@onekeyfe/hd-transport-lowlevel 1.1.27-alpha.34 → 1.1.27-alpha.36

package/__tests__/protocol-v2.test.js

@@ -124,16 +124,35 @@ describe('LowlevelTransport protocol framing', () => {
     }).map(chunk => chunk.toString('hex'));
     const plugin = createPlugin({
       devices: [{ id: 'classic-id', name: 'OneKey Classic', commType: 'ble' }],
-      responses: responseChunks,
+      responses: [...responseChunks, ...responseChunks],
     });
     const lowlevel = configureTransport(plugin);
 
+    await expect(lowlevel.acquire({ uuid: 'classic-id' })).resolves.toEqual({
+      uuid: 'classic-id',
+      protocolType: 'V1',
+    });
     await expect(lowlevel.call('classic-id', 'Initialize', {})).resolves.toEqual({
       type: 'Success',
       message: { message: 'ok' },
     });
   });
 
+  test('rejects calls before protocol detection', async () => {
+    const responseChunks = ProtocolV1.encodeTransportPackets(schemas.protocolV1, 'Success', {
+      message: 'ok',
+    }).map(chunk => chunk.toString('hex'));
+    const plugin = createPlugin({
+      devices: [{ id: 'classic-id', name: 'OneKey Classic', commType: 'ble' }],
+      responses: responseChunks,
+    });
+    const lowlevel = configureTransport(plugin);
+
+    await expect(lowlevel.call('classic-id', 'Initialize', {})).rejects.toThrow(
+      'Device protocol has not been detected'
+    );
+  });
+
   test('detects Protocol V2 devices and reassembles split Protocol V2 notifications', async () => {
     const probeResponse = ProtocolV2.encodeFrame(
       schemas,
@@ -250,4 +269,20 @@ describe('LowlevelTransport protocol framing', () => {
       'Device protocol mismatch: expected V1'
     );
   });
+
+  test('rejects automatic detection instead of caching V1 when both protocol probes fail', async () => {
+    const plugin = createPlugin({
+      devices: [{ id: 'flaky-pro2-id', name: 'Unknown BLE Device', commType: 'ble' }],
+      responses: [
+        new Error('Protocol V1 probe timed out'),
+        new Error('Protocol V2 probe timed out'),
+      ],
+    });
+    const lowlevel = configureTransport(plugin);
+
+    await expect(lowlevel.acquire({ uuid: 'flaky-pro2-id' })).rejects.toThrow(
+      'Unable to detect BLE protocol'
+    );
+    expect(lowlevel.getProtocolType('flaky-pro2-id')).toBeUndefined();
+  });
 });

package/dist/index.d.ts

