@scp-dev/broker 0.1.1 → 0.1.2

package/dist/index.d.ts

@@ -222,6 +222,8 @@ interface Bridge {
     /** the endpoints of other accounts this account's contacts let it reach */
     contacts(): Promise<XListed[]>;
     status(): BridgeStatus;
+    /** reads the credential again and reconnects now, also after the hub revoked or replaced this bridge */
+    relink(): void;
     stop(): Promise<void>;
 }
 /** a WebSocket constructor that takes request headers, as Bun's and Node's do */
@@ -401,6 +403,8 @@ interface BrokerOptions {
     machine?: string | undefined;
     /** the link to the hub; without it the broker never opens a network connection */
     bridge?: BridgeConfig | undefined;
+    /** reads the bridge configuration again for bridge_relink; one that appeared or names another hub or machine restarts the broker */
+    bridgeConfig?: (() => Promise<BridgeConfig | undefined>) | undefined;
     /** how often presence that decays without a request (a hook-only endpoint) is checked for changes (default 60 s) */
     presenceEveryMs?: number | undefined;
     /** where a judge model's key_env is read (default the broker's environment) */

package/dist/index.js

@@ -563,6 +563,7 @@ function startBridge(options) {
   let connected = false;
   let ready = false;
   let stopped = false;
+  let shutDown = false;
   let lastError = options.token ? null : options.tokenError ?? "no hub credential; the broker runs local-only";
   let since = (/* @__PURE__ */ new Date()).toISOString();
   let attempt = 0;
@@ -603,7 +604,7 @@ function startBridge(options) {
     });
   }
   function connect() {
-    if (stopped || !token) return;
+    if (stopped || !token || ws) return;
     let socket;
     try {
       socket = new Socket(relaySocketUrl(options.url), { headers: { Authorization: `Bearer ${token}` } });
@@ -1009,8 +1010,19 @@ function startBridge(options) {
   function status() {
     return { enabled: true, machine, url: options.url, connected, last_error: lastError, since };
   }
+  function relink() {
+    if (shutDown) return;
+    stopped = false;
+    attempt = 0;
+    clearTimeout(retryTimer);
+    if (ws) return;
+    void reconnect().then(() => {
+      if (!token && !ws) setState(false, "no hub credential; log in again");
+    });
+  }
   async function stop() {
     stopped = true;
+    shutDown = true;
     clearTimeout(retryTimer);
     for (const fn of waitingForLink.splice(0)) fn();
     const socket = ws;
@@ -1022,7 +1034,7 @@ function startBridge(options) {
     if (socket && socket.readyState <= 1) socket.close(1e3, "the broker stopped");
   }
   connect();
-  return { forward, changed, resync, activity, contacts, status, stop };
+  return { forward, changed, resync, activity, contacts, status, relink, stop };
 }
 
 // src/server.ts
@@ -1577,7 +1589,7 @@ function openDatabase(path) {
 // src/server.ts
 var SWEEP_MS = 10 * 6e4;
 var PRESENCE_MS = 6e4;
-var OBSERVER_METHODS = /* @__PURE__ */ new Set(["list", "snapshot", "watch", "log", "policy", "policy_check", "cloud_status"]);
+var OBSERVER_METHODS = /* @__PURE__ */ new Set(["list", "snapshot", "watch", "log", "policy", "policy_check", "cloud_status", "bridge_relink"]);
 var SCOPE_METHODS = /* @__PURE__ */ new Set([
   "rules",
   "rules_set",
@@ -1734,6 +1746,15 @@ async function startBroker(options) {
       }
     });
   }
+  async function relink() {
+    const config = options.bridgeConfig ? await options.bridgeConfig() : options.bridge;
+    if (!config || bridge && config.url === options.bridge?.url && config.machine === options.bridge?.machine) {
+      bridge?.relink();
+      return bridge?.status() ?? { enabled: false };
+    }
+    setImmediate(() => void stop());
+    return { enabled: false, restarting: true };
+  }
   function activity() {
     if (idleTimer) clearTimeout(idleTimer);
     idleTimer = void 0;
@@ -2335,6 +2356,8 @@ async function startBroker(options) {
       }
       case "cloud_status":
         return bridge?.status() ?? { enabled: false };
+      case "bridge_relink":
+        return relink();
     }
     throw new RelayError4("method_not_found", `no method ${method}`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scp-dev/broker",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Swarm Communication Protocol local broker: a unix socket JSON-RPC daemon over the relay core, its client and the bridge to an account hub.",
   "license": "Apache-2.0",
   "homepage": "https://scp.dev",

package/src/bridge.ts

@@ -78,6 +78,8 @@ export interface Bridge {
   /** the endpoints of other accounts this account's contacts let it reach */
   contacts(): Promise<XListed[]>
   status(): BridgeStatus
+  /** reads the credential again and reconnects now, also after the hub revoked or replaced this bridge */
+  relink(): void
   stop(): Promise<void>
 }
 
@@ -132,7 +134,9 @@ export function startBridge(options: BridgeOptions): Bridge {
   let connected = false
   /** hello went through on the current socket: deltas may go out */
   let ready = false
+  /** the hub turned this bridge away, or the broker stopped it: no more retries until relink */
   let stopped = false
+  let shutDown = false
   let lastError: string | null = options.token ? null : (options.tokenError ?? "no hub credential; the broker runs local-only")
   let since = new Date().toISOString()
   let attempt = 0
@@ -177,7 +181,7 @@ export function startBridge(options: BridgeOptions): Bridge {
   }
 
   function connect() {
-    if (stopped || !token) return
+    if (stopped || !token || ws) return
     let socket: WebSocket
     try {
       socket = new Socket(relaySocketUrl(options.url), { headers: { Authorization: `Bearer ${token}` } })
@@ -624,8 +628,20 @@ export function startBridge(options: BridgeOptions): Bridge {
     return { enabled: true, machine, url: options.url, connected, last_error: lastError, since }
   }
 
+  function relink() {
+    if (shutDown) return
+    stopped = false
+    attempt = 0
+    clearTimeout(retryTimer)
+    if (ws) return
+    void reconnect().then(() => {
+      if (!token && !ws) setState(false, "no hub credential; log in again")
+    })
+  }
+
   async function stop() {
     stopped = true
+    shutDown = true
     clearTimeout(retryTimer)
     for (const fn of waitingForLink.splice(0)) fn()
     const socket = ws
@@ -638,5 +654,5 @@ export function startBridge(options: BridgeOptions): Bridge {
   }
 
   connect()
-  return { forward, changed, resync, activity, contacts, status, stop }
+  return { forward, changed, resync, activity, contacts, status, relink, stop }
 }

package/src/server.ts

@@ -57,6 +57,8 @@ export interface BrokerOptions {
   machine?: string | undefined
   /** the link to the hub; without it the broker never opens a network connection */
   bridge?: BridgeConfig | undefined
+  /** reads the bridge configuration again for bridge_relink; one that appeared or names another hub or machine restarts the broker */
+  bridgeConfig?: (() => Promise<BridgeConfig | undefined>) | undefined
   /** how often presence that decays without a request (a hook-only endpoint) is checked for changes (default 60 s) */
   presenceEveryMs?: number | undefined
   /** where a judge model's key_env is read (default the broker's environment) */
@@ -110,7 +112,7 @@ interface Connection {
 
 const SWEEP_MS = 10 * 60_000
 const PRESENCE_MS = 60_000
-const OBSERVER_METHODS = new Set(["list", "snapshot", "watch", "log", "policy", "policy_check", "cloud_status"])
+const OBSERVER_METHODS = new Set(["list", "snapshot", "watch", "log", "policy", "policy_check", "cloud_status", "bridge_relink"])
 const SCOPE_METHODS = new Set([
   "rules",
   "rules_set",
@@ -281,6 +283,17 @@ export async function startBroker(options: BrokerOptions): Promise<Broker> {
     })
   }
 
+  /** links the bridge again with the credential on disk; a configuration this broker cannot take without a restart stops it */
+  async function relink(): Promise<object> {
+    const config = options.bridgeConfig ? await options.bridgeConfig() : options.bridge
+    if (!config || (bridge && config.url === options.bridge?.url && config.machine === options.bridge?.machine)) {
+      bridge?.relink()
+      return bridge?.status() ?? { enabled: false }
+    }
+    setImmediate(() => void stop())
+    return { enabled: false, restarting: true }
+  }
+
   function activity() {
     if (idleTimer) clearTimeout(idleTimer)
     idleTimer = undefined
@@ -948,6 +961,8 @@ export async function startBroker(options: BrokerOptions): Promise<Broker> {
       }
       case "cloud_status":
         return bridge?.status() ?? { enabled: false }
+      case "bridge_relink":
+        return relink()
     }
     throw new RelayError("method_not_found", `no method ${method}`)
   }