chuvsu-js 1.0.0 → 2.0.0

package/dist/browser.d.ts

@@ -0,0 +1,5 @@
+export { Schedule } from "./tt/schedule.js";
+export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, } 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";

package/dist/browser.js

@@ -0,0 +1,2 @@
+export { Schedule } from "./tt/schedule.js";
+export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, } from "./tt/utils.js";

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export { LkClient } from "./lk/client.js";
 export { TtClient } from "./tt/client.js";
 export { Schedule } from "./tt/schedule.js";
 export type { CacheEntry } from "./common/cache.js";
-export { getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, } from "./tt/utils.js";
+export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, } 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";

package/dist/index.js

@@ -1,5 +1,5 @@
 export { LkClient } from "./lk/client.js";
 export { TtClient } from "./tt/client.js";
 export { Schedule } from "./tt/schedule.js";
-export { getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, } from "./tt/utils.js";
+export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, } from "./tt/utils.js";
 export { AuthError, ParseError } from "./common/types.js";

package/dist/tt/client.d.ts

@@ -21,13 +21,19 @@ export declare class TtClient {
     private relogin;
     private authGet;
     private authPost;
-    getSchedule(opts: {
+    private fetchSchedule;
+    /**
+     * Get schedule for all periods. The returned Schedule automatically
+     * routes queries to the correct period based on the date.
+     */
+    getSchedule(groupId: number): Promise<Schedule>;
+    /**
+     * Get schedule for a specific period only.
+     */
+    getScheduleForPeriod(opts: {
         groupId: number;
-        period?: Period;
+        period: Period;
     }): Promise<Schedule>;
-    getCurrentPeriod(opts?: {
-        date?: Date;
-    }): Period;
     getFaculties(): Promise<Faculty[]>;
     getGroupsForFaculty(opts: {
         facultyId: number;

package/dist/tt/client.js

@@ -5,6 +5,12 @@ import { parseGroupButtons, parseFacultyButtons, parseTeacherButtons, parseFullS
 import { Schedule } from "./schedule.js";
 const BASE = "https://tt.chuvsu.ru";
 const AUTH_URL = `${BASE}/auth`;
+const ALL_PERIODS = [
+    1 /* Period.FallSemester */,
+    2 /* Period.WinterSession */,
+    3 /* Period.SpringSemester */,
+    4 /* Period.SummerSession */,
+];
 export class TtClient {
     http = new HttpClient();
     educationType;
@@ -91,44 +97,40 @@ export class TtClient {
         return res;
     }
     // --- Schedule ---
-    async getSchedule(opts) {
-        const period = opts.period ?? this.getCurrentPeriod();
-        const cacheKey = `${opts.groupId}:${period}`;
+    async fetchSchedule(groupId, period) {
+        const cacheKey = `${groupId}:${period}`;
         const cached = this.cache?.get("schedule", cacheKey);
-        let days;
-        if (cached) {
-            days = cached;
-        }
-        else {
-            const url = `${BASE}/index/grouptt/gr/${opts.groupId}`;
-            let body;
-            if (opts.period !== undefined) {
-                ({ body } = await this.authPost(url, { htype: String(opts.period) }));
-            }
-            else {
-                ({ body } = await this.authGet(url));
-            }
-            days = parseFullSchedule(body);
-            this.cache?.set("schedule", cacheKey, days);
+        if (cached)
+            return cached;
+        const url = `${BASE}/index/grouptt/gr/${groupId}`;
+        const { body } = await this.authPost(url, { htype: String(period) });
+        const days = parseFullSchedule(body);
+        this.cache?.set("schedule", cacheKey, days);
+        return days;
+    }
+    /**
+     * Get schedule for all periods. The returned Schedule automatically
+     * routes queries to the correct period based on the date.
+     */
+    async getSchedule(groupId) {
+        const schedules = new Map();
+        const results = await Promise.all(ALL_PERIODS.map(async (period) => {
+            const days = await this.fetchSchedule(groupId, period);
+            return { period, days };
+        }));
+        for (const { period, days } of results) {
+            schedules.set(period, days);
         }
-        return new Schedule(opts.groupId, period, days);
-    }
-    // --- Period ---
-    getCurrentPeriod(opts) {
-        const date = opts?.date ?? new Date();
-        const month = date.getMonth();
-        const day = date.getDate();
-        // Dec 25+ and Jan → Winter session (зимняя сессия)
-        if (month === 0 || (month === 11 && day >= 25))
-            return 2 /* Period.WinterSession */;
-        // Feb–May → Spring semester (весенний семестр)
-        if (month >= 1 && month <= 4)
-            return 3 /* Period.SpringSemester */;
-        // Jun–Aug → Summer session (летняя сессия)
-        if (month >= 5 && month <= 7)
-            return 4 /* Period.SummerSession */;
-        // Sep – Dec 24 → Fall semester (осенний семестр)
-        return 1 /* Period.FallSemester */;
+        return new Schedule(groupId, schedules);
+    }
+    /**
+     * Get schedule for a specific period only.
+     */
+    async getScheduleForPeriod(opts) {
+        const days = await this.fetchSchedule(opts.groupId, opts.period);
+        const schedules = new Map();
+        schedules.set(opts.period, days);
+        return new Schedule(opts.groupId, schedules, opts.period);
     }
     // --- Search / Discovery ---
     async getFaculties() {

package/dist/tt/parse.js

@@ -56,6 +56,14 @@ export function parseTeacherButtons(html) {
 }
 export function parseFullSchedule(html) {
     const doc = parseHtml(html);
+    // Session layout has date-based cells with ids like "trd20251224"
+    if (doc.querySelector('td[id^="trd2"]')) {
+        return parseSessionSchedule(doc);
+    }
+    return parseSemesterSchedule(doc);
+}
+// --- Semester schedule parsing (weekday-based, repeating weekly) ---
+function parseSemesterSchedule(doc) {
     const days = [];
     const rows = doc.querySelectorAll("tr");
     let currentDay = null;
@@ -86,7 +94,7 @@ export function parseFullSchedule(html) {
             continue;
         const entries = [];
         for (const entryRow of dataCell.querySelectorAll("table tr")) {
-            const entry = parseScheduleEntry(entryRow);
+            const entry = parseSemesterEntry(entryRow);
             if (entry)
                 entries.push(entry);
         }
@@ -99,7 +107,7 @@ export function parseFullSchedule(html) {
     }
     return days;
 }
-function parseScheduleEntry(el) {
+function parseSemesterEntry(el) {
     const td = el.querySelector("td") ?? el;
     const fullHtml = td.innerHTML ?? "";
     const plainText = text(td);
@@ -125,3 +133,80 @@ function parseScheduleEntry(el) {
         weekParity,
     };
 }
+// --- Session schedule parsing (date-based, specific dates) ---
+function parseSessionSchedule(doc) {
+    const days = [];
+    for (const dateCell of doc.querySelectorAll('td[id^="trd2"]')) {
+        // Parse date from cell id: trd20251224 -> 2025-12-24
+        const id = dateCell.getAttribute("id") ?? "";
+        const dateMatch = id.match(/trd(\d{4})(\d{2})(\d{2})/);
+        if (!dateMatch)
+            continue;
+        const year = parseInt(dateMatch[1]);
+        const month = parseInt(dateMatch[2]) - 1;
+        const dayNum = parseInt(dateMatch[3]);
+        const date = new Date(year, month, dayNum);
+        // Extract weekday from after <br>
+        const cellHtml = dateCell.innerHTML ?? "";
+        const brMatch = cellHtml.match(/<br\s*\/?>\s*(.+)/i);
+        const weekday = brMatch ? brMatch[1].trim() : "";
+        // Data cell is the next td.trdata sibling in the same row
+        const row = dateCell.parentElement;
+        if (!row)
+            continue;
+        const dataCell = row.querySelector("td.trdata:not(.trfd)");
+        if (!dataCell)
+            continue;
+        // Parse entries
+        const slots = [];
+        let slotNumber = 1;
+        for (const entryRow of dataCell.querySelectorAll("table tr")) {
+            const td = entryRow.querySelector("td") ?? entryRow;
+            const entry = parseSessionEntry(td);
+            if (!entry)
+                continue;
+            slots.push({
+                number: slotNumber++,
+                timeStart: entry.timeStart,
+                timeEnd: entry.timeEnd,
+                entries: [entry.entry],
+            });
+        }
+        if (slots.length > 0) {
+            days.push({ weekday, date, slots });
+        }
+    }
+    return days;
+}
+function parseSessionEntry(td) {
+    const fullHtml = td.innerHTML ?? "";
+    const plainText = text(td);
+    if (!plainText)
+        return null;
+    // Subject from blue span
+    const subjectEl = td.querySelector('span[style*="color: blue"]');
+    const subject = subjectEl ? text(subjectEl) : "";
+    if (!subject)
+        return null;
+    // Room: text before the first <span
+    const roomMatch = fullHtml.match(/^([^<]*?)\s*<span/);
+    const room = roomMatch ? roomMatch[1].trim() : "";
+    // Type: parenthesized text after </span>, case-insensitive
+    const typeMatch = plainText.match(/\((лк|пр|лб|зач|экз|зчО|кр|конс\.?|Экз)\)/i);
+    const type = typeMatch ? typeMatch[1].replace(/\.$/, "").toLowerCase() : "";
+    // Time: after <br>, format HH:MM - HH:MM
+    const timeMatch = fullHtml.match(/<br\s*\/?>\s*(\d{2}:\d{2})\s*-\s*(\d{2}:\d{2})/);
+    if (!timeMatch)
+        return null;
+    return {
+        entry: {
+            room,
+            subject,
+            type,
+            weeks: { from: 0, to: 0 },
+            teacher: { name: "" },
+        },
+        timeStart: parseTime(timeMatch[1]),
+        timeEnd: parseTime(timeMatch[2]),
+    };
+}

package/dist/tt/schedule.d.ts

@@ -2,11 +2,21 @@ import type { FullScheduleDay, SemesterWeek, Lesson } from "./types.js";
 import { Period } from "../common/types.js";
 export declare class Schedule {
     readonly groupId: number;
-    readonly period: Period;
-    readonly days: FullScheduleDay[];
-    constructor(groupId: number, period: Period, days: FullScheduleDay[]);
+    private scheduleMap;
+    private _period?;
+    constructor(groupId: number, schedules: Map<number, FullScheduleDay[]>, period?: Period);
+    /** Current (or fixed) period for this schedule. */
+    get period(): Period;
+    /** Days for the current period. */
+    get days(): FullScheduleDay[];
+    /** All periods that have data in this schedule. */
+    get periods(): Period[];
+    /** Get days for a specific period. */
+    getDays(period: Period): FullScheduleDay[];
     private getSlotsForWeekday;
     private getDateForWeekday;
+    private static isSameDay;
+    private getSessionLessonsForDate;
     forDay(weekday: number, opts?: {
         subgroup?: number;
         week?: number;

package/dist/tt/schedule.js

@@ -1,23 +1,40 @@
-import { getWeekdayName, getMonday, getSemesterStart, getSemesterWeeks, getWeekNumber, filterSlots, slotsToLessons, } from "./utils.js";
+import { getCurrentPeriod, isSessionPeriod, getWeekdayName, getMonday, getSemesterStart, getSemesterWeeks, getWeekNumber, filterSlots, slotsToLessons, } from "./utils.js";
 export class Schedule {
     groupId;
-    period;
-    days;
-    constructor(groupId, period, days) {
+    scheduleMap;
+    _period;
+    constructor(groupId, schedules, period) {
         this.groupId = groupId;
-        this.period = period;
-        this.days = days;
+        this.scheduleMap = schedules;
+        this._period = period;
     }
-    getSlotsForWeekday(weekday, opts) {
+    /** Current (or fixed) period for this schedule. */
+    get period() {
+        return this._period ?? getCurrentPeriod();
+    }
+    /** Days for the current period. */
+    get days() {
+        return this.scheduleMap.get(this.period) ?? [];
+    }
+    /** All periods that have data in this schedule. */
+    get periods() {
+        return [...this.scheduleMap.keys()];
+    }
+    /** Get days for a specific period. */
+    getDays(period) {
+        return this.scheduleMap.get(period) ?? [];
+    }
+    // --- Semester helpers (weekday-based) ---
+    getSlotsForWeekday(weekday, days, opts) {
         const dayName = getWeekdayName(weekday);
-        const day = this.days.find((d) => d.weekday.toLowerCase() === dayName.toLowerCase());
+        const day = days.find((d) => d.weekday.toLowerCase() === dayName.toLowerCase());
         if (!day)
             return [];
         return filterSlots(day.slots, opts);
     }
-    getDateForWeekday(weekday, week) {
+    getDateForWeekday(weekday, period, week) {
         if (week != null) {
-            const startMonday = getMonday(getSemesterStart({ period: this.period }));
+            const startMonday = getMonday(getSemesterStart({ period }));
             const date = new Date(startMonday);
             date.setDate(startMonday.getDate() +
                 (week - 1) * 7 +
@@ -32,24 +49,85 @@ export class Schedule {
         date.setHours(0, 0, 0, 0);
         return date;
     }
+    // --- Session helpers (date-based) ---
+    static isSameDay(a, b) {
+        return (a.getFullYear() === b.getFullYear() &&
+            a.getMonth() === b.getMonth() &&
+            a.getDate() === b.getDate());
+    }
+    getSessionLessonsForDate(days, date) {
+        const day = days.find((d) => d.date && Schedule.isSameDay(d.date, date));
+        if (!day)
+            return [];
+        return slotsToLessons(day.slots, date);
+    }
+    // --- Public query methods ---
     forDay(weekday, opts) {
-        const slots = this.getSlotsForWeekday(weekday, opts);
-        const date = this.getDateForWeekday(weekday, opts?.week);
+        const period = this.period;
+        const days = this.getDays(period);
+        if (isSessionPeriod(period)) {
+            // For sessions, return all entries on days matching this weekday
+            const lessons = [];
+            const dayName = getWeekdayName(weekday);
+            for (const d of days) {
+                if (d.weekday.toLowerCase() === dayName.toLowerCase() && d.date) {
+                    lessons.push(...slotsToLessons(d.slots, d.date));
+                }
+            }
+            return lessons;
+        }
+        const slots = this.getSlotsForWeekday(weekday, days, opts);
+        const date = this.getDateForWeekday(weekday, period, opts?.week);
         return slotsToLessons(slots, date);
     }
     forDate(date, opts) {
+        const period = getCurrentPeriod({ date });
+        const days = this.getDays(period);
+        if (isSessionPeriod(period)) {
+            const lessons = this.getSessionLessonsForDate(days, date);
+            if (lessons.length > 0)
+                return lessons;
+        }
+        // Try session periods for exact date match (sessions can have entries
+        // on dates that fall outside their "official" period boundaries)
+        for (const [p, d] of this.scheduleMap) {
+            if (p === period)
+                continue;
+            const match = d.find((day) => day.date && Schedule.isSameDay(day.date, date));
+            if (match)
+                return slotsToLessons(match.slots, date);
+        }
+        if (isSessionPeriod(period))
+            return [];
         const weekday = date.getDay();
-        const week = getWeekNumber({ period: this.period, date });
-        const slots = this.getSlotsForWeekday(weekday, {
+        const week = getWeekNumber({ period, date });
+        const slots = this.getSlotsForWeekday(weekday, days, {
             subgroup: opts?.subgroup,
             week,
         });
         return slotsToLessons(slots, date);
     }
     forWeek(week, opts) {
-        const effectiveWeek = week ?? getWeekNumber({ period: this.period });
+        const period = this.period;
+        const days = this.getDays(period);
+        if (isSessionPeriod(period)) {
+            // For sessions, return all entries within this calendar week
+            const now = new Date();
+            const monday = getMonday(now);
+            const sunday = new Date(monday);
+            sunday.setDate(monday.getDate() + 6);
+            sunday.setHours(23, 59, 59, 999);
+            const lessons = [];
+            for (const d of days) {
+                if (d.date && d.date >= monday && d.date <= sunday) {
+                    lessons.push(...slotsToLessons(d.slots, d.date));
+                }
+            }
+            return lessons;
+        }
+        const effectiveWeek = week ?? getWeekNumber({ period });
         const semesterWeeks = getSemesterWeeks({
-            period: this.period,
+            period,
             weekCount: effectiveWeek,
         });
         const weekData = semesterWeeks.find((w) => w.week === effectiveWeek);
@@ -60,7 +138,7 @@ export class Schedule {
             date.setDate(mondayDate.getDate() + i);
             date.setHours(0, 0, 0, 0);
             const weekday = i === 6 ? 0 : i + 1;
-            const slots = this.getSlotsForWeekday(weekday, {
+            const slots = this.getSlotsForWeekday(weekday, days, {
                 subgroup: opts?.subgroup,
                 week: effectiveWeek,
             });

package/dist/tt/types.d.ts

@@ -26,6 +26,7 @@ export interface FullScheduleSlot {
 }
 export interface FullScheduleDay {
     weekday: string;
+    date?: Date;
     slots: FullScheduleSlot[];
 }
 export interface LessonTimeSlot {

package/dist/tt/utils.d.ts

@@ -1,5 +1,9 @@
 import type { FullScheduleSlot, SemesterWeek, Lesson } from "./types.js";
 import { Period } from "../common/types.js";
+export declare function getCurrentPeriod(opts?: {
+    date?: Date;
+}): Period;
+export declare function isSessionPeriod(period: Period): boolean;
 export declare function getWeekdayName(weekday: number): string;
 export declare function getMonday(date: Date): Date;
 /**

package/dist/tt/utils.js

@@ -1,3 +1,22 @@
+export function getCurrentPeriod(opts) {
+    const date = opts?.date ?? new Date();
+    const month = date.getMonth();
+    const day = date.getDate();
+    // Dec 25+ and Jan → Winter session (зимняя сессия)
+    if (month === 0 || (month === 11 && day >= 25))
+        return 2 /* Period.WinterSession */;
+    // Feb–May → Spring semester (весенний семестр)
+    if (month >= 1 && month <= 4)
+        return 3 /* Period.SpringSemester */;
+    // Jun–Aug → Summer session (летняя сессия)
+    if (month >= 5 && month <= 7)
+        return 4 /* Period.SummerSession */;
+    // Sep – Dec 24 → Fall semester (осенний семестр)
+    return 1 /* Period.FallSemester */;
+}
+export function isSessionPeriod(period) {
+    return period === 2 /* Period.WinterSession */ || period === 4 /* Period.SummerSession */;
+}
 const WEEKDAY_NAMES = [
     "Воскресенье",
     "Понедельник",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chuvsu-js",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Node.js library for ChuvSU student portal (lk.chuvsu.ru) and schedule (tt.chuvsu.ru)",
   "type": "module",
   "main": "dist/index.js",
@@ -9,6 +9,10 @@
     ".": {
       "import": "./dist/index.js",
       "types": "./dist/index.d.ts"
+    },
+    "./browser": {
+      "import": "./dist/browser.js",
+      "types": "./dist/browser.d.ts"
     }
   },
   "files": [