valar 0.0.8__tar.gz → 0.0.10__tar.gz

valar-0.0.10/PKG-INFO

@@ -0,0 +1,146 @@
+Metadata-Version: 2.2
+Name: valar
+Version: 0.0.10
+Summary: valar for morghulis
+Author: LYP
+Author-email: liuyinpeng@buaa.edu.cn
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: channels==3.0.3
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+valar for morghulis
+
+# settings
+```python
+from pathlib import Path
+
+""" Compulsory settings """
+DEBUG = True
+BASE_DIR = Path(__file__).resolve().parent.parent
+BASE_APP = str(BASE_DIR.name)
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+""" Minimized compulsory settings """
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': BASE_DIR / 'db.sqlite3',
+    }
+}
+
+INSTALLED_APPS = [
+    'django.contrib.sessions',
+    "corsheaders",
+    'channels',
+    'valar.dao'
+]
+
+MIDDLEWARE = [
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'corsheaders.middleware.CorsMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'valar.Middleware'
+]
+
+CHANNEL_LAYERS = {
+    "default": {
+        "BACKEND": "channels.layers.InMemoryChannelLayer"
+    }
+}
+
+CORS_ORIGIN_ALLOW_ALL = True
+CORS_ALLOW_CREDENTIALS = True
+ROOT_URLCONF = "%s.urls" % BASE_APP
+ASGI_APPLICATION = "%s.asgi.application" % BASE_APP
+VALAR_CHANNEL_HANDLER_MAPPING = "%s.urls.channel_handler_mapping" % BASE_APP
+
+""" Optional settings """
+# ALLOWED_HOSTS = ['*']
+# LANGUAGE_CODE = 'en-us'
+# TIME_ZONE = 'Asia/Shanghai'
+# USE_I18N = True
+# USE_TZ = False
+# SESSION_SAVE_EVERY_REQUEST = True
+# SESSION_COOKIE_AGE = 60 * 60
+# FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+# DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+```
+
+# root urls
+```python
+from django.urls import path
+
+from valar.channels import ValarSocketSender
+from valar.channels.views import handel_channel
+
+urlpatterns = [
+    path('socket/<str:handler>', handel_channel),
+]
+
+
+async def test_handler(data, sender: ValarSocketSender):
+    # print(data, sender.handler, sender.client, sender.uid)
+    await sender.to_users({'user': 15}, 15)
+    for i in range(3):
+        await sender.to_clients({'h': i},sender.client)
+
+
+channel_handler_mapping = {
+    'test': test_handler
+}
+
+```
+
+
+# asgi
+```python
+from django.core.asgi import get_asgi_application
+from channels.routing import ProtocolTypeRouter, URLRouter
+from django.urls import re_path
+
+from valar.channels import ValarConsumer
+
+application = ProtocolTypeRouter({
+    'http': get_asgi_application(),
+     'websocket': URLRouter([
+        re_path(r'(?P<client>\w+)/$', ValarConsumer.as_asgi()),
+    ])
+})
+
+```
+
+
+
+# prepare
+```sh
+python -m pip install --upgrade pip
+```
+```sh
+pip install --upgrade build
+```
+```sh
+pip install twine
+```
+
+# publish
+```sh
+rm -r dist
+```
+```sh
+python -m build
+```
+```sh
+twine check dist/*
+```
+```sh
+twine upload dist/*
+```

valar-0.0.10/README.md

