@opensumi/ide-terminal-next 2.14.4 → 2.15.0

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

@@ -0,0 +1,229 @@
+"use strict";
+/* ---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TerminalProfileServiceNode = exports.ITerminalProfileServiceNode = void 0;
+const tslib_1 = require("tslib");
+const platform_1 = require("@opensumi/ide-core-common/lib/platform");
+const di_1 = require("@opensumi/di");
+const shell_1 = require("./shell");
+const ide_core_node_1 = require("@opensumi/ide-core-node");
+const fs_extra_1 = require("fs-extra");
+const path = (0, tslib_1.__importStar)(require("@opensumi/ide-core-common/lib/path"));
+function applyConfigProfilesToMap(configProfiles, profilesMap) {
+    var _a;
+    if (!configProfiles) {
+        return;
+    }
+    for (const [profileName, value] of Object.entries(configProfiles)) {
+        if (value === null || (!('path' in value) && !('source' in value))) {
+            profilesMap.delete(profileName);
+        }
+        else {
+            value.icon = value.icon || ((_a = profilesMap.get(profileName)) === null || _a === void 0 ? void 0 : _a.icon);
+            profilesMap.set(profileName, value);
+        }
+    }
+}
+exports.ITerminalProfileServiceNode = Symbol('ITerminalProfileServiceNode');
+let TerminalProfileServiceNode = class TerminalProfileServiceNode {
+    constructor() { }
+    detectAvailableProfiles(options) {
+        if (options.preference) {
+            // 说明用户有设置 perference 中的 profile
+            // 目前 Node 端无法获取 browser 层的配置，所以需要前端传进来
+            this._perferenceProfiles = options.preference;
+        }
+        if (platform_1.isWindows) {
+            return this._detectWindowsProfiles(options);
+        }
+        return this._detectUnixProfiles(options);
+    }
+    _getPreferenceProfiles() {
+        return this._perferenceProfiles || {};
+    }
+    async _detectWindowsProfiles(options) {
+        const defaultProfileName = 'windowsDefault';
+        const configProfiles = this._getPreferenceProfiles();
+        const { autoDetect } = options;
+        // Determine the correct System32 path. We want to point to Sysnative
+        // when the 32-bit version of VS Code is running on a 64-bit machine.
+        // The reason for this is because PowerShell's important PSReadline
+        // module doesn't work if this is not the case. See #27915.
+        const is32ProcessOn64Windows = process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432');
+        const system32Path = `${process.env['windir']}\\${is32ProcessOn64Windows ? 'Sysnative' : 'System32'}`;
+        await this.initializeWindowsProfiles();
+        const detectedProfiles = new Map();
+        // Add auto detected profiles
+        if (autoDetect) {
+            detectedProfiles.set('PowerShell', {
+                source: "PowerShell" /* Pwsh */,
+                // icon: Codicon.terminalPowershell,
+                isAutoDetected: true,
+            });
+            detectedProfiles.set('Windows PowerShell', {
+                path: `${system32Path}\\WindowsPowerShell\\v1.0\\powershell.exe`,
+                // icon: Codicon.terminalPowershell,
+                isAutoDetected: true,
+            });
+            detectedProfiles.set('Git Bash', {
+                source: "Git Bash" /* GitBash */,
+                isAutoDetected: true,
+            });
+            detectedProfiles.set('Cygwin', {
+                path: [
+                    `${process.env['HOMEDRIVE']}\\cygwin64\\bin\\bash.exe`,
+                    `${process.env['HOMEDRIVE']}\\cygwin\\bin\\bash.exe`,
+                ],
+                args: ['--login'],
+                isAutoDetected: true,
+            });
+            detectedProfiles.set('Command Prompt', {
+                path: `${system32Path}\\cmd.exe`,
+                // icon: Codicon.terminalCmd,
+                isAutoDetected: true,
+            });
+        }
+        applyConfigProfilesToMap(configProfiles, detectedProfiles);
+        const resultProfiles = this.transformToTerminalProfiles(detectedProfiles.entries(), defaultProfileName);
+        // TODO: 暂不引入 WSL 的相关逻辑
+        // const useWslProfiles = ;
+        // let useWSLexe = false;
+        // if (getWindowsBuildNumber() >= 16299) {
+        //   useWSLexe = true;
+        // }
+        // if (autoDetect || (!autoDetect && useWslProfiles)) {
+        //   const wslPath = `${system32Path}\\${useWSLexe ? 'wsl' : 'bash'}.exe`;
+        // }
+        return resultProfiles;
+    }
+    async initializeWindowsProfiles() {
+        if (this.profileSources) {
+            return;
+        }
+        this.profileSources = new Map();
+        this.profileSources.set('Git Bash', {
+            profileName: 'Git Bash',
+            paths: shell_1.WINDOWS_GIT_BASH_PATHS,
+            args: ['--login'],
+        });
+        this.profileSources.set('PowerShell', {
+            profileName: 'PowerShell',
+            paths: await (0, shell_1.getPowershellPaths)(),
+            // icon: ThemeIcon.asThemeIcon(Codicon.terminalPowershell),
+        });
+    }
+    async _detectUnixProfiles(options) {
+        const defaultProfileName = 'unixDefault';
+        const { autoDetect } = options;
+        const configProfiles = this._getPreferenceProfiles();
+        const detectedProfiles = new Map();
+        if (autoDetect) {
+            const contents = (await (0, fs_extra_1.readFile)('/etc/shells')).toString();
+            const profiles = contents.split('\n').filter((e) => e.trim().indexOf('#') !== 0 && e.trim().length > 0);
+            const counts = new Map();
+            for (const profile of profiles) {
+                let profileName = path.basename(profile);
+                let count = counts.get(profileName) || 0;
+                count++;
+                if (count > 1) {
+                    profileName = `${profileName} (${count})`;
+                }
+                counts.set(profileName, count);
+                detectedProfiles.set(profileName, { path: profile, isAutoDetected: true });
+            }
+        }
+        applyConfigProfilesToMap(configProfiles, detectedProfiles);
+        return await this.transformToTerminalProfiles(detectedProfiles.entries(), defaultProfileName);
+    }
+    async validateProfilePaths(profileName, defaultProfileName, potentialPaths, args, env, overrideName, isAutoDetected) {
+        if (potentialPaths.length === 0) {
+            return Promise.resolve(undefined);
+        }
+        const potentialPath = potentialPaths.shift();
+        if (potentialPath === '') {
+            // 如果是空的，则跳过
+            return this.validateProfilePaths(profileName, defaultProfileName, potentialPaths, args, env, overrideName, isAutoDetected);
+        }
+        const profile = {
+            profileName,
+            path: potentialPath,
+            args,
+            env,
+            overrideName,
+            isAutoDetected,
+            isDefault: profileName === defaultProfileName,
+        };
+        // For non-absolute paths, check if it's available on $PATH
+        if (path.basename(potentialPath) === potentialPath) {
+            // The executable isn't an absolute path, try find it on the PATH
+            const executable = await (0, shell_1.findExecutable)(potentialPath, undefined, undefined, undefined);
+            if (!executable) {
+                return this.validateProfilePaths(profileName, defaultProfileName, potentialPaths, args, env, overrideName, isAutoDetected);
+            }
+            return profile;
+        }
+        const result = await (0, shell_1.exists)(potentialPath);
+        if (result) {
+            return profile;
+        }
+        return this.validateProfilePaths(profileName, defaultProfileName, potentialPaths, args, env, overrideName, isAutoDetected);
+    }
+    async transformToTerminalProfiles(entries, defaultProfileName) {
+        var _a;
+        const resultProfiles = [];
+        for (const [profileName, profile] of entries) {
+            if (profile === null) {
+                continue;
+            }
+            let originalPaths = [];
+            let args;
+            let icon;
+            if ('source' in profile) {
+                const source = (_a = this.profileSources) === null || _a === void 0 ? void 0 : _a.get(profile.source);
+                if (!source) {
+                    continue;
+                }
+                originalPaths = source.paths;
+                // if there are configured args, override the default ones
+                args = profile.args || source.args;
+                if (profile.icon) {
+                    // icon = validateIcon(profile.icon);
+                }
+                else if (source.icon) {
+                    icon = source.icon;
+                }
+            }
+            else {
+                originalPaths = Array.isArray(profile.path) ? profile.path : [profile.path];
+                args = platform_1.isWindows ? profile.args : Array.isArray(profile.args) ? profile.args : undefined;
+                // icon = validateIcon(profile.icon);
+            }
+            // TODO: use  (await this.variableResolver.resolveArray(originalPaths))
+            const paths = originalPaths.slice();
+            const validatedProfile = await this.validateProfilePaths(profileName, defaultProfileName, paths, args, {});
+            if (validatedProfile) {
+                validatedProfile.isAutoDetected = profile.isAutoDetected;
+                validatedProfile.icon = icon;
+                validatedProfile.color = profile.color;
+                resultProfiles.push(validatedProfile);
+            }
+            else {
+                this.logger.log('profile not validated', profileName, originalPaths);
+            }
+        }
+        return resultProfiles;
+    }
+};
+(0, tslib_1.__decorate)([
+    (0, di_1.Autowired)(ide_core_node_1.INodeLogger),
+    (0, tslib_1.__metadata)("design:type", Object)
+], TerminalProfileServiceNode.prototype, "logger", void 0);
+TerminalProfileServiceNode = (0, tslib_1.__decorate)([
+    (0, di_1.Injectable)(),
+    (0, tslib_1.__metadata)("design:paramtypes", [])
+], TerminalProfileServiceNode);
+exports.TerminalProfileServiceNode = TerminalProfileServiceNode;
+//# sourceMappingURL=terminal.profile.service.js.map

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

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

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

