fix tests; move qss url emit to nse to qss.service

Author: adrastaea

packages/backend/src/nest/auth/sigchain.service.ts

@@ -143,10 +143,14 @@ export class SigChainService extends EventEmitter {
 
   private handleChainUpdate = (teamName: string) => {
     this._updateUsersOnChainUpdate(teamName)
-    void this._updateKeysOnChainUpdate(teamName)
+    void this._updateKeysOnChainUpdate(teamName).catch(err => {
+      this.logger.error('Failed to update iOS keychain on chain update', err)
+    })
     this._updateDeviceCredentials(teamName)
     this.emit('updated', teamName)
-    this.saveChain(teamName)
+    void this.saveChain(teamName).catch(err => {
+      this.logger.error('Failed to save chain after update', err)
+    })
     this.logger.info('Chain updated, emitted updated event')
   }
 
@@ -185,6 +189,7 @@ export class SigChainService extends EventEmitter {
     }
 
     const teamId = sigchain.team!.id
+    await this._ensureDb()
     const alreadySentKeys: Set<string> = new Set(await this.localDbService.getKeysStoredInKeychain(teamId))
     const keysToSend: StorableKey[] = []
     const keyNamesSent: string[] = []

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

@@ -138,99 +138,6 @@ describe('ConnectionsManagerService', () => {
     expect(launchSpy).toBeCalledTimes(1)
   })
 
-  it('emits the authoritative QSS URL for the NSE on iOS', async () => {
-    const originalPlatform = process.platform
-    Object.defineProperty(process, 'platform', {
-      value: 'ios',
-    })
-
-    try {
-      await localDbService.setCommunity({
-        ...community,
-        teamId: 'team-id',
-        qssEndpoint: 'wss://community.example/ws',
-      })
-      await localDbService.setCurrentCommunityId(community.id)
-
-      qssService._qssEndpoint = 'wss://authoritative.example'
-
-      const emitSpy = jest.spyOn(connectionsManagerService.serverIoProvider.io, 'emit')
-
-      await (connectionsManagerService as any).emitNseQssUrl()
-
-      expect(emitSpy).toHaveBeenCalledWith(SocketEvents.NSE_QSS_URL_UPDATED, {
-        teamId: 'team-id',
-        qssUrl: 'https://authoritative.example',
-      })
-    } finally {
-      Object.defineProperty(process, 'platform', {
-        value: originalPlatform,
-      })
-    }
-  })
-
-  it('falls back to the stored community QSS endpoint when no authoritative endpoint is available', async () => {
-    const originalPlatform = process.platform
-    Object.defineProperty(process, 'platform', {
-      value: 'ios',
-    })
-
-    try {
-      await localDbService.setCommunity({
-        ...community,
-        teamId: 'team-id',
-        qssEndpoint: 'ws://community.example/ws',
-      })
-      await localDbService.setCurrentCommunityId(community.id)
-
-      qssService._qssEndpoint = undefined as any
-
-      const emitSpy = jest.spyOn(connectionsManagerService.serverIoProvider.io, 'emit')
-
-      await (connectionsManagerService as any).emitNseQssUrl()
-
-      expect(emitSpy).toHaveBeenCalledWith(SocketEvents.NSE_QSS_URL_UPDATED, {
-        teamId: 'team-id',
-        qssUrl: 'http://community.example/ws',
-      })
-    } finally {
-      Object.defineProperty(process, 'platform', {
-        value: originalPlatform,
-      })
-    }
-  })
-
-  it('skips NSE QSS URL emission when no valid ws or wss endpoint can be derived', async () => {
-    const originalPlatform = process.platform
-    Object.defineProperty(process, 'platform', {
-      value: 'ios',
-    })
-
-    try {
-      await localDbService.setCommunity({
-        ...community,
-        teamId: 'team-id',
-        qssEndpoint: 'https://community.example/api',
-      })
-      await localDbService.setCurrentCommunityId(community.id)
-
-      qssService._qssEndpoint = 'https://authoritative.example/api'
-
-      const emitSpy = jest.spyOn(connectionsManagerService.serverIoProvider.io, 'emit')
-
-      await (connectionsManagerService as any).emitNseQssUrl()
-
-      expect(emitSpy).not.toHaveBeenCalledWith(
-        SocketEvents.NSE_QSS_URL_UPDATED,
-        expect.objectContaining({ teamId: 'team-id' })
-      )
-    } finally {
-      Object.defineProperty(process, 'platform', {
-        value: originalPlatform,
-      })
-    }
-  })
-
   it('pauses and resumes qss alongside the mobile lifecycle', async () => {
     const closeSocketSpy = jest.spyOn(connectionsManagerService, 'closeSocket').mockResolvedValue()
     const openSocketSpy = jest.spyOn(connectionsManagerService, 'openSocket').mockResolvedValue()

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

@@ -50,7 +50,6 @@ import {
   InvitationData,
   SetUserProfileResponse,
   UserProfilesUpdatedPayload,
-  NseQssUrlUpdatedEvent,
 } from '@quiet/types'
 import { CONFIG_OPTIONS, QSS_ALLOWED, QSS_ENDPOINT, SERVER_IO_PROVIDER, SOCKS_PROXY_AGENT } from '../const'
 import { Libp2pService, Libp2pState } from '../libp2p/libp2p.service'
@@ -601,7 +600,6 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
 
     // Unblock websocket endpoints
     this.socketService.resolveReadyness()
-    void this.emitNseQssUrl()
     this.serverIoProvider.io.emit(SocketEvents.COMMUNITY_LAUNCHED, {
       id: community.id,
     } as LaunchCommunityPayload)
@@ -687,62 +685,10 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
     })
   }
 
