@onekeyfe/hd-transport-usb 1.1.26 → 1.1.27-alpha.30

package/dist/index.d.ts

@@ -1,9 +1,7 @@
 import * as transport from '@onekeyfe/hd-transport';
-import transport__default, { OneKeyDeviceInfo, AcquireInput } from '@onekeyfe/hd-transport';
+import transport__default, { ProtocolType, OneKeyDeviceInfo, AcquireInput } from '@onekeyfe/hd-transport';
 import EventEmitter from 'events';
 
-declare const PACKET_SIZE = 64;
-
 declare class NodeUsbTransport {
     messages: ReturnType<typeof transport__default.parseConfigure> | undefined;
     name: string;
@@ -16,6 +14,7 @@ declare class NodeUsbTransport {
     private openDevices;
     private reconnectLocks;
     private cancelled;
+    getProtocolType(_path: string): ProtocolType;
     init(logger: any, emitter?: EventEmitter): Promise<string>;
     configure(signedData: any): Promise<void>;
     listen(): void;
@@ -42,4 +41,4 @@ declare class NodeUsbTransport {
     private receiveData;
 }
 
-export { PACKET_SIZE, NodeUsbTransport as default };
+export { NodeUsbTransport as default };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,SAA8B,MAAM,wBAAwB,CAAC;AAKpE,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AA0J7E,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,QAAQ,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAElE,IAAI,SAAsB;IAE1B,OAAO,SAAM;IAEb,UAAU,UAAS;IAEnB,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAGvB,OAAO,CAAC,aAAa,CAA6B;IAGlD,OAAO,CAAC,WAAW,CAAiC;IAGpD,OAAO,CAAC,cAAc,CAA0C;IAGhE,OAAO,CAAC,SAAS,CAAS;IAM1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAMxC,SAAS,CAAC,UAAU,EAAE,GAAG;IAOzB,MAAM;IAIN,IAAI;IAQE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9E,IAAI,CAAC,IAAI,EAAE,MAAM;;;;;;IAiBjB,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IA8B9C,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAkBvC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BxD,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAkCpE,MAAM;IAWN,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,gBAAgB;IAoBxB,OAAO,CAAC,iBAAiB;YAmDX,sBAAsB;YAyCtB,mBAAmB;IAsCjC,OAAO,CAAC,UAAU;YAgEJ,WAAW;CAkC1B;AAED,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,SAMN,MAAM,wBAAwB,CAAC;AAGhC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AA+J3F,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,QAAQ,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAElE,IAAI,SAAsB;IAE1B,OAAO,SAAM;IAEb,UAAU,UAAS;IAEnB,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAGvB,OAAO,CAAC,aAAa,CAA6B;IAGlD,OAAO,CAAC,WAAW,CAAiC;IAGpD,OAAO,CAAC,cAAc,CAA0C;IAGhE,OAAO,CAAC,SAAS,CAAS;IAG1B,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY;IAQ5C,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAMxC,SAAS,CAAC,UAAU,EAAE,GAAG;IAOzB,MAAM;IAIN,IAAI;IAQE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9E,IAAI,CAAC,IAAI,EAAE,MAAM;;;;;;IAiBjB,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IA8B9C,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAkBvC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BxD,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAkCpE,MAAM;IAWN,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,gBAAgB;IAoBxB,OAAO,CAAC,iBAAiB;YAmDX,sBAAsB;YAyCtB,mBAAmB;IAsCjC,OAAO,CAAC,UAAU;YAgEJ,WAAW;CAkC1B"}

package/dist/index.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var ByteBuffer = require('bytebuffer');
 var usb = require('usb');
 var transport = require('@onekeyfe/hd-transport');
@@ -61,12 +59,11 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-const PACKET_SIZE = 64;
-const REPORT_ID = 0x3f;
-const PAYLOAD_SIZE = PACKET_SIZE - 1;
-const HEADER_LENGTH = 6;
-
-const { parseConfigure, buildEncodeBuffers, decodeProtocol, receiveOne, check } = transport__default["default"];
+const { parseConfigure, ProtocolV1, check } = transport__default["default"];
+const PACKET_SIZE = transport.PROTOCOL_V1_USB_PACKET_SIZE;
+const REPORT_ID = transport.PROTOCOL_V1_REPORT_ID;
+const PAYLOAD_SIZE = transport.PROTOCOL_V1_CHUNK_PAYLOAD_SIZE;
+const HEADER_LENGTH = transport.PROTOCOL_V1_MESSAGE_HEADER_SIZE;
 const INTERFACE_NUMBER = 0;
 const ENDPOINT_IN = 0x81;
 const ENDPOINT_OUT = 0x01;
@@ -174,6 +171,9 @@ class NodeUsbTransport {
         this.reconnectLocks = new Map();
         this.cancelled = false;
     }
+    getProtocolType(_path) {
+        return 'V1';
+    }
     init(logger, emitter) {
         this.Log = logger;
         this.emitter = emitter;
@@ -194,7 +194,7 @@ class NodeUsbTransport {
             if (!this.messages) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
-            const encodeBuffers = buildEncodeBuffers(this.messages, name, data);
+            const encodeBuffers = ProtocolV1.encodeMessageChunks(this.messages, name, data);
             yield this.sendAllChunksWithRetry(path, encodeBuffers);
         });
     }
@@ -208,7 +208,7 @@ class NodeUsbTransport {
             if (!this.messages) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
-            return receiveOne(this.messages, resData);
+            return ProtocolV1.decodeMessage(this.messages, resData);
         });
     }
     enumerate() {
@@ -295,13 +295,13 @@ class NodeUsbTransport {
             else {
                 (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug('NodeUsbTransport call-', ' name: ', name, ' data: ', data);
             }
-            const encodeBuffers = buildEncodeBuffers(messages, name, data);
+            const encodeBuffers = ProtocolV1.encodeMessageChunks(messages, name, data);
             yield this.sendAllChunksWithRetry(path, encodeBuffers);
             const resData = yield this.receiveData(path, this.getOpenDevice(path));
             if (typeof resData !== 'string') {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Returning data is not string.');
             }
-            const jsonData = receiveOne(messages, resData);
+            const jsonData = ProtocolV1.decodeMessage(messages, resData);
             return check.call(jsonData);
         });
     }
