@hmcts/ccd-case-ui-toolkit 7.3.53-exui-2906-activity-tracker-13 → 7.3.53-exui-2906-activity-tracker-15

package/fesm2022/hmcts-ccd-case-ui-toolkit.mjs

@@ -11,7 +11,7 @@ import { NG_VALUE_ACCESSOR, NG_VALIDATORS, FormArray, FormGroup, FormControl, Va
 import { BehaviorSubject, throwError, Subject, EMPTY, Observable, ReplaySubject, of, timer, skip, forkJoin, fromEvent, Subscription, combineLatest } from 'rxjs';
 import * as i1$2 from '@angular/common/http';
 import { HttpErrorResponse, HttpHeaders, HttpParams } from '@angular/common/http';
-import { distinctUntilChanged, catchError, filter, map, publish, refCount, delay, switchMap, finalize, timeout, mergeMap, retryWhen, tap, delayWhen, publishReplay, take, debounceTime, first, takeUntil } from 'rxjs/operators';
+import { distinctUntilChanged, catchError, filter, map, publish, refCount, delay, switchMap, finalize, timeout, mergeMap, retryWhen, tap, delayWhen, publishReplay, take, debounceTime, first, takeUntil, skip as skip$1 } from 'rxjs/operators';
 import { connect } from 'socket.io-client';
 import { polling } from 'rx-polling-hmcts';
 import { Type, Exclude, Expose, plainToClassFromExist, plainToClass } from 'class-transformer';
@@ -2264,7 +2264,8 @@ class ActivityComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(ActivityComponent, { className: "ActivityComponent", filePath: "lib/shared/components/activity/activity.component.ts", lineNumber: 12 }); })();
 
 const ACTIVITY_SOCKET_SHARED_STATE_KEY = '__ccdActivitySocketSharedState__';
-const ACTIVITY_SOCKET_RECONNECT_DELAY_MS = 1000 * 2;
+const ACTIVITY_SOCKET_RECONNECT_DELAY_MIN_MS = 1000;
+const ACTIVITY_SOCKET_RECONNECT_DELAY_MAX_MS = 20000;
 class ActivitySocketService {
     sessionStorageService;
     activityService;
@@ -2544,16 +2545,32 @@ class ActivitySocketService {
         if (!state.allowWebSockets || socket !== state.socket || state.owners.size === 0 || state.reconnectTimer) {
             return;
         }
+        console.warn('Activity socket connection lost, scheduling reconnect...');
         state.reconnectTimer = setTimeout(() => {
             state.reconnectTimer = undefined;
             if (socket === state.socket && state.owners.size > 0 && !ActivitySocketService.isSocketActive(socket)) {
                 socket.connect();
             }
-        }, ACTIVITY_SOCKET_RECONNECT_DELAY_MS);
+        }, ActivitySocketService.getReconnectDelayMs());
         if (ActivitySocketService.isSocketActive(socket)) {
             socket.disconnect();
         }
     }
+    static getReconnectDelayMs() {
+        const delayRange = ACTIVITY_SOCKET_RECONNECT_DELAY_MAX_MS - ACTIVITY_SOCKET_RECONNECT_DELAY_MIN_MS + 1;
+        const randomDelay = ActivitySocketService.getCryptoRandomInt(delayRange) + ACTIVITY_SOCKET_RECONNECT_DELAY_MIN_MS;
+        console.log(`Activity socket reconnect scheduled in ${randomDelay}ms`);
+        return randomDelay;
+    }
+    // Returns an unbiased crypto-random integer from 0 inclusive to exclusiveMax exclusive.
+    static getCryptoRandomInt(exclusiveMax) {
+        const randomValue = new Uint32Array(1);
+        const maxUnbiasedValue = Math.floor(0x100000000 / exclusiveMax) * exclusiveMax;
+        do {
+            globalThis.crypto.getRandomValues(randomValue);
+        } while (randomValue[0] >= maxUnbiasedValue);
+        return randomValue[0] % exclusiveMax;
+    }
     // Treats connected, connecting, opening, and open sockets as active.
     static isSocketActive(socket) {
         if (!socket) {
@@ -41720,6 +41737,7 @@ class SearchResultComponent {
     selectedCases = [];
     lastWatchedCaseIds = [];
     lastWatchedCaseIdsKey = null;
+    socketConnectSubscription;
     alphabeticalCompare = (left, right) => left.localeCompare(right);
     constructor(searchResultViewItemComparatorFactory, appConfig, activityService, caseReferencePipe, placeholderService, browserService, sessionStorageService, activitySocketService) {
         this.activityService = activityService;
@@ -41742,8 +41760,14 @@ class SearchResultComponent {
         }
         this.sessionStorageService.removeItem('eventUrl');
         this.selection.emit(this.selectedCases);
+        if (!isSolicitorUser(this.sessionStorageService)) {
+            this.socketConnectSubscription = this.activitySocketService.connected
+                .pipe(skip$1(1), distinctUntilChanged(), filter(connected => connected))
+                .subscribe(() => this.watchResults(true));
+        }
     }
     ngOnDestroy() {
+        this.socketConnectSubscription?.unsubscribe();
         if (this.activitySocketService.isEnabled && this.lastWatchedCaseIdsKey !== null) {
             this.activitySocketService.stopAllCase(this.lastWatchedCaseIds, true);
         }
@@ -42034,11 +42058,11 @@ class SearchResultComponent {
             }
         }
     }
-    watchResults() {
+    watchResults(force = false) {
         if (this.activitySocketService.isEnabled) {
             const caseIds = this.resultView?.results?.map(value => value.case_id) ?? [];
             const watchKey = [...caseIds].sort(this.alphabeticalCompare).join(',');
-            if (watchKey === this.lastWatchedCaseIdsKey) {
+            if (!force && watchKey === this.lastWatchedCaseIdsKey) {
                 return;
             }
             this.lastWatchedCaseIdsKey = watchKey;
@@ -42097,7 +42121,7 @@ class SearchResultComponent {
         }], sortHandler: [{
             type: Output
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(SearchResultComponent, { className: "SearchResultComponent", filePath: "lib/shared/components/search-result/search-result.component.ts", lineNumber: 20 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(SearchResultComponent, { className: "SearchResultComponent", filePath: "lib/shared/components/search-result/search-result.component.ts", lineNumber: 22 }); })();
 
 class SearchResultModule {
     static ɵfac = function SearchResultModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || SearchResultModule)(); };