open-vtop 1.0.3 → 1.0.4

package/dist/captcha-solver.js

@@ -1,8 +1,9 @@
 /**
  * CAPTCHA Solver for VTOP
- * Uses canvas for image processing and bitmap matching / neural network for character recognition
+ * Uses pure JS for image processing and bitmap matching / neural network for character recognition
  */
-import { createCanvas, loadImage } from "canvas";
+import * as jpeg from "jpeg-js";
+import { PNG } from "pngjs";
 import { bitmaps } from "./bitmaps.js";
 // ============ Bitmap-based solver (original method) ============
 function captchaParse(imgarr) {
@@ -134,6 +135,53 @@ function maxSoft(a) {
     }
     return n;
 }
+async function decodeImage(dataUri) {
+    const parts = extractDataUriParts(dataUri);
+    if (!parts)
+        throw new Error("Invalid Data URI");
+    const buffer = Buffer.from(parts.base64, "base64");
+    if (parts.mimeType === "image/png") {
+        return new Promise((resolve, reject) => {
+            const png = new PNG();
+            png.parse(buffer, (err, data) => {
+                if (err)
+                    reject(err);
+                else
+                    resolve({
+                        width: data.width,
+                        height: data.height,
+                        data: data.data,
+                    });
+            });
+        });
+    }
+    else if (parts.mimeType === "image/jpeg") {
+        const decoded = jpeg.decode(buffer, { useTArray: true });
+        return {
+            width: decoded.width,
+            height: decoded.height,
+            data: decoded.data,
+        };
+    }
+    throw new Error("Unsupported image type: " + parts.mimeType);
+}
+function resizeImage(src, targetW, targetH) {
+    // Nearest neighbor resize
+    const target = new Uint8ClampedArray(targetW * targetH * 4);
+    for (let y = 0; y < targetH; y++) {
+        for (let x = 0; x < targetW; x++) {
+            const srcX = Math.floor((x * src.width) / targetW);
+            const srcY = Math.floor((y * src.height) / targetH);
+            const srcIdx = (srcY * src.width + srcX) * 4;
+            const targetIdx = (y * targetW + x) * 4;
+            target[targetIdx] = src.data[srcIdx];
+            target[targetIdx + 1] = src.data[srcIdx + 1];
+            target[targetIdx + 2] = src.data[srcIdx + 2];
+            target[targetIdx + 3] = src.data[srcIdx + 3];
+        }
+    }
+    return target;
+}
 /**
  * Solve a CAPTCHA image using the saturation-based neural network method
  * @param imgDataUri - Base64 data URI of the captcha image
@@ -147,12 +195,15 @@ export async function solve(imgDataUri) {
         return solveBitmap(imgDataUri);
     }
     const labelTxt = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
-    const canvas = createCanvas(200, 40);
-    const ctx = canvas.getContext("2d");
-    const image = await loadImage(imgDataUri);
-    ctx.drawImage(image, 0, 0, 200, 40);
-    const pd = ctx.getImageData(0, 0, 200, 40);
-    let bls = saturation(pd.data);
+    const img = await decodeImage(imgDataUri);
+    // Target size: 200x40
+    let dataToUse = img.data;
+    if (img.width !== 200 || img.height !== 40) {
+        dataToUse = resizeImage(img, 200, 40);
+    }
+    // dataToUse is now RGBA array of 200x40 image
+    // saturation expects Uint8ClampedArray or similar
+    let bls = saturation(dataToUse);
     let out = "";
     for (let i = 0; i < 6; i++) {
         let block = preImg(bls[i]);
@@ -171,16 +222,17 @@ export async function solve(imgDataUri) {
  * @returns Solved captcha string
  */
 export async function solveBitmap(imgDataUri) {
-    const canvas = createCanvas(180, 45);
-    const ctx = canvas.getContext("2d");
-    const image = await loadImage(imgDataUri);
-    ctx.drawImage(image, 0, 0, canvas.width, canvas.height);
-    const imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
-    const data = imageData.data;
+    const img = await decodeImage(imgDataUri);
+    // For bitmap solver, we need 180x45
+    // Original code: canvas 180x45, drawImage(image, 0, 0, 180, 45)
+    // So we definitely need to resize
+    const resizedData = resizeImage(img, 180, 45);
     // Convert to grayscale 2D array
     const arr = [];
-    for (let i = 0; i < data.length; i += 4) {
-        const gval = data[i] * 0.299 + data[i + 1] * 0.587 + data[i + 2] * 0.114;
+    for (let i = 0; i < resizedData.length; i += 4) {
+        const gval = resizedData[i] * 0.299 +
+            resizedData[i + 1] * 0.587 +
+            resizedData[i + 2] * 0.114;
         arr.push(Math.round(gval));
     }
     const newArr = [];

package/dist/index.js

@@ -6,25 +6,12 @@ import { serveStatic } from "@hono/node-server/serve-static";
 import { Home } from "./views/Home.js";
 import { SuccessMessage } from "./views/partials.js";
 import { sessionManager } from "./session-manager.js";
-import { readFile } from "fs/promises";
-import { dirname, join } from "path";
-import { fileURLToPath } from "url";
 const app = new Hono();
-const __dirname = dirname(fileURLToPath(import.meta.url));
-// Serve htmx from node_modules - resolve absolute path
-const htmxPath = join(__dirname, "../node_modules/htmx.org/dist/htmx.min.js");
-app.get("/static/htmx.js", async (c) => {
-    try {
-        const content = await readFile(htmxPath);
-        return c.body(content, 200, {
-            "Content-Type": "application/javascript",
-        });
-    }
-    catch (e) {
-        console.error("Failed to serve HTMX:", e);
-        return c.text("Failed to load HTMX", 500);
-    }
-});
+import { createRequire } from "module";
+const require = createRequire(import.meta.url);
+const htmxPath = require.resolve("htmx.org/dist/htmx.min.js");
+// Serve htmx from node_modules
+app.use("/static/htmx.js", serveStatic({ path: htmxPath }));
 // Main page
 app.get("/", (c) => {
     return c.html(_jsx(Home, {}));
@@ -40,11 +27,10 @@ app.get("/api/session/status", (c) => {
     const lastInit = state.lastInitialized
         ? new Date(state.lastInitialized).toLocaleString()
         : "Never";
-    // Redact sensitive values for security
-    const hasCsrf = !!state.csrf;
-    const hasJsession = state.cookies.has("JSESSIONID");
-    const hasServerId = state.cookies.has("SERVERID");
-    return c.html(_jsxs("div", { style: "font-family: monospace; padding: 1rem; background: #f5f5f5; border-radius: 4px; color: #000;", children: [_jsxs("div", { style: "margin-bottom: 0.5rem;", children: [_jsx("strong", { children: "Status:" }), " ", status] }), _jsxs("div", { style: "margin-bottom: 0.5rem;", children: [_jsx("strong", { children: "Last Initialized:" }), " ", lastInit] }), _jsxs("div", { style: "margin-bottom: 0.5rem;", children: [_jsx("strong", { children: "Total Cookies:" }), " ", state.cookies.size] }), _jsxs("div", { style: "margin-bottom: 0.5rem;", children: [_jsx("strong", { children: "CSRF Token:" }), " ", hasCsrf ? "✅ Present" : "❌ Missing"] }), _jsxs("div", { style: "margin-bottom: 0.5rem;", children: [_jsx("strong", { children: "JSESSIONID:" }), " ", hasJsession ? "✅ Present" : "❌ Missing"] }), _jsxs("div", { children: [_jsx("strong", { children: "SERVERID:" }), " ", hasServerId ? "✅ Present" : "❌ Missing"] })] }));
+    const csrfToken = state.csrf || "None";
+    const jsessionid = state.cookies.get("JSESSIONID") || "None";
+    const serverid = state.cookies.get("SERVERID") || "None";
+    return c.html(_jsxs("div", { style: "font-family: monospace; padding: 1rem; background: #f5f5f5; border-radius: 4px; color: #000;", children: [_jsxs("div", { style: "margin-bottom: 0.5rem;", children: [_jsx("strong", { children: "Status:" }), " ", status] }), _jsxs("div", { style: "margin-bottom: 0.5rem;", children: [_jsx("strong", { children: "Last Initialized:" }), " ", lastInit] }), _jsxs("div", { style: "margin-bottom: 0.5rem;", children: [_jsx("strong", { children: "Total Cookies:" }), " ", state.cookies.size] }), _jsxs("div", { style: "margin-bottom: 0.5rem;", children: [_jsx("strong", { children: "CSRF Token:" }), " ", csrfToken] }), _jsxs("div", { style: "margin-bottom: 0.5rem;", children: [_jsx("strong", { children: "JSESSIONID:" }), " ", jsessionid] }), _jsxs("div", { children: [_jsx("strong", { children: "SERVERID:" }), " ", serverid] })] }));
 });
 // Manual session refresh endpoint
 app.post("/api/session/refresh", async (c) => {
@@ -109,16 +95,13 @@ app.get("/api/login/status/html", (c) => {
 // Debug logs storage
 const debugLogs = [];
 function addDebugLog(level, message) {
-    // Only log if specifically enabled
-    if (process.env.DEBUG_LOGS === "true") {
-        const timestamp = new Date().toLocaleTimeString();
-        debugLogs.push({ timestamp, level, message });
-        // Keep only last 100 logs
-        if (debugLogs.length > 100) {
-            debugLogs.shift();
-        }
-        console.log(`[${level}] ${message}`);
+    const timestamp = new Date().toLocaleTimeString();
+    debugLogs.push({ timestamp, level, message });
+    // Keep only last 100 logs
+    if (debugLogs.length > 100) {
+        debugLogs.shift();
     }
+    console.log(`[${level}] ${message}`);
 }
 // Form-based login endpoint (for HTMX)
 app.post("/api/login/form", async (c) => {
@@ -131,19 +114,18 @@ app.post("/api/login/form", async (c) => {
             addDebugLog("ERROR", "Login attempt with missing credentials");
             return c.html(_jsxs("div", { style: "padding: 1rem; background: #f8d7da; border: 1px solid #f5c6cb; border-radius: 4px; color: #721c24;", children: [_jsx("strong", { children: "\u274C Error:" }), " Username, password, and registration number are required."] }));
         }
-        // Don't log credentials even in debug
-        addDebugLog("INFO", "Login requested");
+        addDebugLog("INFO", `Login requested for user: ${username} (${regNo})`);
         // Show that login is in progress
         const startTime = Date.now();
         addDebugLog("INFO", "Starting login process - polling for text CAPTCHA...");
         const success = await sessionManager.login(username, password, regNo);
         const duration = ((Date.now() - startTime) / 1000).toFixed(1);
         if (success) {
-            addDebugLog("SUCCESS", `Login successful (took ${duration}s)`);
+            addDebugLog("SUCCESS", `Login successful for ${username} (took ${duration}s)`);
             return c.html(_jsxs("div", { style: "padding: 1rem; background: #d4edda; border: 1px solid #c3e6cb; border-radius: 4px; color: #155724;", children: [_jsx("strong", { children: "\uD83C\uDF89 Login Successful!" }), _jsxs("div", { style: "margin-top: 0.5rem;", children: ["Welcome, ", _jsx("strong", { children: username })] }), _jsxs("div", { style: "margin-top: 0.25rem; font-size: 0.85rem;", children: ["Login took ", duration, " seconds"] })] }));
         }
         else {
-            addDebugLog("ERROR", `Login failed (took ${duration}s)`);
+            addDebugLog("ERROR", `Login failed for ${username} (took ${duration}s)`);
             return c.html(_jsxs("div", { style: "padding: 1rem; background: #f8d7da; border: 1px solid #f5c6cb; border-radius: 4px; color: #721c24;", children: [_jsx("strong", { children: "\u274C Login Failed" }), _jsx("div", { style: "margin-top: 0.5rem;", children: "Check your credentials or try again. VTOP might be showing reCAPTCHA." }), _jsxs("div", { style: "margin-top: 0.25rem; font-size: 0.85rem;", children: ["Attempt took ", duration, " seconds"] })] }));
         }
     }
@@ -154,9 +136,6 @@ app.post("/api/login/form", async (c) => {
 });
 // Debug logs endpoint
 app.get("/api/debug/logs", (c) => {
-    if (process.env.DEBUG_LOGS !== "true") {
-        return c.html(_jsx("div", { style: "color: #888;", children: "Debug logs are disabled. Set DEBUG_LOGS=true to enable." }));
-    }
     if (debugLogs.length === 0) {
         return c.html(_jsx("div", { style: "color: #888;", children: "No logs yet. Try logging in to see debug output." }));
     }
@@ -220,10 +199,9 @@ app.get("/api/assignments/html", async (c) => {
         return c.html(_jsxs("div", { style: "padding: 1rem; background: #f8d7da; border: 1px solid #f5c6cb; border-radius: 4px; color: #721c24;", children: [_jsx("strong", { children: "\u274C Error:" }), " ", String(error)] }));
     }
 });
-const port = Number(process.env.PORT) || 6767;
 serve({
     fetch: app.fetch,
-    port,
+    port: 6767,
 }, (info) => {
     console.log(`🚀 Server is running on http://localhost:${info.port}`);
     console.log(`📊 Session status: http://localhost:${info.port}/api/session/status`);

package/dist/session-manager.js

@@ -276,7 +276,7 @@ class VTOPSessionManager {
                             solvedCaptcha = await solve(cleanDataUri);
                             console.log("✅ Solved CAPTCHA:", solvedCaptcha);
                             // Save captcha image for debugging
-                            if (parts?.base64 && process.env.DEBUG_CAPTCHA === "true") {
+                            if (parts?.base64) {
                                 const out = path.resolve(process.cwd(), "captcha.jpg");
                                 await saveCaptchaImage(parts.base64, out);
                                 //  console.log(`📷 Saved CAPTCHA image to ${out}`);
@@ -349,25 +349,13 @@ class VTOPSessionManager {
                                 : new URL(location, LOGIN_PAGE).toString();
                             await this.fetchWithCookies(redirectUrl);
                         }
-                        // After successfully submitting the captcha, we MUST verify login success
-                        console.log("POST successful, verifying login status...");
-                        // Try to navigate to post-login pages to confirm we are actually logged in
-                        // VTOP is tricky: a 200 OK on login POST doesn't guarantee success (could be wrong password)
-                        const navSuccess = await this.navigatePostLogin();
-                        if (navSuccess) {
-                            console.log("🎉 Login verified successfully!");
-                            this.state.loggedIn = true;
-                            this.state.username = username;
-                            this.state.regNo = regNo;
-                            return true;
-                        }
-                        else {
-                            console.error("❌ Login verification failed - cleaning up session");
-                            this.state.loggedIn = false;
-                            this.state.username = null;
-                            this.state.regNo = null;
-                            return false;
-                        }
+                        // After successfully submitting the captcha, assume login worked
+                        // The actual success will be determined when we try to fetch data
+                        console.log("🎉 Login POST submitted successfully!");
+                        this.state.loggedIn = true;
+                        this.state.username = username;
+                        this.state.regNo = regNo;
+                        return true;
                     }
                     catch (e) {
                         console.error("Login POST failed:", e);

package/package.json

@@ -4,26 +4,28 @@
   "scripts": {
     "dev": "tsx watch src/index.tsx",
     "build": "tsc",
-    "start": "node dist/index.js"
+    "start": "node dist/index.js",
+    "prepare": "npm run build"
   },
   "dependencies": {
     "@hono/node-server": "^1.19.9",
-    "canvas": "^3.2.1",
     "hono": "^4.11.4",
-    "htmx.org": "^2.0.8"
+    "htmx.org": "^2.0.8",
+    "jpeg-js": "^0.4.4",
+    "pngjs": "^7.0.0"
   },
   "bin": {
     "open-vtop": "dist/index.js"
   },
   "files": [
-    "dist",
-    "README.md",
-    "LICENSE"
+    "dist"
   ],
   "devDependencies": {
+    "@types/jpeg-js": "^0.3.0",
     "@types/node": "^20.11.17",
+    "@types/pngjs": "^6.0.5",
     "tsx": "^4.7.1",
     "typescript": "^5.8.3"
   },
-  "version": "1.0.3"
+  "version": "1.0.4"
 }