@theia/vsx-registry 1.39.0-next.9 → 1.40.0

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

@@ -11,7 +11,7 @@
 // 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
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import { DateTime } from 'luxon';
@@ -34,22 +34,22 @@ import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
 import { BUILTIN_QUERY, INSTALLED_QUERY, RECOMMENDED_QUERY } from './vsx-extensions-search-model';
 import { IGNORE_RECOMMENDATIONS_ID } from './recommended-extensions/recommended-extensions-preference-contribution';
 import { VSXExtensionsCommands } from './vsx-extension-commands';
-import { VSXExtensionRaw } from '@theia/ovsx-client';
+import { VSXExtensionRaw, OVSXApiFilter } from '@theia/ovsx-client';
 import { OVSXClientProvider } from '../common/ovsx-client-provider';
 
 @injectable()
-export class VSXExtensionsContribution extends AbstractViewContribution<VSXExtensionsViewContainer>
-    implements ColorContribution, FrontendApplicationContribution {
+export class VSXExtensionsContribution extends AbstractViewContribution<VSXExtensionsViewContainer> implements ColorContribution, FrontendApplicationContribution {
 
-    @inject(VSXExtensionsModel) protected readonly model: VSXExtensionsModel;
-    @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry;
-    @inject(FileDialogService) protected readonly fileDialogService: FileDialogService;
-    @inject(MessageService) protected readonly messageService: MessageService;
-    @inject(LabelProvider) protected readonly labelProvider: LabelProvider;
-    @inject(ClipboardService) protected readonly clipboardService: ClipboardService;
-    @inject(PreferenceService) protected readonly preferenceService: PreferenceService;
-    @inject(OVSXClientProvider) protected readonly clientProvider: OVSXClientProvider;
-    @inject(QuickInputService) protected readonly quickInput: QuickInputService;
+    @inject(VSXExtensionsModel) protected model: VSXExtensionsModel;
+    @inject(CommandRegistry) protected commandRegistry: CommandRegistry;
+    @inject(FileDialogService) protected fileDialogService: FileDialogService;
+    @inject(MessageService) protected messageService: MessageService;
+    @inject(LabelProvider) protected labelProvider: LabelProvider;
+    @inject(ClipboardService) protected clipboardService: ClipboardService;
+    @inject(PreferenceService) protected preferenceService: PreferenceService;
+    @inject(OVSXClientProvider) protected clientProvider: OVSXClientProvider;
+    @inject(OVSXApiFilter) protected vsxApiFilter: OVSXApiFilter;
+    @inject(QuickInputService) protected quickInput: QuickInputService;
 
     constructor() {
         super({
@@ -209,8 +209,8 @@ export class VSXExtensionsContribution extends AbstractViewContribution<VSXExten
         const extensionId = extension.id;
         const currentVersion = extension.version;
         const client = await this.clientProvider();
-        const extensions = await client.getAllVersions(extensionId);
-        const latestCompatible = await client.getLatestCompatibleExtensionVersion(extensionId);
+        const { extensions } = await client.query({ extensionId, includeAllVersions: true });
+        const latestCompatible = this.vsxApiFilter.getLatestCompatibleExtension(extensions);
         let compatibleExtensions: VSXExtensionRaw[] = [];
         let activeItem = undefined;
         if (latestCompatible) {
@@ -283,7 +283,7 @@ export class VSXExtensionsContribution extends AbstractViewContribution<VSXExten
                 const install = nls.localizeByDefault('Install');
                 const showRecommendations = nls.localizeByDefault('Show Recommendations');
                 const userResponse = await this.messageService.info(
-                    nls.localizeByDefault('Do you want to install the recommended extensions for this repository?'),
+                    nls.localize('theia/vsx-registry/recommendedExtensions', 'Do you want to install the recommended extensions for this repository?'),
                     install,
                     showRecommendations
                 );

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

@@ -11,32 +11,47 @@
 // 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
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 import debounce from 'p-debounce';
 import * as markdownit from '@theia/core/shared/markdown-it';
 import * as DOMPurify from '@theia/core/shared/dompurify';
-import { Emitter } from '@theia/core/lib/common/event';
+import { Emitter, Event } 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';
 import { VSXExtension, VSXExtensionFactory } from './vsx-extension';
 import { ProgressService } from '@theia/core/lib/common/progress-service';
 import { VSXExtensionsSearchModel } from './vsx-extensions-search-model';
-import { Deferred } from '@theia/core/lib/common/promise-util';
 import { PreferenceInspectionScope, PreferenceService } from '@theia/core/lib/browser';
 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 { VSXExtensionRaw, VSXResponseError, VSXSearchOptions } from '@theia/ovsx-client/lib/ovsx-types';
 import { OVSXClientProvider } from '../common/ovsx-client-provider';
+import { RequestContext, RequestService } from '@theia/core/shared/@theia/request';
+import { OVSXApiFilter } from '@theia/ovsx-client';
 
 @injectable()
 export class VSXExtensionsModel {
 
+    protected initialized: Promise<void>;
+    /**
+     * Single source for all extensions
+     */
+    protected readonly extensions = new Map<string, VSXExtension>();
     protected readonly onDidChangeEmitter = new Emitter<void>();
-    readonly onDidChange = this.onDidChangeEmitter.event;
+    protected _installed = new Set<string>();
+    protected _recommended = new Set<string>();
+    protected _searchResult = new Set<string>();
+    protected _searchError?: string;
+
+    protected searchCancellationTokenSource = new CancellationTokenSource();
+    protected updateSearchResult = debounce(async () => {
+        const { token } = this.resetSearchCancellationTokenSource();
+        await this.doUpdateSearchResult({ query: this.search.query, includeAllVersions: true }, token);
+    }, 500);
 
     @inject(OVSXClientProvider)
     protected clientProvider: OVSXClientProvider;
@@ -59,11 +74,15 @@ export class VSXExtensionsModel {
     @inject(VSXExtensionsSearchModel)
     readonly search: VSXExtensionsSearchModel;
 
-    protected readonly initialized = new Deferred<void>();
+    @inject(RequestService)
+    protected request: RequestService;
+
+    @inject(OVSXApiFilter)
+    protected vsxApiFilter: OVSXApiFilter;
 
     @postConstruct()
     protected init(): void {
-        this.doInit();
+        this.initialized = this.doInit().catch(console.error);
     }
 
     protected async doInit(): Promise<void> {
@@ -72,7 +91,56 @@ export class VSXExtensionsModel {
             this.initSearchResult(),
             this.initRecommended(),
         ]);
-        this.initialized.resolve();
+    }
+
+    get onDidChange(): Event<void> {
+        return this.onDidChangeEmitter.event;
+    }
+
+    get installed(): IterableIterator<string> {
+        return this._installed.values();
+    }
+
+    get searchError(): string | undefined {
+        return this._searchError;
+    }
+
+    get searchResult(): IterableIterator<string> {
+        return this._searchResult.values();
+    }
+
+    get recommended(): IterableIterator<string> {
+        return this._recommended.values();
+    }
+
+    isInstalled(id: string): boolean {
+        return this._installed.has(id);
+    }
+
+    getExtension(id: string): VSXExtension | undefined {
+        return this.extensions.get(id);
+    }
+
+    resolve(id: string): Promise<VSXExtension> {
+        return this.doChange(async () => {
+            await this.initialized;
+            const extension = await this.refresh(id);
+            if (!extension) {
+                throw new Error(`Failed to resolve ${id} extension.`);
+            }
+            if (extension.readmeUrl) {
+                try {
+                    const rawReadme = RequestContext.asText(await this.request.request({ url: extension.readmeUrl }));
+                    const readme = this.compileReadme(rawReadme);
+                    extension.update({ readme });
+                } catch (e) {
+                    if (!VSXResponseError.is(e) || e.statusCode !== 404) {
+                        console.error(`[${id}]: failed to compile readme, reason:`, e);
+                    }
+                }
+            }
+            return extension;
+        });
     }
 
     protected async initInstalled(): Promise<void> {
@@ -108,37 +176,9 @@ export class VSXExtensionsModel {
         }
     }
 
-    /**
-     * single source of all extensions
-     */
-    protected readonly extensions = new Map<string, VSXExtension>();
-
-    protected _installed = new Set<string>();
-    get installed(): IterableIterator<string> {
-        return this._installed.values();
-    }
-
-    isInstalled(id: string): boolean {
-        return this._installed.has(id);
-    }
-
-    protected _searchError?: string;
-    get searchError(): string | undefined {
-        return this._searchError;
-    }
-
-    protected _searchResult = new Set<string>();
-    get searchResult(): IterableIterator<string> {
-        return this._searchResult.values();
-    }
-
-    protected _recommended = new Set<string>();
-    get recommended(): IterableIterator<string> {
-        return this._recommended.values();
-    }
-
-    getExtension(id: string): VSXExtension | undefined {
-        return this.extensions.get(id);
+    protected resetSearchCancellationTokenSource(): CancellationTokenSource {
+        this.searchCancellationTokenSource.cancel();
+        return this.searchCancellationTokenSource = new CancellationTokenSource();
     }
 
     protected setExtension(id: string): VSXExtension {
@@ -155,25 +195,18 @@ export class VSXExtensionsModel {
     protected doChange<T>(task: () => Promise<T>, token: CancellationToken = CancellationToken.None): Promise<T | undefined> {
         return this.progressService.withProgress('', 'extensions', async () => {
             if (token && token.isCancellationRequested) {
-                return undefined;
+                return;
             }
             const result = await task();
             if (token && token.isCancellationRequested) {
-                return undefined;
+                return;
             }
-            this.onDidChangeEmitter.fire(undefined);
+            this.onDidChangeEmitter.fire();
             return result;
         });
     }
 
-    protected searchCancellationTokenSource = new CancellationTokenSource();
-    protected updateSearchResult = debounce(() => {
-        this.searchCancellationTokenSource.cancel();
-        this.searchCancellationTokenSource = new CancellationTokenSource();
-        const query = this.search.query;
-        return this.doUpdateSearchResult({ query, includeAllVersions: true }, this.searchCancellationTokenSource.token);
-    }, 500);
-    protected doUpdateSearchResult(param: VSXSearchParam, token: CancellationToken): Promise<void> {
+    protected doUpdateSearchResult(param: VSXSearchOptions, token: CancellationToken): Promise<void> {
         return this.doChange(async () => {
             const searchResult = new Set<string>();
             if (!param.query) {
@@ -188,8 +221,8 @@ export class VSXExtensionsModel {
             }
             for (const data of result.extensions) {
                 const id = data.namespace.toLowerCase() + '.' + data.name.toLowerCase();
-                const extension = client.getLatestCompatibleVersion(data);
-                if (!extension) {
+                const allVersions = this.vsxApiFilter.getLatestCompatibleVersion(data);
+                if (!allVersions) {
                     continue;
                 }
                 this.setExtension(id).update(Object.assign(data, {
@@ -198,7 +231,7 @@ export class VSXExtensionsModel {
                     iconUrl: data.files.icon,
                     readmeUrl: data.files.readme,
                     licenseUrl: data.files.license,
-                    version: extension.version
+                    version: allVersions.version
                 }));
                 searchResult.add(id);
             }
@@ -268,29 +301,6 @@ export class VSXExtensionsModel {
         };
     }
 
-    resolve(id: string): Promise<VSXExtension> {
-        return this.doChange(async () => {
-            await this.initialized.promise;
-            const extension = await this.refresh(id);
-            if (!extension) {
-                throw new Error(`Failed to resolve ${id} extension.`);
-            }
-            if (extension.readmeUrl) {
-                try {
-                    const client = await this.clientProvider();
-                    const rawReadme = await client.fetchText(extension.readmeUrl);
-                    const readme = this.compileReadme(rawReadme);
-                    extension.update({ readme });
-                } catch (e) {
-                    if (!VSXResponseError.is(e) || e.statusCode !== 404) {
-                        console.error(`[${id}]: failed to compile readme, reason:`, e);
-                    }
-                }
-            }
-            return extension;
-        });
-    }
-
     protected compileReadme(readmeMarkdown: string): string {
         const readmeHtml = markdownit({ html: true }).render(readmeMarkdown);
         return DOMPurify.sanitize(readmeHtml);
@@ -303,9 +313,18 @@ export class VSXExtensionsModel {
                 return extension;
             }
             const client = await this.clientProvider();
-            const data = version !== undefined
-                ? await client.getExtension(id, { extensionVersion: version, includeAllVersions: true })
-                : await client.getLatestCompatibleExtensionVersion(id);
+            let data: VSXExtensionRaw | undefined;
+            if (version === undefined) {
+                const { extensions } = await client.query({ extensionId: id, includeAllVersions: true });
+                if (extensions?.length) {
+                    data = this.vsxApiFilter.getLatestCompatibleExtension(extensions);
+                }
+            } else {
+                const { extensions } = await client.query({ extensionId: id, extensionVersion: version, includeAllVersions: true });
+                if (extensions?.length) {
+                    data = extensions?.[0];
+                }
+            }
             if (!data) {
                 return;
             }

package/src/browser/vsx-extensions-search-bar.tsx

@@ -11,7 +11,7 @@
 // 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
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import * as React from '@theia/core/shared/react';

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

@@ -11,7 +11,7 @@
 // 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
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import { injectable } from '@theia/core/shared/inversify';

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

@@ -11,7 +11,7 @@
 // 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
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';

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

@@ -11,7 +11,7 @@
  * 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
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
  *******************************************************************************‚*/
 
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';

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

@@ -11,7 +11,7 @@
 // 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
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import { injectable, interfaces, postConstruct, inject } from '@theia/core/shared/inversify';

package/src/browser/vsx-language-quick-pick-service.ts

@@ -11,7 +11,7 @@
 // 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
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import { LanguageQuickPickItem, LanguageQuickPickService } from '@theia/core/lib/browser/i18n/language-quick-pick-service';

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

@@ -11,7 +11,7 @@
 // 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
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import '../../src/browser/style/index.css';
@@ -33,21 +33,14 @@ import { VSXExtensionsSourceOptions } from './vsx-extensions-source';
 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 { OVSXClientProvider, createOVSXClient } from '../common/ovsx-client-provider';
 import { VSXEnvironment, VSX_ENVIRONMENT_PATH } from '../common/vsx-environment';
-import { RequestService } from '@theia/core/shared/@theia/request';
 import { LanguageQuickPickService } from '@theia/core/lib/browser/i18n/language-quick-pick-service';
 import { VSXLanguageQuickPickService } from './vsx-language-quick-pick-service';
 
-export default new ContainerModule((bind, unbind, _, rebind) => {
-    bind<OVSXClientProvider>(OVSXClientProvider).toDynamicValue(ctx => {
-        const clientPromise = createOVSXClient(ctx.container.get(VSXEnvironment), ctx.container.get(RequestService));
-        return () => clientPromise;
-    }).inSingletonScope();
-    bind(VSXEnvironment).toDynamicValue(
-        ctx => WebSocketConnectionProvider.createProxy(ctx.container, VSX_ENVIRONMENT_PATH)
-    ).inSingletonScope();
-
+export default new ContainerModule((bind, unbind, isBound, rebind) => {
+    bind(VSXEnvironment)
+        .toDynamicValue(ctx => WebSocketConnectionProvider.createProxy(ctx.container, VSX_ENVIRONMENT_PATH))
+        .inSingletonScope();
     bind(VSXExtension).toSelf();
     bind(VSXExtensionFactory).toFactory(ctx => (option: VSXExtensionOptions) => {
         const child = ctx.container.createChild();

package/src/common/index.ts

@@ -0,0 +1,19 @@
+// *****************************************************************************
+// Copyright (C) 2023 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
+// *****************************************************************************
+
+export { OVSXClientProvider, OVSXUrlResolver } from './ovsx-client-provider';
+export { VSXEnvironment } from './vsx-environment';
+export { VSXExtensionUri } from './vsx-extension-uri';

package/src/common/ovsx-client-provider.ts

@@ -11,20 +11,25 @@
 // 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
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
+import { MaybePromise } from '@theia/core/lib/common';
 import { RequestService } from '@theia/core/shared/@theia/request';
-import { OVSXClient } from '@theia/ovsx-client';
+import type { interfaces } from '@theia/core/shared/inversify';
+import { OVSXClient, OVSXHttpClient } from '@theia/ovsx-client';
 import { VSXEnvironment } from './vsx-environment';
 
-export const OVSXClientProvider = Symbol('OVSXClientProvider');
-export type OVSXClientProvider = () => Promise<OVSXClient>;
+export const OVSXUrlResolver = Symbol('OVSXUrlResolver') as symbol & interfaces.Abstract<OVSXUrlResolver>;
+export type OVSXUrlResolver = (value: string) => MaybePromise<string>;
 
+export const OVSXClientProvider = Symbol('OVSXClientProvider') as symbol & interfaces.Abstract<OVSXClientProvider>;
+export type OVSXClientProvider = () => MaybePromise<OVSXClient>;
+
+/**
+ * @deprecated since 1.32.0
+ */
 export async function createOVSXClient(vsxEnvironment: VSXEnvironment, requestService: RequestService): Promise<OVSXClient> {
-    const [apiVersion, apiUrl] = await Promise.all([
-        vsxEnvironment.getVscodeApiVersion(),
-        vsxEnvironment.getRegistryApiUri()
-    ]);
-    return new OVSXClient({ apiVersion, apiUrl: apiUrl.toString() }, requestService);
+    const apiUrl = await vsxEnvironment.getRegistryApiUri();
+    return new OVSXHttpClient(apiUrl, requestService);
 }

package/src/common/vsx-environment.ts

@@ -11,9 +11,11 @@
 // 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
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
+import type { OVSXRouterConfig } from '@theia/ovsx-client';
+
 export const VSX_ENVIRONMENT_PATH = '/services/vsx-environment';
 
 export const VSXEnvironment = Symbol('VSXEnvironment');
@@ -21,4 +23,5 @@ export interface VSXEnvironment {
     getRegistryUri(): Promise<string>;
     getRegistryApiUri(): Promise<string>;
     getVscodeApiVersion(): Promise<string>;
+    getOvsxRouterConfig?(): Promise<OVSXRouterConfig | undefined>;
 }

package/src/common/vsx-extension-uri.ts

@@ -11,7 +11,7 @@
 // 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
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import { VSCodeExtensionUri as VSXExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';

package/src/common/vsx-registry-common-module.ts

@@ -0,0 +1,63 @@
+// *****************************************************************************
+// Copyright (C) 2023 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 { ContainerModule } from '@theia/core/shared/inversify';
+import { OVSXClientProvider, OVSXUrlResolver } from '../common';
+import { RequestService } from '@theia/core/shared/@theia/request';
+import { ExtensionIdMatchesFilterFactory, OVSXApiFilter, OVSXApiFilterImpl, OVSXClient, OVSXHttpClient, OVSXRouterClient, RequestContainsFilterFactory } from '@theia/ovsx-client';
+import { VSXEnvironment } from './vsx-environment';
+
+export default new ContainerModule(bind => {
+    bind(OVSXUrlResolver)
+        .toFunction(url => url);
+    bind(OVSXClientProvider)
+        .toDynamicValue(ctx => {
+            const vsxEnvironment = ctx.container.get<VSXEnvironment>(VSXEnvironment);
+            const requestService = ctx.container.get<RequestService>(RequestService);
+            const urlResolver = ctx.container.get(OVSXUrlResolver);
+            const clientPromise = Promise
+                .all([
+                    vsxEnvironment.getRegistryApiUri(),
+                    vsxEnvironment.getOvsxRouterConfig?.(),
+                ])
+                .then<OVSXClient>(async ([apiUrl, ovsxRouterConfig]) => {
+                    if (ovsxRouterConfig) {
+                        const clientFactory = OVSXHttpClient.createClientFactory(requestService);
+                        return OVSXRouterClient.FromConfig(
+                            ovsxRouterConfig,
+                            async url => clientFactory(await urlResolver(url)),
+                            [RequestContainsFilterFactory, ExtensionIdMatchesFilterFactory]
+                        );
+                    }
+                    return new OVSXHttpClient(
+                        await urlResolver(apiUrl),
+                        requestService
+                    );
+                });
+            // reuse the promise for subsequent calls to this provider
+            return () => clientPromise;
+        })
+        .inSingletonScope();
+    bind(OVSXApiFilter)
+        .toDynamicValue(ctx => {
+            const vsxEnvironment = ctx.container.get<VSXEnvironment>(VSXEnvironment);
+            const apiFilter = new OVSXApiFilterImpl('-- temporary invalid version value --');
+            vsxEnvironment.getVscodeApiVersion()
+                .then(apiVersion => apiFilter.supportedApiVersion = apiVersion);
+            return apiFilter;
+        })
+        .inSingletonScope();
+});

package/src/node/vsx-cli.ts

@@ -0,0 +1,38 @@
+// *****************************************************************************
+// Copyright (C) 2023 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 { CliContribution } from '@theia/core/lib/node';
+import { injectable } from '@theia/core/shared/inversify';
+import { Argv } from '@theia/core/shared/yargs';
+import { OVSXRouterConfig } from '@theia/ovsx-client';
+import * as fs from 'fs';
+
+@injectable()
+export class VsxCli implements CliContribution {
+
+    ovsxRouterConfig: OVSXRouterConfig | undefined;
+
+    configure(conf: Argv<{}>): void {
+        conf.option('ovsx-router-config', { description: 'JSON configuration file for the OVSX router client', type: 'string' });
+    }
+
+    async setArguments(args: Record<string, unknown>): Promise<void> {
+        const { 'ovsx-router-config': ovsxRouterConfig } = args;
+        if (typeof ovsxRouterConfig === 'string') {
+            this.ovsxRouterConfig = JSON.parse(await fs.promises.readFile(ovsxRouterConfig, 'utf8'));
+        }
+    }
+}