omnikey-cli 1.0.9 → 1.0.11

package/dist/index.js

@@ -52,8 +52,10 @@ program
     .command('logs')
     .description('Show logs of the running Omnikey daemon')
     .option('--lines <lines>', 'Number of log lines to show', '50')
+    .option('--errors', 'Show only error logs')
     .action((options) => {
     const lines = Number(options.lines) || 50;
-    (0, showLogs_1.showLogs)(lines);
+    const errorsOnly = !!options.errors;
+    (0, showLogs_1.showLogs)(lines, errorsOnly);
 });
 program.parseAsync(process.argv);

package/dist/killDaemon.js

@@ -2,31 +2,42 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.killDaemon = killDaemon;
 const child_process_1 = require("child_process");
+const removeConfig_1 = require("./removeConfig");
 /**
  * Kill the Omnikey API backend daemon running on a given port (default 7071).
  * Looks for node processes running backend-dist/index.js on the specified port and kills them.
  * @param port The port to look for (default 7071)
  */
 function killDaemon(port = 7071) {
+    // 1. Unload/kill the launchd agent first
     try {
-        // Find the PID(s) of node processes running backend-dist/index.js on the given port
-        // macOS: lsof -i :PORT -t
-        const pids = (0, child_process_1.execSync)(`lsof -i :${port} -t`).toString().split('\n').filter(Boolean);
-        if (pids.length === 0) {
-            console.log(`No daemon found running on port ${port}.`);
-            return;
-        }
-        for (const pid of pids) {
-            try {
-                process.kill(Number(pid), 'SIGTERM');
-                console.log(`Killed daemon process with PID ${pid} on port ${port}.`);
-            }
-            catch (e) {
-                console.error(`Failed to kill process ${pid}:`, e);
-            }
-        }
+        (0, removeConfig_1.killLaunchdAgent)();
+        console.log('Launchd agent unloaded (if it existed).');
+    }
+    catch (e) {
+        console.warn('Failed to unload launchd agent or agent did not exist:', e);
+    }
+    // 2. Check if the port is still in use
+    let pids = [];
+    try {
+        pids = (0, child_process_1.execSync)(`lsof -i :${port} -t`).toString().split('\n').filter(Boolean);
     }
     catch (e) {
-        console.log(`No daemon found running on port ${port}.`);
+        // lsof returns non-zero exit code if nothing is using the port
+        pids = [];
+    }
+    if (pids.length === 0) {
+        console.log(`No process found using port ${port} after unloading launchd agent.`);
+        return;
+    }
+    // 3. If the port is still occupied, kill the process using the port
+    for (const pid of pids) {
+        try {
+            process.kill(Number(pid), 'SIGTERM');
+            console.log(`Killed process with PID ${pid} using port ${port}.`);
+        }
+        catch (e) {
+            console.error(`Failed to kill process ${pid}:`, e);
+        }
     }
 }

package/dist/removeConfig.js

@@ -3,11 +3,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.killLaunchdAgent = killLaunchdAgent;
 exports.removeConfigAndDb = removeConfigAndDb;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const child_process_1 = require("child_process");
+function killLaunchdAgent() {
+    const homeDir = process.env.HOME || process.env.USERPROFILE || os_1.default.homedir();
+    const plistName = 'com.omnikey.daemon.plist';
+    const plistPath = path_1.default.join(homeDir, 'Library', 'LaunchAgents', plistName);
+    if (fs_1.default.existsSync(plistPath)) {
+        try {
+            (0, child_process_1.execSync)(`launchctl unload "${plistPath}"`);
+            fs_1.default.rmSync(plistPath);
+            console.log(`Removed launchd agent: ${plistPath}`);
+        }
+        catch (e) {
+            console.error(`Failed to remove launchd agent: ${e}`);
+        }
+    }
+    else {
+        console.log(`Launchd agent does not exist: ${plistPath}`);
+    }
+}
 /**
  * Removes the ~/.omnikey config directory and the SQLite database file specified in config.json.
  */
@@ -31,21 +50,7 @@ function removeConfigAndDb() {
         }
     }
     // Remove launchd agent if exists (macOS)
