sessix-server 0.2.7 → 0.2.9

package/dist/index.js

@@ -299,7 +299,7 @@ var import_uuid5 = require("uuid");
 var import_promises4 = require("fs/promises");
 var import_node_os6 = require("os");
 var import_node_path5 = require("path");
-var import_node_child_process5 = require("child_process");
+var import_node_child_process6 = require("child_process");
 var import_node_util = require("util");
 
 // src/providers/ProcessProvider.ts
@@ -2059,79 +2059,120 @@ var ApprovalProxy = class _ApprovalProxy {
 };
 
 // src/mdns/MdnsService.ts
-var import_bonjour_service = __toESM(require("bonjour-service"));
+var import_node_child_process3 = require("child_process");
 var import_node_os4 = require("os");
-function getLanAddresses() {
-  const results = [];
-  for (const [name, addrs] of Object.entries((0, import_node_os4.networkInterfaces)())) {
-    if (name.startsWith("utun") || name === "lo") continue;
-    if (isWindows && (name.startsWith("vEthernet") || name.includes("Loopback"))) continue;
-    for (const addr of addrs ?? []) {
-      if (addr.family === "IPv4" && !addr.internal) {
-        results.push(addr.address);
-      }
-    }
-  }
-  return results;
+function buildTxtArgs(txt) {
+  return Object.entries(txt).map(([k, v]) => `${k}=${v}`);
 }
 var MdnsService = class {
-  bonjour = null;
-  service = null;
+  proc = null;
+  bonjourInstance = null;
+  bonjourService = null;
   wsPort;
   httpPort;
   version;
   pairing;
+  useDnsSd;
   constructor(options) {
     this.wsPort = options.wsPort;
     this.httpPort = options.httpPort;
     this.version = options.version ?? "0.1.0";
     this.pairing = options.pairing ?? "closed";
+    this.useDnsSd = (0, import_node_os4.platform)() === "darwin";
+  }
+  getTxt() {
+    return {
+      version: this.version,
+      httpPort: String(this.httpPort),
+      wsPort: String(this.wsPort),
+      pairing: this.pairing
+    };
   }
   /**
    * 启动 mDNS 广播
    */
   start() {
-    if (this.bonjour) {
+    if (this.useDnsSd) {
+      this.startDnsSd();
+    } else {
+      this.startBonjour();
+    }
+  }
+  startDnsSd() {
+    if (this.proc) {
       console.warn(`[MdnsService] ${t("mdns.alreadyRunning")}`);
       return;
     }
-    const lanAddrs = getLanAddresses();
-    const onMdnsError = (err) => {
-      console.warn(`[MdnsService] mDNS error (non-fatal): ${err.message}`);
-      this.stop();
-    };
-    const opts = lanAddrs.length > 0 ? { interface: lanAddrs[0] } : {};
-    this.bonjour = new import_bonjour_service.default(opts, onMdnsError);
-    this.bonjour.server?.mdns?.on("error", onMdnsError);
-    if (lanAddrs.length > 0) {
-      console.log(`[MdnsService] ${t("mdns.boundInterface", { ip: lanAddrs[0] })}`);
-    }
-    this.service = this.bonjour.publish({
-      name: "Sessix",
-      type: "sessix",
-      port: this.wsPort,
-      txt: {
-        version: this.version,
-        httpPort: String(this.httpPort),
-        wsPort: String(this.wsPort),
-        pairing: this.pairing
+    const args = [
+      "-R",
+      "Sessix",
+      "_sessix._tcp",
+      "local",
+      String(this.wsPort),
+      ...buildTxtArgs(this.getTxt())
+    ];
+    this.proc = (0, import_node_child_process3.spawn)("dns-sd", args, { stdio: "ignore" });
+    this.proc.on("error", (err) => {
+      console.warn(`[MdnsService] dns-sd failed, falling back to bonjour-service: ${err.message}`);
+      this.proc = null;
+      this.useDnsSd = false;
+      this.startBonjour();
+    });
+    this.proc.on("exit", (code) => {
+      if (code !== null && code !== 0) {
+        console.warn(`[MdnsService] dns-sd exited with code ${code}`);
       }
+      this.proc = null;
     });
-    console.log(`[MdnsService] ${t("mdns.started", { port: this.wsPort })}`);
+    console.log(`[MdnsService] ${t("mdns.started", { port: this.wsPort })} (dns-sd)`);
+  }
+  async startBonjour() {
+    if (this.bonjourInstance) {
+      console.warn(`[MdnsService] ${t("mdns.alreadyRunning")}`);
+      return;
+    }
+    try {
+      const { default: Bonjour } = await import("bonjour-service");
+      const { networkInterfaces: networkInterfaces2 } = await import("os");
+      const lanAddrs = getLanAddresses(networkInterfaces2);
+      const opts = lanAddrs.length > 0 ? { interface: lanAddrs[0] } : {};
+      const onError = (err) => {
+        if (err.code === "EADDRINUSE") return;
+        console.warn(`[MdnsService] mDNS error (non-fatal): ${err.message}`);
+      };
+      this.bonjourInstance = new Bonjour(opts, onError);
+      this.bonjourInstance.server?.mdns?.on("error", onError);
+      if (lanAddrs.length > 0) {
+        console.log(`[MdnsService] ${t("mdns.boundInterface", { ip: lanAddrs[0] })}`);
+      }
+      this.bonjourService = this.bonjourInstance.publish({
+        name: "Sessix",
+        type: "sessix",
+        port: this.wsPort,
+        txt: this.getTxt()
+      });
+      console.log(`[MdnsService] ${t("mdns.started", { port: this.wsPort })} (bonjour-service)`);
+    } catch (err) {
+      console.warn(`[MdnsService] bonjour-service failed: ${err.message}`);
+    }
   }
   /**
    * 停止 mDNS 广播
    */
   stop() {
-    if (this.service) {
-      this.service.stop?.(() => {
+    if (this.proc) {
+      this.proc.kill();
+      this.proc = null;
+    }
+    if (this.bonjourService) {
+      this.bonjourService.stop?.(() => {
         console.log(`[MdnsService] ${t("mdns.stopped")}`);
       });
-      this.service = null;
+      this.bonjourService = null;
     }
-    if (this.bonjour) {
-      this.bonjour.destroy();
-      this.bonjour = null;
+    if (this.bonjourInstance) {
+      this.bonjourInstance.destroy();
+      this.bonjourInstance = null;
     }
     console.log(`[MdnsService] ${t("mdns.closed")}`);
   }
@@ -2140,30 +2181,45 @@ var MdnsService = class {
    */
   updatePairingState(state) {
     this.pairing = state;
-    if (!this.bonjour) return;
+    if (this.useDnsSd) {
+      if (this.proc) {
+        this.proc.kill();
+        this.proc = null;
+      }
+      this.startDnsSd();
+      return;
+    }
+    if (!this.bonjourInstance) return;
     const republish = () => {
-      if (!this.bonjour) return;
-      this.service = this.bonjour.publish({
+      if (!this.bonjourInstance) return;
+      this.bonjourService = this.bonjourInstance.publish({
         name: "Sessix",
         type: "sessix",
         port: this.wsPort,
-        txt: {
-          version: this.version,
-          httpPort: String(this.httpPort),
-          wsPort: String(this.wsPort),
-          pairing: state
-        }
+        txt: this.getTxt()
       });
     };
-    if (this.service) {
-      const old = this.service;
-      this.service = null;
+    if (this.bonjourService) {
+      const old = this.bonjourService;
+      this.bonjourService = null;
       old.stop?.(() => republish());
     } else {
       republish();
     }
   }
 };
+function getLanAddresses(networkInterfacesFn) {
+  const results = [];
+  for (const [name, addrs] of Object.entries(networkInterfacesFn())) {
+    if (name.startsWith("utun") || name === "lo") continue;
+    for (const addr of addrs ?? []) {
+      if (addr.family === "IPv4" && !addr.internal) {
+        results.push(addr.address);
+      }
+    }
+  }
+  return results;
+}
 
 // src/hooks/HookInstaller.ts
 var import_promises2 = require("fs/promises");
@@ -2637,7 +2693,7 @@ var NotificationService = class {
 };
 
 // src/notification/DesktopNotificationChannel.ts
-var import_node_child_process3 = require("child_process");
+var import_node_child_process4 = require("child_process");
 var DesktopNotificationChannel = class {
   isAvailable() {
     return process.platform === "darwin";
@@ -2649,7 +2705,7 @@ var DesktopNotificationChannel = class {
     const sound = payload.sound ?? "Ping";
     const script = `display notification "${body}" with title "${title}" sound name "${sound}"`;
     return new Promise((resolve) => {
-      (0, import_node_child_process3.execFile)("osascript", ["-e", script], (err) => {
+      (0, import_node_child_process4.execFile)("osascript", ["-e", script], (err) => {
         if (err) {
           console.warn("[DesktopNotificationChannel] Send notification failed:", err.message);
         }
@@ -2975,16 +3031,23 @@ async function getHistoricalSessions(projectPath) {
     const entries = await (0, import_promises3.readdir)(projectDir, { withFileTypes: true });
     const jsonlFiles = entries.filter((e) => e.isFile() && e.name.endsWith(".jsonl"));
     const mtimeMap = /* @__PURE__ */ new Map();
-    for (const entry of jsonlFiles) {
-      const sessionId = entry.name.slice(0, -6);
-      const filePath = (0, import_path.join)(projectDir, entry.name);
-      try {
-        const fileStat = await (0, import_promises3.stat)(filePath);
-        mtimeMap.set(sessionId, fileStat.mtimeMs);
-      } catch {
-        mtimeMap.set(sessionId, 0);
-      }
-    }
+    await Promise.all(
+      jsonlFiles.map(async (entry) => {
+        const sessionId = entry.name.slice(0, -6);
+        const filePath = (0, import_path.join)(projectDir, entry.name);
+        try {
+          const contentTs = await extractLastTimestamp(filePath);
+          if (contentTs) {
+            mtimeMap.set(sessionId, contentTs);
+          } else {
+            const fileStat = await (0, import_promises3.stat)(filePath);
+            mtimeMap.set(sessionId, fileStat.mtimeMs);
+          }
+        } catch {
+          mtimeMap.set(sessionId, 0);
+        }
+      })
+    );
     const uuidDirs = entries.filter(
       (e) => e.isDirectory() && UUID_RE.test(e.name) && !mtimeMap.has(e.name)
     );
@@ -3135,6 +3198,32 @@ async function getSessionHistory(projectPath, sessionId) {
     };
   }
 }
+async function extractLastTimestamp(filePath) {
+  let fileHandle;
+  try {
+    fileHandle = await (0, import_promises3.open)(filePath, "r");
+    const fileStat = await fileHandle.stat();
+    const readSize = Math.min(fileStat.size, 8192);
+    const buffer = Buffer.alloc(readSize);
+    await fileHandle.read(buffer, 0, readSize, fileStat.size - readSize);
+    const tail = buffer.toString("utf-8");
+    const lines = tail.split("\n").filter((l) => l.trim());
+    for (let i = lines.length - 1; i >= 0; i--) {
+      try {
+        const obj = JSON.parse(lines[i]);
+        if (obj.timestamp) {
+          const ts = new Date(obj.timestamp).getTime();
+          if (!isNaN(ts)) return ts;
+        }
+      } catch {
+      }
+    }
+  } catch {
+  } finally {
+    await fileHandle?.close();
+  }
+  return void 0;
+}
 async function extractFirstPrompt(filePath) {
   let fileHandle;
   try {
@@ -3203,17 +3292,24 @@ async function countJsonlFilesWithMtime(dirPath) {
       (e) => e.isDirectory() && UUID_RE.test(e.name) && !jsonlNames.has(e.name)
     );
     let latestMtime = 0;
-    const allEntries = [
-      ...entries.filter((e) => e.isFile() && e.name.endsWith(".jsonl")),
-      ...uuidDirs
-    ];
-    for (const entry of allEntries) {
-      try {
-        const fileStat = await (0, import_promises3.stat)((0, import_path.join)(dirPath, entry.name));
-        if (fileStat.mtimeMs > latestMtime) latestMtime = fileStat.mtimeMs;
-      } catch {
-      }
-    }
+    const jsonlEntries = entries.filter((e) => e.isFile() && e.name.endsWith(".jsonl"));
+    await Promise.all([
+      ...jsonlEntries.map(async (entry) => {
+        try {
+          const contentTs = await extractLastTimestamp((0, import_path.join)(dirPath, entry.name));
+          const ts = contentTs ?? (await (0, import_promises3.stat)((0, import_path.join)(dirPath, entry.name))).mtimeMs;
+          if (ts > latestMtime) latestMtime = ts;
+        } catch {
+        }
+      }),
+      ...uuidDirs.map(async (entry) => {
+        try {
+          const fileStat = await (0, import_promises3.stat)((0, import_path.join)(dirPath, entry.name));
+          if (fileStat.mtimeMs > latestMtime) latestMtime = fileStat.mtimeMs;
+        } catch {
+        }
+      })
+    ]);
     return { count: jsonlNames.size + uuidDirs.length, latestMtime };
   } catch {
     return { count: 0, latestMtime: 0 };
@@ -3401,7 +3497,7 @@ var AuthManager = class extends import_events2.EventEmitter {
 var import_promises5 = require("fs/promises");
 
 // src/terminal/TerminalExecutor.ts
-var import_node_child_process4 = require("child_process");
+var import_node_child_process5 = require("child_process");
 var import_uuid4 = require("uuid");
 var EXEC_TIMEOUT_MS = 5 * 60 * 1e3;
 var TerminalExecutor = class {
@@ -3427,7 +3523,7 @@ var TerminalExecutor = class {
     const execId = (0, import_uuid4.v4)();
     const shell = isWindows ? "powershell" : "bash";
     const args = isWindows ? ["-Command", command] : ["-c", command];
-    const proc = (0, import_node_child_process4.spawn)(shell, args, {
+    const proc = (0, import_node_child_process5.spawn)(shell, args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
       env: { ...process.env }
@@ -3490,7 +3586,7 @@ var TerminalExecutor = class {
 // src/server.ts
 var WS_PORT = 3745;
 var HTTP_PORT = 3746;
-var execAsync = (0, import_node_util.promisify)(import_node_child_process5.exec);
+var execAsync = (0, import_node_util.promisify)(import_node_child_process6.exec);
 async function killPortProcess(port) {
   try {
     if (isWindows) {
@@ -3847,9 +3943,9 @@ async function start(opts = {}) {
         }
         case "terminal_exec": {
           const activeSession = sessionManager.getActiveSessions().find((s) => s.id === event.sessionId);
-          const cwd = activeSession?.projectPath ?? sessionManager.getSessionProjectPath(event.sessionId);
+          const cwd = activeSession?.projectPath ?? sessionManager.getSessionProjectPath(event.sessionId) ?? event.projectPath;
           if (!cwd) {
-            wsBridge.send(ws, { type: "error", code: "TERMINAL_EXEC_ERROR", message: "Session not found or no project path", sessionId: event.sessionId });
+            wsBridge.send(ws, { type: "error", code: "TERMINAL_EXEC_ERROR", message: `Session not found (id: ${event.sessionId.slice(0, 8)}\u2026)`, sessionId: event.sessionId });
             break;
           }
           terminalExecutor.exec(event.sessionId, event.command, cwd);