Move websocket_*.dart to transports and remove key_value_store*.dart.

cloudwebrtc · cloudwebrtc · commit 224d14d0a160 · 2020-01-08T23:53:43.000+08:00
diff --git a/example/lib/generated_plugin_registrant.dart b/example/lib/generated_plugin_registrant.dart
@@ -0,0 +1,15 @@
+//
+// Generated file. Do not edit.
+//
+
+// ignore: unused_import
+import 'dart:ui';
+
+import 'package:shared_preferences_web/shared_preferences_web.dart';
+
+import 'package:flutter_web_plugins/flutter_web_plugins.dart';
+
+void registerPlugins(PluginRegistry registry) {
+  SharedPreferencesPlugin.registerWith(registry.registrarFor(SharedPreferencesPlugin));
+  registry.registerMessageHandler();
+}
diff --git a/example/lib/src/dialpad.dart b/example/lib/src/dialpad.dart
@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:sip_ua/sip_ua.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
-import 'utils/key_value_store.dart'
-    if (dart.library.js) 'utils/key_value_store_web.dart';
 import 'widgets/action_button.dart';
 
 class DialPadWidget extends StatefulWidget {
@@ -17,7 +16,7 @@ class _MyDialPadWidget extends State<DialPadWidget>
   String _dest;
   SIPUAHelper get helper => widget._helper;
   TextEditingController _textController;
-  KeyValueStore _keyValueStore = KeyValueStore();
+  SharedPreferences _preferences;
 
   @override
   initState() {
@@ -27,9 +26,9 @@ class _MyDialPadWidget extends State<DialPadWidget>
   }
 
   void _loadSettings() async {
-    await _keyValueStore.init();
+    _preferences = await SharedPreferences.getInstance();
     _dest =
-        _keyValueStore.getString('dest') ?? 'sip:hello_jssip@tryit.jssip.net';
+        _preferences.getString('dest') ?? 'sip:hello_jssip@tryit.jssip.net';
     _textController = TextEditingController(text: _dest);
     _textController.text = _dest;
     this.setState(() {});
@@ -63,7 +62,7 @@ class _MyDialPadWidget extends State<DialPadWidget>
       return null;
     }
     helper.call(dest, voiceonly);
-    _keyValueStore.setString('dest', dest);
+    _preferences.setString('dest', dest);
     return null;
   }
 
diff --git a/example/lib/src/register.dart b/example/lib/src/register.dart
@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:sip_ua/sip_ua.dart';
-
-import 'utils/key_value_store.dart'
-    if (dart.library.js) 'utils/key_value_store_web.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 class RegisterWidget extends StatefulWidget {
   final SIPUAHelper _helper;
@@ -22,7 +20,7 @@ class _MyRegisterWidget extends State<RegisterWidget>
     'Origin': ' https://tryit.jssip.net',
     'Host': 'tryit.jssip.net:10443'
   };
-  KeyValueStore _keyValueStore = KeyValueStore();
+  SharedPreferences _preferences;
   RegistrationState _registerState;
 
   SIPUAHelper get helper => widget._helper;
@@ -43,22 +41,22 @@ class _MyRegisterWidget extends State<RegisterWidget>
   }
 
   void _loadSettings() async {
-    await _keyValueStore.init();
+     _preferences = await SharedPreferences.getInstance();
     this.setState(() {
-      _wsUri = _keyValueStore.getString('ws_uri') ?? 'wss://tryit.jssip.net:10443';
-      _sipUri = _keyValueStore.getString('sip_uri') ?? 'hello_flutter@tryit.jssip.net';
-      _displayName = _keyValueStore.getString('display_name') ?? 'Flutter SIP UA';
-      _password = _keyValueStore.getString('password');
-      _authorizationUser = _keyValueStore.getString('auth_user');
+      _wsUri = _preferences.getString('ws_uri') ?? 'wss://tryit.jssip.net:10443';
+      _sipUri = _preferences.getString('sip_uri') ?? 'hello_flutter@tryit.jssip.net';
+      _displayName = _preferences.getString('display_name') ?? 'Flutter SIP UA';
+      _password = _preferences.getString('password');
+      _authorizationUser = _preferences.getString('auth_user');
     });
   }
 
   void _saveSettings() {
-    _keyValueStore.setString('ws_uri', _wsUri);
-    _keyValueStore.setString('sip_uri', _sipUri);
-    _keyValueStore.setString('display_name', _displayName);
-    _keyValueStore.setString('password', _password);
-    _keyValueStore.setString('auth_user', _authorizationUser);
+    _preferences.setString('ws_uri', _wsUri);
+    _preferences.setString('sip_uri', _sipUri);
+    _preferences.setString('display_name', _displayName);
+    _preferences.setString('password', _password);
+    _preferences.setString('auth_user', _authorizationUser);
   }
 
   @override
