Feat 1706 conn status desktop

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * 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))
+* Adds connection status information to messages panel on desktop when no peers are connected ([#1706](https://github.com/TryQuiet/quiet/
 
 # Refactorings:
 
@@ -25,6 +26,7 @@
 # Refactorings:
 
 * Use ack for CREATE_NETWORK and simplify
+* Logging from all sources can be written to node console
 * Move Community model to the backend
 
 # Fixes:

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 --",
     "e2e:linux:build": "lerna run --scope @quiet/backend webpack:prod && lerna run --scope @quiet/desktop distUbuntu && lerna run --scope e2e-tests linux:copy",
     "e2e:linux:run": "lerna run --scope e2e-tests test --",
     "prepare": "husky",

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.

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

@@ -45,6 +45,7 @@ import {
   type SavedOwnerCertificatePayload,
   type UserProfile,
   type UserProfilesStoredEvent,
+  PeersNetworkDataPayload,
 } from '@quiet/types'
 import Logger from '../common/logger'
 import { CONFIG_OPTIONS, QUIET_DIR, SERVER_IO_PROVIDER, SOCKS_PROXY_AGENT } from '../const'
@@ -565,7 +566,21 @@ 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)
     })
 

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)
     })
 

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)

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,

packages/desktop/CHANGELOG.md

@@ -2,8 +2,13 @@
 
 # New features:
 
+* Adds connection status information to messages panel when no peers are connected ([#1706](https://github.com/TryQuiet/quiet/issues/1706))
+
 # Refactorings:
 
+* 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:
 
 [2.2.0]