@onekeyfe/hd-transport-lowlevel 1.1.27-alpha.31 → 1.1.27-alpha.32

package/.eslintignore

@@ -1,2 +1,4 @@
+coverage/
 dist/
 __tests__/
+jest.config.js

package/__tests__/protocol-v2.test.js

@@ -48,10 +48,28 @@ const protocolV2Schema = {
         },
       },
     },
+    Ping: {
+      fields: {
+        message: {
+          type: 'string',
+          id: 1,
+        },
+      },
+    },
+    Success: {
+      fields: {
+        message: {
+          type: 'string',
+          id: 1,
+        },
+      },
+    },
     MessageType: {
       values: {
         MessageType_GetProtoVersion: 60200,
         MessageType_ProtoVersion: 60201,
+        MessageType_Ping: 60206,
+        MessageType_Success: 60207,
       },
     },
   },
@@ -119,11 +137,9 @@ describe('LowlevelTransport protocol framing', () => {
   test('detects Protocol V2 devices and reassembles split Protocol V2 notifications', async () => {
     const probeResponse = ProtocolV2.encodeFrame(
       schemas,
-      'ProtoVersion',
+      'Success',
       {
-        major_version: 2,
-        minor_version: 0,
-        patch_version: 0,
+        message: 'probe',
       },
       { router: PROTOCOL_V2_CHANNEL_BLE_UART }
     );
@@ -144,7 +160,7 @@ describe('LowlevelTransport protocol framing', () => {
     const lowlevel = configureTransport(plugin);
 
     await expect(lowlevel.enumerate()).resolves.toEqual([
-      { id: 'pro2-id', name: 'OneKey Pro 2', commType: 'ble', protocolType: 'V2' },
+      { id: 'pro2-id', name: 'OneKey Pro 2', commType: 'ble' },
     ]);
     await expect(lowlevel.acquire({ uuid: 'pro2-id' })).resolves.toEqual({
       uuid: 'pro2-id',
@@ -164,11 +180,9 @@ describe('LowlevelTransport protocol framing', () => {
   test('falls back to Protocol V2 probe for unnamed Protocol V2 devices', async () => {
     const probeResponse = ProtocolV2.encodeFrame(
       schemas,
-      'ProtoVersion',
+      'Success',
       {
-        major_version: 2,
-        minor_version: 0,
-        patch_version: 0,
+        message: 'probe',
       },
       { router: PROTOCOL_V2_CHANNEL_BLE_UART }
     );
@@ -185,6 +199,46 @@ describe('LowlevelTransport protocol framing', () => {
     expect(lowlevel.getProtocolType('unknown-pro2-id')).toBe('V2');
   });
 
+  test('resets the lowlevel connection before probing Protocol V2 after a V1 timeout', async () => {
+    const probeResponse = ProtocolV2.encodeFrame(
+      schemas,
+      'Success',
+      {
+        message: 'probe',
+      },
+      { router: PROTOCOL_V2_CHANNEL_BLE_UART }
+    );
+    let staleReceivePending = false;
+    let resetAfterTimeout = false;
+    const plugin = createPlugin({
+      devices: [{ id: 'slow-v2-id', name: 'Unknown BLE Device', commType: 'ble' }],
+      responses: [],
+    });
+    plugin.disconnect.mockImplementation(() => {
+      staleReceivePending = false;
+      resetAfterTimeout = true;
+      return Promise.resolve();
+    });
+    plugin.receive.mockImplementation(() => {
+      if (!staleReceivePending && !resetAfterTimeout) {
+        staleReceivePending = true;
+        return new Promise(() => {});
+      }
+      if (staleReceivePending) {
+        return Promise.reject(new Error('stale receive still pending'));
+      }
+      return Promise.resolve(bytesToHex(probeResponse));
+    });
+    const lowlevel = configureTransport(plugin);
+
+    await expect(lowlevel.acquire({ uuid: 'slow-v2-id' })).resolves.toEqual({
+      uuid: 'slow-v2-id',
+      protocolType: 'V2',
+    });
+    expect(plugin.disconnect).toHaveBeenCalledWith('slow-v2-id');
+    expect(plugin.connect).toHaveBeenCalledTimes(2);
+  });
+
   test('verifies expected Protocol V1 instead of trusting the requested protocol', async () => {
     const plugin = createPlugin({
       devices: [{ id: 'v2-id', name: 'Unknown BLE Device', commType: 'ble' }],

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as transport from '@onekeyfe/hd-transport';
-import transport__default, { ProtocolType, LowlevelTransportSharedPlugin, TransportCallOptions } from '@onekeyfe/hd-transport';
+import transport__default, { ProtocolType, LowlevelTransportSharedPlugin, LowLevelDevice, TransportCallOptions } from '@onekeyfe/hd-transport';
 import EventEmitter from 'events';
 
 type LowLevelAcquireInput = {
@@ -15,18 +15,14 @@ declare class LowlevelTransport {
     emitter?: EventEmitter;
     plugin: LowlevelTransportSharedPlugin;
     private deviceProtocol;
+    private deviceProtocolHints;
     private protocolV2Assemblers;
     getProtocolType(path: string): ProtocolType;
     init(logger: any, emitter: EventEmitter, plugin: LowlevelTransportSharedPlugin): void;
     configure(signedData: any): void;
     configureProtocolV2(signedData: any): void;
     listen(): void;
-    enumerate(): Promise<{
-        protocolType?: ProtocolType | undefined;
-        commType: transport.OneKeyDeviceCommType;
-        id: string;
-        name: string;
-    }[]>;
+    enumerate(): Promise<LowLevelDevice[]>;
     acquire(input: LowLevelAcquireInput): Promise<{
         uuid: string;
         protocolType: ProtocolType;
@@ -37,6 +33,7 @@ declare class LowlevelTransport {
     private createProtocolTimeoutError;
     private createProtocolMismatchError;
     private detectProtocol;
+    private resetConnectionAfterProbe;
     private probeProtocolV1;
     private probeProtocolV2;
     private receiveHex;

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,EAEV,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,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;;;;;;IAcT,OAAO,CAAC,KAAK,EAAE,oBAAoB;;;;IAiBnC,OAAO,CAAC,IAAI,EAAE,MAAM;IAYpB,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;YAsCd,eAAe;YAef,eAAe;YAmBf,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;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"}

package/dist/index.js

@@ -42,7 +42,7 @@ const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
 const PROTOCOL_V2_PROBE_TIMEOUT_MS = 5000;
 const LOWLEVEL_PROTOCOL_TIMEOUT_MS = 30000;
 const LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH = 64;
-function inferProtocolTypeFromDeviceName(name) {
+function inferProtocolHintFromDeviceName(name) {
     return /\bpro\s*2\b/i.test(name !== null && name !== void 0 ? name : '') ? 'V2' : undefined;
 }
 function isProtocolV1TransportChunk(data) {
@@ -56,6 +56,7 @@ class LowlevelTransport {
         this.configured = false;
         this.plugin = {};
         this.deviceProtocol = new Map();
+        this.deviceProtocolHints = new Map();
         this.protocolV2Assemblers = new Map();
     }
     getProtocolType(path) {
@@ -82,16 +83,16 @@ class LowlevelTransport {
         return __awaiter(this, void 0, void 0, function* () {
             const devices = yield this.plugin.enumerate();
             return devices.map((device) => {
-                const protocolType = inferProtocolTypeFromDeviceName(device.name);
-                if (protocolType) {
-                    this.deviceProtocol.set(device.id, protocolType);
+                const protocolHint = inferProtocolHintFromDeviceName(device.name);
+                if (protocolHint) {
+                    this.deviceProtocolHints.set(device.id, protocolHint);
                 }
-                return Object.assign(Object.assign({}, device), (protocolType ? { protocolType } : {}));
+                return device;
             });
         });
     }
     acquire(input) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.plugin.connect(input.uuid);
@@ -101,8 +102,10 @@ class LowlevelTransport {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.LowlevelTrasnportConnectError, (_a = error.message) !== null && _a !== void 0 ? _a : error);
             }
             this.protocolV2Assemblers.set(input.uuid, new transport.ProtocolV2FrameAssembler());
-            const expectedProtocol = (_b = input.expectedProtocol) !== null && _b !== void 0 ? _b : this.deviceProtocol.get(input.uuid);
-            const protocolType = yield this.detectProtocol(input.uuid, expectedProtocol);
+            const protocolHint = input.expectedProtocol
+                ? undefined
+                : this.deviceProtocolHints.get(input.uuid);
+            const protocolType = yield this.detectProtocol(input.uuid, input.expectedProtocol, protocolHint);
             return { uuid: input.uuid, protocolType };
         });
     }
@@ -111,6 +114,7 @@ class LowlevelTransport {
             try {
                 yield this.plugin.disconnect(uuid);
                 this.deviceProtocol.delete(uuid);
+                this.deviceProtocolHints.delete(uuid);
                 this.protocolV2Assemblers.delete(uuid);
                 return true;
             }
@@ -179,8 +183,8 @@ class LowlevelTransport {
     createProtocolMismatchError(expected) {
         return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
     }
-    detectProtocol(uuid, expectedProtocol) {
-        var _a, _b, _c, _d;
+    detectProtocol(uuid, expectedProtocol, protocolHint) {
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
             if (expectedProtocol === 'V2') {
                 if (yield this.probeProtocolV2(uuid)) {
@@ -198,21 +202,49 @@ class LowlevelTransport {
                 }
                 throw this.createProtocolMismatchError(expectedProtocol);
             }
+            if (protocolHint === 'V2' && (yield this.probeProtocolV2(uuid))) {
+                this.deviceProtocol.set(uuid, 'V2');
+                (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2 (hint)`);
+                return 'V2';
+            }
             const cachedProtocol = this.deviceProtocol.get(uuid);
             if (cachedProtocol === 'V2' && (yield this.probeProtocolV2(uuid))) {
                 this.deviceProtocol.set(uuid, 'V2');
-                (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2 (cached)`);
+                (_d = this.Log) === null || _d === void 0 ? void 0 : _d.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2 (cached)`);
                 return 'V2';
             }
             let protocol = 'V1';
-            if (!(yield this.probeProtocolV1(uuid)) && (yield this.probeProtocolV2(uuid))) {
-                protocol = 'V2';
+            const protocolV1Detected = yield this.probeProtocolV1(uuid);
+            if (!protocolV1Detected) {
+                yield this.resetConnectionAfterProbe(uuid, 'V1');
+                if (yield this.probeProtocolV2(uuid)) {
+                    protocol = 'V2';
+                }
             }
             this.deviceProtocol.set(uuid, protocol);
-            (_d = this.Log) === null || _d === void 0 ? void 0 : _d.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> ${protocol}`);
+            (_e = this.Log) === null || _e === void 0 ? void 0 : _e.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> ${protocol}`);
             return protocol;
         });
     }
+    resetConnectionAfterProbe(uuid, protocol) {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function* () {
+            (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
+            try {
+                yield this.plugin.disconnect(uuid);
+            }
+            catch (error) {
+                (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug(`[LowlevelTransport] disconnect after Protocol ${protocol} probe failed:`, error);
+            }
+            try {
+                yield this.plugin.connect(uuid);
+            }
+            catch (error) {
+                (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[LowlevelTransport] reconnect after Protocol ${protocol} probe failed:`, error);
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.LowlevelTrasnportConnectError, (_d = error.message) !== null && _d !== void 0 ? _d : error);
+            }
+        });
+    }
     probeProtocolV1(uuid) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -243,10 +275,11 @@ class LowlevelTransport {
                 timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT_MS,
                 logger: this.Log,
                 logPrefix: 'ProtocolV2 Lowlevel-BLE',
-                onProbeFailed: () => {
-                    var _a;
-                    (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
-                },
+                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');
+                }),
             });
         });
     }

package/jest.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  preset: '../../jest.config.js',
+  testEnvironment: 'node',
+  modulePathIgnorePatterns: ['node_modules', '<rootDir>/lib', '<rootDir>/libDev'],
+  collectCoverage: true,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-lowlevel",
-  "version": "1.1.27-alpha.31",
+  "version": "1.1.27-alpha.32",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -15,12 +15,13 @@
   "scripts": {
     "dev": "rimraf dist && rollup -c ../../build/rollup.config.js -w",
     "build": "rimraf dist && rollup -c ../../build/rollup.config.js",
+    "test": "jest",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.1.27-alpha.31",
-    "@onekeyfe/hd-transport": "1.1.27-alpha.31"
+    "@onekeyfe/hd-shared": "1.1.27-alpha.32",
+    "@onekeyfe/hd-transport": "1.1.27-alpha.32"
   },
-  "gitHead": "73a8ecbc0e5e47038966b2f9a5ab30dc2f947d8f"
+  "gitHead": "04f92052a18dcf17e4a347f3003b4c4bbf062681"
 }

package/src/index.ts

@@ -28,7 +28,7 @@ const PROTOCOL_V2_PROBE_TIMEOUT_MS = 5000;
 const LOWLEVEL_PROTOCOL_TIMEOUT_MS = 30_000;
 const LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH = 64;
 
-function inferProtocolTypeFromDeviceName(name?: string | null): ProtocolType | undefined {
+function inferProtocolHintFromDeviceName(name?: string | null): ProtocolType | undefined {
   return /\bpro\s*2\b/i.test(name ?? '') ? 'V2' : undefined;
 }
 
@@ -55,6 +55,8 @@ export default class LowlevelTransport {
 
   private deviceProtocol: Map<string, ProtocolType> = new Map();
 
+  private deviceProtocolHints: Map<string, ProtocolType> = new Map();
+
   private protocolV2Assemblers: Map<string, ProtocolV2FrameAssembler> = new Map();
 
   getProtocolType(path: string): ProtocolType {
@@ -85,14 +87,11 @@ export default class LowlevelTransport {
   async enumerate() {
     const devices = await this.plugin.enumerate();
     return devices.map((device: LowLevelDevice) => {
-      const protocolType = inferProtocolTypeFromDeviceName(device.name);
-      if (protocolType) {
-        this.deviceProtocol.set(device.id, protocolType);
+      const protocolHint = inferProtocolHintFromDeviceName(device.name);
+      if (protocolHint) {
+        this.deviceProtocolHints.set(device.id, protocolHint);
       }
-      return {
-        ...device,
-        ...(protocolType ? { protocolType } : {}),
-      };
+      return device;
     });
   }
 
@@ -108,8 +107,14 @@ export default class LowlevelTransport {
     }
 
     this.protocolV2Assemblers.set(input.uuid, new ProtocolV2FrameAssembler());
-    const expectedProtocol = input.expectedProtocol ?? this.deviceProtocol.get(input.uuid);
-    const protocolType = await this.detectProtocol(input.uuid, expectedProtocol);
+    const protocolHint = input.expectedProtocol
+      ? undefined
+      : this.deviceProtocolHints.get(input.uuid);
+    const protocolType = await this.detectProtocol(
+      input.uuid,
+      input.expectedProtocol,
+      protocolHint
+    );
     return { uuid: input.uuid, protocolType };
   }
 
@@ -117,6 +122,7 @@ export default class LowlevelTransport {
     try {
       await this.plugin.disconnect(uuid);
       this.deviceProtocol.delete(uuid);
+      this.deviceProtocolHints.delete(uuid);
       this.protocolV2Assemblers.delete(uuid);
       return true;
     } catch (error) {
@@ -213,7 +219,8 @@ export default class LowlevelTransport {
 
   private async detectProtocol(
     uuid: string,
-    expectedProtocol?: ProtocolType
+    expectedProtocol?: ProtocolType,
+    protocolHint?: ProtocolType
   ): Promise<ProtocolType> {
     if (expectedProtocol === 'V2') {
       if (await this.probeProtocolV2(uuid)) {
@@ -233,6 +240,12 @@ export default class LowlevelTransport {
       throw this.createProtocolMismatchError(expectedProtocol);
     }
 
+    if (protocolHint === 'V2' && (await this.probeProtocolV2(uuid))) {
+      this.deviceProtocol.set(uuid, 'V2');
+      this.Log?.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2 (hint)`);
+      return 'V2';
+    }
+
     const cachedProtocol = this.deviceProtocol.get(uuid);
     if (cachedProtocol === 'V2' && (await this.probeProtocolV2(uuid))) {
       this.deviceProtocol.set(uuid, 'V2');
@@ -241,14 +254,44 @@ export default class LowlevelTransport {
     }
 
     let protocol: ProtocolType = 'V1';
-    if (!(await this.probeProtocolV1(uuid)) && (await this.probeProtocolV2(uuid))) {
-      protocol = 'V2';
+    const protocolV1Detected = await this.probeProtocolV1(uuid);
+    if (!protocolV1Detected) {
+      await this.resetConnectionAfterProbe(uuid, 'V1');
+      if (await this.probeProtocolV2(uuid)) {
+        protocol = 'V2';
+      }
     }
     this.deviceProtocol.set(uuid, protocol);
     this.Log?.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> ${protocol}`);
     return protocol;
   }
 
+  private async resetConnectionAfterProbe(uuid: string, protocol: ProtocolType) {
+    this.protocolV2Assemblers.get(uuid)?.reset();
+
+    try {
+      await this.plugin.disconnect(uuid);
+    } catch (error) {
+      this.Log?.debug(
+        `[LowlevelTransport] disconnect after Protocol ${protocol} probe failed:`,
+        error
+      );
+    }
+
+    try {
+      await this.plugin.connect(uuid);
+    } catch (error) {
+      this.Log?.debug(
+        `[LowlevelTransport] reconnect after Protocol ${protocol} probe failed:`,
+        error
+      );
+      throw ERRORS.TypedError(
+        HardwareErrorCode.LowlevelTrasnportConnectError,
+        error.message ?? error
+      );
+    }
+  }
+
   private async probeProtocolV1(uuid: string) {
     if (!this._messages) {
       return false;
@@ -277,8 +320,9 @@ export default class LowlevelTransport {
       timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT_MS,
       logger: this.Log,
       logPrefix: 'ProtocolV2 Lowlevel-BLE',
-      onProbeFailed: () => {
+      onProbeFailed: async () => {
         this.protocolV2Assemblers.get(uuid)?.reset();
+        await this.resetConnectionAfterProbe(uuid, 'V2');
       },
     });
   }