genesys-cloud-streaming-client 14.2.1-develop.21 → 14.2.1-develop.23

package/dist/cjs/client.js

@@ -45,6 +45,7 @@ function stanzaOptionsJwt(config) {
     }
     let wsHost = config.host.replace(/\/$/, '');
     let stanzaOptions = {
+        resource: config.jidResource,
         transports: {
             websocket: `${wsHost}/stream/jwt/${config.jwt}`
         },
@@ -110,16 +111,21 @@ class Client {
             originAppId: options.appId
         });
         this.on('disconnected', () => {
+            const wasConnected = this.connected;
             if (this._stanzaio.transport || this.connecting) {
-                this.logger.info('disconnected event received, but reconnection is in progress');
+                this.logger.info('disconnected event received, but reconnection is in progress', undefined, { skipServer: !wasConnected });
                 return;
             }
             this.connected = false;
             this._ping.stop();
-            this.logger.info('Streaming client disconnected.');
+            // since it's possible to continually get diconnected events,
+            // we only want to log this if we were just connected
+            this.logger.info('Streaming client disconnected.', undefined, { skipServer: !wasConnected });
             const channelId = this.config.channelId;
             if (this.autoReconnect && !this.deadChannels.includes(channelId)) {
-                this.logger.info('Streaming client disconnected unexpectedly. Attempting to auto reconnect', { channelId });
+                // since it's possible to continually get diconnected events,
+                // we only want to log this if we were just connected
+                this.logger.info('Streaming client disconnected unexpectedly. Attempting to auto reconnect', { channelId }, { skipServer: !wasConnected });
                 this._reconnector.start();
             }
         });

package/dist/cjs/webrtc.js

@@ -197,7 +197,7 @@ class WebrtcExtension extends events_1.EventEmitter {
                 this.logger.error('Failed to send stats', {
                     err,
                     numberOfFailedStats: statsToSend.length
-                });
+                }, { skipServer: !navigator.onLine });
             }
         }
     }

package/dist/deploy-info.json

@@ -17,6 +17,6 @@
       "file": "/v14/streaming-client.browser.js"
     }
   ],
-  "build": "21",
-  "buildDate": "2022-09-14T21:29:01.144206Z"
+  "build": "23",
+  "buildDate": "2022-09-23T17:45:10.255649Z"
 }

package/dist/es/client.js

@@ -44,6 +44,7 @@ function stanzaOptionsJwt(config) {
     }
     let wsHost = config.host.replace(/\/$/, '');
     let stanzaOptions = {
+        resource: config.jidResource,
         transports: {
             websocket: `${wsHost}/stream/jwt/${config.jwt}`
         },
@@ -109,16 +110,21 @@ export class Client {
             originAppId: options.appId
         });
         this.on('disconnected', () => {
+            const wasConnected = this.connected;
             if (this._stanzaio.transport || this.connecting) {
-                this.logger.info('disconnected event received, but reconnection is in progress');
+                this.logger.info('disconnected event received, but reconnection is in progress', undefined, { skipServer: !wasConnected });
                 return;
             }
             this.connected = false;
             this._ping.stop();
-            this.logger.info('Streaming client disconnected.');
+            // since it's possible to continually get diconnected events,
+            // we only want to log this if we were just connected
+            this.logger.info('Streaming client disconnected.', undefined, { skipServer: !wasConnected });
             const channelId = this.config.channelId;
             if (this.autoReconnect && !this.deadChannels.includes(channelId)) {
-                this.logger.info('Streaming client disconnected unexpectedly. Attempting to auto reconnect', { channelId });
+                // since it's possible to continually get diconnected events,
+                // we only want to log this if we were just connected
+                this.logger.info('Streaming client disconnected unexpectedly. Attempting to auto reconnect', { channelId }, { skipServer: !wasConnected });
                 this._reconnector.start();
             }
         });

package/dist/es/index.bundle.js

