@theia/core 1.53.0-next.4 → 1.53.0-next.55

package/src/node/process-utils.spec.ts

@@ -1,48 +1,48 @@
-// *****************************************************************************
-// Copyright (C) 2021 Ericsson 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 { expect } from 'chai';
-import { Container } from 'inversify';
-import { ProcessUtils } from './process-utils';
-
-/** PPID, PID */
-const mockPsOutput = `\
-     5     6
-    40     7
-     1     2
-     1     3
-     2    40
-     2     5
-     0     1
-`;
-
-describe('ProcessUtils', () => {
-
-    let coreProcessManager: ProcessUtils;
-
-    beforeEach(() => {
-        const container = new Container();
-        container.bind(ProcessUtils).toSelf().inSingletonScope();
-        coreProcessManager = container.get(ProcessUtils);
-    });
-
-    it('ProcessUtils#unixGetChildrenRecursive', () => {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        coreProcessManager['spawnSync'] = () => ({ stdout: mockPsOutput }) as any;
-        const pids = coreProcessManager['unixGetChildrenRecursive'](2);
-        expect(Array.from(pids)).members([40, 5, 6, 7]);
-    });
-});
+// *****************************************************************************
+// Copyright (C) 2021 Ericsson 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 { expect } from 'chai';
+import { Container } from 'inversify';
+import { ProcessUtils } from './process-utils';
+
+/** PPID, PID */
+const mockPsOutput = `\
+     5     6
+    40     7
+     1     2
+     1     3
+     2    40
+     2     5
+     0     1
+`;
+
+describe('ProcessUtils', () => {
+
+    let coreProcessManager: ProcessUtils;
+
+    beforeEach(() => {
+        const container = new Container();
+        container.bind(ProcessUtils).toSelf().inSingletonScope();
+        coreProcessManager = container.get(ProcessUtils);
+    });
+
+    it('ProcessUtils#unixGetChildrenRecursive', () => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        coreProcessManager['spawnSync'] = () => ({ stdout: mockPsOutput }) as any;
+        const pids = coreProcessManager['unixGetChildrenRecursive'](2);
+        expect(Array.from(pids)).members([40, 5, 6, 7]);
+    });
+});

package/src/node/process-utils.ts

