@onekeyfe/hd-transport-electron 1.1.26-alpha.12 → 1.1.26-alpha.30

package/dist/{index-de36348d.js → index-b01d011d.js}

@@ -32,7 +32,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 
 function initNobleBleSupport(webContents) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-2e41f27c.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-4f7435c3.js'); });
         setupNobleBleHandlers(webContents);
     });
 }

package/dist/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-de36348d.js');
+var index = require('./index-b01d011d.js');
 
 
 

package/dist/{noble-ble-handler-2e41f27c.js → noble-ble-handler-4f7435c3.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-de36348d.js');
+var index = require('./index-b01d011d.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var hdTransport = require('@onekeyfe/hd-transport');
 var pRetry = require('p-retry');
@@ -81,8 +81,8 @@ const ONEKEY_SERVICE_UUIDS = [hdShared.ONEKEY_SERVICE_UUID];
 const NORMALIZED_WRITE_UUID = '0002';
 const NORMALIZED_NOTIFY_UUID = '0003';
 const BLUETOOTH_INIT_TIMEOUT = 10000;
-const DEVICE_SCAN_TIMEOUT = 5000;
-const FAST_SCAN_TIMEOUT = 1500;
+const DEVICE_SCAN_TIMEOUT = 8000;
+const FAST_SCAN_TIMEOUT = 8000;
 const DEVICE_CHECK_INTERVAL = 500;
 const CONNECTION_TIMEOUT = 3000;
 const SERVICE_DISCOVERY_TIMEOUT = 10000;
@@ -506,8 +506,10 @@ function transmitHexDataToDevice(deviceId, hexData) {
     });
 }
 function handleDeviceDiscovered(peripheral) {
-    var _a;
+    var _a, _b;
     const deviceName = ((_a = peripheral.advertisement) === null || _a === void 0 ? void 0 : _a.localName) || 'Unknown Device';
+    const serviceUuids = ((_b = peripheral.advertisement) === null || _b === void 0 ? void 0 : _b.serviceUuids) || [];
+    logger === null || logger === void 0 ? void 0 : logger.info(`[NobleBLE] Scan found: name="${deviceName}" id=${peripheral.id} serviceUUIDs=[${serviceUuids.join(', ')}]`);
     if (!hdShared.isOnekeyDevice(deviceName)) {
         return;
     }
@@ -557,7 +559,7 @@ function performTargetedScan(targetDeviceId) {
                 resolve(null);
             }, FAST_SCAN_TIMEOUT);
             nobleInstance.on('discover', onDiscover);
