Merge branch 'develop' into chore/run-e2e-on-mac-intel

Author: islathehut

3rd-party/qss

@@ -23,7 +23,7 @@
 * Fixed trace logger toggles [#3045](https://github.com/TryQuiet/quiet/issues/3045)
 * Fixed auth issues when using QSS in AWS [#3128](https://github.com/TryQuiet/quiet/issues/3128)
 * Fixed bug around killing old tor process that results in an unhandled exception [#3135](https://github.com/TryQuiet/quiet/issues/3135)
-
+* Fixed bug that caused a registration loop when QSS_ALLOWED is true but the endpoint is unset [#3140](https://github.com/TryQuiet/quiet/issues/3140)
 
 ### Chores
 
@@ -35,6 +35,7 @@
 
 * Handle AWS QSS endpoints in invite links [#3024](https://github.com/TryQuiet/quiet/issues/3024)
 * Fixes dialing on join when using AWS QSS [#3025](https://github.com/TryQuiet/quiet/issues/3025)
+* Fix delay between sign-in and historical log entry pull from QSS [#3127](https://github.com/TryQuiet/quiet/issues/3127)
 
 ## [6.3.0]
 

CHANGELOG.md

@@ -21,6 +21,7 @@ import { RoleName } from '../auth/services/roles/roles'
 import { Injectable } from '@nestjs/common'
 import { randomUUID } from 'crypto'
 import { SigChain } from '../auth/sigchain'
+import { QSSAuthConnStatus } from './qss.const'
 
 @Injectable()
 export class QSSAuthConnection extends EventEmitter {
@@ -37,9 +38,14 @@ export class QSSAuthConnection extends EventEmitter {
    */
   private _teamId: string | undefined = undefined
   /**
-   * True when connected and operational
+   * Status of LFA connection
+   *
+   *  NOT_STARTED = Connection has been created but hasn't been started
+   *  STARTING = Connection is in use but hasn't finished identity handshake
+   *  ACTIVE = Connection is in use and the identity handshake was successful
+   *  INACTIVE = Connection was stopped/disconnected
    */
-  private _active: boolean = false
+  private _connStatus: QSSAuthConnStatus = QSSAuthConnStatus.NOT_STARTED
   /**
    * Random ID for this connection
    */
@@ -89,8 +95,16 @@ export class QSSAuthConnection extends EventEmitter {
     return this._joinStatus
   }
 
+  public get connStatus(): QSSAuthConnStatus {
+    return this._connStatus
+  }
+
+  /**
+   * This is true when the connection is starting up or has successfully completed the identity handshake
+   * and is actively syncing sigchain updates with QSS
+   */
   public get active(): boolean {
-    return this._active
+    return [QSSAuthConnStatus.STARTING, QSSAuthConnStatus.CONNECTED].includes(this.connStatus)
   }
 
   public get id(): string {
@@ -127,7 +141,7 @@ export class QSSAuthConnection extends EventEmitter {
     if (this._authConnection != null) {
       // if we have an existing auth connection for this team check if it has been started and is active, if so
       // do nothing
-      if (this._authConnection._started && this._active) {
+      if (this._authConnection._started && this.active) {
         this.logger.error(`Auth connection already started with QSS for this team`, this.teamId)
         return
       }
@@ -139,8 +153,8 @@ export class QSSAuthConnection extends EventEmitter {
     await this._initNewConn(sigChain)
 
     this.logger.info(`Auth connection established with QSS`)
+    this._connStatus = QSSAuthConnStatus.STARTING
     this._authConnection!.start()
-    this._active = true
   }
 
   /**
@@ -183,9 +197,9 @@ export class QSSAuthConnection extends EventEmitter {
       this._joinStatus = JoinStatus.JOINED
     }
 
-    // handle connected events and update the sigchain/join status
+    // Handle connected events and update the sigchain/join status
     authConnection.on('connected', () => {
-      this._active = true
+      this._connStatus = QSSAuthConnStatus.CONNECTED
       if (this.sigChainService.activeChainTeamName != null && this._joinStatus !== JoinStatus.JOINED) {
         this.logger.debug(`Sending sync message because our chain is initialized`)
         const sigChain = this.sigChainService.getActiveChain()
@@ -202,7 +216,7 @@ export class QSSAuthConnection extends EventEmitter {
     // set the connection to inactive when disconnecting
     authConnection.on('disconnected', event => {
       this.logger.info(`LFA Disconnected!`, event)
-      this._active = false
+      this._connStatus = QSSAuthConnStatus.INACTIVE
       this.emit(QSSEvents.QSS_DISCONNECTED, this.teamId)
     })
 
@@ -285,7 +299,7 @@ export class QSSAuthConnection extends EventEmitter {
     } catch (e) {
       this.logger.error(`Error while stopping auth connection with QSS for team ID ${this.teamId}`, e)
     } finally {
-      this._active = false
+      this._connStatus = QSSAuthConnStatus.INACTIVE
     }
   }
 }

packages/backend/src/nest/qss/qss-auth-conn.ts

@@ -1,2 +1,9 @@
 export const CLIENT_TRANSPORTS = ['websocket']
 export const QSS_RECONNECT_DELAY_MS = 60_000
+
+export enum QSSAuthConnStatus {
+  NOT_STARTED = 'NOT_STARTED',
+  INACTIVE = 'INACTIVE',
+  STARTING = 'STARTING',
+  CONNECTED = 'CONNECTED',
+}

packages/backend/src/nest/qss/qss.const.ts

@@ -47,6 +47,8 @@ import { IpfsModule } from '../ipfs/ipfs.module'
 import { logEntryToLogUpdate } from '../storage/orbitDb/util'
 import { OrbitDbModule } from '../storage/orbitDb/orbitdb.module'
 import { QSSAuthConnectionManager } from './qss-auth-conn-manager.service'
+import { QSSAuthConnection } from './qss-auth-conn'
+import { QSSAuthConnStatus } from './qss.const'
 
 describe('QSSService', () => {
   let store: Store
@@ -63,6 +65,7 @@ describe('QSSService', () => {
   let libp2pParams: Libp2pNodeParams
   let mockedCreateSocket: any
   let mockedGetSocket: any
+  let mockedGetAuthConnection: any
   let mockedSendMessage: any
   let mockedJoinStatus: any
   let addPendingMessageSpy: any
@@ -160,6 +163,10 @@ describe('QSSService', () => {
       mockedCaptchaVerified.mockRestore()
       mockedCaptchaVerified = undefined
     }
+    if (mockedGetAuthConnection != null) {
+      mockedGetAuthConnection.mockRestore()
+      mockedGetAuthConnection = undefined
+    }
   })
 
   interface InitCommunitySettings {
@@ -483,6 +490,16 @@ describe('QSSService', () => {
       await initCommunity()
       const initStatusOrig = await qssService.getQssInitStatus()
       expect(initStatusOrig.qssSetup).toBeFalsy()
+      mockedGetAuthConnection = jest
+        .spyOn(qssAuthConnManager, 'getConnection')
+        .mockImplementation((teamId: string): QSSAuthConnection => {
+          return {
+            active: true,
+            joinStatus: JoinStatus.JOINED,
+            connStatus: QSSAuthConnStatus.CONNECTED,
+            on: (...args: any[]) => {},
+          } as any
+        })
 
       mockedSendMessage = jest
         .spyOn(qssClient, 'sendMessage')

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

@@ -41,7 +41,7 @@ import { LocalDbService } from '../local-db/local-db.service'
 import { DLQDecryptEntry } from '../local-db/local-db.types'
 import { LogUpdate } from '../storage/orbitDb/orbitdb.types'
 import { logEntryToLogUpdate } from '../storage/orbitDb/util'
-import { QSS_RECONNECT_DELAY_MS } from './qss.const'
+import { QSS_RECONNECT_DELAY_MS, QSSAuthConnStatus } from './qss.const'
 import { CompoundError, InvitationDataV3, SocketActions, SocketEvents } from '@quiet/types'
 import { LocalDbEvents } from '../local-db/local-db.types'
 import { SocketService } from '../socket/socket.service'
@@ -558,6 +558,7 @@ export class QSSService extends EventEmitter implements OnModuleDestroy, OnModul
   }
 
   private _stopLogPullInterval(teamId: string): void {
+    this.logger.debug('Stopping log pull interval', teamId)
     const existingInterval = this._logPullIntervals.get(teamId)
     if (existingInterval != null) {
       clearInterval(existingInterval)
@@ -568,14 +569,15 @@ export class QSSService extends EventEmitter implements OnModuleDestroy, OnModul
   public startLogPullInterval(teamId: string): void {
     this.logger.debug('Starting log pull interval', teamId)
     if (this._logPullIntervals.has(teamId)) {
+      this.logger.debug('Existing log pull interval, skipping', teamId)
       return
     }
 
     void this._pullLatestLogEntriesForTeam(teamId)
 
     const interval = setInterval(() => {
       void this._pullLatestLogEntriesForTeam(teamId)
-    }, 30_000)
+    }, 10_000)
 
     this._logPullIntervals.set(teamId, interval)
   }
@@ -609,13 +611,19 @@ export class QSSService extends EventEmitter implements OnModuleDestroy, OnModul
         this.startLogPullInterval(teamId)
       }
 
-      authConnection?.on(QSSEvents.QSS_AUTH_CONNECTED, startLogPullInterval)
+      authConnection?.on(QSSEvents.QSS_AUTH_CONNECTED, (teamId: string) => {
+        this.startLogPullInterval(teamId)
+      })
       authConnection?.on(QSSEvents.QSS_DISCONNECTED, () => {
         this.logger.info('Disconnected event received, stopping log entry pull interval', teamId)
         this._stopLogPullInterval(teamId)
       })
 
-      if (authConnection?.active) {
+      if (
+        authConnection?.connStatus === QSSAuthConnStatus.CONNECTED &&
+        authConnection?.joinStatus === JoinStatus.JOINED
+      ) {
+        this.logger.info('Already finished auth connection with QSS, starting log pull interval')
         startLogPullInterval()
       }
     }

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

@@ -157,7 +157,6 @@ class LFAIdentityProvider implements IdentityProvider {
     try {
       // convert the hex string back to a signed envelope
       const signedEnvelope = this._hexToSignedEnvelope(signature)
-      this.logger.warn('Serialized signature', signedEnvelope)
       // validate the user is on the chain
       const { user, sigchain } = this.getUserAndChain(signedEnvelope.author.name, signedEnvelope.teamId)
       // verify the signature against the keys stored on the chain for this user

packages/backend/src/nest/storage/orbitDb/identity/lfa/lfa-identity.provider.ts

@@ -177,7 +177,7 @@ let browserWidth: number
 let browserHeight: number
 
 // Default title bar must be hidden for macos because we have custom styles for it
-const titleBarStyle = process.platform !== 'win32' ? 'hidden' : 'default'
+const titleBarStyle = process.platform === 'darwin' ? 'hidden' : 'default'
 export const createWindow = async () => {
   logger.trace('Creating splash and main windows')
   logger.trace('Creating main window')

packages/desktop/src/main/main.ts

@@ -263,13 +263,54 @@ describe('Create community', () => {
     const OLD_ENV = process.env
     beforeEach(() => {
       jest.resetModules()
-      process.env = { ...OLD_ENV, QSS_ALLOWED: 'true' }
+      process.env = { ...OLD_ENV, QSS_ALLOWED: 'true', QSS_ENDPOINT: 'ws://localhost:80/' }
     })
     afterEach(() => {
       process.env = OLD_ENV
     })
 
-    it('shows ServerOfferComponent when QSS_ALLOWED is true and user submits community name', async () => {
+    it(`doesn't ServerOfferComponent when QSS_ALLOWED is true and QSS_ENDPOINT is invalid and user submits community name`, async () => {
+      const { store } = await prepareStore({
+        [StoreKeys.Socket]: {
+          ...new SocketState(),
+          isConnected: true,
+        },
+        [StoreKeys.Modals]: {
+          ...new ModalsInitialState(),
+          [ModalName.createCommunityModal]: { open: true },
+        },
+      })
+
+      process.env.QSS_ENDPOINT = ''
+
+      renderComponent(
+        <>
+          <JoinCommunity />
+          <CreateCommunity />
+        </>,
+        store
+      )
+
+      // Confirm proper modal title is displayed
+      const createCommunityDictionary = CreateCommunityDictionary()
+      const createCommunityTitle = screen.getByText(createCommunityDictionary.header)
+      expect(createCommunityTitle).toBeVisible()
+
+      // Click redirecting link
+      const link = screen.getByTestId('CreateCommunityLink')
+      await userEvent.click(link)
+
+      // Confirm user is being redirected to join community
+      const joinCommunityDictionary = JoinCommunityDictionary()
+      const joinCommunityTitle = await screen.findByText(joinCommunityDictionary.header)
+      expect(joinCommunityTitle).toBeVisible()
+
+      // ServerOffer modal should appear
+      expect(() => screen.getByTestId('ServerOffer-UseQuietServer')).toThrow()
+      expect(() => screen.getByTestId('ServerOffer-NotNow')).toThrow()
+    })
+
+    it('shows ServerOfferComponent when QSS_ALLOWED is true and QSS_ENDPOINT is valid and user submits community name', async () => {
       const { store } = await prepareStore({
         [StoreKeys.Socket]: {
           ...new SocketState(),

packages/desktop/src/renderer/components/CreateJoinCommunity/CreateCommunity/CreateCommunity.test.tsx

@@ -41,13 +41,25 @@ const CreateCommunity = () => {
       return
     }
     setPendingCommunityName(name)
-    logger.warn(process.env.QSS_ALLOWED)
-    if (process.env.QSS_ALLOWED === 'true') {
-      setShowServerOffer(true)
-    } else {
+    logger.warn('QSS settings', process.env.QSS_ALLOWED, process.env.QSS_ENDPOINT)
+    const createCommunityWithoutQSS = () => {
       dispatch(communities.actions.createCommunity({ name, useServer: false }))
       createUsernameModal.handleOpen()
     }
+    if (process.env.QSS_ALLOWED === 'true') {
+      try {
+        new URL(process.env.QSS_ENDPOINT ?? '')
+        setShowServerOffer(true)
+      } catch (error) {
+        logger.error(
+          `QSS is allowed but the endpoint is invalid (endpoint provided = "${process.env.QSS_ENDPOINT}"`,
+          error
+        )
+        createCommunityWithoutQSS()
+      }
+    } else {
+      createCommunityWithoutQSS()
+    }
   }
 
   const handleServerOfferClose = (useServer: boolean) => {