@scp-dev/hub 0.5.0 → 0.5.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _scp_dev_core from '@scp-dev/core';
-import { Envelope, RelayCore, CoreOptions, EndpointRow, PolicySubject, ScopeSubject, ScopeNode, ScopeDirection, Admission, MessageRow, EndpointView, ScopeCap, ScopeEntry, Claim, SendParams, SendResult, EndpointKind, Presence, StatusState, Verdict, JudgeModelConfig, JudgeClient, Sql, JudgePolicy, Wake, CrossAccountLink, XDelivered, XListed, ActivityRow, XRelease } from '@scp-dev/core';
+import { Envelope, RelayCore, CoreOptions, EndpointRow, EndpointView, PolicySubject, ScopeSubject, ScopeNode, ScopeDirection, Admission, MessageRow, ScopeCap, ScopeEntry, Claim, SendParams, SendResult, EndpointKind, Presence, StatusState, Verdict, JudgeModelConfig, JudgeClient, Sql, JudgePolicy, Wake, CrossAccountLink, XDelivered, XListed, ActivityRow, XRelease } from '@scp-dev/core';
 
 type RelayAuth = Envelope["from"]["auth"];
 /** a machine name: one relay host of an account */
@@ -162,6 +162,8 @@ declare class FederatedCore extends RelayCore {
     protected resolve(address: unknown): EndpointRow;
     protected addressUsers(): string[];
     protected localRow(row: EndpointRow): boolean;
+    /** a live mirrored row shows the presence its machine mirrored, not one its last_seen decays to here */
+    protected view(row: EndpointRow, shown?: Set<string>): EndpointView;
     protected address(row: EndpointRow): string;
     protected subject(row: EndpointRow): PolicySubject;
     /** a stand-in for another account's sender is no endpoint of this relay: list, peers and snapshots leave it out */

package/dist/index.js

@@ -90,6 +90,7 @@ var FederatedCore = class extends RelayCore {
     if (!columns.includes("incarnation")) this.sql.all(`ALTER TABLE endpoints ADD COLUMN incarnation TEXT`);
     if (!columns.includes("scope_epoch")) this.sql.all(`ALTER TABLE endpoints ADD COLUMN scope_epoch INTEGER`);
     if (!columns.includes("mirrored_caps")) this.sql.all(`ALTER TABLE endpoints ADD COLUMN mirrored_caps TEXT`);
+    if (!columns.includes("mirrored_presence")) this.sql.all(`ALTER TABLE endpoints ADD COLUMN mirrored_presence TEXT`);
     this.sql.all(`CREATE UNIQUE INDEX IF NOT EXISTS endpoints_remote ON endpoints (remote) WHERE remote IS NOT NULL`);
     if (this.xinbox) for (const statement of XACCT_MIGRATION) this.sql.all(statement);
   }
@@ -222,6 +223,12 @@ var FederatedCore = class extends RelayCore {
   localRow(row) {
     return !row.remote;
   }
+  /** a live mirrored row shows the presence its machine mirrored, not one its last_seen decays to here */
+  view(row, shown) {
+    const view = super.view(row, shown);
+    const { remote, mirrored_presence: mirrored } = row;
+    return remote && row.connections > 0 && (mirrored === "online" || mirrored === "idle") ? { ...view, presence: mirrored } : view;
+  }
   address(row) {
     const remote = row.remote;
     if (remote && isForeign(remote)) return remote.slice(1);
@@ -391,6 +398,7 @@ var FederatedCore = class extends RelayCore {
           status_note: view.status?.note ?? null,
           token_hash: null,
           connections: live ? 1 : 0,
+          mirrored_presence: view.presence,
           last_seen: view.lastSeen ?? (live ? now : before?.last_seen ?? null),
           auth: auth ?? row.auth,
           ...view.kind === "agent" ? this.scopeColumns(machine, view.scope, row, place(view.handle)) : {}
@@ -3468,7 +3476,7 @@ var RelayHub = class _RelayHub {
       return count;
     });
     this.stored = null;
-    this.toBridges(name, { machine: name, endpoints: [], full: true });
+    this.toBridges(name, { machine: name, endpoints: [], full: true, released: true });
     this.dash({ type: "endpoints", at: new Date(this.now()).toISOString(), machine: name });
     this.deps.log?.("relay_action", { account: this.account, machine: name, method: "machine_release", code: "ok" });
     return { removed: name, endpoints: dropped };
@@ -3505,7 +3513,7 @@ var RelayHub = class _RelayHub {
         core.record("machine_expire", null, name, { machine: name, endpoints: count });
         return count;
       });
-      this.toBridges(name, { machine: name, endpoints: [], full: true });
+      this.toBridges(name, { machine: name, endpoints: [], full: true, released: true });
       this.deps.log?.("relay_action", { account: this.account, machine: name, method: "machine_expire", code: "ok", endpoints: dropped });
     }
   }
@@ -3523,7 +3531,7 @@ var RelayHub = class _RelayHub {
       for (const name of unbound) this.relay.record("machine_forget", null, name, { machine: name, endpoints: this.relay.dropMachine(name, { queue: true }) });
       return unbound;
     });
-    for (const name of forgotten) this.toBridges(name, { machine: name, endpoints: [], full: true });
+    for (const name of forgotten) this.toBridges(name, { machine: name, endpoints: [], full: true, released: true });
   }
   /** the hub_state keys (`denied:<tokenId>`) of tokens revoked lately, to when; loaded once per object lifetime */
   deniedGrants() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scp-dev/hub",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Swarm Communication Protocol federation and account hub: mirrored endpoints across machines, bridges, direct clients and cross-account delivery.",
   "license": "Apache-2.0",
   "homepage": "https://scp.dev",
@@ -29,7 +29,7 @@
     "typecheck": "tsc -p ."
   },
   "dependencies": {
-    "@scp-dev/core": "0.1.5"
+    "@scp-dev/core": "0.1.6"
   },
   "devDependencies": {
     "tsup": "^8.5.1"

package/src/federation.ts

@@ -82,6 +82,8 @@ interface FederatedRow extends EndpointRow {
   scope_epoch: number | null
   /** this machine's own agent: the wire caps it mirrored last */
   mirrored_caps: string | null
+  /** another machine's row: the presence its bridge mirrored last */
+  mirrored_presence: Presence | null
 }
 
 /** own rules as they cross machines: selector lists per direction */
@@ -290,6 +292,7 @@ export class FederatedCore extends RelayCore {
     if (!columns.includes("incarnation")) this.sql.all(`ALTER TABLE endpoints ADD COLUMN incarnation TEXT`)
     if (!columns.includes("scope_epoch")) this.sql.all(`ALTER TABLE endpoints ADD COLUMN scope_epoch INTEGER`)
     if (!columns.includes("mirrored_caps")) this.sql.all(`ALTER TABLE endpoints ADD COLUMN mirrored_caps TEXT`)
+    if (!columns.includes("mirrored_presence")) this.sql.all(`ALTER TABLE endpoints ADD COLUMN mirrored_presence TEXT`)
     this.sql.all(`CREATE UNIQUE INDEX IF NOT EXISTS endpoints_remote ON endpoints (remote) WHERE remote IS NOT NULL`)
     if (this.xinbox) for (const statement of XACCT_MIGRATION) this.sql.all(statement)
   }
@@ -446,6 +449,13 @@ export class FederatedCore extends RelayCore {
     return !(row as FederatedRow).remote
   }
 
+  /** a live mirrored row shows the presence its machine mirrored, not one its last_seen decays to here */
+  protected override view(row: EndpointRow, shown?: Set<string>): EndpointView {
+    const view = super.view(row, shown)
+    const { remote, mirrored_presence: mirrored } = row as FederatedRow
+    return remote && row.connections > 0 && (mirrored === "online" || mirrored === "idle") ? { ...view, presence: mirrored } : view
+  }
+
   protected override address(row: EndpointRow): string {
     const remote = (row as FederatedRow).remote
     if (remote && isForeign(remote)) return remote.slice(1)
@@ -625,6 +635,7 @@ export class FederatedCore extends RelayCore {
           status_note: view.status?.note ?? null,
           token_hash: null,
           connections: live ? 1 : 0,
+          mirrored_presence: view.presence,
           last_seen: view.lastSeen ?? (live ? now : (before?.last_seen ?? null)),
           auth: auth ?? row.auth,
           ...(view.kind === "agent" ? this.scopeColumns(machine, view.scope, row, place(view.handle)) : {}),

package/src/hub.ts

@@ -1774,7 +1774,7 @@ export class RelayHub {
       return count
     })
     this.stored = null
-    this.toBridges(name, { machine: name, endpoints: [], full: true })
+    this.toBridges(name, { machine: name, endpoints: [], full: true, released: true })
     this.dash({ type: "endpoints", at: new Date(this.now()).toISOString(), machine: name })
     this.deps.log?.("relay_action", { account: this.account, machine: name, method: "machine_release", code: "ok" })
     return { removed: name, endpoints: dropped }
@@ -1812,7 +1812,7 @@ export class RelayHub {
         core.record("machine_expire", null, name, { machine: name, endpoints: count })
         return count
       })
-      this.toBridges(name, { machine: name, endpoints: [], full: true })
+      this.toBridges(name, { machine: name, endpoints: [], full: true, released: true })
       this.deps.log?.("relay_action", { account: this.account, machine: name, method: "machine_expire", code: "ok", endpoints: dropped })
     }
   }
@@ -1831,7 +1831,7 @@ export class RelayHub {
       for (const name of unbound) this.relay.record("machine_forget", null, name, { machine: name, endpoints: this.relay.dropMachine(name, { queue: true }) })
       return unbound
     })
-    for (const name of forgotten) this.toBridges(name, { machine: name, endpoints: [], full: true })
+    for (const name of forgotten) this.toBridges(name, { machine: name, endpoints: [], full: true, released: true })
   }
 
   /** the hub_state keys (`denied:<tokenId>`) of tokens revoked lately, to when; loaded once per object lifetime */