@electron-memory/monitor 0.2.2 → 0.2.5

package/dist/index.js

@@ -299,13 +299,13 @@ var DataPersister = class {
       return null;
     }
   }
-  /** 获取所有会话列表 */
+  /** 获取所有会话列表（按 startTime 降序，最新在前；与索引写入顺序无关） */
   getSessions() {
     const indexFile = path.join(this.storageDir, "sessions.json");
     try {
       const content = fs.readFileSync(indexFile, "utf-8");
       const index = JSON.parse(content);
-      return index.sessions;
+      return this.sortSessionsByStartDesc(index.sessions);
     } catch {
       return [];
     }
@@ -408,11 +408,19 @@ var DataPersister = class {
   saveSessionIndex(sessions) {
     const indexFile = path.join(this.storageDir, "sessions.json");
     const index = {
-      sessions,
+      sessions: this.sortSessionsByStartDesc(sessions),
       lastUpdated: Date.now()
     };
     fs.writeFileSync(indexFile, JSON.stringify(index, null, 2), "utf-8");
   }
+  /** 统一排序：startTime 新 → 旧（同毫秒时按 id 稳定排序） */
+  sortSessionsByStartDesc(sessions) {
+    return [...sessions].sort((a, b) => {
+      const t = b.startTime - a.startTime;
+      if (t !== 0) return t;
+      return String(b.id).localeCompare(String(a.id));
+    });
+  }
   ensureDirectory(dir) {
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true });
@@ -475,10 +483,14 @@ var SessionManager = class {
   getCurrentSession() {
     return this.currentSession;
   }
-  /** 开始新会话 */
+  /** 开始新会话；若顶替了上一条进行中的会话，通过 `replaced` 返回以便主进程补写 report.json */
   startSession(label, description) {
+    if (!this.currentSession) {
+      this.reconcileStaleRunningInIndex();
+    }
+    let replaced = null;
     if (this.currentSession && this.currentSession.status === "running") {
-      this.endSession();
+      replaced = this.endSession();
     }
     const sessionId = v4();
     const { dataFile, metaFile } = this.persister.createSessionFiles(sessionId);
@@ -494,7 +506,7 @@ var SessionManager = class {
     };
     this.currentSession = session;
     this.persister.saveSessionMeta(session);
-    return session;
+    return { session, replaced };
   }
   /** 结束当前会话 */
   endSession() {
@@ -522,6 +534,24 @@ var SessionManager = class {
   getSession(sessionId) {
     return this.persister.readSessionMeta(sessionId);
   }
+  /**
+   * 当前内存无活动会话时，将索引中仍为 running 的条目标为 aborted（进程异常退出后残留）
+   */
+  reconcileStaleRunningInIndex() {
+    if (this.currentSession) return;
+    const sessions = this.persister.getSessions();
+    const now = Date.now();
+    for (const s of sessions) {
+      if (s.status !== "running") continue;
+      const fixed = {
+        ...s,
+        status: "aborted",
+        endTime: now,
+        duration: now - s.startTime
+      };
+      this.persister.saveSessionMeta(fixed);
+    }
+  }
 };
 
 // src/core/anomaly.ts
@@ -692,10 +722,38 @@ var os2 = __toESM(require("os"));
 var Analyzer = class {
   /** 生成会话报告 */
   generateReport(sessionId, label, description, startTime, endTime, snapshots, anomalies, dataFile) {
+    const environment = this.collectEnvironment();
+    const eventMarks = this.collectEventMarks(snapshots);
     if (snapshots.length === 0) {
-      throw new Error("No snapshots to analyze");
+      const summary2 = this.emptySummary();
+      const suggestions2 = [
+        {
+          id: "no-snapshots",
+          severity: "info",
+          category: "optimization",
+          title: "\u4F1A\u8BDD\u5185\u6CA1\u6709\u53EF\u7528\u7684\u5185\u5B58\u5FEB\u7167",
+          description: "\u7ED3\u675F\u4F1A\u8BDD\u65F6\u78C1\u76D8\u4E0A\u5C1A\u672A\u5199\u5165\u4EFB\u4F55\u91C7\u6837\u70B9\uFF08\u4F8B\u5982\u521A\u542F\u52A8\u5C31\u7ACB\u523B\u7ED3\u675F\uFF0C\u6216\u91C7\u96C6\u95F4\u9694\u5C1A\u672A\u89E6\u53D1\uFF09\u3002\u62A5\u544A\u4E2D\u7684\u7EDF\u8BA1\u4E0E\u8D8B\u52BF\u65E0\u6CD5\u8BA1\u7B97\u3002",
+          suggestions: [
+            "\u4FDD\u6301\u4F1A\u8BDD\u5F00\u542F\u81F3\u5C11\u4E00\u4E2A\u91C7\u96C6\u5468\u671F\u540E\u518D\u70B9\u300C\u7ED3\u675F\u4F1A\u8BDD\u300D",
+            "\u5728\u914D\u7F6E\u4E2D\u9002\u5F53\u7F29\u77ED\u91C7\u96C6\u95F4\u9694\u4EE5\u4FBF\u66F4\u5FEB\u5F97\u5230\u6570\u636E"
+          ]
+        }
+      ];
+      return {
+        sessionId,
+        label,
+        description,
+        startTime,
+        endTime,
+        duration: endTime - startTime,
+        environment,
+        summary: summary2,
+        anomalies,
+        suggestions: suggestions2,
+        eventMarks,
+        dataFile
+      };
     }
-    const environment = this.collectEnvironment();
     const summary = this.computeSummary(snapshots);
     const suggestions = this.generateSuggestions(snapshots, summary, anomalies);
     return {
@@ -709,6 +767,7 @@ var Analyzer = class {
       summary,
       anomalies,
       suggestions,
+      eventMarks,
       dataFile
     };
   }
@@ -745,6 +804,53 @@ var Analyzer = class {
     };
   }
   // ===== 私有方法 =====
+  emptySummary() {
+    const z = this.computeMetricSummary([]);
+    const stable = { slope: 0, r2: 0, direction: "stable", confidence: "low" };
+    return {
+      totalProcesses: { min: 0, max: 0, avg: 0 },
+      totalMemory: z,
+      byProcessType: {
+        browser: z,
+        renderer: [],
+        gpu: null,
+        utility: null
+      },
+      mainV8Heap: {
+        heapUsed: z,
+        heapTotal: z,
+        external: z,
+        arrayBuffers: z
+      },
+      trends: {
+        totalMemory: stable,
+        browserMemory: stable,
+        rendererMemory: stable
+      }
+    };
+  }
+  /** 从快照展平所有标记，并附上该采样点的分类内存（KB） */
+  collectEventMarks(snapshots) {
+    const out = [];
+    for (const s of snapshots) {
+      if (!s.marks?.length) continue;
+      const browserKB = s.processes.filter((p) => p.type === "Browser").reduce((sum, p) => sum + p.memory.workingSetSize, 0);
+      const rendererKB = s.processes.filter((p) => p.type === "Tab" && !p.isMonitorProcess).reduce((sum, p) => sum + p.memory.workingSetSize, 0);
+      const gpuKB = s.processes.filter((p) => p.type === "GPU").reduce((sum, p) => sum + p.memory.workingSetSize, 0);
+      for (const m of s.marks) {
+        out.push({
+          timestamp: m.timestamp,
+          label: m.label,
+          metadata: m.metadata,
+          totalWorkingSetKB: s.totalWorkingSetSize,
+          browserKB,
+          rendererKB,
+          gpuKB
+        });
+      }
+    }
+    return out;
+  }
   collectEnvironment() {
     const cpus2 = os2.cpus();
     return {
@@ -1114,6 +1220,7 @@ var path3 = __toESM(require("path"));
 var import_electron2 = require("electron");
 var import_promises = require("fs/promises");
 var path2 = __toESM(require("path"));
+var import_node_url = require("url");
 var SCHEME = "emm-dashboard";
 var privilegedRegistered = false;
 var handlerRegistered = false;
@@ -1148,6 +1255,48 @@ function isPathInsideRoot(filePath, root) {
   }
   return true;
 }
+function urlToUiRelativePath(requestUrl) {
+  let u;
+  try {
+    u = new URL(requestUrl);
+  } catch {
+    return "";
+  }
+  let p = "";
+  try {
+    p = decodeURIComponent(u.pathname || "");
+  } catch {
+    p = u.pathname || "";
+  }
+  p = p.replace(/^\/+/, "");
+  const host = (u.hostname || "").toLowerCase();
+  if (p.includes("..")) {
+    return "";
+  }
+  if (host === "electron" || host === "") {
+    return p || "index.html";
+  }
+  if (p) {
+    return `${host}/${p}`.replace(/\\/g, "/");
+  }
+  if (host.includes(".")) {
+    return host;
+  }
+  return "index.html";
+}
+function bufferToResponseBody(buf) {
+  return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
+}
+function looksLikeHtml(buf) {
+  let i = 0;
+  if (buf.length >= 3 && buf[0] === 239 && buf[1] === 187 && buf[2] === 191) {
+    i = 3;
+  }
+  while (i < buf.length && (buf[i] === 32 || buf[i] === 9 || buf[i] === 10 || buf[i] === 13)) {
+    i += 1;
+  }
+  return i < buf.length && buf[i] === 60;
+}
 function corsHeaders() {
   return {
     "Access-Control-Allow-Origin": "*",
@@ -1189,24 +1338,40 @@ function ensureDashboardProtocolHandler(uiRoot) {
       return new Response(null, { status: 204, headers: corsHeaders() });
     }
     try {
-      let pathname;
-      try {
-        pathname = decodeURIComponent(new URL(request.url).pathname);
-      } catch {
-        return new Response("Bad URL", { status: 400, headers: corsHeaders() });
+      const rel = urlToUiRelativePath(request.url);
+      if (!rel || rel.includes("..")) {
+        return new Response("Bad path", { status: 400, headers: corsHeaders() });
       }
-      let rel = pathname.replace(/^\/+/, "");
-      if (!rel) {
-        rel = "index.html";
-      }
-      const filePath = path2.resolve(path2.join(base, rel));
+      const filePath = path2.resolve(path2.join(base, ...rel.split("/")));
       if (!isPathInsideRoot(filePath, base)) {
         return new Response("Forbidden", { status: 403, headers: corsHeaders() });
       }
-      const body = await (0, import_promises.readFile)(filePath);
+      const fileUrl = (0, import_node_url.pathToFileURL)(filePath).href;
+      let upstream;
+      try {
+        upstream = await import_electron2.net.fetch(fileUrl);
+      } catch {
+        upstream = new Response(null, { status: 599 });
+      }
+      let buf;
+      if (!upstream.ok) {
+        buf = await (0, import_promises.readFile)(filePath);
+      } else {
+        const ab = await upstream.arrayBuffer();
+        buf = Buffer.from(ab);
+      }
       const ext = path2.extname(filePath).toLowerCase();
+      if (ext === ".html" && !looksLikeHtml(buf)) {
+        console.error(
+          "[@electron-memory/monitor] emm-dashboard: not HTML at",
+          filePath,
+          "url=",
+          request.url
+        );
+        return new Response("Invalid dashboard HTML", { status: 500, headers: corsHeaders() });
+      }
       const mime = MIME_BY_EXT[ext] || "application/octet-stream";
-      return new Response(body, {
+      return new Response(bufferToResponseBody(buf), {
         status: 200,
         headers: {
           "Content-Type": mime,
@@ -1216,6 +1381,7 @@ function ensureDashboardProtocolHandler(uiRoot) {
       });
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
+      console.error("[@electron-memory/monitor] emm-dashboard:", request.url, err);
       return new Response(msg, { status: 404, headers: corsHeaders() });
     }
   });
@@ -1374,10 +1540,28 @@ var IPCMainHandler = class {
       return this.monitor.startSession(args.label, args.description);
     });
     import_electron4.ipcMain.handle(IPC_CHANNELS.SESSION_STOP, async () => {
-      return this.monitor.stopSession();
+      try {
+        const report = await this.monitor.stopSession();
+        if (!report) {
+          return { ok: false, reason: "no_active_session" };
+        }
+        return {
+          ok: true,
+          sessionId: report.sessionId,
+          label: report.label,
+          durationMs: report.duration
+        };
+      } catch (err) {
+        console.error("[electron-memory-monitor] SESSION_STOP failed:", err);
+        return {
+          ok: false,
+          reason: "error",
+          message: err instanceof Error ? err.message : String(err)
+        };
+      }
     });
     import_electron4.ipcMain.handle(IPC_CHANNELS.SESSION_LIST, async () => {
-      return this.monitor.getSessions();
+      return this.monitor.getSessionsPayloadForIpc();
     });
     import_electron4.ipcMain.handle(IPC_CHANNELS.SESSION_REPORT, async (_event, sessionId) => {
       return this.monitor.getSessionReport(sessionId);
@@ -1401,7 +1585,7 @@ var IPCMainHandler = class {
       return this.monitor.getConfig();
     });
     import_electron4.ipcMain.handle(IPC_CHANNELS.GET_SESSIONS, async () => {
-      return this.monitor.getSessions();
+      return this.monitor.getSessionsPayloadForIpc();
     });
     import_electron4.ipcMain.handle(IPC_CHANNELS.SESSION_EXPORT, async (_event, sessionId) => {
       return this.monitor.exportSession(sessionId);
@@ -1412,8 +1596,11 @@ var IPCMainHandler = class {
     import_electron4.ipcMain.handle(IPC_CHANNELS.SESSION_DELETE, async (_event, sessionId) => {
       return this.monitor.deleteSession(sessionId);
     });
-    import_electron4.ipcMain.on(IPC_CHANNELS.RENDERER_REPORT, (_event, detail) => {
-      this.monitor.updateRendererDetail(detail);
+    import_electron4.ipcMain.on(IPC_CHANNELS.RENDERER_REPORT, (event, detail) => {
+      this.monitor.updateRendererDetail({
+        ...detail,
+        webContentsId: event.sender.id
+      });
     });
   }
   /** 向监控面板推送快照数据 */
@@ -1443,6 +1630,10 @@ var DEFAULT_CONFIG = {
   enabled: true,
   autoStart: true,
   openDashboardOnStart: true,
+  session: {
+    autoStartOnLaunch: true,
+    autoLabelPrefix: "\u81EA\u52A8\u4F1A\u8BDD"
+  },
   collectInterval: 2e3,
   persistInterval: 60,
   enableRendererDetail: false,
@@ -1468,6 +1659,36 @@ var DEFAULT_CONFIG = {
 };
 
 // src/core/monitor.ts
+function mergeMarksFromExcludedSnapshots(full, sampled) {
+  const marked = full.filter((s) => s.marks && s.marks.length > 0);
+  if (marked.length === 0) return sampled;
+  const sampledRefs = new Set(sampled);
+  const result = sampled.map((s) => ({
+    ...s,
+    marks: s.marks?.length ? [...s.marks] : void 0
+  }));
+  for (const src of marked) {
+    if (sampledRefs.has(src)) continue;
+    let bestIdx = 0;
+    let bestDiff = Infinity;
+    for (let i = 0; i < result.length; i++) {
+      const d = Math.abs(result[i].timestamp - src.timestamp);
+      if (d < bestDiff) {
+        bestDiff = d;
+        bestIdx = i;
+      }
+    }
+    const target = result[bestIdx];
+    target.marks = [...target.marks || [], ...src.marks];
+  }
+  return result;
+}
+function formatAutoSessionLabel(prefix) {
+  const d = /* @__PURE__ */ new Date();
+  const p2 = (n) => String(n).padStart(2, "0");
+  const stamp = `${d.getFullYear()}-${p2(d.getMonth() + 1)}-${p2(d.getDate())} ${p2(d.getHours())}:${p2(d.getMinutes())}:${p2(d.getSeconds())}`;
+  return `${prefix || "\u81EA\u52A8\u4F1A\u8BDD"} ${stamp}`;
+}
 var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
   constructor(config) {
     super();
@@ -1511,11 +1732,20 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
     });
     this.collector.start();
     this.anomalyDetector.start();
+    this.persister.cleanOldSessions();
+    this.sessionManager.reconcileStaleRunningInIndex();
+    this.started = true;
+    if (this.config.session.autoStartOnLaunch) {
+      try {
+        const label = formatAutoSessionLabel(this.config.session.autoLabelPrefix);
+        this.startSession(label, this.config.session.autoDescription);
+      } catch (err) {
+        console.error("[@electron-memory/monitor] autoStartOnLaunch failed:", err);
+      }
+    }
     if (this.config.openDashboardOnStart) {
       this.openDashboard();
     }
-    this.persister.cleanOldSessions();
-    this.started = true;
   }
   /** 停止监控 */
   async stop() {
@@ -1544,9 +1774,16 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
     if (!this.started) {
       throw new Error("Monitor is not started");
     }
-    const session = this.sessionManager.startSession(label, description);
+    const anomaliesForReplaced = this.anomalyDetector.getAnomalies();
+    const { session, replaced } = this.sessionManager.startSession(label, description);
+    if (replaced) {
+      void this.persistCompletedSessionReport(replaced, anomaliesForReplaced).catch((err) => {
+        console.error("[@electron-memory/monitor] \u88AB\u9876\u66FF\u4F1A\u8BDD\u7684\u62A5\u544A\u5199\u5165\u5931\u8D25:", err);
+      });
+    }
     this.collector.setSessionId(session.id);
     this.anomalyDetector.clearAnomalies();
+    this.emit("session-start", session);
     return session.id;
   }
   /** 结束当前会话 */
@@ -1557,8 +1794,26 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
     const completedSession = this.sessionManager.endSession();
     if (!completedSession) return null;
     this.collector.setSessionId(null);
-    const snapshots = this.persister.readSessionSnapshots(completedSession.id);
     const anomalies = this.anomalyDetector.getAnomalies();
+    const report = await this.persistCompletedSessionReport(completedSession, anomalies);
+    return report;
+  }
+  /** 为已落盘元数据的会话生成并写入 report.json（显式结束或被新会话顶替） */
+  async persistCompletedSessionReport(completedSession, anomalies) {
+    const fs2 = await import("fs/promises");
+    const snapshotsPath = path4.join(
+      this.persister.getStorageDir(),
+      completedSession.id,
+      "snapshots.jsonl"
+    );
+    let snapshots = [];
+    try {
+      const content = await fs2.readFile(snapshotsPath, "utf-8");
+      const lines = content.trim().split("\n").filter(Boolean);
+      snapshots = lines.map((line) => JSON.parse(line));
+    } catch {
+      snapshots = this.persister.readSessionSnapshots(completedSession.id);
+    }
     const report = this.analyzer.generateReport(
       completedSession.id,
       completedSession.label,
@@ -1570,8 +1825,7 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
       completedSession.dataFile
     );
     const reportPath = path4.join(this.persister.getStorageDir(), completedSession.id, "report.json");
-    const fs2 = await import("fs");
-    fs2.writeFileSync(reportPath, JSON.stringify(report, null, 2), "utf-8");
+    await fs2.writeFile(reportPath, JSON.stringify(report, null, 2), "utf-8");
     this.emit("session-end", report);
     return report;
   }
@@ -1596,6 +1850,18 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
   async getSessions() {
     return this.sessionManager.getSessions();
   }
+  /**
+   * 供监控面板 IPC：列表来自磁盘索引，是否在录制以内存中的 currentSession 为准（避免索引僵尸 running）
+   */
+  getSessionsPayloadForIpc() {
+    if (!this.started) {
+      return { sessions: [], activeSessionId: null };
+    }
+    return {
+      sessions: this.sessionManager.getSessions(),
+      activeSessionId: this.sessionManager.getCurrentSession()?.id ?? null
+    };
+  }
   /** 获取指定会话报告 */
   async getSessionReport(sessionId) {
     const fs2 = await import("fs");
@@ -1607,7 +1873,6 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
       const session = this.sessionManager.getSession(sessionId);
       if (!session || !session.endTime) return null;
       const snapshots = this.persister.readSessionSnapshots(sessionId);
-      if (snapshots.length === 0) return null;
       return this.analyzer.generateReport(
         session.id,
         session.label,
@@ -1629,17 +1894,18 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
     if (endTime != null) {
       snapshots = snapshots.filter((s) => s.timestamp <= endTime);
     }
+    const beforeDownsample = snapshots;
     const limit = maxPoints ?? 600;
-    if (snapshots.length > limit) {
-      const step = snapshots.length / limit;
+    if (beforeDownsample.length > limit) {
+      const step = beforeDownsample.length / limit;
       const sampled = [];
       for (let i = 0; i < limit; i++) {
-        sampled.push(snapshots[Math.round(i * step)]);
+        sampled.push(beforeDownsample[Math.round(i * step)]);
       }
-      if (sampled[sampled.length - 1] !== snapshots[snapshots.length - 1]) {
-        sampled[sampled.length - 1] = snapshots[snapshots.length - 1];
+      if (sampled[sampled.length - 1] !== beforeDownsample[beforeDownsample.length - 1]) {
+        sampled[sampled.length - 1] = beforeDownsample[beforeDownsample.length - 1];
       }
-      snapshots = sampled;
+      snapshots = mergeMarksFromExcludedSnapshots(beforeDownsample, sampled);
     }
     return snapshots;
   }
@@ -1790,6 +2056,10 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
     return {
       ...DEFAULT_CONFIG,
       ...userConfig,
+      session: {
+        ...DEFAULT_CONFIG.session,
+        ...userConfig.session || {}
+      },
       anomaly: {
         ...DEFAULT_CONFIG.anomaly,
         ...userConfig.anomaly || {}