chuvsu-js 5.3.0 → 5.4.0

package/dist/common/types.d.ts

@@ -2,7 +2,9 @@ export declare enum AcademicPeriod {
     FallSemester = 1,
     WinterSession = 2,
     SpringSemester = 3,
-    SummerSession = 4
+    SummerSession = 4,
+    StateFinalAssessment = 9,
+    Retake = 11
 }
 export declare enum EducationLevel {
     HigherEducation = 1,

package/dist/common/types.js

@@ -4,6 +4,8 @@ export var AcademicPeriod;
     AcademicPeriod[AcademicPeriod["WinterSession"] = 2] = "WinterSession";
     AcademicPeriod[AcademicPeriod["SpringSemester"] = 3] = "SpringSemester";
     AcademicPeriod[AcademicPeriod["SummerSession"] = 4] = "SummerSession";
+    AcademicPeriod[AcademicPeriod["StateFinalAssessment"] = 9] = "StateFinalAssessment";
+    AcademicPeriod[AcademicPeriod["Retake"] = 11] = "Retake";
 })(AcademicPeriod || (AcademicPeriod = {}));
 export var EducationLevel;
 (function (EducationLevel) {

package/dist/core.d.ts

@@ -1,7 +1,7 @@
 export * from "./tt/domain/index.js";
 export { attachWebinars, findWebinar } from "./tt/webinars.js";
 export type { LessonWithWebinar } from "./tt/webinars.js";
-export { getAdjacentSemester, getCompensatingWorkDays, getCurrentPeriod, getEffectiveHolidays, formatLocalDate, getHolidayTransfers, getSemesterStart, getSemesterWeeks, getStandardScheduleBlocks, getWeekNumber, getWeekdayName, isHoliday, isLocalDate, isSessionPeriod, parseLocalDate, RUSSIAN_HOLIDAYS, } from "./tt/utils/index.js";
+export { getAdjacentSemester, getCompensatingWorkDays, getCurrentPeriod, getEffectiveHolidays, formatLocalDate, getHolidayTransfers, getSemesterStart, getSemesterWeeks, getStandardScheduleBlocks, getWeekNumber, getWeekdayName, isHoliday, isLocalDate, isSessionPeriod, LessonType, parseLessonType, parseLocalDate, RUSSIAN_HOLIDAYS, } from "./tt/utils/index.js";
 export type { Holiday, HolidayTransfer } from "./tt/utils/index.js";
 export { AuthError, EducationLevel, ParseError, AcademicPeriod, } from "./common/types.js";
 export type { LocalDate, Teacher, Time, TimeRange, WeekRange, } from "./common/types.js";

package/dist/core.js

@@ -1,5 +1,5 @@
 // Runtime-safe core for Node.js, browsers, Deno, and workers.
 export * from "./tt/domain/index.js";
 export { attachWebinars, findWebinar } from "./tt/webinars.js";
-export { getAdjacentSemester, getCompensatingWorkDays, getCurrentPeriod, getEffectiveHolidays, formatLocalDate, getHolidayTransfers, getSemesterStart, getSemesterWeeks, getStandardScheduleBlocks, getWeekNumber, getWeekdayName, isHoliday, isLocalDate, isSessionPeriod, parseLocalDate, RUSSIAN_HOLIDAYS, } from "./tt/utils/index.js";
+export { getAdjacentSemester, getCompensatingWorkDays, getCurrentPeriod, getEffectiveHolidays, formatLocalDate, getHolidayTransfers, getSemesterStart, getSemesterWeeks, getStandardScheduleBlocks, getWeekNumber, getWeekdayName, isHoliday, isLocalDate, isSessionPeriod, LessonType, parseLessonType, parseLocalDate, RUSSIAN_HOLIDAYS, } from "./tt/utils/index.js";
 export { AuthError, EducationLevel, ParseError, AcademicPeriod, } from "./common/types.js";

package/dist/parsers.d.ts

@@ -1,3 +1,3 @@
-export { parseAcademicYearFromPage, parseRoomButtons, parseRoomSchedule, parseRoomInfo, parseRoomName, parseFacultyButtons, parseGroupSchedule, parseGroupName, parseGroupButtons, parseGroupsString, parsePeriodFromPage, parseTeacherButtons, parseTeacherSchedule, parseTeacherInfo, parseWebinars, } from "./tt/parse/index.js";
+export { parseAcademicYearFromPage, parseAvailablePeriodsFromPage, parseRoomButtons, parseRoomSchedule, parseRoomInfo, parseRoomName, parseFacultyButtons, parseGroupSchedule, parseGroupName, parseGroupButtons, parseGroupsString, parsePeriodFromPage, parseTeacherButtons, parseTeacherSchedule, parseTeacherInfo, parseWebinars, } from "./tt/parse/index.js";
 export { createScheduleSourceSnapshot } from "./tt/observations.js";
 export type { ParsedScheduleDay, ParsedLesson, ParsedScheduleBlock, } from "./tt/types.js";

package/dist/parsers.js

@@ -1,2 +1,2 @@
-export { parseAcademicYearFromPage, parseRoomButtons, parseRoomSchedule, parseRoomInfo, parseRoomName, parseFacultyButtons, parseGroupSchedule, parseGroupName, parseGroupButtons, parseGroupsString, parsePeriodFromPage, parseTeacherButtons, parseTeacherSchedule, parseTeacherInfo, parseWebinars, } from "./tt/parse/index.js";
+export { parseAcademicYearFromPage, parseAvailablePeriodsFromPage, parseRoomButtons, parseRoomSchedule, parseRoomInfo, parseRoomName, parseFacultyButtons, parseGroupSchedule, parseGroupName, parseGroupButtons, parseGroupsString, parsePeriodFromPage, parseTeacherButtons, parseTeacherSchedule, parseTeacherInfo, parseWebinars, } from "./tt/parse/index.js";
 export { createScheduleSourceSnapshot } from "./tt/observations.js";

package/dist/tt/client.d.ts

@@ -13,7 +13,7 @@ export declare class TimetableClient {
     private repositoryReady;
     private repositoryMutation;
     private loginMode;
-    private timetableContext;
+    private timetableContexts;
     constructor(opts?: TimetableClientOptions);
     private get pertt();
     get repository(): TimetableRepository;

package/dist/tt/client.js

@@ -1,18 +1,20 @@
 import { HttpClient, } from "../common/http.js";
 import { HybridCache } from "../common/cache.js";
 import { AcademicPeriod, AuthError, EducationLevel, ParseError, } from "../common/types.js";
-import { parseAcademicYearFromPage, parseRoomButtons, parseRoomSchedule, parseRoomInfo, parseRoomName, parseGroupButtons, parseGroupName, parseFacultyButtons, parseTeacherButtons, parseGroupSchedule, parseTeacherSchedule, parseTeacherInfo, parsePeriodFromPage, parseWebinars, } from "./parse/index.js";
+import { parseAcademicYearFromPage, parseAvailablePeriodsFromPage, parseRoomButtons, parseRoomSchedule, parseRoomInfo, parseRoomName, parseGroupButtons, parseGroupName, parseFacultyButtons, parseTeacherButtons, parseGroupSchedule, parseTeacherSchedule, parseTeacherInfo, parsePeriodFromPage, parseWebinars, } from "./parse/index.js";
 import { Schedule } from "./domain/schedule.js";
 import { TimetableRepository } from "./domain/repository.js";
 import { createScheduleSourceSnapshot } from "./observations.js";
 const BASE = "https://tt.chuvsu.ru";
 const AUTH_URL = `${BASE}/auth`;
 const TIMETABLE_CONTEXT_TTL_MS = 15 * 60 * 1000;
-const ALL_PERIODS = [
+const SUPPORTED_PERIODS = [
     AcademicPeriod.FallSemester,
     AcademicPeriod.WinterSession,
     AcademicPeriod.SpringSemester,
     AcademicPeriod.SummerSession,
+    AcademicPeriod.StateFinalAssessment,
+    AcademicPeriod.Retake,
 ];
 function requirePositiveId(value, label) {
     if (!Number.isInteger(value) || value == null || value < 1) {
@@ -28,12 +30,12 @@ function normalizeSearchQuery(value, label, minimumLength = 1) {
     return normalized;
 }
 function normalizePeriods(periods) {
-    const values = [...(periods ?? ALL_PERIODS)];
+    const values = [...periods];
     if (values.length === 0)
         throw new RangeError("At least one period is required");
     const unique = new Set();
     for (const period of values) {
-        if (!ALL_PERIODS.includes(period)) {
+        if (!SUPPORTED_PERIODS.includes(period)) {
             throw new RangeError(`Invalid academic period: ${period}`);
         }
         if (unique.has(period)) {
@@ -74,7 +76,7 @@ export class TimetableClient {
     repositoryReady = null;
     repositoryMutation = Promise.resolve();
     loginMode = null;
-    timetableContext = null;
+    timetableContexts = new Map();
     constructor(opts) {
         this.educationLevel = opts?.educationLevel ?? EducationLevel.HigherEducation;
         if (this.educationLevel !== EducationLevel.HigherEducation &&
@@ -189,7 +191,7 @@ export class TimetableClient {
             throw new AuthError("TT login failed");
         }
         this.loginMode = { type: "credentials", ...opts };
-        this.timetableContext = null;
+        this.timetableContexts.clear();
     }
     async loginAsGuest() {
         const res = await this.http.post(AUTH_URL, { guest: "Войти гостем", hfac: "0", pertt: this.pertt }, false);
@@ -197,7 +199,7 @@ export class TimetableClient {
             throw new AuthError("TT guest login failed");
         }
         this.loginMode = { type: "guest" };
-        this.timetableContext = null;
+        this.timetableContexts.clear();
     }
     isSessionExpired(body) {
         return body.includes('name="wname"');
@@ -260,10 +262,9 @@ export class TimetableClient {
     }
     /** Resolve the academic year and active period from tt.chuvsu.ru itself. */
     async getTimetableContext(pageUrl) {
-        if (this.timetableContext &&
-            Date.now() - this.timetableContext.resolvedAt < TIMETABLE_CONTEXT_TTL_MS) {
-            return this.timetableContext;
-        }
+        const cached = this.timetableContexts.get(pageUrl);
+        if (cached && Date.now() - cached.resolvedAt < TIMETABLE_CONTEXT_TTL_MS)
+            return cached;
         const { body } = await this.authGet(pageUrl);
         const academicYearStartYear = parseAcademicYearFromPage(body);
         if (academicYearStartYear == null) {
@@ -273,12 +274,14 @@ export class TimetableClient {
         if (period == null) {
             throw new ParseError("TT page does not expose the active timetable period");
         }
+        const availablePeriods = parseAvailablePeriodsFromPage(body);
         const context = {
             academicYearStartYear,
             period,
+            availablePeriods: availablePeriods.length ? availablePeriods : [period],
             resolvedAt: Date.now(),
         };
-        this.timetableContext = context;
+        this.timetableContexts.set(pageUrl, context);
         return context;
     }
     // --- Schedule ---
@@ -359,7 +362,7 @@ export class TimetableClient {
     }
     async getSchedule(owner, options) {
         const ownerUrl = this.ownerUrl(owner);
-        const periods = normalizePeriods(options?.periods);
+        const requestedPeriods = options?.periods ? normalizePeriods(options.periods) : null;
         await this.ensureRepository();
         if (owner.type === "group" && owner.group.name.trim()) {
             await this.rememberGroups([owner.group]);
@@ -372,6 +375,7 @@ export class TimetableClient {
         }
         const resolvedOwner = this.resolveOwner(owner);
         const context = await this.getTimetableContext(ownerUrl);
+        const periods = requestedPeriods ?? context.availablePeriods;
         const results = await Promise.all(periods.map(async (period) => ({
             period,
             days: await this.fetchOwnerSchedule(resolvedOwner, period, context.academicYearStartYear),

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

@@ -1,5 +1,5 @@
 export { RandomLessonIdGenerator, occurrenceIdForSeries, migrateLegacyLessonId } from "./ids.js";
-export { ScheduleSnapshot, createScheduleSnapshot } from "./schedule-snapshot.js";
+export { ScheduleSnapshot, createScheduleSnapshot, SCHEDULE_SNAPSHOT_SCHEMA_VERSION } from "./schedule-snapshot.js";
 export type { SerializedScheduleSnapshot } from "./schedule-snapshot.js";
 export { TimetableDirectory } from "./directory.js";
 export { entityKey, mergeEntityRefs, mergeGroups, mergeRooms, mergeTeachers, normalizeScheduleText, } from "./normalize.js";

package/dist/tt/domain/index.js

@@ -1,5 +1,5 @@
 export { RandomLessonIdGenerator, occurrenceIdForSeries, migrateLegacyLessonId } from "./ids.js";
-export { ScheduleSnapshot, createScheduleSnapshot } from "./schedule-snapshot.js";
+export { ScheduleSnapshot, createScheduleSnapshot, SCHEDULE_SNAPSHOT_SCHEMA_VERSION } from "./schedule-snapshot.js";
 export { TimetableDirectory } from "./directory.js";
 export { entityKey, mergeEntityRefs, mergeGroups, mergeRooms, mergeTeachers, normalizeScheduleText, } from "./normalize.js";
 export { MemoryTimetableRepositoryAdapter, TimetableRepository, } from "./repository.js";

package/dist/tt/domain/repository.d.ts

@@ -1,4 +1,4 @@
-import type { AcademicPeriod } from "../../common/types.js";
+import { AcademicPeriod } from "../../common/types.js";
 import { TimetableDirectory } from "./directory.js";
 import type { IngestResult, LessonIdGenerator, LessonOccurrence, LessonSeries, ScheduleOwner, ScheduleSourceSnapshot, TimetableRepositoryAdapter, TimetableRepositoryPatch, TimetableRepositorySnapshot } from "./types.js";
 export declare class TimetableRepository {

package/dist/tt/domain/repository.js

@@ -1,3 +1,4 @@
+import { AcademicPeriod } from "../../common/types.js";
 import { isLocalDate } from "../utils/date.js";
 import { TimetableDirectory } from "./directory.js";
 import { RandomLessonIdGenerator } from "./ids.js";
@@ -9,7 +10,7 @@ function sourceObservationKey(sourceKey, observationKey) {
     return claimKey(sourceKey, observationKey);
 }
 function canonicalBucketKey(observation, source) {
-    const prefix = `${source.academicYearStartYear}:${source.period}:${observation.kind}:${normalizeScheduleText(observation.subject)}`;
+    const prefix = `${source.academicYearStartYear}:${source.period}:${observation.kind}:${observation.retakeAttempt ?? 0}:${normalizeScheduleText(observation.subject)}`;
     return observation.kind === "series"
         ? `${prefix}:${observation.recurrence.weekday}:${recurrenceWeeks(observation)}`
         : `${prefix}:${observation.date}`;
@@ -88,7 +89,7 @@ function observationScore(left, right, sameSource, directory) {
         return Number.NEGATIVE_INFINITY;
     }
     let score = 35;
-    if (normalizeScheduleText(left.type) === normalizeScheduleText(right.type)) {
+    if (left.type === right.type) {
         score += 10;
     }
     else if (left.type && right.type) {
@@ -570,7 +571,7 @@ export class TimetableRepository {
         if (!Number.isInteger(source.academicYearStartYear)) {
             throw new Error(`Invalid academic year for source ${source.sourceKey}`);
         }
-        if (!Number.isInteger(source.period) || source.period < 1 || source.period > 4) {
+        if (!Number.isInteger(source.period) || !Object.values(AcademicPeriod).includes(source.period)) {
             throw new Error(`Invalid academic period for source ${source.sourceKey}`);
         }
         if (!(source.observedAt instanceof Date) || !Number.isFinite(source.observedAt.getTime())) {
@@ -939,6 +940,7 @@ export class TimetableRepository {
             ...relations,
             isDistance: claims.some((value) => value.observation.isDistance === true),
             possibleChanges: claims.some((value) => value.observation.possibleChanges === true),
+            ...(preferred.observation.retakeAttempt ? { retakeAttempt: preferred.observation.retakeAttempt } : {}),
             substitutions: this.aggregateSubstitutions(claims),
             sources: claims.map(sourceRef),
         };
@@ -980,6 +982,7 @@ export class TimetableRepository {
             ...relations,
             isDistance: claims.some((value) => value.observation.isDistance === true),
             possibleChanges: claims.some((value) => value.observation.possibleChanges === true),
+            ...(preferred.observation.retakeAttempt ? { retakeAttempt: preferred.observation.retakeAttempt } : {}),
             status: transfer ? "moved" : "scheduled",
             movedFrom: transfer
                 ? { date: transfer.fromDate, slotNumber: transfer.fromSlot }

package/dist/tt/domain/schedule-snapshot.d.ts

@@ -11,8 +11,9 @@ type SerializedSeries = Omit<LessonSeries, "sources"> & {
 type SerializedOccurrence = Omit<LessonOccurrence, "sources"> & {
     sources: SerializedSource[];
 };
+export declare const SCHEDULE_SNAPSHOT_SCHEMA_VERSION = 3;
 export interface SerializedScheduleSnapshot {
-    schemaVersion: 2;
+    schemaVersion: typeof SCHEDULE_SNAPSHOT_SCHEMA_VERSION;
     repositoryRevision: number;
     owner: ScheduleOwner;
     academicYearStartYear: number;
@@ -21,8 +22,8 @@ export interface SerializedScheduleSnapshot {
     end: LocalDate;
     series: SerializedSeries[];
     direct: SerializedOccurrence[];
-    holidays: Holiday[];
-    holidayTransfers: {
+    holidays?: Holiday[];
+    holidayTransfers?: {
         dayOff: string;
         workDay: string | null;
     }[];

package/dist/tt/domain/schedule-snapshot.js

@@ -1,5 +1,6 @@
-import { formatLocalDate, parseLocalDate } from "../utils/index.js";
+import { formatLocalDate, parseLocalDate, RUSSIAN_HOLIDAYS } from "../utils/index.js";
 import { Schedule } from "./schedule.js";
+export const SCHEDULE_SNAPSHOT_SCHEMA_VERSION = 3;
 function serializeSources(sources, include) {
     return include
         ? sources.map((source) => ({ ...structuredClone(source), observedAt: source.observedAt.toISOString() }))
@@ -8,6 +9,12 @@ function serializeSources(sources, include) {
 function deserializeSources(sources) {
     return sources.map((source) => ({ ...structuredClone(source), observedAt: new Date(source.observedAt) }));
 }
+function usesDefaultHolidays(holidays) {
+    return holidays.length === RUSSIAN_HOLIDAYS.length && holidays.every((holiday, index) => {
+        const standard = RUSSIAN_HOLIDAYS[index];
+        return holiday.month === standard.month && holiday.day === standard.day && holiday.name === standard.name;
+    });
+}
 /** Browser-ready schedule backed by recurring rules and dated exceptions. */
 export class ScheduleSnapshot extends Schedule {
     snapshot;
@@ -15,7 +22,7 @@ export class ScheduleSnapshot extends Schedule {
     snapshotDirect;
     dateSetCache = new Map();
     constructor(snapshot) {
-        if (snapshot.schemaVersion !== 2) {
+        if (snapshot.schemaVersion !== SCHEDULE_SNAPSHOT_SCHEMA_VERSION) {
             throw new Error(`Unsupported schedule snapshot schema: ${snapshot.schemaVersion}`);
         }
         const series = snapshot.series.map((value) => ({
@@ -27,7 +34,7 @@ export class ScheduleSnapshot extends Schedule {
         const options = {
             period: snapshot.period,
             holidays: snapshot.holidays,
-            holidayTransfers: snapshot.holidayTransfers.map((value) => ({
+            holidayTransfers: snapshot.holidayTransfers?.map((value) => ({
                 dayOff: new Date(value.dayOff),
                 workDay: value.workDay ? new Date(value.workDay) : null,
             })),
@@ -77,7 +84,7 @@ export function createScheduleSnapshot(schedule, options) {
         ...value, sources: serializeSources(value.sources, includeSources),
     }));
     return {
-        schemaVersion: 2,
+        schemaVersion: SCHEDULE_SNAPSHOT_SCHEMA_VERSION,
         repositoryRevision: schedule.revision,
         owner: structuredClone(schedule.owner),
         academicYearStartYear: schedule.academicYearStartYear,
@@ -86,10 +93,12 @@ export function createScheduleSnapshot(schedule, options) {
         end: formatLocalDate(end),
         series,
         direct,
-        holidays: structuredClone(schedule.holidays),
-        holidayTransfers: schedule.holidayTransfers.map((value) => ({
-            dayOff: value.dayOff.toISOString(),
-            workDay: value.workDay?.toISOString() ?? null,
-        })),
+        ...(!usesDefaultHolidays(schedule.holidays) ? { holidays: structuredClone(schedule.holidays) } : {}),
+        ...(schedule.holidayTransfers.length ? {
+            holidayTransfers: schedule.holidayTransfers.map((value) => ({
+                dayOff: value.dayOff.toISOString(),
+                workDay: value.workDay?.toISOString() ?? null,
+            })),
+        } : {}),
     };
 }

package/dist/tt/domain/schedule.js

@@ -181,6 +181,7 @@ export class Schedule {
                 rooms,
                 isDistance,
                 possibleChanges: series.possibleChanges,
+                ...(series.retakeAttempt ? { retakeAttempt: series.retakeAttempt } : {}),
                 status: "scheduled",
                 originalRooms,
                 originalTeachers,

package/dist/tt/domain/types.d.ts

@@ -1,4 +1,5 @@
 import type { AcademicPeriod, LocalDate, TimeRange, WeekRange } from "../../common/types.js";
+import type { LessonType } from "../utils/lesson-type.js";
 export type LessonSeriesId = string;
 export type LessonId = string;
 export interface NamedEntityRef {
@@ -62,8 +63,7 @@ export interface LessonSeries {
     academicYearStartYear: number;
     period: AcademicPeriod;
     subject: string;
-    /** Free-form portal label; empty when no source exposes one. */
-    type: string;
+    type: LessonType;
     slotNumber?: number;
     time?: TimeRange;
     recurrence: LessonRecurrence;
@@ -72,6 +72,7 @@ export interface LessonSeries {
     rooms: RelationSet<RoomRef>;
     isDistance: boolean;
     possibleChanges: boolean;
+    retakeAttempt?: 1 | 2;
     substitutions: LessonSubstitution[];
     sources: LessonSourceRef[];
 }
@@ -85,8 +86,7 @@ export interface LessonOccurrence {
     nominalDate: LocalDate;
     scheduledDate: LocalDate;
     subject: string;
-    /** Free-form portal label; empty when no source exposes one. */
-    type: string;
+    type: LessonType;
     slotNumber?: number;
     time?: TimeRange;
     groups: RelationSet<GroupAttendance>;
@@ -94,6 +94,7 @@ export interface LessonOccurrence {
     rooms: RelationSet<RoomRef>;
     isDistance: boolean;
     possibleChanges: boolean;
+    retakeAttempt?: 1 | 2;
     status: LessonStatus;
     movedFrom?: {
         date: LocalDate;
@@ -107,8 +108,7 @@ interface ObservationBase {
     /** Stable only inside one source page projection. */
     key: string;
     subject: string;
-    /** Free-form portal label; empty when this source does not expose one. */
-    type: string;
+    type: LessonType;
     slotNumber?: number;
     time?: TimeRange;
     groups: RelationSet<GroupAttendance>;
@@ -116,6 +116,7 @@ interface ObservationBase {
     rooms: RelationSet<RoomRef>;
     isDistance?: boolean;
     possibleChanges?: boolean;
+    retakeAttempt?: 1 | 2;
     substitutions?: LessonSubstitution[];
 }
 export interface SeriesObservation extends ObservationBase {

package/dist/tt/observations.js

@@ -1,4 +1,4 @@
-import { parseLocalDate } from "./utils/index.js";
+import { parseLessonType, parseLocalDate } from "./utils/index.js";
 const WEEKDAY_INDEX = new Map([
     ["воскресенье", 0],
     ["понедельник", 1],
@@ -67,7 +67,7 @@ function observationBase(key, entry, block, owner) {
     return {
         key,
         subject: entry.subject,
-        type: entry.type,
+        type: parseLessonType(entry.type),
         slotNumber: block.slotNumber,
         time: block.time,
         groups: groupsFor(entry, owner),
@@ -75,6 +75,7 @@ function observationBase(key, entry, block, owner) {
         rooms: roomsFor(entry, owner),
         isDistance: entry.isDistance,
         possibleChanges: entry.possibleChanges,
+        ...(entry.retakeAttempt ? { retakeAttempt: entry.retakeAttempt } : {}),
         substitutions: substitutionsFor(entry.substitutions),
     };
 }

package/dist/tt/parse/entry-parts.d.ts

@@ -1,3 +1,4 @@
+export declare function parseRetakeAttempt(value: string): 1 | 2 | undefined;
 export declare function entryHtmlLines(html: string): string[];
 export declare function entryTextLines(html: string): string[];
 export declare function stripHtml(html: string): string;

package/dist/tt/parse/entry-parts.js

@@ -5,6 +5,11 @@ const GROUP_TOKEN_RE = /^[A-ZА-ЯЁ]{1,}(?:-[A-ZА-ЯЁa-zа-яё0-9]+)+$/u;
 const LEADING_PARENTHESIZED_RE = /^\s*\(([^()]*)\)/u;
 const WEEK_METADATA_RE = /(?:^|\s)нед\.?(?:\s|$)/iu;
 const SUBGROUP_METADATA_RE = /^\d+\s*подгруппа$/iu;
+const RETAKE_RE = /(?:^|\s)([12])\s*ППА(?:\s|$)/iu;
+export function parseRetakeAttempt(value) {
+    const match = value.match(RETAKE_RE);
+    return match ? Number(match[1]) : undefined;
+}
 export function entryHtmlLines(html) {
     return html.split(BR_RE).map((line) => line.trim());
 }

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

@@ -1,7 +1,7 @@
 import { parseHtml, parseTeacher, parseTime, parseWeekParity, parseWeeks, text, } from "../../common/parse.js";
 import { parseSubstitutionDiv, parseTransferDiv, } from "./overlays.js";
 import { SUBGROUP_RE, WEEKS_RE } from "./patterns.js";
-import { hasDistanceMarker, containsGroupCode, linesAfterSubject, parseLessonTypeAfterSubject, parseEntryRoom, stripDistanceMarker, } from "./entry-parts.js";
+import { hasDistanceMarker, containsGroupCode, linesAfterSubject, parseLessonTypeAfterSubject, parseEntryRoom, parseRetakeAttempt, stripDistanceMarker, stripHtml, } from "./entry-parts.js";
 export function parseGroupSchedule(html) {
     const doc = parseHtml(html);
     // Session layout has date-based cells with ids like "trd20251224"
@@ -180,6 +180,7 @@ function parseSessionEntry(td) {
     // Type: parenthesized text after </span>, case-insensitive
     const type = parseLessonTypeAfterSubject(subjectEl).toLowerCase();
     const subgroupMatch = plainText.match(SUBGROUP_RE);
+    const retakeAttempt = parseRetakeAttempt(stripHtml(fullHtml));
     const parts = linesAfterSubject(fullHtml, subject);
     const teacherPart = parts.find((part) => stripDistanceMarker(part).length > 0 &&
         !/^\d{2}:\d{2}\s*-\s*\d{2}:\d{2}$/.test(part) &&
@@ -198,6 +199,7 @@ function parseSessionEntry(td) {
             subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
             isDistance: hasDistanceMarker(plainText) || hasDistanceMarker(room ?? ""),
             possibleChanges,
+            ...(retakeAttempt ? { retakeAttempt } : {}),
         },
         time: { start: parseTime(timeMatch[1]), end: parseTime(timeMatch[2]) },
     };

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

@@ -1,5 +1,5 @@
 export { parseGroupsString } from "./groups.js";
-export { parseAcademicYearFromPage, parseRoomButtons, parseRoomName, parseFacultyButtons, parseGroupButtons, parseGroupName, parsePeriodFromPage, parseTeacherButtons, } from "./lists.js";
+export { parseAcademicYearFromPage, parseAvailablePeriodsFromPage, parseRoomButtons, parseRoomName, parseFacultyButtons, parseGroupButtons, parseGroupName, parsePeriodFromPage, parseTeacherButtons, } from "./lists.js";
 export { parseGroupSchedule } from "./full-schedule.js";
 export { parseRoomSchedule, parseRoomInfo, } from "./audience.js";
 export { parseTeacherSchedule, parseTeacherInfo, } from "./teacher.js";

package/dist/tt/parse/index.js

@@ -1,5 +1,5 @@
 export { parseGroupsString } from "./groups.js";
-export { parseAcademicYearFromPage, parseRoomButtons, parseRoomName, parseFacultyButtons, parseGroupButtons, parseGroupName, parsePeriodFromPage, parseTeacherButtons, } from "./lists.js";
+export { parseAcademicYearFromPage, parseAvailablePeriodsFromPage, parseRoomButtons, parseRoomName, parseFacultyButtons, parseGroupButtons, parseGroupName, parsePeriodFromPage, parseTeacherButtons, } from "./lists.js";
 export { parseGroupSchedule } from "./full-schedule.js";
 export { parseRoomSchedule, parseRoomInfo, } from "./audience.js";
 export { parseTeacherSchedule, parseTeacherInfo, } from "./teacher.js";

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

@@ -1,5 +1,7 @@
 import { AcademicPeriod } from "../../common/types.js";
 import type { Faculty, Group, Room } from "../types.js";
+/** Period tabs exposed by this timetable page, in portal order. */
+export declare function parseAvailablePeriodsFromPage(html: string): AcademicPeriod[];
 export declare function parsePeriodFromPage(html: string): AcademicPeriod | null;
 /** Parse the start year from labels like "2026/2027 учебный год". */
 export declare function parseAcademicYearFromPage(html: string): number | null;

package/dist/tt/parse/lists.js

@@ -1,21 +1,36 @@
 import { parseHtml, text } from "../../common/parse.js";
+import { AcademicPeriod } from "../../common/types.js";
 const PERIOD_LABELS = {
     "осенний семестр": 1,
     "зимняя сессия": 2,
     "весенний семестр": 3,
     "летняя сессия": 4,
+    "гиа": AcademicPeriod.StateFinalAssessment,
+    "ппа": AcademicPeriod.Retake,
 };
+const KNOWN_PERIODS = new Set(Object.values(AcademicPeriod).filter((value) => typeof value === "number"));
+/** Period tabs exposed by this timetable page, in portal order. */
+export function parseAvailablePeriodsFromPage(html) {
+    const doc = parseHtml(html);
+    const periods = new Set();
+    for (const input of doc.querySelectorAll('input[name="pertype"]')) {
+        const value = Number(input.getAttribute("value"));
+        if (KNOWN_PERIODS.has(value))
+            periods.add(value);
+    }
+    return [...periods];
+}
 export function parsePeriodFromPage(html) {
     const doc = parseHtml(html);
     // Schedule pages expose the active period as the checked radio button.
     const checked = doc.querySelector('input[name="pertype"][checked]');
     const checkedValue = Number(checked?.getAttribute("value"));
-    if (checkedValue >= 1 && checkedValue <= 4) {
+    if (KNOWN_PERIODS.has(checkedValue)) {
         return checkedValue;
     }
     // Some pages keep the selected period only in the hidden form field.
     const hiddenValue = Number(doc.querySelector('#htype')?.getAttribute("value"));
-    if (hiddenValue >= 1 && hiddenValue <= 4) {
+    if (KNOWN_PERIODS.has(hiddenValue)) {
         return hiddenValue;
     }
     // Legacy markup used an italic textual marker.

package/dist/tt/types.d.ts

@@ -96,6 +96,8 @@ export interface ParsedLesson {
     substituteFor?: SubstituteForInfo;
     /** Whether this entry is marked as potentially changing (class="want"). */
     possibleChanges?: boolean;
+    /** Repeated interim assessment attempt (ППА), when marked by the portal. */
+    retakeAttempt?: 1 | 2;
 }
 export interface ParsedScheduleBlock {
     /** Portal ordinal claim. It is independent from the time claim. */

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

@@ -2,5 +2,6 @@ export { formatLocalDate, getMonday, getWeekdayName, isSameDay, isLocalDate, par
 export { getAdjacentSemester, getCurrentPeriod, isSessionPeriod, } from "./period.js";
 export { getSemesterStart, getSemesterWeeks, getWeekNumber, } from "./semester.js";
 export { getStandardScheduleBlocks } from "./time-slots.js";
+export { LessonType, parseLessonType } from "./lesson-type.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,4 +2,5 @@ export { formatLocalDate, getMonday, getWeekdayName, isSameDay, isLocalDate, par
 export { getAdjacentSemester, getCurrentPeriod, isSessionPeriod, } from "./period.js";
 export { getSemesterStart, getSemesterWeeks, getWeekNumber, } from "./semester.js";
 export { getStandardScheduleBlocks } from "./time-slots.js";
+export { LessonType, parseLessonType } from "./lesson-type.js";
 export { getCompensatingWorkDays, getEffectiveHolidays, getHolidayTransfers, isHoliday, RUSSIAN_HOLIDAYS, } from "./holidays.js";

package/dist/tt/utils/lesson-type.d.ts

@@ -0,0 +1,17 @@
+/** Stable compact identifiers for portal lesson types. */
+export declare enum LessonType {
+    Unknown = 0,
+    Lecture = 1,
+    Practical = 2,
+    Laboratory = 3,
+    Consultation = 4,
+    Credit = 5,
+    GradedCredit = 6,
+    Exam = 7,
+    Individual = 8,
+    Group = 9,
+    CourseProject = 10,
+    Krp = 11
+}
+/** Convert portal short code into compact domain identifier. */
+export declare function parseLessonType(code: string): LessonType;

package/dist/tt/utils/lesson-type.js

@@ -0,0 +1,33 @@
+/** Stable compact identifiers for portal lesson types. */
+export var LessonType;
+(function (LessonType) {
+    LessonType[LessonType["Unknown"] = 0] = "Unknown";
+    LessonType[LessonType["Lecture"] = 1] = "Lecture";
+    LessonType[LessonType["Practical"] = 2] = "Practical";
+    LessonType[LessonType["Laboratory"] = 3] = "Laboratory";
+    LessonType[LessonType["Consultation"] = 4] = "Consultation";
+    LessonType[LessonType["Credit"] = 5] = "Credit";
+    LessonType[LessonType["GradedCredit"] = 6] = "GradedCredit";
+    LessonType[LessonType["Exam"] = 7] = "Exam";
+    LessonType[LessonType["Individual"] = 8] = "Individual";
+    LessonType[LessonType["Group"] = 9] = "Group";
+    LessonType[LessonType["CourseProject"] = 10] = "CourseProject";
+    LessonType[LessonType["Krp"] = 11] = "Krp";
+})(LessonType || (LessonType = {}));
+const TYPE_BY_CODE = {
+    лк: LessonType.Lecture,
+    пр: LessonType.Practical,
+    лб: LessonType.Laboratory,
+    конс: LessonType.Consultation,
+    зач: LessonType.Credit,
+    зачо: LessonType.GradedCredit,
+    экз: LessonType.Exam,
+    из: LessonType.Individual,
+    гз: LessonType.Group,
+    кп: LessonType.CourseProject,
+    крп: LessonType.Krp,
+};
+/** Convert portal short code into compact domain identifier. */
+export function parseLessonType(code) {
+    return TYPE_BY_CODE[code.trim().toLocaleLowerCase("ru-RU").replace(/\.$/u, "")] ?? LessonType.Unknown;
+}

package/dist/tt/webinars.js

@@ -1,3 +1,4 @@
+import { LessonType, parseLessonType } from "./utils/lesson-type.js";
 function normalize(value) {
     return value
         .toLocaleLowerCase("ru-RU")
@@ -25,7 +26,7 @@ export function findWebinar(lesson, webinars) {
         }
         if (normalize(webinar.subject) !== normalize(lesson.subject))
             return false;
-        if (webinar.type && lesson.type && webinar.type !== lesson.type)
+        if (webinar.type && lesson.type !== LessonType.Unknown && parseLessonType(webinar.type) !== lesson.type)
             return false;
         return true;
     });

package/docs/v5-migration.md

@@ -104,7 +104,10 @@ new TimetableClient({ educationLevel: EducationLevel.HigherEducation });
 | `getTeacherPhoto(id)` / `getTeacherPhotoLazy(id)` | `getTeacherPhoto(id)` |
 
 `getGroupSchedule`, `getTeacherSchedule` и `getRoomSchedule` по умолчанию
-загружают все четыре периода. Для ограничения запросов передайте `periods`:
+загружают все периоды, доступные на соответствующей странице портала, включая
+ГИА (`AcademicPeriod.StateFinalAssessment`, 9) и ППА (`AcademicPeriod.Retake`, 11).
+Уроки ППА содержат `retakeAttempt: 1 | 2`, если номер попытки указан на сайте.
+Для ограничения запросов передайте `periods`:
 
 ```ts
 import { AcademicPeriod } from "chuvsu-js";
@@ -117,6 +120,10 @@ const schedule = await client.getTeacherSchedule(teacherId, {
 });
 ```
 
+`LessonType` хранит тип занятия числом в наблюдениях, репозитории и снимке.
+`parseLessonType(code)` переводит код портала в этот индекс. Для неизвестного
+кода возвращается `LessonType.Unknown`; текстовые расшифровки принадлежат клиенту.
+
 Для кода, который работает с разными владельцами одинаково, добавлен общий
 метод:
 
@@ -314,7 +321,7 @@ schedule.dateKeys({ subgroup: 2 }); // даты для календаря
 после дополнения пары из другого расписания. ` ScheduleSnapshot` использует ту же
 логику дат, переносов, праздников и подгрупп, что и `Schedule`.
 
-Формат `SerializedScheduleSnapshot` имеет `schemaVersion: 2`.
+Формат `SerializedScheduleSnapshot` имеет `schemaVersion: 3`.
 Новые UUID идентификаторы серий и пар кодируются короче; для перевода сохранённых
 идентификаторов v5 используйте `migrateLegacyLessonId`.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chuvsu-js",
-  "version": "5.3.0",
+  "version": "5.4.0",
   "description": "Библиотека для расписания и личного кабинета ЧГУ им. И. Н. Ульянова",
   "type": "module",
   "main": "dist/index.js",