unraid
diff --git a/‎api/src/unraid-api/cli/internal-client.service.ts‎
Lines changed: 1 addition & 0 deletions b/‎api/src/unraid-api/cli/internal-client.service.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎api/src/unraid-api/shared/internal-graphql-client.factory.ts‎
Lines changed: 4 additions & 1 deletion b/‎api/src/unraid-api/shared/internal-graphql-client.factory.ts‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎packages/unraid-api-plugin-connect/src/internal-rpc/internal.client.ts‎
Lines changed: 1 addition & 0 deletions b/‎packages/unraid-api-plugin-connect/src/internal-rpc/internal.client.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎packages/unraid-shared/src/services/base-internal-client.service.ts‎
Lines changed: 26 additions & 10 deletions b/‎packages/unraid-shared/src/services/base-internal-client.service.ts‎
Lines changed: 26 additions & 10 deletions
@@ -56,6 +56,7 @@ export class CliInternalClientService {
     }
 
     public clearClient() {
+        // Stop the Apollo client to terminate any active processes
         this.client?.stop();
         this.client = null;
     }
 
@@ -96,7 +96,10 @@ export class InternalGraphQLClientFactory {
             const socketPath = this.getSocketPath();
             this.logger.debug('Creating GraphQL client using Unix socket: %s', socketPath);
             if (enableSubscriptions) {
-                wsUri = 'ws://localhost/graphql';
+                // For Unix sockets, use the ws+unix:// protocol
+                // Format: ws+unix://socket/path:/url/path
+                wsUri = `ws+unix://${socketPath}:/graphql`;
+                this.logger.debug('WebSocket subscriptions over Unix socket: %s', wsUri);
             }
 
             const agent = new Agent({
 
@@ -50,6 +50,7 @@ export class InternalClientService {
     }
 
     public clearClient() {
+        // Stop the Apollo client to terminate any active processes
         this.client?.stop();
         this.client = null;
     }
 
@@ -31,6 +31,7 @@ export interface InternalClientOptions {
 export abstract class BaseInternalClientService {
     protected readonly logger: Logger;
     protected client: ApolloClient<NormalizedCacheObject> | null = null;
+    private wsClient: ReturnType<typeof createClient> | null = null;
 
     private readonly PROD_NGINX_PORT = 80;
 
@@ -156,16 +157,25 @@ export abstract class BaseInternalClientService {
 
         // If subscriptions are enabled, set up WebSocket link
         if (this.options.enableSubscriptions) {
-            const wsUri = this.isRunningOnSocket() 
-                ? 'ws://localhost/graphql' 
-                : this.getApiAddress('ws');
-
-            const wsLink = new GraphQLWsLink(
-                createClient({
-                    url: wsUri,
-                    connectionParams: () => ({ 'x-api-key': apiKey }),
-                })
-            );
+            let wsUri: string;
+            
+            if (this.isRunningOnSocket()) {
+                // For Unix sockets, use the ws+unix:// protocol
+                // Format: ws+unix://socket/path:/url/path
+                const socketPath = this.getSocketPath();
+                wsUri = `ws+unix://${socketPath}:/graphql`;
+                this.logger.debug('Enabling WebSocket subscriptions over Unix socket: %s', wsUri);
+            } else {
+                wsUri = this.getApiAddress('ws');
+                this.logger.debug('Enabling WebSocket subscriptions at: %s', wsUri);
+            }
+
+            this.wsClient = createClient({
+                url: wsUri,
+                connectionParams: () => ({ 'x-api-key': apiKey }),
+            });
+            
+            const wsLink = new GraphQLWsLink(this.wsClient);
 
             const splitLink = split(
                 ({ query }) => {
@@ -214,7 +224,13 @@ export abstract class BaseInternalClientService {
     }
 
     public clearClient() {
+        // Stop the Apollo client to terminate any active processes
         this.client?.stop();
+        // Clean up WebSocket client if it exists
+        if (this.wsClient) {
+            this.wsClient.dispose();
+            this.wsClient = null;
+        }
         this.client = null;
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ export class CliInternalClientService {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public clearClient() {`
	`59`	`+ // Stop the Apollo client to terminate any active processes`
`59`	`60`	`this.client?.stop();`
`60`	`61`	`this.client = null;`
`61`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ export class InternalClientService {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public clearClient() {`
	`53`	`+ // Stop the Apollo client to terminate any active processes`
`53`	`54`	`this.client?.stop();`
`54`	`55`	`this.client = null;`
`55`	`56`	`}`