From f3768a674a56fbf047743b434908cd35726c1b57 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 3 Jun 2021 11:37:45 +1000 Subject: [PATCH] short error on no network for retry sending message --- .github/workflows/release.yml | 1 + app/sql.js | 1 + js/background.js | 3 +++ package.json | 2 +- ts/components/session/ActionsPanel.tsx | 22 ++++++++-------- .../conversation/SessionConversation.tsx | 1 + ts/data/data.ts | 1 + ts/opengroup/opengroupV2/OpenGroupAPIV2.ts | 4 +++ ts/receiver/attachments.ts | 2 +- .../conversations/ConversationController.ts | 15 ++++++++++- ts/session/onions/onionSend.ts | 2 +- ts/session/sending/MessageQueue.ts | 2 +- ts/session/snode_api/SNodeAPI.ts | 4 ++- ts/session/snode_api/onions.ts | 2 +- ts/session/snode_api/snodePool.ts | 25 +++++++++++++++---- ts/state/ducks/conversations.ts | 1 + ts/window.d.ts | 3 ++- 17 files changed, 67 insertions(+), 24 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7fdfd45b..b78f0106c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,7 @@ on: push: branches: - master + - clearnet jobs: build: diff --git a/app/sql.js b/app/sql.js index 0209d82a5..e18322a3d 100644 --- a/app/sql.js +++ b/app/sql.js @@ -213,6 +213,7 @@ async function vacuumDatabase(instance) { } console.warn('Vacuuming DB. This might take a while.'); await instance.run('VACUUM;'); + console.warn('Vacuuming DB Finished'); } async function updateToSchemaVersion1(currentVersion, instance) { diff --git a/js/background.js b/js/background.js index 7d91e3959..a35b84626 100644 --- a/js/background.js +++ b/js/background.js @@ -64,6 +64,7 @@ // We add this to window here because the default Node context is erased at the end // of preload.js processing window.setImmediate = window.nodeSetImmediate; + window.globalOnlineStatus = true; // default to true as we don't get an event on app start const { Views } = window.Signal; @@ -614,6 +615,7 @@ let disconnectTimer = null; function onOffline() { window.log.info('offline'); + window.globalOnlineStatus = false; window.removeEventListener('offline', onOffline); window.addEventListener('online', onOnline); @@ -626,6 +628,7 @@ function onOnline() { window.log.info('online'); + window.globalOnlineStatus = true; window.removeEventListener('online', onOnline); window.addEventListener('offline', onOffline); diff --git a/package.json b/package.json index eb9d44bea..a063b0cef 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "session-desktop", "productName": "Session", "description": "Private messaging from your desktop", - "version": "1.6.5", + "version": "1.6.6", "license": "GPL-3.0", "author": { "name": "Loki Project", diff --git a/ts/components/session/ActionsPanel.tsx b/ts/components/session/ActionsPanel.tsx index 2c2f5f2d4..cecfc9556 100644 --- a/ts/components/session/ActionsPanel.tsx +++ b/ts/components/session/ActionsPanel.tsx @@ -160,17 +160,17 @@ const triggerSyncIfNeeded = async () => { const removeAllV1OpenGroups = async () => { const allV1Convos = (await getAllOpenGroupV1Conversations()).models || []; - await Promise.all( - allV1Convos.map(async v1Convo => { - try { - window.log.info('removing v1Convo: ', v1Convo.id); - // calling this here rather than in a migration because it takes care of removing the attachments, the messages, the profile images, etc. - await ConversationController.getInstance().deleteContact(v1Convo.id); - } catch (e) { - window.log.warn('failed to delete opengroupv1'); - } - }) - ); + // tslint:disable-next-line: prefer-for-of + for (let index = 0; index < allV1Convos.length; index++) { + const v1Convo = allV1Convos[index]; + try { + window.log.info('removing v1Convo: ', v1Convo.id); + // calling this here rather than in a migration because it takes care of removing the attachments, the messages, the profile images, etc. + await ConversationController.getInstance().deleteContact(v1Convo.id); + } catch (e) { + window.log.warn(`failed to delete opengroupv1 ${v1Convo.id}`, e); + } + } }; const triggerAvatarReUploadIfNeeded = async () => { diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx index 32bd72aba..dbccaf120 100644 --- a/ts/components/session/conversation/SessionConversation.tsx +++ b/ts/components/session/conversation/SessionConversation.tsx @@ -1127,6 +1127,7 @@ export class SessionConversation extends React.Component { private async updateMemberList() { const allPubKeys = await getPubkeysInPublicConversation(this.props.selectedConversationKey); + window?.log?.info(`getPubkeysInPublicConversation returned '${allPubKeys?.length}' members`); const allMembers = allPubKeys.map((pubKey: string) => { const conv = ConversationController.getInstance().get(pubKey); diff --git a/ts/data/data.ts b/ts/data/data.ts index 275926369..0d946e824 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -595,6 +595,7 @@ export async function getAllOpenGroupV1Conversations(): Promise> { + window?.log?.info(`getPubkeysInPublicConversation in '${id}'`); return channels.getPubkeysInPublicConversation(id); } diff --git a/ts/opengroup/opengroupV2/OpenGroupAPIV2.ts b/ts/opengroup/opengroupV2/OpenGroupAPIV2.ts index 3f2c3f67d..b4714d6c6 100644 --- a/ts/opengroup/opengroupV2/OpenGroupAPIV2.ts +++ b/ts/opengroup/opengroupV2/OpenGroupAPIV2.ts @@ -82,6 +82,10 @@ export async function sendApiV2Request( throw new Error('Invalid request'); } + if (!window.globalOnlineStatus) { + throw new pRetry.AbortError('Network is not available'); + } + // set the headers sent by the caller, and the roomId. const headers = request.headers || {}; if (FSv2.isOpenGroupV2Request(request)) { diff --git a/ts/receiver/attachments.ts b/ts/receiver/attachments.ts index 3f909fa0a..46858777e 100644 --- a/ts/receiver/attachments.ts +++ b/ts/receiver/attachments.ts @@ -33,7 +33,7 @@ export async function downloadAttachment(attachment: any) { res = await FSv2.downloadFileFromFSv2(attachmentId, defaultFsOldV2); } else { window.log.warn( - 'downloadAttachment attachment is neither opengroup attachment nor fsv2... Dropping it' + `downloadAttachment attachment is neither opengroup attachment nor fsv2... Dropping it ${asURL.href}` ); throw new Error('Attachment url is not opengroupv2 nor fileserver v2. Unsupported'); } diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 77a8955fd..b347327d7 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -183,13 +183,17 @@ export class ConversationController { throw new Error('ConversationController.get() needs complete initial fetch'); } + window.log.info(`deleteContact with ${id}`); + const conversation = this.conversations.get(id); if (!conversation) { + window.log.warn(`deleteContact no such convo ${id}`); return; } // Closed/Medium group leaving if (conversation.isClosedGroup()) { + window.log.info(`deleteContact ClosedGroup case: ${id}`); await conversation.leaveClosedGroup(); // open group v2 } else if (conversation.isOpenGroupV2()) { @@ -214,16 +218,24 @@ export class ConversationController { } // those are the stuff to do for all contact types - await conversation.destroyMessages(); + window.log.info(`deleteContact destroyingMessages: ${id}`); + await conversation.destroyMessages(); + window.log.info(`deleteContact message destroyed: ${id}`); // if this conversation is a private conversation it's in fact a `contact` for desktop. // we just want to remove everything related to it, set the active_at to undefined // so conversation still exists (useful for medium groups members or opengroups) but is not shown on the UI if (conversation.isPrivate()) { + window.log.info(`deleteContact isPrivate, marking as inactive: ${id}`); + conversation.set('active_at', undefined); await conversation.commit(); } else { + window.log.info(`deleteContact !isPrivate, removing convo from DB: ${id}`); + await removeConversation(id); + window.log.info(`deleteContact !isPrivate, convo removed from DB: ${id}`); + this.conversations.remove(conversation); if (window.inboxStore) { window.inboxStore?.dispatch(conversationActions.conversationRemoved(conversation.id)); @@ -231,6 +243,7 @@ export class ConversationController { conversationActions.conversationChanged(conversation.id, conversation.getProps()) ); } + window.log.info(`deleteContact !isPrivate, convo removed from store: ${id}`); } } diff --git a/ts/session/onions/onionSend.ts b/ts/session/onions/onionSend.ts index 307e05feb..c6e3cddde 100644 --- a/ts/session/onions/onionSend.ts +++ b/ts/session/onions/onionSend.ts @@ -179,7 +179,7 @@ export const sendViaOnion = async ( { retries: 9, // each path can fail 3 times before being dropped, we have 3 paths at most factor: 2, - minTimeout: 200, + minTimeout: 1000, maxTimeout: 4000, onFailedAttempt: e => { window?.log?.warn( diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index 749499932..26a379948 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -77,7 +77,7 @@ export class MessageQueue { }); } catch (e) { window?.log?.warn(`Failed to send message to open group: ${roomInfos}`, e); - void MessageSentHandler.handleMessageSentFailure(message, error); + void MessageSentHandler.handleMessageSentFailure(message, e || error); } } diff --git a/ts/session/snode_api/SNodeAPI.ts b/ts/session/snode_api/SNodeAPI.ts index 8546ef2a6..9ab954fa3 100644 --- a/ts/session/snode_api/SNodeAPI.ts +++ b/ts/session/snode_api/SNodeAPI.ts @@ -111,6 +111,8 @@ export async function getSnodesFromSeedUrl(urlObj: URL): Promise> { // Removed limit until there is a way to get snode info // for individual nodes (needed for guard nodes); this way // we get all active nodes + window?.log?.info(`getSnodesFromSeedUrl starting with ${urlObj.href}`); + const params = { active_only: true, fields: { @@ -242,7 +244,7 @@ export async function requestSnodesForPubkey(pubKey: string): Promise { window?.log?.warn( diff --git a/ts/session/snode_api/onions.ts b/ts/session/snode_api/onions.ts index b800788b5..038ac8c95 100644 --- a/ts/session/snode_api/onions.ts +++ b/ts/session/snode_api/onions.ts @@ -833,7 +833,7 @@ export async function lokiOnionFetch( { retries: 9, factor: 1, - minTimeout: 200, + minTimeout: 1000, maxTimeout: 2000, onFailedAttempt: e => { window?.log?.warn( diff --git a/ts/session/snode_api/snodePool.ts b/ts/session/snode_api/snodePool.ts index 073e12143..911c3493f 100644 --- a/ts/session/snode_api/snodePool.ts +++ b/ts/session/snode_api/snodePool.ts @@ -49,6 +49,8 @@ export type SeedNode = { // just get the filtered list async function tryGetSnodeListFromLokidSeednode(seedNodes: Array): Promise> { + window?.log?.info('tryGetSnodeListFromLokidSeednode starting...'); + if (!seedNodes.length) { window?.log?.info('loki_snode_api::tryGetSnodeListFromLokidSeednode - seedNodes are empty'); return []; @@ -83,8 +85,7 @@ async function tryGetSnodeListFromLokidSeednode(seedNodes: Array): Pro // does this error message need to be exactly this? throw new window.textsecure.SeedNodeError('Failed to contact seed node'); } - } - if (snodes.length) { + } else { window?.log?.info( `loki_snode_api::tryGetSnodeListFromLokidSeednode - ${seedNode.url} returned ${snodes.length} snodes` ); @@ -186,7 +187,7 @@ async function getSnodeListFromLokidSeednode( retries = 0 ): Promise> { const SEED_NODE_RETRIES = 3; - + window?.log?.info('getSnodeListFromLokidSeednode starting...'); if (!seedNodes.length) { window?.log?.info('loki_snode_api::getSnodeListFromLokidSeednode - seedNodes are empty'); return []; @@ -227,6 +228,8 @@ async function getSnodeListFromLokidSeednode( export async function refreshRandomPoolDetail(seedNodes: Array): Promise> { let snodes = []; try { + window?.log?.info(`refreshRandomPoolDetail with seedNodes.length ${seedNodes.length}`); + snodes = await getSnodeListFromLokidSeednode(seedNodes); // make sure order of the list is random, so we get version in a non-deterministic way snodes = _.shuffle(snodes); @@ -241,7 +244,7 @@ export async function refreshRandomPoolDetail(seedNodes: Array): Promi })); window?.log?.info( 'LokiSnodeAPI::refreshRandomPool - Refreshed random snode pool with', - randomSnodePool.length, + snodes.length, 'snodes' ); return fetchSnodePool; @@ -263,7 +266,7 @@ export async function refreshRandomPoolDetail(seedNodes: Array): Promi * or if we have enough snodes, fetches the snode pool from one of the snode. */ export async function refreshRandomPool(): Promise { - if (!window.getSeedNodeList() || !window.getSeedNodeList().length) { + if (!window.getSeedNodeList() || !window.getSeedNodeList()?.length) { window?.log?.error( 'LokiSnodeAPI:::refreshRandomPool - getSeedNodeList has not been loaded yet' ); @@ -272,15 +275,26 @@ export async function refreshRandomPool(): Promise { } // tslint:disable-next-line:no-parameter-reassignment const seedNodes = window.getSeedNodeList(); + window?.log?.info("right before allowOnlyOneAtATime 'refreshRandomPool'"); return allowOnlyOneAtATime('refreshRandomPool', async () => { + window?.log?.info("running allowOnlyOneAtATime 'refreshRandomPool'"); + // we don't have nodes to fetch the pool from them, so call the seed node instead. if (randomSnodePool.length < minSnodePoolCount) { + window?.log?.info( + `refreshRandomPool: NOT enough snodes to fetch from them, so falling back to seedNodes ${seedNodes?.length}` + ); + randomSnodePool = await exports.refreshRandomPoolDetail(seedNodes); return; } try { + window?.log?.info( + `refreshRandomPool: enough snodes to fetch from them, so we try using them ${randomSnodePool.length}` + ); + // let this request try 3 (3+1) times. If all those requests end up without having a consensus, // fetch the snode pool from one of the seed nodes (see the catch). await pRetry( @@ -289,6 +303,7 @@ export async function refreshRandomPool(): Promise { if (!commonNodes || commonNodes.length < requiredSnodesForAgreement) { // throwing makes trigger a retry if we have some left. + window?.log?.info(`refreshRandomPool: Not enough common nodes ${commonNodes?.length}`); throw new Error('Not enough common nodes.'); } window?.log?.info('updating snode list with snode pool length:', commonNodes.length); diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 01bdcea0e..f5bcbd78d 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -406,6 +406,7 @@ export function openConversationExternal( id: string, messageId?: string ): SelectedConversationChangedActionType { + window?.log?.info(`openConversationExternal with convoId: ${id}; messageId: ${messageId}`); return { type: 'SELECTED_CONVERSATION_CHANGED', payload: { diff --git a/ts/window.d.ts b/ts/window.d.ts index 139592050..3ad40e534 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -57,7 +57,7 @@ declare global { onLogin: any; resetDatabase: any; restart: any; - getSeedNodeList: () => any; + getSeedNodeList: () => Array | undefined; setPassword: any; setSettingValue: any; showEditProfileDialog: any; @@ -89,5 +89,6 @@ declare global { lightTheme: DefaultTheme; darkTheme: DefaultTheme; LokiPushNotificationServer: any; + globalOnlineStatus: boolean; } }