@theia/vsx-registry 1.45.1 → 1.46.0-next.72

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

@@ -1,106 +1,108 @@
-// *****************************************************************************
-// 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import '../../src/browser/style/index.css';
-
-import { ContainerModule } from '@theia/core/shared/inversify';
-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';
-import { VSXExtensionsModel } from './vsx-extensions-model';
-import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
-import { VSXExtensionsWidget, VSXExtensionsWidgetOptions } from './vsx-extensions-widget';
-import { VSXExtensionFactory, VSXExtension, VSXExtensionOptions } from './vsx-extension';
-import { VSXExtensionEditor } from './vsx-extension-editor';
-import { VSXExtensionEditorManager } from './vsx-extension-editor-manager';
-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 { VSXEnvironment, VSX_ENVIRONMENT_PATH } from '../common/vsx-environment';
-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, 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();
-        child.bind(VSXExtensionOptions).toConstantValue(option);
-        return child.get(VSXExtension);
-    });
-    bind(VSXExtensionsModel).toSelf().inSingletonScope();
-
-    bind(VSXExtensionEditor).toSelf();
-    bind(WidgetFactory).toDynamicValue(ctx => ({
-        id: VSXExtensionEditor.ID,
-        createWidget: async (options: VSXExtensionOptions) => {
-            const extension = await ctx.container.get(VSXExtensionsModel).resolve(options.id);
-            const child = ctx.container.createChild();
-            child.bind(VSXExtension).toConstantValue(extension);
-            return child.get(VSXExtensionEditor);
-        }
-    })).inSingletonScope();
-    bind(VSXExtensionEditorManager).toSelf().inSingletonScope();
-    bind(OpenHandler).toService(VSXExtensionEditorManager);
-
-    bind(WidgetFactory).toDynamicValue(({ container }) => ({
-        id: VSXExtensionsWidget.ID,
-        createWidget: async (options: VSXExtensionsWidgetOptions) => VSXExtensionsWidget.createWidget(container, options)
-    })).inSingletonScope();
-    bind(WidgetFactory).toDynamicValue(ctx => ({
-        id: VSXExtensionsViewContainer.ID,
-        createWidget: async () => {
-            const child = ctx.container.createChild();
-            child.bind(ViewContainerIdentifier).toConstantValue({
-                id: VSXExtensionsViewContainer.ID,
-                progressLocationId: 'extensions'
-            });
-            child.bind(VSXExtensionsViewContainer).toSelf();
-            const viewContainer = child.get(VSXExtensionsViewContainer);
-            const widgetManager = child.get(WidgetManager);
-            for (const id of [
-                VSXExtensionsSourceOptions.SEARCH_RESULT,
-                VSXExtensionsSourceOptions.RECOMMENDED,
-                VSXExtensionsSourceOptions.INSTALLED,
-                VSXExtensionsSourceOptions.BUILT_IN,
-            ]) {
-                const widget = await widgetManager.getOrCreateWidget(VSXExtensionsWidget.ID, { id });
-                viewContainer.addWidget(widget, {
-                    initiallyCollapsed: id === VSXExtensionsSourceOptions.BUILT_IN
-                });
-            }
-            return viewContainer;
-        }
-    })).inSingletonScope();
-
-    bind(VSXExtensionsSearchModel).toSelf().inSingletonScope();
-    bind(VSXExtensionsSearchBar).toSelf().inSingletonScope();
-
-    rebind(LanguageQuickPickService).to(VSXLanguageQuickPickService).inSingletonScope();
-
-    bindViewContribution(bind, VSXExtensionsContribution);
-    bind(FrontendApplicationContribution).toService(VSXExtensionsContribution);
-    bind(ColorContribution).toService(VSXExtensionsContribution);
-
-    bindExtensionPreferences(bind);
-    bindPreferenceProviderOverrides(bind, unbind);
-});
+// *****************************************************************************
+// 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import '../../src/browser/style/index.css';
+
+import { ContainerModule } from '@theia/core/shared/inversify';
+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';
+import { VSXExtensionsModel } from './vsx-extensions-model';
+import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
+import { VSXExtensionsWidget, VSXExtensionsWidgetOptions } from './vsx-extensions-widget';
+import { VSXExtensionFactory, VSXExtension, VSXExtensionOptions } from './vsx-extension';
+import { VSXExtensionEditor } from './vsx-extension-editor';
+import { VSXExtensionEditorManager } from './vsx-extension-editor-manager';
+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 { bindVsxExtensionsPreferences } from './vsx-extensions-preferences';
+import { VSXEnvironment, VSX_ENVIRONMENT_PATH } from '../common/vsx-environment';
+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, 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();
+        child.bind(VSXExtensionOptions).toConstantValue(option);
+        return child.get(VSXExtension);
+    });
+    bind(VSXExtensionsModel).toSelf().inSingletonScope();
+
+    bind(VSXExtensionEditor).toSelf();
+    bind(WidgetFactory).toDynamicValue(ctx => ({
+        id: VSXExtensionEditor.ID,
+        createWidget: async (options: VSXExtensionOptions) => {
+            const extension = await ctx.container.get(VSXExtensionsModel).resolve(options.id);
+            const child = ctx.container.createChild();
+            child.bind(VSXExtension).toConstantValue(extension);
+            return child.get(VSXExtensionEditor);
+        }
+    })).inSingletonScope();
+    bind(VSXExtensionEditorManager).toSelf().inSingletonScope();
+    bind(OpenHandler).toService(VSXExtensionEditorManager);
+
+    bind(WidgetFactory).toDynamicValue(({ container }) => ({
+        id: VSXExtensionsWidget.ID,
+        createWidget: async (options: VSXExtensionsWidgetOptions) => VSXExtensionsWidget.createWidget(container, options)
+    })).inSingletonScope();
+    bind(WidgetFactory).toDynamicValue(ctx => ({
+        id: VSXExtensionsViewContainer.ID,
+        createWidget: async () => {
+            const child = ctx.container.createChild();
+            child.bind(ViewContainerIdentifier).toConstantValue({
+                id: VSXExtensionsViewContainer.ID,
+                progressLocationId: 'extensions'
+            });
+            child.bind(VSXExtensionsViewContainer).toSelf();
+            const viewContainer = child.get(VSXExtensionsViewContainer);
+            const widgetManager = child.get(WidgetManager);
+            for (const id of [
+                VSXExtensionsSourceOptions.SEARCH_RESULT,
+                VSXExtensionsSourceOptions.RECOMMENDED,
+                VSXExtensionsSourceOptions.INSTALLED,
+                VSXExtensionsSourceOptions.BUILT_IN,
+            ]) {
+                const widget = await widgetManager.getOrCreateWidget(VSXExtensionsWidget.ID, { id });
+                viewContainer.addWidget(widget, {
+                    initiallyCollapsed: id === VSXExtensionsSourceOptions.BUILT_IN
+                });
+            }
+            return viewContainer;
+        }
+    })).inSingletonScope();
+
+    bind(VSXExtensionsSearchModel).toSelf().inSingletonScope();
+    bind(VSXExtensionsSearchBar).toSelf().inSingletonScope();
+
+    rebind(LanguageQuickPickService).to(VSXLanguageQuickPickService).inSingletonScope();
+
+    bindViewContribution(bind, VSXExtensionsContribution);
+    bind(FrontendApplicationContribution).toService(VSXExtensionsContribution);
+    bind(ColorContribution).toService(VSXExtensionsContribution);
+
+    bindExtensionPreferences(bind);
+    bindPreferenceProviderOverrides(bind, unbind);
+    bindVsxExtensionsPreferences(bind);
+});

