remoteRF-server 0.2.2__tar.gz → 0.2.4__tar.gz

{remoterf_server-0.2.2 → remoterf_server-0.2.4}/PKG-INFO

@@ -1,6 +1,8 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 0.2.2
+Version: 0.2.4
+Summary: RemoteRF server-side control package
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: grpcio
 Requires-Dist: protobuf

{remoterf_server-0.2.2 → remoterf_server-0.2.4}/pyproject.toml

@@ -4,7 +4,9 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server"
-version = "0.2.2"
+version = "0.2.4"
+description = "RemoteRF server-side control package"
+requires-python = ">=3.8"
 dependencies = [
   "grpcio",
   "protobuf",

{remoterf_server-0.2.2 → remoterf_server-0.2.4}/src/remoteRF_server/common/idl/schema.py

@@ -15,7 +15,7 @@ and the server auto-discovers it on startup via load_drivers().
 The admin's schema file:
     1. Imports from this module
     2. Subclasses DeviceSchema
-    3. Decorates with @register_driver("pluto")
+    3. Decorates with @idl_register("pluto")
     4. Implements make_device(**kwargs) — factory from manifest config
     5. Decorates exposed methods with @idl_expose(kind="get"|"set"|"call")
 
@@ -96,6 +96,8 @@ def register_driver(device_type: str):
         return cls
     return decorator
 
+idl_register = register_driver
+
 def get_driver_class(device_type: str) -> type:
     cls = _DRIVER_REGISTRY.get(device_type.strip().lower())
     if cls is None:

{remoterf_server-0.2.2 → remoterf_server-0.2.4}/src/remoteRF_server/server/reservation.py

@@ -277,7 +277,11 @@ class ReservationHandler:
     def _clean_expired_reservations(self, device_id: int):
         """Remove expired reservations from the database."""
         current_time = datetime.now()
-        self.db.cursor().execute('DELETE FROM Reservations WHERE device_id = ? AND end_time < ?', (device_id, current_time))
+        cur = self.db.cursor()
+        try:
+            cur.execute('DELETE FROM Reservations WHERE device_id = ? AND end_time < ?', (device_id, current_time))
+        finally:
+            cur.close()
     
     @db_connection
     def get_reserved_device_ids_for_user(self, username: str) -> list[int]:
@@ -737,14 +741,21 @@ from pathlib import Path
 LOG_PATH = get_db_dir() / "activity_logs.npy"
 log_lock = threading.Lock()
 
-def _load_logs ():
+def _load_logs():
     if LOG_PATH.exists():
         return np.load(LOG_PATH, allow_pickle=True).tolist()
     return []
 
-def _save_logs (logs):
+def _save_logs(logs):
     np.save(LOG_PATH, logs, allow_pickle=True)
 
+def _append_log(entry: dict):
+    """Append a single log entry. Holds log_lock only during file I/O, not during the RPC call."""
+    with log_lock:
+        logs = _load_logs()
+        logs.append(entry)
+        _save_logs(logs)
+
 # Store a reference to the original handle_call so we can wrap it
 ReservationHandler._original_handle_call = ReservationHandler.handle_call
 
@@ -764,44 +775,33 @@ def sanitize_for_logging(obj):
     else:
         return repr(obj)
 
-# Store a reference to the original handle_call so we can wrap it
-ReservationHandler._original_handle_call = ReservationHandler.handle_call
-
 def handle_call_wrapper(self, *, function_name, args):
     """
     Wrapper around the original handle_call.
-    Ensures thread-safe logging to .npy by acquiring a global lock
-    and sanitizes the args/result for pickling.
+    The RPC call runs WITHOUT holding log_lock so a slow/stalled disk write
+    can never block the server. Logging happens after the call returns.
     """
-    with log_lock:
-        # Load logs (thread-safe)
-        activity_log = _load_logs()
-
-        # Make a sanitized copy of args (to hide passwords and non-pickleable objects)
-        sanitized_args = sanitize_for_logging(dict(args))
-        if 'pw' in sanitized_args:
-            sanitized_args['pw'] = '*'
-
-        # Call the original handle_call
-        result = self._original_handle_call(function_name=function_name, args=args)
-
-        # Sanitize the result
-        sanitized_result = sanitize_for_logging(result)
-
-        # Append a new entry to our logs
-        username = sanitize_for_logging(unmap_arg(args['un'])) if 'un' in args else 'N/A'
-        activity_log.append({
-            "timestamp": datetime.now().isoformat(),
-            "action": function_name,
-            "username": username,
-            "details": {
-                "args": sanitized_args,
-                "result": sanitized_result
-            }
-        })
-
-        # Save logs back to .npy (thread-safe)
-        _save_logs(activity_log)
+    # Make a sanitized copy of args before the call (no lock needed here)
+    sanitized_args = sanitize_for_logging(dict(args))
+    if 'pw' in sanitized_args:
+        sanitized_args['pw'] = '*'
+
+    # Run the actual RPC — NOT inside log_lock
+    result = self._original_handle_call(function_name=function_name, args=args)
+
+    # Log asynchronously after the call completes
+    sanitized_result = sanitize_for_logging(result)
+    username = sanitize_for_logging(unmap_arg(args['un'])) if 'un' in args else 'N/A'
+    entry = {
+        "timestamp": datetime.now().isoformat(),
+        "action": function_name,
+        "username": username,
+        "details": {
+            "args": sanitized_args,
+            "result": sanitized_result
+        }
+    }
+    threading.Thread(target=_append_log, args=(entry,), daemon=True).start()
 
     return result
 

{remoterf_server-0.2.2 → remoterf_server-0.2.4}/src/remoteRF_server.egg-info/PKG-INFO

@@ -1,6 +1,8 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 0.2.2
+Version: 0.2.4
+Summary: RemoteRF server-side control package
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: grpcio
 Requires-Dist: protobuf