desktop-pet-app 0.3.3 → 0.3.4

package/bin/cli.js

@@ -1,32 +1,173 @@
 #!/usr/bin/env node
 
-const { spawn } = require('node:child_process')
+const { execFileSync, spawn } = require('node:child_process')
 const fs = require('node:fs')
+const os = require('node:os')
 const path = require('node:path')
 
-let electron
-try {
-  electron = require('electron')
-} catch (error) {
-  console.error('未找到 electron 包，请重新安装 desktop-pet-app。')
-  console.error('若在国内网络安装失败，可先设置镜像再重装：')
-  console.error('  ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ npm install --global <包路径或包名>')
-  console.error(error instanceof Error ? error.message : String(error))
-  process.exit(1)
+const manifest = require('../package.json')
+
+const MAC_APP_PATH = '/Applications/Desktop Pet.app'
+const MAC_BUNDLE_ID = 'com.xinshu.desktoppet'
+const TAKEOVER_TIMEOUT_MS = 5_000
+
+function parseVersion(value) {
+  const match = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/.exec(value)
+  if (!match) return undefined
+  return {
+    major: Number(match[1]),
+    minor: Number(match[2]),
+    patch: Number(match[3]),
+    prerelease: match[4]
+  }
+}
+
+function compareVersions(a, b) {
+  const left = parseVersion(a)
+  const right = parseVersion(b)
+  if (!left || !right) throw new Error(`无效版本号：${!left ? a : b}`)
+  for (const key of ['major', 'minor', 'patch']) {
+    if (left[key] !== right[key]) return left[key] > right[key] ? 1 : -1
+  }
+  if (!left.prerelease && right.prerelease) return 1
+  if (left.prerelease && !right.prerelease) return -1
+  if (!left.prerelease || !right.prerelease) return 0
+  return left.prerelease.localeCompare(right.prerelease, undefined, { numeric: true })
 }
 
-if (typeof electron !== 'string' || !fs.existsSync(electron)) {
-  console.error('electron 已安装但二进制缺失，请用镜像重装：')
-  console.error('  ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ npm install --global --force <包路径或包名>')
-  process.exit(1)
+function selectLaunchTarget(npmVersion, nativeApp, forceNpm = false) {
+  if (!forceNpm && nativeApp && compareVersions(nativeApp.version, npmVersion) >= 0) {
+    return { kind: 'native', version: nativeApp.version, appPath: nativeApp.appPath }
+  }
+  return { kind: 'npm', version: npmVersion }
 }
 
-const appPath = path.join(__dirname, '..')
+function readPlistValue(plistPath, key) {
+  return execFileSync('/usr/libexec/PlistBuddy', ['-c', `Print :${key}`, plistPath], {
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'ignore']
+  }).trim()
+}
+
+function installedMacApp() {
+  const plistPath = path.join(MAC_APP_PATH, 'Contents', 'Info.plist')
+  const executablePath = path.join(MAC_APP_PATH, 'Contents', 'MacOS', 'Desktop Pet')
+  try {
+    if (!fs.existsSync(executablePath)) return undefined
+    if (readPlistValue(plistPath, 'CFBundleIdentifier') !== MAC_BUNDLE_ID) return undefined
+    const version = readPlistValue(plistPath, 'CFBundleShortVersionString')
+    if (!parseVersion(version)) return undefined
+    return { version, appPath: MAC_APP_PATH }
+  } catch {
+    return undefined
+  }
+}
+
+function runningDesktopPet() {
+  const endpointPath = process.env.DESKTOP_PET_PORT_FILE?.trim() || path.join(os.homedir(), '.desktop-pet-port')
+  try {
+    const endpoint = JSON.parse(fs.readFileSync(endpointPath, 'utf8'))
+    if (!Number.isSafeInteger(endpoint.pid) || endpoint.pid < 1) return undefined
+    process.kill(endpoint.pid, 0)
+    return {
+      pid: endpoint.pid,
+      version: typeof endpoint.appVersion === 'string' && parseVersion(endpoint.appVersion)
+        ? endpoint.appVersion
+        : undefined
+    }
+  } catch {
+    return undefined
+  }
+}
+
+function shouldReplaceRunningVersion(targetVersion, runningVersion) {
+  return runningVersion === undefined || compareVersions(targetVersion, runningVersion) > 0
+}
+
+function processIsDesktopPet(pid) {
+  if (process.platform === 'win32') return false
+  try {
+    const command = execFileSync('/bin/ps', ['-p', String(pid), '-o', 'command='], { encoding: 'utf8' })
+    return /desktop[- ]pet/i.test(command)
+  } catch {
+    return false
+  }
+}
+
+function processIsRunning(pid) {
+  try {
+    process.kill(pid, 0)
+    return true
+  } catch {
+    return false
+  }
+}
+
+function stopOlderRuntime(targetVersion) {
+  const running = runningDesktopPet()
+  if (!running || !shouldReplaceRunningVersion(targetVersion, running.version) || !processIsDesktopPet(running.pid)) return
+
+  try {
+    process.kill(running.pid, 'SIGTERM')
+  } catch {
+    return
+  }
+
+  const deadline = Date.now() + TAKEOVER_TIMEOUT_MS
+  while (Date.now() < deadline && processIsRunning(running.pid)) {
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100)
+  }
+  if (processIsRunning(running.pid)) {
+    try {
+      process.kill(running.pid, 'SIGKILL')
+    } catch {}
+  }
+}
+
+function npmElectronPath() {
+  try {
+    return require('electron')
+  } catch (error) {
+    console.error('未找到 electron 包，请重新安装 desktop-pet-app。')
+    console.error('若在国内网络安装失败，可先设置镜像再重装：')
+    console.error('  ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ npm install --global <包路径或包名>')
+    console.error(error instanceof Error ? error.message : String(error))
+    process.exit(1)
+  }
+}
+
+function launch() {
+  const appPath = path.join(__dirname, '..')
+  const forceNpm = Boolean(process.env.DESKTOP_PET_PROFILE?.trim()) || process.platform !== 'darwin'
+  const target = selectLaunchTarget(
+    manifest.version,
+    process.platform === 'darwin' ? installedMacApp() : undefined,
+    forceNpm
+  )
+  stopOlderRuntime(target.version)
+
+  let command
+  let args
+  let env = process.env
+  if (target.kind === 'native') {
+    command = '/usr/bin/open'
+    args = ['-n', target.appPath, '--args', ...process.argv.slice(2)]
+  } else {
+    command = npmElectronPath()
+    if (typeof command !== 'string' || !fs.existsSync(command)) {
+      console.error('electron 已安装但二进制缺失，请用镜像重装：')
+      console.error('  ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ npm install --global --force <包路径或包名>')
+      process.exit(1)
+    }
+    args = [appPath, ...process.argv.slice(2)]
+    env = { ...process.env, DESKTOP_PET_NPM_DISTRIBUTION: '1' }
+  }
+
+  const child = spawn(command, args, { stdio: 'ignore', detached: true, env })
+  child.on('error', (error) => console.error(`Desktop Pet 启动失败：${error.message}`))
+  child.unref()
+}
 