@@ -483,7 +483,7 @@ class NodeUsbTransport {
         return __awaiter(this, void 0, void 0, function* () {
             const firstPacket = yield this.transferInWithRetry(path, dev, PACKET_SIZE);
             const firstData = skipReportByte(firstPacket);
-            const { length, typeId, restBuffer } = decodeProtocol.decodeChunked(toArrayBuffer(firstData));
+            const { length, typeId, restBuffer } = ProtocolV1.decodeFirstChunk(toArrayBuffer(firstData));
             const lengthWithHeader = Number(length) + HEADER_LENGTH;
             const decoded = new ByteBuffer__default["default"](lengthWithHeader);
             decoded.writeUint16(typeId);
@@ -509,5 +509,4 @@ class NodeUsbTransport {
     }
 }
 
-exports.PACKET_SIZE = PACKET_SIZE;
-exports["default"] = NodeUsbTransport;
+module.exports = NodeUsbTransport;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-usb",
-  "version": "1.1.26",
+  "version": "1.1.27-alpha.30",
   "description": "OneKey hardware wallet direct USB transport plugin (libusb)",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -20,10 +20,10 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.1.26",
-    "@onekeyfe/hd-transport": "1.1.26",
+    "@onekeyfe/hd-shared": "1.1.27-alpha.30",
+    "@onekeyfe/hd-transport": "1.1.27-alpha.30",
     "bytebuffer": "^5.0.1",
     "usb": "^2.14.0"
   },
-  "gitHead": "25f2737f5e9d357764fb82f558b024f763cdd30d"
+  "gitHead": "f1e3a93e766463007436eaa9aff4a271ffd8830c"
 }

package/src/index.ts

@@ -1,14 +1,23 @@
 import ByteBuffer from 'bytebuffer';
 import * as usb from 'usb';
-import transport, { LogBlockCommand } from '@onekeyfe/hd-transport';
+import transport, {
+  LogBlockCommand,
+  PROTOCOL_V1_CHUNK_PAYLOAD_SIZE,
+  PROTOCOL_V1_MESSAGE_HEADER_SIZE,
+  PROTOCOL_V1_REPORT_ID,
+  PROTOCOL_V1_USB_PACKET_SIZE,
+} from '@onekeyfe/hd-transport';
 import { ERRORS, HardwareErrorCode, ONEKEY_WEBUSB_FILTER, wait } from '@onekeyfe/hd-shared';
 
-import { HEADER_LENGTH, PACKET_SIZE, PAYLOAD_SIZE, REPORT_ID } from './constants';
-
 import type EventEmitter from 'events';
-import type { AcquireInput, OneKeyDeviceInfo } from '@onekeyfe/hd-transport';
+import type { AcquireInput, OneKeyDeviceInfo, ProtocolType } from '@onekeyfe/hd-transport';
+
+const { parseConfigure, ProtocolV1, check } = transport;
 
