clocktopus 1.0.7 → 1.1.1

package/README.md

@@ -47,16 +47,18 @@ That's it. Start/stop timers from the Home tab.
 
 ### Commands
 
-| Command                 | Description                          |
-| ----------------------- | ------------------------------------ |
-| `clocktopus dash`       | Start dashboard (foreground)         |
-| `clocktopus serve`      | Start dashboard as background daemon |
-| `clocktopus serve:stop` | Stop the dashboard daemon            |
-| `clocktopus serve:logs` | View dashboard daemon logs           |
-| `clocktopus start`      | Start a timer (interactive)          |
-| `clocktopus stop`       | Stop the current timer               |
-| `clocktopus status`     | Check timer status                   |
-| `clocktopus monitor`    | Start idle monitor (foreground)      |
+| Command                   | Description                             |
+| ------------------------- | --------------------------------------- |
+| `clocktopus dash`         | Start dashboard (foreground)            |
+| `clocktopus serve`        | Start dashboard as background daemon    |
+| `clocktopus serve:stop`   | Stop the dashboard daemon               |
+| `clocktopus serve:logs`   | View dashboard daemon logs              |
+| `clocktopus start`        | Start a timer (interactive)             |
+| `clocktopus stop`         | Stop the current timer                  |
+| `clocktopus status`       | Check timer status                      |
+| `clocktopus monitor`      | Start idle monitor as background daemon |
+| `clocktopus monitor:stop` | Stop the idle monitor                   |
+| `clocktopus monitor:logs` | View idle monitor logs                  |
 
 ### Desktop App (macOS)
 

package/dist/dashboard/routes/monitor.js

