dsh-sessions-manager 3.4.0 → 3.4.1

package/lib/index.js

@@ -405,10 +405,99 @@ function createAutoArchiveStore(options = {}) {
       return store;
     });
   }
-  function isFresh(store, now = Date.now()) {
+  function isFresh2(store, now = Date.now()) {
     return Number.isFinite(store && store.lastRunAt) && now - store.lastRunAt < RUN_INTERVAL_MS;
   }
-  return { read, write, mutate, update, recordRun, isFresh, indexPath, dir };
+  return { read, write, mutate, update, recordRun, isFresh: isFresh2, indexPath, dir };
+}
+
+// src/session-meta-cache.js
+var DEFAULT_TTL_MS = 5 * 60 * 1e3;
+var DEFAULT_MAX = 4e3;
+function fingerprintOf(stat2) {
+  if (!stat2 || typeof stat2 !== "object") return null;
+  const mtimeMs = stat2.mtimeMs;
+  const size = stat2.size;
+  if (typeof mtimeMs !== "number" || !Number.isFinite(mtimeMs) || mtimeMs <= 0) return null;
+  if (typeof size !== "number" || !Number.isFinite(size) || size < 0) return null;
+  return `${Math.floor(mtimeMs)}:${size}`;
+}
+function isFresh(entry, stat2, now, ttlMs = DEFAULT_TTL_MS) {
+  if (!entry) return false;
+  const fp = fingerprintOf(stat2);
+  if (!fp) return false;
+  if (entry.fingerprint !== fp) return false;
+  if (typeof entry.at !== "number") return false;
+  return now - entry.at <= ttlMs;
+}
+function partitionByCache(ids, statsById, cache, now = Date.now(), ttlMs = DEFAULT_TTL_MS) {
+  const cached = /* @__PURE__ */ new Map();
+  const missing = [];
+  for (const id of ids) {
+    const entry = cache && cache.get(String(id));
+    const stat2 = statsById && statsById.get(String(id));
+    if (isFresh(entry, stat2, now, ttlMs) && entry && entry.meta) {
+      cached.set(String(id), entry.meta);
+    } else {
+      missing.push(String(id));
+    }
+  }
+  return { cached, missing };
+}
+function createSessionMetaCache(opts = {}) {
+  const ttlMs = Number.isFinite(opts.ttlMs) ? opts.ttlMs : DEFAULT_TTL_MS;
+  const max = Number.isInteger(opts.max) && opts.max > 0 ? opts.max : DEFAULT_MAX;
+  const map = /* @__PURE__ */ new Map();
+  let hits = 0;
+  let misses = 0;
+  return {
+    // 命中返回 meta，未命中/无法校验返回 null。
+    get(id, stat2) {
+      const key = String(id);
+      const entry = map.get(key);
+      if (isFresh(entry, stat2, Date.now(), ttlMs)) {
+        hits++;
+        map.delete(key);
+        map.set(key, entry);
+        return entry.meta;
+      }
+      misses++;
+      return null;
+    },
+    set(id, stat2, meta) {
+      if (!meta) return null;
+      const fp = fingerprintOf(stat2);
+      if (!fp) return null;
+      const key = String(id);
+      map.delete(key);
+      map.set(key, { fingerprint: fp, at: Date.now(), meta });
+      if (map.size > max) {
+        const oldest = map.keys().next().value;
+        if (oldest !== void 0) map.delete(oldest);
+      }
+      return meta;
+    },
+    // 批量判定：一次算出「命中缓存」与「需要解码」两组，供列表构建做批量投影。
+    partition(ids, statsById) {
+      return partitionByCache(ids, statsById, map, Date.now(), ttlMs);
+    },
+    invalidate(id) {
+      if (id == null) return false;
+      const key = String(id);
+      const had = map.has(key);
+      map.delete(key);
+      return had;
+    },
+    clear() {
+      map.clear();
+    },
+    get size() {
+      return map.size;
+    },
+    stats() {
+      return { size: map.size, hits, misses, ttlMs };
+    }
+  };
 }
 
 // src/index.js
