@onekeyfe/hd-transport-electron 1.1.27-alpha.35 → 1.1.27-alpha.37

package/dist/ble-ops.d.ts

@@ -7,12 +7,7 @@ export interface SoftRefreshParams {
     subscriptionOperations: Map<string, 'subscribing' | 'unsubscribing' | 'idle'>;
     subscribedDevices: Map<string, boolean>;
     pairedDevices: Set<string>;
-    notificationCallbacks: Map<string, (hex: string) => void>;
-    processNotificationData: (deviceId: string, data: Buffer) => {
-        isComplete: boolean;
-        completePacket?: string;
-        error?: string;
-    };
+    onNotificationData: (deviceId: string, data: Buffer) => void;
     logger: Logger | null;
 }
 export declare function softRefreshSubscription(params: SoftRefreshParams): Promise<void>;

package/dist/ble-ops.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ble-ops.d.ts","sourceRoot":"","sources":["../src/ble-ops.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,CAAC;IACxD,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,GAAG,eAAe,GAAG,MAAM,CAAC,CAAC;IAC9E,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC;IAC1D,uBAAuB,EAAE,CACvB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,KACT;QACH,UAAU,EAAE,OAAO,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuDtF"}
+{"version":3,"file":"ble-ops.d.ts","sourceRoot":"","sources":["../src/ble-ops.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,CAAC;IACxD,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,GAAG,eAAe,GAAG,MAAM,CAAC,CAAC;IAC9E,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3B,kBAAkB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8CtF"}

package/dist/{index-b01d011d.js → index-02fc07fe.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-4f7435c3.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-94c42077.js'); });
         setupNobleBleHandlers(webContents);
     });
 }

package/dist/index.js

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

package/dist/{noble-ble-handler-4f7435c3.js → noble-ble-handler-94c42077.js}

@@ -1,8 +1,7 @@
 'use strict';
 
-var index = require('./index-b01d011d.js');
+var index = require('./index-02fc07fe.js');
 var hdShared = require('@onekeyfe/hd-shared');
