clocktopus 1.2.0 → 1.2.1

package/dist/dashboard/routes/timer.js

@@ -1,6 +1,12 @@
 import { Hono } from 'hono';
+import { v4 as uuidv4 } from 'uuid';
 import { Clockify } from '../../clockify.js';
-import { completeLatestSession } from '../../lib/db.js';
+import { completeLatestSession, getOpenSession, logSessionStart } from '../../lib/db.js';
+import { stopJiraTimer } from '../../lib/jira.js';
+function extractJiraTicket(description) {
+    const match = description.match(/\b([A-Z][A-Z0-9]+-\d+)\b/);
+    return match?.[1];
+}
 const timerRoutes = new Hono();
 timerRoutes.get('/timer/active', async (c) => {
     try {
@@ -11,11 +17,19 @@ timerRoutes.get('/timer/active', async (c) => {
         const timer = await clockify.getActiveTimer(user.defaultWorkspace, user.id);
         if (!timer)
             return c.json({ active: false });
+        // Sync externally-started timers (e.g. from Clockify app or Jira plugin) to DB
+        const timerStart = timer.timeInterval.start;
+        const openSession = getOpenSession();
+        const alreadyTracked = openSession && openSession.startedAt.slice(0, 19) === timerStart.slice(0, 19);
+        if (!alreadyTracked) {
+            const jiraTicket = extractJiraTicket(timer.description ?? '');
+            logSessionStart(timer.id ?? uuidv4(), timer.projectId, timer.description ?? '', timerStart, jiraTicket);
+        }
         return c.json({
             active: true,
             description: timer.description,
             projectId: timer.projectId,
-            start: timer.timeInterval.start,
+            start: timerStart,
         });
     }
     catch {
@@ -47,10 +61,23 @@ timerRoutes.post('/timer/stop', async (c) => {
         const user = await clockify.getUser();
         if (!user)
             return c.json({ ok: false, error: 'Could not connect to Clockify.' }, 500);
+        const openSession = getOpenSession();
         const result = await clockify.stopTimer(user.defaultWorkspace, user.id);
         if (!result)
             return c.json({ ok: false, error: 'Failed to stop timer.' }, 500);
-        completeLatestSession(new Date().toISOString(), false);
+        const completedAt = new Date().toISOString();
+        completeLatestSession(completedAt, false);
+        if (openSession?.jiraTicket) {
+            const timeSpentSeconds = Math.round((new Date(completedAt).getTime() - new Date(openSession.startedAt).getTime()) / 1000);
+            if (timeSpentSeconds >= 60) {
+                try {
+                    await stopJiraTimer(openSession.jiraTicket, timeSpentSeconds);
+                }
+                catch (err) {
+                    console.error('Error stopping Jira timer:', err);
+                }
+            }
+        }
         return c.json({ ok: true });
     }
     catch {

package/dist/lib/db.js

@@ -105,7 +105,7 @@ export function getLatestToken() {
 }
 export function logSessionStart(id, projectId, description, startedAt, jiraTicket) {
     const db = getDb();
-    const stmt = db.prepare('INSERT INTO sessions (id, projectId, description, startedAt, isAutoCompleted, jiraTicket) VALUES (?, ?, ?, ?, ?, ?)');
+    const stmt = db.prepare('INSERT OR IGNORE INTO sessions (id, projectId, description, startedAt, isAutoCompleted, jiraTicket) VALUES (?, ?, ?, ?, ?, ?)');
     stmt.run(id, projectId, description, startedAt, 0, jiraTicket ?? null);
 }
 export function completeLatestSession(completedAt, isAutoCompleted = false) {
@@ -130,6 +130,14 @@ export function getSessionCount() {
     const row = stmt.get();
     return row.count;
 }
+export function getOpenSession() {
+    const db = getDb();
+    const stmt = db.prepare('SELECT * FROM sessions WHERE completedAt IS NULL ORDER BY startedAt DESC LIMIT 1');
+    const row = stmt.get();
+    if (!row)
+        return null;
+    return SessionSchema.parse(row);
+}
 export function getLatestSession() {
     const db = getDb();
     const stmt = db.prepare(`

package/package.json

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