clocktopus 1.10.2 → 1.10.4

package/dist/dashboard/routes/monitor.js

@@ -3,11 +3,11 @@ import { execSync } from 'child_process';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { createRequire } from 'module';
+import { IS_DEV } from '../../lib/constants.js';
 const __filename = fileURLToPath(import.meta.url);
 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 PM2_NAME = IS_DEV ? 'clocktopus-monitor-dev' : 'clocktopus-monitor';
 const pm2Bin = path.join(path.dirname(createRequire(import.meta.url).resolve('pm2')), 'bin', 'pm2');
 const bunBin = (() => {
     try {

package/dist/dashboard/views.js

@@ -13,9 +13,8 @@ export function indexPage() {
   <style>
     * { box-sizing: border-box; margin: 0; padding: 0; }
     html.browser { background: #0d1117; }
-    html, body { border-radius: 12px; }
-    html { overflow: hidden; background: transparent; }
-    body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; background: transparent; color: #e1e4e8; padding: 2rem; }
+    html { border-radius: 12px; overflow: hidden; height: 100vh; background: transparent; }
+    body { border-radius: 12px; height: 100vh; overflow-y: auto; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; background: transparent; color: #e1e4e8; padding: 2rem; }
     h1 { font-size: 1.8rem; margin-bottom: 0; color: #fff; }
     h2 { font-size: 1.1rem; color: #fff; margin-bottom: 1rem; }
 

package/dist/index.js

@@ -9,7 +9,7 @@ import { execSync } from 'child_process';
 import { closeStaleOpenSessions, completeLatestSession, getLatestSession, setSessionJiraWorklogId } from './lib/db.js';
 import { isClockifyEnabled } from './lib/credentials.js';
 import { ensureNativeAddons } from './lib/ensure-native-addons.js';
-import { DASHBOARD_PORT, DASHBOARD_URL } from './lib/constants.js';
+import { DASHBOARD_PORT, DASHBOARD_URL, IS_DEV } from './lib/constants.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const program = new Command();
@@ -268,44 +268,70 @@ program
     }
     // Safer restart w/ cooldown; only resume a recent auto-completed session
     let lastResumeAt = 0;
+    let resuming = false;
     const RESUME_COOLDOWN_MS = 10000;
+    // Shared between lock-state and idle-time watchers so a resume triggered
+    // by one path disarms the other (otherwise both fire and we get two starts).
+    let isLocked = false;
+    let lastIdle = false;
     async function safeRestartTimerIfNeeded() {
         const now = Date.now();
-        if (now - lastResumeAt < RESUME_COOLDOWN_MS)
-            return;
-        // Small delay lets services settle after wake/activity
-        await sleep(800);
-        const latestSession = getLatestSession();
-        if (!latestSession)
-            return;
-        const twoHoursAgo = Date.now() - 2 * 60 * 60 * 1000;
-        const completedMs = latestSession.completedAt ? new Date(latestSession.completedAt).getTime() : 0;
-        if (!latestSession.isAutoCompleted || completedMs <= twoHoursAgo)
+        if (resuming || now - lastResumeAt < RESUME_COOLDOWN_MS)
             return;
-        if (isClockifyEnabled()) {
-            if (!latestSession.projectId)
+        resuming = true;
+        // Gate concurrent callers immediately; refine on success/failure below.
+        lastResumeAt = now;
+        try {
+            // Small delay lets services settle after wake/activity
+            await sleep(800);
+            const latestSession = getLatestSession();
+            if (!latestSession)
                 return;
-            const activeEntry = await (await clockify()).getActiveTimer(workspaceId, userId);
-            if (activeEntry)
+            const twoHoursAgo = Date.now() - 2 * 60 * 60 * 1000;
+            const completedMs = latestSession.completedAt ? new Date(latestSession.completedAt).getTime() : 0;
+            if (!latestSession.isAutoCompleted || completedMs <= twoHoursAgo)
+                return;
+            if (isClockifyEnabled()) {
+                if (!latestSession.projectId)
+                    return;
+                const activeEntry = await (await clockify()).getActiveTimer(workspaceId, userId);
+                if (activeEntry) {
+                    isLocked = false;
+                    lastIdle = false;
+                    return;
+                }
+                await (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();
+                isLocked = false;
+                lastIdle = false;
                 return;
-            await (await clockify()).startTimer(workspaceId, latestSession.projectId, latestSession.description, latestSession.jiraTicket ?? undefined);
-            console.log(chalk.green('Timer restarted for the last used project.'));
+            }
+            // Jira-only resume: new DB session with a fresh uuid, same ticket.
+            // Re-read latest to guard against a concurrent insert from another path.
+            if (!latestSession.jiraTicket)
+                return;
+            const fresh = getLatestSession();
+            if (fresh && !fresh.completedAt) {
+                isLocked = false;
+                lastIdle = false;
+                return;
+            }
+            const { v4: uuidv4 } = await import('uuid');
+            const { logSessionStart } = await import('./lib/db.js');
+            const sessionId = uuidv4();
+            const startedAt = new Date().toISOString();
+            logSessionStart(sessionId, latestSession.projectId ?? null, latestSession.description, startedAt, latestSession.jiraTicket);
+            console.log(chalk.green(`Resumed Jira timer for ${latestSession.jiraTicket}.`));
             lastResumeAt = Date.now();
-            return;
+            isLocked = false;
+            lastIdle = false;
+        }
+        finally {
+            resuming = false;
         }
-        // Jira-only resume: new DB session with a fresh uuid, same ticket
-        if (!latestSession.jiraTicket)
-            return;
-        const { v4: uuidv4 } = await import('uuid');
-        const { logSessionStart } = await import('./lib/db.js');
-        const sessionId = uuidv4();
-        const startedAt = new Date().toISOString();
-        logSessionStart(sessionId, latestSession.projectId ?? null, latestSession.description, startedAt, latestSession.jiraTicket);
-        console.log(chalk.green(`Resumed Jira timer for ${latestSession.jiraTicket}.`));
-        lastResumeAt = Date.now();
     }
     console.log(chalk.blue('Monitoring display events (Unified Log) and idle time...'));
-    let isLocked = false;
     let pollInterval = null;
     console.log(chalk.blue('Monitoring display/lock state (macos-notification-state) and idle time...'));
     try {
@@ -351,7 +377,6 @@ program
         console.error(err);
     }
     const IDLE_THRESHOLD_SECONDS = 300; // 5 minutes
-    let lastIdle = false;
     const idleInterval = setInterval(async () => {
         try {
             const idleModule = await import('desktop-idle');
@@ -398,9 +423,8 @@ program
     const { startDashboard } = await import('./dashboard/server.js');
     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';
+const MONITOR_PM2_NAME = IS_DEV ? 'clocktopus-monitor-dev' : 'clocktopus-monitor';
+const DASH_PM2_NAME = IS_DEV ? 'clocktopus-dash-dev' : 'clocktopus-dash';
 const pm2Bin = path.join(path.dirname(createRequire(import.meta.url).resolve('pm2')), 'bin', 'pm2');
 const bunBin = (() => {
     try {

package/dist/lib/constants.js

@@ -1,3 +1,25 @@
+import * as path from 'path';
+/**
+ * True only when running from the clocktopus source repo (e.g. `bun run`
+ * during local development). Bun-linked global installs live under
+ * `node_modules/` and must NOT be flagged as dev — otherwise PM2 names and
+ * data paths pick up the dev variants. Set CLOCKTOPUS_DEV=1 to force on.
+ */
+export const IS_DEV = (() => {
+    const override = process.env.CLOCKTOPUS_DEV;
+    if (override != null && override !== '') {
+        return override === '1' || override.toLowerCase() === 'true';
+    }
+    try {
+        const scriptDir = path.dirname(new URL(import.meta.url).pathname);
+        if (scriptDir.includes('/node_modules/'))
+            return false;
+        return scriptDir.includes('/Projects/') || scriptDir.includes('/src/');
+    }
+    catch {
+        return false;
+    }
+})();
 /**
  * Dashboard HTTP port. Override via CLOCKTOPUS_PORT env var if 4001 is busy.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clocktopus",
-  "version": "1.10.2",
+  "version": "1.10.4",
   "description": "Time-tracking automation for Clockify with idle monitoring, Jira integration, Google Calendar sync, CLI, web dashboard, and desktop app.",
   "type": "module",
   "main": "dist/index.js",