update all

Author: tvd12

android/app/src/main/java/com/tvd12/ezyfoxserver/client/EzyClientProxy.java

@@ -43,7 +43,6 @@ public static EzyClientProxy getInstance() {
     public void register(BinaryMessenger messenger) {
         if(registered.compareAndSet(false, true)) {
             doRegister(messenger);
-            mainEventsLoop.start();
         }
     }
 
@@ -56,6 +55,7 @@ private void doRegister(BinaryMessenger messenger) {
             run(call.method, (Map)call.arguments, result);
         });
         this.addDefaultMethods();
+        this.mainEventsLoop.start();
     }
 
     public void run(String method, Map params, MethodChannel.Result callback) {

android/app/src/main/java/com/tvd12/ezyfoxserver/client/proxy/EzyCreateClientMethod.java

@@ -103,7 +103,7 @@ public void handle(EzyEvent event) {
         params.put("clientName", client.getName());
         params.put("eventType", eventTypeName);
         params.put("data", eventData);
-        methodChannel.invokeMethod("onSocketEvent", params);
+        methodChannel.invokeMethod("ezy.event", params);
     }
 }
 
@@ -128,6 +128,6 @@ public void handle(EzyArray data) {
         params.put("clientName", client.getName());
         params.put("command", commandName);
         params.put("data", commandData);
-        methodChannel.invokeMethod("onSocketData", params);
+        methodChannel.invokeMethod("ezy.data", params);
     }
 }

ios/Runner.xcodeproj/project.pbxproj

@@ -1132,6 +1132,11 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+					"EZY_DEBUG=1",
+				);
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

ios/Runner/AppDelegate.swift

@@ -8,6 +8,8 @@ import Flutter
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
     GeneratedPluginRegistrant.register(with: self)
+    let controller : FlutterViewController = window?.rootViewController as! FlutterViewController
+    EzyClientProxy.getInstance().registration(controller.binaryMessenger)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
 }

ios/client/EzyClientProxy.mm

@@ -43,6 +43,7 @@ -(void)registration:(NSObject<FlutterBinaryMessenger>*)messager {
     if (_registed) {
         return;
     }
+    _registed = true;
     _methodChannel = [FlutterMethodChannel
                       methodChannelWithName:@"com.tvd12.ezyfoxserver.client"
                       binaryMessenger:messager];

ios/client/proxy/EzyMethodProxy.mm

@@ -142,7 +142,7 @@ void handle(EzyEvent* event) {
         [params setValue:[EzyNativeStrings newNSString:mClient->getName().c_str()] forKey:@"clientName"];
         [params setValue:[EzyNativeStrings newNSString:eventTypeName.c_str()] forKey:@"eventType"];
         [params setValue:eventData forKey:@"data"];
-        [mMethodChannel invokeMethod:@"onSocketEvent" arguments:params];
+        [mMethodChannel invokeMethod:@"ezy.event" arguments:params];
     }
 };
 
@@ -171,7 +171,7 @@ void handle(entity::EzyArray* data) {
         [params setValue:[EzyNativeStrings newNSString:mClient->getName().c_str()] forKey:@"clientName"];
         [params setValue:[EzyNativeStrings newNSString:commandName.c_str()] forKey:@"command"];
         [params setValue:commandData forKey:@"data"];
-        [mMethodChannel invokeMethod:@"onSocketData" arguments:params];
+        [mMethodChannel invokeMethod:@"ezy.data" arguments:params];
     }
 };
 
@@ -273,7 +273,7 @@ @implementation EzyDisconnectMethod
 
 - (NSObject *)invoke:(NSDictionary *)params {
     EzyClient* client = getClient(params);
-    int reason = 0;
+    int reason = constant::Close;
     if([params valueForKey:@"reason"])
         reason = [[params valueForKey:@"reason"] intValue];
     client->disconnect(reason);

ios/client/serializer/EzyNativeDataDeserializer.mm

@@ -51,6 +51,9 @@ - (void)deserializeToArray:(EzyArray*)output value:(NSObject*)value {
         EzyObject* fobject = (EzyObject*)[self fromReadableMap:dict];
         output->addObject(fobject);
     }
+    else if([value isKindOfClass:[NSNull class]]) {
+        output->addNull();
+    }
     else {
         @throw [NSException exceptionWithName:@"NSInvalidArgumentException"
                                        reason: [NSString stringWithFormat:@"has no deserializer for value: %@", value]

lib/ezyclient/ezy_client.dart

@@ -17,7 +17,7 @@ class EzyClient {
   late String name;
   late EzyZone? zone;
   late EzyUser? me;
-  late EzySetup? setup;
+  late EzySetup setup;
   late EzyHandlerManager handlerManager;
   late String? privateKey;
   late int sessionId;

lib/ezyclient/ezy_clients.dart

@@ -7,9 +7,9 @@ import 'ezy_logger.dart';
 class EzyClients {
   late String defaultClientName;
   late Map<String, EzyClient> clients;
-  static EzyClients _INSTANCE = EzyClients();
+  static final EzyClients _INSTANCE = EzyClients._();
 
-  EzyClients() {
+  EzyClients._() {
     this.defaultClientName = "";
     this.clients = Map();
   }

lib/ezyclient/ezy_proxy.dart

@@ -1,11 +1,58 @@
 import 'package:flutter/services.dart';
+import 'package:hello_flutter/ezyclient/ezy_clients.dart';
+import 'package:hello_flutter/ezyclient/ezy_logger.dart';
+
+import 'ezy_client.dart';
 
 class EzyProxy {
-  static const MethodChannel _methodChannel = const MethodChannel('com.tvd12.ezyfoxserver.client');
+  late MethodChannel _methodChannel;
+
+  static final EzyProxy _INSTANCE = EzyProxy._();
+
+  EzyProxy._() {
+    this._methodChannel = const MethodChannel('com.tvd12.ezyfoxserver.client');
+    this._methodChannel.setMethodCallHandler(this._handleSocketEventDatas);
+  }
 
-  EzyProxy._();
+  static EzyProxy getInstance() {
+    return _INSTANCE;
+  }
+
+  Future<void> _handleSocketEventDatas(MethodCall call) async {
+    // type inference will work here avoiding an explicit cast
+    switch(call.method) {
+      case "ezy.event":
+        _onSocketEvent(call.arguments);
+        break;
+      case "ezy.data":
+        _onSocketData(call.arguments);
+        break;
+      default:
+        EzyLogger.warn("there is no handler for method: ${call.method}, ignore it");
+    }
+  }
+
+  void _onSocketEvent(Map arguments) {
+    String clientName = arguments["clientName"];
+    String eventType = arguments["eventType"];
+    dynamic data = arguments["data"];
+    EzyClient client = _getClient(clientName);
+    client.handleEvent(eventType, data);
+  }
+
+  void _onSocketData(Map arguments) {
+    String clientName = arguments["clientName"];
+    String command = arguments["command"];
+    dynamic data = arguments["data"];
+    EzyClient client = _getClient(clientName);
+    client.handleData(command, data);
+  }
 
   static Future<T?> run<T>(String method, Map params) {
-    return _methodChannel.invokeMethod(method, params);
+    return EzyProxy.getInstance()._methodChannel.invokeMethod(method, params);
+  }
+
+  EzyClient _getClient(String clientName) {
+    return EzyClients.getInstance().getClient(clientName);
   }
 }