@theia/remote 1.52.0 → 1.53.0-next.55

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

@@ -1,66 +1,66 @@
-// *****************************************************************************
-// 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
-// *****************************************************************************
-
-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 {
-
-    @inject(RemoteConnectionService)
-    protected readonly connectionService: RemoteConnectionService;
-
-    protected static forwardedPorts: ForwardInfo[] = [];
-
-    async forwardPort(connectionPort: number, portToForward: ForwardedPort): Promise<void> {
-        const currentConnection = this.connectionService.getConnectionFromPort(connectionPort);
-        if (!currentConnection) {
-            throw new Error(`No connection found for port ${connectionPort}`);
-        }
-
-        const server = createServer(socket => {
-            currentConnection?.forwardOut(socket, portToForward.port);
-        }).listen(portToForward.port, portToForward.address);
-
-        currentConnection.onDidDisconnect(() => {
-            this.portRemoved(portToForward);
-        });
-
-        RemotePortForwardingProviderImpl.forwardedPorts.push({ connection: currentConnection, port: portToForward, server });
-    }
-
-    async portRemoved(forwardedPort: ForwardedPort): Promise<void> {
-        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 }));
-    }
-}
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+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 {
+
+    @inject(RemoteConnectionService)
+    protected readonly connectionService: RemoteConnectionService;
+
+    protected static forwardedPorts: ForwardInfo[] = [];
+
+    async forwardPort(connectionPort: number, portToForward: ForwardedPort): Promise<void> {
+        const currentConnection = this.connectionService.getConnectionFromPort(connectionPort);
+        if (!currentConnection) {
+            throw new Error(`No connection found for port ${connectionPort}`);
+        }
+
+        const server = createServer(socket => {
+            currentConnection?.forwardOut(socket, portToForward.port);
+        }).listen(portToForward.port, portToForward.address);
+
+        currentConnection.onDidDisconnect(() => {
+            this.portRemoved(portToForward);
+        });
+
+        RemotePortForwardingProviderImpl.forwardedPorts.push({ connection: currentConnection, port: portToForward, server });
+    }
+
+    async portRemoved(forwardedPort: ForwardedPort): Promise<void> {
+        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-proxy-server-provider.ts

@@ -1,37 +1,37 @@
-// *****************************************************************************
-// Copyright (C) 2023 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 { Deferred } from '@theia/core/lib/common/promise-util';
-import { injectable } from '@theia/core/shared/inversify';
-import * as net from 'net';
-
-@injectable()
-export class RemoteProxyServerProvider {
-
-    async getProxyServer(callback?: (socket: net.Socket) => void): Promise<net.Server> {
-        const deferred = new Deferred();
-
-        const proxy = net.createServer(socket => {
-            callback?.(socket);
-        }).listen(0, () => {
-            deferred.resolve();
-        });
-
-        await deferred.promise;
-        return proxy;
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2023 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 { Deferred } from '@theia/core/lib/common/promise-util';
+import { injectable } from '@theia/core/shared/inversify';
+import * as net from 'net';
+
+@injectable()
+export class RemoteProxyServerProvider {
+
+    async getProxyServer(callback?: (socket: net.Socket) => void): Promise<net.Server> {
+        const deferred = new Deferred();
+
+        const proxy = net.createServer(socket => {
+            callback?.(socket);
+        }).listen(0, () => {
+            deferred.resolve();
+        });
+
+        await deferred.promise;
+        return proxy;
+    }
+
+}

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

@@ -1,41 +1,41 @@
-// *****************************************************************************
-// Copyright (C) 2023 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 { inject, injectable } from '@theia/core/shared/inversify';
-import { RemoteStatus, RemoteStatusService } from '../electron-common/remote-status-service';
-import { RemoteConnectionService } from './remote-connection-service';
-
-@injectable()
-export class RemoteStatusServiceImpl implements RemoteStatusService {
-
-    @inject(RemoteConnectionService)
-    protected remoteConnectionService: RemoteConnectionService;
-
-    async getStatus(localPort: number): Promise<RemoteStatus> {
-        const connection = this.remoteConnectionService.getConnectionFromPort(localPort);
-        if (connection) {
-            return {
-                alive: true,
-                name: connection.name,
-                type: connection.type
-            };
-        } else {
-            return {
-                alive: false
-            };
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2023 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 { inject, injectable } from '@theia/core/shared/inversify';
+import { RemoteStatus, RemoteStatusService } from '../electron-common/remote-status-service';
+import { RemoteConnectionService } from './remote-connection-service';
+
+@injectable()
+export class RemoteStatusServiceImpl implements RemoteStatusService {
+
+    @inject(RemoteConnectionService)
+    protected remoteConnectionService: RemoteConnectionService;
+
+    async getStatus(localPort: number): Promise<RemoteStatus> {
+        const connection = this.remoteConnectionService.getConnectionFromPort(localPort);
+        if (connection) {
+            return {
+                alive: true,
+                name: connection.name,
+                type: connection.type
+            };
+        } else {
+            return {
+                alive: false
+            };
+        }
+    }
+}

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

@@ -1,64 +1,64 @@
-// *****************************************************************************
-// Copyright (C) 2023 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 { Disposable, Event } from '@theia/core';
-import * as net from 'net';
-
-export type RemoteStatusReport = (message: string) => void;
-
-export interface ExpressLayer {
-    name: string
-    regexp: RegExp
-    handle: Function
-    path?: string
-}
-
-export interface RemoteExecOptions {
-    env?: NodeJS.ProcessEnv;
-}
-
-export interface RemoteExecResult {
-    stdout: string;
-    stderr: string;
-}
-
-export type RemoteExecTester = (stdout: string, stderr: string) => boolean;
-
-export interface RemoteConnection extends Disposable {
-    id: string;
-    name: string;
-    type: string;
-    localPort: number;
-    remotePort: number;
-    onDidDisconnect: Event<void>;
-    forwardOut(socket: net.Socket, port?: number): void;
-
-    /**
-     * execute a single command on the remote machine
-     */
-    exec(cmd: string, args?: string[], options?: RemoteExecOptions): Promise<RemoteExecResult>;
-
-    /**
-     * execute a command on the remote machine and wait for a specific output
-     * @param tester function which returns true if the output is as expected
-     */
-    execPartial(cmd: string, tester: RemoteExecTester, args?: string[], options?: RemoteExecOptions): Promise<RemoteExecResult>;
-
-    /**
-     * copy files from local to remote
-     */
-    copy(localPath: string | Buffer | NodeJS.ReadableStream, remotePath: string): Promise<void>;
-}
+// *****************************************************************************
+// Copyright (C) 2023 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 { Disposable, Event } from '@theia/core';
+import * as net from 'net';
+
+export type RemoteStatusReport = (message: string) => void;
+
+export interface ExpressLayer {
+    name: string
+    regexp: RegExp
+    handle: Function
+    path?: string
+}
+
+export interface RemoteExecOptions {
+    env?: NodeJS.ProcessEnv;
+}
+
+export interface RemoteExecResult {
+    stdout: string;
+    stderr: string;
+}
+
+export type RemoteExecTester = (stdout: string, stderr: string) => boolean;
+
+export interface RemoteConnection extends Disposable {
+    id: string;
+    name: string;
+    type: string;
+    localPort: number;
+    remotePort: number;
+    onDidDisconnect: Event<void>;
+    forwardOut(socket: net.Socket, port?: number): void;
+
+    /**
+     * execute a single command on the remote machine
+     */
+    exec(cmd: string, args?: string[], options?: RemoteExecOptions): Promise<RemoteExecResult>;
+
+    /**
+     * execute a command on the remote machine and wait for a specific output
+     * @param tester function which returns true if the output is as expected
+     */
+    execPartial(cmd: string, tester: RemoteExecTester, args?: string[], options?: RemoteExecOptions): Promise<RemoteExecResult>;
+
+    /**
+     * copy files from local to remote
+     */
+    copy(localPath: string | Buffer | NodeJS.ReadableStream, remotePath: string): Promise<void>;
+}

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

@@ -1,48 +1,48 @@
-// *****************************************************************************
-// Copyright (C) 2023 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 { RemoteNativeDependencyContribution, DownloadOptions, DependencyDownload } from './remote-native-dependency-contribution';
-import { RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
-import { OS } from '@theia/core';
-
-@injectable()
-export class AppNativeDependencyContribution implements RemoteNativeDependencyContribution {
-
-    appDownloadUrlBase = 'https://github.com/eclipse-theia/theia/releases/download';
-
-    protected getDefaultURLForFile(remotePlatform: RemotePlatform, theiaVersion: string): string {
-        if (remotePlatform.arch !== 'x64') {
-            throw new Error(`Unsupported remote architecture '${remotePlatform.arch}'. Remote support is only available for x64 architectures.`);
-        }
-        let platform: string;
-        if (remotePlatform.os === OS.Type.Windows) {
-            platform = 'win32';
-        } else if (remotePlatform.os === OS.Type.OSX) {
-            platform = 'darwin';
-        } else {
-            platform = 'linux';
-        }
-        return `${this.appDownloadUrlBase}/v${theiaVersion}/native-dependencies-${platform}-${remotePlatform.arch}.zip`;
-    }
-
-    async download(options: DownloadOptions): Promise<DependencyDownload> {
-        return {
-            buffer: await options.download(this.getDefaultURLForFile(options.remotePlatform, options.theiaVersion)),
-            archive: 'zip'
-        };
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2023 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 { RemoteNativeDependencyContribution, DownloadOptions, DependencyDownload } from './remote-native-dependency-contribution';
+import { RemotePlatform } from '@theia/core/lib/node/remote/remote-cli-contribution';
+import { OS } from '@theia/core';
+
+@injectable()
+export class AppNativeDependencyContribution implements RemoteNativeDependencyContribution {
+
+    appDownloadUrlBase = 'https://github.com/eclipse-theia/theia/releases/download';
+
+    protected getDefaultURLForFile(remotePlatform: RemotePlatform, theiaVersion: string): string {
+        if (remotePlatform.arch !== 'x64') {
+            throw new Error(`Unsupported remote architecture '${remotePlatform.arch}'. Remote support is only available for x64 architectures.`);
+        }
+        let platform: string;
+        if (remotePlatform.os === OS.Type.Windows) {
+            platform = 'win32';
+        } else if (remotePlatform.os === OS.Type.OSX) {
+            platform = 'darwin';
+        } else {
+            platform = 'linux';
+        }
+        return `${this.appDownloadUrlBase}/v${theiaVersion}/native-dependencies-${platform}-${remotePlatform.arch}.zip`;
+    }
+
+    async download(options: DownloadOptions): Promise<DependencyDownload> {
+        return {
+            buffer: await options.download(this.getDefaultURLForFile(options.remotePlatform, options.theiaVersion)),
+            archive: 'zip'
+        };
+    }
+}

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

@@ -1,28 +1,28 @@
-// *****************************************************************************
-// Copyright (C) 2023 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 { RemoteCopyContribution, RemoteCopyRegistry } from '@theia/core/lib/node/remote/remote-copy-contribution';
-
-@injectable()
-export class MainCopyContribution implements RemoteCopyContribution {
-    async copy(registry: RemoteCopyRegistry): Promise<void> {
-        registry.file('package.json');
-        await registry.glob('lib/backend/**/*.js');
-        await registry.directory('lib/frontend');
-        await registry.directory('lib/webview');
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2023 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 { RemoteCopyContribution, RemoteCopyRegistry } from '@theia/core/lib/node/remote/remote-copy-contribution';
+
+@injectable()
+export class MainCopyContribution implements RemoteCopyContribution {
+    async copy(registry: RemoteCopyRegistry): Promise<void> {
+        registry.file('package.json');
+        await registry.glob('lib/backend/**/*.js');
+        await registry.directory('lib/frontend');
+        await registry.directory('lib/webview');
+    }
+}