@onekeyfe/hd-transport-web-device 1.0.38-alpha.2 → 1.0.39-alpha.10

package/dist/electron-ble-transport.d.ts

@@ -23,6 +23,7 @@ export default class ElectronBleTransport {
     private dataBuffers;
     private notificationCleanups;
     private disconnectCleanups;
+    private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;
     configure(signedData: any): void;

package/dist/electron-ble-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":";AAAA,OAAO,SAAkD,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAGL,QAAQ,EAGT,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAKlE,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,UAAU,CAAC,EAAE,UAAU,CAAC;KACzB;CACF;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AASF,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,IAAI,SAA0B;IAE9B,UAAU,UAAS;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAGvB,OAAO,CAAC,gBAAgB,CAA0B;IAGlD,OAAO,CAAC,WAAW,CAAsE;IAGzF,OAAO,CAAC,oBAAoB,CAAsC;IAGlE,OAAO,CAAC,kBAAkB,CAAsC;IAGhE,OAAO,CAAC,kBAAkB;IAmB1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAexC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAEA,SAAS,IAAI,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAcpD,OAAO,CAAC,KAAK,EAAE,eAAe;;;;IA0E9B,OAAO,CAAC,EAAE,EAAE,MAAM;IAwBxB,OAAO,CAAC,sBAAsB;IAkBxB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA2EpE,OAAO,CAAC,yBAAyB;CAyDlC"}
+{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":";AAAA,OAAO,SAAkD,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAIL,QAAQ,EAGT,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAKlE,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,UAAU,CAAC,EAAE,UAAU,CAAC;KACzB;CACF;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AASF,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,IAAI,SAA0B;IAE9B,UAAU,UAAS;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAGvB,OAAO,CAAC,gBAAgB,CAA0B;IAGlD,OAAO,CAAC,WAAW,CAAsE;IAGzF,OAAO,CAAC,oBAAoB,CAAsC;IAGlE,OAAO,CAAC,kBAAkB,CAAsC;IAGhE,OAAO,CAAC,oBAAoB;IAmC5B,OAAO,CAAC,kBAAkB;IAmB1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAexC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAEA,SAAS,IAAI,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAcpD,OAAO,CAAC,KAAK,EAAE,eAAe;;;;IA8E9B,OAAO,CAAC,EAAE,EAAE,MAAM;IAwBxB,OAAO,CAAC,sBAAsB;IA2BxB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA2EpE,OAAO,CAAC,yBAAyB;CAyDlC"}

package/dist/index.d.ts

@@ -54,6 +54,7 @@ declare class ElectronBleTransport {
     private dataBuffers;
     private notificationCleanups;
     private disconnectCleanups;
+    private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;
     configure(signedData: any): void;

package/dist/index.js

@@ -269,6 +269,35 @@ class ElectronBleTransport {
         this.notificationCleanups = new Map();
         this.disconnectCleanups = new Map();
     }
+    handleBluetoothError(error) {
+        if (error && typeof error === 'object') {
+            if ('code' in error) {
+                if (error.code === hdShared.HardwareErrorCode.BlePoweredOff) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePoweredOff);
+                }
+                if (error.code === hdShared.HardwareErrorCode.BleUnsupported) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleUnsupported);
+                }
+                if (error.code === hdShared.HardwareErrorCode.BlePermissionError) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError);
+                }
+            }
+            const errorMessage = error.message || String(error);
+            const poweredOffMessage = hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.BlePoweredOff];
+            const unsupportedMessage = hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.BleUnsupported];
+            const permissionMessage = hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.BlePermissionError];
+            if (errorMessage.includes(poweredOffMessage) || errorMessage.includes('poweredOff')) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePoweredOff);
+            }
+            if (errorMessage.includes(unsupportedMessage) || errorMessage.includes('unsupported')) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleUnsupported);
+            }
+            if (errorMessage.includes(permissionMessage) || errorMessage.includes('unauthorized')) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError);
+            }
+        }
+        throw error;
+    }
     cleanupDeviceState(deviceId) {
         this.connectedDevices.delete(deviceId);
         this.dataBuffers.delete(deviceId);
@@ -310,7 +339,7 @@ class ElectronBleTransport {
             }
             catch (error) {
                 (_b = this.Log) === null || _b === void 0 ? void 0 : _b.error('[Transport] Noble BLE enumerate failed:', error);
-                throw error;
+                this.handleBluetoothError(error);
             }
         });
     }
