npm - kalvium-worklog - Versions diffs - 1.4.0 → 1.4.2 - Mend

kalvium-worklog 1.4.0 → 1.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/capture-token.js +72 -38
package/dist/discover-position.d.ts +4 -2
package/dist/discover-position.js +65 -17
package/package.json +1 -1

package/dist/capture-token.js CHANGED Viewed

@@ -61,10 +61,11 @@ async function captureTokenViaBrowser() {
     console.log("\n  ========================================");
     console.log("  Browser-based token capture (no Playwright)");
     console.log("  ========================================\n");
-    // Start local HTTP server to receive the token
+    // The JS that runs on kalvium.community to extract and send the token
+    const bookmarkletJS = `javascript:void(function(){var t=localStorage.getItem('kc-token')||localStorage.getItem('keycloak-token');if(!t){for(var i=0;i<localStorage.length;i++){var k=localStorage.key(i),v=localStorage.getItem(k);if(v&&v.includes('refresh_token')){t=v;break}}}if(!t){for(var i=0;i<sessionStorage.length;i++){var k=sessionStorage.key(i),v=sessionStorage.getItem(k);if(v&&v.includes('refresh_token')){t=v;break}}}if(t){fetch('http://localhost:${PORT}/capture',{method:'POST',headers:{'Content-Type':'text/plain'},body:t}).then(function(r){if(r.ok)alert('Token sent! You can close this tab.');else alert('Failed: '+r.status)}).catch(function(e){alert('Error: '+e)})}else{alert('No token found in storage. Make sure you are logged in.')}})()`;
+    // Start local HTTP server
     const tokenPromise = new Promise((resolve) => {
         const server = createServer((req, res) => {
-            // Handle CORS + token capture
             res.setHeader("Access-Control-Allow-Origin", "*");
             res.setHeader("Access-Control-Allow-Headers", "Content-Type");
             res.setHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
@@ -78,15 +79,14 @@ async function captureTokenViaBrowser() {
                 body += chunk;
             });
             req.on("end", () => {
+                // Token capture endpoint
                 if (req.url?.startsWith("/capture")) {
                     try {
-                        // Try parsing as JSON first (POST body)
                         let data;
                         if (body) {
                             data = JSON.parse(body);
                         }
                         else {
-                            // Try query param
                             const url = new URL(req.url, `http://localhost:${PORT}`);
                             const tokenParam = url.searchParams.get("token");
                             if (!tokenParam) {
@@ -98,69 +98,103 @@ async function captureTokenViaBrowser() {
                         }
                         if (data.refresh_token) {
                             res.writeHead(200, { "Content-Type": "text/html" });
-                            res.end("<html><body><h2>Token captured! You can close this tab.</h2></body></html>");
+                            res.end("<html><body style='font-family:sans-serif;text-align:center;padding:40px'><h2>✓ Token captured!</h2><p>You can close this tab and go back to Termux.</p></body></html>");
                             resolve(data);
                         }
                         else {
-                            res.writeHead(400);
-                            res.end("Invalid token — missing refresh_token");
+                            res.writeHead(400, { "Content-Type": "text/html" });
+                            res.end("<html><body><h2>Invalid token — missing refresh_token</h2></body></html>");
                             resolve(null);
                         }
                     }
                     catch {
-                        res.writeHead(400);
-                        res.end("Invalid JSON");
+                        res.writeHead(400, { "Content-Type": "text/html" });
+                        res.end("<html><body><h2>Invalid JSON</h2></body></html>");
                         resolve(null);
                     }
+                    return;
                 }
-                else {
-                    res.writeHead(200, { "Content-Type": "text/html" });
-                    res.end(`
-              <html><body>
-              <h2>Kalvium Worklog — Token Capture</h2>
-              <p>If you're seeing this, the local server is running.</p>
-              <p>Go back to the Kalvium tab and paste the JavaScript snippet.</p>
-              </body></html>
-            `);
-                }
+                // Main page — serves the bookmarklet + instructions
+                res.writeHead(200, { "Content-Type": "text/html" });
+                res.end(`<!DOCTYPE html>
+<html>
+<head>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>Kalvium Worklog — Token Capture</title>
+<style>
+  body { font-family: -apple-system, sans-serif; max-width: 600px; margin: 0 auto; padding: 20px; line-height: 1.6; }
+  .step { background: #f0f4ff; border-radius: 12px; padding: 16px; margin: 12px 0; }
+  .step h3 { margin-top: 0; }
+  .bookmarklet { display: inline-block; background: #4285f4; color: white; padding: 14px 24px; border-radius: 8px; text-decoration: none; font-size: 18px; font-weight: bold; margin: 12px 0; }
+  .bookmarklet:active { background: #3367d6; }
+  .note { background: #fff8e1; border-radius: 8px; padding: 12px; margin: 12px 0; font-size: 14px; }
+  code { background: #f5f5f5; padding: 2px 6px; border-radius: 4px; font-size: 13px; word-break: break-all; }
+  .kalvium-link { display: inline-block; background: #34a853; color: white; padding: 12px 20px; border-radius: 8px; text-decoration: none; font-size: 16px; margin: 8px 0; }
+</style>
+</head>
+<body>
+<h2>Kalvium Worklog — Token Capture</h2>
+<div class="step">
+  <h3>Step 1: Open Kalvium & log in</h3>
+  <p>Tap the button below to open Kalvium. Log in with Google (complete 2FA if asked).</p>
+  <a class="kalvium-link" href="https://kalvium.community/internships" target="_blank">Open Kalvium →</a>
+</div>
+<div class="step">
+  <h3>Step 2: Save this bookmarklet</h3>
+  <p><b>Long-press</b> the blue button below, then select <b>"Bookmark link"</b> or <b>"Add bookmark"</b>.</p>
+  <a class="bookmarklet" href="${bookmarkletJS.replace(/"/g, "&quot;")}">📋 Capture Token</a>
+  <p><small>If long-press doesn't work: bookmark this page, then edit the bookmark and change the URL to the code below.</small></p>
+</div>
+<div class="step">
+  <h3>Step 3: Run the bookmarklet</h3>
+  <p>Go back to the <b>Kalvium tab</b> (where you logged in).<br>
+  Open your <b>bookmarks menu</b> and tap <b>"📋 Capture Token"</b>.</p>
+  <p>You should see <b>"Token sent!"</b> — then come back to Termux.</p>
+</div>
+<div class="note">
+  <b>Trouble with bookmarklet?</b> Copy this code, open Kalvium, then paste it in the address bar (type <code>javascript:</code> first, then paste the rest after the colon):
+  <br><br>
+  <code>${bookmarkletJS.replace(/^javascript:/, "")}</code>
+</div>
+</body>
+</html>`);
             });
         });
         server.listen(PORT, () => {
             console.log(`  Local server running on http://localhost:${PORT}`);
         });
-        // Timeout after 5 minutes
         setTimeout(() => {
             server.close();
             resolve(null);
         }, 300000);
     });
-    // Open kalvium.community in the phone's default browser
-    const url = "https://kalvium.community/internships";
+    // Open the localhost page in the browser
+    const localUrl = `http://localhost:${PORT}`;
     try {
         if (process.platform === "android") {
-            // Termux: use termux-open-url
-            execSync(`termux-open-url ${url}`, { stdio: "ignore" });
+            execSync(`termux-open-url ${localUrl}`, { stdio: "ignore" });
         }
         else {
-            // Other platforms: try xdg-open or open
-            execSync(`xdg-open ${url} || open ${url}`, { stdio: "ignore" });
+            execSync(`xdg-open ${localUrl} || open ${localUrl}`, {
+                stdio: "ignore",
+            });
         }
-        console.log(`  Opened ${url} in your browser.`);
+        console.log(`  Opened ${localUrl} in your browser.`);
     }
     catch {
-        console.log(`  Could not auto-open browser. Please open: ${url}`);
+        console.log(`  Could not auto-open browser. Please open: ${localUrl}`);
     }
     console.log("\n  ────────────────────────────────────────────");
-    console.log("  1. Log in with Google (complete 2FA if needed)");
-    console.log("  2. After you're logged in, copy this line:");
-    console.log("  ────────────────────────────────────────────\n");
-    // The JS snippet extracts tokens from the page's network requests
-    // and sends them to our local server
-    const jsSnippet = `javascript:void(function(){var t=localStorage.getItem('kc-token')||localStorage.getItem('keycloak-token');if(!t){for(var i=0;i<localStorage.length;i++){var k=localStorage.key(i),v=localStorage.getItem(k);if(v&&v.includes('refresh_token')){t=v;break}}}if(!t){for(var i=0;i<sessionStorage.length;i++){var k=sessionStorage.key(i),v=sessionStorage.getItem(k);if(v&&v.includes('refresh_token')){t=v;break}}}if(t){fetch('http://localhost:${PORT}/capture',{method:'POST',headers:{'Content-Type':'text/plain'},body:t}).then(function(r){if(r.ok)alert('Token sent! You can close this tab.');else alert('Failed: '+r.status)}).catch(function(e){alert('Error: '+e)})}else{alert('No token found in storage. Make sure you are logged in.')}})()`;
-    console.log(`  ${jsSnippet}\n`);
-    console.log("  3. Paste it in the browser ADDRESS BAR (where you type URLs)");
-    console.log("     and press Enter. (Remove any leading 'javascript:' that");
-    console.log("     the browser strips, then type it manually if needed.)");
+    console.log("  A page opened in your browser with instructions:");
+    console.log("  1. Click 'Open Kalvium' and log in");
+    console.log("  2. Long-press 'Capture Token' → Bookmark it");
+    console.log("  3. Go to Kalvium tab → open the bookmark");
+    console.log("  ────────────────────────────────────────────");
     console.log("\n  Waiting for token (up to 5 minutes)...\n");
     const data = await tokenPromise;
     if (data) {

package/dist/discover-position.d.ts CHANGED Viewed

@@ -1,5 +1,7 @@
 /**
- * Discover the user's internship position ID by capturing API calls.
- * Tries headless first, falls back to headed browser for manual login.
+ * Discover the user's internship position ID.
+ * Tries JWT extraction first (no browser needed).
+ * Falls back to browser-based discovery via Playwright if available.
+ * On Android, uses JWT extraction only.
  */
 export declare function discoverPosition(): Promise<boolean>;

package/dist/discover-position.js CHANGED Viewed

@@ -1,31 +1,71 @@
-import { chromium } from "playwright";
-import { PROFILE_DIR, CONFIG_FILE, ensureInstallDir, saveConfig, } from "./config.js";
+import { PROFILE_DIR, CONFIG_FILE, ensureInstallDir, saveConfig, loadToken, getPositionIdFromToken, } from "./config.js";
 /**
- * Discover the user's internship position ID by capturing API calls.
- * Tries headless first, falls back to headed browser for manual login.
+ * Check if Playwright is available on this platform.
+ */
+function isPlaywrightAvailable() {
+    try {
+        if (process.platform === "android")
+            return false;
+        require.resolve("playwright");
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Discover the user's internship position ID.
+ * Tries JWT extraction first (no browser needed).
+ * Falls back to browser-based discovery via Playwright if available.
+ * On Android, uses JWT extraction only.
  */
 export async function discoverPosition() {
     ensureInstallDir();
     console.log("=== Discovering internship position ID ===\n");
-    // Step 1: Try headless first
-    console.log("1. Trying headless mode (existing session)...");
-    let captured = await discoverViaBrowser(true);
+    // Step 1: Try extracting from saved token (no browser needed)
+    const token = loadToken();
+    if (token) {
+        const positionId = getPositionIdFromToken(token);
+        if (positionId) {
+            const worklogUrl = `https://student-api.kalvium.community/api/internships/worklogs/${positionId}`;
+            saveConfig({ position_id: positionId, worklog_api_url: worklogUrl });
+            console.log(`\n=== SUCCESS ===`);
+            console.log(`Position ID: ${positionId}`);
+            console.log(`Worklog API: ${worklogUrl}`);
+            console.log(`Saved to: ${CONFIG_FILE}`);
+            return true;
+        }
+        console.log("  Could not extract position ID from token.");
+    }
+    else {
+        console.log("  No token found. Run `kalvium-worklog login` first.");
+    }
+    // Step 2: Fall back to browser-based discovery (if Playwright available)
+    if (!isPlaywrightAvailable()) {
+        console.log("\nERROR: Could not discover position ID.");
+        console.log("Playwright is not available on this platform.");
+        console.log("Make sure you have a valid token (run `kalvium-worklog login`).");
+        return false;
+    }
+    const { chromium } = await import("playwright");
+    console.log("\n1. Trying headless mode (existing session)...");
+    let captured = await discoverViaBrowser(chromium, true);
     if (!captured.token) {
         console.log("  No valid session. Opening browser for manual login...");
-        captured = await discoverViaBrowser(false);
+        captured = await discoverViaBrowser(chromium, false);
     }
     if (!captured.token) {
         console.log("\nERROR: Could not capture token. Please log in and try again.");
         return false;
     }
     console.log(`   Token captured: ${captured.token.slice(0, 40)}...`);
-    // Step 2: Extract position ID from captured API URLs
+    // Step 3: Extract position ID from captured API URLs
     const positionId = extractPositionId(captured.api_url ?? "");
     if (!positionId) {
         console.log("\nERROR: Could not determine position ID from API calls");
         return false;
     }
-    // Step 3: Save config
+    // Step 4: Save config
     const worklogUrl = `https://student-api.kalvium.community/api/internships/worklogs/${positionId}`;
     saveConfig({ position_id: positionId, worklog_api_url: worklogUrl });
     console.log(`\n=== SUCCESS ===`);
@@ -34,7 +74,7 @@ export async function discoverPosition() {
     console.log(`Saved to: ${CONFIG_FILE}`);
     return true;
 }
-async function discoverViaBrowser(headless) {
+async function discoverViaBrowser(chromium, headless) {
     const captured = {};
     const context = await chromium.launchPersistentContext(PROFILE_DIR, {
         headless: false,
@@ -75,16 +115,25 @@ async function discoverViaBrowser(headless) {
     }
     else {
         console.log("\n  ========================================");
-        console.log("  Browser opened. Please log in now:");
-        console.log("  1. Click 'Continue with Google'");
-        console.log("  2. Sign in with your Kalvium account");
-        console.log("  3. Complete 2FA if prompted");
-        console.log("  4. Wait — the script continues automatically");
+        console.log("  Browser opened. Auto-clicking 'Continue with Google'...");
+        console.log("  Please complete 2FA if prompted.");
         console.log("  ========================================\n");
         await page.goto("https://kalvium.community/internships", {
             waitUntil: "domcontentloaded",
             timeout: 120000,
         });
+        // Auto-click "Continue with Google"
+        try {
+            const googleBtn = page.locator("text=Continue with Google").first();
+            const isVisible = await googleBtn.isVisible().catch(() => false);
+            if (isVisible) {
+                await googleBtn.click();
+                console.log("  Clicked 'Continue with Google'.");
+            }
+        }
+        catch {
+            // ignore
+        }
         console.log("  Waiting for login to complete (up to 5 minutes)...");
         for (let i = 0; i < 300; i++) {
             if (captured.token && captured.api_url)
@@ -112,7 +161,6 @@ function extractPositionId(apiUrl) {
     if (internshipsIdx === -1)
         return null;
     for (const part of parts.slice(internshipsIdx + 1)) {
-        // Position IDs are UUIDs (36 chars, 4 dashes)
         if (part.length === 36 && part.split("-").length === 5) {
             return part;
         }

package/package.json CHANGED Viewed

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