@ours.network/messenger-server 1.0.31-nightly.23 → 1.0.31-nightly.24

package/dist/chunks/{chunk-ZLMZUBJY.js → chunk-QA42GHTR.js}

@@ -38,7 +38,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var define_MESSENGER_BUILD_INFO_default;
 var init_define_MESSENGER_BUILD_INFO = __esm({
   "<define:__MESSENGER_BUILD_INFO__>"() {
-    define_MESSENGER_BUILD_INFO_default = { name: "@ours.network/messenger-server", version: "1.0.31-nightly.23", sha: "110c44f3d58518346a3e1afa5b070bd47cee862a", dirty: true };
+    define_MESSENGER_BUILD_INFO_default = { name: "@ours.network/messenger-server", version: "1.0.31-nightly.24", sha: "57c2b0c767bc8bd397c8cccebb781c4c76e70699", dirty: true };
   }
 });
 

package/dist/chunks/{server-KK2HKPON.js → server-3KJ33EX5.js}

@@ -10,7 +10,7 @@ import {
   publicEngineError,
   publicInternalError,
   reportFailure
-} from "./chunk-ZLMZUBJY.js";
+} from "./chunk-QA42GHTR.js";
 
 // node_modules/bn.js/lib/bn.js
 var require_bn = __commonJS({
@@ -12117,7 +12117,7 @@ function startResourceObserver(client, identity, callbacks) {
   return {
     ready,
     get healthy() {
-      if (healthy && Date.now() - lastCoverage >= 6e3) {
+      if (healthy && Date.now() - lastCoverage >= 45e3) {
         fail(new Error("resource source coverage expired"));
         controller.abort();
       }
@@ -12446,13 +12446,15 @@ var ResourceOutput = class {
   #closed = false;
   #releaseDrain;
   #abort = () => this.close();
-  send(envelope) {
+  send(envelope, admitted = () => {
+  }) {
     if (this.#closed) return Promise.reject(new Error("resource output closed"));
     const bytes = Buffer.byteLength(JSON.stringify(envelope));
     if (bytes > RESOURCE_ASSEMBLY_BYTES) return this.#fail(new Error("resource assembly limit exceeded"));
     if (this.#active && this.#pendingBytes + bytes > RESOURCE_PENDING_BYTES) {
       return this.#fail(new Error("resource pending limit exceeded"));
     }
+    admitted();
     return new Promise((resolve4, reject) => {
       const item = { envelope, bytes, resolve: resolve4, reject };
       if (!this.#active) {
@@ -12484,7 +12486,7 @@ var ResourceOutput = class {
     try {
       while (this.#active && !this.#closed) {
         const item = this.#active;
-        for (const frame of resourceFrames(item.envelope)) {
+        for (const frame of "views" in item.envelope ? [{ event: "resource-coverage", data: item.envelope }] : resourceFrames(item.envelope)) {
           if (this.#closed) break;
           const writable = this.response.write(`event: ${frame.event}
 data: ${JSON.stringify(frame.data)}
@@ -12553,11 +12555,12 @@ var ResourceConnections = class {
     const observer = startResourceObserver(this.deps.client, this.deps.identity, {
       committed: (frame) => {
         if (!connection || controller.signal.aborted) return;
+        connection.source = frame;
         for (const view of connection.views.values()) {
-          if (frame.kind === "coverage") {
-            if (view.covered && !view.failed) void this.#emit(connection, view, "coverage", { source: view.covered }).catch(close);
-          } else if (!view.covered || frame.position > view.covered.position) this.#schedule(connection, view);
+          if (!view.covered || frame.position > view.covered.position) this.#schedule(connection, view);
         }
+        if (frame.kind === "coverage") void this.#coverage(connection, frame).catch(close);
+        else this.#queueCoverage(connection);
       },
       failed: (error) => {
         if (!connection || controller.signal.aborted) return;
@@ -12583,7 +12586,7 @@ data: ${JSON.stringify({
         } else void Promise.allSettled(writes).then(close);
       }
     });
-    connection = { id, controller, output, views: /* @__PURE__ */ new Map(), epochs: /* @__PURE__ */ new Map(), observer, localRevision: 0, projectionTail: Promise.resolve(), close };
+    connection = { id, controller, output, views: /* @__PURE__ */ new Map(), epochs: /* @__PURE__ */ new Map(), observer, localRevision: 0, projectionTail: Promise.resolve(), coverageQueued: false, close };
     this.#connections.set(id, connection);
     response.once("close", close);
     subscribeHumanProfile(this.deps.stateDir, this.deps.identityCid, () => {
@@ -12682,17 +12685,62 @@ data: ${JSON.stringify({
     view.controller.abort();
     view.rejectInitial(new ResourceBindingError(409, "resource binding retired"));
   }
-  #emit(connection, view, kind, payload) {
+  #emit(connection, view, kind, payload, source) {
     return connection.output.send({
       protocolVersion: 1,
       producerGeneration: this.producerGeneration,
       viewId: view.descriptor.viewId,
       subscriptionEpoch: view.epoch,
-      sequence: ++view.sequence,
+      sequence: view.sequence + 1,
       revision: view.revision,
       baselineId: view.baselineId,
       kind,
-      payload
+      payload,
+      ...source ? { source } : {}
+    }, () => {
+      view.sequence++;
+      if (source || kind === "ready") view.qualifiedAt = Date.now();
+    });
+  }
+  #queueCoverage(connection) {
+    if (connection.coverageQueued) return;
+    connection.coverageQueued = true;
+    void (async () => {
+      try {
+        let tail;
+        do {
+          tail = connection.projectionTail;
+          await tail;
+        } while (tail !== connection.projectionTail && !connection.controller.signal.aborted);
+        if (!connection.controller.signal.aborted && connection.source) {
+          void this.#coverage(connection, connection.source).catch(connection.close);
+        }
+      } finally {
+        connection.coverageQueued = false;
+      }
+    })().catch(connection.close);
+  }
+  #coverage(connection, source) {
+    const now = Date.now();
+    if (now - (connection.coverageAt ?? -Infinity) < 15e3 || !connection.observer.healthy) return Promise.resolve();
+    const eligible = [...connection.views.values()].filter((view) => this.#current(connection, view) && !view.failed && !view.running && !view.dirty && view.payload !== void 0 && view.covered && view.covered.producerGeneration === source.producerGeneration && view.covered.position === source.position && (view.descriptor.resource !== "identity" || view.localRevision === connection.localRevision) && now - (view.qualifiedAt ?? 0) >= 15e3);
+    if (!eligible.length) return Promise.resolve();
+    const views = eligible.map((view) => ({
+      protocolVersion: 1,
+      producerGeneration: this.producerGeneration,
+      viewId: view.descriptor.viewId,
+      subscriptionEpoch: view.epoch,
+      baselineId: view.baselineId,
+      sequence: view.sequence + 1,
+      revision: view.revision,
+      source: view.covered
+    }));
+    return connection.output.send({ protocolVersion: 1, producerGeneration: this.producerGeneration, views }, () => {
+      connection.coverageAt = now;
+      for (const view of eligible) {
+        view.sequence++;
+        view.qualifiedAt = now;
+      }
     });
   }
   #schedule(connection, view) {
@@ -12712,7 +12760,6 @@ data: ${JSON.stringify({
     try {
       if (view.dirty && this.#current(connection, view)) {
         view.dirty = false;
-        const localRevision = connection.localRevision;
         const captured = await captureResourceProjection(this.deps.client, this.deps.identity, async () => {
           const payload = await this.deps.project(view.descriptor, view.controller.signal);
           const delta = view.descriptor.resource === "messages" && view.payload !== void 0 ? await messageProjectionDelta(
@@ -12730,13 +12777,13 @@ data: ${JSON.stringify({
         const first = view.payload === void 0;
         const changed = first || JSON.stringify(captured.payload.payload) !== JSON.stringify(view.payload);
         view.covered = captured.source;
-        view.localRevision = localRevision;
+        view.localRevision = connection.localRevision;
         if (changed) {
           view.revision++;
           if (first || view.descriptor.resource !== "messages") {
-            await this.#emit(connection, view, "snapshot", captured.payload.payload);
+            await this.#emit(connection, view, "snapshot", captured.payload.payload, captured.source);
           } else {
-            await this.#emit(connection, view, "upsert", captured.payload.delta);
+            await this.#emit(connection, view, "upsert", captured.payload.delta, captured.source);
           }
           if (!this.#current(connection, view)) return;
           view.payload = captured.payload.payload;
@@ -12752,8 +12799,6 @@ data: ${JSON.stringify({
             baselineId: view.baselineId,
             descriptor: view.descriptor
           });
-        } else {
-          await this.#emit(connection, view, "coverage", { source: captured.source });
         }
       }
     } catch (error) {
@@ -21564,6 +21609,13 @@ async function serveEvents(req, res, deps) {
   res.flushHeaders?.();
   const subscription = deps.events.subscribe(deps.sseQueueLimit ?? 64);
   let closed2 = false;
+  let lastOutput = Date.now();
+  const heartbeatMs = deps.sseHeartbeatMs ?? 2e4;
+  const sendHint = (event, identity) => {
+    const writable = writeSse(res, event, identity);
+    lastOutput = Date.now();
+    return writable;
+  };
   let drainWait = null;
   let releaseDrain = null;
   const onDrain = () => {
@@ -21593,13 +21645,15 @@ async function serveEvents(req, res, deps) {
   req.once("close", close);
   res.once("close", close);
   const heartbeat = setInterval(() => {
-    if (!closed2 && !res.destroyed && !drainWait && !res.write(": keepalive\n\n")) {
-      void waitForDrain();
+    if (!closed2 && !res.destroyed && !drainWait && Date.now() - lastOutput >= heartbeatMs) {
+      const writable = res.write(": keepalive\n\n");
+      lastOutput = Date.now();
+      if (!writable) void waitForDrain();
     }
-  }, deps.sseHeartbeatMs ?? 2e4);
+  }, heartbeatMs);
   heartbeat.unref?.();
   try {
-    if (!writeSse(res, { type: "sync_required", reason: "connected" }, deps.identityCid)) {
+    if (!sendHint({ type: "sync_required", reason: "connected" }, deps.identityCid)) {
       await waitForDrain();
     }
     while (!closed2) {
@@ -21607,7 +21661,7 @@ async function serveEvents(req, res, deps) {
       if (event === null || closed2) break;
       if (drainWait) await drainWait;
       if (closed2 || res.destroyed) break;
-      if (!writeSse(res, event)) await waitForDrain();
+      if (!sendHint(event)) await waitForDrain();
     }
   } finally {
     clearInterval(heartbeat);
@@ -22302,7 +22356,7 @@ import { randomBytes as randomBytes2 } from "node:crypto";
 // node_modules/@ours.network/sdk/dist/index.js
 init_define_MESSENGER_BUILD_INFO();
 
-// node_modules/@ours.network/sdk/dist/chunk-AKRQMPU6.js
+// node_modules/@ours.network/sdk/dist/chunk-CJT4XK7F.js
 init_define_MESSENGER_BUILD_INFO();
 
 // node_modules/@ours.network/sdk/dist/chunk-4VLQOZT7.js
@@ -22410,9 +22464,9 @@ var I = 100 * 1024 * 1024;
 var K = { brokerUrl: "wss://broker1.ours.network", port: 3050, stateDir: E(T(), ".ours"), gcIntervalMs: 36e5, historyMaxBytes: I, apiVisibility: "owner", apiAuthMode: "legacy" };
 var $2 = "daemon-token";
 
-// node_modules/@ours.network/sdk/dist/chunk-AKRQMPU6.js
+// node_modules/@ours.network/sdk/dist/chunk-CJT4XK7F.js
 import { homedir as Ie } from "node:os";
-import { isAbsolute as be, join as _e, resolve as ce } from "node:path";
+import { isAbsolute as _e, join as be, resolve as ce } from "node:path";
 import { randomBytes as z } from "node:crypto";
 import { readFileSync as Se } from "node:fs";
 import { homedir as Ae } from "node:os";
@@ -22586,12 +22640,12 @@ var U = class {
       if (!u2.ok) throw new L(u2.status);
       if (!u2.body || !u2.headers.get("content-type")?.startsWith("text/event-stream")) throw new Error("Invalid resource stream response");
       l = u2.body.getReader();
-      let g2 = new TextDecoder("utf-8", { fatal: true }), y2 = "", I2 = 0, b2 = false, S2, T2 = -1;
+      let g2 = new TextDecoder("utf-8", { fatal: true }), y2 = "", I2 = 0, _ = false, S2, T2 = -1;
       for (; ; ) {
-        let { value: _, done: x } = await l.read();
+        let { value: b2, done: x } = await l.read();
         if (c(), x) throw new Error("Resource stream ended before disposal");
-        if (I2 += _.byteLength, I2 > 8 * 1024 * 1024) throw new Error("Resource live input exceeds limit");
-        for (y2 += g2.decode(_, { stream: true }); ; ) {
+        if (I2 += b2.byteLength, I2 > 8 * 1024 * 1024) throw new Error("Resource live input exceeds limit");
+        for (y2 += g2.decode(b2, { stream: true }); ; ) {
           c();
           let w2 = /\r?\n\r?\n/.exec(y2);
           if (!w2) break;
@@ -22606,8 +22660,8 @@ var U = class {
           let J = A2.kind;
           if (!["ready", "committed", "coverage", "resync"].includes(J)) throw new Error("Invalid resource frame kind");
           if (S2 !== void 0 && (A2.producerGeneration !== S2 || A2.position < T2)) throw new Error("Resource stream continuity changed");
-          if (S2 = A2.producerGeneration, T2 = A2.position, J === "ready") b2 = true, a(6e3);
-          else if (b2) a(6e3);
+          if (S2 = A2.producerGeneration, T2 = A2.position, J === "ready") _ = true, a(45e3);
+          else if (_) a(45e3);
           else if (J !== "resync") throw new Error("Resource mutation before ready");
           yield A2, c();
         }
@@ -22892,7 +22946,7 @@ function Te(e2 = process.env) {
     if (!e2.OURS_CONFIG.trim()) throw new R2("OURS_CONFIG must name a client profile");
     return ce(e2.OURS_CONFIG);
   }
-  return _e(e2.HOME || Ie(), ".ours-client", "profile.json");
+  return be(e2.HOME || Ie(), ".ours-client", "profile.json");
 }
 function Oe(e2) {
   let t = (o) => {
@@ -22914,7 +22968,7 @@ function Oe(e2) {
   } catch {
     return t("endpoint must equal serverUrl/daemon");
   }
-  return typeof n.expectedInstanceId != "string" || !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test(n.expectedInstanceId) ? t("expectedInstanceId must be a lowercase UUID") : typeof n.credentialPath != "string" || !be(n.credentialPath) || ce(n.credentialPath) !== n.credentialPath ? t("credentialPath must be an absolute normalized path") : Object.freeze({ serverUrl: r, endpoint: i, expectedInstanceId: n.expectedInstanceId, credentialPath: n.credentialPath });
+  return typeof n.expectedInstanceId != "string" || !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test(n.expectedInstanceId) ? t("expectedInstanceId must be a lowercase UUID") : typeof n.credentialPath != "string" || !_e(n.credentialPath) || ce(n.credentialPath) !== n.credentialPath ? t("credentialPath must be an absolute normalized path") : Object.freeze({ serverUrl: r, endpoint: i, expectedInstanceId: n.expectedInstanceId, credentialPath: n.credentialPath });
 }
 function le(e2 = process.env) {
   let t = Te(e2), n;
@@ -23080,15 +23134,15 @@ async function X(e2 = {}) {
     if (o !== void 0) throw new Error("Instance selection cannot use an injected fetch");
     let I2 = h2(g2);
     if (c !== void 0 && !Array.isArray(c)) throw new Error("Instance selection requires a nonempty capability list");
-    let b2 = [...c ?? ["external-sessions-v1"]];
-    if (!b2.length || b2.some((T2) => typeof T2 != "string" || !T2.trim())) throw new Error("Instance selection requires a nonempty capability list");
-    if (i === "external") b2.includes("external-sessions-v1") || b2.push("external-sessions-v1");
-    else if (b2.includes("external-sessions-v1")) throw new Error("External capabilities require explicit sessionMode: external; refusing local-mode fallback");
+    let _ = [...c ?? ["external-sessions-v1"]];
+    if (!_.length || _.some((T2) => typeof T2 != "string" || !T2.trim())) throw new Error("Instance selection requires a nonempty capability list");
+    if (i === "external") _.includes("external-sessions-v1") || _.push("external-sessions-v1");
+    else if (_.includes("external-sessions-v1")) throw new Error("External capabilities require explicit sessionMode: external; refusing local-mode fallback");
     {
-      let T2 = await globalThis.fetch(m2(I2, "/selection"), { signal: s ? AbortSignal.any([s, AbortSignal.timeout(5e3)]) : AbortSignal.timeout(5e3), redirect: "error" }), _ = await P(T2);
-      if (!T2.ok || !_ || Object.keys(_).length !== 3 || Object.keys(_).some((w2) => !["schema", "instanceId", "capabilities"].includes(w2)) || _.schema !== 1 || _.instanceId !== a) throw new Error("Daemon instance selection metadata is absent, incompatible or mismatched");
-      let x = _.capabilities;
-      if (!Array.isArray(x) || x.some((w2) => typeof w2 != "string") || b2.some((w2) => !x.includes(w2))) throw new Error("Daemon does not support the required capabilities; refusing local-mode fallback");
+      let T2 = await globalThis.fetch(m2(I2, "/selection"), { signal: s ? AbortSignal.any([s, AbortSignal.timeout(5e3)]) : AbortSignal.timeout(5e3), redirect: "error" }), b2 = await P(T2);
+      if (!T2.ok || !b2 || Object.keys(b2).length !== 3 || Object.keys(b2).some((w2) => !["schema", "instanceId", "capabilities"].includes(w2)) || b2.schema !== 1 || b2.instanceId !== a) throw new Error("Daemon instance selection metadata is absent, incompatible or mismatched");
+      let x = b2.capabilities;
+      if (!Array.isArray(x) || x.some((w2) => typeof w2 != "string") || _.some((w2) => !x.includes(w2))) throw new Error("Daemon does not support the required capabilities; refusing local-mode fallback");
     }
     let S2 = l === void 0 ? y2 : S(l);
     if (typeof S2 != "string" || !S2.trim()) throw new Error("Instance selection requires an explicit API token after daemon verification");

package/dist/cli.js

@@ -7,7 +7,7 @@ import {
   normalizeBasePath,
   operatorError,
   reportFailure
-} from "./chunks/chunk-ZLMZUBJY.js";
+} from "./chunks/chunk-QA42GHTR.js";
 
 // src/cli.ts
 init_define_MESSENGER_BUILD_INFO();
@@ -131,7 +131,7 @@ async function main() {
   }
   if (process.argv.length !== 3) throw new ConfigurationError("serve does not accept command-line options");
   const cfg = loadConfig();
-  const { start } = await import("./chunks/server-KK2HKPON.js");
+  const { start } = await import("./chunks/server-3KJ33EX5.js");
   const handle = await start(cfg, BUILD_INFO);
   let closing = false;
   const shutdown = (signal) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/messenger-server",
-  "version": "1.0.31-nightly.23",
+  "version": "1.0.31-nightly.24",
   "description": "Self-hosted Messenger REST/SSE backend for one identity on a shared Ours daemon.",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",
@@ -41,14 +41,14 @@
   },
   "dependencies": {
     "@eslint-community/regexpp": "4.12.2",
-    "@ours.network/sdk": "4.1.1-nightly.2",
+    "@ours.network/sdk": "4.1.1-nightly.3",
     "parse5": "^8.0.1",
     "web-push": "^3.6.7",
     "ws": "^8.21.0"
   },
   "devDependencies": {
-    "@ours.network/cli": "3.1.1-nightly.2",
-    "@ours.network/daemon": "4.1.1-nightly.2",
+    "@ours.network/cli": "3.1.1-nightly.3",
+    "@ours.network/daemon": "4.1.1-nightly.3",
     "@playwright/test": "^1.62.1",
     "@types/node": "^20.14.0",
     "@types/web-push": "^3.6.4",