@@ -500,7 +589,24 @@ function apply(ctx) {
   const sq = ctx.sessionQuery;
   const dom = () => ctx.storageDomain.get("workspace");
   const authorityTitleCache = /* @__PURE__ */ new Map();
-  let authorityTitlesLoaded = false;
+  const metaCache = createSessionMetaCache();
+  function metaFromSnapshot(o) {
+    let title = null, createdAt = null, cwd = null;
+    if (o) {
+      if (o.title && o.title.title) title = String(o.title.title);
+      if (o.session) {
+        cwd = o.session.cwd || null;
+        createdAt = o.session.createdAt || null;
+      }
+    }
+    return { title, cwd, createdAt };
+  }
+  function unwrapSnapshot(result) {
+    if (!result) return null;
+    if (result.status === "fulfilled") return result.value || null;
+    if (result.status === "rejected") return null;
+    return result;
+  }
   async function archivedState() {
     const d = dom();
     if (!d) throw new Error("workspace domain is not open");
@@ -534,56 +640,65 @@ function apply(ctx) {
     return operation;
   }
   let wsByPath = {};
-  async function resolveOne(id, usage) {
-    let title = null, createdAt = null, cwd = null;
-    try {
-      const o = await sq.readTitleSnapshot(id);
-      if (o) {
-        if (o.title && o.title.title) title = String(o.title.title);
-        if (o.session) {
-          cwd = o.session.cwd || null;
-          createdAt = o.session.createdAt || null;
-        }
-      }
-    } catch (e) {
-    }
-    if (!title || !cwd) {
-      try {
-        const r = await sp.readFrom(id, 0);
-        if (r.meta) {
-          if (!cwd) cwd = r.meta.cwd || null;
-          if (!createdAt) createdAt = r.meta.createdAt || null;
-        }
-        if (!title && Array.isArray(r.events)) title = foldTitle(r.events);
-      } catch (e2) {
-      }
-    }
+  function buildItem(key, meta, usage, exposeUsage) {
+    const cwd = meta.cwd || null;
     const ws = cwd ? wsByPath[cwd] : void 0;
-    const workspaceGone = !!(cwd && !ws);
+    const title = meta.title || null;
     const display = title ? String(title).length > MAX_TITLE ? String(title).slice(0, MAX_TITLE) + "\u2026" : String(title) : null;
     const base = {
-      sessionId: id,
+      sessionId: key,
       title: display,
-      createdAt: createdAt || null,
-      workspacePath: cwd || null,
+      createdAt: meta.createdAt || null,
+      workspacePath: cwd,
       workspaceTitle: ws && ws.title ? ws.title : null,
-      workspaceGone: workspaceGone ? true : false,
+      workspaceGone: !!(cwd && !ws),
       hasWorkspace: !!cwd
     };
-    if (usage) {
-      if (usage.sizeById && usage.sizeById.has(id)) base.sizeBytes = usage.sizeById.get(id);
-      if (usage.mtimeById && usage.mtimeById.has(id)) base.updatedAt = usage.mtimeById.get(id);
+    if (exposeUsage && usage) {
+      if (usage.sizeById && usage.sizeById.has(key)) base.sizeBytes = usage.sizeById.get(key);
+      if (usage.mtimeById && usage.mtimeById.has(key)) base.updatedAt = usage.mtimeById.get(key);
     }
     return base;
   }
-  async function collectUsage() {
+  async function resolveOne(id, usage, opts = {}) {
+    const key = String(id);
+    const statInfo = usage ? { mtimeMs: usage.mtimeById.get(key), size: usage.sizeById.get(key) } : null;
+    const cached = metaCache.get(key, statInfo);
+    if (cached) return buildItem(key, cached, usage, opts.exposeUsage);
+    let meta = { title: null, cwd: null, createdAt: null };
+    if (opts.preloaded !== void 0) {
+      meta = metaFromSnapshot(unwrapSnapshot(opts.preloaded));
+    } else if (typeof sq.readTitleSnapshot === "function") {
+      try {
+        meta = metaFromSnapshot(await sq.readTitleSnapshot(id));
+      } catch (e) {
+      }
+    }
+    if (!meta.title || !meta.cwd) {
+      try {
+        const r = await sp.readFrom(id, 0);
+        if (r.meta) {
+          if (!meta.cwd) meta.cwd = r.meta.cwd || null;
+          if (!meta.createdAt) meta.createdAt = r.meta.createdAt || null;
+        }
+        if (!meta.title && Array.isArray(r.events)) meta.title = foldTitle(r.events);
+      } catch (e2) {
+      }
+    }
+    metaCache.set(key, statInfo, meta);
+    return buildItem(key, meta, usage, opts.exposeUsage);
+  }
+  async function collectUsage(preloadedHeaders) {
     const sizeById = /* @__PURE__ */ new Map();
     const mtimeById = /* @__PURE__ */ new Map();
-    let headers = [];
-    try {
-      headers = await sp.list();
-    } catch (e) {
-      headers = [];
+    let headers = null;
+    if (Array.isArray(preloadedHeaders)) headers = preloadedHeaders;
+    else {
+      try {
+        headers = await sp.list();
+      } catch (e) {
+        headers = [];
+      }
     }
     if (!Array.isArray(headers)) headers = [];
     const CHUNK = 8;
@@ -1034,25 +1149,38 @@ function apply(ctx) {
       return { next: null, value: { ok: true, archived: true } };
     });
   }
-  async function allSessionItems(opts = {}) {
-    let materialized = /* @__PURE__ */ new Set();
-    let live = ctx.get("sessions");
-    let headersOk = false;
+  async function projectTitles(ids) {
+    const out = /* @__PURE__ */ new Map();
+    if (!ids || !ids.length) return out;
+    if (typeof sq.readTitleSnapshots !== "function") return out;
     try {
-      const headers = await sp.list();
-      materialized = new Set(headers.map((h) => String(h.id)));
-      headersOk = true;
+      const results = await sq.readTitleSnapshots(ids);
+      if (!Array.isArray(results)) return out;
+      results.forEach((result, index) => {
+        const id = String(ids[index]);
+        out.set(id, unwrapSnapshot(result));
+      });
     } catch (e) {
     }
-    const ids = [];
+    return out;
+  }
+  async function allSessionItems(opts = {}) {
+    let headers = [];
+    let headersOk = false;
     try {
-      for (const header of await sp.list()) ids.push(String(header.id));
+      headers = await sp.list();
+      headersOk = Array.isArray(headers);
+      if (!headersOk) headers = [];
     } catch (e) {
+      headers = [];
     }
+    let live = ctx.get("sessions");
+    const ids = headers.map((h) => String(h.id));
     if (live) {
       try {
         live.list().forEach((s) => {
-          if (!ids.includes(String(s.id))) ids.push(String(s.id));
+          const sid = String(s.id);
+          if (!ids.includes(sid)) ids.push(sid);
         });
       } catch (e) {
       }
@@ -1072,10 +1200,16 @@ function apply(ctx) {
     }
     const currentArchived = new Set((await archivedState().catch(() => ({ archivedSessionIds: [] }))).archivedSessionIds || []);
     const items = [];
-    const usage = opts && opts.usage ? await collectUsage() : null;
+    const usage = await collectUsage(headers);
+    const statsById = new Map(visibleIds.map((id) => [id, { mtimeMs: usage.mtimeById.get(id), size: usage.sizeById.get(id) }]));
+    const { cached, missing } = metaCache.partition(visibleIds, statsById);
+    const snapshotById = await projectTitles(missing);
     const CHUNK = 6;
     for (let i = 0; i < visibleIds.length; i += CHUNK) {
-      const res2 = await Promise.all(visibleIds.slice(i, i + CHUNK).map((id) => resolveOne(id, usage)));
+      const res2 = await Promise.all(visibleIds.slice(i, i + CHUNK).map((id) => resolveOne(id, usage, {
+        exposeUsage: !!(opts && opts.usage),
+        preloaded: snapshotById.has(id) ? snapshotById.get(id) : void 0
+      })));
       for (const it of res2) items.push({ ...it, archived: currentArchived.has(it.sessionId) });
     }
     let starredSet = /* @__PURE__ */ new Set();
@@ -1123,35 +1257,38 @@ function apply(ctx) {
   }
   async function sidebarAuthority() {
     const ids = [];
+    let headers = [];
     try {
-      for (const header of await sp.list()) ids.push(String(header.id));
+      headers = await sp.list();
     } catch (e) {
+      headers = [];
     }
+    if (!Array.isArray(headers)) headers = [];
+    for (const header of headers) ids.push(String(header.id));
     const sessions = ctx.get("sessions");
     try {
       if (sessions) sessions.list().forEach((session) => {
-        if (!ids.includes(String(session.id))) ids.push(String(session.id));
+        const sid = String(session.id);
+        if (!ids.includes(sid)) ids.push(sid);
       });
     } catch (e) {
     }
     const store = await readTrashStore();
-    if (!authorityTitlesLoaded && ids.length && typeof sq.readTitleSnapshots === "function") {
-      const results = await sq.readTitleSnapshots(ids);
-      results.forEach((result, index) => {
-        if (result && result.status === "fulfilled" && result.value && result.value.title && typeof result.value.title.title === "string") {
-          authorityTitleCache.set(ids[index], result.value.title.title);
-        }
-      });
-      authorityTitlesLoaded = true;
-    } else if (!authorityTitlesLoaded) {
-      for (const sid of ids) {
-        try {
-          const snapshot = await sq.readTitleSnapshot(sid);
-          if (snapshot && snapshot.title && typeof snapshot.title.title === "string") authorityTitleCache.set(sid, snapshot.title.title);
-        } catch (e) {
+    if (ids.length) {
+      const usage = await collectUsage(headers);
+      const statsById = new Map(ids.map((id) => [id, { mtimeMs: usage.mtimeById.get(id), size: usage.sizeById.get(id) }]));
+      const { cached, missing } = metaCache.partition(ids, statsById);
+      const snapshotById = await projectTitles(missing);
+      for (const id of ids) {
+        let meta = cached.get(id) || null;
+        if (!meta) {
+          const snapshot = snapshotById.has(id) ? snapshotById.get(id) : typeof sq.readTitleSnapshot === "function" ? await sq.readTitleSnapshot(id).catch(() => null) : null;
+          const next = metaFromSnapshot(snapshot);
+          metaCache.set(id, statsById.get(id), next);
+          meta = next;
         }
+        if (meta && meta.title) authorityTitleCache.set(id, String(meta.title));
       }
-      authorityTitlesLoaded = true;
     }
     return {
       titles: Object.fromEntries(authorityTitleCache),
@@ -1380,7 +1517,9 @@ function apply(ctx) {
           const body = await readJsonBody(req);
           const sid = body && typeof body.sessionId === "string" ? body.sessionId : null;
           if (!sid) return json(res, { ok: false, error: "missing sessionId" }, 400);
-          json(res, await deleteOne(sid));
+          const out = await deleteOne(sid);
+          metaCache.invalidate(sid);
+          json(res, out);
         } catch (e) {
           json(res, { ok: false, error: String(e && e.message || e) }, errorStatus(e));
         }
@@ -1398,6 +1537,7 @@ function apply(ctx) {
           for (const sid of ids) {
             try {
               results.push({ sessionId: sid, ok: true, ...await deleteOne(sid) });
+              metaCache.invalidate(sid);
             } catch (e) {
               results.push({ sessionId: sid, ok: false, error: String(e && e.message || e) });
             }
@@ -1461,7 +1601,9 @@ function apply(ctx) {
           const body = await readJsonBody(req);
           const sid = body && typeof body.sessionId === "string" ? body.sessionId : null;
           if (!sid) return json(res, { ok: false, error: "missing sessionId" }, 400);
-          json(res, await restoreFromTrash(sid));
+          const out = await restoreFromTrash(sid);
+          metaCache.invalidate(sid);
+          json(res, out);
         } catch (e) {
           json(res, { ok: false, error: String(e && e.message || e) }, 500);
         }
@@ -1475,7 +1617,9 @@ function apply(ctx) {
           const body = await readJsonBody(req);
           const sid = body && typeof body.sessionId === "string" ? body.sessionId : null;
           if (!sid) return json(res, { ok: false, error: "missing sessionId" }, 400);
-          json(res, await purgeFromTrash(sid));
+          const out = await purgeFromTrash(sid);
+          metaCache.invalidate(sid);
+          json(res, out);
         } catch (e) {
           json(res, { ok: false, error: String(e && e.message || e) }, 500);
         }
@@ -1493,6 +1637,7 @@ function apply(ctx) {
           for (const sid of ids) {
             try {
               results.push({ sessionId: sid, ok: true, ...await purgeFromTrash(sid) });
+              metaCache.invalidate(sid);
             } catch (e) {
               results.push({ sessionId: sid, ok: false, error: String(e && e.message || e) });
             }
@@ -1592,6 +1737,7 @@ function apply(ctx) {
           if (!sid) return json(res, { ok: false, error: "missing sessionId" }, 400);
           if (!target) return json(res, { ok: false, error: "missing targetPath" }, 400);
           const moved = await moveOne(sid, target);
+          metaCache.invalidate(sid);
           try {
             await reindexRegistry();
           } catch (e) {