desktop-pet-app 0.2.5 → 0.2.9

package/README.md

@@ -30,7 +30,7 @@ desktop-pet
 
 ## 更新
 
-通过 npm 安装的版本使用 npm 更新：
+通过 npm 安装的 macOS 版本可以直接使用应用内更新，首次更新会安装并切换到 `/Applications/Desktop Pet.app`。也可以继续使用 npm 更新：
 
 ```bash
 npm update --global desktop-pet-app

package/bin/cli.js

@@ -25,7 +25,8 @@ const appPath = path.join(__dirname, '..')
 
 const child = spawn(electron, [appPath, ...process.argv.slice(2)], {
   stdio: 'ignore',
-  detached: true
+  detached: true,
+  env: { ...process.env, DESKTOP_PET_NPM_DISTRIBUTION: '1' }
 })
 
 child.unref()

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,6 +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_BUNDLE_ID = "com.xinshu.desktoppet";
 let status = { kind: "idle" };
 function updateCheckURL() {
   const override = process.env.DESKTOP_PET_UPDATE_API?.trim();
@@ -1669,6 +1696,7 @@ function getUpdateStatus() {
   return status;
 }
 async function checkForUpdates(currentVersion = electron.app.getVersion()) {
+  if (status.kind === "downloading") return status;
   status = { kind: "checking" };
   try {
     const endpoint = new URL(updateCheckURL());
@@ -1713,7 +1741,7 @@ function updateCheckHeaders(endpoint) {
 async function downloadAvailableUpdate() {
   const available = status.kind === "available" ? status.update : void 0;
   if (!available) return status;
-  status = { kind: "downloading", update: available };
+  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 temporaryPath = `${artifactPath}.${node_crypto.randomUUID()}.download`;
@@ -1730,7 +1758,13 @@ async function downloadAvailableUpdate() {
     if (response.url && new URL(response.url).protocol !== "https:") {
       throw new Error("更新下载地址必须使用 HTTPS");
     }
-    const digest = await saveAndHash(response.body, temporaryPath);
+    const totalBytes = parseContentLength(response.headers.get("content-length"));
+    let downloadedBytes = 0;
+    status = { kind: "downloading", update: available, downloadedBytes, totalBytes };
+    const digest = await saveAndHash(response.body, temporaryPath, (chunkBytes) => {
+      downloadedBytes += chunkBytes;
+      status = { kind: "downloading", update: available, downloadedBytes, totalBytes };
+    });
     if (digest !== available.sha256) throw new Error("更新包校验失败，文件未安装");
     await promises.rm(artifactPath, { force: true });
     await moveFile(temporaryPath, artifactPath);
@@ -1747,7 +1781,7 @@ async function downloadAvailableUpdate() {
 }
 async function installDownloadedUpdate() {
   if (status.kind !== "downloaded") return void 0;
-  if (!electron.app.isPackaged) throw new Error("仅打包后的宠物应用支持安装更新");
+  if (!supportsInAppInstall()) throw new Error("当前运行方式不支持应用内安装，请使用正式发布版");
   if (process.platform !== "darwin" && process.platform !== "win32") {
     throw new Error("当前平台暂不支持应用内安装，请下载对应安装包更新");
   }
@@ -1759,7 +1793,8 @@ async function installDownloadedUpdate() {
     downloaded.artifactPath,
     downloaded.update.sha256,
     process.platform,
-    process.execPath
+    process.execPath,
+    JSON.stringify(restartArgumentsAfterUpdate())
   ], {
     detached: true,
     stdio: "ignore",
@@ -1771,11 +1806,18 @@ async function installDownloadedUpdate() {
   electron.app.quit();
   return downloaded.update;
 }
-async function saveAndHash(body, destination) {
+function supportsInAppInstall() {
+  return electron.app.isPackaged || process.env.DESKTOP_PET_NPM_DISTRIBUTION === "1";
+}
+function restartArgumentsAfterUpdate() {
+  return !electron.app.isPackaged && process.argv[1] ? [process.argv[1]] : [];
+}
+async function saveAndHash(body, destination, onChunk) {
   const hash = node_crypto.createHash("sha256");
   const meter = new node_stream.Transform({
     transform(chunk, _encoding, done) {
       hash.update(chunk);
+      onChunk(chunk.length);
       done(null, chunk);
     }
   });
@@ -1786,6 +1828,23 @@ async function saveAndHash(body, destination) {
   );
   return hash.digest("hex");
 }
+function parseContentLength(value) {
+  if (!value) return void 0;
+  const bytes = Number(value);
+  return Number.isSafeInteger(bytes) && bytes > 0 ? bytes : void 0;
+}
+function downloadProgressText(progress) {
+  if (progress.totalBytes) {
+    const percent = Math.min(100, Math.floor(progress.downloadedBytes / progress.totalBytes * 100));
+    return `${percent}%`;
+  }
+  return formatBytes(progress.downloadedBytes);
+}
+function formatBytes(bytes) {
+  if (bytes < 1024) return `${bytes} B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+}
 async function moveFile(source, destination) {
   const { rename } = await import("node:fs/promises");
   await rename(source, destination);
@@ -1802,8 +1861,9 @@ const { dirname, join } = require('node:path')
 const { execFile, spawn } = require('node:child_process')
 const { promisify } = require('node:util')
 
-const [, , parentPidText, sourcePath, expectedSHA256, platform, appExecutable] = process.argv
+const [, , parentPidText, sourcePath, expectedSHA256, platform, 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))
@@ -1817,7 +1877,22 @@ const sha256 = (path) => new Promise((resolve, reject) => {
   input.on('error', reject)
   input.on('end', () => resolve(hash.digest('hex')))
 })
