@ccmsg/cli 0.2.4 → 0.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccmsg/cli",
-  "version": "0.2.4",
+  "version": "0.2.7",
   "description": "The ccmsg daemon, CLI and agent plugins for one instance (= one config home)",
   "license": "MIT",
   "author": "kawaz",

package/src/auth/auth.ts

@@ -59,6 +59,19 @@ export const REFRESH_TTL_MS = 7 * 24 * 60 * 60 * 1000;
  * short to be a second usable token. */
 export const PREVIOUS_GRACE_MS = 60_000;
 
+/** How much of an access token's life must be left for a rotation to keep it.
+ *
+ * A family has one access token and every page a person has open presents it,
+ * so minting a new one on each rotation would take the token out from under the
+ * pages that are already holding it. Rotation therefore keeps the standing
+ * access token while it has this much life left, and mints only when it is
+ * running out — the pages share one token and renew it together.
+ *
+ * Half, because it is the largest share that still leaves a full half of the
+ * token's life to notice the new value in: the window is what bounds how long a
+ * page may go on holding a token whose family has already moved on. */
+export const ACCESS_KEEP_MS = ACCESS_TTL_MS / 2;
+
 /** How many times a six-digit code may be got wrong before the registration URL
  * is spent.
  *
@@ -706,11 +719,18 @@ export class Auth {
       return { sub: held.body.sub, access: held.body.access, refresh: held.body.refresh };
     }
     const at = this.#now();
+    // The refresh token rotates every time; the access token is the family's
+    // one token and is shared by every page the person has open, so it is kept
+    // until it is close enough to running out to be worth replacing.
+    const access =
+      held.body.access.expires_at - at >= ACCESS_KEEP_MS
+        ? held.body.access
+        : { value: token(), expires_at: at + ACCESS_TTL_MS };
     const rotated: TokenFamily = {
       kind: "token_family",
       sub: held.body.sub,
       iss: this.deps.self,
-      access: { value: token(), expires_at: at + ACCESS_TTL_MS },
+      access,
       refresh: { value: token(), expires_at: at + REFRESH_TTL_MS },
       previous_refresh: { value: held.body.refresh.value, expires_at: at + PREVIOUS_GRACE_MS },
       // The value going out of service is remembered as a digest for as long as

package/src/mesh/relay.ts

@@ -1,6 +1,8 @@
 import {
+  type AgentInfo,
   type InstanceId,
   LAST_LIVE_RETENTION_MS,
+  type LastLiveSession,
   type PeerInfo,
   PLAIN_TOPICS,
   type Sid,
@@ -116,12 +118,16 @@ export class Relay {
     return values;
   }
 
-  /** Which instance a session belongs to, read from the `peers` values the
-   * cluster stated (§7.3).
+  /** Which instance a session belongs to, read from the cluster values the
+   * peers stated (§7.3).
    *
-   * The row names its own instance rather than the one that relayed it, so a
-   * value that travelled through a third instance still points at the session's
-   * own. */
+   * `peers` names every session an instance currently holds — connected or in
+   * `last_live` — and is checked first. A session hello has not reached yet
+   * has no row there but the harness may already know of it, so `agents` is
+   * checked next; `last_live` is the last resort for one whose instance has
+   * not stated `agents` at all. Every row names its own instance rather than
+   * the one that relayed it, so a value that travelled through a third
+   * instance still points at the session's own. */
   owner(sid: Sid): InstanceId | undefined {
     this.#sweep();
     for (const held of this.#held.values()) {
@@ -129,6 +135,16 @@ export class Relay {
       const row = value?.peers?.find((peer) => peer.sid === sid);
       if (row !== undefined) return row.instance;
     }
+    for (const held of this.#held.values()) {
+      const value = held.get("agents") as { agents?: AgentInfo[] } | undefined;
+      const row = value?.agents?.find((agent) => agent.sid === sid);
+      if (row !== undefined) return row.instance;
+    }
+    for (const held of this.#held.values()) {
+      const value = held.get("peers") as { last_live?: LastLiveSession[] } | undefined;
+      const row = value?.last_live?.find((session) => session.sid === sid);
+      if (row !== undefined) return row.instance;
+    }
     return undefined;
   }
 

package/src/sessions/last-live.ts

@@ -2,6 +2,7 @@ import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import {
   LAST_LIVE_RETENTION_MS,
+  type InstanceId,
   type LastLiveSession,
   type Sid,
   type Timestamp,
@@ -35,7 +36,14 @@ const VERSION = 1;
 export class LastLiveStore {
   #entries = new Map<Sid, StoredEntry>();
 
-  constructor(private readonly file: string) {}
+  /** `id` is this instance's own: every entry this store holds is by
+   * definition an observation *this* instance made, so `instance` is forced
+   * to it on both ends (load and record) rather than trusted from whatever
+   * the field on disk happens to say. */
+  constructor(
+    private readonly file: string,
+    private readonly id: InstanceId,
+  ) {}
 
   /** Read at startup (§8.3 step 4), before anything can ask for the list. A
    * file that is missing or unreadable starts an empty list: the daemon has no
@@ -50,7 +58,9 @@ export class LastLiveStore {
     const sessions = (document as Document | null)?.sessions;
     if (!Array.isArray(sessions)) return;
     for (const entry of sessions as StoredEntry[]) {
-      if (typeof entry?.sid === "string") this.#entries.set(entry.sid, entry);
+      if (typeof entry?.sid === "string") {
+        this.#entries.set(entry.sid, { ...entry, instance: this.id });
+      }
     }
     this.#prune(now);
   }
@@ -71,7 +81,11 @@ export class LastLiveStore {
    * Paused rather than Disappeared (§5.2). */
   record(entry: StoredEntry): void {
     const stopped = this.#entries.get(entry.sid)?.stopped_at ?? entry.stopped_at;
-    this.#entries.set(entry.sid, stopped === undefined ? entry : { ...entry, stopped_at: stopped });
+    this.#entries.set(entry.sid, {
+      ...entry,
+      instance: this.id,
+      ...(stopped === undefined ? {} : { stopped_at: stopped }),
+    });
     this.#save();
   }
 

package/src/sessions/registry.ts

@@ -190,7 +190,7 @@ export class Sessions implements UpstreamResource {
       () => this.changed(),
       deps.pollMs,
     );
-    this.#lastLive = new LastLiveStore(join(deps.stateDir, "last-live.json"));
+    this.#lastLive = new LastLiveStore(join(deps.stateDir, "last-live.json"), deps.self);
     this.#lastLive.load();
     this.#terminals =
       deps.terminals === undefined