clocktopus 1.1.2 → 1.1.4

package/README.md

@@ -150,6 +150,22 @@ Go to **System Settings > Notifications** and ensure **terminal-notifier** has n
 
 Enable **Require password immediately** in System Settings > Lock Screen.
 
+### Bun installs an old version
+
+Bun caches registry data aggressively. Clear the cache and reinstall:
+
+```bash
+bun pm cache rm && bun i -g clocktopus@latest
+```
+
+### Native addons not built (untrusted postinstall)
+
+If `bun install -g` skips the postinstall script, the monitor will auto-build native addons on first run (requires Node.js for `npx`). Alternatively, trust the package and reinstall:
+
+```bash
+bun pm trust clocktopus && bun i -g clocktopus
+```
+
 ### Linux
 
 ```bash

package/dist/dashboard/routes/monitor.js

@@ -7,6 +7,7 @@ const __dirname = path.dirname(__filename);
 const SCRIPT_PATH = path.resolve(__dirname, '../../index.js');
 const isDev = SCRIPT_PATH.includes('/Projects/') || SCRIPT_PATH.includes('/src/');
 const PM2_NAME = isDev ? 'clocktopus-monitor-dev' : 'clocktopus-monitor';
+const pm2Bin = path.resolve(__dirname, '../../node_modules/.bin/pm2');
 const monitorRoutes = new Hono();
 function pm2Exec(command) {
     try {
@@ -20,7 +21,7 @@ function pm2Exec(command) {
 }
 monitorRoutes.get('/monitor/status', (c) => {
     try {
-        const output = execSync('bunx pm2 jlist', { encoding: 'utf-8', timeout: 10000 });
+        const output = execSync('${pm2Bin} jlist', { encoding: 'utf-8', timeout: 10000 });
         const processes = JSON.parse(output);
         const proc = processes.find((p) => p.name === PM2_NAME);
         if (!proc) {
@@ -41,18 +42,18 @@ monitorRoutes.post('/monitor/start', (c) => {
     const bunPath = execSync('which bun', { encoding: 'utf-8' }).trim();
     // Delete any existing process to avoid duplicates
     try {
-        execSync(`bunx pm2 delete ${PM2_NAME}`, { stdio: 'ignore' });
+        execSync(`${pm2Bin} delete ${PM2_NAME}`, { stdio: 'ignore' });
     }
     catch { }
-    const result = pm2Exec(`bunx pm2 start ${SCRIPT_PATH} --name ${PM2_NAME} --interpreter ${bunPath} -- monitor:run`);
+    const result = pm2Exec(`${pm2Bin} start ${SCRIPT_PATH} --name ${PM2_NAME} --interpreter ${bunPath} -- monitor:run`);
     return c.json(result);
 });
 monitorRoutes.post('/monitor/stop', (c) => {
-    const result = pm2Exec(`bunx pm2 stop ${PM2_NAME}`);
+    const result = pm2Exec(`${pm2Bin} stop ${PM2_NAME}`);
     return c.json(result);
 });
 monitorRoutes.post('/monitor/restart', (c) => {
-    const result = pm2Exec(`bunx pm2 restart ${PM2_NAME}`);
+    const result = pm2Exec(`${pm2Bin} restart ${PM2_NAME}`);
     return c.json(result);
 });
 export default monitorRoutes;

package/dist/index.js

@@ -9,6 +9,7 @@ import { fileURLToPath } from 'url';
 import { completeLatestSession, getLatestSession } from './lib/db.js';
 import { stopJiraTimer } from './lib/jira.js';
 import { startDashboard } from './dashboard/server.js';
+import { ensureNativeAddons } from './lib/ensure-native-addons.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const program = new Command();
@@ -286,19 +287,21 @@ program
 const isDev = __dirname.includes('/Projects/') || __dirname.includes('/src/');
 const MONITOR_PM2_NAME = isDev ? 'clocktopus-monitor-dev' : 'clocktopus-monitor';
 const DASH_PM2_NAME = isDev ? 'clocktopus-dash-dev' : 'clocktopus-dash';
+const pm2Bin = path.join(__dirname, '..', 'node_modules', '.bin', 'pm2');
 program
     .command('monitor')
     .description('Start idle monitor as a background daemon.')
     .action(async () => {
+    ensureNativeAddons();
     const { execSync } = await import('child_process');
     const bunPath = execSync('which bun', { encoding: 'utf-8' }).trim();
     const scriptPath = path.join(__dirname, 'index.js');
     try {
         try {
-            execSync(`bunx pm2 delete ${MONITOR_PM2_NAME}`, { stdio: 'ignore' });
+            execSync(`${pm2Bin} delete ${MONITOR_PM2_NAME}`, { stdio: 'ignore' });
         }
         catch { }
-        execSync(`bunx pm2 start ${scriptPath} --name ${MONITOR_PM2_NAME} --interpreter ${bunPath} -- monitor:run`, {
+        execSync(`${pm2Bin} start ${scriptPath} --name ${MONITOR_PM2_NAME} --interpreter ${bunPath} -- monitor:run`, {
             stdio: 'inherit',
         });
         console.log(chalk.green('Idle monitor started in background.'));
@@ -315,7 +318,7 @@ program
     .action(async () => {
     const { execSync } = await import('child_process');
     try {
-        execSync(`bunx pm2 stop ${MONITOR_PM2_NAME}`, { stdio: 'inherit' });
+        execSync(`${pm2Bin} stop ${MONITOR_PM2_NAME}`, { stdio: 'inherit' });
     }
     catch {
         console.log(chalk.yellow('Monitor is not running.'));
@@ -327,7 +330,7 @@ program
     .action(async () => {
     const { execSync } = await import('child_process');
     try {
-        execSync(`bunx pm2 logs ${MONITOR_PM2_NAME} --lines 50`, { stdio: 'inherit' });
+        execSync(`${pm2Bin} logs ${MONITOR_PM2_NAME} --lines 50`, { stdio: 'inherit' });
     }
     catch {
         console.log(chalk.yellow('Monitor is not running.'));
@@ -342,10 +345,10 @@ program
     const scriptPath = path.join(__dirname, 'index.js');
     try {
         try {
-            execSync(`bunx pm2 delete ${DASH_PM2_NAME}`, { stdio: 'ignore' });
+            execSync(`${pm2Bin} delete ${DASH_PM2_NAME}`, { stdio: 'ignore' });
         }
         catch { }
-        execSync(`bunx pm2 start ${scriptPath} --name ${DASH_PM2_NAME} --interpreter ${bunPath} -- dash`, {
+        execSync(`${pm2Bin} start ${scriptPath} --name ${DASH_PM2_NAME} --interpreter ${bunPath} -- dash`, {
             stdio: 'inherit',
         });
         console.log(chalk.green('Dashboard running at http://localhost:4001'));
@@ -362,7 +365,7 @@ program
     .action(async () => {
     const { execSync } = await import('child_process');
     try {
-        execSync(`bunx pm2 stop ${DASH_PM2_NAME}`, { stdio: 'inherit' });
+        execSync(`${pm2Bin} stop ${DASH_PM2_NAME}`, { stdio: 'inherit' });
     }
     catch {
         console.log(chalk.yellow('Dashboard is not running.'));
@@ -374,7 +377,7 @@ program
     .action(async () => {
     const { execSync } = await import('child_process');
     try {
-        execSync(`bunx pm2 logs ${DASH_PM2_NAME} --lines 50`, { stdio: 'inherit' });
+        execSync(`${pm2Bin} logs ${DASH_PM2_NAME} --lines 50`, { stdio: 'inherit' });
     }
     catch {
         console.log(chalk.yellow('Dashboard is not running.'));

package/dist/lib/ensure-native-addons.js

@@ -0,0 +1,76 @@
+import { execSync } from 'child_process';
+import { createRequire } from 'module';
+import * as path from 'path';
+import * as fs from 'fs';
+const require = createRequire(import.meta.url);
+const NATIVE_MODULES = [
+    { name: 'macos-notification-state', addonName: 'notificationstate' },
+    { name: 'desktop-idle', addonName: 'desktopIdle' },
+];
+function hasBuiltAddon(moduleName, addonName) {
+    try {
+        const modulePath = path.dirname(require.resolve(`${moduleName}/package.json`));
+        const nodePath = path.join(modulePath, 'build', 'Release', `${addonName}.node`);
+        return fs.existsSync(nodePath);
+    }
+    catch {
+        return false;
+    }
+}
+function findNodeGyp() {
+    try {
+        execSync('node-gyp --version', { stdio: 'ignore' });
+        return 'node-gyp';
+    }
+    catch { }
+    try {
+        execSync('npx --version', { stdio: 'ignore' });
+        return 'npx node-gyp';
+    }
+    catch { }
+    return null;
+}
+function buildModule(moduleName, nodeGypCmd) {
+    let modulePath;
+    try {
+        modulePath = path.dirname(require.resolve(`${moduleName}/package.json`));
+    }
+    catch {
+        return false;
+    }
+    if (!fs.existsSync(path.join(modulePath, 'binding.gyp')))
+        return false;
+    try {
+        console.log(`Building native addon: ${moduleName}...`);
+        execSync(`${nodeGypCmd} rebuild`, { cwd: modulePath, stdio: 'inherit' });
+        console.log(`Built ${moduleName} successfully.`);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export function ensureNativeAddons() {
+    if (process.platform !== 'darwin')
+        return;
+    const missing = NATIVE_MODULES.filter((m) => !hasBuiltAddon(m.name, m.addonName));
+    if (missing.length === 0)
+        return;
+    console.log(`Native addons not built: ${missing.map((m) => m.name).join(', ')}. Attempting to build...`);
+    const nodeGypCmd = findNodeGyp();
+    if (!nodeGypCmd) {
+        console.warn('Warning: node-gyp not found. Native addons could not be built.');
+        console.warn('  Install Node.js (includes npx) then restart, or run:');
+        console.warn('  bun pm trust clocktopus && bun install -g clocktopus');
+        return;
+    }
+    const failed = [];
+    for (const mod of missing) {
+        if (!buildModule(mod.name, nodeGypCmd)) {
+            failed.push(mod.name);
+        }
+    }
+    if (failed.length > 0) {
+        console.warn(`Warning: Failed to build: ${failed.join(', ')}. Monitor features may not work.`);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clocktopus",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
@@ -21,9 +21,9 @@
     "clock": "bun dist/index.js",
     "monitor": "bun dist/index.js monitor",
     "monitor:stop": "bun dist/index.js monitor:stop",
-    "monitor:restart": "bunx pm2 restart clocktopus-monitor-dev",
+    "monitor:restart": "node_modules/.bin/pm2 restart clocktopus-monitor-dev",
     "monitor:logs": "bun dist/index.js monitor:logs",
-    "monitor:status": "bunx pm2 status clocktopus-monitor-dev",
+    "monitor:status": "node_modules/.bin/pm2 status clocktopus-monitor-dev",
     "prepare": "husky",
     "dashboard": "bun -e \"import('./dist/dashboard/server.js').then(m => m.startDashboard())\"",
     "db:cleanup": "bun dist/scripts/db-cleanup.js",