-  private getNseQssUrl(wsUrl: string | undefined): string | undefined {
-    if (wsUrl == null || wsUrl === '') {
-      this.logger.warn('Skipping NSE QSS URL update because wsUrl is empty')
-      return undefined
-    }
-
-    if (wsUrl.startsWith('wss://')) {
-      return `https://${wsUrl.slice('wss://'.length)}`
-    }
-
-    if (wsUrl.startsWith('ws://')) {
-      return `http://${wsUrl.slice('ws://'.length)}`
-    }
-
-    this.logger.warn('Skipping NSE QSS URL update because endpoint is not ws/wss', wsUrl)
-    return undefined
-  }
-
-  private async emitNseQssUrl(): Promise<void> {
-    if ((process.platform as string) !== 'ios') {
-      return
-    }
-
-    const community = await this.localDbService.getCurrentCommunity()
-    if (community?.teamId == null) {
-      this.logger.warn('Skipping NSE QSS URL update because no active community or team ID found')
-      this.logger.warn('Community', community)
-      return
-    }
-
-    const wsUrl = community.qssEndpoint ?? this.qssEndpoint ?? this.qssService.qssEndpoint
-    const qssUrl = this.getNseQssUrl(wsUrl)
-    if (qssUrl == null) {
-      this.logger.warn('Skipping NSE QSS URL update because no valid QSS URL could be derived')
-      return
-    }
-
-    const payload: NseQssUrlUpdatedEvent = {
-      teamId: community.teamId,
-      qssUrl,
-    }
-
-    this.serverIoProvider.io.emit(SocketEvents.NSE_QSS_URL_UPDATED, payload)
-  }
-
   /**
    * Attaches listeners for events received from the state manager
    */
   private attachSocketServiceListeners() {
-    this.serverIoProvider.io.on(SocketActions.CONNECTION, socket => {
-      void this.emitNseQssUrl()
-      socket.on(SocketActions.START, () => {
-        void this.emitNseQssUrl()
-      })
-    })
-
     // Community
     this.socketService.on(SocketActions.CONNECTION, () => {
       this.logger.info(`socketService - ${SocketActions.CONNECTION}`)

packages/backend/src/nest/libp2p/integration-tests/userProfile-sync.spec.ts

@@ -276,7 +276,7 @@ describe('UserProfileStore OrbitDB Sync', () => {
       10000,
       100
     )
-    userProfileStores[N_PEERS - 1].startSync()
+    await userProfileStores[N_PEERS - 1].startSync()
 
     await waitForExpect(
       async () => {
@@ -291,11 +291,17 @@ describe('UserProfileStore OrbitDB Sync', () => {
       1000
     )
 
-    // Ensure only the new peer emitted 'updated'
-    for (let i = 0; i < N_PEERS - 1; i++) {
-      expect(updatedSpies[i]).toHaveBeenCalledTimes(1)
-    }
-    logger.info('New peer updated:', updatedSpies[N_PEERS - 1].mock.calls.length, 'times')
-    expect(updatedSpies[N_PEERS - 1]).toHaveBeenCalled()
+    await waitForExpect(
+      async () => {
+        // Ensure only the new peer emitted 'updated'
+        for (let i = 0; i < N_PEERS - 1; i++) {
+          expect(updatedSpies[i]).toHaveBeenCalledTimes(1)
+        }
+        logger.info('New peer updated:', updatedSpies[N_PEERS - 1].mock.calls.length, 'times')
+        expect(updatedSpies[N_PEERS - 1]).toHaveBeenCalled()
+      },
+      5000,
+      100
+    )
   })
 })

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

@@ -366,25 +366,6 @@ describe('QPSService', () => {
       )
     })
 
-    it('strips qssUrl from push data before sending to QPS', async () => {
-      await qpsService.sendBatchPush(TEAM_ID, 'title', 'body', {
-        cid: 'cid-1',
-        qssUrl: 'https://untrusted.example',
-      })
-
-      expect(qssClient.sendMessage).toHaveBeenCalledWith(
-        WebsocketEvents.SEND_BATCH_PUSH,
-        expect.objectContaining({
-          payload: expect.objectContaining({
-            title: 'title',
-            body: 'body',
-            data: { teamId: TEAM_ID, cid: 'cid-1' },
-          }),
-        }),
-        true
-      )
-    })
-
     it('skips when QPS is disabled', async () => {
       const disabled = new QPSService(
         false,
@@ -490,26 +471,6 @@ describe('QPSService', () => {
       qssClient.sendMessage.mockResolvedValue(pushSuccessResponse)
     })
 
-    it('strips qssUrl from single push data before sending to QPS', async () => {
-      await qpsService.sendPush('ucan-user-a', 'title', 'body', {
-        cid: 'cid-1',
-        qssUrl: 'https://untrusted.example',
-      })
-
-      expect(qssClient.sendMessage).toHaveBeenCalledWith(
-        WebsocketEvents.SEND_PUSH,
-        expect.objectContaining({
-          payload: {
-            ucan: 'ucan-user-a',
-            title: 'title',
-            body: 'body',
-            data: { cid: 'cid-1' },
-          },
-        }),
-        true
-      )
-    })
-
     it('skips single push when QSS is not connected', async () => {
       qssClient.connected = false
 

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

@@ -197,6 +197,85 @@ describe('QSSService', () => {
       expect(qssService.canConnect).toBeTruthy()
     })
 
+    it('emits the NSE QSS URL from the endpoint passed to connect on iOS', async () => {
+      const originalPlatform = process.platform
+      Object.defineProperty(process, 'platform', { value: 'ios' })
+
+      try {
+        await localDbService.setCommunity({
+          ...community,
+          teamId: 'team-id',
+          qssEnabled: true,
+        })
+        await localDbService.setCurrentCommunityId(community.id)
+
+        mockedAllowed = jest.spyOn(qssService, 'qssAllowed', 'get').mockReturnValue(true)
+        const emitSpy = jest.spyOn(qssService['socketService'].serverIoProvider.io, 'emit')
+
+        await qssService.connect('wss://community.example/ws')
+
+        expect(emitSpy).toHaveBeenCalledWith(SocketEvents.NSE_QSS_URL_UPDATED, {
+          teamId: 'team-id',
+          qssUrl: 'https://community.example/ws',
+        })
+      } finally {
+        Object.defineProperty(process, 'platform', { value: originalPlatform })
+      }
+    })
+
+    it('emits the NSE QSS URL from the stored endpoint when connect is called without one on iOS', async () => {
+      const originalPlatform = process.platform
+      Object.defineProperty(process, 'platform', { value: 'ios' })
+
+      try {
+        await localDbService.setCommunity({
+          ...community,
+          teamId: 'team-id',
+          qssEnabled: true,
+        })
+        await localDbService.setCurrentCommunityId(community.id)
+
+        qssService._qssEndpoint = 'ws://configured.example/ws'
+        mockedAllowed = jest.spyOn(qssService, 'qssAllowed', 'get').mockReturnValue(true)
+        const emitSpy = jest.spyOn(qssService['socketService'].serverIoProvider.io, 'emit')
+
+        await qssService.connect(undefined)
+
+        expect(emitSpy).toHaveBeenCalledWith(SocketEvents.NSE_QSS_URL_UPDATED, {
+          teamId: 'team-id',
+          qssUrl: 'http://configured.example/ws',
+        })
+      } finally {
+        Object.defineProperty(process, 'platform', { value: originalPlatform })
+      }
+    })
+
+    it('skips NSE QSS URL emission when connect uses a non-ws endpoint on iOS', async () => {
+      const originalPlatform = process.platform
+      Object.defineProperty(process, 'platform', { value: 'ios' })
+
+      try {
+        await localDbService.setCommunity({
+          ...community,
+          teamId: 'team-id',
+          qssEnabled: true,
+        })
+        await localDbService.setCurrentCommunityId(community.id)
+
+        mockedAllowed = jest.spyOn(qssService, 'qssAllowed', 'get').mockReturnValue(true)
+        const emitSpy = jest.spyOn(qssService['socketService'].serverIoProvider.io, 'emit')
+
+        await qssService.connect('https://community.example/api')
+
+        expect(emitSpy).not.toHaveBeenCalledWith(
+          SocketEvents.NSE_QSS_URL_UPDATED,
+          expect.objectContaining({ teamId: 'team-id' })
+        )
+      } finally {
+        Object.defineProperty(process, 'platform', { value: originalPlatform })
+      }
+    })
+
     it(`doesn't connect to QSS when not enabled and an endpoint string is provided`, async () => {
       await initCommunity()
       mockedAllowed = jest.spyOn(qssService, 'qssAllowed', 'get').mockReturnValue(false)