@theia/dev-container 1.56.0 → 1.57.0-next.136
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/README.md +4 -3
- package/lib/electron-browser/container-connection-contribution.d.ts +11 -5
- package/lib/electron-browser/container-connection-contribution.d.ts.map +1 -1
- package/lib/electron-browser/container-connection-contribution.js +46 -5
- package/lib/electron-browser/container-connection-contribution.js.map +1 -1
- package/lib/electron-browser/container-info-contribution.d.ts +12 -3
- package/lib/electron-browser/container-info-contribution.d.ts.map +1 -1
- package/lib/electron-browser/container-info-contribution.js +38 -3
- package/lib/electron-browser/container-info-contribution.js.map +1 -1
- package/lib/electron-browser/dev-container-frontend-module.d.ts.map +1 -1
- package/lib/electron-browser/dev-container-frontend-module.js +5 -0
- package/lib/electron-browser/dev-container-frontend-module.js.map +1 -1
- package/lib/electron-common/dev-container-workspaces.d.ts +3 -0
- package/lib/electron-common/dev-container-workspaces.d.ts.map +1 -0
- package/lib/electron-common/dev-container-workspaces.js +21 -0
- package/lib/electron-common/dev-container-workspaces.js.map +1 -0
- package/lib/electron-common/remote-container-connection-provider.d.ts +2 -1
- package/lib/electron-common/remote-container-connection-provider.d.ts.map +1 -1
- package/lib/electron-node/dev-container-backend-module.d.ts.map +1 -1
- package/lib/electron-node/dev-container-backend-module.js +7 -0
- package/lib/electron-node/dev-container-backend-module.js.map +1 -1
- package/lib/electron-node/dev-container-file-service.d.ts +6 -1
- package/lib/electron-node/dev-container-file-service.d.ts.map +1 -1
- package/lib/electron-node/dev-container-file-service.js +39 -7
- package/lib/electron-node/dev-container-file-service.js.map +1 -1
- package/lib/electron-node/dev-container-workspace-handler.d.ts +7 -0
- package/lib/electron-node/dev-container-workspace-handler.d.ts.map +1 -0
- package/lib/electron-node/dev-container-workspace-handler.js +21 -0
- package/lib/electron-node/dev-container-workspace-handler.js.map +1 -0
- package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.d.ts +3 -0
- package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.d.ts.map +1 -1
- package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.js +25 -2
- package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.js.map +1 -1
- package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.d.ts +18 -0
- package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.d.ts.map +1 -0
- package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.js +58 -0
- package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.js.map +1 -0
- package/lib/electron-node/docker-container-service.d.ts +3 -2
- package/lib/electron-node/docker-container-service.d.ts.map +1 -1
- package/lib/electron-node/docker-container-service.js +7 -5
- package/lib/electron-node/docker-container-service.js.map +1 -1
- package/lib/electron-node/remote-container-connection-provider.d.ts +2 -1
- package/lib/electron-node/remote-container-connection-provider.d.ts.map +1 -1
- package/lib/electron-node/remote-container-connection-provider.js +3 -3
- package/lib/electron-node/remote-container-connection-provider.js.map +1 -1
- package/package.json +7 -7
- package/src/electron-browser/container-connection-contribution.ts +58 -10
- package/src/electron-browser/container-info-contribution.ts +44 -6
- package/src/electron-browser/dev-container-frontend-module.ts +6 -1
- package/src/electron-common/dev-container-workspaces.ts +18 -0
- package/src/electron-common/remote-container-connection-provider.ts +2 -1
- package/src/electron-node/dev-container-backend-module.ts +8 -0
- package/src/electron-node/dev-container-file-service.ts +40 -10
- package/src/electron-node/dev-container-workspace-handler.ts +33 -0
- package/src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts +22 -2
- package/src/electron-node/devcontainer-contributions/variable-resolver-contribution.ts +54 -0
- package/src/electron-node/docker-container-service.ts +9 -7
- package/src/electron-node/remote-container-connection-provider.ts +3 -3
package/README.md
CHANGED
|
@@ -17,6 +17,7 @@ The `@theia/dev-container` extension provides functionality to create, start and
|
|
|
17
17
|
|
|
18
18
|
The full devcontainer.json Schema can be found [here](https://containers.dev/implementors/json_reference/).
|
|
19
19
|
Currently only a small number of configuration file properties are implemented. Those include the following:
|
|
20
|
+
|
|
20
21
|
- name
|
|
21
22
|
- Image
|
|
22
23
|
- dockerfile/build.dockerfile
|
|
@@ -25,8 +26,7 @@ Currently only a small number of configuration file properties are implemented.
|
|
|
25
26
|
- forwardPorts
|
|
26
27
|
- mounts
|
|
27
28
|
|
|
28
|
-
see `main-container-creation-contributions.ts` for how to implementations or how to implement additional ones.
|
|
29
|
-
|
|
29
|
+
see `main-container-creation-contributions.ts` for how to implementations or how to implement additional ones.
|
|
30
30
|
|
|
31
31
|
## Additional Information
|
|
32
32
|
|
|
@@ -39,5 +39,6 @@ see `main-container-creation-contributions.ts` for how to implementations or how
|
|
|
39
39
|
- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
|
|
40
40
|
|
|
41
41
|
## Trademark
|
|
42
|
+
|
|
42
43
|
"Theia" is a trademark of the Eclipse Foundation
|
|
43
|
-
https://www.eclipse.org/theia
|
|
44
|
+
<https://www.eclipse.org/theia>
|
|
@@ -1,22 +1,28 @@
|
|
|
1
1
|
import { AbstractRemoteRegistryContribution, RemoteRegistry } from '@theia/remote/lib/electron-browser/remote-registry-contribution';
|
|
2
|
-
import { RemoteContainerConnectionProvider } from '../electron-common/remote-container-connection-provider';
|
|
2
|
+
import { DevContainerFile, RemoteContainerConnectionProvider } from '../electron-common/remote-container-connection-provider';
|
|
3
3
|
import { RemotePreferences } from '@theia/remote/lib/electron-browser/remote-preferences';
|
|
4
4
|
import { WorkspaceStorageService } from '@theia/workspace/lib/browser/workspace-storage-service';
|
|
5
|
-
import { Command, QuickInputService } from '@theia/core';
|
|
6
|
-
import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
|
|
5
|
+
import { Command, MaybePromise, QuickInputService, URI } from '@theia/core';
|
|
6
|
+
import { WorkspaceInput, WorkspaceOpenHandlerContribution, WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
|
|
7
7
|
import { ContainerOutputProvider } from './container-output-provider';
|
|
8
|
+
import { WorkspaceServer } from '@theia/workspace/lib/common';
|
|
8
9
|
export declare namespace RemoteContainerCommands {
|
|
9
10
|
const REOPEN_IN_CONTAINER: Command;
|
|
10
11
|
}
|
|
11
|
-
export declare class ContainerConnectionContribution extends AbstractRemoteRegistryContribution {
|
|
12
|
+
export declare class ContainerConnectionContribution extends AbstractRemoteRegistryContribution implements WorkspaceOpenHandlerContribution {
|
|
12
13
|
protected readonly connectionProvider: RemoteContainerConnectionProvider;
|
|
13
14
|
protected readonly remotePreferences: RemotePreferences;
|
|
14
15
|
protected readonly workspaceStorageService: WorkspaceStorageService;
|
|
15
16
|
protected readonly workspaceService: WorkspaceService;
|
|
17
|
+
protected readonly workspaceServer: WorkspaceServer;
|
|
16
18
|
protected readonly quickInputService: QuickInputService;
|
|
17
19
|
protected readonly containerOutputProvider: ContainerOutputProvider;
|
|
18
20
|
registerRemoteCommands(registry: RemoteRegistry): void;
|
|
21
|
+
canHandle(uri: URI): MaybePromise<boolean>;
|
|
22
|
+
openWorkspace(uri: URI, options?: WorkspaceInput | undefined): Promise<void>;
|
|
23
|
+
getWorkspaceLabel(uri: URI): Promise<string | undefined>;
|
|
19
24
|
openInContainer(): Promise<void>;
|
|
20
|
-
|
|
25
|
+
doOpenInContainer(devcontainerFile: DevContainerFile, workspaceUri?: string): Promise<void>;
|
|
26
|
+
getOrSelectDevcontainerFile(): Promise<DevContainerFile | undefined>;
|
|
21
27
|
}
|
|
22
28
|
//# sourceMappingURL=container-connection-contribution.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-connection-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,kCAAkC,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAC;AACrI,OAAO,EAAqB,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;
|
|
1
|
+
{"version":3,"file":"container-connection-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,kCAAkC,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAC;AACrI,OAAO,EAAE,gBAAgB,EAAqB,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;AACjJ,OAAO,EAAE,iBAAiB,EAAE,MAAM,uDAAuD,CAAC;AAC1F,OAAO,EAAE,uBAAuB,EAAE,MAAM,wDAAwD,CAAC;AACjG,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,gCAAgC,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AACpI,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG9D,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,mBAAmB,SAIC,CAAC;CACrC;AAGD,qBACa,+BAAgC,SAAQ,kCAAmC,YAAW,gCAAgC;IAG/H,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iCAAiC,CAAC;IAGzE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAGpE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAEpE,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAMtD,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC;IAIpC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB5E,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAUxD,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB3F,2BAA2B,IAAI,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;CAqB7E"}
|
|
@@ -25,6 +25,8 @@ const workspace_storage_service_1 = require("@theia/workspace/lib/browser/worksp
|
|
|
25
25
|
const core_1 = require("@theia/core");
|
|
26
26
|
const workspace_service_1 = require("@theia/workspace/lib/browser/workspace-service");
|
|
27
27
|
const container_output_provider_1 = require("./container-output-provider");
|
|
28
|
+
const common_1 = require("@theia/workspace/lib/common");
|
|
29
|
+
const dev_container_workspaces_1 = require("../electron-common/dev-container-workspaces");
|
|
28
30
|
var RemoteContainerCommands;
|
|
29
31
|
(function (RemoteContainerCommands) {
|
|
30
32
|
RemoteContainerCommands.REOPEN_IN_CONTAINER = core_1.Command.toLocalizedCommand({
|
|
@@ -40,36 +42,71 @@ let ContainerConnectionContribution = class ContainerConnectionContribution exte
|
|
|
40
42
|
execute: () => this.openInContainer()
|
|
41
43
|
});
|
|
42
44
|
}
|
|
45
|
+
canHandle(uri) {
|
|
46
|
+
return uri.scheme === dev_container_workspaces_1.DEV_CONTAINER_WORKSPACE_SCHEME;
|
|
47
|
+
}
|
|
48
|
+
async openWorkspace(uri, options) {
|
|
49
|
+
const filePath = new URLSearchParams(uri.query).get(dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY);
|
|
50
|
+
if (!filePath) {
|
|
51
|
+
throw new Error('No devcontainer file specified for workspace');
|
|
52
|
+
}
|
|
53
|
+
const devcontainerFiles = await this.connectionProvider.getDevContainerFiles(uri.path.toString());
|
|
54
|
+
const devcontainerFile = devcontainerFiles.find(file => file.path === filePath);
|
|
55
|
+
if (!devcontainerFile) {
|
|
56
|
+
throw new Error(`Devcontainer file at ${filePath} not found in workspace`);
|
|
57
|
+
}
|
|
58
|
+
return this.doOpenInContainer(devcontainerFile, uri.toString());
|
|
59
|
+
}
|
|
60
|
+
async getWorkspaceLabel(uri) {
|
|
61
|
+
const containerFilePath = new URLSearchParams(uri.query).get(dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY);
|
|
62
|
+
if (!containerFilePath) {
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
;
|
|
66
|
+
const files = await this.connectionProvider.getDevContainerFiles(uri.path.toString());
|
|
67
|
+
const devcontainerFile = files.find(file => file.path === containerFilePath);
|
|
68
|
+
return `${uri.path.base} [Dev Container: ${devcontainerFile === null || devcontainerFile === void 0 ? void 0 : devcontainerFile.name}]`;
|
|
69
|
+
}
|
|
43
70
|
async openInContainer() {
|
|
44
71
|
const devcontainerFile = await this.getOrSelectDevcontainerFile();
|
|
45
72
|
if (!devcontainerFile) {
|
|
46
73
|
return;
|
|
47
74
|
}
|
|
48
|
-
|
|
75
|
+
this.doOpenInContainer(devcontainerFile);
|
|
76
|
+
}
|
|
77
|
+
async doOpenInContainer(devcontainerFile, workspaceUri) {
|
|
78
|
+
var _a;
|
|
79
|
+
const lastContainerInfoKey = `${LAST_USED_CONTAINER}:${devcontainerFile.path}`;
|
|
49
80
|
const lastContainerInfo = await this.workspaceStorageService.getData(lastContainerInfoKey);
|
|
50
81
|
this.containerOutputProvider.openChannel();
|
|
51
82
|
const connectionResult = await this.connectionProvider.connectToContainer({
|
|
52
83
|
nodeDownloadTemplate: this.remotePreferences['remote.nodeDownloadTemplate'],
|
|
53
84
|
lastContainerInfo,
|
|
54
|
-
devcontainerFile
|
|
85
|
+
devcontainerFile: devcontainerFile.path,
|
|
86
|
+
workspaceUri
|
|
55
87
|
});
|
|
56
88
|
this.workspaceStorageService.setData(lastContainerInfoKey, {
|
|
57
89
|
id: connectionResult.containerId,
|
|
58
90
|
lastUsed: Date.now()
|
|
59
91
|
});
|
|
92
|
+
this.workspaceServer.setMostRecentlyUsedWorkspace(`${dev_container_workspaces_1.DEV_CONTAINER_WORKSPACE_SCHEME}:${(_a = this.workspaceService.workspace) === null || _a === void 0 ? void 0 : _a.resource.path}?${dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY}=${devcontainerFile.path}`);
|
|
60
93
|
this.openRemote(connectionResult.port, false, connectionResult.workspacePath);
|
|
61
94
|
}
|
|
62
95
|
async getOrSelectDevcontainerFile() {
|
|
63
96
|
var _a;
|
|
64
|
-
const
|
|
97
|
+
const workspace = this.workspaceService.workspace;
|
|
98
|
+
if (!workspace) {
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
const devcontainerFiles = await this.connectionProvider.getDevContainerFiles(workspace.resource.path.toString());
|
|
65
102
|
if (devcontainerFiles.length === 1) {
|
|
66
|
-
return devcontainerFiles[0]
|
|
103
|
+
return devcontainerFiles[0];
|
|
67
104
|
}
|
|
68
105
|
return (_a = (await this.quickInputService.pick(devcontainerFiles.map(file => ({
|
|
69
106
|
type: 'item',
|
|
70
107
|
label: file.name,
|
|
71
108
|
description: file.path,
|
|
72
|
-
file: file
|
|
109
|
+
file: file,
|
|
73
110
|
})), {
|
|
74
111
|
title: 'Select a devcontainer.json file'
|
|
75
112
|
}))) === null || _a === void 0 ? void 0 : _a.file;
|
|
@@ -92,6 +129,10 @@ tslib_1.__decorate([
|
|
|
92
129
|
(0, inversify_1.inject)(workspace_service_1.WorkspaceService),
|
|
93
130
|
tslib_1.__metadata("design:type", workspace_service_1.WorkspaceService)
|
|
94
131
|
], ContainerConnectionContribution.prototype, "workspaceService", void 0);
|
|
132
|
+
tslib_1.__decorate([
|
|
133
|
+
(0, inversify_1.inject)(common_1.WorkspaceServer),
|
|
134
|
+
tslib_1.__metadata("design:type", Object)
|
|
135
|
+
], ContainerConnectionContribution.prototype, "workspaceServer", void 0);
|
|
95
136
|
tslib_1.__decorate([
|
|
96
137
|
(0, inversify_1.inject)(core_1.QuickInputService),
|
|
97
138
|
tslib_1.__metadata("design:type", Object)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-connection-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/container-connection-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,4DAAkE;AAClE,kHAAqI;AACrI,
|
|
1
|
+
{"version":3,"file":"container-connection-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,20 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { WindowTitleContribution } from '@theia/core/lib/browser/window/window-title-service';
|
|
2
|
+
import { RemoteStatus, RemoteStatusService } from '@theia/remote/lib/electron-common/remote-status-service';
|
|
3
|
+
import { FrontendApplicationContribution, LabelProviderContribution } from '@theia/core/lib/browser';
|
|
2
4
|
import type { ContainerInspectInfo } from 'dockerode';
|
|
3
5
|
import { RemoteContainerConnectionProvider } from '../electron-common/remote-container-connection-provider';
|
|
4
6
|
import { PortForwardingService } from '@theia/remote/lib/electron-browser/port-forwarding/port-forwarding-service';
|
|
5
|
-
|
|
7
|
+
import { URI } from '@theia/core';
|
|
8
|
+
export declare class ContainerInfoContribution implements FrontendApplicationContribution, WindowTitleContribution, LabelProviderContribution {
|
|
6
9
|
protected readonly connectionProvider: RemoteContainerConnectionProvider;
|
|
7
10
|
protected readonly portForwardingService: PortForwardingService;
|
|
8
|
-
|
|
11
|
+
protected readonly remoteStatusService: RemoteStatusService;
|
|
12
|
+
protected status: RemoteStatus | undefined;
|
|
13
|
+
protected containerInfo: ContainerInspectInfo | undefined;
|
|
14
|
+
protected containerFilePath: string | undefined;
|
|
9
15
|
onStart(): Promise<void>;
|
|
16
|
+
enhanceTitle(title: string, parts: Map<string, string | undefined>): string;
|
|
17
|
+
canHandle(element: object): number;
|
|
18
|
+
getName(element: URI): string | undefined;
|
|
10
19
|
}
|
|
11
20
|
//# sourceMappingURL=container-info-contribution.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-info-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/container-info-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"container-info-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/container-info-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qDAAqD,CAAC;AAC9F,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,+BAA+B,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACrG,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,qBAAqB,EAAE,MAAM,4EAA4E,CAAC;AAEnH,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,qBACa,yBAA0B,YAAW,+BAA+B,EAAE,uBAAuB,EAAE,yBAAyB;IAEjI,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iCAAiC,CAAC;IAGzE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAE5D,SAAS,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;IAC3C,SAAS,CAAC,aAAa,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAC1D,SAAS,CAAC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAc9B,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,MAAM;IAQ3E,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAelC,OAAO,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;CAK5C"}
|
|
@@ -18,13 +18,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
exports.ContainerInfoContribution = void 0;
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
20
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
|
+
const remote_status_service_1 = require("@theia/remote/lib/electron-common/remote-status-service");
|
|
21
22
|
const remote_container_connection_provider_1 = require("../electron-common/remote-container-connection-provider");
|
|
22
23
|
const port_forwarding_service_1 = require("@theia/remote/lib/electron-browser/port-forwarding/port-forwarding-service");
|
|
24
|
+
const dev_container_workspaces_1 = require("../electron-common/dev-container-workspaces");
|
|
25
|
+
const core_1 = require("@theia/core");
|
|
23
26
|
let ContainerInfoContribution = class ContainerInfoContribution {
|
|
24
27
|
async onStart() {
|
|
25
|
-
var _a, _b
|
|
26
|
-
|
|
27
|
-
|
|
28
|
+
var _a, _b;
|
|
29
|
+
const containerPort = parseInt((_a = new URLSearchParams(location.search).get('port')) !== null && _a !== void 0 ? _a : '0');
|
|
30
|
+
const containerInfo = await this.connectionProvider.getCurrentContainerInfo(containerPort);
|
|
31
|
+
this.status = await this.remoteStatusService.getStatus(containerPort);
|
|
32
|
+
this.portForwardingService.forwardedPorts = Object.entries((_b = containerInfo === null || containerInfo === void 0 ? void 0 : containerInfo.NetworkSettings.Ports) !== null && _b !== void 0 ? _b : {}).flatMap(([_, ports]) => (ports.map(port => {
|
|
28
33
|
var _a, _b;
|
|
29
34
|
return ({
|
|
30
35
|
editing: false,
|
|
@@ -34,6 +39,32 @@ let ContainerInfoContribution = class ContainerInfoContribution {
|
|
|
34
39
|
});
|
|
35
40
|
})));
|
|
36
41
|
}
|
|
42
|
+
enhanceTitle(title, parts) {
|
|
43
|
+
if (this.status && this.status.alive) {
|
|
44
|
+
const devcontainerName = this.status.name;
|
|
45
|
+
title = `${title} [Dev Container${devcontainerName ? ': ' + devcontainerName : ''}]`;
|
|
46
|
+
}
|
|
47
|
+
return title;
|
|
48
|
+
}
|
|
49
|
+
canHandle(element) {
|
|
50
|
+
if ('query' in element) {
|
|
51
|
+
let containerFilePath = new URLSearchParams(element.query).get(dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY);
|
|
52
|
+
if (containerFilePath) {
|
|
53
|
+
if (containerFilePath.startsWith(element.path.toString())) {
|
|
54
|
+
containerFilePath = containerFilePath.replace(element.path.toString(), '');
|
|
55
|
+
}
|
|
56
|
+
this.containerFilePath = containerFilePath;
|
|
57
|
+
return 100;
|
|
58
|
+
}
|
|
59
|
+
;
|
|
60
|
+
return 0;
|
|
61
|
+
}
|
|
62
|
+
return 0;
|
|
63
|
+
}
|
|
64
|
+
getName(element) {
|
|
65
|
+
const dir = new core_1.URI(this.containerFilePath).path.dir.base;
|
|
66
|
+
return `${element.path.base} [Dev Container${dir && dir !== '.devcontainer' ? `: ${dir}` : ''}]`;
|
|
67
|
+
}
|
|
37
68
|
};
|
|
38
69
|
exports.ContainerInfoContribution = ContainerInfoContribution;
|
|
39
70
|
tslib_1.__decorate([
|
|
@@ -44,6 +75,10 @@ tslib_1.__decorate([
|
|
|
44
75
|
(0, inversify_1.inject)(port_forwarding_service_1.PortForwardingService),
|
|
45
76
|
tslib_1.__metadata("design:type", port_forwarding_service_1.PortForwardingService)
|
|
46
77
|
], ContainerInfoContribution.prototype, "portForwardingService", void 0);
|
|
78
|
+
tslib_1.__decorate([
|
|
79
|
+
(0, inversify_1.inject)(remote_status_service_1.RemoteStatusService),
|
|
80
|
+
tslib_1.__metadata("design:type", Object)
|
|
81
|
+
], ContainerInfoContribution.prototype, "remoteStatusService", void 0);
|
|
47
82
|
exports.ContainerInfoContribution = ContainerInfoContribution = tslib_1.__decorate([
|
|
48
83
|
(0, inversify_1.injectable)()
|
|
49
84
|
], ContainerInfoContribution);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-info-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/container-info-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,4DAAkE;
|
|
1
|
+
{"version":3,"file":"container-info-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/container-info-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-container-frontend-module.d.ts","sourceRoot":"","sources":["../../src/electron-browser/dev-container-frontend-module.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;
|
|
1
|
+
{"version":3,"file":"dev-container-frontend-module.d.ts","sourceRoot":"","sources":["../../src/electron-browser/dev-container-frontend-module.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAW/D,wBAgBG"}
|
|
@@ -23,9 +23,12 @@ const service_connection_provider_1 = require("@theia/core/lib/browser/messaging
|
|
|
23
23
|
const container_output_provider_1 = require("./container-output-provider");
|
|
24
24
|
const container_info_contribution_1 = require("./container-info-contribution");
|
|
25
25
|
const browser_1 = require("@theia/core/lib/browser");
|
|
26
|
+
const workspace_service_1 = require("@theia/workspace/lib/browser/workspace-service");
|
|
27
|
+
const window_title_service_1 = require("@theia/core/lib/browser/window/window-title-service");
|
|
26
28
|
exports.default = new inversify_1.ContainerModule(bind => {
|
|
27
29
|
bind(container_connection_contribution_1.ContainerConnectionContribution).toSelf().inSingletonScope();
|
|
28
30
|
bind(remote_registry_contribution_1.RemoteRegistryContribution).toService(container_connection_contribution_1.ContainerConnectionContribution);
|
|
31
|
+
bind(workspace_service_1.WorkspaceOpenHandlerContribution).toService(container_connection_contribution_1.ContainerConnectionContribution);
|
|
29
32
|
bind(container_output_provider_1.ContainerOutputProvider).toSelf().inSingletonScope();
|
|
30
33
|
bind(remote_container_connection_provider_1.RemoteContainerConnectionProvider).toDynamicValue(ctx => {
|
|
31
34
|
const outputProvider = ctx.container.get(container_output_provider_1.ContainerOutputProvider);
|
|
@@ -33,5 +36,7 @@ exports.default = new inversify_1.ContainerModule(bind => {
|
|
|
33
36
|
}).inSingletonScope();
|
|
34
37
|
bind(container_info_contribution_1.ContainerInfoContribution).toSelf().inSingletonScope();
|
|
35
38
|
bind(browser_1.FrontendApplicationContribution).toService(container_info_contribution_1.ContainerInfoContribution);
|
|
39
|
+
bind(window_title_service_1.WindowTitleContribution).toService(container_info_contribution_1.ContainerInfoContribution);
|
|
40
|
+
bind(browser_1.LabelProviderContribution).toService(container_info_contribution_1.ContainerInfoContribution);
|
|
36
41
|
});
|
|
37
42
|
//# sourceMappingURL=dev-container-frontend-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-container-frontend-module.js","sourceRoot":"","sources":["../../src/electron-browser/dev-container-frontend-module.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;AAChF,4DAA+D;AAC/D,kHAA6G;AAC7G,kHAAmJ;AACnJ,2FAAsF;AACtF,+GAA0G;AAC1G,2EAAsE;AACtE,+EAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"dev-container-frontend-module.js","sourceRoot":"","sources":["../../src/electron-browser/dev-container-frontend-module.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;AAChF,4DAA+D;AAC/D,kHAA6G;AAC7G,kHAAmJ;AACnJ,2FAAsF;AACtF,+GAA0G;AAC1G,2EAAsE;AACtE,+EAA0E;AAC1E,qDAAqG;AACrG,sFAAkG;AAClG,8FAA8F;AAE9F,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,mEAA+B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,yDAA0B,CAAC,CAAC,SAAS,CAAC,mEAA+B,CAAC,CAAC;IAC5E,IAAI,CAAC,oDAAgC,CAAC,CAAC,SAAS,CAAC,mEAA+B,CAAC,CAAC;IAElF,IAAI,CAAC,mDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,IAAI,CAAC,wEAAiC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QACzD,MAAM,cAAc,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,mDAAuB,CAAC,CAAC;QAClE,OAAO,uDAAyB,CAAC,gBAAgB,CAAoC,GAAG,CAAC,SAAS,EAAE,4EAAqC,EAAE,cAAc,CAAC,CAAC;IAC/J,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEtB,IAAI,CAAC,uDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,yCAA+B,CAAC,CAAC,SAAS,CAAC,uDAAyB,CAAC,CAAC;IAC3E,IAAI,CAAC,8CAAuB,CAAC,CAAC,SAAS,CAAC,uDAAyB,CAAC,CAAC;IACnE,IAAI,CAAC,mCAAyB,CAAC,CAAC,SAAS,CAAC,uDAAyB,CAAC,CAAC;AACzE,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-container-workspaces.d.ts","sourceRoot":"","sources":["../../src/electron-common/dev-container-workspaces.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,8BAA8B,iBAAiB,CAAC;AAC7D,eAAO,MAAM,wBAAwB,kBAAkB,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// *****************************************************************************
|
|
3
|
+
// Copyright (C) 2024 Typefox and others.
|
|
4
|
+
//
|
|
5
|
+
// This program and the accompanying materials are made available under the
|
|
6
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
+
//
|
|
9
|
+
// This Source Code may also be made available under the following Secondary
|
|
10
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
+
// with the GNU Classpath Exception which is available at
|
|
13
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
14
|
+
//
|
|
15
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
|
+
// *****************************************************************************
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.DEV_CONTAINER_PATH_QUERY = exports.DEV_CONTAINER_WORKSPACE_SCHEME = void 0;
|
|
19
|
+
exports.DEV_CONTAINER_WORKSPACE_SCHEME = 'devcontainer';
|
|
20
|
+
exports.DEV_CONTAINER_PATH_QUERY = 'containerfile';
|
|
21
|
+
//# sourceMappingURL=dev-container-workspaces.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-container-workspaces.js","sourceRoot":"","sources":["../../src/electron-common/dev-container-workspaces.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;;;AAEnE,QAAA,8BAA8B,GAAG,cAAc,CAAC;AAChD,QAAA,wBAAwB,GAAG,eAAe,CAAC"}
|
|
@@ -7,6 +7,7 @@ export interface ContainerConnectionOptions {
|
|
|
7
7
|
nodeDownloadTemplate?: string;
|
|
8
8
|
lastContainerInfo?: LastContainerInfo;
|
|
9
9
|
devcontainerFile: string;
|
|
10
|
+
workspaceUri?: string;
|
|
10
11
|
}
|
|
11
12
|
export interface LastContainerInfo {
|
|
12
13
|
id: string;
|
|
@@ -23,7 +24,7 @@ export interface DevContainerFile {
|
|
|
23
24
|
}
|
|
24
25
|
export interface RemoteContainerConnectionProvider extends RpcServer<ContainerOutputProvider> {
|
|
25
26
|
connectToContainer(options: ContainerConnectionOptions): Promise<ContainerConnectionResult>;
|
|
26
|
-
getDevContainerFiles(): Promise<DevContainerFile[]>;
|
|
27
|
+
getDevContainerFiles(workspacePath: string): Promise<DevContainerFile[]>;
|
|
27
28
|
getCurrentContainerInfo(port: number): Promise<ContainerInspectInfo | undefined>;
|
|
28
29
|
}
|
|
29
30
|
//# sourceMappingURL=remote-container-connection-provider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-container-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-common/remote-container-connection-provider.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAGtD,eAAO,MAAM,qCAAqC,sBAAsB,CAAC;AAEzE,eAAO,MAAM,iCAAiC,eAA8C,CAAC;AAE7F,MAAM,WAAW,0BAA0B;IACvC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,gBAAgB,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"remote-container-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-common/remote-container-connection-provider.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAGtD,eAAO,MAAM,qCAAqC,sBAAsB,CAAC;AAEzE,eAAO,MAAM,iCAAiC,eAA8C,CAAC;AAE7F,MAAM,WAAW,0BAA0B;IACvC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iCAAkC,SAAQ,SAAS,CAAC,uBAAuB,CAAC;IACzF,kBAAkB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC5F,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACzE,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAAC;CACpF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-container-backend-module.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-container-backend-module.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAgB/D,eAAO,MAAM,sBAAsB,iBAkBjC,CAAC;;AAEH,wBAaG"}
|
|
@@ -27,10 +27,15 @@ const dev_container_file_service_1 = require("./dev-container-file-service");
|
|
|
27
27
|
const cli_enhancing_creation_contributions_1 = require("./devcontainer-contributions/cli-enhancing-creation-contributions");
|
|
28
28
|
const remote_cli_contribution_1 = require("@theia/core/lib/node/remote/remote-cli-contribution");
|
|
29
29
|
const profile_file_modification_contribution_1 = require("./devcontainer-contributions/profile-file-modification-contribution");
|
|
30
|
+
const dev_container_workspace_handler_1 = require("./dev-container-workspace-handler");
|
|
31
|
+
const default_workspace_server_1 = require("@theia/workspace/lib/node/default-workspace-server");
|
|
32
|
+
const variable_resolver_contribution_1 = require("./devcontainer-contributions/variable-resolver-contribution");
|
|
30
33
|
exports.remoteConnectionModule = connection_container_module_1.ConnectionContainerModule.create(({ bind, bindBackendService }) => {
|
|
31
34
|
(0, core_1.bindContributionProvider)(bind, docker_container_service_1.ContainerCreationContribution);
|
|
32
35
|
(0, main_container_creation_contributions_1.registerContainerCreationContributions)(bind);
|
|
33
36
|
(0, cli_enhancing_creation_contributions_1.registerTheiaStartOptionsContributions)(bind);
|
|
37
|
+
(0, core_1.bindContributionProvider)(bind, variable_resolver_contribution_1.VariableResolverContribution);
|
|
38
|
+
(0, variable_resolver_contribution_1.registerVariableResolverContributions)(bind);
|
|
34
39
|
bind(profile_file_modification_contribution_1.ProfileFileModificationContribution).toSelf().inSingletonScope();
|
|
35
40
|
bind(docker_container_service_1.ContainerCreationContribution).toService(profile_file_modification_contribution_1.ProfileFileModificationContribution);
|
|
36
41
|
bind(remote_container_connection_provider_1.DevContainerConnectionProvider).toSelf().inSingletonScope();
|
|
@@ -50,5 +55,7 @@ exports.default = new inversify_1.ContainerModule((bind, unbind, isBound, rebind
|
|
|
50
55
|
bind(cli_enhancing_creation_contributions_1.SettingsContribution).toSelf().inSingletonScope();
|
|
51
56
|
bind(remote_cli_contribution_1.RemoteCliContribution).toService(cli_enhancing_creation_contributions_1.ExtensionsContribution);
|
|
52
57
|
bind(remote_cli_contribution_1.RemoteCliContribution).toService(cli_enhancing_creation_contributions_1.SettingsContribution);
|
|
58
|
+
bind(dev_container_workspace_handler_1.DevContainerWorkspaceHandler).toSelf().inSingletonScope();
|
|
59
|
+
bind(default_workspace_server_1.WorkspaceHandlerContribution).toService(dev_container_workspace_handler_1.DevContainerWorkspaceHandler);
|
|
53
60
|
});
|
|
54
61
|
//# sourceMappingURL=dev-container-backend-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-container-backend-module.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.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,4DAA+D;AAC/D,4GAAuG;AACvG,iGAAwF;AACxF,kHAAmJ;AACnJ,yEAAmG;AACnG,sCAAgG;AAChG,8HAA4H;AAC5H,6EAAuE;AAEvE,4HAAyK;AACzK,iGAA4F;AAC5F,gIAA0H;
|
|
1
|
+
{"version":3,"file":"dev-container-backend-module.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.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,4DAA+D;AAC/D,4GAAuG;AACvG,iGAAwF;AACxF,kHAAmJ;AACnJ,yEAAmG;AACnG,sCAAgG;AAChG,8HAA4H;AAC5H,6EAAuE;AAEvE,4HAAyK;AACzK,iGAA4F;AAC5F,gIAA0H;AAC1H,uFAAiF;AACjF,iGAAkG;AAClG,gHAAkJ;AAErI,QAAA,sBAAsB,GAAG,uDAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,EAAE,EAAE;IACpG,IAAA,+BAAwB,EAAC,IAAI,EAAE,wDAA6B,CAAC,CAAC;IAC9D,IAAA,8EAAsC,EAAC,IAAI,CAAC,CAAC;IAC7C,IAAA,6EAAsC,EAAC,IAAI,CAAC,CAAC;IAC7C,IAAA,+BAAwB,EAAC,IAAI,EAAE,6DAA4B,CAAC,CAAC;IAC7D,IAAA,sEAAqC,EAAC,IAAI,CAAC,CAAC;IAC5C,IAAI,CAAC,4EAAmC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACtE,IAAI,CAAC,wDAA6B,CAAC,CAAC,SAAS,CAAC,4EAAmC,CAAC,CAAC;IAEnF,IAAI,CAAC,qEAA8B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACjE,IAAI,CAAC,wEAAiC,CAAC,CAAC,SAAS,CAAC,qEAA8B,CAAC,CAAC;IAClF,IAAI,CAAC,wBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CACzC,IAAI,2BAAoB,CAA0B,4EAAqC,EAAE,MAAM,CAAC,EAAE;QAC9F,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoC,wEAAiC,CAAC,CAAC;QACvG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACzB,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QACpD,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC,CAAC,CAAC;AACZ,CAAC,CAAC,CAAC;AAEH,kBAAe,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACjE,IAAI,CAAC,iDAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,uDAAyB,CAAC,CAAC,eAAe,CAAC,8BAAsB,CAAC,CAAC;IAExE,IAAI,CAAC,oDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,IAAI,CAAC,6DAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,2DAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,+CAAqB,CAAC,CAAC,SAAS,CAAC,6DAAsB,CAAC,CAAC;IAC9D,IAAI,CAAC,+CAAqB,CAAC,CAAC,SAAS,CAAC,2DAAoB,CAAC,CAAC;IAE5D,IAAI,CAAC,8DAA4B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC/D,IAAI,CAAC,uDAA4B,CAAC,CAAC,SAAS,CAAC,8DAA4B,CAAC,CAAC;AAC/E,CAAC,CAAC,CAAC"}
|
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
import { WorkspaceServer } from '@theia/workspace/lib/common';
|
|
2
2
|
import { DevContainerFile } from '../electron-common/remote-container-connection-provider';
|
|
3
3
|
import { DevContainerConfiguration } from './devcontainer-file';
|
|
4
|
+
import { ContributionProvider } from '@theia/core';
|
|
5
|
+
import { VariableResolverContribution } from './devcontainer-contributions/variable-resolver-contribution';
|
|
4
6
|
export declare class DevContainerFileService {
|
|
5
7
|
protected readonly workspaceServer: WorkspaceServer;
|
|
8
|
+
protected readonly variableResolverContributions: ContributionProvider<VariableResolverContribution>;
|
|
9
|
+
protected resolveVariable(value: string): string;
|
|
10
|
+
protected resolveVariablesRecursively<T>(obj: T): T;
|
|
6
11
|
getConfiguration(path: string): Promise<DevContainerConfiguration>;
|
|
7
|
-
getAvailableFiles(): Promise<DevContainerFile[]>;
|
|
12
|
+
getAvailableFiles(workspace: string): Promise<DevContainerFile[]>;
|
|
8
13
|
protected searchForDevontainerJsonFiles(directory: string, depth: number): Promise<string[]>;
|
|
9
14
|
}
|
|
10
15
|
//# sourceMappingURL=dev-container-file-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-container-file-service.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yDAAyD,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-container-file-service.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yDAAyD,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,EAAE,oBAAoB,EAAa,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,6DAA6D,CAAC;AAI3G,qBACa,uBAAuB;IAGhC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,6BAA6B,EAAE,oBAAoB,CAAC,4BAA4B,CAAC,CAAC;IAErG,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAahD,SAAS,CAAC,2BAA2B,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAe7C,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAWlE,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;cAUvD,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAgBrG"}
|
|
@@ -22,20 +22,47 @@ const common_1 = require("@theia/workspace/lib/common");
|
|
|
22
22
|
const jsonc_parser_1 = require("jsonc-parser");
|
|
23
23
|
const fs = require("@theia/core/shared/fs-extra");
|
|
24
24
|
const core_1 = require("@theia/core");
|
|
25
|
+
const variable_resolver_contribution_1 = require("./devcontainer-contributions/variable-resolver-contribution");
|
|
26
|
+
const VARIABLE_REGEX = /^\$\{(.+?)(?::(.+))?\}$/;
|
|
25
27
|
let DevContainerFileService = class DevContainerFileService {
|
|
28
|
+
resolveVariable(value) {
|
|
29
|
+
const match = value.match(VARIABLE_REGEX);
|
|
30
|
+
if (match) {
|
|
31
|
+
const [, type, variable] = match;
|
|
32
|
+
for (const contribution of this.variableResolverContributions.getContributions()) {
|
|
33
|
+
if (contribution.canResolve(type)) {
|
|
34
|
+
return contribution.resolve(variable !== null && variable !== void 0 ? variable : type);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return value;
|
|
39
|
+
}
|
|
40
|
+
resolveVariablesRecursively(obj) {
|
|
41
|
+
if (typeof obj === 'string') {
|
|
42
|
+
return this.resolveVariable(obj);
|
|
43
|
+
}
|
|
44
|
+
else if (Array.isArray(obj)) {
|
|
45
|
+
return obj.map(item => this.resolveVariablesRecursively(item));
|
|
46
|
+
}
|
|
47
|
+
else if (obj && typeof obj === 'object') {
|
|
48
|
+
const newObj = {};
|
|
49
|
+
for (const [key, value] of Object.entries(obj)) {
|
|
50
|
+
newObj[key] = this.resolveVariablesRecursively(value);
|
|
51
|
+
}
|
|
52
|
+
return newObj;
|
|
53
|
+
}
|
|
54
|
+
return obj;
|
|
55
|
+
}
|
|
26
56
|
async getConfiguration(path) {
|
|
27
|
-
|
|
57
|
+
let configuration = (0, jsonc_parser_1.parse)(await fs.readFile(path, 'utf-8').catch(() => '0'));
|
|
28
58
|
if (!configuration) {
|
|
29
59
|
throw new Error(`devcontainer file ${path} could not be parsed`);
|
|
30
60
|
}
|
|
61
|
+
configuration = this.resolveVariablesRecursively(configuration);
|
|
31
62
|
configuration.location = path;
|
|
32
63
|
return configuration;
|
|
33
64
|
}
|
|
34
|
-
async getAvailableFiles() {
|
|
35
|
-
const workspace = await this.workspaceServer.getMostRecentlyUsedWorkspace();
|
|
36
|
-
if (!workspace) {
|
|
37
|
-
return [];
|
|
38
|
-
}
|
|
65
|
+
async getAvailableFiles(workspace) {
|
|
39
66
|
const devcontainerPath = new core_1.URI(workspace).path.join('.devcontainer').fsPath();
|
|
40
67
|
return (await this.searchForDevontainerJsonFiles(devcontainerPath, 1)).map(file => {
|
|
41
68
|
var _a;
|
|
@@ -46,7 +73,7 @@ let DevContainerFileService = class DevContainerFileService {
|
|
|
46
73
|
});
|
|
47
74
|
}
|
|
48
75
|
async searchForDevontainerJsonFiles(directory, depth) {
|
|
49
|
-
if (depth < 0) {
|
|
76
|
+
if (depth < 0 || !await fs.pathExists(directory)) {
|
|
50
77
|
return [];
|
|
51
78
|
}
|
|
52
79
|
const filesPaths = (await fs.readdir(directory)).map(file => new core_1.Path(directory).join(file).fsPath());
|
|
@@ -67,6 +94,11 @@ tslib_1.__decorate([
|
|
|
67
94
|
(0, inversify_1.inject)(common_1.WorkspaceServer),
|
|
68
95
|
tslib_1.__metadata("design:type", Object)
|
|
69
96
|
], DevContainerFileService.prototype, "workspaceServer", void 0);
|
|
97
|
+
tslib_1.__decorate([
|
|
98
|
+
(0, inversify_1.inject)(core_1.ContributionProvider),
|
|
99
|
+
(0, inversify_1.named)(variable_resolver_contribution_1.VariableResolverContribution),
|
|
100
|
+
tslib_1.__metadata("design:type", Object)
|
|
101
|
+
], DevContainerFileService.prototype, "variableResolverContributions", void 0);
|
|
70
102
|
exports.DevContainerFileService = DevContainerFileService = tslib_1.__decorate([
|
|
71
103
|
(0, inversify_1.injectable)()
|
|
72
104
|
], DevContainerFileService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-container-file-service.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.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,
|
|
1
|
+
{"version":3,"file":"dev-container-file-service.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { URI } from '@theia/core';
|
|
2
|
+
import { WorkspaceHandlerContribution } from '@theia/workspace/lib/node/default-workspace-server';
|
|
3
|
+
export declare class DevContainerWorkspaceHandler implements WorkspaceHandlerContribution {
|
|
4
|
+
canHandle(uri: URI): boolean;
|
|
5
|
+
workspaceStillExists(uri: URI): Promise<boolean>;
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=dev-container-workspace-handler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-container-workspace-handler.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-workspace-handler.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAGlC,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAC;AAGlG,qBACa,4BAA6B,YAAW,4BAA4B;IAE7E,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO;IAItB,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;CAIzD"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DevContainerWorkspaceHandler = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const fs = require("@theia/core/shared/fs-extra");
|
|
6
|
+
const inversify_1 = require("@theia/core/shared/inversify");
|
|
7
|
+
const dev_container_workspaces_1 = require("../electron-common/dev-container-workspaces");
|
|
8
|
+
let DevContainerWorkspaceHandler = class DevContainerWorkspaceHandler {
|
|
9
|
+
canHandle(uri) {
|
|
10
|
+
return uri.scheme === dev_container_workspaces_1.DEV_CONTAINER_WORKSPACE_SCHEME;
|
|
11
|
+
}
|
|
12
|
+
async workspaceStillExists(uri) {
|
|
13
|
+
const devcontainerFile = new URLSearchParams(uri.query).get(dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY);
|
|
14
|
+
return await fs.pathExists(uri.path.fsPath()) && !!devcontainerFile && fs.pathExists(devcontainerFile);
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
exports.DevContainerWorkspaceHandler = DevContainerWorkspaceHandler;
|
|
18
|
+
exports.DevContainerWorkspaceHandler = DevContainerWorkspaceHandler = tslib_1.__decorate([
|
|
19
|
+
(0, inversify_1.injectable)()
|
|
20
|
+
], DevContainerWorkspaceHandler);
|
|
21
|
+
//# sourceMappingURL=dev-container-workspace-handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-container-workspace-handler.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-workspace-handler.ts"],"names":[],"mappings":";;;;AAgBA,kDAAkD;AAClD,4DAA0D;AAE1D,0FAAuH;AAGhH,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAErC,SAAS,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,MAAM,KAAK,yDAA8B,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,GAAQ;QAC/B,MAAM,gBAAgB,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,mDAAwB,CAAC,CAAC;QACtF,OAAO,MAAM,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,gBAAgB,IAAI,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC3G,CAAC;CACJ,CAAA;AAVY,oEAA4B;uCAA5B,4BAA4B;IADxC,IAAA,sBAAU,GAAE;GACA,4BAA4B,CAUxC"}
|