chuvsu-js 0.2.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

@@ -5,6 +5,7 @@ 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;

package/dist/tt/client.js

@@ -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) {
@@ -51,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) {
@@ -67,10 +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));
+            ({ body } = await this.authGet(url));
         }
         const data = parseFullSchedule(body);
         this.cache?.set("schedule", cacheKey, data);
@@ -193,7 +225,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 +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,
         });
@@ -212,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",
@@ -221,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chuvsu-js",
-  "version": "0.2.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",