@@ -30908,6 +30908,17 @@ var __awaiter$1 = (undefined && undefined.__awaiter) || function (thisArg, _argu
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+const SAVED_REQUESTS_KEY = 'gc_logger_requests';
+const STATUS_CODES_TO_RETRY_IMMEDIATELY = [
+    408,
+    429,
+    500,
+    503,
+    504
+];
+const STATUS_CODES_TO_RETRY_LATER = [
+    401
+];
 const logUploaderMap = new Map();
 const getOrCreateLogUploader = (url, debugMode = false) => {
     let uploader = logUploaderMap.get(url);
@@ -30923,7 +30934,6 @@ class LogUploader {
         this.url = url;
         this.debugMode = debugMode;
         this.sendQueue = [];
-        this.hasPendingRequest = false;
     }
     postLogsToEndpoint(requestParams) {
         const deferred = getDeferred();
@@ -30932,13 +30942,44 @@ class LogUploader {
         this.debug('adding requestParams to sendQueue', {
             requestParams,
             updatedSendQueue: this.sendQueue.map(i => i.requestParams),
-            hasPendingRequest: this.hasPendingRequest
+            hasPendingRequest: !!this.pendingRequest
         });
         return deferred.promise;
     }
-    postLogsToEndpointInstantly(requestParams) {
-        this.debug('sending request instantly', { requestParams, sendQueue: this.sendQueue.map(i => i.requestParams) });
-        return this.sendPostRequest(requestParams);
+    postLogsToEndpointInstantly(requestParams, opts) {
+        return __awaiter$1(this, void 0, void 0, function* () {
+            this.debug('sending request instantly', { requestParams, sendQueue: this.sendQueue.map(i => i.requestParams) });
+            if (!navigator.onLine) {
+                return this.saveRequestForLater(requestParams);
+            }
+            try {
+                yield this.sendPostRequest(requestParams);
+            }
+            catch (e) {
+                if (opts === null || opts === void 0 ? void 0 : opts.saveOnFailure) {
+                    this.saveRequestForLater(requestParams);
+                }
+                throw e;
+            }
+        });
+    }
+    saveRequestForLater(request) {
+        const savedRequests = this.getSavedRequests() || [];
+        const sanitizedRequest = Object.assign({}, request);
+        delete sanitizedRequest.accessToken;
+        savedRequests.push(sanitizedRequest);
+        window.localStorage.setItem(SAVED_REQUESTS_KEY, JSON.stringify(savedRequests));
+    }
+    getSavedRequests() {
+        const jsonStr = window.localStorage.getItem(SAVED_REQUESTS_KEY);
+        if (jsonStr) {
+            try {
+                return JSON.parse(jsonStr);
+            }
+            catch (e) {
+                console.error('Failed to parse saved messages, ignoring', { savedMessagesStr: jsonStr });
+            }
+        }
     }
     sendEntireQueue() {
         this.debug('sending all queued requests instantly to clear out sendQueue', {
@@ -30948,7 +30989,7 @@ class LogUploader {
         let queueItem;
         /* eslint-disable-next-line no-cond-assign */
         while (queueItem = this.sendQueue.shift()) {
-            promises.push(this.postLogsToEndpointInstantly(queueItem.requestParams));
+            promises.push(this.postLogsToEndpointInstantly(queueItem.requestParams, { saveOnFailure: true }));
         }
         /* don't want this to be async because this is called from the window 'unload' event */
         return promises;
@@ -30959,9 +31000,9 @@ class LogUploader {
     }
     sendNextQueuedLogToServer() {
         return __awaiter$1(this, void 0, void 0, function* () {
-            if (this.hasPendingRequest || this.sendQueue.length === 0) {
+            if (this.pendingRequest || this.sendQueue.length === 0) {
                 this.debug('sendNextQueuedLogToServer() but not sending request', {
-                    hasPendingRequest: this.hasPendingRequest,
+                    hasPendingRequest: !!this.pendingRequest,
                     sendQueueLength: this.sendQueue.length
                 });
                 return;
@@ -30973,15 +31014,20 @@ class LogUploader {
                     queueItemRequestParams: queueItem.requestParams, updatedSendQueue: this.sendQueue.map(i => i.requestParams)
                 });
                 /* reset state and send the next item in the queue */
-                this.hasPendingRequest = false;
+                this.pendingRequest = undefined;
                 this.sendNextQueuedLogToServer();
             });
-            this.hasPendingRequest = true;
+            this.pendingRequest = queueItem;
             this.debug('sending logs to server', { queueItem: queueItem.requestParams, sendQueue: this.sendQueue.map(i => i.requestParams) });
             // return backOff(this.sendPostRequest.bind(this, queueItem.requestParams), {
-            return backOff_1(() => this.sendPostRequest(queueItem.requestParams), {
+            return backOff_1(() => this.backoffFn(queueItem.requestParams), {
                 retry: (err) => {
-                    return !!(err && err.status === 429);
+                    var _a;
+                    const status = (_a = err.response) === null || _a === void 0 ? void 0 : _a.status;
+                    const code = err.code;
+                    // we get a "ERR_NETWORK" in the case of a network blip failure. if this happens, we will want to try again.
+                    // this is akin to not getting a response at all
+                    return navigator.onLine && ((status && STATUS_CODES_TO_RETRY_IMMEDIATELY.includes(status)) || code === "ERR_NETWORK");
                 },
                 numOfAttempts: 10,
                 startingDelay: 0,
@@ -30992,10 +31038,38 @@ class LogUploader {
                 this.debug('successfully sent logs to server', { requestParams: queueItem.requestParams, response });
                 queueItem.deferred.resolve(response);
             })
-                .catch((error) => {
-                this.debug('ERROR sending logs to server', { requestParams: queueItem.requestParams, error });
-                return queueItem.deferred.reject(error);
-            });
+                .catch(this.handleBackoffError.bind(this, queueItem));
+        });
+    }
+    handleBackoffError(queueItem, error) {
+        var _a;
+        // there are certain errors we know we don't want to try again, and certain errors/responses that *may* work in the future.
+        const status = (_a = error.response) === null || _a === void 0 ? void 0 : _a.status;
+        const isRetriableStatus = status && STATUS_CODES_TO_RETRY_IMMEDIATELY.includes(status) || STATUS_CODES_TO_RETRY_LATER.includes(status);
+        if (isRetriableStatus || error.code === "ERR_NETWORK") {
+            this.debug('Failed to sends logs to the server, moving request to the end of the queue', { requestParams: queueItem.requestParams, error });
+            this.saveRequestForLater(queueItem.requestParams);
+        }
+        else {
+            this.debug('ERROR sending logs to server', { requestParams: queueItem.requestParams, error });
+        }
+        queueItem.deferred.reject(Object.assign(Object.assign({}, error), { id: "rejectionSpot1" }));
+    }
+    backoffFn(requestParams) {
+        return __awaiter$1(this, void 0, void 0, function* () {
+            const accessToken = requestParams.accessToken;
+            const response = yield this.sendPostRequest(requestParams);
+            // add any saved queue items to the queue using the access token
+            const savedRequests = this.getSavedRequests();
+            if (savedRequests) {
+                window.localStorage.removeItem(SAVED_REQUESTS_KEY);
+                savedRequests.map(request => {
+                    const reqWithToken = Object.assign({ accessToken }, request);
+                    // this adds it to the send queue, it doesn't send it immediately
+                    this.postLogsToEndpoint(reqWithToken);
+                });
+            }
+            return response;
         });
     }
     sendPostRequest(requestParams) {
@@ -31132,7 +31206,7 @@ class ServerLogger {
         return this.logUploader.sendEntireQueue()
             .concat(
         /* this will send any items in the buffer still */
-        this.logBuffer.map((item) => this.logUploader.postLogsToEndpointInstantly(this.convertToRequestParams(item.traces.reverse()))));
+        this.logBuffer.map((item) => this.logUploader.postLogsToEndpointInstantly(this.convertToRequestParams(item.traces.reverse()), { saveOnFailure: true })));
     }
     sendLogsToServer(immediate = false) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -31432,7 +31506,7 @@ class Logger extends EventEmitter {
     }
 }
 /* eslint-disable @typescript-eslint/naming-convention */
-Logger.VERSION = '4.1.1';
+Logger.VERSION = '4.2.0';
 
 /* istanbul ignore file */
 if (!commonjsGlobal) {
@@ -41822,7 +41896,7 @@ class WebrtcExtension extends EventEmitter {
                     this.logger.error('Failed to send stats', {
                         err,
                         numberOfFailedStats: statsToSend.length
-                    });
+                    }, { skipServer: !navigator.onLine });
                 }
             }
         });
@@ -43213,6 +43287,7 @@ function stanzaOptionsJwt(config) {
     }
     let wsHost = config.host.replace(/\/$/, '');
     let stanzaOptions = {
+        resource: config.jidResource,
         transports: {
             websocket: `${wsHost}/stream/jwt/${config.jwt}`
         },
@@ -43278,16 +43353,21 @@ class Client {
             originAppId: options.appId
         });
         this.on('disconnected', () => {
+            const wasConnected = this.connected;
             if (this._stanzaio.transport || this.connecting) {
-                this.logger.info('disconnected event received, but reconnection is in progress');
+                this.logger.info('disconnected event received, but reconnection is in progress', undefined, { skipServer: !wasConnected });
                 return;
             }
             this.connected = false;
             this._ping.stop();
-            this.logger.info('Streaming client disconnected.');
+            // since it's possible to continually get diconnected events,
+            // we only want to log this if we were just connected
+            this.logger.info('Streaming client disconnected.', undefined, { skipServer: !wasConnected });
             const channelId = this.config.channelId;
             if (this.autoReconnect && !this.deadChannels.includes(channelId)) {
-                this.logger.info('Streaming client disconnected unexpectedly. Attempting to auto reconnect', { channelId });
+                // since it's possible to continually get diconnected events,
+                // we only want to log this if we were just connected
+                this.logger.info('Streaming client disconnected unexpectedly. Attempting to auto reconnect', { channelId }, { skipServer: !wasConnected });
                 this._reconnector.start();
             }
         });

package/dist/es/webrtc.js

@@ -195,7 +195,7 @@ export class WebrtcExtension extends EventEmitter {
                     this.logger.error('Failed to send stats', {
                         err,
                         numberOfFailedStats: statsToSend.length
-                    });
+                    }, { skipServer: !navigator.onLine });
                 }
             }
         });