-const { parseConfigure, buildEncodeBuffers, decodeProtocol, receiveOne, check } = transport;
+const PACKET_SIZE = PROTOCOL_V1_USB_PACKET_SIZE;
+const REPORT_ID = PROTOCOL_V1_REPORT_ID;
+const PAYLOAD_SIZE = PROTOCOL_V1_CHUNK_PAYLOAD_SIZE;
+const HEADER_LENGTH = PROTOCOL_V1_MESSAGE_HEADER_SIZE;
 
 /** USB interface number for vendor-specific communication */
 const INTERFACE_NUMBER = 0;
@@ -187,6 +196,11 @@ export default class NodeUsbTransport {
   /** set to true when cancel() is called; checked by retry loops */
   private cancelled = false;
 
+  // NodeUsbTransport speaks Protocol V1 only (no Pro2 USB support yet via libusb).
+  getProtocolType(_path: string): ProtocolType {
+    return 'V1';
+  }
+
   /**
    * Initialize transport.
    * Signature matches the Transport.init interface (logger, emitter).
@@ -220,7 +234,7 @@ export default class NodeUsbTransport {
     if (!this.messages) {
       throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
-    const encodeBuffers = buildEncodeBuffers(this.messages, name, data);
+    const encodeBuffers = ProtocolV1.encodeMessageChunks(this.messages, name, data);
     await this.sendAllChunksWithRetry(path, encodeBuffers);
   }
 
@@ -237,7 +251,7 @@ export default class NodeUsbTransport {
     if (!this.messages) {
       throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
-    return receiveOne(this.messages, resData);
+    return ProtocolV1.decodeMessage(this.messages, resData);
   }
 
   /**
@@ -341,7 +355,7 @@ export default class NodeUsbTransport {
     }
 
     // Encode protobuf message into 63-byte chunks (same as WebUsbTransport)
-    const encodeBuffers = buildEncodeBuffers(messages, name, data);
+    const encodeBuffers = ProtocolV1.encodeMessageChunks(messages, name, data);
 
     // Send all chunks with retry — if any chunk fails and reconnects,
     // restart the entire send sequence from chunk 0 (device resets state on reconnect)
@@ -352,7 +366,7 @@ export default class NodeUsbTransport {
     if (typeof resData !== 'string') {
       throw ERRORS.TypedError(HardwareErrorCode.NetworkError, 'Returning data is not string.');
     }
-    const jsonData = receiveOne(messages, resData);
+    const jsonData = ProtocolV1.decodeMessage(messages, resData);
     return check.call(jsonData);
   }
 
@@ -605,7 +619,7 @@ export default class NodeUsbTransport {
     const firstData = skipReportByte(firstPacket);
 
     // Decode header: ## marker → { typeId, length, restBuffer }
-    const { length, typeId, restBuffer } = decodeProtocol.decodeChunked(toArrayBuffer(firstData));
+    const { length, typeId, restBuffer } = ProtocolV1.decodeFirstChunk(toArrayBuffer(firstData));
 
     // Allocate result: typeId(2) + length(4) + payload(length)
     const lengthWithHeader = Number(length) + HEADER_LENGTH;
@@ -634,5 +648,3 @@ export default class NodeUsbTransport {
     return Buffer.from(result as unknown as ArrayBuffer).toString('hex');
   }
 }
-
-export { PACKET_SIZE } from './constants';

package/dist/constants.d.ts

@@ -1,5 +0,0 @@
-export declare const PACKET_SIZE = 64;
-export declare const REPORT_ID = 63;
-export declare const PAYLOAD_SIZE: number;
-export declare const HEADER_LENGTH = 6;
-//# sourceMappingURL=constants.d.ts.map

package/dist/constants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,WAAW,KAAK,CAAC;AAG9B,eAAO,MAAM,SAAS,KAAO,CAAC;AAG9B,eAAO,MAAM,YAAY,QAAkB,CAAC;AAG5C,eAAO,MAAM,aAAa,IAAI,CAAC"}

package/src/constants.ts

@@ -1,11 +0,0 @@
-/** USB packet size in bytes */
-export const PACKET_SIZE = 64;
-
-/** Protocol marker byte (0x3F = '?') — first byte of every packet */
-export const REPORT_ID = 0x3f;
-
-/** Usable payload per packet after stripping the 0x3F report byte */
-export const PAYLOAD_SIZE = PACKET_SIZE - 1;
-
-/** Protocol header length: typeId (2 bytes) + length (4 bytes) */
-export const HEADER_LENGTH = 6;