phanterpwa 13.22.0__tar.gz → 13.24.0__tar.gz

{phanterpwa-13.22.0/phanterpwa.egg-info → phanterpwa-13.24.0}/PKG-INFO

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

{phanterpwa-13.22.0 → phanterpwa-13.24.0}/phanterpwa/__init__.py

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

{phanterpwa-13.22.0 → phanterpwa-13.24.0}/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-13.22.0 → phanterpwa-13.24.0}/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,7 @@ 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):
         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 +377,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-13.22.0 → phanterpwa-13.24.0}/phanterpwa/server.py

@@ -11,7 +11,9 @@ from tornado import (
     web,
     ioloop,
     httpserver,
-    autoreload
+    autoreload,
+    netutil,
+    process
 )
 from phanterpwa.tools import config
 from phanterpwa import compiler
@@ -77,6 +79,7 @@ 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))
@@ -87,12 +90,13 @@ class PhanterPWATornado(object):
                     )
                 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)
+                # 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])
 
             for x in self.projectConfig['FRONTEND']:
                 current_port = self.projectConfig['FRONTEND'][x]['port']
@@ -104,12 +108,25 @@ class PhanterPWATornado(object):
                     )
                 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)
+                # 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])
+                    app_http_server.add_sockets(socket)
+                process.fork_processes(self.cpu_number)
+
+
         autoreload.watch(os.path.join(self.projectPath, "config.json"))
         ioloop.IOLoop.current().start()
         print("start stopped")
@@ -189,10 +206,10 @@ class ProjectRunner():
         else:
             f_comp = False
             if str(project_version).strip() != str(project_version_cfg).strip():
-                f_comp=True
+                f_comp = True
                 print("Project version change:", str(project_version_cfg).strip(), "-->", str(project_version).strip())
             if str(ppwa_version).strip() != str(PHANTERPWA_VERSION).strip():
-                f_comp=True
+                f_comp = True
                 print("PhanterPWA version change:",
                     str(ppwa_version).strip(), "-->", str(PHANTERPWA_VERSION).strip())
             if f_comp:

{phanterpwa-13.22.0 → phanterpwa-13.24.0/phanterpwa.egg-info}/PKG-INFO

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