@@ -17,7 +17,7 @@ declare class LowlevelTransport {
     private deviceProtocol;
     private deviceProtocolHints;
     private protocolV2Assemblers;
-    getProtocolType(path: string): ProtocolType;
+    getProtocolType(path: string): ProtocolType | undefined;
     init(logger: any, emitter: EventEmitter, plugin: LowlevelTransportSharedPlugin): void;
     configure(signedData: any): void;
     configureProtocolV2(signedData: any): void;
@@ -32,6 +32,8 @@ declare class LowlevelTransport {
     private callProtocolV1;
     private createProtocolTimeoutError;
     private createProtocolMismatchError;
+    private createProtocolDetectionError;
+    private clearProbeProtocol;
     private detectProtocol;
     private resetConnectionAfterProbe;
     private probeProtocolV1;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,SAWN,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAqBpD,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,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY;IAI3C,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;IAInC,MAAM;IAIA,SAAS;IAWT,OAAO,CAAC,KAAK,EAAE,oBAAoB;;;;IAuBnC,OAAO,CAAC,IAAI,EAAE,MAAM;IAapB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA6BlB,cAAc;IAuC5B,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,2BAA2B;YAOrB,cAAc;YAiDd,yBAAyB;YA0BzB,eAAe;YAef,eAAe;YAoBf,UAAU;YAUV,qBAAqB;YAmBrB,mBAAmB;YAqBnB,oBAAoB;YAOpB,cAAc;IAsC5B,MAAM;CAGP"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,SAWN,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAqBpD,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,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;IAInC,MAAM;IAIA,SAAS;IAWT,OAAO,CAAC,KAAK,EAAE,oBAAoB;;;;IAuBnC,OAAO,CAAC,IAAI,EAAE,MAAM;IAapB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YAmClB,cAAc;IAuC5B,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;YAsDd,yBAAyB;YA0BzB,eAAe;YAgBf,eAAe;YA6Bf,UAAU;YAUV,qBAAqB;YAmBrB,mBAAmB;YAqBnB,oBAAoB;YAOpB,cAAc;IAsC5B,MAAM;CAGP"}

package/dist/index.js

@@ -60,8 +60,7 @@ class LowlevelTransport {
         this.protocolV2Assemblers = new Map();
     }
     getProtocolType(path) {
-        var _a;
-        return (_a = this.deviceProtocol.get(path)) !== null && _a !== void 0 ? _a : 'V1';
+        return this.deviceProtocol.get(path);
     }
     init(logger, emitter, plugin) {
         this.Log = logger;
@@ -130,6 +129,9 @@ class LowlevelTransport {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
             const protocol = this.getProtocolType(uuid);
+            if (!protocol) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol has not been detected for ${uuid}`);
+            }
             if (transport.LogBlockCommand.has(name)) {
                 this.Log.debug('lowlevel-transport', 'call-', ' name: ', name, ' protocol: ', protocol);
             }
@@ -183,8 +185,16 @@ class LowlevelTransport {
     createProtocolMismatchError(expected) {
         return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
     }
+    createProtocolDetectionError() {
+        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, 'Unable to detect BLE protocol: device did not respond to Protocol V1 Initialize or Protocol V2 Ping');
+    }
+    clearProbeProtocol(uuid, protocol) {
+        if (this.deviceProtocol.get(uuid) === protocol) {
+            this.deviceProtocol.delete(uuid);
+        }
+    }
     detectProtocol(uuid, expectedProtocol, protocolHint) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             if (expectedProtocol === 'V2') {
                 if (yield this.probeProtocolV2(uuid)) {
@@ -213,17 +223,20 @@ class LowlevelTransport {
                 (_d = this.Log) === null || _d === void 0 ? void 0 : _d.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2 (cached)`);
                 return 'V2';
             }
-            let protocol = 'V1';
             const protocolV1Detected = yield this.probeProtocolV1(uuid);
-            if (!protocolV1Detected) {
-                yield this.resetConnectionAfterProbe(uuid, 'V1');
-                if (yield this.probeProtocolV2(uuid)) {
-                    protocol = 'V2';
-                }
+            if (protocolV1Detected) {
+                this.deviceProtocol.set(uuid, 'V1');
+                (_e = this.Log) === null || _e === void 0 ? void 0 : _e.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V1`);
+                return 'V1';
+            }
+            yield this.resetConnectionAfterProbe(uuid, 'V1');
+            if (yield this.probeProtocolV2(uuid)) {
+                this.deviceProtocol.set(uuid, 'V2');
+                (_f = this.Log) === null || _f === void 0 ? void 0 : _f.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2`);
+                return 'V2';
             }
-            this.deviceProtocol.set(uuid, protocol);
-            (_e = this.Log) === null || _e === void 0 ? void 0 : _e.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> ${protocol}`);
-            return protocol;
+            this.deviceProtocol.delete(uuid);
+            throw this.createProtocolDetectionError();
         });
     }
     resetConnectionAfterProbe(uuid, protocol) {
@@ -257,6 +270,7 @@ class LowlevelTransport {
                 return true;
             }
             catch (error) {
+                this.clearProbeProtocol(uuid, 'V1');
                 (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[LowlevelTransport] Protocol V1 Initialize probe failed:', error);
                 return false;
             }
@@ -270,17 +284,27 @@ class LowlevelTransport {
             }
             this.deviceProtocol.set(uuid, 'V2');
             (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
-            return transport.probeProtocolV2({
-                call: (name, data, options) => this.callProtocolV2(uuid, name, data, options),
-                timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT_MS,
-                logger: this.Log,
-                logPrefix: 'ProtocolV2 Lowlevel-BLE',
-                onProbeFailed: () => __awaiter(this, void 0, void 0, function* () {
-                    var _b;
-                    (_b = this.protocolV2Assemblers.get(uuid)) === null || _b === void 0 ? void 0 : _b.reset();
-                    yield this.resetConnectionAfterProbe(uuid, 'V2');
-                }),
-            });
+            try {
+                const detected = yield transport.probeProtocolV2({
+                    call: (name, data, options) => this.callProtocolV2(uuid, name, data, options),
+                    timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT_MS,
+                    logger: this.Log,
+                    logPrefix: 'ProtocolV2 Lowlevel-BLE',
+                    onProbeFailed: () => __awaiter(this, void 0, void 0, function* () {
+                        var _b;
+                        (_b = this.protocolV2Assemblers.get(uuid)) === null || _b === void 0 ? void 0 : _b.reset();
+                        yield this.resetConnectionAfterProbe(uuid, 'V2');
+                    }),
+                });
+                if (!detected) {
+                    this.clearProbeProtocol(uuid, 'V2');
+                }
+                return detected;
+            }
+            catch (error) {
+                this.clearProbeProtocol(uuid, 'V2');
+                throw error;
+            }
         });
     }
     receiveHex(timeoutMs, commandName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-lowlevel",
-  "version": "1.1.27-alpha.34",
+  "version": "1.1.27-alpha.36",
   "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.1.27-alpha.34",
-    "@onekeyfe/hd-transport": "1.1.27-alpha.34"
+    "@onekeyfe/hd-shared": "1.1.27-alpha.36",
+    "@onekeyfe/hd-transport": "1.1.27-alpha.36"
   },
-  "gitHead": "ff1863a1ff300ada1314b7315e5ab827663d9f4c"
+  "gitHead": "1aaff42d7dd10933009ba7e0c0b7324e91d8e993"
 }

package/src/index.ts

@@ -59,8 +59,8 @@ export default class LowlevelTransport {
 
   private protocolV2Assemblers: Map<string, ProtocolV2FrameAssembler> = new Map();
 
-  getProtocolType(path: string): ProtocolType {
-    return this.deviceProtocol.get(path) ?? 'V1';
+  getProtocolType(path: string): ProtocolType | undefined {
+    return this.deviceProtocol.get(path);
   }
 
   init(logger: any, emitter: EventEmitter, plugin: LowlevelTransportSharedPlugin) {
@@ -142,6 +142,12 @@ export default class LowlevelTransport {
     }
 
     const protocol = this.getProtocolType(uuid);
+    if (!protocol) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        `Device protocol has not been detected for ${uuid}`
+      );
+    }
     if (LogBlockCommand.has(name)) {
       this.Log.debug('lowlevel-transport', 'call-', ' name: ', name, ' protocol: ', protocol);
     } else {
@@ -217,6 +223,19 @@ export default class LowlevelTransport {
     );
   }
 
+  private createProtocolDetectionError() {
+    return ERRORS.TypedError(
+      HardwareErrorCode.BleTimeoutError,
+      'Unable to detect BLE protocol: device did not respond to Protocol V1 Initialize or Protocol V2 Ping'
+    );
+  }
+
+  private clearProbeProtocol(uuid: string, protocol: ProtocolType) {
+    if (this.deviceProtocol.get(uuid) === protocol) {
+      this.deviceProtocol.delete(uuid);
+    }
+  }
+
   private async detectProtocol(
     uuid: string,
     expectedProtocol?: ProtocolType,
@@ -253,17 +272,22 @@ export default class LowlevelTransport {
       return 'V2';
     }
 
-    let protocol: ProtocolType = 'V1';
     const protocolV1Detected = await this.probeProtocolV1(uuid);
-    if (!protocolV1Detected) {
-      await this.resetConnectionAfterProbe(uuid, 'V1');
-      if (await this.probeProtocolV2(uuid)) {
-        protocol = 'V2';
-      }
+    if (protocolV1Detected) {
+      this.deviceProtocol.set(uuid, 'V1');
+      this.Log?.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V1`);
+      return 'V1';
     }
