@onekeyfe/hd-transport 1.0.7-alpha.4 → 1.0.7

package/__tests__/decode-features.test.js

@@ -0,0 +1,72 @@
+const ProtoBuf = require('protobufjs/light');
+const ByteBuffer = require('bytebuffer');
+
+const { decode } = require('../src/serialization/protobuf/decode');
+const { decode: decodeProtocol } = require('../src/serialization/protocol/decode');
+
+// eslint-disable-next-line import/no-unresolved
+const messages = require('../messages.json');
+
+const fixtures = [
+  {
+    name: 'Features-error-battery_level',
+    encodeMessage:
+      '0011000000260a096f6e656b65792e736f1002180020002801900101aa010131b00101b80163c00163c020ff',
+    out: {
+      vendor: 'onekey.so',
+      major_version: 2,
+      minor_version: 0,
+      patch_version: 0,
+      bootloader_mode: true,
+      firmware_present: true,
+      capabilities: [],
+      model: '1',
+      fw_major: 1,
+      fw_minor: 99,
+      fw_patch: 99,
+      battery_level: 4,
+    },
+  },
+  {
+    name: 'Features-success',
+    encodeMessage:
+      '0011000000260a096f6e656b65792e736f1002180020002801900101aa010131b00102b80163c00163c02004',
+    out: {
+      vendor: 'onekey.so',
+      major_version: 2,
+      minor_version: 0,
+      patch_version: 0,
+      bootloader_mode: true,
+      firmware_present: true,
+      capabilities: [],
+      model: '1',
+      fw_major: 2,
+      fw_minor: 99,
+      fw_patch: 99,
+      battery_level: 4,
+    },
+  },
+];
+
+describe('Fix messages decode', () => {
+  const Messages = ProtoBuf.Root.fromJSON(messages);
+  const Message = Messages.lookup(`Features`);
+  fixtures.forEach(f => {
+    describe(f.name, () => {
+      test('decode', () => {
+        // deserialize
+        const encoded = ByteBuffer.fromHex(f.encodeMessage);
+        const { buffer } = decodeProtocol(encoded);
+        const decoded = decode(Message, buffer);
+
+        // filter null values
+        Object.keys(decoded).forEach(key => {
+          if (decoded[key] == null) {
+            delete decoded[key];
+          }
+        });
+        expect(decoded).toEqual(f.out);
+      });
+    });
+  });
+});

package/dist/index.js

@@ -135,7 +135,19 @@ function messageToJSON(Message, fields) {
 const decode$1 = (Message, data) => {
     const buff = data.toBuffer();
     const a = new Uint8Array(buff);
-    const decoded = Message.decode(a);
+    let decoded;
+    try {
+        decoded = Message.decode(a);
+    }
+    catch (error) {
+        if (a.length > 1 && a[a.length - 1] === 0xff) {
+            a[a.length - 1] = 0x04;
+            decoded = Message.decode(a);
+        }
+        else {
+            throw error;
+        }
+    }
     return messageToJSON(decoded, decoded.$type.fields);
 };
 

package/dist/serialization/protobuf/decode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decode.d.ts","sourceRoot":"","sources":["../../../src/serialization/protobuf/decode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAkB,MAAM,kBAAkB,CAAC;AACxD,OAAO,UAAU,MAAM,YAAY,CAAC;AAuEpC,eAAO,MAAM,MAAM,YAAa,IAAI,QAAQ,UAAU;;CAUrD,CAAC"}
+{"version":3,"file":"decode.d.ts","sourceRoot":"","sources":["../../../src/serialization/protobuf/decode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAkB,MAAM,kBAAkB,CAAC;AACxD,OAAO,UAAU,MAAM,YAAY,CAAC;AAuEpC,eAAO,MAAM,MAAM,YAAa,IAAI,QAAQ,UAAU;;CAsBrD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport",
-  "version": "1.0.7-alpha.4",
+  "version": "1.0.7",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -26,5 +26,5 @@
     "long": "^4.0.0",
     "protobufjs": "^6.11.2"
   },
-  "gitHead": "003e08dbef65862a4f747eaf4572d48a03c53c41"
+  "gitHead": "8b08f905e7426fac23b5cf9ec55eb336278f0e3b"
 }

package/src/serialization/protobuf/decode.ts

@@ -73,7 +73,19 @@ function messageToJSON(Message: Message<Record<string, unknown>>, fields: Type['
 export const decode = (Message: Type, data: ByteBuffer) => {
   const buff = data.toBuffer();
   const a = new Uint8Array(buff);
-  const decoded = Message.decode(a);
+
+  let decoded;
+  try {
+    decoded = Message.decode(a);
+  } catch (error) {
+    // Fix a battery_level problem with the device
+    if (a.length > 1 && a[a.length - 1] === 0xff) {
+      a[a.length - 1] = 0x04;
+      decoded = Message.decode(a);
+    } else {
+      throw error;
+    }
+  }
 
   // [compatibility]: in the end it should be possible to get rid of messageToJSON method and call
   // Message.toObject(decoded) to return result as plain javascript object. This method should be able to do