chuvsu-js 0.2.0 → 1.0.0

package/README.md

@@ -5,8 +5,6 @@ Node.js библиотека для работы с порталами ЧувГ
 - **tt.chuvsu.ru** — расписание занятий (факультеты, группы, преподаватели)
 - **lk.chuvsu.ru** — личный кабинет студента (персональные данные)
 
-Пока что очень сырая, много что можно оптимизировать.
-
 ## Установка
 
 ```bash
@@ -27,19 +25,30 @@ await tt.loginAsGuest();
 
 // Найти группу по названию
 const groups = await tt.searchGroup({ name: "КТ-41-24" });
-console.log(groups); // [{ id: 123, name: "КТ-41-24", specialty: "...", profile: "..." }]
+console.log(groups); // [{ id: 8919, name: "КТ-41-24", specialty: "...", profile: "..." }]
 
-// Получить расписание на сегодня
-const lessons = await tt.getScheduleForDate({
-  groupId: groups[0].id,
-  date: new Date(),
-});
+// Получить расписание группы
+const schedule = await tt.getSchedule({ groupId: groups[0].id });
 
-for (const lesson of lessons) {
+// Расписание на сегодня
+const today = schedule.today();
+for (const lesson of today) {
   console.log(
     `${lesson.start.hours}:${lesson.start.minutes} — ${lesson.subject} (${lesson.type})`,
   );
 }
+
+// С фильтром по подгруппе
+schedule.today({ subgroup: 1 });
+
+// На завтра
+schedule.tomorrow();
+
+// На текущую неделю
+schedule.thisWeek();
+
+// Текущая пара
+schedule.currentLesson();
 ```
 
 ### Личный кабинет (LkClient)
@@ -84,30 +93,13 @@ await tt.login({ email: "...", password: "..." });
 await tt.loginAsGuest();
 ```
 
-#### Расписание
+#### Получение расписания
 
 ```ts
-// Полное расписание группы (все дни, все слоты)
-const schedule = await tt.getGroupSchedule({ groupId, period? });
-
-// Расписание на конкретную дату
-const lessons = await tt.getScheduleForDate({ groupId, date, filter?, period? });
-
-// Расписание на день недели (0 = воскресенье, 1 = понедельник, ...)
-const lessons = await tt.getScheduleForDay({ groupId, weekday, filter?, period? });
-
-// Расписание на неделю
-const week = await tt.getScheduleForWeek({ groupId, week?, filter?, period? });
-
-// Текущая пара
-const lesson = await tt.getCurrentLesson({ groupId, filter? });
+const schedule = await tt.getSchedule({ groupId, period? });
 ```
 
-**ScheduleFilter** — фильтрация по подгруппе и/или неделе:
-
-```ts
-{ subgroup?: number; week?: number }
-```
+Возвращает объект `Schedule`, который позволяет получать расписание локально, без дополнительных запросов к серверу.
 
 #### Поиск
 
@@ -125,6 +117,13 @@ const groups = await tt.searchGroup({ name: "ЗИ" });
 const teachers = await tt.searchTeacher({ name: "Иванов" });
 ```
 
+#### Период
+
+```ts
+// Текущий учебный период
+const period = tt.getCurrentPeriod();
+```
+
 #### Кеш
 
 ```ts
@@ -137,10 +136,71 @@ const data = tt.exportCache();
 tt.importCache(data);
 ```
 
-Категории кеша: `schedule`, `faculties`, `groups`, `currentPeriod`.
+Категории кеша: `schedule`, `faculties`, `groups`.
+
+### Schedule
+
+Объект расписания группы. Все методы синхронные — данные уже загружены.
+
+#### Свойства
+
+```ts
+schedule.groupId; // ID группы
+schedule.period; // Учебный период
+schedule.days; // Сырые данные (FullScheduleDay[])
+```
+
+#### Расписание по дате
+
+```ts
+// На сегодня
+schedule.today({ subgroup?: number });
+
+// На завтра
+schedule.tomorrow({ subgroup?: number });
+
+// На конкретную дату
+schedule.forDate(date: Date, { subgroup?: number });
+```
+
+#### Расписание по неделе
+
+```ts
+// На текущую неделю
+schedule.thisWeek({ subgroup?: number });
+
+// На конкретную неделю
+schedule.forWeek(week?: number, { subgroup?: number });
+```
+
+#### Расписание по дню недели
+
+```ts
+// По дню недели (0 = воскресенье, 1 = понедельник, ...)
+schedule.forDay(weekday: number, { subgroup?: number, week?: number });
+```
+
+#### Текущая пара
+
+```ts
+const lesson = schedule.currentLesson({ subgroup?: number });
+```
 
 #### Утилиты семестра
 
