clocktopus 1.1.0 → 1.1.2

package/dist/index.js

@@ -186,7 +186,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();
     }
@@ -201,6 +201,9 @@ program
             if (!getSessionState) {
                 throw new Error('getSessionState not found in module');
             }
+            // Verify the native addon actually works before setting up polling
+            const initialState = getSessionState();
+            console.log(chalk.gray(`Initial session state: ${initialState}`));
             pollInterval = setInterval(async () => {
                 try {
                     const state = getSessionState();
@@ -217,6 +220,11 @@ program
                 }
                 catch (error) {
                     console.error('Error polling session state:', error);
+                    if (pollInterval) {
+                        clearInterval(pollInterval);
+                        pollInterval = null;
+                        console.error(chalk.red('Display monitoring disabled due to repeated errors.'));
+                    }
                 }
             }, 3000);
         }

package/dist/lib/jira.js

@@ -21,7 +21,10 @@ async function jiraApiRequest(endpoint, method, body) {
             return response.data;
         }
         catch (error) {
-            if (error instanceof Error) {
+            if (axios.isAxiosError(error)) {
+                console.error('Error making Jira API request (OAuth):', error.message, error.response?.data);
+            }
+            else if (error instanceof Error) {
                 console.error('Error making Jira API request (OAuth):', error.message);
             }
             return null;
@@ -49,7 +52,10 @@ async function jiraApiRequest(endpoint, method, body) {
         return response.data;
     }
     catch (error) {
-        if (error instanceof Error) {
+        if (axios.isAxiosError(error)) {
+            console.error('Error making Jira API request:', error.message, error.response?.data);
+        }
+        else if (error instanceof Error) {
             console.error('Error making Jira API request:', error.message);
         }
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clocktopus",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "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": "cd node_modules/macos-notification-state && node-gyp rebuild 2>/dev/null; cd ../desktop-idle && node-gyp rebuild 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);
+}