reddy-api-srm 1.0.7 → 1.0.8

package/dist/src/auth/validatePassword.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatePassword = validatePassword;
 async function validatePassword({ identifier, digest, password, }) {
+    let res;
     try {
-        const res = await fetch(`https://academia.srmist.edu.in/accounts/p/40-10002227248/signin/v2/primary/${identifier}/password?digest=${digest}&cli_time=${Date.now()}&servicename=ZohoCreator&service_language=en&serviceurl=https%3A%2F%2Facademia.srmist.edu.in%2Fportal%2Facademia-academic-services%2FredirectFromLogin`, {
+        res = await fetch(`https://academia.srmist.edu.in/accounts/p/40-10002227248/signin/v2/primary/${identifier}/password?digest=${digest}&cli_time=${Date.now()}&servicename=ZohoCreator&service_language=en&serviceurl=https%3A%2F%2Facademia.srmist.edu.in%2Fportal%2Facademia-academic-services%2FredirectFromLogin`, {
             headers: {
                 accept: "*/*",
                 "accept-language": "en-US,en;q=0.9",
@@ -19,7 +20,24 @@ async function validatePassword({ identifier, digest, password, }) {
             body: `{"passwordauth":{"password":"${password}"}}`,
             method: "POST",
         });
-        const response = (await res.json());
+        // ── Detect redirect to Zoho sessions-reminder page ───────────────────────
+        if (res.redirected && res.url && res.url.includes("sessions-reminder")) {
+            let flowId = null;
+            try { const u = new URL(res.url); flowId = u.searchParams.get("flowId") ?? u.searchParams.get("flow_id") ?? null; } catch (_) {}
+            return { data: { statusCode: 435, message: "Maximum concurrent sessions reached. Please terminate existing sessions to continue.", captcha: { required: false, digest: null }, isConcurrentLimit: true, flowId }, isAuthenticated: false };
+        }
+        // Read body as text first — safely handles non-JSON responses
+        const bodyText = await res.text();
+        let response;
+        try {
+            response = JSON.parse(bodyText);
+        } catch (_) {
+            const lower = bodyText.toLowerCase();
+            if (lower.includes("sessions-reminder") || (lower.includes("concurrent") && lower.includes("session"))) {
+                return { data: { statusCode: 435, message: "Maximum concurrent sessions reached. Please terminate existing sessions to continue.", captcha: { required: false, digest: null }, isConcurrentLimit: true, flowId: null }, isAuthenticated: false };
+            }
+            return { error: "Internal Server Error", errorReason: new Error("Non-JSON response from login endpoint") };
+        }
         if (response.status_code === 201) {
             // Use filterCookies to process set-cookie header
             const setCookieHeader = res.headers.get("set-cookie");
@@ -36,9 +54,6 @@ async function validatePassword({ identifier, digest, password, }) {
             return { data, isAuthenticated: true };
         }
         // ── Concurrent / device-limit detection ──────────────────────────────────
-        // Zoho returns status_code 435 when the concurrent session limit is hit.
-        // The response also embeds a flowId used to call the terminate endpoint.
-        // Field names seen in Zoho responses: flowId, flow_id, concurrent_flow_id
         const msg = (response.localized_message ?? response.message ?? "").toLowerCase();
         const isConcurrentLimit =
             response.status_code === 435 ||
@@ -46,17 +61,16 @@ async function validatePassword({ identifier, digest, password, }) {
             msg.includes("maximum number") ||
             msg.includes("device limit") ||
             msg.includes("already logged") ||
+            msg.includes("sessions") ||
             !!response.flowId ||
             !!response.flow_id ||
             !!response.concurrent_flow_id;
-        // Extract the flow identifier — try all known field names
         const flowId =
             response.flowId ??
             response.flow_id ??
             response.concurrent_flow_id ??
             response.login_flow_id ??
             null;
-        // ─────────────────────────────────────────────────────────────────────────
         const captchaRequired = msg.includes("captcha");
         const data = {
             statusCode: response.status_code,
@@ -64,13 +78,15 @@ async function validatePassword({ identifier, digest, password, }) {
             captcha: captchaRequired
                 ? { required: true, digest: response.cdigest }
                 : { required: false, digest: null },
-            // NEW: concurrent session fields
             isConcurrentLimit,
             flowId,
         };
         return { data, isAuthenticated: false };
     }
     catch (e) {
+        if (res && res.redirected && res.url && res.url.includes("sessions-reminder")) {
+            return { data: { statusCode: 435, message: "Maximum concurrent sessions reached.", captcha: { required: false, digest: null }, isConcurrentLimit: true, flowId: null }, isAuthenticated: false };
+        }
         return { error: "Internal Server Error", errorReason: e };
     }
 }

package/dist/src/fetch/fetchCalender.js

@@ -10,6 +10,7 @@ async function fetchCalendar(cookie) {
     const url = await (0, dynamicUrl_1.calendarDynamicUrl)();
     try {
         const response = await (0, axios_1.default)(url, {
+            responseType: "text",
             headers: {
                 accept: "*/*",
                 "accept-language": "en-US,en;q=0.9",

package/dist/src/parser/parseCalender.js

@@ -37,92 +37,128 @@ exports.parseCalendar = parseCalendar;
 const cheerio = __importStar(require("cheerio"));
 async function parseCalendar(response) {
     try {
-        let htmlContent = null;
-        // Method 1: zmlvalue approach (Zoho Page Builder pages)
-        const $outer = cheerio.load(response);
-        const zmlValue = $outer("div.zc-pb-embed-placeholder-content").attr("zmlvalue");
-        if (zmlValue) {
-            htmlContent = zmlValue;
+        // ── Step 1: Normalise response to a string ─────────────────────────────
+        let rawResponse;
+        if (typeof response === "string") {
+            rawResponse = response;
+        } else if (response !== null && response !== undefined && typeof response === "object") {
+            // Axios may auto-parse JSON — try common field names that could hold HTML
+            const candidate = response.data ?? response.html ?? response.content ??
+                response.body ?? response.result ?? response.page ?? response.pageContent;
+            rawResponse = typeof candidate === "string" ? candidate : JSON.stringify(response);
+        } else {
+            rawResponse = String(response ?? "");
         }
-        // Method 2: pageSanitizer.sanitize approach (Zoho Report pages)
+        // ── Step 2: Extract the HTML content ───────────────────────────────────
+        let htmlContent = null;
+        // Method 1: Zoho Page Builder embed (zmlvalue attribute)
+        try {
+            const $outer = cheerio.load(rawResponse);
+            const zmlEl = $outer("div.zc-pb-embed-placeholder-content");
+            if (zmlEl.length > 0) {
+                const zmlValue = zmlEl.attr("zmlvalue");
+                if (zmlValue && zmlValue.length > 50) htmlContent = zmlValue;
+            }
+        } catch (_) { /* ignore */ }
+        // Method 2: pageSanitizer.sanitize('...') — Zoho XHR page/report response
         if (!htmlContent) {
-            const match = response.match(/pageSanitizer\.sanitize\('(.*)'\);/s);
+            const match = rawResponse.match(/pageSanitizer\.sanitize\s*\(\s*['"](.+?)['"]\s*\)/s);
             if (match && match[1]) {
                 htmlContent = match[1]
                     .replace(/\\x([0-9A-Fa-f]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)))
-                    .replace(/\\\\/g, "")
-                    .replace(/\\'/g, "'");
+                    .replace(/\\\\/g, "\\")
+                    .replace(/\\'/g, "'")
+                    .replace(/\\"/g, '"')
+                    .replace(/\\n/g, "\n")
+                    .replace(/\\t/g, "\t");
             }
         }
+        // Method 3: Response already contains table HTML
+        if (!htmlContent && rawResponse.includes("<table") && rawResponse.includes("<tr")) {
+            htmlContent = rawResponse;
+        }
+        // Method 4: JSON body with embedded HTML
+        if (!htmlContent && rawResponse.trim().startsWith("{")) {
+            try {
+                const parsed = JSON.parse(rawResponse);
+                const c = parsed.data ?? parsed.html ?? parsed.content ?? parsed.body ?? parsed.result;
+                if (typeof c === "string" && c.includes("<table")) htmlContent = c;
+            } catch (_) { /* not JSON */ }
+        }
         if (!htmlContent) {
             return { error: "Failed to extract calendar details", status: 404 };
         }
-        const $inner = cheerio.load(htmlContent);
-        // Try multiple selectors for the calendar table
-        let $mainTable = $inner("table[bgcolor='#FAFCFE']");
-        if ($mainTable.length === 0) $mainTable = $inner("table[bgcolor='#fafcfe']");
-        if ($mainTable.length === 0) {
-            // Find the largest table that looks like a calendar
+        // ── Step 3: Find the calendar table ────────────────────────────────────
+        const $ = cheerio.load(htmlContent);
+        let $mainTable = $("table[bgcolor='#FAFCFE']");
+        if (!$mainTable.length) $mainTable = $("table[bgcolor='#fafcfe']");
+        if (!$mainTable.length) {
+            // Fall back to the table with the most data
             let bestTable = null;
-            let bestThCount = 0;
-            $inner("table").each((_, el) => {
-                const thCount = $inner(el).find("th").length;
-                if (thCount > bestThCount) {
-                    bestThCount = thCount;
-                    bestTable = $inner(el);
-                }
+            let bestScore = 0;
+            $("table").each((_, el) => {
+                const $el = $(el);
+                const score = $el.find("tr").length * ($el.find("tr").first().find("td, th").length || 1);
+                if (score > bestScore) { bestScore = score; bestTable = $el; }
             });
-            if (bestTable && bestThCount > 3) $mainTable = bestTable;
+            if (bestTable && bestScore > 10) $mainTable = bestTable;
         }
-        if ($mainTable.length === 0) {
-            return { error: "Could not find the main calendar table.", status: 500 };
+        if (!$mainTable.length) {
+            return { error: "Could not find calendar table", status: 500 };
         }
-        const $headerRow = $mainTable.find("tr").first();
-        const $ths = $headerRow.find("th");
-        const monthsData = [];
-        // Auto-detect columns per month by trying common values
-        let colsPerMonth = 5;
-        const MONTH_NAMES = ["january","february","march","april","may","june","july","august","september","october","november","december"];
-        for (const cols of [5, 4, 6, 3]) {
-            const candidate = [];
-            for (let i = 0;; i++) {
-                const idx = i * cols + Math.floor(cols / 2);
-                if (idx >= $ths.length) break;
-                let name = $ths.eq(idx).find("strong").text().trim();
-                if (!name) name = $ths.eq(idx).text().trim();
-                if (name && MONTH_NAMES.includes(name.toLowerCase())) {
-                    candidate.push(name);
-                } else {
-                    break;
-                }
-            }
-            if (candidate.length > 0) {
-                colsPerMonth = cols;
-                candidate.forEach(m => monthsData.push({ month: m, days: [] }));
-                break;
+        // ── Step 4: Locate the header row and month names ──────────────────────
+        const MONTH_NAMES = ["january","february","march","april","may","june",
+            "july","august","september","october","november","december"];
+        const allRows = $mainTable.find("tr").toArray();
+        let headerRowIndex = -1;
+        let monthNames = [];
+        for (let ri = 0; ri < Math.min(4, allRows.length); ri++) {
+            const cells = $(allRows[ri]).find("td, th").toArray();
+            const found = [];
+            for (const cell of cells) {
+                const text = ($(cell).find("strong").text().trim() || $(cell).text().trim());
+                if (text && MONTH_NAMES.includes(text.toLowerCase())) found.push(text);
             }
+            if (found.length > 0) { headerRowIndex = ri; monthNames = found; break; }
+        }
+        if (monthNames.length === 0) {
+            return { error: "Could not parse month headers from calendar", status: 500 };
+        }
+        // ── Step 5: Find first data row (starts with a number = date) ──────────
+        let firstDataRowIndex = headerRowIndex + 1;
+        while (firstDataRowIndex < allRows.length) {
+            const firstCell = $(allRows[firstDataRowIndex]).find("td, th").first().text().trim();
+            if (/^\d+$/.test(firstCell)) break;
+            firstDataRowIndex++;
         }
-        if (monthsData.length === 0) {
-            return { error: "Could not parse month headers from calendar.", status: 500 };
+        if (firstDataRowIndex >= allRows.length) {
+            return { error: "No data rows found in calendar table", status: 500 };
         }
-        const $dataRows = $mainTable.find("tr").slice(1).toArray();
-        $dataRows.forEach((rowElement) => {
-            const $tds = $inner(rowElement).find("td");
-            monthsData.forEach((month, monthIndex) => {
-                const offset = monthIndex * colsPerMonth;
-                if (offset + 3 >= $tds.length)
-                    return;
-                const date = $tds.eq(offset).text().trim();
-                if (!date)
-                    return;
-                const day = $tds.eq(offset + 1).text().trim();
-                const event = $tds.eq(offset + 2).find("strong").text().trim()
-                    || $tds.eq(offset + 2).text().trim();
-                const dayOrder = $tds.eq(offset + 3).text().trim();
+        // ── Step 6: Calculate columns per month from the first data row ─────────
+        const dataRowCellCount = $(allRows[firstDataRowIndex]).find("td, th").length;
+        let colsPerMonth = monthNames.length > 0 ? Math.round(dataRowCellCount / monthNames.length) : 5;
+        if (colsPerMonth < 3) colsPerMonth = 5;
+        // ── Step 7: Parse all data rows ────────────────────────────────────────
+        const monthsData = monthNames.map(m => ({ month: m, days: [] }));
+        for (let ri = firstDataRowIndex; ri < allRows.length; ri++) {
+            const $cells = $(allRows[ri]).find("td, th");
+            monthsData.forEach((month, mi) => {
+                const offset = mi * colsPerMonth;
+                if (offset + 3 >= $cells.length) return;
+                const date = $cells.eq(offset).text().trim();
+                if (!date || !/^\d+$/.test(date)) return;
+                const day = $cells.eq(offset + 1).text().trim();
+                const event = ($cells.eq(offset + 2).find("strong").text().trim()
+                    || $cells.eq(offset + 2).text().trim()).trim();
+                const dayOrder = $cells.eq(offset + 3).text().trim();
                 month.days.push({ date, day, event, dayOrder });
             });
-        });
-        return { calendar: monthsData, status: 200 };
+        }
+        const populated = monthsData.filter(m => m.days.length > 0);
+        if (populated.length === 0) {
+            return { error: "Calendar table found but no data could be parsed", status: 500 };
+        }
+        return { calendar: populated, status: 200 };
     }
     catch (error) {
         console.error("Error parsing calendar:", error);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "reddy-api-srm",
   "description": "SRMIST KTR Academia portal",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "exports": {