@tiba-spark/client-shared-lib 26.1.0-307 → 26.1.0-309

package/fesm2022/tiba-spark-client-shared-lib.mjs

@@ -112406,6 +112406,32 @@ class AuthTokenService {
         this.setConflictDetected = (error) => new SetConflictDetected(error);
         this.clearConflictDetected = () => new ClearConflictDetected();
     }
+    // refreshInterval: early expirty offset
+    isTokenExpired(token, refreshInterval = 0) {
+        const expiration = this.parseJwtExp(token);
+        if (expiration === null) {
+            return true;
+        }
+        return new Date() > new Date(moment.unix(expiration).add(-refreshInterval * 0.1, 'milliseconds').format());
+    }
+    parseJwtExp(token) {
+        try {
+            const payloadSegment = token.split('.')[1];
+            if (!payloadSegment) {
+                return null;
+            }
+            const base64 = payloadSegment.replace(/-/g, '+').replace(/_/g, '/');
+            const padding = '='.repeat((4 - (base64.length % 4)) % 4);
+            if (typeof atob === 'undefined') {
+                return null;
+            }
+            const payload = JSON.parse(atob(base64 + padding));
+            return typeof payload.exp === 'number' ? payload.exp : null;
+        }
+        catch {
+            return null;
+        }
+    }
     handleRequest(req, next) {
         req = this.setRequestHeaders(req);
         let request = next.handle(req);
@@ -113306,12 +113332,14 @@ class SignalR {
         this.zoneChanged = (zoneDto, parkId) => new ZoneChangedAction(zoneDto, parkId);
         this.initializeSmartParkConnection = (smartpark) => new AddSmartparkAction(smartpark);
         this.facilityRemoteCommandExecuted = (facilityRemoteCommandEvent) => new FacilityRemoteCommandExecutedAction(facilityRemoteCommandEvent);
+        this.signalRRefreshToken = () => new SignalRRefreshTokenAction();
         this.store = injector.get(Store);
         this.realtimeEventService = injector.get(RealtimeEventService);
         this.notificationEventService = injector.get(NotificationEventService);
         this.sessionStorageService = injector.get(SessionStorageService);
         this.appConfig = injector.get(AppConfigService);
         this.generalActionService = injector.get(GeneralActionService);
+        this.authTokenService = injector.get(AuthTokenService);
     }
     initRealtimeEventListeners() {
         const config = this.appConfig.getConfig();
@@ -113325,7 +113353,7 @@ class SignalR {
             skipNegotiation: true, // Skip the negotiation step
             transport: HttpTransportType.WebSockets // Use WebSockets directly
         })
-            .withAutomaticReconnect(new TibaRetryPolicy(maxConsecutiveFailedRetryCount))
+            .withAutomaticReconnect(new TibaRetryPolicy(maxConsecutiveFailedRetryCount, this.injector))
             .build();
         this.connection.keepAliveIntervalInMilliseconds = 8000;
         this.connection.serverTimeoutInMilliseconds = 30000;
@@ -113557,8 +113585,14 @@ class SignalR {
             this.handleRealTimeAwaitingSubscriptions();
             this.handleNotificationAwaitingSubscription();
         })
-            .catch(async (e) => {
-            this.retryConnection(connection, 1);
+            .catch(async (error) => {
+            if (isUnauthorizedOrExpired(error, this.sessionStorageService.accessToken, this.authTokenService)) {
+                datadogLogs.logger.info(`SignalR initial connect -> unauthorized. Message: ${error?.message}`);
+                this.signalRRefreshToken();
+            }
+            else {
+                this.retryConnection(connection, 1);
+            }
         });
     }
     _disconnect(connection) {
@@ -113581,10 +113615,16 @@ class SignalR {
                 this.handleRealTimeAwaitingSubscriptions();
                 this.handleNotificationAwaitingSubscription();
             })
-                .catch(() => {
-                const config = this.appConfig.getConfig();
-                if (retryCount <= config.signalR.maxConsecutiveFailedRetryCount) {
-                    this.retryConnection(connection, retryCount + 1);
+                .catch((error) => {
+                if (isUnauthorizedOrExpired(error, this.sessionStorageService.accessToken, this.authTokenService)) {
+                    datadogLogs.logger.info(`SignalR retry connect -> unauthorized. Message: ${error?.message}`);
+                    this.signalRRefreshToken();
+                }
+                else {
+                    const config = this.appConfig.getConfig();
+                    if (retryCount <= config.signalR.maxConsecutiveFailedRetryCount) {
+                        this.retryConnection(connection, retryCount + 1);
+                    }
                 }
             });
         }, getSecondsBackoff(retryCount));
@@ -113648,24 +113688,26 @@ __decorate([
 __decorate([
     Dispatch()
 ], SignalR.prototype, "facilityRemoteCommandExecuted", void 0);
+__decorate([
+    Dispatch()
+], SignalR.prototype, "signalRRefreshToken", void 0);
 class TibaRetryPolicy {
-    constructor(maxConsecutiveFailedRetryCount) {
+    constructor(maxConsecutiveFailedRetryCount, injector) {
         this.signalRRefreshToken = () => new SignalRRefreshTokenAction();
         this.maxConsecutiveFailedRetryCount = maxConsecutiveFailedRetryCount;
+        this.sessionStorageService = injector.get(SessionStorageService);
+        this.authTokenService = injector.get(AuthTokenService);
     }
     nextRetryDelayInMilliseconds(retryContext) {
         let milliseconds = null;
         const currentRetryCount = retryContext.previousRetryCount + 1;
-        if (currentRetryCount < this.maxConsecutiveFailedRetryCount) {
-            const unauthorized = retryContext.retryReason.message.includes(`Status code '${HttpStatusCode$4.Unauthorized}'`);
-            if (unauthorized) {
-                datadogLogs.logger.info(`TibaRetryPolicy -> unauthorized token. Message:  ${retryContext.retryReason.message}`);
-                this.signalRRefreshToken();
-            }
-            else {
-                datadogLogs.logger.info(`TibaRetryPolicy -> failed negotiation #${currentRetryCount}. Message: ${retryContext.retryReason.message}`);
-                milliseconds = getSecondsBackoff(currentRetryCount);
-            }
+        if (isUnauthorizedOrExpired(retryContext.retryReason, this.sessionStorageService.accessToken, this.authTokenService)) {
+            datadogLogs.logger.info(`TibaRetryPolicy -> unauthorized token. Message:  ${retryContext.retryReason.message}`);
+            this.signalRRefreshToken();
+        }
+        else if (currentRetryCount < this.maxConsecutiveFailedRetryCount) {
+            datadogLogs.logger.info(`TibaRetryPolicy -> failed negotiation #${currentRetryCount}. Message: ${retryContext.retryReason.message}`);
+            milliseconds = getSecondsBackoff(currentRetryCount);
         }
         return milliseconds;
     }
@@ -113684,6 +113726,10 @@ function getSecondsBackoff(retryCount) {
     const [minSeconds, maxSeconds] = delaysTableInSeconds[retryCount] || [0, 0];
     return (Math.floor(Math.random() * (maxSeconds - minSeconds + 1)) + minSeconds) * ONE_SECOND_IN_MILLISECONDS;
 }
+function isUnauthorizedOrExpired(error, token, authTokenService) {
+    const unauthorized = error?.message?.includes(`Status code '${HttpStatusCode$4.Unauthorized}'`);
+    return unauthorized || authTokenService.isTokenExpired(token);
+}
 
 class ParkService {
     constructor(injector) {