@@ -1,6 +1,8 @@
 import { RPCService } from '@opensumi/ide-connection';
 import { IShellLaunchConfig, ITerminalServiceClient, INodePtyInstance, ITerminalError } from '../common';
 import { WindowsShellType } from '../common/shell';
+import { IDetectProfileOptions, ITerminalProfile } from '../common/profile';
+import { OperatingSystem } from '@opensumi/ide-core-common/lib/platform';
 /**
  * this RPC target: NodePtyTerminalService
  */
@@ -18,6 +20,7 @@ interface IRPCTerminalService {
 export declare class TerminalServiceClientImpl extends RPCService<IRPCTerminalService> implements ITerminalServiceClient {
     private terminalMap;
     private terminalService;
+    private terminalProfileService;
     private clientId;
     private logger;
     setConnectionClientId(clientId: string): void;
@@ -27,7 +30,7 @@ export declare class TerminalServiceClientImpl extends RPCService<IRPCTerminalSe
         signal?: number;
     } | number, signal?: number): void;
     ensureTerminal(terminalIdArr: string[]): boolean;
-    create2(id: string, options: IShellLaunchConfig): Promise<INodePtyInstance | undefined>;
+    create2(id: string, cols: number, rows: number, launchConfig: IShellLaunchConfig): Promise<INodePtyInstance | undefined>;
     $resolveWindowsShellPath(type: WindowsShellType): Promise<string | undefined>;
     $resolveUnixShellPath(type: string): Promise<string | undefined>;
     $resolveShellPath(paths: string[]): Promise<string | undefined>;
