remoteRF-server 1.7.3__tar.gz → 1.7.4__tar.gz

{remoterf_server-1.7.3 → remoterf_server-1.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.7.3
+Version: 1.7.4
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3

{remoterf_server-1.7.3 → remoterf_server-1.7.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server"
-version = "1.7.3"
+version = "1.7.4"
 description = "RemoteRF server-side control package"
 license = { text = "GPL-3.0-or-later" }
 requires-python = ">=3.10"

{remoterf_server-1.7.3 → remoterf_server-1.7.4}/src/remoteRF_server/server/federation/cluster.py

@@ -1303,13 +1303,22 @@ def _walk_in(pools: list[dict], notify) -> None:
     active. Any other open door (an older lab's own) is ignored."""
     from . import global_home
 
-    if GLOBAL in load():
-        return
     state = global_home.load()
     home = (state.get("identity") or {}).get("deployment_id")
     party = state.get("party") or {}
+    clusters = load()
+    if GLOBAL in clusters and (clusters[GLOBAL].get("peer") == home or not home):
+        return
     if not home or party.get("state") != "active":
         return
+    if GLOBAL in clusters:
+        # Joined under an earlier Global home (this lab's state outlived a Global
+        # reset): drop it and rejoin the current one, keeping what it shared.
+        stale = clusters.pop(GLOBAL)
+        queued = state.setdefault("public_groups", [])
+        queued += [group_id for group_id in stale.get("groups", []) if group_id not in queued]
+        save(clusters)
+        global_home.save(state)
     for pool in pools:
         owner = (pool.get("owner") or {}).get("identity") or {}
         if pool.get("cluster_name") != GLOBAL or owner.get("deployment_id") != home:

{remoterf_server-1.7.3 → remoterf_server-1.7.4}/src/remoteRF_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.7.3
+Version: 1.7.4
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3

{remoterf_server-1.7.3 → remoterf_server-1.7.4}/tests/test_global_home.py

@@ -81,6 +81,21 @@ class GlobalHomeContractTests(unittest.TestCase):
         self.assertEqual([c["contract_id"] for c in self.broker.call("GET", "/v2/broker/contracts")["contracts"]],
                          [party["contract_id"]])
 
+    def test_a_global_cluster_joined_under_an_earlier_home_is_rejoined_with_its_groups(self):
+        with self.server(H):
+            home_identity = cluster._identity()
+            cluster._public_note(cluster.GLOBAL, "open")
+        self._standing(B, home_identity)
+        with self.server(B):
+            # State from before a Global reset: the cluster names a home that is gone.
+            cluster.save({cluster.GLOBAL: {"role": "member", "state": "active", "public": True, "peer": C,
+                                           "contract_id": "8a2e3f10-0000-4000-8000-0000000000ff",
+                                           "published": [], "groups": [7]}})
+            cluster.tick(self.notes.append)
+            item = cluster.load()[cluster.GLOBAL]
+            self.assertEqual((item["peer"], item["contract_id"], item["groups"]), (H, global_home.contract_id(), [7]))
+            self.assertNotIn("public_groups", global_home.load())
+
     def _standing(self, lab, home_identity):
         """The lab proposes its standing contract; the home accepts; the lab sees it active."""
         with self.server(lab), mock.patch.object(global_home, "fetch_identity", return_value=home_identity):