@@ -0,0 +1,128 @@
+valar for morghulis
+
+# settings
+```python
+from pathlib import Path
+
+""" Compulsory settings """
+DEBUG = True
+BASE_DIR = Path(__file__).resolve().parent.parent
+BASE_APP = str(BASE_DIR.name)
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+""" Minimized compulsory settings """
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': BASE_DIR / 'db.sqlite3',
+    }
+}
+
+INSTALLED_APPS = [
+    'django.contrib.sessions',
+    "corsheaders",
+    'channels',
+    'valar.dao'
+]
+
+MIDDLEWARE = [
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'corsheaders.middleware.CorsMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'valar.Middleware'
+]
+
+CHANNEL_LAYERS = {
+    "default": {
+        "BACKEND": "channels.layers.InMemoryChannelLayer"
+    }
+}
+
+CORS_ORIGIN_ALLOW_ALL = True
+CORS_ALLOW_CREDENTIALS = True
+ROOT_URLCONF = "%s.urls" % BASE_APP
+ASGI_APPLICATION = "%s.asgi.application" % BASE_APP
+VALAR_CHANNEL_HANDLER_MAPPING = "%s.urls.channel_handler_mapping" % BASE_APP
+
+""" Optional settings """
+# ALLOWED_HOSTS = ['*']
+# LANGUAGE_CODE = 'en-us'
+# TIME_ZONE = 'Asia/Shanghai'
+# USE_I18N = True
+# USE_TZ = False
+# SESSION_SAVE_EVERY_REQUEST = True
+# SESSION_COOKIE_AGE = 60 * 60
+# FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+# DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+```
+
+# root urls
+```python
+from django.urls import path
+
+from valar.channels import ValarSocketSender
+from valar.channels.views import handel_channel
+
+urlpatterns = [
+    path('socket/<str:handler>', handel_channel),
+]
+
+
+async def test_handler(data, sender: ValarSocketSender):
+    # print(data, sender.handler, sender.client, sender.uid)
+    await sender.to_users({'user': 15}, 15)
+    for i in range(3):
+        await sender.to_clients({'h': i},sender.client)
+
+
+channel_handler_mapping = {
+    'test': test_handler
+}
+
+```
+
+
+# asgi
+```python
+from django.core.asgi import get_asgi_application
+from channels.routing import ProtocolTypeRouter, URLRouter
+from django.urls import re_path
+
+from valar.channels import ValarConsumer
+
+application = ProtocolTypeRouter({
+    'http': get_asgi_application(),
+     'websocket': URLRouter([
+        re_path(r'(?P<client>\w+)/$', ValarConsumer.as_asgi()),
+    ])
+})
+
+```
+
+
+
+# prepare
+```sh
+python -m pip install --upgrade pip
+```
+```sh
+pip install --upgrade build
+```
+```sh
+pip install twine
+```
+
+# publish
+```sh
+rm -r dist
+```
+```sh
+python -m build
+```
+```sh
+twine check dist/*
+```
+```sh
+twine upload dist/*
+```

{valar-0.0.8 → valar-0.0.10}/setup.py

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

valar-0.0.10/src/valar/__init__.py

@@ -0,0 +1,21 @@
+from django.http import JsonResponse, HttpRequest
+from django.utils.deprecation import MiddlewareMixin
+
+class ValarResponse(JsonResponse):
+    def __init__(self, data, message='', code='info'):
+        self.message = message
+        self.code = code
+        super(ValarResponse, self).__init__(data, safe=False)
+
+
+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
+        return response

{valar-0.0.8 → valar-0.0.10}/src/valar/channels/__init__.py

@@ -43,7 +43,7 @@ class ValarSocketSender:
         await self.send(GROUP, body)
 
     async def register(self):
-        body = self.__convert_body('register.emit',  [self.client], [self.uid])
+        body = self.__convert_body('register.emit',  None,[self.client], [self.uid])
         await self.send(GROUP, body)
 
 
@@ -65,7 +65,6 @@ class ValarConsumer(AsyncJsonWebsocketConsumer):
         await self.close(code)
 
     async def receive_json(self, data, *args, **kwargs):
-        print(data)
         pass
 
     async def user_emit(self, event):

{valar-0.0.8 → valar-0.0.10}/src/valar/channels/views.py

@@ -2,10 +2,13 @@ import asyncio
 import importlib
 import json
 from django.core.exceptions import ImproperlyConfigured
-from django.http import JsonResponse
 from django.conf import settings
 
-from src.valar.channels import ValarSocketSender
+from .. import ValarResponse
+from ..channels import ValarSocketSender
+
+
+
 
 
 async def handel_channel(request, handler):
@@ -13,10 +16,12 @@ async def handel_channel(request, handler):
     uid = request.session.get('UID')
     data = json.loads(request.body)
     method = get_valar_channel_handler(handler)
-    loop = asyncio.get_event_loop()
     sender = ValarSocketSender(handler, client, uid)
+    if uid and client:
+        await sender.register()
+    loop = asyncio.get_event_loop()
     loop.create_task(method(data, sender))
-    return JsonResponse({'status':'OK'}, safe=False)
+    return ValarResponse({'status':'OK'}, message='OK', code= 'success')
 
 
 

valar-0.0.10/src/valar.egg-info/PKG-INFO

