@onekeyfe/hd-transport 1.2.0-alpha.1 → 1.2.0-alpha.3

package/__tests__/messages.test.js

@@ -70,6 +70,14 @@ describe('messages', () => {
     expect(() => createMessageFromType(messages, 0)).not.toThrow();
   });
 
+  test('createMessageFromType throws a readable error for unknown ids', () => {
+    const messages = parseConfigure(json);
+
+    expect(() => createMessageFromType(messages, 99999)).toThrow(
+      'MessageType id "99999" is not defined in protobuf schema'
+    );
+  });
+
   test('createMessageFromName (wire_type case)', () => {
     const messages = parseConfigure(json);
     const name = 'TxAckInput';

package/__tests__/protocol-v2.test.js

@@ -15,6 +15,18 @@ const protocolV1Messages = parseConfigure({
         },
       },
     },
+    Failure: {
+      fields: {
+        code: {
+          type: 'uint32',
+          id: 1,
+        },
+        message: {
+          type: 'string',
+          id: 2,
+        },
+      },
+    },
     ButtonRequest: {
       fields: {
         code: {
@@ -32,6 +44,7 @@ const protocolV1Messages = parseConfigure({
     MessageType: {
       values: {
         MessageType_Success: 2,
+        MessageType_Failure: 3,
         MessageType_ButtonRequest: 26,
         MessageType_OnekeyGetFeatures: 10025,
         MessageType_OnekeyFeatures: 10026,
@@ -714,6 +727,26 @@ describe('Protocol V2 framing and session', () => {
     expect(decoded.type).toBe('ButtonRequest');
   });
 
+  test('decodes legacy V1 Failure as a Protocol V2 fallback', () => {
+    // Some device-side rejection paths still return legacy Failure(type=3)
+    // inside a Protocol V2 frame. It must surface as a device Failure, not as
+    // a protobuf catalog TypeError.
+    const frame = ProtocolV2.encodeFrame(
+      { ...schemas, protocolV2: schemas.protocolV1 },
+      'Failure',
+      {
+        code: 1,
+        message: 'Action cancelled',
+      }
+    );
+    const decoded = ProtocolV2.decodeFrame(schemas, frame);
+    expect(decoded.type).toBe('Failure');
+    expect(decoded.message).toEqual({
+      code: 1,
+      message: 'Action cancelled',
+    });
+  });
+
   test('does not fall back to legacy V1 messages outside the allowlist', () => {
     // OnekeyFeatures exists only in the V1 schema and is not allowlisted.
     const frame = protocolV2.encodeProtobufFrame(10026, new Uint8Array(0));

package/dist/index.js

@@ -249,7 +249,11 @@ const createMessageFromName = (messages, name) => {
 };
 const createMessageFromType = (messages, typeId) => {
     const MessageType = messages.lookupEnum('MessageType');
-    const messageName = MessageType.valuesById[typeId].replace('MessageType_', '');
+    const rawMessageName = MessageType.valuesById[typeId];
+    if (!rawMessageName) {
+        throw new Error(`MessageType id "${typeId}" is not defined in protobuf schema`);
+    }
+    const messageName = rawMessageName.replace('MessageType_', '');
     const Message = messages.lookupType(messageName);
     return {
         Message,
@@ -605,6 +609,7 @@ const resolveProtocolV2EncodeSchema = (name, schemas) => {
     }
 };
 const PROTOCOL_V2_LEGACY_DECODE_ALLOWLIST = new Set([
+    'Failure',
     'ButtonRequest',
     'EntropyRequest',
     'PinMatrixRequest',

package/dist/protocols/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/protocols/index.ts"],"names":[],"mappings":";AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAE,qBAAqB,EAA+C,MAAM,cAAc,CAAC;AAElG,OAAO,EAAE,aAAa,IAAI,eAAe,EAAE,MAAM,cAAc,CAAC;AAMhE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,MAAM,CAAC;AAElD,eAAO,MAAM,iCAAiC,QAAQ,CAAC;AAEvD,KAAK,iBAAiB,GAAG;IACvB,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;CAClB,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,qBAAqB,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAqCF,eAAO,MAAM,UAAU;;;;;;;;;;CAOtB,CAAC;AAEF,eAAO,MAAM,UAAU;yBAEV,iBAAiB,QACpB,MAAM,QACN,OAAO,MAAM,EAAE,OAAO,CAAC,YACpB,sBAAsB;yBAkCtB,iBAAiB,SACnB,UAAU,YACR,KAAK,sBAAsB,EAAE,QAAQ,GAAG,WAAW,GAAG,SAAS,CAAC;;;;;;;;;;CA4B5E,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/protocols/index.ts"],"names":[],"mappings":";AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAE,qBAAqB,EAA+C,MAAM,cAAc,CAAC;AAElG,OAAO,EAAE,aAAa,IAAI,eAAe,EAAE,MAAM,cAAc,CAAC;AAMhE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,MAAM,CAAC;AAElD,eAAO,MAAM,iCAAiC,QAAQ,CAAC;AAEvD,KAAK,iBAAiB,GAAG;IACvB,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;CAClB,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,qBAAqB,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAsCF,eAAO,MAAM,UAAU;;;;;;;;;;CAOtB,CAAC;AAEF,eAAO,MAAM,UAAU;yBAEV,iBAAiB,QACpB,MAAM,QACN,OAAO,MAAM,EAAE,OAAO,CAAC,YACpB,sBAAsB;yBAkCtB,iBAAiB,SACnB,UAAU,YACR,KAAK,sBAAsB,EAAE,QAAQ,GAAG,WAAW,GAAG,SAAS,CAAC;;;;;;;;;;CA4B5E,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/serialization/protobuf/messages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAE7C,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,iBAMvD;AAED,eAAO,MAAM,qBAAqB,aAAc,SAAS,IAAI,QAAQ,MAAM;;;CAiB1E,CAAC;AAEF,eAAO,MAAM,qBAAqB,aAAc,SAAS,IAAI,UAAU,MAAM;;;CAW5E,CAAC"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/serialization/protobuf/messages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAE7C,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,iBAMvD;AAED,eAAO,MAAM,qBAAqB,aAAc,SAAS,IAAI,QAAQ,MAAM;;;CAiB1E,CAAC;AAEF,eAAO,MAAM,qBAAqB,aAAc,SAAS,IAAI,UAAU,MAAM;;;CAgB5E,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport",
-  "version": "1.2.0-alpha.1",
+  "version": "1.2.0-alpha.3",
   "description": "Transport layer abstractions and utilities for OneKey hardware SDK.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -28,5 +28,5 @@
     "long": "^4.0.0",
     "protobufjs": "^6.11.2"
   },
-  "gitHead": "4f4aae3a47be7bd54b4db4a10c400056784e01bd"
+  "gitHead": "54a4a40baee7e376b9a810dade60007d2c9b00c9"
 }

package/src/protocols/index.ts

@@ -38,6 +38,7 @@ const resolveProtocolV2EncodeSchema = (name: string, schemas: ProtocolV2Schemas)
 };
 
 const PROTOCOL_V2_LEGACY_DECODE_ALLOWLIST = new Set([
+  'Failure',
   'ButtonRequest',
   'EntropyRequest',
   'PinMatrixRequest',

package/src/serialization/protobuf/messages.ts

@@ -30,7 +30,12 @@ export const createMessageFromName = (messages: protobuf.Root, name: string) =>
 export const createMessageFromType = (messages: protobuf.Root, typeId: number) => {
   const MessageType = messages.lookupEnum('MessageType');
 
-  const messageName = MessageType.valuesById[typeId].replace('MessageType_', '');
+  const rawMessageName = MessageType.valuesById[typeId];
+  if (!rawMessageName) {
+    throw new Error(`MessageType id "${typeId}" is not defined in protobuf schema`);
+  }
+
+  const messageName = rawMessageName.replace('MessageType_', '');
 
   const Message = messages.lookupType(messageName);