@vgroup/dialbox 0.1.66 → 0.1.67

package/fesm2020/vgroup-dialbox.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Injectable, EventEmitter, Component, Input, Output, ViewChild, Inject, NgModule } from '@angular/core';
 import swal from 'sweetalert2';
 import { AsYouType } from 'libphonenumber-js';
-import { throwError, BehaviorSubject, of, interval, Subscription } from 'rxjs';
+import { throwError, BehaviorSubject, Observable, of, interval, Subscription } from 'rxjs';
 import * as i1 from '@angular/common/http';
 import { HttpHeaders, HttpParams, HttpClientModule } from '@angular/common/http';
 import { catchError, switchMap, map, tap, shareReplay } from 'rxjs/operators';
@@ -588,6 +588,38 @@ class ExtensionService {
         const params = new HttpParams().set('deviceId', deviceId);
         return this.http.get(environment.apiUrl + '/utilities/twilio/incomingcall/token/web', { headers, params });
     }
+    // Check if token needs refresh based on expires_at timestamp
+    isTokenExpired() {
+        const expiresAt = localStorage.getItem('token_expires_at');
+        if (!expiresAt) {
+            return true; // No expiration info, assume expired
+        }
+        const expirationTime = parseInt(expiresAt) * 1000; // Convert to milliseconds
+        const currentTime = Date.now();
+        const bufferTime = 5 * 60 * 1000; // 5 minutes buffer before actual expiration
+        return currentTime >= (expirationTime - bufferTime);
+    }
+    // Refresh token if needed
+    refreshTokenIfNeeded(deviceId) {
+        if (this.isTokenExpired()) {
+            console.log('Token expired or about to expire, refreshing...');
+            return this.getIncomingCallToken(deviceId);
+        }
+        // Return current token data
+        const currentToken = localStorage.getItem('in-token');
+        const expiresAt = localStorage.getItem('token_expires_at');
+        if (currentToken && expiresAt) {
+            return new Observable(observer => {
+                observer.next({
+                    token: currentToken,
+                    expires_at: parseInt(expiresAt)
+                });
+                observer.complete();
+            });
+        }
+        // If no current token, get a new one
+        return this.getIncomingCallToken(deviceId);
+    }
     getOutgoingCallToken(payload) {
         const params = {
             'Content-Type': 'application/json',
@@ -1397,11 +1429,17 @@ class TwilioService {
         if (this.tokenInitialized) {
             return this.tokenInitialization$ || of(null);
         }
-        this.tokenInitialization$ = this.extensionService.getIncomingCallToken(this.deviceId).pipe(tap((data) => {
+        this.tokenInitialization$ = this.extensionService.refreshTokenIfNeeded(this.deviceId).pipe(tap((data) => {
             this.incomingCallToken = data.token;
             localStorage.setItem('in-token', data.token);
+            // Store expiration timestamp for future refresh checks
+            if (data.expires_at) {
+                localStorage.setItem('token_expires_at', data.expires_at.toString());
+                console.log('Token expires at:', new Date(data.expires_at * 1000).toLocaleString());
+            }
             this.tokenInitialized = true;
-            console.log('dfdfdsfdsfds');
+            console.log('Token initialized successfully');
+            this.startTokenRefreshScheduler();
             this.initializeDevice();
         }), catchError(error => {
             console.error('Error initializing Twilio token:', error);
@@ -1412,12 +1450,24 @@ class TwilioService {
     }
     initializeTwilioDevice(deviceId) {
         this.deviceId = deviceId;
-        if (this.tokenInitialized && this.incomingCallToken) {
-            this.initializeDevice();
-        }
-        else {
-            this.initializeToken().subscribe();
-        }
+        // Always check if token needs refresh when initializing device
+        this.extensionService.refreshTokenIfNeeded(deviceId).subscribe({
+            next: (data) => {
+                this.incomingCallToken = data.token;
+                localStorage.setItem('in-token', data.token);
+                // Store expiration timestamp for future refresh checks
+                if (data.expires_at) {
+                    localStorage.setItem('token_expires_at', data.expires_at.toString());
+                    console.log('Token refreshed, expires at:', new Date(data.expires_at * 1000).toLocaleString());
+                }
+                this.tokenInitialized = true;
+                this.startTokenRefreshScheduler();
+                this.initializeDevice();
+            },
+            error: (error) => {
+                console.error('Error refreshing token during device initialization:', error);
+            }
+        });
     }
     initializeDevice() {
         if (this.device) {
@@ -1520,6 +1570,45 @@ class TwilioService {
         };
         return this.http.post(environment.apiUrl + '/utilities/phonebook/delete/photo/' + id, payload, httpOptions);
     }
+    // Start periodic token refresh scheduler
+    startTokenRefreshScheduler() {
+        // Clear existing interval if any
+        if (this.tokenRefreshInterval) {
+            clearInterval(this.tokenRefreshInterval);
+        }
+        // Check token every 10 minutes
+        this.tokenRefreshInterval = setInterval(() => {
+            if (this.deviceId && this.extensionService.isTokenExpired()) {
+                console.log('Scheduled token refresh triggered');
+                this.extensionService.refreshTokenIfNeeded(this.deviceId).subscribe({
+                    next: (data) => {
+                        this.incomingCallToken = data.token;
+                        localStorage.setItem('in-token', data.token);
+                        if (data.expires_at) {
+                            localStorage.setItem('token_expires_at', data.expires_at.toString());
+                            console.log('Token automatically refreshed, expires at:', new Date(data.expires_at * 1000).toLocaleString());
+                        }
+                        // Reinitialize device with new token
+                        this.initializeDevice();
+                    },
+                    error: (error) => {
+                        console.error('Error during scheduled token refresh:', error);
+                    }
+                });
+            }
+        }, 10 * 60 * 1000); // 10 minutes
+    }
+    // Stop token refresh scheduler
+    stopTokenRefreshScheduler() {
+        if (this.tokenRefreshInterval) {
+            clearInterval(this.tokenRefreshInterval);
+            this.tokenRefreshInterval = null;
+        }
+    }
+    // Cleanup method to be called when service is destroyed
+    ngOnDestroy() {
+        this.stopTokenRefreshScheduler();
+    }
     // toggleCallerIdAlertFn(val: any) {
     //   let httpOptions = {
     //     headers: new HttpHeaders({