desktop-pet-app 0.2.7 → 0.3.1

package/out/main/index.js

@@ -23,11 +23,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 const electron = require("electron");
 const node_path = require("node:path");
+const node_fs = require("node:fs");
 const path = require("path");
 const os = require("os");
 const node_crypto = require("node:crypto");
 const node_http = require("node:http");
-const node_fs = require("node:fs");
 const node_os = require("node:os");
 const crypto = require("crypto");
 const WebSocket = require("ws");
@@ -66,7 +66,20 @@ function levelFromEnv() {
   const v = (process.env.DESKTOP_PET_LOG_LEVEL ?? "info").toLowerCase();
   return v === "debug" || v === "warn" || v === "error" ? v : "info";
 }
-const logger = new Logger(levelFromEnv());
+function mainLogDirectory() {
+  return node_path.join(electron.app.getPath("userData"), "logs");
+}
+function writeMainLog(line) {
+  console.log(line);
+  try {
+    const directory = mainLogDirectory();
+    node_fs.mkdirSync(directory, { recursive: true });
+    node_fs.appendFileSync(node_path.join(directory, "main.log"), `${line}
+`, "utf8");
+  } catch {
+  }
+}
+const logger = new Logger(levelFromEnv(), writeMainLog);
 const PORT_FILE = process.env.DESKTOP_PET_PORT_FILE?.trim() || path.join(os.homedir(), ".desktop-pet-port");
 const LOCAL_PET_PROTOCOL_VERSION = "1.0";
 const LOCAL_PET_MAX_BODY_BYTES = 64 * 1024;
@@ -268,9 +281,11 @@ class PetManager {
   pets = /* @__PURE__ */ new Map();
   lastGreetAt = /* @__PURE__ */ new Map();
   timer;
+  petsVisible = true;
   register(id, win, skin, identity) {
     this.pets.set(id, { id, win, skin, identity });
     win.on("closed", () => this.pets.delete(id));
+    if (!this.petsVisible) win.hide();
     if (!this.timer) this.timer = setInterval(() => this.checkProximity(), PROXIMITY_SCAN_MS);
     logger.info("pet registered", { id, skin, total: this.pets.size });
   }
@@ -282,6 +297,17 @@ class PetManager {
       (pet) => !pet.win.isDestroyed() && pet.identity.kind === "primary"
     );
   }
