fix: Improve backup corruption message #1538
Merged
Conversation
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
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR refactors socket and backup utility functions by consolidating them into a single src/adapter/utils.ts file. The changes eliminate code duplication and improve maintainability by centralizing common adapter utilities.
Key changes:
- Moves
isTcpPathandparseTcpPathfunctions fromsocketPortUtils.tstoutils.ts - Adds a new
readBackupfunction toutils.tsfor centralized backup file reading - Updates all adapter files to use the new centralized utility functions
- Removes the obsolete
socketPortUtils.tsfile
Reviewed Changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| src/adapter/utils.ts | New centralized utility file containing TCP path parsing and backup reading functions |
| src/adapter/socketPortUtils.ts | Deleted file - functionality moved to utils.ts |
| src/adapter/zoh/adapter/zohAdapter.ts | Updated import to use new utils location |
| src/adapter/zigate/driver/zigate.ts | Updated imports and function calls to use new utils location |
| src/adapter/zboss/uart.ts | Updated imports and function calls to use new utils location |
| src/adapter/z-stack/znp/znp.ts | Updated imports and function calls to use new utils location |
| src/adapter/z-stack/adapter/adapter-backup.ts | Refactored to use new centralized readBackup function |
| src/adapter/ezsp/driver/uart.ts | Updated imports and function calls to use new utils location |
| src/adapter/ezsp/adapter/backup.ts | Refactored to use new centralized readBackup function |
| src/adapter/ember/uart/ash.ts | Updated imports and function calls to use new utils location |
| src/adapter/ember/adapter/emberAdapter.ts | Refactored to use new centralized readBackup function, removed unused imports |
| src/adapter/deconz/driver/driver.ts | Updated imports and function calls to use new utils location |
| src/adapter/deconz/adapter/deconzAdapter.ts | Refactored to use new centralized readBackup function |
Nerivec
reviewed
Oct 28, 2025
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Copilot <[email protected]>
Collaborator
|
Somewhat related, should Should also look into moving the entire "port" (serial or tcp) out of drivers, we can init it from Adapter, and send it to the driver. |
Owner
Author
|
Agree with both points, I think the only con of removing Ready for merge? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Based on feedback given in Koenkk/zigbee2mqtt#11767