@theia/vsx-registry 1.18.0 → 1.19.0

package/src/browser/vsx-extension.tsx

@@ -14,6 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+import * as markdownit from 'markdown-it';
 import * as React from '@theia/core/shared/react';
 import * as DOMPurify from '@theia/core/shared/dompurify';
 import { injectable, inject } from '@theia/core/shared/inversify';
@@ -28,7 +29,7 @@ import { Endpoint } from '@theia/core/lib/browser/endpoint';
 import { VSXEnvironment } from '../common/vsx-environment';
 import { VSXExtensionsSearchModel } from './vsx-extensions-search-model';
 import { MenuPath } from '@theia/core/lib/common';
-import { codicon, ContextMenuRenderer } from '@theia/core/lib/browser';
+import { codicon, ContextMenuRenderer, TooltipService } from '@theia/core/lib/browser';
 import { VSXExtensionNamespaceAccess, VSXUser } from '@theia/ovsx-client/lib/ovsx-types';
 
 export const EXTENSIONS_CONTEXT_MENU: MenuPath = ['extensions_context_menu'];
@@ -112,6 +113,9 @@ export class VSXExtension implements VSXExtensionData, TreeElement {
     @inject(VSXExtensionsSearchModel)
     readonly search: VSXExtensionsSearchModel;
 
+    @inject(TooltipService)
+    readonly tooltipService: TooltipService;
+
     protected readonly data: Partial<VSXExtensionData> = {};
 
     get uri(): URI {
@@ -183,7 +187,14 @@ export class VSXExtension implements VSXExtensionData, TreeElement {
     }
 
     get version(): string | undefined {
-        return this.getData('version');
+        let version = this.getData('version');
+
+        // Ensure version begins with a 'v'
+        if (version && !version.startsWith('v')) {
+            version = `v${version}`;
+        }
+
+        return version;
     }
 
     get averageRating(): number | undefined {
@@ -244,6 +255,28 @@ export class VSXExtension implements VSXExtensionData, TreeElement {
         return this.getData('publishedBy');
     }
 
+    get tooltipId(): string {
+        return this.tooltipService.tooltipId;
+    }
+
+    get tooltip(): string {
+        let md = `__${this.displayName}__ ${this.version}\n\n${this.description}\n_____\n\nPublisher: ${this.publisher}`;
+
+        if (this.license) {
+            md += `  \rLicense: ${this.license}`;
+        }
+
+        if (this.downloadCount) {
+            md += `  \rDownload count: ${downloadCompactFormatter.format(this.downloadCount)}`;
+        }
+
+        if (this.averageRating) {
+            md += `  \rAverage Rating: ${this.averageRating.toFixed(1)}`;
+        }
+
+        return markdownit().render(md);
+    }
+
     protected _busy = 0;
     get busy(): boolean {
         return !!this._busy;
@@ -289,7 +322,7 @@ export class VSXExtension implements VSXExtensionData, TreeElement {
      * @returns the registry link for the given extension at the path.
      */
     async getRegistryLink(path = ''): Promise<URI> {
-        const uri = await this.environment.getRegistryUri();
+        const uri = new URI(await this.environment.getRegistryUri());
         return uri.resolve('extension/' + this.id.replace('.', '/')).resolve(path);
     }
 
@@ -316,7 +349,9 @@ export class VSXExtension implements VSXExtensionData, TreeElement {
     }
 
     render(): React.ReactNode {
-        return <VSXExtensionComponent extension={this} />;
+        const node = <VSXExtensionComponent extension={this} />;
+        this.tooltipService.update();
+        return node;
     }
 }
 
@@ -379,8 +414,9 @@ const downloadCompactFormatter = new Intl.NumberFormat(undefined, { notation: 'c
 
 export class VSXExtensionComponent extends AbstractVSXExtensionComponent {
     render(): React.ReactNode {
-        const { iconUrl, publisher, displayName, description, version, downloadCount, averageRating } = this.props.extension;
-        return <div className='theia-vsx-extension'>
+        const { iconUrl, publisher, displayName, description, version, downloadCount, averageRating, tooltipId, tooltip } = this.props.extension;
+
+        return <div className='theia-vsx-extension' data-for={tooltipId} data-tip={tooltip}>
             {iconUrl ?
                 <img className='theia-vsx-extension-icon' src={iconUrl} /> :
                 <div className='theia-vsx-extension-icon placeholder' />}

package/src/browser/vsx-extensions-model.ts

@@ -17,7 +17,7 @@
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 import debounce from 'p-debounce';
 import * as showdown from 'showdown';
-import * as sanitize from 'sanitize-html';
+import * as DOMPurify from '@theia/core/shared/dompurify';
 import { Emitter } from '@theia/core/lib/common/event';
 import { CancellationToken, CancellationTokenSource } from '@theia/core/lib/common/cancellation';
 import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin';
@@ -30,7 +30,7 @@ import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { RecommendedExtensions } from './recommended-extensions/recommended-extensions-preference-contribution';
 import URI from '@theia/core/lib/common/uri';
 import { VSXResponseError, VSXSearchParam } from '@theia/ovsx-client/lib/ovsx-types';
-import { OVSXAsyncClient } from './ovsx-async-client';
+import { OVSXClientProvider } from '../common/ovsx-client-provider';
 
 @injectable()
 export class VSXExtensionsModel {
@@ -38,8 +38,8 @@ export class VSXExtensionsModel {
     protected readonly onDidChangeEmitter = new Emitter<void>();
     readonly onDidChange = this.onDidChangeEmitter.event;
 
-    @inject(OVSXAsyncClient)
-    protected client: OVSXAsyncClient;
+    @inject(OVSXClientProvider)
+    protected clientProvider: OVSXClientProvider;
 
     @inject(HostedPluginSupport)
     protected readonly pluginSupport: HostedPluginSupport;
@@ -63,7 +63,6 @@ export class VSXExtensionsModel {
 
     @postConstruct()
     protected async init(): Promise<void> {
-        await this.client.ready;
         await Promise.all([
             this.initInstalled(),
             this.initSearchResult(),
@@ -167,14 +166,15 @@ export class VSXExtensionsModel {
     }, 150);
     protected doUpdateSearchResult(param: VSXSearchParam, token: CancellationToken): Promise<void> {
         return this.doChange(async () => {
-            const result = await this.client.search(param);
+            const client = await this.clientProvider();
+            const result = await client.search(param);
             if (token.isCancellationRequested) {
                 return;
             }
             const searchResult = new Set<string>();
             for (const data of result.extensions) {
                 const id = data.namespace.toLowerCase() + '.' + data.name.toLowerCase();
-                const extension = this.client.getLatestCompatibleVersion(data);
+                const extension = client.getLatestCompatibleVersion(data);
                 if (!extension) {
                     continue;
                 }
@@ -260,7 +260,8 @@ export class VSXExtensionsModel {
             }
             if (extension.readmeUrl) {
                 try {
-                    const rawReadme = await this.client.fetchText(extension.readmeUrl);
+                    const client = await this.clientProvider();
+                    const rawReadme = await client.fetchText(extension.readmeUrl);
                     const readme = this.compileReadme(rawReadme);
                     extension.update({ readme });
                 } catch (e) {
@@ -275,15 +276,15 @@ export class VSXExtensionsModel {
 
     protected compileReadme(readmeMarkdown: string): string {
         const markdownConverter = new showdown.Converter({
+            headerLevelStart: 2,
             noHeaderId: true,
             strikethrough: true,
-            headerLevelStart: 2
+            tables: true,
+            underline: true
         });
 
         const readmeHtml = markdownConverter.makeHtml(readmeMarkdown);
-        return sanitize(readmeHtml, {
-            allowedTags: sanitize.defaults.allowedTags.concat(['h1', 'h2', 'img'])
-        });
+        return DOMPurify.sanitize(readmeHtml);
     }
 
     protected async refresh(id: string): Promise<VSXExtension | undefined> {
@@ -292,7 +293,8 @@ export class VSXExtensionsModel {
             if (!this.shouldRefresh(extension)) {
                 return extension;
             }
-            const data = await this.client.getLatestCompatibleExtensionVersion(id);
+            const client = await this.clientProvider();
+            const data = await client.getLatestCompatibleExtensionVersion(id);
             if (!data) {
                 return;
             }

package/src/browser/vsx-extensions-view-container.ts

@@ -22,12 +22,15 @@ import { VSXSearchMode } from './vsx-extensions-search-model';
 import { generateExtensionWidgetId } from './vsx-extensions-widget';
 import { VSXExtensionsSourceOptions } from './vsx-extensions-source';
 import { VSXExtensionsCommands } from './vsx-extension-commands';
+import { nls } from '@theia/core/lib/common/nls';
 
 @injectable()
 export class VSXExtensionsViewContainer extends ViewContainer {
 
     static ID = 'vsx-extensions-view-container';
-    static LABEL = 'Extensions';
+    static LABEL = nls.localize('vscode/settingsLayout/extensions', 'Extensions');
+
+    disableDNDBetweenContainers = true;
 
     @inject(VSXExtensionsSearchBar)
     protected readonly searchBar: VSXExtensionsSearchBar;
@@ -163,7 +166,7 @@ export class VSXExtensionsViewContainer extends ViewContainer {
     }
 
     protected getToggleVisibilityGroupLabel(): string {
-        return 'a/Views';
+        return 'a/' + nls.localize('vscode/viewPaneContainer/views', 'Views');
     }
 }
 export namespace VSXExtensionsViewContainer {

package/src/browser/vsx-extensions-widget.ts

@@ -17,6 +17,7 @@
 import { injectable, interfaces, postConstruct, inject } from '@theia/core/shared/inversify';
 import { SourceTreeWidget } from '@theia/core/lib/browser/source-tree';
 import { VSXExtensionsSource, VSXExtensionsSourceOptions } from './vsx-extensions-source';
+import { nls } from '@theia/core/lib/common/nls';
 
 @injectable()
 export class VSXExtensionsWidgetOptions extends VSXExtensionsSourceOptions {
@@ -66,13 +67,13 @@ export class VSXExtensionsWidget extends SourceTreeWidget {
     protected computeTitle(): string {
         switch (this.options.id) {
             case VSXExtensionsSourceOptions.INSTALLED:
-                return 'Installed';
+                return nls.localize('vscode/extensions.contribution/installed filter', 'Installed');
             case VSXExtensionsSourceOptions.BUILT_IN:
-                return 'Built-in';
+                return nls.localize('vscode/extensions.contribution/builtin filter', 'Built-in');
             case VSXExtensionsSourceOptions.RECOMMENDED:
-                return 'Recommended';
+                return nls.localize('vscode/extensions.contribution/most popular recommended', 'Recommended');
             case VSXExtensionsSourceOptions.SEARCH_RESULT:
-                return 'Open VSX Registry';
+                return nls.localize('theia/vsx-registry/openVSX', 'Open VSX Registry');
             default:
                 return '';
         }

package/src/browser/vsx-registry-frontend-module.ts

@@ -17,7 +17,9 @@
 import '../../src/browser/style/index.css';
 
 import { ContainerModule } from '@theia/core/shared/inversify';
-import { WidgetFactory, bindViewContribution, FrontendApplicationContribution, ViewContainerIdentifier, OpenHandler, WidgetManager } from '@theia/core/lib/browser';
+import {
+    WidgetFactory, bindViewContribution, FrontendApplicationContribution, ViewContainerIdentifier, OpenHandler, WidgetManager, WebSocketConnectionProvider
+} from '@theia/core/lib/browser';
 import { VSXExtensionsViewContainer } from './vsx-extensions-view-container';
 import { VSXExtensionsContribution } from './vsx-extensions-contribution';
 import { VSXExtensionsSearchBar } from './vsx-extensions-search-bar';
@@ -28,24 +30,20 @@ import { VSXExtensionFactory, VSXExtension, VSXExtensionOptions } from './vsx-ex
 import { VSXExtensionEditor } from './vsx-extension-editor';
 import { VSXExtensionEditorManager } from './vsx-extension-editor-manager';
 import { VSXExtensionsSourceOptions } from './vsx-extensions-source';
-import { VSXEnvironment } from '../common/vsx-environment';
 import { VSXExtensionsSearchModel } from './vsx-extensions-search-model';
 import { bindExtensionPreferences } from './recommended-extensions/recommended-extensions-preference-contribution';
 import { bindPreferenceProviderOverrides } from './recommended-extensions/preference-provider-overrides';
-import { OVSXAsyncClient } from './ovsx-async-client';
+import { OVSXClientProvider, createOVSXClient } from '../common/ovsx-client-provider';
+import { VSXEnvironment, VSX_ENVIRONMENT_PATH } from '../common/vsx-environment';
 
 export default new ContainerModule((bind, unbind) => {
-    bind(VSXEnvironment).toSelf().inSingletonScope();
-    bind(OVSXAsyncClient).toDynamicValue(ctx => {
-        const vsxEnvironment = ctx.container.get(VSXEnvironment);
-        return new OVSXAsyncClient(Promise.all([
-            vsxEnvironment.getVscodeApiVersion(),
-            vsxEnvironment.getRegistryApiUri()
-        ]).then(([apiVersion, apiUri]) => ({
-            apiVersion,
-            apiUrl: apiUri.toString()
-        })));
+    bind<OVSXClientProvider>(OVSXClientProvider).toDynamicValue(ctx => {
+        const clientPromise = createOVSXClient(ctx.container.get(VSXEnvironment));
+        return () => clientPromise;
     }).inSingletonScope();
+    bind(VSXEnvironment).toDynamicValue(
+        ctx => WebSocketConnectionProvider.createProxy(ctx.container, VSX_ENVIRONMENT_PATH)
+    ).inSingletonScope();
 
     bind(VSXExtension).toSelf();
     bind(VSXExtensionFactory).toFactory(ctx => (option: VSXExtensionOptions) => {

package/{lib/browser/ovsx-async-client.d.ts → src/common/ovsx-client-provider.ts}

@@ -13,18 +13,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { OVSXClient, OVSXClientOptions } from '@theia/ovsx-client/lib';
-/**
- * In some instances, the OVSXClient must be created asynchronously. This class
- * makes it possible to get an un-initialized instance and wait for it to be ready.
- */
-export declare class OVSXAsyncClient extends OVSXClient {
-    /**
-     * Resolves once the initial asynchronous options are resolved.
-     *
-     * Calling methods before this promise is resolved will throw errors.
-     */
-    readonly ready: Promise<OVSXAsyncClient>;
-    constructor(asyncOptions: Promise<OVSXClientOptions>);
+
+import { OVSXClient } from '@theia/ovsx-client';
+import { VSXEnvironment } from './vsx-environment';
+
+export const OVSXClientProvider = Symbol('OVSXClientProvider');
+export type OVSXClientProvider = () => Promise<OVSXClient>;
+
+export async function createOVSXClient(vsxEnvironment: VSXEnvironment): Promise<OVSXClient> {
+    const [apiVersion, apiUrl] = await Promise.all([
+        vsxEnvironment.getVscodeApiVersion(),
+        vsxEnvironment.getRegistryApiUri()
+    ]);
+    return new OVSXClient({ apiVersion, apiUrl: apiUrl.toString() });
 }
-//# sourceMappingURL=ovsx-async-client.d.ts.map

package/src/{browser/ovsx-async-client.ts → common/vsx-environment.ts}

@@ -14,26 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { OVSXClient, OVSXClientOptions } from '@theia/ovsx-client/lib';
+export const VSX_ENVIRONMENT_PATH = '/services/vsx-environment';
 
-/**
- * In some instances, the OVSXClient must be created asynchronously. This class
- * makes it possible to get an un-initialized instance and wait for it to be ready.
- */
-export class OVSXAsyncClient extends OVSXClient {
-
-    /**
-     * Resolves once the initial asynchronous options are resolved.
-     *
-     * Calling methods before this promise is resolved will throw errors.
-     */
-    readonly ready: Promise<OVSXAsyncClient>;
-
-    constructor(asyncOptions: Promise<OVSXClientOptions>) {
-        super(undefined!); // hack: using methods at this point will fail.
-        this.ready = asyncOptions.then(options => {
-            (this.options as OVSXClientOptions) = options;
-            return this;
-        });
-    }
+export const VSXEnvironment = Symbol('VSXEnvironment');
+export interface VSXEnvironment {
+    getRegistryUri(): Promise<string>;
+    getRegistryApiUri(): Promise<string>;
+    getVscodeApiVersion(): Promise<string>;
 }

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

@@ -0,0 +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;
+    }
+}

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

@@ -23,13 +23,13 @@ import { injectable, inject } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { PluginDeployerResolver, PluginDeployerResolverContext } from '@theia/plugin-ext/lib/common/plugin-protocol';
 import { VSXExtensionUri } from '../common/vsx-extension-uri';
-import { OVSXClient } from '@theia/ovsx-client/lib/ovsx-client';
+import { OVSXClientProvider } from '../common/ovsx-client-provider';
 
 @injectable()
 export class VSXExtensionResolver implements PluginDeployerResolver {
 
-    @inject(OVSXClient)
-    protected client: OVSXClient;
+    @inject(OVSXClientProvider)
+    protected clientProvider: OVSXClientProvider;
 
     protected readonly downloadPath: string;
 
@@ -49,7 +49,8 @@ export class VSXExtensionResolver implements PluginDeployerResolver {
             return;
         }
         console.log(`[${id}]: trying to resolve latest version...`);
-        const extension = await this.client.getLatestCompatibleExtensionVersion(id);
+        const client = await this.clientProvider();
+        const extension = await client.getLatestCompatibleExtensionVersion(id);
         if (!extension) {
             return;
         }

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

@@ -17,18 +17,20 @@
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { VSXExtensionResolver } from './vsx-extension-resolver';
 import { PluginDeployerResolver } from '@theia/plugin-ext/lib/common/plugin-protocol';
-import { VSCODE_DEFAULT_API_VERSION, VSX_REGISTRY_URL_DEFAULT } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-types';
-import { OVSXClient } from '@theia/ovsx-client/lib/ovsx-client';
+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';
 
 export default new ContainerModule(bind => {
-    bind(OVSXClient).toConstantValue(new OVSXClient({
-        apiVersion: process.env['VSCODE_API_VERSION'] || VSCODE_DEFAULT_API_VERSION,
-        apiUrl: resolveRegistryUrl()
-    }));
+    bind<OVSXClientProvider>(OVSXClientProvider).toDynamicValue(ctx => {
+        const clientPromise = createOVSXClient(ctx.container.get(VSXEnvironment));
+        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);
 });
-
-function resolveRegistryUrl(): string {
-   return process.env['VSX_REGISTRY_URL'] || VSX_REGISTRY_URL_DEFAULT;
-}

package/lib/browser/ovsx-async-client.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ovsx-async-client.d.ts","sourceRoot":"","sources":["../../src/browser/ovsx-async-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEvE;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,UAAU;IAE3C;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;gBAE7B,YAAY,EAAE,OAAO,CAAC,iBAAiB,CAAC;CAOvD"}

package/lib/browser/ovsx-async-client.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ovsx-async-client.js","sourceRoot":"","sources":["../../src/browser/ovsx-async-client.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,gDAAuE;AAEvE;;;GAGG;AACH,MAAa,eAAgB,SAAQ,gBAAU;IAS3C,YAAY,YAAwC;QAChD,KAAK,CAAC,SAAU,CAAC,CAAC,CAAC,+CAA+C;QAClE,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACpC,IAAI,CAAC,OAA6B,GAAG,OAAO,CAAC;YAC9C,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAhBD,0CAgBC"}

package/src/common/vsx-environment.tsx

@@ -1,51 +0,0 @@
-/********************************************************************************
- * 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 { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
-import URI from '@theia/core/lib/common/uri';
-import { VSCODE_DEFAULT_API_VERSION } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-types';
-
-@injectable()
-export class VSXEnvironment {
-
-    @inject(EnvVariablesServer)
-    protected readonly environments: EnvVariablesServer;
-
-    protected _registryUri: URI | undefined;
-    async getRegistryUri(): Promise<URI> {
-        if (!this._registryUri) {
-            const vsxRegistryUrl = await this.environments.getValue('VSX_REGISTRY_URL');
-            this._registryUri = new URI(vsxRegistryUrl && vsxRegistryUrl.value || 'https://open-vsx.org');
-        }
-        return this._registryUri;
-    }
-
-    async getRegistryApiUri(): Promise<URI> {
-        const registryUri = await this.getRegistryUri();
-        return registryUri.resolve('api');
-    }
-
-    protected _apiVersion: string | undefined;
-    async getVscodeApiVersion(): Promise<string> {
-        if (!this._apiVersion) {
-            const apiVersion = await this.environments.getValue('VSCODE_API_VERSION');
-            this._apiVersion = apiVersion?.value || VSCODE_DEFAULT_API_VERSION;
-        }
-        return this._apiVersion;
-    }
-
-}