@theia/dev-container 1.67.0-next.13 → 1.67.0-next.56

package/README.md

@@ -16,7 +16,7 @@ The `@theia/dev-container` extension provides functionality to create, start and
 [vscode Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers).
 
 The full devcontainer.json Schema can be found [here](https://containers.dev/implementors/json_reference/).
-Currently only a small number of configuration file properties are implemented. Those include the following:
+Currently not all of the configuration file properties are implemented. The following are implemented:
 
 - name
 - Image
@@ -25,11 +25,20 @@ Currently only a small number of configuration file properties are implemented.
 - location
 - forwardPorts
 - mounts
+- containerEnv
+- remoteUser
+- shutdownAction
+- postCreateCommand
+- postStartCommand
 
 see `main-container-creation-contributions.ts` for how to implementations or how to implement additional ones.
 
+Additionally adds support for `composeUpArgs` devcontainer.json property to apply additional arguments for the `docker compose up` call.
+Usage: `"composeUpArgs": ["--force-recreate"]`
+
 ## Additional Information
 
+- [API documentation for `@theia/dev-container`](https://eclipse-theia.github.io/theia/docs/next/modules/_theia_dev-container.html)
 - [Theia - GitHub](https://github.com/eclipse-theia/theia)
 - [Theia - Website](https://theia-ide.org/)
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@theia/dev-container",
-  "version": "1.67.0-next.13+c409d5d18",
+  "version": "1.67.0-next.56+d8f18cc386c",
   "description": "Theia - Editor Preview Extension",
   "dependencies": {
-    "@theia/core": "1.67.0-next.13+c409d5d18",
-    "@theia/output": "1.67.0-next.13+c409d5d18",
-    "@theia/remote": "1.67.0-next.13+c409d5d18",
-    "@theia/workspace": "1.67.0-next.13+c409d5d18",
+    "@theia/core": "1.67.0-next.56+d8f18cc386c",
+    "@theia/output": "1.67.0-next.56+d8f18cc386c",
+    "@theia/remote": "1.67.0-next.56+d8f18cc386c",
+    "@theia/workspace": "1.67.0-next.56+d8f18cc386c",
     "dockerode": "^4.0.2",
     "jsonc-parser": "^2.2.0",
     "uuid": "^8.0.0"
@@ -51,5 +51,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "c409d5d18d8c4f5a722f87b37ea9d6fd5af47ea8"
+  "gitHead": "d8f18cc386c45a736cd193d42eab02c8f64c6b10"
 }

package/src/electron-browser/container-info-contribution.ts

@@ -44,13 +44,13 @@ export class ContainerInfoContribution implements FrontendApplicationContributio
         const containerInfo = await this.connectionProvider.getCurrentContainerInfo(containerPort);
         this.status = await this.remoteStatusService.getStatus(containerPort);
 
-        this.portForwardingService.forwardedPorts = Object.entries(containerInfo?.NetworkSettings.Ports ?? {}).flatMap(([_, ports]) => (
+        this.portForwardingService.forwardedPorts.push(...Object.entries(containerInfo?.NetworkSettings.Ports ?? {}).flatMap(([_, ports]) => (
             ports.map(port => ({
                 editing: false,
                 address: port.HostIp ?? '',
                 localPort: parseInt(port.HostPort ?? '0'),
                 origin: 'container'
-            }))));
+            })))));
     }
 
     enhanceTitle(title: string, parts: Map<string, string | undefined>): string {

package/src/electron-node/dev-container-backend-module.ts

@@ -29,6 +29,7 @@ import { ProfileFileModificationContribution } from './devcontainer-contribution
 import { DevContainerWorkspaceHandler } from './dev-container-workspace-handler';
 import { WorkspaceHandlerContribution } from '@theia/workspace/lib/node/default-workspace-server';
 import { registerVariableResolverContributions, VariableResolverContribution } from './devcontainer-contributions/variable-resolver-contribution';
+import { DockerComposeService } from './docker-compose/compose-service';
 
 export const remoteConnectionModule = ConnectionContainerModule.create(({ bind, bindBackendService }) => {
     bindContributionProvider(bind, ContainerCreationContribution);
@@ -54,6 +55,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(DockerContainerService).toSelf().inSingletonScope();
     bind(ConnectionContainerModule).toConstantValue(remoteConnectionModule);
 
+    bind(DockerComposeService).toSelf().inSingletonScope();
+
     bind(DevContainerFileService).toSelf().inSingletonScope();
 
     bind(ExtensionsContribution).toSelf().inSingletonScope();

package/src/electron-node/devcontainer-file.ts

@@ -161,6 +161,10 @@ export interface ComposeContainer {
      * Whether to overwrite the command specified in the image. The default is false.
      */
     overrideCommand?: boolean
+    /**
+     * Allows passing additional arguments to the 'docker compose up' command.
+     */
+    composeUpArgs?: string[]
     [k: string]: unknown
 }
 

package/src/electron-node/docker-compose/compose-service.ts

@@ -0,0 +1,79 @@
+// *****************************************************************************
+// Copyright (C) 2025 Typefox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from '@theia/core/shared/inversify';
+import * as Docker from 'dockerode';
+import { ComposeContainer, DevContainerConfiguration } from '../devcontainer-file';
+import { ContainerOutputProvider } from '../../electron-common/container-output-provider';
+import { spawn } from 'child_process';
+import path = require('path');
+
+@injectable()
+export class DockerComposeService {
+
+    async createContainers(
+        devcontainerConfig: DevContainerConfiguration,
+        containerCreateOptions: Docker.ContainerCreateOptions,
+        outputProvider?: ContainerOutputProvider): Promise<string> {
+
+        if (!devcontainerConfig.dockerComposeFile || typeof devcontainerConfig.dockerComposeFile !== 'string') {
+            throw new Error('dockerComposeFile is not defined in devcontainer configuration. Multiple files are not supported currently');
+        }
+
+        const dockerComposeFilePath = resolveComposeFilePath(devcontainerConfig);
+
+        const composeUpArgs = Array.isArray(devcontainerConfig.composeUpArgs) ? devcontainerConfig.composeUpArgs : [];
+        await this.executeComposeCommand(dockerComposeFilePath, 'up', ['--detach', ...composeUpArgs], outputProvider);
+
+        return (devcontainerConfig as ComposeContainer).service;
+    }
+
+    protected executeComposeCommand(composeFilePath: string, command: string, args: string[], outputProvider?: ContainerOutputProvider): Promise<string> {
+        return new Promise<string>((resolve, reject) => {
+            const process = spawn('docker', ['compose', '-f', composeFilePath, command, ...args]);
+            process.stdout.on('data', data => {
+                outputProvider?.onRemoteOutput(data.toString());
+            });
+            process.stderr.on('data', data => {
+                outputProvider?.onRemoteOutput(data.toString());
+            });
+            process.on('close', code => {
+                outputProvider?.onRemoteOutput(`docker compose process exited with code ${code}`);
+                if (code === 0) {
+                    resolve(''); // TODO return real container ids
+                } else {
+                    reject(new Error(`docker compose process exited with code ${code}`));
+                }
+            });
+        });
+    }
+}
+
+export function resolveComposeFilePath(devcontainerConfig: DevContainerConfiguration): string {
+    if (!devcontainerConfig.dockerComposeFile) {
+        throw new Error('dockerComposeFile is not defined in devcontainer configuration.');
+    }
+
+    if (typeof devcontainerConfig.dockerComposeFile !== 'string') {
+        throw new Error('Multiple docker compose files are not supported currently.');
+    }
+
+    if (path.isAbsolute(devcontainerConfig.dockerComposeFile)) {
+        return devcontainerConfig.dockerComposeFile;
+    } else {
+        return path.resolve(path.dirname(devcontainerConfig.location!), devcontainerConfig.dockerComposeFile);
+    }
+}

package/src/electron-node/docker-container-service.ts

@@ -24,6 +24,7 @@ import { DevContainerConfiguration } from './devcontainer-file';
 import { DevContainerFileService } from './dev-container-file-service';
 import { ContainerOutputProvider } from '../electron-common/container-output-provider';
 import { RemoteDockerContainerConnection } from './remote-container-connection-provider';
+import { DockerComposeService } from './docker-compose/compose-service';
 
 export const ContainerCreationContribution = Symbol('ContainerCreationContributions');
 
@@ -60,6 +61,9 @@ export class DockerContainerService {
     @inject(DevContainerFileService)
     protected readonly devContainerFileService: DevContainerFileService;
 
+    @inject(DockerComposeService)
+    protected readonly dockerComposeService: DockerComposeService;
+
     container: Docker.Container | undefined;
 
     async getOrCreateContainer(docker: Docker, options: ContainerConnectionOptions, outputProvider?: ContainerOutputProvider): Promise<Docker.Container> {
@@ -121,9 +125,19 @@ export class DockerContainerService {
             await containerCreateContrib.handleContainerCreation?.(containerCreateOptions, devcontainerConfig, docker, outputProvider);
         }
 
-        // TODO add more config
-        const container = await docker.createContainer(containerCreateOptions);
-        await container.start();
+        let container: Docker.Container;
+
+        if (devcontainerConfig.dockerComposeFile) {
+            const containerName = await this.dockerComposeService.createContainers(devcontainerConfig, containerCreateOptions, outputProvider);
+            const services = await docker.listContainers({ filters: { label: [`com.docker.compose.service=${containerName}`] } });
+            if (services.length === 0) {
+                throw new Error(`No running container found for docker compose service ${containerName}`);
+            }
+            container = docker.getContainer(services[0].Id);
+        } else {
+            container = await docker.createContainer(containerCreateOptions);
+            await container.start();
+        }
 
         for (const containerCreateContrib of this.containerCreationContributions.getContributions()) {
             await containerCreateContrib.handlePostCreate?.(devcontainerConfig, container, docker, outputProvider);
@@ -131,4 +145,5 @@ export class DockerContainerService {
 
         return container;
     }
+
 }

package/src/electron-node/remote-container-connection-provider.ts

@@ -25,7 +25,7 @@ import { RemoteConnectionService } from '@theia/remote/lib/electron-node/remote-
 import { RemoteProxyServerProvider } from '@theia/remote/lib/electron-node/remote-proxy-server-provider';
 import { Emitter, Event, generateUuid, MessageService, RpcServer, ILogger } from '@theia/core';
 import { Socket } from 'net';
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable, named } from '@theia/core/shared/inversify';
 import * as Docker from 'dockerode';
 import { DockerContainerService } from './docker-container-service';
 import { Deferred } from '@theia/core/lib/common/promise-util';
@@ -34,6 +34,8 @@ import { PassThrough } from 'stream';
 import { exec, execSync } from 'child_process';
 import { DevContainerFileService } from './dev-container-file-service';
 import { ContainerOutputProvider } from '../electron-common/container-output-provider';
+import { DevContainerConfiguration } from './devcontainer-file';
+import { resolveComposeFilePath } from './docker-compose/compose-service';
 
 @injectable()
 export class DevContainerConnectionProvider implements RemoteContainerConnectionProvider, RpcServer<ContainerOutputProvider> {
@@ -121,7 +123,7 @@ export class DevContainerConnectionProvider implements RemoteContainerConnection
             const report: RemoteStatusReport = message => progress.report({ message });
             report('Connecting to remote system...');
 
-            const remote = await this.createContainerConnection(container, dockerConnection, devContainerConfig.name);
+            const remote = await this.createContainerConnection(container, dockerConnection, devContainerConfig);
             const result = await this.remoteSetup.setup({
                 connection: remote,
                 report,
@@ -160,13 +162,14 @@ export class DevContainerConnectionProvider implements RemoteContainerConnection
         return this.devContainerFileService.getAvailableFiles(workspacePath);
     }
 
-    async createContainerConnection(container: Docker.Container, docker: Docker, name?: string): Promise<RemoteDockerContainerConnection> {
+    async createContainerConnection(container: Docker.Container, docker: Docker, config: DevContainerConfiguration): Promise<RemoteDockerContainerConnection> {
         return Promise.resolve(new RemoteDockerContainerConnection({
             id: generateUuid(),
-            name: name ?? 'dev-container',
+            name: config.name ?? 'dev-container',
             type: 'Dev Container',
             docker,
             container,
+            config,
         }));
     }
 
@@ -190,6 +193,7 @@ export interface RemoteContainerConnectionOptions {
     type: string;
     docker: Docker;
     container: Docker.Container;
+    config: DevContainerConfiguration;
 }
 
 interface ContainerTerminalSession {
@@ -208,6 +212,9 @@ interface ContainerTerminalSession {
 
 export class RemoteDockerContainerConnection implements RemoteConnection {
 
+    @inject(ILogger) @named('dev-container')
+    protected readonly logger: ILogger;
+
     id: string;
     name: string;
     type: string;
@@ -219,6 +226,8 @@ export class RemoteDockerContainerConnection implements RemoteConnection {
 
     remoteSetupResult: RemoteSetupResult;
 
+    protected config: DevContainerConfiguration;
+
     protected activeTerminalSession: ContainerTerminalSession | undefined;
 
     protected readonly onDidDisconnectEmitter = new Emitter<void>();
@@ -232,6 +241,8 @@ export class RemoteDockerContainerConnection implements RemoteConnection {
         this.docker = options.docker;
         this.container = options.container;
 
+        this.config = options.config;
+
         this.docker.getEvents({ filters: { container: [this.container.id], event: ['stop'] } }).then(stream => {
             stream.on('data', () => this.onDidDisconnectEmitter.fire());
         });
@@ -295,6 +306,7 @@ export class RemoteDockerContainerConnection implements RemoteConnection {
             });
             const stdout = new PassThrough();
             stdout.on('data', (data: Buffer) => {
+                this.logger.debug('REMOTE STDOUT:', data.toString());
                 if (deferred.state === 'unresolved') {
                     stdoutBuffer += data.toString();
 
@@ -305,6 +317,7 @@ export class RemoteDockerContainerConnection implements RemoteConnection {
             });
             const stderr = new PassThrough();
             stderr.on('data', (data: Buffer) => {
+                this.logger.debug('REMOTE STDERR:', data.toString());
                 if (deferred.state === 'unresolved') {
                     stderrBuffer += data.toString();
 
@@ -359,13 +372,34 @@ export class RemoteDockerContainerConnection implements RemoteConnection {
     }
 
     disposeSync(): void {
-        const remoteHost = this.getDockerHost();
         // cant use dockerrode here since this needs to happen on one tick
-        execSync(`docker ${remoteHost}stop ${this.container.id}`);
+        this.shutdownContainer(true);
     }
 
     async dispose(): Promise<void> {
-        return this.container.stop();
+        await this.shutdownContainer(false);
+    }
+
+    protected async shutdownContainer(sync: boolean): Promise<unknown> {
+        const remoteHost = this.getDockerHost();
+
+        const shutdownAction = this.config.shutdownAction ?? this.config.dockerComposeFile ? 'stopCompose' : 'stopContainer';
+
+        if (shutdownAction === 'stopContainer') {
+            return sync ? execSync(`docker ${remoteHost}stop ${this.container.id}`) : this.container.stop();
+        } else if (shutdownAction === 'stopCompose') {
+            const composeFilePath = resolveComposeFilePath(this.config);
+            return sync ? execSync(`docker ${remoteHost}compose -f ${composeFilePath} stop`) :
+                new Promise<void>((res, rej) => exec(`docker ${remoteHost}compose -f ${composeFilePath} stop`, err => {
+                    if (err) {
+                        console.error(err);
+                        rej(err);
+                    } else {
+                        res();
+                    }
+                }));
+        }
+
     }
 
 }

package/lib/dev-container-server/dev-container-server.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=dev-container-server.d.ts.map

package/lib/dev-container-server/dev-container-server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dev-container-server.d.ts","sourceRoot":"","sources":["../../src/dev-container-server/dev-container-server.ts"],"names":[],"mappings":""}

package/lib/dev-container-server/dev-container-server.js

@@ -1,48 +0,0 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2024 Typefox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-const net_1 = require("net");
-const process_1 = require("process");
-/**
- * this node.js Program is supposed to be executed by an docker exec session inside a docker container.
- * It uses a tty session to listen on stdin and send on stdout all communication with the theia backend running inside the container.
- */
-let backendPort = undefined;
-process_1.argv.slice(2).forEach(arg => {
-    if (arg.startsWith('-target-port')) {
-        backendPort = parseInt(arg.split('=')[1]);
-    }
-});
-if (!backendPort) {
-    throw new Error('please start with -target-port={port number}');
-}
-if (process_1.stdin.isTTY) {
-    process_1.stdin.setRawMode(true);
-}
-const connection = (0, net_1.createConnection)(backendPort, '0.0.0.0');
-connection.pipe(process_1.stdout);
-process_1.stdin.pipe(connection);
-connection.on('error', error => {
-    console.error('connection error', error);
-});
-connection.on('close', () => {
-    console.log('connection closed');
-    process.exit(0);
-});
-// keep the process running
-setInterval(() => { }, 1 << 30);
-//# sourceMappingURL=dev-container-server.js.map

package/lib/dev-container-server/dev-container-server.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dev-container-server.js","sourceRoot":"","sources":["../../src/dev-container-server/dev-container-server.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,6BAAuC;AACvC,qCAA8C;AAE9C;;;GAGG;AAEH,IAAI,WAAW,GAAuB,SAAS,CAAC;AAChD,cAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;IACxB,IAAI,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACjC,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,WAAW,EAAE,CAAC;IACf,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;AACpE,CAAC;AACD,IAAI,eAAK,CAAC,KAAK,EAAE,CAAC;IACd,eAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC;AACD,MAAM,UAAU,GAAG,IAAA,sBAAgB,EAAC,WAAW,EAAE,SAAS,CAAC,CAAC;AAE5D,UAAU,CAAC,IAAI,CAAC,gBAAM,CAAC,CAAC;AACxB,eAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAEvB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;IAC3B,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC,CAAC,CAAC;AAEH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;IACxB,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC,CAAC,CAAC;AAEH,2BAA2B;AAC3B,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC"}

package/lib/electron-browser/container-connection-contribution.d.ts

@@ -1,29 +0,0 @@
-import { AbstractRemoteRegistryContribution, RemoteRegistry } from '@theia/remote/lib/electron-browser/remote-registry-contribution';
-import { DevContainerFile, RemoteContainerConnectionProvider } from '../electron-common/remote-container-connection-provider';
-import { WorkspaceStorageService } from '@theia/workspace/lib/browser/workspace-storage-service';
-import { Command, MaybePromise, MessageService, QuickInputService, URI } from '@theia/core';
-import { WorkspaceInput, WorkspaceOpenHandlerContribution, WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
-import { ContainerOutputProvider } from './container-output-provider';
-import { WorkspaceServer } from '@theia/workspace/lib/common';
-import { RemotePreferences } from '@theia/remote/lib/electron-common/remote-preferences';
-export declare namespace RemoteContainerCommands {
-    const REOPEN_IN_CONTAINER: Command;
-}
-export declare class ContainerConnectionContribution extends AbstractRemoteRegistryContribution implements WorkspaceOpenHandlerContribution {
-    protected readonly connectionProvider: RemoteContainerConnectionProvider;
-    protected readonly remotePreferences: RemotePreferences;
-    protected readonly messageService: MessageService;
-    protected readonly workspaceStorageService: WorkspaceStorageService;
-    protected readonly workspaceService: WorkspaceService;
-    protected readonly workspaceServer: WorkspaceServer;
-    protected readonly quickInputService: QuickInputService;
-    protected readonly containerOutputProvider: ContainerOutputProvider;
-    registerRemoteCommands(registry: RemoteRegistry): void;
-    canHandle(uri: URI): MaybePromise<boolean>;
-    openWorkspace(uri: URI, options?: WorkspaceInput | undefined): Promise<void>;
-    getWorkspaceLabel(uri: URI): Promise<string | undefined>;
-    openInContainer(): Promise<void>;
-    doOpenInContainer(devcontainerFile: DevContainerFile, workspacePath?: string): Promise<void>;
-    getOrSelectDevcontainerFile(): Promise<DevContainerFile | undefined>;
-}
-//# sourceMappingURL=container-connection-contribution.d.ts.map

package/lib/electron-browser/container-connection-contribution.d.ts.map

@@ -1 +0,0 @@
-{"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,uBAAuB,EAAE,MAAM,wDAAwD,CAAC;AACjG,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAO,iBAAiB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACjG,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;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AAEzF,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,mBAAmB,SAIQ,CAAC;CAC5C;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,cAAc,EAAE,cAAc,CAAC;IAGlD,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,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB5F,2BAA2B,IAAI,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;CAyB7E"}

package/lib/electron-browser/container-connection-contribution.js

@@ -1,156 +0,0 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2024 Typefox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContainerConnectionContribution = exports.RemoteContainerCommands = void 0;
-const tslib_1 = require("tslib");
-const inversify_1 = require("@theia/core/shared/inversify");
-const remote_registry_contribution_1 = require("@theia/remote/lib/electron-browser/remote-registry-contribution");
-const remote_container_connection_provider_1 = require("../electron-common/remote-container-connection-provider");
-const workspace_storage_service_1 = require("@theia/workspace/lib/browser/workspace-storage-service");
-const core_1 = require("@theia/core");
-const workspace_service_1 = require("@theia/workspace/lib/browser/workspace-service");
-const container_output_provider_1 = require("./container-output-provider");
-const common_1 = require("@theia/workspace/lib/common");
-const dev_container_workspaces_1 = require("../electron-common/dev-container-workspaces");
-const remote_preferences_1 = require("@theia/remote/lib/electron-common/remote-preferences");
-var RemoteContainerCommands;
-(function (RemoteContainerCommands) {
-    RemoteContainerCommands.REOPEN_IN_CONTAINER = core_1.Command.toLocalizedCommand({
-        id: 'dev-container:reopen-in-container',
-        label: 'Reopen in Container',
-        category: 'Dev Container'
-    }, 'theia/remote/dev-container/connect');
-})(RemoteContainerCommands || (exports.RemoteContainerCommands = RemoteContainerCommands = {}));
-const LAST_USED_CONTAINER = 'lastUsedContainer';
-let ContainerConnectionContribution = class ContainerConnectionContribution extends remote_registry_contribution_1.AbstractRemoteRegistryContribution {
-    registerRemoteCommands(registry) {
-        registry.registerCommand(RemoteContainerCommands.REOPEN_IN_CONTAINER, {
-            execute: () => this.openInContainer()
-        });
-    }
-    canHandle(uri) {
-        return uri.scheme === dev_container_workspaces_1.DEV_CONTAINER_WORKSPACE_SCHEME;
-    }
-    async openWorkspace(uri, options) {
-        const filePath = new URLSearchParams(uri.query).get(dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY);
-        if (!filePath) {
-            throw new Error('No devcontainer file specified for workspace');
-        }
-        const devcontainerFiles = await this.connectionProvider.getDevContainerFiles(uri.path.toString());
-        const devcontainerFile = devcontainerFiles.find(file => file.path === filePath);
-        if (!devcontainerFile) {
-            throw new Error(`Devcontainer file at ${filePath} not found in workspace`);
-        }
-        return this.doOpenInContainer(devcontainerFile, uri.path.toString());
-    }
-    async getWorkspaceLabel(uri) {
-        const containerFilePath = new URLSearchParams(uri.query).get(dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY);
-        if (!containerFilePath) {
-            return;
-        }
-        ;
-        const files = await this.connectionProvider.getDevContainerFiles(uri.path.toString());
-        const devcontainerFile = files.find(file => file.path === containerFilePath);
-        return `${uri.path.base} [Dev Container: ${devcontainerFile === null || devcontainerFile === void 0 ? void 0 : devcontainerFile.name}]`;
-    }
-    async openInContainer() {
-        const devcontainerFile = await this.getOrSelectDevcontainerFile();
-        if (!devcontainerFile) {
-            return;
-        }
-        this.doOpenInContainer(devcontainerFile);
-    }
-    async doOpenInContainer(devcontainerFile, workspacePath) {
-        var _a;
-        const lastContainerInfoKey = `${LAST_USED_CONTAINER}:${devcontainerFile.path}`;
-        const lastContainerInfo = await this.workspaceStorageService.getData(lastContainerInfoKey);
-        this.containerOutputProvider.openChannel();
-        const connectionResult = await this.connectionProvider.connectToContainer({
-            nodeDownloadTemplate: this.remotePreferences['remote.nodeDownloadTemplate'],
-            lastContainerInfo,
-            devcontainerFile: devcontainerFile.path,
-            workspacePath: workspacePath
-        });
-        this.workspaceStorageService.setData(lastContainerInfoKey, {
-            id: connectionResult.containerId,
-            lastUsed: Date.now()
-        });
-        this.workspaceServer.setMostRecentlyUsedWorkspace(`${dev_container_workspaces_1.DEV_CONTAINER_WORKSPACE_SCHEME}:${workspacePath !== null && workspacePath !== void 0 ? workspacePath : (_a = this.workspaceService.workspace) === null || _a === void 0 ? void 0 : _a.resource.path}?${dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY}=${devcontainerFile.path}`);
-        this.openRemote(connectionResult.port, false, connectionResult.workspacePath);
-    }
-    async getOrSelectDevcontainerFile() {
-        var _a;
-        const workspace = this.workspaceService.workspace;
-        if (!workspace) {
-            return;
-        }
-        const devcontainerFiles = await this.connectionProvider.getDevContainerFiles(workspace.resource.path.toString());
-        if (devcontainerFiles.length === 1) {
-            return devcontainerFiles[0];
-        }
-        else if (devcontainerFiles.length === 0) {
-            // eslint-disable-next-line max-len
-            this.messageService.error(core_1.nls.localize('theia/remote/dev-container/noDevcontainerFiles', 'No devcontainer.json files found in the workspace. Please ensure you have a .devcontainer directory with a devcontainer.json file.'));
-            return undefined;
-        }
-        return (_a = (await this.quickInputService.pick(devcontainerFiles.map(file => ({
-            type: 'item',
-            label: file.name,
-            description: file.path,
-            file: file,
-        })), {
-            title: core_1.nls.localize('theia/remote/dev-container/selectDevcontainer', 'Select a devcontainer.json file')
-        }))) === null || _a === void 0 ? void 0 : _a.file;
-    }
-};
-exports.ContainerConnectionContribution = ContainerConnectionContribution;
-tslib_1.__decorate([
-    (0, inversify_1.inject)(remote_container_connection_provider_1.RemoteContainerConnectionProvider),
-    tslib_1.__metadata("design:type", Object)
-], ContainerConnectionContribution.prototype, "connectionProvider", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(remote_preferences_1.RemotePreferences),
-    tslib_1.__metadata("design:type", Object)
-], ContainerConnectionContribution.prototype, "remotePreferences", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(core_1.MessageService),
-    tslib_1.__metadata("design:type", core_1.MessageService)
-], ContainerConnectionContribution.prototype, "messageService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(workspace_storage_service_1.WorkspaceStorageService),
-    tslib_1.__metadata("design:type", workspace_storage_service_1.WorkspaceStorageService)
-], ContainerConnectionContribution.prototype, "workspaceStorageService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(workspace_service_1.WorkspaceService),
-    tslib_1.__metadata("design:type", workspace_service_1.WorkspaceService)
-], ContainerConnectionContribution.prototype, "workspaceService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(common_1.WorkspaceServer),
-    tslib_1.__metadata("design:type", Object)
-], ContainerConnectionContribution.prototype, "workspaceServer", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(core_1.QuickInputService),
-    tslib_1.__metadata("design:type", Object)
-], ContainerConnectionContribution.prototype, "quickInputService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(container_output_provider_1.ContainerOutputProvider),
-    tslib_1.__metadata("design:type", container_output_provider_1.ContainerOutputProvider)
-], ContainerConnectionContribution.prototype, "containerOutputProvider", void 0);
-exports.ContainerConnectionContribution = ContainerConnectionContribution = tslib_1.__decorate([
-    (0, inversify_1.injectable)()
-], ContainerConnectionContribution);
-//# sourceMappingURL=container-connection-contribution.js.map

package/lib/electron-browser/container-connection-contribution.js.map

@@ -1 +0,0 @@
-{"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,kHAAiJ;AACjJ,sGAAiG;AACjG,sCAAiG;AACjG,sFAAoI;AACpI,2EAAsE;AACtE,wDAA8D;AAC9D,0FAAuH;AACvH,6FAAyF;AAEzF,IAAiB,uBAAuB,CAMvC;AAND,WAAiB,uBAAuB;IACvB,2CAAmB,GAAG,cAAO,CAAC,kBAAkB,CAAC;QAC1D,EAAE,EAAE,mCAAmC;QACvC,KAAK,EAAE,qBAAqB;QAC5B,QAAQ,EAAE,eAAe;KAC5B,EAAE,oCAAoC,CAAC,CAAC;AAC7C,CAAC,EANgB,uBAAuB,uCAAvB,uBAAuB,QAMvC;AAED,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AAEzC,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,iEAAkC;IA0BnF,sBAAsB,CAAC,QAAwB;QAC3C,QAAQ,CAAC,eAAe,CAAC,uBAAuB,CAAC,mBAAmB,EAAE;YAClE,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE;SACxC,CAAC,CAAC;IACP,CAAC;IAED,SAAS,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,MAAM,KAAK,yDAA8B,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAQ,EAAE,OAAoC;QAC9D,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,mDAAwB,CAAC,CAAC;QAE9E,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClG,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QAEhF,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,yBAAyB,CAAC,CAAC;QAC/E,CAAC;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,GAAQ;QAC5B,MAAM,iBAAiB,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,mDAAwB,CAAC,CAAC;QACvF,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACrB,OAAO;QACX,CAAC;QAAA,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtF,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAC;QAC7E,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,oBAAoB,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI,GAAG,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,eAAe;QACjB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAClE,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpB,OAAO;QACX,CAAC;QACD,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,gBAAkC,EAAE,aAAsB;;QAC9E,MAAM,oBAAoB,GAAG,GAAG,mBAAmB,IAAI,gBAAgB,CAAC,IAAI,EAAE,CAAC;QAC/E,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAgC,oBAAoB,CAAC,CAAC;QAE1H,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,CAAC;QAE3C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC;YACtE,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,CAAC,6BAA6B,CAAC;YAC3E,iBAAiB;YACjB,gBAAgB,EAAE,gBAAgB,CAAC,IAAI;YACvC,aAAa,EAAE,aAAa;SAC/B,CAAC,CAAC;QAEH,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAoB,oBAAoB,EAAE;YAC1E,EAAE,EAAE,gBAAgB,CAAC,WAAW;YAChC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,CAAC,4BAA4B,CAC7C,GAAG,yDAA8B,IAAI,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,MAAA,IAAI,CAAC,gBAAgB,CAAC,SAAS,0CAAE,QAAQ,CAAC,IAAI,IAAI,mDAAwB,IAAI,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjK,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,2BAA2B;;QAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC;QAClD,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,OAAO;QACX,CAAC;QACD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEjH,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;aAAM,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxC,mCAAmC;YACnC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,UAAG,CAAC,QAAQ,CAAC,gDAAgD,EAAE,oIAAoI,CAAC,CAAC,CAAC;YAChO,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,OAAO,MAAA,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACrE,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,IAAI,CAAC,IAAI;YAChB,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,IAAI,EAAE,IAAI;SACb,CAAC,CAAC,EAAE;YACD,KAAK,EAAE,UAAG,CAAC,QAAQ,CAAC,+CAA+C,EAAE,iCAAiC,CAAC;SAC1G,CAAC,CAAC,0CAAE,IAAI,CAAC;IACd,CAAC;CAEJ,CAAA;AAxHY,0EAA+B;AAGrB;IADlB,IAAA,kBAAM,EAAC,wEAAiC,CAAC;;2EAC+B;AAGtD;IADlB,IAAA,kBAAM,EAAC,sCAAiB,CAAC;;0EAC8B;AAGrC;IADlB,IAAA,kBAAM,EAAC,qBAAc,CAAC;sCACY,qBAAc;uEAAC;AAG/B;IADlB,IAAA,kBAAM,EAAC,mDAAuB,CAAC;sCACY,mDAAuB;gFAAC;AAGjD;IADlB,IAAA,kBAAM,EAAC,oCAAgB,CAAC;sCACY,oCAAgB;yEAAC;AAGnC;IADlB,IAAA,kBAAM,EAAC,wBAAe,CAAC;;wEAC4B;AAGjC;IADlB,IAAA,kBAAM,EAAC,wBAAiB,CAAC;;0EAC8B;AAGrC;IADlB,IAAA,kBAAM,EAAC,mDAAuB,CAAC;sCACY,mDAAuB;gFAAC;0CAxB3D,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;GACA,+BAA+B,CAwH3C"}