@onekeyfe/hd-transport-react-native 1.2.0-alpha.34 → 1.2.0-alpha.35

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AA8BtC,eAAO,MAAM,wBAAwB,gBAA0B,CAAC;AAChE,eAAO,MAAM,sBAAsB,gBAAiB,MAAM,cAAc,SAAS;iBA1BhE,MAAM;;;QA2CtB,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,MAAM,GAAG,IAAI,WACP,CAAC;AAE/C,eAAO,MAAM,aAAa,UAAW,MAAM,GAAG,IAAI,UAAU,MAAM,GAAG,IAAI,YAGxE,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AA8BtC,eAAO,MAAM,wBAAwB,gBAA0B,CAAC;AAChE,eAAO,MAAM,sBAAsB,gBAAiB,MAAM,cAAc,SAAS;iBA1BhE,MAAM;;;QA2CtB,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,MAAM,GAAG,IAAI,WACP,CAAC;AAE/C,eAAO,MAAM,aAAa,UAAW,MAAM,GAAG,IAAI,UAAU,MAAM,GAAG,IAAI,YAGxE,CAAC"}

package/dist/index.d.ts

@@ -85,6 +85,7 @@ declare class ReactNativeBleTransport {
      * @returns
      */
     enumerate(): Promise<IOneKeyDevice[]>;
+    private installTransportForAcquire;
     acquire(input: BleAcquireInput): Promise<{
         uuid: string;
         protocolType: ProtocolType;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -215,18 +215,6 @@ class BleTransport {
     }
 }
 
-function createTransportCallLog(name, protocol, data) {
-    if (name === 'ResourceUpdate' || name === 'ResourceAck') {
-        return {
-            name,
-            protocol,
-            file_name: data.file_name,
-            hash: data.hash,
-        };
-    }
-    return { name, protocol };
-}
-
 const { check, ProtocolV1, parseConfigure } = transport__default["default"];
 const Log = bleLogger;
 const transportCache = {};
@@ -684,6 +672,33 @@ class ReactNativeBleTransport {
             }));
         });
     }
+    installTransportForAcquire(uuid, device, characteristics) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { writeCharacteristic, notifyCharacteristic } = characteristics !== null && characteristics !== void 0 ? characteristics : (yield this.resolveCharacteristics(device));
+            const transport$1 = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
+            if (reactNative.Platform.OS === 'android') {
+                transport$1.mtuSize = typeof device.mtu === 'number' ? device.mtu : transport$1.mtuSize;
+            }
+            const monitorToken = this.nextMonitorToken;
+            this.nextMonitorToken += 1;
+            const notifyTransactionId = `${uuid}:notify:${monitorToken}`;
+            transport$1.monitorToken = monitorToken;
+            transport$1.notifyTransactionId = notifyTransactionId;
+            this.monitorTokens.set(uuid, monitorToken);
+            transport$1.notifySubscription = this._monitorCharacteristic(transport$1.notifyCharacteristic, uuid, monitorToken, notifyTransactionId);
+            transportCache[uuid] = transport$1;
+            this.protocolV2Assemblers.set(uuid, new transport.ProtocolV2FrameAssembler(transport.PROTOCOL_V2_BLE_FRAME_MAX_BYTES));
+            if (reactNative.Platform.OS === 'ios') {
+                yield new Promise(resolve => {
+                    setTimeout(resolve, IOS_NOTIFY_READY_DELAY_MS);
+                });
+            }
+            else if (reactNative.Platform.OS === 'android') {
+                yield delay(ANDROID_NOTIFY_READY_DELAY_MS);
+            }
+            return transport$1;
+        });
+    }
     acquire(input) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
@@ -791,38 +806,34 @@ class ReactNativeBleTransport {
                 }
             }
             device = yield requestAndroidMtu(device);
-            const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristics(device);
+            const acquiredDevice = device;
+            const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristics(acquiredDevice);
             const protocolHint = expectedProtocol
                 ? undefined
-                : (_b = (_a = input.protocolHint) !== null && _a !== void 0 ? _a : this.deviceProtocolHints.get(uuid)) !== null && _b !== void 0 ? _b : inferProtocolHintFromDeviceName(getDeviceDisplayName(device));
+                : (_b = (_a = input.protocolHint) !== null && _a !== void 0 ? _a : this.deviceProtocolHints.get(uuid)) !== null && _b !== void 0 ? _b : inferProtocolHintFromDeviceName(getDeviceDisplayName(acquiredDevice));
             yield this.release(uuid, true);
             if (protocolHint) {
                 this.deviceProtocolHints.set(uuid, protocolHint);
             }
