chuvsu-js 2.3.0 → 2.4.0

package/README.md

@@ -6,8 +6,8 @@ Node.js библиотека для работы с порталами ЧувГ
 - **lk.chuvsu.ru** — личный кабинет студента (персональные данные)
 
 > [!WARNING]
-> Пока не доработана, код говно, замены занятий пока не парсит.
-> Не надейтесь на правильный вывод расписания.
+> Пока не доработана, код и архитектура говно и надо бы его 10 раз переписать.
+> Не надейтесь на правильный вывод расписания, но впринципе я не замечал пока расхождений.
 
 ## Установка
 

package/dist/browser.d.ts

@@ -1,5 +1,5 @@
 export { Schedule } from "./tt/schedule.js";
 export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, getTimeSlots, getLessonNumber, getAdjacentSemester, } from "./tt/utils.js";
 export { Period, EducationType } from "./common/types.js";
-export type { Time, WeekRange, Teacher, } from "./common/types.js";
-export type { Faculty, Group, ScheduleEntry, FullScheduleSlot, FullScheduleDay, LessonTimeSlot, Lesson, LessonTime, SemesterWeek, } from "./tt/types.js";
+export type { Time, WeekRange, Teacher } from "./common/types.js";
+export type { Faculty, Group, ScheduleEntry, FullScheduleSlot, FullScheduleDay, LessonTimeSlot, Lesson, LessonTime, SemesterWeek, Substitution, TransferInfo, TtClientOptions, CacheConfig, } from "./tt/types.js";

package/dist/index.d.ts

@@ -4,7 +4,7 @@ export { Schedule } from "./tt/schedule.js";
 export type { CacheEntry } from "./common/cache.js";
 export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, getTimeSlots, getLessonNumber, getAdjacentSemester, isHoliday, RUSSIAN_HOLIDAYS, } from "./tt/utils.js";
 export type { Holiday } from "./tt/utils.js";
-export { Period, EducationType, AuthError, ParseError } from "./common/types.js";
-export type { Time, WeekRange, Teacher, } from "./common/types.js";
-export type { PersonalData, } from "./lk/types.js";
-export type { Faculty, Group, ScheduleEntry, FullScheduleSlot, FullScheduleDay, LessonTimeSlot, Lesson, LessonTime, SemesterWeek, TtClientOptions, CacheConfig, } from "./tt/types.js";
+export { Period, EducationType, AuthError, ParseError, } from "./common/types.js";
+export type { Time, WeekRange, Teacher } from "./common/types.js";
+export type { PersonalData } from "./lk/types.js";
+export type { Faculty, Group, ScheduleEntry, FullScheduleSlot, FullScheduleDay, LessonTimeSlot, Lesson, LessonTime, SemesterWeek, Substitution, TransferInfo, TtClientOptions, CacheConfig, } from "./tt/types.js";

package/dist/index.js

@@ -2,4 +2,4 @@ export { LkClient } from "./lk/client.js";
 export { TtClient } from "./tt/client.js";
 export { Schedule } from "./tt/schedule.js";
 export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, getTimeSlots, getLessonNumber, getAdjacentSemester, isHoliday, RUSSIAN_HOLIDAYS, } from "./tt/utils.js";
-export { AuthError, ParseError } from "./common/types.js";
+export { AuthError, ParseError, } from "./common/types.js";

package/dist/tt/parse.js

@@ -109,12 +109,83 @@ function parseSemesterSchedule(doc) {
     }
     return days;
 }