@@ -0,0 +1,146 @@
+Metadata-Version: 2.2
+Name: valar
+Version: 0.0.10
+Summary: valar for morghulis
+Author: LYP
+Author-email: liuyinpeng@buaa.edu.cn
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: channels==3.0.3
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+valar for morghulis
+
+# settings
+```python
+from pathlib import Path
+
+""" Compulsory settings """
+DEBUG = True
+BASE_DIR = Path(__file__).resolve().parent.parent
+BASE_APP = str(BASE_DIR.name)
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+""" Minimized compulsory settings """
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': BASE_DIR / 'db.sqlite3',
+    }
+}
+
+INSTALLED_APPS = [
+    'django.contrib.sessions',
+    "corsheaders",
+    'channels',
+    'valar.dao'
+]
+
+MIDDLEWARE = [
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'corsheaders.middleware.CorsMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'valar.Middleware'
+]
+
+CHANNEL_LAYERS = {
+    "default": {
+        "BACKEND": "channels.layers.InMemoryChannelLayer"
+    }
+}
+
+CORS_ORIGIN_ALLOW_ALL = True
+CORS_ALLOW_CREDENTIALS = True
+ROOT_URLCONF = "%s.urls" % BASE_APP
+ASGI_APPLICATION = "%s.asgi.application" % BASE_APP
+VALAR_CHANNEL_HANDLER_MAPPING = "%s.urls.channel_handler_mapping" % BASE_APP
+
+""" Optional settings """
+# ALLOWED_HOSTS = ['*']
+# LANGUAGE_CODE = 'en-us'
+# TIME_ZONE = 'Asia/Shanghai'
+# USE_I18N = True
+# USE_TZ = False
+# SESSION_SAVE_EVERY_REQUEST = True
+# SESSION_COOKIE_AGE = 60 * 60
+# FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+# DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+```
+
+# root urls
+```python
+from django.urls import path
+
+from valar.channels import ValarSocketSender
+from valar.channels.views import handel_channel
+
+urlpatterns = [
+    path('socket/<str:handler>', handel_channel),
+]
+
+
+async def test_handler(data, sender: ValarSocketSender):
+    # print(data, sender.handler, sender.client, sender.uid)
+    await sender.to_users({'user': 15}, 15)
+    for i in range(3):
+        await sender.to_clients({'h': i},sender.client)
+
+
+channel_handler_mapping = {
+    'test': test_handler
+}
+
+```
+
+
+# asgi
+```python
+from django.core.asgi import get_asgi_application
+from channels.routing import ProtocolTypeRouter, URLRouter
+from django.urls import re_path
+
+from valar.channels import ValarConsumer
+
+application = ProtocolTypeRouter({
+    'http': get_asgi_application(),
+     'websocket': URLRouter([
+        re_path(r'(?P<client>\w+)/$', ValarConsumer.as_asgi()),
+    ])
+})
+
+```
+
+
+
+# prepare
+```sh
+python -m pip install --upgrade pip
+```
+```sh
+pip install --upgrade build
+```
+```sh
+pip install twine
+```
+
+# publish
+```sh
+rm -r dist
+```
+```sh
+python -m build
+```
+```sh
+twine check dist/*
+```
+```sh
+twine upload dist/*
+```

valar-0.0.8/PKG-INFO

@@ -1,44 +0,0 @@
-Metadata-Version: 2.2
-Name: valar
-Version: 0.0.8
-Summary: valar for morghulis
-Author: LYP
-Author-email: liuyinpeng@buaa.edu.cn
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: channels==3.0.3
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
-
-valar for morghulis
-
-# prepare
-```sh
-python -m pip install --upgrade pip
-```
-```sh
-pip install --upgrade build
-```
-```sh
-pip install twine
-```
-
-# publish
-```sh
-rm -r dist
-```
-```sh
-python -m build
-```
-```sh
-twine check dist/*
-```
-```sh
-twine upload dist/*
-```

valar-0.0.8/README.md

@@ -1,26 +0,0 @@
-valar for morghulis
-
-# prepare
-```sh
-python -m pip install --upgrade pip
-```
-```sh
-pip install --upgrade build
-```
-```sh
-pip install twine
-```
-
-# publish
-```sh
-rm -r dist
-```
-```sh
-python -m build
-```
-```sh
-twine check dist/*
-```
-```sh
-twine upload dist/*
-```

valar-0.0.8/src/valar.egg-info/PKG-INFO

@@ -1,44 +0,0 @@
-Metadata-Version: 2.2
-Name: valar
-Version: 0.0.8
-Summary: valar for morghulis
-Author: LYP
-Author-email: liuyinpeng@buaa.edu.cn
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: channels==3.0.3
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
-
-valar for morghulis
-
-# prepare
-```sh
-python -m pip install --upgrade pip
-```
-```sh
-pip install --upgrade build
-```
-```sh
-pip install twine
-```
-
-# publish
-```sh
-rm -r dist
-```
-```sh
-python -m build
-```
-```sh
-twine check dist/*
-```
-```sh
-twine upload dist/*
-```