-            const transport$1 = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
-            if (reactNative.Platform.OS === 'android') {
-                transport$1.mtuSize = typeof device.mtu === 'number' ? device.mtu : transport$1.mtuSize;
-            }
-            const monitorToken = this.nextMonitorToken;
-            this.nextMonitorToken += 1;
-            const notifyTransactionId = `${uuid}:notify:${monitorToken}`;
-            transport$1.monitorToken = monitorToken;
-            transport$1.notifyTransactionId = notifyTransactionId;
-            this.monitorTokens.set(uuid, monitorToken);
-            transport$1.notifySubscription = this._monitorCharacteristic(transport$1.notifyCharacteristic, uuid, monitorToken, notifyTransactionId);
-            transportCache[uuid] = transport$1;
-            this.protocolV2Assemblers.set(uuid, new transport.ProtocolV2FrameAssembler(transport.PROTOCOL_V2_BLE_FRAME_MAX_BYTES));
-            if (reactNative.Platform.OS === 'ios') {
-                yield new Promise(resolve => {
-                    setTimeout(resolve, IOS_NOTIFY_READY_DELAY_MS);
-                });
+            yield this.installTransportForAcquire(uuid, acquiredDevice, {
+                writeCharacteristic,
+                notifyCharacteristic,
+            });
+            try {
+                const protocolType = yield this.detectProtocol(uuid, expectedProtocol, protocolHint, () => __awaiter(this, void 0, void 0, function* () {
+                    yield this.installTransportForAcquire(uuid, acquiredDevice);
+                }));
+                const currentTransport = transportCache[uuid];
+                if (!currentTransport) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotFound);
+                }
+                this.attachDisconnectSubscription(currentTransport, acquiredDevice, uuid);
+                return { uuid, protocolType };
             }