+function parseDate(dd, mm, yyyy) {
+    return new Date(parseInt(yyyy), parseInt(mm) - 1, parseInt(dd));
+}
+function parseTransferDiv(div) {
+    const divText = text(div);
+    const divHtml = div.innerHTML ?? "";
+    const m = divText.match(/(\d{2})\.(\d{2})\.(\d{4})\s*перенос\s*c\s*(\d{2})\.(\d{2})\.(\d{4})\s*\((\d+)\s*пара\)/);
+    if (!m)
+        return null;
+    const targetDate = parseDate(m[1], m[2], m[3]);
+    const fromDate = parseDate(m[4], m[5], m[6]);
+    const fromSlot = parseInt(m[7]);
+    const subjectEl = div.querySelector('span[style*="color: blue"]');
+    const subject = subjectEl ? text(subjectEl) : "";
+    if (!subject)
+        return null;
+    const roomMatch = divHtml.match(/([А-Яа-яA-Za-z]-\d+)/);
+    const typeMatch = divText.match(/\((лк|пр|лб|зач|экз|зчО|кр|конс)\)/);
+    // Teacher: last text line before closing </div>
+    const parts = divHtml.split(/<br\s*\/?>/);
+    const lastPart = parts[parts.length - 1]?.replace(/<[^>]*>/g, "").trim();
+    const transfer = { targetDate, fromDate, fromSlot, subject };
+    return {
+        transfer,
+        entry: {
+            room: roomMatch?.[1] ?? "",
+            subject,
+            type: typeMatch?.[1] ?? "",
+            weeks: { from: 0, to: 0 },
+            teacher: parseTeacher(lastPart ?? ""),
+            transfer,
+        },
+    };
+}
+function parseSubstitutionDiv(div) {
+    const divText = text(div);
+    const divHtml = div.innerHTML ?? "";
+    const m = divText.match(/(\d{2})\.(\d{2})\.(\d{4})\s*замена\s*на:/);
+    if (!m)
+        return null;
+    const date = parseDate(m[1], m[2], m[3]);
+    let room;
+    let teacher;
+    const roomMatch = divHtml.match(/Аудитория:\s*<span[^>]*>([^<]+)<\/span>/);
+    if (roomMatch)
+        room = roomMatch[1].trim();
+    const teacherMatch = divHtml.match(/Преподаватель:\s*<span[^>]*>([^<]+)<\/span>/);
+    if (teacherMatch)
+        teacher = parseTeacher(teacherMatch[1].trim());
+    return { date, room, teacher };
+}
 function parseSemesterEntry(el) {
     const td = el.querySelector("td") ?? el;
     const fullHtml = td.innerHTML ?? "";
     const plainText = text(td);
     if (!plainText)
         return null;
+    const possibleChanges = (td.getAttribute("class") ?? "").includes("want") || undefined;
+    // Detect red-bordered divs (transfers / substitutions)
+    const redDivs = td.querySelectorAll('div[style*="border: 2px solid red"]');
+    // Check for transfer (перенос) — the whole entry is the transferred lesson
+    for (const div of redDivs) {
+        const result = parseTransferDiv(div);
+        if (result) {
+            if (possibleChanges)
+                result.entry.possibleChanges = true;
+            return result.entry;
+        }
+    }
+    // Collect substitutions (замена на)
+    const substitutions = [];
+    for (const div of redDivs) {
+        const sub = parseSubstitutionDiv(div);
+        if (sub)
+            substitutions.push(sub);
+    }
+    // Parse regular entry
     const subjectEl = td.querySelector('span[style*="color: blue"]');
     const subject = subjectEl ? text(subjectEl) : "";
     if (!subject)
@@ -133,6 +204,8 @@ function parseSemesterEntry(el) {
         teacher: parseTeacher(teacherMatch?.[1] ?? ""),
         subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
         weekParity,
+        substitutions: substitutions.length > 0 ? substitutions : undefined,
+        possibleChanges,
     };
 }
 // --- Session schedule parsing (date-based, specific dates) ---

package/dist/tt/schedule.js

