desktop-pet-app 0.2.9 → 0.3.3

package/out/main/index.js

@@ -1717,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;
@@ -1743,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 });
@@ -1793,6 +1799,7 @@ async function installDownloadedUpdate() {
     downloaded.artifactPath,
     downloaded.update.sha256,
     process.platform,
+    downloaded.update.version,
     process.execPath,
     JSON.stringify(restartArgumentsAfterUpdate())
   ], {
@@ -1812,6 +1819,29 @@ function supportsInAppInstall() {
 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;
+  }
+}
+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");
   const meter = new node_stream.Transform({
@@ -1861,7 +1891,7 @@ const { dirname, join } = require('node:path')
 const { execFile, spawn } = require('node:child_process')
 const { promisify } = require('node:util')
 
-const [, , parentPidText, sourcePath, expectedSHA256, platform, fallbackExecutable, fallbackArgsJSON] = 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)
@@ -1884,11 +1914,25 @@ const restartFallback = () => {
   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 () => {
-  // 安装器可能会保留已有应用的位置（开发构建尤其如此），不能假设它在 /Applications。
-  // 让 LaunchServices 按 bundle ID 查找刚安装的实际应用位置。
   if (platform === 'darwin') {
-    await run('/usr/bin/open', ['-b', '${MAC_BUNDLE_ID}'])
+    // 安装器可能把包重定位到已有开发构建，且机器上可能存在多个同 bundle ID 的应用。
+    // 找到版本完全匹配的具体路径再启动，避免按 bundle ID 命中旧副本后静默失败。
+    const installedApp = await findInstalledMacApp()
+    await run('/usr/bin/open', ['-n', installedApp])
     return
   }
   restartFallback()
@@ -3100,6 +3144,67 @@ async function dutyLoop(adapter) {
     }
   }
 }
+const TAKEOVER_TIMEOUT_MS = 5e3;
+const TAKEOVER_POLL_MS = 100;
+function takeOverRunningInstance() {
+  if (process.platform === "win32") return false;
+  const pid = readLockOwnerPid();
+  if (!pid) return false;
+  if (!processIsDesktopPet(pid)) {
+    logger.warn("single-instance lock held by an unrelated process, refusing to take over", { pid });
+    return false;
+  }
+  logger.info("taking over running instance", { pid });
+  try {
+    process.kill(pid, "SIGTERM");
+  } catch {
+    return true;
+  }
+  if (waitForExit(pid, TAKEOVER_TIMEOUT_MS)) return true;
+  logger.warn("instance did not exit after SIGTERM, forcing", { pid });
+  try {
+    process.kill(pid, "SIGKILL");
+  } catch {
+    return true;
+  }
+  return waitForExit(pid, 1e3);
+}
+function readLockOwnerPid() {
+  let target;
+  try {
+    target = node_fs.readlinkSync(node_path.join(electron.app.getPath("userData"), "SingletonLock"));
+  } catch {
+    return void 0;
+  }
+  const hostPrefix = `${node_os.hostname()}-`;
+  if (!target.startsWith(hostPrefix)) return void 0;
+  const pid = Number(target.slice(hostPrefix.length));
+  return Number.isSafeInteger(pid) && pid > 0 ? pid : void 0;
+}
+function processIsDesktopPet(pid) {
+  try {
+    const command = node_child_process.execFileSync("/bin/ps", ["-p", String(pid), "-o", "command="], { encoding: "utf8" });
+    return /desktop[- ]pet/i.test(command);
+  } catch {
+    return false;
+  }
+}
+function waitForExit(pid, timeoutMs) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (!processAlive(pid)) return true;
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, TAKEOVER_POLL_MS);
+  }
+  return !processAlive(pid);
+}
+function processAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
 const trayIcon1xPath = path.join(__dirname, "./chunks/tray-iconTemplate-BIK86F-0.png");
 const trayIcon2xPath = path.join(__dirname, "./chunks/tray-iconTemplate@2x-B19HpcaE.png");
 let tray;
@@ -3138,8 +3243,12 @@ if (profileDirectory) {
   electron.app.setPath("userData", node_path.resolve(profileDirectory));
 }
 registerAccountProtocol();
-const singleInstance = electron.app.requestSingleInstanceLock();
+let singleInstance = electron.app.requestSingleInstanceLock();
+if (!singleInstance && takeOverRunningInstance()) {
+  singleInstance = electron.app.requestSingleInstanceLock();
+}
 if (!singleInstance) {
+  logger.warn("another instance is running, quitting");
   electron.app.quit();
 } else {
   electron.app.on("second-instance", (_event, argv) => {

package/package.json

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