@wilm-ai/wilma-client 1.4.0 → 1.4.2

package/dist/client.d.ts

@@ -24,6 +24,11 @@ export declare class WilmaClient {
             date?: string;
         }) => Promise<LessonNote[]>;
     };
+    schedule: {
+        list: (opts?: {
+            date?: string;
+        }) => Promise<OverviewData["schedule"]>;
+    };
     overview: {
         get: () => Promise<OverviewData>;
     };

package/dist/client.js

@@ -5,6 +5,7 @@ import { parseNewsDetailHtml, parseNewsDetailJson, parseNewsList, parseNewsListH
 import { parseExamsHtml } from "./parsers/exams.js";
 import { parseAttendanceHtml } from "./parsers/attendance.js";
 import { parseOverview } from "./parsers/overview.js";
+import { parseScheduleHtml } from "./parsers/schedule.js";
 import { parseStudentsFromHome } from "./parsers/students.js";
 export class WilmaClient {
     session;
@@ -138,6 +139,18 @@ export class WilmaClient {
             return parseAttendanceHtml(text, opts?.date ?? "");
         },
     };
+    schedule = {
+        list: async (opts) => {
+            if (!opts?.date) {
+                return (await this.overview.get()).schedule;
+            }
+            const params = new URLSearchParams();
+            params.set("date", isoDateToFinnish(opts.date));
+            const resp = await this.session.get(`/schedule?${params.toString()}`);
+            const text = await resp.text();
+            return parseScheduleHtml(text);
+        },
+    };
     overview = {
         get: async () => {
             const resp = await this.session.get("/overview");
@@ -154,3 +167,10 @@ function safeJson(text) {
         return {};
     }
 }
+function isoDateToFinnish(date) {
+    const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(date);
+    if (!match) {
+        return date;
+    }
+    return `${match[3]}.${match[2]}.${match[1]}`;
+}

package/dist/parsers/messages.js

@@ -79,9 +79,53 @@ export function parseMessageDetailHtml(html, messageId) {
         });
     }
     let content = null;