@@ -1,4 +1,4 @@
-import { getCurrentPeriod, isSessionPeriod, getWeekdayName, getMonday, getSemesterStart, getSemesterWeeks, getWeekNumber, getAdjacentSemester, filterSlots, slotsToLessons, sortLessons, isHoliday, RUSSIAN_HOLIDAYS, } from "./utils.js";
+import { getCurrentPeriod, isSessionPeriod, getWeekdayName, getMonday, getSemesterStart, getSemesterWeeks, getWeekNumber, getAdjacentSemester, filterSlots, slotsToLessons, sortLessons, isHoliday, collectTransfers, suppressTransferredLessons, RUSSIAN_HOLIDAYS, } from "./utils.js";
 export class Schedule {
     groupId;
     scheduleMap;
@@ -104,9 +104,15 @@ export class Schedule {
                 const slots = this.getSlotsForWeekday(weekday, semesterDays, {
                     subgroup: opts?.subgroup,
                     week,
+                    date,
                 });
                 lessons.push(...slotsToLessons(slots, date));
             }
+            // 3. Suppress lessons that were transferred away from this date
+            const transfers = collectTransfers(semesterDays);
+            if (transfers.length > 0) {
+                return suppressTransferredLessons(lessons, transfers, date).sort(sortLessons);
+            }
         }
         return lessons.sort(sortLessons);
     }

package/dist/tt/types.d.ts

@@ -9,6 +9,26 @@ export interface Group {
     specialty?: string;
     profile?: string;
 }
