Feat/mothership v2

api/.env.development

@@ -19,12 +19,14 @@ PATHS_LOGS_FILE=./dev/log/graphql-api.log
 PATHS_CONNECT_STATUS_FILE_PATH=./dev/connectStatus.json # Connect plugin status file
 PATHS_OIDC_JSON=./dev/configs/oidc.local.json
 PATHS_LOCAL_SESSION_FILE=./dev/local-session
+PATHS_CONNECT_STATUS=./dev/states/connectStatus.json # Connect status file for development
 ENVIRONMENT="development"
 NODE_ENV="development"
 PORT="3001"
 PLAYGROUND=true
 INTROSPECTION=true
-MOTHERSHIP_GRAPHQL_LINK="http://authenticator:3000/graphql"
+MOTHERSHIP_GRAPHQL_LINK="wss://preview.mothership2.unraid.net"
+MOTHERSHIP_BASE_URL="https://preview.mothership2.unraid.net"
 NODE_TLS_REJECT_UNAUTHORIZED=0
 BYPASS_PERMISSION_CHECKS=false
 BYPASS_CORS_CHECKS=true

api/dev/configs/api.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.25.3",
+  "version": "4.27.2",
   "extraOrigins": [],
   "sandbox": true,
   "ssoSubIds": [],

api/dev/configs/connect.json

@@ -2,7 +2,7 @@
   "wanaccess": true,
   "wanport": 8443,
   "upnpEnabled": false,
-  "apikey": "",
+  "apikey": "_______________________LOCAL_API_KEY_HERE_________________________",
   "localApiKey": "_______________________LOCAL_API_KEY_HERE_________________________",
   "email": "test@example.com",
   "username": "zspearmint",

api/dev/states/connectStatus.json

@@ -0,0 +1,7 @@
+{
+  "connectionStatus": "PRE_INIT",
+  "error": null,
+  "lastPing": null,
+  "allowedOrigins": "",
+  "timestamp": 1764601989840
+}

api/scripts/build.ts

@@ -7,7 +7,7 @@ import { exit } from 'process';
 import type { PackageJson } from 'type-fest';
 import { $, cd } from 'zx';
 
