kalvium-worklog 1.0.2 → 1.1.0

package/dist/catchup.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/catchup.js

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+/**
+ * Catch-up entry point — runs on login/wake.
+ * Checks if today's worklog was submitted, and if not, submits it.
+ * Used by the login launchd job (RunAtLoad).
+ */
+import { catchUpSubmit } from "./submit.js";
+catchUpSubmit().then((ok) => {
+    process.exit(ok ? 0 : 1);
+});

package/dist/cli.js

@@ -2,7 +2,7 @@
 import { Command } from "commander";
 import { captureToken } from "./capture-token.js";
 import { discoverPosition } from "./discover-position.js";
-import { submitWorklog, checkStatus, dailySubmit } from "./submit.js";
+import { submitWorklog, checkStatus, dailySubmit, catchUpSubmit } from "./submit.js";
 import { setupScheduler, removeScheduler } from "./scheduler.js";
 import { generateWebapp } from "./generate-webapp.js";
 import { loadToken, saveConfig, getPositionIdFromToken } from "./config.js";
@@ -41,7 +41,7 @@ program
 // ─── submit ────────────────────────────────────────────────────────────────
 program
     .command("submit [text]")
-    .description("Submit worklog (default text: 'working')")
+    .description("Submit worklog (default text: 'Working on assigned task')")
     .option("--status <type>", "Work status", "on_site")
     .option("--dry-run", "Test without submitting")
     .action(async (text, opts) => {
@@ -52,7 +52,7 @@ program
         return;
     }
     const result = await submitWorklog({
-        text: text ?? "working",
+        text: text ?? "Working on assigned task",
         status: opts.status,
         dryRun: opts.dryRun,
     });
@@ -69,12 +69,21 @@ program
 // ─── daily ─────────────────────────────────────────────────────────────────
 program
     .command("daily")
-    .description("Run daily auto-submit (used by scheduler — skips weekends)")
+    .description("Run daily auto-submit (used by scheduler — skips weekends, retries on network failure)")
     .action(async () => {
     const ok = await dailySubmit();
     if (!ok)
         process.exit(1);
 });
+// ─── catchup ───────────────────────────────────────────────────────────────
+program
+    .command("catchup")
+    .description("Check if today's worklog is missing and submit if needed (runs on login/wake)")
+    .action(async () => {
+    const ok = await catchUpSubmit();
+    if (!ok)
+        process.exit(1);
+});
 // ─── schedule ──────────────────────────────────────────────────────────────
 program
     .command("schedule [time]")
@@ -201,7 +210,7 @@ program
     await generateWebapp();
     console.log("\n✅ Setup complete!\n");
     console.log("Commands:");
-    console.log("  kalvium-worklog submit              # submit with 'working'");
+    console.log("  kalvium-worklog submit              # submit with default text");
     console.log("  kalvium-worklog submit 'my update'  # custom text");
     console.log("  kalvium-worklog status              # check status");
     console.log("  kalvium-worklog schedule --remove   # stop automation");

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { captureToken } from "./capture-token.js";
 export { discoverPosition } from "./discover-position.js";
-export { submitWorklog, checkStatus, dailySubmit, STATUS_OPTIONS } from "./submit.js";
+export { submitWorklog, checkStatus, dailySubmit, catchUpSubmit, STATUS_OPTIONS } from "./submit.js";
 export type { SubmitOptions, SubmitResult } from "./submit.js";
 export { setupScheduler, removeScheduler } from "./scheduler.js";
 export type { ScheduleOptions } from "./scheduler.js";

package/dist/index.js

@@ -1,6 +1,6 @@
 export { captureToken } from "./capture-token.js";
 export { discoverPosition } from "./discover-position.js";
-export { submitWorklog, checkStatus, dailySubmit, STATUS_OPTIONS } from "./submit.js";
+export { submitWorklog, checkStatus, dailySubmit, catchUpSubmit, STATUS_OPTIONS } from "./submit.js";
 export { setupScheduler, removeScheduler } from "./scheduler.js";
 export { generateWebapp } from "./generate-webapp.js";
 export { refreshToken } from "./refresh.js";

package/dist/scheduler.js

@@ -37,30 +37,39 @@ function formatTime(hour, minute) {
     return `${hour - 12}:${minute.toString().padStart(2, "0")} PM`;
 }
 /**
- * Copy the daily-submit.js script to ~/.kalvium/ as a wrapper that
- * imports from the npm package's dist directory (using absolute paths).
- * This way it works even if the package is updated.
+ * Copy the daily-submit.js and catchup.js scripts to ~/.kalvium/ as wrappers
+ * that import from the npm package's dist directory (using absolute paths).
  */
 function copyDailyScript() {
     ensureInstallDir();
-    const dst = join(INSTALL_DIR, "daily_submit.js");
-    // Create a wrapper that imports from the package's dist directory
     const distDir = __dirname;
-    const wrapper = `#!/usr/bin/env node
+    // Daily submit wrapper
+    const dailyDst = join(INSTALL_DIR, "daily_submit.js");
+    const dailyWrapper = `#!/usr/bin/env node
 // Auto-generated by kalvium-worklog. Do not edit.
 import { dailySubmit } from "${join(distDir, "submit.js")}";
 dailySubmit().then((ok) => process.exit(ok ? 0 : 1));
 `;
-    writeFileSync(dst, wrapper);
-    return dst;
+    writeFileSync(dailyDst, dailyWrapper);
+    // Catch-up wrapper (runs on login/wake)
+    const catchupDst = join(INSTALL_DIR, "catchup_submit.js");
+    const catchupWrapper = `#!/usr/bin/env node
+// Auto-generated by kalvium-worklog. Do not edit.
+import { catchUpSubmit } from "${join(distDir, "submit.js")}";
+catchUpSubmit().then((ok) => process.exit(ok ? 0 : 1));
+`;
+    writeFileSync(catchupDst, catchupWrapper);
+    return dailyDst;
 }
 function setupLaunchd(hour, minute) {
     const launchAgentsDir = join(homedir(), "Library", "LaunchAgents");
     if (!existsSync(launchAgentsDir)) {
         mkdirSync(launchAgentsDir, { recursive: true });
     }
-    const plistPath = join(launchAgentsDir, "com.kalvium.worklog.plist");
     const dailyScript = copyDailyScript();
+    const catchupScript = join(INSTALL_DIR, "catchup_submit.js");
+    // ─── 1. Scheduled daily plist (fires at chosen time) ────────────────────
+    const plistPath = join(launchAgentsDir, "com.kalvium.worklog.plist");
     const plist = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -103,7 +112,43 @@ function setupLaunchd(hour, minute) {
     writeFileSync(plistPath, plist);
     execSync(`launchctl unload "${plistPath}"`, { stdio: "ignore" });
     execSync(`launchctl load "${plistPath}"`, { stdio: "ignore" });
+    // ─── 2. Catch-up plist (fires on login/wake — RunAtLoad) ────────────────
+    // This checks if today's worklog was already submitted. If not, submits it.
+    // Handles the case where the scheduled time was missed (laptop asleep/offline).
+    const catchupPlistPath = join(launchAgentsDir, "com.kalvium.worklog.catchup.plist");
+    const catchupPlist = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>com.kalvium.worklog.catchup</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>${process.execPath}</string>
+        <string>${catchupScript}</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>StartInterval</key>
+    <integer>1800</integer>
+    <key>StandardOutPath</key>
+    <string>${LOG_FILE}</string>
+    <key>StandardErrorPath</key>
+    <string>${LOG_FILE}</string>
+    <key>EnvironmentVariables</key>
+    <dict>
+        <key>HOME</key>
+        <string>${homedir()}</string>
+        <key>PATH</key>
+        <string>/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/homebrew/bin</string>
+    </dict>
+</dict>
+</plist>`;
+    writeFileSync(catchupPlistPath, catchupPlist);
+    execSync(`launchctl unload "${catchupPlistPath}"`, { stdio: "ignore" });
+    execSync(`launchctl load "${catchupPlistPath}"`, { stdio: "ignore" });
     console.log(`Daily auto-submit installed (${formatTime(hour, minute)} every weekday)`);
+    console.log("  + Catch-up check on login/wake (every 30 min)");
     return true;
 }
 function setupTaskScheduler(hour, minute) {
@@ -159,6 +204,7 @@ function setupCron(hour, minute) {
  */
 export async function removeScheduler() {
     if (IS_MAC) {
+        // Remove daily plist
         const plistPath = join(homedir(), "Library/LaunchAgents/com.kalvium.worklog.plist");
         try {
             execSync(`launchctl unload "${plistPath}"`, { stdio: "ignore" });
@@ -169,7 +215,18 @@ export async function removeScheduler() {
         if (existsSync(plistPath)) {
             execSync(`rm "${plistPath}"`);
         }
-        console.log("Daily auto-submit removed.");
+        // Remove catch-up plist
+        const catchupPlistPath = join(homedir(), "Library/LaunchAgents/com.kalvium.worklog.catchup.plist");
+        try {
+            execSync(`launchctl unload "${catchupPlistPath}"`, { stdio: "ignore" });
+        }
+        catch {
+            // ignore
+        }
+        if (existsSync(catchupPlistPath)) {
+            execSync(`rm "${catchupPlistPath}"`);
+        }
+        console.log("Daily auto-submit removed (including catch-up).");
         return true;
     }
     else if (IS_WINDOWS) {

package/dist/submit.d.ts

@@ -22,5 +22,11 @@ export declare function checkStatus(): Promise<void>;
 /**
  * Daily auto-submit (used by scheduler).
  * Skips weekends. Logs to file.
+ * Retries on network failure (up to 5 times with 60s delay).
  */
 export declare function dailySubmit(): Promise<boolean>;
+/**
+ * Catch-up check: if it's a weekday and today's worklog hasn't been
+ * submitted yet, submit it. Used on login/wake to handle missed runs.
+ */
+export declare function catchUpSubmit(): Promise<boolean>;

package/dist/submit.js

@@ -14,7 +14,7 @@ export const STATUS_OPTIONS = {
  * for re-login and retries the submission.
  */
 export async function submitWorklog(options = {}) {
-    const text = options.text ?? "working";
+    const text = options.text ?? "Working on assigned task";
     const statusKey = options.status ?? "on_site";
     const dryRun = options.dryRun ?? false;
     const worklogApi = getWorklogApi();
@@ -177,6 +177,7 @@ export async function checkStatus() {
 /**
  * Daily auto-submit (used by scheduler).
  * Skips weekends. Logs to file.
+ * Retries on network failure (up to 5 times with 60s delay).
  */
 export async function dailySubmit() {
     const day = new Date().getDay();
@@ -185,12 +186,95 @@ export async function dailySubmit() {
         return true;
     }
     log("[INFO] Starting daily worklog submission...");
-    const result = await submitWorklog({ text: "working", status: "on_site" });
-    if (result.success) {
-        log(`[INFO] SUCCESS: ${result.message}`);
+    // Retry up to 5 times in case of network failure
+    // (covers: laptop waking up, internet reconnecting, etc.)
+    const MAX_RETRIES = 5;
+    const RETRY_DELAY_MS = 60000; // 1 minute between retries
+    for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+        if (attempt > 1) {
+            log(`[INFO] Retry ${attempt}/${MAX_RETRIES} (waiting for network...)`);
+        }
+        const result = await submitWorklog({
+            text: "Working on assigned task",
+            status: "on_site",
+        });
+        if (result.success) {
+            log(`[INFO] SUCCESS: ${result.message}`);
+            return true;
+        }
+        // Check if it's a network error (retry) vs a real error (give up)
+        const isNetworkError = result.message.includes("fetch") ||
+            result.message.includes("ECONNREFUSED") ||
+            result.message.includes("ENOTFOUND") ||
+            result.message.includes("ETIMEDOUT") ||
+            result.message.includes("network") ||
+            result.message.includes("Failed to fetch") ||
+            result.message.includes("refresh failed");
+        // "Already submitted" is a success, not an error
+        if (result.message.includes("Already submitted")) {
+            log(`[INFO] ${result.message}`);
+            return true;
+        }
+        if (isNetworkError && attempt < MAX_RETRIES) {
+            log(`[WARN] Network error: ${result.message}. Retrying in 60s...`);
+            await sleep(RETRY_DELAY_MS);
+            continue;
+        }
+        // Non-network error or max retries reached
+        log(`[ERROR] ${result.message}`);
+        return false;
+    }
+    return false;
+}
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+/**
+ * Catch-up check: if it's a weekday and today's worklog hasn't been
+ * submitted yet, submit it. Used on login/wake to handle missed runs.
+ */
+export async function catchUpSubmit() {
+    const day = new Date().getDay();
+    if (day === 0 || day === 6) {
+        return true; // weekend, nothing to do
+    }
+    log("[INFO] Catch-up check: verifying today's worklog...");
+    // Check if today's worklog was already submitted
+    const worklogApi = getWorklogApi();
+    if (!worklogApi) {
+        log("[ERROR] No config found. Run `kalvium-worklog discover` first.");
+        return false;
+    }
+    // Try to refresh token and check status
+    const refreshResult = await refreshToken();
+    if (!refreshResult.success || !refreshResult.accessToken) {
+        log("[WARN] Could not refresh token for catch-up check. Will try submit directly.");
+        // Fall through to submit attempt — it has its own retry/relogin logic
     }
     else {
-        log(`[ERROR] ${result.message}`);
+        try {
+            const res = await fetch(worklogApi, {
+                headers: { authorization: `Bearer ${refreshResult.accessToken}` },
+            });
+            if (res.ok) {
+                const worklogs = await res.json();
+                if (Array.isArray(worklogs)) {
+                    const today = new Date().toISOString().slice(0, 10);
+                    const todayEntry = worklogs.find((w) => (w.worklogDate ?? "").slice(0, 10) === today &&
+                        w.status === "complete");
+                    if (todayEntry) {
+                        log("[INFO] Today's worklog already submitted. No catch-up needed.");
+                        return true;
+                    }
+                }
+            }
+        }
+        catch {
+            // Network error — fall through to submit attempt
+            log("[WARN] Could not check status for catch-up. Will try submit directly.");
+        }
     }
-    return result.success;
+    // Today's worklog is missing — submit it
+    log("[INFO] Today's worklog is missing. Running catch-up submit...");
+    return dailySubmit();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kalvium-worklog",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Auto-submit your daily Kalvium worklog without opening the website",
   "keywords": [
     "kalvium",

package/templates/worklog_standalone.html

@@ -80,7 +80,7 @@
             </div>
         </div>
 
-        <textarea id="text" placeholder="What did you worked on today?">working</textarea>
+        <textarea id="text" placeholder="What did you worked on today?">Working on assigned task</textarea>
 
         <button class="btn btn-submit" id="submitBtn" onclick="submitWorklog()">Submit Worklog</button>
         <button class="btn btn-status" onclick="checkStatus()">Check Status</button>

package/templates/worklog_template.html

@@ -76,7 +76,7 @@
             </div>
         </div>
 
-        <textarea id="text" placeholder="What did you work on today?">working</textarea>
+        <textarea id="text" placeholder="What did you work on today?">Working on assigned task</textarea>
 
         <button class="btn btn-submit" id="submitBtn" onclick="submitWorklog()">Submit Worklog</button>
         <button class="btn btn-status" onclick="checkStatus()">Check Status</button>