clocktopus 1.6.1 → 1.6.3

package/README.md

@@ -195,6 +195,44 @@ cd ~/.bun/install/global/node_modules/macos-notification-state && npx node-gyp r
 apt install libxss-dev pkg-config build-essential
 ```
 
+### node-gyp error: `Cannot find module './entry-index'`
+
+During install you may see:
+
+```
+gyp ERR! stack Error: Cannot find module './entry-index'
+gyp ERR! stack Require stack:
+gyp ERR! stack - .../node_modules/cacache/lib/get.js
+...
+error: install script from "desktop-idle" exited with 1
+```
+
+Caused by a broken `node-gyp@12.2.0` / `cacache` bundle fetched via `bunx` on newer Node versions (e.g. Node 25).
+
+Fixes, in order:
+
+1. **Use Node 20 LTS** (most reliable):
+
+   ```bash
+   nvm install 20 && nvm use 20
+   bun i -g clocktopus@latest --trust
+   ```
+
+2. **Clear the bunx node-gyp cache** and retry:
+
+   ```bash
+   rm -rf /var/folders/**/bunx-*-node-gyp@latest
+   bun i -g clocktopus@latest --trust
+   ```
+
+3. **Install via npm** (uses its own node-gyp):
+
+   ```bash
+   npm i -g clocktopus@latest
+   ```
+
+`desktop-idle` is a native addon and must be compiled at install time — skipping postinstall leaves idle detection disabled.
+
 ## License
 
 MIT

package/dist/dashboard/routes/server.js

@@ -0,0 +1,42 @@
+import { Hono } from 'hono';
+import { execSync, spawn } from 'child_process';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { createRequire } from 'module';
+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 DASH_PM2_NAME = isDev ? 'clocktopus-dash-dev' : 'clocktopus-dash';
+const pm2Bin = path.join(path.dirname(createRequire(import.meta.url).resolve('pm2')), 'bin', 'pm2');
+const serverRoutes = new Hono();
+function isUnderPm2() {
+    if (process.env.pm_id)
+        return true;
+    try {
+        const output = execSync(`${pm2Bin} jlist`, { encoding: 'utf-8', timeout: 3000 });
+        const processes = JSON.parse(output);
+        return processes.some((p) => p.name === DASH_PM2_NAME && p.pid === process.pid);
+    }
+    catch {
+        return false;
+    }
+}
+serverRoutes.post('/server/restart', (c) => {
+    const underPm2 = isUnderPm2();
+    setTimeout(() => {
+        if (underPm2) {
+            try {
+                spawn(pm2Bin, ['restart', DASH_PM2_NAME], { detached: true, stdio: 'ignore' }).unref();
+            }
+            catch {
+                process.exit(0);
+            }
+        }
+        else {
+            process.exit(0);
+        }
+    }, 100);
+    return c.json({ ok: true, managed: underPm2 });
+});
+export default serverRoutes;

package/dist/dashboard/server.js

@@ -11,6 +11,7 @@ import timerRoutes from './routes/timer.js';
 import dataRoutes from './routes/data.js';
 import monitorRoutes from './routes/monitor.js';
 import calendarRoutes from './routes/calendar.js';
+import serverRoutes from './routes/server.js';
 const app = new Hono();
 app.use('*', cors());
 app.get('/', (c) => c.html(indexPage()));
@@ -22,6 +23,7 @@ app.route('/api', timerRoutes);
 app.route('/api', dataRoutes);
 app.route('/api', monitorRoutes);
 app.route('/api', calendarRoutes);
+app.route('/api', serverRoutes);
 export function startDashboard() {
     console.log(`Clocktopus dashboard running at http://localhost:${DASHBOARD_PORT}`);
     serve({ fetch: app.fetch, port: DASHBOARD_PORT });

package/dist/dashboard/views.js