@@ -5,7 +5,8 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const SCRIPT_PATH = path.resolve(__dirname, '../../index.js');
-const PM2_NAME = 'clocktopus-monitor';
+const isDev = SCRIPT_PATH.includes('/Projects/') || SCRIPT_PATH.includes('/src/');
+const PM2_NAME = isDev ? 'clocktopus-monitor-dev' : 'clocktopus-monitor';
 const monitorRoutes = new Hono();
 function pm2Exec(command) {
     try {
@@ -43,7 +44,7 @@ monitorRoutes.post('/monitor/start', (c) => {
         execSync(`bunx pm2 delete ${PM2_NAME}`, { stdio: 'ignore' });
     }
     catch { }
-    const result = pm2Exec(`bunx pm2 start ${SCRIPT_PATH} --name ${PM2_NAME} --interpreter ${bunPath} -- monitor`);
+    const result = pm2Exec(`bunx pm2 start ${SCRIPT_PATH} --name ${PM2_NAME} --interpreter ${bunPath} -- monitor:run`);
     return c.json(result);
 });
 monitorRoutes.post('/monitor/stop', (c) => {

package/dist/index.js

@@ -137,8 +137,8 @@ function sleep(ms) {
     return new Promise((res) => setTimeout(res, ms));
 }
 program
-    .command('monitor')
-    .description('Monitor system idle time and screen state, and stop the Clockify timer if idle or screen is off.')
+    .command('monitor:run', { hidden: true })
+    .description('Run monitor in foreground (used by PM2).')
     .action(async () => {
     const { workspaceId, userId } = await getWorkspaceAndUser();
     async function stopTimerAndLog(reason) {
@@ -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);
         }
@@ -275,6 +283,56 @@ program
     .action(() => {
     startDashboard();
 });
+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';
+program
+    .command('monitor')
+    .description('Start idle monitor as a background daemon.')
+    .action(async () => {
+    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' });
+        }
+        catch { }
+        execSync(`bunx pm2 start ${scriptPath} --name ${MONITOR_PM2_NAME} --interpreter ${bunPath} -- monitor:run`, {
+            stdio: 'inherit',
+        });
+        console.log(chalk.green('Idle monitor started in background.'));
+        console.log(chalk.gray('  Stop:   clocktopus monitor:stop'));
+        console.log(chalk.gray('  Logs:   clocktopus monitor:logs'));
+    }
+    catch {
+        console.error(chalk.red('Failed to start monitor.'));
+    }
+});
+program
+    .command('monitor:stop')
+    .description('Stop the idle monitor daemon.')
+    .action(async () => {
+    const { execSync } = await import('child_process');
+    try {
+        execSync(`bunx pm2 stop ${MONITOR_PM2_NAME}`, { stdio: 'inherit' });
+    }
+    catch {
+        console.log(chalk.yellow('Monitor is not running.'));
+    }
+});
+program
+    .command('monitor:logs')
+    .description('Show idle monitor logs.')
+    .action(async () => {
+    const { execSync } = await import('child_process');
+    try {
+        execSync(`bunx pm2 logs ${MONITOR_PM2_NAME} --lines 50`, { stdio: 'inherit' });
+    }
+    catch {
+        console.log(chalk.yellow('Monitor is not running.'));
+    }
+});
 program
     .command('serve')
     .description('Start dashboard as a background daemon (PM2).')
@@ -283,12 +341,11 @@ program
     const bunPath = execSync('which bun', { encoding: 'utf-8' }).trim();
     const scriptPath = path.join(__dirname, 'index.js');
     try {
-        // Stop existing if running
         try {
-            execSync('bunx pm2 delete clocktopus-dash', { stdio: 'ignore' });
+            execSync(`bunx pm2 delete ${DASH_PM2_NAME}`, { stdio: 'ignore' });
         }
         catch { }
-        execSync(`bunx pm2 start ${scriptPath} --name clocktopus-dash --interpreter ${bunPath} -- dash`, {
+        execSync(`bunx pm2 start ${scriptPath} --name ${DASH_PM2_NAME} --interpreter ${bunPath} -- dash`, {
             stdio: 'inherit',
         });
         console.log(chalk.green('Dashboard running at http://localhost:4001'));
@@ -305,7 +362,7 @@ program
     .action(async () => {
     const { execSync } = await import('child_process');
     try {
-        execSync('bunx pm2 stop clocktopus-dash', { stdio: 'inherit' });
+        execSync(`bunx pm2 stop ${DASH_PM2_NAME}`, { stdio: 'inherit' });
     }
     catch {
         console.log(chalk.yellow('Dashboard is not running.'));
@@ -317,7 +374,7 @@ program
     .action(async () => {
     const { execSync } = await import('child_process');
     try {
-        execSync('bunx pm2 logs clocktopus-dash --lines 50', { stdio: 'inherit' });
+        execSync(`bunx pm2 logs ${DASH_PM2_NAME} --lines 50`, { stdio: 'inherit' });
     }
     catch {
         console.log(chalk.yellow('Dashboard is not running.'));

package/dist/lib/db.js

@@ -2,7 +2,15 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { Database } from 'bun:sqlite';
 import { z } from 'zod';
-const DB_DIR = path.join(process.cwd(), 'data/db');
+function getDataDir() {
+    const scriptDir = path.dirname(new URL(import.meta.url).pathname);
+    const isDev = scriptDir.includes('/Projects/') || scriptDir.includes('/src/');
+    if (isDev) {
+        return path.join(process.cwd(), 'data/db');
+    }
+    return path.join(process.env.HOME || '~', '.clocktopus', 'data');
+}
+const DB_DIR = getDataDir();
 const DB_PATH = path.join(DB_DIR, 'sessions.db');
 if (!fs.existsSync(DB_DIR)) {
     fs.mkdirSync(DB_DIR, { recursive: true });

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.0.7",
+  "version": "1.1.1",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
@@ -15,15 +15,14 @@
   "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 -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",
     "lint": "eslint . --ext .ts",
     "clock": "bun dist/index.js",
-    "clockd": "bunx pm2 start dist/index.js --name clocktopus --",
-    "monitor": "bun run clockd monitor",
-    "monitor:restart": "bunx pm2 restart clocktopus",
-    "monitor:stop": "bunx pm2 stop clocktopus",
-    "monitor:logs": "bunx pm2 logs clocktopus",
-    "monitor:status": "bunx pm2 status clocktopus",
+    "monitor": "bun dist/index.js monitor",
+    "monitor:stop": "bun dist/index.js monitor:stop",
+    "monitor:restart": "bunx pm2 restart clocktopus-monitor-dev",
+    "monitor:logs": "bun dist/index.js monitor:logs",
+    "monitor:status": "bunx 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",