remoteRF-server 0.1.71__tar.gz → 0.1.73__tar.gz

{remoterf_server-0.1.71 → remoterf_server-0.1.73}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 0.1.71
+Version: 0.1.73
 Description-Content-Type: text/markdown
 Requires-Dist: grpcio
 Requires-Dist: protobuf
@@ -346,7 +346,9 @@ todo:
 <!-- Testing functionality (disregarding Host pipeline) -->
 <!-- Clean up serverrf CLI + basic documentation for all commands, usergroups, export codes by CSV. -->
 
-HostRF meta data -> push upon connection + retry connection on host side.
+<!-- HostRF meta data -> push upon connection + retry connection on host side. -->
+
+Host ID (NEEDS TO BE UNIQUE AND TELL THE HOST THAT) (or if device also does it as well.)
 
 ServerRF display meta data as part of devices list / reservation + online/activity status (appended into device name) + (plus host side warning if the device id is NOT globally unique!)
 

{remoterf_server-0.1.71 → remoterf_server-0.1.73}/README.md

@@ -335,7 +335,9 @@ todo:
 <!-- Testing functionality (disregarding Host pipeline) -->
 <!-- Clean up serverrf CLI + basic documentation for all commands, usergroups, export codes by CSV. -->
 
-HostRF meta data -> push upon connection + retry connection on host side.
+<!-- HostRF meta data -> push upon connection + retry connection on host side. -->
+
+Host ID (NEEDS TO BE UNIQUE AND TELL THE HOST THAT) (or if device also does it as well.)
 
 ServerRF display meta data as part of devices list / reservation + online/activity status (appended into device name) + (plus host side warning if the device id is NOT globally unique!)
 

