refactor(terminal): decouple terminal input from JSON RPC path (#4696)

Author: coffeedeveloper

packages/extension/__tests__/hosted/api/vscode/ext.host.terminal.test.ts

@@ -78,6 +78,12 @@ describe('ext host terminal test', () => {
         detectAvailableProfiles() {
           return [];
         },
+        input() {
+          // no-op for tests
+        },
+        resize() {
+          // no-op for tests
+        },
       },
     },
     {

packages/terminal-next/__tests__/browser/inject.ts

@@ -194,6 +194,12 @@ export const injector = new MockInjector([
         pid: 0,
         name: '123',
       }),
+      input() {
+        // no-op for tests
+      },
+      resize() {
+        // no-op for tests
+      },
       $resolveUnixShellPath(p) {
         return p;
       },

packages/terminal-next/__tests__/browser/terminal.service.test.ts

@@ -90,6 +90,12 @@ describe('terminal service test cases', () => {
             (terminalService as any)?.$processChange(sessionId, 'zsh');
           });
         },
+        input() {
+          // no-op for tests
+        },
+        resize() {
+          // no-op for tests
+        },
         $resolveUnixShellPath(p) {
           return p;
         },

packages/terminal-next/__tests__/node/terminal.reconnect.test.ts

@@ -92,6 +92,7 @@ class MockTerminalClient implements ITerminalServiceClient {
   reconnectedIds: string[] = [];
   disconnectedIds: string[] = [];
   setConnectionClientId(): void {}
+  input(): void {}
   onMessage(): void {}
   resize(): void {}
   disposeById(): void {}

packages/terminal-next/__tests__/node/terminal.service.client.test.ts

@@ -62,7 +62,7 @@ describe('TerminalServiceClientImpl', () => {
       receiveData = receiveData + data;
     });
 
-    terminalServiceClient.onMessage(mockId, JSON.stringify({ data: 'message test' }));
+    terminalServiceClient.input(mockId, 'message test');
     terminalServiceClient.resize(mockId, 400, 400);
 
     await new Promise<void>((resolve) => {

packages/terminal-next/src/browser/terminal.service.ts

@@ -27,8 +27,6 @@ export interface EventMessage {
 }
 @Injectable()
 export class NodePtyTerminalService extends Disposable implements ITerminalService {
-  static countId = 1;
-
   private backendOs: OperatingSystem | undefined;
 
   @Autowired(INJECTOR_TOKEN)
@@ -117,29 +115,12 @@ export class NodePtyTerminalService extends Disposable implements ITerminalServi
     this.logger.error(`${sessionId} cannot create ptyInstance`, ptyInstance);
   }
 
-  private _sendMessage(sessionId: string, json: any, requestId?: number) {
-    const id = requestId || NodePtyTerminalService.countId++;
-
-    this.serviceClientRPC.onMessage(
-      sessionId,
-      JSON.stringify({
-        id,
-        ...json,
-      }),
-    );
-  }
-
   async sendText(sessionId: string, message: string) {
-    this._sendMessage(sessionId, {
-      data: message,
-    });
+    this.serviceClientRPC.input(sessionId, message);
   }
 
   async resize(sessionId: string, cols: number, rows: number) {
-    this._sendMessage(sessionId, {
-      method: 'resize',
-      params: { cols, rows },
-    });
+    this.serviceClientRPC.resize(sessionId, rows, cols);
   }
 
   async getCodePlatformKey(): Promise<'osx' | 'windows' | 'linux'> {

packages/terminal-next/src/common/pty.ts

@@ -328,6 +328,7 @@ export interface ITerminalServiceClient {
     rows: number,
     launchConfig: IShellLaunchConfig,
   ): Promise<INodePtyInstance | undefined>;
+  input(id: string, data: string): void;
   onMessage(id: string, msg: string): void;
   resize(id: string, rows: number, cols: number): void;
   disposeById(id: string): void;

packages/terminal-next/src/node/terminal.service.client.ts

@@ -155,15 +155,24 @@ export class TerminalServiceClientImpl extends RPCService<IRPCTerminalService> i
   }
 
   onMessage(id: string, msg: string): void {
-    const { data, params, method } = JSON.parse(msg);
+    try {
+      const { data, params, method } = JSON.parse(msg);
 
-    if (method === 'resize') {
-      this.resize(id, params.rows, params.cols);
-    } else {
-      this.terminalService.onMessage(id, data);
+      if (method === 'resize') {
+        this.resize(id, params.rows, params.cols);
+      } else {
+        this.terminalService.onMessage(id, data);
+      }
+    } catch {
+      // Fallback for legacy/raw messages.
+      this.terminalService.onMessage(id, msg);
     }
   }
 
+  input(id: string, data: string): void {
+    this.terminalService.onMessage(id, data);
+  }
+
   resize(id: string, rows: number, cols: number) {
     this.terminalService.resize(id, rows, cols);
   }