Merge pull request #813 from Adamant-im/feat/message-sending-timeouts

Feat/message sending timeouts

Author: S-FrontendDev

src/components/AChat/AChatAttachment/AChatFile.vue

@@ -80,6 +80,7 @@ import IconFile from '@/components/icons/common/IconFile.vue'
 import { useStore } from 'vuex'
 import { AChatFileLoader } from './AChatFileLoader'
 import { mdiImageOff } from '@mdi/js'
+import { useConsiderOffline } from '@/hooks/useConsiderOffline'
 
 const className = 'a-chat-file'
 const classes = {
@@ -120,6 +121,9 @@ const isImage = computed(() => {
   return ['jpg', 'jpeg', 'png'].includes(props.file.extension!)
 })
 
+const { consideredOffline } = useConsiderOffline()
+
+
 const fileName = computed(() =>
   isLocalFile(props.file) ? props.file.file.name : props.file.name || 'UNNAMED'
 )
@@ -146,6 +150,10 @@ const fileSize = computed(() => {
 
 const uploadProgress = computed(() => {
   if (isLocalFile(props.file)) {
+    if (consideredOffline.value) {
+      return 0;
+    }
+
     return store.getters['attachment/getUploadProgress'](props.file.file.cid)
   }
 

src/components/Chat/Chat.vue

@@ -322,6 +322,7 @@ import { useChatStateStore } from '@/stores/modal-state'
 import ChatPlaceholder from '@/components/Chat/ChatPlaceholder.vue'
 import { watchImmediate } from '@vueuse/core'
 import { NodeStatusResult } from '@/lib/nodes/abstract.node'
+import { isAllNodesOfflineError } from '@/lib/nodes/utils/errors'
 
 const validationErrors = {
   emptyMessage: 'EMPTY_MESSAGE',
@@ -873,6 +874,14 @@ const fetchChatMessages = async () => {
     }
   } catch {
     if (store.getters['chat/chatOffset'](props.partnerId) !== -1) {
+      if (areAdmNodesOnline.value) {
+        // give health check time to be finished and then retry in case of miscoordination of nodes statuses
+        // (when areAdmNodesOnline says there are some nodes online, but the request fails with allNodesOffline error)
+        return setTimeout(async () => {
+          await fetchChatMessages()
+        }, 5000)
+      }
+
       return (allowFetchingMessages.value = true)
     }
     loading.value = false

src/components/NodesOfflineDialog.vue

@@ -60,7 +60,7 @@ export default {
         return store.state.chat.noActiveNodesDialog
       },
       set() {
-        store.commit('chat/setNoActiveNodesDialog', false)
+        store.commit('chat/setNoActiveNodesDialog', { value: false })
       }
     })
 

src/hooks/useConsiderOffline.ts

@@ -19,17 +19,29 @@ export function useConsiderOffline() {
     ...ipfsNodes.value
   ])
 
+  const admAnyOnline = computed(() => admNodes.value.some((node) => node.status === 'online'))
+  const admAllDisabled = computed(() => admNodes.value.every((node) => node.status === 'disabled'))
+
+  const anyNodeOnline = computed(() => allNodes.value.some((node) => node.status === 'online'))
   const everyNodeDisabled = computed(() =>
     allNodes.value.every((node) => node.status === 'disabled')
   )
-  const anyNodeOnline = computed(() => allNodes.value.some((node) => node.status === 'online'))
 
-  const consideredOffline = computed(
-    () =>
-      !isOnline.value ||
-      (!anyNodeOnline.value && !everyNodeDisabled.value) ||
-      everyNodeDisabled.value
-  )
+  const consideredOffline = computed(() => {
+    if (!isOnline.value) {
+      return true
+    }
+
+    if (admAnyOnline.value) {
+      return false
+    }
+
+    if (!admAllDisabled.value && !admAnyOnline.value) {
+      return true
+    }
+
+    return !anyNodeOnline.value || everyNodeDisabled.value
+  })
 
   return {
     consideredOffline

src/hooks/useResendPendingMessages.ts

@@ -1,6 +1,5 @@
-import { computed, onBeforeUnmount } from 'vue'
+import { computed, onBeforeUnmount, watch } from 'vue'
 import { useStore } from 'vuex'
-import { watchImmediate } from '@vueuse/core'
 import { MessageType } from '@/lib/constants'
 import { NodeStatusResult } from '@/lib/nodes/abstract.node'
 import { FileData } from '@/lib/files'
@@ -25,33 +24,62 @@ export function useResendPendingMessages() {
     () => store.state.chat.pendingMessages
   )
 
-  watchImmediate([areAdmNodesOnline, areIpfsNodesOnline], ([admOnline, ipfsOnline]) => {
-    const hasMessagesWithFiles = Object.values(pendingMessages.value).some(
-      (message) => message.files && message.files.length > 0
-    )
-
-    const isReady = hasMessagesWithFiles ? admOnline && ipfsOnline : admOnline
-
-    if (!isReady) return
+  // resend basic messages
+  function resendBasic() {
+    Object.entries(pendingMessages.value).forEach(([id, msg]) => {
+      if (msg.type === MessageType.BASIC_ENCRYPTED_MESSAGE) {
+        store
+          .dispatch('chat/resendMessage', {
+            recipientId: msg.recipientId,
+            messageId: id
+          })
+          .then((res) => {
+            if (res.success) store.commit('chat/deletePendingMessage', id)
+          })
+      }
+    })
+  }
 
-    Object.entries(pendingMessages.value).forEach(([messageId, message]) => {
-      ;(message.type === MessageType.BASIC_ENCRYPTED_MESSAGE
-        ? store.dispatch('chat/resendMessage', {
-            recipientId: message.recipientId,
-            messageId
+  // resend messages with attachments (requires ipfs node)
+  function resendAttachments() {
+    Object.entries(pendingMessages.value).forEach(([id, msg]) => {
+      if (msg.type !== MessageType.BASIC_ENCRYPTED_MESSAGE && msg.files?.length) {
+        store
+          .dispatch('chat/resendAttachment', {
+            recipientId: msg.recipientId,
+            files: msg.files,
+            messageId: id
           })
-        : store.dispatch('chat/resendAttachment', {
-            recipientId: message.recipientId,
-            files: message.files,
-            messageId
+          .then((res) => {
+            if (res.success) store.commit('chat/deletePendingMessage', id)
           })
-      ).then((res) => {
-        if (res.success) {
-          store.commit('chat/deletePendingMessage', messageId)
-        }
-      })
+      }
     })
-  })
+  }
+
+  watch(
+    areAdmNodesOnline,
+    (isUp, wasUp) => {
+      if (!isUp || isUp === wasUp) return
+
+      resendBasic()
+      if (areIpfsNodesOnline.value) {
+        resendAttachments()
+      }
+    },
+    { immediate: true }
+  )
+
+  watch(
+    areIpfsNodesOnline,
+    (isUp, wasUp) => {
+      if (!isUp || isUp === wasUp) return
+      if (!areAdmNodesOnline.value) return
+
+      resendAttachments()
+    },
+    { immediate: true }
+  )
 
   onBeforeUnmount(() => {
     Object.values(pendingMessages.value).forEach((message) => {

src/hooks/useTrackConnection.ts

@@ -7,7 +7,14 @@ export function useTrackConnection() {
   const store = useStore()
   const { consideredOffline } = useConsiderOffline()
 
+  let firstCallSkipped = false
+
   watch(consideredOffline, (isOffline) => {
+    if (!firstCallSkipped) {
+      firstCallSkipped = true
+      return
+    }
+
     const type = isOffline ? 'offline' : 'online'
 
     store.dispatch('snackbar/show', {

src/lib/adamant-api/index.js

@@ -12,6 +12,7 @@ import { isStringEqualCI } from '@/lib/textHelpers'
 import { parseCryptoAddressesKVStxs } from '@/lib/store-crypto-address'
 import { DEFAULT_TIME_DELTA } from '@/lib/nodes/constants.js'
 import constants from '@/lib/constants/index.js'
+import { isAllNodesOfflineError } from '@/lib/nodes/utils/errors.js'
 
 Queue.configure(Promise)
 
@@ -111,6 +112,10 @@ export function isReady() {
  * @returns {Promise<string>}
  */
 export function getPublicKey(address = '') {
+  if (address === store.state.address && myKeypair.publicKey) {
+    return Promise.resolve(myKeypair.publicKey.toString('hex'))
+  }
+
   // @todo remove returning cached keys and use getCachedPublicKey instead
   const publicKeyCached = store.getters.publicKey(address)
 

src/lib/files/ipfs.ts

@@ -1,11 +1,11 @@
+import { CID } from 'multiformats/cid'
+import { code } from 'multiformats/codecs/raw'
+import { sha256 } from 'multiformats/hashes/sha2'
+
 /**
  * Compute CID for a file
  */
 export async function computeCID(fileOrBytes: File | Uint8Array) {
-  const { CID } = await import('multiformats/cid')
-  const { code } = await import('multiformats/codecs/raw')
-  const { sha256 } = await import('multiformats/hashes/sha2')
-
   const bytes =
     fileOrBytes instanceof File ? new Uint8Array(await fileOrBytes.arrayBuffer()) : fileOrBytes
 

src/store/modules/chat/index.js

@@ -26,6 +26,7 @@ import { replyMessageAsset, attachmentAsset } from '@/lib/adamant-api/asset'
 import { uploadFiles } from '../../../lib/files'
 import { generateAdamantChats } from './utils/generateAdamantChats'
 import {
+  AllNodesDisabledError,
   AllNodesOfflineError,
   isAllNodesDisabledError,
   isAllNodesOfflineError
@@ -554,8 +555,8 @@ const mutations = {
     }
   },
 
-  setNoActiveNodesDialog(state, value) {
-    if (state.noActiveNodesDialog === false) {
+  setNoActiveNodesDialog(state, { value, afterSendingMessage = false }) {
+    if (state.noActiveNodesDialog === false && !afterSendingMessage) {
       return // do not show dialog again
     }
 
@@ -617,7 +618,7 @@ const actions = {
       })
       .catch((err) => {
         if (isAllNodesDisabledError(err) || getters.isNoNodesDialogAllowed(err)) {
-          commit('setNoActiveNodesDialog', true)
+          commit('setNoActiveNodesDialog', { value: true })
           setTimeout(() => dispatch('loadChats'), 5000) // retry in 5 seconds
         }
       })
@@ -674,7 +675,7 @@ const actions = {
       })
       .catch((err) => {
         if (isAllNodesDisabledError(err) || getters.isNoNodesDialogAllowed(err)) {
-          commit('setNoActiveNodesDialog', true)
+          commit('setNoActiveNodesDialog', { value: true })
         }
         throw err
       })
@@ -844,6 +845,15 @@ const actions = {
         // if the error is caused by connection we keep the message in PENDING status
         // and try to resend it after the connection is restored
 
+        dispatch(
+          'snackbar/show',
+          {
+            message: i18n.global.t(`connection.offline`),
+            timeout: 3000
+          },
+          { root: true }
+        )
+
         // timeout for self deleting out of pending messages
         const timeout = setTimeout(() => {
           dispatch('rejectPendingMessage', {
@@ -866,6 +876,10 @@ const actions = {
           partnerId: recipientId
         })
       } else {
+        if (isAllNodesDisabledError(error)) {
+          commit('setNoActiveNodesDialog', { value: true, afterSendingMessage: true })
+        }
+
         if (id) {
           commit('updateMessage', {
             id,
@@ -889,7 +903,7 @@ const actions = {
    * @returns {Promise}
    */
   async sendAttachment(
-    { commit, rootState, dispatch },
+    { commit, rootState, dispatch, rootGetters },
     { files, message, recipientId, replyToId }
   ) {
     const recipientPublicKey = await getPublicKey(recipientId)
@@ -923,6 +937,14 @@ const actions = {
     console.debug('Updated CIDs and Nonces', newAsset)
 
     try {
+      const areAdmNodesDisabled = rootGetters['nodes/adm'].every(
+        (node) => node.status === 'disabled'
+      )
+
+      if (areAdmNodesDisabled) {
+        throw new AllNodesDisabledError('adm')
+      }
+
       const uploadData = await uploadFiles(files, (progress) => {
         for (const [cid] of cids) {
           commit('attachment/setUploadProgress', { cid, progress }, { root: true })
@@ -944,6 +966,10 @@ const actions = {
       console.debug('Updated CIDs after upload', newAsset)
     } catch (err) {
       if (!isAllNodesOfflineError(err)) {
+        if (isAllNodesDisabledError(err)) {
+          commit('setNoActiveNodesDialog', { value: true, afterSendingMessage: true })
+        }
+
         commit('updateMessage', {
           id: messageObject.id,
           status: TS.REJECTED,
@@ -965,7 +991,11 @@ const actions = {
     return queueMessage(newAsset, recipientId, MessageType.RICH_CONTENT_MESSAGE)
       .then((res) => {
         if (isAllNodesOfflineError(res)) {
-          throw new AllNodesOfflineError('ipfs')
+          throw new AllNodesOfflineError('adm')
+        }
+
+        if (isAllNodesDisabledError(res)) {
+          throw new AllNodesDisabledError('adm')
         }
 
         if (!res.success) {
@@ -986,6 +1016,10 @@ const actions = {
       .catch((err) => {
         // update `message.status` to 'REJECTED' if the error is not caused by connection
         if (!isAllNodesOfflineError(err)) {
+          if (isAllNodesDisabledError(err)) {
+            commit('setNoActiveNodesDialog', { value: true, afterSendingMessage: true })
+          }
+
           commit('updateMessage', {
             id: messageObject.id,
             status: TS.REJECTED,
@@ -995,6 +1029,15 @@ const actions = {
           // if the error is caused by connection we keep the message in PENDING status
           // and try to resend it after the connection is restored
 
+          dispatch(
+            'snackbar/show',
+            {
+              message: i18n.global.t(`connection.offline`),
+              timeout: 3000
+            },
+            { root: true }
+          )
+
           // timeout for self deleting out of pending messages
           const timeout = setTimeout(() => {
             dispatch('rejectPendingMessage', {
@@ -1181,7 +1224,7 @@ const actions = {
 
   rejectPendingMessage({ commit }, { messageId, recipientId }) {
     commit('updateMessage', {
-      messageId,
+      id: messageId,
       status: TS.REJECTED,
       partnerId: recipientId
     })