@le-space/rootfs 0.6.29 → 0.6.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@le-space/rootfs",
-  "version": "0.6.29",
+  "version": "0.6.31",
   "description": "Shared rootfs contract parsing, reference profile assets, and build helpers.",
   "license": "MIT",
   "type": "module",

package/reference/orbitdb-relay/rootfs/build-rootfs-image.sh

@@ -243,6 +243,7 @@ case "${ROOTFS_PROFILE}" in
       --copy-in "${SCRIPT_DIR}/orbitdb-relay-bootstrap.service:/etc/systemd/system"
       --copy-in "${SCRIPT_DIR}/orbitdb-relay-bootstrap-refresh.service:/etc/systemd/system"
       --copy-in "${SCRIPT_DIR}/orbitdb-relay-bootstrap-refresh.timer:/etc/systemd/system"
+      --copy-in "${SCRIPT_DIR}/orbitdb-relay-bootstrap-deregister.service:/etc/systemd/system"
       --copy-in "${SCRIPT_DIR}/orbitdb-relay-autotls-refresh.service:/etc/systemd/system"
       --copy-in "${SCRIPT_DIR}/orbitdb-relay-bootstrap.conf:/etc/systemd/system/orbitdb-relay.service.d"
       --run-command "tar -xf /opt/$(basename "${APP_TAR}") -C /opt/orbitdb-relay"

package/reference/orbitdb-relay/rootfs/orbitdb-relay-bootstrap-deregister.service

@@ -0,0 +1,20 @@
+[Unit]
+Description=Best-effort Aleph bootstrap deregistration on shutdown for orbitdb-relay
+After=network-online.target orbitdb-relay.service
+Wants=network-online.target
+ConditionPathExists=/etc/default/orbitdb-relay.ready
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+Environment=ENV_FILE=/etc/default/orbitdb-relay
+Environment=DESCRIBE_SCRIPT=/usr/local/sbin/orbitdb-relay-describe.py
+Environment=ALEPH_BOOTSTRAP_DEREGISTER_ONLY=1
+ExecStart=/bin/true
+ExecStop=/usr/bin/python3 /usr/local/sbin/orbitdb-relay-bootstrap-refresh.py
+StandardOutput=journal
+StandardError=journal
+TimeoutStopSec=25
+
+[Install]
+WantedBy=multi-user.target

package/reference/orbitdb-relay/rootfs/orbitdb-relay-bootstrap-refresh.py

@@ -476,6 +476,7 @@ def fetch_previous_hashes(
     sender: str,
     current_item_hash: str,
     now_ms: int,
+    deregister_all: bool = False,
 ) -> list[str]:
     stale_cutoff_ms = now_ms - (STALE_RECORD_MAX_AGE_SECONDS * 1000)
     normalized_sender = normalize_address(sender)
@@ -503,7 +504,10 @@ def fetch_previous_hashes(
             }
             if not same_publisher:
                 continue
-            if parsed["item_hash"] == current_item_hash:
+            if not deregister_all and parsed["item_hash"] == current_item_hash:
+                continue
+            if deregister_all:
+                found.append(str(parsed["item_hash"]))
                 continue
             updated_at = timestamp_ms(parsed["updated_at"])
             if updated_at is not None and updated_at < stale_cutoff_ms:
@@ -556,6 +560,49 @@ def main() -> None:
         print(json_dumps({"status": "skipped", "reason": "missing publisher key"}))
         return
 
+    publisher_address = address_from_private_key(publisher_private_key)
+    now_ms = int(time.time() * 1000)
+    channel = env_values.get("ALEPH_BOOTSTRAP_CHANNEL", DEFAULT_CHANNEL).strip() or DEFAULT_CHANNEL
+    ref = env_values.get("ALEPH_BOOTSTRAP_REF", DEFAULT_REF).strip() or DEFAULT_REF
+    post_type = env_values.get("ALEPH_BOOTSTRAP_POST_TYPE", POST_TYPE).strip() or POST_TYPE
+    if post_type != POST_TYPE:
+        raise RuntimeError(
+            f"Unsupported ALEPH_BOOTSTRAP_POST_TYPE: {post_type}. Expected {POST_TYPE}."
+        )
+    api_host = env_values.get("ALEPH_BOOTSTRAP_API_HOST", DEFAULT_API_HOST).strip() or DEFAULT_API_HOST
+    deregister_only = os.environ.get("ALEPH_BOOTSTRAP_DEREGISTER_ONLY", "").strip().lower() in {
+        "1",
+        "true",
+        "yes",
+    }
+    if deregister_only:
+        hashes = fetch_previous_hashes(
+            api_host,
+            channel,
+            ref,
+            post_type,
+            publisher_address,
+            "",
+            now_ms,
+            deregister_all=True,
+        )
+        forget_response = broadcast_forget(
+            api_host, publisher_address, publisher_private_key, hashes, channel
+        )
+        print(
+            json_dumps(
+                {
+                    "status": "forgotten" if hashes else "skipped",
+                    "reason": None if hashes else "no matching bootstrap records",
+                    "sender": publisher_address,
+                    "registrationId": registration_id,
+                    "forgottenHashes": hashes,
+                    "forgetResponse": forget_response,
+                }
+            )
+        )
+        return
+
     describe = subprocess.run([DESCRIBE_SCRIPT], check=True, capture_output=True, text=True)
     metadata = json.loads(describe.stdout.strip() or "{}")
     peer_id = metadata.get("peer_id")
