reddy-api-srm 1.0.11 → 1.1.0
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.
- package/dist/src/auth/login.d.ts +14 -0
- package/dist/src/auth/login.d.ts.map +1 -0
- package/dist/src/auth/login.js +96 -0
- package/dist/src/auth/login.js.map +1 -0
- package/dist/src/auth/sessionSeed.d.ts +7 -0
- package/dist/src/auth/sessionSeed.d.ts.map +1 -0
- package/dist/src/auth/sessionSeed.js +40 -0
- package/dist/src/auth/sessionSeed.js.map +1 -0
- package/dist/src/auth/terminateSessions.d.ts +9 -24
- package/dist/src/auth/terminateSessions.d.ts.map +1 -0
- package/dist/src/auth/terminateSessions.js +99 -100
- package/dist/src/auth/terminateSessions.js.map +1 -0
- package/dist/src/auth/validatePassword.d.ts +1 -1
- package/dist/src/auth/validatePassword.d.ts.map +1 -1
- package/dist/src/auth/validatePassword.js +138 -87
- package/dist/src/auth/validatePassword.js.map +1 -1
- package/dist/src/auth/validateUser.d.ts +1 -1
- package/dist/src/auth/validateUser.d.ts.map +1 -1
- package/dist/src/auth/validateUser.js +14 -40
- package/dist/src/auth/validateUser.js.map +1 -1
- package/dist/src/fetch/fetchAttendance.d.ts +5 -1
- package/dist/src/fetch/fetchAttendance.d.ts.map +1 -1
- package/dist/src/fetch/fetchAttendance.js +3 -33
- package/dist/src/fetch/fetchAttendance.js.map +1 -1
- package/dist/src/fetch/fetchCalender.d.ts +5 -1
- package/dist/src/fetch/fetchCalender.d.ts.map +1 -1
- package/dist/src/fetch/fetchCalender.js +4 -37
- package/dist/src/fetch/fetchCalender.js.map +1 -1
- package/dist/src/fetch/fetchCourseDetails.d.ts +5 -1
- package/dist/src/fetch/fetchCourseDetails.d.ts.map +1 -1
- package/dist/src/fetch/fetchCourseDetails.js +5 -40
- package/dist/src/fetch/fetchCourseDetails.js.map +1 -1
- package/dist/src/fetch/fetchDayOrder.d.ts +5 -1
- package/dist/src/fetch/fetchDayOrder.d.ts.map +1 -1
- package/dist/src/fetch/fetchDayOrder.js +3 -33
- package/dist/src/fetch/fetchDayOrder.js.map +1 -1
- package/dist/src/fetch/fetchLogout.d.ts +2 -4
- package/dist/src/fetch/fetchLogout.d.ts.map +1 -1
- package/dist/src/fetch/fetchLogout.js +15 -9
- package/dist/src/fetch/fetchLogout.js.map +1 -1
- package/dist/src/fetch/fetchMarks.d.ts +5 -1
- package/dist/src/fetch/fetchMarks.d.ts.map +1 -1
- package/dist/src/fetch/fetchMarks.js +4 -33
- package/dist/src/fetch/fetchMarks.js.map +1 -1
- package/dist/src/fetch/fetchPage.d.ts +6 -0
- package/dist/src/fetch/fetchPage.d.ts.map +1 -0
- package/dist/src/fetch/fetchPage.js +58 -0
- package/dist/src/fetch/fetchPage.js.map +1 -0
- package/dist/src/fetch/fetchTimetable.d.ts +5 -1
- package/dist/src/fetch/fetchTimetable.d.ts.map +1 -1
- package/dist/src/fetch/fetchTimetable.js +5 -40
- package/dist/src/fetch/fetchTimetable.js.map +1 -1
- package/dist/src/fetch/fetchUserInfo.d.ts +5 -1
- package/dist/src/fetch/fetchUserInfo.d.ts.map +1 -1
- package/dist/src/fetch/fetchUserInfo.js +6 -35
- package/dist/src/fetch/fetchUserInfo.js.map +1 -1
- package/dist/src/index.d.ts +39 -5
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +86 -33
- package/dist/src/index.js.map +1 -1
- package/dist/src/parser/decodeHtml.d.ts +6 -0
- package/dist/src/parser/decodeHtml.d.ts.map +1 -0
- package/dist/src/parser/decodeHtml.js +18 -0
- package/dist/src/parser/decodeHtml.js.map +1 -0
- package/dist/src/parser/parseAttendance.d.ts +2 -2
- package/dist/src/parser/parseAttendance.d.ts.map +1 -1
- package/dist/src/parser/parseAttendance.js +68 -16
- package/dist/src/parser/parseAttendance.js.map +1 -1
- package/dist/src/parser/parseCalender.d.ts +2 -2
- package/dist/src/parser/parseCalender.d.ts.map +1 -1
- package/dist/src/parser/parseCalender.js +125 -43
- package/dist/src/parser/parseCalender.js.map +1 -1
- package/dist/src/parser/parseCourse.d.ts +2 -2
- package/dist/src/parser/parseCourse.d.ts.map +1 -1
- package/dist/src/parser/parseCourse.js +19 -8
- package/dist/src/parser/parseCourse.js.map +1 -1
- package/dist/src/parser/parseDayOrder.d.ts +2 -2
- package/dist/src/parser/parseDayOrder.d.ts.map +1 -1
- package/dist/src/parser/parseDayOrder.js +31 -12
- package/dist/src/parser/parseDayOrder.js.map +1 -1
- package/dist/src/parser/parseMarks.d.ts +2 -2
- package/dist/src/parser/parseMarks.d.ts.map +1 -1
- package/dist/src/parser/parseMarks.js +23 -11
- package/dist/src/parser/parseMarks.js.map +1 -1
- package/dist/src/parser/parseTimetable.d.ts +2 -2
- package/dist/src/parser/parseTimetable.d.ts.map +1 -1
- package/dist/src/parser/parseTimetable.js +51 -27
- package/dist/src/parser/parseTimetable.js.map +1 -1
- package/dist/src/parser/parseUserInfo.d.ts +2 -2
- package/dist/src/parser/parseUserInfo.d.ts.map +1 -1
- package/dist/src/parser/parseUserInfo.js +57 -25
- package/dist/src/parser/parseUserInfo.js.map +1 -1
- package/dist/src/type/attendance.d.ts +5 -5
- package/dist/src/type/attendance.d.ts.map +1 -1
- package/dist/src/type/auth.d.ts +33 -5
- package/dist/src/type/auth.d.ts.map +1 -1
- package/dist/src/type/calendar.d.ts.map +1 -1
- package/dist/src/type/common.d.ts.map +1 -1
- package/dist/src/type/course.d.ts.map +1 -1
- package/dist/src/type/dayOrder.d.ts.map +1 -1
- package/dist/src/type/index.d.ts +0 -1
- package/dist/src/type/index.d.ts.map +1 -1
- package/dist/src/type/index.js +0 -1
- package/dist/src/type/index.js.map +1 -1
- package/dist/src/type/marks.d.ts.map +1 -1
- package/dist/src/type/timetable.d.ts.map +1 -1
- package/dist/src/type/user.d.ts +1 -0
- package/dist/src/type/user.d.ts.map +1 -1
- package/dist/src/utils/attendanceStatus.d.ts +8 -0
- package/dist/src/utils/attendanceStatus.d.ts.map +1 -0
- package/dist/src/utils/attendanceStatus.js +20 -0
- package/dist/src/utils/attendanceStatus.js.map +1 -0
- package/dist/src/utils/data.d.ts +11 -0
- package/dist/src/utils/data.d.ts.map +1 -0
- package/dist/src/utils/data.js +36 -0
- package/dist/src/utils/data.js.map +1 -0
- package/dist/src/utils/dynamicUrl.d.ts +14 -0
- package/dist/src/utils/dynamicUrl.d.ts.map +1 -0
- package/dist/src/utils/dynamicUrl.js +105 -0
- package/dist/src/utils/dynamicUrl.js.map +1 -0
- package/package.json +2 -2
|
@@ -35,21 +35,49 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.parseCalendar = parseCalendar;
|
|
37
37
|
const cheerio = __importStar(require("cheerio"));
|
|
38
|
+
// Month name mapping: supports both full names and abbreviations
|
|
39
|
+
const MONTH_PATTERNS = {
|
|
40
|
+
january: "January", jan: "January",
|
|
41
|
+
february: "February", feb: "February",
|
|
42
|
+
march: "March", mar: "March",
|
|
43
|
+
april: "April", apr: "April",
|
|
44
|
+
may: "May",
|
|
45
|
+
june: "June", jun: "June",
|
|
46
|
+
july: "July", jul: "July",
|
|
47
|
+
august: "August", aug: "August",
|
|
48
|
+
september: "September", sep: "September", sept: "September",
|
|
49
|
+
october: "October", oct: "October",
|
|
50
|
+
november: "November", nov: "November",
|
|
51
|
+
december: "December", dec: "December",
|
|
52
|
+
};
|
|
53
|
+
function normalizeMonthName(raw) {
|
|
54
|
+
// Strip year suffix (e.g., "Jan '26" → "Jan")
|
|
55
|
+
const cleaned = raw.replace(/['\u2018\u2019]\s*\d{2,4}$/, "").trim();
|
|
56
|
+
const key = cleaned.toLowerCase();
|
|
57
|
+
return MONTH_PATTERNS[key] ?? null;
|
|
58
|
+
}
|
|
38
59
|
async function parseCalendar(response) {
|
|
39
60
|
try {
|
|
40
|
-
// ── Step 1:
|
|
61
|
+
// ── Step 1: Normalize response to a string ──────────────────────────
|
|
41
62
|
let rawResponse;
|
|
42
63
|
if (typeof response === "string") {
|
|
43
64
|
rawResponse = response;
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
65
|
+
}
|
|
66
|
+
else if (response !== null &&
|
|
67
|
+
response !== undefined &&
|
|
68
|
+
typeof response === "object") {
|
|
69
|
+
const obj = response;
|
|
70
|
+
const candidate = obj.data ?? obj.html ?? obj.content ??
|
|
71
|
+
obj.body ?? obj.result ?? obj.page ?? obj.pageContent;
|
|
72
|
+
rawResponse =
|
|
73
|
+
typeof candidate === "string"
|
|
74
|
+
? candidate
|
|
75
|
+
: JSON.stringify(response);
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
50
78
|
rawResponse = String(response ?? "");
|
|
51
79
|
}
|
|
52
|
-
// ── Step 2: Extract the HTML content
|
|
80
|
+
// ── Step 2: Extract the HTML content ────────────────────────────────
|
|
53
81
|
let htmlContent = null;
|
|
54
82
|
// Method 1: Zoho Page Builder embed (zmlvalue attribute)
|
|
55
83
|
try {
|
|
@@ -57,9 +85,13 @@ async function parseCalendar(response) {
|
|
|
57
85
|
const zmlEl = $outer("div.zc-pb-embed-placeholder-content");
|
|
58
86
|
if (zmlEl.length > 0) {
|
|
59
87
|
const zmlValue = zmlEl.attr("zmlvalue");
|
|
60
|
-
if (zmlValue && zmlValue.length > 50)
|
|
88
|
+
if (zmlValue && zmlValue.length > 50)
|
|
89
|
+
htmlContent = zmlValue;
|
|
61
90
|
}
|
|
62
|
-
}
|
|
91
|
+
}
|
|
92
|
+
catch {
|
|
93
|
+
// ignore
|
|
94
|
+
}
|
|
63
95
|
// Method 2: pageSanitizer.sanitize('...') — Zoho XHR page/report response
|
|
64
96
|
if (!htmlContent) {
|
|
65
97
|
const match = rawResponse.match(/pageSanitizer\.sanitize\s*\(\s*['"](.+?)['"]\s*\)/s);
|
|
@@ -74,89 +106,139 @@ async function parseCalendar(response) {
|
|
|
74
106
|
}
|
|
75
107
|
}
|
|
76
108
|
// Method 3: Response already contains table HTML
|
|
77
|
-
if (!htmlContent &&
|
|
109
|
+
if (!htmlContent &&
|
|
110
|
+
rawResponse.includes("<table") &&
|
|
111
|
+
rawResponse.includes("<tr")) {
|
|
78
112
|
htmlContent = rawResponse;
|
|
79
113
|
}
|
|
80
114
|
// Method 4: JSON body with embedded HTML
|
|
81
115
|
if (!htmlContent && rawResponse.trim().startsWith("{")) {
|
|
82
116
|
try {
|
|
83
117
|
const parsed = JSON.parse(rawResponse);
|
|
84
|
-
const c = parsed.data ?? parsed.html ?? parsed.content ??
|
|
85
|
-
|
|
86
|
-
|
|
118
|
+
const c = parsed.data ?? parsed.html ?? parsed.content ??
|
|
119
|
+
parsed.body ?? parsed.result;
|
|
120
|
+
if (typeof c === "string" && c.includes("<table"))
|
|
121
|
+
htmlContent = c;
|
|
122
|
+
}
|
|
123
|
+
catch {
|
|
124
|
+
// not JSON
|
|
125
|
+
}
|
|
87
126
|
}
|
|
88
127
|
if (!htmlContent) {
|
|
89
|
-
return {
|
|
128
|
+
return {
|
|
129
|
+
error: "Failed to extract calendar details",
|
|
130
|
+
status: 404,
|
|
131
|
+
};
|
|
90
132
|
}
|
|
91
|
-
// ── Step 3: Find the calendar table
|
|
133
|
+
// ── Step 3: Find the calendar table ─────────────────────────────────
|
|
92
134
|
const $ = cheerio.load(htmlContent);
|
|
93
135
|
let $mainTable = $("table[bgcolor='#FAFCFE']");
|
|
94
|
-
if (!$mainTable.length)
|
|
136
|
+
if (!$mainTable.length)
|
|
137
|
+
$mainTable = $("table[bgcolor='#fafcfe']");
|
|
95
138
|
if (!$mainTable.length) {
|
|
96
|
-
// Fall back to the table
|
|
139
|
+
// Fall back to the largest table
|
|
97
140
|
let bestTable = null;
|
|
98
141
|
let bestScore = 0;
|
|
99
142
|
$("table").each((_, el) => {
|
|
100
143
|
const $el = $(el);
|
|
101
|
-
const score = $el.find("tr").length *
|
|
102
|
-
|
|
144
|
+
const score = $el.find("tr").length *
|
|
145
|
+
($el.find("tr").first().find("td, th").length || 1);
|
|
146
|
+
if (score > bestScore) {
|
|
147
|
+
bestScore = score;
|
|
148
|
+
bestTable = $el;
|
|
149
|
+
}
|
|
103
150
|
});
|
|
104
|
-
if (bestTable && bestScore > 10)
|
|
151
|
+
if (bestTable && bestScore > 10)
|
|
152
|
+
$mainTable = bestTable;
|
|
105
153
|
}
|
|
106
154
|
if (!$mainTable.length) {
|
|
107
155
|
return { error: "Could not find calendar table", status: 500 };
|
|
108
156
|
}
|
|
109
|
-
// ── Step 4: Locate the header row and month names
|
|
110
|
-
const MONTH_NAMES = ["january","february","march","april","may","june",
|
|
111
|
-
"july","august","september","october","november","december"];
|
|
157
|
+
// ── Step 4: Locate the header row and month names ───────────────────
|
|
112
158
|
const allRows = $mainTable.find("tr").toArray();
|
|
113
159
|
let headerRowIndex = -1;
|
|
114
160
|
let monthNames = [];
|
|
161
|
+
let rawMonthNames = [];
|
|
115
162
|
for (let ri = 0; ri < Math.min(4, allRows.length); ri++) {
|
|
116
163
|
const cells = $(allRows[ri]).find("td, th").toArray();
|
|
117
164
|
const found = [];
|
|
165
|
+
const foundRaw = [];
|
|
118
166
|
for (const cell of cells) {
|
|
119
|
-
const text = ($(cell).find("strong").text().trim() ||
|
|
120
|
-
|
|
167
|
+
const text = ($(cell).find("strong").text().trim() ||
|
|
168
|
+
$(cell).text().trim());
|
|
169
|
+
if (!text)
|
|
170
|
+
continue;
|
|
171
|
+
const normalized = normalizeMonthName(text);
|
|
172
|
+
if (normalized) {
|
|
173
|
+
found.push(normalized);
|
|
174
|
+
foundRaw.push(text);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
if (found.length > 0) {
|
|
178
|
+
headerRowIndex = ri;
|
|
179
|
+
monthNames = found;
|
|
180
|
+
rawMonthNames = foundRaw;
|
|
181
|
+
break;
|
|
121
182
|
}
|
|
122
|
-
if (found.length > 0) { headerRowIndex = ri; monthNames = found; break; }
|
|
123
183
|
}
|
|
124
184
|
if (monthNames.length === 0) {
|
|
125
|
-
return {
|
|
185
|
+
return {
|
|
186
|
+
error: "Could not parse month headers from calendar",
|
|
187
|
+
status: 500,
|
|
188
|
+
};
|
|
126
189
|
}
|
|
127
|
-
// ── Step 5: Find first data row (starts with a number = date)
|
|
190
|
+
// ── Step 5: Find first data row (starts with a number = date) ───────
|
|
128
191
|
let firstDataRowIndex = headerRowIndex + 1;
|
|
129
192
|
while (firstDataRowIndex < allRows.length) {
|
|
130
|
-
const firstCell = $(allRows[firstDataRowIndex])
|
|
131
|
-
|
|
193
|
+
const firstCell = $(allRows[firstDataRowIndex])
|
|
194
|
+
.find("td, th")
|
|
195
|
+
.first()
|
|
196
|
+
.text()
|
|
197
|
+
.trim();
|
|
198
|
+
if (/^\d+$/.test(firstCell))
|
|
199
|
+
break;
|
|
132
200
|
firstDataRowIndex++;
|
|
133
201
|
}
|
|
134
202
|
if (firstDataRowIndex >= allRows.length) {
|
|
135
|
-
return {
|
|
203
|
+
return {
|
|
204
|
+
error: "No data rows found in calendar table",
|
|
205
|
+
status: 500,
|
|
206
|
+
};
|
|
136
207
|
}
|
|
137
|
-
// ── Step 6: Calculate columns per month
|
|
208
|
+
// ── Step 6: Calculate columns per month ─────────────────────────────
|
|
138
209
|
const dataRowCellCount = $(allRows[firstDataRowIndex]).find("td, th").length;
|
|
139
|
-
let colsPerMonth = monthNames.length > 0
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
210
|
+
let colsPerMonth = monthNames.length > 0
|
|
211
|
+
? Math.round(dataRowCellCount / monthNames.length)
|
|
212
|
+
: 5;
|
|
213
|
+
if (colsPerMonth < 3)
|
|
214
|
+
colsPerMonth = 5;
|
|
215
|
+
// ── Step 7: Parse all data rows ─────────────────────────────────────
|
|
216
|
+
const monthsData = monthNames.map((m) => ({
|
|
217
|
+
month: m,
|
|
218
|
+
days: [],
|
|
219
|
+
}));
|
|
143
220
|
for (let ri = firstDataRowIndex; ri < allRows.length; ri++) {
|
|
144
221
|
const $cells = $(allRows[ri]).find("td, th");
|
|
145
222
|
monthsData.forEach((month, mi) => {
|
|
146
223
|
const offset = mi * colsPerMonth;
|
|
147
|
-
if (offset + 3 >= $cells.length)
|
|
224
|
+
if (offset + 3 >= $cells.length)
|
|
225
|
+
return;
|
|
148
226
|
const date = $cells.eq(offset).text().trim();
|
|
149
|
-
if (!date || !/^\d+$/.test(date))
|
|
227
|
+
if (!date || !/^\d+$/.test(date))
|
|
228
|
+
return;
|
|
150
229
|
const day = $cells.eq(offset + 1).text().trim();
|
|
151
|
-
const event = ($cells.eq(offset + 2).find("strong").text().trim()
|
|
152
|
-
|
|
230
|
+
const event = ($cells.eq(offset + 2).find("strong").text().trim() ||
|
|
231
|
+
$cells.eq(offset + 2).text().trim()).trim();
|
|
153
232
|
const dayOrder = $cells.eq(offset + 3).text().trim();
|
|
154
233
|
month.days.push({ date, day, event, dayOrder });
|
|
155
234
|
});
|
|
156
235
|
}
|
|
157
|
-
const populated = monthsData.filter(m => m.days.length > 0);
|
|
236
|
+
const populated = monthsData.filter((m) => m.days.length > 0);
|
|
158
237
|
if (populated.length === 0) {
|
|
159
|
-
return {
|
|
238
|
+
return {
|
|
239
|
+
error: "Calendar table found but no data could be parsed",
|
|
240
|
+
status: 500,
|
|
241
|
+
};
|
|
160
242
|
}
|
|
161
243
|
return { calendar: populated, status: 200 };
|
|
162
244
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseCalender.js","sourceRoot":"","sources":["../../../src/parser/parseCalender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"parseCalender.js","sourceRoot":"","sources":["../../../src/parser/parseCalender.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { CourseResponse } from "../type/course";
|
|
2
|
-
export declare function parseCourseDetails(response:
|
|
1
|
+
import type { CourseResponse } from "../type/course";
|
|
2
|
+
export declare function parseCourseDetails(response: unknown): Promise<CourseResponse>;
|
|
3
3
|
//# sourceMappingURL=parseCourse.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseCourse.d.ts","sourceRoot":"","sources":["../../../src/parser/parseCourse.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"parseCourse.d.ts","sourceRoot":"","sources":["../../../src/parser/parseCourse.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,cAAc,CAAC,CAoEzB"}
|
|
@@ -35,21 +35,32 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.parseCourseDetails = parseCourseDetails;
|
|
37
37
|
const cheerio = __importStar(require("cheerio"));
|
|
38
|
+
const decodeHtml_1 = require("./decodeHtml");
|
|
38
39
|
async function parseCourseDetails(response) {
|
|
39
40
|
try {
|
|
40
|
-
const
|
|
41
|
-
if (!
|
|
41
|
+
const decodedHtml = (0, decodeHtml_1.decodePageSanitizer)(response);
|
|
42
|
+
if (!decodedHtml) {
|
|
42
43
|
return { error: "Failed to extract course details", status: 404 };
|
|
43
44
|
}
|
|
44
|
-
const encodedHtml = match[1];
|
|
45
|
-
const decodedHtml = encodedHtml
|
|
46
|
-
.replace(/\\x([0-9A-Fa-f]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)))
|
|
47
|
-
.replace(/\\\\/g, "")
|
|
48
|
-
.replace(/\\'/g, "'");
|
|
49
45
|
const $ = cheerio.load(decodedHtml);
|
|
50
46
|
let batch = "";
|
|
51
47
|
try {
|
|
52
|
-
batch = $("td:contains('Batch:')")
|
|
48
|
+
batch = $("td:contains('Batch:')")
|
|
49
|
+
.next("td")
|
|
50
|
+
.find("font")
|
|
51
|
+
.text()
|
|
52
|
+
.trim();
|
|
53
|
+
// Fallback batch detection
|
|
54
|
+
if (!batch) {
|
|
55
|
+
$("tr").each((_, row) => {
|
|
56
|
+
const text = $(row).text();
|
|
57
|
+
const match = text.match(/Batch\s*:\s*(\d+)/);
|
|
58
|
+
if (match) {
|
|
59
|
+
batch = match[1];
|
|
60
|
+
return false;
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
}
|
|
53
64
|
}
|
|
54
65
|
catch {
|
|
55
66
|
batch = "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseCourse.js","sourceRoot":"","sources":["../../../src/parser/parseCourse.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"parseCourse.js","sourceRoot":"","sources":["../../../src/parser/parseCourse.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { DayOrderResponse } from "../type/dayOrder";
|
|
2
|
-
export declare function parseDayOrder(response:
|
|
1
|
+
import type { DayOrderResponse } from "../type/dayOrder";
|
|
2
|
+
export declare function parseDayOrder(response: unknown): Promise<DayOrderResponse>;
|
|
3
3
|
//# sourceMappingURL=parseDayOrder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseDayOrder.d.ts","sourceRoot":"","sources":["../../../src/parser/parseDayOrder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"parseDayOrder.d.ts","sourceRoot":"","sources":["../../../src/parser/parseDayOrder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGzD,wBAAsB,aAAa,CACjC,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,gBAAgB,CAAC,CAwD3B"}
|
|
@@ -35,30 +35,49 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.parseDayOrder = parseDayOrder;
|
|
37
37
|
const cheerio = __importStar(require("cheerio"));
|
|
38
|
+
const decodeHtml_1 = require("./decodeHtml");
|
|
38
39
|
async function parseDayOrder(response) {
|
|
39
40
|
try {
|
|
40
|
-
const
|
|
41
|
-
if (!
|
|
42
|
-
return {
|
|
41
|
+
const decodedHtml = (0, decodeHtml_1.decodePageSanitizer)(response);
|
|
42
|
+
if (!decodedHtml) {
|
|
43
|
+
return {
|
|
44
|
+
error: "Failed to extract dayOrder details",
|
|
45
|
+
status: 404,
|
|
46
|
+
};
|
|
43
47
|
}
|
|
44
|
-
const encodedHtml = match[1];
|
|
45
|
-
const decodedHtml = encodedHtml
|
|
46
|
-
.replace(/\\x([0-9A-Fa-f]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)))
|
|
47
|
-
.replace(/\\\\/g, "")
|
|
48
|
-
.replace(/\\'/g, "'");
|
|
49
48
|
const $ = cheerio.load(decodedHtml);
|
|
50
49
|
let dayOrderText = "";
|
|
51
50
|
let dayOrder = "-";
|
|
51
|
+
// Strategy 1: Original selector
|
|
52
52
|
$("span.highlight font[color='yellow']").each((_, el) => {
|
|
53
53
|
const text = $(el).text().trim();
|
|
54
54
|
if (text.startsWith("Day Order:")) {
|
|
55
55
|
dayOrderText = text.replace("Day Order:", "").trim();
|
|
56
56
|
}
|
|
57
57
|
});
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
58
|
+
// Strategy 2: Look for Day Order pattern in any element
|
|
59
|
+
if (!dayOrderText) {
|
|
60
|
+
$("font, span, strong, td").each((_, el) => {
|
|
61
|
+
const text = $(el).text().trim();
|
|
62
|
+
const match = text.match(/Day\s*Order\s*:\s*(.+)/i);
|
|
63
|
+
if (match) {
|
|
64
|
+
dayOrderText = match[1].trim();
|
|
65
|
+
return false;
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
// Extract the day number
|
|
70
|
+
if (dayOrderText) {
|
|
71
|
+
for (const order of ["1", "2", "3", "4", "5"]) {
|
|
72
|
+
if (dayOrderText.includes(order)) {
|
|
73
|
+
dayOrder = order;
|
|
74
|
+
break;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
// If contains "No Day Order" or similar, keep as "-"
|
|
78
|
+
if (dayOrderText.toLowerCase().includes("no day order") ||
|
|
79
|
+
dayOrderText.toLowerCase().includes("holiday")) {
|
|
80
|
+
dayOrder = "-";
|
|
62
81
|
}
|
|
63
82
|
}
|
|
64
83
|
return { dayOrder, status: 200 };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseDayOrder.js","sourceRoot":"","sources":["../../../src/parser/parseDayOrder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"parseDayOrder.js","sourceRoot":"","sources":["../../../src/parser/parseDayOrder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,sCA0DC;AA9DD,iDAAmC;AAEnC,6CAAmD;AAE5C,KAAK,UAAU,aAAa,CACjC,QAAiB;IAEjB,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAA,gCAAmB,EAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO;gBACL,KAAK,EAAE,oCAAoC;gBAC3C,MAAM,EAAE,GAAG;aACZ,CAAC;QACJ,CAAC;QAED,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACpC,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,QAAQ,GAAG,GAAG,CAAC;QAEnB,gCAAgC;QAChC,CAAC,CAAC,qCAAqC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE;YACtD,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;YACjC,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBAClC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YACvD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,wDAAwD;QACxD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,CAAC,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE;gBACzC,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;gBACjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;gBACpD,IAAI,KAAK,EAAE,CAAC;oBACV,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBAC/B,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,yBAAyB;QACzB,IAAI,YAAY,EAAE,CAAC;YACjB,KAAK,MAAM,KAAK,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;gBAC9C,IAAI,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;oBACjC,QAAQ,GAAG,KAAK,CAAC;oBACjB,MAAM;gBACR,CAAC;YACH,CAAC;YACD,qDAAqD;YACrD,IACE,YAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC;gBACnD,YAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAC9C,CAAC;gBACD,QAAQ,GAAG,GAAG,CAAC;YACjB,CAAC;QACH,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACnC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;QACjD,OAAO,EAAE,KAAK,EAAE,2BAA2B,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IAC7D,CAAC;AACH,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { MarksResponse } from "../type/marks";
|
|
2
|
-
export declare function parseMarks(response:
|
|
1
|
+
import type { MarksResponse } from "../type/marks";
|
|
2
|
+
export declare function parseMarks(response: unknown): Promise<MarksResponse>;
|
|
3
3
|
//# sourceMappingURL=parseMarks.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseMarks.d.ts","sourceRoot":"","sources":["../../../src/parser/parseMarks.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"parseMarks.d.ts","sourceRoot":"","sources":["../../../src/parser/parseMarks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAGnD,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,CA8FxB"}
|
|
@@ -35,25 +35,37 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.parseMarks = parseMarks;
|
|
37
37
|
const cheerio = __importStar(require("cheerio"));
|
|
38
|
+
const decodeHtml_1 = require("./decodeHtml");
|
|
38
39
|
async function parseMarks(response) {
|
|
39
40
|
try {
|
|
40
|
-
const
|
|
41
|
-
if (!
|
|
42
|
-
console.error("Failed to extract sanitized content from response");
|
|
41
|
+
const decodedHtml = (0, decodeHtml_1.decodePageSanitizer)(response);
|
|
42
|
+
if (!decodedHtml) {
|
|
43
43
|
return { error: "Failed to extract marks data", status: 404 };
|
|
44
44
|
}
|
|
45
|
-
const encodedHtml = match[1];
|
|
46
|
-
const decodedHtml = encodedHtml
|
|
47
|
-
.replace(/\\x([0-9A-Fa-f]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)))
|
|
48
|
-
.replace(/\\\\/g, "")
|
|
49
|
-
.replace(/\\'/g, "'");
|
|
50
45
|
const $ = cheerio.load(decodedHtml);
|
|
51
|
-
|
|
46
|
+
// Strategy 1: Original selector - 7th table
|
|
47
|
+
let table = $("table:nth-child(7)");
|
|
48
|
+
// Strategy 2: Find table by content pattern (marks have sub-tables)
|
|
49
|
+
if (!table.length || table.find("tr").length <= 1) {
|
|
50
|
+
$("table").each((_, el) => {
|
|
51
|
+
const $el = $(el);
|
|
52
|
+
// Marks table typically has sub-tables inside cells
|
|
53
|
+
const hasSubTables = $el.find("td table").length > 0;
|
|
54
|
+
const hasStrongSlash = $el.find("td strong").text().includes("/");
|
|
55
|
+
if (hasSubTables && hasStrongSlash) {
|
|
56
|
+
table = $el;
|
|
57
|
+
return false;
|
|
58
|
+
}
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
if (!table.length) {
|
|
62
|
+
return { markList: [], status: 200 };
|
|
63
|
+
}
|
|
52
64
|
const marksDetails = [];
|
|
53
65
|
const tableRows = table.find("tr");
|
|
54
66
|
tableRows.each((i, row) => {
|
|
55
67
|
if (i === 0)
|
|
56
|
-
return;
|
|
68
|
+
return; // skip header row
|
|
57
69
|
const cols = $(row).find("td");
|
|
58
70
|
const course = $(cols[0]).text().trim();
|
|
59
71
|
const category = $(cols[1]).text().trim();
|
|
@@ -62,7 +74,7 @@ async function parseMarks(response) {
|
|
|
62
74
|
return;
|
|
63
75
|
const marks = [];
|
|
64
76
|
const total = { obtained: 0, maxMark: 0 };
|
|
65
|
-
marksTable.find("td").each((
|
|
77
|
+
marksTable.find("td").each((_, markTd) => {
|
|
66
78
|
const strongText = $(markTd).find("strong").text().trim();
|
|
67
79
|
const [type, max] = strongText.split("/");
|
|
68
80
|
const obtained = $(markTd)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseMarks.js","sourceRoot":"","sources":["../../../src/parser/parseMarks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"parseMarks.js","sourceRoot":"","sources":["../../../src/parser/parseMarks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { TimetableResponse } from "../type/timetable";
|
|
2
|
-
export declare function parseTimetable(response:
|
|
1
|
+
import type { TimetableResponse } from "../type/timetable";
|
|
2
|
+
export declare function parseTimetable(response: unknown): Promise<TimetableResponse>;
|
|
3
3
|
//# sourceMappingURL=parseTimetable.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseTimetable.d.ts","sourceRoot":"","sources":["../../../src/parser/parseTimetable.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parseTimetable.d.ts","sourceRoot":"","sources":["../../../src/parser/parseTimetable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAK3D,wBAAsB,cAAc,CAClC,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,iBAAiB,CAAC,CAuH5B"}
|