@@ -332,8 +361,13 @@ class ElectronBleTransport {
                 if (!device) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, `Device ${uuid} not found`);
                 }
-                yield window.desktopApi.nobleBle.connect(uuid);
-                this.connectedDevices.add(uuid);
+                try {
+                    yield window.desktopApi.nobleBle.connect(uuid);
+                    this.connectedDevices.add(uuid);
+                }
+                catch (error) {
+                    this.handleBluetoothError(error);
+                }
                 this.dataBuffers.set(uuid, { buffer: [], bufferLength: 0 });
                 yield window.desktopApi.nobleBle.subscribe(uuid);
                 const cleanup = window.desktopApi.nobleBle.onNotification((deviceId, data) => {
@@ -388,10 +422,17 @@ class ElectronBleTransport {
         });
     }
     handleNotificationData(deviceId, hexData) {
-        var _a;
+        var _a, _b;
+        if (hexData === 'PAIRING_REJECTED') {
+            (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[Transport] Pairing rejection detected for device:', deviceId);
+            if (this.runPromise) {
+                this.runPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceBondedCanceled));
+            }
+            return;
+        }
         const result = this.processNotificationPacket(deviceId, hexData);
         if (result.error) {
-            (_a = this.Log) === null || _a === void 0 ? void 0 : _a.error('[Transport] Packet processing error:', result.error);
+            (_b = this.Log) === null || _b === void 0 ? void 0 : _b.error('[Transport] Packet processing error:', result.error);
             if (this.runPromise) {
                 this.runPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-web-device",
-  "version": "1.0.38-alpha.2",
+  "version": "1.0.39-alpha.10",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -20,12 +20,12 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^1.0.38-alpha.2",
-    "@onekeyfe/hd-transport": "^1.0.38-alpha.2"
+    "@onekeyfe/hd-shared": "^1.0.39-alpha.10",
+    "@onekeyfe/hd-transport": "^1.0.39-alpha.10"
   },
   "devDependencies": {
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "8abef3b449b357bd179ed0f9a60f763335a688cd"
+  "gitHead": "97fbf97e4ba3388fdc01be8722a94358715dcf12"
 }

package/src/electron-ble-transport.ts

@@ -2,6 +2,7 @@ import transport, { COMMON_HEADER_SIZE, LogBlockCommand } from '@onekeyfe/hd-tra
 import {
   ERRORS,
   HardwareErrorCode,
+  HardwareErrorCodeMessage,
   Deferred,
   createDeferred,
   isHeaderChunk,
@@ -57,6 +58,41 @@ export default class ElectronBleTransport {
   // Disconnect listener cleanup functions
   private disconnectCleanups: Map<string, () => void> = new Map();
 
+  // Handle bluetooth related errors with proper error code mapping
+  private handleBluetoothError(error: any): never {
+    if (error && typeof error === 'object') {
+      // Check for specific bluetooth error codes
+      if ('code' in error) {
+        if (error.code === HardwareErrorCode.BlePoweredOff) {
+          throw ERRORS.TypedError(HardwareErrorCode.BlePoweredOff);
+        }
+        if (error.code === HardwareErrorCode.BleUnsupported) {
+          throw ERRORS.TypedError(HardwareErrorCode.BleUnsupported);
+        }
+        if (error.code === HardwareErrorCode.BlePermissionError) {
+          throw ERRORS.TypedError(HardwareErrorCode.BlePermissionError);
+        }
+      }
+      // Check for error message containing bluetooth state related text using predefined messages
+      const errorMessage = error.message || String(error);
+      const poweredOffMessage = HardwareErrorCodeMessage[HardwareErrorCode.BlePoweredOff];
+      const unsupportedMessage = HardwareErrorCodeMessage[HardwareErrorCode.BleUnsupported];
+      const permissionMessage = HardwareErrorCodeMessage[HardwareErrorCode.BlePermissionError];
+
+      if (errorMessage.includes(poweredOffMessage) || errorMessage.includes('poweredOff')) {
+        throw ERRORS.TypedError(HardwareErrorCode.BlePoweredOff);
+      }
+      if (errorMessage.includes(unsupportedMessage) || errorMessage.includes('unsupported')) {
+        throw ERRORS.TypedError(HardwareErrorCode.BleUnsupported);
+      }
+      if (errorMessage.includes(permissionMessage) || errorMessage.includes('unauthorized')) {
+        throw ERRORS.TypedError(HardwareErrorCode.BlePermissionError);
+      }
+    }
+
+    throw error;
+  }
+
   // Clean up all device state and listeners - unified cleanup function
   private cleanupDeviceState(deviceId: string): void {
     this.connectedDevices.delete(deviceId);
@@ -110,7 +146,7 @@ export default class ElectronBleTransport {
       return devices;
     } catch (error) {
       this.Log?.error('[Transport] Noble BLE enumerate failed:', error);
-      throw error;
+      this.handleBluetoothError(error);
     }
   }
 
@@ -138,8 +174,12 @@ export default class ElectronBleTransport {
       }
 
       // Connect to device
-      await window.desktopApi.nobleBle.connect(uuid);
-      this.connectedDevices.add(uuid);
+      try {
+        await window.desktopApi.nobleBle.connect(uuid);
+        this.connectedDevices.add(uuid);
+      } catch (error) {
+        this.handleBluetoothError(error);
+      }
 
       // Initialize data buffer for this device
       this.dataBuffers.set(uuid, { buffer: [], bufferLength: 0 });
@@ -213,6 +253,15 @@ export default class ElectronBleTransport {
 
   // Handle notification data from Noble BLE
   private handleNotificationData(deviceId: string, hexData: string): void {
+    // Check for pairing rejection
+    if (hexData === 'PAIRING_REJECTED') {
+      this.Log?.debug('[Transport] Pairing rejection detected for device:', deviceId);
+      if (this.runPromise) {
+        this.runPromise.reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceBondedCanceled));
+      }
+      return;
+    }
+
     const result = this.processNotificationPacket(deviceId, hexData);
 
     if (result.error) {

package/dist/webble-utils.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="node" />
-export declare const isHeaderChunk: (chunk: Buffer | Uint8Array) => boolean;
-export declare const isOnekeyDevice: (name: string | null, id?: string) => boolean;
-//# sourceMappingURL=webble-utils.d.ts.map

package/dist/webble-utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"webble-utils.d.ts","sourceRoot":"","sources":["../src/webble-utils.ts"],"names":[],"mappings":";AAEA,eAAO,MAAM,aAAa,UAAW,MAAM,GAAG,UAAU,KAAG,OAa1D,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,IAAI,OAAO,MAAM,KAAG,OAYjE,CAAC"}

package/src/webble-utils.ts

@@ -1,30 +0,0 @@
-import { MESSAGE_TOP_CHAR, MESSAGE_HEADER_BYTE } from '@onekeyfe/hd-transport';
-
-export const isHeaderChunk = (chunk: Buffer | Uint8Array): boolean => {
-  if (chunk.length < 9) return false;
-  const [MagicQuestionMark, sharp1, sharp2] = chunk;
-
-  if (
-    String.fromCharCode(MagicQuestionMark) === String.fromCharCode(MESSAGE_TOP_CHAR) &&
-    String.fromCharCode(sharp1) === String.fromCharCode(MESSAGE_HEADER_BYTE) &&
-    String.fromCharCode(sharp2) === String.fromCharCode(MESSAGE_HEADER_BYTE)
-  ) {
-    return true;
-  }
-
-  return false;
-};
-
-export const isOnekeyDevice = (name: string | null, id?: string): boolean => {
-  if (id?.startsWith?.('MI')) {
-    return true;
-  }
-
-  // 过滤 BixinKeyxxx 和 Kxxxx 和 Txxxx
-  // i 忽略大小写模式
-  const re = /(BixinKey\d{10})|(K\d{4})|(T\d{4})|(Touch\s\w{4})|(Pro\s\w{4})/i;
-  if (name && re.exec(name)) {
-    return true;
-  }
-  return false;
-};