@theia/remote 1.52.0 → 1.53.0-next.55

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

@@ -1,35 +1,35 @@
-// *****************************************************************************
-// 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
-// *****************************************************************************
-
-export type RemoteStatus = RemoteConnectedStatus | RemoteDisconnectedStatus;
-
-export interface RemoteDisconnectedStatus {
-    alive: false;
-}
-
-export interface RemoteConnectedStatus {
-    alive: true;
-    type: string;
-    name: string;
-}
-
-export const RemoteStatusServicePath = '/remote/status';
-
-export const RemoteStatusService = Symbol('RemoteStatusService');
-
-export interface RemoteStatusService {
-    getStatus(localPort: number): Promise<RemoteStatus>
-}
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+export type RemoteStatus = RemoteConnectedStatus | RemoteDisconnectedStatus;
+
+export interface RemoteDisconnectedStatus {
+    alive: false;
+}
+
+export interface RemoteConnectedStatus {
+    alive: true;
+    type: string;
+    name: string;
+}
+
+export const RemoteStatusServicePath = '/remote/status';
+
+export const RemoteStatusService = Symbol('RemoteStatusService');
+
+export interface RemoteStatusService {
+    getStatus(localPort: number): Promise<RemoteStatus>
+}

package/src/electron-node/backend-remote-service-impl.ts

@@ -1,45 +1,45 @@
-// *****************************************************************************
-// 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 { CliContribution } from '@theia/core/lib/node';
-import { injectable } from '@theia/core/shared/inversify';
-import { Arguments, Argv } from '@theia/core/shared/yargs';
-import { BackendRemoteService } from '@theia/core/lib/node/remote/backend-remote-service';
-
-export const REMOTE_START = 'remote';
-
-@injectable()
-export class BackendRemoteServiceImpl extends BackendRemoteService implements CliContribution {
-
-    protected isRemote: boolean = false;
-
-    configure(conf: Argv): void {
-        conf.option(REMOTE_START, {
-            description: 'Starts the server as an endpoint for a remote connection (i.e. through SSH)',
-            type: 'boolean',
-            default: false
-        });
-    }
-
-    setArguments(args: Arguments): void {
-        this.isRemote = Boolean(args[REMOTE_START]);
-    }
-
-    override isRemoteServer(): boolean {
-        return this.isRemote;
-    }
-
-}
+// *****************************************************************************
+// 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 { CliContribution } from '@theia/core/lib/node';
+import { injectable } from '@theia/core/shared/inversify';
+import { Arguments, Argv } from '@theia/core/shared/yargs';
+import { BackendRemoteService } from '@theia/core/lib/node/remote/backend-remote-service';
+
+export const REMOTE_START = 'remote';
+
+@injectable()
+export class BackendRemoteServiceImpl extends BackendRemoteService implements CliContribution {
+
+    protected isRemote: boolean = false;
+
+    configure(conf: Argv): void {
+        conf.option(REMOTE_START, {
+            description: 'Starts the server as an endpoint for a remote connection (i.e. through SSH)',
+            type: 'boolean',
+            default: false
+        });
+    }
+
+    setArguments(args: Arguments): void {
+        this.isRemote = Boolean(args[REMOTE_START]);
+    }
+
+    override isRemoteServer(): boolean {
+        return this.isRemote;
+    }
+
+}

package/src/electron-node/remote-backend-module.ts