diff --git a/example/lib/src/utils/dart_html_dummy.dart b/example/lib/src/utils/dart_html_dummy.dart
diff --git a/example/lib/src/utils/key_value_store.dart b/example/lib/src/utils/key_value_store.dart
diff --git a/example/lib/src/utils/key_value_store_web.dart b/example/lib/src/utils/key_value_store_web.dart
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -27,6 +27,7 @@ dependencies:
     path: ../
   shared_preferences:
   shared_preferences_macos:
+  shared_preferences_web:
 
 dev_dependencies:
   flutter_test:
diff --git a/lib/src/config.dart b/lib/src/config.dart
@@ -6,7 +6,7 @@ import 'grammar.dart';
 import 'socket.dart' as Socket;
 import 'uri.dart';
 import 'utils.dart' as Utils;
-import 'websocket_interface.dart';
+import 'transports/websocket_interface.dart';
 import 'logger.dart';
 
 final logger = Log();
diff --git a/lib/src/event_manager/internal_events.dart b/lib/src/event_manager/internal_events.dart
@@ -9,7 +9,7 @@ import '../rtc_session/dtmf.dart';
 import '../rtc_session/info.dart';
 import '../sip_message.dart';
 import '../transport.dart';
-import '../websocket_interface.dart';
+import '../transports/websocket_interface.dart';
 import '../transactions/transaction_base.dart';
 
 class EventStateChanged extends EventType {}
diff --git a/lib/src/event_manager/transport_events.dart b/lib/src/event_manager/transport_events.dart
@@ -1,5 +1,5 @@
 import 'events.dart';
