Update web_socket_channel to the latest, min SDK 3.3

.github/workflows/ci.yaml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        sdk: [2.19, stable, beta]
+        sdk: [3.4, stable, beta] # note, not testing on 3.3 due to build_runner CI dependency problem.
     steps:
       - uses: actions/checkout@v4
 
@@ -25,7 +25,7 @@ jobs:
         run: sudo gem install coveralls-lcov 
 
       - name: Start Centrifugo
-        run: docker run -d -p 8000:8000 centrifugo/centrifugo:latest centrifugo --client_insecure
+        run: docker run -d -p 8000:8000 centrifugo/centrifugo:v6 centrifugo --client.insecure
 
       - name: Run tests
         run: bash tool/test.sh

analysis_options.yaml

@@ -38,8 +38,6 @@ linter:
   - empty_statements
   - hash_and_equals
   # - invariant_booleans # https://github.com/flutter/flutter/issues/5790
-  - iterable_contains_unrelated_type
-  - list_remove_unrelated_type
   # - literal_only_boolean_expressions # https://github.com/flutter/flutter/issues/5791
   - no_adjacent_strings_in_list
   - no_duplicate_case_values
@@ -51,7 +49,6 @@ linter:
   # === style rules ===
   - always_declare_return_types
   # - always_put_control_body_on_new_line
-  - always_require_non_null_named_parameters
   # - always_specify_types
   - annotate_overrides
   # - avoid_annotating_with_dynamic # not yet tested

example/chat_app/lib/client/client.dart

