Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions lib/mqtt5_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ part 'src/mqtt_constants.dart';

part 'src/mqtt_protocol.dart';

part 'src/mqtt_environment.dart';

part 'src/mqtt_event.dart';

part 'src/mqtt_event_bus.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ abstract class MqttBrowserConnection extends MqttConnectionBase {
final length = message.length;
final messageBytes = message.read(length);
var buffer = messageBytes.buffer;
var bData = ByteData.view(buffer);
var bData = ByteData.view(buffer, 0, length);
wsClient.send(bData.jsify()!);
}

Expand Down
1 change: 0 additions & 1 deletion lib/src/mqtt_browser_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ class MqttBrowserClient extends MqttClient {
String? username,
String? password,
]) async {
MqttEnvironment.isWebClient = true;
instantiationCorrect = true;
clientEventBus = MqttEventBus.fromEventBus(events.EventBus());
clientEventBus?.on<DisconnectOnNoPingResponse>().listen(
Expand Down
14 changes: 0 additions & 14 deletions lib/src/mqtt_environment.dart

This file was deleted.

2 changes: 1 addition & 1 deletion lib/src/mqtt_server_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class MqttServerClient extends MqttClient {
///
/// Minimum value is 1000ms.
int? get socketTimeout => _socketTimeout;

set socketTimeout(int? period) {
if (period != null && period >= MqttConstants.minimumSocketTimeoutPeriod) {
_socketTimeout = period;
Expand Down Expand Up @@ -90,7 +91,6 @@ class MqttServerClient extends MqttClient {
String? username,
String? password,
]) async {
MqttEnvironment.isWebClient = false;
instantiationCorrect = true;
clientEventBus = MqttEventBus.fromEventBus(events.EventBus());
clientEventBus?.on<DisconnectOnNoPingResponse>().listen(
Expand Down
15 changes: 3 additions & 12 deletions lib/src/utility/mqtt_byte_buffer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,9 @@ class MqttByteBuffer {
'length $length, count $count, position $_position, buffer $buffer',
);
}
if (MqttEnvironment.isWebClient) {
final tmp = typed.Uint8Buffer();
tmp.addAll(buffer!.getRange(_position, _position + count));
_position += count;
final tmp2 = typed.Uint8Buffer();
tmp2.addAll(tmp);
return tmp2;
} else {
_position += count;
return typed.Uint8Buffer()
..addAll(buffer!.getRange(_position - count, _position));
}
final start = _position;
_position += count;
return typed.Uint8Buffer()..addAll(buffer!.getRange(start, _position));
}

/// Reads a sequence of bytes from the current
Expand Down
2 changes: 0 additions & 2 deletions test/manual/mqtt_client_mosquitto_ws_browser_test_manual.dart
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ void main() {
client.connectionMessage = connMess;
var ok = true;
try {
expect(MqttEnvironment.isWebClient, isFalse);
await client.connect();
expect(MqttEnvironment.isWebClient, isTrue);
var connectionOK = false;
if (client.connectionStatus!.state == MqttConnectionState.connected) {
print('Browser client connected locally');
Expand Down
2 changes: 0 additions & 2 deletions test/mqtt_client_connection_unsecure.dart
Original file line number Diff line number Diff line change
Expand Up @@ -216,13 +216,11 @@ void main() {
);
broker.setMessageHandler = messageHandler;
ch.onConnected = connectCb;
expect(MqttEnvironment.isWebClient, isFalse);
await ch.connect(
mockBrokerAddress,
mockBrokerPort,
MqttConnectMessage().withClientIdentifier(testClientId),
);
expect(MqttEnvironment.isWebClient, isFalse);
expect(ch.connectionStatus.state, MqttConnectionState.connected);
expect(ch.connectionStatus.reasonCode, MqttConnectReasonCode.success);
expect(connectCbCalled, isTrue);
Expand Down