support hosted web extension (microsoft#183375)

Author: sandy081

src/vs/workbench/browser/web.api.ts

@@ -220,7 +220,7 @@ export interface IWorkbenchConstructionOptions {
 	 * 	- an extension in the Marketplace
 	 * 	- location of the extension where it is hosted.
 	 */
-	readonly additionalBuiltinExtensions?: readonly (MarketplaceExtension | UriComponents)[];
+	readonly additionalBuiltinExtensions?: readonly (MarketplaceExtension | UriComponents | HostedExtension)[];
 
 	/**
 	 * List of extensions to be enabled if they are installed.
@@ -373,6 +373,14 @@ export interface IResourceUriProvider {
 export type ExtensionId = string;
 
 export type MarketplaceExtension = ExtensionId | { readonly id: ExtensionId; preRelease?: boolean; migrateStorageFrom?: ExtensionId };
+export interface HostedExtension {
+	readonly location: UriComponents;
+	readonly preRelease?: boolean;
+	readonly packageNLSUris?: Map<string, UriComponents>;
+	readonly fallbackPackageNLSUri?: UriComponents;
+	readonly readmeUri?: UriComponents;
+	readonly changelogUri?: UriComponents;
+}
 
 export interface ICommonTelemetryPropertiesResolver {
 	(): { [key: string]: any };

src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts

@@ -45,6 +45,14 @@ import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/use
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 
 type GalleryExtensionInfo = { readonly id: string; preRelease?: boolean; migrateStorageFrom?: string };
+interface HostedExtensionInfo {
+	readonly location: UriComponents;
+	readonly preRelease?: boolean;
+	readonly packageNLSUris?: Map<string, UriComponents>;
+	readonly fallbackPackageNLSUri?: UriComponents;
+	readonly readmeUri?: UriComponents;
+	readonly changelogUri?: UriComponents;
+}
 type ExtensionInfo = { readonly id: string; preRelease: boolean };
 
 function isGalleryExtensionInfo(obj: unknown): obj is GalleryExtensionInfo {
@@ -54,6 +62,23 @@ function isGalleryExtensionInfo(obj: unknown): obj is GalleryExtensionInfo {
 		&& (galleryExtensionInfo.migrateStorageFrom === undefined || typeof galleryExtensionInfo.migrateStorageFrom === 'string');
 }
 
+function isHostedExtensionInfo(obj: unknown): obj is HostedExtensionInfo {
+	const hostedExtensionInfo = obj as HostedExtensionInfo | undefined;
+	return isUriComponents(hostedExtensionInfo?.location)
+		&& (hostedExtensionInfo?.preRelease === undefined || typeof hostedExtensionInfo.preRelease === 'boolean')
+		&& (hostedExtensionInfo?.fallbackPackageNLSUri === undefined || isUriComponents(hostedExtensionInfo?.fallbackPackageNLSUri))
+		&& (hostedExtensionInfo?.changelogUri === undefined || isUriComponents(hostedExtensionInfo?.changelogUri))
+		&& (hostedExtensionInfo?.readmeUri === undefined || isUriComponents(hostedExtensionInfo?.readmeUri));
+}
+
+function isUriComponents(thing: unknown): thing is UriComponents {
+	if (!thing) {
+		return false;
+	}
+	return isString((<any>thing).path) &&
+		isString((<any>thing).scheme);
+}
+
 interface IStoredWebExtension {
 	readonly identifier: IExtensionIdentifier;
 	readonly version: string;
@@ -117,12 +142,12 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
 		}
 	}
 
-	private _customBuiltinExtensionsInfoPromise: Promise<{ extensions: ExtensionInfo[]; extensionsToMigrate: [string, string][]; extensionLocations: URI[] }> | undefined;
-	private readCustomBuiltinExtensionsInfoFromEnv(): Promise<{ extensions: ExtensionInfo[]; extensionsToMigrate: [string, string][]; extensionLocations: URI[] }> {
+	private _customBuiltinExtensionsInfoPromise: Promise<{ extensions: ExtensionInfo[]; extensionsToMigrate: [string, string][]; extensionLocations: HostedExtensionInfo[] }> | undefined;
+	private readCustomBuiltinExtensionsInfoFromEnv(): Promise<{ extensions: ExtensionInfo[]; extensionsToMigrate: [string, string][]; extensionLocations: HostedExtensionInfo[] }> {
 		if (!this._customBuiltinExtensionsInfoPromise) {
 			this._customBuiltinExtensionsInfoPromise = (async () => {
 				let extensions: ExtensionInfo[] = [];
-				const extensionLocations: URI[] = [];
+				const extensionLocations: HostedExtensionInfo[] = [];
 				const extensionsToMigrate: [string, string][] = [];
 				const customBuiltinExtensionsInfo = this.environmentService.options && Array.isArray(this.environmentService.options.additionalBuiltinExtensions)
 					? this.environmentService.options.additionalBuiltinExtensions.map(additionalBuiltinExtension => isString(additionalBuiltinExtension) ? { id: additionalBuiltinExtension } : additionalBuiltinExtension)
@@ -134,7 +159,11 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
 							extensionsToMigrate.push([e.migrateStorageFrom, e.id]);
 						}
 					} else {
-						extensionLocations.push(URI.revive(e));
+						if (isHostedExtensionInfo(e)) {
+							extensionLocations.push(e);
+						} else {
+							extensionLocations.push({ location: e });
+						}
 					}
 				}
 				if (extensions.length) {
@@ -212,9 +241,14 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
 			return [];
 		}
 		const result: IScannedExtension[] = [];
-		await Promise.allSettled(extensionLocations.map(async location => {
+		await Promise.allSettled(extensionLocations.map(async ({ location, preRelease, packageNLSUris, fallbackPackageNLSUri, readmeUri, changelogUri }) => {
 			try {
-				const webExtension = await this.toWebExtension(location);
+				const webExtension = await this.toWebExtension(URI.revive(location), undefined,
+					packageNLSUris ? [...packageNLSUris.entries()].reduce((result, [key, value]) => { result.set(key, URI.revive(value)); return result; }, new Map<string, URI>()) : undefined,
+					URI.revive(fallbackPackageNLSUri),
+					URI.revive(readmeUri),
+					URI.revive(changelogUri),
+					{ preRelease });
 				const extension = await this.toScannedExtension(webExtension, true);
 				if (extension.isValid || !scanOptions?.skipInvalidExtensions) {
 					result.push(extension);