@opensumi/ide-terminal-next 3.0.2-next-1715852509.0 → 3.0.2-next-1715860290.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/contribution/terminal.command.d.ts +3 -2
- package/lib/browser/contribution/terminal.command.d.ts.map +1 -1
- package/lib/browser/contribution/terminal.command.js +5 -1
- package/lib/browser/contribution/terminal.command.js.map +1 -1
- package/lib/browser/terminal.client.d.ts +2 -0
- package/lib/browser/terminal.client.d.ts.map +1 -1
- package/lib/browser/terminal.client.js +29 -0
- package/lib/browser/terminal.client.js.map +1 -1
- package/lib/browser/terminal.controller.d.ts.map +1 -1
- package/lib/browser/terminal.controller.js +7 -5
- package/lib/browser/terminal.controller.js.map +1 -1
- package/lib/browser/terminal.view.d.ts.map +1 -1
- package/lib/browser/terminal.view.js +1 -4
- package/lib/browser/terminal.view.js.map +1 -1
- package/lib/common/client.d.ts +8 -0
- package/lib/common/client.d.ts.map +1 -1
- package/lib/common/client.js.map +1 -1
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +5 -0
- package/lib/node/index.js.map +1 -1
- package/lib/node/pty.d.ts +2 -0
- package/lib/node/pty.d.ts.map +1 -1
- package/lib/node/pty.js +7 -3
- package/lib/node/pty.js.map +1 -1
- package/lib/node/shell-integration.service.d.ts +21 -0
- package/lib/node/shell-integration.service.d.ts.map +1 -0
- package/lib/node/shell-integration.service.js +70 -0
- package/lib/node/shell-integration.service.js.map +1 -0
- package/lib/node/terminal.service.client.d.ts.map +1 -1
- package/lib/node/terminal.service.client.js +2 -1
- package/lib/node/terminal.service.client.js.map +1 -1
- package/lib/node/terminal.service.d.ts.map +1 -1
- package/lib/node/terminal.service.js +4 -3
- package/lib/node/terminal.service.js.map +1 -1
- package/package.json +16 -16
- package/src/browser/contribution/terminal.command.ts +8 -2
- package/src/browser/terminal.client.ts +40 -1
- package/src/browser/terminal.controller.ts +8 -5
- package/src/browser/terminal.view.ts +1 -4
- package/src/common/client.ts +10 -0
- package/src/node/index.ts +5 -0
- package/src/node/pty.ts +6 -3
- package/src/node/shell-integration.service.ts +77 -0
- package/src/node/terminal.service.client.ts +2 -1
- package/src/node/terminal.service.ts +4 -3
- package/lib/node/easy-shell-intergration.d.ts +0 -9
- package/lib/node/easy-shell-intergration.d.ts.map +0 -1
- package/lib/node/easy-shell-intergration.js +0 -54
- package/lib/node/easy-shell-intergration.js.map +0 -1
- package/src/node/easy-shell-intergration.ts +0 -53
package/lib/node/pty.js
CHANGED
|
@@ -14,9 +14,9 @@ const osLocale = tslib_1.__importStar(require("os-locale"));
|
|
|
14
14
|
const di_1 = require("@opensumi/di");
|
|
15
15
|
const ide_core_node_1 = require("@opensumi/ide-core-node");
|
|
16
16
|
const shell_path_1 = require("@opensumi/ide-core-node/lib/bootstrap/shell-path");
|
|
17
|
-
const easy_shell_intergration_1 = require("./easy-shell-intergration");
|
|
18
17
|
const pty_manager_1 = require("./pty.manager");
|
|
19
18
|
const shell_1 = require("./shell");
|
|
19
|
+
const shell_integration_service_1 = require("./shell-integration.service");
|
|
20
20
|
exports.IPtyService = Symbol('IPtyService');
|
|
21
21
|
let PtyService = class PtyService extends ide_core_node_1.Disposable {
|
|
22
22
|
get pty() {
|
|
@@ -153,12 +153,12 @@ let PtyService = class PtyService extends ide_core_node_1.Disposable {
|
|
|
153
153
|
// HACK: 这里的处理逻辑有些黑，后续需要整体去整理下 Shell Intergration，然后整体优化一下
|
|
154
154
|
// 如果是启动 bash，则使用 init file 植入 Intergration 能力
|
|
155
155
|
if ((_a = options.executable) === null || _a === void 0 ? void 0 : _a.includes('bash')) {
|
|
156
|
-
await
|
|
156
|
+
const bashIntegrationPath = await this.shellIntegrationService.initBashInitFile();
|
|
157
157
|
if (!options.args) {
|
|
158
158
|
options.args = [];
|
|
159
159
|
}
|
|
160
160
|
if (Array.isArray(options.args)) {
|
|
161
|
-
options.args.push('--init-file',
|
|
161
|
+
options.args.push('--init-file', bashIntegrationPath);
|
|
162
162
|
}
|
|
163
163
|
}
|
|
164
164
|
this._ptyOptions['env'] = ptyEnv;
|
|
@@ -251,6 +251,10 @@ tslib_1.__decorate([
|
|
|
251
251
|
(0, di_1.Autowired)(pty_manager_1.PtyServiceManagerToken),
|
|
252
252
|
tslib_1.__metadata("design:type", Object)
|
|
253
253
|
], PtyService.prototype, "ptyServiceManager", void 0);
|
|
254
|
+
tslib_1.__decorate([
|
|
255
|
+
(0, di_1.Autowired)(shell_integration_service_1.IShellIntegrationService),
|
|
256
|
+
tslib_1.__metadata("design:type", Object)
|
|
257
|
+
], PtyService.prototype, "shellIntegrationService", void 0);
|
|
254
258
|
PtyService = tslib_1.__decorate([
|
|
255
259
|
(0, di_1.Injectable)({ multiple: true }),
|
|
256
260
|
tslib_1.__metadata("design:paramtypes", [String, Object, Number, Number])
|
package/lib/node/pty.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../src/node/pty.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;;AAEhG,sIAAsI;AAEtI,2BAA8B;AAC9B,oDAAoB;AAEpB,+DAA+B;AAE/B,4DAAsC;AAEtC,qCAAqD;AACrD,2DAAiG;AACjG,iFAAgF;AAMhF
|
|
1
|
+
{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../src/node/pty.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
export interface IShellIntegrationService {
|
|
2
|
+
initBashInitFile(): Promise<string>;
|
|
3
|
+
getBashIntegrationContent(): Promise<string>;
|
|
4
|
+
}
|
|
5
|
+
export declare const shellIntegrationDirPath: string;
|
|
6
|
+
export declare const bashIntegrationPath: string;
|
|
7
|
+
export declare const IShellIntegrationService: unique symbol;
|
|
8
|
+
/**
|
|
9
|
+
* 可通过重写此 Service 做到自定义的 Bash 注入
|
|
10
|
+
* 后续增加 ZSH 的支持
|
|
11
|
+
*/
|
|
12
|
+
export declare class ShellIntegrationService implements IShellIntegrationService {
|
|
13
|
+
/**
|
|
14
|
+
注入的 bash initFile，用于 ShellIntegration 功能的搭建
|
|
15
|
+
可覆写此文件，实现自定义的注入
|
|
16
|
+
*注意*：要保持 prompt_start 和 prompt_end 的注入，否则会影响 IDE 的终端智能
|
|
17
|
+
*/
|
|
18
|
+
getBashIntegrationContent(): Promise<string>;
|
|
19
|
+
initBashInitFile(): Promise<string>;
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=shell-integration.service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shell-integration.service.d.ts","sourceRoot":"","sources":["../../src/node/shell-integration.service.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,wBAAwB;IAEvC,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAGpC,yBAAyB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9C;AAGD,eAAO,MAAM,uBAAuB,QAA6D,CAAC;AAElG,eAAO,MAAM,mBAAmB,QAA8D,CAAC;AAE/F,eAAO,MAAM,wBAAwB,eAAqC,CAAC;AAE3E;;;GAGG;AACH,qBACa,uBAAwB,YAAW,wBAAwB;IACtE;;;;MAIE;IACI,yBAAyB,IAAI,OAAO,CAAC,MAAM,CAAC;IAsC5C,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;CAK1C"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ShellIntegrationService = exports.IShellIntegrationService = exports.bashIntegrationPath = exports.shellIntegrationDirPath = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const os_1 = tslib_1.__importDefault(require("os"));
|
|
6
|
+
const path_1 = tslib_1.__importDefault(require("path"));
|
|
7
|
+
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
8
|
+
const di_1 = require("@opensumi/di");
|
|
9
|
+
// 未来适配 OpenSumi 的时候需要调整
|
|
10
|
+
exports.shellIntegrationDirPath = path_1.default.join(os_1.default.tmpdir(), '.sumi-shell', 'shell-integration');
|
|
11
|
+
exports.bashIntegrationPath = path_1.default.join(exports.shellIntegrationDirPath, 'bash-integration.bash');
|
|
12
|
+
exports.IShellIntegrationService = Symbol('IShellIntegrationService');
|
|
13
|
+
/**
|
|
14
|
+
* 可通过重写此 Service 做到自定义的 Bash 注入
|
|
15
|
+
* 后续增加 ZSH 的支持
|
|
16
|
+
*/
|
|
17
|
+
let ShellIntegrationService = class ShellIntegrationService {
|
|
18
|
+
/**
|
|
19
|
+
注入的 bash initFile，用于 ShellIntegration 功能的搭建
|
|
20
|
+
可覆写此文件，实现自定义的注入
|
|
21
|
+
*注意*：要保持 prompt_start 和 prompt_end 的注入，否则会影响 IDE 的终端智能
|
|
22
|
+
*/
|
|
23
|
+
async getBashIntegrationContent() {
|
|
24
|
+
return String.raw `
|
|
25
|
+
|
|
26
|
+
if [ -r /etc/profile ]; then
|
|
27
|
+
. /etc/profile
|
|
28
|
+
fi
|
|
29
|
+
if [ -r ~/.bashrc ]; then
|
|
30
|
+
. ~/.bashrc
|
|
31
|
+
fi
|
|
32
|
+
if [ -r ~/.bash_profile ]; then
|
|
33
|
+
. ~/.bash_profile
|
|
34
|
+
elif [ -r ~/.bash_login ]; then
|
|
35
|
+
. ~/.bash_login
|
|
36
|
+
elif [ -r ~/.profile ]; then
|
|
37
|
+
. ~/.profile
|
|
38
|
+
fi
|
|
39
|
+
|
|
40
|
+
__is_prompt_start() {
|
|
41
|
+
builtin printf '\e]6973;PS\a' # 标记 Shell Prompt Start，使其可被 IDE 上层感知，用于终端智能
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
__is_prompt_end() {
|
|
45
|
+
builtin printf '\e]6973;PE\a' # 用于标记 Shell Prompt End，作用同上
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
__is_update_prompt() {
|
|
49
|
+
if [[ "$__is_custom_PS1" == "" || "$__is_custom_PS1" != "$PS1" ]]; then
|
|
50
|
+
__is_original_PS1=$PS1
|
|
51
|
+
__is_custom_PS1="\[$(__is_prompt_start)\]$__is_original_PS1\[$(__is_prompt_end)\]"
|
|
52
|
+
export PS1="$__is_custom_PS1"
|
|
53
|
+
fi
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
__is_update_prompt
|
|
57
|
+
`;
|
|
58
|
+
}
|
|
59
|
+
// 可被集成侧覆写以自定义 Bash 注入文件
|
|
60
|
+
async initBashInitFile() {
|
|
61
|
+
await fs_extra_1.default.mkdirp(exports.shellIntegrationDirPath);
|
|
62
|
+
await fs_extra_1.default.writeFile(exports.bashIntegrationPath, await this.getBashIntegrationContent());
|
|
63
|
+
return exports.bashIntegrationPath;
|
|
64
|
+
}
|
|
65
|
+
};
|
|
66
|
+
ShellIntegrationService = tslib_1.__decorate([
|
|
67
|
+
(0, di_1.Injectable)()
|
|
68
|
+
], ShellIntegrationService);
|
|
69
|
+
exports.ShellIntegrationService = ShellIntegrationService;
|
|
70
|
+
//# sourceMappingURL=shell-integration.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shell-integration.service.js","sourceRoot":"","sources":["../../src/node/shell-integration.service.ts"],"names":[],"mappings":";;;;AAAA,oDAAoB;AACpB,wDAAwB;AAExB,gEAA0B;AAE1B,qCAA0C;AAU1C,wBAAwB;AACX,QAAA,uBAAuB,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,mBAAmB,CAAC,CAAC;AAErF,QAAA,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,+BAAuB,EAAE,uBAAuB,CAAC,CAAC;AAElF,QAAA,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC;AAE3E;;;GAGG;AAEI,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAClC;;;;MAIE;IACF,KAAK,CAAC,yBAAyB;QAC7B,OAAO,MAAM,CAAC,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAiChB,CAAC;IACJ,CAAC;IAED,wBAAwB;IACxB,KAAK,CAAC,gBAAgB;QACpB,MAAM,kBAAE,CAAC,MAAM,CAAC,+BAAuB,CAAC,CAAC;QACzC,MAAM,kBAAE,CAAC,SAAS,CAAC,2BAAmB,EAAE,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC,CAAC;QAChF,OAAO,2BAAmB,CAAC;IAC7B,CAAC;CACF,CAAA;AAjDY,uBAAuB;IADnC,IAAA,eAAU,GAAE;GACA,uBAAuB,CAiDnC;AAjDY,0DAAuB"}
|
|
@@ -1 +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,EAAe,eAAe,EAA0B,MAAM,yBAAyB,CAAC;AAE/F,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EAEd,sBAAsB,EACvB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE5E,OAAO,EAAmC,gBAAgB,EAAE,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,CAA4C;IAG/D,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;IAQpD,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;IAa1D,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;
|
|
1
|
+
{"version":3,"file":"terminal.service.client.d.ts","sourceRoot":"","sources":["../../src/node/terminal.service.client.ts"],"names":[],"mappings":"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"}
|
|
@@ -138,7 +138,8 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
|
|
|
138
138
|
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;
|
|
139
139
|
}
|
|
140
140
|
dispose() {
|
|
141
|
-
|
|
141
|
+
// TODO 后续需要一个合理的 Dispose 逻辑，暂时不要 Dispose，避免重连时终端不可用
|
|
142
|
+
// this.terminalService.closeClient(this.clientId);
|
|
142
143
|
}
|
|
143
144
|
getCwd(id) {
|
|
144
145
|
return this.terminalService.getCwd(id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.service.client.js","sourceRoot":"","sources":["../../src/node/terminal.service.client.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,6DAAsD;AACtD,2DAA+F;AAE/F,sCAMmB;AAGnB,2CAAoF;AAEpF,mCAA2F;AAC3F,yEAAqG;AAWrG;;;GAGG;AAEI,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,2BAA+B;IAAvE;;QACG,gBAAW,GAAkC,IAAI,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal.service.client.js","sourceRoot":"","sources":["../../src/node/terminal.service.client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAWrE,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;IAepD,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;IAiBP,OAAO,CAClB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,kBAAkB,GAC/B,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IA2FjC,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;
|
|
1
|
+
{"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,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAWrE,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;IAepD,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;IAiBP,OAAO,CAClB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,kBAAkB,GAC/B,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IA2FjC,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;IAOP,OAAO,CAAC,WAAW;IAIb,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAQtD"}
|
|
@@ -203,9 +203,10 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
|
|
|
203
203
|
terminal.kill();
|
|
204
204
|
}
|
|
205
205
|
dispose() {
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
206
|
+
// TODO 后续需要一个合理的 Dispose 逻辑，暂时不要 Dispose，避免重连时终端不可用
|
|
207
|
+
// this.serviceClientMap.forEach((client) => {
|
|
208
|
+
// client.dispose();
|
|
209
|
+
// });
|
|
209
210
|
}
|
|
210
211
|
getTerminal(id) {
|
|
211
212
|
return this.terminalProcessMap.get(id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.service.js","sourceRoot":"","sources":["../../src/node/terminal.service.ts"],"names":[],"mappings":";;;;;AAAA,qCAA+E;AAC/E,2DAAgG;AAEhG,sCAAoH;AAGpH,+BAAmC;AACnC,+CAA2E;AAE3E,4GAA4G;AAC5G,YAAY;AACZ,MAAM,cAAc,GAAG,GAAG,GAAG,IAAI,CAAC;AAClC,QAAQ;AACR,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAGtB,IAAM,mBAAmB,2BAAzB,MAAM,mBAAmB;IAAzB;QAGG,uBAAkB,GAA4B,IAAI,GAAG,EAAE,CAAC;QACxD,sBAAiB,GAAyC,IAAI,GAAG,EAAE,CAAC;QAEpE,qBAAgB,GAAwC,IAAI,GAAG,EAAE,CAAC;QAClE,oBAAe,GAAgC,IAAI,GAAG,EAAE,CAAC;QAczD,sBAAiB,GAAwB,IAAI,GAAG,EAAE,CAAC;QACnD,wBAAmB,GAAgC,IAAI,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal.service.js","sourceRoot":"","sources":["../../src/node/terminal.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-terminal-next",
|
|
3
|
-
"version": "3.0.2-next-
|
|
3
|
+
"version": "3.0.2-next-1715860290.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,10 +17,10 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-connection": "3.0.2-next-
|
|
21
|
-
"@opensumi/ide-core-common": "3.0.2-next-
|
|
22
|
-
"@opensumi/ide-core-node": "3.0.2-next-
|
|
23
|
-
"@opensumi/ide-file-service": "3.0.2-next-
|
|
20
|
+
"@opensumi/ide-connection": "3.0.2-next-1715860290.0",
|
|
21
|
+
"@opensumi/ide-core-common": "3.0.2-next-1715860290.0",
|
|
22
|
+
"@opensumi/ide-core-node": "3.0.2-next-1715860290.0",
|
|
23
|
+
"@opensumi/ide-file-service": "3.0.2-next-1715860290.0",
|
|
24
24
|
"node-pty": "1.0.0",
|
|
25
25
|
"os-locale": "^4.0.0",
|
|
26
26
|
"xterm": "5.3.0",
|
|
@@ -30,18 +30,18 @@
|
|
|
30
30
|
"xterm-addon-webgl": "0.15.0"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
|
-
"@opensumi/ide-components": "3.0.2-next-
|
|
34
|
-
"@opensumi/ide-core-browser": "3.0.2-next-
|
|
35
|
-
"@opensumi/ide-dev-tool": "3.0.2-next-
|
|
36
|
-
"@opensumi/ide-editor": "3.0.2-next-
|
|
37
|
-
"@opensumi/ide-main-layout": "3.0.2-next-
|
|
38
|
-
"@opensumi/ide-overlay": "3.0.2-next-
|
|
39
|
-
"@opensumi/ide-status-bar": "3.0.2-next-
|
|
40
|
-
"@opensumi/ide-theme": "3.0.2-next-
|
|
41
|
-
"@opensumi/ide-variable": "3.0.2-next-
|
|
42
|
-
"@opensumi/ide-workspace": "3.0.2-next-
|
|
33
|
+
"@opensumi/ide-components": "3.0.2-next-1715860290.0",
|
|
34
|
+
"@opensumi/ide-core-browser": "3.0.2-next-1715860290.0",
|
|
35
|
+
"@opensumi/ide-dev-tool": "3.0.2-next-1715860290.0",
|
|
36
|
+
"@opensumi/ide-editor": "3.0.2-next-1715860290.0",
|
|
37
|
+
"@opensumi/ide-main-layout": "3.0.2-next-1715860290.0",
|
|
38
|
+
"@opensumi/ide-overlay": "3.0.2-next-1715860290.0",
|
|
39
|
+
"@opensumi/ide-status-bar": "3.0.2-next-1715860290.0",
|
|
40
|
+
"@opensumi/ide-theme": "3.0.2-next-1715860290.0",
|
|
41
|
+
"@opensumi/ide-variable": "3.0.2-next-1715860290.0",
|
|
42
|
+
"@opensumi/ide-workspace": "3.0.2-next-1715860290.0",
|
|
43
43
|
"@types/http-proxy": "^1.17.2",
|
|
44
44
|
"http-proxy": "^1.18.0"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "418f55493d415886a27e873ccff118e41bb3df36"
|
|
47
47
|
}
|
|
@@ -2,6 +2,7 @@ import { Autowired } from '@opensumi/di';
|
|
|
2
2
|
import {
|
|
3
3
|
AppConfig,
|
|
4
4
|
COMMON_COMMANDS,
|
|
5
|
+
ClientAppContribution,
|
|
5
6
|
CommandContribution,
|
|
6
7
|
CommandRegistry,
|
|
7
8
|
CommandService,
|
|
@@ -30,8 +31,8 @@ import { TerminalKeyBoardInputService } from '../terminal.input';
|
|
|
30
31
|
|
|
31
32
|
import { EnvironmentVariableServiceToken } from './../../common/environmentVariable';
|
|
32
33
|
|
|
33
|
-
@Domain(CommandContribution)
|
|
34
|
-
export class TerminalCommandContribution implements CommandContribution {
|
|
34
|
+
@Domain(CommandContribution, ClientAppContribution)
|
|
35
|
+
export class TerminalCommandContribution implements CommandContribution, ClientAppContribution {
|
|
35
36
|
@Autowired(ITerminalController)
|
|
36
37
|
protected readonly terminalController: ITerminalController;
|
|
37
38
|
|
|
@@ -78,6 +79,11 @@ export class TerminalCommandContribution implements CommandContribution {
|
|
|
78
79
|
this.terminalController.reconnect();
|
|
79
80
|
}
|
|
80
81
|
|
|
82
|
+
onDisposeSideEffects() {
|
|
83
|
+
// TODO 销毁 Node.js 端的 Terminal Client
|
|
84
|
+
// 目前的情况下，想要终端重连后正常工作的话，会导致一些内存泄漏
|
|
85
|
+
}
|
|
86
|
+
|
|
81
87
|
private setDefaultTerminalType(type: string) {
|
|
82
88
|
this.preference.update(TerminalSettingsId.Type, type);
|
|
83
89
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
|
|
2
|
-
import { IEventBus, QuickPickService, TerminalClientAttachEvent } from '@opensumi/ide-core-browser';
|
|
2
|
+
import { IEventBus, QuickPickService, TerminalClientAttachEvent, localize } from '@opensumi/ide-core-browser';
|
|
3
3
|
import { PreferenceService } from '@opensumi/ide-core-browser/lib/preferences/types';
|
|
4
4
|
import {
|
|
5
5
|
Deferred,
|
|
@@ -539,6 +539,45 @@ export class TerminalClient extends Disposable implements ITerminalClient {
|
|
|
539
539
|
}
|
|
540
540
|
}
|
|
541
541
|
|
|
542
|
+
// 检查 Terminal Client 对应的后端 Shell 进程是否存活
|
|
543
|
+
public async checkHealthy() {
|
|
544
|
+
return await this.internalService.check([this.id]);
|
|
545
|
+
}
|
|
546
|
+
|
|
547
|
+
// 输出终端已经被 Kill 的提醒
|
|
548
|
+
public displayUnHealthyMessage() {
|
|
549
|
+
const xtermRaw = this.term;
|
|
550
|
+
|
|
551
|
+
// 基于 Xterm Theme 的颜色来输出用户提示
|
|
552
|
+
const currentTheme = xtermRaw.options.theme;
|
|
553
|
+
|
|
554
|
+
// 根据当前主题设置输出样式的函数
|
|
555
|
+
const printStyledMessage = (message: string, foreground: string, background: string): void => {
|
|
556
|
+
const padding = ' '; // 四个空格作为左右边距
|
|
557
|
+
const paddedMessage = message
|
|
558
|
+
.split('\n')
|
|
559
|
+
.map((line) => padding + line + padding)
|
|
560
|
+
.join('\n');
|
|
561
|
+
const styledMessage = `\x1b[48;2;${hexToRgb(foreground)};38;2;${hexToRgb(background)}m${paddedMessage}\x1b[0m`;
|
|
562
|
+
xtermRaw.writeln('\n');
|
|
563
|
+
xtermRaw.writeln('\n' + styledMessage + '\n'); // 在输出前后添加空行
|
|
564
|
+
};
|
|
565
|
+
|
|
566
|
+
// 辅助函数：将十六进制颜色转换为 RGB 字符串
|
|
567
|
+
const hexToRgb = (hex: string): string => {
|
|
568
|
+
const r = parseInt(hex.slice(1, 3), 16);
|
|
569
|
+
const g = parseInt(hex.slice(3, 5), 16);
|
|
570
|
+
const b = parseInt(hex.slice(5, 7), 16);
|
|
571
|
+
return `${r};${g};${b}`;
|
|
572
|
+
};
|
|
573
|
+
|
|
574
|
+
printStyledMessage(
|
|
575
|
+
localize('terminal.process.unHealthy'),
|
|
576
|
+
currentTheme?.foreground || '#d7dbdeff',
|
|
577
|
+
currentTheme?.background || '#151b21ff',
|
|
578
|
+
);
|
|
579
|
+
}
|
|
580
|
+
|
|
542
581
|
reset() {
|
|
543
582
|
this._prepare();
|
|
544
583
|
this._attachAfterRender();
|
|
@@ -532,12 +532,15 @@ export class TerminalController extends WithEventBus implements ITerminalControl
|
|
|
532
532
|
|
|
533
533
|
async reconnect() {
|
|
534
534
|
const clients = Array.from(this._clients.values());
|
|
535
|
-
const canReconnected = await this.service.check(clients.map((client) => client.id));
|
|
536
535
|
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
536
|
+
// 在重连的时候检查终端的健康状态，如果不健康的话，展示相关信息提示用户
|
|
537
|
+
clients.forEach(async (client) => {
|
|
538
|
+
const clientHealthy = await client.checkHealthy();
|
|
539
|
+
|
|
540
|
+
if (!clientHealthy) {
|
|
541
|
+
client.displayUnHealthyMessage();
|
|
542
|
+
}
|
|
543
|
+
});
|
|
541
544
|
}
|
|
542
545
|
|
|
543
546
|
focus() {
|
|
@@ -242,7 +242,7 @@ export class WidgetGroup extends Disposable implements IWidgetGroup {
|
|
|
242
242
|
export class TerminalGroupViewService implements ITerminalGroupViewService {
|
|
243
243
|
protected _widgets: Map<string, Widget>;
|
|
244
244
|
|
|
245
|
-
@observable
|
|
245
|
+
@observable
|
|
246
246
|
groups: WidgetGroup[] = observable.array([]);
|
|
247
247
|
|
|
248
248
|
@observable
|
|
@@ -290,9 +290,6 @@ export class TerminalGroupViewService implements ITerminalGroupViewService {
|
|
|
290
290
|
|
|
291
291
|
@action
|
|
292
292
|
private _doSelectGroup(index: number) {
|
|
293
|
-
if (this.currentGroupIndex === index) {
|
|
294
|
-
return;
|
|
295
|
-
}
|
|
296
293
|
const group = this.getGroup(index);
|
|
297
294
|
this.currentGroupIndex = index;
|
|
298
295
|
this.currentGroupId = group.id;
|
package/src/common/client.ts
CHANGED
|
@@ -141,6 +141,16 @@ export interface ITerminalClient extends Disposable {
|
|
|
141
141
|
* 更新终端客户端配置
|
|
142
142
|
*/
|
|
143
143
|
updateLaunchConfig(launchConfig: IShellLaunchConfig): void;
|
|
144
|
+
|
|
145
|
+
/**
|
|
146
|
+
* 检查终端的健康状态，Shell 进程是否存活
|
|
147
|
+
*/
|
|
148
|
+
checkHealthy(): Promise<boolean>;
|
|
149
|
+
|
|
150
|
+
/**
|
|
151
|
+
* 在终端不健康时(对应的Shell 进程被 Kill)，使用 Xterm 提示用户，避免误解
|
|
152
|
+
*/
|
|
153
|
+
displayUnHealthyMessage(): void;
|
|
144
154
|
/**
|
|
145
155
|
* clear 参数用于判断是否需要清理 meta 信息，
|
|
146
156
|
* 不需要 clear 参数的时候基本为正常推出，
|
package/src/node/index.ts
CHANGED
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
|
|
12
12
|
import { IPtyService, PtyService } from './pty';
|
|
13
13
|
import { PtyServiceManager, PtyServiceManagerToken } from './pty.manager';
|
|
14
|
+
import { IShellIntegrationService, ShellIntegrationService } from './shell-integration.service';
|
|
14
15
|
import { TerminalProcessServiceImpl } from './terminal.process.service';
|
|
15
16
|
import { ITerminalProfileServiceNode, TerminalProfileServiceNode } from './terminal.profile.service';
|
|
16
17
|
import { TerminalServiceImpl } from './terminal.service';
|
|
@@ -31,6 +32,10 @@ export class TerminalNodePtyModule extends NodeModule {
|
|
|
31
32
|
token: ITerminalProcessService,
|
|
32
33
|
useClass: TerminalProcessServiceImpl,
|
|
33
34
|
},
|
|
35
|
+
{
|
|
36
|
+
token: IShellIntegrationService,
|
|
37
|
+
useClass: ShellIntegrationService,
|
|
38
|
+
},
|
|
34
39
|
{
|
|
35
40
|
token: IPtyService,
|
|
36
41
|
useClass: PtyService,
|
package/src/node/pty.ts
CHANGED
|
@@ -20,9 +20,9 @@ import { IShellLaunchConfig, ITerminalLaunchError } from '../common';
|
|
|
20
20
|
import { IProcessExitEvent, IProcessReadyEvent } from '../common/process';
|
|
21
21
|
import { IPtyProcessProxy, IPtySpawnOptions } from '../common/pty';
|
|
22
22
|
|
|
23
|
-
import { bashIntergrationPath, initShellIntergrationFile } from './easy-shell-intergration';
|
|
24
23
|
import { IPtyServiceManager, PtyServiceManagerToken } from './pty.manager';
|
|
25
24
|
import { findExecutable } from './shell';
|
|
25
|
+
import { IShellIntegrationService } from './shell-integration.service';
|
|
26
26
|
|
|
27
27
|
export const IPtyService = Symbol('IPtyService');
|
|
28
28
|
|
|
@@ -34,6 +34,9 @@ export class PtyService extends Disposable {
|
|
|
34
34
|
@Autowired(PtyServiceManagerToken)
|
|
35
35
|
protected readonly ptyServiceManager: IPtyServiceManager;
|
|
36
36
|
|
|
37
|
+
@Autowired(IShellIntegrationService)
|
|
38
|
+
protected readonly shellIntegrationService: IShellIntegrationService;
|
|
39
|
+
|
|
37
40
|
protected readonly _ptyOptions: pty.IPtyForkOptions | pty.IWindowsPtyForkOptions;
|
|
38
41
|
private _ptyProcess: IPtyProcessProxy | undefined;
|
|
39
42
|
|
|
@@ -186,12 +189,12 @@ export class PtyService extends Disposable {
|
|
|
186
189
|
// HACK: 这里的处理逻辑有些黑，后续需要整体去整理下 Shell Intergration，然后整体优化一下
|
|
187
190
|
// 如果是启动 bash，则使用 init file 植入 Intergration 能力
|
|
188
191
|
if (options.executable?.includes('bash')) {
|
|
189
|
-
await
|
|
192
|
+
const bashIntegrationPath = await this.shellIntegrationService.initBashInitFile();
|
|
190
193
|
if (!options.args) {
|
|
191
194
|
options.args = [];
|
|
192
195
|
}
|
|
193
196
|
if (Array.isArray(options.args)) {
|
|
194
|
-
options.args.push('--init-file',
|
|
197
|
+
options.args.push('--init-file', bashIntegrationPath);
|
|
195
198
|
}
|
|
196
199
|
}
|
|
197
200
|
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import os from 'os';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
|
|
4
|
+
import fs from 'fs-extra';
|
|
5
|
+
|
|
6
|
+
import { Injectable } from '@opensumi/di';
|
|
7
|
+
|
|
8
|
+
export interface IShellIntegrationService {
|
|
9
|
+
// 初始化 Bash 注入文件，幂等设计，返回注入文件路径
|
|
10
|
+
initBashInitFile(): Promise<string>;
|
|
11
|
+
|
|
12
|
+
// 获取 Bash 注入文件的 Content 内容
|
|
13
|
+
getBashIntegrationContent(): Promise<string>;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
// 未来适配 OpenSumi 的时候需要调整
|
|
17
|
+
export const shellIntegrationDirPath = path.join(os.tmpdir(), '.sumi-shell', 'shell-integration');
|
|
18
|
+
|
|
19
|
+
export const bashIntegrationPath = path.join(shellIntegrationDirPath, 'bash-integration.bash');
|
|
20
|
+
|
|
21
|
+
export const IShellIntegrationService = Symbol('IShellIntegrationService');
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* 可通过重写此 Service 做到自定义的 Bash 注入
|
|
25
|
+
* 后续增加 ZSH 的支持
|
|
26
|
+
*/
|
|
27
|
+
@Injectable()
|
|
28
|
+
export class ShellIntegrationService implements IShellIntegrationService {
|
|
29
|
+
/**
|
|
30
|
+
注入的 bash initFile，用于 ShellIntegration 功能的搭建
|
|
31
|
+
可覆写此文件，实现自定义的注入
|
|
32
|
+
*注意*：要保持 prompt_start 和 prompt_end 的注入，否则会影响 IDE 的终端智能
|
|
33
|
+
*/
|
|
34
|
+
async getBashIntegrationContent(): Promise<string> {
|
|
35
|
+
return String.raw`
|
|
36
|
+
|
|
37
|
+
if [ -r /etc/profile ]; then
|
|
38
|
+
. /etc/profile
|
|
39
|
+
fi
|
|
40
|
+
if [ -r ~/.bashrc ]; then
|
|
41
|
+
. ~/.bashrc
|
|
42
|
+
fi
|
|
43
|
+
if [ -r ~/.bash_profile ]; then
|
|
44
|
+
. ~/.bash_profile
|
|
45
|
+
elif [ -r ~/.bash_login ]; then
|
|
46
|
+
. ~/.bash_login
|
|
47
|
+
elif [ -r ~/.profile ]; then
|
|
48
|
+
. ~/.profile
|
|
49
|
+
fi
|
|
50
|
+
|
|
51
|
+
__is_prompt_start() {
|
|
52
|
+
builtin printf '\e]6973;PS\a' # 标记 Shell Prompt Start，使其可被 IDE 上层感知，用于终端智能
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
__is_prompt_end() {
|
|
56
|
+
builtin printf '\e]6973;PE\a' # 用于标记 Shell Prompt End，作用同上
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
__is_update_prompt() {
|
|
60
|
+
if [[ "$__is_custom_PS1" == "" || "$__is_custom_PS1" != "$PS1" ]]; then
|
|
61
|
+
__is_original_PS1=$PS1
|
|
62
|
+
__is_custom_PS1="\[$(__is_prompt_start)\]$__is_original_PS1\[$(__is_prompt_end)\]"
|
|
63
|
+
export PS1="$__is_custom_PS1"
|
|
64
|
+
fi
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
__is_update_prompt
|
|
68
|
+
`;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
// 可被集成侧覆写以自定义 Bash 注入文件
|
|
72
|
+
async initBashInitFile(): Promise<string> {
|
|
73
|
+
await fs.mkdirp(shellIntegrationDirPath);
|
|
74
|
+
await fs.writeFile(bashIntegrationPath, await this.getBashIntegrationContent());
|
|
75
|
+
return bashIntegrationPath;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
@@ -186,7 +186,8 @@ export class TerminalServiceClientImpl extends RPCService<IRPCTerminalService> i
|
|
|
186
186
|
}
|
|
187
187
|
|
|
188
188
|
dispose() {
|
|
189
|
-
|
|
189
|
+
// TODO 后续需要一个合理的 Dispose 逻辑，暂时不要 Dispose，避免重连时终端不可用
|
|
190
|
+
// this.terminalService.closeClient(this.clientId);
|
|
190
191
|
}
|
|
191
192
|
|
|
192
193
|
getCwd(id: string): Promise<string | undefined> {
|