Feature/2295

CHANGELOG.md

@@ -3,6 +3,7 @@
 # New features:
 
 * Add support for new format of invitation link: `c=<cid>&t=<token>&s=<serverAddress>&i=<inviterAddress>` ([#2310](https://github.com/TryQuiet/quiet/issues/2310))
+* Use server for downloading initial community metadata if v2 invitation link is detected ([#2295](https://github.com/TryQuiet/quiet/issues/2295))
 
 # Refactorings:
 

packages/backend/package.json

@@ -108,6 +108,7 @@
     "dotenv": "8.2.0",
     "events": "^3.2.0",
     "express": "^4.17.1",
+    "fetch-retry": "^6.0.0",
     "fastq": "^1.17.1",
     "get-port": "^5.1.1",
     "go-ipfs": "npm:[email protected]",

packages/backend/src/nest/connections-manager/connections-manager.module.ts

@@ -5,9 +5,10 @@ import { SocketModule } from '../socket/socket.module'
 import { StorageModule } from '../storage/storage.module'
 import { TorModule } from '../tor/tor.module'
 import { ConnectionsManagerService } from './connections-manager.service'
+import { ServerProxyServiceModule } from '../storageServerProxy/storageServerProxy.module'
 
 @Module({
-  imports: [RegistrationModule, StorageModule, TorModule, SocketModule, LocalDbModule],
+  imports: [RegistrationModule, StorageModule, TorModule, SocketModule, LocalDbModule, ServerProxyServiceModule],
   providers: [ConnectionsManagerService],
   exports: [ConnectionsManagerService],
 })

packages/backend/src/nest/connections-manager/connections-manager.service.tor.spec.ts

@@ -178,7 +178,6 @@ describe('Connections manager', () => {
     const spyOnDestroyHiddenService = jest.spyOn(tor, 'destroyHiddenService')
     await connectionsManagerService.init()
     const network = await connectionsManagerService.getNetwork()
-    console.log('network', network)
     expect(network.hiddenService.onionAddress.split('.')[0]).toHaveLength(56)
     expect(network.hiddenService.privateKey).toHaveLength(99)
     const peerId = await PeerId.createFromJSON(network.peerId)

packages/backend/src/nest/connections-manager/connections-manager.service.ts

@@ -1,69 +1,68 @@
+import { peerIdFromKeys } from '@libp2p/peer-id'
 import { Inject, Injectable, OnModuleInit } from '@nestjs/common'
 import { Crypto } from '@peculiar/webcrypto'
-import { Agent } from 'https'
-import fs from 'fs'
-import path from 'path'
-import { peerIdFromKeys } from '@libp2p/peer-id'
-import { setEngine, CryptoEngine } from 'pkijs'
 import { EventEmitter } from 'events'
+import fs from 'fs'
 import getPort from 'get-port'
+import { Agent } from 'https'
+import path from 'path'
 import PeerId from 'peer-id'
+import { CryptoEngine, setEngine } from 'pkijs'
 import { getLibp2pAddressesFromCsrs, removeFilesFromDir } from '../common/utils'
 
+import { LazyModuleLoader } from '@nestjs/core'
+import { createLibp2pAddress, isPSKcodeValid, p2pAddressesToPairs } from '@quiet/common'
+import { CertFieldsTypes, getCertFieldValue, loadCertificate } from '@quiet/identity'
 import {
-  GetMessagesPayload,
   ChannelMessageIdsResponse,
-  type DeleteChannelResponse,
+  ChannelSubscribedPayload,
   ChannelsReplicatedPayload,
   Community,
-  CommunityId,
+  CommunityMetadata,
+  CommunityOwnership,
   ConnectionProcessInfo,
   CreateChannelPayload,
   CreateChannelResponse,
+  CreateNetworkPayload,
   DeleteFilesFromChannelSocketPayload,
   DownloadStatus,
   ErrorMessages,
   FileMetadata,
-  MessagesLoadedPayload,
+  GetMessagesPayload,
   InitCommunityPayload,
+  MessagesLoadedPayload,
   NetworkDataPayload,
   NetworkInfo,
   NetworkStats,
-  type SavedOwnerCertificatePayload,
   PushNotificationPayload,
-  RegisterOwnerCertificatePayload,
   RemoveDownloadStatus,
+  SaveCSRPayload,
   SendCertificatesResponse,
   SendMessagePayload,
-  ChannelSubscribedPayload,
   SocketActionTypes,
-  StorePeerListPayload,
   UploadFilePayload,
-  PeerId as PeerIdType,
-  SaveCSRPayload,
-  CommunityMetadata,
-  type PermsData,
+  type DeleteChannelResponse,
+  type SavedOwnerCertificatePayload,
   type UserProfile,
   type UserProfilesStoredEvent,
 } from '@quiet/types'
+import Logger from '../common/logger'
 import { CONFIG_OPTIONS, QUIET_DIR, SERVER_IO_PROVIDER, SOCKS_PROXY_AGENT } from '../const'
-import { ConfigOptions, GetPorts, ServerIoProviderTypes } from '../types'
-import { SocketService } from '../socket/socket.service'
-import { RegistrationService } from '../registration/registration.service'
-import { LocalDbService } from '../local-db/local-db.service'
-import { StorageService } from '../storage/storage.service'
-import { ServiceState, TorInitState } from './connections-manager.types'
 import { Libp2pService } from '../libp2p/libp2p.service'
-import { Tor } from '../tor/tor.service'
-import { LocalDBKeys } from '../local-db/local-db.types'
 import { Libp2pEvents, Libp2pNodeParams } from '../libp2p/libp2p.types'
+import { LocalDbService } from '../local-db/local-db.service'
+import { LocalDBKeys } from '../local-db/local-db.types'
+import { RegistrationService } from '../registration/registration.service'
 import { RegistrationEvents } from '../registration/registration.types'
-import { StorageEvents } from '../storage/storage.types'
-import { LazyModuleLoader } from '@nestjs/core'
-import Logger from '../common/logger'
 import { emitError } from '../socket/socket.errors'
-import { createLibp2pAddress, isPSKcodeValid } from '@quiet/common'
-import { CertFieldsTypes, createRootCA, getCertFieldValue, loadCertificate } from '@quiet/identity'
+import { SocketService } from '../socket/socket.service'
+import { StorageService } from '../storage/storage.service'
+import { StorageEvents } from '../storage/storage.types'
+import { ServerProxyService } from '../storageServerProxy/storageServerProxy.service'
+import { ServerStoredCommunityMetadata } from '../storageServerProxy/storageServerProxy.types'
+import { Tor } from '../tor/tor.service'
+import { ConfigOptions, GetPorts, ServerIoProviderTypes } from '../types'
+import { ServiceState, TorInitState } from './connections-manager.types'
 
 @Injectable()
 export class ConnectionsManagerService extends EventEmitter implements OnModuleInit {
@@ -81,6 +80,7 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
     @Inject(SOCKS_PROXY_AGENT) public readonly socksProxyAgent: Agent,
     private readonly socketService: SocketService,
     private readonly registrationService: RegistrationService,
+    private readonly storageServerProxyService: ServerProxyService,
     private readonly localDbService: LocalDbService,
     private readonly storageService: StorageService,
     private readonly tor: Tor,
@@ -628,6 +628,33 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
       await this.storageService?.saveCSR(payload)
     })
 
+    this.socketService.on(
+      SocketActionTypes.DOWNLOAD_INVITE_DATA,
+      async (payload: { cid: string; serverAddress: string }, callback: (response: CreateNetworkPayload) => void) => {
+        this.logger(`socketService - ${SocketActionTypes.DOWNLOAD_INVITE_DATA}`)
+        this.storageServerProxyService.setServerAddress(payload.serverAddress)
+        let downloadedData: ServerStoredCommunityMetadata
+        try {
+          downloadedData = await this.storageServerProxyService.downloadData(payload.cid)
+        } catch (e) {
+          this.logger.error(`Downloading community data failed`, e)
+          emitError(this.serverIoProvider.io, {
+            type: SocketActionTypes.DOWNLOAD_INVITE_DATA,
+            message: ErrorMessages.STORAGE_SERVER_CONNECTION_FAILED,
+          })
+          return
+        }
+
+        const createNetworkPayload: CreateNetworkPayload = {
+          ownership: CommunityOwnership.User,
+          peers: p2pAddressesToPairs(downloadedData.peerList),
+          psk: downloadedData.psk,
+          ownerOrbitDbIdentity: downloadedData.ownerOrbitDbIdentity,
+        }
+        callback(createNetworkPayload)
+      }
+    )
+
     // Public Channels
     this.socketService.on(
       SocketActionTypes.CREATE_CHANNEL,

packages/backend/src/nest/registration/registration.functions.ts

@@ -64,7 +64,6 @@ export const extractPendingCsrs = async (payload: { csrs: string[]; certificates
       pendingCsrs.push(csr)
     }
   }
-  logger('DuplicatedCertBug', { parsedUniqueCsrs, pendingNames, certNames })
   return pendingCsrs
 }
 

packages/backend/src/nest/registration/registration.service.ts

@@ -62,7 +62,6 @@ export class RegistrationService extends EventEmitter implements OnModuleInit {
           certificates: (await this.storageService?.loadAllCertificates()) as string[],
         })
 
-        this.logger('Finished issuing certificates')
         // Event processing finished
         this.registrationEventInProgress = false
 
@@ -90,14 +89,13 @@ export class RegistrationService extends EventEmitter implements OnModuleInit {
       return
     }
 
-    this.logger('DuplicatedCertBug', { payload })
     const pendingCsrs = await extractPendingCsrs(payload)
-    this.logger('DuplicatedCertBug', { pendingCsrs })
     await Promise.all(
       pendingCsrs.map(async csr => {
         await this.registerUserCertificate(csr)
       })
     )
+    this.logger('Finished issuing certificates')
   }
 
   // TODO: This doesn't save the owner's certificate in OrbitDB, so perhaps we
@@ -121,7 +119,6 @@ export class RegistrationService extends EventEmitter implements OnModuleInit {
 
   public async registerUserCertificate(csr: string): Promise<void> {
     const result = await issueCertificate(csr, this.permsData)
-    this.logger('DuplicatedCertBug', { result })
     if (result?.cert) {
       // Save certificate (awaited) so that we are sure that the certs
       // are saved before processing the next round of CSRs.

packages/backend/src/nest/socket/socket.service.ts

@@ -174,15 +174,8 @@ export class SocketService extends EventEmitter implements OnModuleInit {
       socket.on(
         SocketActionTypes.DOWNLOAD_INVITE_DATA,
         async (payload: { serverAddress: string; cid: string }, callback: (response: CreateNetworkPayload) => void) => {
-          // this.emit(SocketActionTypes.DOWNLOAD_INVITE_DATA, payload, callback)
-          console.log('download invite data', payload)
-          // Mock it for now
-          callback({
-            ownership: CommunityOwnership.User,
-            peers: [],
-            psk: '',
-            ownerOrbitDbIdentity: '',
-          })
+          console.log('SOCKET Downloading invite data', payload)
+          this.emit(SocketActionTypes.DOWNLOAD_INVITE_DATA, payload, callback)
         }
       )
 

packages/backend/src/nest/storage/certifacteRequests/certificatesRequestsStore.ts

@@ -100,14 +100,11 @@ export class CertificatesRequestsStore extends EventEmitter {
         return e.payload.value
       })
 
-    this.logger('DuplicatedCertBug', { allEntries })
     const allCsrsUnique = [...new Set(allEntries)]
-    this.logger('DuplicatedCertBug', { allCsrsUnique })
     await Promise.all(
       allCsrsUnique
         .filter(async csr => {
           const validation = await CertificatesRequestsStore.validateUserCsr(csr)
-          this.logger('DuplicatedCertBug', { validation, csr })
           if (validation) return true
           return false
         })
@@ -121,7 +118,6 @@ export class CertificatesRequestsStore extends EventEmitter {
           filteredCsrsMap.set(pubKey, csr)
         })
     )
-    this.logger('DuplicatedCertBug', '[...filteredCsrsMap.values()]', [...filteredCsrsMap.values()])
     return [...filteredCsrsMap.values()]
   }
 

packages/backend/src/nest/storage/certificates/certificates.store.ts

@@ -166,7 +166,6 @@ export class CertificatesStore extends EventEmitter {
         }
 
         const validation = await this.validateCertificate(certificate)
-        this.logger('DuplicatedCertBug', { validation, certificate })
         if (validation) {
           const parsedCertificate = parseCertificate(certificate)
           const pubkey = keyFromCertificate(parsedCertificate)

packages/backend/src/nest/storage/storage.service.spec.ts

@@ -43,6 +43,7 @@ import { CertificatesRequestsStore } from './certifacteRequests/certificatesRequ
 import { CertificatesStore } from './certificates/certificates.store'
 import { CommunityMetadataStore } from './communityMetadata/communityMetadata.store'
 import { OrbitDb } from './orbitDb/orbitDb.service'
+import { UserProfileStore } from './userProfile/userProfile.store'
 
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
@@ -72,6 +73,7 @@ describe('StorageService', () => {
   let certificatesRequestsStore: CertificatesRequestsStore
   let certificatesStore: CertificatesStore
   let communityMetadataStore: CommunityMetadataStore
+  let userProfileStore: UserProfileStore
   let orbitDbService: OrbitDb
   let peerId: PeerId
 
@@ -135,7 +137,7 @@ describe('StorageService', () => {
     certificatesRequestsStore = await module.resolve(CertificatesRequestsStore)
     certificatesStore = await module.resolve(CertificatesStore)
     communityMetadataStore = await module.resolve(CommunityMetadataStore)
-    console.log({ communityMetadataStore })
+    userProfileStore = await module.resolve(UserProfileStore)
     lazyModuleLoader = await module.resolve(LazyModuleLoader)
 
     orbitDbDir = await module.resolve(ORBIT_DB_DIR)
@@ -262,16 +264,17 @@ describe('StorageService', () => {
       const certificatesDbAddress = certificatesStore.getAddress()
       const certificatesRequestsDbAddress = certificatesRequestsStore.getAddress()
       const communityMetadataDbAddress = communityMetadataStore.getAddress()
+      const userProfileDbAddress = userProfileStore.getAddress()
       expect(channelsDbAddress).not.toBeFalsy()
       expect(certificatesDbAddress).not.toBeFalsy()
       expect(subscribeToPubSubSpy).toBeCalledTimes(2)
       // Storage initialization:
       expect(subscribeToPubSubSpy).toHaveBeenNthCalledWith(1, [
+        StorageService.dbAddress(communityMetadataDbAddress),
         StorageService.dbAddress(channelsDbAddress),
         StorageService.dbAddress(certificatesDbAddress),
         StorageService.dbAddress(certificatesRequestsDbAddress),
-        StorageService.dbAddress(communityMetadataDbAddress),
-        '/orbitdb/zdpuAyScVHonV7KUdb3rdNmC9ZurssGdfgveYm3ds7KNJ6CpU/user-profiles',
+        StorageService.dbAddress(userProfileDbAddress),
       ])
       // Creating channel:
       expect(subscribeToPubSubSpy).toHaveBeenNthCalledWith(2, [StorageService.dbAddress(db.address)])

packages/backend/src/nest/storage/storage.service.ts

@@ -153,7 +153,9 @@ export class StorageService extends EventEmitter {
 
   private async startReplicate() {
     const dbs = []
-
+    if (this.communityMetadataStore?.getAddress()) {
+      dbs.push(this.communityMetadataStore.getAddress())
+    }
     if (this.channels?.address) {
       dbs.push(this.channels.address)
     }
@@ -163,9 +165,6 @@ export class StorageService extends EventEmitter {
     if (this.certificatesRequestsStore.getAddress()) {
       dbs.push(this.certificatesRequestsStore.getAddress())
     }
-    if (this.communityMetadataStore?.getAddress()) {
-      dbs.push(this.communityMetadataStore.getAddress())
-    }
     if (this.userProfileStore.getAddress()) {
       dbs.push(this.userProfileStore.getAddress())
     }

packages/backend/src/nest/storageServerProxy/storageServerProxy.module.ts

@@ -0,0 +1,8 @@
+import { Module } from '@nestjs/common'
+import { ServerProxyService } from './storageServerProxy.service'
+
+@Module({
+  providers: [ServerProxyService],
+  exports: [ServerProxyService],
+})
+export class ServerProxyServiceModule {}