-import { getDeploymentVersion } from './get-deployment-version.js';
+import { getDeploymentVersion } from '@app/../scripts/get-deployment-version.js';
 
 type ApiPackageJson = PackageJson & {
     version: string;

api/src/unraid-api/unraid-file-modifier/file-modification.ts

@@ -8,6 +8,7 @@ import { applyPatch, createPatch, parsePatch, reversePatch } from 'diff';
 import { coerce, compare, gte, lte } from 'semver';
 
 import { getUnraidVersion } from '@app/common/dashboard/get-unraid-version.js';
+import { NODE_ENV } from '@app/environment.js';
 
 export type ModificationEffect = 'nginx:reload';
 
@@ -225,6 +226,14 @@ export abstract class FileModification {
                 throw new Error('Invalid file modification configuration');
             }
 
+            // Skip file modifications in development mode
+            if (NODE_ENV === 'development') {
+                return {
+                    shouldApply: false,
+                    reason: 'File modifications are disabled in development mode',
+                };
+            }
+
             const fileExists = await access(this.filePath, constants.R_OK | constants.W_OK)
                 .then(() => true)
                 .catch(() => false);

api/src/unraid-api/unraid-file-modifier/unraid-file-modifier.service.ts

@@ -8,6 +8,7 @@ import {
 import { ConfigService } from '@nestjs/config';
 
 import type { ModificationEffect } from '@app/unraid-api/unraid-file-modifier/file-modification.js';
+import { NODE_ENV } from '@app/environment.js';
 import { FileModificationEffectService } from '@app/unraid-api/unraid-file-modifier/file-modification-effect.service.js';
 import { FileModification } from '@app/unraid-api/unraid-file-modifier/file-modification.js';
 
@@ -29,6 +30,11 @@ export class UnraidFileModificationService
      */
     async onModuleInit() {
         try {
+            if (NODE_ENV === 'development') {
+                this.logger.log('Skipping file modifications in development mode');
+                return;
+            }
+
             this.logger.log('Loading file modifications...');
             const mods = await this.loadModifications();
             await this.applyModifications(mods);

packages/unraid-api-plugin-connect/codegen.ts

@@ -29,26 +29,7 @@ const config: CodegenConfig = {
         },
     },
     generates: {
-        // Generate Types for Mothership GraphQL Client
-        'src/graphql/generated/client/': {
-            documents: './src/graphql/**/*.ts',
-            schema: {
-                [process.env.MOTHERSHIP_GRAPHQL_LINK ?? 'https://staging.mothership.unraid.net/ws']: {
-                    headers: {
-                        origin: 'https://forums.unraid.net',
-                    },
-                },
-            },
-            preset: 'client',
-            presetConfig: {
-                gqlTagName: 'graphql',
-            },
-            config: {
-                useTypeImports: true,
-                withObjectType: true,
-            },
-            plugins: [{ add: { content: '/* eslint-disable */' } }],
-        },
+        // No longer generating mothership GraphQL types since we switched to WebSocket-based UnraidServerClient
     },
 };
 

packages/unraid-api-plugin-connect/package.json

@@ -13,7 +13,7 @@
         "build": "tsc",
         "prepare": "npm run build",
         "format": "prettier --write \"src/**/*.{ts,js,json}\"",
-        "codegen": "MOTHERSHIP_GRAPHQL_LINK='https://staging.mothership.unraid.net/ws' graphql-codegen --config codegen.ts"
+        "codegen": "graphql-codegen --config codegen.ts"
     },
     "keywords": [
         "unraid",
@@ -57,6 +57,7 @@
         "jose": "6.0.13",
         "lodash-es": "4.17.21",
         "nest-authz": "2.17.0",
+        "pify": "^6.1.0",
         "prettier": "3.6.2",
         "rimraf": "6.0.1",
         "rxjs": "7.8.2",

packages/unraid-api-plugin-connect/src/connection-status/cloud.service.ts

@@ -204,7 +204,7 @@ export class CloudService {
     }
 
     private async hardCheckDns() {
-        const mothershipGqlUri = this.configService.getOrThrow<string>('MOTHERSHIP_GRAPHQL_LINK');
+        const mothershipGqlUri = this.configService.getOrThrow<string>('MOTHERSHIP_BASE_URL');
         const hostname = new URL(mothershipGqlUri).host;
         const lookup = promisify(lookupDNS);
         const resolve = promisify(resolveDNS);

packages/unraid-api-plugin-connect/src/connection-status/connect-status-writer.service.ts

@@ -1,7 +1,8 @@
 import { Injectable, Logger, OnApplicationBootstrap, OnModuleDestroy } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { OnEvent } from '@nestjs/event-emitter';
-import { unlink, writeFile } from 'fs/promises';
+import { mkdir, unlink, writeFile } from 'fs/promises';
+import { dirname } from 'path';
 
 import { ConfigType, ConnectionMetadata } from '../config/connect.config.js';
 import { EVENTS } from '../helper/nest-tokens.js';
@@ -13,8 +14,8 @@ export class ConnectStatusWriterService implements OnApplicationBootstrap, OnMod
     private logger = new Logger(ConnectStatusWriterService.name);
 
     get statusFilePath() {
-        // Use environment variable if provided, otherwise use default path
-        return process.env.PATHS_CONNECT_STATUS_FILE_PATH ?? '/var/local/emhttp/connectStatus.json';
+        // Use environment variable if set, otherwise default to /var/local/emhttp/connectStatus.json
+        return this.configService.get('PATHS_CONNECT_STATUS') || '/var/local/emhttp/connectStatus.json';
     }
 
     async onApplicationBootstrap() {
@@ -59,6 +60,10 @@ export class ConnectStatusWriterService implements OnApplicationBootstrap, OnMod
             const data = JSON.stringify(statusData, null, 2);
             this.logger.verbose(`Writing connection status: ${data}`);
 
+            // Ensure the directory exists before writing
+            const dir = dirname(this.statusFilePath);
+            await mkdir(dir, { recursive: true });
+
             await writeFile(this.statusFilePath, data);
             this.logger.verbose(`Status written to ${this.statusFilePath}`);
         } catch (error) {

packages/unraid-api-plugin-connect/src/graphql/remote-response.ts

@@ -1,5 +1,5 @@
 // Import from the generated directory
-import { graphql } from '../graphql/generated/client/gql.js';
+import { graphql } from './generated/client/gql.js';
 
 export const SEND_REMOTE_QUERY_RESPONSE = graphql(/* GraphQL */ `
     mutation sendRemoteGraphQLResponse($input: RemoteGraphQLServerInput!) {

packages/unraid-api-plugin-connect/src/mothership-proxy/local-graphql-executor.service.ts

@@ -0,0 +1,162 @@
+import { Inject, Injectable, Logger } from '@nestjs/common';
+import { gql } from '@apollo/client/core/index.js';
+import { parse, print, visit } from 'graphql';
+
+import {
+  CANONICAL_INTERNAL_CLIENT_TOKEN,
+  type CanonicalInternalClientService,
+} from '@unraid/shared';
+
+interface GraphQLExecutor {
+  execute(params: {
+    query: string
+    variables?: Record<string, any>
+    operationName?: string
+    operationType?: 'query' | 'mutation' | 'subscription'
+  }): Promise<any>
+  stopSubscription?(operationId: string): Promise<void>
+}
+
+/**
+ * Local GraphQL executor that maps remote queries to local API calls
+ */
+@Injectable()
+export class LocalGraphQLExecutor implements GraphQLExecutor {
+  private readonly logger = new Logger(LocalGraphQLExecutor.name);
+
+  constructor(
+    @Inject(CANONICAL_INTERNAL_CLIENT_TOKEN)
+    private readonly internalClient: CanonicalInternalClientService,
+  ) {}
+
+  async execute(params: {
+    query: string
+    variables?: Record<string, any>
+    operationName?: string
+    operationType?: 'query' | 'mutation' | 'subscription'
+  }): Promise<any> {
+    const { query, variables, operationName, operationType } = params;
+
+    try {
+      this.logger.debug(`Executing ${operationType} operation: ${operationName || 'unnamed'}`);
+      this.logger.verbose(`Query: ${query}`);
+      this.logger.verbose(`Variables: ${JSON.stringify(variables)}`);
+
+      // Transform remote query to local query by removing "remote" prefixes
+      const localQuery = this.transformRemoteQueryToLocal(query);
+
+      // Execute the transformed query against local API
+      const client = await this.internalClient.getClient();
+      const result = await client.query({
+        query: gql`${localQuery}`,
+        variables,
+      });
+
+      return {
+        data: result.data,
+      };
+    } catch (error: any) {
+      this.logger.error(`GraphQL execution error: ${error?.message}`);
+      return {
+        errors: [
+          {
+            message: error?.message || 'Unknown error',
+            extensions: { code: 'EXECUTION_ERROR' },
+          },
+        ],
+      };
+    }
+  }
+
+  /**
+   * Transform remote GraphQL query to local query by removing "remote" prefixes
+   */
+  private transformRemoteQueryToLocal(query: string): string {
+    try {
+      // Parse the GraphQL query
+      const document = parse(query);
+
+      // Transform the document by removing "remote" prefixes
+      const transformedDocument = visit(document, {
+        // Transform operation names (e.g., remoteGetDockerInfo -> getDockerInfo)
+        OperationDefinition: (node) => {
+          if (node.name?.value.startsWith('remote')) {
+            return {
+              ...node,
+              name: {
+                ...node.name,
+                value: this.removeRemotePrefix(node.name.value),
+              },
+            };
+          }
+          return node;
+        },
+        // Transform field names (e.g., remoteGetDockerInfo -> docker, remoteGetVms -> vms)
+        Field: (node) => {
+          if (node.name.value.startsWith('remote')) {
+            return {
+              ...node,
+              name: {
+                ...node.name,
+                value: this.transformRemoteFieldName(node.name.value),
+              },
+            };
+          }
+          return node;
+        },
+      });
+
+      // Convert back to string
+      return print(transformedDocument);
+    } catch (error) {
+      this.logger.error(`Failed to parse/transform GraphQL query: ${error}`);
+      throw error;
+    }
+  }
+
+  /**
+   * Remove "remote" prefix from operation names
+   */
+  private removeRemotePrefix(name: string): string {
+    if (name.startsWith('remote')) {
+      // remoteGetDockerInfo -> getDockerInfo
+      return name.slice(6); // Remove "remote"
+    }
+    return name;
+  }
+
+  /**
+   * Transform remote field names to local equivalents
+   */
+  private transformRemoteFieldName(fieldName: string): string {
+    // Handle common patterns
+    if (fieldName === 'remoteGetDockerInfo') {
+      return 'docker';
+    }
+    if (fieldName === 'remoteGetVms') {
+      return 'vms';
+    }
+    if (fieldName === 'remoteGetSystemInfo') {
+      return 'system';
+    }
+
+    // Generic transformation: remove "remoteGet" and convert to camelCase
+    if (fieldName.startsWith('remoteGet')) {
+      const baseName = fieldName.slice(9); // Remove "remoteGet"
+      return baseName.charAt(0).toLowerCase() + baseName.slice(1);
+    }
+
+    // Remove "remote" prefix as fallback
+    if (fieldName.startsWith('remote')) {
+      const baseName = fieldName.slice(6); // Remove "remote"
+      return baseName.charAt(0).toLowerCase() + baseName.slice(1);
+    }
+
+    return fieldName;
+  }
+
+  async stopSubscription(operationId: string): Promise<void> {
+    this.logger.debug(`Stopping subscription: ${operationId}`);
+    // Subscription cleanup logic would go here
+  }
+}