-import '../websocket_interface.dart';
+import '../transports/websocket_interface.dart';
 
 class EventSocketConnected extends EventType {
   WebSocketInterface socket;
diff --git a/lib/src/sip_ua_helper.dart b/lib/src/sip_ua_helper.dart
@@ -3,14 +3,14 @@ import 'package:flutter_webrtc/webrtc.dart';
 import 'package:logger/logger.dart';
 
 import 'config.dart';
+import 'event_manager/event_manager.dart';
+import 'logger.dart';
 import 'message.dart';
 import 'rtc_session.dart';
 import 'socket.dart';
-import 'ua.dart';
-import 'websocket_interface.dart';
-import 'logger.dart';
-import 'event_manager/event_manager.dart';
 import 'stack_trace_nj.dart';
+import 'transports/websocket_interface.dart';
+import 'ua.dart';
 
 class SIPUAHelper extends EventManager {
   UA _ua;
diff --git a/lib/src/socket.dart b/lib/src/socket.dart
@@ -1,6 +1,6 @@
 import 'grammar.dart';
 import 'utils.dart' as Utils;
-import 'websocket_interface.dart';
+import 'transports/websocket_interface.dart';
 import 'logger.dart';
 
 final logger = Log();
diff --git a/lib/src/transport.dart b/lib/src/transport.dart
@@ -4,7 +4,7 @@ import 'exceptions.dart' as Exceptions;
 import 'socket.dart' as Socket;
 import 'timers.dart';
 import 'utils.dart';
-import 'websocket_interface.dart';
+import 'transports/websocket_interface.dart';
 import 'logger.dart';
 import 'stack_trace_nj.dart';
 
diff --git a/lib/src/transports/websocket_dart_impl.dart b/lib/src/transports/websocket_dart_impl.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 import 'dart:math';
 import 'dart:convert';
 import 'dart:async';
-import 'logger.dart';
+import '../logger.dart';
 
 typedef void OnMessageCallback(dynamic msg);
 typedef void OnCloseCallback(int code, String reason);
@@ -17,7 +17,7 @@ class WebSocketImpl {
   OnCloseCallback onClose;
   WebSocketImpl(this._url);
 
-  connect({Object protocols, Object headers}) async {
+  void connect({Object protocols, Object headers}) async {
     logger.info('connect $_url, $headers, $protocols');
     try {
       _socket =
@@ -38,18 +38,18 @@ class WebSocketImpl {
     }
   }
 
-  send(data) {
+  void send(data) {
     if (_socket != null) {
       _socket.add(data);
       logger.debug('send: $data');
     }
   }
 
-  close() {
+  void close() {
     _socket.close();
   }
 
-  isConnecting() {
+  bool isConnecting() {
     return _socket != null && _socket.readyState == WebSocket.connecting;
   }
 
diff --git a/lib/src/transports/websocket_interface.dart b/lib/src/transports/websocket_interface.dart
@@ -4,10 +4,10 @@ import 'websocket_dart_impl.dart'
     if (dart.library.js) 'websocket_web_impl.dart';
 import 'dart:math';
 
-import 'grammar.dart';
-import 'socket.dart';
-import 'timers.dart';
-import 'logger.dart';
+import '../grammar.dart';
+import '../socket.dart';
+import '../timers.dart';
+import '../logger.dart';
 
 class WebSocketInterface implements Socket {
   String _url;
@@ -140,31 +140,31 @@ class WebSocketInterface implements Socket {
     }
   }
 
-  isConnected() {
+  bool isConnected() {
     return _connected;
   }
 
-  isConnecting() {
+  bool isConnecting() {
     return this._ws != null && this._ws.isConnecting();
   }
 
   /**
    * WebSocket Event Handlers
    */
-  _onOpen() {
+  void _onOpen() {
     logger.debug('WebSocket ${this._url} connected');
     this.onconnect();
   }
 
-  _onClose(wasClean, code, reason) {
+  void _onClose(wasClean, code, reason) {
     logger.debug('WebSocket ${this._url} closed');
     if (wasClean == false) {
       logger.debug('WebSocket abrupt disconnection');
     }
     this.ondisconnect(this, !wasClean, code, reason);
   }
 
-  _onMessage(data) {
+  void _onMessage(data) {
     logger.debug('Received WebSocket message');
     if (data != null) {
       if (data.toString().trim().length > 0) {
@@ -175,7 +175,7 @@ class WebSocketInterface implements Socket {
     }
   }
 
-  _onError(e) {
+  void _onError(e) {
     logger.error('WebSocket ${this._url} error: ${e}');
   }
 }
diff --git a/lib/src/transports/websocket_web_impl.dart b/lib/src/transports/websocket_web_impl.dart
@@ -1,6 +1,6 @@
-import 'web_socket_dummy.dart' if (dart.library.js) 'dart:html';
-import 'web_socket_dummy.dart' if (dart.library.js) 'dart:js_util' as JSUtils;
-import 'logger.dart';
+import 'dart:html';
+import 'dart:js_util' as JSUtils;
+import '../logger.dart';
 
 typedef void OnMessageCallback(dynamic msg);
 typedef void OnCloseCallback(int code, String reason);
@@ -16,7 +16,7 @@ class WebSocketImpl {
 
   WebSocketImpl(this._url);
 
-  connect({Object protocols, Object headers}) async {
+  void connect({Object protocols, Object headers}) async {
     logger.info('connect $_url, $headers, $protocols');
     try {
       _socket = WebSocket(_url, 'sip');
@@ -43,7 +43,7 @@ class WebSocketImpl {
     }
   }
 
-  send(data) {
+  void send(data) {
     if (_socket != null && _socket.readyState == WebSocket.OPEN) {
       _socket.send(data);
       logger.debug('send: $data');
@@ -52,11 +52,11 @@ class WebSocketImpl {
     }
   }
 
-  isConnecting() {
+  bool isConnecting() {
     return _socket != null && _socket.readyState == WebSocket.CONNECTING;
   }
 
-  close() {
+  void close() {
     _socket.close();
   }
 }
diff --git a/lib/src/ua.dart b/lib/src/ua.dart
@@ -14,7 +14,7 @@ import 'timers.dart';
 import 'transport.dart';
 import 'uri.dart';
 import 'utils.dart' as Utils;
-import 'websocket_interface.dart';
+import 'transports/websocket_interface.dart';
 
 import 'event_manager/event_manager.dart';
 import 'event_manager/internal_events.dart';
diff --git a/lib/src/web_socket_dummy.dart b/lib/src/web_socket_dummy.dart
diff --git a/test/test_sip_ua.dart b/test/test_sip_ua.dart
diff --git a/test/test_websocket.dart b/test/test_websocket.dart
