@scp-dev/broker 0.1.2 → 0.1.4

package/dist/testing.d.ts

@@ -4,6 +4,8 @@ interface FakeToken {
     tokenId: string;
     /** the account handle the token acts as */
     user: string;
+    /** the org member the token belongs to; none is the personal account's owner */
+    actor?: string;
 }
 interface FakeHubServer {
     /** the http origin, as a bridge's url takes it */

package/dist/testing.js

@@ -50,7 +50,14 @@ function startFakeHubServer(options) {
     if (!token) return null;
     return {
       account: token.user,
-      grant: { tokenId: token.tokenId, userId: `usr_${token.user}`, actorId: null, expiresAt: Date.now() + 36e5, scoped: false, role: null }
+      grant: {
+        tokenId: token.tokenId,
+        userId: `usr_${token.user}`,
+        actorId: token.actor ?? null,
+        expiresAt: Date.now() + 36e5,
+        scoped: false,
+        role: token.actor ? "member" : null
+      }
     };
   }
   const server = Bun.serve({

package/package.json

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

package/src/bridge.ts

@@ -73,6 +73,8 @@ export interface Bridge {
   changed(endpoint: string): void
   /** rules, caps, groups or a title changed, which can touch several endpoints: every mirrored endpoint is sent again */
   resync(): void
+  /** a local endpoint took another handle: the hub renames its mirror in place, keeping what queued for it */
+  renamed(endpoint: string, was: string): void
   /** a local endpoint's activity, posted to the hub */
   activity(endpoint: string, row: ActivityRow): void
   /** the endpoints of other accounts this account's contacts let it reach */
@@ -257,9 +259,10 @@ export function startBridge(options: BridgeOptions): Bridge {
   }
 
   async function handshake(socket: WebSocket) {
-    const hello = await request<{ account: string; endpoints: RemoteView[] }>("hello", { protocol: PROTOCOL, machine, bridge: true })
+    const hello = await request<{ account: string; endpoints: RemoteView[]; others?: string[] }>("hello", { protocol: PROTOCOL, machine, bridge: true })
     account = hello.account
     core.setAliases([account])
+    core.setOthers(account, Array.isArray(hello.others) ? hello.others.filter((name): name is string => typeof name === "string") : [])
     ready = true
     applyRemote(hello.endpoints, true)
     await Promise.all(fullMirror().map((params) => request("mirror", params)))
@@ -354,7 +357,7 @@ export function startBridge(options: BridgeOptions): Bridge {
   function localAddress(address: unknown): unknown {
     if (typeof address !== "string" || !account || !address.startsWith(`${account}/`)) return address
     const rest = address.slice(account.length + 1)
-    return rest.includes("/") ? `${core.user}/${rest}` : `${core.user}/${account}/${rest}`
+    return rest.includes("/") ? core.remoteAddress(rest) : `${core.user}/${account}/${rest}`
   }
 
   /** the lowest seq a fresh subscribe must replay from: every delivery at or below it was acked */
@@ -391,6 +394,7 @@ export function startBridge(options: BridgeOptions): Bridge {
       }
       case "endpoints": {
         if (typeof params.machine !== "string" || params.machine === machine) return
+        if (typeof params.own === "boolean") core.setOther(params.machine, !params.own)
         try {
           core.mirror(params.machine, params.endpoints, { full: params.full === true })
         } catch (error) {
@@ -601,6 +605,18 @@ export function startBridge(options: BridgeOptions): Bridge {
     if (mirrored(view)) fireAndForget("mirror", { endpoints: [outward(view)], full: false })
   }
 
+  function renamed(endpoint: string, was: string) {
+    if (!ready) return
+    let view: EndpointView
+    try {
+      view = core.whoami(endpoint)
+    } catch {
+      return
+    }
+    if (mirrored(view)) fireAndForget("mirror", { endpoints: [{ ...outward(view), was }], full: false })
+    else resync()
+  }
+
   function resync() {
     if (!ready) return
     let frames: ReturnType<typeof fullMirror>
@@ -654,5 +670,5 @@ export function startBridge(options: BridgeOptions): Bridge {
   }
 
   connect()
-  return { forward, changed, resync, activity, contacts, status, relink, stop }
+  return { forward, changed, resync, renamed, activity, contacts, status, relink, stop }
 }

package/src/client.ts

@@ -31,6 +31,8 @@ export interface Hello {
   tty?: boolean
   /** a hook's connection: it claims like an agent but never counts as connected, and posts only event and status */
   transient?: boolean
+  /** with `transient`: the session joins the relay on demand, taking `handle` when given, and links itself under the agent `under` */
+  join?: { handle?: string; under?: string }
   /** a one-shot command: the broker announces no presence change when it connects or goes */
   brief?: boolean
   /** no identity: list, status, watch, log and policy only */

package/src/index.ts

@@ -1,6 +1,8 @@
 export { type BrokerInfo, BrokerUnavailable, connectBroker, type GrantParams, type GroupParams, RelayClient, type Hello, type HelloResult } from "./client"
-export { relaySocketUrl, type Bridge, type BridgeConfig, type BridgeStatus } from "./bridge"
+export { relaySocketUrl, type Bridge, type BridgeConfig, type BridgeHooks, type BridgeStatus } from "./bridge"
 export { BrokerRunning } from "./lock"
 export { MAX_LINE } from "./ndjson"
 export { accountHome, localHostName, policyPath, privateDir, relayDir, shortHostname, socketPath, systemHostname, thisHostname } from "./paths"
-export { startBroker, type Broker, type BrokerOptions } from "./server"
+export type { Deliver } from "./judge-gate"
+export { startBroker, type Broker, type BrokerOptions, type LinkContext, type LinkFactory } from "./server"
+export { readSessionMarker, type SessionMarker, writeSessionMarker } from "./sessions"