genesys-cloud-streaming-client 17.2.4-develop.109 → 17.2.4-verbose-logging.3

package/dist/cjs/client.d.ts

@@ -39,6 +39,17 @@ export declare class Client extends EventEmitter {
     _messenger: MessengerExtensionApi;
     _ping: Ping;
     constructor(options: IClientOptions);
+    _getAppInfoLoggerParams(): {
+        appId: string;
+        originAppName: string;
+        originAppVersion: string;
+        originAppId: string;
+        version: string;
+    };
+    _getStanzaConnectionInfo(): {
+        stanzaInstancaId: string | undefined;
+        channelId: string | undefined;
+    };
     private handleSendEventFromExtension;
     private checkIsBackgroundAssistant;
     private addInateEventHandlers;

package/dist/cjs/client.js

@@ -73,7 +73,8 @@ class Client extends events_1.default {
             initializeServerLogging: !this.isGuest && !options.optOutOfWebrtcStatsTelemetry,
             /* streaming-client logging info */
             appVersion: Client.version,
-            appName: 'streaming-client',
+            /* istanbul ignore next */
+            appName: (options.appName ? `${options.appName}:` : '') + 'streaming-client',
             logLevel: this.config.logLevel || 'info',
             logger: options.logger || console,
             formatters: options.logFormatters,
@@ -103,6 +104,24 @@ class Client extends events_1.default {
             this[extensionName] = extension.expose;
             this[`_${extensionName}`] = extension;
         });
+        this.logger.info('streaming-client instantiated', this._getAppInfoLoggerParams());
+    }
+    _getAppInfoLoggerParams() {
+        return {
+            appId: this.logger.clientId,
+            originAppName: this.config.appName || 'unknown',
+            originAppVersion: this.config.appVersion || 'unknown',
+            originAppId: this.config.appId || 'unknown',
+            version: this.version,
+        };
+    }
+    /* istanbul ignore next */
+    _getStanzaConnectionInfo() {
+        var _a, _b;
+        return {
+            stanzaInstancaId: (_a = this.activeStanzaInstance) === null || _a === void 0 ? void 0 : _a.id,
+            channelId: (_b = this.activeStanzaInstance) === null || _b === void 0 ? void 0 : _b.channelId
+        };
     }
     handleSendEventFromExtension(extension, data, message = false) {
         return extension.tokenBucket.removeTokens(1, () => {
@@ -178,7 +197,7 @@ class Client extends events_1.default {
     }
     async handleStanzaDisconnectedEvent(disconnectedInstance) {
         var _a, _b;
-        this.logger.info('stanzaDisconnected event received', { stanzaInstanceId: disconnectedInstance.id, channelId: disconnectedInstance.channelId });
+        this.logger.info('stanzaDisconnected event received', { ...this._getAppInfoLoggerParams(), stanzaInstanceId: disconnectedInstance.id, channelId: disconnectedInstance.channelId });
         this.connected = false;
         this.connecting = false;
         (_a = disconnectedInstance.pinger) === null || _a === void 0 ? void 0 : _a.stop();
@@ -197,7 +216,7 @@ class Client extends events_1.default {
     }
     handleNoLongerSubscribed(stanzaInstance) {
         var _a, _b;
-        this.logger.warn('noLongerSubscribed event received', { stanzaInstanceId: stanzaInstance.id, channelId: stanzaInstance.channelId });
+        this.logger.warn('noLongerSubscribed event received', { ...this._getAppInfoLoggerParams(), stanzaInstanceId: stanzaInstance.id, channelId: stanzaInstance.channelId });
         (_a = stanzaInstance.pinger) === null || _a === void 0 ? void 0 : _a.stop();
         (_b = stanzaInstance.serverMonitor) === null || _b === void 0 ? void 0 : _b.stop();
         this.hardReconnectRequired = true;
@@ -213,7 +232,7 @@ class Client extends events_1.default {
         this.hardReconnectRequired = true;
     }
     async disconnect() {
-        this.logger.info('streamingClient.disconnect was called');
+        this.logger.info('streamingClient.disconnect was called', { ...this._getAppInfoLoggerParams() });
         if (!this.activeStanzaInstance) {
             return;
         }
@@ -277,7 +296,7 @@ class Client extends events_1.default {
         }
         this.setConnectionData(newConnectionData);
         clearTimeout(this.backoffReductionTimer);
-        this.logger.debug('Setting timer for next backoff reduction since we haven\'t reached total reset', { msUntilReduction: msUntilNextReduction, delayMsAfterNextReduction: newConnectionData.delayMsAfterNextReduction });
+        this.logger.debug('Setting timer for next backoff reduction since we haven\'t reached total reset', { ...this._getAppInfoLoggerParams(), msUntilReduction: msUntilNextReduction, delayMsAfterNextReduction: newConnectionData.delayMsAfterNextReduction });
         this.backoffReductionTimer = setTimeout(() => this.decreaseBackoff(newConnectionData.delayMsAfterNextReduction), msUntilNextReduction);
     }
     getStartingDelay(connectionData, maxDelay) {
@@ -350,7 +369,7 @@ class Client extends events_1.default {
                     message: axiosError.message
                 };
             }
-            this.logger.error('Failed to connect streaming client', { error });
+            this.logger.error('Failed to connect streaming client', { ...this._getAppInfoLoggerParams(), error });
             if (!err) {
                 throw error;
             }
@@ -383,7 +402,7 @@ class Client extends events_1.default {
             };
             additionalErrorDetails.error = sanitizedError;
             if ([401, 403].includes(((_b = err.response) === null || _b === void 0 ? void 0 : _b.status) || 0)) {
-                this.logger.error('Streaming client received an error that it can\'t recover from and will not attempt to reconnect', additionalErrorDetails);
+                this.logger.error('Streaming client received an error that it can\'t recover from and will not attempt to reconnect', { ...additionalErrorDetails, ...this._getAppInfoLoggerParams() });
                 return false;
             }
         }
@@ -392,7 +411,7 @@ class Client extends events_1.default {
         if (err instanceof sasl_error_1.default) {
             this.logger.info('hardReconnectRequired set to true due to sasl error');
             this.hardReconnectRequired = true;
-            Object.assign(additionalErrorDetails, { channelId: err.channelId, stanzaInstanceId: err.stanzaInstanceId });
+            Object.assign(additionalErrorDetails, { ...this._getAppInfoLoggerParams(), channelId: err.channelId, stanzaInstanceId: err.stanzaInstanceId });
         }
         // we don't need to log the stack for a timeout message
         if (err instanceof timeout_error_1.TimeoutError) {
@@ -417,7 +436,7 @@ class Client extends events_1.default {
             }
         }
         const connectionData = this.increaseBackoff();
-        this.logger.error('Failed streaming client connection attempt, retrying', additionalErrorDetails, { skipServer: err instanceof offline_error_1.default });
+        this.logger.error('Failed streaming client connection attempt, retrying', { ...additionalErrorDetails, ...this._getAppInfoLoggerParams() }, { skipServer: err instanceof offline_error_1.default });
         this.logger.debug('debug: retry info', { expectedRetryInMs: connectionData.currentDelayMs, appName: this.config.appName, clientId: this.logger.clientId });
         return true;
     }
@@ -450,7 +469,7 @@ class Client extends events_1.default {
         }
         catch (err) {
             if (stanzaInstance) {
-                this.logger.error('Error occurred in connection attempt, but after websocket connected. Cleaning up connection so backoff is respected', { stanzaInstanceId: stanzaInstance.id, channelId: stanzaInstance.channelId });
+                this.logger.error('Error occurred in connection attempt, but after websocket connected. Cleaning up connection so backoff is respected', { ...this._getAppInfoLoggerParams(), stanzaInstanceId: stanzaInstance.id, channelId: stanzaInstance.channelId });
                 this.removeStanzaBoundEventHandlers();
                 (_a = stanzaInstance.pinger) === null || _a === void 0 ? void 0 : _a.stop();
                 (_b = stanzaInstance.serverMonitor) === null || _b === void 0 ? void 0 : _b.stop();
@@ -464,13 +483,14 @@ class Client extends events_1.default {
     async setupConnectionMonitoring(stanzaInstance) {
         const setupClientPinger = (message) => {
             const logMessage = `${message}, falling back to client-side pinging`;
-            this.logger.warn(logMessage, { stanzaInstanceId: stanzaInstance.id, channelId: stanzaInstance.channelId });
+            this.logger.warn(logMessage, { ...this._getAppInfoLoggerParams(), stanzaInstanceId: stanzaInstance.id, channelId: stanzaInstance.channelId });
             stanzaInstance.pinger = new ping_1.Ping(this, stanzaInstance);
         };
         if (this.useServerSidePings) {
             try {
                 // if this fails, then hawk doesn't support serverside pinging and we need to do client side pings
                 await stanzaInstance.subscribeToNode(this._notifications.pubsubHost, 'enable.server.side.pings');
+                this.logger.info('using server-side pinging', { ...this._getAppInfoLoggerParams() });
                 stanzaInstance.serverMonitor = new server_monitor_1.ServerMonitor(this, stanzaInstance);
             }
             catch (err) {
@@ -523,7 +543,7 @@ class Client extends events_1.default {
             this.config.jid = jid;
             this.config.channelId = channelId;
             this.autoReconnect = true;
-            this.logger.info('attempting to connect streaming client on channel', { channelId });
+            this.logger.info('attempting to connect streaming client on channel', { ...this._getAppInfoLoggerParams(), channelId });
             this.connectionManager.setConfig(this.config);
             this.hardReconnectRequired = false;
         }

package/dist/cjs/connection-manager.d.ts

@@ -14,4 +14,5 @@ export declare class ConnectionManager {
     private getStanzaOptions;
     private getJwtOptions;
     private getStandardOptions;
+    private getAppInfoLoggerParams;
 }

package/dist/cjs/connection-manager.js

@@ -46,7 +46,7 @@ class ConnectionManager {
             stanza.on('disconnected', boundSessionDisconnected);
             stanza.updateConfig(options);
             stanza.connect();
-        }, 15 * 1000, 'connecting to streaming service', { channelId, stanzaInstanceId: stanza.id });
+        }, 15 * 1000, 'connecting to streaming service', { ...this.getAppInfoLoggerParams(), channelId, stanzaInstanceId: stanza.id });
         connectionAttemptPromise.catch(() => stanza.disconnect());
         return connectionAttemptPromise.finally(() => {
             stanza.off('raw:incoming', boundCheckForErrorStanza);
@@ -56,7 +56,7 @@ class ConnectionManager {
         });
     }
     handleSessionStarted(stanza, resolve) {
-        this.logger.info('new stanza instance connected', { stanzaInstanceId: stanza.id, channelId: stanza.channelId });
+        this.logger.info('new stanza instance connected', { ...this.getAppInfoLoggerParams(), stanzaInstanceId: stanza.id, channelId: stanza.channelId });
         resolve(stanza);
     }
     handleSessionSasl(stanza, reject, sasl) {
@@ -65,7 +65,7 @@ class ConnectionManager {
         }
     }
     handleSessionDisconnected(stanza, reject) {
-        this.logger.error('stanza disconnected', { stanzaInstanceId: stanza.id, channelId: stanza.channelId });
+        this.logger.error('stanza disconnected', { ...this.getAppInfoLoggerParams(), stanzaInstanceId: stanza.id, channelId: stanza.channelId });
         reject();
     }
     checkForErrorStanza(stanza, rawStanza) {
@@ -113,5 +113,13 @@ class ConnectionManager {
             }
         };
     }
+    getAppInfoLoggerParams() {
+        return {
+            appId: this.logger.clientId,
+            originAppName: this.config.appName || 'unknown',
+            originAppVersion: this.config.appVersion || 'unknown',
+            originAppId: this.config.appId || 'unknown',
+        };
+    }
 }
 exports.ConnectionManager = ConnectionManager;

package/dist/cjs/webrtc.js

@@ -62,11 +62,11 @@ class WebrtcExtension extends events_1.EventEmitter {
         this.addEventListeners();
         this.throttledSendStats = lodash_throttle_1.default(this.sendStats.bind(this), this.throttleSendStatsInterval, { leading: false, trailing: true });
         this.client.on('jingle:outgoing', (session) => {
-            this.logger.info('Emitting jingle:outgoing media-session (session-init)', session);
+            this.logger.info('Emitting jingle:outgoing media-session (session-init)', { ...this.client._getAppInfoLoggerParams(), sessionId: session.id, sessionType: session.sessionType });
             return this.emit(events.OUTGOING_RTCSESSION, session);
         });
         this.client.on('jingle:incoming', (session) => {
-            this.logger.info('Emitting jingle:incoming media-session (session-init)', session);
+            this.logger.info('Emitting jingle:incoming media-session (session-init)', { ...this.client._getAppInfoLoggerParams(), sessionId: session.id, sessionType: session.sessionType });
             return this.emit(events.INCOMING_RTCSESSION, session);
         });
         this.client.on('jingle:created', (session) => {
@@ -194,7 +194,7 @@ class WebrtcExtension extends events_1.EventEmitter {
             this.webrtcSessions = this.webrtcSessions.filter(s => s.id !== session.id);
         });
         this.webrtcSessions.push(session);
-        this.logger.info('emitting sdp media-session (offer');
+        this.logger.info('emitting sdp media-session (offer)', { ...this.client._getAppInfoLoggerParams(), sessionId: session.id, sessionType: session.sessionType });
         return this.emit(events.INCOMING_RTCSESSION, session);
     }
     async handleGenesysRenegotiate(existingSession, newSdp) {
@@ -448,7 +448,7 @@ class WebrtcExtension extends events_1.EventEmitter {
         let sessionInfo = this.pendingSessions[sessionId];
         const isDuplicatePropose = !!sessionInfo;
         const sessionType = this.getSessionTypeByJid(msg.from);
-        const loggingParams = { sessionId: sessionId, conversationId: msg.propose.conversationId, sessionType, isDuplicatePropose };
+        const loggingParams = { ...this.client._getAppInfoLoggerParams(), ...this.client._getStanzaConnectionInfo(), sessionId: sessionId, conversationId: msg.propose.conversationId, sessionType, isDuplicatePropose };
         this.logger.info('propose received', loggingParams);
         if (!isDuplicatePropose) {
             const { appId } = this.client.config;
@@ -489,7 +489,7 @@ class WebrtcExtension extends events_1.EventEmitter {
         this.emit(events.REQUEST_INCOMING_RTCSESSION, Object.assign(sessionInfo));
     }
     handleRetract(sessionId) {
-        this.logger.info('retract received', this.getLogDetailsForPendingSessionId(sessionId));
+        this.logger.info('retract received', { ...this.getLogDetailsForPendingSessionId(sessionId), ...this.client._getAppInfoLoggerParams(), ...this.client._getStanzaConnectionInfo() });
         delete this.pendingSessions[sessionId];
         return this.emit(events.CANCEL_INCOMING_RTCSESSION, sessionId);
     }
@@ -575,13 +575,13 @@ class WebrtcExtension extends events_1.EventEmitter {
             }
         };
         session.accepted = true;
-        const details = this.getLogDetailsForPendingSessionId(sessionId);
+        const details = { ...this.getLogDetailsForPendingSessionId(sessionId), ...this.client._getAppInfoLoggerParams(), ...this.client._getStanzaConnectionInfo() };
         this.logger.info('sending jingle proceed', details);
         await this.stanzaInstance.send('message', proceed); // send as Message
         this.logger.info('sent jingle proceed', details);
     }
     async rejectRtcSession(sessionId, ignore = false) {
-        const logDetails = this.getLogDetailsForPendingSessionId(sessionId);
+        const logDetails = { ...this.getLogDetailsForPendingSessionId(sessionId), ...this.client._getAppInfoLoggerParams(), ...this.client._getStanzaConnectionInfo() };
         const session = this.pendingSessions[sessionId];
         if (!session) {
             this.emit(events.RTCSESSION_ERROR, 'Cannot reject session because it is not pending or does not exist');
@@ -613,7 +613,7 @@ class WebrtcExtension extends events_1.EventEmitter {
     }
     async rtcSessionAccepted(sessionId) {
         const pendingSession = this.pendingSessions[sessionId];
-        const logDetails = this.getLogDetailsForPendingSessionId(sessionId);
+        const logDetails = { ...this.getLogDetailsForPendingSessionId(sessionId), ...this.client._getAppInfoLoggerParams(), ...this.client._getStanzaConnectionInfo() };
         const accept = {
             to: JID_1.toBare(this.jid),
             accept: {

package/dist/deploy-info.json

@@ -1,6 +1,6 @@
 {
   "name": "developercenter-cdn/streaming-client",
-  "version": "17.2.4",
+  "version": "verbose-logging",
   "ecosystem": "pc",
   "team": "Client Streaming and Signaling",
   "indexFiles": [
@@ -17,6 +17,6 @@
       "file": "v17/streaming-client.browser.js"
     }
   ],
-  "build": "109",
-  "buildDate": "2024-08-07T21:01:41.401465775Z"
+  "build": "3",
+  "buildDate": "2024-08-15T12:46:00.063206700Z"
 }

package/dist/es/client.d.ts

@@ -39,6 +39,17 @@ export declare class Client extends EventEmitter {
     _messenger: MessengerExtensionApi;
     _ping: Ping;
     constructor(options: IClientOptions);
+    _getAppInfoLoggerParams(): {
+        appId: string;
+        originAppName: string;
+        originAppVersion: string;
+        originAppId: string;
+        version: string;
+    };
+    _getStanzaConnectionInfo(): {
+        stanzaInstancaId: string | undefined;
+        channelId: string | undefined;
+    };
     private handleSendEventFromExtension;
     private checkIsBackgroundAssistant;
     private addInateEventHandlers;

package/dist/es/client.js

@@ -71,7 +71,8 @@ export class Client extends EventEmitter {
             initializeServerLogging: !this.isGuest && !options.optOutOfWebrtcStatsTelemetry,
             /* streaming-client logging info */
             appVersion: Client.version,
-            appName: 'streaming-client',
+            /* istanbul ignore next */
+            appName: (options.appName ? `${options.appName}:` : '') + 'streaming-client',
             logLevel: this.config.logLevel || 'info',
             logger: options.logger || console,
             formatters: options.logFormatters,
@@ -101,6 +102,24 @@ export class Client extends EventEmitter {
             this[extensionName] = extension.expose;
             this[`_${extensionName}`] = extension;
         });
+        this.logger.info('streaming-client instantiated', this._getAppInfoLoggerParams());
+    }
+    _getAppInfoLoggerParams() {
+        return {
+            appId: this.logger.clientId,
+            originAppName: this.config.appName || 'unknown',
+            originAppVersion: this.config.appVersion || 'unknown',
+            originAppId: this.config.appId || 'unknown',
+            version: this.version,
+        };
+    }
+    /* istanbul ignore next */
+    _getStanzaConnectionInfo() {
+        var _a, _b;
+        return {
+            stanzaInstancaId: (_a = this.activeStanzaInstance) === null || _a === void 0 ? void 0 : _a.id,
+            channelId: (_b = this.activeStanzaInstance) === null || _b === void 0 ? void 0 : _b.channelId
+        };
     }
     handleSendEventFromExtension(extension, data, message = false) {
         return extension.tokenBucket.removeTokens(1, () => {
@@ -177,7 +196,7 @@ export class Client extends EventEmitter {
     handleStanzaDisconnectedEvent(disconnectedInstance) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.info('stanzaDisconnected event received', { stanzaInstanceId: disconnectedInstance.id, channelId: disconnectedInstance.channelId });
+            this.logger.info('stanzaDisconnected event received', Object.assign(Object.assign({}, this._getAppInfoLoggerParams()), { stanzaInstanceId: disconnectedInstance.id, channelId: disconnectedInstance.channelId }));
             this.connected = false;
             this.connecting = false;
             (_a = disconnectedInstance.pinger) === null || _a === void 0 ? void 0 : _a.stop();
@@ -197,7 +216,7 @@ export class Client extends EventEmitter {
     }
     handleNoLongerSubscribed(stanzaInstance) {
         var _a, _b;
-        this.logger.warn('noLongerSubscribed event received', { stanzaInstanceId: stanzaInstance.id, channelId: stanzaInstance.channelId });
+        this.logger.warn('noLongerSubscribed event received', Object.assign(Object.assign({}, this._getAppInfoLoggerParams()), { stanzaInstanceId: stanzaInstance.id, channelId: stanzaInstance.channelId }));
         (_a = stanzaInstance.pinger) === null || _a === void 0 ? void 0 : _a.stop();
         (_b = stanzaInstance.serverMonitor) === null || _b === void 0 ? void 0 : _b.stop();
         this.hardReconnectRequired = true;
@@ -214,7 +233,7 @@ export class Client extends EventEmitter {
     }
     disconnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.info('streamingClient.disconnect was called');
+            this.logger.info('streamingClient.disconnect was called', Object.assign({}, this._getAppInfoLoggerParams()));
             if (!this.activeStanzaInstance) {
                 return;
             }
@@ -279,7 +298,7 @@ export class Client extends EventEmitter {
         }
         this.setConnectionData(newConnectionData);
         clearTimeout(this.backoffReductionTimer);
-        this.logger.debug('Setting timer for next backoff reduction since we haven\'t reached total reset', { msUntilReduction: msUntilNextReduction, delayMsAfterNextReduction: newConnectionData.delayMsAfterNextReduction });
+        this.logger.debug('Setting timer for next backoff reduction since we haven\'t reached total reset', Object.assign(Object.assign({}, this._getAppInfoLoggerParams()), { msUntilReduction: msUntilNextReduction, delayMsAfterNextReduction: newConnectionData.delayMsAfterNextReduction }));
         this.backoffReductionTimer = setTimeout(() => this.decreaseBackoff(newConnectionData.delayMsAfterNextReduction), msUntilNextReduction);
     }
     getStartingDelay(connectionData, maxDelay) {
@@ -353,7 +372,7 @@ export class Client extends EventEmitter {
                         message: axiosError.message
                     };
                 }
-                this.logger.error('Failed to connect streaming client', { error });
+                this.logger.error('Failed to connect streaming client', Object.assign(Object.assign({}, this._getAppInfoLoggerParams()), { error }));
                 if (!err) {
                     throw error;
                 }
@@ -388,7 +407,7 @@ export class Client extends EventEmitter {
                 };
                 additionalErrorDetails.error = sanitizedError;
                 if ([401, 403].includes(((_b = err.response) === null || _b === void 0 ? void 0 : _b.status) || 0)) {
-                    this.logger.error('Streaming client received an error that it can\'t recover from and will not attempt to reconnect', additionalErrorDetails);
+                    this.logger.error('Streaming client received an error that it can\'t recover from and will not attempt to reconnect', Object.assign(Object.assign({}, additionalErrorDetails), this._getAppInfoLoggerParams()));
                     return false;
                 }
             }
@@ -397,7 +416,7 @@ export class Client extends EventEmitter {
             if (err instanceof SaslError) {
                 this.logger.info('hardReconnectRequired set to true due to sasl error');
                 this.hardReconnectRequired = true;
-                Object.assign(additionalErrorDetails, { channelId: err.channelId, stanzaInstanceId: err.stanzaInstanceId });
+                Object.assign(additionalErrorDetails, Object.assign(Object.assign({}, this._getAppInfoLoggerParams()), { channelId: err.channelId, stanzaInstanceId: err.stanzaInstanceId }));
             }
             // we don't need to log the stack for a timeout message
             if (err instanceof TimeoutError) {
@@ -422,7 +441,7 @@ export class Client extends EventEmitter {
                 }
             }
             const connectionData = this.increaseBackoff();
-            this.logger.error('Failed streaming client connection attempt, retrying', additionalErrorDetails, { skipServer: err instanceof OfflineError });
+            this.logger.error('Failed streaming client connection attempt, retrying', Object.assign(Object.assign({}, additionalErrorDetails), this._getAppInfoLoggerParams()), { skipServer: err instanceof OfflineError });
             this.logger.debug('debug: retry info', { expectedRetryInMs: connectionData.currentDelayMs, appName: this.config.appName, clientId: this.logger.clientId });
             return true;
         });
@@ -457,7 +476,7 @@ export class Client extends EventEmitter {
             }
             catch (err) {
                 if (stanzaInstance) {
-                    this.logger.error('Error occurred in connection attempt, but after websocket connected. Cleaning up connection so backoff is respected', { stanzaInstanceId: stanzaInstance.id, channelId: stanzaInstance.channelId });
+                    this.logger.error('Error occurred in connection attempt, but after websocket connected. Cleaning up connection so backoff is respected', Object.assign(Object.assign({}, this._getAppInfoLoggerParams()), { stanzaInstanceId: stanzaInstance.id, channelId: stanzaInstance.channelId }));
                     this.removeStanzaBoundEventHandlers();
                     (_a = stanzaInstance.pinger) === null || _a === void 0 ? void 0 : _a.stop();
                     (_b = stanzaInstance.serverMonitor) === null || _b === void 0 ? void 0 : _b.stop();
@@ -473,13 +492,14 @@ export class Client extends EventEmitter {
         return __awaiter(this, void 0, void 0, function* () {
             const setupClientPinger = (message) => {
                 const logMessage = `${message}, falling back to client-side pinging`;
-                this.logger.warn(logMessage, { stanzaInstanceId: stanzaInstance.id, channelId: stanzaInstance.channelId });
+                this.logger.warn(logMessage, Object.assign(Object.assign({}, this._getAppInfoLoggerParams()), { stanzaInstanceId: stanzaInstance.id, channelId: stanzaInstance.channelId }));
                 stanzaInstance.pinger = new Ping(this, stanzaInstance);
             };
             if (this.useServerSidePings) {
                 try {
                     // if this fails, then hawk doesn't support serverside pinging and we need to do client side pings
                     yield stanzaInstance.subscribeToNode(this._notifications.pubsubHost, 'enable.server.side.pings');
+                    this.logger.info('using server-side pinging', Object.assign({}, this._getAppInfoLoggerParams()));
                     stanzaInstance.serverMonitor = new ServerMonitor(this, stanzaInstance);
                 }
                 catch (err) {
@@ -534,7 +554,7 @@ export class Client extends EventEmitter {
                 this.config.jid = jid;
                 this.config.channelId = channelId;
                 this.autoReconnect = true;
-                this.logger.info('attempting to connect streaming client on channel', { channelId });
+                this.logger.info('attempting to connect streaming client on channel', Object.assign(Object.assign({}, this._getAppInfoLoggerParams()), { channelId }));
                 this.connectionManager.setConfig(this.config);
                 this.hardReconnectRequired = false;
             }

package/dist/es/connection-manager.d.ts

@@ -14,4 +14,5 @@ export declare class ConnectionManager {
     private getStanzaOptions;
     private getJwtOptions;
     private getStandardOptions;
+    private getAppInfoLoggerParams;
 }

package/dist/es/connection-manager.js

@@ -44,7 +44,7 @@ export class ConnectionManager {
                 stanza.on('disconnected', boundSessionDisconnected);
                 stanza.updateConfig(options);
                 stanza.connect();
-            }, 15 * 1000, 'connecting to streaming service', { channelId, stanzaInstanceId: stanza.id });
+            }, 15 * 1000, 'connecting to streaming service', Object.assign(Object.assign({}, this.getAppInfoLoggerParams()), { channelId, stanzaInstanceId: stanza.id }));
             connectionAttemptPromise.catch(() => stanza.disconnect());
             return connectionAttemptPromise.finally(() => {
                 stanza.off('raw:incoming', boundCheckForErrorStanza);
@@ -55,7 +55,7 @@ export class ConnectionManager {
         });
     }
     handleSessionStarted(stanza, resolve) {
-        this.logger.info('new stanza instance connected', { stanzaInstanceId: stanza.id, channelId: stanza.channelId });
+        this.logger.info('new stanza instance connected', Object.assign(Object.assign({}, this.getAppInfoLoggerParams()), { stanzaInstanceId: stanza.id, channelId: stanza.channelId }));
         resolve(stanza);
     }
     handleSessionSasl(stanza, reject, sasl) {
@@ -64,7 +64,7 @@ export class ConnectionManager {
         }
     }
     handleSessionDisconnected(stanza, reject) {
-        this.logger.error('stanza disconnected', { stanzaInstanceId: stanza.id, channelId: stanza.channelId });
+        this.logger.error('stanza disconnected', Object.assign(Object.assign({}, this.getAppInfoLoggerParams()), { stanzaInstanceId: stanza.id, channelId: stanza.channelId }));
         reject();
     }
     checkForErrorStanza(stanza, rawStanza) {
@@ -112,4 +112,12 @@ export class ConnectionManager {
             }
         };
     }
+    getAppInfoLoggerParams() {
+        return {
+            appId: this.logger.clientId,
+            originAppName: this.config.appName || 'unknown',
+            originAppVersion: this.config.appVersion || 'unknown',
+            originAppId: this.config.appId || 'unknown',
+        };
+    }
 }