cleanup

pujitm · pujitm · commit b3e2a21992ef · 2025-07-03T13:24:51.000-04:00
diff --git a/api/src/unraid-api/config/store-sync.service.ts b/api/src/unraid-api/config/store-sync.service.ts
@@ -2,24 +2,16 @@ import { Injectable, Logger, OnModuleDestroy } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 
 import type { Unsubscribe } from '@reduxjs/toolkit';
-import { isEqual } from 'lodash-es';
 
 import { store } from '@app/store/index.js';
 
 @Injectable()
 export class StoreSyncService implements OnModuleDestroy {
     private unsubscribe: Unsubscribe;
     private logger = new Logger(StoreSyncService.name);
-    private lastState: object | null = null;
 
     constructor(private configService: ConfigService) {
         this.unsubscribe = store.subscribe(() => {
-            const currentState = store.getState();
-            if (isEqual(currentState, this.lastState)) {
-                this.logger.debug('Store state unchanged; skipping sync');
-                return;
-            }
-            this.lastState = structuredClone(currentState);
             this.configService.set('store', store.getState());
             this.logger.verbose('Synced store to NestJS Config');
         });
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
@@ -5,9 +5,9 @@ import type { OutgoingHttpHeaders } from 'node:http2';
 
 import { isEqual } from 'lodash-es';
 import { Subscription } from 'rxjs';
-import { bufferTime, debounceTime, filter } from 'rxjs/operators';
+import { debounceTime, filter } from 'rxjs/operators';
 
-import { ConnectionMetadata, MinigraphStatus, MyServersConfig } from '../config/connect.config.js';
+import { ConnectionMetadata, MinigraphStatus } from '../config/connect.config.js';
 import { EVENTS } from '../helper/nest-tokens.js';
 
 interface MothershipWebsocketHeaders extends OutgoingHttpHeaders {
@@ -87,12 +87,10 @@ export class MothershipConnectionService implements OnModuleInit, OnModuleDestro
                 filter((change) => Object.values(this.configKeys).includes(change.path)),
                 // 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)
-                bufferTime(25)
+                debounceTime(25)
             )
             .subscribe({
-                next: (changes) => {
-                    this.logger.log(`changes: ${JSON.stringify(changes.map((c) => c.path))}`);
+                next: () => {
                     const { state } = this.getIdentityState();
                     if (isEqual(state, this.lastIdentity)) {
                         this.logger.debug('Identity unchanged; skipping event emission');
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
@@ -9,12 +9,10 @@ import { EVENTS, GRAPHQL_PUBSUB_CHANNEL, GRAPHQL_PUBSUB_TOKEN } from '../helper/
 import { MothershipConnectionService } from './connection.service.js';
 import { MothershipGraphqlClientService } from './graphql.client.js';
 import { MothershipSubscriptionHandler } from './mothership-subscription.handler.js';
-import { isEqual } from 'lodash-es';
 
 @Injectable()
 export class MothershipHandler implements OnModuleDestroy {
     private readonly logger = new Logger(MothershipHandler.name);
-    private isSettingUp = false;
     constructor(
         private readonly connectionService: MothershipConnectionService,
         private readonly clientService: MothershipGraphqlClientService,
@@ -37,25 +35,16 @@ export class MothershipHandler implements OnModuleDestroy {
     }
 
     async setup() {
-        // if (this.isSettingUp) {
-        //     this.logger.debug('Setup already in progress, skipping');
-        //     return;
-        // }
-        this.isSettingUp = true;
-        try {
-            await this.clear();
-            const { state } = this.connectionService.getIdentityState();
-            this.logger.verbose('cleared, got identity state');
-            if (!state.apiKey) {
-                this.logger.warn('No API key found; cannot setup mothership subscription');
-                return;
-            }
-            await this.clientService.createClientInstance();
-            await this.subscriptionHandler.subscribeToMothershipEvents();
-            this.timeoutCheckerJob.start();
-        } finally {
-            this.isSettingUp = false;
+        await this.clear();
+        const { state } = this.connectionService.getIdentityState();
+        this.logger.verbose('cleared, got identity state');
+        if (!state.apiKey) {
+            this.logger.warn('No API key found; cannot setup mothership subscription');
+            return;
         }
+        await this.clientService.createClientInstance();
+        await this.subscriptionHandler.subscribeToMothershipEvents();
+        this.timeoutCheckerJob.start();
     }
 
     @OnEvent(EVENTS.IDENTITY_CHANGED, { async: true })
