@theia/remote 1.49.0 → 1.50.0

package/src/electron-node/remote-port-forwarding-provider.ts

@@ -18,6 +18,13 @@ import { inject, injectable } from '@theia/core/shared/inversify';
 import { ForwardedPort, RemotePortForwardingProvider } from '../electron-common/remote-port-forwarding-provider';
 import { createServer, Server } from 'net';
 import { RemoteConnectionService } from './remote-connection-service';
+import { RemoteConnection } from './remote-types';
+
+interface ForwardInfo {
+    connection: RemoteConnection
+    port: ForwardedPort
+    server: Server
+}
 
 @injectable()
 export class RemotePortForwardingProviderImpl implements RemotePortForwardingProvider {
@@ -25,7 +32,7 @@ export class RemotePortForwardingProviderImpl implements RemotePortForwardingPro
     @inject(RemoteConnectionService)
     protected readonly connectionService: RemoteConnectionService;
 
-    protected forwardedPorts: Map<number, Server> = new Map();
+    protected static forwardedPorts: ForwardInfo[] = [];
 
     async forwardPort(connectionPort: number, portToForward: ForwardedPort): Promise<void> {
         const currentConnection = this.connectionService.getConnectionFromPort(connectionPort);
@@ -36,15 +43,24 @@ export class RemotePortForwardingProviderImpl implements RemotePortForwardingPro
         const server = createServer(socket => {
             currentConnection?.forwardOut(socket, portToForward.port);
         }).listen(portToForward.port, portToForward.address);
-        this.forwardedPorts.set(portToForward.port, server);
+
+        currentConnection.onDidDisconnect(() => {
+            this.portRemoved(portToForward);
+        });
+
+        RemotePortForwardingProviderImpl.forwardedPorts.push({ connection: currentConnection, port: portToForward, server });
     }
 
     async portRemoved(forwardedPort: ForwardedPort): Promise<void> {
-        const proxy = this.forwardedPorts.get(forwardedPort.port);
-        if (proxy) {
-            proxy.close();
-            this.forwardedPorts.delete(forwardedPort.port);
+        const forwardInfo = RemotePortForwardingProviderImpl.forwardedPorts.find(info => info.port.port === forwardedPort.port);
+        if (forwardInfo) {
+            forwardInfo.server.close();
+            RemotePortForwardingProviderImpl.forwardedPorts.splice(RemotePortForwardingProviderImpl.forwardedPorts.indexOf(forwardInfo), 1);
         }
     }
 
+    async getForwardedPorts(): Promise<ForwardedPort[]> {
+        return Array.from(RemotePortForwardingProviderImpl.forwardedPorts)
+            .map(forwardInfo => ({ ...forwardInfo.port, editing: false }));
+    }
 }

package/src/electron-node/remote-types.ts

@@ -14,14 +14,9 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { Disposable, Event, OS } from '@theia/core';
+import { Disposable, Event } from '@theia/core';
 import * as net from 'net';
 
-export interface RemotePlatform {
-    os: OS.Type
-    arch: string
-}
-
 export type RemoteStatusReport = (message: string) => void;
 
 export interface ExpressLayer {

package/src/electron-node/setup/app-native-dependency-contribution.ts

@@ -16,7 +16,7 @@
 
 import { injectable } from '@theia/core/shared/inversify';
 import { RemoteNativeDependencyContribution, DownloadOptions, DependencyDownload } from './remote-native-dependency-contribution';
-import { RemotePlatform } from '../remote-types';
+import { RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
 import { OS } from '@theia/core';
 
 @injectable()

package/src/electron-node/setup/main-copy-contribution.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { injectable } from '@theia/core/shared/inversify';
-import { RemoteCopyContribution, RemoteCopyRegistry } from './remote-copy-contribution';
+import { RemoteCopyContribution, RemoteCopyRegistry } from '@theia/core/lib/node/remote/remote-copy-contribution';
 
 @injectable()
 export class MainCopyContribution implements RemoteCopyContribution {

package/src/electron-node/setup/remote-copy-contribution.ts

@@ -16,36 +16,15 @@
 
 import { ApplicationPackage } from '@theia/core/shared/@theia/application-package';
 import { inject, injectable } from '@theia/core/shared/inversify';
+import { RemoteCopyRegistry, RemoteFile, RemoteCopyOptions } from '@theia/core/lib/node/remote/remote-copy-contribution';
 import { glob as globCallback } from 'glob';
 import { promisify } from 'util';
 import * as path from 'path';
-import { MaybePromise } from '@theia/core';
 
 const promiseGlob = promisify(globCallback);
 
-export const RemoteCopyContribution = Symbol('RemoteCopyContribution');
-
-export interface RemoteCopyContribution {
-    copy(registry: RemoteCopyRegistry): MaybePromise<void>
-}
-
-export interface RemoteCopyOptions {
-    /**
-     * The mode that the file should be set to once copied to the remote.
-     *
-     * Only relevant for POSIX-like systems
-     */
-    mode?: number;
-}
-
-export interface RemoteFile {
-    path: string
-    target: string
-    options?: RemoteCopyOptions;
-}
-
 @injectable()
-export class RemoteCopyRegistry {
+export class RemoteCopyRegistryImpl implements RemoteCopyRegistry {
 
     @inject(ApplicationPackage)
     protected readonly applicationPackage: ApplicationPackage;
@@ -57,14 +36,16 @@ export class RemoteCopyRegistry {
     }
 
     async glob(pattern: string, target?: string): Promise<void> {
+        return this.doGlob(pattern, this.applicationPackage.projectPath, target);
+    }
+
+    async doGlob(pattern: string, cwd: string, target?: string): Promise<void> {
         const projectPath = this.applicationPackage.projectPath;
-        const globResult = await promiseGlob(pattern, {
-            cwd: projectPath
-        });
+        const globResult = await promiseGlob(pattern, { cwd, nodir: true });
         for (const file of globResult) {
             const targetFile = this.withTarget(file, target);
             this.files.push({
-                path: file,
+                path: path.relative(projectPath, path.resolve(cwd, file)),
                 target: targetFile
             });
         }
@@ -80,7 +61,11 @@ export class RemoteCopyRegistry {
     }
 
     async directory(dir: string, target?: string): Promise<void> {
-        return this.glob(dir + '/**', target);
+        let absoluteDir = dir;
+        if (!path.isAbsolute(absoluteDir)) {
+            absoluteDir = path.join(this.applicationPackage.projectPath, dir);
+        }
+        return this.doGlob('**/*', absoluteDir, target ?? dir);
     }
 
     protected withTarget(file: string, target?: string): string {

package/src/electron-node/setup/remote-copy-service.ts

@@ -20,10 +20,12 @@ import * as fs from 'fs';
 import * as os from 'os';
 import { ApplicationPackage } from '@theia/core/shared/@theia/application-package';
 import { inject, injectable, named } from '@theia/core/shared/inversify';
-import { RemoteConnection, RemotePlatform } from '../remote-types';
+import { RemoteConnection } from '../remote-types';
+import { RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
 import { RemoteNativeDependencyService } from './remote-native-dependency-service';
 import { ContributionProvider } from '@theia/core';
-import { RemoteCopyContribution, RemoteCopyRegistry, RemoteFile } from './remote-copy-contribution';
+import { RemoteCopyRegistryImpl } from './remote-copy-contribution';
+import { RemoteCopyContribution, RemoteFile } from '@theia/core/lib/node/remote/remote-copy-contribution';
 
 @injectable()
 export class RemoteCopyService {
@@ -31,8 +33,8 @@ export class RemoteCopyService {
     @inject(ApplicationPackage)
     protected readonly applicationPackage: ApplicationPackage;
 
-    @inject(RemoteCopyRegistry)
-    protected readonly copyRegistry: RemoteCopyRegistry;
+    @inject(RemoteCopyRegistryImpl)
+    protected readonly copyRegistry: RemoteCopyRegistryImpl;
 
     @inject(RemoteNativeDependencyService)
     protected readonly nativeDependencyService: RemoteNativeDependencyService;

package/src/electron-node/setup/remote-native-dependency-contribution.ts

@@ -16,7 +16,7 @@
 
 import { isObject } from '@theia/core';
 import { RequestOptions } from '@theia/core/shared/@theia/request';
-import { RemotePlatform } from '../remote-types';
+import { RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
 
 export interface FileDependencyResult {
     path: string;

package/src/electron-node/setup/remote-native-dependency-service.ts

@@ -21,7 +21,7 @@ import * as decompress from 'decompress';
 import * as path from 'path';
 import * as fs from 'fs/promises';
 import { DependencyDownload, DirectoryDependencyDownload, RemoteNativeDependencyContribution } from './remote-native-dependency-contribution';
-import { RemotePlatform } from '../remote-types';
+import { RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
 
 const decompressTar = require('decompress-tar');
 const decompressTargz = require('decompress-targz');

package/src/electron-node/setup/remote-node-setup-service.ts

@@ -21,7 +21,7 @@ import * as os from 'os';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { RequestService } from '@theia/core/shared/@theia/request';
 import { RemoteSetupScriptService } from './remote-setup-script-service';
-import { RemotePlatform } from '../remote-types';
+import { RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
 import { OS } from '@theia/core';
 
 /**

package/src/electron-node/setup/remote-setup-script-service.ts

@@ -16,7 +16,7 @@
 
 import { OS } from '@theia/core';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { RemotePlatform } from '../remote-types';
+import { RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
 
 export interface RemoteScriptStrategy {
     exec(): string;

package/src/electron-node/setup/remote-setup-service.ts

@@ -14,12 +14,13 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { RemoteConnection, RemoteExecResult, RemotePlatform, RemoteStatusReport } from '../remote-types';
+import { inject, injectable, named } from '@theia/core/shared/inversify';
+import { RemoteConnection, RemoteExecResult, RemoteStatusReport } from '../remote-types';
+import { RemoteCliContext, RemoteCliContribution, RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
 import { ApplicationPackage } from '@theia/core/shared/@theia/application-package';
 import { RemoteCopyService } from './remote-copy-service';
 import { RemoteNativeDependencyService } from './remote-native-dependency-service';
-import { OS, THEIA_VERSION } from '@theia/core';
+import { ContributionProvider, OS, THEIA_VERSION } from '@theia/core';
 import { RemoteNodeSetupService } from './remote-node-setup-service';
 import { RemoteSetupScriptService } from './remote-setup-script-service';
 
@@ -52,6 +53,9 @@ export class RemoteSetupService {
     @inject(ApplicationPackage)
     protected readonly applicationPackage: ApplicationPackage;
 
+    @inject(ContributionProvider) @named(RemoteCliContribution)
+    protected readonly cliContributions: ContributionProvider<RemoteCliContribution>;
+
     async setup(options: RemoteSetupOptions): Promise<RemoteSetupResult> {
         const {
             connection,
@@ -106,11 +110,21 @@ export class RemoteSetupService {
             // We might to switch to PowerShell beforehand on Windows
             prefix = this.scriptService.exec(platform) + ' ';
         }
+        const remoteContext: RemoteCliContext = {
+            platform,
+            directory: remotePath
+        };
+        const args: string[] = ['--hostname=0.0.0.0', `--port=${connection.remotePort ?? 0}`, '--remote'];
+        for (const cli of this.cliContributions.getContributions()) {
+            if (cli.enhanceArgs) {
+                args.push(...await cli.enhanceArgs(remoteContext));
+            }
+        }
         // Change to the remote application path and start a node process with the copied main.js file
         // This way, our current working directory is set as expected
         const result = await connection.execPartial(`${prefix}cd "${remotePath}";${nodeExecutable}`,
             stdout => localAddressRegex.test(stdout),
-            [mainJsFile, '--hostname=0.0.0.0', `--port=${connection.remotePort ?? 0}`, '--remote']);
+            [mainJsFile, ...args]);
 
         const match = localAddressRegex.exec(result.stdout);
         if (!match) {