@@ -36,11 +39,15 @@ export declare class TerminalServiceClientImpl extends RPCService<IRPCTerminalSe
         path: string;
         type: WindowsShellType;
     }>;
+    detectAvailableProfiles(options: IDetectProfileOptions): Promise<ITerminalProfile[]>;
+    getCodePlatformKey(): Promise<'osx' | 'windows' | 'linux'>;
+    getDefaultSystemShell(os: OperatingSystem): Promise<string>;
     onMessage(id: string, msg: string): void;
     resize(id: string, rows: number, cols: number): void;
     disposeById(id: string): void;
     getProcessId(id: string): number;
     getShellName(id: string): string;
+    getOs(): OperatingSystem;
     dispose(): void;
 }
 export {};

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,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"}
+{"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,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAM,MAAM,wCAAwC,CAAC;AAE7E;;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,CAAuC;IAG1D,OAAO,CAAC,eAAe,CAAuB;IAG9C,OAAO,CAAC,sBAAsB,CAA6B;IAE3D,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,CACX,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,kBAAkB,GAC/B,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAsBlC,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;IAsBtF,uBAAuB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAIpF,kBAAkB,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC;IAK1D,qBAAqB,CAAC,EAAE,EAAE,eAAe;IAI/C,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,KAAK,IAAI,eAAe;IAIxB,OAAO;CAGR"}

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

