@meyverick/omnicode 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meyverick/omnicode",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Cross-platform command-line entrypoint for OpenCode through OmniRoute",
   "type": "module",
   "bin": {

package/src/bin/omnicode-runtime.js

@@ -2,9 +2,8 @@ import { spawn } from "node:child_process";
 import { closeSync, existsSync, mkdirSync, openSync, readFileSync, writeFileSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
 
-import { commandExists, getDataDir, isProcessRunning, isPidAlive } from "../installer/lib.js";
+import { commandExists, getDataDir, isPidAlive, isProcessRunningAsync } from "../installer/lib.js";
 
-const isWindows = process.platform === "win32";
 const MAX_OMNI_WAIT = 30;
 const OMNI_CHECK_DELAY = 1000;
 
@@ -53,13 +52,13 @@ async function initTools(dataDir) {
   ]);
 }
 
-function startOmniroute(dataDir, logFile, pidFile) {
-  if (isProcessRunning("omniroute")) {
+async function startOmniroute(dataDir, logFile, pidFile) {
+  if (await isProcessRunningAsync("omniroute")) {
     console.log("[omnicode] omniroute already running");
     return null;
   }
 
-  if (existsSync(pidFile) || existsSync(pidFile)) {
+  if (existsSync(pidFile)) {
     let pid = null;
     try {
       pid = parseInt(readFileSync(pidFile, "utf8").trim(), 10);
@@ -95,7 +94,7 @@ async function waitForOmniroute(pid, logFile) {
       process.exit(1);
     }
 
-    if (isProcessRunning("omniroute")) {
+    if (await isProcessRunningAsync("omniroute")) {
       console.log(`[omnicode] omniroute started (pid: ${pid})`);
       return;
     }
@@ -105,8 +104,8 @@ async function waitForOmniroute(pid, logFile) {
   process.exit(1);
 }
 
-function stopOmnirouteIfIdle(pidFile) {
-  if (isProcessRunning("opencode")) {
+async function stopOmnirouteIfIdle(pidFile) {
+  if (await isProcessRunningAsync("opencode")) {
     return;
   }
 
@@ -124,7 +123,7 @@ function stopOmnirouteIfIdle(pidFile) {
       }
       for (let i = 0; i < 10; i++) {
         if (!isPidAlive(pid)) break;
-        try { process.kill(pid, 0); } catch { break; }
+        await sleep(100);
       }
     }
     try { unlinkSync(pidFile); } catch {}
@@ -138,16 +137,25 @@ export async function runRuntime(mode) {
   const logFile = join(dataDir, "omniroute.log");
   const pidFile = join(dataDir, "omniroute.pid");
 
-  if (!isWindows) {
+  if (process.platform !== "win32") {
     process.umask(0o077);
   }
 
-  const cleanup = () => stopOmnirouteIfIdle(pidFile);
-  process.on("exit", cleanup);
-  process.on("SIGINT", () => { cleanup(); process.exit(0); });
-  process.on("SIGTERM", () => { cleanup(); process.exit(0); });
+  const cleanup = async () => { await stopOmnirouteIfIdle(pidFile); };
+  process.on("exit", () => {
+    try {
+      if (!existsSync(pidFile)) return;
+      const pid = parseInt(readFileSync(pidFile, "utf8").trim(), 10);
+      if (pid && isPidAlive(pid)) {
+        process.kill(-pid, "SIGTERM");
+      }
+      unlinkSync(pidFile);
+    } catch {}
+  });
+  process.on("SIGINT", async () => { await cleanup(); process.exit(0); });
+  process.on("SIGTERM", async () => { await cleanup(); process.exit(0); });
 
-  const pid = startOmniroute(dataDir, logFile, pidFile);
+  const pid = await startOmniroute(dataDir, logFile, pidFile);
 
   await Promise.all([
     pid !== null ? waitForOmniroute(pid, logFile) : Promise.resolve(),

package/src/installer/lib.js

@@ -1,8 +1,10 @@
-import { execFileSync } from "node:child_process";
+import { execFileSync, execFile } from "node:child_process";
+import { promisify } from "node:util";
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 import os from "node:os";
 
+const execFileAsync = promisify(execFile);
 const isWindows = process.platform === "win32";
 
 export function commandExists(command) {
@@ -35,6 +37,27 @@ export function isProcessRunning(name) {
   }
 }
 
+export async function isProcessRunningAsync(name) {
+  try {
+    if (isWindows) {
+      const extensions = [".exe", ".cmd", ".bat"];
+      for (const ext of extensions) {
+        try {
+          const { stdout } = await execFileAsync("tasklist", ["/FI", `IMAGENAME eq ${name}${ext}`, "/NH"], {
+            encoding: "utf8",
+          });
+          if (stdout.includes(`${name}${ext}`)) return true;
+        } catch {}
+      }
+      return false;
+    }
+    await execFileAsync("pgrep", ["-f", name]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 export function isPidAlive(pid) {
   try {
     process.kill(pid, 0);