@onekeyfe/hd-common-connect-sdk 1.2.8-alpha.19 → 1.2.8-alpha.20

package/__tests__/device-state-events.test.ts

@@ -8,6 +8,7 @@ import {
   probeUsbDeviceIdentitiesWithTransport,
 } from '@onekeyfe/hd-core';
 import { HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
+import HttpTransport from '@onekeyfe/hd-transport-http';
 
 import sdkExport, { messagePromises, probeUsbDeviceIdentities } from '../src';
 
@@ -88,7 +89,7 @@ describe('SDK request cleanup', () => {
     expect(Object.keys(messagePromises)).toHaveLength(0);
   });
 
-  test.each(['webusb', 'bridge'] as const)(
+  test.each(['webusb'] as const)(
     'probes %s without disposing an outstanding BLE request and coalesces concurrent probes',
     async commType => {
       const pending = createDeferred<unknown>();
@@ -116,6 +117,17 @@ describe('SDK request cleanup', () => {
     }
   );
 
+  test('rejects the withdrawn Bridge probe without creating a transport or affecting BLE', async () => {
+    jest.mocked(HttpTransport).mockClear();
+    jest.mocked(probeUsbDeviceIdentitiesWithTransport).mockClear();
+    await expect(probeUsbDeviceIdentities({ commType: 'bridge' })).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.CallMethodInvalidParameter,
+    });
+    expect(HttpTransport).not.toHaveBeenCalled();
+    expect(probeUsbDeviceIdentitiesWithTransport).not.toHaveBeenCalled();
+    expect(core.dispose).not.toHaveBeenCalled();
+  });
+
   test('waits for Core disposal and does not retain old listeners after reinitialization', async () => {
     const cleanup = createDeferred<void>();
     core.dispose.mockImplementationOnce(async () => {

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import * as _onekeyfe_hd_core from '@onekeyfe/hd-core';
 import { UsbDeviceIdentity } from '@onekeyfe/hd-core';
 import { Deferred } from '@onekeyfe/hd-shared';
 
-/** Identify USB without disposing the current SDK, changing settings, or opening a wallet. */
+/** Identify WebUSB without disposing the current SDK, changing settings, or opening a wallet. */
 declare const probeUsbDeviceIdentities: ({ commType, }: {
     commType: UsbDeviceIdentity['commType'];
 }) => Promise<UsbDeviceIdentity[]>;

package/dist/index.js

@@ -609,10 +609,10 @@ var _core;
 var _settings = HardwareSdk.parseConnectSettings();
 var usbIdentityProbeTransports = {};
 var usbIdentityProbes = {};
-/** Identify USB without disposing the current SDK, changing settings, or opening a wallet. */
+/** Identify WebUSB without disposing the current SDK, changing settings, or opening a wallet. */
 var probeUsbDeviceIdentities = function (_a) {
     var commType = _a.commType;
-    if (commType !== 'webusb' && commType !== 'bridge') {
+    if (commType !== 'webusb') {
         return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter));
     }
     var pending = usbIdentityProbes[commType];
@@ -620,8 +620,7 @@ var probeUsbDeviceIdentities = function (_a) {
         return pending;
     var transport = usbIdentityProbeTransports[commType];
     if (!transport) {
-        transport =
-            commType === 'webusb' ? new hdTransportWebDevice.WebUsbTransport(true) : new HttpTransport__default["default"](undefined, 3000);
+        transport = new hdTransportWebDevice.WebUsbTransport(true);
         usbIdentityProbeTransports[commType] = transport;
     }
     var probe = HardwareSdk.probeUsbDeviceIdentitiesWithTransport(transport, commType, function (descriptor) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-common-connect-sdk",
-  "version": "1.2.8-alpha.19",
+  "version": "1.2.8-alpha.20",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "ISC",
@@ -21,13 +21,13 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "1.2.8-alpha.19",
-    "@onekeyfe/hd-shared": "1.2.8-alpha.19",
-    "@onekeyfe/hd-transport-emulator": "1.2.8-alpha.19",
-    "@onekeyfe/hd-transport-http": "1.2.8-alpha.19",
-    "@onekeyfe/hd-transport-lowlevel": "1.2.8-alpha.19",
-    "@onekeyfe/hd-transport-usb": "1.2.8-alpha.19",
-    "@onekeyfe/hd-transport-web-device": "1.2.8-alpha.19"
+    "@onekeyfe/hd-core": "1.2.8-alpha.20",
+    "@onekeyfe/hd-shared": "1.2.8-alpha.20",
+    "@onekeyfe/hd-transport-emulator": "1.2.8-alpha.20",
+    "@onekeyfe/hd-transport-http": "1.2.8-alpha.20",
+    "@onekeyfe/hd-transport-lowlevel": "1.2.8-alpha.20",
+    "@onekeyfe/hd-transport-usb": "1.2.8-alpha.20",
+    "@onekeyfe/hd-transport-web-device": "1.2.8-alpha.20"
   },
-  "gitHead": "822e744bceb68a0928ad89d445b985897432edcf"
+  "gitHead": "973f059fe93a58fdcf098ddb32ba63f621a2c78e"
 }

package/src/index.ts

@@ -59,28 +59,26 @@ const getTransport = async (env: ConnectSettings['env']) => {
 let _core: Core | undefined;
 let _settings = parseConnectSettings();
 
-const usbIdentityProbeTransports: Partial<
-  Record<UsbDeviceIdentity['commType'], WebUsbTransport | HttpTransport>
-> = {};
+const usbIdentityProbeTransports: Partial<Record<UsbDeviceIdentity['commType'], WebUsbTransport>> =
+  {};
 const usbIdentityProbes: Partial<
   Record<UsbDeviceIdentity['commType'], Promise<UsbDeviceIdentity[]>>
 > = {};
 
-/** Identify USB without disposing the current SDK, changing settings, or opening a wallet. */
+/** Identify WebUSB without disposing the current SDK, changing settings, or opening a wallet. */
 export const probeUsbDeviceIdentities = ({
   commType,
 }: {
   commType: UsbDeviceIdentity['commType'];
 }): Promise<UsbDeviceIdentity[]> => {
-  if (commType !== 'webusb' && commType !== 'bridge') {
+  if (commType !== 'webusb') {
     return Promise.reject(ERRORS.TypedError(HardwareErrorCode.CallMethodInvalidParameter));
   }
   const pending = usbIdentityProbes[commType];
   if (pending) return pending;
   let transport = usbIdentityProbeTransports[commType];
   if (!transport) {
-    transport =
-      commType === 'webusb' ? new WebUsbTransport(true) : new HttpTransport(undefined, 3000);
+    transport = new WebUsbTransport(true);
     usbIdentityProbeTransports[commType] = transport;
   }
   const probe = probeUsbDeviceIdentitiesWithTransport(transport, commType, descriptor =>