@theia/vsx-registry 1.18.0-next.124 → 1.18.0-next.131

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/lib/browser/vsx-extension.js +2 -2
  2. package/lib/browser/vsx-extension.js.map +1 -1
  3. package/lib/browser/vsx-extensions-model.d.ts +2 -2
  4. package/lib/browser/vsx-extensions-model.d.ts.map +1 -1
  5. package/lib/browser/vsx-extensions-model.js +11 -9
  6. package/lib/browser/vsx-extensions-model.js.map +1 -1
  7. package/lib/browser/vsx-registry-frontend-module.d.ts.map +1 -1
  8. package/lib/browser/vsx-registry-frontend-module.js +6 -12
  9. package/lib/browser/vsx-registry-frontend-module.js.map +1 -1
  10. package/lib/common/ovsx-client-provider.d.ts +21 -0
  11. package/lib/common/ovsx-client-provider.d.ts.map +1 -0
  12. package/lib/{browser/ovsx-async-client.js → common/ovsx-client-provider.js} +11 -16
  13. package/lib/common/ovsx-client-provider.js.map +1 -0
  14. package/lib/common/vsx-environment.d.ts +6 -9
  15. package/lib/common/vsx-environment.d.ts.map +1 -1
  16. package/lib/common/vsx-environment.js +4 -43
  17. package/lib/common/vsx-environment.js.map +1 -1
  18. package/lib/node/vsx-environment-impl.d.ts +26 -0
  19. package/lib/node/vsx-environment-impl.d.ts.map +1 -0
  20. package/lib/node/vsx-environment-impl.js +54 -0
  21. package/lib/node/vsx-environment-impl.js.map +1 -0
  22. package/lib/node/vsx-extension-resolver.d.ts +2 -2
  23. package/lib/node/vsx-extension-resolver.d.ts.map +1 -1
  24. package/lib/node/vsx-extension-resolver.js +6 -5
  25. package/lib/node/vsx-extension-resolver.js.map +1 -1
  26. package/lib/node/vsx-registry-backend-module.d.ts.map +1 -1
  27. package/lib/node/vsx-registry-backend-module.js +10 -9
  28. package/lib/node/vsx-registry-backend-module.js.map +1 -1
  29. package/package.json +9 -9
  30. package/src/browser/vsx-extension.tsx +1 -1
  31. package/src/browser/vsx-extensions-model.ts +10 -8
  32. package/src/browser/vsx-registry-frontend-module.ts +11 -13
  33. package/{lib/browser/ovsx-async-client.d.ts → src/common/ovsx-client-provider.ts} +13 -14
  34. package/src/{browser/ovsx-async-client.ts → common/vsx-environment.ts} +6 -21
  35. package/src/node/vsx-environment-impl.ts +41 -0
  36. package/src/node/vsx-extension-resolver.ts +5 -4
  37. package/src/node/vsx-registry-backend-module.ts +12 -10
  38. package/lib/browser/ovsx-async-client.d.ts.map +0 -1
  39. package/lib/browser/ovsx-async-client.js.map +0 -1
  40. package/src/common/vsx-environment.tsx +0 -51