{remoterf_server-0.1.71 → remoterf_server-0.1.73}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server"
-version = "0.1.71"
+version = "0.1.73"
 dependencies = [
   "grpcio",
   "protobuf",

{remoterf_server-0.1.71 → remoterf_server-0.1.73}/src/remoteRF_server/common/grpc/grpc_host_pb2.py

@@ -25,13 +25,15 @@ _sym_db = _symbol_database.Default()
 from . import grpc_pb2 as grpc__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0fgrpc_host.proto\x12\x08remoterf\x1a\ngrpc.proto\"-\n\tHostHello\x12\x0f\n\x07host_id\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\"^\n\nDeviceInfo\x12\x10\n\x08local_id\x18\x01 \x01(\r\x12\r\n\x05label\x18\x02 \x01(\t\x12\x11\n\tdevice_id\x18\x03 \x01(\t\x12\x0e\n\x06serial\x18\x04 \x01(\t\x12\x0c\n\x04kind\x18\x05 \x01(\t\"_\n\x0e\x44\x65viceAnnounce\x12%\n\x07\x64\x65vices\x18\x01 \x03(\x0b\x32\x14.remoterf.DeviceInfo\x12\x0f\n\x07unix_ms\x18\x02 \x01(\x04\x12\x15\n\rfull_snapshot\x18\x03 \x01(\x08\"\xab\x01\n\nRpcRequest\x12\x0e\n\x06req_id\x18\x01 \x01(\t\x12\x18\n\x10global_device_id\x18\x02 \x01(\r\x12\x17\n\x0flocal_device_id\x18\x03 \x01(\r\x12\x11\n\tdevice_id\x18\x04 \x01(\t\x12-\n\x07request\x18\x05 \x01(\x0b\x32\x1c.remote_rf.GenericRPCRequest\x12\x18\n\x10\x64\x65\x61\x64line_unix_ms\x18\x06 \x01(\x04\"i\n\x0bRpcResponse\x12\x0e\n\x06req_id\x18\x01 \x01(\t\x12\n\n\x02ok\x18\x02 \x01(\x08\x12/\n\x08response\x18\x03 \x01(\x0b\x32\x1d.remote_rf.GenericRPCResponse\x12\r\n\x05\x65rror\x18\x04 \x01(\t\"\x1c\n\tHeartbeat\x12\x0f\n\x07unix_ms\x18\x01 \x01(\x04\"\x18\n\x06\x43\x61ncel\x12\x0e\n\x06req_id\x18\x01 \x01(\t\"\x97\x02\n\tHostFrame\x12$\n\x05hello\x18\x01 \x01(\x0b\x32\x13.remoterf.HostHelloH\x00\x12\x33\n\x0f\x64\x65vice_announce\x18\x02 \x01(\x0b\x32\x18.remoterf.DeviceAnnounceH\x00\x12+\n\x0brpc_request\x18\x03 \x01(\x0b\x32\x14.remoterf.RpcRequestH\x00\x12-\n\x0crpc_response\x18\x04 \x01(\x0b\x32\x15.remoterf.RpcResponseH\x00\x12(\n\theartbeat\x18\x05 \x01(\x0b\x32\x13.remoterf.HeartbeatH\x00\x12\"\n\x06\x63\x61ncel\x18\x06 \x01(\x0b\x32\x10.remoterf.CancelH\x00\x42\x05\n\x03msg2E\n\nHostTunnel\x12\x37\n\x07\x43onnect\x12\x13.remoterf.HostFrame\x1a\x13.remoterf.HostFrame(\x01\x30\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0fgrpc_host.proto\x12\x08remoterf\x1a\ngrpc.proto\"-\n\tHostHello\x12\x0f\n\x07host_id\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\"^\n\nDeviceInfo\x12\x10\n\x08local_id\x18\x01 \x01(\r\x12\r\n\x05label\x18\x02 \x01(\t\x12\x11\n\tdevice_id\x18\x03 \x01(\t\x12\x0e\n\x06serial\x18\x04 \x01(\t\x12\x0c\n\x04kind\x18\x05 \x01(\t\"_\n\x0e\x44\x65viceAnnounce\x12%\n\x07\x64\x65vices\x18\x01 \x03(\x0b\x32\x14.remoterf.DeviceInfo\x12\x0f\n\x07unix_ms\x18\x02 \x01(\x04\x12\x15\n\rfull_snapshot\x18\x03 \x01(\x08\"\xab\x01\n\nRpcRequest\x12\x0e\n\x06req_id\x18\x01 \x01(\t\x12\x18\n\x10global_device_id\x18\x02 \x01(\r\x12\x17\n\x0flocal_device_id\x18\x03 \x01(\r\x12\x11\n\tdevice_id\x18\x04 \x01(\t\x12-\n\x07request\x18\x05 \x01(\x0b\x32\x1c.remote_rf.GenericRPCRequest\x12\x18\n\x10\x64\x65\x61\x64line_unix_ms\x18\x06 \x01(\x04\"i\n\x0bRpcResponse\x12\x0e\n\x06req_id\x18\x01 \x01(\t\x12\n\n\x02ok\x18\x02 \x01(\x08\x12/\n\x08response\x18\x03 \x01(\x0b\x32\x1d.remote_rf.GenericRPCResponse\x12\r\n\x05\x65rror\x18\x04 \x01(\t\"\x1c\n\tHeartbeat\x12\x0f\n\x07unix_ms\x18\x01 \x01(\x04\"\x18\n\x06\x43\x61ncel\x12\x0e\n\x06req_id\x18\x01 \x01(\t\"e\n\x0bMetaRequest\x12\x0e\n\x06req_id\x18\x01 \x01(\t\x12\x18\n\x10include_platform\x18\x02 \x01(\x08\x12\x13\n\x0binclude_env\x18\x03 \x01(\x08\x12\x17\n\x0finclude_devices\x18\x04 \x01(\x08\"\xb7\x01\n\x08HostMeta\x12\x0f\n\x07host_id\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\x12\x0f\n\x07unix_ms\x18\x03 \x01(\x04\x12&\n\x02kv\x18\x04 \x03(\x0b\x32\x1a.remoterf.HostMeta.KvEntry\x12%\n\x07\x64\x65vices\x18\x05 \x03(\x0b\x32\x14.remoterf.DeviceInfo\x1a)\n\x07KvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"[\n\x0cMetaResponse\x12\x0e\n\x06req_id\x18\x01 \x01(\t\x12\n\n\x02ok\x18\x02 \x01(\x08\x12\r\n\x05\x65rror\x18\x03 \x01(\t\x12 \n\x04meta\x18\x04 \x01(\x0b\x32\x12.remoterf.HostMeta\"\xf7\x02\n\tHostFrame\x12$\n\x05hello\x18\x01 \x01(\x0b\x32\x13.remoterf.HostHelloH\x00\x12\x33\n\x0f\x64\x65vice_announce\x18\x02 \x01(\x0b\x32\x18.remoterf.DeviceAnnounceH\x00\x12+\n\x0brpc_request\x18\x03 \x01(\x0b\x32\x14.remoterf.RpcRequestH\x00\x12-\n\x0crpc_response\x18\x04 \x01(\x0b\x32\x15.remoterf.RpcResponseH\x00\x12(\n\theartbeat\x18\x05 \x01(\x0b\x32\x13.remoterf.HeartbeatH\x00\x12\"\n\x06\x63\x61ncel\x18\x06 \x01(\x0b\x32\x10.remoterf.CancelH\x00\x12-\n\x0cmeta_request\x18\x07 \x01(\x0b\x32\x15.remoterf.MetaRequestH\x00\x12/\n\rmeta_response\x18\x08 \x01(\x0b\x32\x16.remoterf.MetaResponseH\x00\x42\x05\n\x03msg2E\n\nHostTunnel\x12\x37\n\x07\x43onnect\x12\x13.remoterf.HostFrame\x1a\x13.remoterf.HostFrame(\x01\x30\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'grpc_host_pb2', _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
   DESCRIPTOR._loaded_options = None
+  _globals['_HOSTMETA_KVENTRY']._loaded_options = None
+  _globals['_HOSTMETA_KVENTRY']._serialized_options = b'8\001'
   _globals['_HOSTHELLO']._serialized_start=41
   _globals['_HOSTHELLO']._serialized_end=86
   _globals['_DEVICEINFO']._serialized_start=88
@@ -46,8 +48,16 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_HEARTBEAT']._serialized_end=590
   _globals['_CANCEL']._serialized_start=592
   _globals['_CANCEL']._serialized_end=616
-  _globals['_HOSTFRAME']._serialized_start=619
-  _globals['_HOSTFRAME']._serialized_end=898
-  _globals['_HOSTTUNNEL']._serialized_start=900
-  _globals['_HOSTTUNNEL']._serialized_end=969
+  _globals['_METAREQUEST']._serialized_start=618
+  _globals['_METAREQUEST']._serialized_end=719
+  _globals['_HOSTMETA']._serialized_start=722
+  _globals['_HOSTMETA']._serialized_end=905
+  _globals['_HOSTMETA_KVENTRY']._serialized_start=864
+  _globals['_HOSTMETA_KVENTRY']._serialized_end=905
+  _globals['_METARESPONSE']._serialized_start=907
+  _globals['_METARESPONSE']._serialized_end=998
+  _globals['_HOSTFRAME']._serialized_start=1001
+  _globals['_HOSTFRAME']._serialized_end=1376
+  _globals['_HOSTTUNNEL']._serialized_start=1378
+  _globals['_HOSTTUNNEL']._serialized_end=1447
 # @@protoc_insertion_point(module_scope)

{remoterf_server-0.1.71 → remoterf_server-0.1.73}/src/remoteRF_server/common/grpc/grpc_host_pb2_grpc.py

@@ -5,7 +5,7 @@ import warnings
 
 from . import grpc_host_pb2 as grpc__host__pb2
 
-GRPC_GENERATED_VERSION = '1.78.0'
+GRPC_GENERATED_VERSION = '1.78.1'
 GRPC_VERSION = grpc.__version__
 _version_not_supported = False
 

{remoterf_server-0.1.71 → remoterf_server-0.1.73}/src/remoteRF_server/host/host_tunnel_server.py

@@ -51,6 +51,31 @@ LOG_MODE = "OFF"  # <-- change this
 
 _LOG_LOCK = threading.Lock()
 
+HOST_ID_RE = re.compile(r"^[A-Za-z0-9_.-]{1,64}$")  # adjust if you want
+
+class HostIdConflictError(RuntimeError):
+    def __init__(self, host_id: str, *, age_ms: int, replace_after_ms: int) -> None:
+        super().__init__(
+            f"host_id '{host_id}' already in use (last heartbeat {age_ms}ms ago). "
+            f"Try again after {replace_after_ms}ms or fix the conflicting host config."
+        )
+        self.host_id = host_id
+        self.age_ms = age_ms
+        self.replace_after_ms = replace_after_ms
+
+def _validate_host_id(raw: str) -> str:
+    hid = (raw or "").strip()
+    if not hid:
+        raise ValueError("Missing host_id (set HOST_ID in host.env; do not auto-generate).")
+    if hid == "unknown-host":
+        raise ValueError("host_id cannot be 'unknown-host' (set HOST_ID in host.env).")
+    if not HOST_ID_RE.fullmatch(hid):
+        raise ValueError(
+            "Invalid host_id. Allowed: 1..64 chars of [A-Za-z0-9_.-]. "
+            f"Got: {hid!r}"
+        )
+    return hid
+
 def _ts() -> str:
     t = time.time()
     sec = int(t)
@@ -387,12 +412,25 @@ class HostTunnelRegistry:
     # directory/status mutators
     # ---------------------------
 
-    def register_host(self, host_id: str, session: HostSession) -> None:
+    def register_host(
+        self,
+        host_id: str,
+        session: HostSession,
+        *,
+        replace_if_stale_ms: int = 15_000,  # tweak: how long without heartbeat before we allow replacement
+    ) -> None:
         info(f"[registry] register_host: host_id={host_id!r}")
+
         with self._lock:
             old = self._hosts.get(host_id)
-            if old is not None:
-                warn(f"[registry] register_host: replacing existing session host_id={host_id!r}")
+            if old is not None and old.alive:
+                age_ms = int(now_ms() - int(getattr(old, "last_heartbeat_ms", 0) or 0))
+                if age_ms < replace_if_stale_ms:
+                    # conflict: someone else is already using this host_id
+                    raise HostIdConflictError(host_id, age_ms=age_ms, replace_after_ms=replace_if_stale_ms)
+
+                # stale: allow replacement
+                warn(f"[registry] register_host: replacing STALE session host_id={host_id!r} age_ms={age_ms}")
                 old.close()
 
             self._hosts[host_id] = session
@@ -823,7 +861,28 @@ class HostTunnelServicer(host_tunnel_pb2_grpc.HostTunnelServicer):
 
                     if which == "hello":
                         hello = frame.hello
-                        host_id = str(getattr(hello, "host_id", "")).strip() or "unknown-host"
+                        raw = str(getattr(hello, "host_id", "") or "")
+                        try:
+                            host_id = _validate_host_id(raw)
+                        except ValueError as e:
+                            error(f"[inbound] invalid hello.host_id peer={peer} err={e}")
+                            fatal["code"] = "INVALID_ARGUMENT"
+                            fatal["details"] = str(e)
+                            stop.set()
+                            return
+
+                        ver = str(getattr(hello, "version", "") or "")
+                        info(f"[inbound] HELLO host_id={host_id!r} version={ver!r} peer={peer}")
+
+                        session = HostSession(host_id)
+                        try:
+                            self.registry.register_host(host_id, session, replace_if_stale_ms=15_000)
+                        except HostIdConflictError as e:
+                            error(f"[inbound] HostIdConflictError host_id={host_id!r} err={e}")
+                            fatal["code"] = "ALREADY_EXISTS"
+                            fatal["details"] = str(e)
+                            stop.set()
+                            return
                         ver = str(getattr(hello, "version", "") or "")
                         info(f"[inbound] HELLO host_id={host_id!r} version={ver!r} peer={peer}")
 
@@ -976,6 +1035,8 @@ class HostTunnelServicer(host_tunnel_pb2_grpc.HostTunnelServicer):
                 error(f"[Connect] aborting stream peer={peer} code={code} details={details}")
                 if code == "ALREADY_EXISTS":
                     context.abort(grpc.StatusCode.ALREADY_EXISTS, details)
+                if code == "INVALID_ARGUMENT":
+                    context.abort(grpc.StatusCode.INVALID_ARGUMENT, details)
                 context.abort(grpc.StatusCode.UNKNOWN, details)
 
             if session is None:

{remoterf_server-0.1.71 → remoterf_server-0.1.73}/src/remoteRF_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 0.1.71
+Version: 0.1.73
 Description-Content-Type: text/markdown
 Requires-Dist: grpcio
 Requires-Dist: protobuf
@@ -346,7 +346,9 @@ todo:
 <!-- Testing functionality (disregarding Host pipeline) -->
 <!-- Clean up serverrf CLI + basic documentation for all commands, usergroups, export codes by CSV. -->
 
-HostRF meta data -> push upon connection + retry connection on host side.
+<!-- HostRF meta data -> push upon connection + retry connection on host side. -->
+
+Host ID (NEEDS TO BE UNIQUE AND TELL THE HOST THAT) (or if device also does it as well.)
 
 ServerRF display meta data as part of devices list / reservation + online/activity status (appended into device name) + (plus host side warning if the device id is NOT globally unique!)