chuvsu-js 4.0.1 → 4.1.0

package/dist/shared.d.ts

@@ -1,9 +1,9 @@
 export { Schedule } from "./tt/schedule.js";
-export { parseGroupsString } from "./tt/parse/index.js";
-export { getAdjacentSemester, getCompensatingWorkDays, getCurrentPeriod, getEffectiveHolidays, getHolidayTransfers, getLessonNumber, getSemesterStart, getSemesterWeeks, getTimeSlots, getWeekNumber, getWeekdayName, isHoliday, isSessionPeriod, RUSSIAN_HOLIDAYS, } from "./tt/utils/index.js";
+export { parseGroupsString, parseWebinars } from "./tt/parse/index.js";
+export { attachWebinarsToLessons, getAdjacentSemester, getCompensatingWorkDays, getCurrentPeriod, getEffectiveHolidays, getHolidayTransfers, getLessonNumber, getSemesterStart, getSemesterWeeks, getTimeSlots, getWeekNumber, getWeekdayName, isHoliday, isSessionPeriod, matchWebinarToLesson, RUSSIAN_HOLIDAYS, } from "./tt/utils/index.js";
 export type { Holiday, HolidayTransfer } from "./tt/utils/index.js";
 export { AuthError, EducationType, ParseError, Period, } from "./common/types.js";
 export type { Teacher, Time, WeekRange } from "./common/types.js";
 export type { BlobAdapter, BlobPutOptions, CacheAdapter, CacheEntry, } from "./common/cache.js";
-export type { Audience, AudienceInfo, CacheConfig, Faculty, FullScheduleDay, FullScheduleSlot, Group, Lesson, LessonTime, LessonTimeSlot, ScheduleEntry, SemesterWeek, SubstituteForInfo, Substitution, TeacherInfo, TransferInfo, TtClientOptions, } from "./tt/types.js";
+export type { Audience, AudienceInfo, CacheConfig, Faculty, FullScheduleDay, FullScheduleSlot, Group, Lesson, LessonTime, LessonTimeSlot, ScheduleEntry, SemesterWeek, SubstituteForInfo, Substitution, TeacherInfo, TransferInfo, TtClientOptions, Webinar, } from "./tt/types.js";
 export type { LkCacheConfig, LkClientOptions, PersonalData } from "./lk/types.js";

package/dist/shared.js

@@ -2,6 +2,6 @@
 // Both ./index.ts and ./browser.ts re-export everything from here and only
 // add their platform-specific extras on top.
 export { Schedule } from "./tt/schedule.js";
-export { parseGroupsString } from "./tt/parse/index.js";
-export { getAdjacentSemester, getCompensatingWorkDays, getCurrentPeriod, getEffectiveHolidays, getHolidayTransfers, getLessonNumber, getSemesterStart, getSemesterWeeks, getTimeSlots, getWeekNumber, getWeekdayName, isHoliday, isSessionPeriod, RUSSIAN_HOLIDAYS, } from "./tt/utils/index.js";
+export { parseGroupsString, parseWebinars } from "./tt/parse/index.js";
+export { attachWebinarsToLessons, getAdjacentSemester, getCompensatingWorkDays, getCurrentPeriod, getEffectiveHolidays, getHolidayTransfers, getLessonNumber, getSemesterStart, getSemesterWeeks, getTimeSlots, getWeekNumber, getWeekdayName, isHoliday, isSessionPeriod, matchWebinarToLesson, RUSSIAN_HOLIDAYS, } from "./tt/utils/index.js";
 export { AuthError, ParseError, } from "./common/types.js";

package/dist/tt/client.d.ts

@@ -1,7 +1,7 @@
 import type { CacheEntry } from "../common/cache.js";
 import { Period } from "../common/types.js";
 import { Schedule } from "./schedule.js";
-import type { Audience, AudienceInfo, Faculty, Group, TeacherInfo, TtClientOptions, CacheConfig } from "./types.js";
+import type { Audience, AudienceInfo, Faculty, Group, TeacherInfo, TtClientOptions, CacheConfig, Webinar } from "./types.js";
 export declare class TtClient {
     private http;
     private educationType;
@@ -36,6 +36,16 @@ export declare class TtClient {
         groupId: number;
         period: Period;
     }): Promise<Schedule>;
