phanterpwa 13.23.0__py3-none-any.whl → 13.26.0__py3-none-any.whl

phanterpwa/__init__.py

@@ -3,7 +3,7 @@
 # license: MIT
 
 __author__ = "PhanterJR<junior.conex@gmail.com>"
-__version__ = "13.23.0"
+__version__ = "13.26.0"
 __install_requeriments__ = [
     "psutil",
     "tornado",

phanterpwa/backend/decorators.py

@@ -1,3 +1,5 @@
+import asyncio
+import sqlite3
 from functools import wraps
 from .security import (
     Serialize,
@@ -8,6 +10,23 @@ from .security import (
 from inspect import currentframe, getframeinfo, getfile
 
 
+def async_retry_on_locked(max_retries=3, delay=0.1):
+    def decorator(func):
+        @wraps(func)
+        async def wrapper(*args, **kwargs):
+            for attempt in range(max_retries):
+                try:
+                    return await func(*args, **kwargs)
+                except sqlite3.OperationalError as e:
+                    if "locked" in str(e) and attempt < max_retries - 1:
+                        await asyncio.sleep(delay * (2 ** attempt))  # ✅ Async sleep
+                        continue
+                    raise
+            return await func(*args, **kwargs)
+        return wrapper
+    return decorator
+
+
 def check_application():
     def decorator(f):
         @wraps(f)

phanterpwa/backend/request_handlers/credentials.py

@@ -1,3 +1,4 @@
+import sqlite3
 from datetime import (
     datetime,
     timedelta
@@ -5,7 +6,8 @@ from datetime import (
 from phanterpwa.backend.decorators import (
     check_application,
     check_client_token,
-    check_user_token
+    check_user_token,
+    async_retry_on_locked
 )
 from phanterpwa.i18n import browser_language
 from phanterpwa.third_parties.xss import xssescape as E
@@ -27,6 +29,7 @@ from datetime import (
     timedelta
 )
 
+CLEANUP_TIME = datetime.now()
 
 class SignClient(web.RequestHandler):
     """
@@ -89,23 +92,8 @@ class SignClient(web.RequestHandler):
         return summary
 
     @check_application()
-    def get(self, *args, **kargs):
-        expire_date = datetime.now() - timedelta(seconds=self.projectConfig['BACKEND'][self.app_name]['default_time_client_token_expire'])
-        anonymous_expire_date = datetime.now() - timedelta(seconds=self.projectConfig['BACKEND'][self.app_name]['default_time_csrf_token_expire'])
-        deactived_user_expire_date = datetime.now() - timedelta(seconds=self.projectConfig['BACKEND'][self.app_name]['default_time_user_token_expire_remember_me'])
-        str_expire_date = expire_date.strftime('%Y-%m-%d %H:%M:%S')
-        str_anonymous_expire_date = anonymous_expire_date.strftime('%Y-%m-%d %H:%M:%S')
-        self.DALDatabase(
-            (self.DALDatabase.client.date_created < str_expire_date)
-        ).delete()
-        self.DALDatabase(
-            (self.DALDatabase.client.auth_user == None)
-            & (self.DALDatabase.client.date_created < str_anonymous_expire_date)
-        ).delete()
-        self.DALDatabase(
-            (self.DALDatabase.auth_user.activated == False)
-            & ((self.DALDatabase.auth_user.date_created < deactived_user_expire_date) | (self.DALDatabase.auth_user.date_created == None))
-        ).delete()
+    async def get(self, *args, **kargs):
+        await self._cleanup()
         self.phanterpwa_client_token = self.request.headers.get('phanterpwa-client-token')
         self.phanterpwa_authorization = self.request.headers.get('phanterpwa-authorization')
         t_client = Serialize(
@@ -390,6 +378,28 @@ class SignClient(web.RequestHandler):
         self.set_status(200)
         return self.write({"status": "OK"})
 
+    @async_retry_on_locked()
+    async def _cleanup(self):
+        global CLEANUP_TIME
+        expire_date = datetime.now() - timedelta(seconds=self.projectConfig['BACKEND'][self.app_name]['default_time_client_token_expire'])
+        anonymous_expire_date = datetime.now() - timedelta(seconds=self.projectConfig['BACKEND'][self.app_name]['default_time_csrf_token_expire'])
+        deactived_user_expire_date = datetime.now() - timedelta(seconds=self.projectConfig['BACKEND'][self.app_name]['default_time_user_token_expire_remember_me'])
+        str_expire_date = expire_date.strftime('%Y-%m-%d %H:%M:%S')
+        str_anonymous_expire_date = anonymous_expire_date.strftime('%Y-%m-%d %H:%M:%S')
+        if CLEANUP_TIME is None or CLEANUP_TIME > (datetime.now() - timedelta(60 * 60 * 12)):
+            self.DALDatabase(
+                (self.DALDatabase.client.date_created < str_expire_date)
+            ).delete()
+            self.DALDatabase(
+                (self.DALDatabase.client.auth_user == None)
+                & (self.DALDatabase.client.date_created < str_anonymous_expire_date)
+            ).delete()
+            self.DALDatabase(
+                (self.DALDatabase.auth_user.activated == False)
+                & ((self.DALDatabase.auth_user.date_created < deactived_user_expire_date) | (self.DALDatabase.auth_user.date_created == None))
+            ).delete()
+            CLEANUP_TIME = datetime.now()
+
 
 class SignForms(web.RequestHandler):
     """

phanterpwa/server.py

@@ -79,52 +79,67 @@ class PhanterPWATornado(object):
             self.cpu_number = int(self.projectConfig["PROJECT"].get('cpu_number', os.cpu_count()))
             if os.name == "nt":
                 self.cpu_number = 1
-            configs = []
-            for x in self.projectConfig['BACKEND']:
-                current_port = self.projectConfig['BACKEND'][x]['port']
-                handlers_app = importlib.import_module("backapps.{0}.handlers".format(x))
-                if isinstance(handlers_app.HANDLER, (list, tuple)):
-                    app = web.Application(
-                        handlers_app.HANDLER,
-                        **handlers_app.SETTINGS
-                    )
-                else:
-                    app = handlers_app.HANDLER
-                # app_http_server = httpserver.HTTPServer(app)
-                # if self.cpu_number == 1:
-                #     app_http_server.listen(int(current_port))
-                # else:
-                #     app_http_server.bind(int(current_port), reuse_port=True)
-                #     app_http_server.start(self.cpu_number)
-                configs.append([app, current_port])
+            needs_fork = self.cpu_number != 1 and self.cpu_number > -1
+            if needs_fork:
+                process.fork_processes(self.cpu_number)
 
-            for x in self.projectConfig['FRONTEND']:
-                current_port = self.projectConfig['FRONTEND'][x]['port']
-                handlers_app = importlib.import_module("frontapps.{0}.handlers".format(x))
-                if isinstance(handlers_app.HANDLER, (list, tuple)):
-                    app = web.Application(
-                        handlers_app.HANDLER,
-                        **handlers_app.SETTINGS
-                    )
-                else:
-                    app = handlers_app.HANDLER
-                # app_http_server = httpserver.HTTPServer(app)
-                # if self.cpu_number == 1:
-                #     app_http_server.listen(int(current_port))
-                # else:
-                #     app_http_server.bind(int(current_port), reuse_port=True)
-                #     app_http_server.start(self.cpu_number)
-                configs.append([app, current_port])
-            if self.cpu_number == 1:
-                for x in configs:
-                    app_http_server = httpserver.HTTPServer(x[0])
-                    app_http_server.listen(int(x[1]))
-            else:
-                for x in configs:
-                    socket = netutil.bind_sockets(x[1])
-                    app_http_server = httpserver.HTTPServer(x[0])
+                for x in self.projectConfig['BACKEND']:
+                    current_port = self.projectConfig['BACKEND'][x]['port']
+                    handlers_app = importlib.import_module("backapps.{0}.handlers".format(x))
+                    if isinstance(handlers_app.HANDLER, (list, tuple)):
+                        app = web.Application(
+                            handlers_app.HANDLER,
+                            **handlers_app.SETTINGS
+                        )
+                    else:
+                        app = handlers_app.HANDLER
+
+                    socket = netutil.bind_sockets(current_port)
+                    app_http_server = httpserver.HTTPServer(app)
                     app_http_server.add_sockets(socket)
-                process.fork_processes(self.cpu_number)
+
+                for x in self.projectConfig['FRONTEND']:
+                    current_port = self.projectConfig['FRONTEND'][x]['port']
+                    handlers_app = importlib.import_module("frontapps.{0}.handlers".format(x))
+                    if isinstance(handlers_app.HANDLER, (list, tuple)):
+                        app = web.Application(
+                            handlers_app.HANDLER,
+                            **handlers_app.SETTINGS
+                        )
+                    else:
+                        app = handlers_app.HANDLER
+
+                    socket = netutil.bind_sockets(current_port)
+                    app_http_server = httpserver.HTTPServer(app)
+                    app_http_server.add_sockets(socket)
+            else:
+                for x in self.projectConfig['BACKEND']:
+                    current_port = self.projectConfig['BACKEND'][x]['port']
+                    handlers_app = importlib.import_module("backapps.{0}.handlers".format(x))
+                    if isinstance(handlers_app.HANDLER, (list, tuple)):
+                        app = web.Application(
+                            handlers_app.HANDLER,
+                            **handlers_app.SETTINGS
+                        )
+                    else:
+                        app = handlers_app.HANDLER
+
+                    app_http_server = httpserver.HTTPServer(app)
+                    app_http_server.listen(current_port)
+
+                for x in self.projectConfig['FRONTEND']:
+                    current_port = self.projectConfig['FRONTEND'][x]['port']
+                    handlers_app = importlib.import_module("frontapps.{0}.handlers".format(x))
+                    if isinstance(handlers_app.HANDLER, (list, tuple)):
+                        app = web.Application(
+                            handlers_app.HANDLER,
+                            **handlers_app.SETTINGS
+                        )
+                    else:
+                        app = handlers_app.HANDLER
+
+                    app_http_server = httpserver.HTTPServer(app)
+                    app_http_server.listen(current_port)
 
 
         autoreload.watch(os.path.join(self.projectPath, "config.json"))

{phanterpwa-13.23.0.dist-info → phanterpwa-13.26.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: phanterpwa
-Version: 13.23.0
+Version: 13.26.0
 Summary: Tools for the phanterpwadeveloper framework
 Home-page: https://github.com/PhanterJR/phanterpwa
 Author: PhanterJR

{phanterpwa-13.23.0.dist-info → phanterpwa-13.26.0.dist-info}/RECORD

@@ -1,17 +1,17 @@
-phanterpwa/__init__.py,sha256=M3FqSIj_Ee97BXlwc6NaWymHHOki-rS7z3tXONl3THE,397
+phanterpwa/__init__.py,sha256=nrVnSugtS6Gm2UejYsK6FjjlXoZDnWZguS25mqhcRPo,397
 phanterpwa/__main__.py,sha256=1vSHtv6-sgAgpZiklf9bwarXX1b-fmKx1rjwJw4h78o,4017
 phanterpwa/compiler.py,sha256=Je3qtVO_cZ69_PPWcXKyBgnRfQ-Ev-zkZ3UTN-ddOTQ,47478
 phanterpwa/configer.py,sha256=O0IO5rf-hwFNdBjcz94OF-fqXKTWbqPElTsfS5V2beY,26327
 phanterpwa/helpers.py,sha256=gUoSd6OeMtA08jwFMrOCsuou58nwech-aGdiPSCX9GI,12138
 phanterpwa/mail.py,sha256=YrsiIQY_SpqySIc7mi6MfyY881DIsoYAJ5dPAz8vorE,5741
 phanterpwa/reversexml.py,sha256=YJeI8VuzEPw0D2z0Cz-HLt2n27WyJawZh6HRNZX5Ujg,10764
-phanterpwa/server.py,sha256=RcA47cQkw_XgxMa-xNH6GzZDAL1tCnpkdqLkp1vHkng,13372
+phanterpwa/server.py,sha256=X8ab8cyNJvnIb3MiqDNEp-2fwnUbUz7UPSZdvFiaNx8,14088
 phanterpwa/sms.py,sha256=XUULyDSk5gPjBqupchIcaGv-C6kX66XxrXpmzfnSp_A,1313
 phanterpwa/tools.py,sha256=SKwqx_suix-b1DP72a7z98jlnSWDmtGNWgCQq_ogB1I,46173
 phanterpwa/xmlconstructor.py,sha256=DMtc9BXI2NMGGmLszZXh2A63Iv0D1qgoWtn0aKyrmoo,162695
 phanterpwa/backend/__init__.py,sha256=zB8rm2I9O3f448YsuaupgBlAoqZAiVM5vEoWnOOGvdw,68
 phanterpwa/backend/dataforms.py,sha256=HwR8D-4vBNXdN5MSpZmjelo-Az92lVvOTIzpbHnPpsg,64543
-phanterpwa/backend/decorators.py,sha256=cNgnPDGj1n47gKxQjcpN7z4bbzyj6lTmqXEGTUDt_og,55413
+phanterpwa/backend/decorators.py,sha256=gPqFjUe8BCci59hBv72j2wvKZB3L5HLZIE-3ESA2wLU,56094
 phanterpwa/backend/security.py,sha256=USPky7nqTKASAN60yYs7-NnoR82LMZlf9aGlfz1QbXM,1300
 phanterpwa/backend/pydal/__init__.py,sha256=lpPDHcS9anJ5ceRSW9fBVuAgKK5qtjSoMsVjp3_nCdw,55
 phanterpwa/backend/pydal/auth.py,sha256=g_HToe-Lewtz4MmD9_KBtFmDl1SfBel0Pp_NDX36Y44,8558
@@ -24,7 +24,7 @@ phanterpwa/backend/request_handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 phanterpwa/backend/request_handlers/admin.py,sha256=QnpoCTMRBuviSCdB84G0pUb13kIg6ky8Wv4DEVB7tRQ,63978
 phanterpwa/backend/request_handlers/auth.py,sha256=epJ2ura3u6YDKNRmvyYGR7FzF1nrgwTpneibP0z9zzw,177284
 phanterpwa/backend/request_handlers/cas.py,sha256=TeeQaodcHVkhu-cUqesh9NeAuo0oXylzcPXpQ9wG6H4,24996
-phanterpwa/backend/request_handlers/credentials.py,sha256=mEWyPrt_3Bd6rKIJcvpTsvngEo0alPZ-JNose7S4DtQ,51277
+phanterpwa/backend/request_handlers/credentials.py,sha256=kML1meL2IJeni2MXiLfG4derOazyeCCR6DTACI1rZJ8,51663
 phanterpwa/backend/request_handlers/errors.py,sha256=x3SMdpkO4mxaSRZZQQxtH1zUFh47C06kssfI4CoPokc,4472
 phanterpwa/backend/request_handlers/i18n_server.py,sha256=p3LQxOdcLHIjgaFs4wO1V2_7gKpfcDT7pDPa7m0-UbQ,3205
 phanterpwa/backend/request_handlers/internal_messages.py,sha256=w_u3NYw0KZfuCIS8tHJhV12tj_UA0_aBekk22nR3oCc,17382
@@ -435,10 +435,10 @@ phanterpwa/usual_sass/preloaders/indefined_text.sass,sha256=z4JuUtBrzoqH3HuNFXvN
 phanterpwa/usual_sass/preloaders/run_points.sass,sha256=EYl93ljfgAc-ZLJ0VScrCoIlHP7Nr6NLdxj1zk2wm_E,3367
 phanterpwa/usual_sass/preloaders/square.sass,sha256=TOsh9muP4zkYLUJcw4i1LeRs60NrtgRWBk_1oMt2_58,1348
 phanterpwa/usual_sass/preloaders/squares.sass,sha256=kH1I89qEfmbvYxCtKFVNcxP5bWIjnqbheXVnyGF0VNo,3862
-phanterpwa-13.23.0.dist-info/LICENSE,sha256=lGEW1PRSZOkug2-d0IJgryCjqt6zhxN5x9pFgy3lx2E,1087
-phanterpwa-13.23.0.dist-info/METADATA,sha256=tKM7_PzPba-30RAt9-Qbvf92E73B24HxPfyrXnXb9ps,1939
-phanterpwa-13.23.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-phanterpwa-13.23.0.dist-info/dependency_links.txt,sha256=Pslekmz-4l1SpBO0x2aYkYZPCScmbrB9HUq1YvXYUzM,40
-phanterpwa-13.23.0.dist-info/entry_points.txt,sha256=siJH2lFXIdsUBDRgcXV4blOb2_iku1vcbqxJ-trIQrw,56
-phanterpwa-13.23.0.dist-info/top_level.txt,sha256=nF1WJ8AByxBv3bLKp3xySR2l2Twrj5n5n7C404lULSk,5319
-phanterpwa-13.23.0.dist-info/RECORD,,
+phanterpwa-13.26.0.dist-info/LICENSE,sha256=lGEW1PRSZOkug2-d0IJgryCjqt6zhxN5x9pFgy3lx2E,1087
+phanterpwa-13.26.0.dist-info/METADATA,sha256=Ws_680J-DTzgitiwWY_rY6-ySIP9Mh2yI3Py9i9Vne8,1939
+phanterpwa-13.26.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+phanterpwa-13.26.0.dist-info/dependency_links.txt,sha256=Pslekmz-4l1SpBO0x2aYkYZPCScmbrB9HUq1YvXYUzM,40
+phanterpwa-13.26.0.dist-info/entry_points.txt,sha256=siJH2lFXIdsUBDRgcXV4blOb2_iku1vcbqxJ-trIQrw,56
+phanterpwa-13.26.0.dist-info/top_level.txt,sha256=nF1WJ8AByxBv3bLKp3xySR2l2Twrj5n5n7C404lULSk,5319
+phanterpwa-13.26.0.dist-info/RECORD,,