@onekeyfe/hd-transport-lowlevel 1.2.2-alpha.5 → 1.2.2-alpha.7

package/__tests__/protocol-v2.test.js

@@ -198,7 +198,7 @@ describe('LowlevelTransport protocol framing', () => {
     });
   });
 
-  test('uses the Protocol V2 BLE writer with the lowlevel compatibility packet size', async () => {
+  test('uses 192-byte packets for Protocol V2 BLE writes', async () => {
     const plugin = createPlugin({ devices: [], responses: [] });
     const lowlevel = configureTransport(plugin);
     const context = {
@@ -209,10 +209,30 @@ describe('LowlevelTransport protocol framing', () => {
       signal: new AbortController().signal,
     };
 
-    await lowlevel.writeProtocolV2Frame('pro2-id', new Uint8Array(130), context, jest.fn());
+    await lowlevel.writeProtocolV2Frame('pro2-id', new Uint8Array(386), context, jest.fn());
 
     expect(plugin.send).toHaveBeenCalledTimes(3);
-    expect(plugin.send.mock.calls.map(([, hex]) => hex.length / 2)).toEqual([64, 64, 2]);
+    expect(plugin.send.mock.calls.map(([, hex]) => hex.length / 2)).toEqual([192, 192, 2]);
+  });
+
+  test('uses the packet capacity reported after BLE connection', async () => {
+    const plugin = createPlugin({ devices: [], responses: [] });
+    plugin.getProtocolV2PacketCapacity = jest.fn().mockResolvedValue(244);
+    const lowlevel = configureTransport(plugin);
+    lowlevel.detectProtocol = jest.fn().mockResolvedValue('V2');
+    const context = {
+      messageName: 'Ping',
+      timeoutMs: 1000,
+      highThroughput: false,
+      generation: 1,
+      signal: new AbortController().signal,
+    };
+
+    await lowlevel.acquire({ uuid: 'pro2-id', expectedProtocol: 'V2' });
+    await lowlevel.writeProtocolV2Frame('pro2-id', new Uint8Array(386), context, jest.fn());
+
+    expect(plugin.getProtocolV2PacketCapacity).toHaveBeenCalledWith('pro2-id');
+    expect(plugin.send.mock.calls.map(([, hex]) => hex.length / 2)).toEqual([244, 142]);
   });
 
   test('rejects calls before protocol detection', async () => {

package/dist/index.d.ts

@@ -17,6 +17,7 @@ declare function shouldLogFirmwareUploadProgress({ percent, lastLoggedPercent, n
 declare function getProtocolV1SendOptions(name: string): {
     withoutResponse: boolean;
 } | undefined;
+declare function resolveLowlevelProtocolV2PacketCapacity(capacity?: number | null): number;
 declare class LowlevelTransport {
     _messages: ReturnType<typeof transport__default.parseConfigure> | undefined;
     _messagesV2: ReturnType<typeof transport__default.parseConfigure> | undefined;
@@ -29,6 +30,7 @@ declare class LowlevelTransport {
     private protocolV2Assemblers;
     private protocolV2Generations;
     private connectedDevices;
+    private protocolV2PacketCapacities;
     private protocolV2Links;
     private protocolV2SchemaConfiguration;
     getProtocolType(path: string): ProtocolType | undefined;
@@ -57,10 +59,11 @@ declare class LowlevelTransport {
     private readProtocolV1Message;
     private readProtocolV2Frame;
     private writeProtocolV2Frame;
+    private refreshProtocolV2PacketCapacity;
     private callProtocolV2;
     private createProtocolV2Adapter;
     private advanceProtocolV2Generation;
     cancel(): void;
 }
 
-export { LowlevelTransport as default, getProtocolV1SendOptions, shouldLogFirmwareUploadProgress };
+export { LowlevelTransport as default, getProtocolV1SendOptions, resolveLowlevelProtocolV2PacketCapacity, shouldLogFirmwareUploadProgress };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,SAYN,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,6BAA6B,EAC7B,YAAY,EAEZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAUpD,wBAAgB,+BAA+B,CAAC,EAC9C,OAAO,EACP,iBAAiB,EACjB,GAAG,EACH,YAAY,GACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;CACtB,WAMA;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM;;cAEpD;AAUD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,WAAW,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAErE,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,MAAM,EAAE,6BAA6B,CAAuC;IAE5E,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,oBAAoB,CAAoD;IAEhF,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,eAAe,CA6BpB;IAEH,OAAO,CAAC,6BAA6B,CAAqB;IAE1D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIvD,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,6BAA6B;IAO9E,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAiBnC,MAAM;IAIA,SAAS;IAKT,OAAO,CAAC,KAAK,EAAE,oBAAoB;;;;IAmDnC,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;IAoB1B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;YAatD,cAAc;IA6E5B,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;YA2Cd,yBAAyB;YAiCzB,eAAe;YAgBf,eAAe;YA6Bf,UAAU;YAUV,qBAAqB;YAmBrB,mBAAmB;YAqBnB,oBAAoB;YAgBpB,cAAc;IAwB5B,OAAO,CAAC,uBAAuB;IAgC/B,OAAO,CAAC,2BAA2B;IAMnC,MAAM;CAGP"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,SAYN,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,6BAA6B,EAC7B,YAAY,EAEZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAWpD,wBAAgB,+BAA+B,CAAC,EAC9C,OAAO,EACP,iBAAiB,EACjB,GAAG,EACH,YAAY,GACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;CACtB,WAMA;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM;;cAEpD;AAED,wBAAgB,uCAAuC,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,UAK/E;AAUD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,WAAW,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAErE,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,MAAM,EAAE,6BAA6B,CAAuC;IAE5E,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,oBAAoB,CAAoD;IAEhF,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,0BAA0B,CAAkC;IAEpE,OAAO,CAAC,eAAe,CA8BpB;IAEH,OAAO,CAAC,6BAA6B,CAAqB;IAE1D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIvD,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,6BAA6B;IAO9E,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAiBnC,MAAM;IAIA,SAAS;IAKT,OAAO,CAAC,KAAK,EAAE,oBAAoB;;;;IAqDnC,OAAO,CAAC,IAAI,EAAE,MAAM;IAgBpB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;IAoB1B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;YAatD,cAAc;IA6E5B,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;YA2Cd,yBAAyB;YAkCzB,eAAe;YAgBf,eAAe;YA6Bf,UAAU;YAUV,qBAAqB;YAmBrB,mBAAmB;YAqBnB,oBAAoB;YAkBpB,+BAA+B;YAgB/B,cAAc;IAwB5B,OAAO,CAAC,uBAAuB;IAgC/B,OAAO,CAAC,2BAA2B;IAMnC,MAAM;CAGP"}

package/dist/index.js

@@ -42,7 +42,8 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 const { check, ProtocolV1, parseConfigure } = transport__default["default"];
 const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
 const PROTOCOL_V2_PROBE_TIMEOUT_MS = 5000;
-const LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH = 64;
+const LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH_FALLBACK = 192;
+const LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH_MAX = 244;
 const FIRMWARE_UPLOAD_LOG_PERCENT_STEP = 5;
 const FIRMWARE_UPLOAD_LOG_INTERVAL_MS = 10000;
 function shouldLogFirmwareUploadProgress({ percent, lastLoggedPercent, now, lastLoggedAt, }) {
@@ -53,6 +54,12 @@ function shouldLogFirmwareUploadProgress({ percent, lastLoggedPercent, now, last
 function getProtocolV1SendOptions(name) {
     return name === 'FirmwareUpload' ? { withoutResponse: false } : undefined;
 }
+function resolveLowlevelProtocolV2PacketCapacity(capacity) {
+    if (typeof capacity !== 'number' || !Number.isFinite(capacity) || capacity <= 0) {
+        return LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH_FALLBACK;
+    }
+    return Math.min(Math.floor(capacity), LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH_MAX);
+}
 function isProtocolV1TransportChunk(data) {
     return data.length >= 9 && data[0] === 0x3f && data[1] === 0x23 && data[2] === 0x23;
 }
@@ -68,6 +75,7 @@ class LowlevelTransport {
         this.protocolV2Assemblers = new Map();
         this.protocolV2Generations = new Map();
         this.connectedDevices = new Set();
+        this.protocolV2PacketCapacities = new Map();
         this.protocolV2Links = new transport.ProtocolV2LinkManager({
             getSchemas: () => {
                 if (!this._messages || !this._messagesV2) {
@@ -94,6 +102,7 @@ class LowlevelTransport {
                     }
                     finally {
                         this.connectedDevices.delete(uuid);
+                        this.protocolV2PacketCapacities.delete(uuid);
                     }
                 }
             }),
@@ -141,6 +150,7 @@ class LowlevelTransport {
             const alreadyConnected = this.connectedDevices.has(input.uuid);
             try {
                 yield this.plugin.connect(input.uuid);
+                yield this.refreshProtocolV2PacketCapacity(input.uuid);
                 if (!alreadyConnected) {
                     this.connectedDevices.add(input.uuid);
                     this.advanceProtocolV2Generation(input.uuid);
@@ -176,6 +186,7 @@ class LowlevelTransport {
                     this.connectedDevices.delete(input.uuid);
                     this.deviceProtocol.delete(input.uuid);
                     this.protocolV2Assemblers.delete(input.uuid);
+                    this.protocolV2PacketCapacities.delete(input.uuid);
                     this.advanceProtocolV2Generation(input.uuid);
                 }
                 throw error;
@@ -190,6 +201,7 @@ class LowlevelTransport {
                 this.connectedDevices.delete(uuid);
                 this.deviceProtocol.delete(uuid);
                 this.protocolV2Assemblers.delete(uuid);
+                this.protocolV2PacketCapacities.delete(uuid);
                 return true;
             }
             catch (error) {
@@ -353,6 +365,7 @@ class LowlevelTransport {
             }
             try {
                 yield this.plugin.connect(uuid);
+                yield this.refreshProtocolV2PacketCapacity(uuid);
                 this.connectedDevices.add(uuid);
                 this.advanceProtocolV2Generation(uuid);
             }
@@ -462,7 +475,7 @@ class LowlevelTransport {
         return __awaiter(this, void 0, void 0, function* () {
             yield transport.writeProtocolV2BleFrame({
                 frame,
-                packetCapacity: LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH,
+                packetCapacity: resolveLowlevelProtocolV2PacketCapacity(this.protocolV2PacketCapacities.get(uuid)),
                 assertActive: assertCurrentGeneration,
                 signal: context.signal,
                 abortMessage: `Protocol V2 BLE write aborted for ${context.messageName}`,
@@ -470,6 +483,19 @@ class LowlevelTransport {
             });
         });
     }
+    refreshProtocolV2PacketCapacity(uuid) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            let reportedCapacity;
+            try {
+                reportedCapacity = yield ((_b = (_a = this.plugin).getProtocolV2PacketCapacity) === null || _b === void 0 ? void 0 : _b.call(_a, uuid));
+            }
+            catch (error) {
+                (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[LowlevelTransport] read Protocol V2 packet capacity failed: ${uuid}`, error);
+            }
+            this.protocolV2PacketCapacities.set(uuid, resolveLowlevelProtocolV2PacketCapacity(reportedCapacity));
+        });
+    }
     callProtocolV2(uuid, name, data, options) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._messages || !this._messagesV2) {
@@ -528,4 +554,5 @@ class LowlevelTransport {
 
 exports["default"] = LowlevelTransport;
 exports.getProtocolV1SendOptions = getProtocolV1SendOptions;
+exports.resolveLowlevelProtocolV2PacketCapacity = resolveLowlevelProtocolV2PacketCapacity;
 exports.shouldLogFirmwareUploadProgress = shouldLogFirmwareUploadProgress;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-lowlevel",
-  "version": "1.2.2-alpha.5",
+  "version": "1.2.2-alpha.7",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -20,8 +20,8 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.2-alpha.5",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.5"
+    "@onekeyfe/hd-shared": "1.2.2-alpha.7",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.7"
   },
-  "gitHead": "82503995b10dd1e293941594239423e3c640973b"
+  "gitHead": "29b87f1c04fea60459d900ef1f61cb9f17eaa4d3"
 }

package/src/index.ts

@@ -26,7 +26,8 @@ const { check, ProtocolV1, parseConfigure } = transport;
 
 const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
 const PROTOCOL_V2_PROBE_TIMEOUT_MS = 5000;
-const LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH = 64;
+const LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH_FALLBACK = 192;
+const LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH_MAX = 244;
 const FIRMWARE_UPLOAD_LOG_PERCENT_STEP = 5;
 const FIRMWARE_UPLOAD_LOG_INTERVAL_MS = 10_000;
 
@@ -52,6 +53,13 @@ export function getProtocolV1SendOptions(name: string) {
   return name === 'FirmwareUpload' ? { withoutResponse: false } : undefined;
 }
 
+export function resolveLowlevelProtocolV2PacketCapacity(capacity?: number | null) {
+  if (typeof capacity !== 'number' || !Number.isFinite(capacity) || capacity <= 0) {
+    return LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH_FALLBACK;
+  }
+  return Math.min(Math.floor(capacity), LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH_MAX);
+}
+
 function isProtocolV1TransportChunk(data: Uint8Array) {
   return data.length >= 9 && data[0] === 0x3f && data[1] === 0x23 && data[2] === 0x23;
 }
@@ -83,6 +91,8 @@ export default class LowlevelTransport {
 
   private connectedDevices: Set<string> = new Set();
 
+  private protocolV2PacketCapacities: Map<string, number> = new Map();
+
   private protocolV2Links = new ProtocolV2LinkManager<string>({
     getSchemas: () => {
       if (!this._messages || !this._messagesV2) {
@@ -109,6 +119,7 @@ export default class LowlevelTransport {
           );
         } finally {
           this.connectedDevices.delete(uuid);
+          this.protocolV2PacketCapacities.delete(uuid);
         }
       }
     },
@@ -163,6 +174,7 @@ export default class LowlevelTransport {
     const alreadyConnected = this.connectedDevices.has(input.uuid);
     try {
       await this.plugin.connect(input.uuid);
+      await this.refreshProtocolV2PacketCapacity(input.uuid);
       if (!alreadyConnected) {
         this.connectedDevices.add(input.uuid);
         this.advanceProtocolV2Generation(input.uuid);
@@ -204,6 +216,7 @@ export default class LowlevelTransport {
         this.connectedDevices.delete(input.uuid);
         this.deviceProtocol.delete(input.uuid);
         this.protocolV2Assemblers.delete(input.uuid);
+        this.protocolV2PacketCapacities.delete(input.uuid);
         this.advanceProtocolV2Generation(input.uuid);
       }
       throw error;
@@ -218,6 +231,7 @@ export default class LowlevelTransport {
       this.deviceProtocol.delete(uuid);
       // Confirmed protocol stays on the device endpoint; BLE names are not a probe hint.
       this.protocolV2Assemblers.delete(uuid);
+      this.protocolV2PacketCapacities.delete(uuid);
       return true;
     } catch (error) {
       this.Log.debug('lowlelvel transport disconnect error: ', error);
@@ -428,6 +442,7 @@ export default class LowlevelTransport {
 
     try {
       await this.plugin.connect(uuid);
+      await this.refreshProtocolV2PacketCapacity(uuid);
       this.connectedDevices.add(uuid);
       this.advanceProtocolV2Generation(uuid);
     } catch (error) {
@@ -545,7 +560,9 @@ export default class LowlevelTransport {
   ) {
     await writeProtocolV2BleFrame({
       frame,
-      packetCapacity: LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH,
+      packetCapacity: resolveLowlevelProtocolV2PacketCapacity(
+        this.protocolV2PacketCapacities.get(uuid)
+      ),
       assertActive: assertCurrentGeneration,
       signal: context.signal,
       abortMessage: `Protocol V2 BLE write aborted for ${context.messageName}`,
@@ -553,6 +570,22 @@ export default class LowlevelTransport {
     });
   }
 
+  private async refreshProtocolV2PacketCapacity(uuid: string) {
+    let reportedCapacity: number | undefined;
+    try {
+      reportedCapacity = await this.plugin.getProtocolV2PacketCapacity?.(uuid);
+    } catch (error) {
+      this.Log?.debug(
+        `[LowlevelTransport] read Protocol V2 packet capacity failed: ${uuid}`,
+        error
+      );
+    }
+    this.protocolV2PacketCapacities.set(
+      uuid,
+      resolveLowlevelProtocolV2PacketCapacity(reportedCapacity)
+    );
+  }
+
   private async callProtocolV2(
     uuid: string,
     name: string,