package/dist/npm/CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 # [Unreleased](https://github.com/purecloudlabs/genesys-cloud-streaming-client/compare/v14.2.0...HEAD)
+* [PCM-1988](https://inindca.atlassian.net/browse/PCM-1988) – Add jidResource support for jwt tokens.
+* [PCM-1992](https://inindca.atlassian.net/browse/PCM-1992) – Update to the latest logger so unsent logs get preserved.
 
 ### Added
 * [PCM-1972](https://inindca.atlassian.net/browse/PCM-1972) – Added support for data channel messages if initially offered in the sdp

package/dist/npm/client.js

@@ -45,6 +45,7 @@ function stanzaOptionsJwt(config) {
     }
     let wsHost = config.host.replace(/\/$/, '');
     let stanzaOptions = {
+        resource: config.jidResource,
         transports: {
             websocket: `${wsHost}/stream/jwt/${config.jwt}`
         },
@@ -110,16 +111,21 @@ class Client {
             originAppId: options.appId
         });
         this.on('disconnected', () => {
+            const wasConnected = this.connected;
             if (this._stanzaio.transport || this.connecting) {
-                this.logger.info('disconnected event received, but reconnection is in progress');
+                this.logger.info('disconnected event received, but reconnection is in progress', undefined, { skipServer: !wasConnected });
                 return;
             }
             this.connected = false;
             this._ping.stop();
-            this.logger.info('Streaming client disconnected.');
+            // since it's possible to continually get diconnected events,
+            // we only want to log this if we were just connected
+            this.logger.info('Streaming client disconnected.', undefined, { skipServer: !wasConnected });
             const channelId = this.config.channelId;
             if (this.autoReconnect && !this.deadChannels.includes(channelId)) {
-                this.logger.info('Streaming client disconnected unexpectedly. Attempting to auto reconnect', { channelId });
+                // since it's possible to continually get diconnected events,
+                // we only want to log this if we were just connected
+                this.logger.info('Streaming client disconnected unexpectedly. Attempting to auto reconnect', { channelId }, { skipServer: !wasConnected });
                 this._reconnector.start();
             }
         });

package/dist/npm/webrtc.js

@@ -197,7 +197,7 @@ class WebrtcExtension extends events_1.EventEmitter {
                 this.logger.error('Failed to send stats', {
                     err,
                     numberOfFailedStats: statsToSend.length
-                });
+                }, { skipServer: !navigator.onLine });
             }
         }
     }