+```ts
+// Номер текущей недели
+schedule.getWeekNumber(date?: Date);
+
+// Все недели семестра
+schedule.getSemesterWeeks(weekCount?: number);
+
+// Начало семестра
+schedule.getSemesterStart();
+```
+
+Утилиты также доступны как standalone функции:
+
 ```ts
 import {
   getSemesterStart,
@@ -149,13 +209,8 @@ import {
   Period,
 } from "chuvsu-js";
 
-// Начало семестра
 getSemesterStart({ period: Period.FallSemester, year: 2025 });
-
-// Все недели семестра
 getSemesterWeeks({ period: Period.SpringSemester });
-
-// Номер текущей недели
 getWeekNumber({ period: Period.SpringSemester });
 ```
 

package/dist/index.d.ts

@@ -1,8 +1,9 @@
 export { LkClient } from "./lk/client.js";
 export { TtClient } from "./tt/client.js";
+export { Schedule } from "./tt/schedule.js";
 export type { CacheEntry } from "./common/cache.js";
-export { getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, filterSlots, slotsToLessons, } from "./tt/schedule.js";
+export { getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, } from "./tt/utils.js";
 export { Period, EducationType, AuthError, ParseError } from "./common/types.js";
 export type { Time, WeekRange, Teacher, } from "./common/types.js";
 export type { PersonalData, } from "./lk/types.js";
-export type { Faculty, Group, ScheduleEntry, FullScheduleSlot, FullScheduleDay, LessonTimeSlot, Lesson, LessonTime, ScheduleWeekDay, ScheduleFilter, SemesterWeek, TtClientOptions, CacheConfig, } from "./tt/types.js";
+export type { Faculty, Group, ScheduleEntry, FullScheduleSlot, FullScheduleDay, LessonTimeSlot, Lesson, LessonTime, SemesterWeek, TtClientOptions, CacheConfig, } from "./tt/types.js";

package/dist/index.js

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

package/dist/lk/client.d.ts

@@ -1,10 +1,13 @@
 import type { PersonalData } from "./types.js";
 export declare class LkClient {
     private http;
+    private credentials;
     login(opts: {
         email: string;
         password: string;
     }): Promise<void>;
+    private isSessionExpired;
+    private authGet;
     getPersonalData(): Promise<PersonalData>;
     getGroupId(): Promise<number | null>;
 }

package/dist/lk/client.js

