@theia/vsx-registry 1.34.2 → 1.34.3

package/src/node/vsx-environment-impl.ts

@@ -1,41 +1,41 @@
-// *****************************************************************************
-// Copyright (C) 2020 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject } from '@theia/core/shared/inversify';
-import URI from '@theia/core/lib/common/uri';
-import { PluginVsCodeCliContribution } from '@theia/plugin-ext-vscode/lib/node/plugin-vscode-cli-contribution';
-import { VSXEnvironment } from '../common/vsx-environment';
-
-@injectable()
-export class VSXEnvironmentImpl implements VSXEnvironment {
-
-    protected _registryUri = new URI(process.env['VSX_REGISTRY_URL']?.trim() || 'https://open-vsx.org');
-
-    @inject(PluginVsCodeCliContribution)
-    protected readonly pluginVscodeCli: PluginVsCodeCliContribution;
-
-    async getRegistryUri(): Promise<string> {
-        return this._registryUri.toString(true);
-    }
-
-    async getRegistryApiUri(): Promise<string> {
-        return this._registryUri.resolve('api').toString(true);
-    }
-
-    async getVscodeApiVersion(): Promise<string> {
-        return this.pluginVscodeCli.vsCodeApiVersionPromise;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject } from '@theia/core/shared/inversify';
+import URI from '@theia/core/lib/common/uri';
+import { PluginVsCodeCliContribution } from '@theia/plugin-ext-vscode/lib/node/plugin-vscode-cli-contribution';
+import { VSXEnvironment } from '../common/vsx-environment';
+
+@injectable()
+export class VSXEnvironmentImpl implements VSXEnvironment {
+
+    protected _registryUri = new URI(process.env['VSX_REGISTRY_URL']?.trim() || 'https://open-vsx.org');
+
+    @inject(PluginVsCodeCliContribution)
+    protected readonly pluginVscodeCli: PluginVsCodeCliContribution;
+
+    async getRegistryUri(): Promise<string> {
+        return this._registryUri.toString(true);
+    }
+
+    async getRegistryApiUri(): Promise<string> {
+        return this._registryUri.resolve('api').toString(true);
+    }
+
+    async getVscodeApiVersion(): Promise<string> {
+        return this.pluginVscodeCli.vsCodeApiVersionPromise;
+    }
+}

package/src/node/vsx-extension-resolver.ts

@@ -1,111 +1,111 @@
-// *****************************************************************************
-// Copyright (C) 2020 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as path from 'path';
-import * as semver from 'semver';
-import * as fs from '@theia/core/shared/fs-extra';
-import { injectable, inject } from '@theia/core/shared/inversify';
-import URI from '@theia/core/lib/common/uri';
-import { PluginDeployerHandler, PluginDeployerResolver, PluginDeployerResolverContext, PluginDeployOptions, PluginIdentifiers } from '@theia/plugin-ext/lib/common/plugin-protocol';
-import { VSCodeExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';
-import { OVSXClientProvider } from '../common/ovsx-client-provider';
-import { VSXExtensionRaw } from '@theia/ovsx-client';
-import { RequestService } from '@theia/core/shared/@theia/request';
-import { PluginVSCodeEnvironment } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-environment';
-import { PluginUninstallationManager } from '@theia/plugin-ext/lib/main/node/plugin-uninstallation-manager';
-
-@injectable()
-export class VSXExtensionResolver implements PluginDeployerResolver {
-
-    @inject(OVSXClientProvider) protected clientProvider: OVSXClientProvider;
-    @inject(PluginDeployerHandler) protected pluginDeployerHandler: PluginDeployerHandler;
-    @inject(RequestService) protected requestService: RequestService;
-    @inject(PluginVSCodeEnvironment) protected readonly environment: PluginVSCodeEnvironment;
-    @inject(PluginUninstallationManager) protected readonly uninstallationManager: PluginUninstallationManager;
-
-    accept(pluginId: string): boolean {
-        return !!VSCodeExtensionUri.toId(new URI(pluginId));
-    }
-
-    async resolve(context: PluginDeployerResolverContext, options?: PluginDeployOptions): Promise<void> {
-        const id = VSCodeExtensionUri.toId(new URI(context.getOriginId()));
-        if (!id) {
-            return;
-        }
-        let extension: VSXExtensionRaw | undefined;
-        const client = await this.clientProvider();
-        if (options) {
-            console.log(`[${id}]: trying to resolve version ${options.version}...`);
-            extension = await client.getExtension(id, { extensionVersion: options.version, includeAllVersions: true });
-        } else {
-            console.log(`[${id}]: trying to resolve latest version...`);
-            extension = await client.getLatestCompatibleExtensionVersion(id);
-        }
-        if (!extension) {
-            return;
-        }
-        if (extension.error) {
-            throw new Error(extension.error);
-        }
-        const resolvedId = id + '-' + extension.version;
-        const downloadUrl = extension.files.download;
-        console.log(`[${id}]: resolved to '${resolvedId}'`);
-
-        if (!options?.ignoreOtherVersions) {
-            const existingVersion = this.hasSameOrNewerVersion(id, extension);
-            if (existingVersion) {
-                console.log(`[${id}]: is already installed with the same or newer version '${existingVersion}'`);
-                return;
-            }
-        }
-        const downloadPath = (await this.environment.getExtensionsDirUri()).path.fsPath();
-        await fs.ensureDir(downloadPath);
-        const extensionPath = path.resolve(downloadPath, path.basename(downloadUrl));
-        console.log(`[${resolvedId}]: trying to download from "${downloadUrl}"...`, 'to path', downloadPath);
-        if (!await this.download(downloadUrl, extensionPath)) {
-            console.log(`[${resolvedId}]: not found`);
-            return;
-        }
-        console.log(`[${resolvedId}]: downloaded to ${extensionPath}"`);
-        context.addPlugin(resolvedId, extensionPath);
-    }
-
-    protected hasSameOrNewerVersion(id: string, extension: VSXExtensionRaw): string | undefined {
-        const existingPlugins = this.pluginDeployerHandler.getDeployedPluginsById(id)
-            .filter(plugin => !this.uninstallationManager.isUninstalled(PluginIdentifiers.componentsToVersionedId(plugin.metadata.model)));
-        const sufficientVersion = existingPlugins.find(existingPlugin => {
-            const existingVersion = semver.clean(existingPlugin.metadata.model.version);
-            const desiredVersion = semver.clean(extension.version);
-            if (desiredVersion && existingVersion && semver.gte(existingVersion, desiredVersion)) {
-                return existingVersion;
-            }
-        });
-        return sufficientVersion?.metadata.model.version;
-    }
-
-    protected async download(downloadUrl: string, downloadPath: string): Promise<boolean> {
-        if (await fs.pathExists(downloadPath)) { return true; }
-        const context = await this.requestService.request({ url: downloadUrl });
-        if (context.res.statusCode === 404) {
-            return false;
-        } else if (context.res.statusCode !== 200) {
-            throw new Error('Request returned status code: ' + context.res.statusCode);
-        } else {
-            await fs.writeFile(downloadPath, context.buffer);
-            return true;
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as path from 'path';
+import * as semver from 'semver';
+import * as fs from '@theia/core/shared/fs-extra';
+import { injectable, inject } from '@theia/core/shared/inversify';
+import URI from '@theia/core/lib/common/uri';
+import { PluginDeployerHandler, PluginDeployerResolver, PluginDeployerResolverContext, PluginDeployOptions, PluginIdentifiers } from '@theia/plugin-ext/lib/common/plugin-protocol';
+import { VSCodeExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';
+import { OVSXClientProvider } from '../common/ovsx-client-provider';
+import { VSXExtensionRaw } from '@theia/ovsx-client';
+import { RequestService } from '@theia/core/shared/@theia/request';
+import { PluginVSCodeEnvironment } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-environment';
+import { PluginUninstallationManager } from '@theia/plugin-ext/lib/main/node/plugin-uninstallation-manager';
+
+@injectable()
+export class VSXExtensionResolver implements PluginDeployerResolver {
+
+    @inject(OVSXClientProvider) protected clientProvider: OVSXClientProvider;
+    @inject(PluginDeployerHandler) protected pluginDeployerHandler: PluginDeployerHandler;
+    @inject(RequestService) protected requestService: RequestService;
+    @inject(PluginVSCodeEnvironment) protected readonly environment: PluginVSCodeEnvironment;
+    @inject(PluginUninstallationManager) protected readonly uninstallationManager: PluginUninstallationManager;
+
+    accept(pluginId: string): boolean {
+        return !!VSCodeExtensionUri.toId(new URI(pluginId));
+    }
+
+    async resolve(context: PluginDeployerResolverContext, options?: PluginDeployOptions): Promise<void> {
+        const id = VSCodeExtensionUri.toId(new URI(context.getOriginId()));
+        if (!id) {
+            return;
+        }
+        let extension: VSXExtensionRaw | undefined;
+        const client = await this.clientProvider();
+        if (options) {
+            console.log(`[${id}]: trying to resolve version ${options.version}...`);
+            extension = await client.getExtension(id, { extensionVersion: options.version, includeAllVersions: true });
+        } else {
+            console.log(`[${id}]: trying to resolve latest version...`);
+            extension = await client.getLatestCompatibleExtensionVersion(id);
+        }
+        if (!extension) {
+            return;
+        }
+        if (extension.error) {
+            throw new Error(extension.error);
+        }
+        const resolvedId = id + '-' + extension.version;
+        const downloadUrl = extension.files.download;
+        console.log(`[${id}]: resolved to '${resolvedId}'`);
+
+        if (!options?.ignoreOtherVersions) {
+            const existingVersion = this.hasSameOrNewerVersion(id, extension);
+            if (existingVersion) {
+                console.log(`[${id}]: is already installed with the same or newer version '${existingVersion}'`);
+                return;
+            }
+        }
+        const downloadPath = (await this.environment.getExtensionsDirUri()).path.fsPath();
+        await fs.ensureDir(downloadPath);
+        const extensionPath = path.resolve(downloadPath, path.basename(downloadUrl));
+        console.log(`[${resolvedId}]: trying to download from "${downloadUrl}"...`, 'to path', downloadPath);
+        if (!await this.download(downloadUrl, extensionPath)) {
+            console.log(`[${resolvedId}]: not found`);
+            return;
+        }
+        console.log(`[${resolvedId}]: downloaded to ${extensionPath}"`);
+        context.addPlugin(resolvedId, extensionPath);
+    }
+
+    protected hasSameOrNewerVersion(id: string, extension: VSXExtensionRaw): string | undefined {
+        const existingPlugins = this.pluginDeployerHandler.getDeployedPluginsById(id)
+            .filter(plugin => !this.uninstallationManager.isUninstalled(PluginIdentifiers.componentsToVersionedId(plugin.metadata.model)));
+        const sufficientVersion = existingPlugins.find(existingPlugin => {
+            const existingVersion = semver.clean(existingPlugin.metadata.model.version);
+            const desiredVersion = semver.clean(extension.version);
+            if (desiredVersion && existingVersion && semver.gte(existingVersion, desiredVersion)) {
+                return existingVersion;
+            }
+        });
+        return sufficientVersion?.metadata.model.version;
+    }
+
+    protected async download(downloadUrl: string, downloadPath: string): Promise<boolean> {
+        if (await fs.pathExists(downloadPath)) { return true; }
+        const context = await this.requestService.request({ url: downloadUrl });
+        if (context.res.statusCode === 404) {
+            return false;
+        } else if (context.res.statusCode !== 200) {
+            throw new Error('Request returned status code: ' + context.res.statusCode);
+        } else {
+            await fs.writeFile(downloadPath, context.buffer);
+            return true;
+        }
+    }
+}

package/src/node/vsx-registry-backend-module.ts

@@ -1,37 +1,37 @@
-// *****************************************************************************
-// Copyright (C) 2020 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { ContainerModule } from '@theia/core/shared/inversify';
-import { VSXExtensionResolver } from './vsx-extension-resolver';
-import { PluginDeployerResolver } from '@theia/plugin-ext/lib/common/plugin-protocol';
-import { OVSXClientProvider, createOVSXClient } from '../common/ovsx-client-provider';
-import { VSXEnvironment, VSX_ENVIRONMENT_PATH } from '../common/vsx-environment';
-import { VSXEnvironmentImpl } from './vsx-environment-impl';
-import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core';
-import { RequestService } from '@theia/core/shared/@theia/request';
-
-export default new ContainerModule(bind => {
-    bind<OVSXClientProvider>(OVSXClientProvider).toDynamicValue(ctx => {
-        const clientPromise = createOVSXClient(ctx.container.get(VSXEnvironment), ctx.container.get(RequestService));
-        return () => clientPromise;
-    }).inSingletonScope();
-    bind(VSXEnvironment).to(VSXEnvironmentImpl).inSingletonScope();
-    bind(ConnectionHandler).toDynamicValue(
-        ctx => new JsonRpcConnectionHandler(VSX_ENVIRONMENT_PATH, () => ctx.container.get(VSXEnvironment))
-    ).inSingletonScope();
-    bind(VSXExtensionResolver).toSelf().inSingletonScope();
-    bind(PluginDeployerResolver).toService(VSXExtensionResolver);
-});
+// *****************************************************************************
+// Copyright (C) 2020 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { ContainerModule } from '@theia/core/shared/inversify';
+import { VSXExtensionResolver } from './vsx-extension-resolver';
+import { PluginDeployerResolver } from '@theia/plugin-ext/lib/common/plugin-protocol';
+import { OVSXClientProvider, createOVSXClient } from '../common/ovsx-client-provider';
+import { VSXEnvironment, VSX_ENVIRONMENT_PATH } from '../common/vsx-environment';
+import { VSXEnvironmentImpl } from './vsx-environment-impl';
+import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core';
+import { RequestService } from '@theia/core/shared/@theia/request';
+
+export default new ContainerModule(bind => {
+    bind<OVSXClientProvider>(OVSXClientProvider).toDynamicValue(ctx => {
+        const clientPromise = createOVSXClient(ctx.container.get(VSXEnvironment), ctx.container.get(RequestService));
+        return () => clientPromise;
+    }).inSingletonScope();
+    bind(VSXEnvironment).to(VSXEnvironmentImpl).inSingletonScope();
+    bind(ConnectionHandler).toDynamicValue(
+        ctx => new JsonRpcConnectionHandler(VSX_ENVIRONMENT_PATH, () => ctx.container.get(VSXEnvironment))
+    ).inSingletonScope();
+    bind(VSXExtensionResolver).toSelf().inSingletonScope();
+    bind(PluginDeployerResolver).toService(VSXExtensionResolver);
+});

package/src/package.spec.ts

@@ -1,29 +1,29 @@
-// *****************************************************************************
-// Copyright (C) 2020 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-/* note: this bogus test file is required so that
-   we are able to run mocha unit tests on this
-   package, without having any actual unit tests in it.
-   This way a coverage report will be generated,
-   showing 0% coverage, instead of no report.
-   This file can be removed once we have real unit
-   tests in place. */
-
-describe('vsx-registry package', () => {
-
-    it('support code coverage statistics', () => true);
-
-});
+// *****************************************************************************
+// Copyright (C) 2020 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+/* note: this bogus test file is required so that
+   we are able to run mocha unit tests on this
+   package, without having any actual unit tests in it.
+   This way a coverage report will be generated,
+   showing 0% coverage, instead of no report.
+   This file can be removed once we have real unit
+   tests in place. */
+
+describe('vsx-registry package', () => {
+
+    it('support code coverage statistics', () => true);
+
+});