package/src/common/index.ts

@@ -1,19 +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';
+// *****************************************************************************
+// 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

@@ -1,35 +1,35 @@
-// *****************************************************************************
-// 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 { MaybePromise } from '@theia/core/lib/common';
-import { RequestService } from '@theia/core/shared/@theia/request';
-import type { interfaces } from '@theia/core/shared/inversify';
-import { OVSXClient, OVSXHttpClient } from '@theia/ovsx-client';
-import { VSXEnvironment } from './vsx-environment';
-
-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 apiUrl = await vsxEnvironment.getRegistryApiUri();
-    return new OVSXHttpClient(apiUrl, requestService);
-}
+// *****************************************************************************
+// 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 { MaybePromise } from '@theia/core/lib/common';
+import { RequestService } from '@theia/core/shared/@theia/request';
+import type { interfaces } from '@theia/core/shared/inversify';
+import { OVSXClient, OVSXHttpClient } from '@theia/ovsx-client';
+import { VSXEnvironment } from './vsx-environment';
+
+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 apiUrl = await vsxEnvironment.getRegistryApiUri();
+    return new OVSXHttpClient(apiUrl, requestService);
+}

package/src/common/vsx-environment.ts

@@ -1,27 +1,27 @@
-// *****************************************************************************
-// 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 type { OVSXRouterConfig } from '@theia/ovsx-client';
-
-export const VSX_ENVIRONMENT_PATH = '/services/vsx-environment';
-
-export const VSXEnvironment = Symbol('VSXEnvironment');
-export interface VSXEnvironment {
-    getRegistryUri(): Promise<string>;
-    getRegistryApiUri(): Promise<string>;
-    getVscodeApiVersion(): Promise<string>;
-    getOvsxRouterConfig?(): Promise<OVSXRouterConfig | undefined>;
-}
+// *****************************************************************************
+// 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 type { OVSXRouterConfig } from '@theia/ovsx-client';
+
+export const VSX_ENVIRONMENT_PATH = '/services/vsx-environment';
+
+export const VSXEnvironment = Symbol('VSXEnvironment');
+export interface VSXEnvironment {
+    getRegistryUri(): Promise<string>;
+    getRegistryApiUri(): Promise<string>;
+    getVscodeApiVersion(): Promise<string>;
+    getOvsxRouterConfig?(): Promise<OVSXRouterConfig | undefined>;
+}

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

@@ -1,20 +1,20 @@
-// *****************************************************************************
-// 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { VSCodeExtensionUri as VSXExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';
-/** @deprecated since 1.25.0. Import `VSCodeExtensionUri from `plugin-ext-vscode` package instead. */
-export { VSXExtensionUri };
-
+// *****************************************************************************
+// 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { VSCodeExtensionUri as VSXExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';
+/** @deprecated since 1.25.0. Import `VSCodeExtensionUri from `plugin-ext-vscode` package instead. */
+export { VSXExtensionUri };
+

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

@@ -1,63 +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();
-});
+// *****************************************************************************
+// 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();
+});