@typerighter/rpc-client 0.25.0 → 0.27.0

package/dist/core/client.js

@@ -46,6 +46,9 @@ export class JsonRpcClient {
             return;
         this.disposed = true;
         this.rejectAllPending('Connection disposed');
+        // Close the streams so the server detects the disconnect
+        this.reader.destroy();
+        this.writer.destroy();
     }
     // https://github.com/microsoft/vscode-languageserver-node/blob/5010cdf9822e1038a30ee7eb6ee5d7aaa79acc4a/jsonrpc/src/common/connection.ts#L565
     onClose(listener) {
@@ -74,9 +77,18 @@ export class JsonRpcClient {
     }
     // https://github.com/microsoft/vscode-languageserver-node/blob/5010cdf9822e1038a30ee7eb6ee5d7aaa79acc4a/jsonrpc/src/common/connection.ts#L557
     onNotification(method, handler) {
-        this.notificationHandlers.set(method, handler);
+        const handlers = this.notificationHandlers.get(method) ?? [];
+        handlers.push(handler);
+        this.notificationHandlers.set(method, handlers);
         return {
-            dispose: () => this.notificationHandlers.delete(method),
+            dispose: () => {
+                const list = this.notificationHandlers.get(method);
+                if (list) {
+                    const idx = list.indexOf(handler);
+                    if (idx !== -1)
+                        list.splice(idx, 1);
+                }
+            },
         };
     }
     // Accumulate chunk and parse as many complete messages as possible
@@ -136,14 +148,16 @@ export class JsonRpcClient {
         }
     }
     handleNotification(notification) {
-        const handler = this.notificationHandlers.get(notification.method);
-        if (!handler)
+        const handlers = this.notificationHandlers.get(notification.method);
+        if (!handlers?.length)
             return;
-        try {
-            handler(notification.params);
-        }
-        catch (error) {
-            console.error(`[jsonrpc] Notification handler for '${notification.method}' threw:`, error);
+        for (const handler of handlers) {
+            try {
+                handler(notification.params);
+            }
+            catch (error) {
+                console.error(`[jsonrpc] Notification handler for '${notification.method}' threw:`, error);
+            }
         }
     }
     // Cleanup

package/dist/index.d.ts

@@ -109,6 +109,8 @@ export declare class RpcClient {
     private constructor();
     static connectTcp(host: string, port: number): Promise<RpcClient>;
     static connectStdio(stdin: Readable, stdout: Writable): RpcClient;
+    /** Send exit notification and close the connection
+     * The detached server will detect the disconnect and save its cache */
     dispose(): void;
     onClose(callback: () => void): {
         dispose: () => void;

package/dist/index.js

@@ -49,7 +49,10 @@ export class RpcClient {
     static connectStdio(stdin, stdout) {
         return new RpcClient(JsonRpcClient.connectStdio(stdin, stdout));
     }
+    /** Send exit notification and close the connection
+     * The detached server will detect the disconnect and save its cache */
     dispose() {
+        this.rpc.sendNotification('exit');
         this.rpc.dispose();
     }
     onClose(callback) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@typerighter/rpc-client",
-  "version": "0.25.0",
+  "version": "0.27.0",
   "description": "JSON-RPC client for Typedown over TCP/stdio.",
   "repository": {
     "type": "git",

package/src/core/client.ts

@@ -47,7 +47,7 @@ export class JsonRpcClient implements MessageConnection {
   // Request/response matching
   private sequenceNumber = 1;
   private responsePromises = new Map<number, PendingRequest>();
-  private notificationHandlers = new Map<string, (params: unknown) => void>();
+  private notificationHandlers = new Map<string, Array<(params: unknown) => void>>();
 
   // Inbound buffer, raw chunks to avoid corrupting multi-byte UTF-8
   private chunks: Buffer[] = [];
@@ -86,6 +86,9 @@ export class JsonRpcClient implements MessageConnection {
     this.disposed = true;
 
     this.rejectAllPending('Connection disposed');
+    // Close the streams so the server detects the disconnect
+    this.reader.destroy();
+    this.writer.destroy();
   }
 
   // https://github.com/microsoft/vscode-languageserver-node/blob/5010cdf9822e1038a30ee7eb6ee5d7aaa79acc4a/jsonrpc/src/common/connection.ts#L565
@@ -118,9 +121,17 @@ export class JsonRpcClient implements MessageConnection {
 
   // https://github.com/microsoft/vscode-languageserver-node/blob/5010cdf9822e1038a30ee7eb6ee5d7aaa79acc4a/jsonrpc/src/common/connection.ts#L557
   onNotification (method: string, handler: (params: any) => void): Disposable {
-    this.notificationHandlers.set(method, handler);
+    const handlers = this.notificationHandlers.get(method) ?? [];
+    handlers.push(handler);
+    this.notificationHandlers.set(method, handlers);
     return {
-      dispose: () => this.notificationHandlers.delete(method),
+      dispose: () => {
+        const list = this.notificationHandlers.get(method);
+        if (list) {
+          const idx = list.indexOf(handler);
+          if (idx !== -1) list.splice(idx, 1);
+        }
+      },
     };
   }
 
@@ -190,14 +201,16 @@ export class JsonRpcClient implements MessageConnection {
   }
 
   private handleNotification (notification: NotificationMessage): void {
-    const handler = this.notificationHandlers.get(notification.method);
+    const handlers = this.notificationHandlers.get(notification.method);
 
-    if (!handler) return;
+    if (!handlers?.length) return;
 
-    try {
-      handler(notification.params);
-    } catch (error) {
-      console.error(`[jsonrpc] Notification handler for '${notification.method}' threw:`, error);
+    for (const handler of handlers) {
+      try {
+        handler(notification.params);
+      } catch (error) {
+        console.error(`[jsonrpc] Notification handler for '${notification.method}' threw:`, error);
+      }
     }
   }
 

package/src/index.ts

@@ -166,7 +166,10 @@ export class RpcClient {
     return new RpcClient(JsonRpcClient.connectStdio(stdin, stdout));
   }
 
+  /** Send exit notification and close the connection
+   * The detached server will detect the disconnect and save its cache */
   dispose (): void {
+    this.rpc.sendNotification('exit');
     this.rpc.dispose();
   }