-const restart = () => spawn(appExecutable, [], { detached: true, stdio: 'ignore' }).unref()
+const restartFallback = () => {
+  const env = { ...process.env }
+  delete env.ELECTRON_RUN_AS_NODE
+  const child = spawn(fallbackExecutable, fallbackArgs, { detached: true, stdio: 'ignore', env })
+  child.on('error', () => undefined)
+  child.unref()
+}
+const restartInstalledApp = async () => {
+  // 安装器可能会保留已有应用的位置（开发构建尤其如此），不能假设它在 /Applications。
+  // 让 LaunchServices 按 bundle ID 查找刚安装的实际应用位置。
+  if (platform === 'darwin') {
+    await run('/usr/bin/open', ['-b', '${MAC_BUNDLE_ID}'])
+    return
+  }
+  restartFallback()
+}
 const shellQuote = (value) => "'" + value.replace(/'/g, "'\\''") + "'"
 
 async function install() {
@@ -1837,17 +1912,28 @@ async function install() {
 async function main() {
   while (parentIsRunning()) await sleep(200)
 
+  let installed = false
   try {
     if (await sha256(sourcePath) !== expectedSHA256) throw new Error('downloaded update hash changed')
     await install()
+    installed = true
   } catch (error) {
     await fs.writeFile(join(dirname(sourcePath), 'last-install-error.log'), String(error)).catch(() => undefined)
   } finally {
-    restart()
+    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())
+main().catch(() => restartFallback())
 `;
 function installerExtension(releaseUrl) {
   const pathname = new URL(releaseUrl).pathname.toLowerCase();
@@ -1957,6 +2043,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,
@@ -2090,11 +2177,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() }
     ]);
@@ -2115,7 +2211,9 @@ function createPetWindow(skin, options) {
 function updateMenuLabel() {
   const status2 = getUpdateStatus();
   if (status2.kind === "available") return `软件更新（v${status2.update.version} 可下载）`;
-  if (status2.kind === "downloading") return `软件更新（正在下载 v${status2.update.version}）`;
+  if (status2.kind === "downloading") {
+    return `软件更新（v${status2.update.version} 下载 ${downloadProgressText(status2)}）`;
+  }
   if (status2.kind === "downloaded") return `软件更新（v${status2.update.version} 已下载）`;
   return "软件更新";
 }
@@ -2131,6 +2229,12 @@ function updateMenuItems(petId) {
             dispatch({ type: "bubble", text: `发现 v${result.update.version}，可从“软件更新”安装`, ttl: 6e3 }, petId);
           } else if (result.kind === "up-to-date") {
             dispatch({ type: "bubble", text: "已经是最新版本啦", ttl: 4500 }, petId);
+          } else if (result.kind === "downloading") {
+            dispatch({
+              type: "bubble",
+              text: `v${result.update.version} 正在下载：${downloadProgressText(result)}`,
+              ttl: 4500
+            }, petId);
           } else if (result.kind === "error") {
             dispatch({ type: "bubble", text: result.message, ttl: 7e3 }, petId);
           }
@@ -2154,7 +2258,10 @@ function updateMenuItems(petId) {
     });
   }
   if (status2.kind === "downloading") {
-    items.splice(1, 0, { label: `正在下载 v${status2.update.version}…`, enabled: false });
+    items.splice(1, 0, {
+      label: `正在下载 v${status2.update.version} · ${downloadProgressText(status2)}`,
+      enabled: false
+    });
   }
   if (status2.kind === "downloaded") {
     items.splice(1, 0, {
@@ -2993,6 +3100,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));
@@ -3005,6 +3145,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();
   });
 }
@@ -3015,6 +3156,7 @@ function ensurePrimaryPet() {
   });
 }
 electron.app.whenReady().then(async () => {
+  createMenuBar();
   await startAccountCallbackRouter();
   startEventServer();
   const activated = await activateStoredDevice().catch((err) => {
@@ -3039,9 +3181,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.5",
+  "version": "0.2.9",
   "description": "AI desktop pet with MCP support and a self-hosted relay server",
   "license": "MIT",
   "keywords": [