desktop-pet-app 0.2.4 → 0.2.7

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

@@ -246,6 +246,9 @@ function sleep(ms) {
 function isPetOnQuest(petId) {
   return busy.has(petId);
 }
+function canSendAwayPet(identity) {
+  return identity.kind === "remote-friend";
+}
 function presentPetIdentity(identity, localUsername) {
   if (identity.kind === "remote-friend") {
     return {
@@ -274,6 +277,11 @@ class PetManager {
   count() {
     return this.pets.size;
   }
+  hasPrimaryPet() {
+    return [...this.pets.values()].some(
+      (pet) => !pet.win.isDestroyed() && pet.identity.kind === "primary"
+    );
+  }
   findRemoteFriend(username) {
     const normalized = username.trim().toLowerCase();
     return [...this.pets.values()].find(
@@ -1645,6 +1653,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";
 let status = { kind: "idle" };
 function updateCheckURL() {
   const override = process.env.DESKTOP_PET_UPDATE_API?.trim();
@@ -1661,6 +1670,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());
@@ -1705,7 +1715,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`;
@@ -1722,7 +1732,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);
@@ -1739,7 +1755,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("当前平台暂不支持应用内安装，请下载对应安装包更新");
   }
@@ -1751,6 +1767,7 @@ async function installDownloadedUpdate() {
     downloaded.artifactPath,
     downloaded.update.sha256,
     process.platform,
+    restartExecutableAfterUpdate(),
     process.execPath
   ], {
     detached: true,
@@ -1763,11 +1780,21 @@ 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 restartExecutableAfterUpdate() {
+  if (!electron.app.isPackaged && process.env.DESKTOP_PET_NPM_DISTRIBUTION === "1" && process.platform === "darwin") {
+    return MAC_INSTALLED_APP_EXECUTABLE;
+  }
+  return process.execPath;
+}
+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);
     }
   });
@@ -1778,6 +1805,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);
@@ -1794,7 +1838,7 @@ 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, installedAppExecutable, fallbackExecutable] = process.argv
 const parentPid = Number(parentPidText)
 const run = promisify(execFile)
 
@@ -1809,7 +1853,11 @@ 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 restart = (executable) => {
+  const env = { ...process.env }
+  delete env.ELECTRON_RUN_AS_NODE
+  spawn(executable, [], { detached: true, stdio: 'ignore', env }).unref()
+}
 const shellQuote = (value) => "'" + value.replace(/'/g, "'\\''") + "'"
 
 async function install() {
@@ -1829,17 +1877,19 @@ 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()
+    restart(installed ? installedAppExecutable : fallbackExecutable)
   }
 }
 
-main().catch(() => restart())
+main().catch(() => restart(fallbackExecutable))
 `;
 function installerExtension(releaseUrl) {
   const pathname = new URL(releaseUrl).pathname.toLowerCase();
@@ -2087,7 +2137,7 @@ function createPetWindow(skin, options) {
         submenu: updateMenuItems(id)
       },
       { type: "separator" },
-      { label: "送走这只宠物", click: () => win.close() },
+      ...canSendAwayPet(identity) ? [{ label: "送走这只宠物", click: () => win.close() }] : [],
       { label: "退出", click: () => electron.app.quit() }
     ]);
     menu.popup({ window: win });
@@ -2107,7 +2157,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 "软件更新";
 }
@@ -2123,6 +2175,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);
           }
@@ -2146,7 +2204,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, {
@@ -2997,6 +3058,13 @@ if (!singleInstance) {
   electron.app.on("second-instance", (_event, argv) => {
     const callback = argv.find((value) => value.startsWith("desktop-pet://"));
     if (callback) handleAccountCallback(callback);
+    ensurePrimaryPet();
+  });
+}
+function ensurePrimaryPet() {
+  if (petManager.hasPrimaryPet()) return null;
+  return createPetWindow(process.env.DESKTOP_PET_SKIN || "codex", {
+    identity: { kind: "primary" }
   });
 }
 electron.app.whenReady().then(async () => {
@@ -3009,9 +3077,7 @@ electron.app.whenReady().then(async () => {
   if (!activated) startRelay();
   if (process.env.DESKTOP_PET_P2P !== "0") startP2PWindow(getDeviceIceServers());
   void startRunnerManager();
-  const id = createPetWindow(process.env.DESKTOP_PET_SKIN || "codex", {
-    identity: { kind: "primary" }
-  });
+  const id = ensurePrimaryPet();
   setTimeout(() => {
     void checkForUpdates().then((result) => {
       if (id && result.kind === "available") {

package/package.json

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