@theia/remote 1.77.0-next.1 → 1.77.0-next.101
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/local-backend-services.js +21 -26
- package/lib/electron-browser/local-backend-services.js.map +1 -1
- package/lib/electron-browser/port-forwarding/port-forwading-contribution.d.ts +1 -1
- package/lib/electron-browser/port-forwarding/port-forwading-contribution.d.ts.map +1 -1
- package/lib/electron-browser/port-forwarding/port-forwading-contribution.js +14 -18
- package/lib/electron-browser/port-forwarding/port-forwading-contribution.js.map +1 -1
- package/lib/electron-browser/port-forwarding/port-forwarding-service.d.ts +1 -1
- package/lib/electron-browser/port-forwarding/port-forwarding-service.d.ts.map +1 -1
- package/lib/electron-browser/port-forwarding/port-forwarding-service.js +14 -21
- package/lib/electron-browser/port-forwarding/port-forwarding-service.js.map +1 -1
- package/lib/electron-browser/port-forwarding/port-forwarding-widget.d.ts +1 -1
- package/lib/electron-browser/port-forwarding/port-forwarding-widget.d.ts.map +1 -1
- package/lib/electron-browser/port-forwarding/port-forwarding-widget.js +34 -43
- package/lib/electron-browser/port-forwarding/port-forwarding-widget.js.map +1 -1
- package/lib/electron-browser/remote-cli-args-collector.js +13 -18
- package/lib/electron-browser/remote-cli-args-collector.js.map +1 -1
- package/lib/electron-browser/remote-cli-args-collector.spec.js +5 -7
- package/lib/electron-browser/remote-cli-args-collector.spec.js.map +1 -1
- package/lib/electron-browser/remote-electron-file-dialog-service.d.ts +1 -1
- package/lib/electron-browser/remote-electron-file-dialog-service.d.ts.map +1 -1
- package/lib/electron-browser/remote-electron-file-dialog-service.js +17 -21
- package/lib/electron-browser/remote-electron-file-dialog-service.js.map +1 -1
- package/lib/electron-browser/remote-frontend-contribution.d.ts +3 -3
- package/lib/electron-browser/remote-frontend-contribution.d.ts.map +1 -1
- package/lib/electron-browser/remote-frontend-contribution.js +38 -48
- package/lib/electron-browser/remote-frontend-contribution.js.map +1 -1
- package/lib/electron-browser/remote-frontend-module.js +61 -63
- package/lib/electron-browser/remote-frontend-module.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 +26 -33
- package/lib/electron-browser/remote-local-workspace-contribution.js.map +1 -1
- package/lib/electron-browser/remote-registry-contribution.js +12 -17
- package/lib/electron-browser/remote-registry-contribution.js.map +1 -1
- package/lib/electron-browser/remote-service.js +5 -8
- package/lib/electron-browser/remote-service.js.map +1 -1
- package/lib/electron-browser/remote-ssh-contribution.d.ts +3 -3
- package/lib/electron-browser/remote-ssh-contribution.d.ts.map +1 -1
- package/lib/electron-browser/remote-ssh-contribution.js +41 -47
- package/lib/electron-browser/remote-ssh-contribution.js.map +1 -1
- package/lib/electron-browser/remote-user-storage-provider.d.ts +2 -2
- package/lib/electron-browser/remote-user-storage-provider.d.ts.map +1 -1
- package/lib/electron-browser/remote-user-storage-provider.js +23 -33
- package/lib/electron-browser/remote-user-storage-provider.js.map +1 -1
- package/lib/electron-common/remote-port-forwarding-provider.js +2 -5
- package/lib/electron-common/remote-port-forwarding-provider.js.map +1 -1
- package/lib/electron-common/remote-preferences.js +20 -24
- package/lib/electron-common/remote-preferences.js.map +1 -1
- package/lib/electron-common/remote-ssh-connection-provider.js +2 -5
- package/lib/electron-common/remote-ssh-connection-provider.js.map +1 -1
- package/lib/electron-common/remote-status-service.js +2 -5
- package/lib/electron-common/remote-status-service.js.map +1 -1
- package/lib/electron-node/backend-remote-service-impl.js +10 -13
- package/lib/electron-node/backend-remote-service-impl.js.map +1 -1
- package/lib/electron-node/remote-auto-shutdown-service.js +15 -19
- package/lib/electron-node/remote-auto-shutdown-service.js.map +1 -1
- package/lib/electron-node/remote-auto-shutdown-service.spec.js +28 -30
- package/lib/electron-node/remote-auto-shutdown-service.spec.js.map +1 -1
- package/lib/electron-node/remote-backend-module.js +69 -72
- package/lib/electron-node/remote-backend-module.js.map +1 -1
- package/lib/electron-node/remote-connection-service.d.ts +3 -3
- package/lib/electron-node/remote-connection-service.d.ts.map +1 -1
- package/lib/electron-node/remote-connection-service.js +13 -18
- package/lib/electron-node/remote-connection-service.js.map +1 -1
- package/lib/electron-node/remote-connection-socket-provider.js +7 -10
- package/lib/electron-node/remote-connection-socket-provider.js.map +1 -1
- package/lib/electron-node/remote-port-forwarding-provider.d.ts +3 -3
- package/lib/electron-node/remote-port-forwarding-provider.d.ts.map +1 -1
- package/lib/electron-node/remote-port-forwarding-provider.js +10 -14
- package/lib/electron-node/remote-port-forwarding-provider.js.map +1 -1
- package/lib/electron-node/remote-proxy-server-provider.js +8 -11
- package/lib/electron-node/remote-proxy-server-provider.js.map +1 -1
- package/lib/electron-node/remote-status-service.d.ts +2 -2
- package/lib/electron-node/remote-status-service.d.ts.map +1 -1
- package/lib/electron-node/remote-status-service.js +8 -12
- package/lib/electron-node/remote-status-service.js.map +1 -1
- package/lib/electron-node/remote-types.js +1 -2
- package/lib/electron-node/remote-types.js.map +1 -1
- package/lib/electron-node/setup/app-native-dependency-contribution.d.ts +1 -1
- package/lib/electron-node/setup/app-native-dependency-contribution.d.ts.map +1 -1
- package/lib/electron-node/setup/app-native-dependency-contribution.js +13 -16
- package/lib/electron-node/setup/app-native-dependency-contribution.js.map +1 -1
- package/lib/electron-node/setup/app-native-dependency-contribution.spec.js +14 -16
- package/lib/electron-node/setup/app-native-dependency-contribution.spec.js.map +1 -1
- package/lib/electron-node/setup/main-copy-contribution.js +5 -8
- package/lib/electron-node/setup/main-copy-contribution.js.map +1 -1
- package/lib/electron-node/setup/remote-copy-contribution.d.ts.map +1 -1
- package/lib/electron-node/setup/remote-copy-contribution.js +13 -16
- package/lib/electron-node/setup/remote-copy-contribution.js.map +1 -1
- package/lib/electron-node/setup/remote-copy-service.d.ts +3 -3
- package/lib/electron-node/setup/remote-copy-service.d.ts.map +1 -1
- package/lib/electron-node/setup/remote-copy-service.js +23 -30
- package/lib/electron-node/setup/remote-copy-service.js.map +1 -1
- package/lib/electron-node/setup/remote-native-dependency-contribution.js +8 -11
- package/lib/electron-node/setup/remote-native-dependency-contribution.js.map +1 -1
- package/lib/electron-node/setup/remote-native-dependency-service.d.ts +1 -1
- package/lib/electron-node/setup/remote-native-dependency-service.d.ts.map +1 -1
- package/lib/electron-node/setup/remote-native-dependency-service.js +25 -30
- package/lib/electron-node/setup/remote-native-dependency-service.js.map +1 -1
- package/lib/electron-node/setup/remote-node-setup-service.d.ts +2 -2
- package/lib/electron-node/setup/remote-node-setup-service.d.ts.map +1 -1
- package/lib/electron-node/setup/remote-node-setup-service.js +25 -30
- package/lib/electron-node/setup/remote-node-setup-service.js.map +1 -1
- package/lib/electron-node/setup/remote-setup-script-service.js +17 -22
- package/lib/electron-node/setup/remote-setup-script-service.js.map +1 -1
- package/lib/electron-node/setup/remote-setup-service.d.ts +5 -5
- package/lib/electron-node/setup/remote-setup-service.d.ts.map +1 -1
- package/lib/electron-node/setup/remote-setup-service.js +33 -42
- package/lib/electron-node/setup/remote-setup-service.js.map +1 -1
- package/lib/electron-node/ssh/remote-ssh-connection-provider.d.ts +12 -9
- package/lib/electron-node/ssh/remote-ssh-connection-provider.d.ts.map +1 -1
- package/lib/electron-node/ssh/remote-ssh-connection-provider.js +43 -51
- package/lib/electron-node/ssh/remote-ssh-connection-provider.js.map +1 -1
- package/lib/electron-node/ssh/remote-ssh-connection-provider.spec.js +26 -26
- package/lib/electron-node/ssh/remote-ssh-connection-provider.spec.js.map +1 -1
- package/lib/electron-node/ssh/ssh-identity-file-collector.d.ts.map +1 -1
- package/lib/electron-node/ssh/ssh-identity-file-collector.js +15 -18
- package/lib/electron-node/ssh/ssh-identity-file-collector.js.map +1 -1
- package/lib/package.spec.d.ts +1 -0
- package/lib/package.spec.js +1 -0
- package/package.json +17 -9
- package/src/electron-browser/port-forwarding/port-forwading-contribution.ts +1 -1
- package/src/electron-browser/port-forwarding/port-forwarding-service.ts +1 -1
- package/src/electron-browser/port-forwarding/port-forwarding-widget.tsx +1 -1
- package/src/electron-browser/remote-cli-args-collector.spec.ts +1 -1
- package/src/electron-browser/remote-electron-file-dialog-service.ts +2 -2
- package/src/electron-browser/remote-frontend-contribution.ts +3 -3
- package/src/electron-browser/remote-frontend-module.ts +16 -16
- package/src/electron-browser/remote-local-workspace-contribution.ts +2 -2
- package/src/electron-browser/remote-ssh-contribution.ts +7 -4
- package/src/electron-browser/remote-user-storage-provider.ts +2 -2
- package/src/electron-node/remote-auto-shutdown-service.spec.ts +1 -1
- package/src/electron-node/remote-backend-module.ts +22 -22
- package/src/electron-node/remote-connection-service.ts +3 -3
- package/src/electron-node/remote-port-forwarding-provider.ts +3 -3
- package/src/electron-node/remote-status-service.ts +2 -2
- package/src/electron-node/setup/app-native-dependency-contribution.spec.ts +1 -1
- package/src/electron-node/setup/app-native-dependency-contribution.ts +1 -1
- package/src/electron-node/setup/remote-copy-contribution.ts +3 -2
- package/src/electron-node/setup/remote-copy-service.ts +4 -4
- package/src/electron-node/setup/remote-native-dependency-service.ts +5 -6
- package/src/electron-node/setup/remote-node-setup-service.ts +2 -2
- package/src/electron-node/setup/remote-setup-service.ts +5 -5
- package/src/electron-node/ssh/remote-ssh-connection-provider.spec.ts +6 -2
- package/src/electron-node/ssh/remote-ssh-connection-provider.ts +14 -9
- package/src/electron-node/ssh/ssh-identity-file-collector.ts +2 -2
- package/src/typings/decompress-plugins.d.ts +30 -0
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"ssh-identity-file-collector.d.ts","sourceRoot":"","sources":["../../../src/electron-node/ssh/ssh-identity-file-collector.ts"],"names":[],"mappings":"AAoBA,OAAa,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAGvC,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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2023 TypeFox and others.
|
|
4
3
|
//
|
|
@@ -14,16 +13,15 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
const core_1 = require("@theia/core");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import * as fs from '@theia/core/shared/fs-extra';
|
|
18
|
+
import * as os from 'os';
|
|
19
|
+
import * as path from 'path';
|
|
20
|
+
import * as crypto from 'crypto';
|
|
21
|
+
import ssh2 from 'ssh2';
|
|
22
|
+
// A CommonJS module whose exports cannot be detected statically, so it is imported as a whole.
|
|
23
|
+
import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
24
|
+
import { ILogger } from '@theia/core';
|
|
27
25
|
let SSHIdentityFileCollector = class SSHIdentityFileCollector {
|
|
28
26
|
getDefaultIdentityFiles() {
|
|
29
27
|
const homeDir = os.homedir();
|
|
@@ -121,13 +119,12 @@ let SSHIdentityFileCollector = class SSHIdentityFileCollector {
|
|
|
121
119
|
return preferredIdentityKeys;
|
|
122
120
|
}
|
|
123
121
|
};
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
(
|
|
127
|
-
(0, inversify_1.named)('remote:SSHIdentityFileCollector'),
|
|
128
|
-
tslib_1.__metadata("design:type", Object)
|
|
122
|
+
__decorate([
|
|
123
|
+
inject(ILogger),
|
|
124
|
+
named('remote:SSHIdentityFileCollector')
|
|
129
125
|
], SSHIdentityFileCollector.prototype, "logger", void 0);
|
|
130
|
-
|
|
131
|
-
|
|
126
|
+
SSHIdentityFileCollector = __decorate([
|
|
127
|
+
injectable()
|
|
132
128
|
], SSHIdentityFileCollector);
|
|
129
|
+
export { SSHIdentityFileCollector };
|
|
133
130
|
//# sourceMappingURL=ssh-identity-file-collector.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-identity-file-collector.js","sourceRoot":"","sources":["../../../src/electron-node/ssh/ssh-identity-file-collector.ts"],"names":[],"mappings":"
|
|
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/lib/package.spec.d.ts
CHANGED
package/lib/package.spec.js
CHANGED
package/package.json
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/remote",
|
|
3
|
-
"version": "1.77.0-next.
|
|
3
|
+
"version": "1.77.0-next.101+8308c936b",
|
|
4
4
|
"description": "Theia - Remote",
|
|
5
|
+
"type": "module",
|
|
5
6
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.77.0-next.
|
|
7
|
-
"@theia/filesystem": "1.77.0-next.
|
|
8
|
-
"@theia/userstorage": "1.77.0-next.
|
|
9
|
-
"@theia/variable-resolver": "1.77.0-next.
|
|
10
|
-
"@theia/workspace": "1.77.0-next.
|
|
7
|
+
"@theia/core": "1.77.0-next.101+8308c936b",
|
|
8
|
+
"@theia/filesystem": "1.77.0-next.101+8308c936b",
|
|
9
|
+
"@theia/userstorage": "1.77.0-next.101+8308c936b",
|
|
10
|
+
"@theia/variable-resolver": "1.77.0-next.101+8308c936b",
|
|
11
|
+
"@theia/workspace": "1.77.0-next.101+8308c936b",
|
|
11
12
|
"archiver": "^5.3.2",
|
|
12
13
|
"decompress": "^4.2.1",
|
|
13
14
|
"decompress-tar": "^4.1.1",
|
|
@@ -15,8 +16,8 @@
|
|
|
15
16
|
"decompress-unzip": "^4.0.1",
|
|
16
17
|
"express-http-proxy": "^2.1.2",
|
|
17
18
|
"glob": "^8.1.0",
|
|
18
|
-
"socket.io": "^4.8.
|
|
19
|
-
"socket.io-client": "^4.8.
|
|
19
|
+
"socket.io": "^4.8.4",
|
|
20
|
+
"socket.io-client": "^4.8.4",
|
|
20
21
|
"ssh-config": "~5.0.4",
|
|
21
22
|
"ssh2": "^1.17.0",
|
|
22
23
|
"ssh2-sftp-client": "^9.1.0",
|
|
@@ -67,5 +68,12 @@
|
|
|
67
68
|
"nyc": {
|
|
68
69
|
"extends": "../../configs/nyc.json"
|
|
69
70
|
},
|
|
70
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "8308c936be596c357a51fc815ef30022aa62b3d5",
|
|
72
|
+
"exports": {
|
|
73
|
+
"./package.json": "./package.json",
|
|
74
|
+
"./lib/*.json": "./lib/*.json",
|
|
75
|
+
"./lib/*.js": "./lib/*.js",
|
|
76
|
+
"./lib/*": "./lib/*.js",
|
|
77
|
+
"./*": "./*"
|
|
78
|
+
}
|
|
71
79
|
}
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { Command, nls } from '@theia/core';
|
|
18
18
|
import { AbstractViewContribution } from '@theia/core/lib/browser';
|
|
19
19
|
import { injectable } from '@theia/core/shared/inversify';
|
|
20
|
-
import { PortForwardingWidget, PORT_FORWARDING_WIDGET_ID } from './port-forwarding-widget';
|
|
20
|
+
import { PortForwardingWidget, PORT_FORWARDING_WIDGET_ID } from './port-forwarding-widget.js';
|
|
21
21
|
|
|
22
22
|
export namespace PortForwardingCommands {
|
|
23
23
|
export const TOGGLE = Command.toLocalizedCommand({
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import { Emitter } from '@theia/core';
|
|
18
18
|
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
19
|
-
import { RemotePortForwardingProvider } from '../../electron-common/remote-port-forwarding-provider';
|
|
19
|
+
import { RemotePortForwardingProvider } from '../../electron-common/remote-port-forwarding-provider.js';
|
|
20
20
|
import { getCurrentPort } from '@theia/core/lib/electron-browser/messaging/electron-local-ws-connection-source';
|
|
21
21
|
|
|
22
22
|
export interface ForwardedPort {
|
|
@@ -19,7 +19,7 @@ import { ReactNode } from '@theia/core/shared/react';
|
|
|
19
19
|
import { OpenerService, ReactWidget } from '@theia/core/lib/browser';
|
|
20
20
|
import { nls, URI } from '@theia/core';
|
|
21
21
|
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
22
|
-
import { ForwardedPort, PortForwardingService } from './port-forwarding-service';
|
|
22
|
+
import { ForwardedPort, PortForwardingService } from './port-forwarding-service.js';
|
|
23
23
|
import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
|
|
24
24
|
|
|
25
25
|
export const PORT_FORWARDING_WIDGET_ID = 'port-forwarding-widget';
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
18
|
import { RemoteCliArgsContribution } from '@theia/core/lib/common/remote-cli-args-contribution';
|
|
19
|
-
import { RemoteCliArgsCollector } from './remote-cli-args-collector';
|
|
19
|
+
import { RemoteCliArgsCollector } from './remote-cli-args-collector.js';
|
|
20
20
|
|
|
21
21
|
function collectorWith(contributions: RemoteCliArgsContribution[]): RemoteCliArgsCollector {
|
|
22
22
|
const collector = new RemoteCliArgsCollector();
|
|
@@ -20,8 +20,8 @@ import { AdditionalButtonDefinition, OpenFileDialogProps, SaveFileDialogProps }
|
|
|
20
20
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
21
21
|
import { DefaultFileDialogService } from '@theia/filesystem/lib/browser/file-dialog/file-dialog-service';
|
|
22
22
|
import { ElectronFileDialogService } from '@theia/filesystem/lib/electron-browser/file-dialog/electron-file-dialog-service';
|
|
23
|
-
import { RemoteService } from './remote-service';
|
|
24
|
-
import { LOCAL_FILE_SCHEME } from './local-backend-services';
|
|
23
|
+
import { RemoteService } from './remote-service.js';
|
|
24
|
+
import { LOCAL_FILE_SCHEME } from './local-backend-services.js';
|
|
25
25
|
|
|
26
26
|
@injectable()
|
|
27
27
|
export class RemoteElectronFileDialogService extends ElectronFileDialogService {
|
|
@@ -17,9 +17,9 @@
|
|
|
17
17
|
import { Command, CommandContribution, CommandRegistry, ContributionProvider, nls, QuickInputService, QuickPickInput } from '@theia/core';
|
|
18
18
|
import { FrontendApplicationContribution, StatusBar, StatusBarAlignment, StatusBarEntry } from '@theia/core/lib/browser';
|
|
19
19
|
import { inject, injectable, named, optional } from '@theia/core/shared/inversify';
|
|
20
|
-
import { RemoteStatus, RemoteStatusService } from '../electron-common/remote-status-service';
|
|
21
|
-
import { RemoteRegistry, RemoteRegistryContribution } from './remote-registry-contribution';
|
|
22
|
-
import { RemoteService } from './remote-service';
|
|
20
|
+
import { RemoteStatus, RemoteStatusService } from '../electron-common/remote-status-service.js';
|
|
21
|
+
import { RemoteRegistry, RemoteRegistryContribution } from './remote-registry-contribution.js';
|
|
22
|
+
import { RemoteService } from './remote-service.js';
|
|
23
23
|
import { WindowService } from '@theia/core/lib/browser/window/window-service';
|
|
24
24
|
import { getLocalPort, getCurrentPort } from '@theia/core/lib/electron-browser/messaging/electron-local-ws-connection-source';
|
|
25
25
|
|
|
@@ -17,30 +17,30 @@
|
|
|
17
17
|
import { bindRootContributionProvider, CommandContribution } from '@theia/core';
|
|
18
18
|
import { ContainerModule } from '@theia/core/shared/inversify';
|
|
19
19
|
import { bindViewContribution, FrontendApplicationContribution, isRemote, WidgetFactory } from '@theia/core/lib/browser';
|
|
20
|
-
import { RemoteSSHContribution } from './remote-ssh-contribution';
|
|
21
|
-
import { RemoteSSHConnectionProvider, RemoteSSHConnectionProviderPath } from '../electron-common/remote-ssh-connection-provider';
|
|
22
|
-
import { RemoteFrontendContribution } from './remote-frontend-contribution';
|
|
23
|
-
import { RemoteRegistryContribution } from './remote-registry-contribution';
|
|
24
|
-
import { RemoteService } from './remote-service';
|
|
25
|
-
import { RemoteStatusService, RemoteStatusServicePath } from '../electron-common/remote-status-service';
|
|
20
|
+
import { RemoteSSHContribution } from './remote-ssh-contribution.js';
|
|
21
|
+
import { RemoteSSHConnectionProvider, RemoteSSHConnectionProviderPath } from '../electron-common/remote-ssh-connection-provider.js';
|
|
22
|
+
import { RemoteFrontendContribution } from './remote-frontend-contribution.js';
|
|
23
|
+
import { RemoteRegistryContribution } from './remote-registry-contribution.js';
|
|
24
|
+
import { RemoteService } from './remote-service.js';
|
|
25
|
+
import { RemoteStatusService, RemoteStatusServicePath } from '../electron-common/remote-status-service.js';
|
|
26
26
|
import { ElectronFileDialogService } from '@theia/filesystem/lib/electron-browser/file-dialog/electron-file-dialog-service';
|
|
27
|
-
import { RemoteElectronFileDialogService } from './remote-electron-file-dialog-service';
|
|
28
|
-
import { bindRemotePreferences } from '../electron-common/remote-preferences';
|
|
29
|
-
import { PortForwardingWidget, PORT_FORWARDING_WIDGET_ID } from './port-forwarding/port-forwarding-widget';
|
|
30
|
-
import { PortForwardingContribution } from './port-forwarding/port-forwading-contribution';
|
|
31
|
-
import { PortForwardingService } from './port-forwarding/port-forwarding-service';
|
|
32
|
-
import { RemotePortForwardingProvider, RemoteRemotePortForwardingProviderPath } from '../electron-common/remote-port-forwarding-provider';
|
|
27
|
+
import { RemoteElectronFileDialogService } from './remote-electron-file-dialog-service.js';
|
|
28
|
+
import { bindRemotePreferences } from '../electron-common/remote-preferences.js';
|
|
29
|
+
import { PortForwardingWidget, PORT_FORWARDING_WIDGET_ID } from './port-forwarding/port-forwarding-widget.js';
|
|
30
|
+
import { PortForwardingContribution } from './port-forwarding/port-forwading-contribution.js';
|
|
31
|
+
import { PortForwardingService } from './port-forwarding/port-forwarding-service.js';
|
|
32
|
+
import { RemotePortForwardingProvider, RemoteRemotePortForwardingProviderPath } from '../electron-common/remote-port-forwarding-provider.js';
|
|
33
33
|
import { ServiceConnectionProvider } from '@theia/core/lib/browser/messaging/service-connection-provider';
|
|
34
34
|
import '../../src/electron-browser/style/port-forwarding-widget.css';
|
|
35
35
|
import { UserStorageContribution } from '@theia/userstorage/lib/browser/user-storage-contribution';
|
|
36
|
-
import { RemoteUserStorageContribution } from './remote-user-storage-provider';
|
|
36
|
+
import { RemoteUserStorageContribution } from './remote-user-storage-provider.js';
|
|
37
37
|
import { RemoteFileSystemProvider, remoteFileSystemPath, RemoteFileSystemProxyFactory, RemoteFileSystemServer } from '@theia/filesystem/lib/common/remote-file-system-provider';
|
|
38
|
-
import { LocalEnvVariablesServer, LocalRemoteFileSystemContribution, LocalRemoteFileSystemProvider, LocalRemoteFileSytemServer } from './local-backend-services';
|
|
38
|
+
import { LocalEnvVariablesServer, LocalRemoteFileSystemContribution, LocalRemoteFileSystemProvider, LocalRemoteFileSytemServer } from './local-backend-services.js';
|
|
39
39
|
import { envVariablesPath, EnvVariablesServer } from '@theia/core/lib/common/env-variables';
|
|
40
40
|
import { WorkspaceHandlingContribution, WorkspaceOpenHandlerContribution } from '@theia/workspace/lib/browser';
|
|
41
|
-
import { RemoteLocalWorkspaceContribution } from './remote-local-workspace-contribution';
|
|
41
|
+
import { RemoteLocalWorkspaceContribution } from './remote-local-workspace-contribution.js';
|
|
42
42
|
import { FileServiceContribution } from '@theia/filesystem/lib/browser/file-service';
|
|
43
|
-
import { RemoteCliArgsCollector } from './remote-cli-args-collector';
|
|
43
|
+
import { RemoteCliArgsCollector } from './remote-cli-args-collector.js';
|
|
44
44
|
|
|
45
45
|
export default new ContainerModule((bind, _, __, rebind) => {
|
|
46
46
|
bind(RemoteFrontendContribution).toSelf().inSingletonScope();
|
|
@@ -17,9 +17,9 @@
|
|
|
17
17
|
import { ILogger, MaybePromise, URI } from '@theia/core';
|
|
18
18
|
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
19
19
|
import { WorkspaceHandlingContribution, WorkspaceInput, WorkspaceOpenHandlerContribution } from '@theia/workspace/lib/browser';
|
|
20
|
-
import { LOCAL_FILE_SCHEME } from './local-backend-services';
|
|
20
|
+
import { LOCAL_FILE_SCHEME } from './local-backend-services.js';
|
|
21
21
|
import { CURRENT_PORT_PARAM, LOCAL_PORT_PARAM, getCurrentPort, getLocalPort } from '@theia/core/lib/electron-browser/messaging/electron-local-ws-connection-source';
|
|
22
|
-
import { RemoteStatusService } from '../electron-common/remote-status-service';
|
|
22
|
+
import { RemoteStatusService } from '../electron-common/remote-status-service.js';
|
|
23
23
|
import { WindowService } from '@theia/core/lib/browser/window/window-service';
|
|
24
24
|
import { WorkspacePreferences } from '@theia/workspace/lib/common';
|
|
25
25
|
|
|
@@ -17,10 +17,13 @@
|
|
|
17
17
|
import { Command, MessageService, nls, QuickInputService, QuickPickInput } from '@theia/core';
|
|
18
18
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
19
19
|
import { VariableResolverService } from '@theia/variable-resolver/lib/browser';
|
|
20
|
-
import { RemoteSSHConnectionProvider } from '../electron-common/remote-ssh-connection-provider';
|
|
21
|
-
import { AbstractRemoteRegistryContribution, RemoteRegistry } from './remote-registry-contribution';
|
|
22
|
-
import { RemotePreferences } from '../electron-common/remote-preferences';
|
|
23
|
-
import
|
|
20
|
+
import { RemoteSSHConnectionProvider } from '../electron-common/remote-ssh-connection-provider.js';
|
|
21
|
+
import { AbstractRemoteRegistryContribution, RemoteRegistry } from './remote-registry-contribution.js';
|
|
22
|
+
import { RemotePreferences } from '../electron-common/remote-preferences.js';
|
|
23
|
+
import SSHConfigModule, { Directive } from 'ssh-config';
|
|
24
|
+
|
|
25
|
+
// `ssh-config` is a CommonJS module that provides the class as `default` export of `module.exports`.
|
|
26
|
+
const SSHConfig = SSHConfigModule.default;
|
|
24
27
|
|
|
25
28
|
export namespace RemoteSSHCommands {
|
|
26
29
|
export const CONNECT: Command = Command.toLocalizedCommand({
|
|
@@ -18,8 +18,8 @@ import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'
|
|
|
18
18
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
19
19
|
import { FileSystemProvider } from '@theia/filesystem/lib/common/files';
|
|
20
20
|
import { UserStorageContribution } from '@theia/userstorage/lib/browser/user-storage-contribution';
|
|
21
|
-
import { RemoteStatusService } from '../electron-common/remote-status-service';
|
|
22
|
-
import { LocalEnvVariablesServer, LocalRemoteFileSystemProvider } from './local-backend-services';
|
|
21
|
+
import { RemoteStatusService } from '../electron-common/remote-status-service.js';
|
|
22
|
+
import { LocalEnvVariablesServer, LocalRemoteFileSystemProvider } from './local-backend-services.js';
|
|
23
23
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
24
24
|
import { URI } from '@theia/core';
|
|
25
25
|
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
|
-
import { RemoteAutoShutdownService } from './remote-auto-shutdown-service';
|
|
18
|
+
import { RemoteAutoShutdownService } from './remote-auto-shutdown-service.js';
|
|
19
19
|
import { ILogger } from '@theia/core';
|
|
20
20
|
import { Arguments } from '@theia/core/shared/yargs';
|
|
21
21
|
import * as http from 'http';
|
|
@@ -17,33 +17,33 @@
|
|
|
17
17
|
import { ContainerModule } from '@theia/core/shared/inversify';
|
|
18
18
|
import { BackendApplicationContribution, CliContribution } from '@theia/core/lib/node';
|
|
19
19
|
import { MessagingListenerContribution } from '@theia/core/lib/node/messaging/messaging-listeners';
|
|
20
|
-
import { RemoteAutoShutdownService } from './remote-auto-shutdown-service';
|
|
20
|
+
import { RemoteAutoShutdownService } from './remote-auto-shutdown-service.js';
|
|
21
21
|
import { RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-contribution';
|
|
22
|
-
import { RemoteConnectionService } from './remote-connection-service';
|
|
23
|
-
import { RemoteProxyServerProvider } from './remote-proxy-server-provider';
|
|
24
|
-
import { RemoteConnectionSocketProvider } from './remote-connection-socket-provider';
|
|
22
|
+
import { RemoteConnectionService } from './remote-connection-service.js';
|
|
23
|
+
import { RemoteProxyServerProvider } from './remote-proxy-server-provider.js';
|
|
24
|
+
import { RemoteConnectionSocketProvider } from './remote-connection-socket-provider.js';
|
|
25
25
|
import { ConnectionContainerModule } from '@theia/core/lib/node/messaging/connection-container-module';
|
|
26
|
-
import { RemoteSSHConnectionProvider, RemoteSSHConnectionProviderPath } from '../electron-common/remote-ssh-connection-provider';
|
|
27
|
-
import { RemoteSSHConnectionProviderImpl } from './ssh/remote-ssh-connection-provider';
|
|
28
|
-
import { SSHIdentityFileCollector } from './ssh/ssh-identity-file-collector';
|
|
29
|
-
import { RemoteCopyService } from './setup/remote-copy-service';
|
|
30
|
-
import { RemoteSetupService } from './setup/remote-setup-service';
|
|
31
|
-
import { RemoteNativeDependencyService } from './setup/remote-native-dependency-service';
|
|
32
|
-
import { BackendRemoteServiceImpl } from './backend-remote-service-impl';
|
|
26
|
+
import { RemoteSSHConnectionProvider, RemoteSSHConnectionProviderPath } from '../electron-common/remote-ssh-connection-provider.js';
|
|
27
|
+
import { RemoteSSHConnectionProviderImpl } from './ssh/remote-ssh-connection-provider.js';
|
|
28
|
+
import { SSHIdentityFileCollector } from './ssh/ssh-identity-file-collector.js';
|
|
29
|
+
import { RemoteCopyService } from './setup/remote-copy-service.js';
|
|
30
|
+
import { RemoteSetupService } from './setup/remote-setup-service.js';
|
|
31
|
+
import { RemoteNativeDependencyService } from './setup/remote-native-dependency-service.js';
|
|
32
|
+
import { BackendRemoteServiceImpl } from './backend-remote-service-impl.js';
|
|
33
33
|
import { BackendRemoteService } from '@theia/core/lib/node/remote/backend-remote-service';
|
|
34
|
-
import { RemoteNodeSetupService } from './setup/remote-node-setup-service';
|
|
35
|
-
import { RemotePosixScriptStrategy, RemoteSetupScriptService, RemoteWindowsScriptStrategy } from './setup/remote-setup-script-service';
|
|
36
|
-
import { RemoteStatusService, RemoteStatusServicePath } from '../electron-common/remote-status-service';
|
|
37
|
-
import { RemoteStatusServiceImpl } from './remote-status-service';
|
|
34
|
+
import { RemoteNodeSetupService } from './setup/remote-node-setup-service.js';
|
|
35
|
+
import { RemotePosixScriptStrategy, RemoteSetupScriptService, RemoteWindowsScriptStrategy } from './setup/remote-setup-script-service.js';
|
|
36
|
+
import { RemoteStatusService, RemoteStatusServicePath } from '../electron-common/remote-status-service.js';
|
|
37
|
+
import { RemoteStatusServiceImpl } from './remote-status-service.js';
|
|
38
38
|
import { ConnectionHandler, RpcConnectionHandler, bindRootContributionProvider } from '@theia/core';
|
|
39
|
-
import { RemoteCopyRegistryImpl } from './setup/remote-copy-contribution';
|
|
39
|
+
import { RemoteCopyRegistryImpl } from './setup/remote-copy-contribution.js';
|
|
40
40
|
import { RemoteCopyContribution } from '@theia/core/lib/node/remote/remote-copy-contribution';
|
|
41
|
-
import { MainCopyContribution } from './setup/main-copy-contribution';
|
|
42
|
-
import { RemoteNativeDependencyContribution } from './setup/remote-native-dependency-contribution';
|
|
43
|
-
import { AppNativeDependencyContribution } from './setup/app-native-dependency-contribution';
|
|
44
|
-
import { RemotePortForwardingProviderImpl } from './remote-port-forwarding-provider';
|
|
45
|
-
import { RemotePortForwardingProvider, RemoteRemotePortForwardingProviderPath } from '../electron-common/remote-port-forwarding-provider';
|
|
46
|
-
import { bindRemotePreferences } from '../electron-common/remote-preferences';
|
|
41
|
+
import { MainCopyContribution } from './setup/main-copy-contribution.js';
|
|
42
|
+
import { RemoteNativeDependencyContribution } from './setup/remote-native-dependency-contribution.js';
|
|
43
|
+
import { AppNativeDependencyContribution } from './setup/app-native-dependency-contribution.js';
|
|
44
|
+
import { RemotePortForwardingProviderImpl } from './remote-port-forwarding-provider.js';
|
|
45
|
+
import { RemotePortForwardingProvider, RemoteRemotePortForwardingProviderPath } from '../electron-common/remote-port-forwarding-provider.js';
|
|
46
|
+
import { bindRemotePreferences } from '../electron-common/remote-preferences.js';
|
|
47
47
|
|
|
48
48
|
export const remoteConnectionModule = ConnectionContainerModule.create(({ bind, bindBackendService }) => {
|
|
49
49
|
bind(RemoteSSHConnectionProviderImpl).toSelf().inSingletonScope();
|
|
@@ -15,11 +15,11 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
|
-
import { RemoteConnection } from './remote-types';
|
|
18
|
+
import { RemoteConnection } from './remote-types.js';
|
|
19
19
|
import { Disposable } from '@theia/core';
|
|
20
|
-
import { RemoteCopyService } from './setup/remote-copy-service';
|
|
20
|
+
import { RemoteCopyService } from './setup/remote-copy-service.js';
|
|
21
21
|
import { BackendApplicationContribution } from '@theia/core/lib/node';
|
|
22
|
-
import { RemoteSetupService } from './setup/remote-setup-service';
|
|
22
|
+
import { RemoteSetupService } from './setup/remote-setup-service.js';
|
|
23
23
|
|
|
24
24
|
@injectable()
|
|
25
25
|
export class RemoteConnectionService implements BackendApplicationContribution {
|
|
@@ -15,10 +15,10 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
|
-
import { ForwardedPort, RemotePortForwardingProvider } from '../electron-common/remote-port-forwarding-provider';
|
|
18
|
+
import { ForwardedPort, RemotePortForwardingProvider } from '../electron-common/remote-port-forwarding-provider.js';
|
|
19
19
|
import { createServer, Server } from 'net';
|
|
20
|
-
import { RemoteConnectionService } from './remote-connection-service';
|
|
21
|
-
import { RemoteConnection } from './remote-types';
|
|
20
|
+
import { RemoteConnectionService } from './remote-connection-service.js';
|
|
21
|
+
import { RemoteConnection } from './remote-types.js';
|
|
22
22
|
|
|
23
23
|
interface ForwardInfo {
|
|
24
24
|
connection: RemoteConnection
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
|
-
import { RemoteStatus, RemoteStatusService } from '../electron-common/remote-status-service';
|
|
19
|
-
import { RemoteConnectionService } from './remote-connection-service';
|
|
18
|
+
import { RemoteStatus, RemoteStatusService } from '../electron-common/remote-status-service.js';
|
|
19
|
+
import { RemoteConnectionService } from './remote-connection-service.js';
|
|
20
20
|
|
|
21
21
|
@injectable()
|
|
22
22
|
export class RemoteStatusServiceImpl implements RemoteStatusService {
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
18
|
import { OS } from '@theia/core';
|
|
19
19
|
import { RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
|
|
20
|
-
import { AppNativeDependencyContribution } from './app-native-dependency-contribution';
|
|
20
|
+
import { AppNativeDependencyContribution } from './app-native-dependency-contribution.js';
|
|
21
21
|
|
|
22
22
|
class TestableAppNativeDependencyContribution extends AppNativeDependencyContribution {
|
|
23
23
|
publicGetDefaultURLForFile(remotePlatform: RemotePlatform, theiaVersion: string): string {
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { injectable } from '@theia/core/shared/inversify';
|
|
18
|
-
import { RemoteNativeDependencyContribution, DownloadOptions, DependencyDownload } from './remote-native-dependency-contribution';
|
|
18
|
+
import { RemoteNativeDependencyContribution, DownloadOptions, DependencyDownload } from './remote-native-dependency-contribution.js';
|
|
19
19
|
import { RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
|
|
20
20
|
import { OS } from '@theia/core';
|
|
21
21
|
|
|
@@ -17,11 +17,12 @@
|
|
|
17
17
|
import { ApplicationPackage } from '@theia/core/shared/@theia/application-package';
|
|
18
18
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
19
19
|
import { RemoteCopyRegistry, RemoteFile, RemoteCopyOptions } from '@theia/core/lib/node/remote/remote-copy-contribution';
|
|
20
|
-
|
|
20
|
+
// A CommonJS module whose exports cannot be detected statically, so it is imported as a whole.
|
|
21
|
+
import glob from 'glob';
|
|
21
22
|
import { promisify } from 'util';
|
|
22
23
|
import * as path from 'path';
|
|
23
24
|
|
|
24
|
-
const promiseGlob = promisify(
|
|
25
|
+
const promiseGlob = promisify(glob);
|
|
25
26
|
|
|
26
27
|
@injectable()
|
|
27
28
|
export class RemoteCopyRegistryImpl implements RemoteCopyRegistry {
|
|
@@ -14,17 +14,17 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import
|
|
17
|
+
import archiver from 'archiver';
|
|
18
18
|
import * as path from 'path';
|
|
19
19
|
import * as fs from 'fs';
|
|
20
20
|
import * as os from 'os';
|
|
21
21
|
import { ApplicationPackage } from '@theia/core/shared/@theia/application-package';
|
|
22
22
|
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
23
|
-
import { RemoteConnection } from '../remote-types';
|
|
23
|
+
import { RemoteConnection } from '../remote-types.js';
|
|
24
24
|
import { RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
|
|
25
|
-
import { RemoteNativeDependencyService } from './remote-native-dependency-service';
|
|
25
|
+
import { RemoteNativeDependencyService } from './remote-native-dependency-service.js';
|
|
26
26
|
import { ContributionProvider } from '@theia/core';
|
|
27
|
-
import { RemoteCopyRegistryImpl } from './remote-copy-contribution';
|
|
27
|
+
import { RemoteCopyRegistryImpl } from './remote-copy-contribution.js';
|
|
28
28
|
import { RemoteCopyContribution, RemoteFile } from '@theia/core/lib/node/remote/remote-copy-contribution';
|
|
29
29
|
|
|
30
30
|
@injectable()
|
|
@@ -17,15 +17,14 @@
|
|
|
17
17
|
import { ContributionProvider, THEIA_VERSION } from '@theia/core';
|
|
18
18
|
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
19
19
|
import { RequestContext, RequestService, RequestOptions } from '@theia/core/shared/@theia/request';
|
|
20
|
-
import
|
|
20
|
+
import decompress from 'decompress';
|
|
21
21
|
import * as path from 'path';
|
|
22
22
|
import * as fs from 'fs/promises';
|
|
23
|
-
import { DependencyDownload, DirectoryDependencyDownload, RemoteNativeDependencyContribution } from './remote-native-dependency-contribution';
|
|
23
|
+
import { DependencyDownload, DirectoryDependencyDownload, RemoteNativeDependencyContribution } from './remote-native-dependency-contribution.js';
|
|
24
24
|
import { RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const decompressUnzip = require('decompress-unzip');
|
|
25
|
+
import decompressTar from 'decompress-tar';
|
|
26
|
+
import decompressTargz from 'decompress-targz';
|
|
27
|
+
import decompressUnzip from 'decompress-unzip';
|
|
29
28
|
|
|
30
29
|
export const DEFAULT_HTTP_OPTIONS = {
|
|
31
30
|
method: 'GET',
|
|
@@ -20,7 +20,7 @@ import * as os from 'os';
|
|
|
20
20
|
|
|
21
21
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
22
22
|
import { RequestService } from '@theia/core/shared/@theia/request';
|
|
23
|
-
import { RemoteSetupScriptService } from './remote-setup-script-service';
|
|
23
|
+
import { RemoteSetupScriptService } from './remote-setup-script-service.js';
|
|
24
24
|
import { RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
|
|
25
25
|
import { OS } from '@theia/core';
|
|
26
26
|
|
|
@@ -29,7 +29,7 @@ import { OS } from '@theia/core';
|
|
|
29
29
|
*
|
|
30
30
|
* Native dependencies are compiled against this version.
|
|
31
31
|
*/
|
|
32
|
-
export const REMOTE_NODE_VERSION = '24.
|
|
32
|
+
export const REMOTE_NODE_VERSION = '24.21.0';
|
|
33
33
|
|
|
34
34
|
@injectable()
|
|
35
35
|
export class RemoteNodeSetupService {
|
|
@@ -15,14 +15,14 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
18
|
-
import { RemoteConnection, RemoteExecResult, RemoteStatusReport } from '../remote-types';
|
|
18
|
+
import { RemoteConnection, RemoteExecResult, RemoteStatusReport } from '../remote-types.js';
|
|
19
19
|
import { RemoteCliContext, RemoteCliContribution, RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
|
|
20
20
|
import { ApplicationPackage } from '@theia/core/shared/@theia/application-package';
|
|
21
|
-
import { RemoteCopyService } from './remote-copy-service';
|
|
22
|
-
import { RemoteNativeDependencyService } from './remote-native-dependency-service';
|
|
21
|
+
import { RemoteCopyService } from './remote-copy-service.js';
|
|
22
|
+
import { RemoteNativeDependencyService } from './remote-native-dependency-service.js';
|
|
23
23
|
import { ContributionProvider, OS, THEIA_VERSION } from '@theia/core';
|
|
24
|
-
import { RemoteNodeSetupService } from './remote-node-setup-service';
|
|
25
|
-
import { RemoteSetupScriptService } from './remote-setup-script-service';
|
|
24
|
+
import { RemoteNodeSetupService } from './remote-node-setup-service.js';
|
|
25
|
+
import { RemoteSetupScriptService } from './remote-setup-script-service.js';
|
|
26
26
|
|
|
27
27
|
export interface RemoteSetupOptions {
|
|
28
28
|
connection: RemoteConnection;
|
|
@@ -15,8 +15,12 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
|
-
import
|
|
19
|
-
import { RemoteSSHConnectionProviderImpl } from './remote-ssh-connection-provider';
|
|
18
|
+
import SshConfigModule from 'ssh-config';
|
|
19
|
+
import { RemoteSSHConnectionProviderImpl } from './remote-ssh-connection-provider.js';
|
|
20
|
+
|
|
21
|
+
// `ssh-config` is a CommonJS module that provides the class as `default` export of `module.exports`.
|
|
22
|
+
const SshConfig = SshConfigModule.default;
|
|
23
|
+
type SshConfig = SshConfigModule.default;
|
|
20
24
|
|
|
21
25
|
/**
|
|
22
26
|
* Parses the SSH config from an in-memory string instead of a file,
|
|
@@ -14,22 +14,27 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
|
|
17
|
+
// A CommonJS module whose exports cannot be detected statically, so it is imported as a whole.
|
|
18
|
+
import ssh2 from 'ssh2';
|
|
18
19
|
import * as net from 'net';
|
|
19
20
|
import * as fs from '@theia/core/shared/fs-extra';
|
|
20
|
-
import SftpClient
|
|
21
|
-
import
|
|
21
|
+
import SftpClient from 'ssh2-sftp-client';
|
|
22
|
+
import SshConfigModule from 'ssh-config';
|
|
22
23
|
import { Emitter, Event, MessageService, QuickInputService, ILogger } from '@theia/core';
|
|
23
24
|
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
24
|
-
import { RemoteSSHConnectionProvider, RemoteSSHConnectionProviderOptions, SSHConfig } from '../../electron-common/remote-ssh-connection-provider';
|
|
25
|
-
import { RemoteConnectionService } from '../remote-connection-service';
|
|
26
|
-
import { RemoteProxyServerProvider } from '../remote-proxy-server-provider';
|
|
27
|
-
import { RemoteConnection, RemoteExecOptions, RemoteExecResult, RemoteExecTester, RemoteStatusReport } from '../remote-types';
|
|
25
|
+
import { RemoteSSHConnectionProvider, RemoteSSHConnectionProviderOptions, SSHConfig } from '../../electron-common/remote-ssh-connection-provider.js';
|
|
26
|
+
import { RemoteConnectionService } from '../remote-connection-service.js';
|
|
27
|
+
import { RemoteProxyServerProvider } from '../remote-proxy-server-provider.js';
|
|
28
|
+
import { RemoteConnection, RemoteExecOptions, RemoteExecResult, RemoteExecTester, RemoteStatusReport } from '../remote-types.js';
|
|
28
29
|
import { Deferred, timeout } from '@theia/core/lib/common/promise-util';
|
|
29
|
-
import { SSHIdentityFileCollector, SSHKey } from './ssh-identity-file-collector';
|
|
30
|
-
import { RemoteSetupService } from '../setup/remote-setup-service';
|
|
30
|
+
import { SSHIdentityFileCollector, SSHKey } from './ssh-identity-file-collector.js';
|
|
31
|
+
import { RemoteSetupService } from '../setup/remote-setup-service.js';
|
|
31
32
|
import { generateUuid } from '@theia/core/lib/common/uuid';
|
|
32
33
|
|
|
34
|
+
// `ssh-config` is a CommonJS module that provides the class as `default` export of `module.exports`.
|
|
35
|
+
const SshConfig = SshConfigModule.default;
|
|
36
|
+
type SshConfig = SshConfigModule.default;
|
|
37
|
+
|
|
33
38
|
@injectable()
|
|
34
39
|
export class RemoteSSHConnectionProviderImpl implements RemoteSSHConnectionProvider {
|
|
35
40
|
|