@@ -31,8 +31,8 @@ class ChatClient {
       url,
       ClientConfig(
         token: conf.userJwtToken,
-        headers: <String, dynamic>{
-          'user-id': chatUserId,
+        headers: <String, String>{
+          'user-id': chatUserId.toString(),
           'user-name': chatUserName,
         },
       ),

example/chat_app/pubspec.yaml

@@ -8,7 +8,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 version: 0.1.0
 
 environment:
-  sdk: ">=2.19.0 <4.0.0"
+  sdk: ">=3.3.0 <4.0.0"
 
 dependencies:
   centrifuge:

example/console/example.dart

@@ -24,8 +24,10 @@ void main() async {
         url,
         centrifuge.ClientConfig(
           token: userJwtToken,
-          // Headers are only supported on platforms that support dart:io
-          headers: <String, dynamic>{'X-Example-Header': 'example'},
+          // If you want to use Headers in web environment – make sure your headers use
+          // string values, centrifuge-dart will then automatically attach them to connect
+          // frame (using Headers Emulation feature).
+          headers: <String, String>{'X-Example-Header': 'example'},
         ));
 
     // State changes.

example/flutter_app/analysis_options.yaml

@@ -39,8 +39,6 @@ linter:
   - empty_statements
   - hash_and_equals
   # - invariant_booleans # https://github.com/flutter/flutter/issues/5790
-  - iterable_contains_unrelated_type
-  - list_remove_unrelated_type
   # - literal_only_boolean_expressions # https://github.com/flutter/flutter/issues/5791
   - no_adjacent_strings_in_list
   - no_duplicate_case_values
@@ -52,7 +50,6 @@ linter:
   # === style rules ===
   - always_declare_return_types
   # - always_put_control_body_on_new_line
-  - always_require_non_null_named_parameters
   # - always_specify_types
   - annotate_overrides
   # - avoid_annotating_with_dynamic # not yet tested

example/flutter_app/ios/Flutter/flutter_export_environment.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/usr/local/Caskroom/flutter/3.10.6/flutter"
+export "FLUTTER_ROOT=/usr/local/Caskroom/flutter/3.24.4/flutter"
 export "FLUTTER_APPLICATION_PATH=/Users/fz/projects/centrifugal/centrifuge-dart/example/flutter_app"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_TARGET=lib/main.dart"

example/flutter_app/pubspec.yaml

@@ -2,7 +2,7 @@ name: centrifuge_app
 description: A new Flutter project.
 
 environment:
- sdk: '>=2.19.0  <4.0.0'
+ sdk: '>=3.3.0  <4.0.0'
 
 dependencies:
   flutter:

example/web_app/pubspec.yaml

@@ -10,6 +10,7 @@ environment:
 dependencies:
   centrifuge:
     path: ../../
+  web: ^1.1.0
 
 publish_to: none
 

example/web_app/web/main.dart

@@ -1,18 +1,20 @@
-import 'dart:html';
+import 'package:web/web.dart' as web;
 
 import 'package:centrifuge/centrifuge.dart';
 
 void main() {
-  querySelector('#output')?.text = 'Your Dart app is running.';
+  web.document.querySelector('#output')?.text = 'Your Dart app is running.';
 
   void onEvent(dynamic event) {
-    querySelector('#output')?.text = 'client> $event';
+    web.document.querySelector('#output')?.text = 'client> $event';
   }
 
   const url = 'ws://localhost:8000/connection/websocket';
   Client client = createClient(
     url,
-    ClientConfig(),
+    ClientConfig(
+      headers: <String, String>{'Authorization': 'example'},
+    ),
   );
 
   // State changes.

lib/src/client.dart

@@ -7,6 +7,7 @@ import 'package:centrifuge/src/server_subscription.dart';
 import 'package:centrifuge/src/transport.dart';
 import 'package:meta/meta.dart';
 
+import 'platform/vm.dart' if (dart.library.js_interop) 'platform/js.dart';
 import 'proto/client.pb.dart' as protocol;
 import 'subscription.dart';
 
@@ -50,6 +51,10 @@ abstract class Client {
   ///
   void setToken(String token);
 
+  /// Set allows updating connection headers.
+  ///
+  void setHeaders(Map<String, String> headers);
+
   /// Ready resolves when client successfully connected.
   /// Throws exceptions if called not in connecting or connected state.
   Future<void> ready();
@@ -101,6 +106,7 @@ class ClientImpl implements Client {
   ClientImpl(this._url, this._config, this._transportBuilder) {
     _token = _config.token;
     _data = _config.data;
+    _headers = Map<String, String>.of(_config.headers);
   }
 
   final TransportBuilder _transportBuilder;
@@ -113,6 +119,7 @@ class ClientImpl implements Client {
   ClientConfig _config;
   ClientConfig get config => _config;
 
+  Map<String, String> _headers = {};
   String _token = '';
   List<int>? _data;
   String? _client;
@@ -197,6 +204,11 @@ class ClientImpl implements Client {
     _token = token;
   }
 
+  @override
+  void setHeaders(Map<String, String> headers) {
+    _headers = Map<String, String>.of(headers);
+  }
+
   @override
   Future<void> disconnect() async {
     _reconnectAttempts = 0;
@@ -422,8 +434,8 @@ class ClientImpl implements Client {
       return;
     }
 
-    final transport = _transportBuilder(
-        url: _url, config: TransportConfig(headers: _config.headers, timeout: _config.timeout));
+    final transport =
+        _transportBuilder(url: _url, config: TransportConfig(headers: _headers, timeout: _config.timeout));
 
     try {
       await transport.open(_onPush, onError: (dynamic error) {
@@ -470,6 +482,11 @@ class ClientImpl implements Client {
     request.name = _config.name;
     request.version = _config.version;
 
+    if (isWeb) {
+      // Use headers emulation in web context.
+      request.headers.addAll(_headers);
+    }
+
     if (_serverSubs.isNotEmpty) {
       _serverSubs.forEach((key, value) {
         final subRequest = protocol.SubscribeRequest();
@@ -560,7 +577,7 @@ class ClientImpl implements Client {
           _inConnect = false;
           return;
         } else {
-          _processDisconnect(code: err.code, reason: err.message, reconnect: false);
+          _processDisconnect(code: err.code, reason: err.message, reconnect: true);
           await transport.close();
           _inConnect = false;
           return;

lib/src/client_config.dart

@@ -14,7 +14,7 @@ class ClientConfig {
     this.getToken,
     this.data,
     this.getData,
-    this.headers = const <String, dynamic>{},
+    this.headers = const <String, String>{},
     this.tlsSkipVerify = false,
     this.timeout = const Duration(seconds: 10),
     this.minReconnectDelay = const Duration(milliseconds: 500),
@@ -41,8 +41,10 @@ class ClientConfig {
 
   /// Headers that are set when connecting the web socket on dart:io platforms.
   ///
-  /// Note that headers are ignored on the web platform.
-  final Map<String, dynamic> headers;
+  /// Note that headers on the web platform use Headers Emulation (since Centrifugo v6)
+  /// – i.e. headers are sent to Centrifugo in first protocol message but then automatically
+  /// translated to HTTP headers by Centrifugo in the proxy request to the backend.
+  final Map<String, String> headers;
 
   final bool tlsSkipVerify;
   final Duration minReconnectDelay;

lib/src/platform/js.dart

@@ -0,0 +1 @@
+bool get isWeb => true;

lib/src/platform/vm.dart

@@ -0,0 +1 @@
+bool get isWeb => false;