@opensumi/ide-terminal-next 2.13.9 → 2.14.1

package/lib/node/shell.js.map

@@ -1 +1 @@
-{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/node/shell.ts"],"names":[],"mappings":";;;;AAAA,+DAAsD;AACtD,yDAAoB;AAEP,QAAA,sBAAsB,GAAG;IACpC,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,sBAAsB;IACpD,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,2BAA2B;IACzD,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,sBAAsB;IACpD,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,2BAA2B;IACzD,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,gCAAgC;IAC9D,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,yDAAyD;IACtF,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,yDAAyD;CAC3F,CAAC;AAEF,SAAgB,mBAAmB,CAAC,SAAmB;IACrD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;QAC1B,OAAO,SAAS,CAAC;KAClB;IAED,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE;QACzB,IAAI,YAAE,CAAC,UAAU,CAAC,IAAA,2BAAS,EAAC,CAAC,CAAC,CAAC,EAAE;YAC/B,OAAO,CAAC,CAAC;SACV;QACD,SAAS;KACV;AACH,CAAC;AAXD,kDAWC"}
+{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/node/shell.ts"],"names":[],"mappings":"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"}

package/lib/node/terminal.service.client.d.ts

@@ -1,8 +1,14 @@
 import { RPCService } from '@opensumi/ide-connection';
-import { ITerminalServiceClient, TerminalOptions } from '../common';
+import { IShellLaunchConfig, ITerminalServiceClient, INodePtyInstance, ITerminalError } from '../common';
 import { WindowsShellType } from '../common/shell';
+/**
+ * this RPC target: NodePtyTerminalService
+ */
 interface IRPCTerminalService {
-    closeClient(id: string, code?: number, signal?: number): void;
+    closeClient(id: string, data: ITerminalError | {
+        code?: number;
+        signal?: number;
+    } | number, signal?: number): void;
     onMessage(id: string, msg: string): void;
 }
 /**
@@ -16,13 +22,20 @@ export declare class TerminalServiceClientImpl extends RPCService<IRPCTerminalSe
     private logger;
     setConnectionClientId(clientId: string): void;
     clientMessage(id: string, data: string): void;
-    closeClient(id: string, code?: number, signal?: number): void;
+    closeClient(id: string, data: ITerminalError | {
+        code?: number;
+        signal?: number;
+    } | number, signal?: number): void;
     ensureTerminal(terminalIdArr: string[]): boolean;
-    create(id: string, rows: number, cols: number, options: TerminalOptions): Promise<{
-        pid: number;
-        name: string;
-    }>;
+    create2(id: string, options: IShellLaunchConfig): Promise<INodePtyInstance | undefined>;
     $resolveWindowsShellPath(type: WindowsShellType): Promise<string | undefined>;
+    $resolveUnixShellPath(type: string): Promise<string | undefined>;
+    $resolveShellPath(paths: string[]): Promise<string | undefined>;
+    $resolvePotentialUnixShellPath(): Promise<string | undefined>;
+    $resolvePotentialWindowsShellPath(): Promise<{
+        path: string;
+        type: WindowsShellType;
+    }>;
     onMessage(id: string, msg: string): void;
     resize(id: string, rows: number, cols: number): void;
     disposeById(id: string): void;

package/lib/node/terminal.service.client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.service.client.d.ts","sourceRoot":"","sources":["../../src/node/terminal.service.client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAwB,sBAAsB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG1F,OAAO,EAAE,gBAAgB,EAAmC,MAAM,iBAAiB,CAAC;AAGpF,UAAU,mBAAmB;IAC3B,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9D,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C;AAED;;;GAGG;AACH,qBACa,yBAA0B,SAAQ,UAAU,CAAC,mBAAmB,CAAE,YAAW,sBAAsB;IAC9G,OAAO,CAAC,WAAW,CAAgC;IAGnD,OAAO,CAAC,eAAe,CAAuB;IAE9C,OAAO,CAAC,QAAQ,CAAS;IAGzB,OAAO,CAAC,MAAM,CAAc;IAE5B,qBAAqB,CAAC,QAAQ,EAAE,MAAM;IAMtC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAQtC,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAStD,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO;IAI1C,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe;;;;IAavE,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAgBnF,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAUxC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAI7C,WAAW,CAAC,EAAE,EAAE,MAAM;IAItB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAIhC,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAIhC,OAAO;CASR"}
+{"version":3,"file":"terminal.service.client.d.ts","sourceRoot":"","sources":["../../src/node/terminal.service.client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EACL,kBAAkB,EAElB,sBAAsB,EACtB,gBAAgB,EAChB,cAAc,EACf,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,gBAAgB,EAAmC,MAAM,iBAAiB,CAAC;AAGpF;;GAEG;AACH,UAAU,mBAAmB;IAC3B,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnH,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C;AAED;;;GAGG;AACH,qBACa,yBAA0B,SAAQ,UAAU,CAAC,mBAAmB,CAAE,YAAW,sBAAsB;IAC9G,OAAO,CAAC,WAAW,CAAgC;IAGnD,OAAO,CAAC,eAAe,CAAuB;IAE9C,OAAO,CAAC,QAAQ,CAAS;IAGzB,OAAO,CAAC,MAAM,CAAc;IAE5B,qBAAqB,CAAC,QAAQ,EAAE,MAAM;IAKtC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAQtC,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAS3G,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO;IAI1C,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAgBvF,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAgB7E,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKhE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI/D,8BAA8B,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAc7D,iCAAiC,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC;IAsB5F,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAUxC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAI7C,WAAW,CAAC,EAAE,EAAE,MAAM;IAItB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAIhC,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAIhC,OAAO;CAGR"}

package/lib/node/terminal.service.client.js

@@ -29,9 +29,9 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
             this.logger.warn(`clientMessage ${id} rpcClient not found`);
         }
     }
-    closeClient(id, code, signal) {
+    closeClient(id, data, signal) {
         if (this.client) {
-            this.client.closeClient(id, code, signal);
+            this.client.closeClient(id, data, signal);
         }
         else {
             this.logger.warn(`clientMessage ${id} rpcClient not found`);
@@ -41,16 +41,20 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
     ensureTerminal(terminalIdArr) {
         return this.terminalService.ensureClientTerminal(this.clientId, terminalIdArr);
     }
-    async create(id, rows, cols, options) {
-        const clientId = this.clientId;
-        this.terminalService.setClient(clientId, this);
-        this.logger.log('create pty id', id);
-        const pty = (await this.terminalService.create(id, rows, cols, options));
-        this.terminalMap.set(id, pty);
-        return {
-            pid: pty.pid,
-            name: this.terminalService.getShellName(id) || '',
-        };
+    async create2(id, options) {
+        const pty = await this.terminalService.create2(id, options);
+        if (pty) {
+            this.terminalService.setClient(this.clientId, this);
+            this.logger.log(`client ${id} create ${pty} with options ${JSON.stringify(options)}`);
+            this.terminalMap.set(id, pty);
+            return {
+                id,
+                pid: pty.pid,
+                proess: pty.process,
+                name: pty.parsedName,
+                shellPath: pty.launchConfig.shellPath,
+            };
+        }
     }
     async $resolveWindowsShellPath(type) {
         switch (type) {
@@ -59,7 +63,7 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
             case shell_1.WindowsShellType.cmd:
                 return shell_1.WINDOWS_DEFAULT_SHELL_PATH_MAPS.cmd;
             case shell_1.WindowsShellType['git-bash']: {
-                const shell = (0, shell_2.findShellExecutable)(shell_2.WINDOWS_GIT_BASH_PATHS);
+                const shell = await (0, shell_2.findShellExecutableAsync)(shell_2.WINDOWS_GIT_BASH_PATHS);
                 return shell;
             }
             default:
@@ -67,6 +71,45 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
                 return undefined;
         }
     }
+    async $resolveUnixShellPath(type) {
+        const candidates = [type, `/bin/${type}`, `/usr/bin/${type}`];
+        return await (0, shell_2.findShellExecutableAsync)(candidates);
+    }
+    async $resolveShellPath(paths) {
+        return await (0, shell_2.findShellExecutableAsync)(paths);
+    }
+    async $resolvePotentialUnixShellPath() {
+        if (process.env.SHELL) {
+            return process.env.SHELL;
+        }
+        const candidates = ['zsh', 'bash', 'sh'];
+        for (const candidate of candidates) {
+            const path = await this.$resolveUnixShellPath(candidate);
+            if (path) {
+                return path;
+            }
+        }
+    }
+    async $resolvePotentialWindowsShellPath() {
+        let path = await (0, shell_2.findShellExecutableAsync)(shell_2.WINDOWS_GIT_BASH_PATHS);
+        if (path) {
+            return {
+                path,
+                type: shell_1.WindowsShellType['git-bash'],
+            };
+        }
+        path = await (0, shell_2.findExecutable)(shell_1.WINDOWS_DEFAULT_SHELL_PATH_MAPS.powershell);
+        if (path) {
+            return {
+                path,
+                type: shell_1.WindowsShellType.powershell,
+            };
+        }
+        return {
+            path: shell_1.WINDOWS_DEFAULT_SHELL_PATH_MAPS.cmd,
+            type: shell_1.WindowsShellType.cmd,
+        };
+    }
     onMessage(id, msg) {
         const { data, params, method } = JSON.parse(msg);
         if (method === 'resize') {
@@ -90,11 +133,6 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
     }
     dispose() {
         this.terminalService.closeClient(this.clientId);
-        /*
-        this.terminalMap.forEach((pty) => {
-          pty.kill();
-        });
-        */
     }
 };
 (0, tslib_1.__decorate)([

package/lib/node/terminal.service.client.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.service.client.js","sourceRoot":"","sources":["../../src/node/terminal.service.client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal.service.client.js","sourceRoot":"","sources":["../../src/node/terminal.service.client.ts"],"names":[],"mappings":"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"}

package/lib/node/terminal.service.d.ts

@@ -1,7 +1,9 @@
-import { IPty } from './pty';
-import { ITerminalNodeService, TerminalOptions, ITerminalServiceClient } from '../common';
+import { IPty } from '../common/pty';
+import { IShellLaunchConfig } from '../common/pty';
+import { ITerminalNodeService, ITerminalServiceClient } from '../common';
 /**
  * terminal service 的具体实现
+ * @lengthmin: 其实这里应该换成每个实例持有一个 pty 实例，待讨论并推进实现
  */
 export declare class TerminalServiceImpl implements ITerminalNodeService {
     static TerminalPtyCloseThreshold: number;
@@ -12,11 +14,14 @@ export declare class TerminalServiceImpl implements ITerminalNodeService {
     private serviceClientMap;
     private logger;
     private appConfig;
+    private batchedPtyDataMap;
+    private batchedPtyDataTimer;
     setClient(clientId: string, client: ITerminalServiceClient): void;
     ensureClientTerminal(clientId: string, terminalIdArr: string[]): boolean;
     closeClient(clientId: string): void;
     disposeClient(clientId: string): void;
-    create(id: string, rows: number, cols: number, options: TerminalOptions): Promise<IPty>;
+    private flushPtyData;
+    create2(id: string, options: IShellLaunchConfig): Promise<IPty | undefined>;
     onMessage(id: any, msg: any): void;
     resize(id: any, rows: any, cols: any): void;
     getShellName(id: string): string;

package/lib/node/terminal.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.service.d.ts","sourceRoot":"","sources":["../../src/node/terminal.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,IAAI,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAG1F;;GAEG;AACH,qBACa,mBAAoB,YAAW,oBAAoB;IAC9D,MAAM,CAAC,yBAAyB,SAAa;IAE7C,OAAO,CAAC,WAAW,CAAgC;IACnD,OAAO,CAAC,iBAAiB,CAA6C;IACtE,OAAO,CAAC,0BAA0B,CAA0C;IAC5E,OAAO,CAAC,UAAU,CAAoB;IAEtC,OAAO,CAAC,gBAAgB,CAAkD;IAG1E,OAAO,CAAC,MAAM,CAAc;IAG5B,OAAO,CAAC,SAAS,CAAY;IAEtB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB;IAI1D,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE;IAS9D,WAAW,CAAC,QAAQ,EAAE,MAAM;IAa5B,aAAa,CAAC,QAAQ,EAAE,MAAM;IAYxB,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe;IAkC7E,SAAS,CAAC,EAAE,KAAA,EAAE,GAAG,KAAA;IASjB,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,KAAA,EAAE,IAAI,KAAA;IAS5B,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAShC,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAShC,WAAW,CAAC,EAAE,EAAE,MAAM;IAStB,OAAO;IAMP,OAAO,CAAC,WAAW;CAGpB"}
+{"version":3,"file":"terminal.service.d.ts","sourceRoot":"","sources":["../../src/node/terminal.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AASzE;;;GAGG;AACH,qBACa,mBAAoB,YAAW,oBAAoB;IAC9D,MAAM,CAAC,yBAAyB,SAAa;IAE7C,OAAO,CAAC,WAAW,CAAgC;IACnD,OAAO,CAAC,iBAAiB,CAA6C;IACtE,OAAO,CAAC,0BAA0B,CAA0C;IAG5E,OAAO,CAAC,UAAU,CAAa;IAE/B,OAAO,CAAC,gBAAgB,CAAkD;IAG1E,OAAO,CAAC,MAAM,CAAc;IAG5B,OAAO,CAAC,SAAS,CAAY;IAE7B,OAAO,CAAC,iBAAiB,CAAkC;IAC3D,OAAO,CAAC,mBAAmB,CAA0C;IAE9D,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB;IAI1D,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE;IAS9D,WAAW,CAAC,QAAQ,EAAE,MAAM;IAc5B,aAAa,CAAC,QAAQ,EAAE,MAAM;IAYrC,OAAO,CAAC,YAAY;IASP,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB;IA2ErD,SAAS,CAAC,EAAE,KAAA,EAAE,GAAG,KAAA;IASjB,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,KAAA,EAAE,IAAI,KAAA;IAS5B,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAQhC,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAShC,WAAW,CAAC,EAAE,EAAE,MAAM;IAStB,OAAO;IAMP,OAAO,CAAC,WAAW;CAGpB"}

package/lib/node/terminal.service.js

@@ -6,16 +6,23 @@ const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const pty_1 = require("./pty");
 const ide_core_node_1 = require("@opensumi/ide-core-node");
+// ref: https://github.com/vercel/hyper/blob/4c90d7555c79fb6dc438fa9549f1d0ef7c7a5aa7/app/session.ts#L27-L32
+// 批处理字符最大长度
+const BATCH_MAX_SIZE = 200 * 1024;
+// 批处理延时
+const BATCH_DURATION_MS = 16;
 /**
  * terminal service 的具体实现
+ * @lengthmin: 其实这里应该换成每个实例持有一个 pty 实例，待讨论并推进实现
  */
 let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
     constructor() {
         this.terminalMap = new Map();
         this.clientTerminalMap = new Map();
         this.clientTerminalThresholdMap = new Map();
-        this.ptyService = new pty_1.PtyService();
         this.serviceClientMap = new Map();
+        this.batchedPtyDataMap = new Map();
+        this.batchedPtyDataTimer = new Map();
     }
     setClient(clientId, client) {
         this.serviceClientMap.set(clientId, client);
@@ -28,6 +35,7 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
         return this.clientTerminalMap.has(clientId);
     }
     closeClient(clientId) {
+        // TODO: 实现关闭客户端，调用客户端的 closeClient 方法
         const closeTimer = global.setTimeout(() => {
             this.disposeClient(clientId);
             this.logger.debug(`删除 clientId ${clientId} 窗口的 pty 进程`);
@@ -45,33 +53,77 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
             this.clientTerminalMap.delete(clientId);
         }
     }
-    async create(id, rows, cols, options) {
+    flushPtyData(clientId, sessionId) {
+        const ptyData = this.batchedPtyDataMap.get(sessionId);
+        this.batchedPtyDataMap.delete(sessionId);
+        this.batchedPtyDataTimer.delete(sessionId);
+        const serviceClient = this.serviceClientMap.get(clientId);
+        serviceClient.clientMessage(sessionId, ptyData);
+    }
+    async create2(id, options) {
+        var _a;
         const clientId = id.split('|')[0];
-        const terminal = await this.ptyService.create(rows, cols, options);
-        this.terminalMap.set(id, terminal);
-        terminal.on('data', (data) => {
-            if (this.serviceClientMap.has(clientId)) {
-                const serviceClient = this.serviceClientMap.get(clientId);
-                serviceClient.clientMessage(id, data);
-            }
-            else {
-                this.logger.warn(`terminal: pty ${clientId} on data not found`);
+        let terminal;
+        try {
+            terminal = (await this.ptyService.create2(options));
+            this.terminalMap.set(id, terminal);
+            // ref: https://hyper.is/blog
+            // 合并 pty 输出的数据，16ms 后发送给客户端，如
+            // 果在 16ms 内没有收到新的数据，或短时间内数据
+            // 超过 BATCH_MAX_SIZE 限定的长度，则立即发送缓
+            // 存的数据，避免因为输出较多时阻塞 RPC 通信
+            terminal.onData((chunk) => {
+                if (this.serviceClientMap.has(clientId)) {
+                    if (!this.batchedPtyDataMap.has(id)) {
+                        this.batchedPtyDataMap.set(id, '');
+                    }
+                    this.batchedPtyDataMap.set(id, this.batchedPtyDataMap.get(id) + chunk);
+                    const ptyData = this.batchedPtyDataMap.get(id) || '';
+                    if ((ptyData === null || ptyData === void 0 ? void 0 : ptyData.length) + chunk.length >= BATCH_MAX_SIZE) {
+                        if (this.batchedPtyDataTimer.has(id)) {
+                            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                            global.clearTimeout(this.batchedPtyDataTimer.get(id));
+                            this.batchedPtyDataTimer.delete(id);
+                        }
+                        this.flushPtyData(clientId, id);
+                    }
+                    if (!this.batchedPtyDataTimer.has(id)) {
+                        this.batchedPtyDataTimer.set(id, global.setTimeout(() => this.flushPtyData(clientId, id), BATCH_DURATION_MS));
+                    }
+                }
+                else {
+                    this.logger.warn(`terminal: pty ${clientId} on data not found`);
+                }
+            });
+            terminal.onExit(({ exitCode, signal }) => {
+                this.logger.debug(`Terminal process exit (instanceId: ${id}) with code ${exitCode}`);
+                if (this.serviceClientMap.has(clientId)) {
+                    const serviceClient = this.serviceClientMap.get(clientId);
+                    serviceClient.closeClient(id, {
+                        code: exitCode,
+                        signal,
+                    });
+                }
+                else {
+                    this.logger.warn(`terminal: pty ${clientId} on data not found`);
+                }
+            });
+            if (!this.clientTerminalMap.has(clientId)) {
+                this.clientTerminalMap.set(clientId, new Map());
             }
-        });
-        terminal.on('exit', (exitCode, signal) => {
+            (_a = this.clientTerminalMap.get(clientId)) === null || _a === void 0 ? void 0 : _a.set(id, terminal);
+        }
+        catch (error) {
+            this.logger.error(`${id} create terminal error: ${error}, options: ${JSON.stringify(options)}`);
             if (this.serviceClientMap.has(clientId)) {
                 const serviceClient = this.serviceClientMap.get(clientId);
-                serviceClient.closeClient(id, exitCode, signal);
-            }
-            else {
-                this.logger.warn(`terminal: pty ${clientId} on data not found`);
+                serviceClient.closeClient(id, {
+                    id,
+                    message: error.message,
+                    stopped: true,
+                });
             }
-        });
-        const clientMap = this.clientTerminalMap.get(clientId);
-        if (!clientMap) {
-            this.clientTerminalMap.set(clientId, new Map());
         }
-        this.clientTerminalMap.get(clientId).set(id, terminal);
         return terminal;
     }
     onMessage(id, msg) {
@@ -92,10 +144,9 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
     getShellName(id) {
         const terminal = this.getTerminal(id);
         if (!terminal) {
-            return '';
+            return 'invalid terminal';
         }
-        const match = terminal.bin.match(/[\w|.]+$/);
-        return match ? match[0] : 'sh';
+        return terminal.parsedName;
     }
     getProcessId(id) {
         const terminal = this.getTerminal(id);
@@ -121,6 +172,10 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
     }
 };
 TerminalServiceImpl.TerminalPtyCloseThreshold = 10 * 1000;
+(0, tslib_1.__decorate)([
+    (0, di_1.Autowired)(pty_1.IPtyService),
+    (0, tslib_1.__metadata)("design:type", pty_1.PtyService)
+], TerminalServiceImpl.prototype, "ptyService", void 0);
 (0, tslib_1.__decorate)([
     (0, di_1.Autowired)(ide_core_node_1.INodeLogger),
     (0, tslib_1.__metadata)("design:type", Object)

package/lib/node/terminal.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.service.js","sourceRoot":"","sources":["../../src/node/terminal.service.ts"],"names":[],"mappings":";;;;;AAAA,qCAAqD;AACrD,+BAAyC;AAEzC,2DAAgF;AAEhF;;GAEG;AAEH,IAAa,mBAAmB,2BAAhC,MAAa,mBAAmB;IAAhC;QAGU,gBAAW,GAAsB,IAAI,GAAG,EAAE,CAAC;QAC3C,sBAAiB,GAAmC,IAAI,GAAG,EAAE,CAAC;QAC9D,+BAA0B,GAAgC,IAAI,GAAG,EAAE,CAAC;QACpE,eAAU,GAAG,IAAI,gBAAU,EAAE,CAAC;QAE9B,qBAAgB,GAAwC,IAAI,GAAG,EAAE,CAAC;IAsI5E,CAAC;IA9HQ,SAAS,CAAC,QAAgB,EAAE,MAA8B;QAC/D,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IAEM,oBAAoB,CAAC,QAAgB,EAAE,aAAuB;QACnE,IAAI,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACjD,YAAY,CAAC,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,QAAQ,CAAmB,CAAC,CAAC;YAC9E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,QAAQ,aAAa,CAAC,CAAC;SACzD;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAEM,WAAW,CAAC,QAAgB;QACjC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAClC,GAAG,EAAE;YACH,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,QAAQ,aAAa,CAAC,CAAC;YACxD,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACnD,CAAC,EACD,IAAA,6BAAa,GAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,yBAAyB,IAAI,qBAAmB,CAAC,yBAAyB,CAChH,CAAC;QAEF,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC5D,CAAC;IAEM,aAAa,CAAC,QAAgB;QACnC,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEzD,IAAI,WAAW,EAAE;YACf,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;gBAC9B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC5B,GAAG,CAAC,IAAI,EAAE,CAAC;YACb,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SACzC;IACH,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,IAAY,EAAE,IAAY,EAAE,OAAwB;QAClF,MAAM,QAAQ,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAEnE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAEnC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC3B,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBACvC,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAA2B,CAAC;gBACpF,aAAa,CAAC,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;aACvC;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,QAAQ,oBAAoB,CAAC,CAAC;aACjE;QACH,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,QAAgB,EAAE,MAA0B,EAAE,EAAE;YACnE,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBACvC,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAA2B,CAAC;gBACpF,aAAa,CAAC,WAAW,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;aACjD;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,QAAQ,oBAAoB,CAAC,CAAC;aACjE;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEvD,IAAI,CAAC,SAAS,EAAE;YACd,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;SACjD;QACA,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAuB,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAE9E,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,SAAS,CAAC,EAAE,EAAE,GAAG;QACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,EAAE;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,sBAAsB,EAAE,QAAQ,CAAC,CAAC;YACjE,OAAO;SACR;QACD,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI;QAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAEtC,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QACD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,YAAY,CAAC,EAAU;QACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,EAAE,CAAC;SACX;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC7C,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACjC,CAAC;IAED,YAAY,CAAC,EAAU;QACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAEtC,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,CAAC,CAAC,CAAC;SACX;QACD,OAAO,QAAQ,CAAC,GAAG,CAAC;IACtB,CAAC;IAED,WAAW,CAAC,EAAU;QACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAEtC,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QACD,QAAQ,CAAC,IAAI,EAAE,CAAC;IAClB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACvC,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,WAAW,CAAC,EAAU;QAC5B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;CACF,CAAA;AA7IQ,6CAAyB,GAAG,EAAE,GAAG,IAAI,CAAC;AAU7C;IADC,IAAA,cAAS,EAAC,2BAAW,CAAC;;mDACK;AAG5B;IADC,IAAA,cAAS,EAAC,yBAAS,CAAC;;sDACQ;AAdlB,mBAAmB;IAD/B,IAAA,eAAU,GAAE;GACA,mBAAmB,CA8I/B;AA9IY,kDAAmB"}
+{"version":3,"file":"terminal.service.js","sourceRoot":"","sources":["../../src/node/terminal.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-terminal-next",
-  "version": "2.13.9",
+  "version": "2.14.1",
   "files": [
     "lib"
   ],
@@ -16,23 +16,23 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-components": "2.13.9",
-    "@opensumi/ide-core-browser": "2.13.9",
-    "@opensumi/ide-core-common": "2.13.9",
-    "@opensumi/ide-connection": "2.13.9",
-    "@opensumi/ide-core-node": "2.13.9",
-    "@opensumi/ide-editor": "2.13.9",
-    "@opensumi/ide-file-service": "2.13.9",
-    "@opensumi/ide-main-layout": "2.13.9",
-    "@opensumi/ide-theme": "2.13.9",
-    "@opensumi/ide-workspace": "2.13.9",
-    "@opensumi/ide-variable": "2.13.9",
-    "@opensumi/ide-status-bar": "2.13.9",
-    "@opensumi/ide-overlay": "2.13.9",
-    "os-locale": "^4.0.0",
-    "lodash.omit": "^4.1.1",
+    "@opensumi/ide-components": "2.14.1",
+    "@opensumi/ide-connection": "2.14.1",
+    "@opensumi/ide-core-browser": "2.14.1",
+    "@opensumi/ide-core-common": "2.14.1",
+    "@opensumi/ide-core-node": "2.14.1",
+    "@opensumi/ide-editor": "2.14.1",
+    "@opensumi/ide-file-service": "2.14.1",
+    "@opensumi/ide-main-layout": "2.14.1",
+    "@opensumi/ide-overlay": "2.14.1",
+    "@opensumi/ide-status-bar": "2.14.1",
+    "@opensumi/ide-theme": "2.14.1",
+    "@opensumi/ide-variable": "2.14.1",
+    "@opensumi/ide-workspace": "2.14.1",
     "event-kit": "^2.5.3",
+    "lodash.omit": "^4.1.1",
     "node-pty": "0.10.0",
+    "os-locale": "^4.0.0",
     "xterm": "4.13.0",
     "xterm-addon-fit": "^0.3.0",
     "xterm-addon-search": "^0.9.0-beta.3"