updated release v1.12.1

build/lib/i2cylib/network/I2TCP/server.py

@@ -26,9 +26,9 @@ def __init__(self, key=b"I2TCPbasicKey", port=24678,
         I2TCP server class  I2TCP服务端类
 
         :param key: str(or bytes), dynamic key for authentication  对称动态密钥
-        :param port: int, server port that to be bond  服务端要绑定的端口号
+        :param port: int, server port that to be bonded  服务端要绑定的端口号
         :param max_con: int, max TCP connection(s) that allowed
-                        to be accept at the same time  最大同时接受的连接数
+                        to be accepted at the same time  最大同时接受的连接数
         :param logger: Logger, server log output object  日志器（来自于i2cylib.utils.logger.logger.Logger）
         :param secured_connection: bool, enable encryption in connection  启用安全加密层
         :param max_buffer_size: int, max package buffer size for every handler  包缓冲区最大大小（单位：个）
@@ -56,7 +56,7 @@ def __init__(self, key=b"I2TCPbasicKey", port=24678,
 
     def _mainloop_thread(self):
         """
-        over write server main loop
+        overwrite server main loop
 
         :return: None
         """
@@ -147,7 +147,7 @@ def _packager(self, data):
 
         if self.flag_secured_connection_built:  # 安全连接加密
             assert isinstance(self.coder_pack, Iccode)
-            while self.flag_pack_busy:
+            while self.flag_pack_busy and self.live:
                 time.sleep(0.001)
             self.flag_pack_busy = True
             self.coder_pack.reset()

build/lib/i2cylib/network/I2TCP/test.py

@@ -24,8 +24,11 @@ def massive_send(clt, data):
     logger = Logger()
     srv = Server(port=24678, key=b"test", logger=logger, secured_connection=True)
     clt = Client(port=24678, hostname="127.0.0.1", key=b"test", logger=logger)
+    ex_clt = Client(port=24678, hostname="127.0.0.1", key=b"asds", logger=logger)
 
     srv.start()
+    ex_clt.connect()
+    time.sleep(1)
     clt.connect()
 
     data = b""

build/lib/i2cylib/network/i2tcp_basic/base_client.py

@@ -388,7 +388,10 @@ def test():
     if not clt.connect():
         print("trying to connect to local test server")
         clt.reset()
-        clt = I2TCPclient("localhost", logger=Logger(filename="client_testrun.log"))
+        clt = I2TCPclient("localhost", key=b"testtest123", logger=Logger(filename="client_testrun.log"))
+        clt.connect()
+        time.sleep(2)
+        clt = I2TCPclient("localhost", key=b"basic", logger=Logger(filename="client_testrun.log"))
         clt.connect()
     gtc = ""
     for i in range(3):

build/lib/i2cylib/network/i2tcp_basic/base_server.py

@@ -470,6 +470,9 @@ def _auth(self):
             else:
                 self.logger.WARNING("{} unauthorized connection, key received: {}".format(self.log_header,
                                                                                           dynamic_key))
+                raise Exception("{} unauthorized connection, key received: {}".format(self.log_header,
+                                                                                      dynamic_key))
+
             feedback = b""
             while len(feedback) < 2:
                 feedback += self.srv.recv(2 - len(feedback))

i2cylib.egg-info/PKG-INFO

@@ -1,39 +1,39 @@
 Metadata-Version: 2.1
 Name: i2cylib
-Version: 1.12.0
+Version: 1.12.1
 Summary: A Python library contains a lot of useful functions and tools
 Home-page: https://github.com/i2cy/i2cylib
 Author: I2cy Cloud
 Author-email: [email protected]
-License: UNKNOWN
 Project-URL: Bug Tracker, https://github.com/i2cy/i2cylib/issues
 Project-URL: Source Code, https://github.com/i2cy/i2cylib
 Project-URL: Documentation, https://github.com/i2cy/I2cylib/wiki/API-Document
-Description: # 主要包含
-         - `ICCode` i2cy常用的混淆算法
-         - `Dynkey` 动态验证密匙生成/验证工具
-         - `SQLiteDB` SQLite3数据库面向对象式API
-         - `ICFat64` 类FAT虚拟文件系统
-         - `I2TCP` 高度封装的用户层通讯协议
-         - `PID` 异步PID模组
-         - `utils` 各种常用的小工具
-
-        # 安装方法
-        `pip install i2cylib`
-
-        # 内嵌命令行工具
-         - `icen` 基于ICCode混淆算法的文件加密工具
-         - `i2cydbserver` 基于SQLite的数据库服务端
-         - `i2scan` 端口扫描、系统推断工具
-
-        # 环境需求
-        `Python3.6+`
-
-        # API文档
-        [Project Wiki](https://github.com/i2cy/I2cylib/wiki/API-Document)
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+License-File: LICENSE
+
+# 主要包含
+ - `ICCode` i2cy常用的混淆算法
+ - `Dynkey` 动态验证密匙生成/验证工具
+ - `SQLiteDB` SQLite3数据库面向对象式API
+ - `ICFat64` 类FAT虚拟文件系统
+ - `I2TCP` 高度封装的用户层通讯协议
+ - `PID` 异步PID模组
+ - `utils` 各种常用的小工具
+
+# 安装方法
+`pip install i2cylib`
+
+# 内嵌命令行工具
+ - `icen` 基于ICCode混淆算法的文件加密工具
+ - `i2cydbserver` 基于SQLite的数据库服务端
+ - `i2scan` 端口扫描、系统推断工具
+
+# 环境需求
+`Python3.6+`
+
+# API文档
+[Project Wiki](https://github.com/i2cy/I2cylib/wiki/API-Document)

i2cylib.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+LICENSE
 README.md
 pyproject.toml
 setup.py

i2cylib.egg-info/entry_points.txt

@@ -2,4 +2,3 @@
 i2cydbserver = i2cylib.database.I2DB.i2cydbserver:main
 i2en = i2cylib.crypto.I2En.icen:main
 i2scan = i2cylib.network.I2Scan.i2scan:main
-

setup.py

@@ -12,7 +12,7 @@
 
 setuptools.setup(
     name="i2cylib",  # Replace with your own username
-    version="1.12.0",
+    version="1.12.1",
     author="I2cy Cloud",
     author_email="[email protected]",
     description="A Python library contains a lot of useful functions and tools",