clocktopus 1.1.1 → 1.1.3

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();
@@ -186,7 +187,7 @@ program
         const eligible = latestSession.isAutoCompleted && completedAt > twoHoursAgo && !!latestSession.projectId;
         if (!eligible)
             return;
-        await clockify.startTimer(workspaceId, latestSession.projectId, latestSession.description);
+        await clockify.startTimer(workspaceId, latestSession.projectId, latestSession.description, latestSession.jiraTicket ?? undefined);
         console.log(chalk.green('Timer restarted for the last used project.'));
         lastResumeAt = Date.now();
     }
@@ -290,6 +291,7 @@ 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');

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.1",
+  "version": "1.1.3",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
@@ -10,12 +10,13 @@
   "files": [
     "dist",
     "data/.gitkeep",
+    "scripts/postinstall.cjs",
     "!dist/desktop"
   ],
   "scripts": {
     "build": "bunx tsc",
     "prepublishOnly": "bunx tsc",
-    "postinstall": "node -e \"var p=require('path').dirname(require.resolve('macos-notification-state/package.json')); require('child_process').execSync('node-gyp rebuild',{cwd:p,stdio:'inherit'})\" 2>/dev/null; node -e \"var p=require('path').dirname(require.resolve('desktop-idle/package.json')); require('child_process').execSync('node-gyp rebuild',{cwd:p,stdio:'inherit'})\" 2>/dev/null; true",
+    "postinstall": "node scripts/postinstall.cjs",
     "lint": "eslint . --ext .ts",
     "clock": "bun dist/index.js",
     "monitor": "bun dist/index.js monitor",

package/scripts/postinstall.cjs

@@ -0,0 +1,67 @@
+#!/usr/bin/env node
+
+const { execSync } = require('child_process');
+const path = require('path');
+
+const nativeModules = ['macos-notification-state', 'desktop-idle'];
+
+function findNodeGyp() {
+  // Try plain node-gyp first (globally installed)
+  try {
+    execSync('node-gyp --version', { stdio: 'ignore' });
+    return 'node-gyp';
+  } catch {}
+
+  // Try npx (comes with Node.js)
+  try {
+    execSync('npx --version', { stdio: 'ignore' });
+    return 'npx node-gyp';
+  } catch {}
+
+  return null;
+}
+
+function rebuildModule(moduleName, nodeGypCmd) {
+  let modulePath;
+  try {
+    modulePath = path.dirname(require.resolve(`${moduleName}/package.json`));
+  } catch {
+    // Module not installed (e.g. optional dependency on wrong platform)
+    return;
+  }
+
+  const bindingGyp = path.join(modulePath, 'binding.gyp');
+  try {
+    require('fs').accessSync(bindingGyp);
+  } catch {
+    // No binding.gyp, not a native module
+    return;
+  }
+
+  try {
+    console.log(`Building native addon: ${moduleName}...`);
+    execSync(`${nodeGypCmd} rebuild`, { cwd: modulePath, stdio: 'inherit' });
+    console.log(`Built ${moduleName} successfully.`);
+  } catch (err) {
+    console.warn(`Warning: Failed to build ${moduleName}. The monitor feature may not work.`);
+    console.warn(`  You can try manually: cd ${modulePath} && npx node-gyp rebuild`);
+  }
+}
+
+// Only build on macOS — these are macOS-only native addons
+if (process.platform !== 'darwin') {
+  console.log('Skipping native addon build (not macOS).');
+  process.exit(0);
+}
+
+const nodeGypCmd = findNodeGyp();
+if (!nodeGypCmd) {
+  console.warn('Warning: node-gyp not found. Native addons were not built.');
+  console.warn('  Install node-gyp: npm install -g node-gyp');
+  console.warn('  Then rebuild: cd node_modules/macos-notification-state && node-gyp rebuild');
+  process.exit(0);
+}
+
+for (const mod of nativeModules) {
+  rebuildModule(mod, nodeGypCmd);
+}