Merge branch 'fix_push' into 'master'

fix push

See merge request server/openapi/openapi-python-sdk!207

Author: tigersk

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.1.5 (2024-01-19)
+### Fix
+- 修复长链接 protobuf 消息帧生成问题导致的无法连接问题
+
 # 3.1.4 (2024-01-19)
 ### Modify
 - 优化http请求，复用连接

tigeropen/__init__.py

@@ -4,4 +4,4 @@
 
 @author: gaoan
 """
-__VERSION__ = '3.1.4'
+__VERSION__ = '3.1.5'

tigeropen/push/network/transport.py

@@ -52,21 +52,22 @@ class SSLError(object):
 PARSING_MSG = 1
 
 
-def EncodeVarint(msg):
-    value = len(msg)
+def encode_frame(packed_frame):
+    value = len(packed_frame)
+    header_array = []
+
     bits = value & 0x7f
     value >>= 7
-    header_array = []
     while value:
-        header_array.append(0x80 | bits)
+        header_array.append(struct.Struct(">B").pack((0x80 | bits)))
         bits = value & 0x7f
         value >>= 7
-    header_array.append(bits)
-    re = bytes(header_array)
-    return re
+
+    header_array.append(struct.Struct(">B").pack(bits))
+    return b"".join(header_array) + packed_frame
 
 
-def DecodeVarint(buffer):
+def decode_varint(buffer):
     mask = (1 << 32) - 1
     result_type = int
     result = 0
@@ -246,16 +247,8 @@ def transmit(self, frame):
 
         packed_frame = frame.SerializeToString()
         logging.debug("sending frame: %s", MessageToJson(frame))
-        value = len(packed_frame)
-        bits = value & 0x7f
-        value >>= 7
-        while value:
-            self.send(struct.Struct(">B").pack((0x80 | bits)))
-            bits = value & 0x7f
-            value >>= 7
-
-        self.send(struct.Struct(">B").pack(bits))
-        self.send(packed_frame)
+        encoded_frame = encode_frame(packed_frame)
+        self.send(encoded_frame)
 
     def send(self, encoded_frame):
         """
@@ -374,7 +367,7 @@ def __read(self):
                 if self.__parse_status == PARSING_LEN:
                     self.__frame_buffer += struct.Struct(">B").pack(b)
                     if not (b & 0x80):
-                        self.__frame_len = DecodeVarint(self.__frame_buffer)
+                        self.__frame_len = decode_varint(self.__frame_buffer)
                         self.__parse_status = PARSING_MSG
                         self.__frame_buffer = b""
                         continue