@@ -1,87 +1,87 @@
-// *****************************************************************************
-// 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 { ContainerModule } from '@theia/core/shared/inversify';
-import { BackendApplicationContribution, CliContribution } from '@theia/core/lib/node';
-import { RemoteConnectionService } from './remote-connection-service';
-import { RemoteProxyServerProvider } from './remote-proxy-server-provider';
-import { RemoteConnectionSocketProvider } from './remote-connection-socket-provider';
-import { ConnectionContainerModule } from '@theia/core/lib/node/messaging/connection-container-module';
-import { RemoteSSHConnectionProvider, RemoteSSHConnectionProviderPath } from '../electron-common/remote-ssh-connection-provider';
-import { RemoteSSHConnectionProviderImpl } from './ssh/remote-ssh-connection-provider';
-import { SSHIdentityFileCollector } from './ssh/ssh-identity-file-collector';
-import { RemoteCopyService } from './setup/remote-copy-service';
-import { RemoteSetupService } from './setup/remote-setup-service';
-import { RemoteNativeDependencyService } from './setup/remote-native-dependency-service';
-import { BackendRemoteServiceImpl } from './backend-remote-service-impl';
-import { BackendRemoteService } from '@theia/core/lib/node/remote/backend-remote-service';
-import { RemoteNodeSetupService } from './setup/remote-node-setup-service';
-import { RemotePosixScriptStrategy, RemoteSetupScriptService, RemoteWindowsScriptStrategy } from './setup/remote-setup-script-service';
-import { RemoteStatusService, RemoteStatusServicePath } from '../electron-common/remote-status-service';
-import { RemoteStatusServiceImpl } from './remote-status-service';
-import { ConnectionHandler, RpcConnectionHandler, bindContributionProvider } from '@theia/core';
-import { RemoteCopyRegistryImpl } from './setup/remote-copy-contribution';
-import { RemoteCopyContribution } from '@theia/core/lib/node/remote/remote-copy-contribution';
-import { MainCopyContribution } from './setup/main-copy-contribution';
-import { RemoteNativeDependencyContribution } from './setup/remote-native-dependency-contribution';
-import { AppNativeDependencyContribution } from './setup/app-native-dependency-contribution';
-import { RemotePortForwardingProviderImpl } from './remote-port-forwarding-provider';
-import { RemotePortForwardingProvider, RemoteRemotePortForwardingProviderPath } from '../electron-common/remote-port-forwarding-provider';
-
-export const remoteConnectionModule = ConnectionContainerModule.create(({ bind, bindBackendService }) => {
-    bind(RemoteSSHConnectionProviderImpl).toSelf().inSingletonScope();
-    bind(RemoteSSHConnectionProvider).toService(RemoteSSHConnectionProviderImpl);
-    bindBackendService(RemoteSSHConnectionProviderPath, RemoteSSHConnectionProvider);
-
-    bind(RemotePortForwardingProviderImpl).toSelf().inSingletonScope();
-    bind(RemotePortForwardingProvider).toService(RemotePortForwardingProviderImpl);
-    bindBackendService(RemoteRemotePortForwardingProviderPath, RemotePortForwardingProvider);
-});
-
-export default new ContainerModule((bind, _unbind, _isBound, rebind) => {
-    bind(RemoteProxyServerProvider).toSelf().inSingletonScope();
-    bind(RemoteConnectionSocketProvider).toSelf().inSingletonScope();
-    bind(RemoteConnectionService).toSelf().inSingletonScope();
-    bind(BackendApplicationContribution).toService(RemoteConnectionService);
-    bind(RemoteStatusServiceImpl).toSelf().inSingletonScope();
-    bind(RemoteStatusService).toService(RemoteStatusServiceImpl);
-    bind(ConnectionHandler).toDynamicValue(
-        ctx => new RpcConnectionHandler(RemoteStatusServicePath, () => ctx.container.get(RemoteStatusService))
-    ).inSingletonScope();
-
-    bind(RemoteCopyService).toSelf().inSingletonScope();
-    bind(RemoteSetupService).toSelf().inSingletonScope();
-    bind(RemoteNodeSetupService).toSelf().inSingletonScope();
-    bind(RemoteWindowsScriptStrategy).toSelf().inSingletonScope();
-    bind(RemotePosixScriptStrategy).toSelf().inSingletonScope();
-    bind(RemoteSetupScriptService).toSelf().inSingletonScope();
-    bind(RemoteNativeDependencyService).toSelf().inSingletonScope();
-    bind(RemoteCopyRegistryImpl).toSelf().inSingletonScope();
-    bindContributionProvider(bind, RemoteCopyContribution);
-    bindContributionProvider(bind, RemoteNativeDependencyContribution);
-    bind(MainCopyContribution).toSelf().inSingletonScope();
-    bind(RemoteCopyContribution).toService(MainCopyContribution);
-    bind(AppNativeDependencyContribution).toSelf().inSingletonScope();
-    bind(RemoteNativeDependencyContribution).toService(AppNativeDependencyContribution);
-
-    bind(ConnectionContainerModule).toConstantValue(remoteConnectionModule);
-
-    bind(BackendRemoteServiceImpl).toSelf().inSingletonScope();
-    rebind(BackendRemoteService).toService(BackendRemoteServiceImpl);
-    bind(CliContribution).toService(BackendRemoteServiceImpl);
-
-    bind(SSHIdentityFileCollector).toSelf().inSingletonScope();
-});
+// *****************************************************************************
+// 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 { ContainerModule } from '@theia/core/shared/inversify';
+import { BackendApplicationContribution, CliContribution } from '@theia/core/lib/node';
+import { RemoteConnectionService } from './remote-connection-service';
+import { RemoteProxyServerProvider } from './remote-proxy-server-provider';
+import { RemoteConnectionSocketProvider } from './remote-connection-socket-provider';
+import { ConnectionContainerModule } from '@theia/core/lib/node/messaging/connection-container-module';
+import { RemoteSSHConnectionProvider, RemoteSSHConnectionProviderPath } from '../electron-common/remote-ssh-connection-provider';
+import { RemoteSSHConnectionProviderImpl } from './ssh/remote-ssh-connection-provider';
+import { SSHIdentityFileCollector } from './ssh/ssh-identity-file-collector';
+import { RemoteCopyService } from './setup/remote-copy-service';
+import { RemoteSetupService } from './setup/remote-setup-service';
+import { RemoteNativeDependencyService } from './setup/remote-native-dependency-service';
+import { BackendRemoteServiceImpl } from './backend-remote-service-impl';
+import { BackendRemoteService } from '@theia/core/lib/node/remote/backend-remote-service';
+import { RemoteNodeSetupService } from './setup/remote-node-setup-service';
+import { RemotePosixScriptStrategy, RemoteSetupScriptService, RemoteWindowsScriptStrategy } from './setup/remote-setup-script-service';
+import { RemoteStatusService, RemoteStatusServicePath } from '../electron-common/remote-status-service';
+import { RemoteStatusServiceImpl } from './remote-status-service';
+import { ConnectionHandler, RpcConnectionHandler, bindContributionProvider } from '@theia/core';
+import { RemoteCopyRegistryImpl } from './setup/remote-copy-contribution';
+import { RemoteCopyContribution } from '@theia/core/lib/node/remote/remote-copy-contribution';
+import { MainCopyContribution } from './setup/main-copy-contribution';
+import { RemoteNativeDependencyContribution } from './setup/remote-native-dependency-contribution';
+import { AppNativeDependencyContribution } from './setup/app-native-dependency-contribution';
+import { RemotePortForwardingProviderImpl } from './remote-port-forwarding-provider';
+import { RemotePortForwardingProvider, RemoteRemotePortForwardingProviderPath } from '../electron-common/remote-port-forwarding-provider';
+
+export const remoteConnectionModule = ConnectionContainerModule.create(({ bind, bindBackendService }) => {
+    bind(RemoteSSHConnectionProviderImpl).toSelf().inSingletonScope();
+    bind(RemoteSSHConnectionProvider).toService(RemoteSSHConnectionProviderImpl);
+    bindBackendService(RemoteSSHConnectionProviderPath, RemoteSSHConnectionProvider);
+
+    bind(RemotePortForwardingProviderImpl).toSelf().inSingletonScope();
+    bind(RemotePortForwardingProvider).toService(RemotePortForwardingProviderImpl);
+    bindBackendService(RemoteRemotePortForwardingProviderPath, RemotePortForwardingProvider);
+});
+
+export default new ContainerModule((bind, _unbind, _isBound, rebind) => {
+    bind(RemoteProxyServerProvider).toSelf().inSingletonScope();
+    bind(RemoteConnectionSocketProvider).toSelf().inSingletonScope();
+    bind(RemoteConnectionService).toSelf().inSingletonScope();
+    bind(BackendApplicationContribution).toService(RemoteConnectionService);
+    bind(RemoteStatusServiceImpl).toSelf().inSingletonScope();
+    bind(RemoteStatusService).toService(RemoteStatusServiceImpl);
+    bind(ConnectionHandler).toDynamicValue(
+        ctx => new RpcConnectionHandler(RemoteStatusServicePath, () => ctx.container.get(RemoteStatusService))
+    ).inSingletonScope();
+
+    bind(RemoteCopyService).toSelf().inSingletonScope();
+    bind(RemoteSetupService).toSelf().inSingletonScope();
+    bind(RemoteNodeSetupService).toSelf().inSingletonScope();
+    bind(RemoteWindowsScriptStrategy).toSelf().inSingletonScope();
+    bind(RemotePosixScriptStrategy).toSelf().inSingletonScope();
+    bind(RemoteSetupScriptService).toSelf().inSingletonScope();
+    bind(RemoteNativeDependencyService).toSelf().inSingletonScope();
+    bind(RemoteCopyRegistryImpl).toSelf().inSingletonScope();
+    bindContributionProvider(bind, RemoteCopyContribution);
+    bindContributionProvider(bind, RemoteNativeDependencyContribution);
+    bind(MainCopyContribution).toSelf().inSingletonScope();
+    bind(RemoteCopyContribution).toService(MainCopyContribution);
+    bind(AppNativeDependencyContribution).toSelf().inSingletonScope();
+    bind(RemoteNativeDependencyContribution).toService(AppNativeDependencyContribution);
+
+    bind(ConnectionContainerModule).toConstantValue(remoteConnectionModule);
+
+    bind(BackendRemoteServiceImpl).toSelf().inSingletonScope();
+    rebind(BackendRemoteService).toService(BackendRemoteServiceImpl);
+    bind(CliContribution).toService(BackendRemoteServiceImpl);
+
+    bind(SSHIdentityFileCollector).toSelf().inSingletonScope();
+});

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

