valar 0.0.11__tar.gz → 0.0.12__tar.gz

{valar-0.0.11/src/valar.egg-info → valar-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: valar
-Version: 0.0.11
+Version: 0.0.12
 Summary: valar for morghulis
 Author: LYP
 Author-email: liuyinpeng@buaa.edu.cn

{valar-0.0.11 → valar-0.0.12}/setup.py

@@ -10,7 +10,7 @@ requires = ['channels==3.0.3']
 
 setup(
     name="valar",  # 包名
-    version="0.0.11",  # 版本号
+    version="0.0.12",  # 版本号
     author="LYP",  # 作者
     author_email="liuyinpeng@buaa.edu.cn",  # 邮箱
     description="valar for morghulis",  # 简短描述

{valar-0.0.11 → valar-0.0.12}/src/valar/__init__.py

@@ -11,11 +11,15 @@ class ValarResponse(JsonResponse):
 class Middleware(MiddlewareMixin):
     @staticmethod
     def process_response(request: HttpRequest, response: ValarResponse):
-        message, code = response.message, response.code
-        user_id = request.session.get('USER_ID')
         headers = response.headers
-        headers['valar_message'] = message
-        headers['valar_code'] = code
-        if user_id:
-            headers['user_id'] = user_id
+        if type(response)==ValarResponse:
+            message, code = response.message, response.code
+            headers['valar_message'] = message
+            headers['valar_code'] = code
+        auth = request.headers.get('AUTH')
+        if auth:
+            headers['auth'] = auth
+        uid = request.session.get('UID')
+        if uid:
+            headers['uid'] = uid
         return response

{valar-0.0.11 → valar-0.0.12}/src/valar/channels/__init__.py

@@ -1,8 +1,9 @@
 from datetime import datetime
 
+from asgiref.sync import async_to_sync
 from channels.layers import get_channel_layer
 
-from channels.generic.websocket import AsyncJsonWebsocketConsumer
+from channels.generic.websocket import AsyncJsonWebsocketConsumer, JsonWebsocketConsumer
 from django.conf import settings
 
 try:
@@ -30,22 +31,22 @@ class ValarSocketSender:
         }
 
 
-    async def to_users(self, data, *users):
+    def to_users(self, data, *users):
         body = self.__convert_body('user.emit', data, users=users)
-        await self.send(GROUP, body)
+        async_to_sync(self.send)(GROUP, body)
 
-    async def to_clients(self,data, *clients):
+    def to_clients(self,data, *clients):
         body = self.__convert_body('client.emit', data, clients=clients)
-        await self.send(GROUP, body)
+        async_to_sync(self.send)(GROUP, body)
 
-    async def broadcast(self, data):
+
+    def broadcast(self, data):
         body = self.__convert_body('broadcast.emit', data)
-        await self.send(GROUP, body)
+        async_to_sync(self.send)(GROUP, body)
 
-    async def register(self):
+    def register(self):
         body = self.__convert_body('register.emit',  None,[self.client], [self.uid])
-        await self.send(GROUP, body)
-
+        async_to_sync(self.send)(GROUP, body)
 
 class ValarConsumer(AsyncJsonWebsocketConsumer):
 
@@ -92,10 +93,3 @@ class ValarConsumer(AsyncJsonWebsocketConsumer):
 
 
 
-
-
-
-
-
-
-

{valar-0.0.11 → valar-0.0.12}/src/valar/channels/views.py

@@ -8,20 +8,23 @@ from .. import ValarResponse
 from ..channels import ValarSocketSender
 
 
-
-
-
 async def handel_channel(request, handler):
     client = request.headers.get('CLIENT')
+    auth = request.headers.get('AUTH')
     uid = request.session.get('UID')
+    if auth and not uid:
+        return ValarResponse(False)
     data = json.loads(request.body)
-    method = get_valar_channel_handler(handler)
+    try:
+        method = get_valar_channel_handler(handler)
+    except ImproperlyConfigured:
+        return ValarResponse(False, message="Invalid channel handler %r" % handler, code='error')
     sender = ValarSocketSender(handler, client, uid)
     if uid and client:
         await sender.register()
-    loop = asyncio.get_event_loop()
-    loop.create_task(method(data, sender))
-    return ValarResponse({'status':'OK'})
+    thread = asyncio.to_thread(method,data, sender)
+    asyncio.create_task(thread)
+    return ValarResponse(True)
 
 
 

{valar-0.0.11 → valar-0.0.12/src/valar.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: valar
-Version: 0.0.11
+Version: 0.0.12
 Summary: valar for morghulis
 Author: LYP
 Author-email: liuyinpeng@buaa.edu.cn