+  arePetsVisible() {
+    return this.petsVisible;
+  }
+  setPetsVisible(visible) {
+    this.petsVisible = visible;
+    for (const pet of this.pets.values()) {
+      if (pet.win.isDestroyed()) continue;
+      if (visible) pet.win.showInactive();
+      else pet.win.hide();
+    }
+  }
   findRemoteFriend(username) {
     const normalized = username.trim().toLowerCase();
     return [...this.pets.values()].find(
@@ -1653,7 +1679,7 @@ async function fallbackChat(operationId) {
 const REQUEST_TIMEOUT_MS = 6e3;
 const DOWNLOAD_TIMEOUT_MS = 10 * 6e4;
 const LEGACY_OFFICIAL_HTTP_HOST = "47.94.20.104";
-const MAC_INSTALLED_APP_EXECUTABLE = "/Applications/Desktop Pet.app/Contents/MacOS/Desktop Pet";
+const MAC_BUNDLE_ID = "com.xinshu.desktoppet";
 let status = { kind: "idle" };
 function updateCheckURL() {
   const override = process.env.DESKTOP_PET_UPDATE_API?.trim();
@@ -1691,6 +1717,12 @@ async function checkForUpdates(currentVersion = electron.app.getVersion()) {
       status = { kind: "up-to-date", checkedAt: Date.now() };
       return status;
     }
+    const cachedArtifactPath = await verifiedCachedArtifact(update);
+    if (cachedArtifactPath) {
+      status = { kind: "downloaded", update, artifactPath: cachedArtifactPath, downloadedAt: Date.now() };
+      logger.info("using cached verified update", { version: update.version });
+      return status;
+    }
     status = { kind: "available", update, checkedAt: Date.now() };
     logger.info("update available", { currentVersion, version: update.version });
     return status;
@@ -1717,7 +1749,7 @@ async function downloadAvailableUpdate() {
   if (!available) return status;
   status = { kind: "downloading", update: available, downloadedBytes: 0 };
   const updateDirectory = node_path.join(electron.app.getPath("userData"), "updates");
-  const artifactPath = node_path.join(updateDirectory, `desktop-pet-${available.version}${installerExtension(available.releaseUrl)}`);
+  const artifactPath = updateArtifactPath(available);
   const temporaryPath = `${artifactPath}.${node_crypto.randomUUID()}.download`;
   try {
     await promises.mkdir(updateDirectory, { recursive: true });
@@ -1767,8 +1799,9 @@ async function installDownloadedUpdate() {
     downloaded.artifactPath,
     downloaded.update.sha256,
     process.platform,
-    restartExecutableAfterUpdate(),
-    process.execPath
+    downloaded.update.version,
+    process.execPath,
+    JSON.stringify(restartArgumentsAfterUpdate())
   ], {
     detached: true,
     stdio: "ignore",
@@ -1783,11 +1816,31 @@ async function installDownloadedUpdate() {
 function supportsInAppInstall() {
   return electron.app.isPackaged || process.env.DESKTOP_PET_NPM_DISTRIBUTION === "1";
 }
-function restartExecutableAfterUpdate() {
-  if (!electron.app.isPackaged && process.env.DESKTOP_PET_NPM_DISTRIBUTION === "1" && process.platform === "darwin") {
-    return MAC_INSTALLED_APP_EXECUTABLE;
+function restartArgumentsAfterUpdate() {
+  return !electron.app.isPackaged && process.argv[1] ? [process.argv[1]] : [];
+}
+function updateArtifactPath(update) {
+  return node_path.join(electron.app.getPath("userData"), "updates", `desktop-pet-${update.version}${installerExtension(update.releaseUrl)}`);
+}
+async function verifiedCachedArtifact(update) {
+  const artifactPath = updateArtifactPath(update);
+  try {
+    return await sha256File(artifactPath) === update.sha256 ? artifactPath : void 0;
+  } catch (error) {
+    if (error.code !== "ENOENT") {
+      logger.warn("could not verify cached update", { version: update.version, error: String(error) });
+    }
+    return void 0;
   }
-  return process.execPath;
+}
+function sha256File(path2) {
+  return new Promise((resolve, reject) => {
+    const hash = node_crypto.createHash("sha256");
+    const input = node_fs.createReadStream(path2);
+    input.on("data", (chunk) => hash.update(chunk));
+    input.on("error", reject);
+    input.on("end", () => resolve(hash.digest("hex")));
+  });
 }
 async function saveAndHash(body, destination, onChunk) {
   const hash = node_crypto.createHash("sha256");
@@ -1838,8 +1891,9 @@ const { dirname, join } = require('node:path')
 const { execFile, spawn } = require('node:child_process')
 const { promisify } = require('node:util')
 
-const [, , parentPidText, sourcePath, expectedSHA256, platform, installedAppExecutable, fallbackExecutable] = process.argv
+const [, , parentPidText, sourcePath, expectedSHA256, platform, targetVersion, fallbackExecutable, fallbackArgsJSON] = process.argv
 const parentPid = Number(parentPidText)
+const fallbackArgs = JSON.parse(fallbackArgsJSON || '[]')
 const run = promisify(execFile)
 
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
@@ -1853,10 +1907,35 @@ const sha256 = (path) => new Promise((resolve, reject) => {
   input.on('error', reject)
   input.on('end', () => resolve(hash.digest('hex')))
 })
-const restart = (executable) => {
+const restartFallback = () => {
   const env = { ...process.env }
   delete env.ELECTRON_RUN_AS_NODE
-  spawn(executable, [], { detached: true, stdio: 'ignore', env }).unref()
+  const child = spawn(fallbackExecutable, fallbackArgs, { detached: true, stdio: 'ignore', env })
+  child.on('error', () => undefined)
+  child.unref()
+}
+const findInstalledMacApp = async () => {
+  const query = 'kMDItemCFBundleIdentifier == "${MAC_BUNDLE_ID}"'
+  const { stdout } = await run('/usr/bin/mdfind', [query])
+  const candidates = stdout.split('\n').map((value) => value.trim()).filter((value) => value.endsWith('.app'))
+  for (const candidate of candidates) {
+    try {
+      const plist = join(candidate, 'Contents', 'Info.plist')
+      const result = await run('/usr/libexec/PlistBuddy', ['-c', 'Print :CFBundleShortVersionString', plist])
+      if (result.stdout.trim() === targetVersion) return candidate
+    } catch {}
+  }
+  throw new Error('installed app for target version was not found')
+}
+const restartInstalledApp = async () => {
+  if (platform === 'darwin') {
+    // 安装器可能把包重定位到已有开发构建，且机器上可能存在多个同 bundle ID 的应用。
+    // 找到版本完全匹配的具体路径再启动，避免按 bundle ID 命中旧副本后静默失败。
+    const installedApp = await findInstalledMacApp()
+    await run('/usr/bin/open', ['-n', installedApp])
+    return
+  }
+  restartFallback()
 }
 const shellQuote = (value) => "'" + value.replace(/'/g, "'\\''") + "'"
 
@@ -1885,11 +1964,20 @@ async function main() {
   } catch (error) {
     await fs.writeFile(join(dirname(sourcePath), 'last-install-error.log'), String(error)).catch(() => undefined)
   } finally {
-    restart(installed ? installedAppExecutable : fallbackExecutable)
+    if (installed) {
+      try {
+        await restartInstalledApp()
+      } catch (error) {
+        await fs.writeFile(join(dirname(sourcePath), 'last-restart-error.log'), String(error)).catch(() => undefined)
+        restartFallback()
+      }
+    } else {
+      restartFallback()
+    }
   }
 }
 
-main().catch(() => restart(fallbackExecutable))
+main().catch(() => restartFallback())
 `;
 function installerExtension(releaseUrl) {
   const pathname = new URL(releaseUrl).pathname.toLowerCase();
@@ -1999,6 +2087,7 @@ function createPetWindow(skin, options) {
   const x = options.near?.x ?? workArea.x + workArea.width - W - 120;
   const y = options.near?.y ?? workArea.y + workArea.height - H - 60;
   const win = new electron.BrowserWindow({
+    show: petManager.arePetsVisible(),
     width: W,
     height: H,
     x,
@@ -2132,11 +2221,20 @@ function createPetWindow(skin, options) {
           dispatch({ type: "bubble", text: result.message, ttl: 6e3 }, id);
         }
       },
+      {
+        label: "打开日志文件夹",
+        click: () => {
+          void electron.shell.openPath(mainLogDirectory()).then((error) => {
+            if (error) dispatch({ type: "bubble", text: "无法打开日志文件夹", ttl: 6e3 }, id);
+          });
+        }
+      },
       {
         label: updateMenuLabel(),
         submenu: updateMenuItems(id)
       },
       { type: "separator" },
+      { label: "隐藏所有桌面宠物", click: () => petManager.setPetsVisible(false) },
       ...canSendAwayPet(identity) ? [{ label: "送走这只宠物", click: () => win.close() }] : [],
       { label: "退出", click: () => electron.app.quit() }
     ]);
@@ -3046,6 +3144,39 @@ async function dutyLoop(adapter) {
     }
   }
 }
+const trayIcon1xPath = path.join(__dirname, "./chunks/tray-iconTemplate-BIK86F-0.png");
+const trayIcon2xPath = path.join(__dirname, "./chunks/tray-iconTemplate@2x-B19HpcaE.png");
+let tray;
+function createMenuBar() {
+  if (process.platform !== "darwin" || tray) return;
+  tray = new electron.Tray(createPetTemplateImage());
+  tray.setToolTip("Desktop Pet");
+  tray.on("click", showMenu);
+  tray.on("right-click", showMenu);
+}
+function destroyMenuBar() {
+  tray?.destroy();
+  tray = void 0;
+}
+function showMenu() {
+  tray?.popUpContextMenu(electron.Menu.buildFromTemplate([
+    { label: `Desktop Pet v${electron.app.getVersion()}`, enabled: false },
+    { type: "separator" },
+    {
+      label: petManager.arePetsVisible() ? "隐藏所有桌面宠物" : "显示所有桌面宠物",
+      click: () => petManager.setPetsVisible(!petManager.arePetsVisible())
+    },
+    { type: "separator" },
+    { label: "退出 Desktop Pet", click: () => electron.app.quit() }
+  ]));
+}
+function createPetTemplateImage() {
+  let image = electron.nativeImage.createFromBuffer(node_fs.readFileSync(trayIcon2xPath), { scaleFactor: 2 });
+  if (image.isEmpty()) image = electron.nativeImage.createFromPath(trayIcon1xPath);
+  if (image.isEmpty()) throw new Error("无法加载 macOS 菜单栏图标");
+  image.setTemplateImage(true);
+  return image;
+}
 const profileDirectory = process.env.DESKTOP_PET_PROFILE?.trim();
 if (profileDirectory) {
   electron.app.setPath("userData", node_path.resolve(profileDirectory));
@@ -3058,6 +3189,7 @@ if (!singleInstance) {
   electron.app.on("second-instance", (_event, argv) => {
     const callback = argv.find((value) => value.startsWith("desktop-pet://"));
     if (callback) handleAccountCallback(callback);
+    petManager.setPetsVisible(true);
     ensurePrimaryPet();
   });
 }
@@ -3068,6 +3200,7 @@ function ensurePrimaryPet() {
   });
 }
 electron.app.whenReady().then(async () => {
+  createMenuBar();
   await startAccountCallbackRouter();
   startEventServer();
   const activated = await activateStoredDevice().catch((err) => {
@@ -3092,9 +3225,10 @@ electron.app.whenReady().then(async () => {
   logger.info("app started", { firstPet: id });
 });
 electron.app.on("window-all-closed", () => {
-  electron.app.quit();
+  if (process.platform !== "darwin") electron.app.quit();
 });
 electron.app.on("quit", () => {
+  destroyMenuBar();
   stopAccountCallbackRouter();
   stopRelay();
   stopP2PWindow();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "desktop-pet-app",
-  "version": "0.2.7",
+  "version": "0.3.1",
   "description": "AI desktop pet with MCP support and a self-hosted relay server",
   "license": "MIT",
   "keywords": [