@brggroup/share-lib 0.0.85 → 0.0.86

package/fesm2022/brggroup-share-lib.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { inject, Injectable, NgZone, Component, HostListener, ViewContainerRef, Input, ViewChild, EventEmitter, Output, Directive, Optional, Self, HostBinding, forwardRef, Pipe } from '@angular/core';
+import { inject, Injectable, Component, HostListener, ViewContainerRef, Input, ViewChild, EventEmitter, Output, Directive, Optional, Self, HostBinding, forwardRef, Pipe } from '@angular/core';
 import * as i1$4 from '@angular/router';
 import { Router, ActivatedRoute, NavigationEnd, RouterLink, RouterOutlet } from '@angular/router';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
@@ -544,8 +544,11 @@ class TokenStorage {
 }
 
 class SessionManagerService {
-    zone = inject(NgZone);
-    isRunning = false;
+    zone;
+    constructor(zone) {
+        this.zone = zone;
+    }
+    handlers;
     idleTimer;
     refreshTimer;
     heartbeatTimer;
@@ -554,19 +557,25 @@ class SessionManagerService {
     get IDLE_TIME() {
         return (SessionManagerService.IDLE_MIN || 0) * 60 * 1000;
     }
-    LEADER_KEY = 'APP_LEADER';
-    HEARTBEAT_KEY = 'APP_LEADER_HEARTBEAT';
-    channel = new BroadcastChannel('APP_SESSION');
+    LEADER_KEY = 'APP_SESSION_LEADER';
+    HEARTBEAT_KEY = 'APP_SESSION_HEARTBEAT';
+    ACTIVITY_KEY = 'APP_LAST_ACTIVITY';
     tabId = crypto.randomUUID();
     isLeader = false;
-    handlers;
-    /* ---------------- START ---------------- */
+    isRunning = false;
+    refreshLock = false;
+    channel = null;
+    /* -------------------------------- START -------------------------------- */
     start(handlers) {
         if (this.IDLE_TIME <= 0 || this.isRunning)
             return;
+        this.isRunning = true;
         this.handlers = handlers;
+        if ('BroadcastChannel' in window) {
+            this.channel = new BroadcastChannel('APP_SESSION');
+            this.listenChannel();
+        }
         this.listenActivity();
-        this.listenChannel();
         this.updateActivity();
         this.resetIdle();
         this.electLeader();
@@ -576,11 +585,10 @@ class SessionManagerService {
         clearTimeout(this.idleTimer);
         clearTimeout(this.refreshTimer);
         clearInterval(this.heartbeatTimer);
-        if (this.channel) {
-            this.channel.close();
-        }
+        this.channel?.close();
+        this.channel = null;
     }
-    /* ---------------- ACTIVITY ---------------- */
+    /* -------------------------------- ACTIVITY -------------------------------- */
     listenActivity() {
         const events = ['mousemove', 'keydown', 'click', 'scroll'];
         events.forEach((e) => {
@@ -588,22 +596,21 @@ class SessionManagerService {
         });
     }
     onActivity = this.debounce(() => {
+        if (!this.isRunning)
+            return;
         this.updateActivity();
         this.resetIdle();
         this.broadcast('activity');
     }, 1000);
     updateActivity() {
-        localStorage.setItem('APP_LAST_ACTIVITY', Date.now().toString());
+        localStorage.setItem(this.ACTIVITY_KEY, Date.now().toString());
     }
-    broadcast(type) {
+    /* -------------------------------- IDLE -------------------------------- */
+    resetIdle() {
         if (!this.isRunning)
             return;
-        this.channel?.postMessage({ type });
-    }
-    /* ---------------- IDLE ---------------- */
-    resetIdle() {
         clearTimeout(this.idleTimer);
-        const last = Number(localStorage.getItem('APP_LAST_ACTIVITY') || Date.now());
+        const last = Number(localStorage.getItem(this.ACTIVITY_KEY) || Date.now());
         const remain = this.IDLE_TIME - (Date.now() - last);
         if (remain <= 0) {
             this.logout();
@@ -615,7 +622,7 @@ class SessionManagerService {
             }, remain);
         });
     }
-    /* ---------------- LEADER ---------------- */
+    /* -------------------------------- LEADER -------------------------------- */
     electLeader() {
         const leader = localStorage.getItem(this.LEADER_KEY);
         if (!leader) {
@@ -625,7 +632,6 @@ class SessionManagerService {
         this.checkLeaderHeartbeat();
     }
     becomeLeader() {
-        console.log('Become leader', this.tabId);
         this.isLeader = true;
         localStorage.setItem(this.LEADER_KEY, this.tabId);
         this.startHeartbeat();
@@ -644,12 +650,12 @@ class SessionManagerService {
             }
         }, 3000);
     }
-    /* ---------------- REFRESH ---------------- */
+    /* -------------------------------- REFRESH TOKEN -------------------------------- */
     scheduleRefresh() {
-        if (!this.isLeader)
+        if (!this.isLeader || !this.isRunning)
             return;
         clearTimeout(this.refreshTimer);
-        const token = TokenStorage.getToken();
+        const token = this.handlers.getToken();
         if (!token)
             return;
         const exp = this.parseJwt(token).exp * 1000;
@@ -663,8 +669,9 @@ class SessionManagerService {
         }, delay);
     }
     async refreshToken() {
-        if (!this.isLeader)
+        if (!this.isLeader || this.refreshLock || !this.isRunning)
             return;
+        this.refreshLock = true;
         try {
             const res = await this.handlers.refreshToken();
             if (res?.IsSuccess) {
@@ -678,10 +685,17 @@ class SessionManagerService {
         catch {
             this.logout();
         }
+        finally {
+            this.refreshLock = false;
+        }
     }
-    /* ---------------- CHANNEL ---------------- */
+    /* -------------------------------- CHANNEL -------------------------------- */
     listenChannel() {
+        if (!this.channel)
+            return;
         this.channel.onmessage = (msg) => {
+            if (!this.isRunning)
+                return;
             const type = msg.data?.type;
             if (type === 'activity') {
                 this.resetIdle();
@@ -694,12 +708,24 @@ class SessionManagerService {
             }
         };
     }
-    /* ---------------- LOGOUT ---------------- */
+    broadcast(type) {
+        if (!this.isRunning)
+            return;
+        if (this.channel) {
+            this.channel.postMessage({ type });
+        }
+        else {
+            localStorage.setItem('APP_SESSION_EVENT', JSON.stringify({ type, t: Date.now() }));
+        }
+    }
+    /* -------------------------------- LOGOUT -------------------------------- */
     logout() {
+        if (!this.isRunning)
+            return;
         this.broadcast('logout');
         this.handlers.logout();
     }
-    /* ---------------- UTILS ---------------- */
+    /* -------------------------------- UTILS -------------------------------- */
     debounce(fn, delay) {
         let timer;
         return () => {
@@ -711,7 +737,7 @@ class SessionManagerService {
         const payload = token.split('.')[1];
         return JSON.parse(atob(payload));
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.7", ngImport: i0, type: SessionManagerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.7", ngImport: i0, type: SessionManagerService, deps: [{ token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.1.7", ngImport: i0, type: SessionManagerService, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.7", ngImport: i0, type: SessionManagerService, decorators: [{
@@ -719,7 +745,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.7", ngImpor
             args: [{
                     providedIn: 'root',
                 }]
-        }] });
+        }], ctorParameters: () => [{ type: i0.NgZone }] });
 
 const URLs$4 = {
     login: '/api/Auth/Login',
@@ -784,6 +810,7 @@ class AuthService extends HTTPService {
             this.sessionManager.start({
                 refreshToken: () => this.refreshToken(),
                 logout: () => this.signOut(),
+                getToken: () => this.getToken(),
             });
             if (returnUrl) {
                 this.router.navigateByUrl(returnUrl);
@@ -806,7 +833,11 @@ class AuthService extends HTTPService {
     initSession() {
         const token = TokenStorage.getToken();
         if (token) {
-            this.sessionManager.start({ refreshToken: () => this.refreshToken(), logout: () => this.signOut() });
+            this.sessionManager.start({
+                refreshToken: () => this.refreshToken(),
+                logout: () => this.signOut(),
+                getToken: () => this.getToken(),
+            });
         }
     }
     /* ----------------------------------------