@@ -1,56 +1,56 @@
-// *****************************************************************************
-// 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 { RemoteConnection } from './remote-types';
-import { Disposable } from '@theia/core';
-import { RemoteCopyService } from './setup/remote-copy-service';
-import { BackendApplicationContribution } from '@theia/core/lib/node';
-import { RemoteSetupService } from './setup/remote-setup-service';
-
-@injectable()
-export class RemoteConnectionService implements BackendApplicationContribution {
-
-    @inject(RemoteCopyService)
-    protected readonly copyService: RemoteCopyService;
-
-    // Workaround for the fact that connection scoped services cannot directly inject these services.
-    @inject(RemoteSetupService)
-    protected readonly remoteSetupService: RemoteSetupService;
-
-    protected readonly connections = new Map<string, RemoteConnection>();
-
-    getConnection(id: string): RemoteConnection | undefined {
-        return this.connections.get(id);
-    }
-
-    getConnectionFromPort(port: number): RemoteConnection | undefined {
-        return Array.from(this.connections.values()).find(connection => connection.localPort === port);
-    }
-
-    register(connection: RemoteConnection): Disposable {
-        this.connections.set(connection.id, connection);
-        return Disposable.create(() => {
-            this.connections.delete(connection.id);
-        });
-    }
-
-    onStop(): void {
-        for (const connection of this.connections.values()) {
-            connection.dispose();
-        }
-    }
-}
+// *****************************************************************************
+// 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 { RemoteConnection } from './remote-types';
+import { Disposable } from '@theia/core';
+import { RemoteCopyService } from './setup/remote-copy-service';
+import { BackendApplicationContribution } from '@theia/core/lib/node';
+import { RemoteSetupService } from './setup/remote-setup-service';
+
+@injectable()
+export class RemoteConnectionService implements BackendApplicationContribution {
+
+    @inject(RemoteCopyService)
+    protected readonly copyService: RemoteCopyService;
+
+    // Workaround for the fact that connection scoped services cannot directly inject these services.
+    @inject(RemoteSetupService)
+    protected readonly remoteSetupService: RemoteSetupService;
+
+    protected readonly connections = new Map<string, RemoteConnection>();
+
+    getConnection(id: string): RemoteConnection | undefined {
+        return this.connections.get(id);
+    }
+
+    getConnectionFromPort(port: number): RemoteConnection | undefined {
+        return Array.from(this.connections.values()).find(connection => connection.localPort === port);
+    }
+
+    register(connection: RemoteConnection): Disposable {
+        this.connections.set(connection.id, connection);
+        return Disposable.create(() => {
+            this.connections.delete(connection.id);
+        });
+    }
+
+    onStop(): void {
+        for (const connection of this.connections.values()) {
+            connection.dispose();
+        }
+    }
+}

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

@@ -1,34 +1,34 @@
-// *****************************************************************************
-// 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 { io, Socket } from 'socket.io-client';
-
-export interface RemoteProxySocketProviderOptions {
-    port: number;
-    path: string;
-}
-
-@injectable()
-export class RemoteConnectionSocketProvider {
-
-    getProxySocket(options: RemoteProxySocketProviderOptions): Socket {
-        const socket = io(`ws://localhost:${options.port}${options.path}`);
-        socket.connect();
-        return socket;
-    }
-
-}
+// *****************************************************************************
+// 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 { io, Socket } from 'socket.io-client';
+
+export interface RemoteProxySocketProviderOptions {
+    port: number;
+    path: string;
+}
+
+@injectable()
+export class RemoteConnectionSocketProvider {
+
+    getProxySocket(options: RemoteProxySocketProviderOptions): Socket {
+        const socket = io(`ws://localhost:${options.port}${options.path}`);
+        socket.connect();
+        return socket;
+    }
+
+}