@opensumi/ide-terminal-next 2.27.3-next-1706077936.0 → 2.27.3-next-1706520813.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/resize.delegate.d.ts +2 -2
- package/lib/browser/component/resize.delegate.d.ts.map +1 -1
- package/lib/browser/component/terminal.variable.d.ts +2 -2
- package/lib/browser/component/terminal.variable.d.ts.map +1 -1
- package/lib/browser/component/terminal.widget.d.ts +2 -2
- package/lib/browser/component/terminal.widget.d.ts.map +1 -1
- package/lib/browser/terminal.client.js +1 -1
- package/lib/browser/terminal.client.js.map +1 -1
- package/lib/common/pty.d.ts +6 -5
- package/lib/common/pty.d.ts.map +1 -1
- package/lib/common/pty.js.map +1 -1
- package/lib/node/pty.manager.d.ts +5 -2
- package/lib/node/pty.manager.d.ts.map +1 -1
- package/lib/node/pty.manager.js +7 -6
- package/lib/node/pty.manager.js.map +1 -1
- package/lib/node/pty.manager.remote.d.ts.map +1 -1
- package/lib/node/pty.manager.remote.js +4 -8
- package/lib/node/pty.manager.remote.js.map +1 -1
- package/lib/node/pty.proxy.d.ts +2 -2
- package/lib/node/pty.proxy.d.ts.map +1 -1
- package/lib/node/pty.proxy.js +17 -18
- package/lib/node/pty.proxy.js.map +1 -1
- package/lib/node/shell.d.ts.map +1 -1
- package/lib/node/shell.js +1 -4
- package/lib/node/shell.js.map +1 -1
- package/package.json +16 -16
- package/src/browser/terminal.client.ts +1 -1
- package/src/common/pty.ts +7 -6
- package/src/node/pty.manager.remote.ts +5 -9
- package/src/node/pty.manager.ts +16 -9
- package/src/node/pty.proxy.ts +20 -23
- package/src/node/shell.ts +1 -4
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
/// <reference types="react" />
|
|
2
2
|
import { IWidget } from '../../common/resize';
|
|
3
3
|
export interface IResizeDelegateProps {
|
|
4
4
|
start: () => void;
|
|
@@ -9,6 +9,6 @@ export interface IResizeDelegateProps {
|
|
|
9
9
|
last: boolean;
|
|
10
10
|
wholeWidth: number;
|
|
11
11
|
}
|
|
12
|
-
declare const _default: (props: IResizeDelegateProps) =>
|
|
12
|
+
declare const _default: (props: IResizeDelegateProps) => JSX.Element;
|
|
13
13
|
export default _default;
|
|
14
14
|
//# sourceMappingURL=resize.delegate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resize.delegate.d.ts","sourceRoot":"","sources":["../../../src/browser/component/resize.delegate.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resize.delegate.d.ts","sourceRoot":"","sources":["../../../src/browser/component/resize.delegate.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,IAAI,EAAE,OAAO,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;gCAMsB,oBAAoB;AAA3C,wBA6CE"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
|
|
1
|
+
/// <reference types="react" />
|
|
2
2
|
import { IMergedEnvironmentVariableCollectionDiff } from '../../common/environmentVariable';
|
|
3
3
|
interface ITerminalVariableProps {
|
|
4
4
|
diff: IMergedEnvironmentVariableCollectionDiff;
|
|
5
5
|
}
|
|
6
|
-
export declare const TerminalVariable: ({ diff }: ITerminalVariableProps) =>
|
|
6
|
+
export declare const TerminalVariable: ({ diff }: ITerminalVariableProps) => JSX.Element;
|
|
7
7
|
export {};
|
|
8
8
|
//# sourceMappingURL=terminal.variable.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.variable.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.variable.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"terminal.variable.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.variable.tsx"],"names":[],"mappings":";AAIA,OAAO,EAEL,wCAAwC,EAEzC,MAAM,kCAAkC,CAAC;AAI1C,UAAU,sBAAsB;IAC9B,IAAI,EAAE,wCAAwC,CAAC;CAChD;AAaD,eAAO,MAAM,gBAAgB,aAAc,sBAAsB,gBA+ChE,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
|
|
1
|
+
/// <reference types="react" />
|
|
2
2
|
import { IWidget, ITerminalError } from '../../common';
|
|
3
3
|
export interface IProps {
|
|
4
4
|
widget: IWidget;
|
|
5
5
|
show: boolean;
|
|
6
6
|
error: ITerminalError | undefined;
|
|
7
7
|
}
|
|
8
|
-
declare const _default: ({ widget, error, show }: IProps) =>
|
|
8
|
+
declare const _default: ({ widget, error, show }: IProps) => JSX.Element;
|
|
9
9
|
export default _default;
|
|
10
10
|
//# sourceMappingURL=terminal.widget.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.widget.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.widget.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"terminal.widget.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.widget.tsx"],"names":[],"mappings":";AAIA,OAAO,EAEL,OAAO,EACP,cAAc,EAGf,MAAM,cAAc,CAAC;AAItB,MAAM,WAAW,MAAM;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,cAAc,GAAG,SAAS,CAAC;CACnC;kDA8CwC,MAAM;AAA/C,wBAmCE"}
|
|
@@ -372,7 +372,7 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
|
|
|
372
372
|
}
|
|
373
373
|
resolveConnection(connection) {
|
|
374
374
|
if (!connection) {
|
|
375
|
-
this._attached.
|
|
375
|
+
this._attached.resolve();
|
|
376
376
|
return;
|
|
377
377
|
}
|
|
378
378
|
this._attachAddon.setConnection(connection);
|
|
@@ -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,iEAAoG;AACpG,4EAAqF;AACrF,+DAamC;AACnC,4DAAyE;AACzE,kEAA2E;AAC3E,uDAAwD;AACxD,8DAA6E;AAC7E,+DAAuE;AAEvE,sCAgBmB;AACnB,uEAA6G;AAC7G,qDAAoG;AAEpG,uDAA2D;AAC3D,qDAAyE;AACzE,uEAAwE;AACxE,qDAAgE;AAChE,yEAAwF;AACxF,mCAAgC;AAGzB,IAAM,cAAc,sBAApB,MAAM,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;QAiL3D,SAAI,GAAG,EAAE,CAAC;QAzKR,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,IAAI;QAChB,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,kBAAkB,CAAC,MAAM,EAAE,CACpC;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,kBAAkB,CAAC;oBACtB,IAAI,EAAE,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,UAAU;iBAChD,CAAC,CAAC;aACJ;iBAAM;gBACL,IAAI,CAAC,kBAAkB,CAAC;oBACtB,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,kBAAkB,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;YACzD,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,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,oCAAoC;YACpC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,qBAAqB,EAAE,CAAC;YACzF,OAAO,GAAG;gBACR,EAAE,EAAE,IAAI,CAAC,IAAI;gBACb,MAAM,EAAE,cAAc;aACvB,CAAC;SACH;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YAChB,0CAA0C;YAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAChD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACnE,IAAI,GAAG,EAAE;oBACP,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC;iBACnB;aACF;SACF;QAED,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,UAAU,CAAC,4BAA4B,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACvF,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,IAAI,CAAC,aAAa,CAAC,qBAAqB,EAAE;YAC5C,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC;SAClE;QAED,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,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,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,MAAM,oBAAoB,GAAG,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC;QAEnE,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,qFAAwC,EAAE;YACtE,oCAAoC;YACpC,MAAM,mBAAmB,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,sGAEpD,qDAA0B,CAC3B,CAAC;YACF,MAAM,cAAc,GAAG,IAAI,yCAAc,CACvC,oBAAoB,EACpB;gBACE,wBAAwB,EAAE,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC;oBAC1D,CAAC,CAAC,mBAAmB;oBACrB,CAAC,CAAC,qDAA0B;gBAC9B,yBAAyB,EAAE,IAAI,CAAC,iBAAiB,CAAC,GAAG,wGAAkD,EAAE,CAAC;gBAC1G,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,GAAG,kFAAuC,KAAK,CAAC;aACxF,EACD,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAC3C,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;SAC1C;QAED,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,CAAC,qCAAqC,CAAC,CAAC;QAC9D,MAAA,IAAI,CAAC,YAAY,0CAAE,MAAM,CAAC,qCAAqC,CAAC,CAAC;QACjE,MAAA,IAAI,CAAC,MAAM,0CAAE,MAAM,CAAC,qCAAqC,CAAC,CAAC;QAC3D,MAAA,IAAI,CAAC,KAAK,0CAAE,MAAM,CAAC,qCAAqC,CAAC,CAAC;QAC1D,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,SAAS,EAAE,CAAC;SACzB;IACH,CAAC;IAEO,KAAK,CAAC,SAAS;;QACrB,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,iBAAiB,CAAC,wBAAwB,EAAE;YAC9C,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;QAED,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,KAAmE;QAClG;;;WAGG;QACH,IAAI;YACF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;YACrC,IAAI,CAAC,OAAO,EAAE,CAAC;SAChB;QAAC,OAAO,EAAE,EAAE;YACX,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;YACF,IAAI,CAAC,eAAe,EAAE,CAAC;YACvB,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE;gBAC1B,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;aAClB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO;SACR;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;IACD,kBAAkB,CAAC,YAAgC;QACjD,IAAI,CAAC,aAAa,mCACb,IAAI,CAAC,aAAa,GAClB,YAAY,CAChB,CAAC;IACJ,CAAC;IAED,kBAAkB,CAAC,OAAyB;QAC1C,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;;AAlqBM,oCAAqB,GAAwB,IAAI,GAAG,EAAE,CAAC;AAwB9D;IAAC,IAAA,cAAS,EAAC,mBAAc,CAAC;sCACG,aAAQ;gDAAC;AAEtC;IAAC,IAAA,cAAS,EAAC,iCAAwB,CAAC;;uDACyB;AAE7D;IAAC,IAAA,cAAS,EAAC,0BAAiB,CAAC;;iDACmB;AAEhD;IAAC,IAAA,cAAS,EAAC,+BAAsB,CAAC;sCACA,+BAAsB;qDAAC;AAEzD;IAAC,IAAA,cAAS,EAAC,2BAAkB,CAAC;;mDACqB;AAEnD;IAAC,IAAA,cAAS,EAAC,6BAAe,CAAC;;sDACwB;AAEnD;IAAC,IAAA,cAAS,EAAC,uBAAc,CAAC;;6CACe;AAEzC;IAAC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;kDACoB;AAEnD;IAAC,IAAA,cAAS,EAAC,yBAAiB,CAAC;;yDACyB;AAEtD;IAAC,IAAA,cAAS,EAAC,kCAAyB,CAAC;;4CACc;AAEnD;IAAC,IAAA,cAAS,EAAC,gCAAmB,CAAC;;0DAC4B;AAE3D;IAAC,IAAA,cAAS,EAAC,6CAA4B,CAAC;sCACX,6CAA4B;gDAAC;AAE1D;IAAC,IAAA,cAAS,EAAC,mCAAgB,CAAC;;iDACmB;AAE/C;IAAC,IAAA,cAAS,EAAC,yBAAO,CAAC;;8CACgB;AAEnC;IAAC,IAAA,cAAS,EAAC,2BAAS,CAAC;;gDACD;AAEpB;IAAC,IAAA,cAAS,EAAC,qDAA+B,CAAC;;0DACwB;AAEnE;IAAC,IAAA,cAAS,EAAC,qCAAmB,CAAC;;0DAC4B;AAE3D;IAAC,IAAA,cAAS,EAAC,wCAA+B,CAAC;;sEACqC;AAEhF;IAAC,IAAA,cAAS,EAAC,iCAAwB,CAAC;;wDACuB;AAE3D;IAAC,IAAA,cAAS,EAAC,4BAAS,CAAC;;gDACgB;AAkMrC;IAAC,iBAAU;;4CACD;AAgUV;IAAC,IAAA,0BAAQ,EAAC,GAAG,CAAC;;;;qDAGb;AAzlBU,cAAc;IAD1B,IAAA,eAAU,GAAE;;GACA,cAAc,CAoqB1B;AApqBY,wCAAc;AAuqBpB,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC;;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;AAhBY,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CAgBjC;AAhBY,sDAAqB;AAkB3B,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"}
|
package/lib/common/pty.d.ts
CHANGED
|
@@ -60,6 +60,12 @@ export interface IPtyProxyRPCService {
|
|
|
60
60
|
* @param pid pty进程的pid，用于辨识pty进程
|
|
61
61
|
*/
|
|
62
62
|
$onExit(callId: number, pid: number): void;
|
|
63
|
+
/**
|
|
64
|
+
* pty数据on回调代理
|
|
65
|
+
* @param callId 指定callId的方法回调注册
|
|
66
|
+
* @param pid pty进程的pid，用于辨识pty进程
|
|
67
|
+
*/
|
|
68
|
+
$on(callId: number, pid: number, event: any): void;
|
|
63
69
|
/**
|
|
64
70
|
* resize方法RPC转发
|
|
65
71
|
* @param pid pty进程的pid，用于辨识pty进程
|
|
@@ -91,11 +97,6 @@ export interface IPtyProxyRPCService {
|
|
|
91
97
|
* @param pid pty进程的pid，用于辨识pty进程
|
|
92
98
|
*/
|
|
93
99
|
$resume(pid: number): void;
|
|
94
|
-
/**
|
|
95
|
-
* 清理 pty
|
|
96
|
-
* @param pid pty进程的pid，用于辨识pty进程
|
|
97
|
-
*/
|
|
98
|
-
$clear(pid: number): void;
|
|
99
100
|
/**
|
|
100
101
|
* 实时性通过Pid获取ProcessName
|
|
101
102
|
* @param pid pty进程的pid，用于辨识pty进程
|
package/lib/common/pty.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty.d.ts","sourceRoot":"","sources":["../../src/common/pty.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,QAAQ,IAAI,KAAK,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,EAAe,MAAM,2BAA2B,CAAC;AAE5F,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACnG,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAiB,SAAQ,QAAQ;IAChD;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,kBAAkB,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IAEnB,qBAAqB,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACvC;AAED,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAC3D,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AACvE,eAAO,MAAM,mCAAmC,wCAAwC,CAAC;AACzF,eAAO,MAAM,6BAA6B,QAAQ,CAAC;AAEnD,MAAM,WAAW,mBAAmB;IAClC;;;;;;;OAOG;IACH,MAAM,CACJ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EACvB,OAAO,EAAE,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,sBAAsB,EACzD,SAAS,CAAC,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,gBAAgB,GAC9B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAErB;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAE3C;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAE3C;;;;;OAKG;IACH,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAE1D;;;;OAIG;IACH,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAExC;;;;OAIG;IACH,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE1C;;;;OAIG;IACH,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAE1B;;;;OAIG;IACH,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAE3B;;;OAGG;IACH,
|
|
1
|
+
{"version":3,"file":"pty.d.ts","sourceRoot":"","sources":["../../src/common/pty.ts"],"names":[],"mappings":"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"}
|
package/lib/common/pty.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../src/common/pty.ts"],"names":[],"mappings":";;;AAyCa,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAC9C,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAE9C,QAAA,0BAA0B,GAAG,4BAA4B,CAAC;AAC1D,QAAA,mCAAmC,GAAG,qCAAqC,CAAC;AAC5E,QAAA,6BAA6B,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../src/common/pty.ts"],"names":[],"mappings":";;;AAyCa,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAC9C,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAE9C,QAAA,0BAA0B,GAAG,4BAA4B,CAAC;AAC1D,QAAA,mCAAmC,GAAG,qCAAqC,CAAC;AAC5E,QAAA,6BAA6B,GAAG,KAAK,CAAC;AAwPtC,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAetD,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAa5D,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AA6CvE,+BAA+B;AAClB,QAAA,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC;AA2P3E,SAAgB,cAAc,CAC5B,QAA6D;IAE7D,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAC7C,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,CAAC,IAAI,IAAI,QAAQ,CAAC,EAAE;QACvB,OAAO,QAAQ,CAAC;KACjB;IAED,OAAO;QACL,EAAE,EAAE,QAAQ,CAAC,EAAE;QACf,KAAK,EAAE,QAAQ,CAAC,KAAoB;KACrC,CAAC;AACJ,CAAC;AAfD,wCAeC"}
|
|
@@ -14,11 +14,13 @@ export interface IPtyServiceManager {
|
|
|
14
14
|
exitCode: number;
|
|
15
15
|
signal?: number;
|
|
16
16
|
}) => any): pty.IDisposable;
|
|
17
|
+
on(pid: number, event: 'data', listener: (data: string) => void): void;
|
|
18
|
+
on(pid: number, event: 'exit', listener: (exitCode: number, signal?: number) => void): void;
|
|
19
|
+
on(pid: number, event: any, listener: (data: any) => void): void;
|
|
17
20
|
resize(pid: number, columns: number, rows: number): void;
|
|
18
21
|
write(pid: number, data: string): void;
|
|
19
22
|
pause(pid: number): void;
|
|
20
23
|
resume(pid: number): void;
|
|
21
|
-
clear(pid: number): void;
|
|
22
24
|
kill(pid: number, signal?: string): void;
|
|
23
25
|
getProcess(pid: number): Promise<string>;
|
|
24
26
|
getCwd(pid: number): Promise<string | undefined>;
|
|
@@ -40,8 +42,9 @@ export declare class PtyServiceManager implements IPtyServiceManager {
|
|
|
40
42
|
exitCode: number;
|
|
41
43
|
signal?: number;
|
|
42
44
|
}) => any): pty.IDisposable;
|
|
45
|
+
on(pid: number, event: 'data', listener: (data: string) => void): void;
|
|
46
|
+
on(pid: number, event: 'exit', listener: (exitCode: number, signal?: number) => void): void;
|
|
43
47
|
resize(pid: number, columns: number, rows: number): void;
|
|
44
|
-
clear(pid: number): void;
|
|
45
48
|
write(pid: number, data: string): void;
|
|
46
49
|
kill(pid: number, signal?: string): void;
|
|
47
50
|
pause(pid: number): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty.manager.d.ts","sourceRoot":"","sources":["../../src/node/pty.manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAGhC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,gBAAgB,EAAsB,MAAM,WAAW,CAAC;AAIxG,eAAO,MAAM,sBAAsB,eAA8B,CAAC;AAElE;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,KAAK,CACH,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EACvB,UAAU,EAAE,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,sBAAsB,EAC5D,SAAS,CAAC,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,gBAAgB,GAC9B,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE7B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,GAAG,GAAG,GAAG,CAAC,WAAW,CAAC;IACnE,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,GAAG,GAAG,GAAG,CAAC,WAAW,CAAC;IAClG,
|
|
1
|
+
{"version":3,"file":"pty.manager.d.ts","sourceRoot":"","sources":["../../src/node/pty.manager.ts"],"names":[],"mappings":"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"}
|
package/lib/node/pty.manager.js
CHANGED
|
@@ -71,12 +71,13 @@ let PtyServiceManager = class PtyServiceManager {
|
|
|
71
71
|
this.ptyServiceProxy.$onExit(callId, pid);
|
|
72
72
|
return disposable;
|
|
73
73
|
}
|
|
74
|
+
on(pid, event, listener) {
|
|
75
|
+
const { callId } = this.addNewCallback(pid, listener);
|
|
76
|
+
this.ptyServiceProxy.$on(callId, pid, event);
|
|
77
|
+
}
|
|
74
78
|
resize(pid, columns, rows) {
|
|
75
79
|
this.ptyServiceProxy.$resize(pid, columns, rows);
|
|
76
80
|
}
|
|
77
|
-
clear(pid) {
|
|
78
|
-
this.ptyServiceProxy.$clear(pid);
|
|
79
|
-
}
|
|
80
81
|
write(pid, data) {
|
|
81
82
|
timeCaptureTmp = new Date().getTime();
|
|
82
83
|
if (data.includes('=')) {
|
|
@@ -132,6 +133,9 @@ class PtyProcessProxy {
|
|
|
132
133
|
async getCwd() {
|
|
133
134
|
return await this.ptyServiceManager.getCwd(this.pid);
|
|
134
135
|
}
|
|
136
|
+
on(event, listener) {
|
|
137
|
+
this.ptyServiceManager.on(this.pid, event, listener);
|
|
138
|
+
}
|
|
135
139
|
resize(columns, rows) {
|
|
136
140
|
this.ptyServiceManager.resize(this.pid, columns, rows);
|
|
137
141
|
}
|
|
@@ -147,8 +151,5 @@ class PtyProcessProxy {
|
|
|
147
151
|
resume() {
|
|
148
152
|
this.ptyServiceManager.resume(this.pid);
|
|
149
153
|
}
|
|
150
|
-
clear() {
|
|
151
|
-
this.ptyServiceManager.clear(this.pid);
|
|
152
|
-
}
|
|
153
154
|
}
|
|
154
155
|
//# sourceMappingURL=pty.manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty.manager.js","sourceRoot":"","sources":["../../src/node/pty.manager.ts"],"names":[],"mappings":";;;;AAEA,qCAAqD;AACrD,2DAAsD;AAItD,2CAA8C;AAEjC,QAAA,sBAAsB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"pty.manager.js","sourceRoot":"","sources":["../../src/node/pty.manager.ts"],"names":[],"mappings":";;;;AAEA,qCAAqD;AACrD,2DAAsD;AAItD,2CAA8C;AAEjC,QAAA,sBAAsB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AA+BlE,sDAAsD;AACtD,IAAI,cAAc,GAAG,CAAC,CAAC;AACvB,oDAAoD;AACpD,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAE9B,gDAAgD;AAChD,iDAAiD;AAE1C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAS5B,gCAAgC;IAChC;QATU,WAAM,GAAG,CAAC,CAAC;QACX,gBAAW,GAAG,IAAI,GAAG,EAAoC,CAAC;QASlE,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAES,SAAS;QACjB,MAAM,QAAQ,GAAG,KAAK,EAAE,MAAc,EAAE,GAAG,IAAI,EAAE,EAAE;YACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC9C,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,MAAM,EAAE,CAAC,CAAC,CAAC;aAClE;YACD,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;QACpB,CAAC,CAAC;QACF,IAAI,CAAC,eAAe,GAAG,IAAI,2BAAe,CAAC,QAAQ,CAAC,CAAC;IACvD,CAAC;IAED,+CAA+C;IAC/C,6EAA6E;IACrE,cAAc,CACpB,GAAW,EACX,QAAkC;QAElC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC7B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACvC,MAAM,UAAU,GAAoB;YAClC,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAClC,CAAC;SACF,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,KAAK,CACT,IAAY,EACZ,IAAuB,EACvB,OAAyD,EACzD,SAAkB,EAClB,YAA+B;QAE/B,MAAM,cAAc,GAAG,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CACvD,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,SAAS,EACT,YAAY,CACb,CAAa,CAAC;QACf,qBAAqB;QACrB,OAAO,IAAI,eAAe,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW;QAC1B,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW;QACtB,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACjD,CAAC;IAED,0BAA0B;IAC1B,MAAM,CAAC,GAAW,EAAE,QAA4B;QAC9C,MAAM,eAAe,GAAG,CAAC,SAAS,EAAE,EAAE;YACpC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACpB,IAAI,iBAAiB,EAAE;gBACrB,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,cAAc,CAAC;gBACvD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,6BAA6B,QAAQ,YAAY,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;gBAChG,iBAAiB,GAAG,KAAK,CAAC;aAC3B;QACH,CAAC,CAAC;QACF,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QACzE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC1C,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,MAAM,CAAC,GAAW,EAAE,QAA2D;QAC7E,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC1C,OAAO,UAAU,CAAC;IACpB,CAAC;IAID,EAAE,CAAC,GAAW,EAAE,KAAU,EAAE,QAA6B;QACvD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACtD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,CAAC,GAAW,EAAE,OAAe,EAAE,IAAY;QAC/C,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,GAAW,EAAE,IAAY;QAC7B,cAAc,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACtC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACtB,uBAAuB;YACvB,iBAAiB,GAAG,IAAI,CAAC;SAC1B;QACD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,CAAC,GAAW,EAAE,MAAe;QAC/B,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,GAAW;QACf,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,SAAiB;QAClC,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAC7D,CAAC;CACF,CAAA;AApHC;IAAC,IAAA,cAAS,EAAC,2BAAW,CAAC;;iDACO;AAPnB,iBAAiB;IAD7B,IAAA,eAAU,GAAE;;GACA,iBAAiB,CA0H7B;AA1HY,8CAAiB;AA4H9B,oBAAoB;AACpB,4EAA4E;AAC5E,MAAM,eAAe;IAEnB,YAAY,QAAkB,EAAE,iBAAqC;QACnE,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC;QACjC,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC;QAEpD,IAAI,CAAC,MAAM,GAAG,CAAC,QAA4B,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClG,IAAI,CAAC,MAAM,GAAG,CAAC,QAA2D,EAAE,EAAE,CAC5E,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC;IAiBD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,mBAAmB;IACnB,KAAK,CAAC,qBAAqB;QACzB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,MAAM;QACV,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAQD,EAAE,CAAC,KAAU,EAAE,QAAa;QAC1B,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IACvD,CAAC;IACD,MAAM,CAAC,OAAe,EAAE,IAAY;QAClC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACzD,CAAC;IACD,KAAK,CAAC,IAAY;QAChB,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,CAAC,MAAe;QAClB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAChD,CAAC;IACD,KAAK;QACH,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IACD,MAAM;QACJ,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1C,CAAC;CACF"}
|
|
@@ -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;AAc7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAKlD,qBACa,uBAAwB,SAAQ,iBAAiB;gBAEpC,WAAW,GAAE,iBAA2D;IAKhG,OAAO,CAAC,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;IAqChC,SAAS,CAAC,SAAS;CAGpB"}
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
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
|
-
const
|
|
8
|
+
const node_1 = require("@opensumi/ide-connection/lib/node");
|
|
9
9
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
10
10
|
const common_1 = require("../common");
|
|
11
11
|
const pty_manager_1 = require("./pty.manager");
|
|
@@ -42,15 +42,11 @@ let PtyServiceManagerRemote = class PtyServiceManagerRemote extends pty_manager_
|
|
|
42
42
|
}
|
|
43
43
|
},
|
|
44
44
|
});
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
id: 'pty-manager-remote',
|
|
48
|
-
logger: this.logger,
|
|
49
|
-
});
|
|
50
|
-
const remove = clientCenter.setChannel(channel);
|
|
45
|
+
const messageConnection = (0, node_1.createSocketConnection)(socket);
|
|
46
|
+
clientCenter.setConnection(messageConnection);
|
|
51
47
|
return ide_core_common_1.Disposable.create(() => {
|
|
52
48
|
callbackDisposed = true;
|
|
53
|
-
|
|
49
|
+
clientCenter.removeConnection(messageConnection);
|
|
54
50
|
});
|
|
55
51
|
}
|
|
56
52
|
initRemoteConnectionMode(connectOpts) {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"pty.manager.remote.js","sourceRoot":"","sources":["../../src/node/pty.manager.remote.ts"],"names":[],"mappings":"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"}
|
package/lib/node/pty.proxy.d.ts
CHANGED
|
@@ -21,8 +21,8 @@ export declare class PtyServiceProxy implements IPtyProxyRPCService {
|
|
|
21
21
|
$spawn(file: string, args: string[] | string, options: pty.IPtyForkOptions | pty.IWindowsPtyForkOptions, longSessionId?: string, spawnOptions?: IPtySpawnOptions): any;
|
|
22
22
|
$onData(callId: number, pid: number): void;
|
|
23
23
|
$onExit(callId: number, pid: number): void;
|
|
24
|
+
$on(callId: number, pid: number, event: any): void;
|
|
24
25
|
$resize(pid: number, columns: number, rows: number): void;
|
|
25
|
-
$clear(pid: number): void;
|
|
26
26
|
$write(pid: number, data: string): void;
|
|
27
27
|
$kill(pid: number, signal?: string): void;
|
|
28
28
|
$pause(pid: number): void;
|
|
@@ -33,7 +33,7 @@ export declare class PtyServiceProxy implements IPtyProxyRPCService {
|
|
|
33
33
|
export declare class PtyServiceProxyRPCProvider {
|
|
34
34
|
private ptyServiceProxy;
|
|
35
35
|
private readonly ptyServiceCenter;
|
|
36
|
-
private readonly
|
|
36
|
+
private readonly debugLogger;
|
|
37
37
|
private serverListenOptions;
|
|
38
38
|
private server;
|
|
39
39
|
constructor(listenOptions?: ListenOptions);
|
|
@@ -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;
|
|
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;AAIjD,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAOhC,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAKjB,MAAM,WAAW,CAAC;AAqCnB;;;;;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,EACtB,YAAY,CAAC,EAAE,gBAAgB,GAC9B,GAAG;IAgEN,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;IAKhC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAGlD;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
|
@@ -8,7 +8,7 @@ const net_1 = tslib_1.__importDefault(require("net"));
|
|
|
8
8
|
const util_1 = require("util");
|
|
9
9
|
const pty = tslib_1.__importStar(require("node-pty"));
|
|
10
10
|
const ide_connection_1 = require("@opensumi/ide-connection");
|
|
11
|
-
const
|
|
11
|
+
const node_1 = require("@opensumi/ide-connection/lib/node");
|
|
12
12
|
const ide_core_node_1 = require("@opensumi/ide-core-node");
|
|
13
13
|
const platform_1 = require("@opensumi/ide-utils/lib/platform");
|
|
14
14
|
const common_1 = require("../common");
|
|
@@ -167,13 +167,15 @@ class PtyServiceProxy {
|
|
|
167
167
|
(_a = this.ptyDisposableMap.get(pid)) === null || _a === void 0 ? void 0 : _a.push(onExitDisposable);
|
|
168
168
|
}
|
|
169
169
|
}
|
|
170
|
-
$
|
|
170
|
+
$on(callId, pid, event) {
|
|
171
171
|
const ptyInstance = this.ptyInstanceMap.get(pid);
|
|
172
|
-
ptyInstance === null || ptyInstance === void 0 ? void 0 : ptyInstance.
|
|
172
|
+
ptyInstance === null || ptyInstance === void 0 ? void 0 : ptyInstance.on(event, (e) => {
|
|
173
|
+
this.$callback(callId, e);
|
|
174
|
+
});
|
|
173
175
|
}
|
|
174
|
-
$
|
|
176
|
+
$resize(pid, columns, rows) {
|
|
175
177
|
const ptyInstance = this.ptyInstanceMap.get(pid);
|
|
176
|
-
ptyInstance === null || ptyInstance === void 0 ? void 0 : ptyInstance.
|
|
178
|
+
ptyInstance === null || ptyInstance === void 0 ? void 0 : ptyInstance.resize(columns, rows);
|
|
177
179
|
}
|
|
178
180
|
$write(pid, data) {
|
|
179
181
|
const ptyInstance = this.ptyInstanceMap.get(pid);
|
|
@@ -207,11 +209,12 @@ exports.PtyServiceProxy = PtyServiceProxy;
|
|
|
207
209
|
// 需要单独运行PtyServer的时候集成此Class然后运行initServer
|
|
208
210
|
class PtyServiceProxyRPCProvider {
|
|
209
211
|
constructor(listenOptions = { port: common_1.PTY_SERVICE_PROXY_SERVER_PORT }) {
|
|
210
|
-
this.
|
|
212
|
+
this.debugLogger = (0, ide_core_node_1.getDebugLogger)();
|
|
211
213
|
this.serverListenOptions = listenOptions;
|
|
212
214
|
this.ptyServiceCenter = new ide_connection_1.RPCServiceCenter();
|
|
213
215
|
const { createRPCService, getRPCService } = (0, ide_connection_1.initRPCService)(this.ptyServiceCenter);
|
|
214
|
-
const $callback = getRPCService(common_1.PTY_SERVICE_PROXY_CALLBACK_PROTOCOL)
|
|
216
|
+
const $callback = getRPCService(common_1.PTY_SERVICE_PROXY_CALLBACK_PROTOCOL)
|
|
217
|
+
.$callback;
|
|
215
218
|
this.ptyServiceProxy = new PtyServiceProxy($callback);
|
|
216
219
|
createRPCService(common_1.PTY_SERVICE_PROXY_PROTOCOL, this.ptyServiceProxy);
|
|
217
220
|
}
|
|
@@ -222,7 +225,7 @@ class PtyServiceProxyRPCProvider {
|
|
|
222
225
|
createSocket() {
|
|
223
226
|
this.server = net_1.default.createServer();
|
|
224
227
|
this.server.on('connection', (connection) => {
|
|
225
|
-
this.
|
|
228
|
+
this.debugLogger.log('ptyServiceCenter: new connections coming in');
|
|
226
229
|
this.setProxyConnection(connection);
|
|
227
230
|
});
|
|
228
231
|
// const ipcPath = normalizedIpcHandlerPath()
|
|
@@ -231,7 +234,7 @@ class PtyServiceProxyRPCProvider {
|
|
|
231
234
|
fs_1.default.unlinkSync(this.serverListenOptions.path); // 兜底逻辑，如果之前Server没有清除掉SOCK文件的话，那就先清除
|
|
232
235
|
}
|
|
233
236
|
this.server.listen(this.serverListenOptions);
|
|
234
|
-
this.
|
|
237
|
+
this.debugLogger.log('ptyServiceCenter: listening on', this.serverListenOptions);
|
|
235
238
|
}
|
|
236
239
|
// Close Server, release UNIX DOMAIN SOCKET
|
|
237
240
|
bindProcessHandler() {
|
|
@@ -248,15 +251,11 @@ class PtyServiceProxyRPCProvider {
|
|
|
248
251
|
process.exit(0);
|
|
249
252
|
});
|
|
250
253
|
}
|
|
251
|
-
setProxyConnection(
|
|
252
|
-
const
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
});
|
|
257
|
-
const remove = this.ptyServiceCenter.setChannel(channel);
|
|
258
|
-
socket.on('close', () => {
|
|
259
|
-
remove.dispose();
|
|
254
|
+
setProxyConnection(connection) {
|
|
255
|
+
const serverConnection = (0, node_1.createSocketConnection)(connection);
|
|
256
|
+
this.ptyServiceCenter.setConnection(serverConnection);
|
|
257
|
+
connection.on('close', () => {
|
|
258
|
+
this.ptyServiceCenter.removeConnection(serverConnection);
|
|
260
259
|
});
|
|
261
260
|
}
|
|
262
261
|
get $ptyServiceProxy() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty.proxy.js","sourceRoot":"","sources":["../../src/node/pty.proxy.ts"],"names":[],"mappings":";;;;AAAA,0EAAyC;AACzC,oDAAoB;AACpB,sDAAiD;
|
|
1
|
+
{"version":3,"file":"pty.proxy.js","sourceRoot":"","sources":["../../src/node/pty.proxy.ts"],"names":[],"mappings":"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"}
|
package/lib/node/shell.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/node/shell.ts"],"names":[],"mappings":";AAYA,OAAO,EAAE,mBAAmB,EAAwB,eAAe,EAAQ,MAAM,2BAA2B,CAAC;AAG7G,eAAO,MAAM,sBAAsB,UAQlC,CAAC;AAEF,wBAAsB,kBAAkB,sBASvC;AAED,eAAO,MAAM,MAAM,MAAa,MAAM,gCAOrC,CAAC;AAEF,wBAAsB,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAM/F;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAW3E;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG,CAIhF;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,GAAG,CAAC,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,EAAE,EAChB,GAAG,GAAE,mBAAwD,GAC5D,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmD7B;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAO9C;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CASzE;
|
|
1
|
+
{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/node/shell.ts"],"names":[],"mappings":";AAYA,OAAO,EAAE,mBAAmB,EAAwB,eAAe,EAAQ,MAAM,2BAA2B,CAAC;AAG7G,eAAO,MAAM,sBAAsB,UAQlC,CAAC;AAEF,wBAAsB,kBAAkB,sBASvC;AAED,eAAO,MAAM,MAAM,MAAa,MAAM,gCAOrC,CAAC;AAEF,wBAAsB,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAM/F;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAW3E;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG,CAIhF;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,GAAG,CAAC,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,EAAE,EAChB,GAAG,GAAE,mBAAwD,GAC5D,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmD7B;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAO9C;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CASzE;AAoCD,wBAAgB,eAAe,CAAC,GAAG,oBAAc,GAAG,MAAM,CAEzD"}
|
package/lib/node/shell.js
CHANGED
|
@@ -163,10 +163,7 @@ function getSystemShellUnixLike(os, env = process.env) {
|
|
|
163
163
|
try {
|
|
164
164
|
// It's possible for $SHELL to be unset, this API reads /etc/passwd. See https://github.com/github/codespaces/issues/1639
|
|
165
165
|
// Node docs: "Throws a SystemError if a user has no username or homedir."
|
|
166
|
-
|
|
167
|
-
if (info.shell) {
|
|
168
|
-
unixLikeTerminal = info.shell;
|
|
169
|
-
}
|
|
166
|
+
unixLikeTerminal = (0, os_1.userInfo)().shell;
|
|
170
167
|
}
|
|
171
168
|
catch (err) { }
|
|
172
169
|
}
|
package/lib/node/shell.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/node/shell.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/node/shell.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.27.3-next-
|
|
3
|
+
"version": "2.27.3-next-1706520813.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,12 +17,12 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-connection": "2.27.3-next-
|
|
21
|
-
"@opensumi/ide-core-common": "2.27.3-next-
|
|
22
|
-
"@opensumi/ide-core-node": "2.27.3-next-
|
|
23
|
-
"@opensumi/ide-file-service": "2.27.3-next-
|
|
20
|
+
"@opensumi/ide-connection": "2.27.3-next-1706520813.0",
|
|
21
|
+
"@opensumi/ide-core-common": "2.27.3-next-1706520813.0",
|
|
22
|
+
"@opensumi/ide-core-node": "2.27.3-next-1706520813.0",
|
|
23
|
+
"@opensumi/ide-file-service": "2.27.3-next-1706520813.0",
|
|
24
24
|
"event-kit": "^2.5.3",
|
|
25
|
-
"node-pty": "
|
|
25
|
+
"node-pty": "0.11.0-beta19",
|
|
26
26
|
"os-locale": "^4.0.0",
|
|
27
27
|
"xterm": "5.2.0",
|
|
28
28
|
"xterm-addon-canvas": "0.4.0",
|
|
@@ -31,19 +31,19 @@
|
|
|
31
31
|
"xterm-addon-webgl": "0.15.0"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@opensumi/ide-components": "2.27.3-next-
|
|
35
|
-
"@opensumi/ide-core-browser": "2.27.3-next-
|
|
34
|
+
"@opensumi/ide-components": "2.27.3-next-1706520813.0",
|
|
35
|
+
"@opensumi/ide-core-browser": "2.27.3-next-1706520813.0",
|
|
36
36
|
"@opensumi/ide-dev-tool": "1.3.1",
|
|
37
|
-
"@opensumi/ide-editor": "2.27.3-next-
|
|
38
|
-
"@opensumi/ide-main-layout": "2.27.3-next-
|
|
39
|
-
"@opensumi/ide-overlay": "2.27.3-next-
|
|
40
|
-
"@opensumi/ide-status-bar": "2.27.3-next-
|
|
41
|
-
"@opensumi/ide-theme": "2.27.3-next-
|
|
42
|
-
"@opensumi/ide-variable": "2.27.3-next-
|
|
43
|
-
"@opensumi/ide-workspace": "2.27.3-next-
|
|
37
|
+
"@opensumi/ide-editor": "2.27.3-next-1706520813.0",
|
|
38
|
+
"@opensumi/ide-main-layout": "2.27.3-next-1706520813.0",
|
|
39
|
+
"@opensumi/ide-overlay": "2.27.3-next-1706520813.0",
|
|
40
|
+
"@opensumi/ide-status-bar": "2.27.3-next-1706520813.0",
|
|
41
|
+
"@opensumi/ide-theme": "2.27.3-next-1706520813.0",
|
|
42
|
+
"@opensumi/ide-variable": "2.27.3-next-1706520813.0",
|
|
43
|
+
"@opensumi/ide-workspace": "2.27.3-next-1706520813.0",
|
|
44
44
|
"@types/event-kit": "^2.4.0",
|
|
45
45
|
"@types/http-proxy": "^1.17.2",
|
|
46
46
|
"http-proxy": "^1.18.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "ab440e0a62600ed6d6b577fc520d8b42db9d6394"
|
|
49
49
|
}
|
|
@@ -576,7 +576,7 @@ export class TerminalClient extends Disposable implements ITerminalClient {
|
|
|
576
576
|
|
|
577
577
|
resolveConnection(connection: ITerminalConnection | undefined) {
|
|
578
578
|
if (!connection) {
|
|
579
|
-
this._attached.
|
|
579
|
+
this._attached.resolve();
|
|
580
580
|
return;
|
|
581
581
|
}
|
|
582
582
|
|
package/src/common/pty.ts
CHANGED
|
@@ -77,6 +77,13 @@ export interface IPtyProxyRPCService {
|
|
|
77
77
|
*/
|
|
78
78
|
$onExit(callId: number, pid: number): void;
|
|
79
79
|
|
|
80
|
+
/**
|
|
81
|
+
* pty数据on回调代理
|
|
82
|
+
* @param callId 指定callId的方法回调注册
|
|
83
|
+
* @param pid pty进程的pid，用于辨识pty进程
|
|
84
|
+
*/
|
|
85
|
+
$on(callId: number, pid: number, event: any): void;
|
|
86
|
+
|
|
80
87
|
/**
|
|
81
88
|
* resize方法RPC转发
|
|
82
89
|
* @param pid pty进程的pid，用于辨识pty进程
|
|
@@ -113,12 +120,6 @@ export interface IPtyProxyRPCService {
|
|
|
113
120
|
*/
|
|
114
121
|
$resume(pid: number): void;
|
|
115
122
|
|
|
116
|
-
/**
|
|
117
|
-
* 清理 pty
|
|
118
|
-
* @param pid pty进程的pid，用于辨识pty进程
|
|
119
|
-
*/
|
|
120
|
-
$clear(pid: number): void;
|
|
121
|
-
|
|
122
123
|
/**
|
|
123
124
|
* 实时性通过Pid获取ProcessName
|
|
124
125
|
* @param pid pty进程的pid，用于辨识pty进程
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import net, { SocketConnectOpts } from 'net';
|
|
2
2
|
|
|
3
3
|
import { Injectable, Optional } from '@opensumi/di';
|
|
4
|
-
import { RPCServiceCenter,
|
|
5
|
-
import {
|
|
4
|
+
import { RPCServiceCenter, initRPCService } from '@opensumi/ide-connection';
|
|
5
|
+
import { createSocketConnection } from '@opensumi/ide-connection/lib/node';
|
|
6
6
|
import { Disposable, IDisposable } from '@opensumi/ide-core-common';
|
|
7
7
|
|
|
8
8
|
import {
|
|
@@ -50,15 +50,11 @@ export class PtyServiceManagerRemote extends PtyServiceManager {
|
|
|
50
50
|
},
|
|
51
51
|
});
|
|
52
52
|
|
|
53
|
-
const
|
|
54
|
-
|
|
55
|
-
id: 'pty-manager-remote',
|
|
56
|
-
logger: this.logger,
|
|
57
|
-
});
|
|
58
|
-
const remove = clientCenter.setChannel(channel);
|
|
53
|
+
const messageConnection = createSocketConnection(socket);
|
|
54
|
+
clientCenter.setConnection(messageConnection);
|
|
59
55
|
return Disposable.create(() => {
|
|
60
56
|
callbackDisposed = true;
|
|
61
|
-
|
|
57
|
+
clientCenter.removeConnection(messageConnection);
|
|
62
58
|
});
|
|
63
59
|
}
|
|
64
60
|
|
package/src/node/pty.manager.ts
CHANGED
|
@@ -25,11 +25,13 @@ export interface IPtyServiceManager {
|
|
|
25
25
|
// 因为 PtyServiceManage 是 PtyClient 端统筹所有 Pty 的管理类，因此每一个具体方法的调用都需要传入 pid 来对指定 pid 做某些操作
|
|
26
26
|
onData(pid: number, listener: (e: string) => any): pty.IDisposable;
|
|
27
27
|
onExit(pid: number, listener: (e: { exitCode: number; signal?: number }) => any): pty.IDisposable;
|
|
28
|
+
on(pid: number, event: 'data', listener: (data: string) => void): void;
|
|
29
|
+
on(pid: number, event: 'exit', listener: (exitCode: number, signal?: number) => void): void;
|
|
30
|
+
on(pid: number, event: any, listener: (data: any) => void): void;
|
|
28
31
|
resize(pid: number, columns: number, rows: number): void;
|
|
29
32
|
write(pid: number, data: string): void;
|
|
30
33
|
pause(pid: number): void;
|
|
31
34
|
resume(pid: number): void;
|
|
32
|
-
clear(pid: number): void;
|
|
33
35
|
kill(pid: number, signal?: string): void;
|
|
34
36
|
getProcess(pid: number): Promise<string>;
|
|
35
37
|
getCwd(pid: number): Promise<string | undefined>;
|
|
@@ -125,19 +127,21 @@ export class PtyServiceManager implements IPtyServiceManager {
|
|
|
125
127
|
this.ptyServiceProxy.$onData(callId, pid);
|
|
126
128
|
return disposable;
|
|
127
129
|
}
|
|
128
|
-
|
|
129
130
|
onExit(pid: number, listener: (e: { exitCode: number; signal?: number }) => any): pty.IDisposable {
|
|
130
131
|
const { callId, disposable } = this.addNewCallback(pid, listener);
|
|
131
132
|
this.ptyServiceProxy.$onExit(callId, pid);
|
|
132
133
|
return disposable;
|
|
133
134
|
}
|
|
134
135
|
|
|
135
|
-
|
|
136
|
-
|
|
136
|
+
on(pid: number, event: 'data', listener: (data: string) => void): void;
|
|
137
|
+
on(pid: number, event: 'exit', listener: (exitCode: number, signal?: number) => void): void;
|
|
138
|
+
on(pid: number, event: any, listener: (data: any) => void): void {
|
|
139
|
+
const { callId } = this.addNewCallback(pid, listener);
|
|
140
|
+
this.ptyServiceProxy.$on(callId, pid, event);
|
|
137
141
|
}
|
|
138
142
|
|
|
139
|
-
|
|
140
|
-
this.ptyServiceProxy.$
|
|
143
|
+
resize(pid: number, columns: number, rows: number): void {
|
|
144
|
+
this.ptyServiceProxy.$resize(pid, columns, rows);
|
|
141
145
|
}
|
|
142
146
|
|
|
143
147
|
write(pid: number, data: string): void {
|
|
@@ -216,6 +220,12 @@ class PtyProcessProxy implements IPtyProcessProxy {
|
|
|
216
220
|
onData: pty.IEvent<string>;
|
|
217
221
|
onExit: pty.IEvent<{ exitCode: number; signal?: number }>;
|
|
218
222
|
|
|
223
|
+
// 将 pid 维护到对象内部，对外暴露 NodePty 的标准 api，因此在调用的时候不需要显式传入 pid
|
|
224
|
+
on(event: 'data', listener: (data: string) => void): void;
|
|
225
|
+
on(event: 'exit', listener: (exitCode: number, signal?: number) => void): void;
|
|
226
|
+
on(event: any, listener: any): void {
|
|
227
|
+
this.ptyServiceManager.on(this.pid, event, listener);
|
|
228
|
+
}
|
|
219
229
|
resize(columns: number, rows: number): void {
|
|
220
230
|
this.ptyServiceManager.resize(this.pid, columns, rows);
|
|
221
231
|
}
|
|
@@ -231,7 +241,4 @@ class PtyProcessProxy implements IPtyProcessProxy {
|
|
|
231
241
|
resume(): void {
|
|
232
242
|
this.ptyServiceManager.resume(this.pid);
|
|
233
243
|
}
|
|
234
|
-
clear(): void {
|
|
235
|
-
this.ptyServiceManager.clear(this.pid);
|
|
236
|
-
}
|
|
237
244
|
}
|
package/src/node/pty.proxy.ts
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import childProcess from 'child_process';
|
|
2
2
|
import fs from 'fs';
|
|
3
3
|
import net, { ListenOptions, Server } from 'net';
|
|
4
|
+
import os from 'os';
|
|
4
5
|
import { promisify } from 'util';
|
|
5
6
|
|
|
6
7
|
import * as pty from 'node-pty';
|
|
7
8
|
|
|
8
|
-
import { RPCServiceCenter,
|
|
9
|
-
import {
|
|
9
|
+
import { RPCServiceCenter, initRPCService } from '@opensumi/ide-connection';
|
|
10
|
+
import { createSocketConnection } from '@opensumi/ide-connection/lib/node';
|
|
10
11
|
import { DisposableCollection, getDebugLogger } from '@opensumi/ide-core-node';
|
|
11
12
|
import { isMacintosh, isLinux } from '@opensumi/ide-utils/lib/platform';
|
|
12
13
|
|
|
@@ -200,14 +201,16 @@ export class PtyServiceProxy implements IPtyProxyRPCService {
|
|
|
200
201
|
}
|
|
201
202
|
}
|
|
202
203
|
|
|
203
|
-
$
|
|
204
|
+
$on(callId: number, pid: number, event: any): void {
|
|
204
205
|
const ptyInstance = this.ptyInstanceMap.get(pid);
|
|
205
|
-
ptyInstance?.
|
|
206
|
+
ptyInstance?.on(event, (e) => {
|
|
207
|
+
this.$callback(callId, e);
|
|
208
|
+
});
|
|
206
209
|
}
|
|
207
210
|
|
|
208
|
-
$
|
|
211
|
+
$resize(pid: number, columns: number, rows: number): void {
|
|
209
212
|
const ptyInstance = this.ptyInstanceMap.get(pid);
|
|
210
|
-
ptyInstance?.
|
|
213
|
+
ptyInstance?.resize(columns, rows);
|
|
211
214
|
}
|
|
212
215
|
|
|
213
216
|
$write(pid: number, data: string): void {
|
|
@@ -248,17 +251,16 @@ export class PtyServiceProxy implements IPtyProxyRPCService {
|
|
|
248
251
|
export class PtyServiceProxyRPCProvider {
|
|
249
252
|
private ptyServiceProxy: PtyServiceProxy;
|
|
250
253
|
private readonly ptyServiceCenter: RPCServiceCenter;
|
|
251
|
-
private readonly
|
|
254
|
+
private readonly debugLogger = getDebugLogger();
|
|
252
255
|
private serverListenOptions: ListenOptions; // HOST + PORT or UNIX SOCK PATH
|
|
253
256
|
private server: Server;
|
|
254
257
|
|
|
255
258
|
constructor(listenOptions: ListenOptions = { port: PTY_SERVICE_PROXY_SERVER_PORT }) {
|
|
256
259
|
this.serverListenOptions = listenOptions;
|
|
257
260
|
this.ptyServiceCenter = new RPCServiceCenter();
|
|
258
|
-
const { createRPCService, getRPCService } = initRPCService
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
const $callback = getRPCService(PTY_SERVICE_PROXY_CALLBACK_PROTOCOL).$callback;
|
|
261
|
+
const { createRPCService, getRPCService } = initRPCService(this.ptyServiceCenter);
|
|
262
|
+
const $callback: (callId: number, ...args) => void = (getRPCService(PTY_SERVICE_PROXY_CALLBACK_PROTOCOL) as any)
|
|
263
|
+
.$callback;
|
|
262
264
|
|
|
263
265
|
this.ptyServiceProxy = new PtyServiceProxy($callback);
|
|
264
266
|
|
|
@@ -273,7 +275,7 @@ export class PtyServiceProxyRPCProvider {
|
|
|
273
275
|
private createSocket() {
|
|
274
276
|
this.server = net.createServer();
|
|
275
277
|
this.server.on('connection', (connection) => {
|
|
276
|
-
this.
|
|
278
|
+
this.debugLogger.log('ptyServiceCenter: new connections coming in');
|
|
277
279
|
this.setProxyConnection(connection);
|
|
278
280
|
});
|
|
279
281
|
// const ipcPath = normalizedIpcHandlerPath()
|
|
@@ -282,7 +284,7 @@ export class PtyServiceProxyRPCProvider {
|
|
|
282
284
|
fs.unlinkSync(this.serverListenOptions.path); // 兜底逻辑，如果之前Server没有清除掉SOCK文件的话，那就先清除
|
|
283
285
|
}
|
|
284
286
|
this.server.listen(this.serverListenOptions);
|
|
285
|
-
this.
|
|
287
|
+
this.debugLogger.log('ptyServiceCenter: listening on', this.serverListenOptions);
|
|
286
288
|
}
|
|
287
289
|
|
|
288
290
|
// Close Server, release UNIX DOMAIN SOCKET
|
|
@@ -301,16 +303,11 @@ export class PtyServiceProxyRPCProvider {
|
|
|
301
303
|
});
|
|
302
304
|
}
|
|
303
305
|
|
|
304
|
-
private setProxyConnection(
|
|
305
|
-
const
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
});
|
|
310
|
-
|
|
311
|
-
const remove = this.ptyServiceCenter.setChannel(channel);
|
|
312
|
-
socket.on('close', () => {
|
|
313
|
-
remove.dispose();
|
|
306
|
+
private setProxyConnection(connection: net.Socket) {
|
|
307
|
+
const serverConnection = createSocketConnection(connection);
|
|
308
|
+
this.ptyServiceCenter.setConnection(serverConnection);
|
|
309
|
+
connection.on('close', () => {
|
|
310
|
+
this.ptyServiceCenter.removeConnection(serverConnection);
|
|
314
311
|
});
|
|
315
312
|
}
|
|
316
313
|
|
package/src/node/shell.ts
CHANGED
|
@@ -172,10 +172,7 @@ function getSystemShellUnixLike(os: OperatingSystem, env = process.env): string
|
|
|
172
172
|
try {
|
|
173
173
|
// It's possible for $SHELL to be unset, this API reads /etc/passwd. See https://github.com/github/codespaces/issues/1639
|
|
174
174
|
// Node docs: "Throws a SystemError if a user has no username or homedir."
|
|
175
|
-
|
|
176
|
-
if (info.shell) {
|
|
177
|
-
unixLikeTerminal = info.shell;
|
|
178
|
-
}
|
|
175
|
+
unixLikeTerminal = userInfo().shell;
|
|
179
176
|
} catch (err) {}
|
|
180
177
|
}
|
|
181
178
|
|