@psdk/device-webusb 0.3.3 → 0.4.0

package/build/index.d.ts

@@ -3,8 +3,10 @@ export declare class Webusb {
     private readonly filters;
     private readonly configuration;
     private readonly interface;
-    private readonly readEndpoint;
-    private readonly writeEndpoint;
+    private readEndpoint;
+    private writeEndpoint;
+    private inputReadEndpoint?;
+    private inputWriteEndpoint?;
     private state;
     private device?;
     constructor(options: {

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAmB,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAEjF,qBAAa,MAAM;IACjB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,MAAM,CAAC,CAAM;gBAEF,OAAO,EAAE;QAC1B;;WAEG;QACH,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;QAC7B;;WAEG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB;;WAEG;QACH,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB;;WAEG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB;WAYa,UAAU,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM;WAIxC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,MAAM;IAIlD,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;YA4BlC,eAAe;CAwD9B;AAED,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAErB,OAAO,CAAC,EAAE;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB;;WAEG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;WAKa,GAAG,IAAI,iBAAiB;IAItC,IAAI,UAAU,IAAI,MAAM,CAEvB;CACF;AAED,qBAAa,YAAY;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;gBAEP,OAAO,EAAE;QAC1B;;WAEG;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB;;WAEG;QACH,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;CAIF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAmB,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAEjF,qBAAa,MAAM;IACjB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,iBAAiB,CAAC,CAAS;IACnC,OAAO,CAAC,kBAAkB,CAAC,CAAS;IAEpC,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,MAAM,CAAC,CAAM;gBAEF,OAAO,EAAE;QAC1B;;WAEG;QACH,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;QAC7B;;WAEG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB;;WAEG;QACH,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB;;WAEG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB;WAYa,UAAU,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM;WAIxC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,MAAM;IAIlD,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;YAkClC,eAAe;CAwD9B;AAED,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAErB,OAAO,CAAC,EAAE;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB;;WAEG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;WAKa,GAAG,IAAI,iBAAiB;IAItC,IAAI,UAAU,IAAI,MAAM,CAEvB;CACF;AAED,qBAAa,YAAY;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;gBAEP,OAAO,EAAE;QAC1B;;WAEG;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB;;WAEG;QACH,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;CAIF"}

package/build/index.js

@@ -1,25 +1,27 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { ConnectionState, ReadOptions } from "@psdk/frame-father";
-export class Webusb {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceFilter = exports.WebusbReadOptions = exports.Webusb = void 0;
+const frame_father_1 = require("@psdk/frame-father");
+class Webusb {
+    filters;
+    configuration;
+    interface;
+    readEndpoint;
+    writeEndpoint;
+    inputReadEndpoint;
+    inputWriteEndpoint;
+    state;
+    device;
     constructor(options) {
-        var _a, _b, _c, _d;
         if (options.filters.length == 0) {
             throw new Error('Missing filters');
         }
         this.filters = options.filters;
-        this.configuration = (_a = options.configuration) !== null && _a !== void 0 ? _a : 1;
-        this.interface = (_b = options.interface) !== null && _b !== void 0 ? _b : 0;
-        this.state = ConnectionState.DISCONNECTED;
-        this.readEndpoint = (_c = options.readEndpoint) !== null && _c !== void 0 ? _c : 2;
-        this.writeEndpoint = (_d = options.writeEndpoint) !== null && _d !== void 0 ? _d : 2;
+        this.configuration = options.configuration ?? 1;
+        this.interface = options.interface ?? 0;
+        this.state = frame_father_1.ConnectionState.DISCONNECTED;
+        this.inputReadEndpoint = options.readEndpoint ?? 2;
+        this.inputWriteEndpoint = options.writeEndpoint ?? 2;
     }
     static withFilter(filter) {
         return this.withFilters([filter]);
@@ -27,97 +29,93 @@ export class Webusb {
     static withFilters(filters) {
         return new Webusb({ filters });
     }
-    connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
-            if (!navigator.usb) {
-                throw new Error('Your browser not support webusb');
-            }
-            // @ts-ignore
-            const device = yield navigator.usb.requestDevice({
-                filters: this.filters,
-            });
-            if (!device)
-                throw new Error('Failed to get device');
-            yield device.open();
-            yield device.selectConfiguration(this.configuration);
-            yield device.claimInterface(device.configuration.interfaces[this.interface].interfaceNumber);
-            this.state = ConnectionState.CONNECTED;
-            // @ts-ignore
-            navigator.usb.addEventListener('connect', e => {
-                this.state = ConnectionState.CONNECTED;
-            });
-            // @ts-ignore
-            navigator.usb.addEventListener('disconnect', e => {
-                this.state = ConnectionState.DISCONNECTED;
-            });
-            this.device = device;
-            return yield this.connectedDevice();
+    async connect() {
+        // @ts-ignore
+        if (!navigator.usb) {
+            throw new Error('Your browser not support webusb');
+        }
+        // @ts-ignore
+        const device = await navigator.usb.requestDevice({
+            filters: this.filters,
+        });
+        if (!device)
+            throw new Error('Failed to get device');
+        await device.open();
+        await device.selectConfiguration(this.configuration);
+        await device.claimInterface(device.configuration.interfaces[this.interface].interfaceNumber);
+        const alternates = device.configuration.interfaces[0].alternates[0];
+        const inEndpoints = alternates.endpoints.filter(endpoint => endpoint.direction === 'in');
+        const outEndpoints = alternates.endpoints.filter(endpoint => endpoint.direction === 'out');
+        this.readEndpoint = inEndpoints && inEndpoints.length ? inEndpoints[0].endpointNumber : this.inputReadEndpoint;
+        this.writeEndpoint = outEndpoints && outEndpoints.length ? outEndpoints[0].endpointNumber : this.inputWriteEndpoint;
+        this.state = frame_father_1.ConnectionState.CONNECTED;
+        // @ts-ignore
+        navigator.usb.addEventListener('connect', e => {
+            this.state = frame_father_1.ConnectionState.CONNECTED;
         });
+        // @ts-ignore
+        navigator.usb.addEventListener('disconnect', e => {
+            this.state = frame_father_1.ConnectionState.DISCONNECTED;
+        });
+        this.device = device;
+        return await this.connectedDevice();
     }
-    connectedDevice() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const _device = () => this.device;
-            const _connectionState = () => this.state;
-            const _readEndpoint = () => this.readEndpoint;
-            const _writeEndpoint = () => this.writeEndpoint;
-            return new class {
-                origin() {
-                    return _device();
-                }
-                connectionState() {
-                    const device = _device();
-                    if (!device.opened) {
-                        return ConnectionState.DISCONNECTED;
-                    }
-                    return _connectionState();
-                }
-                deviceName() {
-                    const device = _device();
-                    return device.productName;
-                }
-                disconnect() {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        // todo: disconnect webusb
-                    });
-                }
-                canRead() {
-                    return true;
-                }
-                read(options) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        const device = _device();
-                        const _options = options !== null && options !== void 0 ? options : WebusbReadOptions.def();
-                        const result = yield device.transferIn(_readEndpoint(), _options.readLength);
-                        const { status, data } = result;
-                        if (status != 'ok') {
-                            throw new Error(`[${status}]: Failed to read data. about status code you can read this https://developer.mozilla.org/en-US/docs/Web/API/USBInTransferResult`);
-                        }
-                        const arrs = [];
-                        const len = data.byteLength;
-                        for (let i = 0; i < len; i++) {
-                            arrs.push(data.getUint8(i));
-                        }
-                        return new Uint8Array(arrs);
-                    });
+    async connectedDevice() {
+        const _device = () => this.device;
+        const _connectionState = () => this.state;
+        const _readEndpoint = () => this.readEndpoint;
+        const _writeEndpoint = () => this.writeEndpoint;
+        return new class {
+            origin() {
+                return _device();
+            }
+            connectionState() {
+                const device = _device();
+                if (!device.opened) {
+                    return frame_father_1.ConnectionState.DISCONNECTED;
                 }
-                write(data) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        const device = _device();
-                        yield device.transferOut(_writeEndpoint(), data);
-                    });
+                return _connectionState();
+            }
+            deviceName() {
+                const device = _device();
+                return device.productName;
+            }
+            async disconnect() {
+                // todo: disconnect webusb
+            }
+            canRead() {
+                return true;
+            }
+            async read(options) {
+                const device = _device();
+                const _options = options ?? WebusbReadOptions.def();
+                const result = await device.transferIn(_readEndpoint(), _options.readLength);
+                const { status, data } = result;
+                if (status != 'ok') {
+                    throw new Error(`[${status}]: Failed to read data. about status code you can read this https://developer.mozilla.org/en-US/docs/Web/API/USBInTransferResult`);
                 }
-                flush() {
+                const arrs = [];
+                const len = data.byteLength;
+                for (let i = 0; i < len; i++) {
+                    arrs.push(data.getUint8(i));
                 }
-            };
-        });
+                return new Uint8Array(arrs);
+            }
+            async write(data) {
+                const device = _device();
+                await device.transferOut(_writeEndpoint(), data);
+            }
+            flush() {
+            }
+        };
     }
 }
