github-mirrors/modbus-rtu-master
1
0
Fork 0
mirror of https://github.com/Pablo2048/modbus-rtu-master.git synced 2025-10-31 08:22:43 +01:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1 from Pablo2048/development

Browse Source 
Better disconnect handling
This commit is contained in:
Pavel Brychta
2024-10-09 14:06:56 +02:00
committed by GitHub
parent 1d93632f6d 4f5fb3daa8
commit 5f3569d6be
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/modbus-rtu-master.js
View File

@@ -37,15 +37,24 @@ class ModbusRTUMaster {
}
async disconnect() {
if (this.reader) {
await this.reader.releaseLock();
}
if (this.writer) {
await this.writer.releaseLock();
}
if (this.port) {
await this.port.close();
console.log('Serial port closed');
console.log('Disconnect requested');
try {
if (this.reader) {
await this.reader.cancel();
await this.reader.releaseLock();
this.reader = null;
}
if (this.writer) {
await this.writer.releaseLock();
this.writer = null;
}
if (this.port) {
await this.port.close();
this.port = null;
console.log('Serial port closed');
}
} catch (error) {
console.error('Error during disconnect:', error);
}
}
@@ -161,10 +170,16 @@ class ModbusRTUMaster {
}
} catch (error) {
console.error('Error receiving response:', error.message);
if (this.reader) {
await this.reader.cancel();
await this.reader.releaseLock();
this.reader = null;
this.reader = this.port.readable.getReader();
}
if (error.message.includes('Device has been lost')) {
await this.handleDeviceLost();
}
return { error: error.message };
return { error: error.message }; // TODO: or throw error; ?
}
}