+/** A date-specific substitution (room and/or teacher change). */
+export interface Substitution {
+    /** The date this substitution applies to. */
+    date: Date;
+    /** New room, if changed. */
+    room?: string;
+    /** New teacher, if changed. */
+    teacher?: Teacher;
+}
+/** Info about a lesson transferred from another date/slot. */
+export interface TransferInfo {
+    /** Date when this lesson takes place (target). */
+    targetDate: Date;
+    /** Original date the lesson was moved from. */
+    fromDate: Date;
+    /** Original slot number (пара). */
+    fromSlot: number;
+    /** Subject name (used to match the source entry). */
+    subject: string;
+}
 export interface ScheduleEntry {
     room: string;
     subject: string;
@@ -17,6 +37,12 @@ export interface ScheduleEntry {
     teacher: Teacher;
     subgroup?: number;
     weekParity?: "even" | "odd";
+    /** Date-specific substitutions (замена на). */
+    substitutions?: Substitution[];
+    /** If this entry is a transferred lesson (перенос). */
+    transfer?: TransferInfo;
+    /** Whether this entry is marked as potentially changing (class="want"). */
+    possibleChanges?: boolean;
 }
 export interface FullScheduleSlot {
     number: number;
@@ -50,6 +76,14 @@ export interface Lesson {
     weeks: WeekRange;
     subgroup?: number;
     weekParity?: "even" | "odd";
+    /** If a substitution was applied, the original room. */
+    originalRoom?: string;
+    /** If a substitution was applied, the original teacher. */
+    originalTeacher?: Teacher;
+    /** Transfer info if this lesson was moved from another date/slot. */
+    transfer?: TransferInfo;
+    /** Whether this lesson is marked as potentially changing. */
+    possibleChanges?: boolean;
 }
 export interface SemesterWeek {
     week: number;

package/dist/tt/utils.d.ts

@@ -1,4 +1,4 @@
-import type { FullScheduleSlot, SemesterWeek, Lesson, LessonTimeSlot } from "./types.js";
+import type { FullScheduleDay, FullScheduleSlot, ScheduleEntry, SemesterWeek, Lesson, LessonTimeSlot } from "./types.js";
 import { Period, EducationType } from "../common/types.js";
 import type { Time } from "../common/types.js";
 export declare function getCurrentPeriod(opts?: {
@@ -36,8 +36,13 @@ export declare function getWeekNumber(opts: {
 export declare function filterSlots(slots: FullScheduleSlot[], opts?: {
     subgroup?: number;
     week?: number;
+    date?: Date;
 }): FullScheduleSlot[];
 export declare function slotsToLessons(slots: FullScheduleSlot[], date: Date): Lesson[];
+/** Collect all transfer entries from schedule days. */
+export declare function collectTransfers(days: FullScheduleDay[]): ScheduleEntry[];
+/** Remove lessons whose source date/slot match a transfer. */
+export declare function suppressTransferredLessons(lessons: Lesson[], transfers: ScheduleEntry[], date: Date): Lesson[];
 export declare function getTimeSlots(educationType: EducationType): LessonTimeSlot[];
 export declare function getLessonNumber(time: Time, educationType: EducationType): number;
 export declare function getAdjacentSemester(session: Period): Period;

package/dist/tt/utils.js

@@ -88,8 +88,19 @@ export function getWeekNumber(opts) {
     const diff = targetMonday.getTime() - startMonday.getTime();
     return Math.floor(diff / (7 * 24 * 60 * 60 * 1000));
 }
+function isSameDay(a, b) {
+    return (a.getFullYear() === b.getFullYear() &&
+        a.getMonth() === b.getMonth() &&
+        a.getDate() === b.getDate());
+}
 function filterEntries(entries, opts) {
     return entries.filter((e) => {
+        // Transfer entries: only include when the query date matches the target date
+        if (e.transfer) {
+            if (!opts?.date)
+                return false;
+            return isSameDay(e.transfer.targetDate, opts.date);
+        }
         if (opts?.subgroup && e.subgroup && e.subgroup !== opts.subgroup) {
             return false;
         }
@@ -110,7 +121,7 @@ function filterEntries(entries, opts) {
     });
 }
 export function filterSlots(slots, opts) {
-    if (opts?.subgroup == null && opts?.week == null)
+    if (opts?.subgroup == null && opts?.week == null && opts?.date == null)
         return slots;
     return slots
         .map((slot) => ({
@@ -128,22 +139,66 @@ export function slotsToLessons(slots, date) {
     const lessons = [];
     for (const slot of slots) {
         for (const entry of slot.entries) {
+            let room = entry.room;
+            let teacher = entry.teacher;
+            let originalRoom;
+            let originalTeacher;
+            // Apply date-specific substitutions
+            if (entry.substitutions) {
+                const sub = entry.substitutions.find((s) => isSameDay(s.date, date));
+                if (sub) {
+                    if (sub.room) {
+                        originalRoom = room;
+                        room = sub.room;
+                    }
+                    if (sub.teacher) {
+                        originalTeacher = teacher;
+                        teacher = sub.teacher;
+                    }
+                }
+            }
             lessons.push({
                 number: slot.number,
                 start: makeLessonTime(date, slot.timeStart),
                 end: makeLessonTime(date, slot.timeEnd),
                 subject: entry.subject,
                 type: entry.type,
-                room: entry.room,
-                teacher: entry.teacher,
+                room,
+                teacher,
                 weeks: entry.weeks,
                 subgroup: entry.subgroup,
                 weekParity: entry.weekParity,
+                originalRoom,
+                originalTeacher,
+                transfer: entry.transfer,
+                possibleChanges: entry.possibleChanges,
             });
         }
     }
     return lessons;
 }
+/** Collect all transfer entries from schedule days. */
+export function collectTransfers(days) {
+    const transfers = [];
+    for (const day of days) {
+        for (const slot of day.slots) {
+            for (const entry of slot.entries) {
+                if (entry.transfer)
+                    transfers.push(entry);
+            }
+        }
+    }
+    return transfers;
+}
+/** Remove lessons whose source date/slot match a transfer. */
+export function suppressTransferredLessons(lessons, transfers, date) {
+    return lessons.filter((lesson) => {
+        return !transfers.some((t) => t.transfer &&
+            isSameDay(t.transfer.fromDate, date) &&
+            t.transfer.fromSlot === lesson.number &&
+            t.transfer.subject === lesson.subject);
+    });
+}
 // --- Lesson time slots ---
 const VO_TIME_SLOTS = [
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chuvsu-js",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Node.js library for ChuvSU student portal (lk.chuvsu.ru) and schedule (tt.chuvsu.ru)",
   "type": "module",
   "main": "dist/index.js",