@@ -110,9 +110,24 @@ export function indexPage() {
     .toggle .slider::before { content: ''; position: absolute; width: 16px; height: 16px; left: 2px; top: 2px; background: #8b949e; border-radius: 50%; transition: transform 0.2s, background 0.2s; }
     .toggle input:checked + .slider { background: #238636; }
     .toggle input:checked + .slider::before { transform: translateX(16px); background: #fff; }
+
+    /* Server restart overlay */
+    .overlay { position: fixed; inset: 0; background: rgba(13, 17, 23, 0.92); display: none; align-items: center; justify-content: center; z-index: 9999; }
+    .overlay.active { display: flex; }
+    .overlay-box { background: #1c1f26; border: 1px solid #30363d; border-radius: 12px; padding: 2rem 2.5rem; display: flex; flex-direction: column; align-items: center; gap: 1rem; }
+    .spinner { width: 32px; height: 32px; border: 3px solid #30363d; border-top-color: #d29922; border-radius: 50%; animation: spin 0.8s linear infinite; }
+    .overlay-text { color: #e1e4e8; font-size: 0.95rem; }
+    @keyframes spin { to { transform: rotate(360deg); } }
   </style>
 </head>
 <body oncontextmenu="return false;">
+  <div id="server-overlay" class="overlay">
+    <div class="overlay-box">
+      <div class="spinner"></div>
+      <div class="overlay-text" id="server-overlay-text">Restarting Server...</div>
+    </div>
+  </div>
+
   <div class="header">
     <h1>Clocktopus</h1>
     <div class="nav">
@@ -215,7 +230,6 @@ export function indexPage() {
           <button id="monitor-stop-btn" onclick="monitorAction('stop')" class="stop-btn" style="margin-top:0;" disabled>Stop</button>
           <button id="monitor-restart-btn" onclick="monitorAction('restart')" style="margin-top:0;background:#30363d;" disabled>Restart</button>
         </div>
-        <div class="msg" id="monitor-msg"></div>
       </div>
 
       <!-- Session History -->
@@ -280,6 +294,17 @@ export function indexPage() {
         <div class="msg" id="google-msg"></div>
       </div>
 
+      <!-- Server -->
+      <div class="card">
+        <div class="card-header">
+          <div class="dot green"></div>
+          <h2>Server</h2>
+        </div>
+        <p style="font-size:0.85rem;color:#8b949e;margin-bottom:0.5rem;">Restart the Clocktopus dashboard server.</p>
+        <button id="server-restart-btn" onclick="restartServer()" style="background:#30363d;">Restart Server</button>
+        <div class="msg" id="server-msg"></div>
+      </div>
+
       <!-- Jira -->
       <div class="card">
         <div class="card-header">
@@ -678,9 +703,8 @@ export function indexPage() {
       stopBtn.disabled = true;
       restartBtn.disabled = true;
       dot.className = 'dot gray';
-      desc.textContent = pending + ' server...';
+      desc.textContent = pending + ' monitor...';
       desc.style.color = '#d29922';
-      setMsg('monitor-msg', pending + ' server...', true);
 
       const MIN_DISPLAY_MS = 1500;
       const started = Date.now();
@@ -693,23 +717,93 @@ export function indexPage() {
         const res = await fetch('/api/monitor/' + action, { method: 'POST' });
         const data = await res.json();
         await waitMin();
-        if (data.ok) {
-          setMsg('monitor-msg', 'Monitor ' + action + (action === 'stop' ? 'ped' : 'ed') + '.', true);
-        } else {
-          setMsg('monitor-msg', data.output || 'Failed.', false);
-          desc.textContent = prevDesc;
-          desc.style.color = prevColor;
+        if (!data.ok) {
+          desc.textContent = data.output || 'Failed.';
+          desc.style.color = '#f85149';
           dot.className = prevDot;
+          setTimeout(checkMonitorStatus, 2500);
+          return;
         }
         setTimeout(checkMonitorStatus, 500);
       } catch {
         await waitMin();
-        setMsg('monitor-msg', 'Request failed.', false);
-        desc.textContent = prevDesc;
-        desc.style.color = prevColor;
+        desc.textContent = 'Request failed.';
+        desc.style.color = '#f85149';
         dot.className = prevDot;
-        checkMonitorStatus();
+        setTimeout(checkMonitorStatus, 2500);
+      }
+    }
+
+    // --- Server restart ---
+    async function restartServer() {
+      const btn = document.getElementById('server-restart-btn');
+      const overlay = document.getElementById('server-overlay');
+      const overlayText = document.getElementById('server-overlay-text');
+      btn.disabled = true;
+      btn.textContent = 'Restarting...';
+      overlayText.textContent = 'Restarting Server...';
+      overlay.classList.add('active');
+      setMsg('server-msg', '', true);
+
+      const inTauri = !!(window.__TAURI_INTERNALS__ || window.__TAURI__);
+
+      if (inTauri) {
+        try {
+          await window.__TAURI__.core.invoke('restart_server');
+        } catch (err) {
+          overlayText.textContent = 'Restart failed.';
+          setTimeout(function() {
+            overlay.classList.remove('active');
+            btn.disabled = false;
+            btn.textContent = 'Restart Server';
+          }, 2500);
+          return;
+        }
+      } else {
+        let managed = false;
+        try {
+          const res = await fetch('/api/server/restart', { method: 'POST' });
+          const data = await res.json();
+          managed = !!data.managed;
+        } catch {
+          // Expected — server dies mid-response
+        }
+        if (!managed) {
+          overlayText.textContent = 'Server stopped. Start it manually: clocktopus serve';
+          setMsg('server-msg', 'Not managed by PM2 — restart manually.', false);
+          setTimeout(function() {
+            overlay.classList.remove('active');
+            btn.disabled = false;
+            btn.textContent = 'Restart Server';
+          }, 3500);
+          return;
+        }
+      }
+
+      // Poll /api/status until server responds
+      const start = Date.now();
+      const MAX_WAIT_MS = 30000;
+      async function poll() {
+        try {
+          const r = await fetch('/api/status', { cache: 'no-store' });
+          if (r.ok) {
+            overlayText.textContent = 'Server back online. Reloading...';
+            setTimeout(function() { window.location.reload(); }, 400);
+            return;
+          }
+        } catch {}
+        if (Date.now() - start > MAX_WAIT_MS) {
+          overlayText.textContent = 'Server did not come back. Check logs.';
+          setTimeout(function() {
+            overlay.classList.remove('active');
+            btn.disabled = false;
+            btn.textContent = 'Restart Server';
+          }, 3000);
+          return;
+        }
+        setTimeout(poll, 500);
       }
+      setTimeout(poll, 1000);
     }
 
     // --- Projects ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clocktopus",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "type": "module",
   "main": "dist/index.js",
   "bin": {