@@ -8,6 +8,8 @@ const common_1 = require("../common");
 const ide_core_node_1 = require("@opensumi/ide-core-node");
 const shell_1 = require("../common/shell");
 const shell_2 = require("./shell");
+const terminal_profile_service_1 = require("./terminal.profile.service");
+const platform_1 = require("@opensumi/ide-core-common/lib/platform");
 /**
  * 标准的后端服务，供前端调用
  * 目前每个窗口会对应一个 TerminalServiceClientImpl 实例
@@ -41,19 +43,27 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
     ensureTerminal(terminalIdArr) {
         return this.terminalService.ensureClientTerminal(this.clientId, terminalIdArr);
     }
-    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 create2(id, cols, rows, launchConfig) {
+        try {
+            const pty = await this.terminalService.create2(id, cols, rows, launchConfig);
+            if (pty) {
+                this.terminalService.setClient(this.clientId, this);
+                this.logger.log(`client ${id} create ${pty} with options `, launchConfig);
+                this.terminalMap.set(id, pty);
+                return {
+                    id,
+                    pid: pty.pid,
+                    proess: pty.process,
+                    name: pty.parsedName,
+                    shellPath: pty.launchConfig.executable,
+                };
+            }
+            else {
+                this.logger.log(`cannot create pty instance ${id} `, launchConfig);
+            }
+        }
+        catch (error) {
+            this.logger.error(`create pty instance error ${id}`, launchConfig, error);
         }
     }
     async $resolveWindowsShellPath(type) {
@@ -110,6 +120,16 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
             type: shell_1.WindowsShellType.cmd,
         };
     }
+    async detectAvailableProfiles(options) {
+        return await this.terminalProfileService.detectAvailableProfiles(options);
+    }
+    async getCodePlatformKey() {
+        // follow vscode
+        return this.getOs() === platform_1.OperatingSystem.Macintosh ? 'osx' : platform_1.OS === platform_1.OperatingSystem.Windows ? 'windows' : 'linux';
+    }
+    async getDefaultSystemShell(os) {
+        return await (0, shell_2.getSystemShell)(os);
+    }
     onMessage(id, msg) {
         const { data, params, method } = JSON.parse(msg);
         if (method === 'resize') {
@@ -131,6 +151,9 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
     getShellName(id) {
         return this.terminalService.getShellName(id);
     }
+    getOs() {
+        return platform_1.OS;
+    }
     dispose() {
         this.terminalService.closeClient(this.clientId);
     }
@@ -139,6 +162,10 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
     (0, di_1.Autowired)(common_1.ITerminalNodeService),
     (0, tslib_1.__metadata)("design:type", Object)
 ], TerminalServiceClientImpl.prototype, "terminalService", void 0);
+(0, tslib_1.__decorate)([
+    (0, di_1.Autowired)(terminal_profile_service_1.ITerminalProfileServiceNode),
+    (0, tslib_1.__metadata)("design:type", terminal_profile_service_1.TerminalProfileServiceNode)
+], TerminalServiceClientImpl.prototype, "terminalProfileService", 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.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,5 +1,4 @@
-import { IPty } from '../common/pty';
-import { IShellLaunchConfig } from '../common/pty';
+import { IPtyProcess, IShellLaunchConfig } from '../common/pty';
 import { ITerminalNodeService, ITerminalServiceClient } from '../common';
 /**
  * terminal service 的具体实现
@@ -7,11 +6,11 @@ import { ITerminalNodeService, ITerminalServiceClient } from '../common';
  */
 export declare class TerminalServiceImpl implements ITerminalNodeService {
     static TerminalPtyCloseThreshold: number;
-    private terminalMap;
+    private terminalProcessMap;
     private clientTerminalMap;
     private clientTerminalThresholdMap;
-    private ptyService;
     private serviceClientMap;
+    private injector;
     private logger;
     private appConfig;
     private batchedPtyDataMap;
@@ -21,9 +20,10 @@ export declare class TerminalServiceImpl implements ITerminalNodeService {
     closeClient(clientId: string): void;
     disposeClient(clientId: string): void;
     private flushPtyData;
-    create2(id: string, options: IShellLaunchConfig): Promise<IPty | undefined>;
-    onMessage(id: any, msg: any): void;
-    resize(id: any, rows: any, cols: any): void;
+    create2(id: string, cols: IShellLaunchConfig): Promise<IPtyProcess | undefined>;
+    create2(id: string, cols: number, rows: number, options: IShellLaunchConfig): Promise<IPtyProcess | undefined>;
+    onMessage(id: string, msg: string): void;
+    resize(id: string, rows: number, cols: number): void;
     getShellName(id: string): string;
     getProcessId(id: string): number;
     disposeById(id: string): void;

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":"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"}
+{"version":3,"file":"terminal.service.d.ts","sourceRoot":"","sources":["../../src/node/terminal.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAsB,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAS7F;;;GAGG;AACH,qBACa,mBAAoB,YAAW,oBAAoB;IAC9D,MAAM,CAAC,yBAAyB,SAAa;IAE7C,OAAO,CAAC,kBAAkB,CAAsC;IAChE,OAAO,CAAC,iBAAiB,CAAmD;IAC5E,OAAO,CAAC,0BAA0B,CAA0C;IAE5E,OAAO,CAAC,gBAAgB,CAAkD;IAG1E,OAAO,CAAC,QAAQ,CAAW;IAG3B,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;IAa5B,aAAa,CAAC,QAAQ,EAAE,MAAM;IAYrC,OAAO,CAAC,YAAY;IASP,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAC/E,OAAO,CAClB,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAsG5B,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IASjC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IASpD,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAQhC,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAQhC,WAAW,CAAC,EAAE,EAAE,MAAM;IAStB,OAAO;IAMP,OAAO,CAAC,WAAW;CAGpB"}

package/lib/node/terminal.service.js

@@ -5,6 +5,7 @@ exports.TerminalServiceImpl = void 0;
 const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const pty_1 = require("./pty");
+const common_1 = require("../common");
 const ide_core_node_1 = require("@opensumi/ide-core-node");
 // ref: https://github.com/vercel/hyper/blob/4c90d7555c79fb6dc438fa9549f1d0ef7c7a5aa7/app/session.ts#L27-L32
 // 批处理字符最大长度
@@ -17,7 +18,7 @@ const BATCH_DURATION_MS = 16;
  */
 let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
     constructor() {
-        this.terminalMap = new Map();
+        this.terminalProcessMap = new Map();
         this.clientTerminalMap = new Map();
         this.clientTerminalThresholdMap = new Map();
         this.serviceClientMap = new Map();
@@ -35,7 +36,6 @@ 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 进程`);
@@ -46,9 +46,9 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
     disposeClient(clientId) {
         const terminalMap = this.clientTerminalMap.get(clientId);
         if (terminalMap) {
-            terminalMap.forEach((pty, id) => {
-                this.terminalMap.delete(id);
-                pty.kill();
+            terminalMap.forEach((t, id) => {
+                this.terminalProcessMap.delete(id);
+                t.kill();
             });
             this.clientTerminalMap.delete(clientId);
         }
@@ -60,19 +60,30 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
         const serviceClient = this.serviceClientMap.get(clientId);
         serviceClient.clientMessage(sessionId, ptyData);
     }
-    async create2(id, options) {
+    async create2(id, _cols, _rows, _launchConfig) {
         var _a;
         const clientId = id.split('|')[0];
-        let terminal;
+        let ptyService;
+        let cols = _cols;
+        let rows = _rows;
+        let launchConfig = _launchConfig;
+        if (!(typeof cols === 'number')) {
+            launchConfig = cols;
+            cols = launchConfig.cols;
+            rows = launchConfig.rows;
+            if (launchConfig.shellPath) {
+                launchConfig.executable = launchConfig.shellPath;
+            }
+        }
         try {
-            terminal = (await this.ptyService.create2(options));
-            this.terminalMap.set(id, terminal);
+            ptyService = this.injector.get(pty_1.PtyService, [id, launchConfig, cols, rows]);
+            this.terminalProcessMap.set(id, ptyService);
             // ref: https://hyper.is/blog
             // 合并 pty 输出的数据，16ms 后发送给客户端，如
             // 果在 16ms 内没有收到新的数据，或短时间内数据
             // 超过 BATCH_MAX_SIZE 限定的长度，则立即发送缓
             // 存的数据，避免因为输出较多时阻塞 RPC 通信
-            terminal.onData((chunk) => {
+            ptyService.onData((chunk) => {
                 if (this.serviceClientMap.has(clientId)) {
                     if (!this.batchedPtyDataMap.has(id)) {
                         this.batchedPtyDataMap.set(id, '');
@@ -95,7 +106,7 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
                     this.logger.warn(`terminal: pty ${clientId} on data not found`);
                 }
             });
-            terminal.onExit(({ exitCode, signal }) => {
+            ptyService.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);
@@ -108,23 +119,30 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
                     this.logger.warn(`terminal: pty ${clientId} on data not found`);
                 }
             });
+            const error = await ptyService.start();
+            if (error) {
+                this.logger.error(`Terminal process start error (instanceId: ${id})`, error);
+                throw error;
+            }
             if (!this.clientTerminalMap.has(clientId)) {
                 this.clientTerminalMap.set(clientId, new Map());
             }
-            (_a = this.clientTerminalMap.get(clientId)) === null || _a === void 0 ? void 0 : _a.set(id, terminal);
+            (_a = this.clientTerminalMap.get(clientId)) === null || _a === void 0 ? void 0 : _a.set(id, ptyService);
         }
         catch (error) {
-            this.logger.error(`${id} create terminal error: ${error}, options: ${JSON.stringify(options)}`);
+            this.logger.error(`${id} create terminal error: ${JSON.stringify(error)}, options: ${JSON.stringify(launchConfig)}`);
             if (this.serviceClientMap.has(clientId)) {
                 const serviceClient = this.serviceClientMap.get(clientId);
                 serviceClient.closeClient(id, {
                     id,
-                    message: error.message,
+                    message: error === null || error === void 0 ? void 0 : error.message,
+                    type: common_1.ETerminalErrorType.CREATE_FAIL,
                     stopped: true,
+                    launchConfig,
                 });
             }
         }
-        return terminal;
+        return ptyService === null || ptyService === void 0 ? void 0 : ptyService.pty;
     }
     onMessage(id, msg) {
         const terminal = this.getTerminal(id);
@@ -132,28 +150,28 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
             this.logger.warn(`terminal ${id} onMessage not found`, terminal);
             return;
         }
-        terminal.write(msg);
+        terminal.onMessage(msg);
     }
     resize(id, rows, cols) {
         const terminal = this.getTerminal(id);
         if (!terminal) {
             return;
         }
-        this.ptyService.resize(terminal, rows, cols);
+        terminal.resize(rows, cols);
     }
     getShellName(id) {
         const terminal = this.getTerminal(id);
         if (!terminal) {
             return 'invalid terminal';
         }
-        return terminal.parsedName;
+        return terminal.getShellName();
     }
     getProcessId(id) {
         const terminal = this.getTerminal(id);
         if (!terminal) {
             return -1;
         }
-        return terminal.pid;
+        return terminal.getPid();
     }
     disposeById(id) {
         const terminal = this.getTerminal(id);
@@ -168,14 +186,14 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
         });
     }
     getTerminal(id) {
-        return this.terminalMap.get(id);
+        return this.terminalProcessMap.get(id);
     }
 };
 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, di_1.Autowired)(di_1.INJECTOR_TOKEN),
+    (0, tslib_1.__metadata)("design:type", di_1.Injector)
+], TerminalServiceImpl.prototype, "injector", void 0);
 (0, tslib_1.__decorate)([
     (0, di_1.Autowired)(ide_core_node_1.INodeLogger),
     (0, tslib_1.__metadata)("design:type", Object)