-var hdTransport = require('@onekeyfe/hd-transport');
 var pRetry = require('p-retry');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -20,7 +19,7 @@ function safeLog(logger, level, message, ...args) {
 
 function softRefreshSubscription(params) {
     return index.__awaiter(this, void 0, void 0, function* () {
-        const { deviceId, notifyCharacteristic, subscriptionOperations, subscribedDevices, pairedDevices, notificationCallbacks, processNotificationData, logger, } = params;
+        const { deviceId, notifyCharacteristic, subscriptionOperations, subscribedDevices, pairedDevices, onNotificationData, logger, } = params;
         if (!notifyCharacteristic) {
             throw new Error(`Notify characteristic not available for device ${deviceId}`);
         }
@@ -44,16 +43,7 @@ function softRefreshSubscription(params) {
                 pairedDevices.add(deviceId);
                 logger === null || logger === void 0 ? void 0 : logger.info('[BLE-OPS] Device paired successfully', { deviceId });
             }
-            const result = processNotificationData(deviceId, data);
-            if (result.error) {
-                logger === null || logger === void 0 ? void 0 : logger.error('[BLE-OPS] Packet processing error:', result.error);
-                return;
-            }
-            if (result.isComplete && result.completePacket) {
-                const appCb = notificationCallbacks.get(deviceId);
-                if (appCb)
-                    appCb(result.completePacket);
-            }
+            onNotificationData(deviceId, data);
         });
         subscribedDevices.set(deviceId, true);
         subscriptionOperations.set(deviceId, 'idle');
@@ -76,15 +66,15 @@ const deviceCharacteristics = new Map();
 const notificationCallbacks = new Map();
 const subscribedDevices = new Map();
 const subscriptionOperations = new Map();
-const devicePacketStates = new Map();
 const ONEKEY_SERVICE_UUIDS = [hdShared.ONEKEY_SERVICE_UUID];
+const PRO2_ADVERTISEMENT_SERVICE_UUID_KEYS = new Set(['fffd']);
 const NORMALIZED_WRITE_UUID = '0002';
 const NORMALIZED_NOTIFY_UUID = '0003';
 const BLUETOOTH_INIT_TIMEOUT = 10000;
 const DEVICE_SCAN_TIMEOUT = 8000;
 const FAST_SCAN_TIMEOUT = 8000;
 const DEVICE_CHECK_INTERVAL = 500;
-const CONNECTION_TIMEOUT = 3000;
+const CONNECTION_TIMEOUT = 8000;
 const SERVICE_DISCOVERY_TIMEOUT = 10000;
 const BLE_PACKET_SIZE = 192;
 const UNIFIED_WRITE_DELAY = 5;
@@ -93,70 +83,40 @@ const IS_WINDOWS = process.platform === 'win32';
 const ABORTABLE_WRITE_ERROR_PATTERNS = [
     /status:\s*3/i,
 ];
-const MIN_HEADER_LENGTH = 9;
-function processNotificationData(deviceId, data) {
-    logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Notification', {
+function getBleUuidKey(uuid) {
+    const normalized = (uuid !== null && uuid !== void 0 ? uuid : '').replace(/-/g, '').toLowerCase();
+    return normalized.length >= 8 ? normalized.substring(4, 8) : normalized;
+}
+const NORMALIZED_ONEKEY_SERVICE_UUIDS = new Set([
+    ...ONEKEY_SERVICE_UUIDS.map(uuid => getBleUuidKey(uuid)),
+    '0001',
+]);
+function isGenericBleService(uuid) {
+    return ['1800', '1801', '180a', '180f'].includes(getBleUuidKey(uuid));
+}
+function hasOneKeyAdvertisementService(peripheral) {
+    var _a, _b;
+    const serviceUuids = (_b = (_a = peripheral.advertisement) === null || _a === void 0 ? void 0 : _a.serviceUuids) !== null && _b !== void 0 ? _b : [];
+    return serviceUuids.some(uuid => {
+        const uuidKey = getBleUuidKey(uuid);
+        return (NORMALIZED_ONEKEY_SERVICE_UUIDS.has(uuidKey) ||
+            PRO2_ADVERTISEMENT_SERVICE_UUID_KEYS.has(uuidKey));
+    });
+}
+function isOneKeyPeripheral(peripheral) {
+    var _a;
+    const deviceName = ((_a = peripheral.advertisement) === null || _a === void 0 ? void 0 : _a.localName) || null;
+    return hdShared.isOnekeyDevice(deviceName, peripheral.id) || hasOneKeyAdvertisementService(peripheral);
+}
+function emitRawNotification(deviceId, data) {
+    logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Raw notification', {
         deviceId,
         dataLength: data.length,
+        firstBytes: data.subarray(0, 8).toString('hex'),
     });
-    let packetState = devicePacketStates.get(deviceId);
-    if (!packetState) {
-        packetState = { bufferLength: 0, buffer: [], packetCount: 0 };
-        devicePacketStates.set(deviceId, packetState);
-        logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Initialized new packet state for device:', deviceId);
-    }
-    try {
-        if (hdShared.isHeaderChunk(data)) {
-            if (data.length < MIN_HEADER_LENGTH) {
-                return { isComplete: false, error: 'Invalid header chunk: too short' };
-            }
-            const messageId = `${deviceId}-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`;
-            packetState.bufferLength = data.readInt32BE(5);
-            packetState.buffer = [...data.subarray(3)];
-            packetState.packetCount = 1;
-            packetState.messageId = messageId;
-            if (packetState.bufferLength < 0) {
-                logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Invalid negative packet length detected:', {
-                    length: packetState.bufferLength,
-                    dataLength: data.length,
-                    rawHeader: data.subarray(0, Math.min(16, data.length)).toString('hex'),
-                    lengthBytes: data.subarray(5, 9).toString('hex'),
-                });
-                resetPacketState(packetState);
-                return { isComplete: false, error: 'Invalid packet length in header' };
-            }
-        }
-        else {
-            if (packetState.bufferLength === 0) {
-                return { isComplete: false, error: 'Received data chunk without header' };
-            }
-            packetState.packetCount += 1;
-            packetState.buffer = packetState.buffer.concat([...data]);
-        }
-        if (packetState.buffer.length - hdTransport.COMMON_HEADER_SIZE >= packetState.bufferLength) {
-            const completeBuffer = Buffer.from(packetState.buffer);
-            const hexString = completeBuffer.toString('hex');
-            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Packet assembled', {
-                deviceId,
-                totalPackets: packetState.packetCount,
-                expectedLength: packetState.bufferLength,
-                actualLength: packetState.buffer.length - hdTransport.COMMON_HEADER_SIZE,
-            });
-            resetPacketState(packetState);
-            return { isComplete: true, completePacket: hexString };
-        }
-        return { isComplete: false };
-    }
-    catch (error) {
-        resetPacketState(packetState);
-        return { isComplete: false, error: `Packet processing error: ${error}` };
-    }
-}
-function resetPacketState(packetState) {
-    packetState.bufferLength = 0;
-    packetState.buffer = [];
-    packetState.packetCount = 0;
-    packetState.messageId = undefined;
+    const appCb = notificationCallbacks.get(deviceId);
+    if (appCb)
+        appCb(data.toString('hex'));
 }
 function checkBluetoothAvailability() {
     return index.__awaiter(this, void 0, void 0, function* () {
@@ -201,7 +161,6 @@ function setupPersistentStateListener() {
             deviceCharacteristics.clear();
             subscribedDevices.clear();
             notificationCallbacks.clear();
-            devicePacketStates.clear();
             subscriptionOperations.clear();
             pairedDevices.clear();
             if (noble) {
@@ -321,7 +280,6 @@ function cleanupDevice(deviceId, webContents, options = {}) {
         connectedDevices.delete(deviceId);
         deviceCharacteristics.delete(deviceId);
         notificationCallbacks.delete(deviceId);
-        devicePacketStates.delete(deviceId);
         subscribedDevices.delete(deviceId);
         subscriptionOperations.delete(deviceId);
         pairedDevices.delete(deviceId);
@@ -436,8 +394,7 @@ function attemptWindowsWriteUntilPaired(deviceId, doGetWriteCharacteristic, payl
                     subscriptionOperations,
                     subscribedDevices,
                     pairedDevices,
-                    notificationCallbacks,
-                    processNotificationData,
+                    onNotificationData: emitRawNotification,
                     logger,
                 });
                 logger === null || logger === void 0 ? void 0 : logger.info('[BLE-Write] Subscription refresh completed', { deviceId });
@@ -509,12 +466,18 @@ function handleDeviceDiscovered(peripheral) {
     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)) {
+    if (!isOneKeyPeripheral(peripheral)) {
         return;
     }
-    logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Discovered OneKey device:', deviceName);
+    const isNewDevice = !discoveredDevices.has(peripheral.id);
     discoveredDevices.set(peripheral.id, peripheral);
+    if (isNewDevice) {
+        logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Discovered OneKey BLE device:', {
+            name: deviceName,
+            id: peripheral.id,
+            serviceUUIDs: serviceUuids,
+        });
+    }
 }
 function ensureDiscoverListener() {
     if (!noble)
@@ -614,7 +577,7 @@ function enumerateDevices() {
                 logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Scan completed, found devices:', devices.length);
                 resolve(devices);
             }, DEVICE_SCAN_TIMEOUT);
-            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Scanning for ALL BLE devices (no service UUID filter)');
+            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Scanning for OneKey BLE devices');
             nobleInstance.startScanning([], false, (error) => {
                 if (error) {
                     cleanup();
@@ -724,17 +687,21 @@ function discoverServicesAndCharacteristics(peripheral) {
             if (!services || services.length === 0) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound, 'No services found');
             }
-            let service = services.find(s => ONEKEY_SERVICE_UUIDS.includes(s.uuid));
+            let service = services.find(s => NORMALIZED_ONEKEY_SERVICE_UUIDS.has(getBleUuidKey(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];
+                logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Known OneKey service UUID not found, trying first vendor service');
+                service =
+                    services.find(s => PRO2_ADVERTISEMENT_SERVICE_UUID_KEYS.has(getBleUuidKey(s.uuid))) ||
+                        services.find(s => !isGenericBleService(s.uuid)) ||
+                        services[0];
             }
             if (!service) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound);
             }
-            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Using service:', service.uuid);
+            const selectedService = service;
+            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Using service:', selectedService.uuid);
             const characteristics = yield new Promise((resolve, reject) => {
-                service.discoverCharacteristics([], (error, chars) => {
+                selectedService.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));
@@ -956,7 +923,6 @@ function connectDevice(deviceId, webContents) {
                     existingCharacteristics.notify.removeAllListeners('data');
                 }
                 notificationCallbacks.delete(deviceId);
-                devicePacketStates.delete(deviceId);
                 subscribedDevices.delete(deviceId);
             }
             const characteristics = yield setupConnectionAndDiscoverServices(peripheral, deviceId, webContents);
@@ -1039,7 +1005,6 @@ function unsubscribeNotifications(deviceId) {
             });
             notifyCharacteristic.removeAllListeners('data');
             notificationCallbacks.delete(deviceId);
-            devicePacketStates.delete(deviceId);
             subscribedDevices.delete(deviceId);
         }
         finally {
@@ -1079,12 +1044,6 @@ function subscribeNotifications(deviceId, callback) {
         if (subscribedDevices.get(deviceId)) {
             logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Device already subscribed to characteristic, updating callback only');
             notificationCallbacks.set(deviceId, callback);
-            devicePacketStates.set(deviceId, {
-                bufferLength: 0,
-                buffer: [],
-                packetCount: 0,
-                messageId: undefined,
-            });
             subscriptionOperations.set(deviceId, 'idle');
             return Promise.resolve();
         }
@@ -1093,12 +1052,6 @@ function subscribeNotifications(deviceId, callback) {
         }
         notifyCharacteristic.removeAllListeners('data');
         notificationCallbacks.set(deviceId, callback);
-        devicePacketStates.set(deviceId, {
-            bufferLength: 0,
-            buffer: [],
-            packetCount: 0,
-            messageId: undefined,
-        });
         function rebuildAppSubscription(deviceId, notifyCharacteristic) {
             return index.__awaiter(this, void 0, void 0, function* () {
                 yield new Promise(resolve => {
@@ -1120,16 +1073,7 @@ function subscribeNotifications(deviceId, callback) {
                         pairedDevices.add(deviceId);
                         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Device paired successfully', { deviceId });
                     }
-                    const result = processNotificationData(deviceId, data);
-                    if (result.error) {
-                        logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Packet processing error:', result.error);
-                        return;
-                    }
-                    if (result.isComplete && result.completePacket) {
-                        const appCb = notificationCallbacks.get(deviceId);
-                        if (appCb)
-                            appCb(result.completePacket);
-                    }
+                    emitRawNotification(deviceId, data);
                 });
             });
         }

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;AAgjDhE,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":"AAoBA,OAAO,KAAK,EAAsB,WAAW,EAAE,MAAM,UAAU,CAAC;AAy9ChE,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAsKpE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-electron",
-  "version": "1.1.27-alpha.35",
+  "version": "1.1.27-alpha.37",
   "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.27-alpha.35",
-    "@onekeyfe/hd-shared": "1.1.27-alpha.35",
-    "@onekeyfe/hd-transport": "1.1.27-alpha.35",
+    "@onekeyfe/hd-core": "1.1.27-alpha.37",
+    "@onekeyfe/hd-shared": "1.1.27-alpha.37",
+    "@onekeyfe/hd-transport": "1.1.27-alpha.37",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "3a5eb264b57a6cc2338d1f9534be0ba265c2db35"
+  "gitHead": "ff58ceb1249ba3f3f673b39f1c175093fab40a8b"
 }

package/src/ble-ops.ts

@@ -7,15 +7,7 @@ export interface SoftRefreshParams {
   subscriptionOperations: Map<string, 'subscribing' | 'unsubscribing' | 'idle'>;
   subscribedDevices: Map<string, boolean>;
   pairedDevices: Set<string>;
-  notificationCallbacks: Map<string, (hex: string) => void>;
-  processNotificationData: (
-    deviceId: string,
-    data: Buffer
-  ) => {
-    isComplete: boolean;
-    completePacket?: string;
-    error?: string;
-  };
+  onNotificationData: (deviceId: string, data: Buffer) => void;
   logger: Logger | null;
 }
 
@@ -26,8 +18,7 @@ export async function softRefreshSubscription(params: SoftRefreshParams): Promis
     subscriptionOperations,
     subscribedDevices,
     pairedDevices,
-    notificationCallbacks,
-    processNotificationData,
+    onNotificationData,
     logger,
   } = params;
 
@@ -60,15 +51,7 @@ export async function softRefreshSubscription(params: SoftRefreshParams): Promis
       logger?.info('[BLE-OPS] Device paired successfully', { deviceId });
     }
 
-    const result = processNotificationData(deviceId, data);
-    if (result.error) {
-      logger?.error('[BLE-OPS] Packet processing error:', result.error);
-      return;
-    }
-    if (result.isComplete && result.completePacket) {
-      const appCb = notificationCallbacks.get(deviceId);
-      if (appCb) appCb(result.completePacket);
-    }
+    onNotificationData(deviceId, data);
   });
 
   subscribedDevices.set(deviceId, true);

