dsh-msg9-kit 0.2.0 → 0.2.2

package/lib/index.js

@@ -280,7 +280,7 @@ function deleteContact(apiUrl, apiKey, address, signal) {
 }
 
 // src/host/store.ts
-import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
+import { mkdir, open, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 function stateFilePath() {
@@ -324,11 +324,73 @@ async function saveState(state) {
 }
 var writeQueue = Promise.resolve();
 function enqueueWrite(task) {
-  const run = writeQueue.then(task);
+  const run = writeQueue.then(async () => {
+    const release = await acquireStateLock();
+    try {
+      return await task();
+    } finally {
+      await release();
+    }
+  });
   writeQueue = run.catch(() => {
   });
   return run;
 }
+var LOCK_STALE_MS = 3e4;
+var LOCK_RETRY_MS = 100;
+var LOCK_MAX_ATTEMPTS = 50;
+async function acquireStateLock() {
+  const lockPath = `${stateFilePath()}.lock`;
+  await mkdir(dirname(lockPath), { recursive: true });
+  for (let attempt = 0; ; attempt += 1) {
+    let handle;
+    try {
+      handle = await open(lockPath, "wx", 384);
+      await handle.writeFile(JSON.stringify({ pid: process.pid, at: (/* @__PURE__ */ new Date()).toISOString() }));
+      await handle.close();
+      return async () => {
+        await rm(lockPath, { force: true });
+      };
+    } catch (error) {
+      await handle?.close().catch(() => {
+      });
+      if (error.code !== "EEXIST") throw error;
+      if (await isStaleLock(lockPath)) {
+        await rm(lockPath, { force: true });
+        continue;
+      }
+      if (attempt >= LOCK_MAX_ATTEMPTS) {
+        throw new Error(
+          `msg9-kit state file is locked by another process (${lockPath}); multiple dsh instances sharing one DSH_HOME are not supported`
+        );
+      }
+      await new Promise((resolve) => setTimeout(resolve, LOCK_RETRY_MS));
+    }
+  }
+}
+async function isStaleLock(lockPath) {
+  let info;
+  try {
+    info = await stat(lockPath);
+  } catch {
+    return true;
+  }
+  if (Date.now() - info.mtimeMs > LOCK_STALE_MS) return true;
+  const raw = await readFile(lockPath, "utf8").catch(() => "");
+  let pid = NaN;
+  try {
+    pid = Number(JSON.parse(raw).pid);
+  } catch {
+  }
+  if (Number.isInteger(pid) && pid > 0 && pid !== process.pid) {
+    try {
+      process.kill(pid, 0);
+    } catch {
+      return true;
+    }
+  }
+  return false;
+}
 async function getOwner() {
   const envKey = process.env.MSG9_OWNER_KEY;
   if (envKey) {
@@ -359,10 +421,11 @@ async function getWorkspaceInbox(key) {
   const state = await loadState();
   return state.workspaces[key];
 }
-async function upsertWorkspaceInbox(key, inbox) {
+async function upsertWorkspaceInbox(key, patch) {
   return enqueueWrite(async () => {
     const state = await loadState();
-    state.workspaces[key] = { ...state.workspaces[key] ?? {}, ...inbox };
+    const clean = Object.fromEntries(Object.entries(patch).filter(([, value]) => value !== void 0));
+    state.workspaces[key] = { ...state.workspaces[key] ?? {}, ...clean };
     await saveState(state);
   });
 }
@@ -591,10 +654,12 @@ function maskKey(key) {
 
 // src/host/service.ts
 var DEFAULT_WORKSPACE = { key: "default", title: "default", path: "(unknown)" };
+var OWNER_PROBE_RETRY_MS = 6e4;
+var ownerProbeFailedAt = 0;
 async function ownerContext() {
   const owner = await getOwner();
   const apiUrl = owner?.api_url || defaultApiUrl();
-  if (owner?.api_key && (owner.slug === void 0 || owner.address_domain === void 0) && !process.env.MSG9_OWNER_KEY) {
+  if (owner?.api_key && (owner.slug === void 0 || owner.address_domain === void 0) && !process.env.MSG9_OWNER_KEY && Date.now() - ownerProbeFailedAt >= OWNER_PROBE_RETRY_MS) {
     try {
       const me = await ownerMe(apiUrl, owner.api_key);
       const probed = {
@@ -604,8 +669,10 @@ async function ownerContext() {
         address_domain: typeof me.address_domain === "string" ? me.address_domain : null
       };
       await setOwner(probed);
+      ownerProbeFailedAt = 0;
       return { owner: probed, apiUrl };
     } catch {
+      ownerProbeFailedAt = Date.now();
     }
   }
   return { owner, apiUrl };
@@ -704,31 +771,39 @@ async function migrateInbox(workspace, oldInbox, oldOwnerKey) {
     throw new Error(L("\u8FD8\u6CA1\u6709\u7ED1\u5B9A\u79DF\u6237\uFF0C\u65E0\u6CD5\u8FC1\u79FB\u3002", "No tenant is bound; cannot migrate."));
   }
   const agent = await provisionUnderOwner(apiUrl, owner, workspace, workspaceProfile(workspace));
-  const inbox = await ensureSigningKey(workspace.key, {
+  let signingSeed;
+  try {
+    const material = generateSigningMaterial();
+    await setSigningKey(apiUrl, agent.api_key, material.publicKey);
+    signingSeed = material.seed;
+  } catch {
+  }
+  const inbox = {
     address: agent.address,
     api_key: agent.api_key,
     api_url: apiUrl,
     title: workspace.title,
-    path: workspace.path
-  });
-  await replaceWorkspaceInbox(workspace.key, inbox);
+    path: workspace.path,
+    ...signingSeed ? { signing_seed: signingSeed } : {}
+  };
   if (oldInbox.address === agent.address) {
+    await replaceWorkspaceInbox(workspace.key, inbox);
     return { inbox, oldDisabled: false, forwarding: false, movedMail: null };
   }
-  let forwarding = false;
-  let note;
   try {
     await setForwarding(oldInbox.api_url, oldInbox.api_key, agent.address);
-    forwarding = true;
   } catch (error) {
-    note = L(
-      "\u65E7\u5730\u5740\u8F6C\u53D1\u8BBE\u7F6E\u5931\u8D25\uFF08{reason}\uFF09\u2014\u2014\u65E7\u4FE1\u7BB1\u4ECD\u53EF\u80FD\u6536\u5230\u65B0\u90AE\u4EF6\u3002",
-      "Could not set forwarding on the old address ({reason}) \u2014 new mail may still arrive there.",
-      { reason: error?.message ?? String(error) }
-    );
+    throw new Error(L(
+      "\u65E7\u5730\u5740 {old} \u7684\u8F6C\u53D1\u8BBE\u7F6E\u5931\u8D25\uFF08{reason}\uFF09\uFF0C\u8FC1\u79FB\u5DF2\u4E2D\u6B62\uFF1A\u672C\u5730\u914D\u7F6E\u672A\u6539\u52A8\uFF0C\u4ECD\u6307\u5411\u65E7\u4FE1\u7BB1\u3002",
+      "Could not set forwarding on the old address {old} ({reason}); migration aborted \u2014 local state still points at the old inbox.",
+      { old: oldInbox.address, reason: error?.message ?? String(error) }
+    ));
   }
+  await replaceWorkspaceInbox(workspace.key, inbox);
+  const forwarding = true;
   let oldDisabled = false;
   let movedMail = null;
+  let note;
   if (oldOwnerKey) {
     try {
       const moved = await ownerMoveMail(oldInbox.api_url, oldOwnerKey, oldInbox.address, { to: agent.address });
@@ -774,26 +849,51 @@ function createBridgeEventBus() {
     size: () => listeners.size
   };
 }
-async function computeUnread(deps, signal) {
-  const state = await deps.loadState();
-  const rows = Object.entries(state.workspaces).filter(([, inbox]) => Boolean(inbox.api_key));
-  const settled = await Promise.allSettled(
-    rows.map(async ([key, inbox]) => {
-      const page = await deps.api.listInbox(inbox.api_url, inbox.api_key, { folder: "all", limit: 1 }, signal);
-      return [key, Number(page?.unread_count ?? 0), Number(page?.total ?? (page?.messages ?? []).length)];
-    })
-  );
-  const byKey = {};
-  const totalByKey = {};
-  let total = 0;
-  for (const result of settled) {
-    if (result.status !== "fulfilled") continue;
-    const [key, count, mailboxSize] = result.value;
-    byKey[key] = count;
-    totalByKey[key] = mailboxSize;
-    total += count;
-  }
-  return { total, byKey, totalByKey };
+var UNREAD_TTL_MS = 1e4;
+var unreadCache;
+var unreadInflight;
+function invalidateUnreadCache() {
+  unreadCache = void 0;
+}
+async function computeUnread(deps, signal, options) {
+  const ttl = options?.ttlMs ?? UNREAD_TTL_MS;
+  if (unreadInflight) return unreadInflight;
+  if (unreadCache && Date.now() - unreadCache.at < ttl) return unreadCache.view;
+  void signal;
+  unreadInflight = (async () => {
+    const state = await deps.loadState();
+    const rows = Object.entries(state.workspaces).filter(([, inbox]) => Boolean(inbox.api_key));
+    const settled = await Promise.allSettled(
+      rows.map(async ([key, inbox]) => {
+        const page = await deps.api.listInbox(inbox.api_url, inbox.api_key, { folder: "all", limit: 1 });
+        return [key, Number(page?.unread_count ?? 0), Number(page?.total ?? (page?.messages ?? []).length)];
+      })
+    );
+    const previous = unreadCache?.view;
+    const byKey = {};
+    const totalByKey = {};
+    let total = 0;
+    for (let index = 0; index < rows.length; index += 1) {
+      const [key] = rows[index];
+      const result = settled[index];
+      if (result.status === "fulfilled") {
+        const [, count, mailboxSize] = result.value;
+        byKey[key] = count;
+        totalByKey[key] = mailboxSize;
+        total += count;
+      } else if (previous && key in previous.byKey) {
+        byKey[key] = previous.byKey[key];
+        totalByKey[key] = previous.totalByKey[key] ?? 0;
+        total += byKey[key];
+      }
+    }
+    const view = { total, byKey, totalByKey };
+    unreadCache = { at: Date.now(), view };
+    return view;
+  })().finally(() => {
+    unreadInflight = void 0;
+  });
+  return unreadInflight;
 }
 function defaultBridgeDeps(ctx, override = {}) {
   return {
@@ -860,19 +960,35 @@ function hostnameOf(host) {
 function isLoopbackHostname(hostname) {
   return hostname === "localhost" || hostname === "::1" || hostname === "0:0:0:0:0:0:0:1" || /^127(\.\d{1,3}){3}$/.test(hostname);
 }
+function isLoopbackAddress(address) {
+  const normalized = address.toLowerCase().replace(/^::ffff:/, "");
+  return normalized === "::1" || normalized === "0:0:0:0:0:0:0:1" || /^127(\.\d{1,3}){3}$/.test(normalized);
+}
 function isTrustedRequest(req) {
   const host = hostnameOf(req.headers.host);
   if (!host) return false;
   const origin = req.headers.origin;
   if (origin) return isSameOrigin(origin, req.headers.host ?? "");
+  const remote = req.socket?.remoteAddress;
+  if (remote && !isLoopbackAddress(remote)) return false;
   return isLoopbackHostname(host);
 }
+function portOf(hostHeader) {
+  if (hostHeader.startsWith("[")) {
+    const end = hostHeader.indexOf("]");
+    if (end < 0) return void 0;
+    const rest = hostHeader.slice(end + 1);
+    return rest.startsWith(":") ? rest.slice(1) : void 0;
+  }
+  const colon = hostHeader.lastIndexOf(":");
+  return colon > 0 ? hostHeader.slice(colon + 1) : void 0;
+}
 function isSameOrigin(origin, hostHeader) {
   try {
     const parsed = new URL(origin);
-    if (parsed.hostname.toLowerCase() !== hostnameOf(hostHeader)) return false;
-    const colon = hostHeader.lastIndexOf(":");
-    const expected = colon > 0 ? hostHeader.slice(colon + 1) : parsed.protocol === "https:" ? "443" : "80";
+    const originHost = parsed.hostname.toLowerCase().replace(/^\[|\]$/g, "");
+    if (originHost !== hostnameOf(hostHeader)) return false;
+    const expected = portOf(hostHeader) ?? (parsed.protocol === "https:" ? "443" : "80");
     const actual = parsed.port || (parsed.protocol === "https:" ? "443" : "80");
     return actual === expected;
   } catch {
@@ -1104,7 +1220,7 @@ function createMsg9Bridge(deps) {
         description: row.profile?.description ?? null,
         capabilities: row.profile?.capabilities ?? []
       }));
-      return ok(res, { agents, total: page.total ?? agents.length });
+      return ok(res, { agents, total: page.total ?? agents.length, org_id: page.org_id ?? null, org_label: page.org_label ?? null });
     }
     if (method === "GET" && path === `${BRIDGE_PREFIX}/directory`) {
       const { apiUrl } = await ownerContext();
@@ -1255,6 +1371,7 @@ function createMsg9Bridge(deps) {
       const { inbox } = await inboxFor(key, signal);
       await deps.api.markRead(inbox.api_url, inbox.api_key, messageId, "human", signal);
       await setMessageMark(key, messageId, { read_by: "human" });
+      invalidateUnreadCache();
       deps.events?.emit("read");
       return ok(res, { message_id: messageId, read: true });
     }
@@ -1272,6 +1389,7 @@ function createMsg9Bridge(deps) {
         });
       }
       await setMessageMark(key, messageId, { read_by: "human", processed_by: "human" });
+      invalidateUnreadCache();
       deps.events?.emit("done");
       return ok(res, { message_id: messageId, processed: true });
     }
@@ -1301,6 +1419,7 @@ function createMsg9Bridge(deps) {
       const mailDomain = typeof me.mail_domain === "string" ? me.mail_domain : void 0;
       const addressDomain2 = typeof me.address_domain === "string" ? me.address_domain : null;
       await setOwner({ api_key: ownerKey, api_url: apiUrl, id, name: name2, slug, mail_domain: mailDomain, address_domain: addressDomain2 });
+      invalidateUnreadCache();
       return ok(res, {
         owner: {
           name: name2 ?? null,
@@ -1322,6 +1441,7 @@ function createMsg9Bridge(deps) {
       if (!existing?.api_key) throw new BridgeError(404, "unknown-workspace", `no inbox is registered as "${key}"`);
       const workspace = deps.listWorkspaces().find((row) => row.key === key) ?? { key, title: existing.title, path: existing.path };
       const result = await migrateInbox(workspace, existing, str(body.old_owner_key));
+      invalidateUnreadCache();
       deps.log(`migrated ${key}: ${existing.address} -> ${result.inbox.address}`);
       deps.events?.emit("migrate");
       return ok(res, {
@@ -1347,6 +1467,7 @@ function createMsg9Bridge(deps) {
         title ? { ...workspace, title } : workspace,
         signal
       );
+      if (provisioned) invalidateUnreadCache();
       return ok(res, { key: workspace.key, address: inbox.address, provisioned });
     }
     if (method === "POST" && path === `${BRIDGE_PREFIX}/resolve`) {
@@ -1782,7 +1903,7 @@ ${formatMessage(message, Math.max(0, args.body_limit ?? 0))}`;
           );
         }
         const { api_key } = await ownerRotateAgentKey(owner.api_url, owner.api_key, inbox.address, exec?.signal);
-        await upsertWorkspaceInbox(workspace.key, { ...inbox, api_key });
+        await upsertWorkspaceInbox(workspace.key, { api_key });
         return L(
           "\u5DF2\u8F6E\u6362\u300C{title}\u300D({address}) \u7684 key\uFF0C\u65B0 key \u5DF2\u4FDD\u5B58\u3002",
           'Rotated the key for "{title}" ({address}); the new key is saved.',
@@ -2006,6 +2127,16 @@ function unseenMessages(messages, lastSeenId, lastSeenAt) {
   }
   return messages;
 }
+function createNonReentrant(task) {
+  let running = false;
+  return () => {
+    if (running) return;
+    running = true;
+    void task().finally(() => {
+      running = false;
+    });
+  };
+}
 async function pollOnce(deps, rt) {
   const state = await deps.loadState();
   for (const [key, inbox] of Object.entries(state.workspaces)) {
@@ -2014,6 +2145,13 @@ async function pollOnce(deps, rt) {
       await pollInbox(deps, rt, key, inbox);
     } catch (error) {
       deps.log(`watch poll failed for ${key}: ${error?.message ?? String(error)}`);
+      const status = error?.status;
+      if (status === 429) {
+        const serverWait = error?.retryAfter;
+        const backoff = typeof serverWait === "number" && serverWait > 0 ? serverWait * 1e3 : 6e4;
+        deps.log(`watch poll rate-limited for ${key}; backing off ${backoff / 1e3}s`);
+        await (deps.sleep ?? defaultSleep)(backoff);
+      }
     }
   }
 }
@@ -2094,7 +2232,10 @@ async function pollInbox(deps, rt, key, inbox) {
   const all = page.messages ?? [];
   if (page.next_cursor) {
     await deps.setWatchState(key, { watch_cursor: page.next_cursor });
-    if (all[0]) await deps.setWatchState(key, { watch_last_message_id: all[0].message_id });
+    if (all[0]) await deps.setWatchState(key, {
+      watch_last_message_id: all[0].message_id,
+      ...all[0].created_at ? { watch_last_seen_at: all[0].created_at } : {}
+    });
     return;
   }
   const fresh = unseenMessages(all, inbox.watch_last_message_id, inbox.watch_last_seen_at);
@@ -2249,6 +2390,7 @@ function startWatcher(ctx, agents, getRegistry, log, events, reconcileUnread) {
     isPaused: () => getNotifyPaused(),
     resolveAgentById: (id) => agents.get(id),
     batchWindowMs: Math.max(0, Number(process.env.MSG9_WATCH_BATCH_MS ?? 12e3) || 12e3),
+    sleep: defaultSleep,
     resolveAgent: async ({ inbox }) => {
       const registry = getRegistry();
       if (registry?.resolveByPath) {
@@ -2285,7 +2427,7 @@ function startWatcher(ctx, agents, getRegistry, log, events, reconcileUnread) {
         loopControllers.clear();
       };
       const startPolling = () => {
-        pollTimer ??= setInterval(() => void pollOnce(deps, rt), WATCH_POLL_MS);
+        pollTimer ??= setInterval(createNonReentrant(() => pollOnce(deps, rt)), WATCH_POLL_MS);
       };
       const reconcile = async () => {
         if (streamUnsupported || master.signal.aborted) return;
@@ -2371,15 +2513,18 @@ export {
   computeUnread,
   createBridgeEventBus,
   createMsg9Bridge,
+  createNonReentrant,
   createWatchRuntime,
   defaultBridgeDeps,
   ensureInbox,
   flushBatch,
   inject,
+  invalidateUnreadCache,
   isTrustedRequest,
   listWorkspaces,
   loadState,
   matchWorkspaceByPath,
+  migrateInbox,
   name,
   ownerContext,
   pluginNotice,
@@ -2387,8 +2532,10 @@ export {
   renderMailNotice,
   resolveInbox,
   resolveWorkspace,
+  setOwner,
   setWorkspaceRegistry,
   stateFilePath,
   streamInboxLoop,
-  unseenMessages
+  unseenMessages,
+  upsertWorkspaceInbox
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-msg9-kit",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "dsh (DeepSeek Harness) msg9 kit: one msg9.io inbox per workspace. Model tools (send/receive/read/contacts/resolve) plus a /msg9 command in the agent, and a ✉ sidebar icon that opens the same mailbox in the GUI — inbox, outbox and address book, with an unread badge. 给每个 dsh workspace 一个 msg9.io 收件箱：Agent 用工具收发，界面里点 ✉ 就能看同一份邮件。",
   "type": "module",
   "main": "lib/index.js",
@@ -59,7 +59,7 @@
   "scripts": {
     "build": "node scripts/build.mjs",
     "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "node tests/smoke.test.mjs && node tests/client.test.mjs && node tests/cordis.test.mjs && node tests/watch.test.mjs && node tests/watch-integration.test.mjs",
+    "test": "node tests/smoke.test.mjs && node tests/client.test.mjs && node tests/cordis.test.mjs && node tests/watch.test.mjs && node tests/watch-integration.test.mjs && node tests/host-fixes.test.mjs",
     "prepare": "npm run build",
     "prepack": "npm run build"
   },