cicy-desktop 1.0.8

package/src/utils/window-state.js

@@ -0,0 +1,137 @@
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+const crypto = require("crypto");
+const log = require("electron-log");
+
+const STATE_DIR = path.join(os.homedir(), "data", "electron", "state");
+
+// 确保状态目录存在
+function ensureStateDir() {
+  if (!fs.existsSync(STATE_DIR)) {
+    fs.mkdirSync(STATE_DIR, { recursive: true });
+  }
+}
+
+// 生成URL的hash作为唯一标识
+function getUrlHash(url) {
+  if (!url) return "default";
+  try {
+    const urlObj = new URL(url);
+    const domain = urlObj.hostname.replace(/^www\./, "");
+    return crypto.createHash("md5").update(domain).digest("hex").substring(0, 8);
+  } catch {
+    return "default";
+  }
+}
+
+// 获取状态文件路径
+function getStatePath(accountIdx, urlHash) {
+  return path.join(STATE_DIR, `${accountIdx}-${urlHash}.json`);
+}
+
+// 加载窗口状态
+function loadWindowState(accountIdx, url) {
+  try {
+    const urlHash = getUrlHash(url);
+    const statePath = getStatePath(accountIdx, urlHash);
+    if (fs.existsSync(statePath)) {
+      const state = JSON.parse(fs.readFileSync(statePath, "utf8"));
+      log.info(`[WindowState] Loaded state for ${accountIdx}-${urlHash} (${url})`);
+      return state;
+    }
+  } catch (error) {
+    log.error(`[WindowState] Failed to load state:`, error);
+  }
+  return null;
+}
+
+// 保存窗口状态
+function saveWindowState(accountIdx, url, state) {
+  try {
+    ensureStateDir();
+    const urlHash = getUrlHash(url);
+    const statePath = getStatePath(accountIdx, urlHash);
+    const stateWithUrl = { ...state, url, domain: new URL(url).hostname };
+    fs.writeFileSync(statePath, JSON.stringify(stateWithUrl, null, 2), "utf8");
+    log.info(`[WindowState] Saved state for ${accountIdx}-${urlHash}`);
+  } catch (error) {
+    log.error(`[WindowState] Failed to save state:`, error);
+  }
+}
+
+// 删除窗口状态
+function removeWindowState(accountIdx, url) {
+  try {
+    const urlHash = getUrlHash(url);
+    const statePath = getStatePath(accountIdx, urlHash);
+    if (fs.existsSync(statePath)) {
+      fs.unlinkSync(statePath);
+      log.info(`[WindowState] Removed state for ${accountIdx}-${urlHash}`);
+    }
+  } catch (error) {
+    log.error(`[WindowState] Failed to remove state:`, error);
+  }
+}
+
+// 监听窗口状态变化
+function watchWindowState(win, accountIdx) {
+  let saveTimeout = null;
+  let currentUrl = win.webContents.getURL();
+
+  const saveState = () => {
+    if (win.isDestroyed()) return;
+
+    const url = win.webContents.getURL();
+    if (!url || url === "about:blank") return;
+
+    const bounds = win.getBounds();
+    const state = {
+      x: bounds.x,
+      y: bounds.y,
+      width: bounds.width,
+      height: bounds.height,
+      isMaximized: win.isMaximized(),
+      isFullScreen: win.isFullScreen(),
+      updatedAt: new Date().toISOString(),
+    };
+
+    saveWindowState(accountIdx, url, state);
+    currentUrl = url;
+  };
+
+  // 防抖保存
+  const debouncedSave = () => {
+    if (saveTimeout) clearTimeout(saveTimeout);
+    saveTimeout = setTimeout(saveState, 500);
+  };
+
+  // 监听窗口事件
+  win.on("resize", debouncedSave);
+  win.on("move", debouncedSave);
+  win.on("maximize", saveState);
+  win.on("unmaximize", saveState);
+  win.on("enter-full-screen", saveState);
+  win.on("leave-full-screen", saveState);
+
+  // URL变化时保存
+  win.webContents.on("did-navigate", () => {
+    const newUrl = win.webContents.getURL();
+    if (newUrl !== currentUrl) {
+      saveState();
+    }
+  });
+
+  // 窗口关闭时保存最终状态（不删除）
+  win.on("closed", () => {
+    if (saveTimeout) clearTimeout(saveTimeout);
+    saveState();
+  });
+}
+
+module.exports = {
+  loadWindowState,
+  saveWindowState,
+  removeWindowState,
+  watchWindowState,
+};