@@ -1,102 +1,102 @@
-// *****************************************************************************
-// Copyright (C) 2021 Ericsson 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 * as cp from 'child_process';
-import { injectable } from 'inversify';
-
-/**
- * `@theia/core` service with some process-related utilities.
- */
-@injectable()
-export class ProcessUtils {
-
-    terminateProcessTree(ppid: number): void {
-        if (process.platform === 'win32') {
-            this.winTerminateProcessTree(ppid);
-        } else {
-            this.unixTerminateProcessTree(ppid);
-        }
-    }
-
-    protected winTerminateProcessTree(ppid: number): void {
-        this.spawnSync('taskkill.exe', ['/f', '/t', '/pid', ppid.toString(10)]);
-    }
-
-    protected unixTerminateProcessTree(ppid: number): void {
-        for (const pid of this.unixGetChildrenRecursive(ppid)) {
-            // Prevent killing the current process:
-            if (pid !== process.pid) {
-                // Don't stop if a process fails to be killed (keep on killing the others):
-                try {
-                    process.kill(pid);
-                } catch (error) {
-                    console.error(error);
-                }
-            }
-        }
-        if (ppid === this.unixGetPGID(ppid)) {
-            // When a process pgid === pid this means the the process is a group leader.
-            // We can then kill every process part of its group by doing `kill(-pgid)`.
-            // This can catch leaked processes under `init` that are still part of the group.
-            process.kill(-ppid);
-        }
-        process.kill(ppid);
-    }
-
-    protected unixGetPGID(pid: number): number {
-        const { stdout } = this.spawnSync('ps', ['-p', pid.toString(10), '-o', 'pgid=']);
-        return Number.parseInt(stdout, 10);
-    }
-
-    protected unixGetChildrenRecursive(ppid: number): Set<number> {
-        const { stdout } = this.spawnSync('ps', ['ax', '-o', 'ppid=,pid=']);
-        const pids = new Set<number>([ppid]);
-        const matcher = /(\d+)\s+(\d+)/;
-        const psList = stdout
-            .trim()
-            .split('\n')
-            .map(line => {
-                const match = line.match(matcher)!;
-                return {
-                    ppid: Number.parseInt(match[1], 10),
-                    pid: Number.parseInt(match[2], 10),
-                };
-            });
-        // Keep looking for parent/child relationships while we keep finding new parents:
-        let size; do {
-            size = pids.size;
-            for (const child of psList) {
-                if (pids.has(child.ppid)) {
-                    pids.add(child.pid);
-                }
-            }
-        } while (size !== pids.size);
-        // Exclude the requested parent id:
-        pids.delete(ppid);
-        return pids;
-    }
-
-    protected spawnSync(file: string, argv: string[], options?: cp.SpawnSyncOptions): cp.SpawnSyncReturns<string> {
-        const result = cp.spawnSync(file, argv, { ...options, encoding: 'utf8' });
-        if (result.error) {
-            throw result.error;
-        }
-        if (result.status !== 0) {
-            throw new Error(`${JSON.stringify(file)} exited with ${result.status ?? result.signal}. Output:\n${JSON.stringify(result.output)}`);
-        }
-        return result;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2021 Ericsson 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 * as cp from 'child_process';
+import { injectable } from 'inversify';
+
+/**
+ * `@theia/core` service with some process-related utilities.
+ */
+@injectable()
+export class ProcessUtils {
+
+    terminateProcessTree(ppid: number): void {
+        if (process.platform === 'win32') {
+            this.winTerminateProcessTree(ppid);
+        } else {
+            this.unixTerminateProcessTree(ppid);
+        }
+    }
+
+    protected winTerminateProcessTree(ppid: number): void {
+        this.spawnSync('taskkill.exe', ['/f', '/t', '/pid', ppid.toString(10)]);
+    }
+
+    protected unixTerminateProcessTree(ppid: number): void {
+        for (const pid of this.unixGetChildrenRecursive(ppid)) {
+            // Prevent killing the current process:
+            if (pid !== process.pid) {
+                // Don't stop if a process fails to be killed (keep on killing the others):
+                try {
+                    process.kill(pid);
+                } catch (error) {
+                    console.error(error);
+                }
+            }
+        }
+        if (ppid === this.unixGetPGID(ppid)) {
+            // When a process pgid === pid this means the the process is a group leader.
+            // We can then kill every process part of its group by doing `kill(-pgid)`.
+            // This can catch leaked processes under `init` that are still part of the group.
+            process.kill(-ppid);
+        }
+        process.kill(ppid);
+    }
+
+    protected unixGetPGID(pid: number): number {
+        const { stdout } = this.spawnSync('ps', ['-p', pid.toString(10), '-o', 'pgid=']);
+        return Number.parseInt(stdout, 10);
+    }
+
+    protected unixGetChildrenRecursive(ppid: number): Set<number> {
+        const { stdout } = this.spawnSync('ps', ['ax', '-o', 'ppid=,pid=']);
+        const pids = new Set<number>([ppid]);
+        const matcher = /(\d+)\s+(\d+)/;
+        const psList = stdout
+            .trim()
+            .split('\n')
+            .map(line => {
+                const match = line.match(matcher)!;
+                return {
+                    ppid: Number.parseInt(match[1], 10),
+                    pid: Number.parseInt(match[2], 10),
+                };
+            });
+        // Keep looking for parent/child relationships while we keep finding new parents:
+        let size; do {
+            size = pids.size;
+            for (const child of psList) {
+                if (pids.has(child.ppid)) {
+                    pids.add(child.pid);
+                }
+            }
+        } while (size !== pids.size);
+        // Exclude the requested parent id:
+        pids.delete(ppid);
+        return pids;
+    }
+
+    protected spawnSync(file: string, argv: string[], options?: cp.SpawnSyncOptions): cp.SpawnSyncReturns<string> {
+        const result = cp.spawnSync(file, argv, { ...options, encoding: 'utf8' });
+        if (result.error) {
+            throw result.error;
+        }
+        if (result.status !== 0) {
+            throw new Error(`${JSON.stringify(file)} exited with ${result.status ?? result.signal}. Output:\n${JSON.stringify(result.output)}`);
+        }
+        return result;
+    }
+}

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

@@ -1,25 +1,25 @@
-// *****************************************************************************
-// 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 'inversify';
-
-@injectable()
-export class BackendRemoteService {
-
-    isRemoteServer(): boolean {
-        return 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 { injectable } from 'inversify';
+
+@injectable()
+export class BackendRemoteService {
+
+    isRemoteServer(): boolean {
+        return false;
+    }
+}

package/src/node/remote/remote-cli-contribution.ts

@@ -1,34 +1,34 @@
-// *****************************************************************************
-// 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 type { OS } from '../../common/os';
-import type { MaybePromise } from '../../common/types';
-
-export interface RemotePlatform {
-    os: OS.Type
-    arch: string
-}
-
-export interface RemoteCliContext {
-    platform: RemotePlatform;
-    directory: string;
-}
-
-export const RemoteCliContribution = Symbol('RemoteCliContribution');
-
-export interface RemoteCliContribution {
-    enhanceArgs(context: RemoteCliContext): MaybePromise<string[]>;
-}
+// *****************************************************************************
+// 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 type { OS } from '../../common/os';
+import type { MaybePromise } from '../../common/types';
+
+export interface RemotePlatform {
+    os: OS.Type
+    arch: string
+}
+
+export interface RemoteCliContext {
+    platform: RemotePlatform;
+    directory: string;
+}
+
+export const RemoteCliContribution = Symbol('RemoteCliContribution');
+
+export interface RemoteCliContribution {
+    enhanceArgs(context: RemoteCliContext): MaybePromise<string[]>;
+}

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

@@ -1,45 +1,45 @@
-// *****************************************************************************
-// 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 { MaybePromise } from '../../common/types';
-
-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;
-}
-
-export interface RemoteCopyRegistry {
-    getFiles(): RemoteFile[];
-    glob(pattern: string, target?: string): Promise<void>;
-    file(file: string, target?: string, options?: RemoteCopyOptions): void;
-    directory(dir: string, target?: string): Promise<void>;
-}
+// *****************************************************************************
+// 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 { MaybePromise } from '../../common/types';
+
+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;
+}
+
+export interface RemoteCopyRegistry {
+    getFiles(): RemoteFile[];
+    glob(pattern: string, target?: string): Promise<void>;
+    file(file: string, target?: string, options?: RemoteCopyOptions): void;
+    directory(dir: string, target?: string): Promise<void>;
+}

package/src/node/request/backend-request-facade.ts

@@ -1,39 +1,39 @@
-/********************************************************************************
- * Copyright (C) 2022 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 'inversify';
-import { RequestConfiguration, RequestContext, RequestOptions, RequestService } from '@theia/request';
-
-@injectable()
-export class BackendRequestFacade implements RequestService {
-
-    @inject(RequestService)
-    protected readonly requestService: RequestService;
-
-    configure(config: RequestConfiguration): Promise<void> {
-        return this.requestService.configure(config);
-    }
-
-    async request(options: RequestOptions): Promise<RequestContext> {
-        const context = await this.requestService.request(options);
-        return RequestContext.compress(context);
-    }
-
-    resolveProxy(url: string): Promise<string | undefined> {
-        return this.requestService.resolveProxy(url);
-    }
-
-}
+/********************************************************************************
+ * Copyright (C) 2022 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 'inversify';
+import { RequestConfiguration, RequestContext, RequestOptions, RequestService } from '@theia/request';
+
+@injectable()
+export class BackendRequestFacade implements RequestService {
+
+    @inject(RequestService)
+    protected readonly requestService: RequestService;
+
+    configure(config: RequestConfiguration): Promise<void> {
+        return this.requestService.configure(config);
+    }
+
+    async request(options: RequestOptions): Promise<RequestContext> {
+        const context = await this.requestService.request(options);
+        return RequestContext.compress(context);
+    }
+
+    resolveProxy(url: string): Promise<string | undefined> {
+        return this.requestService.resolveProxy(url);
+    }
+
+}

package/src/node/request/backend-request-module.ts

@@ -1,25 +1,25 @@
-/********************************************************************************
- * Copyright (C) 2022 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, decorate, injectable } from 'inversify';
-import { RequestService } from '@theia/request';
-import { NodeRequestService } from '@theia/request/lib/node-request-service';
-
-decorate(injectable(), NodeRequestService);
-
-export default new ContainerModule(bind => {
-    bind(RequestService).to(NodeRequestService).inSingletonScope();
-});
+/********************************************************************************
+ * Copyright (C) 2022 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, decorate, injectable } from 'inversify';
+import { RequestService } from '@theia/request';
+import { NodeRequestService } from '@theia/request/lib/node-request-service';
+
+decorate(injectable(), NodeRequestService);
+
+export default new ContainerModule(bind => {
+    bind(RequestService).to(NodeRequestService).inSingletonScope();
+});