From 7079682ea49a05c18fbe0e79ec58fdf617702b65 Mon Sep 17 00:00:00 2001 From: Isla Koenigsknecht Date: Tue, 19 Mar 2024 12:36:45 -0400 Subject: [PATCH] Linting --- .../connections-manager.service.ts | 25 +++++----- .../backend/src/nest/libp2p/libp2p.service.ts | 22 ++++++--- .../src/nest/tor/tor-control.service.ts | 2 +- .../widgets/channels/BasicMessage.tsx | 6 ++- .../connection.selectors.test.ts | 48 +++++++++++-------- packages/types/src/connection.ts | 4 +- 6 files changed, 65 insertions(+), 42 deletions(-) diff --git a/packages/backend/src/nest/connections-manager/connections-manager.service.ts b/packages/backend/src/nest/connections-manager/connections-manager.service.ts index 6ef9f768a6..86a113bbdf 100644 --- a/packages/backend/src/nest/connections-manager/connections-manager.service.ts +++ b/packages/backend/src/nest/connections-manager/connections-manager.service.ts @@ -397,17 +397,20 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI await this.libp2pService.createInstance(params) // Libp2p event listeners - 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 })) + 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) }) diff --git a/packages/backend/src/nest/libp2p/libp2p.service.ts b/packages/backend/src/nest/libp2p/libp2p.service.ts index e9aa8cb005..c185218d38 100644 --- 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, PeersNetworkDataPayload } 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' @@ -164,12 +170,14 @@ export class Libp2pService extends EventEmitter { this.logger(`${localPeerId} has ${this.libp2pInstance?.getConnections().length} open connections`) const payload: PeersNetworkDataPayload = { - peers: [{ - peer: remotePeerId, - lastSeen: now.toSeconds(), - connectionDuration: 0 - }], - }; + 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) diff --git a/packages/backend/src/nest/tor/tor-control.service.ts b/packages/backend/src/nest/tor/tor-control.service.ts index dd72a28124..4cea2a2075 100644 --- a/packages/backend/src/nest/tor/tor-control.service.ts +++ b/packages/backend/src/nest/tor/tor-control.service.ts @@ -16,7 +16,7 @@ export class TorControl { constructor( @Inject(TOR_CONTROL_PARAMS) public torControlParams: TorControlParams, @Inject(CONFIG_OPTIONS) public configOptions: ConfigOptions, - @Inject(SERVER_IO_PROVIDER) public readonly serverIoProvider: ServerIoProviderTypes, + @Inject(SERVER_IO_PROVIDER) public readonly serverIoProvider: ServerIoProviderTypes ) { this.isSending = false } diff --git a/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.tsx b/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.tsx index d0e7941b03..87e9318f3d 100644 --- a/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.tsx +++ b/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.tsx @@ -223,7 +223,11 @@ export const BasicMessageComponent: React.FC { // This peer should be first in the list as it is the most recently seen one. store.dispatch( - connectionActions.updateNetworkData([{ - peer: 'Qmd35TsAvtskei8zWY3A65ifNWcY4x4SdqkQDHMkH5xPF9', - connectionDuration: 50, - lastSeen: 1000, - }]) + connectionActions.updateNetworkData([ + { + peer: 'Qmd35TsAvtskei8zWY3A65ifNWcY4x4SdqkQDHMkH5xPF9', + connectionDuration: 50, + lastSeen: 1000, + }, + ]) ) // This peer should be second as it has the most shared uptime store.dispatch( - connectionActions.updateNetworkData([{ - peer: 'QmQEk68gnPTRhfBvRAPWXjjXjPydV1MvvZGGJF7W7w2Sv5', - connectionDuration: 500, - lastSeen: 900, - }]) + connectionActions.updateNetworkData([ + { + peer: 'QmQEk68gnPTRhfBvRAPWXjjXjPydV1MvvZGGJF7W7w2Sv5', + connectionDuration: 500, + lastSeen: 900, + }, + ]) ) // This is actually the third one on the list of last seen peers and it goes next, note that the upper peer which should go before that is already in the list. store.dispatch( - connectionActions.updateNetworkData([{ - peer: 'QmbrDuN2oCb8G2e1ajRzpfnALGbeFDYFSoVCBhUYGLSeRD', - connectionDuration: 200, - lastSeen: 500, - }]) + connectionActions.updateNetworkData([ + { + peer: 'QmbrDuN2oCb8G2e1ajRzpfnALGbeFDYFSoVCBhUYGLSeRD', + connectionDuration: 200, + lastSeen: 500, + }, + ]) ) // This is the least valuable peer so it goes last. Rmaining peers, without any network data will be concated to the end of the list. store.dispatch( - connectionActions.updateNetworkData([{ - peer: 'QmTjQLMxJq74yXWBabh1VM8hZsRNhci4wfbVz6vFhLH5am', - connectionDuration: 100, - lastSeen: 100, - }]) + connectionActions.updateNetworkData([ + { + peer: 'QmTjQLMxJq74yXWBabh1VM8hZsRNhci4wfbVz6vFhLH5am', + connectionDuration: 100, + lastSeen: 100, + }, + ]) ) const expectedArray = [ diff --git a/packages/types/src/connection.ts b/packages/types/src/connection.ts index 59bea1c84b..e9b8d0cfac 100644 --- a/packages/types/src/connection.ts +++ b/packages/types/src/connection.ts @@ -8,8 +8,8 @@ export interface NetworkDataPayload { lastSeen: number } -export interface PeersNetworkDataPayload { - peers: NetworkDataPayload[] +export interface PeersNetworkDataPayload { + peers: NetworkDataPayload[] } export interface NetworkStats {