desktop-pet-app 0.3.1 → 0.3.3

package/out/main/index.js

@@ -3144,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;
@@ -3182,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.3.1",
+  "version": "0.3.3",
   "description": "AI desktop pet with MCP support and a self-hosted relay server",
   "license": "MIT",
   "keywords": [