-            else if (reactNative.Platform.OS === 'android') {
-                yield delay(ANDROID_NOTIFY_READY_DELAY_MS);
+            catch (error) {
+                yield this.release(uuid, true);
+                throw error;
             }
-            const protocolType = yield this.detectProtocol(uuid, expectedProtocol, protocolHint);
-            this.attachDisconnectSubscription(transport$1, device, uuid);
-            return { uuid, protocolType };
         });
     }
     _monitorCharacteristic(characteristic, uuid, monitorToken, notifyTransactionId) {
@@ -1005,7 +1016,7 @@ class ReactNativeBleTransport {
             if (!protocol) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol has not been detected for ${uuid}`);
             }
-            Log === null || Log === void 0 ? void 0 : Log.debug('transport call', createTransportCallLog(name, protocol, data));
+            Log === null || Log === void 0 ? void 0 : Log.debug('transport call', transport.createTransportCallLog(name, protocol, data));
             if (protocol === 'V2') {
                 return this.callProtocolV2(uuid, name, data, options);
             }
@@ -1281,7 +1292,7 @@ class ReactNativeBleTransport {
             this.deviceProtocol.delete(uuid);
         }
     }
-    detectProtocol(uuid, expectedProtocol, protocolHint) {
+    detectProtocol(uuid, expectedProtocol, protocolHint, rebuildTransport) {
         return __awaiter(this, void 0, void 0, function* () {
             if (expectedProtocol === 'V1') {
                 if (yield this.probeProtocolV1(uuid)) {
@@ -1313,11 +1324,10 @@ class ReactNativeBleTransport {
                 if (i > 0) {
                     yield this.resetProbeStateAfterProtocolProbe(uuid, probeOrder[i - 1]);
                     if (!transportCache[uuid]) {
-                        const reacquired = yield this.acquire({
-                            uuid,
-                            expectedProtocol: protocol,
-                        });
-                        return reacquired.protocolType;
+                        if (!rebuildTransport) {
+                            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotFound);
+                        }
+                        yield rebuildTransport();
                     }
                 }
                 const detected = protocol === 'V1' ? yield this.probeProtocolV1(uuid) : yield this.probeProtocolV2(uuid);

package/dist/transportLog.d.ts

@@ -1,13 +1,2 @@
-import type { ProtocolType } from '@onekeyfe/hd-transport';
-export declare function createTransportCallLog(name: string, protocol: ProtocolType, data: Record<string, unknown>): {
-    name: string;
-    protocol: ProtocolType;
-    file_name: unknown;
-    hash: unknown;
-} | {
-    name: string;
-    protocol: ProtocolType;
-    file_name?: undefined;
-    hash?: undefined;
-};
+export { createTransportCallLog } from '@onekeyfe/hd-transport';
 //# sourceMappingURL=transportLog.d.ts.map

package/dist/transportLog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transportLog.d.ts","sourceRoot":"","sources":["../src/transportLog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,YAAY,EACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;;;;;;;EAY9B"}
+{"version":3,"file":"transportLog.d.ts","sourceRoot":"","sources":["../src/transportLog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.2.0-alpha.34",
+  "version": "1.2.0-alpha.35",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -20,11 +20,11 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "1.2.0-alpha.34",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.34",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.34",
+    "@onekeyfe/hd-core": "1.2.0-alpha.35",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.35",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.35",
     "@onekeyfe/react-native-ble-utils": "^0.1.6",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "07f10b4c9fab177da7c36d976ec18b075492b57f"
+  "gitHead": "638bd33030686c4a3321e4feb4924c3f9f5c81a8"
 }

package/src/__tests__/protocolV2Link.test.ts

@@ -186,6 +186,8 @@ const createHarness = () => {
 
 const createV1Harness = () => {
   const uuid = 'rn-classic-id';
+  const notifySubscriptionRemovers: jest.Mock[] = [];
+  const disconnectSubscriptionRemovers: jest.Mock[] = [];
   let notifyCallback:
     | ((error: Error | null, characteristic: { value: string } | null) => void)
     | undefined;
@@ -195,7 +197,9 @@ const createV1Harness = () => {
     isNotifiable: true,
     monitor: jest.fn(callback => {
       notifyCallback = callback;
-      return { remove: jest.fn() };
+      const remove = jest.fn();
+      notifySubscriptionRemovers.push(remove);
+      return { remove };
     }),
   };
   let writeCount = 0;
@@ -221,21 +225,33 @@ const createV1Harness = () => {
     serviceUUIDs: ['00000001-0000-1000-8000-00805f9b34fb'],
     isConnected: jest.fn(() => Promise.resolve(true)),
     cancelConnection: jest.fn(() => Promise.resolve()),
-    onDisconnected: jest.fn(() => ({ remove: jest.fn() })),
+    onDisconnected: jest.fn(() => {
+      const remove = jest.fn();
+      disconnectSubscriptionRemovers.push(remove);
+      return { remove };
+    }),
   };
   const transport = new ReactNativeBleTransport({ scanTimeout: 1 });
-  transport.blePlxManager = {
+  const bleManager = {
     devices: jest.fn(() => Promise.resolve([device])),
     connectedDevices: jest.fn(() => Promise.resolve([])),
     cancelTransaction: jest.fn(() => Promise.resolve()),
-  } as any;
+  };
+  transport.blePlxManager = bleManager as any;
   transport.resolveCharacteristics = jest.fn(() =>
     Promise.resolve({ writeCharacteristic, notifyCharacteristic })
   );
   transport.init({ debug: jest.fn(), error: jest.fn() }, new EventEmitter());
   transport.configure(protocolV1Schema);
   transport.configureProtocolV2(protocolV2Schema);
-  return { transport, uuid, device };
+  return {
+    transport,
+    uuid,
+    device,
+    bleManager,
+    notifySubscriptionRemovers,
+    disconnectSubscriptionRemovers,
+  };
 };
 
 describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
@@ -287,7 +303,8 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
   });
 
   test('reconnects before falling back to Protocol V1 after a fatal V2 probe failure', async () => {
-    const { transport, uuid } = createV1Harness();
+    const { transport, uuid, device, notifySubscriptionRemovers, disconnectSubscriptionRemovers } =
+      createV1Harness();
     const probeProtocolV2 = jest
       .spyOn(transport as any, 'probeProtocolV2')
       .mockImplementationOnce(async () => {
@@ -304,6 +321,35 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     expect(probeProtocolV2).toHaveBeenCalledTimes(1);
     expect(resolveCharacteristics).toHaveBeenCalledTimes(2);
     expect(transport.getProtocolType(uuid)).toBe('V1');
+    expect(device.onDisconnected).toHaveBeenCalledTimes(1);
+    expect(notifySubscriptionRemovers).toHaveLength(2);
+    expect(notifySubscriptionRemovers[0]).toHaveBeenCalledTimes(1);
+
+    await transport.release(uuid, true);
+
+    expect(notifySubscriptionRemovers[1]).toHaveBeenCalledTimes(1);
+    expect(disconnectSubscriptionRemovers).toHaveLength(1);
+    expect(disconnectSubscriptionRemovers[0]).toHaveBeenCalledTimes(1);
+  });
+
+  test('cleans the rebuilt transport when Protocol V1 fallback also fails', async () => {
+    const { transport, uuid, device, bleManager, notifySubscriptionRemovers } = createV1Harness();
+    jest.spyOn(transport as any, 'probeProtocolV2').mockImplementationOnce(async () => {
+      await (transport as any).releaseNative(uuid, true);
+      return false;
+    });
+    jest.spyOn(transport as any, 'probeProtocolV1').mockResolvedValue(false);
+
+    await expect(transport.acquire({ uuid, protocolHint: 'V2' })).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.BleTimeoutError,
+    });
+
+    expect(device.onDisconnected).not.toHaveBeenCalled();
+    expect(notifySubscriptionRemovers).toHaveLength(2);
+    expect(notifySubscriptionRemovers[0]).toHaveBeenCalledTimes(1);
+    expect(notifySubscriptionRemovers[1]).toHaveBeenCalledTimes(1);
+    expect(bleManager.cancelTransaction).toHaveBeenCalled();
+    expect(transport.getProtocolType(uuid)).toBeUndefined();
   });
 
   test('disconnects and invalidates a Protocol V1 link after a response timeout', async () => {

package/src/constants.ts

@@ -1,3 +1,5 @@
+import { createKnownBleUuidAliases, matchesKnownBleUuid } from '@onekeyfe/hd-shared';
+
 export const IOS_PACKET_LENGTH = 128;
 export const ANDROID_PACKET_LENGTH = 192;
 export const ANDROID_DEFAULT_MTU = 23;
@@ -57,4 +59,3 @@ export const isSameBleUuid = (left?: string | null, right?: string | null) => {
   if (!left || !right) return false;
   return matchesKnownBleUuid(left, createKnownBleUuidAliases(right));
 };
-import { createKnownBleUuidAliases, matchesKnownBleUuid } from '@onekeyfe/hd-shared';

package/src/index.ts

@@ -649,6 +649,46 @@ export default class ReactNativeBleTransport {
     });
   }
 
+  private async installTransportForAcquire(
+    uuid: string,
+    device: Device,
+    characteristics?: ResolvedBleCharacteristics
+  ) {
+    const { writeCharacteristic, notifyCharacteristic } =
+      characteristics ?? (await this.resolveCharacteristics(device));
+    const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
+    if (Platform.OS === 'android') {
+      transport.mtuSize = typeof device.mtu === 'number' ? device.mtu : transport.mtuSize;
+    }
+    const monitorToken = this.nextMonitorToken;
+    this.nextMonitorToken += 1;
+    const notifyTransactionId = `${uuid}:notify:${monitorToken}`;
+    transport.monitorToken = monitorToken;
+    transport.notifyTransactionId = notifyTransactionId;
+    this.monitorTokens.set(uuid, monitorToken);
+    transport.notifySubscription = this._monitorCharacteristic(
+      transport.notifyCharacteristic,
+      uuid,
+      monitorToken,
+      notifyTransactionId
+    );
+    transportCache[uuid] = transport;
+    this.protocolV2Assemblers.set(
+      uuid,
+      new ProtocolV2FrameAssembler(PROTOCOL_V2_BLE_FRAME_MAX_BYTES)
+    );
+
+    if (Platform.OS === 'ios') {
+      await new Promise<void>(resolve => {
+        setTimeout(resolve, IOS_NOTIFY_READY_DELAY_MS);
+      });
+    } else if (Platform.OS === 'android') {
+      await delay(ANDROID_NOTIFY_READY_DELAY_MS);
+    }
+
+    return transport;
+  }
+
   async acquire(input: BleAcquireInput) {
     const { uuid, forceCleanRunPromise, expectedProtocol } = input;
 
@@ -772,13 +812,16 @@ export default class ReactNativeBleTransport {
     }
 
     device = await requestAndroidMtu(device);
-    const { writeCharacteristic, notifyCharacteristic } = await this.resolveCharacteristics(device);
+    const acquiredDevice = device;
+    const { writeCharacteristic, notifyCharacteristic } = await this.resolveCharacteristics(
+      acquiredDevice
+    );
 
     const protocolHint = expectedProtocol
       ? undefined
       : input.protocolHint ??
         this.deviceProtocolHints.get(uuid) ??
-        inferProtocolHintFromDeviceName(getDeviceDisplayName(device));
+        inferProtocolHintFromDeviceName(getDeviceDisplayName(acquiredDevice));
 
     // release transport before new transport instance
     await this.release(uuid, true);
@@ -786,42 +829,30 @@ export default class ReactNativeBleTransport {
       this.deviceProtocolHints.set(uuid, protocolHint);
     }
 
-    const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
-    if (Platform.OS === 'android') {
-      transport.mtuSize = typeof device.mtu === 'number' ? device.mtu : transport.mtuSize;
-    }
-    const monitorToken = this.nextMonitorToken;
-    this.nextMonitorToken += 1;
-    const notifyTransactionId = `${uuid}:notify:${monitorToken}`;
-    transport.monitorToken = monitorToken;
-    transport.notifyTransactionId = notifyTransactionId;
-    this.monitorTokens.set(uuid, monitorToken);
-    transport.notifySubscription = this._monitorCharacteristic(
-      transport.notifyCharacteristic,
-      uuid,
-      monitorToken,
-      notifyTransactionId
-    );
-    transportCache[uuid] = transport;
-
-    this.protocolV2Assemblers.set(
-      uuid,
-      new ProtocolV2FrameAssembler(PROTOCOL_V2_BLE_FRAME_MAX_BYTES)
-    );
+    await this.installTransportForAcquire(uuid, acquiredDevice, {
+      writeCharacteristic,
+      notifyCharacteristic,
+    });
 
-    if (Platform.OS === 'ios') {
-      await new Promise<void>(resolve => {
-        setTimeout(resolve, IOS_NOTIFY_READY_DELAY_MS);
-      });
-    } else if (Platform.OS === 'android') {
-      await delay(ANDROID_NOTIFY_READY_DELAY_MS);
+    try {
+      const protocolType = await this.detectProtocol(
+        uuid,
+        expectedProtocol,
+        protocolHint,
+        async () => {
+          await this.installTransportForAcquire(uuid, acquiredDevice);
+        }
+      );
+      const currentTransport = transportCache[uuid];
+      if (!currentTransport) {
+        throw ERRORS.TypedError(HardwareErrorCode.TransportNotFound);
+      }
+      this.attachDisconnectSubscription(currentTransport, acquiredDevice, uuid);
+      return { uuid, protocolType };
+    } catch (error) {
+      await this.release(uuid, true);
+      throw error;
     }
-
-    const protocolType = await this.detectProtocol(uuid, expectedProtocol, protocolHint);
-
-    this.attachDisconnectSubscription(transport, device, uuid);
-
-    return { uuid, protocolType };
   }
 
   _monitorCharacteristic(
@@ -1388,7 +1419,8 @@ export default class ReactNativeBleTransport {
   private async detectProtocol(
     uuid: string,
     expectedProtocol?: ProtocolType,
-    protocolHint?: ProtocolType
+    protocolHint?: ProtocolType,
+    rebuildTransport?: () => Promise<void>
   ): Promise<ProtocolType> {
     if (expectedProtocol === 'V1') {
       if (await this.probeProtocolV1(uuid)) {
@@ -1427,11 +1459,10 @@ export default class ReactNativeBleTransport {
         // Reset subscriptions and buffers after a failed probe before trying another protocol.
         await this.resetProbeStateAfterProtocolProbe(uuid, probeOrder[i - 1]);
         if (!transportCache[uuid]) {
-          const reacquired = await this.acquire({
-            uuid,
-            expectedProtocol: protocol,
-          });
-          return reacquired.protocolType;
+          if (!rebuildTransport) {
+            throw ERRORS.TypedError(HardwareErrorCode.TransportNotFound);
+          }
+          await rebuildTransport();
         }
       }
       const detected =

package/src/transportLog.ts

@@ -1,18 +1 @@
-import type { ProtocolType } from '@onekeyfe/hd-transport';
-
-export function createTransportCallLog(
-  name: string,
-  protocol: ProtocolType,
-  data: Record<string, unknown>
-) {
-  if (name === 'ResourceUpdate' || name === 'ResourceAck') {
-    return {
-      name,
-      protocol,
-      file_name: data.file_name,
-      hash: data.hash,
-    };
-  }
-
-  return { name, protocol };
-}
+export { createTransportCallLog } from '@onekeyfe/hd-transport';