@scp-dev/broker 0.3.0 → 0.4.1

package/dist/index.js

@@ -1805,7 +1805,8 @@ async function startBroker(options) {
         if (typeof key === "string") s.data.process = key;
         const was2 = before2.get(endpoint2.id)?.address;
         if (join5 !== void 0) membership(endpoint2, core.sessionOf(endpoint2.id), true, was2?.slice(was2.lastIndexOf("/") + 1));
-        if (under !== void 0 && before2.get(endpoint2.id)?.parent !== endpoint2.parent) bridge?.resync();
+        const tookOver = join5 !== void 0 && [...before2.values()].some((view) => view.id !== endpoint2.id && view.address === endpoint2.address);
+        if (tookOver || under !== void 0 && before2.get(endpoint2.id)?.parent !== endpoint2.parent) bridge?.resync();
         else if ((before2.get(endpoint2.id)?.presence ?? "offline") !== endpoint2.presence) presenceChanged(endpoint2);
         return {
           endpoint: endpoint2,
@@ -1966,20 +1967,37 @@ async function startBroker(options) {
         return { changed };
       }
       case "rename": {
-        const renamed = core.rename(actorOf(s), { ...params.endpoint !== void 0 ? { endpoint: params.endpoint } : {}, handle: params.handle });
+        const renamed = core.rename(actorOf(s), {
+          ...params.endpoint !== void 0 ? { endpoint: params.endpoint } : {},
+          handle: params.handle,
+          ...params.take_over !== void 0 ? { take_over: params.take_over } : {}
+        });
         membership(renamed.endpoint, renamed.session, true, renamed.from);
+        if (renamed.retired) bridge?.resync();
         return renamed.endpoint;
       }
       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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scp-dev/broker",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "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.2.0",
-    "@scp-dev/hub": "0.6.0"
+    "@scp-dev/core": "0.3.1",
+    "@scp-dev/hub": "0.6.2"
   },
   "devDependencies": {
     "tsup": "^8.5.1"

package/src/server.ts

@@ -795,7 +795,8 @@ export async function startBroker(options: BrokerOptions): Promise<Broker> {
         if (typeof key === "string") s.data.process = key
         const was = before.get(endpoint.id)?.address
         if (join !== undefined) membership(endpoint, core.sessionOf(endpoint.id), true, was?.slice(was.lastIndexOf("/") + 1))
-        if (under !== undefined && before.get(endpoint.id)?.parent !== endpoint.parent) bridge?.resync()
+        const tookOver = join !== undefined && [...before.values()].some((view) => view.id !== endpoint.id && view.address === endpoint.address)
+        if (tookOver || (under !== undefined && before.get(endpoint.id)?.parent !== endpoint.parent)) bridge?.resync()
         else if ((before.get(endpoint.id)?.presence ?? "offline") !== endpoint.presence) presenceChanged(endpoint)
         return {
           endpoint,
@@ -956,20 +957,37 @@ export async function startBroker(options: BrokerOptions): Promise<Broker> {
         return { changed }
       }
       case "rename": {
-        const renamed = core.rename(actorOf(s), { ...(params.endpoint !== undefined ? { endpoint: params.endpoint } : {}), handle: params.handle })
+        const renamed = core.rename(actorOf(s), {
+          ...(params.endpoint !== undefined ? { endpoint: params.endpoint } : {}),
+          handle: params.handle,
+          ...(params.take_over !== undefined ? { take_over: params.take_over } : {}),
+        })
         membership(renamed.endpoint, renamed.session, true, renamed.from)
+        if (renamed.retired) bridge?.resync()
         return renamed.endpoint
       }
       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()