-            nobleInstance.startScanning(ONEKEY_SERVICE_UUIDS, false, (error) => {
+            nobleInstance.startScanning([], false, (error) => {
                 if (error) {
                     clearTimeout(timeoutId);
                     nobleInstance.removeListener('discover', onDiscover);
@@ -607,11 +609,13 @@ function enumerateDevices() {
                 });
             };
             const timeoutId = setTimeout(() => {
+                checkDevices();
                 cleanup();
                 logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Scan completed, found devices:', devices.length);
                 resolve(devices);
             }, DEVICE_SCAN_TIMEOUT);
-            nobleInstance.startScanning(ONEKEY_SERVICE_UUIDS, false, (error) => {
+            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Scanning for ALL BLE devices (no service UUID filter)');
+            nobleInstance.startScanning([], false, (error) => {
                 if (error) {
                     cleanup();
                     logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Failed to start scanning:', error);
@@ -706,7 +710,7 @@ function discoverServicesAndCharacteristics(peripheral) {
         });
         const discoveryPromise = (() => index.__awaiter(this, void 0, void 0, function* () {
             const services = yield new Promise((resolve, reject) => {
-                peripheral.discoverServices(ONEKEY_SERVICE_UUIDS, (error, svc) => {
+                peripheral.discoverServices([], (error, svc) => {
                     if (error) {
                         logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Service discovery failed:', error);
                         reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound, error.message));
@@ -716,13 +720,21 @@ function discoverServicesAndCharacteristics(peripheral) {
                     }
                 });
             });
+            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] All services:', services === null || services === void 0 ? void 0 : services.map(s => s.uuid));
             if (!services || services.length === 0) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound, 'No OneKey services found');
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound, 'No services found');
+            }
+            let service = services.find(s => ONEKEY_SERVICE_UUIDS.includes(s.uuid));
+            if (!service) {
+                logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Known OneKey service UUID not found, trying first non-generic service');
+                service = services.find(s => !['1800', '1801', '180a'].includes(s.uuid)) || services[0];
+            }
+            if (!service) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound);
             }
-            const service = services[0];
-            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Found service:', service.uuid);
+            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Using service:', service.uuid);
             const characteristics = yield new Promise((resolve, reject) => {
-                service.discoverCharacteristics([hdShared.ONEKEY_WRITE_CHARACTERISTIC_UUID, hdShared.ONEKEY_NOTIFY_CHARACTERISTIC_UUID], (error, chars) => {
+                service.discoverCharacteristics([], (error, chars) => {
                     if (error) {
                         logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Characteristic discovery failed:', error);
                         reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleCharacteristicNotFound, error.message));

package/dist/noble-ble-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"noble-ble-handler.d.ts","sourceRoot":"","sources":["../src/noble-ble-handler.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAsB,WAAW,EAAE,MAAM,UAAU,CAAC;AAshDhE,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAsKpE"}
+{"version":3,"file":"noble-ble-handler.d.ts","sourceRoot":"","sources":["../src/noble-ble-handler.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAsB,WAAW,EAAE,MAAM,UAAU,CAAC;AAgjDhE,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAsKpE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-electron",
-  "version": "1.1.26-alpha.12",
+  "version": "1.1.26-alpha.30",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -25,9 +25,9 @@
     "electron-log": ">=4.0.0"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "1.1.26-alpha.12",
-    "@onekeyfe/hd-shared": "1.1.26-alpha.12",
-    "@onekeyfe/hd-transport": "1.1.26-alpha.12",
+    "@onekeyfe/hd-core": "1.1.26-alpha.30",
+    "@onekeyfe/hd-shared": "1.1.26-alpha.30",
+    "@onekeyfe/hd-transport": "1.1.26-alpha.30",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "f9e7f7f5bdca2609e817898efd4b54c8c871bb2b"
+  "gitHead": "88ec305cb60347e09cf9e0c8e921d414f7fe3656"
 }

package/src/noble-ble-handler.ts

@@ -79,8 +79,8 @@ const NORMALIZED_NOTIFY_UUID = '0003';
 
 // Timeout and interval constants
 const BLUETOOTH_INIT_TIMEOUT = 10000; // 10 seconds for Bluetooth initialization
-const DEVICE_SCAN_TIMEOUT = 5000; // 5 seconds for device scanning
-const FAST_SCAN_TIMEOUT = 1500; // 1.5 seconds for fast targeted scanning
+const DEVICE_SCAN_TIMEOUT = 8000; // 8 seconds for device scanning (Pro2 has longer advertising interval)
+const FAST_SCAN_TIMEOUT = 8000; // 8 seconds for targeted scanning (Pro2 has longer advertising interval)
 const DEVICE_CHECK_INTERVAL = 500; // 500ms interval for periodic device checks
 const CONNECTION_TIMEOUT = 3000; // 3 seconds for device connection
 const SERVICE_DISCOVERY_TIMEOUT = 10000; // 10 seconds for service discovery
@@ -686,6 +686,14 @@ async function transmitHexDataToDevice(deviceId: string, hexData: string): Promi
 // Handle discovered device (for general enumeration only)
 function handleDeviceDiscovered(peripheral: Peripheral): void {
   const deviceName = peripheral.advertisement?.localName || 'Unknown Device';
+  const serviceUuids = peripheral.advertisement?.serviceUuids || [];
+
+  // Log ALL discovered devices to help identify Pro2 BLE service UUID
+  logger?.info(
+    `[NobleBLE] Scan found: name="${deviceName}" id=${
+      peripheral.id
+    } serviceUUIDs=[${serviceUuids.join(', ')}]`
+  );
 
   // Only process OneKey devices for general discovery
   if (!isOnekeyDevice(deviceName)) {
@@ -753,8 +761,8 @@ async function performTargetedScan(targetDeviceId: string): Promise<Peripheral |
     // Add local listener for this scan
     nobleInstance.on('discover', onDiscover);
 
-    // Start scanning
-    nobleInstance.startScanning(ONEKEY_SERVICE_UUIDS, false, (error?: Error) => {
+    // Start scanning — no service UUID filter (Pro2 may use different service UUID)
+    nobleInstance.startScanning([], false, (error?: Error) => {
       if (error) {
         clearTimeout(timeoutId);
         nobleInstance.removeListener('discover', onDiscover);
@@ -816,15 +824,19 @@ async function enumerateDevices(): Promise<DeviceInfo[]> {
       });
     };
 
-    // Set timeout for scanning
+    // Set timeout for scanning — use longer timeout to catch slow-advertising devices like Pro2
     const timeoutId = setTimeout(() => {
+      // Final collection before resolving — catches devices discovered near the deadline
+      checkDevices();
       cleanup();
       logger?.info('[NobleBLE] Scan completed, found devices:', devices.length);
       resolve(devices);
     }, DEVICE_SCAN_TIMEOUT);
 
-    // Start scanning for OneKey service UUIDs
-    nobleInstance.startScanning(ONEKEY_SERVICE_UUIDS, false, (error?: Error) => {
+    // Start scanning — use empty array to discover ALL BLE devices (Pro2 may use different service UUID)
+    // TODO: restore ONEKEY_SERVICE_UUIDS filter once Pro2 BLE service UUID is confirmed
+    logger?.info('[NobleBLE] Scanning for ALL BLE devices (no service UUID filter)');
+    nobleInstance.startScanning([], false, (error?: Error) => {
       if (error) {
         cleanup();
         logger?.error('[NobleBLE] Failed to start scanning:', error);
@@ -952,9 +964,9 @@ async function discoverServicesAndCharacteristics(
 
   // Main discovery logic as async function
   const discoveryPromise = (async (): Promise<CharacteristicPair> => {
-    // Step 1: Discover services (promisified)
+    // Step 1: Discover ALL services (no filter — Pro2 may use different service UUID)
     const services = await new Promise<Service[]>((resolve, reject) => {
-      peripheral.discoverServices(ONEKEY_SERVICE_UUIDS, (error, svc) => {
+      peripheral.discoverServices([], (error, svc) => {
         if (error) {
           logger?.error('[NobleBLE] Service discovery failed:', error);
           reject(ERRORS.TypedError(HardwareErrorCode.BleServiceNotFound, error.message));
@@ -964,26 +976,40 @@ async function discoverServicesAndCharacteristics(
       });
     });
 
+    // Log all discovered services
+    logger?.info(
+      '[NobleBLE] All services:',
+      services?.map(s => s.uuid)
+    );
+
     if (!services || services.length === 0) {
-      throw ERRORS.TypedError(HardwareErrorCode.BleServiceNotFound, 'No OneKey services found');
+      throw ERRORS.TypedError(HardwareErrorCode.BleServiceNotFound, 'No services found');
     }
 
-    const service = services[0];
-    logger?.info('[NobleBLE] Found service:', service.uuid);
+    // Find OneKey service — try known UUID first, fall back to first service
+    let service = services.find(s => ONEKEY_SERVICE_UUIDS.includes(s.uuid));
+    if (!service) {
+      logger?.info(
+        '[NobleBLE] Known OneKey service UUID not found, trying first non-generic service'
+      );
+      // Skip generic BLE services (1800=GAP, 1801=GATT, 180a=DeviceInfo)
+      service = services.find(s => !['1800', '1801', '180a'].includes(s.uuid)) || services[0];
+    }
+    if (!service) {
+      throw ERRORS.TypedError(HardwareErrorCode.BleServiceNotFound);
+    }
+    logger?.info('[NobleBLE] Using service:', service.uuid);
 
-    // Step 2: Discover characteristics (promisified)
+    // Step 2: Discover ALL characteristics (no filter)
     const characteristics = await new Promise<Characteristic[]>((resolve, reject) => {
-      service.discoverCharacteristics(
-        [ONEKEY_WRITE_CHARACTERISTIC_UUID, ONEKEY_NOTIFY_CHARACTERISTIC_UUID],
-        (error, chars) => {
-          if (error) {
-            logger?.error('[NobleBLE] Characteristic discovery failed:', error);
-            reject(ERRORS.TypedError(HardwareErrorCode.BleCharacteristicNotFound, error.message));
-          } else {
-            resolve(chars);
-          }
+      service.discoverCharacteristics([], (error, chars) => {
+        if (error) {
+          logger?.error('[NobleBLE] Characteristic discovery failed:', error);
+          reject(ERRORS.TypedError(HardwareErrorCode.BleCharacteristicNotFound, error.message));
+        } else {
+          resolve(chars);
         }
-      );
+      });
     });
 
     // Step 3: Find required characteristics