fix: rename configs and proper subscription

elibosley · elibosley · commit d631c6cb0822 · 2025-07-09T09:00:44.000-04:00
diff --git a/.claude/settings.local.json b/.claude/settings.local.json
@@ -10,7 +10,8 @@
       "Bash(grep:*)",
       "Bash(pnpm type-check:*)",
       "Bash(pnpm lint:*)",
-      "Bash(pnpm --filter ./api lint)"
+      "Bash(pnpm --filter ./api lint)",
+      "Bash(mv:*)"
     ]
   },
   "enableAllProjectMcpServers": false
diff --git a/packages/unraid-api-plugin-connect/src/config/connect-status-writer.service.ts b/packages/unraid-api-plugin-connect/src/config/connect-status-writer.service.ts
@@ -5,14 +5,14 @@ import { writeFile } from 'fs/promises';
 import { ConnectionMetadata, ConfigType } from './connect.config.js';
 
 @Injectable()
-export class MinigraphStatusWriterService implements OnModuleInit {
+export class ConnectStatusWriterService implements OnModuleInit {
     constructor(private readonly configService: ConfigService<ConfigType, true>) {}
 
-    private logger = new Logger(MinigraphStatusWriterService.name);
+    private logger = new Logger(ConnectStatusWriterService.name);
 
     get statusFilePath() {
-        // Write to /var/local/emhttp/minigraph-status.json so PHP can read it
-        return '/var/local/emhttp/minigraph-status.json';
+        // Write to /var/local/emhttp/connectStatus.json so PHP can read it
+        return '/var/local/emhttp/connectStatus.json';
     }
 
     async onModuleInit() {
@@ -21,13 +21,11 @@ export class MinigraphStatusWriterService implements OnModuleInit {
         // Write initial status
         await this.writeStatus();
         
-        // Listen for changes to minigraph status
+        // Listen for changes to connection status
         this.configService.changes$.subscribe({
-            next: async (changes) => {
-                const minigraphChanged = Array.isArray(changes) && changes.some((change: any) =>
-                    change.path && change.path.startsWith('connect.mothership')
-                );
-                if (minigraphChanged) {
+            next: async (change) => {
+                const connectionChanged = change.path && change.path.startsWith('connect.mothership');
+                if (connectionChanged) {
                     await this.writeStatus();
                 }
             },
@@ -52,15 +50,15 @@ export class MinigraphStatusWriterService implements OnModuleInit {
             }
             
             const statusData = {
-                minigraph: connectionMetadata?.status || 'PRE_INIT',
+                connectionStatus: connectionMetadata?.status || 'PRE_INIT',
                 error: connectionMetadata?.error || null,
                 lastPing: connectionMetadata?.lastPing || null,
                 allowedOrigins: allowedOrigins,
                 timestamp: Date.now()
             };
 
             const data = JSON.stringify(statusData, null, 2);
-            this.logger.verbose(`Writing minigraph status: ${data}`);
+            this.logger.verbose(`Writing connection status: ${data}`);
             
             await writeFile(this.statusFilePath, data);
             this.logger.verbose(`Status written to ${this.statusFilePath}`);
diff --git a/packages/unraid-api-plugin-connect/src/index.ts b/packages/unraid-api-plugin-connect/src/index.ts
@@ -3,15 +3,15 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
 
 import { ConnectConfigPersister } from './config/config.persistence.js';
 import { configFeature } from './config/connect.config.js';
-import { MinigraphStatusWriterService } from './config/minigraph-status-writer.service.js';
+import { ConnectStatusWriterService } from './config/connect-status-writer.service.js';
 import { MothershipModule } from './mothership-proxy/mothership.module.js';
 import { ConnectModule } from './unraid-connect/connect.module.js';
 
 export const adapter = 'nestjs';
 
 @Module({
     imports: [ConfigModule.forFeature(configFeature), ConnectModule, MothershipModule],
-    providers: [ConnectConfigPersister, MinigraphStatusWriterService],
+    providers: [ConnectConfigPersister, ConnectStatusWriterService],
     exports: [],
 })
 class ConnectPluginModule {
diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/UpdateFlashBackup.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/UpdateFlashBackup.php
@@ -23,16 +23,16 @@
 $myservers = file_exists($myservers_flash_cfg_path) ? @parse_ini_file($myservers_flash_cfg_path,true) : [];
 $isRegistered = !empty($myservers['remote']['username']);
 
-// Read minigraph status from the new API status file
-$statusFilePath = '/var/local/emhttp/minigraph-status.json';
-$minigraphStatus = '';
+// Read connection status from the new API status file
+$statusFilePath = '/var/local/emhttp/connectStatus.json';
+$connectionStatus = '';
 
 if (file_exists($statusFilePath)) {
     $statusData = @json_decode(file_get_contents($statusFilePath), true);
-    $minigraphStatus = $statusData['minigraph'] ?? '';
+    $connectionStatus = $statusData['connectionStatus'] ?? '';
 }
 
-$isConnected = ($minigraphStatus === 'CONNECTED') ? true : false;
+$isConnected = ($connectionStatus === 'CONNECTED') ? true : false;
 
 $flashbackup_ini = '/var/local/emhttp/flashbackup.ini';
 
diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php
@@ -211,18 +211,18 @@ private function getConnectKnownOrigins()
          * Include localhost in the test, but only display HTTP(S) URLs that do not include localhost.
          */
         $this->host = $_SERVER['HTTP_HOST'] ?? "unknown";
-        // Read minigraph status and allowed origins from the new API status file
-        $statusFilePath = '/var/local/emhttp/minigraph-status.json';
-        $minigraphStatus = '';
+        // Read connection status and allowed origins from the new API status file
+        $statusFilePath = '/var/local/emhttp/connectStatus.json';
+        $connectionStatus = '';
         $allowedOrigins = '';
         
         if (file_exists($statusFilePath)) {
             $statusData = @json_decode(file_get_contents($statusFilePath), true);
-            $minigraphStatus = $statusData['minigraph'] ?? '';
+            $connectionStatus = $statusData['connectionStatus'] ?? '';
             $allowedOrigins = $statusData['allowedOrigins'] ?? '';
         }
         
-        $this->myServersMiniGraphConnected = ($minigraphStatus === 'CONNECTED');
+        $this->myServersMiniGraphConnected = ($connectionStatus === 'CONNECTED');
 
         $extraOrigins = $this->myServersFlashCfg['api']['extraOrigins'] ?? "";
         $combinedOrigins = $allowedOrigins . "," . $extraOrigins; // combine the two strings for easier searching
