chuvsu-js 0.1.0 → 0.3.0

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,11 @@
 import type { CacheEntry } from "../common/cache.js";
-import type { Period } from "../common/types.js";
+import { Period } from "../common/types.js";
 import type { Faculty, Group, FullScheduleDay, ScheduleFilter, Lesson, ScheduleWeekDay, 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,6 +16,10 @@ export declare class TtClient {
         password: string;
     }): Promise<void>;
     loginAsGuest(): Promise<void>;
+    private isSessionExpired;
+    private relogin;
+    private authGet;
+    private authPost;
     getGroupSchedule(opts: {
         groupId: number;
         period?: Period;
@@ -30,7 +35,7 @@ export declare class TtClient {
     getScheduleForDate(opts: {
         groupId: number;
         date: Date;
-        filter?: ScheduleFilter;
+        subgroup?: number;
         period?: Period;
     }): Promise<Lesson[]>;
     getScheduleForWeek(opts: {
@@ -41,11 +46,11 @@ export declare class TtClient {
     }): Promise<ScheduleWeekDay[]>;
     getCurrentLesson(opts: {
         groupId: number;
-        filter?: ScheduleFilter;
+        subgroup?: number;
     }): Promise<Lesson | null>;
-    getCurrentPeriod(opts: {
-        groupId: number;
-    }): Promise<Period | null>;
+    getCurrentPeriod(opts?: {
+        date?: Date;
+    }): Period;
     getFaculties(): Promise<Faculty[]>;
     getGroupsForFaculty(opts: {
         facultyId: number;

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 { parsePeriodFromPage, parseGroupButtons, parseFacultyButtons, parseTeacherButtons, parseFullSchedule, } from "./parse.js";
+import { parseGroupButtons, parseFacultyButtons, parseTeacherButtons, parseFullSchedule, } from "./parse.js";
 import { filterSlots, getMonday, getWeekdayName, getWeekNumber, getSemesterStart, getSemesterWeeks, slotsToLessons, } from "./schedule.js";
 const BASE = "https://tt.chuvsu.ru";
 const AUTH_URL = `${BASE}/auth`;
@@ -9,6 +9,7 @@ export class TtClient {
     http = new HttpClient();
     educationType;
     cache;
+    loginMode = null;
     constructor(opts) {
         this.educationType = opts?.educationType ?? 1 /* EducationType.HigherEducation */;
         if (opts?.cache == null) {
@@ -19,7 +20,6 @@ export class TtClient {
                 schedule: opts.cache,
                 faculties: opts.cache,
                 groups: opts.cache,
-                currentPeriod: opts.cache,
             });
         }
         else {
@@ -52,12 +52,43 @@ 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" };
+    }
+    isSessionExpired(body) {
+        return body.includes('name="wname"');
+    }
+    async relogin() {
+        if (!this.loginMode)
+            return;
+        if (this.loginMode.type === "credentials") {
+            await this.login(this.loginMode);
+        }
+        else {
+            await this.loginAsGuest();
+        }
+    }
+    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);
+        }
+        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);
+        }
+        return res;
     }
     // --- Schedule ---
     async getGroupSchedule(opts) {
@@ -68,14 +99,10 @@ export class TtClient {
         const url = `${BASE}/index/grouptt/gr/${opts.groupId}`;
         let body;
         if (opts.period !== undefined) {
-            ({ body } = await this.http.post(url, { htype: String(opts.period) }));
+            ({ body } = await this.authPost(url, { htype: String(opts.period) }));
         }
         else {
-            ({ body } = await this.http.get(url));
-        }
-        const period = parsePeriodFromPage(body);
-        if (period !== null) {
-            this.cache?.set("currentPeriod", String(opts.groupId), period);
+            ({ body } = await this.authGet(url));
         }
         const data = parseFullSchedule(body);
         this.cache?.set("schedule", cacheKey, data);
@@ -97,7 +124,9 @@ export class TtClient {
             const semesterStart = getSemesterStart({ period });
             const startMonday = getMonday(semesterStart);
             const date = new Date(startMonday);
-            date.setDate(startMonday.getDate() + week * 7 + (weekday === 0 ? 6 : weekday - 1));
+            date.setDate(startMonday.getDate() +
+                (week - 1) * 7 +
+                (weekday === 0 ? 6 : weekday - 1));
             return date;
         }
         const now = new Date();
@@ -109,9 +138,7 @@ export class TtClient {
         return date;
     }
     async getScheduleForDay(opts) {
-        const period = opts.period ??
-            (await this.getCurrentPeriod({ groupId: opts.groupId })) ??
-            1;
+        const period = opts.period ?? this.getCurrentPeriod();
         const slots = await this.getFilteredSlots({
             groupId: opts.groupId,
             weekday: opts.weekday,
@@ -123,23 +150,21 @@ export class TtClient {
     }
     async getScheduleForDate(opts) {
         const weekday = opts.date.getDay();
-        const period = opts.period ?? (await this.getCurrentPeriod({ groupId: opts.groupId }));
-        const effectiveFilter = { ...opts.filter };
-        if (period && !effectiveFilter.week) {
+        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 });
         }
         const slots = await this.getFilteredSlots({
             groupId: opts.groupId,
             weekday,
             filter: effectiveFilter,
-            period: period ?? undefined,
+            period,
         });
         return slotsToLessons(slots, opts.date);
     }
     async getScheduleForWeek(opts) {
-        const period = opts.period ??
-            (await this.getCurrentPeriod({ groupId: opts.groupId })) ??
-            1;
+        const period = opts.period ?? this.getCurrentPeriod();
         const week = opts.week ?? getWeekNumber({ period });
         const effectiveFilter = { ...opts.filter, week };
         const semesterWeeks = getSemesterWeeks({ period, weekCount: week });
@@ -166,7 +191,7 @@ export class TtClient {
         const lessons = await this.getScheduleForDate({
             groupId: opts.groupId,
             date: now,
-            filter: opts.filter,
+            subgroup: opts.subgroup,
         });
         const timeMinutes = now.getHours() * 60 + now.getMinutes();
         for (const lesson of lessons) {
@@ -179,24 +204,28 @@ export class TtClient {
         return null;
     }
     // --- Period ---
-    async getCurrentPeriod(opts) {
-        const cacheKey = String(opts.groupId);
-        const cached = this.cache?.get("currentPeriod", cacheKey);
-        if (cached != null)
-            return cached;
-        const { body } = await this.http.get(`${BASE}/index/grouptt/gr/${opts.groupId}`);
-        const period = parsePeriodFromPage(body);
-        if (period !== null) {
-            this.cache?.set("currentPeriod", cacheKey, period);
-        }
-        return period;
+    getCurrentPeriod(opts) {
+        const date = opts?.date ?? new Date();
+        const month = date.getMonth();
+        const day = date.getDate();
+        // Dec 25+ and Jan → Winter session (зимняя сессия)
+        if (month === 0 || (month === 11 && day >= 25))
+            return 2 /* Period.WinterSession */;
+        // Feb–May → Spring semester (весенний семестр)
+        if (month >= 1 && month <= 4)
+            return 3 /* Period.SpringSemester */;
+        // Jun–Aug → Summer session (летняя сессия)
+        if (month >= 5 && month <= 7)
+            return 4 /* Period.SummerSession */;
+        // Sep – Dec 24 → Fall semester (осенний семестр)
+        return 1 /* Period.FallSemester */;
     }
     // --- Search / Discovery ---
     async getFaculties() {
         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;
@@ -206,7 +235,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,
         });
@@ -215,7 +244,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",
@@ -224,7 +253,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

@@ -27,6 +27,5 @@ export declare function getSemesterWeeks(opts: {
 export declare function getWeekNumber(opts: {
     period: Period;
     date?: Date;
-    year?: number;
 }): number;
 export declare function slotsToLessons(slots: FullScheduleSlot[], date: Date): Lesson[];

package/dist/tt/schedule.js

@@ -11,7 +11,7 @@ export function getWeekdayName(weekday) {
     return WEEKDAY_NAMES[weekday] ?? "";
 }
 export function filterSlots(slots, filter) {
-    if (!filter?.subgroup && !filter?.week)
+    if (filter?.subgroup == null && filter?.week == null)
         return slots;
     return slots
         .map((slot) => ({
@@ -25,7 +25,7 @@ function filterEntries(entries, filter) {
         if (filter?.subgroup && e.subgroup && e.subgroup !== filter.subgroup) {
             return false;
         }
-        if (filter?.week) {
+        if (filter?.week != null) {
             if (e.weeks.from > 0 &&
                 (filter.week < e.weeks.from || filter.week > e.weeks.to)) {
                 return false;

package/dist/tt/types.d.ts

@@ -67,7 +67,6 @@ export interface CacheConfig {
     schedule?: number;
     faculties?: number;
     groups?: number;
-    currentPeriod?: number;
 }
 export interface TtClientOptions {
     educationType?: EducationType;

package/package.json

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