TryQuiet · ikoenigsknecht · Mar 14, 2024 · Mar 15, 2024 · Mar 15, 2024 · Mar 15, 2024
diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml
@@ -14,18 +14,15 @@ jobs:
     runs-on: [self-hosted, macOS, ARM64, android]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          lfs: true
 
       - name: Install dependencies
         run: |
           npm i
           npm run lerna bootstrap --scope @quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/mobile,backend-bundle
 
-      - name: Pull binaries
-        run: |
-          git lfs install
-          git lfs pull
-
       - name: Pass local config
         run : |
           cat << EOF >> packages/mobile/android/local.properties

diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
@@ -13,18 +13,15 @@ jobs:
     runs-on: [self-hosted, macOS, ARM64, iOS]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          lfs: true
 
       - name: Install dependencies
         run: |
           npm i
           npm run lerna bootstrap --scope @quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/mobile,backend-bundle
 
-      - name: Pull binaries
-        run: |
-          git lfs install
-          git lfs pull
-
       - name: Install pods
         run: |
           cd packages/mobile/ios

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,12 +4,17 @@
 
 * Use ack for CREATE_NETWORK and simplify
 * Refactored package.json to have consistent license "GPL-3.0-or-later"
+* Logging from all sources can be written to node console
 
 # Fixes
 
 * Fixes channel name creation logic
 * Allow JPEG and GIF files as profile photos ([#2332](https://github.com/TryQuiet/quiet/issues/2332))
 
+# New Features
+
+* Adds connection status information to messages panel on desktop when no peers are connected ([#1706](https://github.com/TryQuiet/quiet/issues/1706))
+
 [2.1.2]
 
 # Refactorings:

diff --git a/bs.log b/bs.log
diff --git a/package.json b/package.json
@@ -7,7 +7,11 @@
     "postpublish": "node copy-changelog.js && git add . && git commit -m 'Update packages CHANGELOG.md' && git push",
     "start:desktop": "lerna run --scope @quiet/desktop start",
     "lint:all": "lerna run lint",
-    "distAndRunE2ETests:mac:local": "lerna run --scope @quiet/desktop distMac:local && lerna run --scope e2e-tests test:localBinary --",
+    "clean": "lerna clean",
+    "bootstrap": "lerna bootstrap",
+    "bootstrap:clean": "npm run clean && npm run bootstrap",
+    "lerna:run:desktop": "lerna run --scope @quiet/desktop",
+    "distAndRunE2ETests:mac:local": "npm run lerna:run:desktop distMac:local && lerna run --scope e2e-tests test:localBinary --",
     "prepare": "husky",
     "lint-staged": "lerna run lint-staged"
   },

diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
@@ -12,6 +12,10 @@
 
 * Refactor: Consolidate profile photo validation and match magic byte check to type check
 
+* Refactor: Updates peer connecting events to include updating peers DB and refactors some payload types ([#1706](https://github.com/TryQuiet/quiet/issues/1706))
+
+* Refactor: Update Tor initialized status when Tor is connected ([#1706](https://github.com/TryQuiet/quiet/issues/1706))
+
 [2.0.3-alpha.6]
 
 * Fix: filter out invalid peer addresses in peer list. Update peer list in localdb.

diff --git a/packages/backend/src/nest/connections-manager/connections-manager.service.ts b/packages/backend/src/nest/connections-manager/connections-manager.service.ts
@@ -44,6 +44,7 @@ import {
   type PermsData,
   type UserProfile,
   type UserProfilesStoredEvent,
+  PeersNetworkDataPayload,
 } from '@quiet/types'
 import { CONFIG_OPTIONS, QUIET_DIR, SERVER_IO_PROVIDER, SOCKS_PROXY_AGENT } from '../const'
 import { ConfigOptions, GetPorts, ServerIoProviderTypes } from '../types'
@@ -394,10 +395,26 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
     }
 
     await this.libp2pService.createInstance(params)
+
     // Libp2p event listeners
-    this.libp2pService.on(Libp2pEvents.PEER_CONNECTED, (payload: { peers: string[] }) => {
+    this.libp2pService.on(Libp2pEvents.PEER_CONNECTED, async (payload: PeersNetworkDataPayload) => {
+      const peerStats: { [peerId: string]: NetworkStats } = await payload.peers.reduce(
+        async (updateObj, peer) => {
+          return {
+            ...(await updateObj),
+            [peer.peer]: {
+              peerId: peer.peer,
+              lastSeen: peer.lastSeen,
+              connectionTime: peer.connectionDuration,
+            } as NetworkStats,
+          }
+        },
+        Promise.resolve({} as { [peerId: string]: NetworkStats })
+      )
+      await this.localDbService.update(LocalDBKeys.PEERS, peerStats)
       this.serverIoProvider.io.emit(SocketActionTypes.PEER_CONNECTED, payload)
     })
+
     this.libp2pService.on(Libp2pEvents.PEER_DISCONNECTED, async (payload: NetworkDataPayload) => {
       const peerPrevStats = await this.localDbService.find(LocalDBKeys.PEERS, payload.peer)
       const prev = peerPrevStats?.connectionTime || 0
@@ -414,6 +431,7 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
       // BARTEK: Potentially obsolete to send this to state-manager
       this.serverIoProvider.io.emit(SocketActionTypes.PEER_DISCONNECTED, payload)
     })
+
     await this.storageService.init(_peerId)
     // We can use Nest for dependency injection, but I think since the
     // registration service depends on the storage service being

diff --git a/packages/backend/src/nest/libp2p/libp2p.service.ts b/packages/backend/src/nest/libp2p/libp2p.service.ts
@@ -5,7 +5,13 @@ import { mplex } from '@libp2p/mplex'
 import { multiaddr } from '@multiformats/multiaddr'
 import { Inject, Injectable } from '@nestjs/common'
 import { createLibp2pAddress, createLibp2pListenAddress } from '@quiet/common'
-import { ConnectionProcessInfo, type NetworkDataPayload, PeerId, SocketActionTypes } from '@quiet/types'
+import {
+  ConnectionProcessInfo,
+  type NetworkDataPayload,
+  PeerId,
+  SocketActionTypes,
+  PeersNetworkDataPayload,
+} from '@quiet/types'
 import crypto from 'crypto'
 import { EventEmitter } from 'events'
 import { Agent } from 'https'
@@ -153,20 +159,32 @@ export class Libp2pService extends EventEmitter {
     })
 
     this.libp2pInstance.addEventListener('peer:connect', async peer => {
+      this.logger(`Connecting peer: ${JSON.stringify(peer)}`)
       const remotePeerId = peer.detail.remotePeer.toString()
       const localPeerId = peerId.toString()
       this.logger(`${localPeerId} connected to ${remotePeerId}`)
 
-      this.connectedPeers.set(remotePeerId, DateTime.utc().valueOf())
-      this.logger(`${localPeerId} is connected to ${this.connectedPeers.size} peers`)
+      const now = DateTime.utc()
+      this.connectedPeers.set(remotePeerId, now.valueOf())
+      this.logger(`${localPeerId} is now connected to ${this.connectedPeers.size} peers`)
       this.logger(`${localPeerId} has ${this.libp2pInstance?.getConnections().length} open connections`)
 
-      this.emit(Libp2pEvents.PEER_CONNECTED, {
-        peers: [remotePeerId],
-      })
+      const payload: PeersNetworkDataPayload = {
+        peers: [
+          {
+            peer: remotePeerId,
+            lastSeen: now.toSeconds(),
+            connectionDuration: 0,
+          },
+        ],
+      }
+
+      this.logger(`Emitting ${Libp2pEvents.PEER_CONNECTED} event with payload ${JSON.stringify(payload)}`)
+      this.emit(Libp2pEvents.PEER_CONNECTED, payload)
     })
 
     this.libp2pInstance.addEventListener('peer:disconnect', async peer => {
+      this.logger(`Disconnecting peer: ${JSON.stringify(peer)}`)
       const remotePeerId = peer.detail.remotePeer.toString()
       const localPeerId = peerId.toString()
       this.logger(`${localPeerId} disconnected from ${remotePeerId}`)
@@ -187,12 +205,14 @@ export class Libp2pService extends EventEmitter {
       const connectionDuration: number = connectionEndTime - connectionStartTime
 
       this.connectedPeers.delete(remotePeerId)
-      this.logger(`${localPeerId} is connected to ${this.connectedPeers.size} peers`)
+      this.logger(`${localPeerId} is now connected to ${this.connectedPeers.size} peers`)
       const peerStat: NetworkDataPayload = {
         peer: remotePeerId,
         connectionDuration,
         lastSeen: connectionEndTime,
       }
+
+      this.logger(`Emitting ${Libp2pEvents.PEER_DISCONNECTED} event with payload ${JSON.stringify(peerStat)}`)
       this.emit(Libp2pEvents.PEER_DISCONNECTED, peerStat)
     })
 

diff --git a/packages/backend/src/nest/tor/tor-control.service.ts b/packages/backend/src/nest/tor/tor-control.service.ts
@@ -1,9 +1,10 @@
 import { Inject, Injectable } from '@nestjs/common'
 import net from 'net'
-import { CONFIG_OPTIONS, TOR_CONTROL_PARAMS } from '../const'
-import { ConfigOptions } from '../types'
+import { CONFIG_OPTIONS, SERVER_IO_PROVIDER, TOR_CONTROL_PARAMS } from '../const'
+import { ConfigOptions, ServerIoProviderTypes } from '../types'
 import { TorControlAuthType, TorControlParams } from './tor.types'
 import Logger from '../common/logger'
+import { SocketActionTypes } from '@quiet/types'
 
 @Injectable()
 export class TorControl {
@@ -14,7 +15,8 @@ export class TorControl {
 
   constructor(
     @Inject(TOR_CONTROL_PARAMS) public torControlParams: TorControlParams,
-    @Inject(CONFIG_OPTIONS) public configOptions: ConfigOptions
+    @Inject(CONFIG_OPTIONS) public configOptions: ConfigOptions,
+    @Inject(SERVER_IO_PROVIDER) public readonly serverIoProvider: ServerIoProviderTypes
   ) {
     this.isSending = false
   }
@@ -63,6 +65,7 @@ export class TorControl {
         this.logger(`Connecting to Tor, host: ${this.torControlParams.host} port: ${this.torControlParams.port}`)
         await this._connect()
         this.logger('Tor connected')
+        this.serverIoProvider.io.emit(SocketActionTypes.TOR_INITIALIZED)
         return
       } catch (e) {
         this.logger(e)

diff --git a/packages/backend/tsconfig.build.json b/packages/backend/tsconfig.build.json
@@ -4,7 +4,7 @@
     "target": "ES2020",
     "module": "ES2022",
     "strict": true,
-        "declaration": true,
+    "declaration": true,
     "removeComments": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,

diff --git a/packages/common/src/sortPeers.ts b/packages/common/src/sortPeers.ts
@@ -39,10 +39,10 @@ export const filterAndSortPeers = (
     }
   }
 
-  const peerList = mostWantedPeers.map(peerId => {
+  const peerList = mostWantedPeers.map(peer => {
     return peersAddresses.find(peerAddress => {
       const id = peerAddress.split('/')[7]
-      if (id === peerId.peerId) {
+      if (id === peer.peerId) {
         peersAddresses.splice(peersAddresses.indexOf(peerAddress), 1)
         return true
       }

diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md
@@ -1,9 +1,15 @@
 [unreleased]
 
+# New Features
+
+* Adds connection status information to messages panel when no peers are connected ([#1706](https://github.com/TryQuiet/quiet/issues/1706))
+
 # Refactorings:
 
 * Use ack for CREATE_NETWORK and simplify
 * Refactored package.json to have consistent license "GPL-3.0-or-later"
+* Updates all logging from renderer to write to the node console
+* Updates usages of `act` in tests to use `@testing-library/react` to avoid errors/warnings
 
 # Fixes