Skip to content

Added callback to catch an error happening on the socket connection #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added callback to catch an error happening on the socket connection #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0d3ebd
Added callback to catch an error happening on the socket connection
ElegantCrab Apr 27, 2023
c7e4864
Request timeout added
ElegantCrab Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions lib/modbus.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,13 @@ ModbusClient createClient(TcpConnector connector, {int unitId = 1}) =>
ModbusClientImpl(connector, unitId);

ModbusClient createTcpClient(address,
{int port = 502,
ModbusMode mode = ModbusMode.rtu,
int unitId = 1,
Duration? timeout}) =>
{
int port = 502,
ModbusMode mode = ModbusMode.rtu,
int unitId = 1,
Duration? connectionTimeout,
Duration? requestTimeout,
Function(dynamic error, dynamic stackTrace)? onConnectionError
}) =>
ModbusClientImpl(
TcpConnector(address, port, mode, timeout: timeout), unitId);
TcpConnector(address, port, mode, timeout: connectionTimeout), unitId, onConnectionError: onConnectionError, requestTimeout: requestTimeout);
10 changes: 8 additions & 2 deletions lib/src/client.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,15 @@ class ModbusClientImpl extends ModbusClient {
Map<PendingKey, PendingCallback> _pendingMap = HashMap();
Map<PendingKey, Completer> _waitingMap = HashMap();
Queue<Request> _waitingQueue = DoubleLinkedQueue();
Duration? _requestTimeout;
Function(dynamic error, dynamic stackTrace)? _onConnectionError;

ModbusClientImpl(this._connector, int unitId) {
ModbusClientImpl(this._connector, int unitId, { Function(dynamic error, dynamic stackTrace)? onConnectionError, Duration? requestTimeout = const Duration(milliseconds: 6000) }) {
_connector.onResponse = _onConnectorData;
_connector.onError = _onConnectorError;
_connector.onClose = _onConnectorClose;
_onConnectionError = onConnectionError;
_requestTimeout = requestTimeout;
_connector.setUnitId(unitId);
}

Expand Down Expand Up @@ -67,6 +71,7 @@ class ModbusClientImpl extends ModbusClient {
_pendingMap.clear();
_waitingMap.clear();
// _completer?.completeError(error, stackTrace);
if(_onConnectionError != null) _onConnectionError!(error, stackTrace);
throw ModbusConnectException("Connector Error: ${error}");
}

Expand Down Expand Up @@ -171,7 +176,8 @@ class ModbusClientImpl extends ModbusClient {
} else {
completer!.complete(responseData);
}
});
})
.timeout(_requestTimeout!);
}

@override
Expand Down