debounce instead of batch; check if identity state chagned before

pujitm · pujitm · commit 0f46d498cd70 · 2025-07-03T11:52:50.000-04:00
emitting
diff --git a/packages/unraid-api-plugin-connect/src/mothership-proxy/connection.service.ts b/packages/unraid-api-plugin-connect/src/mothership-proxy/connection.service.ts
@@ -3,8 +3,9 @@ import { ConfigService } from '@nestjs/config';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import type { OutgoingHttpHeaders } from 'node:http2';
 
+import { isEqual } from 'lodash-es';
 import { Subscription } from 'rxjs';
-import { bufferTime, filter } from 'rxjs/operators';
+import { debounceTime, filter } from 'rxjs/operators';
 
 import { ConnectionMetadata, MinigraphStatus, MyServersConfig } from '../config/connect.config.js';
 import { EVENTS } from '../helper/nest-tokens.js';
@@ -58,6 +59,7 @@ export class MothershipConnectionService implements OnModuleInit, OnModuleDestro
     };
 
     private identitySubscription: Subscription | null = null;
+    private lastIdentity: Partial<IdentityState> | null = null;
     private metadataChangedSubscription: Subscription | null = null;
 
     constructor(
@@ -83,12 +85,22 @@ export class MothershipConnectionService implements OnModuleInit, OnModuleDestro
         this.identitySubscription = this.configService.changes$
             .pipe(
                 filter((change) => Object.values(this.configKeys).includes(change.path)),
-                bufferTime(25)
+                // debouncing is necessary here (instead of buffering/batching) to prevent excess emissions
+                // because the store.* config values will change frequently upon api boot
+                debounceTime(25)
             )
             .subscribe({
                 next: () => {
+                    const { state } = this.getIdentityState();
+                    if (isEqual(state, this.lastIdentity)) {
+                        this.logger.debug('Identity unchanged; skipping event emission');
+                        return;
+                    }
+                    this.lastIdentity = structuredClone(state);
                     const success = this.eventEmitter.emit(EVENTS.IDENTITY_CHANGED);
-                    if (!success) {
+                    if (success) {
+                        this.logger.debug('Emitted IDENTITY_CHANGED event');
+                    } else {
                         this.logger.warn('Failed to emit IDENTITY_CHANGED event');
                     }
                 },
diff --git a/packages/unraid-api-plugin-connect/src/mothership-proxy/mothership.events.ts b/packages/unraid-api-plugin-connect/src/mothership-proxy/mothership.events.ts
@@ -15,7 +15,6 @@ import { isEqual } from 'lodash-es';
 export class MothershipHandler implements OnModuleDestroy {
     private readonly logger = new Logger(MothershipHandler.name);
     private isSettingUp = false;
-    private lastIdentityHash: object | null = null;
     constructor(
         private readonly connectionService: MothershipConnectionService,
         private readonly clientService: MothershipGraphqlClientService,
@@ -38,10 +37,10 @@ export class MothershipHandler implements OnModuleDestroy {
     }
 
     async setup() {
-        if (this.isSettingUp) {
-            this.logger.debug('Setup already in progress, skipping');
-            return;
-        }
+        // if (this.isSettingUp) {
+        //     this.logger.debug('Setup already in progress, skipping');
+        //     return;
+        // }
         this.isSettingUp = true;
         try {
             await this.clear();
@@ -51,9 +50,6 @@ export class MothershipHandler implements OnModuleDestroy {
                 this.logger.warn('No API key found; cannot setup mothership subscription');
                 return;
             }
-            // cache identity snapshot to avoid redundant setups
-            this.lastIdentityHash = structuredClone(state);
-
             await this.clientService.createClientInstance();
             await this.subscriptionHandler.subscribeToMothershipEvents();
             this.timeoutCheckerJob.start();
@@ -66,12 +62,6 @@ export class MothershipHandler implements OnModuleDestroy {
     async onIdentityChanged() {
         const { state } = this.connectionService.getIdentityState();
         if (state.apiKey) {
-            const identityHash = structuredClone(state);
-
-            if (isEqual(identityHash, this.lastIdentityHash)) {
-                this.logger.debug('Identity unchanged; skipping mothership setup');
-                return;
-            }
             this.logger.verbose('Identity changed; setting up mothership subscription');
             await this.setup();
         }
