kwebsocket 1.0__tar.gz → 1.2__tar.gz

{kwebsocket-1.0 → kwebsocket-1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kwebsocket
-Version: 1.0
+Version: 1.2
 Summary: kwebsocket
 Home-page: UNKNOWN
 Author: 百里
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fk1402936534@qq.com
 License: MIT License
 Description: UNKNOWN
-Keywords: kwebsocket1.0
+Keywords: kwebsocket1.2
 Platform: UNKNOWN

{kwebsocket-1.0 → kwebsocket-1.2}/kwebsocket/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
-__version__ = '1.0'
+__version__ = '1.2'
 from .rfdszbfnbxrdfgvxrhbdtxrhtbs import vsregrsgtrdhbrhtrsgrshydtrsegregsresgr
 client=vsregrsgtrdhbrhtrsgrshydtrsegregsresgr()

{kwebsocket-1.0 → kwebsocket-1.2}/kwebsocket/rfdszbfnbxrdfgvxrhbdtxrhtbs.py

@@ -15,27 +15,28 @@ class vsregrsgtrdhbrhtrsgrshydtrsegregsresgr:
         'status':False
     }
     def __connect(self):
-        import websocket
-        for i in range(100):
-            self.wsobj = websocket.WebSocket()
-            try:
-                self.wsobj.connect(self.__config['url'])
-            except websocket._exceptions.WebSocketBadStatusException:
-                try:self.wsobj.close()
-                except:pass
-                self.wsobj=None
-                if i>=self.__config['break']:
+        if not self.wsobj:
+            import websocket
+            for i in range(100):
+                self.wsobj = websocket.WebSocket()
+                try:
+                    self.wsobj.connect(self.__config['url'])
+                except websocket._exceptions.WebSocketBadStatusException:
+                    try:self.wsobj.close()
+                    except:pass
+                    self.wsobj=None
+                    if i>=self.__config['break']:
+                        self.__close_th_lock()
+                        raise Exception('连接已中止，请重新连接')
+                    time.sleep(0.1)
+                except:
+                    try:self.wsobj.close()
+                    except:pass
+                    self.wsobj=None
                     self.__close_th_lock()
-                    raise Exception('连接已中止，请重新连接')
-                time.sleep(0.1)
-            except:
-                try:self.wsobj.close()
-                except:pass
-                self.wsobj=None
-                self.__close_th_lock()
-                raise
-            else:
-                break
+                    raise
+                else:
+                    break
     def __start_th_lock(self):
         """开启线程锁 多线程中建议开启 注意 这个python多线程锁 而不是数据库事务锁"""
         if not self.__thlock['obj']:
@@ -51,6 +52,11 @@ class vsregrsgtrdhbrhtrsgrshydtrsegregsresgr:
             self.__thlock['status']=False
             if self.__config['debug']:
                 kwebsocket_print_log('退出线程锁cache')
+    def close(self):
+        if self.wsobj:
+            try:self.wsobj.close()
+            except:pass
+            self.wsobj=None
     def connect(self,url,th_lock=False):
         """设置连接
 
@@ -68,22 +74,23 @@ class vsregrsgtrdhbrhtrsgrshydtrsegregsresgr:
 
     def send(self,text):
         for i in range(100):
-            if not self.wsobj:
-                self.__connect()
+            self.__connect()
             try:
                 self.wsobj.send(text)
             except ConnectionAbortedError:
-                try:self.wsobj.close()
-                except:pass
-                self.wsobj=None
+                self.close()
+                if i>=self.__config['break']:
+                    self.__close_th_lock()
+                    raise Exception('连接已中止，请重新连接')
+                time.sleep(0.1)
+            except BrokenPipeError:
+                self.close()
                 if i>=self.__config['break']:
                     self.__close_th_lock()
                     raise Exception('连接已中止，请重新连接')
                 time.sleep(0.1)
             except:
-                try:self.wsobj.close()
-                except:pass
-                self.wsobj=None
+                self.close()
                 self.__close_th_lock()
                 raise
             else:
@@ -92,22 +99,23 @@ class vsregrsgtrdhbrhtrsgrshydtrsegregsresgr:
     def recv(self):
         """接收数据"""
         for i in range(100):
-            if not self.wsobj:
-                self.__connect()
+            self.__connect()
             try:
                 data = self.wsobj.recv()
             except ConnectionAbortedError:
-                try:self.wsobj.close()
-                except:pass
-                self.wsobj=None
+                self.close()
+                if i>=self.__config['break']:
+                    self.__close_th_lock()
+                    raise Exception('连接已中止，请重新连接')
+                time.sleep(0.1)
+            except BrokenPipeError:
+                self.close()
                 if i>=self.__config['break']:
                     self.__close_th_lock()
                     raise Exception('连接已中止，请重新连接')
                 time.sleep(0.1)
             except:
-                try:self.wsobj.close()
-                except:pass
-                self.wsobj=None
+                self.close()
                 self.__close_th_lock()
                 raise
             else:

{kwebsocket-1.0 → kwebsocket-1.2}/kwebsocket.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kwebsocket
-Version: 1.0
+Version: 1.2
 Summary: kwebsocket
 Home-page: UNKNOWN
 Author: 百里
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fk1402936534@qq.com
 License: MIT License
 Description: UNKNOWN
-Keywords: kwebsocket1.0
+Keywords: kwebsocket1.2
 Platform: UNKNOWN