+    getWebinars(opts?: {
+        date?: Date;
+        facultyId?: number;
+    }): Promise<Webinar[]>;
+    getWebinarJoinUrl(opts: {
+        webinarId: string | number;
+        idType?: number;
+        email: string;
+        password: string;
+    }): Promise<string>;
     getFaculties(): Promise<Faculty[]>;
     getGroupsForFaculty(opts: {
         facultyId: number;

package/dist/tt/client.js

@@ -1,7 +1,7 @@
 import { HttpClient } from "../common/http.js";
 import { HybridCache } from "../common/cache.js";
 import { AuthError } from "../common/types.js";
-import { parseAudienceButtons, parseAudienceFullSchedule, parseAudienceInfo, parseAudienceName, parseGroupButtons, parseFacultyButtons, parseTeacherButtons, parseFullSchedule, parseTeacherFullSchedule, parseTeacherInfo, } from "./parse/index.js";
+import { parseAudienceButtons, parseAudienceFullSchedule, parseAudienceInfo, parseAudienceName, parseGroupButtons, parseFacultyButtons, parseTeacherButtons, parseFullSchedule, parseTeacherFullSchedule, parseTeacherInfo, parseWebinars, } from "./parse/index.js";
 import { Schedule } from "./schedule.js";
 const BASE = "https://tt.chuvsu.ru";
 const AUTH_URL = `${BASE}/auth`;
@@ -23,8 +23,20 @@ function makeUniformCacheConfig(ttl) {
         teacherPhotos: ttl,
         audienceInfo: ttl,
         audienceImages: ttl,
+        webinars: ttl,
     };
 }
+function formatDate(date) {
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, "0");
+    const day = String(date.getDate()).padStart(2, "0");
+    return `${year}-${month}-${day}`;
+}
+function getAcademicYearKey(date = new Date()) {
+    const year = date.getFullYear();
+    const start = date.getMonth() >= 8 ? year : year - 1;
+    return `${start}-${start + 1}`;
+}
 export class TtClient {
     http = new HttpClient();
     educationType;
@@ -113,7 +125,7 @@ export class TtClient {
     }
     // --- Schedule ---
     async fetchSchedule(groupId, period) {
-        const cacheKey = `${groupId}:${period}`;
+        const cacheKey = `${groupId}:${period}:${getAcademicYearKey()}`;
         const cached = await this.cache?.get("schedule", cacheKey);
         if (cached)
             return cached;
@@ -147,6 +159,43 @@ export class TtClient {
         schedules.set(opts.period, days);
         return new Schedule(opts.groupId, schedules, opts.period, this.educationType);
     }
+    async getWebinars(opts) {
+        const date = opts?.date ?? new Date();
+        const facultyId = opts?.facultyId ?? 0;
+        const cacheKey = `${formatDate(date)}:${facultyId}:${this.pertt}`;
+        const cached = await this.cache?.get("webinars", cacheKey);
+        if (cached)
+            return cached;
+        const { body } = await this.authPost(`${BASE}/webinar`, {
+            seldate: formatDate(date),
+            selfac: String(facultyId),
+            pertt: this.pertt,
+        });
+        const data = parseWebinars(body);
+        await this.cache?.set("webinars", cacheKey, data);
+        return data;
+    }
+    async getWebinarJoinUrl(opts) {
+        const { body } = await this.authPost(`${BASE}/webinar/getjoin`, {
+            idw: String(opts.webinarId),
+            idwt: String(opts.idType ?? 1),
+            name: opts.email,
+            pass: opts.password,
+            auto: "1",
+        });
+        let parsed;
+        try {
+            parsed = JSON.parse(body);
+        }
+        catch {
+            throw new AuthError("TT webinar join failed: invalid response");
+        }
+        const data = parsed;
+        if (data.mes !== "SUCCESS" || !data.url?.startsWith("http")) {
+            throw new AuthError(data.mes ?? "TT webinar join failed");
+        }
+        return data.url;
+    }
     // --- Search / Discovery ---
     async getFaculties() {
         const cached = await this.cache?.get("faculties", "all");

package/dist/tt/parse/audience.js

@@ -3,6 +3,7 @@ import { parseSemesterScheduleWith } from "./full-schedule.js";
 import { parseGroupsString } from "./groups.js";
 import { parseSubstituteForDiv, parseSubstitutionDiv, parseTransferDiv, } from "./overlays.js";
 import { LESSON_TYPE_GLOBAL_RE, LESSON_TYPE_RE, SUBGROUP_ANNOTATION_RE, SUBGROUP_RE, WEEKS_GLOBAL_RE, WEEKS_RE, } from "./patterns.js";
+const DISTANCE_RE = /дистанционно|ДОТ/i;
 export function parseAudienceInfo(html) {
     const doc = parseHtml(html);
     // Name: <span class="htext"><nobr>Аудитория <span style="color: blue;">NAME</span></nobr></span>
@@ -141,6 +142,7 @@ function parseAudienceSemesterEntry(el) {
         groups: parseGroupsString(groupsLine),
         subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
         weekParity,
+        isDistance: DISTANCE_RE.test(cleanText),
         substitutions: substitutions.length > 0 ? substitutions : undefined,
         possibleChanges,
     };

package/dist/tt/parse/full-schedule.js

@@ -2,6 +2,7 @@ import { parseHtml, parseTeacher, parseTime, parseWeekParity, parseWeeks, text,
 import { getLessonNumber } from "../utils/index.js";
 import { parseSubstitutionDiv, parseTransferDiv, } from "./overlays.js";
 import { FLEXIBLE_LESSON_TYPE_RE_I, LESSON_TYPE_RE, SUBGROUP_RE, WEEKS_RE, } from "./patterns.js";
+const DISTANCE_RE = /дистанционно|ДОТ/i;
 export function parseFullSchedule(html, educationType) {
     const doc = parseHtml(html);
     const edType = educationType ?? 1 /* EducationType.HigherEducation */;
@@ -110,6 +111,7 @@ function parseSemesterEntry(el) {
         groups: [],
         subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
         weekParity,
+        isDistance: DISTANCE_RE.test(cleanText) || DISTANCE_RE.test(roomMatch?.[1] ?? ""),
         substitutions: substitutions.length > 0 ? substitutions : undefined,
         possibleChanges,
     };
@@ -194,6 +196,7 @@ function parseSessionEntry(td) {
             teacher: parseTeacher(teacherPart),
             groups: [],
             subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
+            isDistance: DISTANCE_RE.test(plainText) || DISTANCE_RE.test(room),
             possibleChanges,
         },
         timeStart: parseTime(timeMatch[1]),

package/dist/tt/parse/index.d.ts

@@ -3,3 +3,4 @@ export { parseAudienceButtons, parseAudienceName, parseFacultyButtons, parseGrou
 export { parseFullSchedule } from "./full-schedule.js";
 export { parseAudienceFullSchedule, parseAudienceInfo, } from "./audience.js";
 export { parseTeacherFullSchedule, parseTeacherInfo, } from "./teacher.js";
+export { parseWebinars } from "./webinars.js";

package/dist/tt/parse/index.js

@@ -3,3 +3,4 @@ export { parseAudienceButtons, parseAudienceName, parseFacultyButtons, parseGrou
 export { parseFullSchedule } from "./full-schedule.js";
 export { parseAudienceFullSchedule, parseAudienceInfo, } from "./audience.js";
 export { parseTeacherFullSchedule, parseTeacherInfo, } from "./teacher.js";
+export { parseWebinars } from "./webinars.js";

package/dist/tt/parse/overlays.js

@@ -2,6 +2,7 @@ import { parseTeacher, text } from "../../common/parse.js";
 import { parseGroupsString } from "./groups.js";
 import { LESSON_TYPE_PATTERN, LESSON_TYPE_RE, LESSON_TYPE_RE_I, SUBGROUP_RE, } from "./patterns.js";
 const GROUP_CODE_RE = /[A-ZА-ЯЁ]{1,}(?:-[A-ZА-ЯЁa-zа-яё0-9]+)+/u;
+const DISTANCE_RE = /дистанционно|ДОТ/i;
 export function parseDate(dd, mm, yyyy) {
     return new Date(parseInt(yyyy), parseInt(mm) - 1, parseInt(dd));
 }
@@ -53,6 +54,7 @@ export function parseTransferDiv(div) {
             teacher: parseTeacher(teacherPart),
             groups: parseGroupsString(groupsPart),
             subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
+            isDistance: DISTANCE_RE.test(divText) || DISTANCE_RE.test(roomMatch?.[1] ?? ""),
             transfer,
         },
     };
@@ -72,7 +74,7 @@ export function parseSubstitutionDiv(div) {
     const teacherMatch = divHtml.match(/Преподаватель:\s*<span[^>]*>([^<]+)<\/span>/);
     if (teacherMatch)
         teacher = parseTeacher(teacherMatch[1].trim());
-    return { date, room, teacher };
+    return { date, room, teacher, isDistance: DISTANCE_RE.test(room ?? divText) };
 }
 export function parseSubstituteForDiv(div) {
     const divText = text(div);
@@ -111,6 +113,7 @@ export function parseSubstituteForDiv(div) {
             teacher: { name: "" },
             groups: parseGroupsString(groupsMatch?.[1]),
             subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
+            isDistance: DISTANCE_RE.test(divText) || DISTANCE_RE.test(roomMatch?.[1] ?? ""),
             substituteFor: { date, originalTeacher },
         },
     };

package/dist/tt/parse/teacher.js

@@ -4,6 +4,7 @@ import { parseSemesterScheduleWith } from "./full-schedule.js";
 import { parseGroupsString } from "./groups.js";
 import { parseSubstituteForDiv, parseSubstitutionDiv, parseTransferDiv, } from "./overlays.js";
 import { FLEXIBLE_LESSON_TYPE_PATTERN, FLEXIBLE_LESSON_TYPE_RE_I, LESSON_TYPE_RE, SUBGROUP_RE, WEEKS_RE, } from "./patterns.js";
+const DISTANCE_RE = /дистанционно|ДОТ/i;
 export function parseTeacherFullSchedule(html, educationType) {
     const doc = parseHtml(html);
     const edType = educationType ?? 1 /* EducationType.HigherEducation */;
@@ -68,6 +69,7 @@ function parseTeacherSemesterEntry(el) {
         groups: parseGroupsString(groupsMatch?.[1]),
         subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
         weekParity,
+        isDistance: DISTANCE_RE.test(cleanText) || DISTANCE_RE.test(roomMatch?.[1] ?? ""),
         substitutions: substitutions.length > 0 ? substitutions : undefined,
         possibleChanges,
     };
@@ -140,6 +142,7 @@ function parseTeacherSessionEntry(td) {
             teacher: { name: "" },
             groups: parseGroupsString(groupsMatch?.[1]),
             subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
+            isDistance: DISTANCE_RE.test(plainText) || DISTANCE_RE.test(room),
             possibleChanges,
         },
         timeStart: parseTime(timeMatch[1]),

package/dist/tt/parse/webinars.d.ts

@@ -0,0 +1,2 @@
+import type { Webinar } from "../types.js";
+export declare function parseWebinars(html: string): Webinar[];

package/dist/tt/parse/webinars.js

@@ -0,0 +1,98 @@
+import { parseHtml, parseTeacher, parseTime, text, } from "../../common/parse.js";
+import { parseGroupsString } from "./groups.js";
+import { FLEXIBLE_LESSON_TYPE_RE_I, SUBGROUP_RE } from "./patterns.js";
+const GROUP_CODE_RE = /[A-ZА-ЯЁ]{1,}(?:-[A-ZА-ЯЁa-zа-яё0-9]+)+(?:\s*ин)?/u;
+function parseDateValue(value) {
+    const match = value?.match(/^(\d{4})-(\d{2})-(\d{2})$/);
+    if (!match)
+        return undefined;
+    return new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
+}
+function parseTimeRange(raw) {
+    const match = raw.match(/(\d{2}:\d{2})\s*-\s*(\d{2}:\d{2})/);
+    if (!match)
+        return null;
+    return { start: parseTime(match[1]), end: parseTime(match[2]) };
+}
+function splitLesson(raw) {
+    const typeMatches = [...raw.matchAll(new RegExp(FLEXIBLE_LESSON_TYPE_RE_I, "gi"))];
+    const typeMatch = typeMatches.at(-1);
+    if (!typeMatch || typeMatch.index == null) {
+        return {
+            subject: raw,
+            type: "",
+            teacherRaw: "",
+            groupsRaw: "",
+        };
+    }
+    const subject = raw.slice(0, typeMatch.index).trim();
+    const type = typeMatch[1].replace(/\.$/, "").toLowerCase();
+    const rest = raw.slice(typeMatch.index + typeMatch[0].length).trim();
+    const groupMatch = rest.match(GROUP_CODE_RE);
+    const teacherRaw = groupMatch?.index == null ? rest : rest.slice(0, groupMatch.index).trim();
+    const groupsRaw = groupMatch?.index == null ? "" : rest.slice(groupMatch.index).trim();
+    const subgroupMatch = raw.match(SUBGROUP_RE);
+    return {
+        subject,
+        type,
+        teacherRaw,
+        groupsRaw,
+        subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
+    };
+}
+function parseWebinarRows(doc, tableSelector, scheduled, fallbackDate) {
+    const webinars = [];
+    for (const slotRow of doc.querySelectorAll(`${tableSelector} > tbody > tr`)) {
+        const slotCells = [...slotRow.children].filter((child) => child.tagName.toLowerCase() === "td");
+        const timeCell = slotCells[0];
+        const dataCell = slotCells[1];
+        if (!timeCell || !dataCell)
+            continue;
+        const timeText = text(timeCell);
+        const timeRange = parseTimeRange(timeText);
+        if (!timeRange)
+            continue;
+        const id = timeCell.querySelector("div")?.getAttribute("id") ?? "";
+        const idMatch = id.match(/trd(\d{4}-\d{2}-\d{2})t(\d+)/);
+        const date = parseDateValue(idMatch?.[1]) ?? fallbackDate;
+        const slotNumber = idMatch ? parseInt(idMatch[2]) : undefined;
+        for (const row of dataCell.querySelectorAll("table tr")) {
+            const cells = [...row.children].filter((child) => child.tagName.toLowerCase() === "td");
+            const lessonCell = cells[0];
+            const titleCell = cells[1];
+            if (!lessonCell || !titleCell)
+                continue;
+            const button = row.querySelector("button[onclick*=\"jointo\"]");
+            const onclick = button?.getAttribute("onclick") ?? "";
+            const joinMatch = onclick.match(/jointo(?:sub)?\('([^']+)',\s*(\d+)\)/);
+            const raw = text(lessonCell);
+            const parsed = splitLesson(raw);
+            webinars.push({
+                id: joinMatch?.[1] ?? "",
+                idType: joinMatch ? parseInt(joinMatch[2]) : 1,
+                scheduled,
+                date,
+                slotNumber,
+                timeStart: timeRange.start,
+                timeEnd: timeRange.end,
+                subject: parsed.subject,
+                type: parsed.type,
+                teacher: parseTeacher(parsed.teacherRaw),
+                groups: parseGroupsString(parsed.groupsRaw),
+                subgroup: parsed.subgroup,
+                title: text(titleCell),
+                raw,
+            });
+        }
+    }
+    return webinars;
+}
+export function parseWebinars(html) {
+    const doc = parseHtml(html);
+    const selectedDate = doc.querySelector('select[name="seldate"] option[selected]')?.getAttribute("value");
+    const fallbackDate = parseDateValue(selectedDate);
+    return [
+        ...parseWebinarRows(doc, "#webstt", true, fallbackDate),
+        ...parseWebinarRows(doc, "#websttext", false, fallbackDate),
+    ];
+}

package/dist/tt/schedule.d.ts

@@ -23,6 +23,7 @@ export declare class Schedule {
     getDays(period: Period): FullScheduleDay[];
     private getSlotsForWeekday;
     private getDateForWeekday;
+    private isInCurrentAcademicYear;
     forDay(weekday: number, opts?: {
         subgroup?: number;
         week?: number;

package/dist/tt/schedule.js

@@ -60,6 +60,15 @@ export class Schedule {
         date.setHours(0, 0, 0, 0);
         return date;
     }
+    isInCurrentAcademicYear(date) {
+        const now = new Date();
+        const startYear = now.getMonth() >= 8
+            ? now.getFullYear()
+            : now.getFullYear() - 1;
+        const start = new Date(startYear, 8, 1);
+        const end = new Date(startYear + 1, 7, 31, 23, 59, 59, 999);
+        return date >= start && date <= end;
+    }
     // --- Public query methods ---
     forDay(weekday, opts) {
         const period = this.period;
@@ -70,7 +79,10 @@ export class Schedule {
             const dayName = getWeekdayName(weekday);
             for (const d of days) {
                 if (d.weekday.toLowerCase() === dayName.toLowerCase() && d.date) {
-                    lessons.push(...slotsToLessons(d.slots, d.date, { isTeacherSchedule: this.isTeacherSchedule }));
+                    const slots = filterSlots(d.slots, { subgroup: opts?.subgroup });
+                    lessons.push(...slotsToLessons(slots, d.date, {
+                        isTeacherSchedule: this.isTeacherSchedule,
+                    }));
                 }
             }
             return lessons.sort(sortLessons);
@@ -80,6 +92,8 @@ export class Schedule {
         return slotsToLessons(slots, date, { isTeacherSchedule: this.isTeacherSchedule });
     }
     forDate(date, opts) {
+        if (!this.isInCurrentAcademicYear(date))
+            return [];
         if (isHoliday(date, this.holidays, this.holidayTransfers))
             return [];
         const period = getCurrentPeriod({ date });
@@ -88,7 +102,10 @@ export class Schedule {
         for (const [, d] of this.scheduleMap) {
             for (const day of d) {
                 if (day.date && isSameDay(day.date, date)) {
-                    lessons.push(...slotsToLessons(day.slots, date, { isTeacherSchedule: this.isTeacherSchedule }));
+                    const slots = filterSlots(day.slots, { subgroup: opts?.subgroup });
+                    lessons.push(...slotsToLessons(slots, date, {
+                        isTeacherSchedule: this.isTeacherSchedule,
+                    }));
                 }
             }
         }

package/dist/tt/types.d.ts

@@ -42,6 +42,8 @@ export interface Substitution {
     date: Date;
     /** New room, if changed. */
     room?: string;
+    /** Whether the substitution moves the lesson online. */
+    isDistance?: boolean;
     /** New teacher, if changed. */
     teacher?: Teacher;
 }
@@ -78,6 +80,8 @@ export interface ScheduleEntry {
     groups: string[];
     subgroup?: number;
     weekParity?: "even" | "odd";
+    /** True when the lesson is explicitly marked as дистанционно / ДОТ. */
+    isDistance?: boolean;
     /** Date-specific substitutions (замена на). */
     substitutions?: Substitution[];
     /** If this entry is a transferred lesson (перенос). */
@@ -121,6 +125,10 @@ export interface Lesson {
     weeks: WeekRange;
     subgroup?: number;
     weekParity?: "even" | "odd";
+    /** True when the lesson is explicitly marked as дистанционно / ДОТ. */
+    isDistance?: boolean;
+    /** Matched webinar metadata, if attached by `attachWebinarsToLessons`. */
+    webinar?: Webinar;
     /** If a substitution was applied, the original room. */
     originalRoom?: string;
     /** If a substitution was applied, the original teacher. */
@@ -145,6 +153,27 @@ export interface SemesterWeek {
     start: Date;
     end: Date;
 }
+export interface Webinar {
+    /** Internal tt.chuvsu.ru webinar id used by `/webinar/getjoin`. */
+    id: string;
+    /** Webinar table type argument (`idwt`) used by `/webinar/getjoin`. */
+    idType: number;
+    /** True for "Вебинары по расписанию"; false for external webinars. */
+    scheduled: boolean;
+    date?: Date;
+    slotNumber?: number;
+    timeStart: Time;
+    timeEnd: Time;
+    subject: string;
+    type: string;
+    teacher: Teacher;
+    groups: string[];
+    subgroup?: number;
+    /** Free-form title/topic from the second table column. */
+    title: string;
+    /** Raw first-column text as rendered by tt.chuvsu.ru. */
+    raw: string;
+}
 export interface CacheConfig {
     schedule?: number;
     faculties?: number;
@@ -156,6 +185,7 @@ export interface CacheConfig {
     teacherPhotos?: number;
     audienceInfo?: number;
     audienceImages?: number;
+    webinars?: number;
 }
 export interface TtClientOptions {
     educationType?: EducationType;

package/dist/tt/utils/holidays.js

@@ -92,18 +92,18 @@ export function getEffectiveHolidays(year, holidays = RUSSIAN_HOLIDAYS, transfer
     const nonJanuaryOnWeekend = holidays
         .filter((h) => !isJanuaryHoliday(h))
         .map((h) => new Date(year, h.month - 1, h.day))
-        .filter((d) => d.getDay() === 0 || d.getDay() === 6)
+        .filter((d) => d.getDay() === 0 || (!sixDayWeek && d.getDay() === 6))
         .sort((a, b) => a.getTime() - b.getTime());
     for (const holiday of nonJanuaryOnWeekend) {
         let candidate = new Date(holiday);
-        if (candidate.getDay() === 6) {
+        if (!sixDayWeek && candidate.getDay() === 6) {
             candidate.setDate(candidate.getDate() + 2);
         }
         else {
             candidate.setDate(candidate.getDate() + 1);
         }
         while (candidate.getDay() === 0 ||
-            candidate.getDay() === 6 ||
+            (!sixDayWeek && candidate.getDay() === 6) ||
             isOriginalHoliday(candidate) ||
             effectiveDays.some((ed) => isSameDay(ed, candidate))) {
             candidate.setDate(candidate.getDate() + 1);
@@ -141,19 +141,19 @@ export function getHolidayTransfers(year, holidays = RUSSIAN_HOLIDAYS, transfers
     const nonJanuaryOnWeekend = holidays
         .filter((h) => !isJanuaryHoliday(h))
         .map((h) => new Date(year, h.month - 1, h.day))
-        .filter((d) => d.getDay() === 0 || d.getDay() === 6)
+        .filter((d) => d.getDay() === 0 || (!sixDayWeek && d.getDay() === 6))
         .sort((a, b) => a.getTime() - b.getTime());
     const isOriginalHoliday = (d) => originalDates.some((od) => isSameDay(od, d));
     for (const holiday of nonJanuaryOnWeekend) {
         let candidate = new Date(holiday);
-        if (candidate.getDay() === 6) {
+        if (!sixDayWeek && candidate.getDay() === 6) {
             candidate.setDate(candidate.getDate() + 2);
         }
         else {
             candidate.setDate(candidate.getDate() + 1);
         }
         while (candidate.getDay() === 0 ||
-            candidate.getDay() === 6 ||
+            (!sixDayWeek && candidate.getDay() === 6) ||
             isOriginalHoliday(candidate) ||
             effectiveDays.some((ed) => isSameDay(ed, candidate))) {
             candidate.setDate(candidate.getDate() + 1);

package/dist/tt/utils/index.d.ts

@@ -2,6 +2,6 @@ export { getMonday, getWeekdayName, isSameDay } from "./date.js";
 export { getAdjacentSemester, getCurrentPeriod, isSessionPeriod, } from "./period.js";
 export { getSemesterStart, getSemesterWeeks, getWeekNumber, } from "./semester.js";
 export { getLessonNumber, getTimeSlots } from "./time-slots.js";
-export { collectTransfers, filterSlots, slotsToLessons, sortLessons, suppressTransferredLessons, } from "./lessons.js";
+export { attachWebinarsToLessons, collectTransfers, filterSlots, matchWebinarToLesson, slotsToLessons, sortLessons, suppressTransferredLessons, } from "./lessons.js";
 export { getCompensatingWorkDays, getEffectiveHolidays, getHolidayTransfers, isHoliday, RUSSIAN_HOLIDAYS, } from "./holidays.js";
 export type { Holiday, HolidayTransfer } from "./holidays.js";

package/dist/tt/utils/index.js

@@ -2,5 +2,5 @@ export { getMonday, getWeekdayName, isSameDay } from "./date.js";
 export { getAdjacentSemester, getCurrentPeriod, isSessionPeriod, } from "./period.js";
 export { getSemesterStart, getSemesterWeeks, getWeekNumber, } from "./semester.js";
 export { getLessonNumber, getTimeSlots } from "./time-slots.js";
-export { collectTransfers, filterSlots, slotsToLessons, sortLessons, suppressTransferredLessons, } from "./lessons.js";
+export { attachWebinarsToLessons, collectTransfers, filterSlots, matchWebinarToLesson, slotsToLessons, sortLessons, suppressTransferredLessons, } from "./lessons.js";
 export { getCompensatingWorkDays, getEffectiveHolidays, getHolidayTransfers, isHoliday, RUSSIAN_HOLIDAYS, } from "./holidays.js";

package/dist/tt/utils/lessons.d.ts

@@ -1,4 +1,4 @@
-import type { FullScheduleDay, FullScheduleSlot, Lesson, ScheduleEntry } from "../types.js";
+import type { FullScheduleDay, FullScheduleSlot, Lesson, ScheduleEntry, Webinar } from "../types.js";
 export declare function sortLessons(a: Lesson, b: Lesson): number;
 export declare function filterSlots(slots: FullScheduleSlot[], opts?: {
     subgroup?: number;
@@ -8,6 +8,8 @@ export declare function filterSlots(slots: FullScheduleSlot[], opts?: {
 export declare function slotsToLessons(slots: FullScheduleSlot[], date: Date, opts?: {
     isTeacherSchedule?: boolean;
 }): Lesson[];
+export declare function matchWebinarToLesson(lesson: Lesson, webinars: Webinar[]): Webinar | undefined;
+export declare function attachWebinarsToLessons(lessons: Lesson[], webinars: Webinar[]): Lesson[];
 /** All transfer entries from the given schedule days. */
 export declare function collectTransfers(days: FullScheduleDay[]): ScheduleEntry[];
 /** Remove lessons whose source date/slot match a transfer. */

package/dist/tt/utils/lessons.js

@@ -51,12 +51,16 @@ function makeLessonTime(date, time) {
     d.setHours(time.hours, time.minutes, 0, 0);
     return { date: d, hours: time.hours, minutes: time.minutes };
 }
+function isDistanceRoom(room) {
+    return /дистанционно|ДОТ/i.test(room ?? "");
+}
 export function slotsToLessons(slots, date, opts) {
     const lessons = [];
     for (const slot of slots) {
         for (const entry of slot.entries) {
             let room = entry.room;
             let teacher = entry.teacher;
+            let isDistance = entry.isDistance || isDistanceRoom(room);
             let originalRoom;
             let originalTeacher;
             // Apply date-specific substitutions
@@ -66,6 +70,7 @@ export function slotsToLessons(slots, date, opts) {
                     if (sub.room) {
                         originalRoom = room;
                         room = sub.room;
+                        isDistance = sub.isDistance || isDistanceRoom(room);
                     }
                     if (sub.teacher) {
                         // On teacher schedules, a teacher substitution means another teacher
@@ -89,6 +94,7 @@ export function slotsToLessons(slots, date, opts) {
                 weeks: entry.weeks,
                 subgroup: entry.subgroup,
                 weekParity: entry.weekParity,
+                isDistance,
                 originalRoom,
                 originalTeacher,
                 transfer: entry.transfer,
@@ -99,6 +105,50 @@ export function slotsToLessons(slots, date, opts) {
     }
     return lessons;
 }
+function normalizeText(value) {
+    return value
+        .toLowerCase()
+        .replace(/ё/g, "е")
+        .replace(/\s+/g, " ")
+        .trim();
+}
+function sameTime(lesson, webinar) {
+    return (lesson.start.hours === webinar.timeStart.hours &&
+        lesson.start.minutes === webinar.timeStart.minutes &&
+        lesson.end.hours === webinar.timeEnd.hours &&
+        lesson.end.minutes === webinar.timeEnd.minutes);
+}
+export function matchWebinarToLesson(lesson, webinars) {
+    return webinars.find((webinar) => {
+        if (!webinar.scheduled)
+            return false;
+        if (webinar.date && !isSameDay(webinar.date, lesson.start.date))
+            return false;
+        if (webinar.slotNumber != null && webinar.slotNumber !== lesson.number) {
+            return false;
+        }
+        if (!sameTime(lesson, webinar))
+            return false;
+        if (normalizeText(webinar.subject) !== normalizeText(lesson.subject)) {
+            return false;
+        }
+        if (webinar.type && lesson.type && webinar.type !== lesson.type) {
+            return false;
+        }
+        if (webinar.subgroup != null &&
+            lesson.subgroup != null &&
+            webinar.subgroup !== lesson.subgroup) {
+            return false;
+        }
+        return true;
+    });
+}
+export function attachWebinarsToLessons(lessons, webinars) {
+    return lessons.map((lesson) => {
+        const webinar = matchWebinarToLesson(lesson, webinars);
+        return webinar ? { ...lesson, webinar } : lesson;
+    });
+}
 /** All transfer entries from the given schedule days. */
 export function collectTransfers(days) {
     const transfers = [];

package/package.json

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