chuvsu-js 2.8.0 → 2.8.2

package/dist/tt/client.d.ts

@@ -78,6 +78,7 @@ export declare class TtClient {
         audienceId: number;
         period: Period;
     }): Promise<Schedule>;
+    private getCachedAudienceImage;
     /** Get the audience photo (audimage). Returns null if missing. */
     getAudienceImage(audienceId: number): Promise<Buffer | null>;
     /** Get the building exterior image (blockimage). Returns null if missing. */

package/dist/tt/client.js

@@ -259,29 +259,38 @@ export class TtClient {
         schedules.set(opts.period, days);
         return new Schedule(opts.audienceId, schedules, opts.period, this.educationType);
     }
+    async getCachedAudienceImage(cacheKey, fetchUrl) {
+        const cached = this.cache?.get("audienceImages", cacheKey);
+        if (cached !== null && cached !== undefined) {
+            const entry = cached;
+            return entry.data ? Buffer.from(entry.data, "base64") : null;
+        }
+        const url = await fetchUrl();
+        if (!url) {
+            this.cache?.set("audienceImages", cacheKey, { data: null });
+            return null;
+        }
+        const buf = await this.authGetBuffer(`${BASE}${url}`);
+        if (buf.length === 0) {
+            this.cache?.set("audienceImages", cacheKey, { data: null });
+            return null;
+        }
+        this.cache?.set("audienceImages", cacheKey, {
+            data: buf.toString("base64"),
+        });
+        return buf;
+    }
     /** Get the audience photo (audimage). Returns null if missing. */
     async getAudienceImage(audienceId) {
-        const info = await this.getAudienceInfo(audienceId);
-        if (!info?.audImageUrl)
-            return null;
-        const buf = await this.authGetBuffer(`${BASE}${info.audImageUrl}`);
-        return buf.length > 0 ? buf : null;
+        return this.getCachedAudienceImage(`aud:${audienceId}`, async () => (await this.getAudienceInfo(audienceId))?.audImageUrl);
     }
     /** Get the building exterior image (blockimage). Returns null if missing. */
     async getAudienceBlockImage(audienceId) {
-        const info = await this.getAudienceInfo(audienceId);
-        if (!info?.blockImageUrl)
-            return null;
-        const buf = await this.authGetBuffer(`${BASE}${info.blockImageUrl}`);
-        return buf.length > 0 ? buf : null;
+        return this.getCachedAudienceImage(`block:${audienceId}`, async () => (await this.getAudienceInfo(audienceId))?.blockImageUrl);
     }
     /** Get the floor plan image for the audience. Returns null if missing. */
     async getAudienceFloorplan(audienceId) {
-        const info = await this.getAudienceInfo(audienceId);
-        if (!info?.floorplanUrl)
-            return null;
-        const buf = await this.authGetBuffer(`${BASE}${info.floorplanUrl}`);
-        return buf.length > 0 ? buf : null;
+        return this.getCachedAudienceImage(`floor:${audienceId}`, async () => (await this.getAudienceInfo(audienceId))?.floorplanUrl);
     }
     async searchTeacher(opts) {
         const { body } = await this.authPost(`${BASE}/`, {

package/dist/tt/parse.js

@@ -397,6 +397,26 @@ export function parseAudienceInfo(html) {
     const audImg = doc.querySelector("#audsrc");
     const blockImg = doc.querySelector("#blocksrc");
     const floorImg = doc.querySelector("#floorsrc");
+    // Highlight rect from the image map: prefer the <area> whose id matches
+    // the current audience (planaudNNNN); fall back to the first rect area.
+    let floorplanRect;
+    const areas = doc.querySelectorAll('map[name="flooraud"] area[shape="rect"]');
+    let chosen = undefined;
+    for (const a of areas) {
+        if (a.getAttribute("alt")?.trim() === name) {
+            chosen = a;
+            break;
+        }
+    }
+    if (!chosen && areas.length > 0)
+        chosen = areas[0];
+    if (chosen) {
+        const coords = chosen.getAttribute("coords") ?? "";
+        const parts = coords.split(",").map((s) => parseInt(s.trim(), 10));
+        if (parts.length === 4 && parts.every((n) => Number.isFinite(n))) {
+            floorplanRect = { x1: parts[0], y1: parts[1], x2: parts[2], y2: parts[3] };
+        }
+    }
     return {
         name,
         building,
@@ -405,6 +425,7 @@ export function parseAudienceInfo(html) {
         audImageUrl: audImg?.getAttribute("src") || undefined,
         blockImageUrl: blockImg?.getAttribute("src") || undefined,
         floorplanUrl: floorImg?.getAttribute("src") || undefined,
+        floorplanRect,
     };
 }
 function parseAudienceSemesterEntry(el) {

package/dist/tt/types.d.ts

@@ -27,6 +27,13 @@ export interface AudienceInfo {
     blockImageUrl?: string;
     /** Relative URL of the floor plan image (/index/floorplan/...). */
     floorplanUrl?: string;
+    /** Rectangle (in floorplan image pixels) highlighting this audience. */
+    floorplanRect?: {
+        x1: number;
+        y1: number;
+        x2: number;
+        y2: number;
+    };
 }
 /** A date-specific substitution (room and/or teacher change). */
 export interface Substitution {
@@ -140,6 +147,7 @@ export interface CacheConfig {
     teacherInfo?: number;
     teacherPhotos?: number;
     audienceInfo?: number;
+    audienceImages?: number;
 }
 export interface TtClientOptions {
     educationType?: EducationType;

package/package.json

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