package/src/utils/window-utils.js

@@ -0,0 +1,336 @@
+const { app, BrowserWindow, Menu, dialog, shell } = require("electron");
+const path = require("path");
+const fs = require("fs");
+const os = require("os");
+const log = require("electron-log");
+const { config } = require("../config");
+const { initWindowMonitoring } = require("./window-monitor");
+const { loadWindowState, watchWindowState } = require("./window-state");
+
+app.name = "ElectronMCP";
+
+function setupWindowHandlers(win) {
+
+  // Hook window.open to use createWindow with proper webPreferences (webviewTag etc)
+  win.webContents.setWindowOpenHandler(({ url }) => {
+    log.info(`[WindowOpen] Intercepted: ${url}`);
+    if (url && url !== "about:blank") {
+      showOpenLinkDialog(win, url);
+    }
+    return { action: "deny" };
+  });
+  if (!win.webContents.debugger.isAttached()) {
+    win.webContents.debugger.attach("1.3");
+  }
+
+  // 初始化窗口监控（在 dom-ready 之前调用）
+  initWindowMonitoring(win);
+
+  // 🔥 确保窗口可以正常关闭 + 添加日志
+  win.on("close", () => {
+    log.info(`[Window ${win.id}] Close event triggered: ${win.getTitle()}`);
+  });
+
+  // 🔥 全局下载处理 - 自动保存到 ~/Downloads/electron/
+  const ses = win.webContents.session;
+  if (!ses._autoDownloadEnabled) {
+    ses._autoDownloadEnabled = true;
+    ses.on("will-download", (event, item, webContents) => {
+      // 如果没有设置 savePath，自动保存
+      setTimeout(() => {
+        if (!item.getSavePath()) {
+          const filename = item.getFilename();
+          const savePath = path.join(app.getPath("home"), "Downloads", "electron", filename);
+          fs.mkdirSync(path.dirname(savePath), { recursive: true });
+          item.setSavePath(savePath);
+          log.info(`[Auto Download] ${filename} -> ${savePath}`);
+        }
+      }, 0);
+    });
+  }
+
+  win.webContents.on("dom-ready", async () => {
+    // Auto-inject electronRPC for trusted URLs
+    const pageUrl = win.webContents.getURL();
+    try {
+      const u = new URL(pageUrl);
+      if (u.hostname === "localhost" || u.hostname.endsWith(".de5.net")) {
+        const rpcCode = `
+          if (!window.electronRPC) {
+            try {
+              const { ipcRenderer } = require('electron');
+              window.electronRPC = (tool, args) => ipcRenderer.invoke('rpc', tool, args || {});
+              console.log('[RPC] electronRPC ready');
+            } catch(e) {}
+          }
+        `;
+        if (win.webContents.debugger.isAttached()) {
+          await win.webContents.debugger.sendCommand("Runtime.evaluate", { expression: rpcCode });
+        } else {
+          await win.webContents.executeJavaScript(rpcCode);
+        }
+      }
+    } catch(e) { log.error("[RPC inject]", e.message); }
+
+    try {
+      // 1. 获取当前页面的根域名
+      const currentURL = win.webContents.getURL();
+      const url = new URL(currentURL);
+      const hostname = url.hostname;
+      const port = url.port;
+
+      // 2. 确定域名标识
+      let domain;
+      if (hostname === "localhost" || /^\d+\.\d+\.\d+\.\d+$/.test(hostname)) {
+        // localhost 或 IP 地址，使用 hostname:port 作为标识
+        domain = port ? `${hostname}_${port}` : hostname;
+      } else {
+        // 提取根域名 (例如: web.telegram.org -> telegram.org)
+        const parts = hostname.split(".");
+        domain = parts.length > 2 ? parts.slice(-2).join(".") : hostname;
+      }
+
+      // 3. 检查域名注入脚本
+      const injectDir = path.join(os.homedir(), "data", "electron", "extension", "inject");
+      const injectFile = path.join(injectDir, `${domain}.js`);
+
+      // 4. 确保目录存在
+      if (!fs.existsSync(injectDir)) {
+        fs.mkdirSync(injectDir, { recursive: true });
+      }
+
+      let domainCode = "";
+
+      // 5. 如果文件不存在，使用默认脚本并创建文件
+      if (!fs.existsSync(injectFile)) {
+        const defaultInjectPath = path.join(__dirname, "..", "extension", "inject.js");
+        domainCode = fs.readFileSync(defaultInjectPath, "utf-8");
+        fs.writeFileSync(injectFile, domainCode, "utf-8");
+        log.info(`[DomReady] Created inject script for ${domain}`);
+      } else {
+        domainCode = fs.readFileSync(injectFile, "utf-8");
+      }
+
+      // 6. 注入脚本
+      await win.webContents.executeJavaScript(`
+        (async () => {
+          try {
+            ${domainCode}
+          } catch(e) {
+            log.error('Domain inject error:', e);
+          }
+        })()
+      `);
+      log.info(`[DomReady] Injected script for ${domain}`);
+    } catch (error) {
+      log.error("[DomReady] Error:", error);
+    }
+  });
+}
+
+function isTrustedUrl(url) {
+  if (!url) return false;
+  try {
+    const u = new URL(url);
+    return u.hostname === "localhost" || u.hostname.endsWith(".de5.net");
+  } catch { return false; }
+}
+
+function createWindow(options = {}, accountIdx = 0, forceNew = false) {
+  const { width = 1200, height = 800, url, webPreferences = {}, x, y } = options;
+  console.log("[createWindow] url:", url, "isTrusted:", isTrustedUrl(url));
+
+  // Check if oneWindow mode is enabled - execute before coordinate logic
+  if (config.oneWindow && !forceNew) {
+    const allWindows = BrowserWindow.getAllWindows();
+    if (allWindows.length > 0) {
+      const existingWin = allWindows[0];
+      log.info(
+        `[WindowUtils] Single window mode enabled. Reusing existing window ${existingWin.id}`
+      );
+
+      if (existingWin.isMinimized()) existingWin.restore();
+      existingWin.focus();
+
+      if (url) {
+        const currentUrl = existingWin.webContents.getURL();
+        if (currentUrl === url) {
+          log.info(`[WindowUtils] Same URL detected, reloading page`);
+          existingWin.webContents.reload();
+        } else {
+          existingWin.loadURL(url);
+        }
+      }
+      return existingWin;
+    }
+  }
+
+  // 尝试加载保存的窗口状态（基于URL）
+  const savedState = url ? loadWindowState(accountIdx, url) : null;
+
+  // 如果没有指定位置和大小，使用保存的状态或自动偏移
+  let posX = x;
+  let posY = y;
+  let winWidth = width;
+  let winHeight = height;
+
+  // 只有在没有明确指定位置时才使用保存的状态
+  if (x === undefined && y === undefined && savedState) {
+    posX = savedState.x;
+    posY = savedState.y;
+    log.info(`[WindowState] Restored position for ${url}: ${posX},${posY}`);
+  } else if (posX === undefined || posY === undefined) {
+    const allWindows = BrowserWindow.getAllWindows();
+    const offset = allWindows.length * 30; // 每个窗口偏移30px
+    posX = posX !== undefined ? posX : offset;
+    posY = posY !== undefined ? posY : offset;
+  }
+
+  // 只有在没有明确指定大小时才使用保存的状态
+  if (width === 1200 && height === 800 && savedState) {
+    winWidth = savedState.width;
+    winHeight = savedState.height;
+    log.info(`[WindowState] Restored size for ${url}: ${winWidth}x${winHeight}`);
+  }
+
+  const win = new BrowserWindow({
+    width: winWidth,
+    height: winHeight,
+    x: posX,
+    y: posY,
+    webPreferences: {
+      webviewTag: true,
+      offscreen: false, // 确保不是离屏渲染
+      nodeIntegration: isTrustedUrl(url),
+      contextIsolation: !isTrustedUrl(url),
+      partition: `persist:sandbox-${accountIdx}`,
+      // 启用剪贴板权限
+      enableClipboard: true,
+      // 允许 webview 访问剪贴板
+      webSecurity: false, // 在开发环境中可以考虑禁用，生产环境需要谨慎
+      ...webPreferences,
+    },
+  });
+
+  // 监听窗口状态变化并自动保存（基于URL）
+  watchWindowState(win, accountIdx);
+
+  // ✅ 核心修正：获取当前窗口真正使用的那个 session
+  const ses = win.webContents.session;
+
+  // 设置代理（如果全局配置了）
+  if (config.proxy) {
+    const proxyConfig = {
+      proxyRules: config.proxy,
+      // proxyBypassRules removed
+    };
+    ses
+      .setProxy(proxyConfig)
+      .then(() => {
+        log.info(`[Proxy] Account ${accountIdx} 已设置代理: ${config.proxy}`);
+      })
+      .catch((err) => {
+        log.error(`[Proxy] Account ${accountIdx} 设置代理失败:`, err);
+      });
+  }
+  ses.setPermissionRequestHandler((webContents, permission, callback) => {
+    // 允许麦克风权限（语音输入需要）
+    if (permission === "media") {
+      log.info(`[Permission] 已自动允许: ${permission}`);
+      return callback(true);
+    }
+    // 允许剪贴板权限
+    if (permission.startsWith("clipboard")) {
+      log.info(`[Permission] 已自动允许剪贴板权限: ${permission}`);
+      return callback(true);
+    }
+    log.info(`[Permission] 已自动拒绝: ${permission}`);
+    return callback(false);
+  });
+
+  // 💡 额外保险：处理权限检查（某些新版 Electron 需要这个）
+  ses.setPermissionCheckHandler((webContents, permission, originatingOrigin) => {
+    if (permission === "media") return true;
+    // 允许剪贴板权限检查
+    if (permission.startsWith("clipboard")) return true;
+    return false;
+  });
+
+  function getTitlePrefix() {
+    return `${config.port}:${accountIdx}-${win.id} | `;
+  }
+
+  const titlePrefix = getTitlePrefix();
+
+  win.webContents.on("page-title-updated", (event, title) => {
+    win.setTitle(`${getTitlePrefix()} | ${title}`);
+  });
+
+  setupWindowHandlers(win);
+
+  if (url) {
+    win.loadURL(url);
+  }
+
+  return win;
+}
+
+function getWindowInfo(win) {
+  try {
+    const wc = win.webContents;
+    if (!wc || !wc.session) return null;
+    const partition = wc.session.partition || "";
+    const accountIdx = partition.startsWith("persist:sandbox-")
+      ? parseInt(partition.replace("persist:sandbox-", ""), 10)
+      : 0;
+
+    return {
+      id: win.id,
+      title: win.getTitle(),
+      url: wc.getURL(),
+      accountIdx,
+      partition,
+      debuggerIsAttached: wc.debugger.isAttached(),
+      isActive: win.isFocused(),
+      bounds: win.getBounds(),
+      isDomReady: !wc.isLoading(),
+      isLoading: wc.isLoading(),
+      isDestroyed: wc.isDestroyed(),
+      isCrashed: wc.isCrashed(),
+      isWaitingForResponse: wc.isWaitingForResponse(),
+      isVisible: win.isVisible(),
+      isMinimized: win.isMinimized(),
+      isMaximized: win.isMaximized(),
+    };
+  } catch (e) {
+    return null;
+  }
+}
+
+app.on("browser-window-created", (event, win) => {
+  setupWindowHandlers(win);
+});
+
+
+function showOpenLinkDialog(parentWin, url) {
+  dialog.showMessageBox(parentWin, {
+    type: 'question',
+    buttons: ['Open in Browser', 'Open in App', 'Cancel'],
+    defaultId: 0,
+    title: 'Open Link',
+    message: 'How would you like to open this link?',
+    detail: url
+  }).then(({ response }) => {
+    if (response === 0) {
+      shell.openExternal(url);
+    } else if (response === 1) {
+      createWindow({ url }, 0, true);
+    }
+  });
+}
+
+module.exports = {
+  createWindow,
+  setupWindowHandlers,
+  getWindowInfo,
+};

package/update-desktop.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+echo "🔄 更新桌面启动脚本..."
+
+# 设置路径
+DESKTOP_FILE="$HOME/Desktop/electron-mcp.command"
+SOURCE_FILE="./electron-mcp-simple.command"
+
+# 备份现有文件
+if [ -f "$DESKTOP_FILE" ]; then
+    echo "📋 备份现有文件..."
+    cp "$DESKTOP_FILE" "$DESKTOP_FILE.old"
+fi
+
+# 复制新文件
+echo "📁 复制新文件..."
+cp "$SOURCE_FILE" "$DESKTOP_FILE"
+
+# 设置权限
+echo "🔐 设置执行权限..."
+chmod +x "$DESKTOP_FILE"
+
+# 验证
+if [ -f "$DESKTOP_FILE" ] && [ -x "$DESKTOP_FILE" ]; then
+    echo "✅ 更新完成！"
+    echo "📁 文件: $DESKTOP_FILE"
+    echo "🔐 权限: $(ls -l "$DESKTOP_FILE" | cut -d' ' -f1)"
+    echo ""
+    echo "现在可以双击桌面上的 electron-mcp.command 启动服务了！"
+else
+    echo "❌ 更新失败"
+    exit 1
+fi