@onekeyfe/hd-transport 1.2.8-alpha.10 → 1.2.8-alpha.12

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;AAGpC,OAAO,EAAE,qBAAqB,EAA+C,MAAM,cAAc,CAAC;AAElG,OAAO,EAAE,aAAa,IAAI,eAAe,EAAE,MAAM,cAAc,CAAC;AAShE,OAAO,EAGL,kBAAkB,EAClB,UAAU,EACX,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,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;CACd,CAAC;AAkGF,eAAO,MAAM,UAAU;;;;;;;;;;CAOtB,CAAC;AAEF,eAAO,MAAM,UAAU;;;0BAIC,iBAAiB,SAAS,UAAU;;;;;;;;;;yBAgB/C,iBAAiB,QACpB,MAAM,QACN,OAAO,MAAM,EAAE,OAAO,CAAC,YACpB,sBAAsB;yBAkBZ,iBAAiB,SAAS,UAAU;;;;;;;;;;;;;;;;;;;;;;CAqC1D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/protocols/index.ts"],"names":[],"mappings":";AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AAGpC,OAAO,EAAE,qBAAqB,EAA+C,MAAM,cAAc,CAAC;AAElG,OAAO,EAAE,aAAa,IAAI,eAAe,EAAE,MAAM,cAAc,CAAC;AAIhE,OAAO,EAGL,kBAAkB,EAClB,UAAU,EACX,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,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;CACd,CAAC;AAqHF,eAAO,MAAM,UAAU;;;;;;;;;;CAOtB,CAAC;AAEF,eAAO,MAAM,UAAU;;;0BAIC,iBAAiB,SAAS,UAAU;;;;;;;;;;yBAgB/C,iBAAiB,QACpB,MAAM,QACN,OAAO,MAAM,EAAE,OAAO,CAAC,YACpB,sBAAsB;yBAkBZ,iBAAiB,SAAS,UAAU;;;;;;;;;;;;;;;;;;;;;;CAqC1D,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;AAI7C,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,iBAmCvD;AAED,eAAO,MAAM,qBAAqB,aAAc,SAAS,IAAI,QAAQ,MAAM;;;CAiB1E,CAAC;AAEF,eAAO,MAAM,qBAAqB,aAAc,SAAS,IAAI,UAAU,MAAM;;;CAgB5E,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.8-alpha.10",
+  "version": "1.2.8-alpha.12",
   "description": "Transport layer abstractions and utilities for OneKey hardware SDK.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -11,9 +11,9 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "node scripts/protobuf-static.js && rimraf dist && rollup -c ../../build/rollup.config.js -w",
-    "build": "node scripts/protobuf-static.js && rimraf dist && rollup -c ../../build/rollup.config.js",
-    "test": "node scripts/protobuf-static.js && jest",
+    "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",
     "update:protobuf": "./scripts/protobuf-build.sh"
@@ -28,5 +28,5 @@
     "long": "^4.0.0",
     "protobufjs": "^6.11.2"
   },
-  "gitHead": "47d2f63acb8e5fa9ee623c060af7c9f83ad6f939"
+  "gitHead": "69c7334a3d32e0b55f1b8e57420754fdb5fcd645"
 }

package/src/protocols/index.ts

@@ -1,17 +1,12 @@
 import ByteBuffer from 'bytebuffer';
-import { Reader } from 'protobufjs/light';
+import { Reader, Type } from 'protobufjs/light';
 
 import { encodeEnvelopeMessage, encodeMessageChunks, encodeTransportPackets } from './v1/packets';
 import { decodeFirstChunk } from './v1/decode';
 import { decodeMessage as decodeV1Message } from './v1/receive';
-import {
-  createMessageFromName,
-  createMessageFromType,
-  parseConfigure,
-} from '../serialization/protobuf/messages';
+import { createMessageFromName, createMessageFromType } from '../serialization/protobuf/messages';
 import { encode as encodeProtobuf } from '../serialization/protobuf/encode';
 import { decode as decodeProtobuf } from '../serialization/protobuf/decode';
-import { legacyProtocolInfoSchema } from '../../lib/protobuf-static';
 import {
   decodeFrame as decodeV2Frame,
   encodeProtobufFrame,
@@ -35,8 +30,27 @@ type ProtocolV2FrameOptions = {
   seq?: number;
 };
 
-const LEGACY_PROTOCOL_V2_PROTOCOL_INFO =
-  parseConfigure(legacyProtocolInfoSchema).lookupType('LegacyProtocolInfo');
+const LEGACY_PROTOCOL_V2_PROTOCOL_INFO = Type.fromJSON('LegacyProtocolInfo', {
+  fields: {
+    version: {
+      rule: 'required',
+      type: 'uint32',
+      id: 1,
+    },
+    supported_messages: {
+      rule: 'repeated',
+      type: 'uint32',
+      id: 2,
+      options: {
+        packed: false,
+      },
+    },
+    protobuf_definition: {
+      type: 'string',
+      id: 3,
+    },
+  },
+});
 
 const decodeLegacyProtocolV2ProtocolInfo = (pbPayload: Uint8Array) => {
   const byteBuffer = ByteBuffer.wrap(Buffer.from(pbPayload) as unknown as ArrayBuffer);

package/src/serialization/protobuf/messages.ts

@@ -1,42 +1,11 @@
 import * as protobuf from 'protobufjs/light';
 
-import { schemaKey, schemas } from '../../../lib/protobuf-static';
-
 export function parseConfigure(data: protobuf.INamespace) {
   // @ts-ignore [compatiblity]: connect is sending stringified json
-  const schema = typeof data === 'string' ? JSON.parse(data) : data;
-  const key = schemaKey(schema);
-  const createConstructors = schemas[key];
-  // Field resolution mutates options; keep built-in descriptors reusable across connections.
-  const messages = protobuf.Root.fromJSON(
-    createConstructors ? JSON.parse(JSON.stringify(schema)) : schema
-  );
-  if (createConstructors) {
-    const constructors = createConstructors();
-    const types: protobuf.Type[] = [];
-    const collect = (namespace: protobuf.Namespace) => {
-      if (namespace instanceof protobuf.Type) types.push(namespace);
-      namespace.nestedArray.forEach(child => {
-        if (child instanceof protobuf.Namespace) collect(child);
-      });
-    };
-    collect(messages);
-    // Register every constructor before resolving fields, which access parent.ctor.
-    types.forEach(type => {
-      type.ctor = constructors[type.fullName];
-    });
-    types.forEach(type => {
-      const constructor = constructors[type.fullName];
-      type.encode = constructor.encode;
-      type.decode = constructor.decode;
-      type.verify = constructor.verify;
-      type.fromObject = constructor.fromObject;
-      type.toObject = constructor.toObject;
-      type.setup = () => type;
-    });
-    messages.resolveAll();
+  if (typeof data === 'string') {
+    return protobuf.Root.fromJSON(JSON.parse(data));
   }
-  return messages;
+  return protobuf.Root.fromJSON(data);
 }
 
 export const createMessageFromName = (messages: protobuf.Root, name: string) => {

package/lib/protobuf-static.d.ts

@@ -1,5 +0,0 @@
-import type { Constructor, INamespace, Type } from 'protobufjs/light';
-type StaticMessageConstructor = Constructor<{}> & Pick<Type, 'encode' | 'decode' | 'verify' | 'fromObject' | 'toObject'>;
-export function schemaKey(schema: INamespace): string;
-export const schemas: Partial<Record<string, () => Record<string, StaticMessageConstructor>>>;
-export const legacyProtocolInfoSchema: INamespace;