fix: improve BLE connection stability and fix memory leaks in noble-ble-handler#654
Draft
fix: improve BLE connection stability and fix memory leaks in noble-ble-handler#654
Conversation
Revert the import order changes in noble-ble-handler.ts that were accidentally included in a previous commit.
Contributor
✅ Snyk checks have passed. No issues have been found so far.
💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse. |
wabicai
changed the title
auto-merge was automatically disabled
January 20, 2026 02:52
Pull request was converted to draft
wabicai
force-pushed
the
fix/revert-noble-import-changes
branch
from
14330a5 to
8ba5e24
Compare
|
No dependency changes detected. Learn more about Socket for GitHub. 👍 No dependency changes detected in pull request |
wabicai
force-pushed
the
fix/revert-noble-import-changes
branch
2 times, most recently
from
fe93846 to
14330a5
Compare
- Add timeout and disconnect protection to discoverServicesAndCharacteristics - Fix disconnect listener lost after forceReconnectPeripheral by re-setting it - Remove redundant forceReconnect in freshScanAndDiscover (fresh peripheral doesn't need GATT cache clearing) - Add cleanupDiscoveredCache option to DeviceCleanupOptions - Pass webContents to forceReconnectPeripheral and freshScanAndDiscover for proper listener setup - Convert all Chinese comments to English Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
wabicai
changed the title
Member
Author
|
@codex review, Check if there are any areas in the current code that can be optimized |
Member
Author
Code reviewNo issues found. Checked for bugs and CLAUDE.md compliance. 🤖 Generated with Claude Code - If this code review was useful, please react with 👍. Otherwise, react with 👎. |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 49a9042fc4
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
BLE peripherals may advertise with empty/changed localName after pairing or on some OSes. The previous code checked isOnekeyDevice(deviceName) before checking activeTargetedScan, which meant the targeted scan would never resolve for devices with missing/changed names. Move the activeTargetedScan check before the name filter so we match by device ID regardless of name during targeted scans.
- Remove global activeTargetedScan state variable - Remove settled flag - use cleanup + Promise idempotency instead - Use local discover listener within performTargetedScan - Cleanup function removes listener and clears timeout atomically - Simpler, more maintainable code with no global state Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Fix typo: "bundlinpissues" -> "bundling issues" - Fix enumerateDevices interval memory leak with unified cleanup function - Remove unused `idx` variable in chunked write loop - Extract duplicated connection logic into setupConnectionAndDiscoverServices() - Net reduction of 22 lines while improving maintainability Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Use const for timeoutId (prefer-const) - Fix prettier formatting for reject() call - Fix prettier formatting for function signature - Remove redundant await on return value (no-return-await) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Add try/finally to subscribeNotifications to ensure subscriptionOperations is always reset even on error - Use ERRORS.TypedError consistently instead of plain Error in freshScanAndDiscover and discoverServicesAndCharacteristicsWithRetry - Wait for disconnect callback before rejecting in connectDevice - Remove obsolete comment Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR improves BLE connection stability and fixes several memory leaks in the
noble-ble-handler.tsmodule.Changes
activeTargetedScanstate to eliminate listener leaksactiveTargetedScanBEFORE theisOnekeyDevicename filter to handle BLE peripherals that advertise with empty/changedlocalNameafter pairing or on some OSesSERVICE_DISCOVERY_TIMEOUT(10s) and disconnect handler todiscoverServicesAndCharacteristicsto prevent hanging operationscleanupDiscoveredCacheoption: New option inDeviceCleanupOptionsto optionally clear the discovered devices cachewebContentsto reconnect functions: Enable proper disconnect listener setup inforceReconnectPeripheralandfreshScanAndDiscoverFiles Changed
packages/hd-transport-electron/src/noble-ble-handler.tsTest Plan