chuvsu-js 2.2.0 → 2.3.0

package/README.md

@@ -5,6 +5,10 @@ Node.js библиотека для работы с порталами ЧувГ
 - **tt.chuvsu.ru** — расписание занятий (факультеты, группы, преподаватели)
 - **lk.chuvsu.ru** — личный кабинет студента (персональные данные)
 
+> [!WARNING]
+> Пока не доработана, код говно, замены занятий пока не парсит.
+> Не надейтесь на правильный вывод расписания.
+
 ## Установка
 
 ```bash

package/dist/index.d.ts

@@ -2,7 +2,8 @@ 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 { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, getTimeSlots, getLessonNumber, getAdjacentSemester, } from "./tt/utils.js";
+export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, getTimeSlots, getLessonNumber, getAdjacentSemester, isHoliday, RUSSIAN_HOLIDAYS, } from "./tt/utils.js";
+export type { Holiday } 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";

package/dist/index.js

@@ -1,5 +1,5 @@
 export { LkClient } from "./lk/client.js";
 export { TtClient } from "./tt/client.js";
 export { Schedule } from "./tt/schedule.js";
-export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, getTimeSlots, getLessonNumber, getAdjacentSemester, } from "./tt/utils.js";
+export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, getTimeSlots, getLessonNumber, getAdjacentSemester, isHoliday, RUSSIAN_HOLIDAYS, } from "./tt/utils.js";
 export { AuthError, ParseError } from "./common/types.js";

package/dist/tt/schedule.d.ts

@@ -1,11 +1,14 @@
 import type { FullScheduleDay, SemesterWeek, Lesson } from "./types.js";
 import { Period, EducationType } from "../common/types.js";
+import { type Holiday } from "./utils.js";
 export declare class Schedule {
     readonly groupId: number;
     readonly scheduleMap: Map<number, FullScheduleDay[]>;
     readonly educationType: EducationType;
+    /** List of holidays to exclude from schedule queries. Pass `[]` to disable. */
+    readonly holidays: Holiday[];
     private _period?;
-    constructor(groupId: number, scheduleMap: Map<number, FullScheduleDay[]>, period?: Period, educationType?: EducationType);
+    constructor(groupId: number, scheduleMap: Map<number, FullScheduleDay[]>, period?: Period, educationType?: EducationType, holidays?: Holiday[] | null);
     /** Current (or fixed) period for this schedule. */
     get period(): Period;
     /** Days for the current period. */

package/dist/tt/schedule.js

@@ -1,14 +1,17 @@
-import { getCurrentPeriod, isSessionPeriod, getWeekdayName, getMonday, getSemesterStart, getSemesterWeeks, getWeekNumber, getAdjacentSemester, filterSlots, slotsToLessons, } from "./utils.js";
+import { getCurrentPeriod, isSessionPeriod, getWeekdayName, getMonday, getSemesterStart, getSemesterWeeks, getWeekNumber, getAdjacentSemester, filterSlots, slotsToLessons, sortLessons, isHoliday, RUSSIAN_HOLIDAYS, } from "./utils.js";
 export class Schedule {
     groupId;
     scheduleMap;
     educationType;
+    /** List of holidays to exclude from schedule queries. Pass `[]` to disable. */
+    holidays;
     _period;
-    constructor(groupId, scheduleMap, period, educationType) {
+    constructor(groupId, scheduleMap, period, educationType, holidays) {
         this.groupId = groupId;
         this.scheduleMap = scheduleMap;
         this.educationType = educationType ?? 1 /* EducationType.HigherEducation */;
         this._period = period;
+        this.holidays = holidays ?? RUSSIAN_HOLIDAYS;
     }
     /** Current (or fixed) period for this schedule. */
     get period() {
@@ -70,13 +73,15 @@ export class Schedule {
                     lessons.push(...slotsToLessons(d.slots, d.date));
                 }
             }
-            return lessons;
+            return lessons.sort(sortLessons);
         }
         const slots = this.getSlotsForWeekday(weekday, days, opts);
         const date = this.getDateForWeekday(weekday, period, opts?.week);
         return slotsToLessons(slots, date);
     }
     forDate(date, opts) {
+        if (isHoliday(date, this.holidays))
+            return [];
         const period = getCurrentPeriod({ date });
         const lessons = [];
         // 1. Check all periods for date-based (session) entries matching this date
@@ -103,7 +108,7 @@ export class Schedule {
                 lessons.push(...slotsToLessons(slots, date));
             }
         }
-        return lessons;
+        return lessons.sort(sortLessons);
     }
     forWeek(week, opts) {
         const period = this.period;
@@ -127,18 +132,18 @@ export class Schedule {
             date.setHours(0, 0, 0, 0);
             lessons.push(...this.forDate(date, opts));
         }
-        return lessons;
+        return lessons.sort(sortLessons);
     }
     today(opts) {
-        return this.forDate(new Date(), opts);
+        return this.forDate(new Date(), opts).sort(sortLessons);
     }
     tomorrow(opts) {
         const date = new Date();
         date.setDate(date.getDate() + 1);
-        return this.forDate(date, opts);
+        return this.forDate(date, opts).sort(sortLessons);
     }
     thisWeek(opts) {
-        return this.forWeek(undefined, opts);
+        return this.forWeek(undefined, opts).sort(sortLessons);
     }
     currentLesson(opts) {
         const now = new Date();

package/dist/tt/utils.d.ts

@@ -5,6 +5,7 @@ export declare function getCurrentPeriod(opts?: {
     date?: Date;
 }): Period;
 export declare function isSessionPeriod(period: Period): boolean;
+export declare function sortLessons(a: Lesson, b: Lesson): number;
 export declare function getWeekdayName(weekday: number): string;
 export declare function getMonday(date: Date): Date;
 /**
@@ -40,3 +41,18 @@ export declare function slotsToLessons(slots: FullScheduleSlot[], date: Date): L
 export declare function getTimeSlots(educationType: EducationType): LessonTimeSlot[];
 export declare function getLessonNumber(time: Time, educationType: EducationType): number;
 export declare function getAdjacentSemester(session: Period): Period;
+export interface Holiday {
+    /** Month number, 1–12. */
+    month: number;
+    /** Day of month. */
+    day: number;
+    /** Human-readable name. */
+    name: string;
+}
+/** Russian non-working public holidays (Статья 112 ТК РФ). */
+export declare const RUSSIAN_HOLIDAYS: Holiday[];
+/**
+ * Returns true if the given date falls on a holiday.
+ * Pass an empty array to disable holiday checking.
+ */
+export declare function isHoliday(date: Date, holidays?: Holiday[]): boolean;

package/dist/tt/utils.js

@@ -17,6 +17,9 @@ export function getCurrentPeriod(opts) {
 export function isSessionPeriod(period) {
     return period === 2 /* Period.WinterSession */ || period === 4 /* Period.SummerSession */;
 }
+export function sortLessons(a, b) {
+    return a.start.date.getTime() - b.start.date.getTime();
+}
 const WEEKDAY_NAMES = [
     "Воскресенье",
     "Понедельник",
@@ -143,23 +146,83 @@ export function slotsToLessons(slots, date) {
 }
 // --- Lesson time slots ---
 const VO_TIME_SLOTS = [
-    { number: 1, start: { hours: 8, minutes: 20 }, end: { hours: 9, minutes: 40 } },
-    { number: 2, start: { hours: 9, minutes: 50 }, end: { hours: 11, minutes: 10 } },
-    { number: 3, start: { hours: 11, minutes: 40 }, end: { hours: 13, minutes: 0 } },
-    { number: 4, start: { hours: 13, minutes: 30 }, end: { hours: 14, minutes: 50 } },
-    { number: 5, start: { hours: 15, minutes: 0 }, end: { hours: 16, minutes: 20 } },
-    { number: 6, start: { hours: 16, minutes: 40 }, end: { hours: 18, minutes: 0 } },
-    { number: 7, start: { hours: 18, minutes: 10 }, end: { hours: 19, minutes: 30 } },
-    { number: 8, start: { hours: 19, minutes: 40 }, end: { hours: 21, minutes: 0 } },
+    {
+        number: 1,
+        start: { hours: 8, minutes: 20 },
+        end: { hours: 9, minutes: 40 },
+    },
+    {
+        number: 2,
+        start: { hours: 9, minutes: 50 },
+        end: { hours: 11, minutes: 10 },
+    },
+    {
+        number: 3,
+        start: { hours: 11, minutes: 40 },
+        end: { hours: 13, minutes: 0 },
+    },
+    {
+        number: 4,
+        start: { hours: 13, minutes: 30 },
+        end: { hours: 14, minutes: 50 },
+    },
+    {
+        number: 5,
+        start: { hours: 15, minutes: 0 },
+        end: { hours: 16, minutes: 20 },
+    },
+    {
+        number: 6,
+        start: { hours: 16, minutes: 40 },
+        end: { hours: 18, minutes: 0 },
+    },
+    {
+        number: 7,
+        start: { hours: 18, minutes: 10 },
+        end: { hours: 19, minutes: 30 },
+    },
+    {
+        number: 8,
+        start: { hours: 19, minutes: 40 },
+        end: { hours: 21, minutes: 0 },
+    },
 ];
 const SPO_TIME_SLOTS = [
-    { number: 1, start: { hours: 8, minutes: 10 }, end: { hours: 9, minutes: 40 } },
-    { number: 2, start: { hours: 9, minutes: 55 }, end: { hours: 11, minutes: 25 } },
-    { number: 3, start: { hours: 11, minutes: 55 }, end: { hours: 13, minutes: 25 } },
-    { number: 4, start: { hours: 13, minutes: 40 }, end: { hours: 15, minutes: 10 } },
-    { number: 5, start: { hours: 15, minutes: 25 }, end: { hours: 16, minutes: 55 } },
-    { number: 6, start: { hours: 17, minutes: 10 }, end: { hours: 18, minutes: 40 } },
-    { number: 7, start: { hours: 18, minutes: 55 }, end: { hours: 20, minutes: 25 } },
+    {
+        number: 1,
+        start: { hours: 8, minutes: 10 },
+        end: { hours: 9, minutes: 40 },
+    },
+    {
+        number: 2,
+        start: { hours: 9, minutes: 55 },
+        end: { hours: 11, minutes: 25 },
+    },
+    {
+        number: 3,
+        start: { hours: 11, minutes: 55 },
+        end: { hours: 13, minutes: 25 },
+    },
+    {
+        number: 4,
+        start: { hours: 13, minutes: 40 },
+        end: { hours: 15, minutes: 10 },
+    },
+    {
+        number: 5,
+        start: { hours: 15, minutes: 25 },
+        end: { hours: 16, minutes: 55 },
+    },
+    {
+        number: 6,
+        start: { hours: 17, minutes: 10 },
+        end: { hours: 18, minutes: 40 },
+    },
+    {
+        number: 7,
+        start: { hours: 18, minutes: 55 },
+        end: { hours: 20, minutes: 25 },
+    },
 ];
 export function getTimeSlots(educationType) {
     return educationType === 2 /* EducationType.VocationalEducation */
@@ -188,3 +251,29 @@ export function getAdjacentSemester(session) {
         ? 1 /* Period.FallSemester */
         : 3 /* Period.SpringSemester */;
 }
+/** Russian non-working public holidays (Статья 112 ТК РФ). */
+export const RUSSIAN_HOLIDAYS = [
+    { month: 1, day: 1, name: "Новый год" },
+    { month: 1, day: 2, name: "Новогодние каникулы" },
+    { month: 1, day: 3, name: "Новогодние каникулы" },
+    { month: 1, day: 4, name: "Новогодние каникулы" },
+    { month: 1, day: 5, name: "Новогодние каникулы" },
+    { month: 1, day: 6, name: "Новогодние каникулы" },
+    { month: 1, day: 7, name: "Рождество Христово" },
+    { month: 1, day: 8, name: "Новогодние каникулы" },
+    { month: 2, day: 23, name: "День защитника Отечества" },
+    { month: 3, day: 8, name: "Международный женский день" },
+    { month: 5, day: 1, name: "Праздник Весны и Труда" },
+    { month: 5, day: 9, name: "День Победы" },
+    { month: 6, day: 12, name: "День России" },
+    { month: 11, day: 4, name: "День народного единства" },
+];
+/**
+ * Returns true if the given date falls on a holiday.
+ * Pass an empty array to disable holiday checking.
+ */
+export function isHoliday(date, holidays = RUSSIAN_HOLIDAYS) {
+    const month = date.getMonth() + 1;
+    const day = date.getDate();
+    return holidays.some((h) => h.month === month && h.day === day);
+}

package/package.json

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