kwebsocket 1.3__tar.gz → 1.4__tar.gz

{kwebsocket-1.3 → kwebsocket-1.4}/PKG-INFO

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

{kwebsocket-1.3 → kwebsocket-1.4}/kwebsocket/__init__.py

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

{kwebsocket-1.3 → kwebsocket-1.4}/kwebsocket/rfdszbfnbxrdfgvxrhbdtxrhtbs.py

@@ -1,16 +1,49 @@
 # -*- coding: utf-8 -*-
-import time,threading
+import time,threading,hashlib,json,os
 def kwebsocket_print_log(*strs):
     print(time.strftime("%Y-%m-%d %H:%M:%S"),*strs)
 def kwebsocket_json_encode(strs):
     """python列表或字典转成字符串"""
-    import json
     try:
         return json.dumps(strs,ensure_ascii=False)
     except Exception:
         return ""
+def kwebsocket_md5(strs):
+    """md5加密
+    
+    参数 strs：要加密的字符串
+
+    return String类型
+    """
+    m = hashlib.md5()
+    b = strs.encode(encoding='utf-8')
+    m.update(b)
+    return m.hexdigest()
+def kwebsocket_is_index(params,index):
+    try:
+        params[index]
+    except KeyError:
+        return False
+    except IndexError:
+        return False
+    else:
+        return True
+def file_get_content(filename,cur_encoding='utf-8'):
+    """获取文件内容
+    
+    filename 完整文件名
+
+    cur_encoding 指定编码获取文件内容
+
+    encoding 是否返回文件编码  默认否
+    """
+    fileData=''
+    if os.path.isfile(filename):
+        with open(filename,encoding=cur_encoding) as file:
+            fileData = file.read()
+    return fileData
 class vsregrsgtrdhbrhtrsgrshydtrsegregsresgr:
-    wsobj=None
+    wsobj={}
     __config={
         'debug':False,
         'th_lock':False,
@@ -21,14 +54,40 @@ class vsregrsgtrdhbrhtrsgrshydtrsegregsresgr:
         'obj':None,
         'status':False
     }
+
+    __tempwsobj=None
+    __bs=None
+    __def_url=''
     def __connect(self):
-        if not self.wsobj:
+        if not self.__config['url']:
+            if os.name == 'posix':
+                if not self.__def_url:
+                    try:
+                        php_ims_datassss=json.loads(file_get_content(os.getcwd()+'/kwebsp/app/official/controller/phpims/common/file/sqlite/data'))
+                        sockets_admin_authkey=php_ims_datassss['admintoken']
+                    except:
+                        import kuncache
+                        php_ims_datassss=''
+                        sockets_admin_authkey=kuncache.cache.set_config({'type':'File','path':'/kwebsp/app/runtime/cachepath'}).get_cache("admin_authkey")
+                    if not sockets_admin_authkey:
+                        raise Exception('连接地址不存在')
+                    
+                    if php_ims_datassss:
+                        self.__def_url='ws://'+php_ims_datassss['domain']+'/?admintoken='+sockets_admin_authkey
+                    else:
+                        self.__def_url="ws://127.0.0.1:39030?authkey="+sockets_admin_authkey
+                self.__config['url']=self.__def_url
+            else:
+                raise Exception('连接地址不存在')
+
+        self.__bs=kwebsocket_md5(self.__config['url'])
+        if not kwebsocket_is_index(self.wsobj,self.__bs):
             import websocket
             for i in range(100):
-                self.wsobj = websocket.WebSocket()
+                self.wsobj[self.__bs] = websocket.WebSocket()
                 try:
-                    self.wsobj.connect(self.__config['url'])
-                except websocket._exceptions.WebSocketBadStatusException:
+                    self.wsobj[self.__bs].connect(self.__config['url'])
+                except websocket._exceptions.WebSocketBadStatusException as e:
                     self.close()
                     if i>=self.__config['break']:
                         self.__close_th_lock()
@@ -39,6 +98,7 @@ class vsregrsgtrdhbrhtrsgrshydtrsegregsresgr:
                     raise
                 else:
                     break
+        self.__tempwsobj=self.wsobj[self.__bs]
     def __start_th_lock(self):
         """开启线程锁 多线程中建议开启 注意 这个python多线程锁 而不是数据库事务锁"""
         if not self.__thlock['obj']:
@@ -55,18 +115,19 @@ class vsregrsgtrdhbrhtrsgrshydtrsegregsresgr:
             if self.__config['debug']:
                 kwebsocket_print_log('退出线程锁cache')
     def close(self):
-        if self.wsobj:
-            try:self.wsobj.close()
+        if kwebsocket_is_index(self.wsobj,self.__bs):
+            try:self.wsobj[self.__bs].close()
             except:pass
-            self.wsobj=None
-    def connect(self,url,breaks=5,th_lock=False):
+            del self.wsobj[self.__bs]
+        self.__tempwsobj=None
+    def connect(self,url='',breaks=5,th_lock='no'):
         """设置连接
 
         url 连接地址 如  wss://websocket.kwebapp.cn/?unionid=1&token=1232
 
         breaks #断线重连次数，0表示不重连
 
-        th_lock 是否开启线程锁 多线程中建议开启 注意 这个python多线程锁 而不是redis库事务锁 也可以在配置信息中全局开启 
+        th_lock 是否开启线程锁 多线程中建议开启 注意 这个python多线程锁
         
         """
         if th_lock!='no':
@@ -86,7 +147,7 @@ class vsregrsgtrdhbrhtrsgrshydtrsegregsresgr:
         for i in range(100):
             self.__connect()
             try:
-                self.wsobj.send(text)
+                self.__tempwsobj.send(text)
             except ConnectionAbortedError:
                 self.close()
                 if i>=self.__config['break']:
@@ -106,6 +167,8 @@ class vsregrsgtrdhbrhtrsgrshydtrsegregsresgr:
             else:
                 self.__close_th_lock()
                 break
+        self.__tempwsobj=None
+        self.__config['url']=''
     def send_arr(self,data,types,admintoken,GroupName='',client_id='',unionid=''):
         """发送信息
         
@@ -142,7 +205,7 @@ class vsregrsgtrdhbrhtrsgrshydtrsegregsresgr:
         for i in range(100):
             self.__connect()
             try:
-                data = self.wsobj.recv()
+                data = self.__tempwsobj.recv()
             except ConnectionAbortedError:
                 self.close()
                 if i>=self.__config['break']:
@@ -162,6 +225,8 @@ class vsregrsgtrdhbrhtrsgrshydtrsegregsresgr:
             else:
                 self.__close_th_lock()
                 break
+        self.__tempwsobj=None
+        self.__config['url']=''
         return data
             
         

{kwebsocket-1.3 → kwebsocket-1.4}/kwebsocket.egg-info/PKG-INFO

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

{kwebsocket-1.3 → kwebsocket-1.4}/kwebsocket.egg-info/requires.txt

@@ -1 +1,2 @@
+kuncache>=1.1
 websocket-client==1.8.0

{kwebsocket-1.3 → kwebsocket-1.4}/setup.py

@@ -44,7 +44,7 @@ def start():
         packages =  b,
 
         
-        install_requires = ['websocket-client==1.8.0'], #第三方包
+        install_requires = ['kuncache>=1.1','websocket-client==1.8.0'], #第三方包
         package_data = {
             '': ['*.html', '*.js','*.css','*.jpg','*.png','*.gif'],
         }