diff --git a/.github/workflows/dart.yaml b/.github/workflows/dart.yaml index c3d2edf..20a5ceb 100644 --- a/.github/workflows/dart.yaml +++ b/.github/workflows/dart.yaml @@ -21,4 +21,4 @@ jobs: run: dart analyze - name: Run tests - run: dart test -p "chrome,vm" + run: dart test -p "chrome,vm" --compiler chrome:dart2wasm,chrome:dart2js diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c5cbce..5518f76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.1.2 + - Fixed oversight in move to `package:web` which made the package not work with wasm. + ## 2.1.1 - Added `pingInterval` to `StompConfig` to control the ping interval of IO WebSockets. Thanks @AndruhovSasha diff --git a/README.md b/README.md index c307f37..9490d1f 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ Alternatives are: #### Running unit tests ```dart -dart run test -p "chrome,vm" test/ +dart run test -p "chrome,vm" --compiler chrome:dart2wasm,chrome:dart2js test/ ``` #### Generating coverage data diff --git a/lib/src/stomp_handler.dart b/lib/src/stomp_handler.dart index 8d39f3d..18ac1f0 100644 --- a/lib/src/stomp_handler.dart +++ b/lib/src/stomp_handler.dart @@ -12,7 +12,7 @@ import 'stomp_frame.dart'; import 'stomp_parser.dart'; import 'connect_api.dart' - if (dart.library.html) 'connect_html.dart' + if (dart.library.js_interop) 'connect_html.dart' if (dart.library.io) 'connect_io.dart' as platform; typedef StompUnsubscribe = void Function({ diff --git a/pubspec.yaml b/pubspec.yaml index be5e881..676da0f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: stomp_dart_client homepage: https://github.com/blackhorse-one/stomp_dart -version: 2.1.1 +version: 2.1.2 description: Dart STOMP client for easy messaging interoperability. Build with flutter in mind, but should work for every dart application. environment: sdk: ">=2.12.0 <4.0.0" diff --git a/test/stomp_config_test.dart b/test/stomp_config_test.dart index 7a2b8a7..a1e6578 100644 --- a/test/stomp_config_test.dart +++ b/test/stomp_config_test.dart @@ -5,7 +5,7 @@ import 'package:web_socket_channel/web_socket_channel.dart'; import 'package:stomp_dart_client/stomp_dart_client.dart'; import 'package:stomp_dart_client/src/connect_api.dart' - if (dart.library.html) 'package:stomp_dart_client/src/connect_html.dart' + if (dart.library.js_interop) 'package:stomp_dart_client/src/connect_html.dart' if (dart.library.io) 'package:stomp_dart_client/src/connect_io.dart' as platform; diff --git a/test/stomp_handler_test.dart b/test/stomp_handler_test.dart index 94e40bf..97df432 100644 --- a/test/stomp_handler_test.dart +++ b/test/stomp_handler_test.dart @@ -9,7 +9,6 @@ void main() { late StompConfig config; StompHandler? handler; late StreamChannel streamChannel; - int? port; setUpAll(() async { // Basic STOMP Server @@ -69,7 +68,10 @@ void main() { stayAlive: true, ); - port = await streamChannel.stream.first; + dynamic port = await streamChannel.stream.first; + if (port is double) { + port = port.toInt(); + } config = StompConfig( url: 'ws://localhost:$port', ); diff --git a/test/stomp_test.dart b/test/stomp_test.dart index 78ae2af..9da4e7b 100644 --- a/test/stomp_test.dart +++ b/test/stomp_test.dart @@ -67,7 +67,10 @@ void main() { stayAlive: true, ); - final port = await streamChannel.stream.first; + dynamic port = await streamChannel.stream.first; + if (port is double) { + port = port.toInt(); + } config = StompConfig( url: 'ws://localhost:$port', ); @@ -120,6 +123,9 @@ void main() { ); dynamic customPort = await customChannel.stream.first; + if (customPort is double) { + customPort = customPort.toInt(); + } late StompClient client; final onWebSocketDone = expectAsync0(() {}, count: 2);