chuvsu-js 2.4.2 → 2.5.0

package/dist/browser.d.ts

@@ -2,4 +2,4 @@ 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, Substitution, TransferInfo, TtClientOptions, CacheConfig, } from "./tt/types.js";
+export type { Faculty, Group, ScheduleEntry, FullScheduleSlot, FullScheduleDay, LessonTimeSlot, Lesson, LessonTime, SemesterWeek, Substitution, TransferInfo, TeacherInfo, TtClientOptions, CacheConfig, } from "./tt/types.js";

package/dist/index.d.ts

@@ -7,4 +7,4 @@ export type { Holiday, HolidayTransfer } 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, Substitution, TransferInfo, TtClientOptions, CacheConfig, } from "./tt/types.js";
+export type { Faculty, Group, ScheduleEntry, FullScheduleSlot, FullScheduleDay, LessonTimeSlot, Lesson, LessonTime, SemesterWeek, Substitution, TransferInfo, TeacherInfo, TtClientOptions, CacheConfig, } from "./tt/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 { Faculty, Group, TtClientOptions, CacheConfig } from "./types.js";
+import type { Faculty, Group, TeacherInfo, TtClientOptions, CacheConfig } from "./types.js";
 export declare class TtClient {
     private http;
     private educationType;
@@ -47,4 +47,15 @@ export declare class TtClient {
         id: number;
         name: string;
     }[]>;
+    getTeachers(): Promise<{
+        id: number;
+        name: string;
+    }[]>;
+    private fetchTeacherSchedule;
+    getTeacherSchedule(teacherId: number): Promise<Schedule>;
+    getTeacherScheduleForPeriod(opts: {
+        teacherId: number;
+        period: Period;
+    }): Promise<Schedule>;
+    getTeacherInfo(teacherId: number): Promise<TeacherInfo | null>;
 }

package/dist/tt/client.js

@@ -1,7 +1,7 @@
 import { HttpClient } from "../common/http.js";
 import { Cache } from "../common/cache.js";
 import { AuthError } from "../common/types.js";
-import { parseGroupButtons, parseFacultyButtons, parseTeacherButtons, parseFullSchedule, } from "./parse.js";
+import { parseGroupButtons, parseFacultyButtons, parseTeacherButtons, parseFullSchedule, parseTeacherFullSchedule, parseTeacherInfo, } from "./parse.js";
 import { Schedule } from "./schedule.js";
 const BASE = "https://tt.chuvsu.ru";
 const AUTH_URL = `${BASE}/auth`;
@@ -173,4 +173,47 @@ export class TtClient {
         });
         return parseTeacherButtons(body);
     }
+    // --- Teacher schedule ---
+    async getTeachers() {
+        const cached = this.cache?.get("teachers", "all");
+        if (cached)
+            return cached;
+        const { body } = await this.authGet(`${BASE}/index/tech`);
+        const data = parseTeacherButtons(body);
+        this.cache?.set("teachers", "all", data);
+        return data;
+    }
+    async fetchTeacherSchedule(teacherId, period) {
+        const cacheKey = `teacher:${teacherId}:${period}`;
+        const cached = this.cache?.get("schedule", cacheKey);
+        if (cached)
+            return cached;
+        const url = `${BASE}/index/techtt/tech/${teacherId}`;
+        const { body } = await this.authPost(url, { htype: String(period) });
+        const days = parseTeacherFullSchedule(body, this.educationType);
+        this.cache?.set("schedule", cacheKey, days);
+        return days;
+    }
+    async getTeacherSchedule(teacherId) {
+        const schedules = new Map();
+        const results = await Promise.all(ALL_PERIODS.map(async (period) => {
+            const days = await this.fetchTeacherSchedule(teacherId, period);
+            return { period, days };
+        }));
+        for (const { period, days } of results) {
+            schedules.set(period, days);
+        }
+        return new Schedule(teacherId, schedules, undefined, this.educationType);
+    }
+    async getTeacherScheduleForPeriod(opts) {
+        const days = await this.fetchTeacherSchedule(opts.teacherId, opts.period);
+        const schedules = new Map();
+        schedules.set(opts.period, days);
+        return new Schedule(opts.teacherId, schedules, opts.period, this.educationType);
+    }
+    async getTeacherInfo(teacherId) {
+        const url = `${BASE}/index/techtt/tech/${teacherId}`;
+        const { body } = await this.authGet(url);
+        return parseTeacherInfo(body);
+    }
 }

package/dist/tt/parse.d.ts

@@ -1,5 +1,5 @@
 import { type Period, EducationType } from "../common/types.js";
