Merge branch 'dev' into test

coco/models.py

@@ -3,6 +3,7 @@
 import threading
 import datetime
 import weakref
+import time
 
 from . import char
 from . import utils
@@ -250,7 +251,10 @@ class WSProxy:
                 continue
             if len(data) == 0:
                 self.close()
-            self.ws.emit("data", {'data': data.decode("utf-8"), 'room': self.connection}, room=self.room)
+            data = data.decode(errors="ignore")
+            self.ws.emit("data", {'data': data, 'room': self.connection}, room=self.room)
+            if len(data) == BUF_SIZE:
+                time.sleep(0.1)
 
     def auto_forward(self):
         thread = threading.Thread(target=self.forward, args=())

coco/proxy.py

@@ -87,10 +87,12 @@ class ProxyServer:
         pass
 
     def get_proxy_sock(self, asset):
+        sock = None
         domain = self.app.service.get_domain_detail_with_gateway(
             asset.domain
         )
-        sock = None
+        if not domain.gateways:
+            return None
         for i in domain.gateways:
             gateway = domain.random_gateway()
             proxy_command = [