-    this.deviceProtocol.set(uuid, protocol);
-    this.Log?.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> ${protocol}`);
-    return protocol;
+
+    await this.resetConnectionAfterProbe(uuid, 'V1');
+    if (await this.probeProtocolV2(uuid)) {
+      this.deviceProtocol.set(uuid, 'V2');
+      this.Log?.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2`);
+      return 'V2';
+    }
+
+    this.deviceProtocol.delete(uuid);
+    throw this.createProtocolDetectionError();
   }
 
   private async resetConnectionAfterProbe(uuid: string, protocol: ProtocolType) {
@@ -302,6 +326,7 @@ export default class LowlevelTransport {
       await this.callProtocolV1(uuid, 'Initialize', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT_MS });
       return true;
     } catch (error) {
+      this.clearProbeProtocol(uuid, 'V1');
       this.Log?.debug('[LowlevelTransport] Protocol V1 Initialize probe failed:', error);
       return false;
     }
@@ -314,17 +339,26 @@ export default class LowlevelTransport {
 
     this.deviceProtocol.set(uuid, 'V2');
     this.protocolV2Assemblers.get(uuid)?.reset();
-    return probeProtocolV2Helper({
-      call: (name: string, data: Record<string, unknown>, options?: TransportCallOptions) =>
-        this.callProtocolV2(uuid, name, data, options),
-      timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT_MS,
-      logger: this.Log,
-      logPrefix: 'ProtocolV2 Lowlevel-BLE',
-      onProbeFailed: async () => {
-        this.protocolV2Assemblers.get(uuid)?.reset();
-        await this.resetConnectionAfterProbe(uuid, 'V2');
-      },
-    });
+    try {
+      const detected = await probeProtocolV2Helper({
+        call: (name: string, data: Record<string, unknown>, options?: TransportCallOptions) =>
+          this.callProtocolV2(uuid, name, data, options),
+        timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT_MS,
+        logger: this.Log,
+        logPrefix: 'ProtocolV2 Lowlevel-BLE',
+        onProbeFailed: async () => {
+          this.protocolV2Assemblers.get(uuid)?.reset();
+          await this.resetConnectionAfterProbe(uuid, 'V2');
+        },
+      });
+      if (!detected) {
+        this.clearProbeProtocol(uuid, 'V2');
+      }
+      return detected;
+    } catch (error) {
+      this.clearProbeProtocol(uuid, 'V2');
+      throw error;
+    }
   }
 
   private async receiveHex(timeoutMs: number | undefined, commandName: string) {