clocktopus 1.4.0 → 1.5.1

package/README.md

@@ -72,7 +72,13 @@ After installing, remove the quarantine flag (app is not code-signed):
 xattr -cr /Applications/Clocktopus.app
 ```
 
-The dashboard server must be running (`clocktopus serve`). See [desktop/README.md](desktop/README.md) for details.
+The app manages the dashboard server for you:
+
+- **Install Clocktopus** — if the CLI is not installed, the popup offers a one-click installer that runs `bun install -g clocktopus` for you.
+- **Start Server** — when the dashboard is not running, the popup shows a "Start Server" button. Click it and the app spawns `clocktopus dash` in the background, then loads the dashboard once it's up.
+- **Stop Server** / **Restart Server** — available from the tray menu when the server is reachable. Stop also kills any pre-existing process on port 4001 (terminal, PM2, prior session).
+
+See [desktop/README.md](desktop/README.md) for details.
 
 ---
 

package/dist/clockify.js

@@ -1,20 +1,39 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { fileURLToPath } from 'url';
 import { HttpClient } from './lib/http-client.js';
 import { logSessionStart } from './lib/db.js';
 import { v4 as uuidv4 } from 'uuid';
 import { NotificationCenter } from 'node-notifier';
 import { getJiraTicket } from './lib/jira.js';
+/**
+ * Resolve `assets/logo.png` from the package root regardless of install layout.
+ * Walks up from this file until the assets dir is found.
+ */
+function resolveLogoPath() {
+    const here = path.dirname(fileURLToPath(import.meta.url));
+    for (let dir = here, prev = ''; dir !== prev; prev = dir, dir = path.dirname(dir)) {
+        const candidate = path.join(dir, 'assets', 'logo.png');
+        if (fs.existsSync(candidate))
+            return candidate;
+    }
+    return undefined;
+}
+const LOGO_PATH = resolveLogoPath();
 export class Clockify {
     constructor() {
         this.httpClient = new HttpClient().getClient();
         this.notifier = new NotificationCenter();
     }
-    sendNotification(title, message, actions, callback) {
+    sendNotification(subtitle, message, actions, callback) {
         this.notifier.notify({
-            title,
+            title: 'Clocktopus',
+            subtitle,
             message,
             sound: true,
             wait: true,
             actions,
+            contentImage: LOGO_PATH,
         }, callback ??
             ((err) => {
                 if (err)

package/dist/dashboard/routes/calendar.js

@@ -3,6 +3,8 @@ import { google } from 'googleapis';
 import { getAuthenticatedClient, getRefreshedToken } from '../../lib/google.js';
 import { getLatestToken, storeToken, getEventProject, setEventProject, getActiveProjects } from '../../lib/db.js';
 import { Clockify } from '../../clockify.js';
+// Hardcoded — registered with Google OAuth; cannot vary with CLOCKTOPUS_PORT
+// without re-registering the redirect URI in the Google Cloud console.
 const DASHBOARD_REDIRECT_URI = 'http://localhost:4001/api/google/callback';
 const calendarRoutes = new Hono();
 calendarRoutes.get('/calendar/events', async (c) => {

package/dist/dashboard/routes/google.js

@@ -3,6 +3,8 @@ import { google } from 'googleapis';
 import { getAuthenticatedClient, getAuthUrl, exchangeGoogleCode } from '../../lib/google.js';
 import { storeToken } from '../../lib/db.js';
 import { saveCredential } from '../../lib/credentials.js';
+// Hardcoded — registered with Google OAuth; cannot vary with CLOCKTOPUS_PORT
+// without re-registering the redirect URI in the Google Cloud console.
 const DASHBOARD_REDIRECT_URI = 'http://localhost:4001/api/google/callback';
 const SCOPES = ['https://www.googleapis.com/auth/calendar.readonly', 'https://www.googleapis.com/auth/userinfo.email'];
 const googleRoutes = new Hono();

package/dist/dashboard/server.js

@@ -2,6 +2,7 @@ import { Hono } from 'hono';
 import { cors } from 'hono/cors';
 import { serve } from '@hono/node-server';
 import { indexPage } from './views.js';
+import { DASHBOARD_PORT } from '../lib/constants.js';
 import statusRoutes from './routes/status.js';
 import clockifyRoutes from './routes/clockify.js';
 import jiraRoutes from './routes/jira.js';
@@ -22,7 +23,6 @@ app.route('/api', dataRoutes);
 app.route('/api', monitorRoutes);
 app.route('/api', calendarRoutes);
 export function startDashboard() {
-    const port = 4001;
-    console.log(`Clocktopus dashboard running at http://localhost:${port}`);
-    serve({ fetch: app.fetch, port });
+    console.log(`Clocktopus dashboard running at http://localhost:${DASHBOARD_PORT}`);
+    serve({ fetch: app.fetch, port: DASHBOARD_PORT });
 }

