valar 1.3.18__py3-none-any.whl → 1.3.19__py3-none-any.whl

valar/channels/executer.py

@@ -10,5 +10,6 @@ async def execute_channel(method, sender: ValarChannelSender):
 
 def __execute__(method, sender: ValarChannelSender):
     sender.start()
-    method(sender)
+    response = method(sender)
+    sender.done(response)
     sender.stop()

valar/channels/sender.py

@@ -19,19 +19,19 @@ class Channel:
         self.auth = body.get('auth')
         self.broadcast = body.get('broadcast')
         self.data = body.get('data')
-        self.resolve = body.get('resolve')
+        self.callback = body.get('callback')
 
-    def to_dict(self, status, payload):
+    def to_dict(self, resolver, payload):
         data = {
             'handler': self.handler,
             'url': self.url,
             'auth': self.auth,
             'broadcast': self.broadcast,
-            'resolve': self.resolve,
+            'callback': self.callback,
             'timestamp': datetime.now().timestamp()
         }
-        if status:
-            data.update({'status': status})
+        if resolver:
+            data.update({'resolver': resolver})
         if payload:
             data.update({'payload': payload})
         return data
@@ -86,17 +86,18 @@ class ValarChannelSender(Sender):
         with self.__lock__:
             self.__payload__ = payload
 
-    def done(self, payload):
-        self.__emit__('done', payload)
+    def done(self, response):
+        self.__emit__('done', response)
 
     def error(self, payload):
         self.__emit__('error', payload)
 
     def __emit__(self, status='proceed', data=None):
         scope = 'broadcast' if self.__channel__.broadcast else 'client'
+        pay = self.__payload__ if status == 'proceed' else data
         body = {
             'type': f'{scope}.emit',
-            'data': self.__channel__.to_dict(status, data or self.__payload__),
+            'data': self.__channel__.to_dict(status, pay),
             'clients': [self.client],
             'users': []
         }

valar/views/handler.py

@@ -17,6 +17,7 @@ def valar_test_handler(sender: ValarChannelSender):
         tick = counter.tick()
         tick.update({'name': 'test1'})
         sender.load(tick)
+    return "aba"
 
 
 def batch_handler(sender: ValarChannelSender):

{valar-1.3.18.dist-info → valar-1.3.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.3.18
+Version: 1.3.19
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP

{valar-1.3.18.dist-info → valar-1.3.19.dist-info}/RECORD

@@ -7,9 +7,9 @@ valar/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/channels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/channels/consumer.py,sha256=_013IDOzx4_VU55jo4wgZEunTJkWt22S9gbFMyYhm8Q,1481
 valar/channels/counter.py,sha256=K8aQUI1RiIrSOg3280tV102soC-ZC1qSRZvBXuwNYQ0,377
-valar/channels/executer.py,sha256=_Ap859nvxRl8Ln0BWMqhnL6cQNl-1NQSmMR4Akh-afY,333
+valar/channels/executer.py,sha256=KS1xs2WVUcv6octOvG0gh981q4k-vQd7XF7mB1U_5ho,370
 valar/channels/mapping.py,sha256=1SBqxEYO4epbRkSOUw5zm6gau15imz1gokrRTQcy94A,755
-valar/channels/sender.py,sha256=6TJR5RlG9K44chhSUC34gvl1G2MgjRxnRpz9lGrs0rU,3852
+valar/channels/sender.py,sha256=GA32Bf59z09EMnnR9lY9hIAc5nN_zcA4Yl6JGz7kTLQ,3909
 valar/channels/views.py,sha256=4J_f-Bn3VR0o0spOa9D52aRcxMRZ0YYgo-dMzJqFrd4,375
 valar/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/classes/singleton_meta.py,sha256=aa9DZKG4Q9Cr67ZWrQ0yaFLrEjwFoTMQbDrpoIqgJZs,245
@@ -43,12 +43,12 @@ valar/models/test.py,sha256=3yfyZHJgviEybV1NyN4Qs1BGKE3DvAtb_e4oFI2MVos,1319
 valar/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/views/auth.py,sha256=zVsXJkMacpHZjQfwQ-LFS4rtUmM2tBbH56L7JSzG55w,4135
 valar/views/file.py,sha256=MdsmuoauyPJTDb89_-mk57IFId5w8HJNpBVozBKAG7s,1538
-valar/views/handler.py,sha256=KlXWhVU-b_b5uxrUwQBHW7H4shSPy4NnXj6AINM_Joo,1619
+valar/views/handler.py,sha256=XXbgFCt-AQNsJplOrOmPOt44HfMpqXJ9SWU8MQX8fio,1636
 valar/views/meta.py,sha256=H3_raG-LEcfg1p_CBpluhPXBsLFQB_jtaI5CKGgYOKk,4774
 valar/views/password.py,sha256=O094qG8Sh4ilT_wpEMw4IZtAlcQjrDVcFD5BHaWKg2Q,2127
 valar/views/rest.py,sha256=iqBCXU105CyS-lQISqrTTD2LCGzXZNijhQfxM7Fc4_Q,2758
-valar-1.3.18.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-valar-1.3.18.dist-info/METADATA,sha256=vY9OmnSw1dEJoJ8mX0-Obzk4knsoWVzpBiyzYxay__E,5173
-valar-1.3.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-valar-1.3.18.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
-valar-1.3.18.dist-info/RECORD,,
+valar-1.3.19.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+valar-1.3.19.dist-info/METADATA,sha256=I9X3zr3KbA6t-TzBQvntVCVSdOxFh9-5bRvTma_ASio,5173
+valar-1.3.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+valar-1.3.19.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
+valar-1.3.19.dist-info/RECORD,,