@theia/ovsx-client 1.53.0-next.55 → 1.53.0-next.64

package/README.md

@@ -1,61 +1,61 @@
-<div align='center'>
-
-<br />
-
-<img src='https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia.svg?sanitize=true' alt='theia-ext-logo' width='100px' />
-
-<h2>ECLIPSE THEIA - OVSX CLIENT</h2>
-
-<hr />
-
-</div>
-
-## Description
-
-The `@theia/ovsx-client` package is used to interact with `open-vsx` through its REST APIs.
-The package allows clients to fetch extensions and their metadata, search the registry, and
-includes the necessary logic to determine compatibility based on a provided supported API version.
-
-Note that this client only supports a subset of the whole OpenVSX API, only what's relevant to
-clients like Theia applications.
-
-### `OVSXRouterClient`
-
-This class is an `OVSXClient` that can delegate requests to sub-clients based on some configuration (`OVSXRouterConfig`).
-
-```jsonc
-{
-    "registries": {
-        // `[Alias]: URL` pairs to avoid copy pasting URLs down the config
-    },
-    "use": [
-        // List of aliases/URLs to use when no filtering was applied.
-    ],
-    "rules": [
-        {
-            "ifRequestContains": "regex matched against various fields in requests",
-            "ifExtensionIdMatches": "regex matched against the extension id (without version)",
-            "use": [/*
-                List of registries to forward the request to when all the
-                conditions are matched.
-
-                `null` or `[]` means to not forward the request anywhere.
-            */]
-        }
-    ]
-}
-```
-
-## Additional Information
-
-- [Theia - GitHub](https://github.com/eclipse-theia/theia)
-- [Theia - Website](https://theia-ide.org/)
-
-## License
-
-- [Eclipse Public License 2.0](http://www.eclipse.org/legal/epl-2.0/)
-- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
-
-## Trademark
-"Theia" is a trademark of the Eclipse Foundation
-https://www.eclipse.org/theia
+<div align='center'>
+
+<br />
+
+<img src='https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia.svg?sanitize=true' alt='theia-ext-logo' width='100px' />
+
+<h2>ECLIPSE THEIA - OVSX CLIENT</h2>
+
+<hr />
+
+</div>
+
+## Description
+
+The `@theia/ovsx-client` package is used to interact with `open-vsx` through its REST APIs.
+The package allows clients to fetch extensions and their metadata, search the registry, and
+includes the necessary logic to determine compatibility based on a provided supported API version.
+
+Note that this client only supports a subset of the whole OpenVSX API, only what's relevant to
+clients like Theia applications.
+
+### `OVSXRouterClient`
+
+This class is an `OVSXClient` that can delegate requests to sub-clients based on some configuration (`OVSXRouterConfig`).
+
+```jsonc
+{
+    "registries": {
+        // `[Alias]: URL` pairs to avoid copy pasting URLs down the config
+    },
+    "use": [
+        // List of aliases/URLs to use when no filtering was applied.
+    ],
+    "rules": [
+        {
+            "ifRequestContains": "regex matched against various fields in requests",
+            "ifExtensionIdMatches": "regex matched against the extension id (without version)",
+            "use": [/*
+                List of registries to forward the request to when all the
+                conditions are matched.
+
+                `null` or `[]` means to not forward the request anywhere.
+            */]
+        }
+    ]
+}
+```
+
+## Additional Information
+
+- [Theia - GitHub](https://github.com/eclipse-theia/theia)
+- [Theia - Website](https://theia-ide.org/)
+
+## License
+
+- [Eclipse Public License 2.0](http://www.eclipse.org/legal/epl-2.0/)
+- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
+
+## Trademark
+"Theia" is a trademark of the Eclipse Foundation
+https://www.eclipse.org/theia

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/ovsx-client",
-  "version": "1.53.0-next.55+d1a989a68c",
+  "version": "1.53.0-next.64+23b351d26",
   "description": "Theia Open-VSX Client",
   "publishConfig": {
     "access": "public"
@@ -29,10 +29,10 @@
     "watch": "theiaext watch"
   },
   "dependencies": {
-    "@theia/request": "1.53.0-next.55+d1a989a68c",
+    "@theia/request": "1.53.0-next.64+23b351d26",
     "limiter": "^2.1.0",
     "semver": "^7.5.4",
     "tslib": "^2.6.2"
   },
-  "gitHead": "d1a989a68c1b5ec1f9098e9126653c6346844769"
+  "gitHead": "23b351d26346a2b5d6aca3ee81fba59c056132f7"
 }

package/src/index.ts

@@ -1,22 +1,22 @@
-// *****************************************************************************
-// 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
-// *****************************************************************************
-
-export { OVSXApiFilter, OVSXApiFilterImpl, OVSXApiFilterProvider } from './ovsx-api-filter';
-export { OVSXHttpClient, OVSX_RATE_LIMIT } from './ovsx-http-client';
-export { OVSXMockClient } from './ovsx-mock-client';
-export { OVSXRouterClient, OVSXRouterConfig, OVSXRouterFilterFactory as FilterFactory } from './ovsx-router-client';
-export * from './ovsx-router-filters';
-export * from './ovsx-types';
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+export { OVSXApiFilter, OVSXApiFilterImpl, OVSXApiFilterProvider } from './ovsx-api-filter';
+export { OVSXHttpClient, OVSX_RATE_LIMIT } from './ovsx-http-client';
+export { OVSXMockClient } from './ovsx-mock-client';
+export { OVSXRouterClient, OVSXRouterConfig, OVSXRouterFilterFactory as FilterFactory } from './ovsx-router-client';
+export * from './ovsx-router-filters';
+export * from './ovsx-types';

package/src/ovsx-api-filter.ts

@@ -1,140 +1,140 @@
-// *****************************************************************************
-// 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 * as semver from 'semver';
-import { OVSXClient, VSXAllVersions, VSXBuiltinNamespaces, VSXExtensionRaw, VSXQueryOptions, VSXSearchEntry } from './ovsx-types';
-
-export const OVSXApiFilterProvider = Symbol('OVSXApiFilterProvider');
-
-export type OVSXApiFilterProvider = () => Promise<OVSXApiFilter>;
-
-export const OVSXApiFilter = Symbol('OVSXApiFilter');
-/**
- * Filter various data types based on a pre-defined supported VS Code API version.
- */
-export interface OVSXApiFilter {
-    supportedApiVersion: string;
-    findLatestCompatibleExtension(query: VSXQueryOptions): Promise<VSXExtensionRaw | undefined>;
-    /**
-     * Get the latest compatible extension version:
-     * - A builtin extension is fetched based on the extension version which matches the API.
-     * - An extension satisfies compatibility if its `engines.vscode` version is supported.
-     *
-     * @param extensionId the extension id.
-     * @returns the data for the latest compatible extension version if available, else `undefined`.
-     */
-    getLatestCompatibleExtension(extensions: VSXExtensionRaw[]): VSXExtensionRaw | undefined;
-    getLatestCompatibleVersion(searchEntry: VSXSearchEntry): VSXAllVersions | undefined;
-}
-
-export class OVSXApiFilterImpl implements OVSXApiFilter {
-
-    constructor(
-        public client: OVSXClient,
-        public supportedApiVersion: string
-    ) { }
-
-    async findLatestCompatibleExtension(query: VSXQueryOptions): Promise<VSXExtensionRaw | undefined> {
-        const targetPlatform = query.targetPlatform;
-        if (!targetPlatform) {
-            return this.queryLatestCompatibleExtension(query);
-        }
-        const latestWithTargetPlatform = await this.queryLatestCompatibleExtension(query);
-        let latestUniversal: VSXExtensionRaw | undefined;
-        if (targetPlatform !== 'universal' && targetPlatform !== 'web') {
-            // Additionally query the universal version, as there might be a newer one available
-            latestUniversal = await this.queryLatestCompatibleExtension({ ...query, targetPlatform: 'universal' });
-        }
-        if (latestWithTargetPlatform && latestUniversal) {
-            // Prefer the version with the target platform if it's greater or equal to the universal version
-            return this.versionGreaterThanOrEqualTo(latestWithTargetPlatform.version, latestUniversal.version) ? latestWithTargetPlatform : latestUniversal;
-        }
-        return latestWithTargetPlatform ?? latestUniversal;
-    }
-
-    protected async queryLatestCompatibleExtension(query: VSXQueryOptions): Promise<VSXExtensionRaw | undefined> {
-        let offset = 0;
-        let size = 5;
-        let loop = true;
-        while (loop) {
-            const queryOptions: VSXQueryOptions = {
-                ...query,
-                offset,
-                size // there is a great chance that the newest version will work
-            };
-            const results = await this.client.query(queryOptions);
-            const compatibleExtension = this.getLatestCompatibleExtension(results.extensions);
-            if (compatibleExtension) {
-                return compatibleExtension;
-            }
-            // Adjust offset by the amount of returned extensions
-            offset += results.extensions.length;
-            // Continue querying if there are more extensions available
-            loop = results.totalSize > offset;
-            // Adjust the size to fetch more extensions next time
-            size = Math.min(size * 2, 100);
-        }
-        return undefined;
-    }
-
-    getLatestCompatibleExtension(extensions: VSXExtensionRaw[]): VSXExtensionRaw | undefined {
-        if (extensions.length === 0) {
-            return;
-        } else if (this.isBuiltinNamespace(extensions[0].namespace.toLowerCase())) {
-            return extensions.find(extension => this.versionGreaterThanOrEqualTo(this.supportedApiVersion, extension.version));
-        } else {
-            return extensions.find(extension => this.supportedVscodeApiSatisfies(extension.engines?.vscode ?? '*'));
-        }
-    }
-
-    getLatestCompatibleVersion(searchEntry: VSXSearchEntry): VSXAllVersions | undefined {
-        function getLatestCompatibleVersion(predicate: (allVersions: VSXAllVersions) => boolean): VSXAllVersions | undefined {
-            if (searchEntry.allVersions) {
-                return searchEntry.allVersions.find(predicate);
-            }
-            // If the allVersions field is missing then try to use the
-            // searchEntry as VSXAllVersions and check if it's compatible:
-            if (predicate(searchEntry)) {
-                return searchEntry;
-            }
-        }
-        if (this.isBuiltinNamespace(searchEntry.namespace)) {
-            return getLatestCompatibleVersion(allVersions => this.versionGreaterThanOrEqualTo(this.supportedApiVersion, allVersions.version));
-        } else {
-            return getLatestCompatibleVersion(allVersions => this.supportedVscodeApiSatisfies(allVersions.engines?.vscode ?? '*'));
-        }
-    }
-
-    protected isBuiltinNamespace(namespace: string): boolean {
-        return VSXBuiltinNamespaces.is(namespace);
-    }
-
-    /**
-     * @returns `a >= b`
-     */
-    protected versionGreaterThanOrEqualTo(a: string, b: string): boolean {
-        const versionA = semver.clean(a);
-        const versionB = semver.clean(b);
-        if (!versionA || !versionB) {
-            return false;
-        }
-        return semver.gte(versionA, versionB);
-    }
-
-    protected supportedVscodeApiSatisfies(vscodeApiRange: string): boolean {
-        return semver.satisfies(this.supportedApiVersion, vscodeApiRange);
-    }
-}
+// *****************************************************************************
+// 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 * as semver from 'semver';
+import { OVSXClient, VSXAllVersions, VSXBuiltinNamespaces, VSXExtensionRaw, VSXQueryOptions, VSXSearchEntry } from './ovsx-types';
+
+export const OVSXApiFilterProvider = Symbol('OVSXApiFilterProvider');
+
+export type OVSXApiFilterProvider = () => Promise<OVSXApiFilter>;
+
+export const OVSXApiFilter = Symbol('OVSXApiFilter');
+/**
+ * Filter various data types based on a pre-defined supported VS Code API version.
+ */
+export interface OVSXApiFilter {
+    supportedApiVersion: string;
+    findLatestCompatibleExtension(query: VSXQueryOptions): Promise<VSXExtensionRaw | undefined>;
+    /**
+     * Get the latest compatible extension version:
+     * - A builtin extension is fetched based on the extension version which matches the API.
+     * - An extension satisfies compatibility if its `engines.vscode` version is supported.
+     *
+     * @param extensionId the extension id.
+     * @returns the data for the latest compatible extension version if available, else `undefined`.
+     */
+    getLatestCompatibleExtension(extensions: VSXExtensionRaw[]): VSXExtensionRaw | undefined;
+    getLatestCompatibleVersion(searchEntry: VSXSearchEntry): VSXAllVersions | undefined;
+}
+
+export class OVSXApiFilterImpl implements OVSXApiFilter {
+
+    constructor(
+        public client: OVSXClient,
+        public supportedApiVersion: string
+    ) { }
+
+    async findLatestCompatibleExtension(query: VSXQueryOptions): Promise<VSXExtensionRaw | undefined> {
+        const targetPlatform = query.targetPlatform;
+        if (!targetPlatform) {
+            return this.queryLatestCompatibleExtension(query);
+        }
+        const latestWithTargetPlatform = await this.queryLatestCompatibleExtension(query);
+        let latestUniversal: VSXExtensionRaw | undefined;
+        if (targetPlatform !== 'universal' && targetPlatform !== 'web') {
+            // Additionally query the universal version, as there might be a newer one available
+            latestUniversal = await this.queryLatestCompatibleExtension({ ...query, targetPlatform: 'universal' });
+        }
+        if (latestWithTargetPlatform && latestUniversal) {
+            // Prefer the version with the target platform if it's greater or equal to the universal version
+            return this.versionGreaterThanOrEqualTo(latestWithTargetPlatform.version, latestUniversal.version) ? latestWithTargetPlatform : latestUniversal;
+        }
+        return latestWithTargetPlatform ?? latestUniversal;
+    }
+
+    protected async queryLatestCompatibleExtension(query: VSXQueryOptions): Promise<VSXExtensionRaw | undefined> {
+        let offset = 0;
+        let size = 5;
+        let loop = true;
+        while (loop) {
+            const queryOptions: VSXQueryOptions = {
+                ...query,
+                offset,
+                size // there is a great chance that the newest version will work
+            };
+            const results = await this.client.query(queryOptions);
+            const compatibleExtension = this.getLatestCompatibleExtension(results.extensions);
+            if (compatibleExtension) {
+                return compatibleExtension;
+            }
+            // Adjust offset by the amount of returned extensions
+            offset += results.extensions.length;
+            // Continue querying if there are more extensions available
+            loop = results.totalSize > offset;
+            // Adjust the size to fetch more extensions next time
+            size = Math.min(size * 2, 100);
+        }
+        return undefined;
+    }
+
+    getLatestCompatibleExtension(extensions: VSXExtensionRaw[]): VSXExtensionRaw | undefined {
+        if (extensions.length === 0) {
+            return;
+        } else if (this.isBuiltinNamespace(extensions[0].namespace.toLowerCase())) {
+            return extensions.find(extension => this.versionGreaterThanOrEqualTo(this.supportedApiVersion, extension.version));
+        } else {
+            return extensions.find(extension => this.supportedVscodeApiSatisfies(extension.engines?.vscode ?? '*'));
+        }
+    }
+
+    getLatestCompatibleVersion(searchEntry: VSXSearchEntry): VSXAllVersions | undefined {
+        function getLatestCompatibleVersion(predicate: (allVersions: VSXAllVersions) => boolean): VSXAllVersions | undefined {
+            if (searchEntry.allVersions) {
+                return searchEntry.allVersions.find(predicate);
+            }
+            // If the allVersions field is missing then try to use the
+            // searchEntry as VSXAllVersions and check if it's compatible:
+            if (predicate(searchEntry)) {
+                return searchEntry;
+            }
+        }
+        if (this.isBuiltinNamespace(searchEntry.namespace)) {
+            return getLatestCompatibleVersion(allVersions => this.versionGreaterThanOrEqualTo(this.supportedApiVersion, allVersions.version));
+        } else {
+            return getLatestCompatibleVersion(allVersions => this.supportedVscodeApiSatisfies(allVersions.engines?.vscode ?? '*'));
+        }
+    }
+
+    protected isBuiltinNamespace(namespace: string): boolean {
+        return VSXBuiltinNamespaces.is(namespace);
+    }
+
+    /**
+     * @returns `a >= b`
+     */
+    protected versionGreaterThanOrEqualTo(a: string, b: string): boolean {
+        const versionA = semver.clean(a);
+        const versionB = semver.clean(b);
+        if (!versionA || !versionB) {
+            return false;
+        }
+        return semver.gte(versionA, versionB);
+    }
+
+    protected supportedVscodeApiSatisfies(vscodeApiRange: string): boolean {
+        return semver.satisfies(this.supportedApiVersion, vscodeApiRange);
+    }
+}

package/src/ovsx-http-client.ts

@@ -1,89 +1,89 @@
-// *****************************************************************************
-// 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 { OVSXClient, VSXQueryOptions, VSXQueryResult, VSXSearchOptions, VSXSearchResult } from './ovsx-types';
-import { RequestContext, RequestService } from '@theia/request';
-import { RateLimiter } from 'limiter';
-
-export const OVSX_RATE_LIMIT = 15;
-
-export class OVSXHttpClient implements OVSXClient {
-
-    /**
-     * @param requestService
-     * @returns factory that will cache clients based on the requested input URL.
-     */
-    static createClientFactory(requestService: RequestService, rateLimiter?: RateLimiter): (url: string) => OVSXClient {
-        // eslint-disable-next-line no-null/no-null
-        const cachedClients: Record<string, OVSXClient> = Object.create(null);
-        return url => cachedClients[url] ??= new this(url, requestService, rateLimiter);
-    }
-
-    constructor(
-        protected vsxRegistryUrl: string,
-        protected requestService: RequestService,
-        protected rateLimiter = new RateLimiter({ tokensPerInterval: OVSX_RATE_LIMIT, interval: 'second' })
-    ) { }
-
-    search(searchOptions?: VSXSearchOptions): Promise<VSXSearchResult> {
-        return this.requestJson(this.buildUrl('api/-/search', searchOptions));
-    }
-
-    query(queryOptions?: VSXQueryOptions): Promise<VSXQueryResult> {
-        return this.requestJson(this.buildUrl('api/v2/-/query', queryOptions));
-    }
-
-    protected async requestJson<R>(url: string): Promise<R> {
-        const attempts = 5;
-        for (let i = 0; i < attempts; i++) {
-            // Use 1, 2, 4, 8, 16 tokens for each attempt
-            const tokenCount = Math.pow(2, i);
-            await this.rateLimiter.removeTokens(tokenCount);
-            const context = await this.requestService.request({
-                url,
-                headers: { 'Accept': 'application/json' }
-            });
-            if (context.res.statusCode === 429) {
-                console.warn('OVSX rate limit exceeded. Consider reducing the rate limit.');
-                // If there are still more attempts left, retry the request with a higher token count
-                if (i < attempts - 1) {
-                    continue;
-                }
-            }
-            return RequestContext.asJson<R>(context);
-        }
-        throw new Error('Failed to fetch data from OVSX.');
-    }
-
-    protected buildUrl(url: string, query?: object): string {
-        return new URL(`${url}${this.buildQueryString(query)}`, this.vsxRegistryUrl).toString();
-    }
-
-    protected buildQueryString(searchQuery?: object): string {
-        if (!searchQuery) {
-            return '';
-        }
-        let queryString = '';
-        for (const [key, value] of Object.entries(searchQuery)) {
-            if (typeof value === 'string') {
-                queryString += `&${key}=${encodeURIComponent(value)}`;
-            } else if (typeof value === 'boolean' || typeof value === 'number') {
-                queryString += `&${key}=${value}`;
-            }
-        }
-        return queryString && '?' + queryString.slice(1);
-    }
-}
+// *****************************************************************************
+// 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 { OVSXClient, VSXQueryOptions, VSXQueryResult, VSXSearchOptions, VSXSearchResult } from './ovsx-types';
+import { RequestContext, RequestService } from '@theia/request';
+import { RateLimiter } from 'limiter';
+
+export const OVSX_RATE_LIMIT = 15;
+
+export class OVSXHttpClient implements OVSXClient {
+
+    /**
+     * @param requestService
+     * @returns factory that will cache clients based on the requested input URL.
+     */
+    static createClientFactory(requestService: RequestService, rateLimiter?: RateLimiter): (url: string) => OVSXClient {
+        // eslint-disable-next-line no-null/no-null
+        const cachedClients: Record<string, OVSXClient> = Object.create(null);
+        return url => cachedClients[url] ??= new this(url, requestService, rateLimiter);
+    }
+
+    constructor(
+        protected vsxRegistryUrl: string,
+        protected requestService: RequestService,
+        protected rateLimiter = new RateLimiter({ tokensPerInterval: OVSX_RATE_LIMIT, interval: 'second' })
+    ) { }
+
+    search(searchOptions?: VSXSearchOptions): Promise<VSXSearchResult> {
+        return this.requestJson(this.buildUrl('api/-/search', searchOptions));
+    }
+
+    query(queryOptions?: VSXQueryOptions): Promise<VSXQueryResult> {
+        return this.requestJson(this.buildUrl('api/v2/-/query', queryOptions));
+    }
+
+    protected async requestJson<R>(url: string): Promise<R> {
+        const attempts = 5;
+        for (let i = 0; i < attempts; i++) {
+            // Use 1, 2, 4, 8, 16 tokens for each attempt
+            const tokenCount = Math.pow(2, i);
+            await this.rateLimiter.removeTokens(tokenCount);
+            const context = await this.requestService.request({
+                url,
+                headers: { 'Accept': 'application/json' }
+            });
+            if (context.res.statusCode === 429) {
+                console.warn('OVSX rate limit exceeded. Consider reducing the rate limit.');
+                // If there are still more attempts left, retry the request with a higher token count
+                if (i < attempts - 1) {
+                    continue;
+                }
+            }
+            return RequestContext.asJson<R>(context);
+        }
+        throw new Error('Failed to fetch data from OVSX.');
+    }
+
+    protected buildUrl(url: string, query?: object): string {
+        return new URL(`${url}${this.buildQueryString(query)}`, this.vsxRegistryUrl).toString();
+    }
+
+    protected buildQueryString(searchQuery?: object): string {
+        if (!searchQuery) {
+            return '';
+        }
+        let queryString = '';
+        for (const [key, value] of Object.entries(searchQuery)) {
+            if (typeof value === 'string') {
+                queryString += `&${key}=${encodeURIComponent(value)}`;
+            } else if (typeof value === 'boolean' || typeof value === 'number') {
+                queryString += `&${key}=${value}`;
+            }
+        }
+        return queryString && '?' + queryString.slice(1);
+    }
+}