cloudpss 4.5.1a1__tar.gz → 4.5.1a2__tar.gz

{cloudpss-4.5.1a1 → cloudpss-4.5.1a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudpss
-Version: 4.5.1a1
+Version: 4.5.1a2
 Summary: cloudpss sdk
 Home-page: https://www.cloudpss.net
 Author: cloudpss

{cloudpss-4.5.1a1 → cloudpss-4.5.1a2}/cloudpss/job/messageStreamReceiver.py

@@ -1,3 +1,4 @@
+import datetime
 import logging
 import sys
 
@@ -29,7 +30,21 @@ class MessageStreamReceiver(JobReceiver):
         self.origin = os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
         self.__hasOpen = False
         self.templates=TemplateManager()
-
+        self.timeOffset=0
+        self.lastMessageTime=0
+    
+    
+    def updateTime(self,timestamp):
+        self.lastMessageTime = timestamp
+        
+    ## 判断是否到达当前时间点的数据或者消息流结束
+    def isEnd(self):
+        
+        if self.status == 1:
+            return True
+        logging.debug('lastMessageTime',self.lastMessageTime)
+        return (self.lastMessageTime/1000)>=time.time()-self.timeOffset
+        
     def __path(self, from_=None):
         if self.id is None:
             raise Exception("id is None")
@@ -50,6 +65,7 @@ class MessageStreamReceiver(JobReceiver):
     def __on_message(self, message):
         
         data = IO.deserialize(message, "ubjson")
+        self.updateTime(data["timestamp"])
         self.ws.url = self.__path(data["id"])
         msg = IO.deserialize(data["data"], "ubjson")
         
@@ -71,7 +87,6 @@ class MessageStreamReceiver(JobReceiver):
 
 
     def __on_error(self,  *args, **kwargs):
-        print(args)
         logging.debug("MessageStreamReceiver error")
         msg = {
             "type": "log",
@@ -115,6 +130,10 @@ class MessageStreamReceiver(JobReceiver):
     
     def __on_open(self,ws, *args, **kwargs):
         self.ws = ws
+        gmt_format = '%a, %d %b %Y %H:%M:%S GMT'
+        serverTime = datetime.datetime.strptime(ws.sock.headers['date'],gmt_format)
+        self.timeOffset = time.time()+time.timezone-serverTime.timestamp()
+        
         logging.debug(f"MessageStreamReceiver on_open")
         self._status = 0
         self.__hasOpen = True

cloudpss-4.5.1a2/cloudpss/version.py

@@ -0,0 +1 @@
+__version__ = '4.5.1-alpha.2'

{cloudpss-4.5.1a1 → cloudpss-4.5.1a2}/cloudpss.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudpss
-Version: 4.5.1a1
+Version: 4.5.1a2
 Summary: cloudpss sdk
 Home-page: https://www.cloudpss.net
 Author: cloudpss

cloudpss-4.5.1a1/cloudpss/version.py

@@ -1 +0,0 @@
-__version__ = '4.5.1-alpha.1'