-import type { Faculty, Group, FullScheduleDay } from "./types.js";
+import type { Faculty, Group, FullScheduleDay, TeacherInfo } from "./types.js";
 export declare function parsePeriodFromPage(html: string): Period | null;
 export declare function parseGroupButtons(html: string): Group[];
 export declare function parseFacultyButtons(html: string): Faculty[];
@@ -8,3 +8,5 @@ export declare function parseTeacherButtons(html: string): {
     name: string;
 }[];
 export declare function parseFullSchedule(html: string, educationType?: EducationType): FullScheduleDay[];
+export declare function parseTeacherFullSchedule(html: string, educationType?: EducationType): FullScheduleDay[];
+export declare function parseTeacherInfo(html: string): TeacherInfo | null;

package/dist/tt/parse.js

@@ -65,7 +65,7 @@ export function parseFullSchedule(html, educationType) {
     return parseSemesterSchedule(doc);
 }
 // --- Semester schedule parsing (weekday-based, repeating weekly) ---
-function parseSemesterSchedule(doc) {
+function parseSemesterScheduleWith(doc, entryParser) {
     const days = [];
     const rows = doc.querySelectorAll("tr");
     let currentDay = null;
@@ -96,7 +96,7 @@ function parseSemesterSchedule(doc) {
             continue;
         const entries = [];
         for (const entryRow of dataCell.querySelectorAll("table tr")) {
-            const entry = parseSemesterEntry(entryRow);
+            const entry = entryParser(entryRow);
             if (entry)
                 entries.push(entry);
         }
@@ -109,6 +109,9 @@ function parseSemesterSchedule(doc) {
     }
     return days;
 }
+function parseSemesterSchedule(doc) {
+    return parseSemesterScheduleWith(doc, parseSemesterEntry);
+}
 function parseDate(dd, mm, yyyy) {
     return new Date(parseInt(yyyy), parseInt(mm) - 1, parseInt(dd));
 }
@@ -291,3 +294,149 @@ function parseSessionEntry(td) {
         timeEnd: parseTime(timeMatch[2]),
     };
 }
+// --- Teacher schedule parsing ---
+export function parseTeacherFullSchedule(html, educationType) {
+    const doc = parseHtml(html);
+    const edType = educationType ?? 1 /* EducationType.HigherEducation */;
+    if (doc.querySelector('td[id^="trd2"]')) {
+        return parseTeacherSessionSchedule(doc, edType);
+    }
+    return parseSemesterScheduleWith(doc, parseTeacherSemesterEntry);
+}
+function parseTeacherSemesterEntry(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;
+    const redDivs = td.querySelectorAll('div[style*="border: 2px solid red"]');
+    for (const div of redDivs) {
+        const result = parseTransferDiv(div);
+        if (result) {
+            if (possibleChanges)
+                result.entry.possibleChanges = true;
+            return result.entry;
+        }
+    }
+    const substitutions = [];
+    for (const div of redDivs) {
+        const sub = parseSubstitutionDiv(div);
+        if (sub)
+            substitutions.push(sub);
+    }
+    let cleanHtml = fullHtml;
+    let cleanText = plainText;
+    for (const div of redDivs) {
+        cleanHtml = cleanHtml.replace(div.outerHTML ?? "", "");
+        cleanText = cleanText.replace(text(div), "");
+    }
+    const subjectEl = td.querySelector('span[style*="color: blue"]');
+    const subject = subjectEl ? text(subjectEl) : "";
+    if (!subject)
+        return null;
+    const typeMatch = cleanText.match(/\((лк|пр|лб|зач|экз|зчО|кр|конс)\)/);
+    const weeksMatch = cleanText.match(/\(([^)]*нед\.?[^)]*)\)/);
+    const roomMatch = cleanHtml.match(/(?:<sup>[^<]*<\/sup>)?([А-Яа-яA-Za-z]-\d+)/);
+    const groupsMatch = cleanHtml.match(/<br\s*\/?>\s*([^<]+?)(?:<br|<\/td|<div|<i|$)/);
+    const subgroupMatch = cleanText.match(/(\d+)\s*подгруппа/);
+    const weekParity = parseWeekParity(cleanHtml);
+    return {
+        room: roomMatch?.[1] ?? "",
+        subject,
+        type: typeMatch?.[1] ?? "",
+        weeks: parseWeeks(weeksMatch?.[1] ?? ""),
+        teacher: { name: "" },
+        groups: groupsMatch?.[1]?.trim() ?? "",
+        subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
+        weekParity,
+        substitutions: substitutions.length > 0 ? substitutions : undefined,
+        possibleChanges,
+    };
+}
+function parseTeacherSessionSchedule(doc, educationType) {
+    const days = [];
+    for (const dateCell of doc.querySelectorAll('td[id^="trd2"]')) {
+        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);
+        const cellHtml = dateCell.innerHTML ?? "";
+        const brMatch = cellHtml.match(/<br\s*\/?>\s*(.+)/i);
+        const weekday = brMatch ? brMatch[1].trim() : "";
+        const row = dateCell.parentElement;
+        if (!row)
+            continue;
+        const dataCell = row.querySelector("td.trdata:not(.trfd)");
+        if (!dataCell)
+            continue;
+        const slots = [];
+        for (const entryRow of dataCell.querySelectorAll("table tr")) {
+            const td = entryRow.querySelector("td") ?? entryRow;
+            const entry = parseTeacherSessionEntry(td);
+            if (!entry)
+                continue;
+            slots.push({
+                number: getLessonNumber(entry.timeStart, educationType),
+                timeStart: entry.timeStart,
+                timeEnd: entry.timeEnd,
+                entries: [entry.entry],
+            });
+        }
+        if (slots.length > 0) {
+            days.push({ weekday, date, slots });
+        }
+    }
+    return days;
+}
+function parseTeacherSessionEntry(td) {
+    const fullHtml = td.innerHTML ?? "";
+    const plainText = text(td);
+    if (!plainText)
+        return null;
+    const subjectEl = td.querySelector('span[style*="color: blue"]');
+    const subject = subjectEl ? text(subjectEl) : "";
+    if (!subject)
+        return null;
+    const roomMatch = fullHtml.match(/^([^<]*?)\s*<span/);
+    const room = roomMatch ? roomMatch[1].trim() : "";
+    const typeMatch = plainText.match(/\((лк|пр|лб|зач|экз|зчО|кр|конс\.?|Экз)\)/i);
+    const type = typeMatch ? typeMatch[1].replace(/\.$/, "").toLowerCase() : "";
+    // Groups: text between </span> type and <br>time
+    const groupsMatch = fullHtml.match(/\((?:лк|пр|лб|зач|экз|зчО|кр|конс\.?|Экз)\)\s*([^<]+?)\s*<br/i);
+    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: "" },
+            groups: groupsMatch?.[1]?.trim() ?? "",
+        },
+        timeStart: parseTime(timeMatch[1]),
+        timeEnd: parseTime(timeMatch[2]),
+    };
+}
+export function parseTeacherInfo(html) {
+    const doc = parseHtml(html);
+    const nameEl = doc.querySelector(".htextb");
+    if (!nameEl)
+        return null;
+    const nameHtml = nameEl.innerHTML ?? "";
+    const nameMatch = nameHtml.match(/^([^<]+)/);
+    const name = nameMatch?.[1]?.trim() ?? "";
+    if (!name)
+        return null;
+    const degreeEl = nameEl.querySelector('span[style*="color: blue"]');
+    const degree = degreeEl ? text(degreeEl).trim() : undefined;
+    const deptEl = doc.querySelector(".htext");
+    const department = deptEl ? text(deptEl).trim() : undefined;
+    return { name, degree: degree || undefined, department: department || undefined };
+}

