@theia/remote 1.75.0-next.4 → 1.75.0-next.43
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/electron-browser/port-forwarding/port-forwarding-widget.js +23 -46
- package/lib/electron-browser/port-forwarding/port-forwarding-widget.js.map +1 -1
- package/lib/electron-browser/remote-local-workspace-contribution.d.ts +1 -1
- package/lib/electron-browser/remote-local-workspace-contribution.d.ts.map +1 -1
- package/lib/electron-browser/remote-local-workspace-contribution.js +1 -0
- package/lib/electron-browser/remote-local-workspace-contribution.js.map +1 -1
- package/lib/electron-node/remote-auto-shutdown-service.js +1 -0
- package/lib/electron-node/remote-auto-shutdown-service.js.map +1 -1
- package/lib/electron-node/ssh/ssh-identity-file-collector.d.ts +2 -0
- package/lib/electron-node/ssh/ssh-identity-file-collector.d.ts.map +1 -1
- package/lib/electron-node/ssh/ssh-identity-file-collector.js +7 -1
- package/lib/electron-node/ssh/ssh-identity-file-collector.js.map +1 -1
- package/package.json +7 -7
- package/src/electron-browser/remote-local-workspace-contribution.ts +3 -3
- package/src/electron-node/remote-auto-shutdown-service.ts +2 -2
- package/src/electron-node/ssh/ssh-identity-file-collector.ts +6 -2
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PortForwardingWidget = exports.PORT_FORWARDING_WIDGET_ID = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const jsx_runtime_1 = require("@theia/core/shared/react/jsx-runtime");
|
|
2
6
|
// *****************************************************************************
|
|
3
7
|
// Copyright (C) 2024 TypeFox and others.
|
|
4
8
|
//
|
|
@@ -14,9 +18,6 @@
|
|
|
14
18
|
//
|
|
15
19
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
20
|
// *****************************************************************************
|
|
17
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.PortForwardingWidget = exports.PORT_FORWARDING_WIDGET_ID = void 0;
|
|
19
|
-
const tslib_1 = require("tslib");
|
|
20
21
|
const React = require("@theia/core/shared/react");
|
|
21
22
|
const browser_1 = require("@theia/core/lib/browser");
|
|
22
23
|
const core_1 = require("@theia/core");
|
|
@@ -36,59 +37,35 @@ let PortForwardingWidget = class PortForwardingWidget extends browser_1.ReactWid
|
|
|
36
37
|
}
|
|
37
38
|
render() {
|
|
38
39
|
if (this.portForwardingService.forwardedPorts.length === 0) {
|
|
39
|
-
return
|
|
40
|
-
React.createElement("p", { style: { marginLeft: 'calc(var(--theia-ui-padding) * 2)' } }, core_1.nls.localizeByDefault('No forwarded ports. Forward a port to access your locally running services over the internet.\n[Forward a Port]({0})').split('\n')[0]),
|
|
41
|
-
this.renderForwardPortButton());
|
|
40
|
+
return (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("p", { style: { marginLeft: 'calc(var(--theia-ui-padding) * 2)' }, children: core_1.nls.localizeByDefault('No forwarded ports. Forward a port to access your locally running services over the internet.\n[Forward a Port]({0})').split('\n')[0] }), this.renderForwardPortButton()] });
|
|
42
41
|
}
|
|
43
|
-
return
|
|
44
|
-
React.createElement("table", { className: 'port-table' },
|
|
45
|
-
React.createElement("thead", null,
|
|
46
|
-
React.createElement("tr", null,
|
|
47
|
-
React.createElement("th", { className: 'port-table-header' }, core_1.nls.localizeByDefault('Port')),
|
|
48
|
-
React.createElement("th", { className: 'port-table-header' }, core_1.nls.localizeByDefault('Label')),
|
|
49
|
-
React.createElement("th", { className: 'port-table-header' }, core_1.nls.localizeByDefault('Address')),
|
|
50
|
-
React.createElement("th", { className: 'port-table-header' }, core_1.nls.localizeByDefault('Origin')))),
|
|
51
|
-
React.createElement("tbody", null,
|
|
52
|
-
this.portForwardingService.forwardedPorts.map(port => (React.createElement("tr", { key: port.address && port.localPort ? `${port.address}:${port.localPort}` : 'editing' },
|
|
53
|
-
this.renderPortColumn(port),
|
|
54
|
-
React.createElement("td", null, port.label ?? ''),
|
|
55
|
-
this.renderAddressColumn(port),
|
|
56
|
-
React.createElement("td", null, port.origin ? core_1.nls.localizeByDefault(port.origin) : '')))),
|
|
57
|
-
!this.portForwardingService.forwardedPorts.some(port => port.editing) && React.createElement("tr", null,
|
|
58
|
-
React.createElement("td", null, this.renderForwardPortButton())))));
|
|
42
|
+
return (0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsxs)("table", { className: 'port-table', children: [(0, jsx_runtime_1.jsx)("thead", { children: (0, jsx_runtime_1.jsxs)("tr", { children: [(0, jsx_runtime_1.jsx)("th", { className: 'port-table-header', children: core_1.nls.localizeByDefault('Port') }), (0, jsx_runtime_1.jsx)("th", { className: 'port-table-header', children: core_1.nls.localizeByDefault('Label') }), (0, jsx_runtime_1.jsx)("th", { className: 'port-table-header', children: core_1.nls.localizeByDefault('Address') }), (0, jsx_runtime_1.jsx)("th", { className: 'port-table-header', children: core_1.nls.localizeByDefault('Origin') })] }) }), (0, jsx_runtime_1.jsxs)("tbody", { children: [this.portForwardingService.forwardedPorts.map(port => ((0, jsx_runtime_1.jsxs)("tr", { children: [this.renderPortColumn(port), (0, jsx_runtime_1.jsx)("td", { children: port.label ?? '' }), this.renderAddressColumn(port), (0, jsx_runtime_1.jsx)("td", { children: port.origin ? core_1.nls.localizeByDefault(port.origin) : '' })] }, port.address && port.localPort ? `${port.address}:${port.localPort}` : 'editing'))), !this.portForwardingService.forwardedPorts.some(port => port.editing) && (0, jsx_runtime_1.jsx)("tr", { children: (0, jsx_runtime_1.jsx)("td", { children: this.renderForwardPortButton() }) })] })] }) });
|
|
59
43
|
}
|
|
60
44
|
renderForwardPortButton() {
|
|
61
|
-
return
|
|
45
|
+
return (0, jsx_runtime_1.jsx)("button", { className: 'theia-button', onClick: () => {
|
|
62
46
|
this.portForwardingService.forwardNewPort('User Forwarded');
|
|
63
47
|
this.update();
|
|
64
|
-
}
|
|
48
|
+
}, children: core_1.nls.localizeByDefault('Forward a Port') });
|
|
65
49
|
}
|
|
66
50
|
renderAddressColumn(port) {
|
|
67
51
|
const address = `${port.address ?? '0.0.0.0'}:${port.localPort}`;
|
|
68
|
-
return
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
React.createElement("span", { className: 'codicon codicon-clippy action-label', title: core_1.nls.localizeByDefault('Copy Local Address'), onClick: () => {
|
|
78
|
-
this.clipboardService.writeText(address);
|
|
79
|
-
} })));
|
|
52
|
+
return (0, jsx_runtime_1.jsx)("td", { children: (0, jsx_runtime_1.jsxs)("div", { className: 'button-cell', children: [(0, jsx_runtime_1.jsx)("span", { style: { flexGrow: 1 }, className: 'forwarded-address', onClick: async (e) => {
|
|
53
|
+
if (e.ctrlKey) {
|
|
54
|
+
const uri = new core_1.URI(`http://${address}`);
|
|
55
|
+
(await this.openerService.getOpener(uri)).open(uri);
|
|
56
|
+
}
|
|
57
|
+
}, title: core_1.nls.localizeByDefault('Follow link') + ' (ctrl/cmd + click)', children: port.localPort ? address : '' }), port.localPort &&
|
|
58
|
+
(0, jsx_runtime_1.jsx)("span", { className: 'codicon codicon-clippy action-label', title: core_1.nls.localizeByDefault('Copy Local Address'), onClick: () => {
|
|
59
|
+
this.clipboardService.writeText(address);
|
|
60
|
+
} })] }) });
|
|
80
61
|
}
|
|
81
62
|
renderPortColumn(port) {
|
|
82
63
|
return port.editing ?
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
React.createElement("span", { className: 'codicon codicon-close action-label', title: core_1.nls.localizeByDefault('Stop Forwarding Port'), onClick: () => {
|
|
89
|
-
this.portForwardingService.removePort(port);
|
|
90
|
-
this.update();
|
|
91
|
-
} })));
|
|
64
|
+
(0, jsx_runtime_1.jsx)("td", { children: (0, jsx_runtime_1.jsx)(PortEditingInput, { port: port, service: this.portForwardingService }) }) :
|
|
65
|
+
(0, jsx_runtime_1.jsx)("td", { children: (0, jsx_runtime_1.jsxs)("div", { className: 'button-cell', children: [(0, jsx_runtime_1.jsx)("span", { style: { flexGrow: 1 }, children: port.localPort }), (0, jsx_runtime_1.jsx)("span", { className: 'codicon codicon-close action-label', title: core_1.nls.localizeByDefault('Stop Forwarding Port'), onClick: () => {
|
|
66
|
+
this.portForwardingService.removePort(port);
|
|
67
|
+
this.update();
|
|
68
|
+
} })] }) });
|
|
92
69
|
}
|
|
93
70
|
};
|
|
94
71
|
exports.PortForwardingWidget = PortForwardingWidget;
|
|
@@ -115,6 +92,6 @@ exports.PortForwardingWidget = PortForwardingWidget = tslib_1.__decorate([
|
|
|
115
92
|
], PortForwardingWidget);
|
|
116
93
|
function PortEditingInput({ port, service }) {
|
|
117
94
|
const [error, setError] = React.useState(false);
|
|
118
|
-
return
|
|
95
|
+
return (0, jsx_runtime_1.jsx)("input", { className: `theia-input forward-port-button${error ? ' port-edit-input-error' : ''}`, "port-edit-input-error": error, autoFocus: true, defaultValue: port.address ? `${port.address}:${port.localPort}` : port.localPort ?? '', placeholder: core_1.nls.localizeByDefault('Port number or address (eg. 3000 or 10.10.10.10:2000).'), onKeyDown: e => e.key === 'Enter' && !error && service.updatePort(port, e.currentTarget.value), onKeyUp: e => setError(!service.isValidAddress(e.currentTarget.value)) });
|
|
119
96
|
}
|
|
120
97
|
//# sourceMappingURL=port-forwarding-widget.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port-forwarding-widget.js","sourceRoot":"","sources":["../../../src/electron-browser/port-forwarding/port-forwarding-widget.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"port-forwarding-widget.js","sourceRoot":"","sources":["../../../src/electron-browser/port-forwarding/port-forwarding-widget.tsx"],"names":[],"mappings":";;;;;AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,kDAAkD;AAElD,qDAAqE;AACrE,sCAAuC;AACvC,4DAAiF;AACjF,uEAAiF;AACjF,iFAA6E;AAEhE,QAAA,yBAAyB,GAAG,wBAAwB,CAAC;AAG3D,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,qBAAW;IAYvC,IAAI;QACV,IAAI,CAAC,EAAE,GAAG,iCAAyB,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;QACxB,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,UAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QACtC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;QAEd,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACrE,CAAC;IAES,MAAM;QACZ,IAAI,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzD,OAAO,4CACH,8BAAG,KAAK,EAAE,EAAE,UAAU,EAAE,mCAAmC,EAAE,YACxD,UAAG,CAAC,iBAAiB,CAAC,sHAAsH,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAC7J,EACH,IAAI,CAAC,uBAAuB,EAAE,IAC7B,CAAC;QACX,CAAC;QAED,OAAO,0CACH,mCAAO,SAAS,EAAC,YAAY,aACzB,4CACI,2CACI,+BAAI,SAAS,EAAC,mBAAmB,YAAE,UAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAM,EACtE,+BAAI,SAAS,EAAC,mBAAmB,YAAE,UAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAM,EACvE,+BAAI,SAAS,EAAC,mBAAmB,YAAE,UAAG,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAM,EACzE,+BAAI,SAAS,EAAC,mBAAmB,YAAE,UAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAM,IACvE,GACD,EACR,8CACK,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CACnD,2CACK,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAC5B,yCAAK,IAAI,CAAC,KAAK,IAAI,EAAE,GAAM,EAC1B,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAC/B,yCAAK,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,UAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,GAAM,KAJ3D,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAKpF,CACR,CAAC,EACD,CAAC,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,yCAAI,yCAAK,IAAI,CAAC,uBAAuB,EAAE,GAAM,GAAK,IACxH,IACJ,GACN,CAAC;IACX,CAAC;IAES,uBAAuB;QAC7B,OAAO,mCAAQ,SAAS,EAAC,cAAc,EAAC,OAAO,EAAE,GAAG,EAAE;gBAClD,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;gBAC5D,IAAI,CAAC,MAAM,EAAE,CAAC;YAClB,CAAC,YACE,UAAG,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,GAAU,CAAC;IACzD,CAAC;IAES,mBAAmB,CAAC,IAAmB;QAC7C,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,OAAO,IAAI,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACjE,OAAO,yCACH,iCAAK,SAAS,EAAC,aAAa,aACxB,iCAAM,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,SAAS,EAAC,mBAAmB,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;4BAC3E,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;gCACZ,MAAM,GAAG,GAAG,IAAI,UAAG,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC;gCACzC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;4BACxD,CAAC;wBACL,CAAC,EAAE,KAAK,EAAE,UAAG,CAAC,iBAAiB,CAAC,aAAa,CAAC,GAAG,qBAAqB,YACjE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAC3B,EAEH,IAAI,CAAC,SAAS;wBACd,iCAAM,SAAS,EAAC,qCAAqC,EAAC,KAAK,EAAE,UAAG,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE;gCACpH,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;4BAC7C,CAAC,GAAS,IAEZ,GACL,CAAC;IACV,CAAC;IAES,gBAAgB,CAAC,IAAmB;QAC1C,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;YACjB,yCAAI,uBAAC,gBAAgB,IAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,qBAAqB,GAAI,GAAK,CAAC,CAAC;YAChF,yCACI,iCAAK,SAAS,EAAC,aAAa,aACxB,iCAAM,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,YAAG,IAAI,CAAC,SAAS,GAAQ,EACrD,iCAAM,SAAS,EAAC,oCAAoC,EAAC,KAAK,EAAE,UAAG,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE;gCACrH,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gCAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;4BAClB,CAAC,GAAS,IACR,GACL,CAAC;IACd,CAAC;CAEJ,CAAA;AAtGY,oDAAoB;AAGV;IADlB,IAAA,kBAAM,EAAC,+CAAqB,CAAC;sCACY,+CAAqB;mEAAC;AAG7C;IADlB,IAAA,kBAAM,EAAC,uBAAa,CAAC;;2DAC0B;AAG7B;IADlB,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;8DAC6B;AAG5C;IADT,IAAA,yBAAa,GAAE;;;;gDAUf;+BArBQ,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CAsGhC;AAED,SAAS,gBAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAA2D;IAChG,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChD,OAAO,kCAAO,SAAS,EAAE,kCAAkC,KAAK,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,EAAE,2BAAyB,KAAK,EAC5H,SAAS,QAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,EACjG,WAAW,EAAE,UAAG,CAAC,iBAAiB,CAAC,wDAAwD,CAAC,EAC5F,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,OAAO,IAAI,CAAC,KAAK,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAC9F,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,GAAU,CAAC;AAEzF,CAAC"}
|
|
@@ -6,7 +6,7 @@ import { WorkspacePreferences } from '@theia/workspace/lib/common';
|
|
|
6
6
|
export declare class RemoteLocalWorkspaceContribution implements WorkspaceOpenHandlerContribution, WorkspaceHandlingContribution {
|
|
7
7
|
protected readonly remoteStatusService: RemoteStatusService;
|
|
8
8
|
protected readonly windowService: WindowService;
|
|
9
|
-
protected logger: ILogger;
|
|
9
|
+
protected readonly logger: ILogger;
|
|
10
10
|
protected preferences: WorkspacePreferences;
|
|
11
11
|
canHandle(uri: URI): boolean;
|
|
12
12
|
modifyRecentWorkspaces(workspaces: string[]): Promise<string[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-local-workspace-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/remote-local-workspace-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEzD,OAAO,EAAE,6BAA6B,EAAE,cAAc,EAAE,gCAAgC,EAAE,MAAM,8BAA8B,CAAC;AAG/H,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,qBACa,gCAAiC,YAAW,gCAAgC,EAAE,6BAA6B;IAGpH,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"remote-local-workspace-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/remote-local-workspace-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEzD,OAAO,EAAE,6BAA6B,EAAE,cAAc,EAAE,gCAAgC,EAAE,MAAM,8BAA8B,CAAC;AAG/H,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,qBACa,gCAAiC,YAAW,gCAAgC,EAAE,6BAA6B;IAGpH,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,WAAW,EAAE,oBAAoB,CAAC;IAE5C,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO;IAItB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAWrE,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC;IAcjF,SAAS,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAOnD,SAAS,CAAC,aAAa,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAMpD,SAAS,CAAC,cAAc,IAAI,GAAG;CAMlC"}
|
|
@@ -81,6 +81,7 @@ tslib_1.__decorate([
|
|
|
81
81
|
], RemoteLocalWorkspaceContribution.prototype, "windowService", void 0);
|
|
82
82
|
tslib_1.__decorate([
|
|
83
83
|
(0, inversify_1.inject)(core_1.ILogger),
|
|
84
|
+
(0, inversify_1.named)('remote:RemoteLocalWorkspaceContribution'),
|
|
84
85
|
tslib_1.__metadata("design:type", Object)
|
|
85
86
|
], RemoteLocalWorkspaceContribution.prototype, "logger", void 0);
|
|
86
87
|
tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-local-workspace-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/remote-local-workspace-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,sCAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"remote-local-workspace-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/remote-local-workspace-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -101,6 +101,7 @@ let RemoteAutoShutdownService = class RemoteAutoShutdownService {
|
|
|
101
101
|
exports.RemoteAutoShutdownService = RemoteAutoShutdownService;
|
|
102
102
|
tslib_1.__decorate([
|
|
103
103
|
(0, inversify_1.inject)(core_1.ILogger),
|
|
104
|
+
(0, inversify_1.named)('remote:RemoteAutoShutdownService'),
|
|
104
105
|
tslib_1.__metadata("design:type", Object)
|
|
105
106
|
], RemoteAutoShutdownService.prototype, "logger", void 0);
|
|
106
107
|
exports.RemoteAutoShutdownService = RemoteAutoShutdownService = tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-auto-shutdown-service.js","sourceRoot":"","sources":["../../src/electron-node/remote-auto-shutdown-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,
|
|
1
|
+
{"version":3,"file":"remote-auto-shutdown-service.js","sourceRoot":"","sources":["../../src/electron-node/remote-auto-shutdown-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ParsedKey } from 'ssh2';
|
|
2
|
+
import { ILogger } from '@theia/core';
|
|
2
3
|
export interface SSHKey {
|
|
3
4
|
filename: string;
|
|
4
5
|
parsedKey: ParsedKey;
|
|
@@ -7,6 +8,7 @@ export interface SSHKey {
|
|
|
7
8
|
isPrivate?: boolean;
|
|
8
9
|
}
|
|
9
10
|
export declare class SSHIdentityFileCollector {
|
|
11
|
+
protected readonly logger: ILogger;
|
|
10
12
|
protected getDefaultIdentityFiles(): string[];
|
|
11
13
|
gatherIdentityFiles(sshAgentSock?: string, overrideIdentityFiles?: string[]): Promise<SSHKey[]>;
|
|
12
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-identity-file-collector.d.ts","sourceRoot":"","sources":["../../../src/electron-node/ssh/ssh-identity-file-collector.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"ssh-identity-file-collector.d.ts","sourceRoot":"","sources":["../../../src/electron-node/ssh/ssh-identity-file-collector.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAGjC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,WAAW,MAAM;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,qBACa,wBAAwB;IAGjC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,uBAAuB,IAAI,MAAM,EAAE;IAqBvC,mBAAmB,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAgFxG"}
|
|
@@ -23,6 +23,7 @@ const path = require("path");
|
|
|
23
23
|
const crypto = require("crypto");
|
|
24
24
|
const ssh2 = require("ssh2");
|
|
25
25
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
26
|
+
const core_1 = require("@theia/core");
|
|
26
27
|
let SSHIdentityFileCollector = class SSHIdentityFileCollector {
|
|
27
28
|
getDefaultIdentityFiles() {
|
|
28
29
|
const homeDir = os.homedir();
|
|
@@ -55,7 +56,7 @@ let SSHIdentityFileCollector = class SSHIdentityFileCollector {
|
|
|
55
56
|
}
|
|
56
57
|
const parsedResult = ssh2.utils.parseKey(result.value);
|
|
57
58
|
if (parsedResult instanceof Error || !parsedResult) {
|
|
58
|
-
|
|
59
|
+
this.logger.info(`Error while parsing SSH public key ${identityFiles[i]}:`, parsedResult);
|
|
59
60
|
return undefined;
|
|
60
61
|
}
|
|
61
62
|
const parsedKey = Array.isArray(parsedResult) ? parsedResult[0] : parsedResult;
|
|
@@ -121,6 +122,11 @@ let SSHIdentityFileCollector = class SSHIdentityFileCollector {
|
|
|
121
122
|
}
|
|
122
123
|
};
|
|
123
124
|
exports.SSHIdentityFileCollector = SSHIdentityFileCollector;
|
|
125
|
+
tslib_1.__decorate([
|
|
126
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
127
|
+
(0, inversify_1.named)('remote:SSHIdentityFileCollector'),
|
|
128
|
+
tslib_1.__metadata("design:type", Object)
|
|
129
|
+
], SSHIdentityFileCollector.prototype, "logger", void 0);
|
|
124
130
|
exports.SSHIdentityFileCollector = SSHIdentityFileCollector = tslib_1.__decorate([
|
|
125
131
|
(0, inversify_1.injectable)()
|
|
126
132
|
], SSHIdentityFileCollector);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-identity-file-collector.js","sourceRoot":"","sources":["../../../src/electron-node/ssh/ssh-identity-file-collector.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,kDAAkD;AAClD,yBAAyB;AACzB,6BAA6B;AAC7B,iCAAiC;AAEjC,6BAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"ssh-identity-file-collector.js","sourceRoot":"","sources":["../../../src/electron-node/ssh/ssh-identity-file-collector.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/remote",
|
|
3
|
-
"version": "1.75.0-next.
|
|
3
|
+
"version": "1.75.0-next.43+8b231a496",
|
|
4
4
|
"description": "Theia - Remote",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.75.0-next.
|
|
7
|
-
"@theia/filesystem": "1.75.0-next.
|
|
8
|
-
"@theia/userstorage": "1.75.0-next.
|
|
9
|
-
"@theia/variable-resolver": "1.75.0-next.
|
|
10
|
-
"@theia/workspace": "1.75.0-next.
|
|
6
|
+
"@theia/core": "1.75.0-next.43+8b231a496",
|
|
7
|
+
"@theia/filesystem": "1.75.0-next.43+8b231a496",
|
|
8
|
+
"@theia/userstorage": "1.75.0-next.43+8b231a496",
|
|
9
|
+
"@theia/variable-resolver": "1.75.0-next.43+8b231a496",
|
|
10
|
+
"@theia/workspace": "1.75.0-next.43+8b231a496",
|
|
11
11
|
"archiver": "^5.3.2",
|
|
12
12
|
"decompress": "^4.2.1",
|
|
13
13
|
"decompress-tar": "^4.1.1",
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"nyc": {
|
|
68
68
|
"extends": "../../configs/nyc.json"
|
|
69
69
|
},
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "8b231a49646069eab30d7ef31d047ae718def49d"
|
|
71
71
|
}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { ILogger, MaybePromise, URI } from '@theia/core';
|
|
18
|
-
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
|
+
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
19
19
|
import { WorkspaceHandlingContribution, WorkspaceInput, WorkspaceOpenHandlerContribution } from '@theia/workspace/lib/browser';
|
|
20
20
|
import { LOCAL_FILE_SCHEME } from './local-backend-services';
|
|
21
21
|
import { CURRENT_PORT_PARAM, LOCAL_PORT_PARAM, getCurrentPort, getLocalPort } from '@theia/core/lib/electron-browser/messaging/electron-local-ws-connection-source';
|
|
@@ -32,8 +32,8 @@ export class RemoteLocalWorkspaceContribution implements WorkspaceOpenHandlerCon
|
|
|
32
32
|
@inject(WindowService)
|
|
33
33
|
protected readonly windowService: WindowService;
|
|
34
34
|
|
|
35
|
-
@inject(ILogger)
|
|
36
|
-
protected logger: ILogger;
|
|
35
|
+
@inject(ILogger) @named('remote:RemoteLocalWorkspaceContribution')
|
|
36
|
+
protected readonly logger: ILogger;
|
|
37
37
|
|
|
38
38
|
@inject(WorkspacePreferences)
|
|
39
39
|
protected preferences: WorkspacePreferences;
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
17
|
+
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
18
18
|
import { ILogger } from '@theia/core';
|
|
19
19
|
import { MaybePromise } from '@theia/core/lib/common/types';
|
|
20
20
|
import { MessagingListenerContribution } from '@theia/core/lib/node/messaging/messaging-listeners';
|
|
@@ -38,7 +38,7 @@ const DEFAULT_SHUTDOWN_TIMEOUT = 5 * 60 * 1000;
|
|
|
38
38
|
@injectable()
|
|
39
39
|
export class RemoteAutoShutdownService implements MessagingListenerContribution, CliContribution {
|
|
40
40
|
|
|
41
|
-
@inject(ILogger)
|
|
41
|
+
@inject(ILogger) @named('remote:RemoteAutoShutdownService')
|
|
42
42
|
protected readonly logger: ILogger;
|
|
43
43
|
|
|
44
44
|
protected enabled = false;
|
|
@@ -20,7 +20,8 @@ import * as path from 'path';
|
|
|
20
20
|
import * as crypto from 'crypto';
|
|
21
21
|
import { ParsedKey } from 'ssh2';
|
|
22
22
|
import * as ssh2 from 'ssh2';
|
|
23
|
-
import { injectable } from '@theia/core/shared/inversify';
|
|
23
|
+
import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
24
|
+
import { ILogger } from '@theia/core';
|
|
24
25
|
|
|
25
26
|
export interface SSHKey {
|
|
26
27
|
filename: string;
|
|
@@ -33,6 +34,9 @@ export interface SSHKey {
|
|
|
33
34
|
@injectable()
|
|
34
35
|
export class SSHIdentityFileCollector {
|
|
35
36
|
|
|
37
|
+
@inject(ILogger) @named('remote:SSHIdentityFileCollector')
|
|
38
|
+
protected readonly logger: ILogger;
|
|
39
|
+
|
|
36
40
|
protected getDefaultIdentityFiles(): string[] {
|
|
37
41
|
const homeDir = os.homedir();
|
|
38
42
|
const PATH_SSH_CLIENT_ID_DSA = path.join(homeDir, '.ssh', '/id_dsa');
|
|
@@ -68,7 +72,7 @@ export class SSHIdentityFileCollector {
|
|
|
68
72
|
|
|
69
73
|
const parsedResult = ssh2.utils.parseKey(result.value);
|
|
70
74
|
if (parsedResult instanceof Error || !parsedResult) {
|
|
71
|
-
|
|
75
|
+
this.logger.info(`Error while parsing SSH public key ${identityFiles[i]}:`, parsedResult);
|
|
72
76
|
return undefined;
|
|
73
77
|
}
|
|
74
78
|
|