@@ -6,14 +6,27 @@ const LOGIN_URL = `${BASE}/info/login.php`;
 const STUDENT_BASE = `${BASE}/student`;
 export class LkClient {
     http = new HttpClient();
+    credentials = null;
     async login(opts) {
         const res = await this.http.post(LOGIN_URL, { email: opts.email, password: opts.password, role: "1", enter: "" }, false);
         if (!(res.status === 302 && res.location?.includes("student"))) {
             throw new AuthError("LK login failed");
         }
+        this.credentials = opts;
+    }
+    isSessionExpired(body) {
+        return body.includes("login.php");
+    }
+    async authGet(url) {
+        const res = await this.http.get(url);
+        if (this.credentials && this.isSessionExpired(res.body)) {
+            await this.login(this.credentials);
+            return this.http.get(url);
+        }
+        return res;
     }
     async getPersonalData() {
-        const { body } = await this.http.get(`${STUDENT_BASE}/personal_data.php`);
+        const { body } = await this.authGet(`${STUDENT_BASE}/personal_data.php`);
         const vals = extractScriptValues(body, "form_personal_data");
         return {
             lastName: vals.fam ?? "",
@@ -32,7 +45,7 @@ export class LkClient {
         };
     }
     async getGroupId() {
-        const { body } = await this.http.get(`${STUDENT_BASE}/tt.php`);
+        const { body } = await this.authGet(`${STUDENT_BASE}/tt.php`);
         const match = body.match(/tt\.chuvsu\.ru\/index\/grouptt\/gr\/(\d+)/);
         return match ? parseInt(match[1]) : null;
     }

package/dist/tt/client.d.ts

@@ -1,10 +1,12 @@
 import type { CacheEntry } from "../common/cache.js";
 import { Period } from "../common/types.js";
-import type { Faculty, Group, FullScheduleDay, ScheduleFilter, Lesson, ScheduleWeekDay, TtClientOptions, CacheConfig } from "./types.js";
+import { Schedule } from "./schedule.js";
+import type { Faculty, Group, TtClientOptions, CacheConfig } from "./types.js";
 export declare class TtClient {
     private http;
     private educationType;
     private cache;
+    private loginMode;
     constructor(opts?: TtClientOptions);
     private get pertt();
     clearCache(category?: keyof CacheConfig): void;
@@ -15,34 +17,14 @@ export declare class TtClient {
         password: string;
     }): Promise<void>;
     loginAsGuest(): Promise<void>;
-    getGroupSchedule(opts: {
+    private isSessionExpired;
+    private relogin;
+    private authGet;
+    private authPost;
+    getSchedule(opts: {
         groupId: number;
         period?: Period;
-    }): Promise<FullScheduleDay[]>;
-    private getFilteredSlots;
-    private getDateForWeekday;
-    getScheduleForDay(opts: {
-        groupId: number;
-        weekday: number;
-        filter?: ScheduleFilter;
-        period?: Period;
-    }): Promise<Lesson[]>;
-    getScheduleForDate(opts: {
-        groupId: number;
-        date: Date;
-        subgroup?: number;
-        period?: Period;
-    }): Promise<Lesson[]>;
-    getScheduleForWeek(opts: {
-        groupId: number;
-        week?: number;
-        filter?: ScheduleFilter;
-        period?: Period;
-    }): Promise<ScheduleWeekDay[]>;
-    getCurrentLesson(opts: {
-        groupId: number;
-        subgroup?: number;
-    }): Promise<Lesson | null>;
+    }): Promise<Schedule>;
     getCurrentPeriod(opts?: {
         date?: Date;
     }): Period;

package/dist/tt/client.js

@@ -2,13 +2,14 @@ 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 { filterSlots, getMonday, getWeekdayName, getWeekNumber, getSemesterStart, getSemesterWeeks, slotsToLessons, } from "./schedule.js";
+import { Schedule } from "./schedule.js";
 const BASE = "https://tt.chuvsu.ru";
 const AUTH_URL = `${BASE}/auth`;
 export class TtClient {
     http = new HttpClient();
     educationType;
     cache;
+    loginMode = null;
     constructor(opts) {
         this.educationType = opts?.educationType ?? 1 /* EducationType.HigherEducation */;
         if (opts?.cache == null) {
@@ -51,125 +52,66 @@ export class TtClient {
         if (res.status !== 302) {
             throw new AuthError("TT login failed");
         }
+        this.loginMode = { type: "credentials", ...opts };
     }
     async loginAsGuest() {
         const res = await this.http.post(AUTH_URL, { guest: "Войти гостем", hfac: "0", pertt: this.pertt }, false);
         if (res.status !== 302) {
             throw new AuthError("TT guest login failed");
         }
+        this.loginMode = { type: "guest" };
     }
-    // --- Schedule ---
-    async getGroupSchedule(opts) {
-        const cacheKey = `${opts.groupId}:${opts.period ?? 0}`;
-        const cached = this.cache?.get("schedule", cacheKey);
-        if (cached)
-            return cached;
-        const url = `${BASE}/index/grouptt/gr/${opts.groupId}`;
-        let body;
-        if (opts.period !== undefined) {
-            ({ body } = await this.http.post(url, { htype: String(opts.period) }));
+    isSessionExpired(body) {
+        return body.includes('name="wname"');
+    }
+    async relogin() {
+        if (!this.loginMode)
+            return;
+        if (this.loginMode.type === "credentials") {
+            await this.login(this.loginMode);
         }
         else {
-            ({ body } = await this.http.get(url));
+            await this.loginAsGuest();
         }
-        const data = parseFullSchedule(body);
-        this.cache?.set("schedule", cacheKey, data);
-        return data;
     }
-    async getFilteredSlots(opts) {
-        const schedule = await this.getGroupSchedule({
-            groupId: opts.groupId,
-            period: opts.period,
-        });
-        const dayName = getWeekdayName(opts.weekday);
-        const day = schedule.find((d) => d.weekday.toLowerCase() === dayName.toLowerCase());
-        if (!day)
-            return [];
-        return filterSlots(day.slots, opts.filter);
-    }
-    getDateForWeekday(weekday, period, week) {
-        if (week != null) {
-            const semesterStart = getSemesterStart({ period });
-            const startMonday = getMonday(semesterStart);
-            const date = new Date(startMonday);
-            date.setDate(startMonday.getDate() +
-                (week - 1) * 7 +
-                (weekday === 0 ? 6 : weekday - 1));
-            return date;
+    async authGet(url) {
+        const res = await this.http.get(url);
+        if (this.loginMode && this.isSessionExpired(res.body)) {
+            await this.relogin();
+            return this.http.get(url);
         }
-        const now = new Date();
-        const currentDay = now.getDay();
-        const diff = weekday - currentDay;
-        const date = new Date(now);
-        date.setDate(now.getDate() + diff);
-        date.setHours(0, 0, 0, 0);
-        return date;
-    }
-    async getScheduleForDay(opts) {
-        const period = opts.period ?? this.getCurrentPeriod();
-        const slots = await this.getFilteredSlots({
-            groupId: opts.groupId,
-            weekday: opts.weekday,
-            filter: opts.filter,
-            period,
-        });
-        const date = this.getDateForWeekday(opts.weekday, period, opts.filter?.week);
-        return slotsToLessons(slots, date);
-    }
-    async getScheduleForDate(opts) {
-        const weekday = opts.date.getDay();
-        const period = opts.period ?? this.getCurrentPeriod({ date: opts.date });
-        const effectiveFilter = { subgroup: opts.subgroup };
-        if (effectiveFilter.week == null) {
-            effectiveFilter.week = getWeekNumber({ period, date: opts.date });
+        return res;
+    }
+    async authPost(url, data) {
+        const res = await this.http.post(url, data);
+        if (this.loginMode && this.isSessionExpired(res.body)) {
+            await this.relogin();
+            return this.http.post(url, data);
         }
-        const slots = await this.getFilteredSlots({
-            groupId: opts.groupId,
-            weekday,
-            filter: effectiveFilter,
-            period,
-        });
-        return slotsToLessons(slots, opts.date);
+        return res;
     }
-    async getScheduleForWeek(opts) {
+    // --- Schedule ---
+    async getSchedule(opts) {
         const period = opts.period ?? this.getCurrentPeriod();
-        const week = opts.week ?? getWeekNumber({ period });
-        const effectiveFilter = { ...opts.filter, week };
-        const semesterWeeks = getSemesterWeeks({ period, weekCount: week });
-        const weekData = semesterWeeks.find((w) => w.week === week);
-        const mondayDate = weekData ? weekData.start : new Date();
-        const result = [];
-        for (let i = 0; i < 7; i++) {
-            const date = new Date(mondayDate);
-            date.setDate(mondayDate.getDate() + i);
-            date.setHours(0, 0, 0, 0);
-            const weekday = i === 6 ? 0 : i + 1;
-            const slots = await this.getFilteredSlots({
-                groupId: opts.groupId,
-                weekday,
-                filter: effectiveFilter,
-                period,
-            });
-            result.push({ date, lessons: slotsToLessons(slots, date) });
+        const cacheKey = `${opts.groupId}:${period}`;
+        const cached = this.cache?.get("schedule", cacheKey);
+        let days;
+        if (cached) {
+            days = cached;
         }
-        return result;
-    }
-    async getCurrentLesson(opts) {
-        const now = new Date();
-        const lessons = await this.getScheduleForDate({
-            groupId: opts.groupId,
-            date: now,
-            subgroup: opts.subgroup,
-        });
-        const timeMinutes = now.getHours() * 60 + now.getMinutes();
-        for (const lesson of lessons) {
-            const start = lesson.start.hours * 60 + lesson.start.minutes;
-            const end = lesson.end.hours * 60 + lesson.end.minutes;
-            if (timeMinutes >= start && timeMinutes <= end) {
-                return lesson;
+        else {
+            const url = `${BASE}/index/grouptt/gr/${opts.groupId}`;
+            let body;
+            if (opts.period !== undefined) {
+                ({ body } = await this.authPost(url, { htype: String(opts.period) }));
+            }
+            else {
+                ({ body } = await this.authGet(url));
             }
+            days = parseFullSchedule(body);
+            this.cache?.set("schedule", cacheKey, days);
         }
-        return null;
+        return new Schedule(opts.groupId, period, days);
     }
     // --- Period ---
     getCurrentPeriod(opts) {
@@ -193,7 +135,7 @@ export class TtClient {
         const cached = this.cache?.get("faculties", "all");
         if (cached)
             return cached;
-        const { body } = await this.http.get(`${BASE}/`);
+        const { body } = await this.authGet(`${BASE}/`);
         const data = parseFacultyButtons(body);
         this.cache?.set("faculties", "all", data);
         return data;
@@ -203,7 +145,7 @@ export class TtClient {
         const cached = this.cache?.get("groups", cacheKey);
         if (cached)
             return cached;
-        const { body } = await this.http.post(`${BASE}/`, {
+        const { body } = await this.authPost(`${BASE}/`, {
             hfac: String(opts.facultyId),
             pertt: this.pertt,
         });
@@ -212,7 +154,7 @@ export class TtClient {
         return data;
     }
     async searchGroup(opts) {
-        const { body } = await this.http.post(`${BASE}/`, {
+        const { body } = await this.authPost(`${BASE}/`, {
             grname: opts.name,
             findgr: "найти",
             hfac: "0",
@@ -221,7 +163,7 @@ export class TtClient {
         return parseGroupButtons(body);
     }
     async searchTeacher(opts) {
-        const { body } = await this.http.post(`${BASE}/`, {
+        const { body } = await this.authPost(`${BASE}/`, {
             techname: opts.name,
             findtech: "найти",
             hfac: "0",

package/dist/tt/schedule.d.ts

@@ -1,31 +1,35 @@
-import type { FullScheduleSlot, ScheduleFilter, SemesterWeek, Lesson } from "./types.js";
+import type { FullScheduleDay, SemesterWeek, Lesson } from "./types.js";
 import { Period } from "../common/types.js";
-export declare function getWeekdayName(weekday: number): string;
-export declare function filterSlots(slots: FullScheduleSlot[], filter?: ScheduleFilter): FullScheduleSlot[];
-export declare function getMonday(date: Date): Date;
-/**
- * Get the start date of a semester.
- * Fall: September 1 of the given year.
- * Spring: first Monday of February of the given year.
- */
-export declare function getSemesterStart(opts: {
-    period: Period;
-    year?: number;
-}): Date;
-/**
- * Get all weeks in a semester with their start/end dates.
- * Week 0 starts from the semester start date.
- */
-export declare function getSemesterWeeks(opts: {
-    period: Period;
-    year?: number;
-    weekCount?: number;
-}): SemesterWeek[];
-/**
- * Get the current week number within a semester.
- */
-export declare function getWeekNumber(opts: {
-    period: Period;
-    date?: Date;
-}): number;
-export declare function slotsToLessons(slots: FullScheduleSlot[], date: Date): Lesson[];
+export declare class Schedule {
+    readonly groupId: number;
+    readonly period: Period;
+    readonly days: FullScheduleDay[];
+    constructor(groupId: number, period: Period, days: FullScheduleDay[]);
+    private getSlotsForWeekday;
+    private getDateForWeekday;
+    forDay(weekday: number, opts?: {
+        subgroup?: number;
+        week?: number;
+    }): Lesson[];
+    forDate(date: Date, opts?: {
+        subgroup?: number;
+    }): Lesson[];
+    forWeek(week?: number, opts?: {
+        subgroup?: number;
+    }): Lesson[];
+    today(opts?: {
+        subgroup?: number;
+    }): Lesson[];
+    tomorrow(opts?: {
+        subgroup?: number;
+    }): Lesson[];
+    thisWeek(opts?: {
+        subgroup?: number;
+    }): Lesson[];
+    currentLesson(opts?: {
+        subgroup?: number;
+    }): Lesson | null;
+    getWeekNumber(date?: Date): number;
+    getSemesterWeeks(weekCount?: number): SemesterWeek[];
+    getSemesterStart(): Date;
+}

package/dist/tt/schedule.js

@@ -1,124 +1,104 @@
-const WEEKDAY_NAMES = [
-    "Воскресенье",
-    "Понедельник",
-    "Вторник",
-    "Среда",
-    "Четверг",
-    "Пятница",
-    "Суббота",
-];
-export function getWeekdayName(weekday) {
-    return WEEKDAY_NAMES[weekday] ?? "";
-}
-export function filterSlots(slots, filter) {
-    if (filter?.subgroup == null && filter?.week == null)
-        return slots;
-    return slots
-        .map((slot) => ({
-        ...slot,
-        entries: filterEntries(slot.entries, filter),
-    }))
-        .filter((slot) => slot.entries.length > 0);
-}
-function filterEntries(entries, filter) {
-    return entries.filter((e) => {
-        if (filter?.subgroup && e.subgroup && e.subgroup !== filter.subgroup) {
-            return false;
-        }
-        if (filter?.week != null) {
-            if (e.weeks.from > 0 &&
-                (filter.week < e.weeks.from || filter.week > e.weeks.to)) {
-                return false;
-            }
-            if (e.weekParity) {
-                const isEven = filter.week % 2 === 0;
-                if (e.weekParity === "even" && !isEven)
-                    return false;
-                if (e.weekParity === "odd" && isEven)
-                    return false;
-            }
+import { getWeekdayName, getMonday, getSemesterStart, getSemesterWeeks, getWeekNumber, filterSlots, slotsToLessons, } from "./utils.js";
+export class Schedule {
+    groupId;
+    period;
+    days;
+    constructor(groupId, period, days) {
+        this.groupId = groupId;
+        this.period = period;
+        this.days = days;
+    }
+    getSlotsForWeekday(weekday, opts) {
+        const dayName = getWeekdayName(weekday);
+        const day = this.days.find((d) => d.weekday.toLowerCase() === dayName.toLowerCase());
+        if (!day)
+            return [];
+        return filterSlots(day.slots, opts);
+    }
+    getDateForWeekday(weekday, week) {
+        if (week != null) {
+            const startMonday = getMonday(getSemesterStart({ period: this.period }));
+            const date = new Date(startMonday);
+            date.setDate(startMonday.getDate() +
+                (week - 1) * 7 +
+                (weekday === 0 ? 6 : weekday - 1));
+            return date;
         }
-        return true;
-    });
-}
-export function getMonday(date) {
-    const d = new Date(date);
-    const day = d.getDay();
-    const diff = day === 0 ? -6 : 1 - day;
-    d.setDate(d.getDate() + diff);
-    d.setHours(0, 0, 0, 0);
-    return d;
-}
-/**
- * Get the start date of a semester.
- * Fall: September 1 of the given year.
- * Spring: first Monday of February of the given year.
- */
-export function getSemesterStart(opts) {
-    const year = opts.year ?? new Date().getFullYear();
-    if (opts.period === 1 /* Period.FallSemester */) {
-        return new Date(year, 8, 1); // September 1
+        const now = new Date();
+        const currentDay = now.getDay();
+        const diff = weekday - currentDay;
+        const date = new Date(now);
+        date.setDate(now.getDate() + diff);
+        date.setHours(0, 0, 0, 0);
+        return date;
     }
-    // Spring: first Monday of February
-    const feb1 = new Date(year, 1, 1);
-    const day = feb1.getDay();
-    const daysToAdd = day === 1 ? 0 : day === 0 ? 1 : 8 - day;
-    const firstMonday = new Date(year, 1, 1 + daysToAdd);
-    firstMonday.setHours(0, 0, 0, 0);
-    return firstMonday;
-}
-/**
- * Get all weeks in a semester with their start/end dates.
- * Week 0 starts from the semester start date.
- */
-export function getSemesterWeeks(opts) {
-    const weekCount = opts.weekCount ?? 17;
-    const semesterStart = getSemesterStart(opts);
-    const startMonday = getMonday(semesterStart);
-    const weeks = [];
-    for (let i = 0; i <= weekCount; i++) {
-        const start = new Date(startMonday);
-        start.setDate(startMonday.getDate() + i * 7);
-        const end = new Date(start);
-        end.setDate(start.getDate() + 6);
-        end.setHours(23, 59, 59, 999);
-        weeks.push({ week: i, start, end });
+    forDay(weekday, opts) {
+        const slots = this.getSlotsForWeekday(weekday, opts);
+        const date = this.getDateForWeekday(weekday, opts?.week);
+        return slotsToLessons(slots, date);
     }
-    return weeks;
-}
-/**
- * Get the current week number within a semester.
- */
-export function getWeekNumber(opts) {
-    const date = opts.date ?? new Date();
-    const semesterStart = getSemesterStart(opts);
-    const startMonday = getMonday(semesterStart);
-    const targetMonday = getMonday(date);
-    const diff = targetMonday.getTime() - startMonday.getTime();
-    return Math.floor(diff / (7 * 24 * 60 * 60 * 1000));
-}
-function makeLessonTime(date, time) {
-    const d = new Date(date);
-    d.setHours(time.hours, time.minutes, 0, 0);
-    return { date: d, hours: time.hours, minutes: time.minutes };
-}
-export function slotsToLessons(slots, date) {
-    const lessons = [];
-    for (const slot of slots) {
-        for (const entry of slot.entries) {
-            lessons.push({
-                number: slot.number,
-                start: makeLessonTime(date, slot.timeStart),
-                end: makeLessonTime(date, slot.timeEnd),
-                subject: entry.subject,
-                type: entry.type,
-                room: entry.room,
-                teacher: entry.teacher,
-                weeks: entry.weeks,
-                subgroup: entry.subgroup,
-                weekParity: entry.weekParity,
+    forDate(date, opts) {
+        const weekday = date.getDay();
+        const week = getWeekNumber({ period: this.period, date });
+        const slots = this.getSlotsForWeekday(weekday, {
+            subgroup: opts?.subgroup,
+            week,
+        });
+        return slotsToLessons(slots, date);
+    }
+    forWeek(week, opts) {
+        const effectiveWeek = week ?? getWeekNumber({ period: this.period });
+        const semesterWeeks = getSemesterWeeks({
+            period: this.period,
+            weekCount: effectiveWeek,
+        });
+        const weekData = semesterWeeks.find((w) => w.week === effectiveWeek);
+        const mondayDate = weekData ? weekData.start : new Date();
+        const lessons = [];
+        for (let i = 0; i < 7; i++) {
+            const date = new Date(mondayDate);
+            date.setDate(mondayDate.getDate() + i);
+            date.setHours(0, 0, 0, 0);
+            const weekday = i === 6 ? 0 : i + 1;
+            const slots = this.getSlotsForWeekday(weekday, {
+                subgroup: opts?.subgroup,
+                week: effectiveWeek,
             });
+            lessons.push(...slotsToLessons(slots, date));
         }
+        return lessons;
+    }
+    today(opts) {
+        return this.forDate(new Date(), opts);
+    }
+    tomorrow(opts) {
+        const date = new Date();
+        date.setDate(date.getDate() + 1);
+        return this.forDate(date, opts);
+    }
+    thisWeek(opts) {
+        return this.forWeek(undefined, opts);
+    }
+    currentLesson(opts) {
+        const now = new Date();
+        const lessons = this.forDate(now, opts);
+        const timeMinutes = now.getHours() * 60 + now.getMinutes();
+        for (const lesson of lessons) {
+            const start = lesson.start.hours * 60 + lesson.start.minutes;
+            const end = lesson.end.hours * 60 + lesson.end.minutes;
+            if (timeMinutes >= start && timeMinutes <= end) {
+                return lesson;
+            }
+        }
+        return null;
+    }
+    getWeekNumber(date) {
+        return getWeekNumber({ period: this.period, date });
+    }
+    getSemesterWeeks(weekCount) {
+        return getSemesterWeeks({ period: this.period, weekCount });
+    }
+    getSemesterStart() {
+        return getSemesterStart({ period: this.period });
     }
-    return lessons;
 }

package/dist/tt/types.d.ts

@@ -50,14 +50,6 @@ export interface Lesson {
     subgroup?: number;
     weekParity?: "even" | "odd";
 }
-export interface ScheduleWeekDay {
-    date: Date;
-    lessons: Lesson[];
-}
-export interface ScheduleFilter {
-    subgroup?: number;
-    week?: number;
-}
 export interface SemesterWeek {
     week: number;
     start: Date;

package/dist/tt/utils.d.ts

@@ -0,0 +1,34 @@
+import type { FullScheduleSlot, SemesterWeek, Lesson } from "./types.js";
+import { Period } from "../common/types.js";
+export declare function getWeekdayName(weekday: number): string;
+export declare function getMonday(date: Date): Date;
+/**
+ * Get the start date of a semester.
+ * Fall: September 1 of the given year.
+ * Spring: first Monday of February of the given year.
+ */
+export declare function getSemesterStart(opts: {
+    period: Period;
+    year?: number;
+}): Date;
+/**
+ * Get all weeks in a semester with their start/end dates.
+ * Week 0 starts from the semester start date.
+ */
+export declare function getSemesterWeeks(opts: {
+    period: Period;
+    year?: number;
+    weekCount?: number;
+}): SemesterWeek[];
+/**
+ * Get the current week number within a semester.
+ */
+export declare function getWeekNumber(opts: {
+    period: Period;
+    date?: Date;
+}): number;
+export declare function filterSlots(slots: FullScheduleSlot[], opts?: {
+    subgroup?: number;
+    week?: number;
+}): FullScheduleSlot[];
+export declare function slotsToLessons(slots: FullScheduleSlot[], date: Date): Lesson[];

package/dist/tt/utils.js

@@ -0,0 +1,124 @@
+const WEEKDAY_NAMES = [
+    "Воскресенье",
+    "Понедельник",
+    "Вторник",
+    "Среда",
+    "Четверг",
+    "Пятница",
+    "Суббота",
+];
+export function getWeekdayName(weekday) {
+    return WEEKDAY_NAMES[weekday] ?? "";
+}
+export function getMonday(date) {
+    const d = new Date(date);
+    const day = d.getDay();
+    const diff = day === 0 ? -6 : 1 - day;
+    d.setDate(d.getDate() + diff);
+    d.setHours(0, 0, 0, 0);
+    return d;
+}
+/**
+ * Get the start date of a semester.
+ * Fall: September 1 of the given year.
+ * Spring: first Monday of February of the given year.
+ */
+export function getSemesterStart(opts) {
+    const year = opts.year ?? new Date().getFullYear();
+    if (opts.period === 1 /* Period.FallSemester */) {
+        return new Date(year, 8, 1); // September 1
+    }
+    // Spring: first Monday of February
+    const feb1 = new Date(year, 1, 1);
+    const day = feb1.getDay();
+    const daysToAdd = day === 1 ? 0 : day === 0 ? 1 : 8 - day;
+    const firstMonday = new Date(year, 1, 1 + daysToAdd);
+    firstMonday.setHours(0, 0, 0, 0);
+    return firstMonday;
+}
+/**
+ * Get all weeks in a semester with their start/end dates.
+ * Week 0 starts from the semester start date.
+ */
+export function getSemesterWeeks(opts) {
+    const weekCount = opts.weekCount ?? 17;
+    const semesterStart = getSemesterStart(opts);
+    const startMonday = getMonday(semesterStart);
+    const weeks = [];
+    for (let i = 0; i <= weekCount; i++) {
+        const start = new Date(startMonday);
+        start.setDate(startMonday.getDate() + i * 7);
+        const end = new Date(start);
+        end.setDate(start.getDate() + 6);
+        end.setHours(23, 59, 59, 999);
+        weeks.push({ week: i, start, end });
+    }
+    return weeks;
+}
+/**
+ * Get the current week number within a semester.
+ */
+export function getWeekNumber(opts) {
+    const date = opts.date ?? new Date();
+    const semesterStart = getSemesterStart(opts);
+    const startMonday = getMonday(semesterStart);
+    const targetMonday = getMonday(date);
+    const diff = targetMonday.getTime() - startMonday.getTime();
+    return Math.floor(diff / (7 * 24 * 60 * 60 * 1000));
+}
+function filterEntries(entries, opts) {
+    return entries.filter((e) => {
+        if (opts?.subgroup && e.subgroup && e.subgroup !== opts.subgroup) {
+            return false;
+        }
+        if (opts?.week != null) {
+            if (e.weeks.from > 0 &&
+                (opts.week < e.weeks.from || opts.week > e.weeks.to)) {
+                return false;
+            }
+            if (e.weekParity) {
+                const isEven = opts.week % 2 === 0;
+                if (e.weekParity === "even" && !isEven)
+                    return false;
+                if (e.weekParity === "odd" && isEven)
+                    return false;
+            }
+        }
+        return true;
+    });
+}
+export function filterSlots(slots, opts) {
+    if (opts?.subgroup == null && opts?.week == null)
+        return slots;
+    return slots
+        .map((slot) => ({
+        ...slot,
+        entries: filterEntries(slot.entries, opts),
+    }))
+        .filter((slot) => slot.entries.length > 0);
+}
+function makeLessonTime(date, time) {
+    const d = new Date(date);
+    d.setHours(time.hours, time.minutes, 0, 0);
+    return { date: d, hours: time.hours, minutes: time.minutes };
+}
+export function slotsToLessons(slots, date) {
+    const lessons = [];
+    for (const slot of slots) {
+        for (const entry of slot.entries) {
+            lessons.push({
+                number: slot.number,
+                start: makeLessonTime(date, slot.timeStart),
+                end: makeLessonTime(date, slot.timeEnd),
+                subject: entry.subject,
+                type: entry.type,
+                room: entry.room,
+                teacher: entry.teacher,
+                weeks: entry.weeks,
+                subgroup: entry.subgroup,
+                weekParity: entry.weekParity,
+            });
+        }
+    }
+    return lessons;
+}

package/package.json

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