Changeset 148 for uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI

Timestamp:

Jan 8, 2016, 2:35:52 PM (8 years ago)

Author:

coas-nagasima

Message:

メッセージバッファ領域がなくなったときにWebSocketパケットを誤って処理してしまうのを修正。
Ethernet送信バッファが取れないときにパケットが送信できなかったのを修正。
その他、処理の安定性の向上。

Location:

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/js

Files:

• ctrlui.js (modified) (1 diff)
• ctrlui.min.js (modified) (1 diff)

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/js/ctrlui.js

@@ -5314 +5314 @@
                         //decrypt data
                         //deserialize
-                        if (!!ss.isValue(msg.data)) {
-                                data = $Kadecot_WampDeserializer.parse(ss.cast(msg.data, String));
-                        }
-                        else {
-                                data = $Kadecot_WampDeserializer.parse(ss.cast(msg, String));
+                        try {
+                                if (!!ss.isValue(msg.data)) {
+                                        data = $Kadecot_WampDeserializer.parse(ss.cast(msg.data, String));
+                                }
+                                else {
+                                        data = $Kadecot_WampDeserializer.parse(ss.cast(msg, String));
+                                }
+                        }
+                        catch ($t1) {
+                                data = null;
                         }
                         if (ss.isNullOrUndefined(data)) {

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/js/ctrlui.min.js

@@ -425 +425 @@
 else{return null;}
 return data;},sendYield:function(request,options,arguments1,argumentsKw){var data;data=$Kadecot_WampSerializer.createYield(request,options,arguments1,argumentsKw);if(this.$on_open_flag){this.$webSocket.send(data);}
-return data;},onOpen:function(e){this.$on_open_flag=true;var callback=this.$wampClientCore.get_openCallback();if(!ss.staticEquals(callback,null)){callback();}},onClose:function(e){this.$on_open_flag=false;var callback=this.$wampClientCore.get_closeCallback();if(!ss.staticEquals(callback,null)){callback();}},onError:function(e){var eea=e;if(!ss.staticEquals(this.$errorCallback,null)){this.$errorCallback(ss.cast(eea.message,String));}},onMessage:function(e){var msg=e;var data;var callback=null;if(!!ss.isValue(msg.data)){data=$Kadecot_WampDeserializer.parse(ss.cast(msg.data,String));}
-else{data=$Kadecot_WampDeserializer.parse(ss.cast(msg,String));}
+return data;},onOpen:function(e){this.$on_open_flag=true;var callback=this.$wampClientCore.get_openCallback();if(!ss.staticEquals(callback,null)){callback();}},onClose:function(e){this.$on_open_flag=false;var callback=this.$wampClientCore.get_closeCallback();if(!ss.staticEquals(callback,null)){callback();}},onError:function(e){var eea=e;if(!ss.staticEquals(this.$errorCallback,null)){this.$errorCallback(ss.cast(eea.message,String));}},onMessage:function(e){var msg=e;var data;var callback=null;try{if(!!ss.isValue(msg.data)){data=$Kadecot_WampDeserializer.parse(ss.cast(msg.data,String));}
+else{data=$Kadecot_WampDeserializer.parse(ss.cast(msg,String));}}
+catch($t1){data=null;}
 if(ss.isNullOrUndefined(data)){return;}
 var list=ss.cast(data,Array);var switchData=ss.unbox(ss.cast(list[0],ss.Int32));switch(switchData){case 2:{if(this.$challnge_flag){this.$challnge_flag=false;callback=this.$wampClientCore.get_authenticateCallback();if(!ss.staticEquals(callback,null)){callback(data);}