@opensumi/ide-terminal-next 2.17.8 → 2.18.0

package/lib/node/pty.proxy.js.map

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

package/lib/node/pty.proxy.remote.exec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=pty.proxy.remote.exec.d.ts.map

package/lib/node/pty.proxy.remote.exec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pty.proxy.remote.exec.d.ts","sourceRoot":"","sources":["../../src/node/pty.proxy.remote.exec.ts"],"names":[],"mappings":""}

package/lib/node/pty.proxy.remote.exec.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const pty_proxy_1 = require("./pty.proxy");
+// 双容器模式下，需要以本文件作为entry单独打包出一个可执行文件，运行在DEV容器中
+const proxyProvider = new pty_proxy_1.PtyServiceProxyRPCProvider();
+proxyProvider.initServer();
+//# sourceMappingURL=pty.proxy.remote.exec.js.map

package/lib/node/pty.proxy.remote.exec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pty.proxy.remote.exec.js","sourceRoot":"","sources":["../../src/node/pty.proxy.remote.exec.ts"],"names":[],"mappings":";;AAAA,2CAAyD;AAEzD,6CAA6C;AAC7C,MAAM,aAAa,GAAG,IAAI,sCAA0B,EAAE,CAAC;AACvD,aAAa,CAAC,UAAU,EAAE,CAAC"}

package/lib/node/shell.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { IProcessEnvironment, OperatingSystem } from '@opensumi/ide-core-common/lib/platform';
+import { IProcessEnvironment, OperatingSystem } from '@opensumi/ide-core-common';
 export declare const WINDOWS_GIT_BASH_PATHS: string[];
 export declare function getPowershellPaths(): Promise<string[]>;
 export declare const exists: (p: string) => Promise<string | undefined>;

package/lib/node/shell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/node/shell.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,mBAAmB,EAAwB,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAGpH,eAAO,MAAM,sBAAsB,UAQlC,CAAC;AAEF,wBAAsB,kBAAkB,sBASvC;AAED,eAAO,MAAM,MAAM,MAAa,MAAM,gCAOrC,CAAC;AAEF,wBAAsB,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAM/F;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAW3E;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG,CAIhF;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,GAAG,CAAC,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,EAAE,EAChB,GAAG,GAAE,mBAAwD,GAC5D,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmD7B;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAO9C;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CASzE;AAoCD,wBAAgB,eAAe,CAAC,GAAG,oBAAc,GAAG,MAAM,CAEzD"}
+{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/node/shell.ts"],"names":[],"mappings":";AAYA,OAAO,EAAE,mBAAmB,EAAwB,eAAe,EAAQ,MAAM,2BAA2B,CAAC;AAG7G,eAAO,MAAM,sBAAsB,UAQlC,CAAC;AAEF,wBAAsB,kBAAkB,sBASvC;AAED,eAAO,MAAM,MAAM,MAAa,MAAM,gCAOrC,CAAC;AAEF,wBAAsB,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAM/F;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAW3E;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG,CAIhF;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,GAAG,CAAC,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,EAAE,EAChB,GAAG,GAAE,mBAAwD,GAC5D,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmD7B;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAO9C;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CASzE;AAoCD,wBAAgB,eAAe,CAAC,GAAG,oBAAc,GAAG,MAAM,CAEzD"}

package/lib/node/shell.js

@@ -11,8 +11,7 @@ const tslib_1 = require("tslib");
 // - https://github.com/microsoft/vscode/blob/ff383268424b1d4b6620e7ea197fb13ae513414f/src/vs/base/node/shell.ts
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const os_1 = require("os");
-const path = tslib_1.__importStar(require("@opensumi/ide-core-common/lib/path"));
-const platform_1 = require("@opensumi/ide-core-common/lib/platform");
+const ide_core_common_1 = require("@opensumi/ide-core-common");
 const ide_core_node_1 = require("@opensumi/ide-core-node");
 exports.WINDOWS_GIT_BASH_PATHS = [
     `${process.env['ProgramW6432']}\\Git\\bin\\bash.exe`,
@@ -36,7 +35,7 @@ async function getPowershellPaths() {
 exports.getPowershellPaths = getPowershellPaths;
 const exists = async (p) => {
     try {
-        await fs_1.default.promises.access(path.normalize(p));
+        await fs_1.default.promises.access(ide_core_common_1.path.normalize(p));
         return p;
     }
     catch (_a) {
@@ -60,7 +59,7 @@ function findShellExecutable(candidate) {
         return undefined;
     }
     for (const p of candidate) {
-        if (fs_1.default.existsSync(path.normalize(p))) {
+        if (fs_1.default.existsSync(ide_core_common_1.path.normalize(p))) {
             return p;
         }
         continue;
@@ -75,26 +74,26 @@ function getCaseInsensitive(target, key) {
 exports.getCaseInsensitive = getCaseInsensitive;
 async function findExecutable(command, cwd, paths, env = process.env) {
     // If we have an absolute path then we take it.
-    if (path.isAbsolute(command)) {
+    if (ide_core_common_1.path.isAbsolute(command)) {
         return (await (0, exports.exists)(command)) ? command : undefined;
     }
     if (cwd === undefined) {
         cwd = process.cwd();
     }
-    const dir = path.dirname(command);
+    const dir = ide_core_common_1.path.dirname(command);
     if (dir !== '.') {
         // We have a directory and the directory is relative (see above). Make the path absolute
         // to the current working directory.
-        const fullPath = path.join(cwd, command);
+        const fullPath = ide_core_common_1.path.join(cwd, command);
         return (await (0, exports.exists)(fullPath)) ? fullPath : undefined;
     }
     const envPath = getCaseInsensitive(env, 'PATH');
     if (paths === undefined && typeof envPath === 'string') {
-        paths = envPath.split(path.delimiter);
+        paths = envPath.split(ide_core_common_1.path.delimiter);
     }
     // No PATH environment. Make path absolute to the cwd.
     if (paths === undefined || paths.length === 0) {
-        const fullPath = path.join(cwd, command);
+        const fullPath = ide_core_common_1.path.join(cwd, command);
         return (await (0, exports.exists)(fullPath)) ? fullPath : undefined;
     }
     // We have a simple file name. We get the path variable from the env
@@ -102,11 +101,11 @@ async function findExecutable(command, cwd, paths, env = process.env) {
     for (const pathEntry of paths) {
         // The path entry is absolute.
         let fullPath;
-        if (path.isAbsolute(pathEntry)) {
-            fullPath = path.join(pathEntry, command);
+        if (ide_core_common_1.path.isAbsolute(pathEntry)) {
+            fullPath = ide_core_common_1.path.join(pathEntry, command);
         }
         else {
-            fullPath = path.join(cwd, pathEntry, command);
+            fullPath = ide_core_common_1.path.join(cwd, pathEntry, command);
         }
         if (await (0, exports.exists)(fullPath)) {
             return fullPath;
@@ -122,7 +121,7 @@ async function findExecutable(command, cwd, paths, env = process.env) {
             }
         }
     }
-    const fullPath = path.join(cwd, command);
+    const fullPath = ide_core_common_1.path.join(cwd, command);
     return (await (0, exports.exists)(fullPath)) ? fullPath : undefined;
 }
 exports.findExecutable = findExecutable;
@@ -141,7 +140,7 @@ exports.getWindowsBuildNumber = getWindowsBuildNumber;
  * @param os The platform to detect the shell of.
  */
 async function getSystemShell(os) {
-    if (os === platform_1.OperatingSystem.Windows) {
+    if (os === ide_core_common_1.OperatingSystem.Windows) {
         if (ide_core_node_1.isWindows) {
             return getSystemShellWindows();
         }
@@ -154,7 +153,7 @@ exports.getSystemShell = getSystemShell;
 let _TERMINAL_DEFAULT_SHELL_UNIX_LIKE = null;
 function getSystemShellUnixLike(os, env = process.env) {
     // Only use $SHELL for the current OS
-    if ((platform_1.isLinux && os === platform_1.OperatingSystem.Macintosh) || (platform_1.isMacintosh && os === platform_1.OperatingSystem.Linux)) {
+    if ((ide_core_common_1.isLinux && os === ide_core_common_1.OperatingSystem.Macintosh) || (ide_core_common_1.isMacintosh && os === ide_core_common_1.OperatingSystem.Linux)) {
         return '/bin/bash';
     }
     if (!_TERMINAL_DEFAULT_SHELL_UNIX_LIKE) {

package/lib/node/shell.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"terminal.profile.service.d.ts","sourceRoot":"","sources":["../../src/node/terminal.profile.service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AACjE,OAAO,EACL,yBAAyB,EACzB,gBAAgB,EAChB,0BAA0B,EAE3B,MAAM,mBAAmB,CAAC;AAsB3B,eAAO,MAAM,2BAA2B,eAAwC,CAAC;AAEjF,qBACa,0BAA0B;IAErC,OAAO,CAAC,MAAM,CAAc;IAE5B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,GAAG,SAAS,CAAC;IACnE,OAAO,CAAC,mBAAmB,CAAgD;;IAG3E,uBAAuB,CAAC,OAAO,EAAE,qBAAqB;IAYtD,sBAAsB,IAAI;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,0BAA0B,CAAA;KAAE;IAGjE,sBAAsB,CAAC,OAAO,EAAE,qBAAqB;IA4DrD,yBAAyB;IAiBzB,mBAAmB,CAAC,OAAO,EAAE,qBAAqB;IAyBlD,oBAAoB,CACxB,WAAW,EAAE,MAAM,EACnB,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,cAAc,EAAE,MAAM,EAAE,EACxB,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,EACnC,GAAG,EAAE,oBAAoB,EACzB,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,EAClC,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS;IAgEhC,2BAA2B,CAC/B,OAAO,EAAE,gBAAgB,CAAC,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC,EAC/D,kBAAkB,EAAE,MAAM,GAAG,SAAS,GACrC,OAAO,CAAC,gBAAgB,EAAE,CAAC;CA2C/B"}
+{"version":3,"file":"terminal.profile.service.d.ts","sourceRoot":"","sources":["../../src/node/terminal.profile.service.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AACjE,OAAO,EACL,yBAAyB,EACzB,gBAAgB,EAChB,0BAA0B,EAE3B,MAAM,mBAAmB,CAAC;AAqB3B,eAAO,MAAM,2BAA2B,eAAwC,CAAC;AAEjF,qBACa,0BAA0B;IAErC,OAAO,CAAC,MAAM,CAAc;IAE5B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,GAAG,SAAS,CAAC;IACnE,OAAO,CAAC,mBAAmB,CAAgD;;IAG3E,uBAAuB,CAAC,OAAO,EAAE,qBAAqB;IAYtD,sBAAsB,IAAI;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,0BAA0B,CAAA;KAAE;IAGjE,sBAAsB,CAAC,OAAO,EAAE,qBAAqB;IA4DrD,yBAAyB;IAiBzB,mBAAmB,CAAC,OAAO,EAAE,qBAAqB;IAyBlD,oBAAoB,CACxB,WAAW,EAAE,MAAM,EACnB,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,cAAc,EAAE,MAAM,EAAE,EACxB,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,EACnC,GAAG,EAAE,oBAAoB,EACzB,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,EAClC,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS;IAgEhC,2BAA2B,CAC/B,OAAO,EAAE,gBAAgB,CAAC,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC,EAC/D,kBAAkB,EAAE,MAAM,GAAG,SAAS,GACrC,OAAO,CAAC,gBAAgB,EAAE,CAAC;CA2C/B"}

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

@@ -9,8 +9,6 @@ const tslib_1 = require("tslib");
 // some code copied and modified from https://github.com/microsoft/vscode/blob/ff383268424b1d4b6620e7ea197fb13ae513414f/src/vs/platform/terminal/node/terminalProfiles.ts
 const fs_extra_1 = require("fs-extra");
 const di_1 = require("@opensumi/di");
-const path = tslib_1.__importStar(require("@opensumi/ide-core-common/lib/path"));
-const platform_1 = require("@opensumi/ide-core-common/lib/platform");
 const ide_core_node_1 = require("@opensumi/ide-core-node");
 const shell_1 = require("./shell");
 function applyConfigProfilesToMap(configProfiles, profilesMap) {
@@ -37,7 +35,7 @@ let TerminalProfileServiceNode = class TerminalProfileServiceNode {
             // 目前 Node 端无法获取 browser 层的配置，所以需要前端传进来
             this._perferenceProfiles = options.preference;
         }
-        if (platform_1.isWindows) {
+        if (ide_core_node_1.isWindows) {
             return this._detectWindowsProfiles(options);
         }
         return this._detectUnixProfiles(options);
@@ -126,7 +124,7 @@ let TerminalProfileServiceNode = class TerminalProfileServiceNode {
             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 profileName = ide_core_node_1.path.basename(profile);
                 let count = counts.get(profileName) || 0;
                 count++;
                 if (count > 1) {
@@ -158,7 +156,7 @@ let TerminalProfileServiceNode = class TerminalProfileServiceNode {
             isDefault: profileName === defaultProfileName,
         };
         // For non-absolute paths, check if it's available on $PATH
-        if (path.basename(potentialPath) === potentialPath) {
+        if (ide_core_node_1.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) {
@@ -199,7 +197,7 @@ let TerminalProfileServiceNode = class TerminalProfileServiceNode {
             }
             else {
                 originalPaths = Array.isArray(profile.path) ? profile.path : [profile.path];
-                args = platform_1.isWindows ? profile.args : Array.isArray(profile.args) ? profile.args : undefined;
+                args = ide_core_node_1.isWindows ? profile.args : Array.isArray(profile.args) ? profile.args : undefined;
                 // icon = validateIcon(profile.icon);
             }
             // TODO: use  (await this.variableResolver.resolveArray(originalPaths))

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

@@ -1 +1 @@
-{"version":3,"file":"terminal.profile.service.js","sourceRoot":"","sources":["../../src/node/terminal.profile.service.ts"],"names":[],"mappings":"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"}
+{"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,5 +1,5 @@
 import { RPCService } from '@opensumi/ide-connection';
-import { OperatingSystem } from '@opensumi/ide-core-common/lib/platform';
+import { OperatingSystem } from '@opensumi/ide-core-node';
 import { IShellLaunchConfig, ITerminalServiceClient, INodePtyInstance, ITerminalError } from '../common';
 import { IDetectProfileOptions, ITerminalProfile } from '../common/profile';
 import { WindowsShellType } from '../common/shell';
@@ -31,16 +31,11 @@ export declare class TerminalServiceClientImpl extends RPCService<IRPCTerminalSe
         signal?: number;
     } | number, signal?: number): void;
     processChange(clientId: string, processName: string): void;
-    ensureTerminal(terminalIdArr: string[]): boolean;
+    ensureTerminal(terminalIdArr: string[]): Promise<boolean>;
     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>;
-    $resolvePotentialUnixShellPath(): Promise<string | undefined>;
-    $resolvePotentialWindowsShellPath(): Promise<{
-        path: string;
-        type: WindowsShellType;
-    }>;
     detectAvailableProfiles(options: IDetectProfileOptions): Promise<ITerminalProfile[]>;
     getCodePlatformKey(): Promise<'osx' | 'windows' | 'linux'>;
     getDefaultSystemShell(os: OperatingSystem): Promise<string>;
@@ -49,7 +44,7 @@ export declare class TerminalServiceClientImpl extends RPCService<IRPCTerminalSe
     disposeById(id: string): void;
     getProcessId(id: string): number;
     getShellName(id: string): string;
-    getOs(): OperatingSystem;
+    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":"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"}
+{"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,EAAe,eAAe,EAA0B,MAAM,yBAAyB,CAAC;AAE/F,OAAO,EACL,kBAAkB,EAElB,sBAAsB,EACtB,gBAAgB,EAChB,cAAc,EACf,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE5E,OAAO,EAAE,gBAAgB,EAAmC,MAAM,iBAAiB,CAAC;AAKpF;;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,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACtD,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;IAMtC,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;IAQ3G,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAOpD,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAIzD,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;IA0BlC,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,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

@@ -4,7 +4,6 @@ exports.TerminalServiceClientImpl = void 0;
 const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const ide_connection_1 = require("@opensumi/ide-connection");
-const platform_1 = require("@opensumi/ide-core-common/lib/platform");
 const ide_core_node_1 = require("@opensumi/ide-core-node");
 const common_1 = require("../common");
 const shell_1 = require("../common/shell");
@@ -21,6 +20,7 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
     }
     setConnectionClientId(clientId) {
         this.clientId = clientId;
+        this.logger.debug('TerminalServiceClientImpl', 'setConnectionClientId', clientId);
         this.terminalService.setClient(this.clientId, this);
     }
     clientMessage(id, data) {
@@ -44,9 +44,9 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
             this.client.$processChange(clientId, processName);
         }
     }
-    // 完成创建之后，前端进行状态同步
-    ensureTerminal(terminalIdArr) {
-        return this.terminalService.ensureClientTerminal(this.clientId, terminalIdArr);
+    // 检查终端状态，终端是否存活
+    async ensureTerminal(terminalIdArr) {
+        return await this.terminalService.ensureClientTerminal(this.clientId, terminalIdArr);
     }
     async create2(id, cols, rows, launchConfig) {
         try {
@@ -54,6 +54,7 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
             if (pty) {
                 this.terminalService.setClient(this.clientId, this);
                 this.logger.log(`client ${id} create ${pty.pid} with options `, launchConfig);
+                this.logger.log(`terminal client ${id} and clientID: ${this.clientId} create ${pty.pid} with options `, launchConfig);
                 this.terminalMap.set(id, pty);
                 return {
                     id,
@@ -93,44 +94,12 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
     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,
-        };
-    }
     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';
+        return this.getOS() === ide_core_node_1.OperatingSystem.Macintosh ? 'osx' : ide_core_node_1.OperatingSystem.Windows ? 'windows' : 'linux';
     }
     async getDefaultSystemShell(os) {
         return await (0, shell_2.getSystemShell)(os);
@@ -156,8 +125,8 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
     getShellName(id) {
         return this.terminalService.getShellName(id);
     }
-    getOs() {
-        return platform_1.OS;
+    getOS() {
+        return ide_core_node_1.isWindows ? ide_core_node_1.OperatingSystem.Windows : ide_core_node_1.isMacintosh ? ide_core_node_1.OperatingSystem.Macintosh : ide_core_node_1.OperatingSystem.Linux;
     }
     dispose() {
         this.terminalService.closeClient(this.clientId);

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

@@ -8,15 +8,16 @@ export declare class TerminalServiceImpl implements ITerminalNodeService {
     static TerminalPtyCloseThreshold: number;
     private terminalProcessMap;
     private clientTerminalMap;
-    private clientTerminalThresholdMap;
     private serviceClientMap;
+    private closeTimeOutMap;
     private injector;
     private logger;
     private appConfig;
+    private readonly ptyServiceManager;
     private batchedPtyDataMap;
     private batchedPtyDataTimer;
     setClient(clientId: string, client: ITerminalServiceClient): void;
-    ensureClientTerminal(clientId: string, terminalIdArr: string[]): boolean;
+    ensureClientTerminal(clientId: string, terminalIdArr: string[]): Promise<boolean>;
     closeClient(clientId: string): void;
     disposeClient(clientId: string): void;
     private flushPtyData;

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":"AAGA,OAAO,EAAsB,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAC7F,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAUhE;;;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;IAgH5B,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"}
+{"version":3,"file":"terminal.service.d.ts","sourceRoot":"","sources":["../../src/node/terminal.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,oBAAoB,EAAE,sBAAsB,EAAyB,MAAM,WAAW,CAAC;AACpH,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAWhE;;;GAGG;AACH,qBACa,mBAAoB,YAAW,oBAAoB;IAC9D,MAAM,CAAC,yBAAyB,SAAa;IAE7C,OAAO,CAAC,kBAAkB,CAAsC;IAChE,OAAO,CAAC,iBAAiB,CAAmD;IAE5E,OAAO,CAAC,gBAAgB,CAAkD;IAC1E,OAAO,CAAC,eAAe,CAA0C;IAGjE,OAAO,CAAC,QAAQ,CAAW;IAG3B,OAAO,CAAC,MAAM,CAAc;IAG5B,OAAO,CAAC,SAAS,CAAY;IAG7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IAEvD,OAAO,CAAC,iBAAiB,CAAkC;IAC3D,OAAO,CAAC,mBAAmB,CAA0C;IAE9D,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB;IAYpD,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE;IAgBpE,WAAW,CAAC,QAAQ,EAAE,MAAM;IAY5B,aAAa,CAAC,QAAQ,EAAE,MAAM;IAuBrC,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;IAgH5B,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

@@ -7,6 +7,7 @@ const di_1 = require("@opensumi/di");
 const ide_core_node_1 = require("@opensumi/ide-core-node");
 const common_1 = require("../common");
 const pty_1 = require("./pty");
+const pty_manager_1 = require("./pty.manager");
 // ref: https://github.com/vercel/hyper/blob/4c90d7555c79fb6dc438fa9549f1d0ef7c7a5aa7/app/session.ts#L27-L32
 // 批处理字符最大长度
 const BATCH_MAX_SIZE = 200 * 1024;
@@ -20,35 +21,56 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
     constructor() {
         this.terminalProcessMap = new Map();
         this.clientTerminalMap = new Map();
-        this.clientTerminalThresholdMap = new Map();
         this.serviceClientMap = new Map();
+        this.closeTimeOutMap = new Map();
         this.batchedPtyDataMap = new Map();
         this.batchedPtyDataTimer = new Map();
     }
     setClient(clientId, client) {
         this.serviceClientMap.set(clientId, client);
+        // 如果有相同的setClient clientId被调用，则取消延时触发closeClient，否则会导致终端无响应
+        const timeOutHandler = this.closeTimeOutMap.get(clientId);
+        if (timeOutHandler) {
+            global.clearTimeout(timeOutHandler);
+            this.closeTimeOutMap.delete(clientId);
+        }
     }
-    ensureClientTerminal(clientId, terminalIdArr) {
-        if (this.clientTerminalThresholdMap.has(clientId)) {
-            clearTimeout(this.clientTerminalThresholdMap.get(clientId));
-            this.logger.debug(`重连 clientId ${clientId} 窗口的 pty 进程`);
+    // 检查SessionId是否存活，但是因为之前接口设计有问题只返回了boolean，所以不能批量返回SessionId的检查结果
+    // 可以通过多次调用来达成目的，每次调用terminalIdArr只传入一个东西
+    async ensureClientTerminal(clientId, terminalIdArr) {
+        const sessionIdArray = terminalIdArr.map((id) => id.split(common_1.TERMINAL_ID_SEPARATOR)[1]);
+        const sessionCheckResArray = await Promise.all(sessionIdArray.map((sessionId) => this.ptyServiceManager.checkSession(sessionId)));
+        this.logger.log(`ensureClientTerminal ${clientId} ${terminalIdArr} ${sessionCheckResArray}`);
+        // 有一个存活就true，所以为了准确使用，每次调用terminalIdArr只传入一个东西
+        for (const sessionCheckRes of sessionCheckResArray) {
+            if (sessionCheckRes) {
+                return true;
+            }
         }
-        return this.clientTerminalMap.has(clientId);
+        return false;
     }
     closeClient(clientId) {
+        // 延时触发，因为WS本身有重连逻辑，因此通过延时触发来避免断开后不就重连但是回调方法都被dispose的问题
         const closeTimer = global.setTimeout(() => {
             this.disposeClient(clientId);
             this.logger.debug(`删除 clientId ${clientId} 窗口的 pty 进程`);
-            this.clientTerminalThresholdMap.delete(clientId);
         }, (0, ide_core_node_1.isDevelopment)() ? 0 : this.appConfig.terminalPtyCloseThreshold || TerminalServiceImpl_1.TerminalPtyCloseThreshold);
-        this.clientTerminalThresholdMap.set(clientId, closeTimer);
+        this.closeTimeOutMap.set(clientId, closeTimer);
     }
     disposeClient(clientId) {
         const terminalMap = this.clientTerminalMap.get(clientId);
+        // 如果是Electron也要直接kill掉，跟随IDE Server的生命周期
+        const isElectronNodeEnv = (0, ide_core_node_1.isElectronNode)();
         if (terminalMap) {
             terminalMap.forEach((t, id) => {
                 this.terminalProcessMap.delete(id);
-                t.kill();
+                if (t.shellLaunchConfig.disablePersistence ||
+                    t.shellLaunchConfig.isExtensionOwnedTerminal ||
+                    isElectronNodeEnv) {
+                    t.kill(); // terminalProfile有isTransient的参数化，要Kill，不保活
+                }
+                // t.kill(); // 这个是窗口关闭时候触发，终端默认在这种场景下保活, 不kill
+                // TOOD 后续看看有没有更加优雅的方案
             });
             this.clientTerminalMap.delete(clientId);
         }
@@ -62,7 +84,7 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
     }
     async create2(id, _cols, _rows, _launchConfig) {
         var _a;
-        const clientId = id.split('|')[0];
+        const clientId = id.split(common_1.TERMINAL_ID_SEPARATOR)[0];
         let ptyService;
         let cols = _cols;
         let rows = _rows;
@@ -212,6 +234,10 @@ tslib_1.__decorate([
     (0, di_1.Autowired)(ide_core_node_1.AppConfig),
     tslib_1.__metadata("design:type", Object)
 ], TerminalServiceImpl.prototype, "appConfig", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(pty_manager_1.PtyServiceManagerToken),
+    tslib_1.__metadata("design:type", Object)
+], TerminalServiceImpl.prototype, "ptyServiceManager", void 0);
 TerminalServiceImpl = TerminalServiceImpl_1 = tslib_1.__decorate([
     (0, di_1.Injectable)()
 ], TerminalServiceImpl);

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

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