-export class WebusbReadOptions extends ReadOptions {
+exports.Webusb = Webusb;
+class WebusbReadOptions extends frame_father_1.ReadOptions {
+    _length;
     constructor(options) {
-        var _a;
         super(options);
-        this._length = (_a = options === null || options === void 0 ? void 0 : options.length) !== null && _a !== void 0 ? _a : 1024;
+        this._length = options?.length ?? 1024;
     }
     static def() {
         return new WebusbReadOptions();
@@ -126,9 +124,13 @@ export class WebusbReadOptions extends ReadOptions {
         return this._length;
     }
 }
-export class DeviceFilter {
+exports.WebusbReadOptions = WebusbReadOptions;
+class DeviceFilter {
+    vendorId;
+    productId;
     constructor(options) {
         this.vendorId = options.vendorId;
         this.productId = options.productId;
     }
 }
+exports.DeviceFilter = DeviceFilter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@psdk/device-webusb",
-  "version": "0.3.3",
+  "version": "0.4.0",
   "description": "psdk",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -12,22 +12,20 @@
   },
   "author": "",
   "devDependencies": {
-    "@babel/core": "^7.24.5",
-    "@babel/preset-env": "^7.24.5",
-    "@babel/preset-typescript": "^7.24.1",
     "@types/jest": "^29.5.12",
     "@vercel/ncc": "^0.38.1",
-    "babel-jest": "^29.7.0",
     "jest": "^29.7.0",
-    "typedoc": "^0.25.13",
-    "typescript": "^5.4.5"
+    "ts-jest": "^29.1.5",
+    "ts-node": "^10.9.2",
+    "typedoc": "^0.26.4",
+    "typescript": "^5.5.3"
   },
   "dependencies": {
-    "@psdk/frame-father": "0.3.3"
+    "@psdk/frame-father": "0.4.0"
   },
   "files": [
     "build",
     "!build/browser/psdk*"
   ],
-  "gitHead": "20a3fc1bb587f8d627f9b1e05dd27240b7785dec"
+  "gitHead": "13fa8cc6aacbf8f6bacb5f485da11a7610001f61"
 }