updates for web wasm support (fix for #392 and #404)

Author: lelejacko

analysis_options.yaml

@@ -7,7 +7,6 @@ analyzer:
 # Lint rules and documentation, see http://dart-lang.github.io/linter/lints
 linter:
   rules:
-    unsafe_html: false
     cancel_subscriptions: true
     close_sinks: true
     hash_and_equals: true

lib/src/engine/socket.dart

@@ -15,7 +15,7 @@ import 'transport.dart';
 // ignore: uri_does_not_exist
 import './transport/transports_stub.dart'
 // ignore: uri_does_not_exist
-    if (dart.library.html) './transport/transports.dart'
+    if (dart.library.js_interop) './transport/transports.dart'
 // ignore: uri_does_not_exist
     if (dart.library.io) './transport/io_transports.dart';
 

lib/src/engine/transport/polling_transport.dart

@@ -10,7 +10,8 @@
 //
 // Copyright (C) 2017 Potix Corporation. All Rights Reserved.
 import 'dart:async';
-import 'dart:html';
+import 'dart:js_interop';
+import 'package:web/web.dart';
 
 import 'package:logging/logging.dart';
 import 'package:socket_io_client/src/engine/transport.dart';
@@ -23,7 +24,7 @@ bool _hasXHR2() {
   try {
     // Dart's HttpRequest doesn't expose a direct way to check for XHR2 features,
     // but attempting to use features like setting `responseType` could serve as a proxy.
-    final xhr = HttpRequest();
+    final xhr = XMLHttpRequest();
     xhr.responseType =
         'arraybuffer'; // Attempting to set a responseType supported by XHR2
     return true;
@@ -280,9 +281,9 @@ class Request extends EventEmitter {
   late Map opts;
   late String method;
   late String uri;
-  late dynamic data;
+  late String? data;
 
-  HttpRequest? xhr;
+  XMLHttpRequest? xhr;
   int? index;
   StreamSubscription? readyStateChange;
 
@@ -311,12 +312,12 @@ class Request extends EventEmitter {
     };
     opts['xdomain'] = this.opts['xd'] ?? false;
 
-    var xhr = this.xhr = HttpRequest();
+    var xhr = this.xhr = XMLHttpRequest();
     var self = this;
 
     try {
       _logger.fine('xhr open $method: $uri');
-      xhr.open(method, uri, async: true);
+      xhr.open(method, uri, true);
 
       try {
         if (this.opts.containsKey('extraHeaders') &&
@@ -371,7 +372,7 @@ class Request extends EventEmitter {
       });
 
       _logger.fine('xhr data $data');
-      xhr.send(data);
+      xhr.send(data?.jsify());
     } catch (e) {
       // Need to defer since .create() is called directly fhrom the constructor
       // and thus the 'error' event can only be only bound *after* this exception
@@ -419,7 +420,7 @@ class Request extends EventEmitter {
   /// @api private
   void onLoad() {
     final data = xhr!.responseText;
-    if (data != null) {
+    if (data.isNotEmpty) {
       emitReserved('data', data);
       emitReserved('success');
       cleanup();

lib/src/engine/transport/websocket_transport.dart

@@ -3,7 +3,7 @@
 // Author: jumperchen<[email protected]>
 
 import 'dart:async';
-import 'dart:html';
+import 'package:web/web.dart';
 import 'package:logging/logging.dart';
 import 'package:socket_io_client/src/engine/transport.dart';
 import 'package:socket_io_common/src/engine/parser/parser.dart';
@@ -35,7 +35,7 @@ class WebSocketTransport extends Transport {
       return emitReserved('error', err);
     }
 
-    if (ws!.binaryType == null) {
+    if (ws?.binaryType == null) {
       supportsBinary = false;
     }
 

pubspec.yaml

@@ -11,6 +11,7 @@ environment:
 dependencies:
   logging: '^1.2.0'
   socket_io_common: '^3.0.2'
+  web: ^1.1.0
 
 dev_dependencies:
   lints: ^4.0.0

test/io_client.dart

@@ -27,5 +27,5 @@ void main() {
 
   socket.on('event', (data) => print(data));
   socket.on('disconnect', (_) => print('disconnect'));
-  socket.on('fromServer', (_) => print(_));
+  socket.on('fromServer', (data) => print(data));
 }

web/main.dart

@@ -37,7 +37,7 @@ void main() {
 
   socket.on('event', (data) => print(data));
   socket.on('disconnect', (_) => print('disconnect'));
-  socket.on('fromServer', (_) => print(_));
+  socket.on('fromServer', (data) => print(data));
 }
 
 class MyEncoder extends Encoder {