-const child = spawn(electron, [appPath, ...process.argv.slice(2)], {
-  stdio: 'ignore',
-  detached: true,
-  env: { ...process.env, DESKTOP_PET_NPM_DISTRIBUTION: '1' }
-})
+if (require.main === module) launch()
 
-child.unref()
+module.exports = { compareVersions, selectLaunchTarget, shouldReplaceRunningVersion }

package/out/main/index.js

@@ -22,8 +22,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 const electron = require("electron");
-const node_path = require("node:path");
 const node_fs = require("node:fs");
+const node_path = require("node:path");
 const path = require("path");
 const os = require("os");
 const node_crypto = require("node:crypto");
@@ -1680,6 +1680,7 @@ 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";
+const MAC_INSTALLED_APP = "/Applications/Desktop Pet.app";
 let status = { kind: "idle" };
 function updateCheckURL() {
   const override = process.env.DESKTOP_PET_UPDATE_API?.trim();
@@ -1915,22 +1916,17 @@ const restartFallback = () => {
   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 {}
+  const plist = join('${MAC_INSTALLED_APP}', 'Contents', 'Info.plist')
+  const bundle = await run('/usr/libexec/PlistBuddy', ['-c', 'Print :CFBundleIdentifier', plist])
+  const version = await run('/usr/libexec/PlistBuddy', ['-c', 'Print :CFBundleShortVersionString', plist])
+  if (bundle.stdout.trim() !== '${MAC_BUNDLE_ID}' || version.stdout.trim() !== targetVersion) {
+    throw new Error('installed app identity or version does not match the verified update')
   }
-  throw new Error('installed app for target version was not found')
+  return '${MAC_INSTALLED_APP}'
 }
 const restartInstalledApp = async () => {
   if (platform === 'darwin') {
-    // 安装器可能把包重定位到已有开发构建，且机器上可能存在多个同 bundle ID 的应用。
-    // 找到版本完全匹配的具体路径再启动，避免按 bundle ID 命中旧副本后静默失败。
+    // PKG 禁止重定位；安装后再次核对固定路径的 bundle ID 与版本再启动。
     const installedApp = await findInstalledMacApp()
     await run('/usr/bin/open', ['-n', installedApp])
     return
@@ -2653,7 +2649,7 @@ async function readBody(req, maxBytes) {
   });
 }
 let eventServer;
-function startEventServer() {
+function startEventServer(appVersion = "0.0.0") {
   if (eventServer) return;
   const sessionToken = crypto.randomBytes(32).toString("base64url");
   const server = http.createServer((req, res) => {
@@ -2710,6 +2706,7 @@ function startEventServer() {
     if (addr && typeof addr === "object") {
       const endpoint = {
         protocolVersion: LOCAL_PET_PROTOCOL_VERSION,
+        appVersion,
         port: addr.port,
         pid: process.pid,
         sessionToken,
@@ -3144,64 +3141,29 @@ 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;
+const PRODUCT_DATA_DIRECTORY = "Desktop Pet";
+const LEGACY_NPM_DATA_DIRECTORY = "desktop-pet-app";
+function configureRuntimeIdentity() {
+  const profileDirectory = process.env.DESKTOP_PET_PROFILE?.trim();
+  if (profileDirectory) {
+    electron.app.setPath("userData", node_path.resolve(profileDirectory));
+    return;
   }
-}
-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);
+  if (!electron.app.isPackaged && process.env.DESKTOP_PET_NPM_DISTRIBUTION !== "1") return;
+  const appDataDirectory = electron.app.getPath("appData");
+  const canonicalDirectory = node_path.join(appDataDirectory, PRODUCT_DATA_DIRECTORY);
+  if (process.env.DESKTOP_PET_NPM_DISTRIBUTION === "1") {
+    migrateLegacyNpmData(node_path.join(appDataDirectory, LEGACY_NPM_DATA_DIRECTORY), canonicalDirectory);
   }
-  return !processAlive(pid);
+  electron.app.setPath("userData", canonicalDirectory);
 }
-function processAlive(pid) {
+function migrateLegacyNpmData(legacyDirectory, canonicalDirectory) {
+  if (!node_fs.existsSync(legacyDirectory) || node_fs.existsSync(canonicalDirectory)) return false;
   try {
-    process.kill(pid, 0);
+    node_fs.renameSync(legacyDirectory, canonicalDirectory);
     return true;
-  } catch {
+  } catch (error) {
+    console.warn(`无法迁移 Desktop Pet 用户数据：${String(error)}`);
     return false;
   }
 }
@@ -3238,15 +3200,9 @@ function createPetTemplateImage() {
   image.setTemplateImage(true);
   return image;
 }
-const profileDirectory = process.env.DESKTOP_PET_PROFILE?.trim();
-if (profileDirectory) {
-  electron.app.setPath("userData", node_path.resolve(profileDirectory));
-}
+configureRuntimeIdentity();
 registerAccountProtocol();
-let singleInstance = electron.app.requestSingleInstanceLock();
-if (!singleInstance && takeOverRunningInstance()) {
-  singleInstance = electron.app.requestSingleInstanceLock();
-}
+const singleInstance = electron.app.requestSingleInstanceLock();
 if (!singleInstance) {
   logger.warn("another instance is running, quitting");
   electron.app.quit();
@@ -3267,7 +3223,7 @@ function ensurePrimaryPet() {
 electron.app.whenReady().then(async () => {
   createMenuBar();
   await startAccountCallbackRouter();
-  startEventServer();
+  startEventServer(electron.app.getVersion());
   const activated = await activateStoredDevice().catch((err) => {
     logger.warn("device authentication failed", { error: String(err) });
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "desktop-pet-app",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "AI desktop pet with MCP support and a self-hosted relay server",
   "license": "MIT",
   "keywords": [
@@ -32,7 +32,7 @@
     "e2e:codebuddy:context": "node scripts/e2e-codebuddy-context-round.mjs",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
-    "package:mac": "npm run build && node scripts/prepare-electron-builder.mjs && electron-builder --mac pkg --publish never; node scripts/prepare-electron-builder.mjs --restore",
+    "package:mac": "npm run build && electron-builder --mac pkg --publish never",
     "pack:check": "npm pack --dry-run",
     "prepack": "npm run build",
     "prepublishOnly": "npm run typecheck && npm test && npm run pack:check"
@@ -48,6 +48,11 @@
       "bin/**",
       "package.json"
     ],
+    "pkg": {
+      "installLocation": "/Applications",
+      "isRelocatable": false,
+      "isVersionChecked": true
+    },
     "mac": {
       "category": "public.app-category.utilities",
       "target": [
@@ -58,14 +63,17 @@
   "devDependencies": {
     "@types/node": "^22.0.0",
     "@types/ws": "^8.18.1",
+    "electron": "^33.2.0",
     "electron-builder": "^26.15.3",
     "electron-vite": "^2.3.0",
     "typescript": "^5.6.3",
     "vite": "^5.4.8",
     "vitest": "^3.2.7"
   },
+  "peerDependencies": {
+    "electron": "^33.2.0"
+  },
   "dependencies": {
-    "electron": "^33.2.0",
     "@modelcontextprotocol/sdk": "^1.30.0",
     "ws": "^8.21.3",
     "zod": "^4.5.4"