@opensumi/ide-terminal-next 2.17.3-next-1651908670.0 → 2.17.3
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/resize.delegate.d.ts +1 -0
- package/lib/browser/component/resize.delegate.d.ts.map +1 -1
- package/lib/browser/component/tab.item.d.ts +1 -0
- package/lib/browser/component/tab.item.d.ts.map +1 -1
- package/lib/browser/component/terminal.variable.d.ts +1 -0
- package/lib/browser/component/terminal.variable.d.ts.map +1 -1
- package/lib/browser/component/terminal.view.d.ts.map +1 -1
- package/lib/browser/component/terminal.view.js +24 -25
- package/lib/browser/component/terminal.view.js.map +1 -1
- package/lib/browser/component/terminal.widget.d.ts +1 -0
- package/lib/browser/component/terminal.widget.d.ts.map +1 -1
- package/lib/browser/links/link-manager.d.ts.map +1 -1
- package/lib/browser/links/link-manager.js +11 -10
- package/lib/browser/links/link-manager.js.map +1 -1
- package/lib/browser/links/validated-local-link-provider.d.ts.map +1 -1
- package/lib/browser/links/validated-local-link-provider.js +2 -1
- package/lib/browser/links/validated-local-link-provider.js.map +1 -1
- package/lib/browser/terminal.client.d.ts +2 -4
- package/lib/browser/terminal.client.d.ts.map +1 -1
- package/lib/browser/terminal.client.js +5 -8
- package/lib/browser/terminal.client.js.map +1 -1
- package/lib/browser/terminal.controller.d.ts +1 -6
- package/lib/browser/terminal.controller.d.ts.map +1 -1
- package/lib/browser/terminal.controller.js +12 -55
- package/lib/browser/terminal.controller.js.map +1 -1
- package/lib/browser/terminal.input.js +2 -2
- package/lib/browser/terminal.input.js.map +1 -1
- package/lib/browser/terminal.internal.service.d.ts +6 -6
- package/lib/browser/terminal.internal.service.d.ts.map +1 -1
- package/lib/browser/terminal.internal.service.js +23 -4
- package/lib/browser/terminal.internal.service.js.map +1 -1
- package/lib/browser/terminal.profile.d.ts.map +1 -1
- package/lib/browser/terminal.profile.internal.d.ts.map +1 -1
- package/lib/browser/terminal.profile.internal.js +6 -4
- package/lib/browser/terminal.profile.internal.js.map +1 -1
- package/lib/browser/terminal.profile.js +2 -3
- package/lib/browser/terminal.profile.js.map +1 -1
- package/lib/browser/terminal.restore.d.ts.map +1 -1
- package/lib/browser/terminal.restore.js +1 -3
- package/lib/browser/terminal.restore.js.map +1 -1
- package/lib/browser/terminal.search.d.ts.map +1 -1
- package/lib/browser/terminal.search.js +0 -6
- package/lib/browser/terminal.search.js.map +1 -1
- package/lib/browser/terminal.service.d.ts +17 -5
- package/lib/browser/terminal.service.d.ts.map +1 -1
- package/lib/browser/terminal.service.js +77 -4
- package/lib/browser/terminal.service.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/browser/xterm.d.ts +1 -2
- package/lib/browser/xterm.d.ts.map +1 -1
- package/lib/browser/xterm.js.map +1 -1
- package/lib/common/client.d.ts +0 -8
- package/lib/common/client.d.ts.map +1 -1
- package/lib/common/client.js.map +1 -1
- package/lib/common/controller.d.ts +3 -12
- package/lib/common/controller.d.ts.map +1 -1
- package/lib/common/controller.js.map +1 -1
- package/lib/common/environmentVariable.d.ts +3 -2
- package/lib/common/environmentVariable.d.ts.map +1 -1
- package/lib/common/environmentVariable.js.map +1 -1
- package/lib/common/environmentVariableCollection.d.ts +3 -2
- package/lib/common/environmentVariableCollection.d.ts.map +1 -1
- package/lib/common/environmentVariableCollection.js +2 -2
- package/lib/common/environmentVariableCollection.js.map +1 -1
- package/lib/common/profile.d.ts +2 -1
- package/lib/common/profile.d.ts.map +1 -1
- package/lib/common/profile.js.map +1 -1
- package/lib/common/pty.d.ts +10 -81
- package/lib/common/pty.d.ts.map +1 -1
- package/lib/common/pty.js +1 -4
- package/lib/common/pty.js.map +1 -1
- package/lib/common/service.d.ts +11 -8
- package/lib/common/service.d.ts.map +1 -1
- package/lib/common/service.js.map +1 -1
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +0 -5
- package/lib/node/index.js.map +1 -1
- package/lib/node/pty.d.ts +4 -8
- package/lib/node/pty.d.ts.map +1 -1
- package/lib/node/pty.js +10 -13
- package/lib/node/pty.js.map +1 -1
- package/lib/node/shell.d.ts +1 -1
- package/lib/node/shell.d.ts.map +1 -1
- package/lib/node/shell.js +15 -14
- package/lib/node/shell.js.map +1 -1
- package/lib/node/terminal.profile.service.d.ts.map +1 -1
- package/lib/node/terminal.profile.service.js +6 -4
- package/lib/node/terminal.profile.service.js.map +1 -1
- package/lib/node/terminal.service.client.d.ts +8 -3
- package/lib/node/terminal.service.client.d.ts.map +1 -1
- package/lib/node/terminal.service.client.js +39 -8
- package/lib/node/terminal.service.client.js.map +1 -1
- package/lib/node/terminal.service.d.ts +2 -3
- package/lib/node/terminal.service.d.ts.map +1 -1
- package/lib/node/terminal.service.js +9 -28
- package/lib/node/terminal.service.js.map +1 -1
- package/package.json +16 -16
- package/lib/common/xterm.d.ts +0 -16
- package/lib/common/xterm.d.ts.map +0 -1
- package/lib/common/xterm.js +0 -3
- package/lib/common/xterm.js.map +0 -1
- package/lib/node/pty.manager.d.ts +0 -52
- package/lib/node/pty.manager.d.ts.map +0 -1
- package/lib/node/pty.manager.js +0 -133
- package/lib/node/pty.manager.js.map +0 -1
- package/lib/node/pty.manager.remote.d.ts +0 -9
- package/lib/node/pty.manager.remote.d.ts.map +0 -1
- package/lib/node/pty.manager.remote.js +0 -55
- package/lib/node/pty.manager.remote.js.map +0 -1
- package/lib/node/pty.proxy.d.ts +0 -45
- package/lib/node/pty.proxy.d.ts.map +0 -1
- package/lib/node/pty.proxy.js +0 -250
- package/lib/node/pty.proxy.js.map +0 -1
- package/lib/node/pty.proxy.remote.exec.d.ts +0 -2
- package/lib/node/pty.proxy.remote.exec.d.ts.map +0 -1
- package/lib/node/pty.proxy.remote.exec.js +0 -7
- package/lib/node/pty.proxy.remote.exec.js.map +0 -1
|
@@ -4,7 +4,6 @@ exports.TerminalController = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const mobx_1 = require("mobx");
|
|
6
6
|
const di_1 = require("@opensumi/di");
|
|
7
|
-
const ws_channel_handler_1 = require("@opensumi/ide-connection/lib/browser/ws-channel-handler");
|
|
8
7
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
9
8
|
const next_1 = require("@opensumi/ide-core-browser/lib/menu/next");
|
|
10
9
|
const menu_util_1 = require("@opensumi/ide-core-browser/lib/menu/next/menu-util");
|
|
@@ -108,56 +107,28 @@ let TerminalController = class TerminalController extends ide_core_common_1.With
|
|
|
108
107
|
return widget;
|
|
109
108
|
}
|
|
110
109
|
async recovery(history) {
|
|
111
|
-
// HACK: 因为现在的终端重连是有问题的，是ClientID机制导致的，因此在拿出记录恢复终端的时候，需要把里面的ClientID替换为当前活跃窗口的ClientID
|
|
112
|
-
// 同时在独立PtyService中，把终端重连的标识转变为真正的realSessionId 也就是 ${clientId}|${realSessionId}
|
|
113
|
-
var _a, _b;
|
|
114
|
-
const currentClientId = this.wsChannelHandler.clientId;
|
|
115
|
-
const currentRealSessionId = (_b = (_a = history.current) === null || _a === void 0 ? void 0 : _a.split('|')) === null || _b === void 0 ? void 0 : _b[1];
|
|
116
|
-
if (history.current) {
|
|
117
|
-
history.current = `${currentClientId}|${currentRealSessionId}`;
|
|
118
|
-
}
|
|
119
|
-
history.groups = history.groups.map((group) => {
|
|
120
|
-
if (Array.isArray(group)) {
|
|
121
|
-
// 替换clientId为当前窗口ClientID
|
|
122
|
-
return group.map((_a) => {
|
|
123
|
-
var _b;
|
|
124
|
-
var { client } = _a, other = tslib_1.__rest(_a, ["client"]);
|
|
125
|
-
return (Object.assign({ client: `${currentClientId}|${(_b = client === null || client === void 0 ? void 0 : client.split('|')) === null || _b === void 0 ? void 0 : _b[1]}` }, other));
|
|
126
|
-
});
|
|
127
|
-
}
|
|
128
|
-
else {
|
|
129
|
-
return group;
|
|
130
|
-
}
|
|
131
|
-
});
|
|
132
110
|
let currentWidgetId = '';
|
|
133
111
|
const { groups, current } = history;
|
|
134
112
|
const ids = [];
|
|
135
|
-
groups.forEach((widgets) => ids.
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
// }
|
|
113
|
+
groups.forEach((widgets) => ids.concat(widgets));
|
|
114
|
+
const checked = await this.service.check(ids.map((id) => (typeof id === 'string' ? id : id.clientId)));
|
|
115
|
+
if (!checked) {
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
141
118
|
for (const widgets of groups) {
|
|
142
119
|
const { group } = this._createOneGroup();
|
|
143
120
|
if (!widgets) {
|
|
144
121
|
continue;
|
|
145
122
|
}
|
|
146
|
-
for (const
|
|
147
|
-
if (!
|
|
123
|
+
for (const sessionId of widgets) {
|
|
124
|
+
if (!sessionId) {
|
|
148
125
|
continue;
|
|
149
126
|
}
|
|
150
127
|
/**
|
|
151
128
|
* widget 创建完成后会同时创建 client
|
|
152
129
|
*/
|
|
153
|
-
const widget = this.terminalView.createWidget(group, typeof
|
|
154
|
-
const client = await this.
|
|
155
|
-
// 终端被Resume的场景下也要绑定终端事件，避免意料之外的BUG
|
|
156
|
-
this.setupClient(widget, client);
|
|
157
|
-
if (session.task) {
|
|
158
|
-
client.isTaskExecutor = true;
|
|
159
|
-
client.taskId = session.task;
|
|
160
|
-
}
|
|
130
|
+
const widget = this.terminalView.createWidget(group, typeof sessionId === 'string' ? sessionId : sessionId.clientId);
|
|
131
|
+
const client = await this.clientFactory(widget, {});
|
|
161
132
|
this._clients.set(client.id, client);
|
|
162
133
|
if (current === client.id) {
|
|
163
134
|
currentWidgetId = widget.id;
|
|
@@ -167,7 +138,6 @@ let TerminalController = class TerminalController extends ide_core_common_1.With
|
|
|
167
138
|
*/
|
|
168
139
|
client.attached.promise.then(() => {
|
|
169
140
|
widget.name = client.name;
|
|
170
|
-
// client.term.writeln('\x1b[2mTerminal restored\x1b[22m');
|
|
171
141
|
/**
|
|
172
142
|
* 不成功的时候则认为这个连接已经失效了，去掉这个 widget
|
|
173
143
|
*/
|
|
@@ -294,11 +264,7 @@ let TerminalController = class TerminalController extends ide_core_common_1.With
|
|
|
294
264
|
if (!client) {
|
|
295
265
|
return;
|
|
296
266
|
}
|
|
297
|
-
|
|
298
|
-
if (client.isTaskExecutor) {
|
|
299
|
-
record.task = client.taskId;
|
|
300
|
-
}
|
|
301
|
-
group.push(record);
|
|
267
|
+
group.push(client.id);
|
|
302
268
|
});
|
|
303
269
|
if (group.length > 0) {
|
|
304
270
|
groups.push(group);
|
|
@@ -330,16 +296,11 @@ let TerminalController = class TerminalController extends ide_core_common_1.With
|
|
|
330
296
|
async createClientWithWidget2(options) {
|
|
331
297
|
const widgetId = this.service.generateSessionId();
|
|
332
298
|
const { group } = this._createOneGroup();
|
|
333
|
-
const widget = this.terminalView.createWidget(group, widgetId,
|
|
299
|
+
const widget = this.terminalView.createWidget(group, widgetId, !options.closeWhenExited, true);
|
|
334
300
|
if (options.beforeCreate && typeof options.beforeCreate === 'function') {
|
|
335
301
|
options.beforeCreate(widgetId);
|
|
336
302
|
}
|
|
337
|
-
|
|
338
|
-
if (options.isTaskExecutor) {
|
|
339
|
-
client.isTaskExecutor = true;
|
|
340
|
-
client.taskId = options.taskId;
|
|
341
|
-
}
|
|
342
|
-
return client;
|
|
303
|
+
return await this._createClient(widget, options.terminalOptions);
|
|
343
304
|
}
|
|
344
305
|
clearCurrentGroup() {
|
|
345
306
|
this.terminalView.currentGroup &&
|
|
@@ -454,10 +415,6 @@ tslib_1.__decorate([
|
|
|
454
415
|
(0, di_1.Autowired)(next_1.ICtxMenuRenderer),
|
|
455
416
|
tslib_1.__metadata("design:type", next_1.ICtxMenuRenderer)
|
|
456
417
|
], TerminalController.prototype, "ctxMenuRenderer", void 0);
|
|
457
|
-
tslib_1.__decorate([
|
|
458
|
-
(0, di_1.Autowired)(ws_channel_handler_1.WSChannelHandler),
|
|
459
|
-
tslib_1.__metadata("design:type", ws_channel_handler_1.WSChannelHandler)
|
|
460
|
-
], TerminalController.prototype, "wsChannelHandler", void 0);
|
|
461
418
|
tslib_1.__decorate([
|
|
462
419
|
mobx_1.observable,
|
|
463
420
|
tslib_1.__metadata("design:type", String)
|
|
@@ -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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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TerminalKeyBoardInputService = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const di_1 = require("@opensumi/di");
|
|
6
|
-
const
|
|
6
|
+
const platform_1 = require("@opensumi/ide-core-common/lib/platform");
|
|
7
7
|
let TerminalKeyBoardInputService = class TerminalKeyBoardInputService {
|
|
8
8
|
constructor() {
|
|
9
9
|
this._isCommandOrCtrl = false;
|
|
@@ -12,7 +12,7 @@ let TerminalKeyBoardInputService = class TerminalKeyBoardInputService {
|
|
|
12
12
|
return this._isCommandOrCtrl;
|
|
13
13
|
}
|
|
14
14
|
listen() {
|
|
15
|
-
const key =
|
|
15
|
+
const key = platform_1.isMacintosh ? 'Meta' : 'Control';
|
|
16
16
|
document.addEventListener('keydown', (e) => {
|
|
17
17
|
if (e.key === key) {
|
|
18
18
|
this._isCommandOrCtrl = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.input.js","sourceRoot":"","sources":["../../src/browser/terminal.input.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C
|
|
1
|
+
{"version":3,"file":"terminal.input.js","sourceRoot":"","sources":["../../src/browser/terminal.input.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,qEAAqE;AAGrE,IAAa,4BAA4B,GAAzC,MAAa,4BAA4B;IAAzC;QACU,qBAAgB,GAAG,KAAK,CAAC;IAqBnC,CAAC;IAnBC,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,MAAM;QACJ,MAAM,GAAG,GAAG,sBAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QAE7C,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;YACzC,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,EAAE;gBACjB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;aAC9B;QACH,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YACvC,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,EAAE;gBACjB,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;aAC/B;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAtBY,4BAA4B;IADxC,IAAA,eAAU,GAAE;GACA,4BAA4B,CAsBxC;AAtBY,oEAA4B"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
import { OperatingSystem } from '@opensumi/ide-core-common';
|
|
3
|
-
import { ITerminalService, ITerminalInternalService, ITerminalError, IPtyExitEvent, ITerminalController, ITerminalProfile, IShellLaunchConfig, ITerminalConnection, IPtyProcessChangeEvent } from '../common';
|
|
4
|
-
import { IXTerm } from '../common/xterm';
|
|
1
|
+
import { Terminal as XTermTerminal } from 'xterm';
|
|
2
|
+
import { OperatingSystem } from '@opensumi/ide-core-common/lib/platform';
|
|
3
|
+
import { ITerminalService, ITerminalInternalService, ITerminalError, IPtyExitEvent, ITerminalController, TerminalOptions, ITerminalProfile, IShellLaunchConfig, ITerminalConnection, IPtyProcessChangeEvent } from '../common';
|
|
5
4
|
export declare class TerminalInternalService implements ITerminalInternalService {
|
|
6
5
|
protected readonly service: ITerminalService;
|
|
7
6
|
protected readonly controller: ITerminalController;
|
|
@@ -10,6 +9,7 @@ export declare class TerminalInternalService implements ITerminalInternalService
|
|
|
10
9
|
getOptions(): import("xterm").ITerminalOptions;
|
|
11
10
|
check(sessionIds: string[]): Promise<boolean>;
|
|
12
11
|
private _getExtHostProxy;
|
|
12
|
+
attach(sessionId: string, xterm: XTermTerminal, rows: number, cols: number, options: TerminalOptions | undefined, type: string): Promise<ITerminalConnection | undefined>;
|
|
13
13
|
sendText(sessionId: string, message: string): Promise<void>;
|
|
14
14
|
resize(sessionId: string, cols: number, rows: number): Promise<void>;
|
|
15
15
|
disposeById(sessionId: string): void;
|
|
@@ -17,10 +17,10 @@ export declare class TerminalInternalService implements ITerminalInternalService
|
|
|
17
17
|
onError(handler: (error: ITerminalError) => void): import("@opensumi/ide-core-common").IDisposable;
|
|
18
18
|
onExit(handler: (event: IPtyExitEvent) => void): import("@opensumi/ide-core-common").IDisposable;
|
|
19
19
|
onProcessChange(handler: (event: IPtyProcessChangeEvent) => void): import("@opensumi/ide-core-common").IDisposable;
|
|
20
|
-
|
|
20
|
+
getOs(): Promise<OperatingSystem>;
|
|
21
21
|
getProfiles(autoDetect: boolean): Promise<ITerminalProfile[]>;
|
|
22
22
|
getDefaultSystemShell(): Promise<string>;
|
|
23
23
|
getCodePlatformKey(): Promise<'osx' | 'windows' | 'linux'>;
|
|
24
|
-
attachByLaunchConfig(sessionId: string, cols: number, rows: number, launchConfig: IShellLaunchConfig
|
|
24
|
+
attachByLaunchConfig(sessionId: string, cols: number, rows: number, launchConfig: IShellLaunchConfig): Promise<ITerminalConnection | undefined>;
|
|
25
25
|
}
|
|
26
26
|
//# sourceMappingURL=terminal.internal.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.internal.service.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.internal.service.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"terminal.internal.service.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.internal.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,aAAa,EAAE,MAAM,OAAO,CAAC;AAGlD,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAEzE,OAAO,EAEL,gBAAgB,EAChB,wBAAwB,EACxB,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAInB,qBACa,uBAAwB,YAAW,wBAAwB;IAEtE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAEnD,OAAO,CAAC,sBAAsB,CAAkD;IAEhF,iBAAiB;IAIjB,UAAU;IAIV,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE;IAI1B,OAAO,CAAC,gBAAgB;IAIlB,MAAM,CACV,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,6BAAsB,EAC7B,IAAI,EAAE,MAAM;IAoBR,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAQ3C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAQ1D,WAAW,CAAC,SAAS,EAAE,MAAM;IASvB,YAAY,CAAC,SAAS,EAAE,MAAM;IAQpC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI;IAIhD,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI;IAI9C,eAAe,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI;IAI1D,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;IAIjC,WAAW,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAI7D,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxC,kBAAkB,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC;IAI1D,oBAAoB,CACxB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,kBAAkB,GAC/B,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;CAkB5C"}
|
|
@@ -4,6 +4,7 @@ exports.TerminalInternalService = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const di_1 = require("@opensumi/di");
|
|
6
6
|
const common_1 = require("../common");
|
|
7
|
+
const terminal_ext_host_proxy_1 = require("./terminal.ext.host.proxy");
|
|
7
8
|
let TerminalInternalService = class TerminalInternalService {
|
|
8
9
|
constructor() {
|
|
9
10
|
this._processExtHostProxies = new Map();
|
|
@@ -20,6 +21,24 @@ let TerminalInternalService = class TerminalInternalService {
|
|
|
20
21
|
_getExtHostProxy(id) {
|
|
21
22
|
return this._processExtHostProxies.get(id);
|
|
22
23
|
}
|
|
24
|
+
async attach(sessionId, xterm, rows, cols, options = {}, type) {
|
|
25
|
+
if (options.isExtensionTerminal) {
|
|
26
|
+
const proxy = new terminal_ext_host_proxy_1.TerminalProcessExtHostProxy(sessionId, cols, rows, this.controller);
|
|
27
|
+
proxy.start();
|
|
28
|
+
proxy.onProcessExit(() => {
|
|
29
|
+
this._processExtHostProxies.delete(sessionId);
|
|
30
|
+
});
|
|
31
|
+
this._processExtHostProxies.set(sessionId, proxy);
|
|
32
|
+
return {
|
|
33
|
+
name: options.name || 'ExtensionTerminal-' + sessionId,
|
|
34
|
+
readonly: false,
|
|
35
|
+
onData: proxy.onProcessData.bind(proxy),
|
|
36
|
+
sendData: proxy.input.bind(proxy),
|
|
37
|
+
onExit: proxy.onProcessExit.bind(proxy),
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
return this.service.attach(sessionId, xterm, rows, cols, options, type);
|
|
41
|
+
}
|
|
23
42
|
async sendText(sessionId, message) {
|
|
24
43
|
const proxy = this._getExtHostProxy(sessionId);
|
|
25
44
|
if (proxy) {
|
|
@@ -58,8 +77,8 @@ let TerminalInternalService = class TerminalInternalService {
|
|
|
58
77
|
onProcessChange(handler) {
|
|
59
78
|
return this.service.onProcessChange(handler);
|
|
60
79
|
}
|
|
61
|
-
async
|
|
62
|
-
return await this.service.
|
|
80
|
+
async getOs() {
|
|
81
|
+
return await this.service.getOs();
|
|
63
82
|
}
|
|
64
83
|
async getProfiles(autoDetect) {
|
|
65
84
|
return await this.service.getProfiles(autoDetect);
|
|
@@ -70,7 +89,7 @@ let TerminalInternalService = class TerminalInternalService {
|
|
|
70
89
|
async getCodePlatformKey() {
|
|
71
90
|
return await this.service.getCodePlatformKey();
|
|
72
91
|
}
|
|
73
|
-
async attachByLaunchConfig(sessionId, cols, rows, launchConfig
|
|
92
|
+
async attachByLaunchConfig(sessionId, cols, rows, launchConfig) {
|
|
74
93
|
if (launchConfig.customPtyImplementation) {
|
|
75
94
|
const proxy = launchConfig.customPtyImplementation(sessionId, cols, rows);
|
|
76
95
|
proxy.start();
|
|
@@ -86,7 +105,7 @@ let TerminalInternalService = class TerminalInternalService {
|
|
|
86
105
|
onExit: proxy.onProcessExit.bind(proxy),
|
|
87
106
|
};
|
|
88
107
|
}
|
|
89
|
-
return await this.service.attachByLaunchConfig(sessionId, cols, rows, launchConfig
|
|
108
|
+
return await this.service.attachByLaunchConfig(sessionId, cols, rows, launchConfig);
|
|
90
109
|
}
|
|
91
110
|
};
|
|
92
111
|
tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.internal.service.js","sourceRoot":"","sources":["../../src/browser/terminal.internal.service.ts"],"names":[],"mappings":";;;;AAEA,qCAAqD;AAGrD,
|
|
1
|
+
{"version":3,"file":"terminal.internal.service.js","sourceRoot":"","sources":["../../src/browser/terminal.internal.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.profile.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.profile.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAGL,YAAY,EACZ,WAAW,EACX,KAAK,EAKN,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAC/B,kBAAkB,EAClB,4BAA4B,EAC5B,gBAAgB,EAEhB,wBAAwB,EACxB,uBAAuB,EAGxB,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal.profile.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.profile.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAGL,YAAY,EACZ,WAAW,EACX,KAAK,EAKN,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAC/B,kBAAkB,EAClB,4BAA4B,EAC5B,gBAAgB,EAEhB,wBAAwB,EACxB,uBAAuB,EAGxB,MAAM,WAAW,CAAC;AAInB,qBACa,sBAAuB,SAAQ,YAAa,YAAW,uBAAuB;IACzF,OAAO,CAAC,kBAAkB,CAAiC;IAG3D,OAAO,CAAC,eAAe,CAAmB;IAG1C,iBAAiB,EAAE,iBAAiB,CAAC;IAGrC,2BAA2B,EAAE,4BAA4B,CAAC;IAE1D,OAAO,CAAC,qBAAqB,CAAkB;IAE/C,IAAI,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAEjC;IACD,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAqC;IACnF,IAAI,4BAA4B,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAE5D;;IAWD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CACtB;IAEZ,IAAI,iBAAiB,IAAI,gBAAgB,EAAE,CAE1C;IAED,OAAO,CAAC,oBAAoB,CAAmC;IAC/D,IAAI,mBAAmB,IAAI,yBAAyB,EAAE,CAErD;IAED,qBAAqB,IAAI,MAAM,GAAG,SAAS;IAO3C,wBAAwB,IAAI,IAAI;IAIhC,6BAA6B,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,wBAAwB,GAAG,SAAS;IAKrG,+BAA+B,CACpC,2BAA2B,EAAE,MAAM,EACnC,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,wBAAwB,GACxC,WAAW;YAUA,eAAe;YAIf,0BAA0B;cAyBxB,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvD,4BAA4B,CAChC,iBAAiB,EAAE,kBAAkB,GACpC,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;IAY3C,0BAA0B,CAAC,IAAI,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBvF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.profile.internal.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.profile.internal.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"terminal.profile.internal.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.profile.internal.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,EACL,6BAA6B,EAC7B,gBAAgB,EAChB,+BAA+B,EAC/B,uBAAuB,EACvB,gBAAgB,EAChB,sBAAsB,EAEvB,MAAM,WAAW,CAAC;AAMnB,qBACa,8BAA+B,YAAW,+BAA+B;IAEpF,cAAc,EAAE,uBAAuB,CAAC;IAGxC,eAAe,EAAE,gBAAgB,CAAC;IAGlC,OAAO,CAAC,iBAAiB,CAAoB;IAG7C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;YAE9C,0BAA0B;IA+BlC,qBAAqB,CAAC,OAAO,CAAC,EAAE,6BAA6B,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAerG,yBAAyB;YASjB,+BAA+B;CAoB9C"}
|
|
@@ -8,6 +8,8 @@ exports.TerminalProfileInternalService = void 0;
|
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
9
|
const di_1 = require("@opensumi/di");
|
|
10
10
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
11
|
+
const path = tslib_1.__importStar(require("@opensumi/ide-core-common/lib/path"));
|
|
12
|
+
const platform_1 = require("@opensumi/ide-core-common/lib/platform");
|
|
11
13
|
const common_1 = require("../common");
|
|
12
14
|
const generatedProfileName = 'Generated Profile';
|
|
13
15
|
let TerminalProfileInternalService = class TerminalProfileInternalService {
|
|
@@ -21,8 +23,8 @@ let TerminalProfileInternalService = class TerminalProfileInternalService {
|
|
|
21
23
|
let shellPath = shellType;
|
|
22
24
|
const args = [];
|
|
23
25
|
const platformKey = await this.terminalService.getCodePlatformKey();
|
|
24
|
-
const terminalOs = await this.terminalService.
|
|
25
|
-
if (terminalOs ===
|
|
26
|
+
const terminalOs = await this.terminalService.getOs();
|
|
27
|
+
if (terminalOs === platform_1.OperatingSystem.Windows) {
|
|
26
28
|
shellPath = (_a = (await this.serviceClientRPC.$resolveWindowsShellPath(shellType))) !== null && _a !== void 0 ? _a : shellPath;
|
|
27
29
|
}
|
|
28
30
|
else {
|
|
@@ -64,8 +66,8 @@ let TerminalProfileInternalService = class TerminalProfileInternalService {
|
|
|
64
66
|
const executable = await this.terminalService.getDefaultSystemShell();
|
|
65
67
|
// Finally fallback to a generated profile
|
|
66
68
|
let args;
|
|
67
|
-
const os = (_a = options === null || options === void 0 ? void 0 : options.os) !== null && _a !== void 0 ? _a : (await this.terminalService.
|
|
68
|
-
if (os ===
|
|
69
|
+
const os = (_a = options === null || options === void 0 ? void 0 : options.os) !== null && _a !== void 0 ? _a : (await this.terminalService.getOs());
|
|
70
|
+
if (os === platform_1.OperatingSystem.Macintosh && path.parse(executable).name.match(/(zsh|bash)/)) {
|
|
69
71
|
// macOS should launch a login shell by default
|
|
70
72
|
args = ['--login'];
|
|
71
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.profile.internal.js","sourceRoot":"","sources":["../../src/browser/terminal.profile.internal.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;AAEH,qCAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"terminal.profile.internal.js","sourceRoot":"","sources":["../../src/browser/terminal.profile.internal.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ const di_1 = require("@opensumi/di");
|
|
|
6
6
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
7
7
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
8
8
|
const common_1 = require("../common");
|
|
9
|
-
const { equals } = ide_core_common_1.arrays;
|
|
10
9
|
let TerminalProfileService = class TerminalProfileService extends ide_core_common_1.WithEventBus {
|
|
11
10
|
constructor() {
|
|
12
11
|
super();
|
|
@@ -63,13 +62,13 @@ let TerminalProfileService = class TerminalProfileService extends ide_core_commo
|
|
|
63
62
|
}
|
|
64
63
|
}
|
|
65
64
|
const filteredContributedProfiles = Array.from(this.terminalContributionService.terminalProfiles.filter((p) => !excludedContributedProfiles.includes(p.title)));
|
|
66
|
-
const contributedProfilesChanged = !equals(filteredContributedProfiles, this._contributedProfiles, contributedProfilesEqual);
|
|
65
|
+
const contributedProfilesChanged = !(0, ide_core_common_1.equals)(filteredContributedProfiles, this._contributedProfiles, contributedProfilesEqual);
|
|
67
66
|
this._contributedProfiles = filteredContributedProfiles;
|
|
68
67
|
return contributedProfilesChanged;
|
|
69
68
|
}
|
|
70
69
|
async _refreshAvailableProfilesNow() {
|
|
71
70
|
const profiles = await this._detectProfiles(true);
|
|
72
|
-
const profilesChanged = !equals(profiles, this._availableProfiles, profilesEqual);
|
|
71
|
+
const profilesChanged = !(0, ide_core_common_1.equals)(profiles, this._availableProfiles, profilesEqual);
|
|
73
72
|
const contributedProfilesChanged = await this._updateContributedProfiles();
|
|
74
73
|
if (profilesChanged || contributedProfilesChanged) {
|
|
75
74
|
this._availableProfiles = profiles;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.profile.js","sourceRoot":"","sources":["../../src/browser/terminal.profile.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAA+D;AAC/D,+DAUmC;AAEnC,sCAWmB;
|
|
1
|
+
{"version":3,"file":"terminal.profile.js","sourceRoot":"","sources":["../../src/browser/terminal.profile.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAA+D;AAC/D,+DAUmC;AAEnC,sCAWmB;AAKnB,IAAa,sBAAsB,GAAnC,MAAa,sBAAuB,SAAQ,8BAAY;IAsBtD;QACE,KAAK,EAAE,CAAC;QANO,kCAA6B,GAAG,IAAI,yBAAO,EAAsB,CAAC;QAclE,sBAAiB,GAChC,IAAI,GAAG,EAAE,CAAC;QAMJ,yBAAoB,GAAgC,EAAE,CAAC;QAd7D,wFAAwF;QACxF,yFAAyF;QACzF,aAAa;QACb,IAAI,CAAC,qBAAqB,GAAG,IAAI,iCAAe,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,wBAAwB,EAAE,CAAC;IAClC,CAAC;IAfD,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,4BAA4B;QAC9B,OAAO,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC;IAClD,CAAC;IAcD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,kBAAkB,IAAI,EAAE,CAAC;IACvC,CAAC;IAGD,IAAI,mBAAmB;QACrB,OAAO,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC;IACzC,CAAC;IAED,qBAAqB;QACnB,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAC/B,GAAG,0DAAwC,GAAG,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,EAAE,CAC1F,CAAC;IACJ,CAAC;IAGD,wBAAwB;QACtB,IAAI,CAAC,4BAA4B,EAAE,CAAC;IACtC,CAAC;IAED,6BAA6B,CAAC,mBAA2B,EAAE,EAAU;QACnE,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAC/D,OAAO,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IAEM,+BAA+B,CACpC,2BAAmC,EACnC,EAAU,EACV,eAAyC;QAEzC,IAAI,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;QACrE,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;YACnB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,2BAA2B,EAAE,MAAM,CAAC,CAAC;SACjE;QACD,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;QAChC,OAAO,4BAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,UAAU,GAAG,IAAI;QAC7C,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,CAAC;IAEO,KAAK,CAAC,0BAA0B;QACtC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAC;QACpE,MAAM,2BAA2B,GAAa,EAAE,CAAC;QACjD,MAAM,cAAc,GAA2B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CACvE,iDAAqC,WAAW,EAChD,EAAE,CACH,CAAC;QACF,KAAK,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACjE,IAAI,KAAK,KAAK,IAAI,EAAE;gBAClB,2BAA2B,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC/C;SACF;QACD,MAAM,2BAA2B,GAAG,KAAK,CAAC,IAAI,CAC5C,IAAI,CAAC,2BAA2B,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAChH,CAAC;QAEF,MAAM,0BAA0B,GAAG,CAAC,IAAA,wBAAM,EACxC,2BAA2B,EAC3B,IAAI,CAAC,oBAAoB,EACzB,wBAAwB,CACzB,CAAC;QACF,IAAI,CAAC,oBAAoB,GAAG,2BAA2B,CAAC;QACxD,OAAO,0BAA0B,CAAC;IACpC,CAAC;IAES,KAAK,CAAC,4BAA4B;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,eAAe,GAAG,CAAC,IAAA,wBAAM,EAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;QAClF,MAAM,0BAA0B,GAAG,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAE3E,IAAI,eAAe,IAAI,0BAA0B,EAAE;YACjD,IAAI,CAAC,kBAAkB,GAAG,QAAQ,CAAC;YACnC,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;YAClC,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;SAClE;IACH,CAAC;IAED,KAAK,CAAC,4BAA4B,CAChC,iBAAqC;QAErC,gFAAgF;QAChF,0EAA0E;QAC1E,IAAI,iBAAiB,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,IAAI,CAAC,CAAC,YAAY,IAAI,iBAAiB,CAAC,EAAE;YACrG,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAC;YAC5D,MAAM,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,0DAAwC,GAAG,GAAG,EAAE,CAAC,CAAC;YAC3G,MAAM,yBAAyB,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,kBAAkB,CAAC,CAAC;YACvG,OAAO,yBAAyB,CAAC;SAClC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,IAAqC;QACpE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAC;QACpE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,8CAAkC,GAAG,WAAW,EAAE,CAAC,CAAC;QAC/G,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;YACtC,MAAM,UAAU,GAA8B;gBAC5C,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;gBAC7C,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBACvB,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;aAC1B,CAAC;YAED,cAA4D,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;SACxF;QACD,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAC9B,GAAG,8CAAkC,GAAG,WAAW,EAAE,EACrD,cAAc,EACd,iCAAe,CAAC,IAAI,CACrB,CAAC;QACF,OAAO;IACT,CAAC;CACF,CAAA;AAjJC;IADC,IAAA,cAAS,EAAC,yBAAgB,CAAC;;+DACc;AAG1C;IADC,IAAA,cAAS,EAAC,oCAAiB,CAAC;;iEACQ;AAGrC;IADC,IAAA,cAAS,EAAC,qCAA4B,CAAC;;2EACkB;AAwC1D;IADC,IAAA,0BAAQ,EAAC,IAAI,CAAC;;;;sEAGd;AApDU,sBAAsB;IADlC,IAAA,eAAU,GAAE;;GACA,sBAAsB,CAqJlC;AArJY,wDAAsB;AAuJnC,SAAS,aAAa,CAAC,GAAqB,EAAE,KAAuB;IACnE,OAAO,CACL,GAAG,CAAC,WAAW,KAAK,KAAK,CAAC,WAAW;QACrC,IAAA,iCAAwB,EAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;QAC9C,GAAG,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK;QACzB,GAAG,CAAC,cAAc,KAAK,KAAK,CAAC,cAAc;QAC3C,GAAG,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS;QACjC,GAAG,CAAC,YAAY,KAAK,KAAK,CAAC,YAAY;QACvC,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CACxB,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,GAA8B,EAAE,KAAgC;IAChG,OAAO,CACL,GAAG,CAAC,mBAAmB,KAAK,KAAK,CAAC,mBAAmB;QACrD,GAAG,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK;QACzB,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI;QACvB,GAAG,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE;QACnB,GAAG,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAC1B,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.restore.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.restore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE5F,qBACa,eAAgB,SAAQ,UAAW,YAAW,gBAAgB;IAEzE,UAAU,EAAE,mBAAmB,CAAC;IAGhC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB,CAAC;IAErD,IAAI,UAAU,
|
|
1
|
+
{"version":3,"file":"terminal.restore.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.restore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE5F,qBACa,eAAgB,SAAQ,UAAW,YAAW,gBAAgB;IAEzE,UAAU,EAAE,mBAAmB,CAAC;IAGhC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB,CAAC;IAErD,IAAI,UAAU,WAEb;IAED,IAAI;IAMJ,OAAO;CAYR"}
|
|
@@ -7,8 +7,7 @@ const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
|
7
7
|
const common_1 = require("../common");
|
|
8
8
|
let TerminalRestore = class TerminalRestore extends ide_core_common_1.Disposable {
|
|
9
9
|
get storageKey() {
|
|
10
|
-
|
|
11
|
-
return 'OPENSUMI_TERMINAL_RESTORE';
|
|
10
|
+
return 'KAITIAN';
|
|
12
11
|
}
|
|
13
12
|
save() {
|
|
14
13
|
const json = this.controller.toJSON();
|
|
@@ -18,7 +17,6 @@ let TerminalRestore = class TerminalRestore extends ide_core_common_1.Disposable
|
|
|
18
17
|
restore() {
|
|
19
18
|
const key = this.storageKey;
|
|
20
19
|
const history = window.localStorage.getItem(key);
|
|
21
|
-
window.localStorage.removeItem(key); // 触发恢复之后清除掉缓存
|
|
22
20
|
if (history) {
|
|
23
21
|
try {
|
|
24
22
|
return this.controller.recovery(JSON.parse(history));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.restore.js","sourceRoot":"","sources":["../../src/browser/terminal.restore.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DAAuD;AAEvD,sCAA4F;AAG5F,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,4BAAU;IAO7C,IAAI,UAAU;QACZ,
|
|
1
|
+
{"version":3,"file":"terminal.restore.js","sourceRoot":"","sources":["../../src/browser/terminal.restore.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DAAuD;AAEvD,sCAA4F;AAG5F,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,4BAAU;IAO7C,IAAI,UAAU;QACZ,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QAC5B,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,OAAO;QACL,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE;YACX,IAAI;gBACF,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;aACtD;YAAC,WAAM;gBACN,cAAc;aACf;SACF;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF,CAAA;AA3BC;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;mDACC;AAGhC;IADC,IAAA,cAAS,EAAC,iCAAwB,CAAC;;gDACiB;AAL1C,eAAe;IAD3B,IAAA,eAAU,GAAE;GACA,eAAe,CA6B3B;AA7BY,0CAAe"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.search.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.search.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"terminal.search.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.search.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEpH,qBACa,qBAAsB,YAAW,sBAAsB;IAElE,IAAI,EAAE,OAAO,CAAC;IAGd,KAAK,EAAE,MAAM,CAAC;IAGd,UAAU,EAAE,mBAAmB,CAAC;IAGhC,YAAY,EAAE,yBAAyB,CAAC;IAExC,SAAS,CAAC,OAAO,gBAAuB;IAExC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAsB;IAEzC,IAAI,MAAM,IAAI,eAAe,GAAG,SAAS,CAExC;IAED,IAAI;IAKJ,KAAK;IAKL,KAAK;IAKL,MAAM;CAGP"}
|
|
@@ -49,12 +49,6 @@ tslib_1.__decorate([
|
|
|
49
49
|
(0, di_1.Autowired)(common_1.ITerminalGroupViewService),
|
|
50
50
|
tslib_1.__metadata("design:type", Object)
|
|
51
51
|
], TerminalSearchService.prototype, "terminalView", void 0);
|
|
52
|
-
tslib_1.__decorate([
|
|
53
|
-
(0, ide_core_common_1.debounce)(150),
|
|
54
|
-
tslib_1.__metadata("design:type", Function),
|
|
55
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
56
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
57
|
-
], TerminalSearchService.prototype, "search", null);
|
|
58
52
|
TerminalSearchService = tslib_1.__decorate([
|
|
59
53
|
(0, di_1.Injectable)()
|
|
60
54
|
], TerminalSearchService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.search.js","sourceRoot":"","sources":["../../src/browser/terminal.search.ts"],"names":[],"mappings":";;;;AAAA,+BAAkC;AAElC,qCAAqD;AACrD,+
|
|
1
|
+
{"version":3,"file":"terminal.search.js","sourceRoot":"","sources":["../../src/browser/terminal.search.ts"],"names":[],"mappings":";;;;AAAA,+BAAkC;AAElC,qCAAqD;AACrD,+DAA2D;AAE3D,sCAAoH;AAGpH,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAAlC;QAaY,YAAO,GAAG,IAAI,yBAAO,EAAQ,CAAC;QAExC,WAAM,GAAgB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAwB3C,CAAC;IAtBC,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC;IAED,IAAI;QACF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAED,KAAK;;QACH,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;IACpB,CAAC;IAED,KAAK;;QACH,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,EAAE,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,MAAM;;QACJ,MAAA,IAAI,CAAC,MAAM,0CAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;CACF,CAAA;AArCC;IADC,iBAAU;;mDACG;AAGd;IADC,iBAAU;;oDACG;AAGd;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;yDACC;AAGhC;IADC,IAAA,cAAS,EAAC,kCAAyB,CAAC;;2DACG;AAX7B,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CAuCjC;AAvCY,sDAAqB"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
+
import { Terminal } from 'xterm';
|
|
1
2
|
import { Injector } from '@opensumi/di';
|
|
2
|
-
import { OperatingSystem } from '@opensumi/ide-core-browser';
|
|
3
3
|
import { ILogger, Event } from '@opensumi/ide-core-common';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
4
|
+
import { OperatingSystem } from '@opensumi/ide-core-common/lib/platform';
|
|
5
|
+
import { ITerminalService, ITerminalError, ITerminalServiceClient, ITerminalConnection, IPtyExitEvent, TerminalOptions, ITerminalProfile, IShellLaunchConfig, IPtyProcessChangeEvent } from '../common';
|
|
6
|
+
import { ShellType } from '../common/shell';
|
|
6
7
|
export interface EventMessage {
|
|
7
8
|
data: string;
|
|
8
9
|
}
|
|
@@ -25,7 +26,18 @@ export declare class NodePtyTerminalService implements ITerminalService {
|
|
|
25
26
|
generateSessionId(): string;
|
|
26
27
|
check(ids: string[]): Promise<boolean>;
|
|
27
28
|
private _createCustomWebSocket;
|
|
28
|
-
|
|
29
|
+
/**
|
|
30
|
+
*
|
|
31
|
+
* @param sessionId
|
|
32
|
+
* @param _
|
|
33
|
+
* @param rows
|
|
34
|
+
* @param cols
|
|
35
|
+
* @param options
|
|
36
|
+
* @param shellType
|
|
37
|
+
* @returns
|
|
38
|
+
*/
|
|
39
|
+
attach(sessionId: string, _: Terminal, rows: number, cols: number, options?: TerminalOptions, shellType?: ShellType): Promise<ITerminalConnection | undefined>;
|
|
40
|
+
attachByLaunchConfig(sessionId: string, cols: number, rows: number, launchConfig: IShellLaunchConfig): Promise<ITerminalConnection | undefined>;
|
|
29
41
|
private _sendMessage;
|
|
30
42
|
sendText(sessionId: string, message: string): Promise<void>;
|
|
31
43
|
resize(sessionId: string, cols: number, rows: number): Promise<void>;
|
|
@@ -50,7 +62,7 @@ export declare class NodePtyTerminalService implements ITerminalService {
|
|
|
50
62
|
signal?: number;
|
|
51
63
|
}): void;
|
|
52
64
|
$processChange(sessionId: string, processName: string): void;
|
|
53
|
-
|
|
65
|
+
getOs(): Promise<OperatingSystem>;
|
|
54
66
|
getProfiles(autoDetect: boolean): Promise<ITerminalProfile[]>;
|
|
55
67
|
getDefaultSystemShell(): Promise<string>;
|
|
56
68
|
dispose(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.service.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"terminal.service.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.service.ts"],"names":[],"mappings":"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"}
|