chuvsu-js 2.7.0 → 2.8.0

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, SubstituteForInfo, TransferInfo, TeacherInfo, TtClientOptions, CacheConfig, } from "./tt/types.js";
+export type { Audience, AudienceInfo, Faculty, Group, ScheduleEntry, FullScheduleSlot, FullScheduleDay, LessonTimeSlot, Lesson, LessonTime, SemesterWeek, Substitution, SubstituteForInfo, 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, TeacherInfo, TtClientOptions, CacheConfig } from "./types.js";
+import type { Audience, AudienceInfo, Faculty, Group, TeacherInfo, TtClientOptions, CacheConfig } from "./types.js";
 export declare class TtClient {
     private http;
     private educationType;
@@ -42,6 +42,48 @@ export declare class TtClient {
     searchGroup(opts: {
         name: string;
     }): Promise<Group[]>;
+    /**
+     * Search audiences by name (substring match). The server requires at
+     * least 3 characters in the query.
+     */
+    searchAudience(opts: {
+        name: string;
+    }): Promise<Audience[]>;
+    /**
+     * Get every audience known to the system in a single request.
+     *
+     * The site exposes only a search form ("at least 3 characters") and no
+     * listing endpoint. However the query is passed to a SQL LIKE, so the
+     * 3-character wildcard `%%%` matches every audience at once and returns
+     * the full list of (id, name) pairs.
+     */
+    getAudiences(): Promise<Audience[]>;
+    /**
+     * Resolve an audience id from its exact name by searching and
+     * selecting the button whose `value` equals the given name.
+     */
+    findAudienceByName(opts: {
+        name: string;
+    }): Promise<Audience | null>;
+    /** Fetch the audience's display name from its schedule page. */
+    getAudienceName(audienceId: number): Promise<string | null>;
+    /**
+     * Fetch detailed info about an audience (building, floor, usage,
+     * image URLs for the audience photo, building photo and floor plan).
+     */
+    getAudienceInfo(audienceId: number): Promise<AudienceInfo | null>;
+    private fetchAudienceSchedule;
+    getAudienceSchedule(audienceId: number): Promise<Schedule>;
+    getAudienceScheduleForPeriod(opts: {
+        audienceId: number;
+        period: Period;
+    }): Promise<Schedule>;
+    /** Get the audience photo (audimage). Returns null if missing. */
+    getAudienceImage(audienceId: number): Promise<Buffer | null>;
+    /** Get the building exterior image (blockimage). Returns null if missing. */
+    getAudienceBlockImage(audienceId: number): Promise<Buffer | null>;
+    /** Get the floor plan image for the audience. Returns null if missing. */
+    getAudienceFloorplan(audienceId: number): Promise<Buffer | null>;
     searchTeacher(opts: {
         name: string;
     }): Promise<{

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, parseTeacherFullSchedule, parseTeacherInfo, } from "./parse.js";
+import { parseAudienceButtons, parseAudienceFullSchedule, parseAudienceInfo, parseAudienceName, 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`;
@@ -167,6 +167,122 @@ export class TtClient {
         });
         return parseGroupButtons(body);
     }
+    /**
+     * Search audiences by name (substring match). The server requires at
+     * least 3 characters in the query.
+     */
+    async searchAudience(opts) {
+        const { body } = await this.authPost(`${BASE}/`, {
+            audname: opts.name,
+            findaud: "найти",
+            hfac: "0",
+            pertt: this.pertt,
+        });
+        return parseAudienceButtons(body);
+    }
+    /**
+     * Get every audience known to the system in a single request.
+     *
+     * The site exposes only a search form ("at least 3 characters") and no
+     * listing endpoint. However the query is passed to a SQL LIKE, so the
+     * 3-character wildcard `%%%` matches every audience at once and returns
+     * the full list of (id, name) pairs.
+     */
+    async getAudiences() {
+        const { body } = await this.authPost(`${BASE}/`, {
+            audname: "%%%",
+            findaud: "найти",
+            hfac: "0",
+            pertt: this.pertt,
+        });
+        return parseAudienceButtons(body);
+    }
+    /**
+     * Resolve an audience id from its exact name by searching and
+     * selecting the button whose `value` equals the given name.
+     */
+    async findAudienceByName(opts) {
+        const q = opts.name.length >= 3 ? opts.name : "%%%";
+        const list = await this.searchAudience({ name: q });
+        return list.find((a) => a.name === opts.name) ?? null;
+    }
+    /** Fetch the audience's display name from its schedule page. */
+    async getAudienceName(audienceId) {
+        const { body } = await this.authGet(`${BASE}/index/audtt/aud/${audienceId}`);
+        return parseAudienceName(body);
+    }
+    /**
+     * Fetch detailed info about an audience (building, floor, usage,
+     * image URLs for the audience photo, building photo and floor plan).
+     */
+    async getAudienceInfo(audienceId) {
+        const cached = this.cache?.get("audienceInfo", String(audienceId));
+        if (cached)
+            return cached;
+        const { body } = await this.authGet(`${BASE}/index/audtt/aud/${audienceId}`);
+        const info = parseAudienceInfo(body);
+        if (info)
+            this.cache?.set("audienceInfo", String(audienceId), info);
+        return info;
+    }
+    async fetchAudienceSchedule(audienceId, period) {
+        const cacheKey = `audience:${audienceId}:${period}`;
+        const cached = this.cache?.get("schedule", cacheKey);
+        if (cached)
+            return cached;
+        const url = `${BASE}/index/audtt/aud/${audienceId}`;
+        const { body } = await this.authPost(url, { htype: String(period) });
+        const days = parseAudienceFullSchedule(body);
+        this.cache?.set("schedule", cacheKey, days);
+        // Cache audience info from the same page to avoid an extra request.
+        if (!this.cache?.get("audienceInfo", String(audienceId))) {
+            const info = parseAudienceInfo(body);
+            if (info)
+                this.cache?.set("audienceInfo", String(audienceId), info);
+        }
+        return days;
+    }
+    async getAudienceSchedule(audienceId) {
+        const schedules = new Map();
+        const results = await Promise.all(ALL_PERIODS.map(async (period) => {
+            const days = await this.fetchAudienceSchedule(audienceId, period);
+            return { period, days };
+        }));
+        for (const { period, days } of results) {
+            schedules.set(period, days);
+        }
+        return new Schedule(audienceId, schedules, undefined, this.educationType);
+    }
+    async getAudienceScheduleForPeriod(opts) {
+        const days = await this.fetchAudienceSchedule(opts.audienceId, opts.period);
+        const schedules = new Map();
+        schedules.set(opts.period, days);
+        return new Schedule(opts.audienceId, schedules, opts.period, this.educationType);
+    }
+    /** Get the audience photo (audimage). Returns null if missing. */
+    async getAudienceImage(audienceId) {
+        const info = await this.getAudienceInfo(audienceId);
+        if (!info?.audImageUrl)
+            return null;
+        const buf = await this.authGetBuffer(`${BASE}${info.audImageUrl}`);
+        return buf.length > 0 ? buf : null;
+    }
+    /** Get the building exterior image (blockimage). Returns null if missing. */
+    async getAudienceBlockImage(audienceId) {
+        const info = await this.getAudienceInfo(audienceId);
+        if (!info?.blockImageUrl)
+            return null;
+        const buf = await this.authGetBuffer(`${BASE}${info.blockImageUrl}`);
+        return buf.length > 0 ? buf : null;
+    }
+    /** Get the floor plan image for the audience. Returns null if missing. */
+    async getAudienceFloorplan(audienceId) {
+        const info = await this.getAudienceInfo(audienceId);
+        if (!info?.floorplanUrl)
+            return null;
+        const buf = await this.authGetBuffer(`${BASE}${info.floorplanUrl}`);
+        return buf.length > 0 ? buf : null;
+    }
     async searchTeacher(opts) {
         const { body } = await this.authPost(`${BASE}/`, {
             techname: opts.name,

package/dist/tt/parse.d.ts

@@ -1,12 +1,16 @@
 import { type Period, EducationType } from "../common/types.js";
-import type { Faculty, Group, FullScheduleDay, TeacherInfo } from "./types.js";
+import type { Audience, AudienceInfo, 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[];
+export declare function parseAudienceButtons(html: string): Audience[];
+export declare function parseAudienceName(html: string): string | null;
 export declare function parseTeacherButtons(html: string): {
     id: number;
     name: string;
 }[];
 export declare function parseFullSchedule(html: string, educationType?: EducationType): FullScheduleDay[];
+export declare function parseAudienceInfo(html: string): AudienceInfo | null;
+export declare function parseAudienceFullSchedule(html: string): FullScheduleDay[];
 export declare function parseTeacherFullSchedule(html: string, educationType?: EducationType): FullScheduleDay[];
 export declare function parseTeacherInfo(html: string): TeacherInfo | null;

package/dist/tt/parse.js

@@ -40,6 +40,31 @@ export function parseFacultyButtons(html) {
     }
     return faculties;
 }
+export function parseAudienceButtons(html) {
+    const results = [];
+    const seen = new Set();
+    const re = /<button[^>]*\bname="aud(\d+)"[^>]*\bvalue="([^"]*)"/g;
+    let m;
+    while ((m = re.exec(html)) !== null) {
+        const id = parseInt(m[1]);
+        if (seen.has(id))
+            continue;
+        seen.add(id);
+        results.push({ id, name: m[2] });
+    }
+    return results;
+}
+export function parseAudienceName(html) {
+    const m = html.match(/id="path"[\s\S]*?findaud[^>]*>[^<]*<\/a>([\s\S]*?)<\/div>/);
+    if (!m)
+        return null;
+    const tail = m[1]
+        .replace(/&nbsp;/g, " ")
+        .replace(/<[^>]*>/g, "")
+        .replace(/^[\s/]+/, "")
+        .trim();
+    return tail || null;
+}
 export function parseTeacherButtons(html) {
     const doc = parseHtml(html);
     const results = [];
@@ -344,6 +369,128 @@ function parseSessionEntry(td) {
         timeEnd: parseTime(timeMatch[2]),
     };
 }
+// --- Audience schedule & info parsing ---
+export function parseAudienceInfo(html) {
+    const doc = parseHtml(html);
+    // Name: <span class="htext"><nobr>Аудитория <span style="color: blue;">NAME</span></nobr></span>
+    const nameEl = doc.querySelector('.htext span[style*="color: blue"]');
+    const name = nameEl ? text(nameEl).trim() : "";
+    if (!name)
+        return null;
+    // Details: <span class="htextb"> (Корпус Б; 3 этаж - Учебная лаборатория)</span>
+    const detailsEl = doc.querySelector(".htextb");
+    const details = detailsEl ? text(detailsEl).trim() : "";
+    let building;
+    let floor;
+    let usage;
+    if (details) {
+        const buildingMatch = details.match(/Корпус\s+([^\s;,)]+)/i);
+        if (buildingMatch)
+            building = buildingMatch[1];
+        const floorMatch = details.match(/(\d+)\s*этаж/i);
+        if (floorMatch)
+            floor = parseInt(floorMatch[1]);
+        const usageMatch = details.match(/этаж\s*-\s*([^)]+?)\s*\)?\s*$/i);
+        if (usageMatch)
+            usage = usageMatch[1].trim();
+    }
+    const audImg = doc.querySelector("#audsrc");
+    const blockImg = doc.querySelector("#blocksrc");
+    const floorImg = doc.querySelector("#floorsrc");
+    return {
+        name,
+        building,
+        floor,
+        usage,
+        audImageUrl: audImg?.getAttribute("src") || undefined,
+        blockImageUrl: blockImg?.getAttribute("src") || undefined,
+        floorplanUrl: floorImg?.getAttribute("src") || undefined,
+    };
+}
+function parseAudienceSemesterEntry(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;
+        }
+    }
+    for (const div of redDivs) {
+        const result = parseSubstituteForDiv(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 subgroupMatch = cleanText.match(/(\d+)\s*подгруппа/);
+    const weekParity = parseWeekParity(cleanHtml);
+    // Audience entries layout:
+    //   <span blue>SUBJ</span> (TYPE) (WEEKS) <br>TEACHER<br>GROUPS
+    // Teacher is the first line after </span>...<br>, groups is the next line.
+    // We split on <br> after the blue subject span.
+    const afterSubject = cleanHtml.split(/<\/span>/i).slice(1).join("</span>");
+    const parts = afterSubject
+        .split(/<br\s*\/?>/i)
+        .map((p) => p.replace(/<[^>]*>/g, "").trim())
+        .filter((p) => p.length > 0);
+    // parts[0] = " (лк) (1 - 16 нед.) " — trailing metadata; drop tokens that
+    // look like (type)/(weeks)/(N подгруппа). First real text line = teacher.
+    const textLines = [];
+    for (const p of parts) {
+        const cleaned = p
+            .replace(/\((лк|пр|лб|зач|экз|зчО|кр|конс)\)/g, "")
+            .replace(/\([^)]*нед\.?[^)]*\)/g, "")
+            .replace(/\(\d+\s*подгруппа\)/g, "")
+            .trim();
+        if (cleaned)
+            textLines.push(cleaned);
+    }
+    const teacherLine = textLines[0] ?? "";
+    const groupsLine = textLines.slice(1).join(" ").trim();
+    return {
+        room: "",
+        subject,
+        type: typeMatch?.[1] ?? "",
+        weeks: parseWeeks(weeksMatch?.[1] ?? ""),
+        teacher: parseTeacher(teacherLine),
+        groups: groupsLine || undefined,
+        subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
+        weekParity,
+        substitutions: substitutions.length > 0 ? substitutions : undefined,
+        possibleChanges,
+    };
+}
+export function parseAudienceFullSchedule(html) {
+    const doc = parseHtml(html);
+    return parseSemesterScheduleWith(doc, parseAudienceSemesterEntry);
+}
 // --- Teacher schedule parsing ---
 export function parseTeacherFullSchedule(html, educationType) {
     const doc = parseHtml(html);

package/dist/tt/types.d.ts

@@ -9,6 +9,25 @@ export interface Group {
     specialty?: string;
     profile?: string;
 }
+export interface Audience {
+    id: number;
+    name: string;
+}
+export interface AudienceInfo {
+    name: string;
+    /** Building letter/name, e.g. "Б". */
+    building?: string;
+    /** Floor number, e.g. 3. */
+    floor?: number;
+    /** Free-form usage description, e.g. "Учебная лаборатория". */
+    usage?: string;
+    /** Relative URL of the audience photo (/index/audimage/...). */
+    audImageUrl?: string;
+    /** Relative URL of the building image (/index/blockimage/...). */
+    blockImageUrl?: string;
+    /** Relative URL of the floor plan image (/index/floorplan/...). */
+    floorplanUrl?: string;
+}
 /** A date-specific substitution (room and/or teacher change). */
 export interface Substitution {
     /** The date this substitution applies to. */
@@ -120,6 +139,7 @@ export interface CacheConfig {
     teachers?: number;
     teacherInfo?: number;
     teacherPhotos?: number;
+    audienceInfo?: number;
 }
 export interface TtClientOptions {
     educationType?: EducationType;

package/package.json

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