@scp-dev/broker 0.2.1 → 0.4.0

package/dist/index.js

@@ -1375,15 +1375,22 @@ async function startBroker(options) {
     judge.sweep();
   }, SWEEP_MS);
   const known = /* @__PURE__ */ new Map();
-  for (const view of localViews()) known.set(view.id, view.presence);
+  const wakes = /* @__PURE__ */ new Map();
+  for (const view of localViews()) {
+    known.set(view.id, view.presence);
+    wakes.set(view.id, view.wake);
+  }
   const presenceTimer = setInterval(() => {
     core.endExited();
     const live = /* @__PURE__ */ new Set();
     for (const view of localViews()) {
       live.add(view.id);
       if ((known.get(view.id) ?? "offline") !== view.presence) presenceChanged(view);
+      else if (wakes.has(view.id) && wakes.get(view.id) !== view.wake) bridge?.changed(view.id);
+      wakes.set(view.id, view.wake);
     }
     for (const id of known.keys()) if (!live.has(id)) known.delete(id);
+    for (const id of wakes.keys()) if (!live.has(id)) wakes.delete(id);
   }, options.presenceEveryMs ?? PRESENCE_MS);
   const ownership = setInterval(() => {
     if (closing || ownsState()) return;
@@ -1493,9 +1500,15 @@ async function startBroker(options) {
     const was = s.data.waker;
     if (was === endpoint) return;
     s.data.waker = endpoint;
-    if (was) core.waker(was, false, { grace: s.data.transient === true });
-    if (endpoint) core.waker(endpoint, true);
-    for (const id of [was, endpoint]) if (id) presenceMoved(id);
+    if (was) {
+      const wake2 = core.whoami(was).wake;
+      core.waker(was, false, { grace: s.data.transient === true });
+      if (!presenceMoved(was) && core.whoami(was).wake !== wake2) bridge?.changed(was);
+    }
+    if (endpoint) {
+      core.waker(endpoint, true);
+      presenceMoved(endpoint);
+    }
   }
   function presenceMoved(id) {
     const view = core.whoami(id);
@@ -1959,14 +1972,26 @@ async function startBroker(options) {
       }
       case "adopt": {
         const actor = actorOf(s);
-        const adopted = core.adopt(
+        const adopted = await core.adopt(
           actor,
           { endpoint: params.endpoint, ...params.parent !== void 0 ? { parent: params.parent } : {} },
-          { tty: actor.kind === "endpoint" && s.data.terminal === true }
+          {
+            tty: actor.kind === "endpoint" && s.data.terminal === true,
+            send: (from, send, origin) => {
+              loadPolicy();
+              if (policyError) throw new RelayError3("policy_refused", policyError);
+              return judge.send(from, send, { tty: false, ...origin }, deliver);
+            }
+          }
         );
         bridge?.resync();
         return adopted;
       }
+      case "link_accept": {
+        const linked = core.linkAccept(actorOf(s), { id: params.id });
+        bridge?.resync();
+        return linked;
+      }
       case "unlink": {
         const unlinked = core.unlink(actorOf(s), params.endpoint !== void 0 ? { endpoint: params.endpoint } : {});
         bridge?.resync();
@@ -1986,11 +2011,13 @@ async function startBroker(options) {
         return view;
       }
       case "event": {
+        const wake2 = core.whoami(me).wake;
         const row = core.event(me, params, hookOf(s));
         notifyFleet({ type: "activity", ...row });
         bridge?.activity(me, row);
         const after = core.whoami(me);
         if ((known.get(me) ?? "offline") !== after.presence) presenceChanged(after);
+        else if (after.wake !== wake2) bridge?.changed(me);
         return row;
       }
       case "inject": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scp-dev/broker",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "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",
@@ -37,8 +37,8 @@
     "typecheck": "tsc -p ."
   },
   "dependencies": {
-    "@scp-dev/core": "0.1.6",
-    "@scp-dev/hub": "0.5.1"
+    "@scp-dev/core": "0.3.0",
+    "@scp-dev/hub": "0.6.1"
   },
   "devDependencies": {
     "tsup": "^8.5.1"

package/src/server.ts

@@ -292,15 +292,22 @@ export async function startBroker(options: BrokerOptions): Promise<Broker> {
     judge.sweep()
   }, SWEEP_MS)
   const known = new Map<string, Presence>()
-  for (const view of localViews()) known.set(view.id, view.presence)
+  const wakes = new Map<string, string | null | undefined>()
+  for (const view of localViews()) {
+    known.set(view.id, view.presence)
+    wakes.set(view.id, view.wake)
+  }
   const presenceTimer = setInterval(() => {
     core.endExited()
     const live = new Set<string>()
     for (const view of localViews()) {
       live.add(view.id)
       if ((known.get(view.id) ?? "offline") !== view.presence) presenceChanged(view)
+      else if (wakes.has(view.id) && wakes.get(view.id) !== view.wake) bridge?.changed(view.id)
+      wakes.set(view.id, view.wake)
     }
     for (const id of known.keys()) if (!live.has(id)) known.delete(id)
+    for (const id of wakes.keys()) if (!live.has(id)) wakes.delete(id)
   }, options.presenceEveryMs ?? PRESENCE_MS)
   const ownership = setInterval(() => {
     if (closing || ownsState()) return
@@ -432,9 +439,15 @@ export async function startBroker(options: BrokerOptions): Promise<Broker> {
     const was = s.data.waker
     if (was === endpoint) return
     s.data.waker = endpoint
-    if (was) core.waker(was, false, { grace: s.data.transient === true })
-    if (endpoint) core.waker(endpoint, true)
-    for (const id of [was, endpoint]) if (id) presenceMoved(id)
+    if (was) {
+      const wake = core.whoami(was).wake
+      core.waker(was, false, { grace: s.data.transient === true })
+      if (!presenceMoved(was) && core.whoami(was).wake !== wake) bridge?.changed(was)
+    }
+    if (endpoint) {
+      core.waker(endpoint, true)
+      presenceMoved(endpoint)
+    }
   }
 
   /** reports an endpoint's presence when it is not the one last reported; whether it was not */
@@ -949,14 +962,26 @@ export async function startBroker(options: BrokerOptions): Promise<Broker> {
       }
       case "adopt": {
         const actor = actorOf(s)
-        const adopted = core.adopt(
+        const adopted = await core.adopt(
           actor,
           { endpoint: params.endpoint, ...(params.parent !== undefined ? { parent: params.parent } : {}) },
-          { tty: actor.kind === "endpoint" && s.data.terminal === true },
+          {
+            tty: actor.kind === "endpoint" && s.data.terminal === true,
+            send: (from: string, send: SendParams, origin: { link: "session" | "self" }) => {
+              loadPolicy()
+              if (policyError) throw new RelayError("policy_refused", policyError)
+              return judge.send(from, send, { tty: false, ...origin }, deliver)
+            },
+          },
         )
         bridge?.resync()
         return adopted
       }
+      case "link_accept": {
+        const linked = core.linkAccept(actorOf(s), { id: params.id })
+        bridge?.resync()
+        return linked
+      }
       case "unlink": {
         const unlinked = core.unlink(actorOf(s), params.endpoint !== undefined ? { endpoint: params.endpoint } : {})
         bridge?.resync()
@@ -976,11 +1001,13 @@ export async function startBroker(options: BrokerOptions): Promise<Broker> {
         return view
       }
       case "event": {
+        const wake = core.whoami(me).wake
         const row = core.event(me, params, hookOf(s))
         notifyFleet({ type: "activity", ...row })
         bridge?.activity(me, row)
         const after = core.whoami(me)
         if ((known.get(me) ?? "offline") !== after.presence) presenceChanged(after)
+        else if (after.wake !== wake) bridge?.changed(me)
         return row
       }
       case "inject": {