@@ -246,7 +246,7 @@ let VSXExtension = class VSXExtension {
246
246
  * @returns the registry link for the given extension at the path.
247
247
  */
248
248
  async getRegistryLink(path = '') {
249
- const uri = await this.environment.getRegistryUri();
249
+ const uri = new uri_1.default(await this.environment.getRegistryUri());
250
250
  return uri.resolve('extension/' + this.id.replace('.', '/')).resolve(path);
251
251
  }
252
252
  async serialize() {
@@ -301,7 +301,7 @@ __decorate([
301
301
  ], VSXExtension.prototype, "contextMenuRenderer", void 0);
302
302
  __decorate([
303
303
  inversify_1.inject(vsx_environment_1.VSXEnvironment),
304
- __metadata("design:type", vsx_environment_1.VSXEnvironment)
304
+ __metadata("design:type", Object)
305
305
  ], VSXExtension.prototype, "environment", void 0);
306
306
  __decorate([
307
307
  inversify_1.inject(vsx_extensions_search_model_1.VSXExtensionsSearchModel),
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extension.js","sourceRoot":"","sources":["../../src/browser/vsx-extension.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vsx-extension.js","sourceRoot":"","sources":["../../src/browser/vsx-extension.tsx"],"names":[],"mappings":"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"}
@@ -25,11 +25,11 @@ import { WorkspaceService } from '@theia/workspace/lib/browser';
25
25
  import { RecommendedExtensions } from './recommended-extensions/recommended-extensions-preference-contribution';
26
26
  import URI from '@theia/core/lib/common/uri';
27
27
  import { VSXSearchParam } from '@theia/ovsx-client/lib/ovsx-types';
28
- import { OVSXAsyncClient } from './ovsx-async-client';
28
+ import { OVSXClientProvider } from '../common/ovsx-client-provider';
29
29
  export declare class VSXExtensionsModel {
30
30
  protected readonly onDidChangeEmitter: Emitter<void>;
31
31
  readonly onDidChange: import("@theia/core/lib/common/event").Event<void>;
32
- protected client: OVSXAsyncClient;
32
+ protected clientProvider: OVSXClientProvider;
33
33
  protected readonly pluginSupport: HostedPluginSupport;
34
34
  protected readonly extensionFactory: VSXExtensionFactory;
35
35
  protected readonly progressService: ProgressService;
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extensions-model.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extensions-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vsx-extensions-model.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extensions-model.ts"],"names":[],"mappings":"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"}
@@ -39,7 +39,7 @@ const promise_util_1 = require("@theia/core/lib/common/promise-util");
39
39
  const browser_1 = require("@theia/core/lib/browser");
40
40
  const browser_2 = require("@theia/workspace/lib/browser");
41
41
  const ovsx_types_1 = require("@theia/ovsx-client/lib/ovsx-types");
42
- const ovsx_async_client_1 = require("./ovsx-async-client");
42
+ const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
43
43
  let VSXExtensionsModel = class VSXExtensionsModel {
44
44
  constructor() {
45
45
  this.onDidChangeEmitter = new event_1.Emitter();
@@ -61,7 +61,6 @@ let VSXExtensionsModel = class VSXExtensionsModel {
61
61
  }, 150);
62
62
  }
63
63
  async init() {
64
- await this.client.ready;
65
64
  await Promise.all([
66
65
  this.initInstalled(),
67
66
  this.initSearchResult(),
@@ -140,14 +139,15 @@ let VSXExtensionsModel = class VSXExtensionsModel {
140
139
  }
141
140
  doUpdateSearchResult(param, token) {
142
141
  return this.doChange(async () => {
143
- const result = await this.client.search(param);
142
+ const client = await this.clientProvider();
143
+ const result = await client.search(param);
144
144
  if (token.isCancellationRequested) {
145
145
  return;
146
146
  }
147
147
  const searchResult = new Set();
148
148
  for (const data of result.extensions) {
149
149
  const id = data.namespace.toLowerCase() + '.' + data.name.toLowerCase();
150
- const extension = this.client.getLatestCompatibleVersion(data);
150
+ const extension = client.getLatestCompatibleVersion(data);
151
151
  if (!extension) {
152
152
  continue;
153
153
  }
@@ -228,7 +228,8 @@ let VSXExtensionsModel = class VSXExtensionsModel {
228
228
  }
229
229
  if (extension.readmeUrl) {
230
230
  try {
231
- const rawReadme = await this.client.fetchText(extension.readmeUrl);
231
+ const client = await this.clientProvider();
232
+ const rawReadme = await client.fetchText(extension.readmeUrl);
232
233
  const readme = this.compileReadme(rawReadme);
233
234
  extension.update({ readme });
234
235
  }
@@ -258,7 +259,8 @@ let VSXExtensionsModel = class VSXExtensionsModel {
258
259
  if (!this.shouldRefresh(extension)) {
259
260
  return extension;
260
261
  }
261
- const data = await this.client.getLatestCompatibleExtensionVersion(id);
262
+ const client = await this.clientProvider();
263
+ const data = await client.getLatestCompatibleExtensionVersion(id);
262
264
  if (!data) {
263
265
  return;
264
266
  }
@@ -320,9 +322,9 @@ let VSXExtensionsModel = class VSXExtensionsModel {
320
322
  }
321
323
  };
322
324
  __decorate([
323
- inversify_1.inject(ovsx_async_client_1.OVSXAsyncClient),
324
- __metadata("design:type", ovsx_async_client_1.OVSXAsyncClient)
325
- ], VSXExtensionsModel.prototype, "client", void 0);
325
+ inversify_1.inject(ovsx_client_provider_1.OVSXClientProvider),
326
+ __metadata("design:type", Function)
327
+ ], VSXExtensionsModel.prototype, "clientProvider", void 0);
326
328
  __decorate([
327
329
  inversify_1.inject(hosted_plugin_1.HostedPluginSupport),
328
330
  __metadata("design:type", hosted_plugin_1.HostedPluginSupport)
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extensions-model.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vsx-extensions-model.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-model.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-registry-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-registry-frontend-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,mCAAmC,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAkB/D,wBAyEG"}
1
+ {"version":3,"file":"vsx-registry-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-registry-frontend-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,mCAAmC,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAoB/D,wBAqEG"}
@@ -28,23 +28,17 @@ const vsx_extension_1 = require("./vsx-extension");
28
28
  const vsx_extension_editor_1 = require("./vsx-extension-editor");
29
29
  const vsx_extension_editor_manager_1 = require("./vsx-extension-editor-manager");
30
30
  const vsx_extensions_source_1 = require("./vsx-extensions-source");
31
- const vsx_environment_1 = require("../common/vsx-environment");
32
31
  const vsx_extensions_search_model_1 = require("./vsx-extensions-search-model");
33
32
  const recommended_extensions_preference_contribution_1 = require("./recommended-extensions/recommended-extensions-preference-contribution");
34
33
  const preference_provider_overrides_1 = require("./recommended-extensions/preference-provider-overrides");
35
- const ovsx_async_client_1 = require("./ovsx-async-client");
34
+ const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
35
+ const vsx_environment_1 = require("../common/vsx-environment");
36
36
  exports.default = new inversify_1.ContainerModule((bind, unbind) => {
37
- bind(vsx_environment_1.VSXEnvironment).toSelf().inSingletonScope();
38
- bind(ovsx_async_client_1.OVSXAsyncClient).toDynamicValue(ctx => {
39
- const vsxEnvironment = ctx.container.get(vsx_environment_1.VSXEnvironment);
40
- return new ovsx_async_client_1.OVSXAsyncClient(Promise.all([
41
- vsxEnvironment.getVscodeApiVersion(),
42
- vsxEnvironment.getRegistryApiUri()
43
- ]).then(([apiVersion, apiUri]) => ({
44
- apiVersion,
45
- apiUrl: apiUri.toString()
46
- })));
37
+ bind(ovsx_client_provider_1.OVSXClientProvider).toDynamicValue(ctx => {
38
+ const clientPromise = ovsx_client_provider_1.createOVSXClient(ctx.container.get(vsx_environment_1.VSXEnvironment));
39
+ return () => clientPromise;
47
40
  }).inSingletonScope();
41
+ bind(vsx_environment_1.VSXEnvironment).toDynamicValue(ctx => browser_1.WebSocketConnectionProvider.createProxy(ctx.container, vsx_environment_1.VSX_ENVIRONMENT_PATH)).inSingletonScope();
48
42
  bind(vsx_extension_1.VSXExtension).toSelf();
49
43
  bind(vsx_extension_1.VSXExtensionFactory).toFactory(ctx => (option) => {
50
44
  const child = ctx.container.createChild();
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-registry-frontend-module.js","sourceRoot":"","sources":["../../src/browser/vsx-registry-frontend-module.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vsx-registry-frontend-module.js","sourceRoot":"","sources":["../../src/browser/vsx-registry-frontend-module.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,21 @@
1
+ /********************************************************************************
2
+ * Copyright (C) 2021 Ericsson and others.
3
+ *
4
+ * This program and the accompanying materials are made available under the
5
+ * terms of the Eclipse Public License v. 2.0 which is available at
6
+ * http://www.eclipse.org/legal/epl-2.0.
7
+ *
8
+ * This Source Code may also be made available under the following Secondary
9
+ * Licenses when the conditions for such availability set forth in the Eclipse
10
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ * with the GNU Classpath Exception which is available at
12
+ * https://www.gnu.org/software/classpath/license.html.
13
+ *
14
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
+ ********************************************************************************/
16
+ import { OVSXClient } from '@theia/ovsx-client';
17
+ import { VSXEnvironment } from './vsx-environment';
18
+ export declare const OVSXClientProvider: unique symbol;
19
+ export declare type OVSXClientProvider = () => Promise<OVSXClient>;
20
+ export declare function createOVSXClient(vsxEnvironment: VSXEnvironment): Promise<OVSXClient>;
21
+ //# sourceMappingURL=ovsx-client-provider.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ovsx-client-provider.d.ts","sourceRoot":"","sources":["../../src/common/ovsx-client-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,oBAAY,kBAAkB,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;AAE3D,wBAAsB,gBAAgB,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,CAM1F"}
@@ -15,20 +15,15 @@
15
15
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
16
16
  ********************************************************************************/
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
- exports.OVSXAsyncClient = void 0;
19
- const lib_1 = require("@theia/ovsx-client/lib");
20
- /**
21
- * In some instances, the OVSXClient must be created asynchronously. This class
22
- * makes it possible to get an un-initialized instance and wait for it to be ready.
23
- */
24
- class OVSXAsyncClient extends lib_1.OVSXClient {
25
- constructor(asyncOptions) {
26
- super(undefined); // hack: using methods at this point will fail.
27
- this.ready = asyncOptions.then(options => {
28
- this.options = options;
29
- return this;
30
- });
31
- }
18
+ exports.createOVSXClient = exports.OVSXClientProvider = void 0;
19
+ const ovsx_client_1 = require("@theia/ovsx-client");
20
+ exports.OVSXClientProvider = Symbol('OVSXClientProvider');
21
+ async function createOVSXClient(vsxEnvironment) {
22
+ const [apiVersion, apiUrl] = await Promise.all([
23
+ vsxEnvironment.getVscodeApiVersion(),
24
+ vsxEnvironment.getRegistryApiUri()
25
+ ]);
26
+ return new ovsx_client_1.OVSXClient({ apiVersion, apiUrl: apiUrl.toString() });
32
27
  }
33
- exports.OVSXAsyncClient = OVSXAsyncClient;
34
- //# sourceMappingURL=ovsx-async-client.js.map
28
+ exports.createOVSXClient = createOVSXClient;
29
+ //# sourceMappingURL=ovsx-client-provider.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ovsx-client-provider.js","sourceRoot":"","sources":["../../src/common/ovsx-client-provider.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,oDAAgD;AAGnC,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAGxD,KAAK,UAAU,gBAAgB,CAAC,cAA8B;IACjE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC3C,cAAc,CAAC,mBAAmB,EAAE;QACpC,cAAc,CAAC,iBAAiB,EAAE;KACrC,CAAC,CAAC;IACH,OAAO,IAAI,wBAAU,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;AACrE,CAAC;AAND,4CAMC"}
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (C) 2020 TypeFox and others.
2
+ * Copyright (C) 2021 Ericsson and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,14 +13,11 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
17
- import URI from '@theia/core/lib/common/uri';
18
- export declare class VSXEnvironment {
19
- protected readonly environments: EnvVariablesServer;
20
- protected _registryUri: URI | undefined;
21
- getRegistryUri(): Promise<URI>;
22
- getRegistryApiUri(): Promise<URI>;
23
- protected _apiVersion: string | undefined;
16
+ export declare const VSX_ENVIRONMENT_PATH = "/services/vsx-environment";
17
+ export declare const VSXEnvironment: unique symbol;
18
+ export interface VSXEnvironment {
19
+ getRegistryUri(): Promise<string>;
20
+ getRegistryApiUri(): Promise<string>;
24
21
  getVscodeApiVersion(): Promise<string>;
25
22
  }
26
23
  //# sourceMappingURL=vsx-environment.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-environment.d.ts","sourceRoot":"","sources":["../../src/common/vsx-environment.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAG7C,qBACa,cAAc;IAGvB,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC;IAEpD,SAAS,CAAC,YAAY,EAAE,GAAG,GAAG,SAAS,CAAC;IAClC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAQ9B,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC;IAKvC,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;CAQ/C"}
1
+ {"version":3,"file":"vsx-environment.d.ts","sourceRoot":"","sources":["../../src/common/vsx-environment.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,eAAO,MAAM,oBAAoB,8BAA8B,CAAC;AAEhE,eAAO,MAAM,cAAc,eAA2B,CAAC;AACvD,MAAM,WAAW,cAAc;IAC3B,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACrC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1C"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  /********************************************************************************
3
- * Copyright (C) 2020 TypeFox and others.
3
+ * Copyright (C) 2021 Ericsson and others.
4
4
  *
5
5
  * This program and the accompanying materials are made available under the
6
6
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,47 +14,8 @@
14
14
  *
15
15
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
16
16
  ********************************************************************************/
17
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
18
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
19
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
20
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
21
- return c > 3 && r && Object.defineProperty(target, key, r), r;
22
- };
23
- var __metadata = (this && this.__metadata) || function (k, v) {
24
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
25
- };
26
17
  Object.defineProperty(exports, "__esModule", { value: true });
27
- exports.VSXEnvironment = void 0;
28
- const inversify_1 = require("@theia/core/shared/inversify");
29
- const env_variables_1 = require("@theia/core/lib/common/env-variables");
30
- const uri_1 = require("@theia/core/lib/common/uri");
31
- const plugin_vscode_types_1 = require("@theia/plugin-ext-vscode/lib/common/plugin-vscode-types");
32
- let VSXEnvironment = class VSXEnvironment {
33
- async getRegistryUri() {
34
- if (!this._registryUri) {
35
- const vsxRegistryUrl = await this.environments.getValue('VSX_REGISTRY_URL');
36
- this._registryUri = new uri_1.default(vsxRegistryUrl && vsxRegistryUrl.value || 'https://open-vsx.org');
37
- }
38
- return this._registryUri;
39
- }
40
- async getRegistryApiUri() {
41
- const registryUri = await this.getRegistryUri();
42
- return registryUri.resolve('api');
43
- }
44
- async getVscodeApiVersion() {
45
- if (!this._apiVersion) {
46
- const apiVersion = await this.environments.getValue('VSCODE_API_VERSION');
47
- this._apiVersion = (apiVersion === null || apiVersion === void 0 ? void 0 : apiVersion.value) || plugin_vscode_types_1.VSCODE_DEFAULT_API_VERSION;
48
- }
49
- return this._apiVersion;
50
- }
51
- };
52
- __decorate([
53
- inversify_1.inject(env_variables_1.EnvVariablesServer),
54
- __metadata("design:type", Object)
55
- ], VSXEnvironment.prototype, "environments", void 0);
56
- VSXEnvironment = __decorate([
57
- inversify_1.injectable()
58
- ], VSXEnvironment);
59
- exports.VSXEnvironment = VSXEnvironment;
18
+ exports.VSXEnvironment = exports.VSX_ENVIRONMENT_PATH = void 0;
19
+ exports.VSX_ENVIRONMENT_PATH = '/services/vsx-environment';
20
+ exports.VSXEnvironment = Symbol('VSXEnvironment');
60
21
  //# sourceMappingURL=vsx-environment.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-environment.js","sourceRoot":"","sources":["../../src/common/vsx-environment.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAkE;AAClE,wEAA0E;AAC1E,oDAA6C;AAC7C,iGAAqG;AAGrG,IAAa,cAAc,GAA3B,MAAa,cAAc;IAMvB,KAAK,CAAC,cAAc;QAChB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACpB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;YAC5E,IAAI,CAAC,YAAY,GAAG,IAAI,aAAG,CAAC,cAAc,IAAI,cAAc,CAAC,KAAK,IAAI,sBAAsB,CAAC,CAAC;SACjG;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAChD,OAAO,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IAGD,KAAK,CAAC,mBAAmB;QACrB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACnB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;YAC1E,IAAI,CAAC,WAAW,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,KAAI,gDAA0B,CAAC;SACtE;QACD,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;CAEJ,CAAA;AAzBG;IADC,kBAAM,CAAC,kCAAkB,CAAC;;oDACyB;AAH3C,cAAc;IAD1B,sBAAU,EAAE;GACA,cAAc,CA4B1B;AA5BY,wCAAc"}
1
+ {"version":3,"file":"vsx-environment.js","sourceRoot":"","sources":["../../src/common/vsx-environment.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAErE,QAAA,oBAAoB,GAAG,2BAA2B,CAAC;AAEnD,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC"}
@@ -0,0 +1,26 @@
1
+ /********************************************************************************
2
+ * Copyright (C) 2020 TypeFox and others.
3
+ *
4
+ * This program and the accompanying materials are made available under the
5
+ * terms of the Eclipse Public License v. 2.0 which is available at
6
+ * http://www.eclipse.org/legal/epl-2.0.
7
+ *
8
+ * This Source Code may also be made available under the following Secondary
9
+ * Licenses when the conditions for such availability set forth in the Eclipse
10
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ * with the GNU Classpath Exception which is available at
12
+ * https://www.gnu.org/software/classpath/license.html.
13
+ *
14
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
+ ********************************************************************************/
16
+ import URI from '@theia/core/lib/common/uri';
17
+ import { PluginVsCodeCliContribution } from '@theia/plugin-ext-vscode/lib/node/plugin-vscode-cli-contribution';
18
+ import { VSXEnvironment } from '../common/vsx-environment';
19
+ export declare class VSXEnvironmentImpl implements VSXEnvironment {
20
+ protected _registryUri: URI;
21
+ protected readonly pluginVscodeCli: PluginVsCodeCliContribution;
22
+ getRegistryUri(): Promise<string>;
23
+ getRegistryApiUri(): Promise<string>;
24
+ getVscodeApiVersion(): Promise<string>;
25
+ }
26
+ //# sourceMappingURL=vsx-environment-impl.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"vsx-environment-impl.d.ts","sourceRoot":"","sources":["../../src/node/vsx-environment-impl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,2BAA2B,EAAE,MAAM,kEAAkE,CAAC;AAC/G,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,qBACa,kBAAmB,YAAW,cAAc;IAErD,SAAS,CAAC,YAAY,MAA8E;IAGpG,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,2BAA2B,CAAC;IAE1D,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAIjC,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIpC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;CAG/C"}
@@ -0,0 +1,54 @@
1
+ "use strict";
2
+ /********************************************************************************
3
+ * Copyright (C) 2020 TypeFox and others.
4
+ *
5
+ * This program and the accompanying materials are made available under the
6
+ * terms of the Eclipse Public License v. 2.0 which is available at
7
+ * http://www.eclipse.org/legal/epl-2.0.
8
+ *
9
+ * This Source Code may also be made available under the following Secondary
10
+ * Licenses when the conditions for such availability set forth in the Eclipse
11
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
12
+ * with the GNU Classpath Exception which is available at
13
+ * https://www.gnu.org/software/classpath/license.html.
14
+ *
15
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
16
+ ********************************************************************************/
17
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
18
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
19
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
20
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
21
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
22
+ };
23
+ var __metadata = (this && this.__metadata) || function (k, v) {
24
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
25
+ };
26
+ Object.defineProperty(exports, "__esModule", { value: true });
27
+ exports.VSXEnvironmentImpl = void 0;
28
+ const inversify_1 = require("@theia/core/shared/inversify");
29
+ const uri_1 = require("@theia/core/lib/common/uri");
30
+ const plugin_vscode_cli_contribution_1 = require("@theia/plugin-ext-vscode/lib/node/plugin-vscode-cli-contribution");
31
+ let VSXEnvironmentImpl = class VSXEnvironmentImpl {
32
+ constructor() {
33
+ var _a;
34
+ this._registryUri = new uri_1.default(((_a = process.env['VSX_REGISTRY_URL']) === null || _a === void 0 ? void 0 : _a.trim()) || 'https://open-vsx.org');
35
+ }
36
+ async getRegistryUri() {
37
+ return this._registryUri.toString(true);
38
+ }
39
+ async getRegistryApiUri() {
40
+ return this._registryUri.resolve('api').toString(true);
41
+ }
42
+ async getVscodeApiVersion() {
43
+ return this.pluginVscodeCli.vsCodeApiVersionPromise;
44
+ }
45
+ };
46
+ __decorate([
47
+ inversify_1.inject(plugin_vscode_cli_contribution_1.PluginVsCodeCliContribution),
48
+ __metadata("design:type", plugin_vscode_cli_contribution_1.PluginVsCodeCliContribution)
49
+ ], VSXEnvironmentImpl.prototype, "pluginVscodeCli", void 0);
50
+ VSXEnvironmentImpl = __decorate([
51
+ inversify_1.injectable()
52
+ ], VSXEnvironmentImpl);
53
+ exports.VSXEnvironmentImpl = VSXEnvironmentImpl;
54
+ //# sourceMappingURL=vsx-environment-impl.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"vsx-environment-impl.js","sourceRoot":"","sources":["../../src/node/vsx-environment-impl.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAkE;AAClE,oDAA6C;AAC7C,qHAA+G;AAI/G,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;;QAEc,iBAAY,GAAG,IAAI,aAAG,CAAC,OAAA,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,0CAAE,IAAI,OAAM,sBAAsB,CAAC,CAAC;IAgBxG,CAAC;IAXG,KAAK,CAAC,cAAc;QAChB,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,OAAO,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC;IACxD,CAAC;CACJ,CAAA;AAbG;IADC,kBAAM,CAAC,4DAA2B,CAAC;8BACA,4DAA2B;2DAAC;AALvD,kBAAkB;IAD9B,sBAAU,EAAE;GACA,kBAAkB,CAkB9B;AAlBY,gDAAkB"}
@@ -14,9 +14,9 @@
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
16
  import { PluginDeployerResolver, PluginDeployerResolverContext } from '@theia/plugin-ext/lib/common/plugin-protocol';
17
- import { OVSXClient } from '@theia/ovsx-client/lib/ovsx-client';
17
+ import { OVSXClientProvider } from '../common/ovsx-client-provider';
18
18
  export declare class VSXExtensionResolver implements PluginDeployerResolver {
19
- protected client: OVSXClient;
19
+ protected clientProvider: OVSXClientProvider;
20
20
  protected readonly downloadPath: string;
21
21
  constructor();
22
22
  accept(pluginId: string): boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extension-resolver.d.ts","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AASlF,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,8CAA8C,CAAC;AAErH,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,qBACa,oBAAqB,YAAW,sBAAsB;IAG/D,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC;IAE7B,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;;IAQxC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAI3B,OAAO,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;cA2BpD,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAoBxF"}
1
+ {"version":3,"file":"vsx-extension-resolver.d.ts","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AASlF,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,8CAA8C,CAAC;AAErH,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,qBACa,oBAAqB,YAAW,sBAAsB;IAG/D,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAE7C,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;;IAQxC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAI3B,OAAO,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;cA4BpD,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAoBxF"}
@@ -33,7 +33,7 @@ const requestretry = require("requestretry");
33
33
  const inversify_1 = require("@theia/core/shared/inversify");
34
34
  const uri_1 = require("@theia/core/lib/common/uri");
35
35
  const vsx_extension_uri_1 = require("../common/vsx-extension-uri");
36
- const ovsx_client_1 = require("@theia/ovsx-client/lib/ovsx-client");
36
+ const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
37
37
  let VSXExtensionResolver = class VSXExtensionResolver {
38
38
  constructor() {
39
39
  this.downloadPath = path.resolve(os.tmpdir(), uuid_1.v4());
@@ -49,7 +49,8 @@ let VSXExtensionResolver = class VSXExtensionResolver {
49
49
  return;
50
50
  }
51
51
  console.log(`[${id}]: trying to resolve latest version...`);
52
- const extension = await this.client.getLatestCompatibleExtensionVersion(id);
52
+ const client = await this.clientProvider();
53
+ const extension = await client.getLatestCompatibleExtensionVersion(id);
53
54
  if (!extension) {
54
55
  return;
55
56
  }
@@ -92,9 +93,9 @@ let VSXExtensionResolver = class VSXExtensionResolver {
92
93
  }
93
94
  };
94
95
  __decorate([
95
- inversify_1.inject(ovsx_client_1.OVSXClient),
96
- __metadata("design:type", ovsx_client_1.OVSXClient)
97
- ], VSXExtensionResolver.prototype, "client", void 0);
96
+ inversify_1.inject(ovsx_client_provider_1.OVSXClientProvider),
97
+ __metadata("design:type", Function)
98
+ ], VSXExtensionResolver.prototype, "clientProvider", void 0);
98
99
  VSXExtensionResolver = __decorate([
99
100
  inversify_1.injectable(),
100
101
  __metadata("design:paramtypes", [])
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extension-resolver.js","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vsx-extension-resolver.js","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-registry-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/vsx-registry-backend-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAM/D,wBAOG"}
1
+ {"version":3,"file":"vsx-registry-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/vsx-registry-backend-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAQ/D,wBAWG"}
@@ -18,17 +18,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
18
18
  const inversify_1 = require("@theia/core/shared/inversify");
19
19
  const vsx_extension_resolver_1 = require("./vsx-extension-resolver");
20
20
  const plugin_protocol_1 = require("@theia/plugin-ext/lib/common/plugin-protocol");
21
- const plugin_vscode_types_1 = require("@theia/plugin-ext-vscode/lib/common/plugin-vscode-types");
22
- const ovsx_client_1 = require("@theia/ovsx-client/lib/ovsx-client");
21
+ const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
22
+ const vsx_environment_1 = require("../common/vsx-environment");
23
+ const vsx_environment_impl_1 = require("./vsx-environment-impl");
24
+ const core_1 = require("@theia/core");
23
25
  exports.default = new inversify_1.ContainerModule(bind => {
24
- bind(ovsx_client_1.OVSXClient).toConstantValue(new ovsx_client_1.OVSXClient({
25
- apiVersion: process.env['VSCODE_API_VERSION'] || plugin_vscode_types_1.VSCODE_DEFAULT_API_VERSION,
26
- apiUrl: resolveRegistryUrl()
27
- }));
26
+ bind(ovsx_client_provider_1.OVSXClientProvider).toDynamicValue(ctx => {
27
+ const clientPromise = ovsx_client_provider_1.createOVSXClient(ctx.container.get(vsx_environment_1.VSXEnvironment));
28
+ return () => clientPromise;
29
+ }).inSingletonScope();
30
+ bind(vsx_environment_1.VSXEnvironment).to(vsx_environment_impl_1.VSXEnvironmentImpl).inSingletonScope();
31
+ bind(core_1.ConnectionHandler).toDynamicValue(ctx => new core_1.JsonRpcConnectionHandler(vsx_environment_1.VSX_ENVIRONMENT_PATH, () => ctx.container.get(vsx_environment_1.VSXEnvironment))).inSingletonScope();
28
32
  bind(vsx_extension_resolver_1.VSXExtensionResolver).toSelf().inSingletonScope();
29
33
  bind(plugin_protocol_1.PluginDeployerResolver).toService(vsx_extension_resolver_1.VSXExtensionResolver);
30
34
  });
31
- function resolveRegistryUrl() {
32
- return process.env['VSX_REGISTRY_URL'] || plugin_vscode_types_1.VSX_REGISTRY_URL_DEFAULT;
33
- }
34
35
  //# sourceMappingURL=vsx-registry-backend-module.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-registry-backend-module.js","sourceRoot":"","sources":["../../src/node/vsx-registry-backend-module.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;AAElF,4DAA+D;AAC/D,qEAAgE;AAChE,kFAAsF;AACtF,iGAA+H;AAC/H,oEAAgE;AAEhE,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,wBAAU,CAAC,CAAC,eAAe,CAAC,IAAI,wBAAU,CAAC;QAC5C,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,gDAA0B;QAC3E,MAAM,EAAE,kBAAkB,EAAE;KAC/B,CAAC,CAAC,CAAC;IACJ,IAAI,CAAC,6CAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,wCAAsB,CAAC,CAAC,SAAS,CAAC,6CAAoB,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC;AAEH,SAAS,kBAAkB;IACxB,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,8CAAwB,CAAC;AACtE,CAAC"}
1
+ {"version":3,"file":"vsx-registry-backend-module.js","sourceRoot":"","sources":["../../src/node/vsx-registry-backend-module.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;AAElF,4DAA+D;AAC/D,qEAAgE;AAChE,kFAAsF;AACtF,yEAAsF;AACtF,+DAAiF;AACjF,iEAA4D;AAC5D,sCAA0E;AAE1E,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAqB,yCAAkB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC9D,MAAM,aAAa,GAAG,uCAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,CAAC;QAC1E,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC;IAC/B,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,gCAAc,CAAC,CAAC,EAAE,CAAC,yCAAkB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC/D,IAAI,CAAC,wBAAiB,CAAC,CAAC,cAAc,CAClC,GAAG,CAAC,EAAE,CAAC,IAAI,+BAAwB,CAAC,sCAAoB,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,CACrG,CAAC,gBAAgB,EAAE,CAAC;IACrB,IAAI,CAAC,6CAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,wCAAsB,CAAC,CAAC,SAAS,CAAC,6CAAoB,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,15 +1,15 @@
1
1
  {
2
2
  "name": "@theia/vsx-registry",
3
- "version": "1.18.0-next.124+008c2a1bbee",
3
+ "version": "1.18.0-next.131+fdb22a16288",
4
4
  "description": "Theia - VSX Registry",
5
5
  "dependencies": {
6
- "@theia/core": "1.18.0-next.124+008c2a1bbee",
7
- "@theia/filesystem": "1.18.0-next.124+008c2a1bbee",
8
- "@theia/ovsx-client": "1.18.0-next.124+008c2a1bbee",
9
- "@theia/plugin-ext": "1.18.0-next.124+008c2a1bbee",
10
- "@theia/plugin-ext-vscode": "1.18.0-next.124+008c2a1bbee",
11
- "@theia/preferences": "1.18.0-next.124+008c2a1bbee",
12
- "@theia/workspace": "1.18.0-next.124+008c2a1bbee",
6
+ "@theia/core": "1.18.0-next.131+fdb22a16288",
7
+ "@theia/filesystem": "1.18.0-next.131+fdb22a16288",
8
+ "@theia/ovsx-client": "1.18.0-next.131+fdb22a16288",
9
+ "@theia/plugin-ext": "1.18.0-next.131+fdb22a16288",
10
+ "@theia/plugin-ext-vscode": "1.18.0-next.131+fdb22a16288",
11
+ "@theia/preferences": "1.18.0-next.131+fdb22a16288",
12
+ "@theia/workspace": "1.18.0-next.131+fdb22a16288",
13
13
  "@types/bent": "^7.0.1",
14
14
  "@types/markdown-it": "*",
15
15
  "@types/showdown": "^1.7.1",
@@ -60,5 +60,5 @@
60
60
  "nyc": {
61
61
  "extends": "../../configs/nyc.json"
62
62
  },
63
- "gitHead": "008c2a1bbee0f3294f8f44556b081bd013bb21e6"
63
+ "gitHead": "fdb22a1628804c0ff4873bcb9522d6e7e94a21be"
64
64
  }
@@ -322,7 +322,7 @@ export class VSXExtension implements VSXExtensionData, TreeElement {
322
322
  * @returns the registry link for the given extension at the path.
323
323
  */
324
324
  async getRegistryLink(path = ''): Promise<URI> {
325
- const uri = await this.environment.getRegistryUri();
325
+ const uri = new URI(await this.environment.getRegistryUri());
326
326
  return uri.resolve('extension/' + this.id.replace('.', '/')).resolve(path);
327
327
  }
328
328
 
@@ -30,7 +30,7 @@ import { WorkspaceService } from '@theia/workspace/lib/browser';
30
30
  import { RecommendedExtensions } from './recommended-extensions/recommended-extensions-preference-contribution';
31
31
  import URI from '@theia/core/lib/common/uri';
32
32
  import { VSXResponseError, VSXSearchParam } from '@theia/ovsx-client/lib/ovsx-types';
33
- import { OVSXAsyncClient } from './ovsx-async-client';
33
+ import { OVSXClientProvider } from '../common/ovsx-client-provider';
34
34
 
35
35
  @injectable()
36
36
  export class VSXExtensionsModel {
@@ -38,8 +38,8 @@ export class VSXExtensionsModel {
38
38
  protected readonly onDidChangeEmitter = new Emitter<void>();
39
39
  readonly onDidChange = this.onDidChangeEmitter.event;
40
40
 
41
- @inject(OVSXAsyncClient)
42
- protected client: OVSXAsyncClient;
41
+ @inject(OVSXClientProvider)
42
+ protected clientProvider: OVSXClientProvider;
43
43
 
44
44
  @inject(HostedPluginSupport)
45
45
  protected readonly pluginSupport: HostedPluginSupport;
@@ -63,7 +63,6 @@ export class VSXExtensionsModel {
63
63
 
64
64
  @postConstruct()
65
65
  protected async init(): Promise<void> {
66
- await this.client.ready;
67
66
  await Promise.all([
68
67
  this.initInstalled(),
69
68
  this.initSearchResult(),
@@ -167,14 +166,15 @@ export class VSXExtensionsModel {
167
166
  }, 150);
168
167
  protected doUpdateSearchResult(param: VSXSearchParam, token: CancellationToken): Promise<void> {
169
168
  return this.doChange(async () => {
170
- const result = await this.client.search(param);
169
+ const client = await this.clientProvider();
170
+ const result = await client.search(param);
171
171
  if (token.isCancellationRequested) {
172
172
  return;
173
173
  }
174
174
  const searchResult = new Set<string>();
175
175
  for (const data of result.extensions) {
176
176
  const id = data.namespace.toLowerCase() + '.' + data.name.toLowerCase();
177
- const extension = this.client.getLatestCompatibleVersion(data);
177
+ const extension = client.getLatestCompatibleVersion(data);
178
178
  if (!extension) {
179
179
  continue;
180
180
  }
@@ -260,7 +260,8 @@ export class VSXExtensionsModel {
260
260
  }
261
261
  if (extension.readmeUrl) {
262
262
  try {
263
- const rawReadme = await this.client.fetchText(extension.readmeUrl);
263
+ const client = await this.clientProvider();
264
+ const rawReadme = await client.fetchText(extension.readmeUrl);
264
265
  const readme = this.compileReadme(rawReadme);
265
266
  extension.update({ readme });
266
267
  } catch (e) {
@@ -292,7 +293,8 @@ export class VSXExtensionsModel {
292
293
  if (!this.shouldRefresh(extension)) {
293
294
  return extension;
294
295
  }
295
- const data = await this.client.getLatestCompatibleExtensionVersion(id);
296
+ const client = await this.clientProvider();
297
+ const data = await client.getLatestCompatibleExtensionVersion(id);
296
298
  if (!data) {
297
299
  return;
298
300
  }
@@ -17,7 +17,9 @@
17
17
  import '../../src/browser/style/index.css';
18
18
 
19
19
  import { ContainerModule } from '@theia/core/shared/inversify';
20
- import { WidgetFactory, bindViewContribution, FrontendApplicationContribution, ViewContainerIdentifier, OpenHandler, WidgetManager } from '@theia/core/lib/browser';
20
+ import {
21
+ WidgetFactory, bindViewContribution, FrontendApplicationContribution, ViewContainerIdentifier, OpenHandler, WidgetManager, WebSocketConnectionProvider
22
+ } from '@theia/core/lib/browser';
21
23
  import { VSXExtensionsViewContainer } from './vsx-extensions-view-container';
22
24
  import { VSXExtensionsContribution } from './vsx-extensions-contribution';
23
25
  import { VSXExtensionsSearchBar } from './vsx-extensions-search-bar';
@@ -28,24 +30,20 @@ import { VSXExtensionFactory, VSXExtension, VSXExtensionOptions } from './vsx-ex
28
30
  import { VSXExtensionEditor } from './vsx-extension-editor';
29
31
  import { VSXExtensionEditorManager } from './vsx-extension-editor-manager';
30
32
  import { VSXExtensionsSourceOptions } from './vsx-extensions-source';
31
- import { VSXEnvironment } from '../common/vsx-environment';
32
33
  import { VSXExtensionsSearchModel } from './vsx-extensions-search-model';
33
34
  import { bindExtensionPreferences } from './recommended-extensions/recommended-extensions-preference-contribution';
34
35
  import { bindPreferenceProviderOverrides } from './recommended-extensions/preference-provider-overrides';
35
- import { OVSXAsyncClient } from './ovsx-async-client';
36
+ import { OVSXClientProvider, createOVSXClient } from '../common/ovsx-client-provider';
37
+ import { VSXEnvironment, VSX_ENVIRONMENT_PATH } from '../common/vsx-environment';
36
38
 
37
39
  export default new ContainerModule((bind, unbind) => {
38
- bind(VSXEnvironment).toSelf().inSingletonScope();
39
- bind(OVSXAsyncClient).toDynamicValue(ctx => {
40
- const vsxEnvironment = ctx.container.get(VSXEnvironment);
41
- return new OVSXAsyncClient(Promise.all([
42
- vsxEnvironment.getVscodeApiVersion(),
43
- vsxEnvironment.getRegistryApiUri()
44
- ]).then(([apiVersion, apiUri]) => ({
45
- apiVersion,
46
- apiUrl: apiUri.toString()
47
- })));
40
+ bind<OVSXClientProvider>(OVSXClientProvider).toDynamicValue(ctx => {
41
+ const clientPromise = createOVSXClient(ctx.container.get(VSXEnvironment));
42
+ return () => clientPromise;
48
43
  }).inSingletonScope();
44
+ bind(VSXEnvironment).toDynamicValue(
45
+ ctx => WebSocketConnectionProvider.createProxy(ctx.container, VSX_ENVIRONMENT_PATH)
46
+ ).inSingletonScope();
49
47
 
50
48
  bind(VSXExtension).toSelf();
51
49
  bind(VSXExtensionFactory).toFactory(ctx => (option: VSXExtensionOptions) => {
@@ -13,18 +13,17 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { OVSXClient, OVSXClientOptions } from '@theia/ovsx-client/lib';
17
- /**
18
- * In some instances, the OVSXClient must be created asynchronously. This class
19
- * makes it possible to get an un-initialized instance and wait for it to be ready.
20
- */
21
- export declare class OVSXAsyncClient extends OVSXClient {
22
- /**
23
- * Resolves once the initial asynchronous options are resolved.
24
- *
25
- * Calling methods before this promise is resolved will throw errors.
26
- */
27
- readonly ready: Promise<OVSXAsyncClient>;
28
- constructor(asyncOptions: Promise<OVSXClientOptions>);
16
+
17
+ import { OVSXClient } from '@theia/ovsx-client';
18
+ import { VSXEnvironment } from './vsx-environment';
19
+
20
+ export const OVSXClientProvider = Symbol('OVSXClientProvider');
21
+ export type OVSXClientProvider = () => Promise<OVSXClient>;
22
+
23
+ export async function createOVSXClient(vsxEnvironment: VSXEnvironment): Promise<OVSXClient> {
24
+ const [apiVersion, apiUrl] = await Promise.all([
25
+ vsxEnvironment.getVscodeApiVersion(),
26
+ vsxEnvironment.getRegistryApiUri()
27
+ ]);
28
+ return new OVSXClient({ apiVersion, apiUrl: apiUrl.toString() });
29
29
  }
30
- //# sourceMappingURL=ovsx-async-client.d.ts.map
@@ -14,26 +14,11 @@
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
16
 
17
- import { OVSXClient, OVSXClientOptions } from '@theia/ovsx-client/lib';
17
+ export const VSX_ENVIRONMENT_PATH = '/services/vsx-environment';
18
18
 
19
- /**
20
- * In some instances, the OVSXClient must be created asynchronously. This class
21
- * makes it possible to get an un-initialized instance and wait for it to be ready.
22
- */
23
- export class OVSXAsyncClient extends OVSXClient {
24
-
25
- /**
26
- * Resolves once the initial asynchronous options are resolved.
27
- *
28
- * Calling methods before this promise is resolved will throw errors.
29
- */
30
- readonly ready: Promise<OVSXAsyncClient>;
31
-
32
- constructor(asyncOptions: Promise<OVSXClientOptions>) {
33
- super(undefined!); // hack: using methods at this point will fail.
34
- this.ready = asyncOptions.then(options => {
35
- (this.options as OVSXClientOptions) = options;
36
- return this;
37
- });
38
- }
19
+ export const VSXEnvironment = Symbol('VSXEnvironment');
20
+ export interface VSXEnvironment {
21
+ getRegistryUri(): Promise<string>;
22
+ getRegistryApiUri(): Promise<string>;
23
+ getVscodeApiVersion(): Promise<string>;
39
24
  }
@@ -0,0 +1,41 @@
1
+ /********************************************************************************
2
+ * Copyright (C) 2020 TypeFox and others.
3
+ *
4
+ * This program and the accompanying materials are made available under the
5
+ * terms of the Eclipse Public License v. 2.0 which is available at
6
+ * http://www.eclipse.org/legal/epl-2.0.
7
+ *
8
+ * This Source Code may also be made available under the following Secondary
9
+ * Licenses when the conditions for such availability set forth in the Eclipse
10
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ * with the GNU Classpath Exception which is available at
12
+ * https://www.gnu.org/software/classpath/license.html.
13
+ *
14
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
+ ********************************************************************************/
16
+
17
+ import { injectable, inject } from '@theia/core/shared/inversify';
18
+ import URI from '@theia/core/lib/common/uri';
19
+ import { PluginVsCodeCliContribution } from '@theia/plugin-ext-vscode/lib/node/plugin-vscode-cli-contribution';
20
+ import { VSXEnvironment } from '../common/vsx-environment';
21
+
22
+ @injectable()
23
+ export class VSXEnvironmentImpl implements VSXEnvironment {
24
+
25
+ protected _registryUri = new URI(process.env['VSX_REGISTRY_URL']?.trim() || 'https://open-vsx.org');
26
+
27
+ @inject(PluginVsCodeCliContribution)
28
+ protected readonly pluginVscodeCli: PluginVsCodeCliContribution;
29
+
30
+ async getRegistryUri(): Promise<string> {
31
+ return this._registryUri.toString(true);
32
+ }
33
+
34
+ async getRegistryApiUri(): Promise<string> {
35
+ return this._registryUri.resolve('api').toString(true);
36
+ }
37
+
38
+ async getVscodeApiVersion(): Promise<string> {
39
+ return this.pluginVscodeCli.vsCodeApiVersionPromise;
40
+ }
41
+ }
@@ -23,13 +23,13 @@ import { injectable, inject } from '@theia/core/shared/inversify';
23
23
  import URI from '@theia/core/lib/common/uri';
24
24
  import { PluginDeployerResolver, PluginDeployerResolverContext } from '@theia/plugin-ext/lib/common/plugin-protocol';
25
25
  import { VSXExtensionUri } from '../common/vsx-extension-uri';
26
- import { OVSXClient } from '@theia/ovsx-client/lib/ovsx-client';
26
+ import { OVSXClientProvider } from '../common/ovsx-client-provider';
27
27
 
28
28
  @injectable()
29
29
  export class VSXExtensionResolver implements PluginDeployerResolver {
30
30
 
31
- @inject(OVSXClient)
32
- protected client: OVSXClient;
31
+ @inject(OVSXClientProvider)
32
+ protected clientProvider: OVSXClientProvider;
33
33
 
34
34
  protected readonly downloadPath: string;
35
35
 
@@ -49,7 +49,8 @@ export class VSXExtensionResolver implements PluginDeployerResolver {
49
49
  return;
50
50
  }
51
51
  console.log(`[${id}]: trying to resolve latest version...`);
52
- const extension = await this.client.getLatestCompatibleExtensionVersion(id);
52
+ const client = await this.clientProvider();
53
+ const extension = await client.getLatestCompatibleExtensionVersion(id);
53
54
  if (!extension) {
54
55
  return;
55
56
  }
@@ -17,18 +17,20 @@
17
17
  import { ContainerModule } from '@theia/core/shared/inversify';
18
18
  import { VSXExtensionResolver } from './vsx-extension-resolver';
19
19
  import { PluginDeployerResolver } from '@theia/plugin-ext/lib/common/plugin-protocol';
20
- import { VSCODE_DEFAULT_API_VERSION, VSX_REGISTRY_URL_DEFAULT } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-types';
21
- import { OVSXClient } from '@theia/ovsx-client/lib/ovsx-client';
20
+ import { OVSXClientProvider, createOVSXClient } from '../common/ovsx-client-provider';
21
+ import { VSXEnvironment, VSX_ENVIRONMENT_PATH } from '../common/vsx-environment';
22
+ import { VSXEnvironmentImpl } from './vsx-environment-impl';
23
+ import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core';
22
24
 
23
25
  export default new ContainerModule(bind => {
24
- bind(OVSXClient).toConstantValue(new OVSXClient({
25
- apiVersion: process.env['VSCODE_API_VERSION'] || VSCODE_DEFAULT_API_VERSION,
26
- apiUrl: resolveRegistryUrl()
27
- }));
26
+ bind<OVSXClientProvider>(OVSXClientProvider).toDynamicValue(ctx => {
27
+ const clientPromise = createOVSXClient(ctx.container.get(VSXEnvironment));
28
+ return () => clientPromise;
29
+ }).inSingletonScope();
30
+ bind(VSXEnvironment).to(VSXEnvironmentImpl).inSingletonScope();
31
+ bind(ConnectionHandler).toDynamicValue(
32
+ ctx => new JsonRpcConnectionHandler(VSX_ENVIRONMENT_PATH, () => ctx.container.get(VSXEnvironment))
33
+ ).inSingletonScope();
28
34
  bind(VSXExtensionResolver).toSelf().inSingletonScope();
29
35
  bind(PluginDeployerResolver).toService(VSXExtensionResolver);
30
36
  });
31
-
32
- function resolveRegistryUrl(): string {
33
- return process.env['VSX_REGISTRY_URL'] || VSX_REGISTRY_URL_DEFAULT;
34
- }
@@ -1 +0,0 @@
1
- {"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"}
@@ -1 +0,0 @@
1
- {"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"}
@@ -1,51 +0,0 @@
1
- /********************************************************************************
2
- * Copyright (C) 2020 TypeFox and others.
3
- *
4
- * This program and the accompanying materials are made available under the
5
- * terms of the Eclipse Public License v. 2.0 which is available at
6
- * http://www.eclipse.org/legal/epl-2.0.
7
- *
8
- * This Source Code may also be made available under the following Secondary
9
- * Licenses when the conditions for such availability set forth in the Eclipse
10
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
- * with the GNU Classpath Exception which is available at
12
- * https://www.gnu.org/software/classpath/license.html.
13
- *
14
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
- ********************************************************************************/
16
-
17
- import { injectable, inject } from '@theia/core/shared/inversify';
18
- import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
19
- import URI from '@theia/core/lib/common/uri';
20
- import { VSCODE_DEFAULT_API_VERSION } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-types';
21
-
22
- @injectable()
23
- export class VSXEnvironment {
24
-
25
- @inject(EnvVariablesServer)
26
- protected readonly environments: EnvVariablesServer;
27
-
28
- protected _registryUri: URI | undefined;
29
- async getRegistryUri(): Promise<URI> {
30
- if (!this._registryUri) {
31
- const vsxRegistryUrl = await this.environments.getValue('VSX_REGISTRY_URL');
32
- this._registryUri = new URI(vsxRegistryUrl && vsxRegistryUrl.value || 'https://open-vsx.org');
33
- }
34
- return this._registryUri;
35
- }
36
-
37
- async getRegistryApiUri(): Promise<URI> {
38
- const registryUri = await this.getRegistryUri();
39
- return registryUri.resolve('api');
40
- }
41
-
42
- protected _apiVersion: string | undefined;
43
- async getVscodeApiVersion(): Promise<string> {
44
- if (!this._apiVersion) {
45
- const apiVersion = await this.environments.getValue('VSCODE_API_VERSION');
46
- this._apiVersion = apiVersion?.value || VSCODE_DEFAULT_API_VERSION;
47
- }
48
- return this._apiVersion;
49
- }
50
-
51
- }