package/src/noble-ble-handler.ts

@@ -9,14 +9,10 @@ import {
   EOneKeyBleMessageKeys,
   ERRORS,
   HardwareErrorCode,
-  ONEKEY_NOTIFY_CHARACTERISTIC_UUID,
   ONEKEY_SERVICE_UUID,
-  ONEKEY_WRITE_CHARACTERISTIC_UUID,
-  isHeaderChunk,
   isOnekeyDevice,
   wait,
 } from '@onekeyfe/hd-shared';
-import { COMMON_HEADER_SIZE } from '@onekeyfe/hd-transport';
 import pRetry from 'p-retry';
 
 import { safeLog } from './types/noble-extended';
@@ -55,15 +51,6 @@ const subscribedDevices = new Map<string, boolean>(); // Track subscription stat
 // 🔒 Subscription operation state tracking to prevent race conditions
 const subscriptionOperations = new Map<string, 'subscribing' | 'unsubscribing' | 'idle'>();
 
-// Packet reassembly state for each device
-interface PacketAssemblyState {
-  bufferLength: number;
-  buffer: number[];
-  packetCount: number;
-  messageId?: string; // Add message ID to track concurrent requests
-}
-const devicePacketStates = new Map<string, PacketAssemblyState>();
-
 // Windows-only response watchdog state moved to utils/windows-ble-recovery
 
 // Pairing-related state removed