package/dist/tt/types.d.ts

@@ -35,6 +35,8 @@ export interface ScheduleEntry {
     type: string;
     weeks: WeekRange;
     teacher: Teacher;
+    /** For teacher schedules: group names (e.g. "КТ-42-25 (1 подгруппа)"). */
+    groups?: string;
     subgroup?: number;
     weekParity?: "even" | "odd";
     /** Date-specific substitutions (замена на). */
@@ -73,6 +75,8 @@ export interface Lesson {
     type: string;
     room: string;
     teacher: Teacher;
+    /** For teacher schedules: group names. */
+    groups?: string;
     weeks: WeekRange;
     subgroup?: number;
     weekParity?: "even" | "odd";
@@ -85,6 +89,12 @@ export interface Lesson {
     /** Whether this lesson is marked as potentially changing. */
     possibleChanges?: boolean;
 }
+/** Teacher info from the schedule page header. */
+export interface TeacherInfo {
+    name: string;
+    degree?: string;
+    department?: string;
+}
 export interface SemesterWeek {
     week: number;
     start: Date;
@@ -94,6 +104,7 @@ export interface CacheConfig {
     schedule?: number;
     faculties?: number;
     groups?: number;
+    teachers?: number;
 }
 export interface TtClientOptions {
     educationType?: EducationType;

package/dist/tt/utils.js

@@ -165,6 +165,7 @@ export function slotsToLessons(slots, date) {
                 type: entry.type,
                 room,
                 teacher,
+                groups: entry.groups,
                 weeks: entry.weeks,
                 subgroup: entry.subgroup,
                 weekParity: entry.weekParity,

package/package.json

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