@onekeyfe/hd-transport-web-device 1.2.0-alpha.0 → 1.2.0-alpha.2

package/__tests__/electron-ble-transport.test.ts

@@ -28,6 +28,25 @@ const protocolV1Schema = {
 
 const protocolV2Schema = {
   nested: {
+    GetProtoVersion: {
+      fields: {},
+    },
+    ProtoVersion: {
+      fields: {
+        major_version: {
+          type: 'uint32',
+          id: 1,
+        },
+        minor_version: {
+          type: 'uint32',
+          id: 2,
+        },
+        patch_version: {
+          type: 'uint32',
+          id: 3,
+        },
+      },
+    },
     Ping: {
       fields: {
         message: {
@@ -46,6 +65,8 @@ const protocolV2Schema = {
     },
     MessageType: {
       values: {
+        MessageType_GetProtoVersion: 60200,
+        MessageType_ProtoVersion: 60201,
         MessageType_Ping: 60206,
         MessageType_Success: 60207,
       },
@@ -109,13 +130,10 @@ describe('ElectronBleTransport protocol detection', () => {
     const device = { id: 'unknown-pro2-id', name: 'Unknown BLE Device' };
     const nobleBle = createNobleBle(device);
     let notificationHandler: ((deviceId: string, data: string) => void) | undefined;
-    let writeCount = 0;
     const probeResponse = ProtocolV2.encodeFrame(
       schemas,
       'Success',
-      {
-        message: 'probe',
-      },
+      { message: 'ok' },
       { router: PROTOCOL_V2_CHANNEL_BLE_UART }
     );
 
@@ -123,9 +141,10 @@ describe('ElectronBleTransport protocol detection', () => {
       notificationHandler = handler;
       return jest.fn();
     });
+    let writeCount = 0;
     nobleBle.write.mockImplementation(() => {
       writeCount += 1;
-      if (writeCount > 1) {
+      if (writeCount === 2) {
         setTimeout(() => notificationHandler?.(device.id, bytesToHex(probeResponse)), 0);
       }
       return Promise.resolve();
@@ -199,9 +218,7 @@ describe('ElectronBleTransport protocol detection', () => {
     const probeResponse = ProtocolV2.encodeFrame(
       schemas,
       'Success',
-      {
-        message: 'probe',
-      },
+      { message: 'ok' },
       { router: PROTOCOL_V2_CHANNEL_BLE_UART }
     );
 

package/dist/index.js

@@ -1365,7 +1365,7 @@ class ElectronBleTransport {
             if (!this._messages || !this._messagesV2) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
-            const forceRun = name === 'Initialize' || name === 'Cancel' || name === 'GetProtoVersion';
+            const forceRun = name === 'Initialize' || name === 'Cancel' || name === 'Ping';
             if (this.runPromise) {
                 if (!forceRun) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportCallInProgress);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-web-device",
-  "version": "1.2.0-alpha.0",
+  "version": "1.2.0-alpha.2",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -20,13 +20,13 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.0-alpha.0",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.0"
+    "@onekeyfe/hd-shared": "1.2.0-alpha.2",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.2"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.0",
+    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.2",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "de9efe20b83666b641ab9e8d945e6350f6450904"
+  "gitHead": "6c183b7f7027f4b4d3db4f427f6360351a6c6680"
 }

package/src/electron-ble-transport.ts

@@ -776,7 +776,7 @@ export default class ElectronBleTransport {
       throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
 
-    const forceRun = name === 'Initialize' || name === 'Cancel' || name === 'GetProtoVersion';
+    const forceRun = name === 'Initialize' || name === 'Cancel' || name === 'Ping';
     if (this.runPromise) {
       if (!forceRun) {
         throw ERRORS.TypedError(HardwareErrorCode.TransportCallInProgress);