api - polish USB command

src/vs/base/browser/usb.ts

@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// https://wicg.github.io/webusb/
+
+export interface UsbDeviceData {
+	readonly deviceClass: number;
+	readonly deviceProtocol: number;
+	readonly deviceSubclass: number;
+	readonly deviceVersionMajor: number;
+	readonly deviceVersionMinor: number;
+	readonly deviceVersionSubminor: number;
+	readonly manufacturerName?: string;
+	readonly productId: number;
+	readonly productName?: string;
+	readonly serialNumber?: string;
+	readonly usbVersionMajor: number;
+	readonly usbVersionMinor: number;
+	readonly usbVersionSubminor: number;
+	readonly vendorId: number;
+}
+
+export async function requestUsb(options?: { filters?: unknown[] }): Promise<UsbDeviceData | undefined> {
+	const usb = (navigator as any).usb;
+	if (!usb) {
+		return undefined;
+	}
+
+	const device = await usb.requestDevice({ filters: options?.filters ?? [] });
+	if (!device) {
+		return undefined;
+	}
+
+	return {
+		deviceClass: device.deviceClass,
+		deviceProtocol: device.deviceProtocol,
+		deviceSubclass: device.deviceSubclass,
+		deviceVersionMajor: device.deviceVersionMajor,
+		deviceVersionMinor: device.deviceVersionMinor,
+		deviceVersionSubminor: device.deviceVersionSubminor,
+		manufacturerName: device.manufacturerName,
+		productId: device.productId,
+		productName: device.productName,
+		serialNumber: device.serialNumber,
+		usbVersionMajor: device.usbVersionMajor,
+		usbVersionMinor: device.usbVersionMinor,
+		usbVersionSubminor: device.usbVersionSubminor,
+		vendorId: device.vendorId,
+	};
+}

src/vs/workbench/browser/actions/workspaceCommands.ts

@@ -24,7 +24,6 @@ import { IOpenEmptyWindowOptions, IOpenWindowOptions, IWindowOpenable } from 'vs
 import { IRecent, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
 import { ILocalizedString } from 'vs/platform/action/common/action';
-import { isWeb } from 'vs/base/common/platform';
 
 export const ADD_ROOT_FOLDER_COMMAND_ID = 'addRootFolder';
 export const ADD_ROOT_FOLDER_LABEL: ILocalizedString = { value: localize('addFolderToWorkspace', "Add Folder to Workspace..."), original: 'Add Folder to Workspace...' };
@@ -308,43 +307,3 @@ CommandsRegistry.registerCommand('_workbench.getRecentlyOpened', async function
 	return workspacesService.getRecentlyOpened();
 });
 
-if (isWeb) {
-	interface UsbDeviceData {
-		readonly deviceClass: number;
-		readonly deviceProtocol: number;
-		readonly deviceSubclass: number;
-		readonly deviceVersionMajor: number;
-		readonly deviceVersionMinor: number;
-		readonly deviceVersionSubminor: number;
-		readonly manufacturerName?: string;
-		readonly productId: number;
-		readonly productName?: string;
-		readonly serialNumber?: string;
-		readonly usbVersionMajor: number;
-		readonly usbVersionMinor: number;
-		readonly usbVersionSubminor: number;
-		readonly vendorId: number;
-	}
-	CommandsRegistry.registerCommand('workbench.experimental.requestUsbDevice', async (_accessor: ServicesAccessor, options?: { filters?: unknown[] }): Promise<UsbDeviceData | undefined> => {
-		const device = await (navigator as any).usb.requestDevice({ filters: options?.filters ?? [] });
-		if (!device) {
-			return undefined;
-		}
-		return {
-			deviceClass: device.deviceClass,
-			deviceProtocol: device.deviceProtocol,
-			deviceSubclass: device.deviceSubclass,
-			deviceVersionMajor: device.deviceVersionMajor,
-			deviceVersionMinor: device.deviceVersionMinor,
-			deviceVersionSubminor: device.deviceVersionSubminor,
-			manufacturerName: device.manufacturerName,
-			productId: device.productId,
-			productName: device.productName,
-			serialNumber: device.serialNumber,
-			usbVersionMajor: device.usbVersionMajor,
-			usbVersionMinor: device.usbVersionMinor,
-			usbVersionSubminor: device.usbVersionSubminor,
-			vendorId: device.vendorId,
-		};
-	});
-}

src/vs/workbench/browser/window.ts

@@ -6,6 +6,7 @@
 import { isSafari, setFullscreen } from 'vs/base/browser/browser';
 import { addDisposableListener, addDisposableThrottledListener, detectFullscreen, EventHelper, EventType, windowOpenNoOpener, windowOpenPopup, windowOpenWithSuccess } from 'vs/base/browser/dom';
 import { DomEmitter } from 'vs/base/browser/event';
+import { requestUsb, UsbDeviceData } from 'vs/base/browser/usb';
 import { timeout } from 'vs/base/common/async';
 import { Event } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
@@ -14,8 +15,10 @@ import { isIOS, isMacintosh } from 'vs/base/common/platform';
 import Severity from 'vs/base/common/severity';
 import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { registerWindowDriver } from 'vs/platform/driver/browser/driver';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IOpenerService, matchesScheme } from 'vs/platform/opener/common/opener';
 import { IProductService } from 'vs/platform/product/common/productService';
@@ -120,6 +123,9 @@ export class BrowserWindow extends Disposable {
 		// Label formatting
 		this.registerLabelFormatters();
 
+		// Commands
+		this.registerCommands();
+
 		// Smoke Test Driver
 		this.setupDriver();
 	}
@@ -227,7 +233,7 @@ export class BrowserWindow extends Disposable {
 		});
 	}
 
-	private registerLabelFormatters() {
+	private registerLabelFormatters(): void {
 		this._register(this.labelService.registerFormatter({
 			scheme: Schemas.vscodeUserData,
 			priority: true,
@@ -237,4 +243,12 @@ export class BrowserWindow extends Disposable {
 			}
 		}));
 	}
+
+	private registerCommands(): void {
+
+		// Allow extensions to request USB devices in Web
+		CommandsRegistry.registerCommand('workbench.experimental.requestUsbDevice', async (_accessor: ServicesAccessor, options?: { filters?: unknown[] }): Promise<UsbDeviceData | undefined> => {
+			return requestUsb(options);
+		});
+	}
 }