cicy-desktop 2.1.299 → 2.1.301

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.299",
+  "version": "2.1.301",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {

package/src/backends/sidecar-ipc.js

@@ -169,6 +169,7 @@ function register({ sidecarLogPath } = {}) {
   // WSL 功能启用后必须重启 Windows 才能继续。不等人:自动安排 90 秒后重启(桌面上会有
   // 系统倒计时提示),UI 可「取消」或「立即重启」。每次开机只安排一次。
   let _rebootScheduled = false;
+  let _relayMisses = 0, _relayResetDone = false; // WSL localhost 转发自愈(见 daemon 循环)
   // 防重启循环:WSL 始终起不来时不能每次开机都重启。计数存 db/wsl-reboots.json,最多自动重启 2 次
   // (成功后 :8008 起来时清零)。
   const REBOOT_COUNT_FILE = path.join(os.homedir(), "cicy-ai", "db", "wsl-reboots.json");
@@ -227,6 +228,25 @@ function register({ sidecarLogPath } = {}) {
       // bootstrap 幂等且可续跑;首次启用 WSL 若要求重启 Windows,下次登录 Desktop
       // 会再次进入这里并从已完成的步骤继续。unknown 表示 WSL 正卡住/未响应,
       // 此时不并发安装,留给下一轮检测或显式「修复 WSL」。
+      // 容器在里面健康、Windows 侧却连不通 = WSL localhost 转发坏了(实测 wsl --shutdown 后恢复)。
+      // 连续 2 轮(≈2 分钟)如此 → 每次开机最多自动重置一次 WSL。数据在 volume 里,容器由
+      // unless-stopped 策略自动拉起;不算「销毁」——对用户来说它本来就已经不可用了。
+      if (!s.running && !s.unknown && s.installed && appDocker.insideHealthy && appDocker.wslShutdown) {
+        let inside = false;
+        try { inside = await appDocker.insideHealthy(APP_CONTAINER, APP_PORT); } catch {}
+        if (inside) {
+          _relayMisses += 1;
+          if (_relayMisses >= 2 && !_relayResetDone) {
+            _relayResetDone = true;
+            auditDestructiveIpc(log, "docker:self-heal-localhost-relay", null, { container: APP_CONTAINER, misses: _relayMisses });
+            log.warn("[docker-daemon] container healthy inside WSL but 127.0.0.1:8008 unreachable from Windows → wsl --shutdown once to rebuild the localhost relay");
+            try { await appDocker.wslShutdown(); } catch (e) { log.warn(`[docker-daemon] wsl --shutdown failed: ${e.message}`); }
+            await refreshDockerStatus();
+            return;
+          }
+          if (_relayMisses < 2) { log.warn(`[docker-daemon] :${APP_PORT} unreachable from Windows but healthy inside (${_relayMisses}/2)`); return; }
+        } else { _relayMisses = 0; }
+      } else if (s.running) { _relayMisses = 0; }
       if (!s.running && !s.unknown && _autoBootstrapPaused && Date.now() < _autoBootstrapRetryAt) {
         // 硬失败后退避(见 recordBootstrapResult);卡片显示 lastError,到点自动再试,用户点「重试」也行。
       } else if (!s.running && !s.unknown) {

package/src/sidecar/wsl-docker.js

@@ -620,6 +620,16 @@ async function ensureFreshImage({ emit } = {}) {
   return true;
 }
 
+// 容器内部视角的健康:docker exec 进容器用 node 探 127.0.0.1:8008。用来区分「容器真挂了」和
+// 「容器好好的、只是 WSL 的 localhost 转发坏了」(后者 Windows 侧 :8008 打不通,实测
+// `wsl --shutdown` 后 75 秒恢复)。
+async function insideHealthy(container = "cicy-code-docker-8008", port = 8008) {
+  try {
+    await wslRun(`docker exec ${container} node -e "fetch('http://127.0.0.1:${port}/api/health').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"`, { timeout: 20000 });
+    return true;
+  } catch { return false; }
+}
+
 // HTTP /health probe on 127.0.0.1:port from Windows — WSL2 forwards localhost,
 // so a container published on :port is reachable here. Reuse docker.js's probe.
 const probeHealth = docker.probeHealth;
@@ -1602,6 +1612,7 @@ async function readMihomoSelections(container = "cicy-code-docker-8008") {
 }
 
 module.exports = {
+  insideHealthy, wslShutdown,
   bootstrap, status, restart, stop, dockerRestart, recreate, update, upgrade, runContainer, readContainerToken,
   distroInstalled, dockerInstalled, dockerEngineUp, imagePresent, probeHealth, wslRun, hasGatewayKey,
   readMihomoConfig, readMihomoSelections, parseMihomoSelections,

package/src/tabbrowser/newtab-protocol.js

@@ -20,8 +20,6 @@ const _handled = new WeakSet(); // sessions that already have the cicyui handler
 // top-right "+"). <id> keeps each panel tab's URL unique so addTab's
 // origin+pathname reuse never collapses two panels into one; the page keys its
 // persisted layout off the same path.
-const PANEL_HTML = path.join(__dirname, "split-panel.html");
-const TELEGRAM_MATRIX_HTML = path.join(__dirname, "telegram-matrix.html");
 const { panelPageForUrl } = require("./panel-page-router");
 
 // NOTE: scheme is "cicyui", NOT "cicy" — "cicy" is already an OS deep-link
@@ -73,7 +71,7 @@ function handlerFor(ses, partition) {
         // read per request (not cached) so dev edits to split-panel.html land on
         // a simple tab reload, no Electron restart.
         try {
-          const file = panelPageForUrl(request.url) === "telegram-matrix.html" ? TELEGRAM_MATRIX_HTML : PANEL_HTML;
+          const file = path.join(__dirname, panelPageForUrl(request.url));
           const html = await fs.promises.readFile(file, "utf8");
           return new Response(html, { headers: { "content-type": "text/html; charset=utf-8" } });
         } catch (e) { return new Response("panel page missing", { status: 500 }); }

package/src/tabbrowser/panel-menu.js

@@ -8,6 +8,10 @@ function createPanelMenuTemplate(openPanel) {
       label: "Telegram 矩阵",
       click: () => openPanel("telegram-matrix"),
     },
+    {
+      label: "Redroid 矩阵",
+      click: () => openPanel("redroid-matrix"),
+    },
   ];
 }
 

package/src/tabbrowser/panel-page-router.js

@@ -1,11 +1,16 @@
+// preset=<name> on a cicyui://panel URL picks the page file; anything else is
+// the generic split panel.
+const PAGES = {
+  "telegram-matrix": "telegram-matrix.html",
+  "redroid-matrix": "redroid-matrix.html",
+};
+
 function panelPageForUrl(value) {
   try {
-    return new URL(value).searchParams.get("preset") === "telegram-matrix"
-      ? "telegram-matrix.html"
-      : "split-panel.html";
+    return PAGES[new URL(value).searchParams.get("preset")] || "split-panel.html";
   } catch (e) {
     return "split-panel.html";
   }
 }
 
-module.exports = { panelPageForUrl };
+module.exports = { panelPageForUrl, PAGES };

package/src/tabbrowser/panel-preload.js

@@ -28,3 +28,30 @@ contextBridge.exposeInMainWorld("panelAPI", {
     return () => ipcRenderer.removeListener("panelcells:state", h);
   },
 });
+
+// Redroid 矩阵 page: docker+adb driven Android devices (redroid-matrix.js).
+const rd = (ch) => (args) => ipcRenderer.invoke(`redroid:${ch}`, args || {});
+contextBridge.exposeInMainWorld("redroidAPI", {
+  defaults: rd("defaults"),
+  list: rd("list"),
+  create: rd("create"),
+  start: (name) => rd("start")({ name }),
+  stop: (name) => rd("stop")({ name }),
+  restart: (name) => rd("restart")({ name }),
+  remove: (name, purge) => rd("remove")({ name, purge }),
+  screenshot: (name) => rd("screenshot")({ name }),
+  input: (name, event) => rd("input")({ name, event }),
+  setProxy: (name, proxy) => rd("set-proxy")({ name, proxy }),
+  probeIp: (name) => rd("probe-ip")({ name }),
+  frida: (name, on) => rd("frida")({ name, on }),
+  apps: (name) => rd("apps")({ name }),
+  launch: (name, pkg) => rd("launch")({ name, pkg }),
+  uninstall: (name, pkg) => rd("uninstall")({ name, pkg }),
+  install: (name) => rd("install")({ name }),
+  shell: (name, cmd) => rd("shell")({ name, cmd }),
+  onProgress: (cb) => {
+    const h = (_e, m) => { try { cb(m); } catch (e) {} };
+    ipcRenderer.on("redroid:progress", h);
+    return () => ipcRenderer.removeListener("redroid:progress", h);
+  },
+});

package/src/tabbrowser/panel-presets.js

@@ -1,5 +1,6 @@
 const PRESETS = {
   "telegram-matrix": { preset: "telegram-matrix", title: "Telegram 矩阵", query: "preset=telegram-matrix" },
+  "redroid-matrix": { preset: "redroid-matrix", title: "Redroid 矩阵", query: "preset=redroid-matrix" },
 };
 
 function resolvePanelPreset(value) {

package/src/tabbrowser/redroid-matrix-core.js

@@ -0,0 +1,177 @@
+// Copyright 2026 CiCy AI
+// SPDX-License-Identifier: Apache-2.0
+
+// Pure helpers for the Redroid matrix panel (no Electron / no shell here so
+// they are unit-testable): container naming, host adb port allocation, the
+// `docker run` command line, `docker ps` parsing and device proxy validation.
+//
+// Conventions (must match what the panel + watchdog expect):
+//   container name   redroid-<slug>            (legacy: bare "redroid"/"redroid11" still listed)
+//   label            cicy.redroid=1            (how we find "ours")
+//   host adb port    15555+  (NOT 5555-5585: that range is reserved by adb for
+//                    emulators and the connection stays "offline" forever)
+//   data volume      /root/redroid-<slug>-data:/data  (survives recreate, dropped on purge)
+
+const LABEL = "cicy.redroid";
+const PORT_BASE = 15555;
+const IMAGES = {
+  "11": "redroid/redroid:11.0.0-latest",
+  "13": "redroid/redroid:13.0.0-latest",
+  "14": "redroid/redroid:14.0.0-latest",
+};
+const DEFAULT_SPEC = { version: "13", width: 720, height: 1280, dpi: 320 };
+
+function slugify(name) {
+  const s = String(name || "").trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 32);
+  if (!s) throw new Error("设备名不能为空（只保留字母、数字和 -）");
+  return s;
+}
+function containerName(name) { return `redroid-${slugify(name)}`; }
+function dataDir(container) { return `/root/${container}-data`; }
+
+// Next free host port ≥ PORT_BASE given the ports already published by
+// existing redroid containers (any order, holes are reused).
+function allocatePort(usedPorts) {
+  const used = new Set((usedPorts || []).map(Number).filter(Number.isFinite));
+  let p = PORT_BASE;
+  while (used.has(p)) p += 1;
+  return p;
+}
+
+function normalizeSpec(input = {}) {
+  const version = String(input.version || DEFAULT_SPEC.version);
+  if (!IMAGES[version]) throw new Error(`不支持的 Android 版本 ${version}（可选 ${Object.keys(IMAGES).join("/")}）`);
+  const num = (v, d, lo, hi) => { const n = Number(v); if (!Number.isFinite(n) || n < lo || n > hi) return d; return Math.round(n); };
+  return {
+    version,
+    image: IMAGES[version],
+    width: num(input.width, DEFAULT_SPEC.width, 240, 4096),
+    height: num(input.height, DEFAULT_SPEC.height, 240, 4096),
+    dpi: num(input.dpi, DEFAULT_SPEC.dpi, 120, 640),
+  };
+}
+
+// The docker command line for a fresh device. `gpu_mode=guest` = software
+// rendering: WSL2 has no /dev/dri and the host mode hangs surfaceflinger.
+function buildRunCommand({ container, port, spec }) {
+  const s = normalizeSpec(spec);
+  return [
+    "docker run -d",
+    `--name ${container}`,
+    `--label ${LABEL}=1`,
+    `--label ${LABEL}.version=${s.version}`,
+    "--privileged",
+    "--restart unless-stopped",
+    `-v ${dataDir(container)}:/data`,
+    `-p ${port}:5555`,
+    s.image,
+    "androidboot.redroid_gpu_mode=guest",
+    `androidboot.redroid_width=${s.width}`,
+    `androidboot.redroid_height=${s.height}`,
+    `androidboot.redroid_dpi=${s.dpi}`,
+  ].join(" ");
+}
+
+// Parse `docker ps -a --format '{{.Names}}\t{{.Image}}\t{{.State}}\t{{.Status}}\t{{.Ports}}'`.
+// Keeps only redroid images; extracts the published host port for 5555/tcp.
+function parsePs(stdout) {
+  const out = [];
+  for (const line of String(stdout || "").split(/\r?\n/)) {
+    if (!line.trim()) continue;
+    const [name, image, state, status, ports = ""] = line.split("\t");
+    if (!/^redroid\/redroid:/.test(image || "")) continue;
+    const m = /(?:^|[\s,])(?:0\.0\.0\.0|127\.0\.0\.1|\[::\]|):?(\d+)->5555\/tcp/.exec(ports) || /:(\d+)->5555\/tcp/.exec(ports);
+    const vm = /redroid:(\d+)\./.exec(image);
+    out.push({
+      name, image, state, status,
+      version: vm ? vm[1] : "",
+      port: m ? Number(m[1]) : null,
+      running: state === "running",
+    });
+  }
+  return out.sort((a, b) => (a.port || 0) - (b.port || 0) || a.name.localeCompare(b.name));
+}
+
+// Android `settings put global http_proxy` wants host:port (or ":0" = off).
+// Accept "host:port" or "http://host:port"; reject anything else so a typo
+// never silently leaves the device on direct egress.
+function normalizeDeviceProxy(value) {
+  const v = String(value || "").trim();
+  if (!v) return "";
+  let host = v, port = "";
+  const u = /^(?:https?:\/\/)?([^/:\s]+):(\d{1,5})\/?$/.exec(v);
+  if (!u) throw new Error("代理格式应为 host:port（例如 172.18.0.2:20011），留空 = 直连");
+  host = u[1]; port = u[2];
+  if (Number(port) < 1 || Number(port) > 65535) throw new Error("代理端口无效");
+  return `${host}:${port}`;
+}
+
+const AOSP_KEYS = { home: 3, back: 4, recents: 187, power: 26, volup: 24, voldown: 25, enter: 66, del: 67, menu: 82 };
+
+// adb `input` argument list for one gesture/keypress. Text goes through
+// `input text` with the characters adb chokes on escaped; anything non-ASCII
+// is sent per key event fallback (adb's input text is ASCII-only).
+function inputArgs(ev) {
+  const n = (x) => Math.max(0, Math.round(Number(x) || 0));
+  switch (ev && ev.type) {
+    case "tap": return ["input", "tap", n(ev.x), n(ev.y)];
+    case "swipe": return ["input", "swipe", n(ev.x1), n(ev.y1), n(ev.x2), n(ev.y2), n(ev.ms || 200)];
+    case "key": {
+      const code = AOSP_KEYS[String(ev.key)] || (Number.isInteger(Number(ev.key)) ? Number(ev.key) : null);
+      if (code == null) throw new Error(`unknown key ${ev.key}`);
+      return ["input", "keyevent", code];
+    }
+    case "text": {
+      const t = String(ev.text || "");
+      if (!t) throw new Error("empty text");
+      if (/[^\x20-\x7e]/.test(t)) throw new Error("adb input text 只支持 ASCII");
+      // spaces → %s, and shell-escape the rest via single quotes
+      return ["input", "text", `'${t.replace(/'/g, "'\\''").replace(/ /g, "%s")}'`];
+    }
+    default: throw new Error(`unknown input ${ev && ev.type}`);
+  }
+}
+
+
+// ── egress IP classification ─────────────────────────────────────────────────
+// Two free sources are merged: ip-api.com (geo, isp/as, mobile/proxy/hosting)
+// and ipapi.is (is_datacenter/is_proxy/is_vpn/is_tor/is_abuser, asn). The
+// grade answers the user's real question — "will sign-up risk engines
+// (Facebook, Google, Telegram…) accept this IP?":
+//   A  residential / mobile line, no flags     → best
+//   B  no datacenter / proxy flags but a backbone or unknown-type ISP
+//   C  datacenter / hosting                     → sign-ups usually blocked
+//   D  flagged proxy / VPN / Tor / abuser       → practically dead
+const RESIDENTIAL_ISP = /comcast|xfinity|verizon|at&t|att\b|spectrum|charter|cox\b|frontier|centurylink|lumen|t-mobile|sprint|optimum|altice|windstream|mediacom|deutsche telekom|telekom|vodafone|orange|\bbt\b|british telecom|sky broadband|virgin media|talktalk|kddi|ntt|softbank|docomo|telstra|optus|bell canada|rogers|shaw|telus|sfr|bouygues|free sas|telefonica|movistar|kpn|swisscom|telia|telenor|chunghwa|sk broadband|kt corp|lg uplink|pldt|globe telecom|singtel|starhub|m1 limited|china telecom|china unicom|china mobile/i;
+
+function classifyIp({ ipapi = null, ipapis = null } = {}) {
+  const a = ipapi || {}, b = ipapis || {};
+  const flags = {
+    proxy: !!(a.proxy || b.is_proxy),
+    vpn: !!b.is_vpn,
+    tor: !!b.is_tor,
+    abuser: !!b.is_abuser,
+    datacenter: !!(a.hosting || b.is_datacenter),
+    mobile: !!a.mobile,
+  };
+  const isp = String(a.isp || a.org || b.asn_org || b.company_name || "");
+  const residential = flags.mobile || RESIDENTIAL_ISP.test(isp);
+  let grade, kind, verdict;
+  if (flags.proxy || flags.vpn || flags.tor || flags.abuser) {
+    grade = "D"; kind = "已标记"; verdict = "情报库已标记为代理 / VPN / Tor / 滥用来源，注册类风控基本必拦，建议换节点。";
+  } else if (flags.datacenter) {
+    grade = "C"; kind = "机房"; verdict = "机房 / 云主机 IP。Facebook、Google 等注册风控大概率拦截或要求验证；日常登录一般可用。";
+  } else if (residential) {
+    grade = "A"; kind = flags.mobile ? "移动网络" : "住宅"; verdict = "住宅 / 移动线路且无任何标记，风控最友好。";
+  } else {
+    grade = "B"; kind = "骨干/未知"; verdict = "未被标记为机房或代理，但也不是明确的住宅线路（骨干 / 商业网络）。注册可试，成功率一般。";
+  }
+  return { grade, kind, verdict, flags, residential };
+}
+
+module.exports = {
+  classifyIp, RESIDENTIAL_ISP,
+  LABEL, PORT_BASE, IMAGES, DEFAULT_SPEC, AOSP_KEYS,
+  slugify, containerName, dataDir, allocatePort, normalizeSpec, buildRunCommand, parsePs,
+  normalizeDeviceProxy, inputArgs,
+};