package/dist/dashboard/views.js

@@ -5,8 +5,14 @@ export function indexPage() {
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Clocktopus Dashboard</title>
+  <script>
+    if (!window.__TAURI_INTERNALS__ && !window.__TAURI__) {
+      document.documentElement.classList.add('browser');
+    }
+  </script>
   <style>
     * { box-sizing: border-box; margin: 0; padding: 0; }
+    html.browser { background: #0d1117; }
     body { 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

@@ -11,6 +11,7 @@ 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';
+import { DASHBOARD_PORT, DASHBOARD_URL } from './lib/constants.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const program = new Command();
@@ -281,7 +282,7 @@ program
 });
 program
     .command('dash')
-    .description('Start the Clocktopus web dashboard on localhost:4001.')
+    .description(`Start the Clocktopus web dashboard on localhost:${DASHBOARD_PORT}.`)
     .action(() => {
     startDashboard();
 });
@@ -352,7 +353,7 @@ program
         execSync(`${pm2Bin} start ${scriptPath} --name ${DASH_PM2_NAME} --interpreter ${bunPath} -- dash`, {
             stdio: 'inherit',
         });
-        console.log(chalk.green('Dashboard running at http://localhost:4001'));
+        console.log(chalk.green(`Dashboard running at ${DASHBOARD_URL}`));
         console.log(chalk.gray('  Stop:   clocktopus serve:stop'));
         console.log(chalk.gray('  Logs:   clocktopus serve:logs'));
     }

package/dist/lib/atlassian.js

@@ -6,6 +6,8 @@ const AUTH_PROXY_URL = 'https://clocktopus-auth.clocktopus.workers.dev';
 // Fallback: direct Atlassian API (when user provides their own credentials)
 const ATLASSIAN_TOKEN_URL = 'https://auth.atlassian.com/oauth/token';
 const ATLASSIAN_RESOURCES_URL = 'https://api.atlassian.com/oauth/token/accessible-resources';
+// Hardcoded — registered with Atlassian; cannot vary with CLOCKTOPUS_PORT
+// without re-registering the redirect URI on the OAuth app.
 const REDIRECT_URI = 'http://localhost:4001/api/jira/callback';
 function hasLocalCredentials() {
     return !!(resolveCredential('ATLASSIAN_CLIENT_ID') && resolveCredential('ATLASSIAN_CLIENT_SECRET'));

package/dist/lib/constants.js

@@ -0,0 +1,15 @@
+/**
+ * Dashboard HTTP port. Override via CLOCKTOPUS_PORT env var if 4001 is busy.
+ *
+ * NOTE: OAuth redirect URIs (Atlassian, Google) are registered with the
+ * provider at port 4001. Changing this port breaks OAuth unless the redirect
+ * URI is re-registered with the provider as well.
+ */
+export const DASHBOARD_PORT = (() => {
+    const raw = process.env.CLOCKTOPUS_PORT;
+    if (!raw)
+        return 4001;
+    const n = parseInt(raw, 10);
+    return Number.isFinite(n) && n > 0 && n < 65536 ? n : 4001;
+})();
+export const DASHBOARD_URL = `http://localhost:${DASHBOARD_PORT}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clocktopus",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
@@ -11,6 +11,7 @@
     "dist",
     "data/.gitkeep",
     "scripts/postinstall.cjs",
+    "assets/logo.png",
     "!dist/desktop"
   ],
   "scripts": {