simpledomcontrol 0.56.3__tar.gz → 0.56.5__tar.gz

{simpledomcontrol-0.56.3 → simpledomcontrol-0.56.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SimpleDomControl
-Version: 0.56.3
+Version: 0.56.5
 Summary: Simple DOM control -> a django MVC framework
 Home-page: https://github.com/StarmanMartin/sdc
 License: Apache-2.0

{simpledomcontrol-0.56.3 → simpledomcontrol-0.56.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "SimpleDomControl"
-version = "0.56.3"
+version = "0.56.5"
 authors = [ "Martin Starman <private@martin-starman.com>", ]
 description = "Simple DOM control -> a django MVC framework"
 readme = "README.md"

{simpledomcontrol-0.56.3 → simpledomcontrol-0.56.5}/sdc_core/consumers.py

@@ -1,6 +1,8 @@
+import asyncio
 import os
 import types
 import traceback
+
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
 from django.core.files.uploadhandler import TemporaryFileUploadHandler
@@ -8,7 +10,7 @@ from django.core.files.uploadhandler import TemporaryFileUploadHandler
 from django.utils.datastructures import MultiValueDict
 from django.utils.translation import gettext as _f
 from django.contrib.auth import get_user_model
-from channels.generic.websocket import WebsocketConsumer
+from channels.generic.websocket import WebsocketConsumer, AsyncWebsocketConsumer
 
 from asgiref.sync import async_to_sync
 import importlib
@@ -65,24 +67,23 @@ class MsgManager:
                 'delete': {'header': f'{model} was deleted', 'msg': '{0} was changed'}}
 
 
-class SDCConsumer(WebsocketConsumer):
+class SDCConsumer(AsyncWebsocketConsumer):
 
-    def connect(self):
-        self.scope["session"]["channel_name"] = self.channel_name
-        self.scope["session"].save()
-        self.accept()
+    async def connect(self):
+        await self.accept()
         self.group_list = []
         self.queryset = None
 
-    def disconnect(self, close_code):
+    async def websocket_disconnect(self, close_code):
         for group in self.group_list:
-            async_to_sync(self.channel_layer.group_discard)(
+            await self.channel_layer.group_discard(
                 group,
                 self.channel_name
             )
+        await super().websocket_disconnect(close_code)
 
-    def state_sdc_event(self, event):
-        self.send(text_data=json.dumps({
+    async def state_sdc_event(self, event):
+        await self.send(text_data=json.dumps({
             'type': 'sdc_event',
             'event': event.get('event', False),
             'msg': event.get('msg', False),
@@ -91,11 +92,11 @@ class SDCConsumer(WebsocketConsumer):
             'is_error': False
         }))
 
-    def state_redirect(self, event):
+    async def state_redirect(self, event):
         if 'controller' in event:
             event['link'] = sdc_link_factory(event.get('controller'), event.get('args'))
 
-        self.send(text_data=json.dumps({
+        await self.send(text_data=json.dumps({
             'type': 'sdc_redirect',
             'msg': event.get('msg', False),
             'header': event.get('header', False),
@@ -103,8 +104,8 @@ class SDCConsumer(WebsocketConsumer):
             'is_error': False
         }))
 
-    def state_error(self, event, id=None):
-        self.send(text_data=json.dumps({
+    async def state_error(self, event, id=None):
+        await self.send(text_data=json.dumps({
             'type': 'error',
             'id': id,
             'is_error': True,
@@ -119,10 +120,9 @@ class SDCConsumer(WebsocketConsumer):
         # with the 'title' method and join them together.
         return ''.join(x.title() for x in components)
 
-    def receive(self, text_data=None, bytes_data=None):
+    async def receive(self, text_data=None, bytes_data=None):
         json_data = {}
         try:
-            session = self.scope['session'].load()
             json_data = json.loads(text_data)
             if json_data['event'] == 'sdc_call':
                 controller_name = self.to_camel_case(json_data['controller'])
@@ -134,14 +134,17 @@ class SDCConsumer(WebsocketConsumer):
                 method = getattr(controller(), json_data['function'])
 
                 logger.info(f"SDC call Socket received: {json_data['app']}.{controller_name}.{json_data['function']}")
+                if asyncio.iscoroutinefunction(method):
+                    return_vals = await method(self, **json_data.get('args', {}))
+                else:
+                    return_vals = method(self, **json_data.get('args', {}))
 
-                return_vals = method(channel=self, **json_data.get('args', {}))
                 return_vals_generator = []
                 if isinstance(return_vals, types.GeneratorType):
                     return_vals_generator = return_vals
                     return_vals = next(return_vals, None)
 
-                self.send(text_data=json.dumps({
+                await self.send(text_data=json.dumps({
                     'id': json_data['id'],
                     'type': 'sdc_recall',
                     'data': return_vals,
@@ -152,7 +155,7 @@ class SDCConsumer(WebsocketConsumer):
                 raise ValueError("event must be sdc_call")
 
         except PermissionDenied:
-            self.state_error({
+            await self.state_error({
                 'msg': _f('403 Not allowed!'),
                 'header': _f('Upps!!')
             }, json_data.get('id'))
@@ -163,7 +166,7 @@ class SDCConsumer(WebsocketConsumer):
             logger.error('\n'.join(e_text))
             if not settings.DEBUG:
                 e_text = _f('Something went wrong')
-            self.state_error({
+            await self.state_error({
                 'msg': e_text,
                 'header': _f('Upps!!')
             }, json_data.get('id'))
@@ -190,9 +193,10 @@ class SDCModelConsumer(WebsocketConsumer):
         self.scope["session"].save()
         self.accept()
 
-    def disconnect(self, close_code):
+    def websocket_disconnect(self, close_code):
         for group in self._group_names:
             async_to_sync(self.channel_layer.group_discard( group, self.channel_name ))
+        super().websocket_disconnect(close_code)
 
     def on_update(self, data):
         if data['pk'] in self.ids:

{simpledomcontrol-0.56.3 → simpledomcontrol-0.56.5}/sdc_core/sdc_extentions/views.py

@@ -1,8 +1,11 @@
+import json
+
 from django.contrib.auth.mixins import AccessMixin
 from django.core.exceptions import PermissionDenied, ImproperlyConfigured
+from django.http import HttpResponse
 from django.views import View
 from functools import wraps
-from sdc_core.sdc_extentions.response import send_redirect
+from sdc_core.sdc_extentions.response import send_redirect, send_success
 from django.conf import settings
 
 class SdcAccessMixin(AccessMixin):
@@ -93,6 +96,15 @@ class SDCView(View):
         if request.method.lower() == 'get' and request.GET.get('_method') == 'api':
             request.method += '_api'
 
+        if request.method.lower() == 'post' and request.POST.get('_method') == 'sdc_server_call':
+            handler = getattr(
+                self, request.POST.get('_sdc_func_name'), self.http_method_not_allowed
+            )
+            res = handler(request, **json.loads(request.POST.get('data')))
+            if isinstance(res, HttpResponse):
+                return res
+            return send_success(_return_data=res)
+
         return super(SDCView, self).dispatch(request, *args, **kwargs)
 
 

{simpledomcontrol-0.56.3 → simpledomcontrol-0.56.5}/sdc_core/template_files/package.json

@@ -76,6 +76,6 @@
     "esm": "^3.2.25",
     "jquery": "^3.7.0",
     "lodash": "^4.17.21",
-    "sdc_client": "^0.56.3"
+    "sdc_client": "^0.56.5"
   }
 }

{simpledomcontrol-0.56.3 → simpledomcontrol-0.56.5}/sdc_core/template_files/settings_extension.py.txt

@@ -1,4 +1,6 @@
 
+SERVER_CALL_VIA_WEB_SOCKET = False
+
 #DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 
 STATIC_ROOT =  BASE_DIR /  'www/'

{simpledomcontrol-0.56.3 → simpledomcontrol-0.56.5}/sdc_core/template_files/templates/base.html

@@ -14,6 +14,7 @@
         window.LANGUAGE_CODE = "{{ LANGUAGE_CODE | default:'de' }}";
         window.CSRF_TOKEN = '{{ csrf_token }}';
         window.DEBUG = {% if debug %} true {% else %} false {% endif %};
+        window.SERVER_CALL_VIA_WEB_SOCKET = {% if server_call_via_web_socket %} true {% else %} false {% endif %};
         window.VERSION = '{{VERSION}}';
     </script>
 

{simpledomcontrol-0.56.3 → simpledomcontrol-0.56.5}/sdc_core/template_files/urls.py.txt

@@ -1,5 +1,5 @@
 def index(request):
-    return render(request, 'index.html', {'VERSION': settings.VERSION})
+    return render(request, 'index.html', {'VERSION': settings.VERSION, 'debug': settings.DEBUG, 'server_call_via_web_socket': settings.SERVER_CALL_VIA_WEB_SOCKET})
 
 urlpatterns += [
     re_path(r'^jsi18n/$', JavaScriptCatalog.as_view(), name='javascript-catalog'),