@@ -567,19 +614,9 @@ def main() -> None:
         metadata.get("browser_bootstrap_multiaddrs") or [], browser_only=True
     )
 
-    publisher_address = address_from_private_key(publisher_private_key)
-    now_ms = int(time.time() * 1000)
     now_seconds = now_ms / 1000
     profile = env_values.get("ALEPH_BOOTSTRAP_PROFILE", DEFAULT_PROFILE).strip() or DEFAULT_PROFILE
     version = env_values.get("ALEPH_BOOTSTRAP_VERSION", "").strip() or None
-    channel = env_values.get("ALEPH_BOOTSTRAP_CHANNEL", DEFAULT_CHANNEL).strip() or DEFAULT_CHANNEL
-    ref = env_values.get("ALEPH_BOOTSTRAP_REF", DEFAULT_REF).strip() or DEFAULT_REF
-    post_type = env_values.get("ALEPH_BOOTSTRAP_POST_TYPE", POST_TYPE).strip() or POST_TYPE
-    if post_type != POST_TYPE:
-        raise RuntimeError(
-            f"Unsupported ALEPH_BOOTSTRAP_POST_TYPE: {post_type}. Expected {POST_TYPE}."
-        )
-    api_host = env_values.get("ALEPH_BOOTSTRAP_API_HOST", DEFAULT_API_HOST).strip() or DEFAULT_API_HOST
     published_multiaddrs = select_compact_multiaddrs(browser_multiaddrs or multiaddrs)
     published_browser_multiaddrs: list[str] = []
     if not published_multiaddrs:

package/reference/orbitdb-relay/rootfs/orbitdb-relay-configure.sh

@@ -15,6 +15,8 @@ CADDY_UPSTREAM_HOST="${CADDY_UPSTREAM_HOST:-127.0.0.1}"
 CADDY_UPSTREAM_METRICS_PORT="${CADDY_UPSTREAM_METRICS_PORT:-9090}"
 AUTOTLS_REFRESH_SERVICE="${AUTOTLS_REFRESH_SERVICE:-orbitdb-relay-autotls-refresh.service}"
 BOOTSTRAP_REFRESH_TIMER="${BOOTSTRAP_REFRESH_TIMER:-orbitdb-relay-bootstrap-refresh.timer}"
+BOOTSTRAP_REFRESH_SERVICE="${BOOTSTRAP_REFRESH_SERVICE:-orbitdb-relay-bootstrap-refresh.service}"
+BOOTSTRAP_DEREGISTER_SERVICE="${BOOTSTRAP_DEREGISTER_SERVICE:-orbitdb-relay-bootstrap-deregister.service}"
 PUBLIC_IPV4=""
 PUBLIC_IPV6=""
 TCP_PORT=""
@@ -278,7 +280,10 @@ if [ "${START_SERVICE}" -eq 1 ]; then
   systemctl restart "${SERVICE_NAME}"
   systemctl enable "${AUTOTLS_REFRESH_SERVICE}"
   systemctl enable "${BOOTSTRAP_REFRESH_TIMER}"
+  systemctl enable "${BOOTSTRAP_DEREGISTER_SERVICE}"
+  systemctl restart "${BOOTSTRAP_DEREGISTER_SERVICE}"
   systemctl start "${BOOTSTRAP_REFRESH_TIMER}"
+  systemctl restart --no-block "${BOOTSTRAP_REFRESH_SERVICE}" || true
   if [ -n "${PROXY_HOSTNAME}" ]; then
     write_caddyfile "${PROXY_HOSTNAME}"
     touch "${CADDY_READY_FILE}"

package/reference/uc-go-peer/rootfs/uc-go-peer-bootstrap-deregister.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=Best-effort Aleph bootstrap deregistration on shutdown for uc-go-peer
-After=network-online.target
+After=network-online.target uc-go-peer.service
 Wants=network-online.target
 ConditionPathExists=/etc/default/uc-go-peer.ready