diff --git a/packages/autocertifier-client/src/AutoCertifierClient.ts b/packages/autocertifier-client/src/AutoCertifierClient.ts index c7858c10d3..56e9b9b127 100644 --- a/packages/autocertifier-client/src/AutoCertifierClient.ts +++ b/packages/autocertifier-client/src/AutoCertifierClient.ts @@ -15,7 +15,7 @@ interface AutoCertifierClientEvents { export type HasSession = (request: HasSessionRequest, context: ServerCallContext) => Promise -const logger = new Logger(module) +const logger = new Logger('AutoCertifierClient') const ensureConfigFileWritable = (directory: string): void => { const baseDirectory = getBaseDirectory(directory) diff --git a/packages/autocertifier-client/src/RestClient.ts b/packages/autocertifier-client/src/RestClient.ts index a58c4b35dd..394390f802 100644 --- a/packages/autocertifier-client/src/RestClient.ts +++ b/packages/autocertifier-client/src/RestClient.ts @@ -5,7 +5,7 @@ import { CreateCertifiedSubdomainRequest } from './data/CreateCertifiedSubdomain import { Logger } from '@streamr/utils' import { makeHttpRequest } from './makeHttpRequest' -const logger = new Logger(module) +const logger = new Logger('RestClient') export class RestClient { diff --git a/packages/autocertifier-server/bin/copyARecordsToRoute53.ts b/packages/autocertifier-server/bin/copyARecordsToRoute53.ts index 682eabd458..f8fa323342 100644 --- a/packages/autocertifier-server/bin/copyARecordsToRoute53.ts +++ b/packages/autocertifier-server/bin/copyARecordsToRoute53.ts @@ -6,7 +6,7 @@ import chunk from 'lodash/chunk' import { ChangeAction } from '@aws-sdk/client-route-53' (async () => { - const logger = new Logger(module) + const logger = new Logger('copyARecordsToRoute53') const domainName = validateEnvironmentVariable('AUTOCERTIFIER_DOMAIN_NAME') const databaseFilePath = validateEnvironmentVariable('AUTOCERTIFIER_DATABASE_FILE_PATH') diff --git a/packages/autocertifier-server/src/AutoCertifierServer.ts b/packages/autocertifier-server/src/AutoCertifierServer.ts index c85e96e7c4..99c8008078 100644 --- a/packages/autocertifier-server/src/AutoCertifierServer.ts +++ b/packages/autocertifier-server/src/AutoCertifierServer.ts @@ -12,7 +12,7 @@ import { ChallengeManager } from './ChallengeManager' import { RRType } from '@aws-sdk/client-route-53' import { Route53Api } from './Route53Api' -const logger = new Logger(module) +const logger = new Logger('AutoCertifierServer') export const validateEnvironmentVariable = (name: string): string | never => { const value = process.env[name] diff --git a/packages/autocertifier-server/src/CertificateCreator.ts b/packages/autocertifier-server/src/CertificateCreator.ts index 159f39bb27..cd76820f92 100644 --- a/packages/autocertifier-server/src/CertificateCreator.ts +++ b/packages/autocertifier-server/src/CertificateCreator.ts @@ -5,7 +5,7 @@ import path from 'path' import { ChallengeManager } from './ChallengeManager' import { Challenge } from 'acme-client/types/rfc8555' -const logger = new Logger(module) +const logger = new Logger('CertificateCreator') // https://letsencrypt.org/docs/challenge-types/#dns-01-challenge const DNS_01_CHALLENGE = 'dns-01' diff --git a/packages/autocertifier-server/src/Database.ts b/packages/autocertifier-server/src/Database.ts index d85289f8e1..e9da94614b 100644 --- a/packages/autocertifier-server/src/Database.ts +++ b/packages/autocertifier-server/src/Database.ts @@ -5,7 +5,7 @@ import { open, Statement, Database as SqliteDatabase } from 'sqlite' import { Logger, filePathToNodeFormat } from '@streamr/utils' import { DatabaseError, InvalidSubdomainOrToken } from '@streamr/autocertifier-client' -const logger = new Logger(module) +const logger = new Logger('Database') export class Database { diff --git a/packages/autocertifier-server/src/DnsServer.ts b/packages/autocertifier-server/src/DnsServer.ts index 04789ed785..0131e5fd00 100644 --- a/packages/autocertifier-server/src/DnsServer.ts +++ b/packages/autocertifier-server/src/DnsServer.ts @@ -8,7 +8,7 @@ type AsyncDnsHandler = ( ...args: Parameters ) => Promise -const logger = new Logger(module) +const logger = new Logger('DnsServer') // https://help.dnsfilter.com/hc/en-us/articles/4408415850003-DNS-Return-Codes // DNS Query Format Error diff --git a/packages/autocertifier-server/src/RestServer.ts b/packages/autocertifier-server/src/RestServer.ts index 183c091c37..1e1af49653 100644 --- a/packages/autocertifier-server/src/RestServer.ts +++ b/packages/autocertifier-server/src/RestServer.ts @@ -14,7 +14,7 @@ import bodyParser from 'body-parser' import * as https from 'https' import * as fs from 'fs' -const logger = new Logger(module) +const logger = new Logger('RestServer') type ExpressType = ReturnType type ServerType = ReturnType diff --git a/packages/autocertifier-server/src/StreamrChallenger.ts b/packages/autocertifier-server/src/StreamrChallenger.ts index 6de7bc16ff..d0d0faf5c9 100644 --- a/packages/autocertifier-server/src/StreamrChallenger.ts +++ b/packages/autocertifier-server/src/StreamrChallenger.ts @@ -15,7 +15,7 @@ import { toProtoRpcClient } from '@streamr/proto-rpc' import { Logger } from '@streamr/utils' import { FailedToConnectToStreamrWebSocket, AutoCertifierRpcClient, SERVICE_ID } from '@streamr/autocertifier-client' -const logger = new Logger(module) +const logger = new Logger('StreamrChallenger') // This is a dummy peer descriptor that is used to connect to the streamr websocket // To ensure that the autocertified subdomain is used for the Streamr Network diff --git a/packages/cdn-location/src/fetchAirportCodeFromCdn.ts b/packages/cdn-location/src/fetchAirportCodeFromCdn.ts index 55e3cbc0ae..c2162096cf 100644 --- a/packages/cdn-location/src/fetchAirportCodeFromCdn.ts +++ b/packages/cdn-location/src/fetchAirportCodeFromCdn.ts @@ -1,6 +1,6 @@ import { Logger, withTimeout } from '@streamr/utils' -const logger = new Logger(module) +const logger = new Logger('fetchAirportCodeFromCdn') const fetchHeader: (url: string, header: string, timeout: number) => Promise = async ( url: string, diff --git a/packages/cdn-location/src/getLocalRegion.ts b/packages/cdn-location/src/getLocalRegion.ts index e38521ffd4..effccfb5a5 100644 --- a/packages/cdn-location/src/getLocalRegion.ts +++ b/packages/cdn-location/src/getLocalRegion.ts @@ -5,7 +5,7 @@ import haversine from 'haversine' const DEFAULT_MAX_CACHE_AGE = 1000 * 60 * 60 // 1 hour -const logger = new Logger(module) +const logger = new Logger('getLocalRegion') let cachedLocalRegion: number | undefined = undefined let cachedLocalRegionFetchTime: number | undefined = undefined diff --git a/packages/cdn-location/test/integration/fetchAirportCodeFromCdn.test.ts b/packages/cdn-location/test/integration/fetchAirportCodeFromCdn.test.ts index d402e82fec..ceb48e6b25 100644 --- a/packages/cdn-location/test/integration/fetchAirportCodeFromCdn.test.ts +++ b/packages/cdn-location/test/integration/fetchAirportCodeFromCdn.test.ts @@ -5,7 +5,7 @@ import { fetchAirportCodeFromFastly } from '../../src/fetchAirportCodeFromCdn' import { airportCodeToRegion } from '../../src/airportCodeToRegion' -const logger = new Logger(module) +const logger = new Logger('fetchAirportCodeFromCdn.test') describe('fetchAirportCodeFromCdn', () => { diff --git a/packages/cli-tools/bin/streamr-internal-node-info.ts b/packages/cli-tools/bin/streamr-internal-node-info.ts index 4f3349c242..61b6b320c9 100644 --- a/packages/cli-tools/bin/streamr-internal-node-info.ts +++ b/packages/cli-tools/bin/streamr-internal-node-info.ts @@ -8,7 +8,7 @@ import { binaryToHex, ChangeFieldType, Logger } from '@streamr/utils' import { createClientCommand } from '../src/command' import semver from 'semver' -const logger = new Logger(module) +const logger = new Logger('streamr-internal-node-info') export type NormalizedNodeInfo = ChangeFieldType< NodeInfo, diff --git a/packages/dht/src/connection/ConnectionLockRpcLocal.ts b/packages/dht/src/connection/ConnectionLockRpcLocal.ts index 7d593240a7..2a09fc4212 100644 --- a/packages/dht/src/connection/ConnectionLockRpcLocal.ts +++ b/packages/dht/src/connection/ConnectionLockRpcLocal.ts @@ -24,7 +24,7 @@ interface ConnectionLockRpcLocalOptions { setPrivate: (id: DhtAddress, isPrivate: boolean) => void } -const logger = new Logger(module) +const logger = new Logger('ConnectionLockRpcLocal') export class ConnectionLockRpcLocal implements IConnectionLockRpc { diff --git a/packages/dht/src/connection/ConnectionLockRpcRemote.ts b/packages/dht/src/connection/ConnectionLockRpcRemote.ts index 4b6571cae2..8db80b155c 100644 --- a/packages/dht/src/connection/ConnectionLockRpcRemote.ts +++ b/packages/dht/src/connection/ConnectionLockRpcRemote.ts @@ -5,7 +5,7 @@ import { ConnectionLockRpcClient } from '../../generated/packages/dht/protos/Dht import { LockID } from './ConnectionLockStates' import { toNodeId } from '../identifiers' -const logger = new Logger(module) +const logger = new Logger('ConnectionLockRpcRemote') export class ConnectionLockRpcRemote extends RpcRemote { diff --git a/packages/dht/src/connection/ConnectionManager.ts b/packages/dht/src/connection/ConnectionManager.ts index 7678ac5a6b..a9023c3afa 100644 --- a/packages/dht/src/connection/ConnectionManager.ts +++ b/packages/dht/src/connection/ConnectionManager.ts @@ -50,7 +50,7 @@ interface ConnectionManagerMetrics extends MetricsDefinition { connectionTotalFailureCount: Metric } -const logger = new Logger(module) +const logger = new Logger('ConnectionManager') enum ConnectionManagerState { IDLE = 'idle', diff --git a/packages/dht/src/connection/ConnectorFacade.ts b/packages/dht/src/connection/ConnectorFacade.ts index eb86844c22..58a3ad164f 100644 --- a/packages/dht/src/connection/ConnectorFacade.ts +++ b/packages/dht/src/connection/ConnectorFacade.ts @@ -25,7 +25,7 @@ export interface ConnectorFacade { stop: () => Promise } -const logger = new Logger(module) +const logger = new Logger('ConnectorFacade') // TODO: Wrap component specific configs to their own objects. export interface DefaultConnectorFacadeOptions { diff --git a/packages/dht/src/connection/Handshaker.ts b/packages/dht/src/connection/Handshaker.ts index f636cf650c..cd785f9ccf 100644 --- a/packages/dht/src/connection/Handshaker.ts +++ b/packages/dht/src/connection/Handshaker.ts @@ -8,7 +8,7 @@ import { toNodeId } from '../identifiers' import { PendingConnection } from './PendingConnection' import { version as applicationVersion } from '../../package.json' -const logger = new Logger(module) +const logger = new Logger('Handshaker') interface HandshakerEvents { handshakeRequest: (source: PeerDescriptor, protocolVersion: string, target?: PeerDescriptor) => void diff --git a/packages/dht/src/connection/ManagedConnection.ts b/packages/dht/src/connection/ManagedConnection.ts index fd65e27d55..36c15c1dae 100644 --- a/packages/dht/src/connection/ManagedConnection.ts +++ b/packages/dht/src/connection/ManagedConnection.ts @@ -12,7 +12,7 @@ export interface ManagedConnectionEvents { disconnected: (gracefulLeave: boolean) => void } -const logger = new Logger(module) +const logger = new Logger('ManagedConnection') // ManagedConnection is a component used as a wrapper for IConnection after they have been successfully handshaked. // Should only be used in the ConnectionManager. diff --git a/packages/dht/src/connection/PendingConnection.ts b/packages/dht/src/connection/PendingConnection.ts index 035b5cb430..b0c0c05bcd 100644 --- a/packages/dht/src/connection/PendingConnection.ts +++ b/packages/dht/src/connection/PendingConnection.ts @@ -9,7 +9,7 @@ export interface PendingConnectionEvents { disconnected: (gracefulLeave: boolean) => void } -const logger = new Logger(module) +const logger = new Logger('PendingConnection') // PendingConnection is used as a reference to a connection that should be opened and handshaked to a given PeerDescriptor // It does not hold a connection internally. The public method onHandshakedCompleted should be called once a connection for the diff --git a/packages/dht/src/connection/connectivityChecker.ts b/packages/dht/src/connection/connectivityChecker.ts index 768382d9cb..b924e4d923 100644 --- a/packages/dht/src/connection/connectivityChecker.ts +++ b/packages/dht/src/connection/connectivityChecker.ts @@ -10,7 +10,7 @@ import { WebsocketClientConnection } from './websocket/NodeWebsocketClientConnec import { connectivityMethodToWebsocketUrl } from './websocket/WebsocketClientConnector' import { isMaybeSupportedProtocolVersion } from '../helpers/version' -const logger = new Logger(module) +const logger = new Logger('connectivityChecker') // TODO use options option or named constant? export const connectAsync = async ({ url, allowSelfSignedCertificate, timeoutMs = 1000 }: diff --git a/packages/dht/src/connection/connectivityRequestHandler.ts b/packages/dht/src/connection/connectivityRequestHandler.ts index 1228f237d8..1fdb5f8957 100644 --- a/packages/dht/src/connection/connectivityRequestHandler.ts +++ b/packages/dht/src/connection/connectivityRequestHandler.ts @@ -15,7 +15,7 @@ import { GeoIpLocator } from '@streamr/geoip-location' export const DISABLE_CONNECTIVITY_PROBE = 0 -const logger = new Logger(module) +const logger = new Logger('connectivityRequestHandler') export const attachConnectivityRequestHandler = (connectionToListenTo: WebsocketServerConnection, geoIpLocator?: GeoIpLocator): void => { connectionToListenTo.on('data', async (data: Uint8Array) => { diff --git a/packages/dht/src/connection/simulator/Simulator.ts b/packages/dht/src/connection/simulator/Simulator.ts index 1c8e9b04a2..8fbf178a29 100644 --- a/packages/dht/src/connection/simulator/Simulator.ts +++ b/packages/dht/src/connection/simulator/Simulator.ts @@ -9,7 +9,7 @@ import Heap from 'heap' import { debugVars } from '../../helpers/debugHelpers' import { DhtAddress, toNodeId } from '../../identifiers' -const logger = new Logger(module) +const logger = new Logger('Simulator') export enum LatencyType { NONE = 'NONE', RANDOM = 'RANDOM', REAL = 'REAL', FIXED = 'FIXED' } diff --git a/packages/dht/src/connection/simulator/SimulatorConnection.ts b/packages/dht/src/connection/simulator/SimulatorConnection.ts index ccff76c818..a955736b24 100644 --- a/packages/dht/src/connection/simulator/SimulatorConnection.ts +++ b/packages/dht/src/connection/simulator/SimulatorConnection.ts @@ -6,7 +6,7 @@ import { Logger } from '@streamr/utils' import { protoToString } from '../../helpers/protoToString' import { toNodeId } from '../../identifiers' -const logger = new Logger(module) +const logger = new Logger('SimulatorConnection') export class SimulatorConnection extends Connection implements IConnection { diff --git a/packages/dht/src/connection/simulator/SimulatorConnector.ts b/packages/dht/src/connection/simulator/SimulatorConnector.ts index b456360703..14812fd705 100644 --- a/packages/dht/src/connection/simulator/SimulatorConnector.ts +++ b/packages/dht/src/connection/simulator/SimulatorConnector.ts @@ -11,7 +11,7 @@ import { DhtAddress, toNodeId } from '../../identifiers' import { acceptHandshake, createIncomingHandshaker, createOutgoingHandshaker, rejectHandshake } from '../Handshaker' import { PendingConnection } from '../PendingConnection' -const logger = new Logger(module) +const logger = new Logger('SimulatorConnector') export class SimulatorConnector { diff --git a/packages/dht/src/connection/webrtc/BrowserWebrtcConnection.ts b/packages/dht/src/connection/webrtc/BrowserWebrtcConnection.ts index 61670bbcc0..956fadc3cb 100644 --- a/packages/dht/src/connection/webrtc/BrowserWebrtcConnection.ts +++ b/packages/dht/src/connection/webrtc/BrowserWebrtcConnection.ts @@ -13,7 +13,7 @@ enum DisconnectedRtcPeerConnectionStateEnum { CLOSED = 'closed', } -const logger = new Logger(module) +const logger = new Logger('BrowserWebrtcConnection') interface Params { iceServers?: IceServer[] diff --git a/packages/dht/src/connection/webrtc/NodeWebrtcConnection.ts b/packages/dht/src/connection/webrtc/NodeWebrtcConnection.ts index 7decdbdd42..7d0434f50b 100644 --- a/packages/dht/src/connection/webrtc/NodeWebrtcConnection.ts +++ b/packages/dht/src/connection/webrtc/NodeWebrtcConnection.ts @@ -11,7 +11,7 @@ import { PortRange } from '../ConnectionManager' import { toNodeId } from '../../identifiers' import { createRandomConnectionId } from '../Connection' -const logger = new Logger(module) +const logger = new Logger('NodeWebrtcConnection') export interface Params { remotePeerDescriptor: PeerDescriptor diff --git a/packages/dht/src/connection/webrtc/WebrtcConnectorRpcLocal.ts b/packages/dht/src/connection/webrtc/WebrtcConnectorRpcLocal.ts index ec914927d2..84e18284a0 100644 --- a/packages/dht/src/connection/webrtc/WebrtcConnectorRpcLocal.ts +++ b/packages/dht/src/connection/webrtc/WebrtcConnectorRpcLocal.ts @@ -17,7 +17,7 @@ import { ConnectionID } from '../IConnection' import { ConnectingConnection } from './WebrtcConnector' import { PendingConnection } from '../PendingConnection' -const logger = new Logger(module) +const logger = new Logger('WebrtcConnectorRpcLocal') interface WebrtcConnectorRpcLocalOptions { connect: (targetPeerDescriptor: PeerDescriptor, doNotRequestConnection: boolean) => PendingConnection diff --git a/packages/dht/src/connection/webrtc/WebrtcConnectorRpcRemote.ts b/packages/dht/src/connection/webrtc/WebrtcConnectorRpcRemote.ts index 3bf88b158b..af7d728126 100644 --- a/packages/dht/src/connection/webrtc/WebrtcConnectorRpcRemote.ts +++ b/packages/dht/src/connection/webrtc/WebrtcConnectorRpcRemote.ts @@ -8,7 +8,7 @@ import { } from '../../../generated/packages/dht/protos/DhtRpc' import { WebrtcConnectorRpcClient } from '../../../generated/packages/dht/protos/DhtRpc.client' -const logger = new Logger(module) +const logger = new Logger('WebrtcConnectorRpcRemote') export class WebrtcConnectorRpcRemote extends RpcRemote { diff --git a/packages/dht/src/connection/websocket/AbstractWebsocketClientConnection.ts b/packages/dht/src/connection/websocket/AbstractWebsocketClientConnection.ts index f5874b3961..1db4e88e47 100644 --- a/packages/dht/src/connection/websocket/AbstractWebsocketClientConnection.ts +++ b/packages/dht/src/connection/websocket/AbstractWebsocketClientConnection.ts @@ -19,7 +19,7 @@ export const CUSTOM_GOING_AWAY = 3001 // https://github.com/websockets/ws/blob/master/doc/ws.md#ready-state-constants const OPEN = 1 -const logger = new Logger(module) +const logger = new Logger('AbstractWebsocketClientConnection') export abstract class AbstractWebsocketClientConnection extends EventEmitter implements IConnection { diff --git a/packages/dht/src/connection/websocket/AutoCertifierClientFacade.ts b/packages/dht/src/connection/websocket/AutoCertifierClientFacade.ts index 97b540f5c0..e228801c17 100644 --- a/packages/dht/src/connection/websocket/AutoCertifierClientFacade.ts +++ b/packages/dht/src/connection/websocket/AutoCertifierClientFacade.ts @@ -50,7 +50,7 @@ interface AutoCertifierClientFacadeOptions { createClientFactory?: () => IAutoCertifierClient } -const logger = new Logger(module) +const logger = new Logger('AutoCertifierClientFacade') export class AutoCertifierClientFacade { diff --git a/packages/dht/src/connection/websocket/BrowserWebsocketClientConnection.ts b/packages/dht/src/connection/websocket/BrowserWebsocketClientConnection.ts index 446790b7fd..4b0f01acb9 100644 --- a/packages/dht/src/connection/websocket/BrowserWebsocketClientConnection.ts +++ b/packages/dht/src/connection/websocket/BrowserWebsocketClientConnection.ts @@ -2,7 +2,7 @@ import { Logger } from '@streamr/utils' import { ICloseEvent, IMessageEvent, w3cwebsocket as Websocket } from 'websocket' import { AbstractWebsocketClientConnection } from './AbstractWebsocketClientConnection' -const logger = new Logger(module) +const logger = new Logger('BrowserWebsocketClientConnection') const BINARY_TYPE = 'arraybuffer' diff --git a/packages/dht/src/connection/websocket/NodeWebsocketClientConnection.ts b/packages/dht/src/connection/websocket/NodeWebsocketClientConnection.ts index cfc495c657..d0c15c33fd 100644 --- a/packages/dht/src/connection/websocket/NodeWebsocketClientConnection.ts +++ b/packages/dht/src/connection/websocket/NodeWebsocketClientConnection.ts @@ -2,7 +2,7 @@ import { Logger, binaryToUtf8 } from '@streamr/utils' import { WebSocket } from 'ws' import { AbstractWebsocketClientConnection } from './AbstractWebsocketClientConnection' -const logger = new Logger(module) +const logger = new Logger('NodeWebsocketClientConnection') const BINARY_TYPE = 'nodebuffer' diff --git a/packages/dht/src/connection/websocket/WebsocketClientConnectorRpcRemote.ts b/packages/dht/src/connection/websocket/WebsocketClientConnectorRpcRemote.ts index 34dd62ed78..74b1dd2c3c 100644 --- a/packages/dht/src/connection/websocket/WebsocketClientConnectorRpcRemote.ts +++ b/packages/dht/src/connection/websocket/WebsocketClientConnectorRpcRemote.ts @@ -6,7 +6,7 @@ import { RpcRemote } from '../../dht/contact/RpcRemote' import { WebsocketClientConnectorRpcClient } from '../../../generated/packages/dht/protos/DhtRpc.client' import { toNodeId } from '../../identifiers' -const logger = new Logger(module) +const logger = new Logger('WebsocketClientConnectorRpcRemote') export class WebsocketClientConnectorRpcRemote extends RpcRemote { diff --git a/packages/dht/src/connection/websocket/WebsocketServer.ts b/packages/dht/src/connection/websocket/WebsocketServer.ts index 0b4f314879..785de0e403 100644 --- a/packages/dht/src/connection/websocket/WebsocketServer.ts +++ b/packages/dht/src/connection/websocket/WebsocketServer.ts @@ -13,7 +13,7 @@ import { v4 as uuid } from 'uuid' import { parse } from 'url' import { IConnection } from '../IConnection' -const logger = new Logger(module) +const logger = new Logger('WebsocketServer') interface WebsocketServerOptions { portRange: PortRange diff --git a/packages/dht/src/connection/websocket/WebsocketServerConnection.ts b/packages/dht/src/connection/websocket/WebsocketServerConnection.ts index bbb441e33d..fe0378021f 100644 --- a/packages/dht/src/connection/websocket/WebsocketServerConnection.ts +++ b/packages/dht/src/connection/websocket/WebsocketServerConnection.ts @@ -6,7 +6,7 @@ import { Url } from 'url' import { CUSTOM_GOING_AWAY, GOING_AWAY } from './AbstractWebsocketClientConnection' import { createRandomConnectionId } from '../Connection' -const logger = new Logger(module) +const logger = new Logger('WebsocketServerConnection') export class WebsocketServerConnection extends EventEmitter implements IConnection { diff --git a/packages/dht/src/connection/websocket/WebsocketServerConnector.ts b/packages/dht/src/connection/websocket/WebsocketServerConnector.ts index 90abbb3fad..06f09dfc8b 100644 --- a/packages/dht/src/connection/websocket/WebsocketServerConnector.ts +++ b/packages/dht/src/connection/websocket/WebsocketServerConnector.ts @@ -22,7 +22,7 @@ import * as Err from '../../helpers/errors' import { expectedConnectionType } from '../../helpers/Connectivity' import { PendingConnection } from '../PendingConnection' -const logger = new Logger(module) +const logger = new Logger('WebsocketServerConnector') export interface WebsocketServerConnectorOptions { onNewConnection: (connection: PendingConnection) => boolean diff --git a/packages/dht/src/dht/DhtNode.ts b/packages/dht/src/dht/DhtNode.ts index 4554c0bb42..11f7f16bd1 100644 --- a/packages/dht/src/dht/DhtNode.ts +++ b/packages/dht/src/dht/DhtNode.ts @@ -127,7 +127,7 @@ type StrictDhtNodeOptions = MarkRequired -const logger = new Logger(module) +const logger = new Logger('DhtNode') export const NUMBER_OF_NODES_PER_KBUCKET_DEFAULT = 8 const PERIODICAL_PING_INTERVAL = 60 * 1000 diff --git a/packages/dht/src/dht/DhtNodeRpcLocal.ts b/packages/dht/src/dht/DhtNodeRpcLocal.ts index c2f5ab3974..b5fc766ccb 100644 --- a/packages/dht/src/dht/DhtNodeRpcLocal.ts +++ b/packages/dht/src/dht/DhtNodeRpcLocal.ts @@ -25,7 +25,7 @@ interface DhtNodeRpcLocalOptions { removeContact: (nodeId: DhtAddress) => void } -const logger = new Logger(module) +const logger = new Logger('DhtNodeRpcLocal') export class DhtNodeRpcLocal implements IDhtNodeRpc { diff --git a/packages/dht/src/dht/DhtNodeRpcRemote.ts b/packages/dht/src/dht/DhtNodeRpcRemote.ts index 00d64d86b5..f9f602f389 100644 --- a/packages/dht/src/dht/DhtNodeRpcRemote.ts +++ b/packages/dht/src/dht/DhtNodeRpcRemote.ts @@ -15,7 +15,7 @@ import { DhtCallContext } from '../rpc-protocol/DhtCallContext' import { RingIdRaw } from './contact/ringIdentifiers' import { RingContacts } from './contact/RingContactList' -const logger = new Logger(module) +const logger = new Logger('DhtNodeRpcRemote') // Fields required by objects stored in the k-bucket library export interface KBucketContact { diff --git a/packages/dht/src/dht/PeerManager.ts b/packages/dht/src/dht/PeerManager.ts index 5c16b02187..d05cfb92db 100644 --- a/packages/dht/src/dht/PeerManager.ts +++ b/packages/dht/src/dht/PeerManager.ts @@ -15,7 +15,7 @@ import { RingContactList } from './contact/RingContactList' import { ReadonlySortedContactList, SortedContactList } from './contact/SortedContactList' import { RingIdRaw, getRingIdRawFromPeerDescriptor } from './contact/ringIdentifiers' -const logger = new Logger(module) +const logger = new Logger('PeerManager') interface PeerManagerOptions { numberOfNodesPerKBucket: number diff --git a/packages/dht/src/dht/discovery/DiscoverySession.ts b/packages/dht/src/dht/discovery/DiscoverySession.ts index 47d9814469..700aaca223 100644 --- a/packages/dht/src/dht/discovery/DiscoverySession.ts +++ b/packages/dht/src/dht/discovery/DiscoverySession.ts @@ -6,7 +6,7 @@ import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote' import { PeerManager, getDistance } from '../PeerManager' import { getClosestNodes } from '../contact/getClosestNodes' -const logger = new Logger(module) +const logger = new Logger('DiscoverySession') interface DiscoverySessionOptions { targetId: DhtAddress diff --git a/packages/dht/src/dht/discovery/PeerDiscovery.ts b/packages/dht/src/dht/discovery/PeerDiscovery.ts index 46c0d1b0a7..b1dd5d1663 100644 --- a/packages/dht/src/dht/discovery/PeerDiscovery.ts +++ b/packages/dht/src/dht/discovery/PeerDiscovery.ts @@ -36,7 +36,7 @@ export const createDistantDhtAddress = (address: DhtAddress): DhtAddress => { return toDhtAddress(flipped) } -const logger = new Logger(module) +const logger = new Logger('PeerDiscovery') export class PeerDiscovery { diff --git a/packages/dht/src/dht/discovery/RingDiscoverySession.ts b/packages/dht/src/dht/discovery/RingDiscoverySession.ts index 21a2a6e94b..3a63172ea3 100644 --- a/packages/dht/src/dht/discovery/RingDiscoverySession.ts +++ b/packages/dht/src/dht/discovery/RingDiscoverySession.ts @@ -7,7 +7,7 @@ import { PeerManager } from '../PeerManager' import { RingContacts } from '../contact/RingContactList' import { RingId, RingIdRaw, getLeftDistance, getRingIdFromPeerDescriptor, getRingIdFromRaw } from '../contact/ringIdentifiers' -const logger = new Logger(module) +const logger = new Logger('RingDiscoverySession') interface RingDiscoverySessionOptions { targetId: RingIdRaw diff --git a/packages/dht/src/dht/recursive-operation/RecursiveOperationManager.ts b/packages/dht/src/dht/recursive-operation/RecursiveOperationManager.ts index 04d2b371bb..bea14f6bc2 100644 --- a/packages/dht/src/dht/recursive-operation/RecursiveOperationManager.ts +++ b/packages/dht/src/dht/recursive-operation/RecursiveOperationManager.ts @@ -41,7 +41,7 @@ interface RecursiveOperationManagerOptions { export interface RecursiveOperationResult { closestNodes: PeerDescriptor[], dataEntries?: DataEntry[] } -const logger = new Logger(module) +const logger = new Logger('RecursiveOperationManager') export class RecursiveOperationManager { diff --git a/packages/dht/src/dht/recursive-operation/RecursiveOperationRpcLocal.ts b/packages/dht/src/dht/recursive-operation/RecursiveOperationRpcLocal.ts index 3d2d1b11c8..f713cd1bab 100644 --- a/packages/dht/src/dht/recursive-operation/RecursiveOperationRpcLocal.ts +++ b/packages/dht/src/dht/recursive-operation/RecursiveOperationRpcLocal.ts @@ -5,7 +5,7 @@ import { createRouteMessageAck } from '../routing/RouterRpcLocal' import { getPreviousPeer } from '../routing/getPreviousPeer' import { toNodeId } from '../../identifiers' -const logger = new Logger(module) +const logger = new Logger('RecursiveOperationRpcLocal') interface RecursiveOperationRpcLocalOptions { doRouteRequest: (routedMessage: RouteMessageWrapper) => RouteMessageAck diff --git a/packages/dht/src/dht/recursive-operation/RecursiveOperationRpcRemote.ts b/packages/dht/src/dht/recursive-operation/RecursiveOperationRpcRemote.ts index 5e41b3dc0e..c34abaca3c 100644 --- a/packages/dht/src/dht/recursive-operation/RecursiveOperationRpcRemote.ts +++ b/packages/dht/src/dht/recursive-operation/RecursiveOperationRpcRemote.ts @@ -6,7 +6,7 @@ import { RpcRemote } from '../contact/RpcRemote' import { getPreviousPeer } from '../routing/getPreviousPeer' import { toNodeId } from '../../identifiers' -const logger = new Logger(module) +const logger = new Logger('RecursiveOperationRpcRemote') export class RecursiveOperationRpcRemote extends RpcRemote { diff --git a/packages/dht/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts b/packages/dht/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts index c8ed4ea325..7e8f909668 100644 --- a/packages/dht/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts +++ b/packages/dht/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts @@ -6,7 +6,7 @@ import { ServerCallContext } from '@protobuf-ts/runtime-rpc' import { DhtCallContext } from '../../rpc-protocol/DhtCallContext' import { DhtAddress, toNodeId } from '../../identifiers' -const logger = new Logger(module) +const logger = new Logger('RecursiveOperationSessionRpcLocal') interface RecursiveOperationSessionRpcLocalOptions { onResponseReceived: ( diff --git a/packages/dht/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.ts b/packages/dht/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.ts index 3119d49f35..398748775c 100644 --- a/packages/dht/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.ts +++ b/packages/dht/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.ts @@ -7,7 +7,7 @@ import { import { RecursiveOperationSessionRpcClient } from '../../../generated/packages/dht/protos/DhtRpc.client' import { RpcRemote } from '../contact/RpcRemote' -const logger = new Logger(module) +const logger = new Logger('RecursiveOperationSessionRpcRemote') export class RecursiveOperationSessionRpcRemote extends RpcRemote { diff --git a/packages/dht/src/dht/routing/Router.ts b/packages/dht/src/dht/routing/Router.ts index 41e803b891..0925a2140e 100644 --- a/packages/dht/src/dht/routing/Router.ts +++ b/packages/dht/src/dht/routing/Router.ts @@ -20,7 +20,7 @@ interface ForwardingTableEntry { peerDescriptors: PeerDescriptor[] } -const logger = new Logger(module) +const logger = new Logger('Router') export class Router { diff --git a/packages/dht/src/dht/routing/RouterRpcLocal.ts b/packages/dht/src/dht/routing/RouterRpcLocal.ts index f423cb5461..56b7db3851 100644 --- a/packages/dht/src/dht/routing/RouterRpcLocal.ts +++ b/packages/dht/src/dht/routing/RouterRpcLocal.ts @@ -14,7 +14,7 @@ interface RouterRpcLocalOptions { localPeerDescriptor: PeerDescriptor } -const logger = new Logger(module) +const logger = new Logger('RouterRpcLocal') export const createRouteMessageAck = (routedMessage: RouteMessageWrapper, error?: RouteMessageError): RouteMessageAck => { const ack: RouteMessageAck = { diff --git a/packages/dht/src/dht/routing/RouterRpcRemote.ts b/packages/dht/src/dht/routing/RouterRpcRemote.ts index 3b16c4414d..d30df58763 100644 --- a/packages/dht/src/dht/routing/RouterRpcRemote.ts +++ b/packages/dht/src/dht/routing/RouterRpcRemote.ts @@ -6,7 +6,7 @@ import { RpcRemote } from '../contact/RpcRemote' import { getPreviousPeer } from './getPreviousPeer' import { toNodeId } from '../../identifiers' -const logger = new Logger(module) +const logger = new Logger('RouterRpcRemote') // default timeout export const ROUTING_TIMEOUT = 2000 diff --git a/packages/dht/src/dht/routing/RoutingSession.ts b/packages/dht/src/dht/routing/RoutingSession.ts index 6c4f61c0e5..355078b3c2 100644 --- a/packages/dht/src/dht/routing/RoutingSession.ts +++ b/packages/dht/src/dht/routing/RoutingSession.ts @@ -13,7 +13,7 @@ import { DhtAddress, areEqualPeerDescriptors, toDhtAddress, toNodeId } from '../ import pull from 'lodash/pull' import { RoutingTable, RoutingTablesCache } from './RoutingTablesCache' -const logger = new Logger(module) +const logger = new Logger('RoutingSession') const MAX_FAILED_HOPS = 2 const ROUTING_TABLE_MAX_SIZE = 5 diff --git a/packages/dht/src/dht/store/StoreManager.ts b/packages/dht/src/dht/store/StoreManager.ts index 5b9696cd9b..9b2a347c37 100644 --- a/packages/dht/src/dht/store/StoreManager.ts +++ b/packages/dht/src/dht/store/StoreManager.ts @@ -36,7 +36,7 @@ interface StoreManagerOptions { createRpcRemote: (contact: PeerDescriptor) => StoreRpcRemote } -const logger = new Logger(module) +const logger = new Logger('StoreManager') export class StoreManager { diff --git a/packages/dht/src/dht/store/StoreRpcLocal.ts b/packages/dht/src/dht/store/StoreRpcLocal.ts index f1416049e9..a5e6e9739f 100644 --- a/packages/dht/src/dht/store/StoreRpcLocal.ts +++ b/packages/dht/src/dht/store/StoreRpcLocal.ts @@ -20,7 +20,7 @@ interface StoreRpcLocalOptions { getStorers: (key: DhtAddress) => readonly PeerDescriptor[] } -const logger = new Logger(module) +const logger = new Logger('StoreRpcLocal') export class StoreRpcLocal implements IStoreRpc { diff --git a/packages/dht/test/benchmark/Find.test.ts b/packages/dht/test/benchmark/Find.test.ts index f2dff256e9..f311d18539 100644 --- a/packages/dht/test/benchmark/Find.test.ts +++ b/packages/dht/test/benchmark/Find.test.ts @@ -8,7 +8,7 @@ import { Logger, wait } from '@streamr/utils' import { debugVars } from '../../src/helpers/debugHelpers' import { toDhtAddress, toNodeId } from '../../src/identifiers' -const logger = new Logger(module) +const logger = new Logger('Find.test') describe('Find correctness', () => { let entryPoint: DhtNode diff --git a/packages/dht/test/benchmark/KademliaCorrectness.test.ts b/packages/dht/test/benchmark/KademliaCorrectness.test.ts index e509a7297e..80aee87289 100644 --- a/packages/dht/test/benchmark/KademliaCorrectness.test.ts +++ b/packages/dht/test/benchmark/KademliaCorrectness.test.ts @@ -7,7 +7,7 @@ import fs from 'fs' import { DhtAddress, toDhtAddress, toNodeId } from '../../src/identifiers' import { Logger } from '@streamr/utils' -const logger = new Logger(module) +const logger = new Logger('KademliaCorrectness.test') describe('Kademlia correctness', () => { let entryPoint: DhtNode diff --git a/packages/dht/test/benchmark/RingCorrectness.test.ts b/packages/dht/test/benchmark/RingCorrectness.test.ts index 8f1d153b7f..beda9014f9 100644 --- a/packages/dht/test/benchmark/RingCorrectness.test.ts +++ b/packages/dht/test/benchmark/RingCorrectness.test.ts @@ -8,7 +8,7 @@ import { DhtAddress, toDhtAddress, toNodeId } from '../../src/identifiers' import { Logger } from '@streamr/utils' import { getRingIdRawFromPeerDescriptor } from '../../src/dht/contact/ringIdentifiers' -const logger = new Logger(module) +const logger = new Logger('RingCorrectness.test') describe('Ring correctness', () => { let entryPoint: DhtNode diff --git a/packages/dht/test/benchmark/hybrid-network-simulation/RingContactList.test.ts b/packages/dht/test/benchmark/hybrid-network-simulation/RingContactList.test.ts index abfe04952e..67382bbf47 100644 --- a/packages/dht/test/benchmark/hybrid-network-simulation/RingContactList.test.ts +++ b/packages/dht/test/benchmark/hybrid-network-simulation/RingContactList.test.ts @@ -6,7 +6,7 @@ import { RingContactList } from '../../../src/dht/contact/RingContactList' import { getRingIdRawFromPeerDescriptor } from '../../../src/dht/contact/ringIdentifiers' import { getRandomRegion } from '../../../src/connection/simulator/pings' -const logger = new Logger(module) +const logger = new Logger('RingContactList.test') function ipv4ToString(ip: number): string { return [ diff --git a/packages/dht/test/integration/ConnectionManager.test.ts b/packages/dht/test/integration/ConnectionManager.test.ts index fa46abccee..ad41b06eb7 100644 --- a/packages/dht/test/integration/ConnectionManager.test.ts +++ b/packages/dht/test/integration/ConnectionManager.test.ts @@ -14,7 +14,7 @@ import range from 'lodash/range' const SERVICE_ID = 'demo' -const logger = new Logger(module) +const logger = new Logger('ConnectionManager.test') // TODO: refactor this test file to use beforeEach and AfterEach for proper teardown describe('ConnectionManager', () => { diff --git a/packages/dht/test/integration/Mock-Layer1-Layer0.test.ts b/packages/dht/test/integration/Mock-Layer1-Layer0.test.ts index f2906f7e90..63446af8fb 100644 --- a/packages/dht/test/integration/Mock-Layer1-Layer0.test.ts +++ b/packages/dht/test/integration/Mock-Layer1-Layer0.test.ts @@ -4,7 +4,7 @@ import { DhtNode } from '../../src/dht/DhtNode' import { createMockConnectionDhtNode, createMockConnectionLayer1Node } from '../utils/utils' import { randomDhtAddress } from '../../src/identifiers' -const logger = new Logger(module) +const logger = new Logger('Mock-Layer1-Layer0.test') describe('Layer 1 on Layer 0 with mocked connections', () => { diff --git a/packages/dht/test/integration/RouteMessage.test.ts b/packages/dht/test/integration/RouteMessage.test.ts index a156a570d5..a53c732232 100644 --- a/packages/dht/test/integration/RouteMessage.test.ts +++ b/packages/dht/test/integration/RouteMessage.test.ts @@ -9,7 +9,7 @@ import { Any } from '../../generated/google/protobuf/any' import { RoutingMode } from '../../src/dht/routing/RoutingSession' import { DhtAddress, randomDhtAddress } from '../../src/identifiers' -const logger = new Logger(module) +const logger = new Logger('RouteMessage.test') const NUM_NODES = 30 diff --git a/packages/dht/test/integration/Websocket.test.ts b/packages/dht/test/integration/Websocket.test.ts index d4c14126bd..de2a6e52c8 100644 --- a/packages/dht/test/integration/Websocket.test.ts +++ b/packages/dht/test/integration/Websocket.test.ts @@ -3,7 +3,7 @@ import { IConnection } from '../../src/connection/IConnection' import { WebsocketClientConnection } from '../../src/connection/websocket/NodeWebsocketClientConnection' import { Logger } from '@streamr/utils' -const logger = new Logger(module) +const logger = new Logger('Websocket.test') describe('Websocket', () => { diff --git a/packages/geoip-location/src/GeoIpLocator.ts b/packages/geoip-location/src/GeoIpLocator.ts index b8932fbd50..6509109c2b 100644 --- a/packages/geoip-location/src/GeoIpLocator.ts +++ b/packages/geoip-location/src/GeoIpLocator.ts @@ -3,7 +3,7 @@ import { CityResponse, Reader } from 'mmdb-lib' import LongTimeout from 'long-timeout' import { downloadGeoIpDatabase } from './downloadGeoIpDatabase' -const logger = new Logger(module) +const logger = new Logger('GeoIpLocator') interface GeoIpLookupResult { latitude: number diff --git a/packages/geoip-location/src/downloadGeoIpDatabase.ts b/packages/geoip-location/src/downloadGeoIpDatabase.ts index ffe3d53d9f..51b277839f 100644 --- a/packages/geoip-location/src/downloadGeoIpDatabase.ts +++ b/packages/geoip-location/src/downloadGeoIpDatabase.ts @@ -11,7 +11,7 @@ const TAR_SUFFFIX = '.tar.gz' const DB_SUFFIX = '.mmdb' const HASH_SUFFIX = '.mmdb.sha384' -const logger = new Logger(module) +const logger = new Logger('downloadGeoIpDatabase') const downloadNewDb = async ( url: string, diff --git a/packages/geoip-location/test/helpers/TestServer.ts b/packages/geoip-location/test/helpers/TestServer.ts index 422f925b5d..0617f1cfc9 100644 --- a/packages/geoip-location/test/helpers/TestServer.ts +++ b/packages/geoip-location/test/helpers/TestServer.ts @@ -7,7 +7,7 @@ import { v4 } from 'uuid' import EventEmitter from 'eventemitter3' import { Duplex, pipeline } from 'stream' -const logger = new Logger(module) +const logger = new Logger('TestServer') type ExpressType = ReturnType type ServerType = ReturnType diff --git a/packages/node/src/broker.ts b/packages/node/src/broker.ts index 9f236d9f9e..bd8621a748 100644 --- a/packages/node/src/broker.ts +++ b/packages/node/src/broker.ts @@ -12,7 +12,7 @@ import { generateMnemonicFromAddress } from './helpers/generateMnemonicFromAddre import { startServer as startHttpServer, stopServer } from './httpServer' import { createPlugin } from './pluginRegistry' -const logger = new Logger(module) +const logger = new Logger('broker') export interface Broker { getStreamrClient: () => StreamrClient diff --git a/packages/node/src/httpServer.ts b/packages/node/src/httpServer.ts index 9db5c2771a..b2d13c697b 100644 --- a/packages/node/src/httpServer.ts +++ b/packages/node/src/httpServer.ts @@ -8,7 +8,7 @@ import { once } from 'events' import { StrictConfig } from './config/config' import { ApiAuthentication, isValidAuthentication } from './apiAuthentication' -const logger = new Logger(module) +const logger = new Logger('httpServer') const HTTP_STATUS_UNAUTHORIZED = 401 const HTTP_STATUS_FORBIDDEN = 403 diff --git a/packages/node/src/plugins/autostaker/AutostakerPlugin.ts b/packages/node/src/plugins/autostaker/AutostakerPlugin.ts index 09bf95b278..b5cca222ba 100644 --- a/packages/node/src/plugins/autostaker/AutostakerPlugin.ts +++ b/packages/node/src/plugins/autostaker/AutostakerPlugin.ts @@ -46,7 +46,7 @@ interface UndelegationQueueQueryResultItem { amount: string } -const logger = new Logger(module) +const logger = new Logger('AutostakerPlugin') // 1e12 wei, i.e. one millionth of one DATA token (we can tweak this later if needed) const MIN_SPONSORSHIP_TOTAL_PAYOUT_PER_SECOND = 1000000000000n diff --git a/packages/node/src/plugins/consoleMetrics/ConsoleMetricsPlugin.ts b/packages/node/src/plugins/consoleMetrics/ConsoleMetricsPlugin.ts index 9d7424d0a7..c756ad0309 100644 --- a/packages/node/src/plugins/consoleMetrics/ConsoleMetricsPlugin.ts +++ b/packages/node/src/plugins/consoleMetrics/ConsoleMetricsPlugin.ts @@ -5,7 +5,7 @@ import { StreamrClient } from '@streamr/sdk' import { Plugin } from '../../Plugin' import PLUGIN_CONFIG_SCHEMA from './config.schema.json' -const logger = new Logger(module) +const logger = new Logger('ConsoleMetricsPlugin') function formatNumber(n: number) { return n < 10 ? n.toFixed(1) : String(Math.round(n)) diff --git a/packages/node/src/plugins/http/publishEndpoint.ts b/packages/node/src/plugins/http/publishEndpoint.ts index 6d7b7cb17f..3d3f2861ef 100644 --- a/packages/node/src/plugins/http/publishEndpoint.ts +++ b/packages/node/src/plugins/http/publishEndpoint.ts @@ -6,7 +6,7 @@ import { parseQueryParameter, parsePositiveInteger, parseTimestamp } from '../.. import { PlainPayloadFormat } from '../../helpers/PayloadFormat' import { HttpServerEndpoint } from '../../Plugin' -const logger = new Logger(module) +const logger = new Logger('publishEndpoint') const PAYLOAD_FORMAT = new PlainPayloadFormat() const createHandler = (msgChainId: string, streamrClient: StreamrClient): RequestHandler => { diff --git a/packages/node/src/plugins/mqtt/Bridge.ts b/packages/node/src/plugins/mqtt/Bridge.ts index 57a77e2a1d..bd2cc62683 100644 --- a/packages/node/src/plugins/mqtt/Bridge.ts +++ b/packages/node/src/plugins/mqtt/Bridge.ts @@ -8,7 +8,7 @@ import { MqttServer, MqttServerListener } from './MqttServer' const DEFAULT_PARTITION = 0 -const logger = new Logger(module) +const logger = new Logger('Bridge') interface StreamSubscription { streamrClientSubscription: Subscription diff --git a/packages/node/src/plugins/mqtt/MqttServer.ts b/packages/node/src/plugins/mqtt/MqttServer.ts index 4ec01c7cde..5a94f0a232 100644 --- a/packages/node/src/plugins/mqtt/MqttServer.ts +++ b/packages/node/src/plugins/mqtt/MqttServer.ts @@ -5,7 +5,7 @@ import { Logger } from '@streamr/utils' import { ApiAuthentication, isValidAuthentication } from '../../apiAuthentication' import Aedes from 'aedes' -const logger = new Logger(module) +const logger = new Logger('MqttServer') export interface MqttServerListener { onMessageReceived(topic: string, payload: string, clientId: string): void diff --git a/packages/node/src/plugins/operator/MaintainTopologyHelper.ts b/packages/node/src/plugins/operator/MaintainTopologyHelper.ts index c44dab29d4..0467a67987 100644 --- a/packages/node/src/plugins/operator/MaintainTopologyHelper.ts +++ b/packages/node/src/plugins/operator/MaintainTopologyHelper.ts @@ -2,7 +2,7 @@ import { Operator, StakeEvent } from '@streamr/sdk' import { EthereumAddress, Logger, StreamID, toEthereumAddress } from '@streamr/utils' import { EventEmitter } from 'eventemitter3' -const logger = new Logger(module) +const logger = new Logger('MaintainTopologyHelper') export interface MaintainTopologyHelperEvents { /** diff --git a/packages/node/src/plugins/operator/MaintainTopologyService.ts b/packages/node/src/plugins/operator/MaintainTopologyService.ts index 96efe5435a..f262baa88c 100644 --- a/packages/node/src/plugins/operator/MaintainTopologyService.ts +++ b/packages/node/src/plugins/operator/MaintainTopologyService.ts @@ -3,7 +3,7 @@ import { Logger, StreamPartID, StreamPartIDUtils } from '@streamr/utils' import pLimit from 'p-limit' import { StreamPartAssignments } from './StreamPartAssignments' -const logger = new Logger(module) +const logger = new Logger('MaintainTopologyService') export class MaintainTopologyService { private readonly streamrClient: StreamrClient diff --git a/packages/node/src/plugins/operator/OperatorFleetState.ts b/packages/node/src/plugins/operator/OperatorFleetState.ts index 6126732fb7..6ac1e0e5b7 100644 --- a/packages/node/src/plugins/operator/OperatorFleetState.ts +++ b/packages/node/src/plugins/operator/OperatorFleetState.ts @@ -6,7 +6,7 @@ import min from 'lodash/min' import once from 'lodash/once' import { HeartbeatMessage, HeartbeatMessageSchema } from './heartbeatUtils' -const logger = new Logger(module) +const logger = new Logger('OperatorFleetState') export interface OperatorFleetStateEvents { added: (nodeId: DhtAddress) => void diff --git a/packages/node/src/plugins/operator/OperatorPlugin.ts b/packages/node/src/plugins/operator/OperatorPlugin.ts index f4caa574ac..a701e17871 100644 --- a/packages/node/src/plugins/operator/OperatorPlugin.ts +++ b/packages/node/src/plugins/operator/OperatorPlugin.ts @@ -65,7 +65,7 @@ export interface OperatorPluginConfig { const STAKED_OPERATORS_CACHE_MAX_AGE = 2 * 24 * 60 * 60 * 1000 -const logger = new Logger(module) +const logger = new Logger('OperatorPlugin') export class OperatorPlugin extends Plugin { private readonly abortController: AbortController = new AbortController() diff --git a/packages/node/src/plugins/operator/StreamPartAssignments.ts b/packages/node/src/plugins/operator/StreamPartAssignments.ts index a407affdd2..4eb7b4ab8a 100644 --- a/packages/node/src/plugins/operator/StreamPartAssignments.ts +++ b/packages/node/src/plugins/operator/StreamPartAssignments.ts @@ -7,7 +7,7 @@ import { ConsistentHashRing } from './ConsistentHashRing' import { MaintainTopologyHelperEvents } from './MaintainTopologyHelper' import { OperatorFleetState } from './OperatorFleetState' -const logger = new Logger(module) +const logger = new Logger('StreamPartAssignments') export interface StreamPartAssignmentEvents { assigned(streamPartId: StreamPartID): void diff --git a/packages/node/src/plugins/operator/announceNodeToContract.ts b/packages/node/src/plugins/operator/announceNodeToContract.ts index 072f7e4a59..df42fe34f9 100644 --- a/packages/node/src/plugins/operator/announceNodeToContract.ts +++ b/packages/node/src/plugins/operator/announceNodeToContract.ts @@ -1,7 +1,7 @@ import { Operator, StreamrClient } from '@streamr/sdk' import { Logger } from '@streamr/utils' -const logger = new Logger(module) +const logger = new Logger('announceNodeToContract') export const announceNodeToContract = async ( writeIntervalInMs: number, diff --git a/packages/node/src/plugins/operator/announceNodeToStream.ts b/packages/node/src/plugins/operator/announceNodeToStream.ts index 7cd4e5c58e..e199a2b541 100644 --- a/packages/node/src/plugins/operator/announceNodeToStream.ts +++ b/packages/node/src/plugins/operator/announceNodeToStream.ts @@ -4,7 +4,7 @@ import { createHeartbeatMessage } from './heartbeatUtils' import { formCoordinationStreamId } from './formCoordinationStreamId' import { StrictConfig } from '../../config/config' -const logger = new Logger(module) +const logger = new Logger('announceNodeToStream') export const announceNodeToStream = async ( operatorContractAddress: EthereumAddress, diff --git a/packages/node/src/plugins/operator/checkOperatorValueBreach.ts b/packages/node/src/plugins/operator/checkOperatorValueBreach.ts index 0aa8d24555..d56c469ec2 100644 --- a/packages/node/src/plugins/operator/checkOperatorValueBreach.ts +++ b/packages/node/src/plugins/operator/checkOperatorValueBreach.ts @@ -3,7 +3,7 @@ import { EthereumAddress, Logger, WeiAmount } from '@streamr/utils' import sample from 'lodash/sample' import without from 'lodash/without' -const logger = new Logger(module) +const logger = new Logger('checkOperatorValueBreach') export const checkOperatorValueBreach = async ( myOperator: Operator, diff --git a/packages/node/src/plugins/operator/closeExpiredFlags.ts b/packages/node/src/plugins/operator/closeExpiredFlags.ts index ca30d6b43a..bfb0bd8669 100644 --- a/packages/node/src/plugins/operator/closeExpiredFlags.ts +++ b/packages/node/src/plugins/operator/closeExpiredFlags.ts @@ -1,7 +1,7 @@ import { GetOperatorSponsorshipsResult, Operator } from '@streamr/sdk' import { Logger } from '@streamr/utils' -const logger = new Logger(module) +const logger = new Logger('closeExpiredFlags') export const closeExpiredFlags = async ( maxAgeInMs: number, diff --git a/packages/node/src/plugins/operator/inspectOverTime.ts b/packages/node/src/plugins/operator/inspectOverTime.ts index edf61c2b59..2dfad92d2a 100644 --- a/packages/node/src/plugins/operator/inspectOverTime.ts +++ b/packages/node/src/plugins/operator/inspectOverTime.ts @@ -84,7 +84,7 @@ class InspectionOverTimeTask { this.abortSignal = composeAbortSignals(userAbortSignal, this.abortController.signal) this.findNodesForTargetGivenFleetStateFn = findNodesForTargetGivenFleetStateFn this.inspectTargetFn = inspectTargetFn - this.logger = new Logger(module, { traceId }) + this.logger = new Logger('InspectionOverTimeTask', { traceId }) this.abortSignal.addEventListener('abort', async () => { await this.fleetState?.destroy() }) diff --git a/packages/node/src/plugins/operator/inspectRandomNode.ts b/packages/node/src/plugins/operator/inspectRandomNode.ts index 0e0b3eea91..aa574b9dfe 100644 --- a/packages/node/src/plugins/operator/inspectRandomNode.ts +++ b/packages/node/src/plugins/operator/inspectRandomNode.ts @@ -18,7 +18,7 @@ export async function inspectRandomNode( findTargetFn = findTarget, ): Promise { const traceId = randomString(6) - const logger = new Logger(module, { traceId }) + const logger = new Logger('inspectRandomNode', { traceId }) logger.info('Select a random operator to inspect') const target = await findTargetFn(operatorContractAddress, myOperator, assignments, streamrClient, logger) diff --git a/packages/node/src/plugins/operator/maintainOperatorValue.ts b/packages/node/src/plugins/operator/maintainOperatorValue.ts index dd9f603870..083c33dee2 100644 --- a/packages/node/src/plugins/operator/maintainOperatorValue.ts +++ b/packages/node/src/plugins/operator/maintainOperatorValue.ts @@ -1,7 +1,7 @@ import { Operator } from '@streamr/sdk' import { Logger, multiplyWeiAmount, WeiAmount } from '@streamr/utils' -const logger = new Logger(module) +const logger = new Logger('maintainOperatorValue') export const maintainOperatorValue = async ( withdrawLimitSafetyFraction: number, diff --git a/packages/node/src/plugins/operator/reviewSuspectNode.ts b/packages/node/src/plugins/operator/reviewSuspectNode.ts index 4ec8857e6f..df98ee56f0 100644 --- a/packages/node/src/plugins/operator/reviewSuspectNode.ts +++ b/packages/node/src/plugins/operator/reviewSuspectNode.ts @@ -4,7 +4,7 @@ import random from 'lodash/random' import { CreateOperatorFleetStateFn } from './OperatorFleetState' import { inspectOverTime } from './inspectOverTime' -const logger = new Logger(module) +const logger = new Logger('reviewSuspectNode') export interface ReviewProcessOpts { sponsorshipAddress: EthereumAddress diff --git a/packages/node/src/plugins/storage/Batch.ts b/packages/node/src/plugins/storage/Batch.ts index 7dd19648e7..099d020464 100644 --- a/packages/node/src/plugins/storage/Batch.ts +++ b/packages/node/src/plugins/storage/Batch.ts @@ -75,7 +75,7 @@ export class Batch extends EventEmitter { this.state = Batch.states.OPENED this.doneCbs = [] - this.logger = new Logger(module, { id: this.id }) + this.logger = new Logger('Batch', { id: this.id }) this.maxSize = maxSize this.maxRecordCount = maxRecordCount diff --git a/packages/node/src/plugins/storage/BatchManager.ts b/packages/node/src/plugins/storage/BatchManager.ts index 1fbafe3614..672cd999eb 100644 --- a/packages/node/src/plugins/storage/BatchManager.ts +++ b/packages/node/src/plugins/storage/BatchManager.ts @@ -35,7 +35,7 @@ export class BatchManager extends EventEmitter { constructor(cassandraClient: Client, opts: Partial = {}) { super() ID += 1 - this.logger = new Logger(module, { id: `${ID}` }) + this.logger = new Logger('BatchManager', { id: `${ID}` }) const defaultOptions = { useTtl: false, diff --git a/packages/node/src/plugins/storage/BucketManager.ts b/packages/node/src/plugins/storage/BucketManager.ts index b44ef0774d..8c7c8a9723 100644 --- a/packages/node/src/plugins/storage/BucketManager.ts +++ b/packages/node/src/plugins/storage/BucketManager.ts @@ -5,7 +5,7 @@ import { Bucket, BucketId } from './Bucket' const { TimeUuid } = cassandraTypes -const logger = new Logger(module) +const logger = new Logger('BucketManager') type StreamPartKey = string diff --git a/packages/node/src/plugins/storage/DeleteExpiredCmd.ts b/packages/node/src/plugins/storage/DeleteExpiredCmd.ts index ad650a9dcf..f89359b086 100644 --- a/packages/node/src/plugins/storage/DeleteExpiredCmd.ts +++ b/packages/node/src/plugins/storage/DeleteExpiredCmd.ts @@ -3,7 +3,7 @@ import pLimit, { Limit } from 'p-limit' import { StreamrClient } from '@streamr/sdk' import { Logger } from '@streamr/utils' -const logger = new Logger(module) +const logger = new Logger('DeleteExpiredCmd') const totalSizeOfBuckets = (buckets: BucketInfo[]) => buckets.reduce((mem, { size }) => mem + size, 0) / (1024 * 1024) diff --git a/packages/node/src/plugins/storage/SetMembershipSynchronizer.ts b/packages/node/src/plugins/storage/SetMembershipSynchronizer.ts index 373163ebe5..245d84b6cc 100644 --- a/packages/node/src/plugins/storage/SetMembershipSynchronizer.ts +++ b/packages/node/src/plugins/storage/SetMembershipSynchronizer.ts @@ -1,6 +1,6 @@ import { Logger } from '@streamr/utils' -const logger = new Logger(module) +const logger = new Logger('SetMembershipSynchronizer') export interface Diff { added: E[] diff --git a/packages/node/src/plugins/storage/Storage.ts b/packages/node/src/plugins/storage/Storage.ts index 25424a9e6f..9314f321be 100644 --- a/packages/node/src/plugins/storage/Storage.ts +++ b/packages/node/src/plugins/storage/Storage.ts @@ -10,7 +10,7 @@ import { Bucket, BucketId } from './Bucket' import { BucketManager, BucketManagerOptions } from './BucketManager' import { MAX_SEQUENCE_NUMBER_VALUE, MIN_SEQUENCE_NUMBER_VALUE } from './dataQueryEndpoint' -const logger = new Logger(module) +const logger = new Logger('Storage') const MAX_TIMESTAMP_VALUE = 8640000000000000 // https://262.ecma-international.org/5.1/#sec-15.9.1.1 const MAX_RESEND_LAST = 10000 diff --git a/packages/node/src/plugins/storage/StorageConfig.ts b/packages/node/src/plugins/storage/StorageConfig.ts index 86a0446207..7e3a16c641 100644 --- a/packages/node/src/plugins/storage/StorageConfig.ts +++ b/packages/node/src/plugins/storage/StorageConfig.ts @@ -4,7 +4,7 @@ import { Diff, SetMembershipSynchronizer } from './SetMembershipSynchronizer' import { StorageEventListener } from './StorageEventListener' import { StoragePoller } from './StoragePoller' -const logger = new Logger(module) +const logger = new Logger('StorageConfig') export interface StorageConfigListener { onStreamPartAdded: (streamPart: StreamPartID) => void diff --git a/packages/node/src/plugins/storage/StorageEventListener.ts b/packages/node/src/plugins/storage/StorageEventListener.ts index 6a80844283..0449214d11 100644 --- a/packages/node/src/plugins/storage/StorageEventListener.ts +++ b/packages/node/src/plugins/storage/StorageEventListener.ts @@ -1,7 +1,7 @@ import { Stream, StreamrClient, StorageNodeAssignmentEvent } from '@streamr/sdk' import { EthereumAddress, Logger } from '@streamr/utils' -const logger = new Logger(module) +const logger = new Logger('StorageEventListener') /** * Hooks up to StreamrClient event listener to learn about diff --git a/packages/node/src/plugins/storage/StoragePlugin.ts b/packages/node/src/plugins/storage/StoragePlugin.ts index 8a7cea3652..277c8cc744 100644 --- a/packages/node/src/plugins/storage/StoragePlugin.ts +++ b/packages/node/src/plugins/storage/StoragePlugin.ts @@ -9,7 +9,7 @@ import { createDataMetadataEndpoint } from './dataMetadataEndpoint' import { createDataQueryEndpoint } from './dataQueryEndpoint' import { createStorageConfigEndpoint } from './storageConfigEndpoint' -const logger = new Logger(module) +const logger = new Logger('StoragePlugin') export interface StoragePluginConfig extends ApiPluginConfig { cassandra: { diff --git a/packages/node/src/plugins/storage/StoragePoller.ts b/packages/node/src/plugins/storage/StoragePoller.ts index b3798d152e..fc457e6058 100644 --- a/packages/node/src/plugins/storage/StoragePoller.ts +++ b/packages/node/src/plugins/storage/StoragePoller.ts @@ -1,7 +1,7 @@ import { Stream, StreamrClient } from '@streamr/sdk' import { Logger, scheduleAtInterval } from '@streamr/utils' -const logger = new Logger(module) +const logger = new Logger('StoragePoller') /** * Polls full state of storage node assignments on an interval. diff --git a/packages/node/src/plugins/storage/dataQueryEndpoint.ts b/packages/node/src/plugins/storage/dataQueryEndpoint.ts index da951ab51b..734ac44e02 100644 --- a/packages/node/src/plugins/storage/dataQueryEndpoint.ts +++ b/packages/node/src/plugins/storage/dataQueryEndpoint.ts @@ -8,7 +8,7 @@ import { Storage } from './Storage' import { Format, getFormat } from './DataQueryFormat' import { HttpServerEndpoint } from '../../Plugin' -const logger = new Logger(module) +const logger = new Logger('dataQueryEndpoint') // TODO: move this to protocol-js export const MIN_SEQUENCE_NUMBER_VALUE = 0 diff --git a/packages/node/src/plugins/subscriber/SubscriberPlugin.ts b/packages/node/src/plugins/subscriber/SubscriberPlugin.ts index c0b106909e..2d0e2c79c0 100644 --- a/packages/node/src/plugins/subscriber/SubscriberPlugin.ts +++ b/packages/node/src/plugins/subscriber/SubscriberPlugin.ts @@ -11,7 +11,7 @@ export interface SubscriberPluginConfig { streams: ConfigStream[] } -const logger = new Logger(module) +const logger = new Logger('SubscriberPlugin') export class SubscriberPlugin extends Plugin { diff --git a/packages/node/src/plugins/websocket/Connection.ts b/packages/node/src/plugins/websocket/Connection.ts index 06e909f6c9..ba94546805 100644 --- a/packages/node/src/plugins/websocket/Connection.ts +++ b/packages/node/src/plugins/websocket/Connection.ts @@ -3,7 +3,7 @@ import { StreamrClient } from '@streamr/sdk' import { PayloadFormat } from '../../helpers/PayloadFormat' import { Logger } from '@streamr/utils' -const logger = new Logger(module) +const logger = new Logger('Connection') export const PING_PAYLOAD = 'ping' const PONG_PAYLOAD = 'pong' diff --git a/packages/node/src/plugins/websocket/PublishConnection.ts b/packages/node/src/plugins/websocket/PublishConnection.ts index c7c4d61a7b..2953f9e191 100644 --- a/packages/node/src/plugins/websocket/PublishConnection.ts +++ b/packages/node/src/plugins/websocket/PublishConnection.ts @@ -23,7 +23,7 @@ export class PublishConnection implements Connection { streamrClient: StreamrClient, payloadFormat: PayloadFormat ): Promise { - const logger = new Logger(module, { socketId }) + const logger = new Logger('PublishConnection', { socketId }) const msgChainId = uuid() ws.on('message', async (data: WebSocket.RawData) => { const payload = data.toString() diff --git a/packages/node/src/plugins/websocket/SubscribeConnection.ts b/packages/node/src/plugins/websocket/SubscribeConnection.ts index 12c72f3091..88326685d4 100644 --- a/packages/node/src/plugins/websocket/SubscribeConnection.ts +++ b/packages/node/src/plugins/websocket/SubscribeConnection.ts @@ -24,7 +24,7 @@ export class SubscribeConnection implements Connection { streamrClient: StreamrClient, payloadFormat: PayloadFormat ): Promise { - const logger = new Logger(module, { socketId }) + const logger = new Logger('SubscribeConnection', { socketId }) const streamPartDefinitions = (this.partitions !== undefined) ? this.partitions.map((partition: number) => ({ id: this.streamId, partition })) : [{ id: this.streamId }] diff --git a/packages/node/src/plugins/websocket/WebsocketServer.ts b/packages/node/src/plugins/websocket/WebsocketServer.ts index 06ea2a3138..fe646080a7 100644 --- a/packages/node/src/plugins/websocket/WebsocketServer.ts +++ b/packages/node/src/plugins/websocket/WebsocketServer.ts @@ -14,7 +14,7 @@ import { SubscribeConnection } from './SubscribeConnection' import { PayloadFormat } from '../../helpers/PayloadFormat' import { WebsocketPluginConfig } from './WebsocketPlugin' -const logger = new Logger(module) +const logger = new Logger('WebsocketServer') enum Action { PUBLISH = 'publish', diff --git a/packages/node/test/integration/plugins/operator/checkOperatorValueBreach.test.ts b/packages/node/test/integration/plugins/operator/checkOperatorValueBreach.test.ts index d31b48a361..72589296e3 100644 --- a/packages/node/test/integration/plugins/operator/checkOperatorValueBreach.test.ts +++ b/packages/node/test/integration/plugins/operator/checkOperatorValueBreach.test.ts @@ -13,7 +13,7 @@ const { getOperatorContract } = _operatorContractUtils -const logger = new Logger(module) +const logger = new Logger('checkOperatorValueBreach.test') const STREAM_CREATION_KEY = '0xb1abdb742d3924a45b0a54f780f0f21b9d9283b231a0a0b35ce5e455fa5375e7' const ONE_ETHER = BigInt(1e18) diff --git a/packages/node/test/integration/plugins/operator/maintainOperatorValue.test.ts b/packages/node/test/integration/plugins/operator/maintainOperatorValue.test.ts index afe1ffaf00..8b76978023 100644 --- a/packages/node/test/integration/plugins/operator/maintainOperatorValue.test.ts +++ b/packages/node/test/integration/plugins/operator/maintainOperatorValue.test.ts @@ -12,7 +12,7 @@ const { getOperatorContract } = _operatorContractUtils -const logger = new Logger(module) +const logger = new Logger('maintainOperatorValue.test') const STAKE_AMOUNT = parseEther('10000') const SAFETY_FRACTION = 0.5 // 50% diff --git a/packages/node/test/integration/plugins/storage/storage-lots-of-data.test.ts b/packages/node/test/integration/plugins/storage/storage-lots-of-data.test.ts index 9f1394fa00..4c3a5ec3f6 100644 --- a/packages/node/test/integration/plugins/storage/storage-lots-of-data.test.ts +++ b/packages/node/test/integration/plugins/storage/storage-lots-of-data.test.ts @@ -14,7 +14,7 @@ const MAX_BUCKET_MESSAGE_COUNT = 20 const NUM_MESSAGES = 1000 const MESSAGE_SIZE = 1e3 // 1k -const logger = new Logger(module) +const logger = new Logger('storage-lots-of-data.test') function retryFlakyTest(fn: () => Promise, isFlakyError: (e: Error) => boolean, maxRuns: number): () => Promise { return async () => { diff --git a/packages/node/test/smoke/autostaker.test.ts b/packages/node/test/smoke/autostaker.test.ts index eb4430195b..da07a2bd28 100644 --- a/packages/node/test/smoke/autostaker.test.ts +++ b/packages/node/test/smoke/autostaker.test.ts @@ -66,7 +66,7 @@ const SPONSORSHIP_3_EARNINGS_PER_SECOND = parseEther('40') const SPONSORSHIP_3_SPONSOR_AMOUNT = parseEther('90000') const RUN_INTERVAL = 10 * 1000 -const logger = new Logger(module) +const logger = new Logger('autostaker.test') const createStream = async (): Promise => { const creator = createClient(await createTestPrivateKey({ gas: true })) diff --git a/packages/node/test/smoke/inspect.test.ts b/packages/node/test/smoke/inspect.test.ts index 27a62cc042..4237ace1c2 100644 --- a/packages/node/test/smoke/inspect.test.ts +++ b/packages/node/test/smoke/inspect.test.ts @@ -78,7 +78,7 @@ const PRE_BAKED_OPERATORS = [{ const DEV_CHAIN_DEFAULT_MINING_INTERVAL = 1000 // hardhat config option in dev-chain -const logger = new Logger(module) +const logger = new Logger('inspect.test') const createStream = async (): Promise => { const creator = createClient(await createTestPrivateKey({ gas: true })) @@ -132,7 +132,7 @@ const createTheGraphClient = (): TheGraphClient => { return new TheGraphClient({ serverUrl: CHAIN_CONFIG.dev2.theGraphUrl, fetch, - logger: new Logger(module) + logger }) } diff --git a/packages/node/test/unit/plugins/operator/inspectionUtils.test.ts b/packages/node/test/unit/plugins/operator/inspectionUtils.test.ts index 7eba77a066..7baf99bfb3 100644 --- a/packages/node/test/unit/plugins/operator/inspectionUtils.test.ts +++ b/packages/node/test/unit/plugins/operator/inspectionUtils.test.ts @@ -20,7 +20,7 @@ const PEER_DESCRIPTOR_ONE = { nodeId: '0x1111' } const PEER_DESCRIPTOR_TWO = { nodeId: '0x2222' } const PEER_DESCRIPTOR_THREE = { nodeId: '0x3333' } -const logger = new Logger(module) +const logger = new Logger('inspectionUtils.test') describe(findTarget, () => { let operator: MockProxy diff --git a/packages/proto-rpc/src/ClientTransport.ts b/packages/proto-rpc/src/ClientTransport.ts index e1b0c4f401..c18102e996 100644 --- a/packages/proto-rpc/src/ClientTransport.ts +++ b/packages/proto-rpc/src/ClientTransport.ts @@ -30,7 +30,7 @@ export interface ResultParts { messageParser: (bytes: Uint8Array) => object } -const logger = new Logger(module) +const logger = new Logger('ClientTransport') export class ClientTransport extends EventEmitter implements RpcTransport { private static objectCount = 0 diff --git a/packages/proto-rpc/src/RpcCommunicator.ts b/packages/proto-rpc/src/RpcCommunicator.ts index d6270fcc6b..150afbcf70 100644 --- a/packages/proto-rpc/src/RpcCommunicator.ts +++ b/packages/proto-rpc/src/RpcCommunicator.ts @@ -108,7 +108,7 @@ class OngoingRequest { } } -const logger = new Logger(module) +const logger = new Logger('RpcCommunicator') interface RpcResponseParams { request: RpcMessage diff --git a/packages/proto-rpc/src/ServerRegistry.ts b/packages/proto-rpc/src/ServerRegistry.ts index 9f2aab3628..a5ac3e278e 100644 --- a/packages/proto-rpc/src/ServerRegistry.ts +++ b/packages/proto-rpc/src/ServerRegistry.ts @@ -33,7 +33,7 @@ interface RegisteredNotification { options: MethodOptions } -const logger = new Logger(module) +const logger = new Logger('ServerRegistry') export function parseWrapper(parseFn: () => T): T | never { try { diff --git a/packages/sdk/src/NetworkNodeFacade.ts b/packages/sdk/src/NetworkNodeFacade.ts index d85b9a2f28..bf3728c80d 100644 --- a/packages/sdk/src/NetworkNodeFacade.ts +++ b/packages/sdk/src/NetworkNodeFacade.ts @@ -92,7 +92,7 @@ export class NetworkNodeFactory { } } -const logger = new Logger(module) +const logger = new Logger('NetworkNodeFacade') /** * Wrap a network node. diff --git a/packages/sdk/src/ProxyNodeFinder.ts b/packages/sdk/src/ProxyNodeFinder.ts index 4ce029849b..d246753c0a 100644 --- a/packages/sdk/src/ProxyNodeFinder.ts +++ b/packages/sdk/src/ProxyNodeFinder.ts @@ -26,7 +26,7 @@ export class ProxyNodeFinder { this.streamIdBuilder = streamIdBuilder this.operatorRegistry = operatorRegistry this.node = node - this.logger = loggerFactory.createLogger(module) + this.logger = loggerFactory.createLogger('ProxyNodeFinder') } async find(streamDefinition: StreamDefinition, diff --git a/packages/sdk/src/StreamrClient.ts b/packages/sdk/src/StreamrClient.ts index e01c59f483..65db8d99bf 100644 --- a/packages/sdk/src/StreamrClient.ts +++ b/packages/sdk/src/StreamrClient.ts @@ -89,7 +89,7 @@ export interface ExtraSubscribeOptions { delivery?: StreamPartDeliveryOptions } -const logger = new Logger(module) +const logger = new Logger('StreamrClient') /** * The main API used to interact with Streamr. diff --git a/packages/sdk/src/contracts/ChainEventPoller.ts b/packages/sdk/src/contracts/ChainEventPoller.ts index cf706aec3e..c12a7e93cd 100644 --- a/packages/sdk/src/contracts/ChainEventPoller.ts +++ b/packages/sdk/src/contracts/ChainEventPoller.ts @@ -56,7 +56,7 @@ export class ChainEventPoller { const abortController = new AbortController() this.abortController = abortController setImmediate(async () => { - const logger = new Logger(module, { sessionId: randomString(6) }) + const logger = new Logger('ChainEventPoller', { sessionId: randomString(6) }) logger.debug('Start polling', { pollInterval: this.pollInterval }) let fromBlock: number | undefined = undefined diff --git a/packages/sdk/src/contracts/Operator.ts b/packages/sdk/src/contracts/Operator.ts index e473fd0d37..83bd89296e 100644 --- a/packages/sdk/src/contracts/Operator.ts +++ b/packages/sdk/src/contracts/Operator.ts @@ -105,7 +105,7 @@ const compareBigInts = (a: bigint, b: bigint) => { } } -const logger = new Logger(module) +const logger = new Logger('Operator') /** * @deprecated diff --git a/packages/sdk/src/contracts/OperatorRegistry.ts b/packages/sdk/src/contracts/OperatorRegistry.ts index 7687b2d9a9..22845a67cb 100644 --- a/packages/sdk/src/contracts/OperatorRegistry.ts +++ b/packages/sdk/src/contracts/OperatorRegistry.ts @@ -39,7 +39,7 @@ export class OperatorRegistry { loggerFactory: LoggerFactory ) { this.theGraphClient = theGraphClient - this.logger = loggerFactory.createLogger(module) + this.logger = loggerFactory.createLogger('OperatorRegistry') } async findRandomNetworkEntrypoints( diff --git a/packages/sdk/src/contracts/StreamRegistry.ts b/packages/sdk/src/contracts/StreamRegistry.ts index 9f98001fc9..183659a80f 100644 --- a/packages/sdk/src/contracts/StreamRegistry.ts +++ b/packages/sdk/src/contracts/StreamRegistry.ts @@ -136,7 +136,7 @@ export class StreamRegistry { this.streamIdBuilder = streamIdBuilder this.config = config this.identity = identity - this.logger = loggerFactory.createLogger(module) + this.logger = loggerFactory.createLogger('StreamRegistry') this.streamRegistryContractReadonly = this.contractFactory.createReadContract( toEthereumAddress(this.config.contracts.streamRegistryChainAddress), StreamRegistryABI, diff --git a/packages/sdk/src/contracts/StreamStorageRegistry.ts b/packages/sdk/src/contracts/StreamStorageRegistry.ts index f315359cd0..f27d50c4b0 100644 --- a/packages/sdk/src/contracts/StreamStorageRegistry.ts +++ b/packages/sdk/src/contracts/StreamStorageRegistry.ts @@ -64,7 +64,7 @@ export class StreamStorageRegistry { this.theGraphClient = theGraphClient this.config = config this.identity = identity - this.logger = loggerFactory.createLogger(module) + this.logger = loggerFactory.createLogger('StreamStorageRegistry') this.streamStorageRegistryContractReadonly = this.contractFactory.createReadContract( toEthereumAddress(this.config.contracts.streamStorageRegistryChainAddress), StreamStorageRegistryABI, diff --git a/packages/sdk/src/contracts/contract.ts b/packages/sdk/src/contracts/contract.ts index 22d5032562..9e4919ecf7 100644 --- a/packages/sdk/src/contracts/contract.ts +++ b/packages/sdk/src/contracts/contract.ts @@ -35,7 +35,7 @@ const isTransactionResponse = (returnValue: any): returnValue is ContractTransac } const createLogger = (eventEmitter: EventEmitter, loggerFactory: LoggerFactory): void => { - const logger = loggerFactory.createLogger(module) + const logger = loggerFactory.createLogger('contract') eventEmitter.on('onMethodExecute', (methodName: string) => { logger.debug('Execute method', { methodName }) }) @@ -177,7 +177,7 @@ export const initContractEventGateway = < transformation: (eventArgs: TSourcePayloads, blockNumber: number) => Parameters[0] loggerFactory: LoggerFactory }): void => { - const logger = opts.loggerFactory.createLogger(module) + const logger = opts.loggerFactory.createLogger('contract') type Listener = (eventArgs: TSourcePayloads, blockNumber: number) => void initEventGateway( opts.targetName, diff --git a/packages/sdk/src/contracts/operatorContractUtils.ts b/packages/sdk/src/contracts/operatorContractUtils.ts index 59caab7728..83a2ae18fe 100644 --- a/packages/sdk/src/contracts/operatorContractUtils.ts +++ b/packages/sdk/src/contracts/operatorContractUtils.ts @@ -28,7 +28,7 @@ import { SignerWithProvider } from '../identity/Identity' const FRACTION_MAX = parseEther('1') -const logger = new Logger(module) +const logger = new Logger('operatorContractUtils') /** * @deprecated diff --git a/packages/sdk/src/encryption/LocalGroupKeyStore.ts b/packages/sdk/src/encryption/LocalGroupKeyStore.ts index 33f8949a7b..72e0f7d81a 100644 --- a/packages/sdk/src/encryption/LocalGroupKeyStore.ts +++ b/packages/sdk/src/encryption/LocalGroupKeyStore.ts @@ -60,7 +60,7 @@ export class LocalGroupKeyStore { ) { this.persistenceManager = persistenceManager this.eventEmitter = eventEmitter - this.logger = loggerFactory.createLogger(module) + this.logger = loggerFactory.createLogger('LocalGroupKeyStore') } async get(keyId: string, publisherId: UserID): Promise { diff --git a/packages/sdk/src/encryption/PublisherKeyExchange.ts b/packages/sdk/src/encryption/PublisherKeyExchange.ts index c29393772e..31b80c74f6 100644 --- a/packages/sdk/src/encryption/PublisherKeyExchange.ts +++ b/packages/sdk/src/encryption/PublisherKeyExchange.ts @@ -38,8 +38,6 @@ enum ResponseType { ERC_1271 } -const logger = new Logger(module) - @scoped(Lifecycle.ContainerScoped) export class PublisherKeyExchange { @@ -70,7 +68,7 @@ export class PublisherKeyExchange { this.messageSigner = messageSigner this.store = store this.identity = identity - this.logger = loggerFactory.createLogger(module) + this.logger = loggerFactory.createLogger('PublisherKeyExchange') this.config = config // Setting explicit keys disables the key-exchange if (config.encryption.keys === undefined) { @@ -82,7 +80,7 @@ export class PublisherKeyExchange { if (msg.signatureType === SignatureType.ERC_1271) { const publisherId = msg.getPublisherId() if (!this.erc1271Publishers.has(publisherId)) { - logger.debug('Add ERC-1271 publisher', { publisherId }) + this.logger.debug('Add ERC-1271 publisher', { publisherId }) this.erc1271Publishers.add(publisherId) } } diff --git a/packages/sdk/src/encryption/SubscriberKeyExchange.ts b/packages/sdk/src/encryption/SubscriberKeyExchange.ts index 2b65d186ce..3c095f1177 100644 --- a/packages/sdk/src/encryption/SubscriberKeyExchange.ts +++ b/packages/sdk/src/encryption/SubscriberKeyExchange.ts @@ -63,7 +63,7 @@ export class SubscriberKeyExchange { this.store = store this.subscriber = subscriber this.identity = identity - this.logger = loggerFactory.createLogger(module) + this.logger = loggerFactory.createLogger('SubscriberKeyExchange') this.config = config // Setting explicit keys disables the key-exchange if (config.encryption.keys === undefined) { diff --git a/packages/sdk/src/subscribe/Resends.ts b/packages/sdk/src/subscribe/Resends.ts index 4b288b9049..5077b5c2cb 100644 --- a/packages/sdk/src/subscribe/Resends.ts +++ b/packages/sdk/src/subscribe/Resends.ts @@ -137,7 +137,7 @@ export class Resends { this.storageNodeRegistry = storageNodeRegistry this.messagePipelineFactory = messagePipelineFactory this.config = config - this.logger = loggerFactory.createLogger(module) + this.logger = loggerFactory.createLogger('Resends') } async resend( diff --git a/packages/sdk/src/subscribe/Subscriber.ts b/packages/sdk/src/subscribe/Subscriber.ts index 052b01235c..cc40fb2b55 100644 --- a/packages/sdk/src/subscribe/Subscriber.ts +++ b/packages/sdk/src/subscribe/Subscriber.ts @@ -21,7 +21,7 @@ export class Subscriber { ) { this.node = node this.messagePipelineFactory = messagePipelineFactory - this.logger = loggerFactory.createLogger(module) + this.logger = loggerFactory.createLogger('Subscriber') } getOrCreateSubscriptionSession(streamPartId: StreamPartID): SubscriptionSession { diff --git a/packages/sdk/src/subscribe/Subscription.ts b/packages/sdk/src/subscribe/Subscription.ts index f8459b2d79..dd09e0d5c6 100644 --- a/packages/sdk/src/subscribe/Subscription.ts +++ b/packages/sdk/src/subscribe/Subscription.ts @@ -49,7 +49,7 @@ export class Subscription extends MessageStream { this.erc1271ContractAddress = erc1271ContractAddress this.deliveryOptions = deliveryOptions this.eventEmitter = eventEmitter - this.logger = loggerFactory.createLogger(module) + this.logger = loggerFactory.createLogger('Subscription') this.onError.listen((err) => { this.eventEmitter.emit('error', err) this.logger.debug('Encountered error', { err }) diff --git a/packages/sdk/src/subscribe/messagePipeline.ts b/packages/sdk/src/subscribe/messagePipeline.ts index 486abc5c57..120817a45d 100644 --- a/packages/sdk/src/subscribe/messagePipeline.ts +++ b/packages/sdk/src/subscribe/messagePipeline.ts @@ -36,7 +36,7 @@ export interface MessagePipelineOptions { export const createMessagePipeline = (opts: MessagePipelineOptions): PushPipeline => { - const logger = opts.loggerFactory.createLogger(module) + const logger = opts.loggerFactory.createLogger('messagePipeline') const onError = (error: Error | StreamrClientError, streamMessage?: StreamMessage) => { if (streamMessage) { diff --git a/packages/sdk/src/subscribe/ordering/GapFiller.ts b/packages/sdk/src/subscribe/ordering/GapFiller.ts index fe8560c53c..10411f1a2d 100644 --- a/packages/sdk/src/subscribe/ordering/GapFiller.ts +++ b/packages/sdk/src/subscribe/ordering/GapFiller.ts @@ -3,7 +3,7 @@ import sample from 'lodash/sample' import { StreamMessage } from '../../protocol/StreamMessage' import { Gap, OrderedMessageChain } from './OrderedMessageChain' -const logger = new Logger(module) +const logger = new Logger('GapFiller') export type GapFillStrategy = 'light' | 'full' diff --git a/packages/sdk/src/subscribe/ordering/OrderedMessageChain.ts b/packages/sdk/src/subscribe/ordering/OrderedMessageChain.ts index 0dda0fa94e..1bfc902809 100644 --- a/packages/sdk/src/subscribe/ordering/OrderedMessageChain.ts +++ b/packages/sdk/src/subscribe/ordering/OrderedMessageChain.ts @@ -24,7 +24,7 @@ export interface Events { unfillableGap: (gap: Gap) => void } -const logger = new Logger(module) +const logger = new Logger('OrderedMessageChain') const areEqualRefs = (ref1: MessageRef, ref2: MessageRef) => { return ref1.compareTo(ref2) === 0 diff --git a/packages/sdk/src/subscribe/resendSubscription.ts b/packages/sdk/src/subscribe/resendSubscription.ts index 451391c6a0..8a1f96e658 100644 --- a/packages/sdk/src/subscribe/resendSubscription.ts +++ b/packages/sdk/src/subscribe/resendSubscription.ts @@ -30,7 +30,7 @@ export const initResendSubscription = ( yield* resentMsgs } catch (err) { if (err.code === 'NO_STORAGE_NODES') { - loggerFactory.createLogger(module).warn('Skip resend (no storage assigned to stream)', { + loggerFactory.createLogger('resendSubscription').warn('Skip resend (no storage assigned to stream)', { streamPartId: subscription.streamPartId, resendOptions }) diff --git a/packages/sdk/src/subscribe/waitForStorage.ts b/packages/sdk/src/subscribe/waitForStorage.ts index e8f44f68dd..7f9a02eaeb 100644 --- a/packages/sdk/src/subscribe/waitForStorage.ts +++ b/packages/sdk/src/subscribe/waitForStorage.ts @@ -5,7 +5,7 @@ import { StreamStorageRegistry } from '../contracts/StreamStorageRegistry' import { StreamMessage } from '../protocol/StreamMessage' import { Resends } from './Resends' -const logger = new Logger(module) +const logger = new Logger('waitForStorage') export const waitForStorage = async ( message: Message, diff --git a/packages/sdk/src/utils/LoggerFactory.ts b/packages/sdk/src/utils/LoggerFactory.ts index 1eaf7aace3..8332d1a5dd 100644 --- a/packages/sdk/src/utils/LoggerFactory.ts +++ b/packages/sdk/src/utils/LoggerFactory.ts @@ -1,4 +1,4 @@ -import { Logger } from '@streamr/utils' +import { Logger, type LoggerModule } from '@streamr/utils' import { inject, Lifecycle, scoped } from 'tsyringe' import { ConfigInjectionToken, StrictStreamrClientConfig } from '../Config' @@ -13,7 +13,7 @@ export class LoggerFactory { this.config = config } - createLogger(module: NodeJS.Module): Logger { - return new Logger(module, { id: this.config.id }, this.config.logLevel) + createLogger(loggerModule: LoggerModule): Logger { + return new Logger(loggerModule, { id: this.config.id }, this.config.logLevel) } } diff --git a/packages/sdk/src/utils/LoggingJsonRpcProvider.ts b/packages/sdk/src/utils/LoggingJsonRpcProvider.ts index 2bb5b10ccf..7867e18dab 100644 --- a/packages/sdk/src/utils/LoggingJsonRpcProvider.ts +++ b/packages/sdk/src/utils/LoggingJsonRpcProvider.ts @@ -1,7 +1,7 @@ import { JsonRpcApiProviderOptions, JsonRpcProvider, Networkish, FetchRequest } from 'ethers' import { Logger, randomString } from '@streamr/utils' -const logger = new Logger(module) +const logger = new Logger('LoggingJsonRpcProvider') export class LoggingJsonRpcProvider extends JsonRpcProvider { private readonly urlConfig: FetchRequest diff --git a/packages/sdk/src/utils/persistence/ServerPersistence.ts b/packages/sdk/src/utils/persistence/ServerPersistence.ts index 28fd42c7b8..a367352b77 100644 --- a/packages/sdk/src/utils/persistence/ServerPersistence.ts +++ b/packages/sdk/src/utils/persistence/ServerPersistence.ts @@ -41,7 +41,7 @@ export default class ServerPersistence implements PersistenceContext { migrationsPath, onInit }: ServerPersistenceOptions) { - this.logger = loggerFactory.createLogger(module) + this.logger = loggerFactory.createLogger('ServerPersistence') const paths = envPaths('streamr-sdk') // ownerId could be too long for the FS, but unlikely to collide locally - concatenate to first 50 chars this.dbFilePath = resolve(paths.data, join('./', ownerId.substring(0, 50), `GroupKeys.db`)) diff --git a/packages/sdk/src/utils/utils.ts b/packages/sdk/src/utils/utils.ts index eaf123cb77..c3f32d751b 100644 --- a/packages/sdk/src/utils/utils.ts +++ b/packages/sdk/src/utils/utils.ts @@ -12,7 +12,7 @@ import { StreamrClientEventEmitter } from '../events' import { WebStreamToNodeStream } from './WebStreamToNodeStream' import { SEPARATOR } from './uuid' -const logger = new Logger(module) +const logger = new Logger('sdk-utils') /** * Generates counter-based ids. diff --git a/packages/sdk/src/utils/waitForAssignmentsToPropagate.ts b/packages/sdk/src/utils/waitForAssignmentsToPropagate.ts index 7d4adeb702..d457103350 100644 --- a/packages/sdk/src/utils/waitForAssignmentsToPropagate.ts +++ b/packages/sdk/src/utils/waitForAssignmentsToPropagate.ts @@ -23,7 +23,7 @@ export async function waitForAssignmentsToPropagate( } } } catch { - loggerFactory.createLogger(module).debug('Ignore malformed content') + loggerFactory.createLogger('waitForAssignmentsToPropagate').debug('Ignore malformed content') } } } diff --git a/packages/sdk/test/end-to-end/Operator.test.ts b/packages/sdk/test/end-to-end/Operator.test.ts index 999a6c88d4..41b066e799 100644 --- a/packages/sdk/test/end-to-end/Operator.test.ts +++ b/packages/sdk/test/end-to-end/Operator.test.ts @@ -34,7 +34,7 @@ const createTheGraphClient = (): TheGraphClient => { return new TheGraphClient({ serverUrl: CHAIN_CONFIG.dev2.theGraphUrl, fetch: (...params: Parameters) => fetch(...params), - logger: new Logger(module) + logger: new Logger('Operator.test') }) } diff --git a/packages/sdk/test/end-to-end/operatorContractUtils.test.ts b/packages/sdk/test/end-to-end/operatorContractUtils.test.ts index 10b2218f2d..a65be4ba87 100644 --- a/packages/sdk/test/end-to-end/operatorContractUtils.test.ts +++ b/packages/sdk/test/end-to-end/operatorContractUtils.test.ts @@ -9,7 +9,7 @@ const createTheGraphClient = (): TheGraphClient => { return new TheGraphClient({ serverUrl: CHAIN_CONFIG.dev2.theGraphUrl, fetch, - logger: new Logger(module) + logger: new Logger('operatorContractUtils.test') }) } diff --git a/packages/sdk/test/test-utils/LeaksDetector.ts b/packages/sdk/test/test-utils/LeaksDetector.ts index 54e6d3a6b5..b4280734d6 100644 --- a/packages/sdk/test/test-utils/LeaksDetector.ts +++ b/packages/sdk/test/test-utils/LeaksDetector.ts @@ -2,7 +2,7 @@ import LeakDetector from 'jest-leak-detector' // requires weak-napi import { Logger, wait } from '@streamr/utils' import { CounterId, instanceId } from '../../src/utils/utils' -const logger = new Logger(module) +const logger = new Logger('LeaksDetector') export class LeaksDetector { private leakDetectors: Map = new Map() diff --git a/packages/sdk/test/test-utils/ProxyHttpServer.ts b/packages/sdk/test/test-utils/ProxyHttpServer.ts index bfda0a0159..b74d2e131c 100644 --- a/packages/sdk/test/test-utils/ProxyHttpServer.ts +++ b/packages/sdk/test/test-utils/ProxyHttpServer.ts @@ -10,7 +10,7 @@ export interface ProxyHttpServerRequest { timestamp: number } -const logger = new Logger(module) +const logger = new Logger('ProxyHttpServer') /** * Forwards requests to targetUrl. Supports only JSON requests and responses. diff --git a/packages/sdk/test/test-utils/deployTestERC1271Contract.ts b/packages/sdk/test/test-utils/deployTestERC1271Contract.ts index 4ec6601501..29eedf0c94 100644 --- a/packages/sdk/test/test-utils/deployTestERC1271Contract.ts +++ b/packages/sdk/test/test-utils/deployTestERC1271Contract.ts @@ -8,7 +8,7 @@ import { createTestClient } from './utils' // eslint-disable-next-line max-len const MOCK_ERC1271_BYTECODE = '0x608060405234801561001057600080fd5b5061073e806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80631626ba7e14610051578063a39fac1214610082578063b810fb4314610097578063b9571721146100c2575b600080fd5b61006461005f366004610527565b6100d7565b6040516001600160e01b031990911681526020015b60405180910390f35b61008a610194565b60405161007991906105a3565b6100aa6100a53660046105f0565b6101f6565b6040516001600160a01b039091168152602001610079565b6100d56100d0366004610609565b610220565b005b60008061011a8585858080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061023192505050565b905060005b60005481101561017f576000818154811061013c5761013c61067e565b6000918252602090912001546001600160a01b039081169083160361016d5750630b135d3f60e11b915061018d9050565b80610177816106aa565b91505061011f565b506001600160e01b03199150505b9392505050565b606060008054806020026020016040519081016040528092919081815260200182805480156101ec57602002820191906000526020600020905b81546001600160a01b031681526001909101906020018083116101ce575b5050505050905090565b6000818154811061020657600080fd5b6000918252602090912001546001600160a01b0316905081565b61022c600083836104af565b505050565b6000815160411461029d5760405162461bcd60e51b815260206004820152603a60248201526000805160206106e983398151915260448201527f3a20696e76616c6964207369676e6174757265206c656e67746800000000000060648201526084015b60405180910390fd5b81516041146102e95760405162461bcd60e51b81526020600482015260186024820152770cae4e4dee4bec4c2c8a6d2cedcc2e8eae4ca98cadccee8d60431b6044820152606401610294565b60208201516040830151606084015160001a601b8110156103125761030f601b826106c3565b90505b8060ff16601b148061032757508060ff16601c145b61036f5760405162461bcd60e51b815260206004820152601960248201527832b93937b92fb130b229b4b3b730ba3ab932ab32b939b4b7b760391b6044820152606401610294565b6fa2a8918ca85bafe22016d0b997e4df60600160ff1b038211156103e95760405162461bcd60e51b815260206004820152603d60248201526000805160206106e983398151915260448201527f3a20696e76616c6964207369676e6174757265202773272076616c75650000006064820152608401610294565b60408051600081526020810180835288905260ff831691810191909152606081018490526080810183905260019060a0016020604051602081039080840390855afa15801561043c573d6000803e3d6000fd5b5050604051601f1901519450506001600160a01b0384166104a65760405162461bcd60e51b815260206004820152603060248201526000805160206106e983398151915260448201526f1d1024a72b20a624a22fa9a4a3a722a960811b6064820152608401610294565b50505092915050565b828054828255906000526020600020908101928215610502579160200282015b828111156105025781546001600160a01b0319166001600160a01b038435161782556020909201916001909101906104cf565b5061050e929150610512565b5090565b5b8082111561050e5760008155600101610513565b60008060006040848603121561053c57600080fd5b83359250602084013567ffffffffffffffff8082111561055b57600080fd5b818601915086601f83011261056f57600080fd5b81358181111561057e57600080fd5b87602082850101111561059057600080fd5b6020830194508093505050509250925092565b6020808252825182820181905260009190848201906040850190845b818110156105e45783516001600160a01b0316835292840192918401916001016105bf565b50909695505050505050565b60006020828403121561060257600080fd5b5035919050565b6000806020838503121561061c57600080fd5b823567ffffffffffffffff8082111561063457600080fd5b818501915085601f83011261064857600080fd5b81358181111561065757600080fd5b8660208260051b850101111561066c57600080fd5b60209290920196919550909350505050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b6000600182016106bc576106bc610694565b5060010190565b600060ff821660ff84168060ff038211156106e0576106e0610694565b01939250505056fe5369676e617475726556616c696461746f72237265636f7665725369676e6572a26469706673582212204d63ca09e554a9f4f26eccc364f853af6151a0d89c0a649da9cb75b38a57ec4f64736f6c634300080d0033' -const logger = new Logger(module) +const logger = new Logger('deployTestERC1271Contract') export async function deployTestERC1271Contract(allowedAddresses: EthereumAddress[]): Promise { const privateKey = await createTestPrivateKey({ gas: true }) diff --git a/packages/sdk/test/test-utils/utils.ts b/packages/sdk/test/test-utils/utils.ts index 3993380085..ea2120a658 100644 --- a/packages/sdk/test/test-utils/utils.ts +++ b/packages/sdk/test/test-utils/utils.ts @@ -58,7 +58,7 @@ import { FakeStorageNode } from './../test-utils/fake/FakeStorageNode' import { addAfterFn } from './jest-utils' import { StreamIDBuilder } from '../../src/StreamIDBuilder' -const logger = new Logger(module) +const logger = new Logger('sdk-test-utils') export function mockLoggerFactory(clientId?: string): LoggerFactory { return new LoggerFactory({ diff --git a/packages/test-utils/src/index.ts b/packages/test-utils/src/index.ts index 5ef095bf63..e6cc6958b5 100644 --- a/packages/test-utils/src/index.ts +++ b/packages/test-utils/src/index.ts @@ -12,7 +12,7 @@ import { Readable } from 'stream' export type Event = string -const logger = new Logger(module) +const logger = new Logger('test-utils') /** * Collect data of a stream into an array. The array is wrapped in a diff --git a/packages/trackerless-network/src/ContentDeliveryManager.ts b/packages/trackerless-network/src/ContentDeliveryManager.ts index cd07950a67..7b8a48b12d 100644 --- a/packages/trackerless-network/src/ContentDeliveryManager.ts +++ b/packages/trackerless-network/src/ContentDeliveryManager.ts @@ -56,7 +56,7 @@ export interface Events { newMessage: (msg: StreamMessage) => void } -const logger = new Logger(module) +const logger = new Logger('ContentDeliveryManager') interface Metrics extends MetricsDefinition { broadcastMessagesPerSecond: Metric diff --git a/packages/trackerless-network/src/NetworkStack.ts b/packages/trackerless-network/src/NetworkStack.ts index e9924005b2..a6d2601359 100644 --- a/packages/trackerless-network/src/NetworkStack.ts +++ b/packages/trackerless-network/src/NetworkStack.ts @@ -23,7 +23,7 @@ export interface NetworkOptions { metricsContext?: MetricsContext } -const logger = new Logger(module) +const logger = new Logger('NetworkStack') const instances: NetworkStack[] = [] const stopInstances = async () => { diff --git a/packages/trackerless-network/src/StreamPartNetworkSplitAvoidance.ts b/packages/trackerless-network/src/StreamPartNetworkSplitAvoidance.ts index 588f0f22b2..2cf328f4de 100644 --- a/packages/trackerless-network/src/StreamPartNetworkSplitAvoidance.ts +++ b/packages/trackerless-network/src/StreamPartNetworkSplitAvoidance.ts @@ -10,7 +10,7 @@ import { DiscoveryLayerNode } from './discovery-layer/DiscoveryLayerNode' * networks. */ -const logger = new Logger(module) +const logger = new Logger('StreamPartNetworkSplitAvoidance') const exponentialRunOff = async ( task: () => Promise, diff --git a/packages/trackerless-network/src/content-delivery-layer/ContentDeliveryLayerNode.ts b/packages/trackerless-network/src/content-delivery-layer/ContentDeliveryLayerNode.ts index a693b8ae91..6eb10eb2b0 100644 --- a/packages/trackerless-network/src/content-delivery-layer/ContentDeliveryLayerNode.ts +++ b/packages/trackerless-network/src/content-delivery-layer/ContentDeliveryLayerNode.ts @@ -71,7 +71,7 @@ export const DEFAULT_NODE_VIEW_SIZE = 20 export const DEFAULT_NEIGHBOR_TARGET_COUNT = 4 export const DEFAULT_ACCEPT_PROXY_CONNECTIONS = false -const logger = new Logger(module) +const logger = new Logger('ContentDeliveryLayerNode') export class ContentDeliveryLayerNode extends EventEmitter { diff --git a/packages/trackerless-network/src/content-delivery-layer/ContentDeliveryRpcRemote.ts b/packages/trackerless-network/src/content-delivery-layer/ContentDeliveryRpcRemote.ts index a7f9f7ec1b..a0cc012b04 100644 --- a/packages/trackerless-network/src/content-delivery-layer/ContentDeliveryRpcRemote.ts +++ b/packages/trackerless-network/src/content-delivery-layer/ContentDeliveryRpcRemote.ts @@ -6,7 +6,7 @@ import { } from '../../generated/packages/trackerless-network/protos/NetworkRpc' import { ContentDeliveryRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client' -const logger = new Logger(module) +const logger = new Logger('ContentDeliveryRpcRemote') export class ContentDeliveryRpcRemote extends RpcRemote { diff --git a/packages/trackerless-network/src/content-delivery-layer/inspection/Inspector.ts b/packages/trackerless-network/src/content-delivery-layer/inspection/Inspector.ts index cc2e522951..c5837b4d63 100644 --- a/packages/trackerless-network/src/content-delivery-layer/inspection/Inspector.ts +++ b/packages/trackerless-network/src/content-delivery-layer/inspection/Inspector.ts @@ -15,7 +15,7 @@ interface InspectorOptions { closeInspectConnection?: (peerDescriptor: PeerDescriptor, lockId: LockID) => Promise } -const logger = new Logger(module) +const logger = new Logger('Inspector') const DEFAULT_TIMEOUT = 60 * 1000 export class Inspector { diff --git a/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/HandshakeRpcLocal.ts b/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/HandshakeRpcLocal.ts index db008b85eb..f4a3921f28 100644 --- a/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/HandshakeRpcLocal.ts +++ b/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/HandshakeRpcLocal.ts @@ -30,7 +30,7 @@ interface HandshakeRpcLocalOptions { handshakeWithInterleaving: (target: PeerDescriptor, remoteNodeId: DhtAddress) => Promise } -const logger = new Logger(module) +const logger = new Logger('HandshakeRpcLocal') export class HandshakeRpcLocal implements IHandshakeRpc { diff --git a/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/HandshakeRpcRemote.ts b/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/HandshakeRpcRemote.ts index 4cf51d4950..b2f05700b5 100644 --- a/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/HandshakeRpcRemote.ts +++ b/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/HandshakeRpcRemote.ts @@ -4,7 +4,7 @@ import { v4 } from 'uuid' import { InterleaveRequest, InterleaveResponse, StreamPartHandshakeRequest } from '../../../generated/packages/trackerless-network/protos/NetworkRpc' import { HandshakeRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client' -const logger = new Logger(module) +const logger = new Logger('HandshakeRpcRemote') interface HandshakeResponse { accepted: boolean diff --git a/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/Handshaker.ts b/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/Handshaker.ts index e405b18b35..165883be4e 100644 --- a/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/Handshaker.ts +++ b/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/Handshaker.ts @@ -28,7 +28,7 @@ interface HandshakerOptions { rpcRequestTimeout?: number } -const logger = new Logger(module) +const logger = new Logger('Handshaker') const PARALLEL_HANDSHAKE_COUNT = 2 diff --git a/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/NeighborFinder.ts b/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/NeighborFinder.ts index 7e23b65e4b..c68bd45298 100644 --- a/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/NeighborFinder.ts +++ b/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/NeighborFinder.ts @@ -15,7 +15,7 @@ interface FindNeighborsSessionOptions { const INITIAL_WAIT = 100 const INTERVAL = 250 -const logger = new Logger(module) +const logger = new Logger('NeighborFinder') export class NeighborFinder { private readonly abortController: AbortController diff --git a/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/NeighborUpdateManager.ts b/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/NeighborUpdateManager.ts index 259fbb963c..024e4c7197 100644 --- a/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/NeighborUpdateManager.ts +++ b/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/NeighborUpdateManager.ts @@ -19,7 +19,7 @@ interface NeighborUpdateManagerOptions { ongoingHandshakes: Set } -const logger = new Logger(module) +const logger = new Logger('NeighborUpdateManager') export const DEFAULT_NEIGHBOR_UPDATE_INTERVAL = 10 * 1000 diff --git a/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/NeighborUpdateRpcRemote.ts b/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/NeighborUpdateRpcRemote.ts index c7c7938e96..4881c3f780 100644 --- a/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/NeighborUpdateRpcRemote.ts +++ b/packages/trackerless-network/src/content-delivery-layer/neighbor-discovery/NeighborUpdateRpcRemote.ts @@ -3,7 +3,7 @@ import { Logger, StreamPartID } from '@streamr/utils' import { NeighborUpdate } from '../../../generated/packages/trackerless-network/protos/NetworkRpc' import { NeighborUpdateRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client' -const logger = new Logger(module) +const logger = new Logger('NeighborUpdateRpcRemote') interface UpdateNeighborsResponse { peerDescriptors: PeerDescriptor[] diff --git a/packages/trackerless-network/src/content-delivery-layer/plumtree/PlumtreeManager.ts b/packages/trackerless-network/src/content-delivery-layer/plumtree/PlumtreeManager.ts index 8770c261dc..27bc9ef607 100644 --- a/packages/trackerless-network/src/content-delivery-layer/plumtree/PlumtreeManager.ts +++ b/packages/trackerless-network/src/content-delivery-layer/plumtree/PlumtreeManager.ts @@ -22,7 +22,7 @@ interface Options { } export const MAX_PAUSED_NEIGHBORS_DEFAULT = 3 -const logger = new Logger(module) +const logger = new Logger('PlumtreeManager') interface Events { message: (msg: StreamMessage) => void diff --git a/packages/trackerless-network/src/content-delivery-layer/proxy/ProxyClient.ts b/packages/trackerless-network/src/content-delivery-layer/proxy/ProxyClient.ts index 35c3217a3e..5d018c6d62 100644 --- a/packages/trackerless-network/src/content-delivery-layer/proxy/ProxyClient.ts +++ b/packages/trackerless-network/src/content-delivery-layer/proxy/ProxyClient.ts @@ -67,7 +67,7 @@ interface Events { message: (message: StreamMessage) => void } -const logger = new Logger(module) +const logger = new Logger('ProxyClient') const SERVICE_ID = 'system/proxy-client' diff --git a/packages/trackerless-network/src/content-delivery-layer/proxy/ProxyConnectionRpcLocal.ts b/packages/trackerless-network/src/content-delivery-layer/proxy/ProxyConnectionRpcLocal.ts index 6d0c775d4d..8a52da4215 100644 --- a/packages/trackerless-network/src/content-delivery-layer/proxy/ProxyConnectionRpcLocal.ts +++ b/packages/trackerless-network/src/content-delivery-layer/proxy/ProxyConnectionRpcLocal.ts @@ -12,7 +12,7 @@ import { ContentDeliveryRpcClient } from '../../../generated/packages/trackerles import { IProxyConnectionRpc } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.server' import { ContentDeliveryRpcRemote } from '../ContentDeliveryRpcRemote' -const logger = new Logger(module) +const logger = new Logger('ProxyConnectionRpcLocal') interface ProxyConnection { userId: UserID diff --git a/packages/trackerless-network/src/content-delivery-layer/proxy/ProxyConnectionRpcRemote.ts b/packages/trackerless-network/src/content-delivery-layer/proxy/ProxyConnectionRpcRemote.ts index 818523b8ba..e6d8b1f743 100644 --- a/packages/trackerless-network/src/content-delivery-layer/proxy/ProxyConnectionRpcRemote.ts +++ b/packages/trackerless-network/src/content-delivery-layer/proxy/ProxyConnectionRpcRemote.ts @@ -3,7 +3,7 @@ import { Logger, UserID, toUserIdRaw } from '@streamr/utils' import { ProxyConnectionRequest, ProxyDirection } from '../../../generated/packages/trackerless-network/protos/NetworkRpc' import { ProxyConnectionRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client' -const logger = new Logger(module) +const logger = new Logger('ProxyConnectionRpcRemote') export class ProxyConnectionRpcRemote extends RpcRemote { diff --git a/packages/trackerless-network/src/content-delivery-layer/temporary-connection/TemporaryConnectionRpcRemote.ts b/packages/trackerless-network/src/content-delivery-layer/temporary-connection/TemporaryConnectionRpcRemote.ts index bc6c80e599..549234f0a0 100644 --- a/packages/trackerless-network/src/content-delivery-layer/temporary-connection/TemporaryConnectionRpcRemote.ts +++ b/packages/trackerless-network/src/content-delivery-layer/temporary-connection/TemporaryConnectionRpcRemote.ts @@ -2,7 +2,7 @@ import { RpcRemote, toNodeId } from '@streamr/dht' import { Logger } from '@streamr/utils' import { TemporaryConnectionRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client' -const logger = new Logger(module) +const logger = new Logger('TemporaryConnectionRpcRemote') export class TemporaryConnectionRpcRemote extends RpcRemote { diff --git a/packages/trackerless-network/src/control-layer/PeerDescriptorStoreManager.ts b/packages/trackerless-network/src/control-layer/PeerDescriptorStoreManager.ts index e4b537f557..fdf1b948ef 100644 --- a/packages/trackerless-network/src/control-layer/PeerDescriptorStoreManager.ts +++ b/packages/trackerless-network/src/control-layer/PeerDescriptorStoreManager.ts @@ -11,7 +11,7 @@ const parsePeerDescriptor = (dataEntries: DataEntry[]): PeerDescriptor[] => { return dataEntries.filter((entry) => !entry.deleted).map((entry) => Any.unpack(entry.data!, PeerDescriptor)) } -const logger = new Logger(module) +const logger = new Logger('PeerDescriptorStoreManager') export const MAX_NODE_COUNT = 8 diff --git a/packages/trackerless-network/test/integration/ContentDeliveryLayerNode-Layer1Node.test.ts b/packages/trackerless-network/test/integration/ContentDeliveryLayerNode-Layer1Node.test.ts index 97f3080530..f054623143 100644 --- a/packages/trackerless-network/test/integration/ContentDeliveryLayerNode-Layer1Node.test.ts +++ b/packages/trackerless-network/test/integration/ContentDeliveryLayerNode-Layer1Node.test.ts @@ -6,7 +6,7 @@ import { DiscoveryLayerNode } from '../../src/discovery-layer/DiscoveryLayerNode import { createContentDeliveryLayerNode } from '../../src/content-delivery-layer/createContentDeliveryLayerNode' import { createMockPeerDescriptor } from '../utils/utils' -const logger = new Logger(module) +const logger = new Logger('ContentDeliveryLayerNode-Layer1Node.test') describe('ContentDeliveryLayerNode-DhtNode', () => { const otherNodeCount = 64 diff --git a/packages/utils/src/Logger.ts b/packages/utils/src/Logger.ts index e7ab7f432a..4fa44199db 100644 --- a/packages/utils/src/Logger.ts +++ b/packages/utils/src/Logger.ts @@ -72,7 +72,7 @@ function wrappedMethodCall( } } -type LoggerModule = string | { id: string } +export type LoggerModule = string | { id: string } export class Logger { static NAME_LENGTH = 25 diff --git a/packages/utils/src/TheGraphClient.ts b/packages/utils/src/TheGraphClient.ts index a49528a0be..3feb5fa109 100644 --- a/packages/utils/src/TheGraphClient.ts +++ b/packages/utils/src/TheGraphClient.ts @@ -36,7 +36,7 @@ export class TheGraphClient { ) { this.serverUrl = opts.serverUrl this.fetch = opts.fetch - this.logger = opts.logger ?? new Logger(module) + this.logger = opts.logger ?? new Logger('TheGraphClient') this.indexingState = new IndexingState( () => this.getIndexBlockNumber(), opts.indexTimeout ?? 60000, diff --git a/packages/utils/src/executeSafePromise.ts b/packages/utils/src/executeSafePromise.ts index 7ba147479f..55040b30d2 100644 --- a/packages/utils/src/executeSafePromise.ts +++ b/packages/utils/src/executeSafePromise.ts @@ -1,6 +1,6 @@ import { Logger } from './Logger' -const logger = new Logger(module) +const logger = new Logger('executeSafePromise') /** * Execute a promise that should never reject. If it does, log the error and exit the process. diff --git a/packages/utils/src/exports.ts b/packages/utils/src/exports.ts index a322f49558..c485f4b9bf 100644 --- a/packages/utils/src/exports.ts +++ b/packages/utils/src/exports.ts @@ -7,7 +7,7 @@ export { type ENSName, toENSName } from './ENSName' export { type EthereumAddress, toEthereumAddress } from './EthereumAddress' export { isENSName } from './isENSName' export { keyToArrayIndex } from './keyToArrayIndex' -export { Logger, type LogLevel } from './Logger' +export { Logger, type LogLevel, type LoggerModule } from './Logger' export { CountMetric, Metric, diff --git a/packages/utils/test/Logger.test.ts b/packages/utils/test/Logger.test.ts index 3912047057..389216ed64 100644 --- a/packages/utils/test/Logger.test.ts +++ b/packages/utils/test/Logger.test.ts @@ -17,7 +17,7 @@ describe('Logger', () => { logs.push(pick(JSON.parse(data), ['level', 'msg'])) } } - logger = new Logger(module, undefined, 'trace', pino({ + logger = new Logger('Logger', undefined, 'trace', pino({ level: 'trace', browser: { write: (o) => {