com.xmobitea.changx.gn-unity 2.0.1 → 2.0.3

package/Runtime/Networking/Socket/NetworkingPeerSocketV2.cs

@@ -1,183 +1,185 @@
-namespace XmobiTea.GN.Networking.Socket
-{
-    using System;
-
-    using BestHTTP.SocketIO;
-    using XmobiTea.GN.Entity;
-    using XmobiTea.GN.Constant;
-    using XmobiTea.MsgPack;
-    using XmobiTea.GN.Logger;
-    using XmobiTea.GN.Common;
-
-    internal class NetworkingPeerSocketV2 : NetworkingSocketPeerBase
-    {
-        private SocketManager socketManager;
-        private bool isConnected;
-
-        internal override bool isWsConnected => this.socketManager != null ? this.socketManager.State == SocketManager.States.Open : false;
-
-        private SupportedSocketIOVersions serverVersion = SupportedSocketIOVersions.v3;
-
-        public void setServerVersion(SupportedSocketIOVersions serverVersion)
-        {
-            this.serverVersion = serverVersion;
-        }
-
-        internal override void sendRequestAuthSocket()
-        {
-            base.sendRequestAuthSocket();
-
-            if (!string.IsNullOrEmpty(this.clientId))
-                this.socketManager.Socket.Emit(Commands.RequestAuthTokenCmd, GNNetwork.getAuthenticateStatus().getAuthToken());
-        }
-
-        internal override void reInitNewSocket()
-        {
-            base.reInitNewSocket();
-
-            if (this.socketManager == null)
-            {
-                var uri = new Uri(this.url + "/socket.io/");
-                this.socketManager = new SocketManager(uri, new SocketOptions()
-                {
-                    ServerVersion = serverVersion,
-                    Reconnection = true,
-                    ReconnectionDelay = TimeSpan.FromMilliseconds(this.reconnectDelay),
-                    Timeout = TimeSpan.FromMilliseconds(this.pingTimeout),
-                    AutoConnect = false,
-                    ConnectWith = BestHTTP.SocketIO.Transports.TransportTypes.WebSocket
-                });
-
-                this.socketManager.Socket.On(SocketIOEventTypes.Connect, onConnect);
-                this.socketManager.Socket.On(SocketIOEventTypes.Disconnect, onDisconnect);
-                this.socketManager.Socket.On(SocketIOEventTypes.Error, onError);
-
-                this.socketManager.Socket.On(Commands.ResponseCmd_MsgPack, onResponseMsgPack);
-                this.socketManager.Socket.On(Commands.EventCmd_MsgPack, onEventMsgPack);
-
-                this.socketManager.Socket.On(Commands.ResponseCmd_Json, onResponseJson);
-                this.socketManager.Socket.On(Commands.EventCmd_Json, onEventJson);
-            }
-        }
-
-        private void onResponseMsgPack(Socket socket, Packet packet, object[] args)
-        {
-            lock (this.messageLstLock)
-            {
-                this.responsePacketLst.Add(new SocketPacket(packet.Attachments[0], true));
-            }
-        }
-
-        private void onEventMsgPack(Socket socket, Packet packet, object[] args)
-        {
-            lock (this.messageLstLock)
-            {
-                this.eventPacketLst.Add(new SocketPacket(packet.Attachments[0], true));
-            }
-        }
-
-        private void onResponseJson(Socket socket, Packet packet, object[] args)
-        {
-            lock (this.messageLstLock)
-            {
-                this.responsePacketLst.Add(new SocketPacket(packet.DecodedArgs[0], false));
-            }
-        }
-
-        private void onEventJson(Socket socket, Packet packet, object[] args)
-        {
-            lock (this.messageLstLock)
-            {
-                this.eventPacketLst.Add(new SocketPacket(packet.DecodedArgs[0], false));
-            }
-        }
-
-        private void onConnect(Socket socket, Packet packet, object[] args)
-        {
-            GNDebug.log("[GN Socket RECV] HandleOpen " + socket.Id);
-
-            this.clientId = socket.Id;
-
-            this.onConnectHandler();
-        }
-
-        private void onDisconnect(Socket socket, Packet packet, object[] args)
-        {
-            GNDebug.log("[GN Socket RECV] HandleClose ");
-
-            this.clientId = string.Empty;
-
-            this.onDisconnectHandler();
-        }
-
-        private void onError(Socket socket, Packet packet, object[] args)
-        {
-            GNDebug.logError(string.Format("Error: {0}", args[0].ToString()));
-        }
-
-        internal override void init(string url, int reconnectDelay, float pingInterval, float pingTimeout)
-        {
-            base.init(url, reconnectDelay, pingInterval, pingTimeout);
-        }
-
-        protected override void emit(RequestType requestType, RequestRole requestRole, OperationRequest operationRequest, string authToken, string secretKey, GNHashtable customTags)
-        {
-            base.emit(requestType, requestRole, operationRequest, authToken, secretKey, customTags);
-
-            if (this.socketManager == null || this.socketManager.Socket == null)
-            {
-                // callback here
-                return;
-            }
-
-            if (customTags != null) operationRequest.setParameter(GNParameterCode.CustomTags, customTags);
-
-            var dataSend = OperationHelper.toSocketData(requestType, requestRole, operationRequest);
-
-            if (operationRequest.isEncrypted())
-                this.socketManager.Socket.Emit(Commands.RequestCmd_MsgPack, MsgPackSerializer.Serialize(dataSend));
-            else
-                this.socketManager.Socket.Emit(Commands.RequestCmd_Json, dataSend);
-        }
-
-        internal override void close(Action _onSocketDisconnect)
-        {
-            base.close(_onSocketDisconnect);
-
-            this.isConnected = false;
-
-            if (this.socketManager != null)
-            {
-                if (this.socketManager.State != SocketManager.States.Closed)
-                {
-                    this.socketManager.Close();
-                    return;
-                }
-            }
-
-            GNDebug.log("[GN Socket] Disconnecting via SocketIOv2 BestHTTP 2");
-
-            onDisconnectHandler();
-        }
-
-        internal override void connect(Action _onSocketConnect)
-        {
-            base.connect(_onSocketConnect);
-
-            if (this.isConnected)
-            {
-                GNDebug.log("[GN Socket] Reconnecting");
-
-                return;
-            }
-
-            this.isConnected = true;
-
-            GNDebug.log("[GN Socket] Connecting via SocketIOv2 BestHTTP 2");
-
-            if (this.socketManager != null) this.socketManager.Open();
-        }
-
-    }
-
-}
+#if UNITY_USING_BEST_HTTP
+namespace XmobiTea.GN.Networking.Socket
+{
+    using System;
+
+    using BestHTTP.SocketIO;
+    using XmobiTea.GN.Entity;
+    using XmobiTea.GN.Constant;
+    using XmobiTea.MsgPack;
+    using XmobiTea.GN.Logger;
+    using XmobiTea.GN.Common;
+
+    internal class NetworkingPeerSocketV2 : NetworkingSocketPeerBase
+    {
+        private SocketManager socketManager;
+        private bool isConnected;
+
+        internal override bool isWsConnected => this.socketManager != null ? this.socketManager.State == SocketManager.States.Open : false;
+
+        private SupportedSocketIOVersions serverVersion = SupportedSocketIOVersions.v3;
+
+        public void setServerVersion(SupportedSocketIOVersions serverVersion)
+        {
+            this.serverVersion = serverVersion;
+        }
+
+        internal override void sendRequestAuthSocket()
+        {
+            base.sendRequestAuthSocket();
+
+            if (!string.IsNullOrEmpty(this.clientId))
+                this.socketManager.Socket.Emit(Commands.RequestAuthTokenCmd, GNNetwork.getAuthenticateStatus().getAuthToken());
+        }
+
+        internal override void reInitNewSocket()
+        {
+            base.reInitNewSocket();
+
+            if (this.socketManager == null)
+            {
+                var uri = new Uri(this.url + "/socket.io/");
+                this.socketManager = new SocketManager(uri, new SocketOptions()
+                {
+                    ServerVersion = serverVersion,
+                    Reconnection = true,
+                    ReconnectionDelay = TimeSpan.FromMilliseconds(this.reconnectDelay),
+                    Timeout = TimeSpan.FromMilliseconds(this.pingTimeout),
+                    AutoConnect = false,
+                    ConnectWith = BestHTTP.SocketIO.Transports.TransportTypes.WebSocket
+                });
+
+                this.socketManager.Socket.On(SocketIOEventTypes.Connect, onConnect);
+                this.socketManager.Socket.On(SocketIOEventTypes.Disconnect, onDisconnect);
+                this.socketManager.Socket.On(SocketIOEventTypes.Error, onError);
+
+                this.socketManager.Socket.On(Commands.ResponseCmd_MsgPack, onResponseMsgPack);
+                this.socketManager.Socket.On(Commands.EventCmd_MsgPack, onEventMsgPack);
+
+                this.socketManager.Socket.On(Commands.ResponseCmd_Json, onResponseJson);
+                this.socketManager.Socket.On(Commands.EventCmd_Json, onEventJson);
+            }
+        }
+
+        private void onResponseMsgPack(Socket socket, Packet packet, object[] args)
+        {
+            lock (this.messageLstLock)
+            {
+                this.responsePacketLst.Add(new SocketPacket(packet.Attachments[0], true));
+            }
+        }
+
+        private void onEventMsgPack(Socket socket, Packet packet, object[] args)
+        {
+            lock (this.messageLstLock)
+            {
+                this.eventPacketLst.Add(new SocketPacket(packet.Attachments[0], true));
+            }
+        }
+
+        private void onResponseJson(Socket socket, Packet packet, object[] args)
+        {
+            lock (this.messageLstLock)
+            {
+                this.responsePacketLst.Add(new SocketPacket(packet.DecodedArgs[0], false));
+            }
+        }
+
+        private void onEventJson(Socket socket, Packet packet, object[] args)
+        {
+            lock (this.messageLstLock)
+            {
+                this.eventPacketLst.Add(new SocketPacket(packet.DecodedArgs[0], false));
+            }
+        }
+
+        private void onConnect(Socket socket, Packet packet, object[] args)
+        {
+            GNDebug.log("[GN Socket RECV] HandleOpen " + socket.Id);
+
+            this.clientId = socket.Id;
+
+            this.onConnectHandler();
+        }
+
+        private void onDisconnect(Socket socket, Packet packet, object[] args)
+        {
+            GNDebug.log("[GN Socket RECV] HandleClose ");
+
+            this.clientId = string.Empty;
+
+            this.onDisconnectHandler();
+        }
+
+        private void onError(Socket socket, Packet packet, object[] args)
+        {
+            GNDebug.logError(string.Format("Error: {0}", args[0].ToString()));
+        }
+
+        internal override void init(string url, int reconnectDelay, float pingInterval, float pingTimeout)
+        {
+            base.init(url, reconnectDelay, pingInterval, pingTimeout);
+        }
+
+        protected override void emit(RequestType requestType, RequestRole requestRole, OperationRequest operationRequest, string authToken, string secretKey, GNHashtable customTags)
+        {
+            base.emit(requestType, requestRole, operationRequest, authToken, secretKey, customTags);
+
+            if (this.socketManager == null || this.socketManager.Socket == null)
+            {
+                // callback here
+                return;
+            }
+
+            if (customTags != null) operationRequest.setParameter(GNParameterCode.CustomTags, customTags);
+
+            var dataSend = OperationHelper.toSocketData(requestType, requestRole, operationRequest);
+
+            if (operationRequest.isEncrypted())
+                this.socketManager.Socket.Emit(Commands.RequestCmd_MsgPack, MsgPackSerializer.Serialize(dataSend));
+            else
+                this.socketManager.Socket.Emit(Commands.RequestCmd_Json, dataSend);
+        }
+
+        internal override void close(Action _onSocketDisconnect)
+        {
+            base.close(_onSocketDisconnect);
+
+            this.isConnected = false;
+
+            if (this.socketManager != null)
+            {
+                if (this.socketManager.State != SocketManager.States.Closed)
+                {
+                    this.socketManager.Close();
+                    return;
+                }
+            }
+
+            GNDebug.log("[GN Socket] Disconnecting via SocketIOv2 BestHTTP 2");
+
+            onDisconnectHandler();
+        }
+
+        internal override void connect(Action _onSocketConnect)
+        {
+            base.connect(_onSocketConnect);
+
+            if (this.isConnected)
+            {
+                GNDebug.log("[GN Socket] Reconnecting");
+
+                return;
+            }
+
+            this.isConnected = true;
+
+            GNDebug.log("[GN Socket] Connecting via SocketIOv2 BestHTTP 2");
+
+            if (this.socketManager != null) this.socketManager.Open();
+        }
+
+    }
+
+}
+#endif

package/Runtime/Networking/Socket/NetworkingPeerSocketV2.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 65c2e705603a61748a4b0767c71d3f18
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 65c2e705603a61748a4b0767c71d3f18
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: