@scp-dev/hub 0.3.0 → 0.3.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, CrossAccountLink, XDelivered, XListed, ActivityRow, XRelease } 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';
 
 type RelayAuth = Envelope["from"]["auth"];
 /** a machine name: one relay host of an account */
@@ -59,6 +59,8 @@ interface MirrorView extends MirrorScope {
     presence?: Presence;
     last_seen?: string | null;
     title?: string | null;
+    /** an agent's {@link Wake}; a value this hub does not know is kept as none */
+    wake?: string | null;
     /** the handle the endpoint had before a rename: its mirror is renamed in place */
     was?: string;
 }
@@ -567,7 +569,7 @@ interface GraphNode {
     status: EndpointView["status"];
     last_seen: string | null;
     parent: string | null;
-    wake?: string | null;
+    wake?: Wake | null;
 }
 /** `spawn`: parent to child; `message`: sender to recipient, with the count and newest send in the graph's window */
 type GraphEdge = {

package/dist/index.js

@@ -22,7 +22,8 @@ import {
   unreachable,
   validHandle,
   validHarness,
-  validSelector
+  validSelector,
+  WAKES
 } from "@scp-dev/core";
 var MACHINE_NAME = /^[a-z0-9][a-z0-9-]{0,31}$/;
 var REMOTE = /^[a-z0-9][a-z0-9._-]{0,63}\/([a-z0-9][a-z0-9._-]{0,62})?$/;
@@ -1283,7 +1284,7 @@ var FederatedCore = class extends RelayCore {
     const was = this.view(before);
     const presence = was.presence !== view.presence;
     const status = before.status_state !== after.status_state || before.status_note !== after.status_note;
-    const other = ["kind", "harness", "model", "cwd", "labels", "title", "tree", "parent_ep", "depth", "rules", "caps", "incarnation"].some(
+    const other = ["kind", "harness", "model", "cwd", "labels", "title", "wake", "tree", "parent_ep", "depth", "rules", "caps", "incarnation"].some(
       (field) => before[field] !== after[field]
     );
     return presence || status || other ? { view, added: false, presence, status } : null;
@@ -1351,6 +1352,7 @@ var FederatedCore = class extends RelayCore {
       rules: rules === void 0 ? row.rules : rules && (rules.in || rules.out) ? JSON.stringify(rules) : null,
       caps,
       title: scope.title !== void 0 ? scope.title : fresh ? null : row.title,
+      wake: scope.wake !== void 0 ? scope.wake : fresh ? null : row.wake,
       incarnation: scope.incarnation ?? row.incarnation
     };
   }
@@ -1504,6 +1506,7 @@ function parseScope(view) {
     throw new RelayError("too_large", `an endpoint's rules and caps are more than ${SCOPE_BYTES} bytes`);
   if (given("title"))
     out.title = view.title === null ? null : cleanText(typeof view.title === "string" ? view.title.replace(/\s+/g, " ") : view.title, "title", 64) || null;
+  if (given("wake")) out.wake = typeof view.wake === "string" && view.wake !== "none" && WAKES.includes(view.wake) ? view.wake : null;
   if (given("incarnation")) {
     if (view.incarnation !== null && (typeof view.incarnation !== "string" || !INCARNATION.test(view.incarnation))) throw bad("incarnation");
     out.incarnation = view.incarnation ?? null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scp-dev/hub",
-  "version": "0.3.0",
+  "version": "0.3.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.3"
+    "@scp-dev/core": "0.1.4"
   },
   "devDependencies": {
     "tsup": "^8.5.1"

package/src/federation.ts

@@ -43,6 +43,8 @@ import {
   validHandle,
   validHarness,
   validSelector,
+  type Wake,
+  WAKES,
 } from "@scp-dev/core"
 
 export type RelayAuth = Envelope["from"]["auth"]
@@ -121,6 +123,8 @@ export interface MirrorView extends MirrorScope {
   presence?: Presence
   last_seen?: string | null
   title?: string | null
+  /** an agent's {@link Wake}; a value this hub does not know is kept as none */
+  wake?: string | null
   /** the handle the endpoint had before a rename: its mirror is renamed in place */
   was?: string
 }
@@ -142,6 +146,7 @@ interface ParsedScope {
   rules?: MirrorRules | null
   caps?: ScopeCaps | null
   title?: string | null
+  wake?: Wake | null
   incarnation?: string | null
 }
 
@@ -1609,7 +1614,7 @@ export class FederatedCore extends RelayCore {
     const was = this.view(before)
     const presence = was.presence !== view.presence
     const status = before.status_state !== after.status_state || before.status_note !== after.status_note
-    const other = (["kind", "harness", "model", "cwd", "labels", "title", "tree", "parent_ep", "depth", "rules", "caps", "incarnation"] as const).some(
+    const other = (["kind", "harness", "model", "cwd", "labels", "title", "wake", "tree", "parent_ep", "depth", "rules", "caps", "incarnation"] as const).some(
       (field) => before[field] !== (after as FederatedRow)[field],
     )
     return presence || status || other ? { view, added: false, presence, status } : null
@@ -1682,6 +1687,7 @@ export class FederatedCore extends RelayCore {
       rules: rules === undefined ? row.rules : rules && (rules.in || rules.out) ? JSON.stringify(rules) : null,
       caps,
       title: scope.title !== undefined ? scope.title : fresh ? null : row.title,
+      wake: scope.wake !== undefined ? scope.wake : fresh ? null : row.wake,
       incarnation: scope.incarnation ?? row.incarnation,
     }
   }
@@ -1860,6 +1866,7 @@ function parseScope(view: Partial<MirrorView>): ParsedScope {
     throw new RelayError("too_large", `an endpoint's rules and caps are more than ${SCOPE_BYTES} bytes`)
   if (given("title"))
     out.title = view.title === null ? null : cleanText(typeof view.title === "string" ? view.title.replace(/\s+/g, " ") : view.title, "title", 64) || null
+  if (given("wake")) out.wake = typeof view.wake === "string" && view.wake !== "none" && WAKES.includes(view.wake as Wake) ? (view.wake as Wake) : null
   if (given("incarnation")) {
     if (view.incarnation !== null && (typeof view.incarnation !== "string" || !INCARNATION.test(view.incarnation))) throw bad("incarnation")
     out.incarnation = view.incarnation ?? null

package/src/hub.ts

@@ -38,6 +38,7 @@ import {
   SYSTEM_HANDLE,
   sameSecret,
   untilTomorrow,
+  type Wake,
   type XContact,
   XCounters,
   type XDelivered,
@@ -104,7 +105,7 @@ export interface GraphNode {
   status: EndpointView["status"]
   last_seen: string | null
   parent: string | null
-  wake?: string | null
+  wake?: Wake | null
 }
 
 /** `spawn`: parent to child; `message`: sender to recipient, with the count and newest send in the graph's window */
@@ -1593,7 +1594,7 @@ export class RelayHub {
   /** a read-only graph for a dashboard: listed endpoints, spawn edges among them, and message counts per sender and recipient; never a body */
   graph(minutes = GRAPH_MINUTES): HubGraph {
     const window = Math.min(Math.max(1, Math.floor(Number.isFinite(minutes) ? minutes : GRAPH_MINUTES)), GRAPH_MINUTES_MAX)
-    const endpoints = this.relay.list() as (EndpointView & { wake?: string | null })[]
+    const endpoints = this.relay.list()
     const byId = new Map(endpoints.map((e) => [e.id, e.address]))
     const listed = new Set(byId.values())
     const nodes: GraphNode[] = endpoints.map((e) => ({