-    const plistName = 'com.omnikey.daemon.plist';
-    const plistPath = path_1.default.join(homeDir, 'Library', 'LaunchAgents', plistName);
-    if (fs_1.default.existsSync(plistPath)) {
-        try {
-            (0, child_process_1.execSync)(`launchctl unload "${plistPath}"`);
-            fs_1.default.rmSync(plistPath);
-            console.log(`Removed launchd agent: ${plistPath}`);
-        }
-        catch (e) {
-            console.error(`Failed to remove launchd agent: ${e}`);
-        }
-    }
-    else {
-        console.log(`Launchd agent does not exist: ${plistPath}`);
-    }
+    killLaunchdAgent();
     // Remove SQLite database
     if (fs_1.default.existsSync(sqlitePath)) {
         try {

package/dist/showLogs.js

@@ -9,40 +9,24 @@ const path_1 = __importDefault(require("path"));
 /**
  * Show the logs of the running Omnikey daemon by printing the contents of the daemon log file.
  * Prints the last N lines (default 50) for convenience.
+ * If errorsOnly is true, shows daemon-error.log instead.
  */
-function showLogs(lines = 50) {
+function showLogs(lines = 50, errorsOnly = false) {
     const homeDir = process.env.HOME || process.env.USERPROFILE || '.';
     const configDir = path_1.default.join(homeDir, '.omnikey');
-    const logPath = path_1.default.join(configDir, 'daemon.log');
-    const errorLogPath = path_1.default.join(configDir, 'daemon-error.log');
-    let logLines = [];
-    let errorLines = [];
-    if (fs_1.default.existsSync(logPath)) {
-        const logContent = fs_1.default.readFileSync(logPath, 'utf-8');
-        logLines = logContent.split('\n');
-    }
-    if (fs_1.default.existsSync(errorLogPath)) {
-        const errorContent = fs_1.default.readFileSync(errorLogPath, 'utf-8');
-        errorLines = errorContent.split('\n');
-    }
-    if (logLines.length === 0 && errorLines.length === 0) {
-        console.log('No daemon.log or daemon-error.log file found.');
+    const logPath = path_1.default.join(configDir, errorsOnly ? 'daemon-error.log' : 'daemon.log');
+    if (!fs_1.default.existsSync(logPath)) {
+        console.log(errorsOnly ? 'No error logs found.' : 'No daemon logs found.');
         return;
     }
-    const left = logLines.slice(-lines);
-    const right = errorLines.slice(-lines);
-    // Calculate column widths
-    const leftWidth = Math.max(40, ...left.map((l) => l.length));
-    const rightWidth = Math.max(40, ...right.map((l) => l.length));
-    // Print header
-    const leftHeader = 'Other Logs'.padEnd(leftWidth);
-    const rightHeader = 'Errors'.padEnd(rightWidth);
-    console.log(`${leftHeader} | ${rightHeader}`);
-    console.log('-'.repeat(leftWidth) + '-+-' + '-'.repeat(rightWidth));
-    // Print lines side by side
-    for (let i = 0; i < lines; i++) {
-        const l = left[i] !== undefined ? left[i] : '';
-        const r = right[i] !== undefined ? right[i] : '';
-        console.log(l.padEnd(leftWidth) + ' | ' + r.padEnd(rightWidth));
+    const logContent = fs_1.default.readFileSync(logPath, 'utf-8');
+    const logLines = logContent.split('\n');
+    const lastLines = logLines.slice(-lines);
+    if (errorsOnly) {
+        console.log('--- Error Logs ---');
+    }
+    else {
+        console.log('--- Daemon Logs ---');
     }
+    lastLines.forEach((line) => console.log(line));
 }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "CLI for onboarding users to Omnikey AI and configuring OPENAI_API_KEY. Use Yarn for install/build.",
   "engines": {
     "node": ">=14.0.0",

package/src/index.ts

@@ -61,9 +61,11 @@ program
   .command('logs')
   .description('Show logs of the running Omnikey daemon')
   .option('--lines <lines>', 'Number of log lines to show', '50')
+  .option('--errors', 'Show only error logs')
   .action((options) => {
     const lines = Number(options.lines) || 50;
-    showLogs(lines);
+    const errorsOnly = !!options.errors;
+    showLogs(lines, errorsOnly);
   });
 
 program.parseAsync(process.argv);

package/src/killDaemon.ts

@@ -1,4 +1,5 @@
 import { execSync } from 'child_process';
+import { killLaunchdAgent } from './removeConfig';
 
 /**
  * Kill the Omnikey API backend daemon running on a given port (default 7071).
@@ -6,23 +7,35 @@ import { execSync } from 'child_process';
  * @param port The port to look for (default 7071)
  */
 export function killDaemon(port: number = 7071) {
+  // 1. Unload/kill the launchd agent first
   try {
-    // Find the PID(s) of node processes running backend-dist/index.js on the given port
-    // macOS: lsof -i :PORT -t
-    const pids = execSync(`lsof -i :${port} -t`).toString().split('\n').filter(Boolean);
-    if (pids.length === 0) {
-      console.log(`No daemon found running on port ${port}.`);
-      return;
-    }
-    for (const pid of pids) {
-      try {
-        process.kill(Number(pid), 'SIGTERM');
-        console.log(`Killed daemon process with PID ${pid} on port ${port}.`);
-      } catch (e) {
-        console.error(`Failed to kill process ${pid}:`, e);
-      }
-    }
+    killLaunchdAgent();
+    console.log('Launchd agent unloaded (if it existed).');
+  } catch (e) {
+    console.warn('Failed to unload launchd agent or agent did not exist:', e);
+  }
+
+  // 2. Check if the port is still in use
+  let pids: string[] = [];
+  try {
+    pids = execSync(`lsof -i :${port} -t`).toString().split('\n').filter(Boolean);
   } catch (e) {
-    console.log(`No daemon found running on port ${port}.`);
+    // lsof returns non-zero exit code if nothing is using the port
+    pids = [];
+  }
+
+  if (pids.length === 0) {
+    console.log(`No process found using port ${port} after unloading launchd agent.`);
+    return;
+  }
+
+  // 3. If the port is still occupied, kill the process using the port
+  for (const pid of pids) {
+    try {
+      process.kill(Number(pid), 'SIGTERM');
+      console.log(`Killed process with PID ${pid} using port ${port}.`);
+    } catch (e) {
+      console.error(`Failed to kill process ${pid}:`, e);
+    }
   }
 }

package/src/removeConfig.ts

@@ -3,6 +3,23 @@ import path from 'path';
 import os from 'os';
 import { execSync } from 'child_process';
 
+export function killLaunchdAgent() {
+  const homeDir = process.env.HOME || process.env.USERPROFILE || os.homedir();
+  const plistName = 'com.omnikey.daemon.plist';
+  const plistPath = path.join(homeDir, 'Library', 'LaunchAgents', plistName);
+  if (fs.existsSync(plistPath)) {
+    try {
+      execSync(`launchctl unload "${plistPath}"`);
+      fs.rmSync(plistPath);
+      console.log(`Removed launchd agent: ${plistPath}`);
+    } catch (e) {
+      console.error(`Failed to remove launchd agent: ${e}`);
+    }
+  } else {
+    console.log(`Launchd agent does not exist: ${plistPath}`);
+  }
+}
+
 /**
  * Removes the ~/.omnikey config directory and the SQLite database file specified in config.json.
  */
@@ -27,19 +44,7 @@ export function removeConfigAndDb() {
   }
 
   // Remove launchd agent if exists (macOS)
-  const plistName = 'com.omnikey.daemon.plist';
-  const plistPath = path.join(homeDir, 'Library', 'LaunchAgents', plistName);
-  if (fs.existsSync(plistPath)) {
-    try {
-      execSync(`launchctl unload "${plistPath}"`);
-      fs.rmSync(plistPath);
-      console.log(`Removed launchd agent: ${plistPath}`);
-    } catch (e) {
-      console.error(`Failed to remove launchd agent: ${e}`);
-    }
-  } else {
-    console.log(`Launchd agent does not exist: ${plistPath}`);
-  }
+  killLaunchdAgent();
 
   // Remove SQLite database
   if (fs.existsSync(sqlitePath)) {

package/src/showLogs.ts

@@ -4,46 +4,25 @@ import path from 'path';
 /**
  * Show the logs of the running Omnikey daemon by printing the contents of the daemon log file.
  * Prints the last N lines (default 50) for convenience.
+ * If errorsOnly is true, shows daemon-error.log instead.
  */
-export function showLogs(lines: number = 50) {
+export function showLogs(lines: number = 50, errorsOnly: boolean = false) {
   const homeDir = process.env.HOME || process.env.USERPROFILE || '.';
   const configDir = path.join(homeDir, '.omnikey');
-  const logPath = path.join(configDir, 'daemon.log');
-  const errorLogPath = path.join(configDir, 'daemon-error.log');
+  const logPath = path.join(configDir, errorsOnly ? 'daemon-error.log' : 'daemon.log');
 
-  let logLines: string[] = [];
-  let errorLines: string[] = [];
-  if (fs.existsSync(logPath)) {
-    const logContent = fs.readFileSync(logPath, 'utf-8');
-    logLines = logContent.split('\n');
-  }
-  if (fs.existsSync(errorLogPath)) {
-    const errorContent = fs.readFileSync(errorLogPath, 'utf-8');
-    errorLines = errorContent.split('\n');
-  }
-
-  if (logLines.length === 0 && errorLines.length === 0) {
-    console.log('No daemon.log or daemon-error.log file found.');
+  if (!fs.existsSync(logPath)) {
+    console.log(errorsOnly ? 'No error logs found.' : 'No daemon logs found.');
     return;
   }
 
-  const left = logLines.slice(-lines);
-  const right = errorLines.slice(-lines);
-
-  // Calculate column widths
-  const leftWidth = Math.max(40, ...left.map((l) => l.length));
-  const rightWidth = Math.max(40, ...right.map((l) => l.length));
-
-  // Print header
-  const leftHeader = 'Other Logs'.padEnd(leftWidth);
-  const rightHeader = 'Errors'.padEnd(rightWidth);
-  console.log(`${leftHeader} | ${rightHeader}`);
-  console.log('-'.repeat(leftWidth) + '-+-' + '-'.repeat(rightWidth));
-
-  // Print lines side by side
-  for (let i = 0; i < lines; i++) {
-    const l = left[i] !== undefined ? left[i] : '';
-    const r = right[i] !== undefined ? right[i] : '';
-    console.log(l.padEnd(leftWidth) + ' | ' + r.padEnd(rightWidth));
+  const logContent = fs.readFileSync(logPath, 'utf-8');
+  const logLines = logContent.split('\n');
+  const lastLines = logLines.slice(-lines);
+  if (errorsOnly) {
+    console.log('--- Error Logs ---');
+  } else {
+    console.log('--- Daemon Logs ---');
   }
+  lastLines.forEach((line) => console.log(line));
 }