@psdk/ohos-usb 0.5.17 → 0.5.19

package/README.md

@@ -10,11 +10,14 @@ npm i @psdk/ohos-usb
 ## How to use
 
 ```js
-const usb = new OhosUsb({});
-usb.discovered(async (devices) => {
-  // ...
-});
-
-await usb.startDiscovery();
+//open usb
+const usb = new OhosUsb();
+const connectDevice = usb.openUsb();
+// init device
+PrinterUtil.getInstance().init(connectDevice);
+// send data
+const report = await PrinterUtil.getInstance().cpcl()
+  .raw(Raw.binary(Uint8Array.from([0x10, 0xff, 0xbf])))
+  .write();
 ```
 

package/build/connected.d.ts

@@ -9,6 +9,7 @@ export declare class OhosUsbConnectedDevice implements ConnectedDevice {
     private readonly options;
     constructor(options: OusbOptions);
     get device(): usb.USBDevice;
+    get ohosUsb(): OhosUsb;
     canRead(): boolean;
     connectionState(): ConnectionState;
     deviceName(): string;

package/build/connected.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connected.d.ts","sourceRoot":"","sources":["../src/connected.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAE,eAAe,EAAE,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAEjF,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAC;AACnC,OAAO,GAAG,MAAM,kBAAkB,CAAC;AAEnC,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,GAAG,CAAC,SAAS,CAAA;CACtB;AAED,qBAAa,sBAAuB,YAAW,eAAe;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAEnB,OAAO,EAAE,WAAW;IAIvC,IAAI,MAAM,IAAI,GAAG,CAAC,SAAS,CAE1B;IAED,OAAO,IAAI,OAAO;IAIlB,eAAe,IAAI,eAAe;IAIlC,UAAU,IAAI,MAAM;IAIpB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,KAAK,IAAI,IAAI;IAEb,MAAM,IAAI,GAAG;IAIb,IAAI,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAO1C,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAO7C"}
+{"version":3,"file":"connected.d.ts","sourceRoot":"","sources":["../src/connected.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAE,eAAe,EAAE,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAEjF,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAC;AACnC,OAAO,GAAG,MAAM,kBAAkB,CAAC;AAEnC,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,GAAG,CAAC,SAAS,CAAA;CACtB;AAED,qBAAa,sBAAuB,YAAW,eAAe;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAEnB,OAAO,EAAE,WAAW;IAIvC,IAAI,MAAM,IAAI,GAAG,CAAC,SAAS,CAE1B;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,OAAO,IAAI,OAAO;IAIlB,eAAe,IAAI,eAAe;IAIlC,UAAU,IAAI,MAAM;IAIpB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,KAAK,IAAI,IAAI;IAEb,MAAM,IAAI,GAAG;IAIb,IAAI,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAO1C,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAO7C"}

package/build/connected.js

@@ -1,27 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OhosUsbConnectedDevice = void 0;
 // @ts-nocheck
-const frame_father_1 = require("@psdk/frame-father");
-class OhosUsbConnectedDevice {
+import { ConnectionState } from "@psdk/frame-father";
+export class OhosUsbConnectedDevice {
+    options;
     constructor(options) {
         this.options = options;
     }
     get device() {
         return this.options.device;
     }
+    get ohosUsb() {
+        return this.options.ohosUsb;
+    }
     canRead() {
         return true;
     }
     connectionState() {
-        return this.options.ohosUsb.isOpened() ? frame_father_1.ConnectionState.CONNECTED : frame_father_1.ConnectionState.DISCONNECTED;
+        return this.ohosUsb.isOpened() ? ConnectionState.CONNECTED : ConnectionState.DISCONNECTED;
     }
     deviceName() {
-        var _a;
-        return (_a = this.options.ohosUsb.deviceName()) !== null && _a !== void 0 ? _a : '';
+        return this.ohosUsb.deviceName() ?? '';
     }
     disconnect() {
-        this.options.ohosUsb.closeUsb();
+        this.ohosUsb.closeUsb();
     }
     flush() { }
     origin() {
@@ -29,7 +29,7 @@ class OhosUsbConnectedDevice {
     }
     read(options) {
         const temp = new Uint8Array(512);
-        const length = this.options.ohosUsb.read_usb(temp);
+        const length = this.ohosUsb.read_usb(temp);
         const receive = temp.slice(0, length);
         return Promise.resolve(receive);
     }
@@ -37,7 +37,6 @@ class OhosUsbConnectedDevice {
         if (!this.options) {
             throw new Error('can not found OusbOptions.');
         }
-        await this.options.ohosUsb.send_usb(data);
+        await this.ohosUsb.send_usb(data);
     }
 }
-exports.OhosUsbConnectedDevice = OhosUsbConnectedDevice;

package/build/index.js

@@ -1,18 +1,2 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./connected"), exports);
-__exportStar(require("./provider"), exports);
+export * from './connected';
+export * from './provider';

package/build/provider.d.ts

@@ -10,7 +10,7 @@ export declare class OhosUsb {
     /**
      * 打开USB端口
      */
-    openUsb(): ConnectedDevice;
+    openUsb(): Promise<ConnectedDevice>;
     initCommunication(device: usb.USBDevice): boolean;
     /**
      * 获得usb打开状态

package/build/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAEnD,OAAO,GAAG,MAAM,kBAAkB,CAAC;AASnC,qBAAa,OAAO;IAClB,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,eAAe,CAAC,CAAyB;IAEjD,UAAU,IAAI,MAAM;IAIpB;;OAEG;IACH,OAAO,IAAI,eAAe;IAwB1B,iBAAiB,CAAC,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,OAAO;IAoCjD;;;;OAIG;IACH,QAAQ,IAAI,OAAO;IAInB;;OAEG;IACH,QAAQ;IAWF,QAAQ,CAAC,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAuDtD;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM;CAiBxC"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAEnD,OAAO,GAAG,MAAM,kBAAkB,CAAC;AASnC,qBAAa,OAAO;IAClB,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,eAAe,CAAC,CAAyB;IAEjD,UAAU,IAAI,MAAM;IAIpB;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IA2BzC,iBAAiB,CAAC,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,OAAO;IAoCjD;;;;OAIG;IACH,QAAQ,IAAI,OAAO;IAInB;;OAEG;IACH,QAAQ;IAWF,QAAQ,CAAC,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAuDtD;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM;CAiBxC"}

package/build/provider.js

@@ -1,43 +1,38 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OhosUsb = void 0;
 // @ts-nocheck
-const connected_1 = require("./connected");
-const _ohos_usbManager_1 = __importDefault(require("@ohos.usbManager"));
+import { OhosUsbConnectedDevice } from "./connected";
+import usb from '@ohos.usbManager';
 let currentDevice;
 let mUsbInterface;
 let mUsbEndpointOut;
 let mUsbEndpointIn;
 let mUsbDeviceConnection;
-class OhosUsb {
-    constructor() {
-        this.VIDQR = 0x09C5;
-        this.VIDMY = 0x09C6;
-        this.VIDIP = 0x353D;
-        this.isOpen = false;
-    }
+export class OhosUsb {
+    VIDQR = 0x09C5;
+    VIDMY = 0x09C6;
+    VIDIP = 0x353D;
+    isOpen = false;
+    connectedDevice;
     deviceName() {
-        var _a;
-        return (_a = currentDevice.name) !== null && _a !== void 0 ? _a : '';
+        return currentDevice.name ?? '';
     }
     /**
      * 打开USB端口
      */
-    openUsb() {
-        let devicesList = _ohos_usbManager_1.default.getDevices();
+    async openUsb() {
+        let devicesList = usb.getDevices();
         for (let i = 0; i < devicesList.length; i++) {
             if ((devicesList[i].vendorId == this.VIDQR) || (devicesList[i].vendorId == this.VIDMY) || (devicesList[i].vendorId == this.VIDIP)) {
                 currentDevice = devicesList[i];
-                if (!_ohos_usbManager_1.default.hasRight(devicesList[i].name)) {
-                    _ohos_usbManager_1.default.requestRight(devicesList[i].name);
+                if (!usb.hasRight(devicesList[i].name)) {
+                    const hasRight = await usb.requestRight(devicesList[i].name);
+                    if (!hasRight) {
+                        return null;
+                    }
                 }
                 try {
                     if (this.initCommunication(devicesList[i])) {
-                        this.connectedDevice = new connected_1.OhosUsbConnectedDevice({
-                            ...this,
+                        this.connectedDevice = new OhosUsbConnectedDevice({
+                            ohosUsb: this,
                             device: currentDevice,
                         });
                         return this.connectedDevice;
@@ -61,10 +56,10 @@ class OhosUsb {
             for (let i = 0; i < usbInterface.endpoints.length; i++) {
                 let ep = usbInterface.endpoints[i];
                 if (ep.type == 2) {
-                    if (ep.direction == _ohos_usbManager_1.default.USBRequestDirection.USB_REQUEST_DIR_TO_DEVICE) {
+                    if (ep.direction == usb.USBRequestDirection.USB_REQUEST_DIR_TO_DEVICE) {
                         mUsbEndpointOut = ep;
                     }
-                    else if (ep.direction == _ohos_usbManager_1.default.USBRequestDirection.USB_REQUEST_DIR_FROM_DEVICE) {
+                    else if (ep.direction == usb.USBRequestDirection.USB_REQUEST_DIR_FROM_DEVICE) {
                         mUsbEndpointIn = ep;
                     }
                 }
@@ -76,7 +71,7 @@ class OhosUsb {
                 return false;
             }
             else {
-                if (!_ohos_usbManager_1.default.hasRight(currentDevice.name)) {
+                if (!usb.hasRight(currentDevice.name)) {
                     this.isOpen = false;
                     return false;
                 }
@@ -103,8 +98,8 @@ class OhosUsb {
         mUsbEndpointIn = null;
         mUsbEndpointOut = null;
         if (mUsbDeviceConnection != null) {
-            _ohos_usbManager_1.default.releaseInterface(mUsbDeviceConnection, mUsbInterface);
-            _ohos_usbManager_1.default.closePipe(mUsbDeviceConnection);
+            usb.releaseInterface(mUsbDeviceConnection, mUsbInterface);
+            usb.closePipe(mUsbDeviceConnection);
             mUsbDeviceConnection = null;
             this.isOpen = false;
         }
@@ -118,13 +113,13 @@ class OhosUsb {
         let index = 0;
         if (currentDevice != null) {
             if (mUsbDeviceConnection == null) {
-                _ohos_usbManager_1.default.requestRight(currentDevice.name);
-                mUsbDeviceConnection = _ohos_usbManager_1.default.connectDevice(currentDevice);
-                let ret = _ohos_usbManager_1.default.claimInterface(mUsbDeviceConnection, mUsbInterface, true);
+                await usb.requestRight(currentDevice.name);
+                mUsbDeviceConnection = usb.connectDevice(currentDevice);
+                let ret = usb.claimInterface(mUsbDeviceConnection, mUsbInterface, true);
             }
             if (mUsbEndpointOut != null) {
                 if (count == 1) {
-                    let result = await _ohos_usbManager_1.default.bulkTransfer(mUsbDeviceConnection, mUsbEndpointOut, sendData, 1500);
+                    let result = await usb.bulkTransfer(mUsbDeviceConnection, mUsbEndpointOut, sendData, 1500);
                     if (result == -1) {
                         return false;
                     }
@@ -136,7 +131,7 @@ class OhosUsb {
                             for (let j = 0; j < yushu; j++) {
                                 temp[j] = sendData[index + j];
                             }
-                            let result = await _ohos_usbManager_1.default.bulkTransfer(mUsbDeviceConnection, mUsbEndpointOut, temp, 1500);
+                            let result = await usb.bulkTransfer(mUsbDeviceConnection, mUsbEndpointOut, temp, 1500);
                             if (result == -1) {
                                 return false;
                             }
@@ -147,7 +142,7 @@ class OhosUsb {
                             for (let j = 0; j < size; j++) {
                                 temp[j] = sendData[index + j];
                             }
-                            let result = await _ohos_usbManager_1.default.bulkTransfer(mUsbDeviceConnection, mUsbEndpointOut, temp, 1500);
+                            let result = await usb.bulkTransfer(mUsbDeviceConnection, mUsbEndpointOut, temp, 1500);
                             index += size;
                             if (result == -1) {
                                 return false;
@@ -175,11 +170,11 @@ class OhosUsb {
      */
     read_usb(tempBytes) {
         if (mUsbDeviceConnection == null) {
-            _ohos_usbManager_1.default.requestRight(currentDevice.name);
-            mUsbDeviceConnection = _ohos_usbManager_1.default.connectDevice(currentDevice);
-            let ret = _ohos_usbManager_1.default.claimInterface(mUsbDeviceConnection, mUsbInterface, true);
+            await usb.requestRight(currentDevice.name);
+            mUsbDeviceConnection = usb.connectDevice(currentDevice);
+            let ret = usb.claimInterface(mUsbDeviceConnection, mUsbInterface, true);
         }
-        _ohos_usbManager_1.default.bulkTransfer(mUsbDeviceConnection, mUsbEndpointIn, tempBytes, 15000).then((dataLength) => {
+        usb.bulkTransfer(mUsbDeviceConnection, mUsbEndpointIn, tempBytes, 15000).then((dataLength) => {
             if (dataLength >= 0) {
                 return dataLength;
             }
@@ -192,4 +187,3 @@ class OhosUsb {
         return 0;
     }
 }
-exports.OhosUsb = OhosUsb;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@psdk/ohos-usb",
-  "version": "0.5.17",
+  "version": "0.5.19",
   "description": "psdk - ohos usb device support",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -24,12 +24,12 @@
     "typescript": "^5.5.3"
   },
   "dependencies": {
-    "@psdk/frame-father": "0.5.17",
+    "@psdk/frame-father": "0.5.19",
     "await-timeout": "^1.1.1"
   },
   "files": [
     "build",
     "!build/browser/psdk*"
   ],
-  "gitHead": "46943a9d832ca94079de06670bc167c18feddf60"
+  "gitHead": "506be0edc5199fa87cb69af7c32b84f9e106b426"
 }