-    const hidden = $("div.ckeditor.hidden").first();
-    if (hidden.length) {
-        content = hidden.text().trim();
+    const replyBoxes = $("div.m-replybox.hidden");
+    if (replyBoxes.length > 0) {
+        const otherReplies = replyBoxes.filter(function () {
+            return !$(this).hasClass("m-replybox-me");
+        });
+        if (otherReplies.length > 0) {
+            const latest = otherReplies.last();
+            const inner = latest.find("div.inner.hidden");
+            if (inner.length) {
+                content = inner.text().trim();
+                const replyHeaderText = latest.find("h2").first().text().trim();
+                const replySender = latest.find("a.profile-link").first();
+                if (replySender.length) {
+                    senderName = replySender.text().trim();
+                    sendersJson = {
+                        senders: [
+                            {
+                                Name: senderName,
+                                Href: replySender.attr("href"),
+                            },
+                        ],
+                    };
+                }
+                else {
+                    const replySenderName = extractReplySenderName(replyHeaderText);
+                    if (replySenderName) {
+                        senderName = replySenderName;
+                        sendersJson = {
+                            senders: [
+                                {
+                                    Name: senderName,
+                                },
+                            ],
+                        };
+                    }
+                }
+                if (replyHeaderText) {
+                    sentAt = parseWilmaTimestamp(extractReplyTimestampText(replyHeaderText));
+                }
+            }
+        }
+    }
+    if (!content) {
+        const hidden = $("div.ckeditor.hidden").first();
+        if (hidden.length) {
+            content = hidden.text().trim();
+        }
     }
     if (!content && panelBody.length) {
         const clone = cheerio.load(panelBody.html() ?? "");
@@ -138,3 +182,12 @@ export function debugMessageFields(data) {
 function compactText(value) {
     return value.replace(/\s+/g, " ").trim();
 }
+function extractReplyTimestampText(headerText) {
+    const absoluteDateTime = /(\d{1,2}\.\d{1,2}\.\d{4}\s+\d{1,2}:\d{2})/.exec(headerText);
+    return absoluteDateTime?.[1] ?? headerText;
+}
+function extractReplySenderName(headerText) {
+    const match = /^(.+?)\s+(?:vastasi|svarade|replied)\b/i.exec(compactText(headerText));
+    const sender = match?.[1]?.trim();
+    return sender || null;
+}

package/dist/parsers/schedule.d.ts

@@ -0,0 +1,2 @@
+import type { ScheduleLesson } from "../types.js";
+export declare function parseScheduleHtml(html: string): ScheduleLesson[];

package/dist/parsers/schedule.js

@@ -0,0 +1,83 @@
+import * as cheerio from "cheerio";
+export function parseScheduleHtml(html) {
+    const $ = cheerio.load(html);
+    const scripts = $("script:not([src])")
+        .map((_, el) => $(el).html() ?? "")
+        .get();
+    const script = scripts.find((text) => text.includes("eventsJSON") && text.includes("Events"));
+    if (!script) {
+        return [];
+    }
+    const match = /Events\s*:\s*(\[[\s\S]*?\])\s*,\s*ActiveTyyppi/.exec(script);
+    if (!match) {
+        return [];
+    }
+    let events;
+    try {
+        events = JSON.parse(match[1]);
+    }
+    catch {
+        return [];
+    }
+    return events
+        .map(parseScheduleEvent)
+        .filter((lesson) => lesson !== null)
+        .sort((a, b) => a.date.localeCompare(b.date) || a.start.localeCompare(b.start));
+}
+function parseScheduleEvent(event) {
+    const date = finnishDateToIso(event.Date ?? "");
+    if (!date) {
+        return null;
+    }
+    const subject = firstRecordValue(event.Text) || firstRecordValue(event.LongText);
+    const teacher = firstTeacher(event.OpeInfo);
+    const dateObj = new Date(`${date}T12:00:00`);
+    return {
+        date,
+        dayOfWeek: dateObj.getDay(),
+        start: minutesToTime(event.Start),
+        end: minutesToTime(event.End),
+        subject,
+        subjectCode: firstSubjectToken(subject),
+        teacher: teacher.name,
+        teacherCode: teacher.code,
+        groupId: Number(event.Id) || 0,
+    };
+}
+function finnishDateToIso(value) {
+    const match = /^(\d{1,2})\.(\d{1,2})\.(\d{4})$/.exec(value.trim());
+    if (!match) {
+        return "";
+    }
+    return `${match[3]}-${match[2].padStart(2, "0")}-${match[1].padStart(2, "0")}`;
+}
+function minutesToTime(value) {
+    if (typeof value !== "number" || !Number.isFinite(value)) {
+        return "";
+    }
+    const hours = Math.floor(value / 60);
+    const minutes = value % 60;
+    return `${String(hours).padStart(2, "0")}:${String(minutes).padStart(2, "0")}`;
+}
+function firstRecordValue(record) {
+    if (!record) {
+        return "";
+    }
+    return Object.values(record).find((value) => value.trim()) ?? "";
+}
+function firstTeacher(groups) {
+    if (!groups) {
+        return { name: "", code: "" };
+    }
+    for (const group of Object.values(groups)) {
+        for (const person of Object.values(group)) {
+            if (person?.nimi || person?.lyhenne) {
+                return { name: person.nimi ?? "", code: person.lyhenne ?? "" };
+            }
+        }
+    }
+    return { name: "", code: "" };
+}
+function firstSubjectToken(subject) {
+    return subject.trim().split(/\s+/, 1)[0] ?? "";
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wilm-ai/wilma-client",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,6 +14,13 @@
     "dist",
     "tenant_list.json"
   ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "lint": "echo 'add lint'",
+    "test": "pnpm run build && node test/parser-messages.mjs && node test/parser-schedule.mjs && node test/client-schedule.mjs",
+    "test:smoke": "tsc -p tsconfig.json && node test/smoke.mjs",
+    "test:live": "tsc -p tsconfig.json && node test/live.spec.mjs"
+  },
   "dependencies": {
     "cheerio": "^1.0.0-rc.12",
     "tough-cookie": "^4.1.4",
@@ -22,12 +29,5 @@
   "devDependencies": {
     "typescript": "^5.6.3",
     "@types/tough-cookie": "^4.0.5"
-  },
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "lint": "echo 'add lint'",
-    "test": "echo 'add tests'",
-    "test:smoke": "tsc -p tsconfig.json && node test/smoke.mjs",
-    "test:live": "tsc -p tsconfig.json && node test/live.spec.mjs"
   }
-}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 Wilm.ai
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.