@opensumi/ide-terminal-next 2.17.7-rc-1653379143.0 → 2.18.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/component/terminal.view.d.ts.map +1 -1
- package/lib/browser/component/terminal.view.js +1 -0
- package/lib/browser/component/terminal.view.js.map +1 -1
- package/lib/browser/terminal.api.d.ts +3 -1
- package/lib/browser/terminal.api.d.ts.map +1 -1
- package/lib/browser/terminal.api.js +5 -0
- package/lib/browser/terminal.api.js.map +1 -1
- package/lib/browser/terminal.client.d.ts +3 -1
- package/lib/browser/terminal.client.d.ts.map +1 -1
- package/lib/browser/terminal.client.js +7 -1
- package/lib/browser/terminal.client.js.map +1 -1
- package/lib/browser/terminal.controller.d.ts +9 -2
- package/lib/browser/terminal.controller.d.ts.map +1 -1
- package/lib/browser/terminal.controller.js +39 -6
- package/lib/browser/terminal.controller.js.map +1 -1
- package/lib/browser/terminal.service.d.ts.map +1 -1
- package/lib/browser/terminal.service.js +2 -2
- package/lib/browser/terminal.service.js.map +1 -1
- package/lib/common/api.d.ts +2 -1
- package/lib/common/api.d.ts.map +1 -1
- package/lib/common/client.d.ts +9 -0
- package/lib/common/client.d.ts.map +1 -1
- package/lib/common/client.js +2 -1
- package/lib/common/client.js.map +1 -1
- package/lib/common/controller.d.ts +3 -1
- package/lib/common/controller.d.ts.map +1 -1
- package/lib/common/controller.js.map +1 -1
- package/lib/node/pty.manager.remote.d.ts +1 -0
- package/lib/node/pty.manager.remote.d.ts.map +1 -1
- package/lib/node/pty.manager.remote.js +43 -6
- package/lib/node/pty.manager.remote.js.map +1 -1
- package/lib/node/pty.proxy.d.ts.map +1 -1
- package/lib/node/pty.proxy.js +1 -1
- package/lib/node/pty.proxy.js.map +1 -1
- package/lib/node/terminal.service.d.ts.map +1 -1
- package/lib/node/terminal.service.js +7 -3
- package/lib/node/terminal.service.js.map +1 -1
- package/package.json +15 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.view.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.view.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAkB1B,OAAO,qBAAqB,CAAC;;AAE7B,
|
|
1
|
+
{"version":3,"file":"terminal.view.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.view.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAkB1B,OAAO,qBAAqB,CAAC;;AAE7B,wBAiHG"}
|
|
@@ -57,6 +57,7 @@ exports.default = (0, mobx_react_lite_1.observer)(() => {
|
|
|
57
57
|
react_1.default.useEffect(() => {
|
|
58
58
|
if (wrapperRef.current) {
|
|
59
59
|
controller.initContextKey(wrapperRef.current);
|
|
60
|
+
controller.viewReady.resolve();
|
|
60
61
|
}
|
|
61
62
|
}, [wrapperRef.current]);
|
|
62
63
|
return (react_1.default.createElement("div", { ref: wrapperRef, className: terminal_module_less_1.default.terminalWrapper, style: { backgroundColor: controller.themeBackground }, "data-group-current": currentGroupId },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.view.js","sourceRoot":"","sources":["../../../src/browser/component/terminal.view.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"terminal.view.js","sourceRoot":"","sources":["../../../src/browser/component/terminal.view.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import type vscode from 'vscode';
|
|
2
2
|
import { Event } from '@opensumi/ide-core-common';
|
|
3
|
-
import { ITerminalApiService, ITerminalGroupViewService, ITerminalController, ITerminalInfo, ITerminalExternalClient, ITerminalInternalService, ITerminalNetwork, ITerminalExitEvent } from '../common';
|
|
3
|
+
import { ITerminalApiService, ITerminalGroupViewService, ITerminalController, ITerminalInfo, ITerminalExternalClient, ITerminalInternalService, ITerminalNetwork, ITerminalExitEvent, ITerminalTitleChangeEvent } from '../common';
|
|
4
4
|
export declare class TerminalApiService implements ITerminalApiService {
|
|
5
5
|
private _onDidOpenTerminal;
|
|
6
6
|
private _onDidCloseTerminal;
|
|
7
|
+
private _onDidTerminalTitleChange;
|
|
7
8
|
private _onDidChangeActiveTerminal;
|
|
8
9
|
readonly onDidOpenTerminal: Event<ITerminalInfo>;
|
|
9
10
|
readonly onDidCloseTerminal: Event<ITerminalExitEvent>;
|
|
11
|
+
readonly onDidTerminalTitleChange: Event<ITerminalTitleChangeEvent>;
|
|
10
12
|
readonly onDidChangeActiveTerminal: Event<string>;
|
|
11
13
|
protected readonly controller: ITerminalController;
|
|
12
14
|
protected readonly view: ITerminalGroupViewService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.api.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,OAAO,EAAE,KAAK,EAAW,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,mBAAmB,EACnB,aAAa,EACb,uBAAuB,EACvB,wBAAwB,EACxB,gBAAgB,EAChB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"terminal.api.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,OAAO,EAAE,KAAK,EAAW,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,mBAAmB,EACnB,aAAa,EACb,uBAAuB,EACvB,wBAAwB,EACxB,gBAAgB,EAChB,kBAAkB,EAClB,yBAAyB,EAC1B,MAAM,WAAW,CAAC;AAEnB,qBACa,kBAAmB,YAAW,mBAAmB;IAC5D,OAAO,CAAC,kBAAkB,CAAgC;IAC1D,OAAO,CAAC,mBAAmB,CAAqC;IAChE,OAAO,CAAC,yBAAyB,CAA4C;IAC7E,OAAO,CAAC,0BAA0B,CAAyB;IAE3D,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,CAAiC;IACjF,QAAQ,CAAC,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAkC;IACxF,QAAQ,CAAC,wBAAwB,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAwC;IAC3G,QAAQ,CAAC,yBAAyB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAyC;IAG1F,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB,CAAC;IAGrD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC;IAE7C,SAAS,CAAC,QAAQ,uCAA8C;;IAoBhE,IAAI,SAAS;;;;QAMZ;IAEK,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC;IA2CpG,YAAY,CAAC,SAAS,EAAE,MAAM;IAI9B,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,UAAO;IAIpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,UAAO;IAU/C,QAAQ,CAAC,QAAQ,EAAE,MAAM;IAUzB,UAAU,CAAC,QAAQ,EAAE,MAAM;IAU3B,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI;IAelF;;OAEG;IACH,oBAAoB;CAGrB"}
|
|
@@ -10,9 +10,11 @@ let TerminalApiService = class TerminalApiService {
|
|
|
10
10
|
constructor() {
|
|
11
11
|
this._onDidOpenTerminal = new ide_core_common_1.Emitter();
|
|
12
12
|
this._onDidCloseTerminal = new ide_core_common_1.Emitter();
|
|
13
|
+
this._onDidTerminalTitleChange = new ide_core_common_1.Emitter();
|
|
13
14
|
this._onDidChangeActiveTerminal = new ide_core_common_1.Emitter();
|
|
14
15
|
this.onDidOpenTerminal = this._onDidOpenTerminal.event;
|
|
15
16
|
this.onDidCloseTerminal = this._onDidCloseTerminal.event;
|
|
17
|
+
this.onDidTerminalTitleChange = this._onDidTerminalTitleChange.event;
|
|
16
18
|
this.onDidChangeActiveTerminal = this._onDidChangeActiveTerminal.event;
|
|
17
19
|
this._entries = new Map();
|
|
18
20
|
this.controller.onDidOpenTerminal((info) => {
|
|
@@ -21,6 +23,9 @@ let TerminalApiService = class TerminalApiService {
|
|
|
21
23
|
this.controller.onDidCloseTerminal((e) => {
|
|
22
24
|
this._onDidCloseTerminal.fire(e);
|
|
23
25
|
});
|
|
26
|
+
this.controller.onDidTerminalTitleChange((e) => {
|
|
27
|
+
this._onDidTerminalTitleChange.fire(e);
|
|
28
|
+
});
|
|
24
29
|
this.controller.onDidChangeActiveTerminal((id) => {
|
|
25
30
|
this._onDidChangeActiveTerminal.fire(id);
|
|
26
31
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.api.js","sourceRoot":"","sources":["../../src/browser/terminal.api.ts"],"names":[],"mappings":";;;;AAAA,2EAA2C;AAG3C,qCAAqD;AACrD,+DAA2D;AAE3D,
|
|
1
|
+
{"version":3,"file":"terminal.api.js","sourceRoot":"","sources":["../../src/browser/terminal.api.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { IFileServiceClient } from '@opensumi/ide-file-service/lib/common';
|
|
|
7
7
|
import { IMessageService } from '@opensumi/ide-overlay';
|
|
8
8
|
import { IVariableResolverService } from '@opensumi/ide-variable/lib/common';
|
|
9
9
|
import { IWorkspaceService } from '@opensumi/ide-workspace/lib/common';
|
|
10
|
-
import { TerminalOptions, ITerminalController, ITerminalClient, ITerminalTheme, ITerminalGroupViewService, ITerminalInternalService, IWidget, ITerminalDataEvent, ITerminalExitEvent, ITerminalConnection, ITerminalExternalLinkProvider, ICreateTerminalOptions, ITerminalProfile, IShellLaunchConfig, ITerminalProfileInternalService } from '../common';
|
|
10
|
+
import { TerminalOptions, ITerminalController, ITerminalClient, ITerminalTheme, ITerminalGroupViewService, ITerminalInternalService, IWidget, ITerminalDataEvent, ITerminalExitEvent, ITerminalTitleChangeEvent, ITerminalConnection, ITerminalExternalLinkProvider, ICreateTerminalOptions, ITerminalProfile, IShellLaunchConfig, ITerminalProfileInternalService } from '../common';
|
|
11
11
|
import { IEnvironmentVariableService } from '../common/environmentVariable';
|
|
12
12
|
import { ITerminalPreference } from '../common/preference';
|
|
13
13
|
import { TerminalKeyBoardInputService } from './terminal.input';
|
|
@@ -59,6 +59,8 @@ export declare class TerminalClient extends Disposable implements ITerminalClien
|
|
|
59
59
|
onOutput: Event<ITerminalDataEvent>;
|
|
60
60
|
private _onExit;
|
|
61
61
|
onExit: Event<ITerminalExitEvent>;
|
|
62
|
+
private _onTitleChange;
|
|
63
|
+
onTitleChange: Event<ITerminalTitleChangeEvent>;
|
|
62
64
|
private readonly _onLinksReady;
|
|
63
65
|
onLinksReady: Event<ITerminalClient>;
|
|
64
66
|
private readonly _onResponseTime;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.client.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"terminal.client.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.client.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,8 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
|
|
|
35
35
|
this.onOutput = this._onOutput.event;
|
|
36
36
|
this._onExit = new ide_core_common_1.Emitter();
|
|
37
37
|
this.onExit = this._onExit.event;
|
|
38
|
+
this._onTitleChange = new ide_core_common_1.Emitter();
|
|
39
|
+
this.onTitleChange = this._onTitleChange.event;
|
|
38
40
|
this._onLinksReady = new ide_core_common_1.Emitter();
|
|
39
41
|
this.onLinksReady = this._onLinksReady.event;
|
|
40
42
|
this._onResponseTime = new ide_core_common_1.Emitter();
|
|
@@ -380,7 +382,11 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
|
|
|
380
382
|
return;
|
|
381
383
|
}
|
|
382
384
|
this._attachAddon.setConnection(connection);
|
|
383
|
-
|
|
385
|
+
const name = this.name || this._launchConfig.name || connection.name;
|
|
386
|
+
if (name !== this.name) {
|
|
387
|
+
this.name = name;
|
|
388
|
+
this._onTitleChange.fire({ id: this.id, name });
|
|
389
|
+
}
|
|
384
390
|
this._ready = true;
|
|
385
391
|
this._attached.resolve();
|
|
386
392
|
this._widget.name = this.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.client.js","sourceRoot":"","sources":["../../src/browser/terminal.client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"terminal.client.js","sourceRoot":"","sources":["../../src/browser/terminal.client.ts"],"names":[],"mappings":";;;;;AAAA,+BAAkC;AAElC,qCAA+E;AAC/E,iEAAqH;AACrH,+DAcmC;AACnC,4DAAyE;AACzE,kEAA2E;AAC3E,uDAAwD;AACxD,8DAA6E;AAC7E,+DAAuE;AAEvE,sCAkBmB;AACnB,uEAA6G;AAC7G,qDAA6E;AAE7E,uDAA2D;AAC3D,qDAAyE;AACzE,uEAAwE;AACxE,qDAAgE;AAChE,mCAAgC;AAGhC,IAAa,cAAc,sBAA3B,MAAa,cAAe,SAAQ,4BAAU;IA2G5C;QACE,KAAK,EAAE,CAAC;QAnGV,UAAU;QAEV,mBAAc,GAAG,KAAK,CAAC;QAGvB,aAAa;QACL,WAAM,GAAG,KAAK,CAAC;QAKf,eAAU,GAAG,KAAK,CAAC;QACnB,mBAAc,GAAG,KAAK,CAAC;QAgEvB,aAAQ,GAAG,IAAI,yBAAO,EAAsB,CAAC;QACrD,YAAO,GAA8B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAEjD,cAAS,GAAG,IAAI,yBAAO,EAAsB,CAAC;QACtD,aAAQ,GAA8B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;QAEnD,YAAO,GAAG,IAAI,yBAAO,EAAsB,CAAC;QACpD,WAAM,GAA8B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QAE/C,mBAAc,GAAG,IAAI,yBAAO,EAA6B,CAAC;QAClE,kBAAa,GAAqC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;QAE3D,kBAAa,GAAG,IAAI,yBAAO,EAAmB,CAAC;QAChE,iBAAY,GAA2B,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;QAE/C,oBAAe,GAAG,IAAI,yBAAO,EAAU,CAAC;QACzD,mBAAc,GAAkB,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;QAiN3D,SAAI,GAAG,EAAE,CAAC;QAxMR,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAK,EAAE;YACpC;gBACE,YAAY,gCACV,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,IAC5B,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,GACjC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAC5B;aACF;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE5B,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;;YACrC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACzC,IAAI,MAAA,KAAK,CAAC,YAAY,0CAAE,UAAU,EAAE;gBAClC,IAAI,CAAC,aAAa,CAAC;oBACjB,IAAI,EAAE,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,UAAU;iBAChD,CAAC,CAAC;aACJ;iBAAM;gBACL,IAAI,CAAC,aAAa,CAAC;oBACjB,IAAI,EAAE,OAAO;iBACd,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CACH,CAAC;QACF,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE;YACzC,IAAI,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,EAAE,EAAE;gBAC3B,IAAI,CAAC,MAAM,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,CAAC;aACzC;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,YAAY;QAClB,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;SACnB;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAe;QAC/B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEhB,IAAI,CAAC,UAAU,CACb,4BAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YACrB,gBAAc,CAAC,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;YACjD,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBAC/B,IAAI,CAAC,KAAK,GAAG,IAAI,0BAAQ,EAAE,CAAC;aAC7B;YACD,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;aAC1B;YACD,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC7B,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC;gBAC3B,CAAC,IAAI,CAAC,EAAE,KAAK;aACiB,CAAC,CAAC;QACpC,CAAC,CAAC,CACH,CAAC;QAEF,0BAA0B;QAC1B,6BAA6B;QAC7B,8BAA8B;QAC9B,SAAS;QACT,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,IAAI,CAAC,YAAY,EAAE,CAAC;SACrB;aAAM;YACL,IAAI,CAAC,UAAU,CACb,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;gBACvB,IAAI,MAAM,EAAE;oBACV,IAAI,CAAC,YAAY,EAAE,CAAC;iBACrB;YACH,CAAC,CAAC,CACH,CAAC;SACH;QAED,IAAI,CAAC,UAAU,CACb,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;YACxB,IAAI,MAAM,EAAE;gBACV,+BAA+B;gBAC/B,0CAA0C;gBAC1C,2BAA2B;aAC5B;iBAAM;gBACL,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,EAAE,CAAC;gBACvB,IAAI,CAAC,OAAO,EAAE,CAAC;aAChB;QACH,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,UAAU,CACb,MAAM,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YACzB,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,oCAAoC;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACtC,MAAM,iBAAiB,GAAuB,IAAA,6CAAoC,EAAC,OAAO,CAAC,CAAC;QAE5F,IAAI,OAAO,CAAC,mBAAmB,EAAE;YAC/B,iBAAiB,CAAC,uBAAuB,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CACpE,IAAI,qDAA2B,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;SAC3E;QACD,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI,CAAC,MAAe,EAAE,UAA2B,EAAE;QACvD,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC;QAChC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACvB,MAAM,EAAE,IAAI,CAAC,oCAAoC,EAAE;SACpD,CAAC,CAAC;IACL,CAAC;IAED,4BAA4B,CAC1B,0BAA6E,EAC7E,GAAkB;QAElB,IAAI,CAAC,0BAA0B,EAAE;YAC/B,OAAO,EAAE,CAAC;SACX;QACD,uBAAuB;QACvB,IAAI,0BAA0B,IAAI,aAAa,IAAI,0BAA0B,EAAE;YAC7E,MAAM,OAAO,GAAG,0BAA0B,CAAC;YAC3C,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;gBACjB,OAAO,0BAA0B,CAAC;aACnC;YACD,OAAO;gBACL,UAAU,EAAE,OAAO,CAAC,IAAI;gBACxB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,sBAAsB;gBACtB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;gBAC5D,GAAG;aACJ,CAAC;SACH;QAED,IAAI,GAAG,EAAE;YACP,0BAA0B,CAAC,GAAG,GAAG,GAAG,CAAC;SACtC;QACD,OAAO,0BAA0B,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAe,EAAE,OAAgC;;QAC3D,IAAI,CAAC,IAAI,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,KAAI,MAAM,CAAC,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAEzB,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACjD,6BAA6B;YAC7B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,qBAAqB,EAAE,CAAC;YACzF,OAAO,GAAG;gBACR,MAAM,EAAE,cAAc;aACvB,CAAC;SACH;QACD,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAE7B,MAAM,GAAG,GAAG,MAAA,MAAA,OAAO,CAAC,GAAG,mCAAI,MAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAA6B,0CAAE,GAAG,mCAAI,IAAI,CAAC,cAAc,CAAC;QAC/F,MAAM,YAAY,GAAG,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC5E,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC;QAEpC,IAAI,YAAY,CAAC,WAAW,EAAE;YAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;SAClD;QACD,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE;YACrB,YAAY,CAAC,GAAG,GAAG,EAAE,CAAC;SACvB;QACD,MAAA,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,0CAAE,yBAAyB,CACjE,YAAY,CAAC,GAAG,EAChB,IAAI,CAAC,kBAAkB,CAAC,SAAS,EACjC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAC1D,CAAC;QAEF,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,CAAC,CAAC,UAAU,EAAE,EAAE;YAC5D,mCAAmC;YACnC,UAAU,CAAC,yBAAyB,CAClC,YAAY,CAAC,GAAI,EACjB,IAAI,CAAC,kBAAkB,CAAC,SAAS,EACjC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAC1D,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QACF,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC5B,CAAC;IAKD,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;IACxB,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,IAAI,aAAa;QACf,OAAO;IACT,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;IAC9B,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAEO,cAAc;QACpB,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAW,EAAE,CAAC;QACtC,IAAI,CAAC,UAAU,CAAC;YACd,IAAI,CAAC,YAAY;YACjB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;gBAChC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7C,CAAC,CAAC;YACF,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;;gBAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,cAAc,IAAI,EAAE,CAAC,CAAC;gBAC9D,IAAI,IAAI,KAAK,CAAC,EAAE;oBACd,IAAI,CAAC,cAAc,CAAC,KAAK,CACvB,YAAY,IAAI,CAAC,IAAI,IAAI,MAAA,MAAA,IAAI,CAAC,YAAY,CAAC,UAAU,0CAAE,WAAW,0CAAE,SAAS,+BAA+B,IAAI,EAAE,CACnH,CAAC;iBACH;gBACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3C,CAAC,CAAC;YAEF,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;gBACjC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACjC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,6BAAW,CAAC,gBAAgB,EAAE;oBACtD,QAAQ,EAAE,KAAK;oBACf,GAAG,EAAE,mBAAmB;iBACzB,CAAC,CAAC;YACL,CAAC,CAAC;SACH,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9C,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE;YACjC,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,IAAI,CAAC,SAAS,EAAE,CAAC;aAClB;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,kCAAmB,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;QACnF,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC;QACnD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACnC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,SAAS;QACP,iBAAiB;QACjB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjF,CAAC;IAED,QAAQ;;QACN,MAAA,IAAI,CAAC,SAAS,0CAAE,MAAM,EAAE,CAAC;QACzB,MAAA,IAAI,CAAC,YAAY,0CAAE,MAAM,EAAE,CAAC;QAC5B,MAAA,IAAI,CAAC,MAAM,0CAAE,MAAM,EAAE,CAAC;QACtB,MAAA,IAAI,CAAC,KAAK,0CAAE,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,IAAI,0BAAQ,EAAQ,CAAC;QACtC,IAAI,CAAC,KAAK,GAAG,IAAI,0BAAQ,EAAQ,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,IAAI,0BAAQ,EAAQ,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,IAAI,0BAAQ,EAAQ,CAAC;QACzC,MAAA,IAAI,CAAC,YAAY,0CAAE,aAAa,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;YACvC,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;YACrC,OAAO,EAAE,CAAC;YACV,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB;QAChB,wCAAwC;QACxC,yDAAyD;QACzD,cAAc,CAAC,GAAG,EAAE;;YAClB,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;gBACrB,MAAA,IAAI,CAAC,KAAK,0CAAE,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;oBAClC,IAAI,CAAC,KAAK,GAAG,IAAI,0BAAQ,EAAQ,CAAC;gBACpC,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,cAAc;;QAC1B,IAAI,IAAI,CAAC,SAAS,CAAC,0BAA0B,EAAE;YAC7C,8BAA8B;YAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;YAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,qBAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;YAChG,OAAO,MAAM,CAAC;SACf;aAAM,IAAI,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;YACnC,OAAO,IAAI,qBAAG,CAAC,MAAA,IAAI,CAAC,SAAS,CAAC,SAAS,0CAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;SAC9D;aAAM;YACL,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,eAAe;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,gBAAc,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;YAC7D,IAAI,CAAC,cAAc,GAAG,gBAAc,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAE,CAAC;SAClF;aAAM;YACL,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC3C,IAAI,MAAM,EAAE;gBACV,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;gBAC7B,gBAAc,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;aAChF;SACF;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,MAAM;QAClB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;SAC1B;IACH,CAAC;IAEO,KAAK,CAAC,UAAU;;QACtB,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC;QAC1B,MAAM,EAAE,IAAI,GAAG,4BAAW,EAAE,IAAI,GAAG,4BAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;QAElE,IAAI,UAA2C,CAAC;QAEhD,MAAM,iBAAiB,mCAClB,IAAI,CAAC,aAAa,KACrB,GAAG,EAAE,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,GAAG,KAAI,IAAI,CAAC,cAAc,GACpD,CAAC;QAEF,IAAI,CAAC,aAAa,GAAG,iBAAiB,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAmC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAEzE,IAAI;YACF,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAC1D,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,KAAK,CACX,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,SAAS,iCAAiC,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;SAChH;QAED,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IAED,iBAAiB,CAAC,UAA2C;QAC3D,IAAI,CAAC,UAAU,EAAE;YACf,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO;SACR;QAED,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,CAAC;QACrE,IAAI,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE;YACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;YACjB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;SACjD;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QACzB,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAE9B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,4CAAyB,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAEzE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;YAClC,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,UAAU,CAAC,IAAY,EAAE,KAAgC;QAC/D;;;WAGG;QACH,IAAI;YACF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACtC,IAAI,CAAC,OAAO,EAAE,CAAC;SAChB;QAAC,WAAM;YACN,cAAc;SACf;IACH,CAAC;IAEO,WAAW;QACjB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;IACH,CAAC;IAEO,OAAO;QACb,2BAA2B;QAC3B,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE;YAC1B,IAAI;gBACF,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;aAClB;YAAC,WAAM;gBACN,OAAO;aACR;SACF;IACH,CAAC;IAEO,eAAe;;QACrB,wCAAwC;QACxC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE;YAC1B,OAAO;SACR;QACD,+BAA+B;QAC/B,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,0CAAE,YAAY,CAAA,EAAE;YACvC,OAAO;SACR;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACvD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAClB,0BAA0B;QAC1B,2CAA2C;QAC3C,UAAU,CAAC,GAAG,EAAE;;YACd,IAAI,CAAA,MAAA,IAAI,CAAC,UAAU,CAAC,YAAY,0CAAE,EAAE,MAAK,IAAI,CAAC,EAAE,EAAE;gBAChD,IAAI,CAAC,KAAK,EAAE,CAAC;aACd;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAGO,eAAe;QACrB,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,IAAY;QAChB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,QAAQ,CAAC,IAAY;QACnB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,WAAW;QACT,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC;IAED,YAAY;QACV,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,EAAE;YACjC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;SACtC;aAAM;YACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YAC1D,OAAO,EAAE,CAAC;SACX;IACH,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAC1D,CAAC;IAED,aAAa,CAAC,OAAwB;QACpC,IAAI,CAAC,gBAAgB,mCAAQ,IAAI,CAAC,gBAAgB,GAAK,OAAO,CAAE,CAAC;QACjE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,oCAAoC,EAAE,CAAC;QAEjE,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACpC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC;SAC/C;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAe;QAC5B,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,oBAAoB,CAAC,QAAuC;QAC1D,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;SACxF;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,4BAA4B,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,CAAC,KAAK,GAAG,IAAI;QAClB,KAAK,CAAC,OAAO,EAAE,CAAC;QAEhB,IAAI,KAAK,EAAE;YACT,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC3C;IACH,CAAC;CACF,CAAA;AApqBQ,oCAAqB,GAAwB,IAAI,GAAG,EAAG,CAAA;AAyB9D;IADC,IAAA,cAAS,EAAC,mBAAc,CAAC;sCACG,aAAQ;gDAAC;AAGtC;IADC,IAAA,cAAS,EAAC,iCAAwB,CAAC;;uDACyB;AAG7D;IADC,IAAA,cAAS,EAAC,0BAAiB,CAAC;;iDACmB;AAGhD;IADC,IAAA,cAAS,EAAC,+BAAsB,CAAC;sCACA,+BAAsB;qDAAC;AAGzD;IADC,IAAA,cAAS,EAAC,2BAAkB,CAAC;;mDACqB;AAGnD;IADC,IAAA,cAAS,EAAC,6BAAe,CAAC;;sDACwB;AAGnD;IADC,IAAA,cAAS,EAAC,uBAAc,CAAC;;6CACe;AAGzC;IADC,IAAA,cAAS,EAAC,kCAAe,CAAC;;uDACyB;AAGpD;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;kDACoB;AAGnD;IADC,IAAA,cAAS,EAAC,kCAAyB,CAAC;;4CACc;AAGnD;IADC,IAAA,cAAS,EAAC,gCAAmB,CAAC;;kDACoB;AAGnD;IADC,IAAA,cAAS,EAAC,6CAA4B,CAAC;sCACX,6CAA4B;gDAAC;AAG1D;IADC,IAAA,cAAS,EAAC,mCAAgB,CAAC;;iDACmB;AAG/C;IADC,IAAA,cAAS,EAAC,yBAAO,CAAC;;8CACgB;AAGnC;IADC,IAAA,cAAS,EAAC,2BAAS,CAAC;;gDACD;AAGpB;IADC,IAAA,cAAS,EAAC,qDAA+B,CAAC;;0DACwB;AAGnE;IADC,IAAA,cAAS,EAAC,qCAAmB,CAAC;;0DAC4B;AAG3D;IADC,IAAA,cAAS,EAAC,wCAA+B,CAAC;;sEACqB;AAGhE;IADC,IAAA,cAAS,EAAC,iCAAwB,CAAC;;wDACO;AAG3C;IADC,IAAA,cAAS,EAAC,4BAAS,CAAC;;gDACgB;AAmOrC;IADC,iBAAU;;4CACD;AAqSV;IADC,IAAA,0BAAQ,EAAC,GAAG,CAAC;;;;qDAGb;AA7lBU,cAAc;IAD1B,IAAA,eAAU,GAAE;;GACA,cAAc,CAqqB1B;AArqBY,wCAAc;AAwqB3B,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAChC;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,QAAkB,EAAE,MAAe,EAAE,OAAyB;QACtF,oCAAoC;QACpC,6DAA6D;QAC7D,kCAAkC;QAElC,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC;YACjC;gBACE,KAAK,EAAE,cAAc;gBACrB,QAAQ,EAAE,cAAc;aACzB;SACF,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzC,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACnC,OAAO,MAAM,CAAC;IAChB,CAAC;IACD;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,QAAkB,EAAE,MAAe,EAAE,OAAgC;QAC9F,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC;YACjC;gBACE,KAAK,EAAE,cAAc;gBACrB,QAAQ,EAAE,cAAc;aACzB;SACF,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzC,MAAM,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACpC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AAnCY,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CAmCjC;AAnCY,sDAAqB;AAqC3B,MAAM,2BAA2B,GAAG,CAAC,QAAkB,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,OAAyB,EAAE,EAAE,CAChH,qBAAqB,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AADnD,QAAA,2BAA2B,+BACwB;AAEzD,MAAM,4BAA4B,GACvC,CAAC,QAAkB,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,OAAgC,EAAE,EAAE,CAC5E,qBAAqB,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAFtD,QAAA,4BAA4B,gCAE0B"}
|
|
@@ -6,7 +6,7 @@ import { WorkbenchEditorService } from '@opensumi/ide-editor';
|
|
|
6
6
|
import { IMainLayoutService } from '@opensumi/ide-main-layout';
|
|
7
7
|
import { TabBarHandler } from '@opensumi/ide-main-layout/lib/browser/tabbar-handler';
|
|
8
8
|
import { IThemeService } from '@opensumi/ide-theme';
|
|
9
|
-
import { ITerminalController, ITerminalClient, ITerminalClientFactory, IWidget, ITerminalInfo, ITerminalBrowserHistory, ITerminalTheme, ITerminalErrorService, ITerminalInternalService, ITerminalLaunchError, ITerminalProcessExtHostProxy, IStartExtensionTerminalRequest, ITerminalExitEvent, ITerminalExternalLinkProvider, ICreateTerminalOptions, ITerminalClientFactory2, ICreateClientWithWidgetOptions, ITerminalProfileService, TerminalOptions } from '../common';
|
|
9
|
+
import { ITerminalController, ITerminalClient, ITerminalClientFactory, IWidget, ITerminalInfo, ITerminalBrowserHistory, ITerminalTheme, ITerminalErrorService, ITerminalInternalService, ITerminalLaunchError, ITerminalProcessExtHostProxy, IStartExtensionTerminalRequest, ITerminalExitEvent, ITerminalTitleChangeEvent, ITerminalExternalLinkProvider, ICreateTerminalOptions, ITerminalClientFactory2, ICreateClientWithWidgetOptions, ITerminalProfileService, TerminalOptions } from '../common';
|
|
10
10
|
import { TerminalGroupViewService } from './terminal.view';
|
|
11
11
|
export declare class TerminalController extends WithEventBus implements ITerminalController {
|
|
12
12
|
protected _focus: boolean;
|
|
@@ -14,6 +14,7 @@ export declare class TerminalController extends WithEventBus implements ITermina
|
|
|
14
14
|
protected _clients: Map<string, ITerminalClient>;
|
|
15
15
|
protected _onDidOpenTerminal: Emitter<ITerminalInfo>;
|
|
16
16
|
protected _onDidCloseTerminal: Emitter<ITerminalExitEvent>;
|
|
17
|
+
protected _onDidTerminalTitleChange: Emitter<ITerminalTitleChangeEvent>;
|
|
17
18
|
protected _onDidChangeActiveTerminal: Emitter<string>;
|
|
18
19
|
protected _ready: Deferred<void>;
|
|
19
20
|
protected _activeClientId?: string;
|
|
@@ -21,6 +22,7 @@ export declare class TerminalController extends WithEventBus implements ITermina
|
|
|
21
22
|
private _linkProviderDisposables;
|
|
22
23
|
readonly onDidOpenTerminal: Event<ITerminalInfo>;
|
|
23
24
|
readonly onDidCloseTerminal: Event<ITerminalExitEvent>;
|
|
25
|
+
readonly onDidTerminalTitleChange: Event<ITerminalTitleChangeEvent>;
|
|
24
26
|
readonly onDidChangeActiveTerminal: Event<string>;
|
|
25
27
|
private readonly _onInstanceRequestStartExtensionTerminal;
|
|
26
28
|
readonly onInstanceRequestStartExtensionTerminal: Event<IStartExtensionTerminalRequest>;
|
|
@@ -43,6 +45,11 @@ export declare class TerminalController extends WithEventBus implements ITermina
|
|
|
43
45
|
private readonly menuService;
|
|
44
46
|
private ctxMenuRenderer;
|
|
45
47
|
protected readonly wsChannelHandler: WSChannelHandler;
|
|
48
|
+
viewReady: Deferred<void>;
|
|
49
|
+
/**
|
|
50
|
+
* 如果这个值在被用到的时候还是 undefined，那说明视图渲染出了问题。
|
|
51
|
+
* 请排查 terminal.view 视图层为什么没有把这个 contextKey 注入进来。
|
|
52
|
+
*/
|
|
46
53
|
private terminalContextKey;
|
|
47
54
|
themeBackground: string;
|
|
48
55
|
get clients(): Map<string, ITerminalClient>;
|
|
@@ -59,7 +66,7 @@ export declare class TerminalController extends WithEventBus implements ITermina
|
|
|
59
66
|
private _reset;
|
|
60
67
|
recovery(history: ITerminalBrowserHistory): Promise<void>;
|
|
61
68
|
initContextKey(dom: HTMLDivElement): void;
|
|
62
|
-
firstInitialize(): void
|
|
69
|
+
firstInitialize(): Promise<void>;
|
|
63
70
|
reconnect(): Promise<void>;
|
|
64
71
|
focus(): void;
|
|
65
72
|
blur(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.controller.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.controller.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"terminal.controller.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TerminalController = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const get_1 = tslib_1.__importDefault(require("lodash/get"));
|
|
5
6
|
const mobx_1 = require("mobx");
|
|
6
7
|
const di_1 = require("@opensumi/di");
|
|
7
8
|
const ws_channel_handler_1 = require("@opensumi/ide-connection/lib/browser/ws-channel-handler");
|
|
@@ -21,15 +22,18 @@ let TerminalController = class TerminalController extends ide_core_common_1.With
|
|
|
21
22
|
super();
|
|
22
23
|
this._onDidOpenTerminal = new ide_core_common_1.Emitter();
|
|
23
24
|
this._onDidCloseTerminal = new ide_core_common_1.Emitter();
|
|
25
|
+
this._onDidTerminalTitleChange = new ide_core_common_1.Emitter();
|
|
24
26
|
this._onDidChangeActiveTerminal = new ide_core_common_1.Emitter();
|
|
25
27
|
this._ready = new ide_core_common_1.Deferred();
|
|
26
28
|
this._linkProviders = new Set();
|
|
27
29
|
this._linkProviderDisposables = new Map();
|
|
28
30
|
this.onDidOpenTerminal = this._onDidOpenTerminal.event;
|
|
29
31
|
this.onDidCloseTerminal = this._onDidCloseTerminal.event;
|
|
32
|
+
this.onDidTerminalTitleChange = this._onDidTerminalTitleChange.event;
|
|
30
33
|
this.onDidChangeActiveTerminal = this._onDidChangeActiveTerminal.event;
|
|
31
34
|
this._onInstanceRequestStartExtensionTerminal = new ide_core_common_1.Emitter();
|
|
32
35
|
this.onInstanceRequestStartExtensionTerminal = this._onInstanceRequestStartExtensionTerminal.event;
|
|
36
|
+
this.viewReady = new ide_core_common_1.Deferred();
|
|
33
37
|
this._focus = false;
|
|
34
38
|
this._clients = new Map();
|
|
35
39
|
}
|
|
@@ -74,8 +78,13 @@ let TerminalController = class TerminalController extends ide_core_common_1.With
|
|
|
74
78
|
this._clients.set(client.id, client);
|
|
75
79
|
this.logger.log(`setup client ${client.id}`);
|
|
76
80
|
client.addDispose(client.onExit((e) => {
|
|
81
|
+
this.terminalView.removeWidget(client.id);
|
|
82
|
+
this.clients.delete(client.id);
|
|
77
83
|
this._onDidCloseTerminal.fire({ id: client.id, code: e.code });
|
|
78
84
|
}));
|
|
85
|
+
client.addDispose(client.onTitleChange((e) => {
|
|
86
|
+
this._onDidTerminalTitleChange.fire({ id: client.id, name: e.name });
|
|
87
|
+
}));
|
|
79
88
|
client.addDispose({
|
|
80
89
|
dispose: () => {
|
|
81
90
|
this._clients.delete(client.id);
|
|
@@ -108,12 +117,22 @@ let TerminalController = class TerminalController extends ide_core_common_1.With
|
|
|
108
117
|
return widget;
|
|
109
118
|
}
|
|
110
119
|
async recovery(history) {
|
|
120
|
+
var _a, _b;
|
|
121
|
+
// Electron的环境下，不启用终端恢复能力
|
|
122
|
+
// 而且在Electron的环境下，clientId的获取方式也不一样，但因为不启用恢复能力，所以后面的代码也无需做额外处理
|
|
123
|
+
if (this.config.isElectronRenderer && !this.config.isRemote) {
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
126
|
+
// 先对recovery数据做一个简单校验，因为之前groups数据可能是字符串或object，而现在抛弃了字符串的方式
|
|
127
|
+
// 所以为了避免旧逻辑写入localStorage的数据混乱，这里做一个简单的校验
|
|
128
|
+
if (!history.current || !(0, get_1.default)(history, 'groups[0][0].client')) {
|
|
129
|
+
return;
|
|
130
|
+
}
|
|
111
131
|
// HACK: 因为现在的终端重连是有问题的，是ClientID机制导致的，因此在拿出记录恢复终端的时候，需要把里面的ClientID替换为当前活跃窗口的ClientID
|
|
112
132
|
// 同时在独立PtyService中，把终端重连的标识转变为真正的realSessionId 也就是 ${clientId}|${realSessionId}
|
|
113
|
-
var _a, _b;
|
|
114
133
|
const currentClientId = this.wsChannelHandler.clientId;
|
|
115
|
-
const currentRealSessionId = (_b = (_a = history.current) === null || _a === void 0 ? void 0 : _a.split(
|
|
116
|
-
if (history.current) {
|
|
134
|
+
const currentRealSessionId = (_b = (_a = history.current) === null || _a === void 0 ? void 0 : _a.split(common_1.TERMINAL_ID_SEPARATOR)) === null || _b === void 0 ? void 0 : _b[1];
|
|
135
|
+
if (history.current && history.current.includes(common_1.TERMINAL_ID_SEPARATOR)) {
|
|
117
136
|
history.current = `${currentClientId}|${currentRealSessionId}`;
|
|
118
137
|
}
|
|
119
138
|
history.groups = history.groups.map((group) => {
|
|
@@ -122,7 +141,9 @@ let TerminalController = class TerminalController extends ide_core_common_1.With
|
|
|
122
141
|
return group.map((_a) => {
|
|
123
142
|
var _b;
|
|
124
143
|
var { client } = _a, other = tslib_1.__rest(_a, ["client"]);
|
|
125
|
-
return (Object.assign({ client:
|
|
144
|
+
return (Object.assign({ client: client.includes(common_1.TERMINAL_ID_SEPARATOR)
|
|
145
|
+
? `${currentClientId}${common_1.TERMINAL_ID_SEPARATOR}${(_b = client === null || client === void 0 ? void 0 : client.split(common_1.TERMINAL_ID_SEPARATOR)) === null || _b === void 0 ? void 0 : _b[1]}`
|
|
146
|
+
: client }, other));
|
|
126
147
|
});
|
|
127
148
|
}
|
|
128
149
|
else {
|
|
@@ -189,7 +210,19 @@ let TerminalController = class TerminalController extends ide_core_common_1.With
|
|
|
189
210
|
this.terminalContextKey.isTerminalViewInitialized.set(true);
|
|
190
211
|
}
|
|
191
212
|
}
|
|
192
|
-
firstInitialize() {
|
|
213
|
+
async firstInitialize() {
|
|
214
|
+
await Promise.race([
|
|
215
|
+
(async () => {
|
|
216
|
+
await this.layoutService.viewReady.promise;
|
|
217
|
+
await this.viewReady.promise;
|
|
218
|
+
})(),
|
|
219
|
+
new Promise((resolve) => {
|
|
220
|
+
setTimeout(() => {
|
|
221
|
+
this.logger.warn("TerminalView didn't initialize in 2s, skip waiting, but may cause some problem");
|
|
222
|
+
resolve();
|
|
223
|
+
}, 2000);
|
|
224
|
+
}),
|
|
225
|
+
]);
|
|
193
226
|
this._tabBarHandler = this.layoutService.getTabbarHandler(common_1.TerminalContainerId);
|
|
194
227
|
this.themeBackground = this.terminalTheme.terminalTheme.background || '';
|
|
195
228
|
this.addDispose(this.terminalView.onWidgetCreated((widget) => {
|
|
@@ -336,7 +369,7 @@ let TerminalController = class TerminalController extends ide_core_common_1.With
|
|
|
336
369
|
* @returns
|
|
337
370
|
*/
|
|
338
371
|
async createClientWithWidget2(options) {
|
|
339
|
-
const widgetId = this.wsChannelHandler.clientId +
|
|
372
|
+
const widgetId = this.wsChannelHandler.clientId + common_1.TERMINAL_ID_SEPARATOR + options.id || this.service.generateSessionId();
|
|
340
373
|
const { group } = this._createOneGroup((0, common_1.convertTerminalOptionsToLaunchConfig)(options.terminalOptions));
|
|
341
374
|
const widget = this.terminalView.createWidget(group, widgetId, options.isTaskExecutor || !options.closeWhenExited, true);
|
|
342
375
|
if (options.beforeCreate && typeof options.beforeCreate === 'function') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.controller.js","sourceRoot":"","sources":["../../src/browser/terminal.controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"terminal.controller.js","sourceRoot":"","sources":["../../src/browser/terminal.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.service.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,QAAQ,EAAkB,MAAM,cAAc,CAAC;AAE/E,OAAO,EAA6C,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACxG,OAAO,EAAW,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAEL,gBAAgB,EAChB,cAAc,EACd,sBAAsB,EAEtB,mBAAmB,EACnB,aAAa,EAGb,gBAAgB,EAChB,kBAAkB,EAElB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"terminal.service.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,QAAQ,EAAkB,MAAM,cAAc,CAAC;AAE/E,OAAO,EAA6C,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACxG,OAAO,EAAW,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAEL,gBAAgB,EAChB,cAAc,EACd,sBAAsB,EAEtB,mBAAmB,EACnB,aAAa,EAGb,gBAAgB,EAChB,kBAAkB,EAElB,sBAAsB,EAEvB,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;CACd;AACD,qBACa,sBAAuB,YAAW,gBAAgB;IAC7D,MAAM,CAAC,OAAO,SAAK;IAEnB,OAAO,CAAC,SAAS,CAA8B;IAG/C,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAGtC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IAG5D,OAAO,CAAC,iBAAiB,CAAoB;IAG7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IAEtC,OAAO,CAAC,QAAQ,CAAiC;IAC1C,OAAO,EAAE,KAAK,CAAC,cAAc,CAAC,CAAuB;IAE5D,OAAO,CAAC,OAAO,CAAgC;IACxC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,CAAsB;IAEzD,OAAO,CAAC,gBAAgB,CAAyC;IAC1D,eAAe,gCAA+B;IAErD,OAAO,CAAC,iBAAiB,CAAqD;IAC9E,OAAO,CAAC,iBAAiB,CAQrB;IAEJ,iBAAiB;IAWX,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE;IAKzB,OAAO,CAAC,sBAAsB,CAY3B;IAEG,oBAAoB,CACxB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,kBAAkB,EAChC,MAAM,EAAE,KAAK;IAoBf,OAAO,CAAC,YAAY;IAYd,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAM3C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAOpD,kBAAkB,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC;IAIhE,WAAW,CAAC,SAAS,EAAE,MAAM;IAIvB,YAAY,CAAC,SAAS,EAAE,MAAM;IAIpC;;;;;OAKG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAI5C;;;;OAIG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAC7D,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAiB/F,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAI/C,KAAK;IAOL,WAAW,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAa7D,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI9C,OAAO;CAIR"}
|
|
@@ -36,11 +36,11 @@ let NodePtyTerminalService = NodePtyTerminalService_1 = class NodePtyTerminalSer
|
|
|
36
36
|
// Electron 环境下，未指定 isRemote 时默认使用本地连接
|
|
37
37
|
// 否则使用 WebSocket 连接
|
|
38
38
|
if (this.appConfig.isElectronRenderer && !this.appConfig.isRemote) {
|
|
39
|
-
return ide_core_browser_1.electronEnv.metadata.windowClientId +
|
|
39
|
+
return ide_core_browser_1.electronEnv.metadata.windowClientId + common_1.TERMINAL_ID_SEPARATOR + (0, common_1.generateSessionId)();
|
|
40
40
|
}
|
|
41
41
|
else {
|
|
42
42
|
const WSChannelHandler = this.injector.get(ws_channel_handler_1.WSChannelHandler);
|
|
43
|
-
return WSChannelHandler.clientId +
|
|
43
|
+
return WSChannelHandler.clientId + common_1.TERMINAL_ID_SEPARATOR + (0, common_1.generateSessionId)();
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
async check(ids) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.service.js","sourceRoot":"","sources":["../../src/browser/terminal.service.ts"],"names":[],"mappings":";;;;;AAAA,yCAAkD;AAElD,qCAA+E;AAC/E,gGAAgH;AAChH,iEAAwG;AACxG,+DAAoE;AAEpE,
|
|
1
|
+
{"version":3,"file":"terminal.service.js","sourceRoot":"","sources":["../../src/browser/terminal.service.ts"],"names":[],"mappings":"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"}
|
package/lib/common/api.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Event } from '@opensumi/ide-core-common';
|
|
2
|
-
import { ITerminalExitEvent } from './client';
|
|
2
|
+
import { ITerminalExitEvent, ITerminalTitleChangeEvent } from './client';
|
|
3
3
|
import { ITerminalExternalClient } from './controller';
|
|
4
4
|
import { TerminalOptions, ITerminalInfo } from './pty';
|
|
5
5
|
export declare const ITerminalApiService: unique symbol;
|
|
@@ -9,6 +9,7 @@ export interface ITerminalApiService {
|
|
|
9
9
|
getProcessId(sessionId: string): Promise<number | undefined>;
|
|
10
10
|
onDidOpenTerminal: Event<ITerminalInfo>;
|
|
11
11
|
onDidCloseTerminal: Event<ITerminalExitEvent>;
|
|
12
|
+
onDidTerminalTitleChange: Event<ITerminalTitleChangeEvent>;
|
|
12
13
|
onDidChangeActiveTerminal: Event<string>;
|
|
13
14
|
terminals: ITerminalInfo[];
|
|
14
15
|
showTerm(id: string, preserveFocus?: boolean): void;
|
package/lib/common/api.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/common/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/common/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEvD,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AACjE,MAAM,WAAW,mBAAmB;IAClC,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACxF,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/D,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAE7D,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;IACxC,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAC9C,wBAAwB,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC3D,yBAAyB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAEzC,SAAS,EAAE,aAAa,EAAE,CAAC;IAE3B,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACpD,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAE7B,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,IAAI,CAAC;IAE1F,oBAAoB,IAAI,IAAI,CAAC;CAC9B"}
|
package/lib/common/client.d.ts
CHANGED
|
@@ -10,6 +10,10 @@ export interface ITerminalExitEvent {
|
|
|
10
10
|
id: string;
|
|
11
11
|
code?: number;
|
|
12
12
|
}
|
|
13
|
+
export interface ITerminalTitleChangeEvent {
|
|
14
|
+
id: string;
|
|
15
|
+
name: string;
|
|
16
|
+
}
|
|
13
17
|
export interface ITerminalClient extends Disposable {
|
|
14
18
|
/**
|
|
15
19
|
* 标识终端客户端的唯一 id
|
|
@@ -129,6 +133,10 @@ export interface ITerminalClient extends Disposable {
|
|
|
129
133
|
* 退出事件
|
|
130
134
|
*/
|
|
131
135
|
onExit: Event<ITerminalExitEvent>;
|
|
136
|
+
/**
|
|
137
|
+
* 标题变更事件
|
|
138
|
+
*/
|
|
139
|
+
onTitleChange: Event<ITerminalTitleChangeEvent>;
|
|
132
140
|
/**
|
|
133
141
|
* linkManager 初始化成功事件
|
|
134
142
|
*/
|
|
@@ -172,4 +180,5 @@ export interface ITerminalLink {
|
|
|
172
180
|
*/
|
|
173
181
|
activate(text: string): void;
|
|
174
182
|
}
|
|
183
|
+
export declare const TERMINAL_ID_SEPARATOR = "|";
|
|
175
184
|
//# sourceMappingURL=client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/common/client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/common/client.ts"],"names":[],"mappings":"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"}
|
package/lib/common/client.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ITerminalClientFactory2 = exports.ITerminalClientFactory = void 0;
|
|
3
|
+
exports.TERMINAL_ID_SEPARATOR = exports.ITerminalClientFactory2 = exports.ITerminalClientFactory = void 0;
|
|
4
4
|
exports.ITerminalClientFactory = Symbol('ITerminalClientFactory');
|
|
5
5
|
exports.ITerminalClientFactory2 = Symbol('ITerminalClientFactory2');
|
|
6
|
+
exports.TERMINAL_ID_SEPARATOR = '|';
|
|
6
7
|
//# sourceMappingURL=client.js.map
|
package/lib/common/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/common/client.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/common/client.ts"],"names":[],"mappings":";;;AAwLa,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAO1D,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAuC5D,QAAA,qBAAqB,GAAG,GAAG,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { IContextKeyService } from '@opensumi/ide-core-browser';
|
|
3
3
|
import { Event, Disposable, Deferred, IDisposable } from '@opensumi/ide-core-common';
|
|
4
4
|
import type { ILinkHoverTargetOptions } from '../browser/links/link-manager';
|
|
5
|
-
import { ITerminalClient, ITerminalExitEvent, ITerminalExternalLinkProvider } from './client';
|
|
5
|
+
import { ITerminalClient, ITerminalExitEvent, ITerminalTitleChangeEvent, ITerminalExternalLinkProvider } from './client';
|
|
6
6
|
import { ITerminalLaunchError, ITerminalProcessExtHostProxy, IStartExtensionTerminalRequest } from './extension';
|
|
7
7
|
import { ITerminalInfo, ICreateTerminalOptions, TerminalOptions } from './pty';
|
|
8
8
|
import { IWidgetGroup, IWidget } from './resize';
|
|
@@ -50,6 +50,7 @@ export interface ITerminalController extends Disposable {
|
|
|
50
50
|
activeClient?: ITerminalClient;
|
|
51
51
|
themeBackground: string;
|
|
52
52
|
contextKeyService?: IContextKeyService;
|
|
53
|
+
viewReady: Deferred<void>;
|
|
53
54
|
initContextKey(dom: HTMLDivElement): void;
|
|
54
55
|
firstInitialize(): void;
|
|
55
56
|
recovery(history: ITerminalBrowserHistory): Promise<void>;
|
|
@@ -71,6 +72,7 @@ export interface ITerminalController extends Disposable {
|
|
|
71
72
|
toJSON(): ITerminalBrowserHistory;
|
|
72
73
|
onDidOpenTerminal: Event<ITerminalInfo>;
|
|
73
74
|
onDidCloseTerminal: Event<ITerminalExitEvent>;
|
|
75
|
+
onDidTerminalTitleChange: Event<ITerminalTitleChangeEvent>;
|
|
74
76
|
onDidChangeActiveTerminal: Event<string>;
|
|
75
77
|
requestStartExtensionTerminal(proxy: ITerminalProcessExtHostProxy, cols: number, rows: number): Promise<ITerminalLaunchError | undefined>;
|
|
76
78
|
readonly onInstanceRequestStartExtensionTerminal: Event<IStartExtensionTerminalRequest>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/common/controller.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGrF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAE7E,OAAO,
|
|
1
|
+
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/common/controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../src/common/controller.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../src/common/controller.ts"],"names":[],"mappings":";;;AA2Da,QAAA,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AA4CpD,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAW1D,QAAA,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAiChE,QAAA,4BAA4B,GAAG,MAAM,CAAC,8BAA8B,CAAC,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { SocketConnectOpts } from 'net';
|
|
|
3
3
|
import { PtyServiceManager } from './pty.manager';
|
|
4
4
|
export declare class PtyServiceManagerRemote extends PtyServiceManager {
|
|
5
5
|
constructor(connectOpts?: SocketConnectOpts);
|
|
6
|
+
private initRPCService;
|
|
6
7
|
private initRemoteConnectionMode;
|
|
7
8
|
protected initLocal(): void;
|
|
8
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty.manager.remote.d.ts","sourceRoot":"","sources":["../../src/node/pty.manager.remote.ts"],"names":[],"mappings":";AAAA,OAAY,EAAE,iBAAiB,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"pty.manager.remote.d.ts","sourceRoot":"","sources":["../../src/node/pty.manager.remote.ts"],"names":[],"mappings":";AAAA,OAAY,EAAE,iBAAiB,EAAE,MAAM,KAAK,CAAC;AAc7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAKlD,qBACa,uBAAwB,SAAQ,iBAAiB;gBAEpC,WAAW,GAAE,iBAA2D;IAKhG,OAAO,CAAC,cAAc;IAiCtB,OAAO,CAAC,wBAAwB;IAgChC,SAAS,CAAC,SAAS;CAGpB"}
|
|
@@ -6,6 +6,7 @@ const net_1 = tslib_1.__importDefault(require("net"));
|
|
|
6
6
|
const di_1 = require("@opensumi/di");
|
|
7
7
|
const ide_connection_1 = require("@opensumi/ide-connection");
|
|
8
8
|
const node_1 = require("@opensumi/ide-connection/lib/node");
|
|
9
|
+
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
9
10
|
const common_1 = require("../common");
|
|
10
11
|
const pty_manager_1 = require("./pty.manager");
|
|
11
12
|
// 双容器架构 - 在IDE容器中远程运行，与DEV Server上的PtyService通信
|
|
@@ -17,15 +18,20 @@ let PtyServiceManagerRemote = class PtyServiceManagerRemote extends pty_manager_
|
|
|
17
18
|
super();
|
|
18
19
|
this.initRemoteConnectionMode(connectOpts);
|
|
19
20
|
}
|
|
20
|
-
|
|
21
|
+
initRPCService(socket) {
|
|
21
22
|
const clientCenter = new ide_connection_1.RPCServiceCenter();
|
|
22
23
|
const { getRPCService: clientGetRPCService, createRPCService } = (0, ide_connection_1.initRPCService)(clientCenter);
|
|
23
|
-
// TODO: 思考any是否应该在这里用 亦或者做空判断
|
|
24
24
|
const getService = clientGetRPCService(common_1.PTY_SERVICE_PROXY_PROTOCOL);
|
|
25
25
|
this.ptyServiceProxy = getService;
|
|
26
|
+
let callbackDisposed = false;
|
|
26
27
|
// 处理回调
|
|
27
28
|
createRPCService(common_1.PTY_SERVICE_PROXY_CALLBACK_PROTOCOL, {
|
|
28
29
|
$callback: async (callId, ...args) => {
|
|
30
|
+
if (callbackDisposed) {
|
|
31
|
+
// 在这里做一下Dispose的处理，在Dispose之后回调不再被执行
|
|
32
|
+
// TODO: 但是按照我的理解，在removeConnection之后这里就完全不应该被执行，但却被执行了，是为什么呢？
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
29
35
|
const callback = this.callbackMap.get(callId);
|
|
30
36
|
if (!callback) {
|
|
31
37
|
// 这里callbackMap的callId对应的回调方法被注销，但是依然被调用了，这种情况不应该发生
|
|
@@ -36,11 +42,42 @@ let PtyServiceManagerRemote = class PtyServiceManagerRemote extends pty_manager_
|
|
|
36
42
|
}
|
|
37
43
|
},
|
|
38
44
|
});
|
|
45
|
+
const messageConnection = (0, node_1.createSocketConnection)(socket);
|
|
46
|
+
clientCenter.setConnection(messageConnection);
|
|
47
|
+
return ide_core_common_1.Disposable.create(() => {
|
|
48
|
+
callbackDisposed = true;
|
|
49
|
+
clientCenter.removeConnection(messageConnection);
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
initRemoteConnectionMode(connectOpts) {
|
|
39
53
|
const socket = new net_1.default.Socket();
|
|
40
|
-
|
|
41
|
-
//
|
|
42
|
-
|
|
43
|
-
|
|
54
|
+
let rpcServiceDisposable;
|
|
55
|
+
// UNIX Socket 连接监听，成功连接后再创建RPC服务
|
|
56
|
+
socket.on('connect', () => {
|
|
57
|
+
this.logger.log('PtyServiceManagerRemote connected');
|
|
58
|
+
rpcServiceDisposable === null || rpcServiceDisposable === void 0 ? void 0 : rpcServiceDisposable.dispose();
|
|
59
|
+
rpcServiceDisposable = this.initRPCService(socket);
|
|
60
|
+
});
|
|
61
|
+
// UNIX Socket 连接失败或者断开，此时需要等待 1.5s 后重新连接
|
|
62
|
+
socket.on('close', () => {
|
|
63
|
+
this.logger.log('PtyServiceManagerRemote connect failed, will reconnect after 2s');
|
|
64
|
+
rpcServiceDisposable === null || rpcServiceDisposable === void 0 ? void 0 : rpcServiceDisposable.dispose();
|
|
65
|
+
global.setTimeout(() => {
|
|
66
|
+
try {
|
|
67
|
+
socket.connect(connectOpts);
|
|
68
|
+
}
|
|
69
|
+
catch (e) {
|
|
70
|
+
this.logger.warn(e);
|
|
71
|
+
}
|
|
72
|
+
}, 2000);
|
|
73
|
+
});
|
|
74
|
+
try {
|
|
75
|
+
socket.connect(connectOpts);
|
|
76
|
+
}
|
|
77
|
+
catch (e) {
|
|
78
|
+
// 连接错误的时候会抛出异常，此时自动重连，同时需要 catch 错误
|
|
79
|
+
this.logger.warn(e);
|
|
80
|
+
}
|
|
44
81
|
}
|
|
45
82
|
initLocal() {
|
|
46
83
|
// override 空置父类的方法，因为不需要LocalInit，使用RemoteInit替代
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty.manager.remote.js","sourceRoot":"","sources":["../../src/node/pty.manager.remote.ts"],"names":[],"mappings":";;;;AAAA,sDAA6C;AAE7C,qCAAoD;AACpD,6DAA4E;AAC5E,4DAA2E;
|
|
1
|
+
{"version":3,"file":"pty.manager.remote.js","sourceRoot":"","sources":["../../src/node/pty.manager.remote.ts"],"names":[],"mappings":";;;;AAAA,sDAA6C;AAE7C,qCAAoD;AACpD,6DAA4E;AAC5E,4DAA2E;AAC3E,+DAAoE;AAEpE,sCAKmB;AAEnB,+CAAkD;AAElD,gDAAgD;AAChD,uEAAuE;AACvE,yCAAyC;AAEzC,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,+BAAiB;IAC5D,0CAA0C;IAC1C,YAAwB,cAAiC,EAAE,IAAI,EAAE,sCAA6B,EAAE;QAC9F,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,wBAAwB,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC;IAEO,cAAc,CAAC,MAAkB;QACvC,MAAM,YAAY,GAAG,IAAI,iCAAgB,EAAE,CAAC;QAC5C,MAAM,EAAE,aAAa,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAc,EAAC,YAAY,CAAC,CAAC;QAC9F,MAAM,UAAU,GAAwB,mBAAmB,CAAC,mCAA0B,CAAQ,CAAC;QAC/F,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC;QAClC,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAE7B,OAAO;QACP,gBAAgB,CAAC,4CAAmC,EAAE;YACpD,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE;gBACnC,IAAI,gBAAgB,EAAE;oBACpB,qCAAqC;oBACrC,8DAA8D;oBAC9D,OAAO;iBACR;gBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC9C,IAAI,CAAC,QAAQ,EAAE;oBACb,oDAAoD;oBACpD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,EAAE,MAAM,CAAC,CAAC;iBACnE;qBAAM;oBACL,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;iBACnB;YACH,CAAC;SACF,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,IAAA,6BAAsB,EAAC,MAAM,CAAC,CAAC;QACzD,YAAY,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;QAC9C,OAAO,4BAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YAC5B,gBAAgB,GAAG,IAAI,CAAC;YACxB,YAAY,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,wBAAwB,CAAC,WAA8B;QAC7D,MAAM,MAAM,GAAG,IAAI,aAAG,CAAC,MAAM,EAAE,CAAC;QAChC,IAAI,oBAA6C,CAAC;QAElD,iCAAiC;QACjC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YACxB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;YACrD,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,OAAO,EAAE,CAAC;YAChC,oBAAoB,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,yCAAyC;QACzC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACtB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iEAAiE,CAAC,CAAC;YACnF,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,OAAO,EAAE,CAAC;YAChC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;gBACrB,IAAI;oBACF,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;iBAC7B;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBACrB;YACH,CAAC,EAAE,IAAI,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;QAEH,IAAI;YACF,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;SAC7B;QAAC,OAAO,CAAC,EAAE;YACV,oCAAoC;YACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACrB;IACH,CAAC;IAES,SAAS;QACjB,iDAAiD;IACnD,CAAC;CACF,CAAA;AA3EY,uBAAuB;IADnC,IAAA,eAAU,GAAE;IAGE,mBAAA,IAAA,aAAQ,GAAE,CAAA;;GAFZ,uBAAuB,CA2EnC;AA3EY,0DAAuB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty.proxy.d.ts","sourceRoot":"","sources":["../../src/node/pty.proxy.ts"],"names":[],"mappings":";AAEA,OAAY,EAAE,aAAa,EAAU,MAAM,KAAK,CAAC;AAEjD,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAMhC,OAAO,EACL,mBAAmB,
|
|
1
|
+
{"version":3,"file":"pty.proxy.d.ts","sourceRoot":"","sources":["../../src/node/pty.proxy.ts"],"names":[],"mappings":";AAEA,OAAY,EAAE,aAAa,EAAU,MAAM,KAAK,CAAC;AAEjD,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAMhC,OAAO,EACL,mBAAmB,EAKpB,MAAM,WAAW,CAAC;AAgCnB;;;;;GAKG;AACH,qBAAa,eAAgB,YAAW,mBAAmB;IAEzD,OAAO,CAAC,cAAc,CAA4B;IAElD,OAAO,CAAC,eAAe,CAAoC;IAE3D,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,gBAAgB,CAAwC;IAEhE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqC;IACjE,OAAO,CAAC,SAAS,CAA+C;gBAEpD,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,OAAA,KAAK,IAAI;IAKvD,OAAO,CAAC,YAAY;IASpB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IASzC,MAAM,CACJ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EACvB,OAAO,EAAE,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,sBAAsB,EACzD,aAAa,CAAC,EAAE,MAAM,GACrB,GAAG;IA6DN,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAwB1C,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAW1C,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAOlD,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAKzD,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAMvC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAQzC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAKzB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAK1B,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAIjC;AAGD,qBAAa,0BAA0B;IACrC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAChD,OAAO,CAAC,mBAAmB,CAAgB;IAC3C,OAAO,CAAC,MAAM,CAAS;gBAEX,aAAa,GAAE,aAAuD;IAY3E,UAAU;IAKjB,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,kBAAkB;IAQ1B,IAAW,gBAAgB,IAAI,eAAe,CAE7C;CACF"}
|
package/lib/node/pty.proxy.js
CHANGED
|
@@ -70,7 +70,7 @@ class PtyServiceProxy {
|
|
|
70
70
|
$spawn(file, args, options, longSessionId) {
|
|
71
71
|
var _a, _b;
|
|
72
72
|
// 切割sessionId到短Id
|
|
73
|
-
const sessionId = (_a = longSessionId === null || longSessionId === void 0 ? void 0 : longSessionId.split(
|
|
73
|
+
const sessionId = (_a = longSessionId === null || longSessionId === void 0 ? void 0 : longSessionId.split(common_1.TERMINAL_ID_SEPARATOR)) === null || _a === void 0 ? void 0 : _a[1];
|
|
74
74
|
this.debugLogger.log('ptyServiceProxy: spawn sessionId:', sessionId);
|
|
75
75
|
let ptyInstance;
|
|
76
76
|
if (sessionId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty.proxy.js","sourceRoot":"","sources":["../../src/node/pty.proxy.ts"],"names":[],"mappings":";;;;AAAA,+BAA+B;AAC/B,oDAAoB;AACpB,sDAAiD;AAEjD,sDAAgC;AAEhC,6DAA4E;AAC5E,4DAA2E;AAC3E,2DAA+E;AAE/E,
|
|
1
|
+
{"version":3,"file":"pty.proxy.js","sourceRoot":"","sources":["../../src/node/pty.proxy.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,
|
|
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,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"}
|
|
@@ -38,7 +38,7 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
|
|
|
38
38
|
// 检查SessionId是否存活，但是因为之前接口设计有问题只返回了boolean，所以不能批量返回SessionId的检查结果
|
|
39
39
|
// 可以通过多次调用来达成目的，每次调用terminalIdArr只传入一个东西
|
|
40
40
|
async ensureClientTerminal(clientId, terminalIdArr) {
|
|
41
|
-
const sessionIdArray = terminalIdArr.map((id) => id.split(
|
|
41
|
+
const sessionIdArray = terminalIdArr.map((id) => id.split(common_1.TERMINAL_ID_SEPARATOR)[1]);
|
|
42
42
|
const sessionCheckResArray = await Promise.all(sessionIdArray.map((sessionId) => this.ptyServiceManager.checkSession(sessionId)));
|
|
43
43
|
this.logger.log(`ensureClientTerminal ${clientId} ${terminalIdArr} ${sessionCheckResArray}`);
|
|
44
44
|
// 有一个存活就true，所以为了准确使用，每次调用terminalIdArr只传入一个东西
|
|
@@ -59,10 +59,14 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
|
|
|
59
59
|
}
|
|
60
60
|
disposeClient(clientId) {
|
|
61
61
|
const terminalMap = this.clientTerminalMap.get(clientId);
|
|
62
|
+
// 如果是Electron也要直接kill掉，跟随IDE Server的生命周期
|
|
63
|
+
const isElectronNodeEnv = (0, ide_core_node_1.isElectronNode)();
|
|
62
64
|
if (terminalMap) {
|
|
63
65
|
terminalMap.forEach((t, id) => {
|
|
64
66
|
this.terminalProcessMap.delete(id);
|
|
65
|
-
if (t.shellLaunchConfig.disablePersistence ||
|
|
67
|
+
if (t.shellLaunchConfig.disablePersistence ||
|
|
68
|
+
t.shellLaunchConfig.isExtensionOwnedTerminal ||
|
|
69
|
+
isElectronNodeEnv) {
|
|
66
70
|
t.kill(); // terminalProfile有isTransient的参数化，要Kill，不保活
|
|
67
71
|
}
|
|
68
72
|
// t.kill(); // 这个是窗口关闭时候触发，终端默认在这种场景下保活, 不kill
|
|
@@ -80,7 +84,7 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
|
|
|
80
84
|
}
|
|
81
85
|
async create2(id, _cols, _rows, _launchConfig) {
|
|
82
86
|
var _a;
|
|
83
|
-
const clientId = id.split(
|
|
87
|
+
const clientId = id.split(common_1.TERMINAL_ID_SEPARATOR)[0];
|
|
84
88
|
let ptyService;
|
|
85
89
|
let cols = _cols;
|
|
86
90
|
let rows = _rows;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.service.js","sourceRoot":"","sources":["../../src/node/terminal.service.ts"],"names":[],"mappings":";;;;;AAAA,qCAA+E;AAC/E,
|
|
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": "2.
|
|
3
|
+
"version": "2.18.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib"
|
|
6
6
|
],
|
|
@@ -16,10 +16,10 @@
|
|
|
16
16
|
"url": "git@github.com:opensumi/core.git"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@opensumi/ide-connection": "2.
|
|
20
|
-
"@opensumi/ide-core-common": "2.
|
|
21
|
-
"@opensumi/ide-core-node": "2.
|
|
22
|
-
"@opensumi/ide-file-service": "2.
|
|
19
|
+
"@opensumi/ide-connection": "2.18.0",
|
|
20
|
+
"@opensumi/ide-core-common": "2.18.0",
|
|
21
|
+
"@opensumi/ide-core-node": "2.18.0",
|
|
22
|
+
"@opensumi/ide-file-service": "2.18.0",
|
|
23
23
|
"event-kit": "^2.5.3",
|
|
24
24
|
"node-pty": "0.11.0-beta19",
|
|
25
25
|
"os-locale": "^4.0.0",
|
|
@@ -28,21 +28,21 @@
|
|
|
28
28
|
"xterm-addon-search": "0.9.0-beta.16"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
|
-
"@opensumi/ide-components": "2.
|
|
32
|
-
"@opensumi/ide-core-browser": "2.
|
|
31
|
+
"@opensumi/ide-components": "2.18.0",
|
|
32
|
+
"@opensumi/ide-core-browser": "2.18.0",
|
|
33
33
|
"@opensumi/ide-dev-tool": "^1.3.1",
|
|
34
|
-
"@opensumi/ide-editor": "2.
|
|
35
|
-
"@opensumi/ide-main-layout": "2.
|
|
36
|
-
"@opensumi/ide-overlay": "2.
|
|
37
|
-
"@opensumi/ide-status-bar": "2.
|
|
38
|
-
"@opensumi/ide-theme": "2.
|
|
39
|
-
"@opensumi/ide-variable": "2.
|
|
40
|
-
"@opensumi/ide-workspace": "2.
|
|
34
|
+
"@opensumi/ide-editor": "2.18.0",
|
|
35
|
+
"@opensumi/ide-main-layout": "2.18.0",
|
|
36
|
+
"@opensumi/ide-overlay": "2.18.0",
|
|
37
|
+
"@opensumi/ide-status-bar": "2.18.0",
|
|
38
|
+
"@opensumi/ide-theme": "2.18.0",
|
|
39
|
+
"@opensumi/ide-variable": "2.18.0",
|
|
40
|
+
"@opensumi/ide-workspace": "2.18.0",
|
|
41
41
|
"@types/event-kit": "^2.4.0",
|
|
42
42
|
"@types/http-proxy": "^1.17.2",
|
|
43
43
|
"@types/puppeteer": "^2.0.0",
|
|
44
44
|
"http-proxy": "^1.18.0",
|
|
45
45
|
"puppeteer": "^2.0.0"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "1db618dccac9390b4249f79d3dc75c6cc6546c44"
|
|
48
48
|
}
|