@@ -72,6 +59,7 @@ const devicePacketStates = new Map<string, PacketAssemblyState>();
 
 // Service UUIDs to scan for - using constants from hd-shared
 const ONEKEY_SERVICE_UUIDS = [ONEKEY_SERVICE_UUID];
+const PRO2_ADVERTISEMENT_SERVICE_UUID_KEYS = new Set(['fffd']);
 
 // Pre-normalized characteristic identifiers for fast comparison
 const NORMALIZED_WRITE_UUID = '0002';
@@ -82,7 +70,7 @@ const BLUETOOTH_INIT_TIMEOUT = 10000; // 10 seconds for Bluetooth initialization
 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 CONNECTION_TIMEOUT = 8000; // 8 seconds for device connection (BLE reconnect after release can be slow)
 const SERVICE_DISCOVERY_TIMEOUT = 10000; // 10 seconds for service discovery
 
 // Write-related constants
@@ -94,101 +82,49 @@ const ABORTABLE_WRITE_ERROR_PATTERNS = [
   /status:\s*3/i, // Windows pairing cancelled / GATT write failed
 ];
 
-// Validation limits
-const MIN_HEADER_LENGTH = 9; // Minimum header chunk length
-
-// Packet processing result types
-interface PacketProcessResult {
-  isComplete: boolean;
-  completePacket?: string;
-  error?: string;
+function getBleUuidKey(uuid?: string | null) {
+  const normalized = (uuid ?? '').replace(/-/g, '').toLowerCase();
+  return normalized.length >= 8 ? normalized.substring(4, 8) : normalized;
 }
 
-// Process incoming BLE notification data with proper packet reassembly
-function processNotificationData(deviceId: string, data: Buffer): PacketProcessResult {
-  //  notification telemetry
-  logger?.info('[NobleBLE] Notification', {
-    deviceId,
-    dataLength: data.length,
-  });
+const NORMALIZED_ONEKEY_SERVICE_UUIDS = new Set([
+  ...ONEKEY_SERVICE_UUIDS.map(uuid => getBleUuidKey(uuid)),
+  '0001',
+]);
 
-  // Get or initialize packet state for this device
-  let packetState = devicePacketStates.get(deviceId);
-  if (!packetState) {
-    packetState = { bufferLength: 0, buffer: [], packetCount: 0 };
-    devicePacketStates.set(deviceId, packetState);
-    logger?.info('[NobleBLE] Initialized new packet state for device:', deviceId);
-  }
-
-  try {
-    if (isHeaderChunk(data)) {
-      // Validate header chunk
-      if (data.length < MIN_HEADER_LENGTH) {
-        return { isComplete: false, error: 'Invalid header chunk: too short' };
-      }
-
-      // Generate message ID for this packet sequence
-      const messageId = `${deviceId}-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`;
-
-      // Reset packet state for new message
-      packetState.bufferLength = data.readInt32BE(5);
-      packetState.buffer = [...data.subarray(3)];
-      packetState.packetCount = 1;
-      packetState.messageId = messageId;
-
-      // Only validate for negative lengths (which would be invalid)
-      if (packetState.bufferLength < 0) {
-        logger?.error('[NobleBLE] Invalid negative packet length detected:', {
-          length: packetState.bufferLength,
-          dataLength: data.length,
-          rawHeader: data.subarray(0, Math.min(16, data.length)).toString('hex'),
-          lengthBytes: data.subarray(5, 9).toString('hex'),
-        });
-        resetPacketState(packetState);
-        return { isComplete: false, error: 'Invalid packet length in header' };
-      }
-    } else {
-      // Validate we have an active packet session
-      if (packetState.bufferLength === 0) {
-        return { isComplete: false, error: 'Received data chunk without header' };
-      }
-
-      // Increment packet counter and append data
-      packetState.packetCount += 1;
-      packetState.buffer = packetState.buffer.concat([...data]);
-    }
-
-    // Check if packet is complete
-    if (packetState.buffer.length - COMMON_HEADER_SIZE >= packetState.bufferLength) {
-      const completeBuffer = Buffer.from(packetState.buffer);
-      const hexString = completeBuffer.toString('hex');
-
-      logger?.info('[NobleBLE] Packet assembled', {
-        deviceId,
-        totalPackets: packetState.packetCount,
-        expectedLength: packetState.bufferLength,
-        actualLength: packetState.buffer.length - COMMON_HEADER_SIZE,
-      });
-
-      // Reset packet state for next message
-      resetPacketState(packetState);
+function isGenericBleService(uuid?: string | null) {
+  return ['1800', '1801', '180a', '180f'].includes(getBleUuidKey(uuid));
+}
 
-      return { isComplete: true, completePacket: hexString };
-    }
+function hasOneKeyAdvertisementService(peripheral: Peripheral) {
+  const serviceUuids = peripheral.advertisement?.serviceUuids ?? [];
+  return serviceUuids.some(uuid => {
+    const uuidKey = getBleUuidKey(uuid);
+    return (
+      NORMALIZED_ONEKEY_SERVICE_UUIDS.has(uuidKey) ||
+      PRO2_ADVERTISEMENT_SERVICE_UUID_KEYS.has(uuidKey)
+    );
+  });
+}
 
-    return { isComplete: false };
-  } catch (error) {
-    resetPacketState(packetState);
-    return { isComplete: false, error: `Packet processing error: ${error}` };
-  }
+function isOneKeyPeripheral(peripheral: Peripheral) {
+  const deviceName = peripheral.advertisement?.localName || null;
+  return isOnekeyDevice(deviceName, peripheral.id) || hasOneKeyAdvertisementService(peripheral);
 }
 
-// Reset packet state to clean state
-function resetPacketState(packetState: PacketAssemblyState): void {
-  packetState.bufferLength = 0;
-  packetState.buffer = [];
-  packetState.packetCount = 0;
-  packetState.messageId = undefined;
+/**
+ * Forward a single BLE notification chunk (not an assembled packet) to the
+ * renderer-side transport. Packet reassembly is handled by ElectronBleTransport.
+ */
+function emitRawNotification(deviceId: string, data: Buffer): void {
+  logger?.info('[NobleBLE] Raw notification', {
+    deviceId,
+    dataLength: data.length,
+    firstBytes: data.subarray(0, 8).toString('hex'),
+  });
+
+  const appCb = notificationCallbacks.get(deviceId);
+  if (appCb) appCb(data.toString('hex'));
 }
 
 // Check Bluetooth availability - returns detailed state
@@ -250,7 +186,6 @@ function setupPersistentStateListener(): void {
       deviceCharacteristics.clear();
       subscribedDevices.clear();
       notificationCallbacks.clear();
-      devicePacketStates.clear();
       subscriptionOperations.clear();
       pairedDevices.clear();
 
@@ -428,7 +363,6 @@ function cleanupDevice(
     connectedDevices.delete(deviceId);
     deviceCharacteristics.delete(deviceId);
     notificationCallbacks.delete(deviceId);
-    devicePacketStates.delete(deviceId);
     subscribedDevices.delete(deviceId);
     subscriptionOperations.delete(deviceId);
     pairedDevices.delete(deviceId);
@@ -590,8 +524,7 @@ async function attemptWindowsWriteUntilPaired(
         subscriptionOperations,
         subscribedDevices,
         pairedDevices,
-        notificationCallbacks,
-        processNotificationData,
+        onNotificationData: emitRawNotification,
         logger,
       });
       logger?.info('[BLE-Write] Subscription refresh completed', { deviceId });
@@ -688,20 +621,21 @@ 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)) {
+  // Only process OneKey candidates for general discovery. Avoid logging every
+  // ambient BLE peripheral; it makes Pro2 debugging hard to read.
+  if (!isOneKeyPeripheral(peripheral)) {
     return;
   }
 
-  logger?.info('[NobleBLE] Discovered OneKey device:', deviceName);
+  const isNewDevice = !discoveredDevices.has(peripheral.id);
   discoveredDevices.set(peripheral.id, peripheral);
+  if (isNewDevice) {
+    logger?.info('[NobleBLE] Discovered OneKey BLE device:', {
+      name: deviceName,
+      id: peripheral.id,
+      serviceUUIDs: serviceUuids,
+    });
+  }
 }
 
 // Ensure discover listener is properly set up
@@ -833,9 +767,9 @@ async function enumerateDevices(): Promise<DeviceInfo[]> {
       resolve(devices);
     }, DEVICE_SCAN_TIMEOUT);
 
-    // 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)');
+    // Start scanning without a service UUID filter so Pro2 advertisements with
+    // short vendor UUIDs can be found, but only OneKey candidates are logged/returned.
+    logger?.info('[NobleBLE] Scanning for OneKey BLE devices');
     nobleInstance.startScanning([], false, (error?: Error) => {
       if (error) {
         cleanup();
@@ -986,23 +920,24 @@ async function discoverServicesAndCharacteristics(
       throw ERRORS.TypedError(HardwareErrorCode.BleServiceNotFound, 'No services found');
     }
 
-    // Find OneKey service — try known UUID first, fall back to first service
-    let service = services.find(s => ONEKEY_SERVICE_UUIDS.includes(s.uuid));
+    // Find OneKey service — Noble may expose 128-bit UUIDs as short UUID keys.
+    let service = services.find(s => NORMALIZED_ONEKEY_SERVICE_UUIDS.has(getBleUuidKey(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];
+      logger?.info('[NobleBLE] Known OneKey service UUID not found, trying first vendor service');
+      service =
+        services.find(s => PRO2_ADVERTISEMENT_SERVICE_UUID_KEYS.has(getBleUuidKey(s.uuid))) ||
+        services.find(s => !isGenericBleService(s.uuid)) ||
+        services[0];
     }
     if (!service) {
       throw ERRORS.TypedError(HardwareErrorCode.BleServiceNotFound);
     }
-    logger?.info('[NobleBLE] Using service:', service.uuid);
+    const selectedService = service;
+    logger?.info('[NobleBLE] Using service:', selectedService.uuid);
 
     // Step 2: Discover ALL characteristics (no filter)
     const characteristics = await new Promise<Characteristic[]>((resolve, reject) => {
-      service.discoverCharacteristics([], (error, chars) => {
+      selectedService.discoverCharacteristics([], (error, chars) => {
         if (error) {
           logger?.error('[NobleBLE] Characteristic discovery failed:', error);
           reject(ERRORS.TypedError(HardwareErrorCode.BleCharacteristicNotFound, error.message));
@@ -1346,7 +1281,6 @@ async function connectDevice(deviceId: string, webContents: WebContents): Promis
         existingCharacteristics.notify.removeAllListeners('data');
       }
       notificationCallbacks.delete(deviceId);
-      devicePacketStates.delete(deviceId);
       subscribedDevices.delete(deviceId);
       // Continue to re-setup the connection properly
     }
@@ -1457,7 +1391,6 @@ async function unsubscribeNotifications(deviceId: string): Promise<void> {
     // Remove all listeners and clear subscription status
     notifyCharacteristic.removeAllListeners('data');
     notificationCallbacks.delete(deviceId);
-    devicePacketStates.delete(deviceId);
     subscribedDevices.delete(deviceId);
   } finally {
     // 🔒 CRITICAL: Always clear operation state (even on error)
@@ -1524,14 +1457,6 @@ async function subscribeNotifications(
     // Just update the callback without re-subscribing
     notificationCallbacks.set(deviceId, callback);
 
-    // Reset packet state for new session
-    devicePacketStates.set(deviceId, {
-      bufferLength: 0,
-      buffer: [],
-      packetCount: 0,
-      messageId: undefined,
-    });
-
     // 🔒 Clear operation state
     subscriptionOperations.set(deviceId, 'idle');
     return Promise.resolve();
@@ -1548,14 +1473,6 @@ async function subscribeNotifications(
   // Store callback for this device
   notificationCallbacks.set(deviceId, callback);
 
-  // Reset packet state for new subscription session
-  devicePacketStates.set(deviceId, {
-    bufferLength: 0,
-    buffer: [],
-    packetCount: 0,
-    messageId: undefined,
-  });
-
   // Helper: rebuild a clean application-layer subscription
   async function rebuildAppSubscription(
     deviceId: string,
@@ -1584,15 +1501,7 @@ async function subscribeNotifications(
         logger?.info('[NobleBLE] Device paired successfully', { deviceId });
       }
 
-      const result = processNotificationData(deviceId, data);
-      if (result.error) {
-        logger?.error('[NobleBLE] Packet processing error:', result.error);
-        return;
-      }
-      if (result.isComplete && result.completePacket) {
-        const appCb = notificationCallbacks.get(deviceId);
-        if (appCb) appCb(result.completePacket);
-      }
+      emitRawNotification(deviceId, data);
     });
   }