@wilm-ai/wilma-client 1.5.1 → 1.5.2

package/dist/client.js

@@ -6,10 +6,10 @@ 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";
+import { parseStudentsFromAccountsRoles, parseStudentsFromHome } from "./parsers/students.js";
 import { CookieJar } from "tough-cookie";
 import { fetch, Headers } from "undici";
-import { wrapNetworkError } from "./network-error.js";
+import { NetworkError, wrapNetworkError } from "./network-error.js";
 const EXTERNAL_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) " +
     "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0 Safari/537.36";
 export class WilmaClient {
@@ -37,7 +37,9 @@ export class WilmaClient {
         return new WilmaClient(session);
     }
     static async listStudents(profile, onMfaRequired) {
-        const session = new WilmaSession(profile.baseUrl);
+        const session = new WilmaSession(profile.baseUrl, {
+            debug: profile.debug ?? false,
+        });
         try {
             await session.login(profile.username, profile.password);
         }
@@ -50,9 +52,27 @@ export class WilmaClient {
                 throw err;
             }
         }
+        try {
+            const accountsResp = await session.get("/api/v1/accounts/me/roles");
+            const accountsText = await accountsResp.text();
+            const fromAccounts = parseStudentsFromAccountsRoles(safeJson(accountsText));
+            if (fromAccounts.length > 0) {
+                return fromAccounts;
+            }
+        }
+        catch (err) {
+            if (err instanceof NetworkError) {
+                throw err;
+            }
+            // API missing or not JSON (e.g. 404 on older Wilma)
+        }
         const resp = await session.get("/");
         const html = await resp.text();
-        return parseStudentsFromHome(html);
+        const fromHome = parseStudentsFromHome(html, resp.url);
+        if (fromHome.length > 0) {
+            return fromHome;
+        }
+        return [];
     }
     messages = {
         list: async (folder = "inbox") => {

package/dist/parsers/students.d.ts

@@ -3,4 +3,13 @@ export interface StudentInfo {
     name: string;
     href: string;
 }
-export declare function parseStudentsFromHome(html: string): StudentInfo[];
+export declare function studentNumberFromHref(href: string): string | null;
+export declare function parseStudentFromUrl(url: string): StudentInfo | null;
+/**
+ * Parse GET /api/v1/accounts/me/roles.
+ * Accepts `{ payload: AccountRole[] }` or a raw array.
+ * Skips the account itself (`type === "passwd"` / type 7). Guardian (and other
+ * non-passwd) roles contribute a student from `slug` + `name`.
+ */
+export declare function parseStudentsFromAccountsRoles(data: unknown): StudentInfo[];
+export declare function parseStudentsFromHome(html: string, pageUrl?: string): StudentInfo[];

package/dist/parsers/students.js

@@ -12,16 +12,106 @@ const NAV_KEYWORDS = [
     "printouts",
     "news",
 ];
-export function parseStudentsFromHome(html) {
-    const $ = cheerio.load(html);
+const STUDENT_HREF_RE = /\/!(\d+)(?:\/|$)/;
+export function studentNumberFromHref(href) {
+    const match = STUDENT_HREF_RE.exec(href);
+    return match ? match[1] : null;
+}
+function isPasswdAccountRole(type) {
+    return type === "passwd" || type === 7 || type === "7";
+}
+function studentNumberFromSlug(slug) {
+    const trimmed = slug.trim();
+    if (!trimmed) {
+        return null;
+    }
+    if (/^\d+$/.test(trimmed)) {
+        return trimmed;
+    }
+    const withSlash = trimmed.startsWith("/") ? trimmed : `/${trimmed}`;
+    return studentNumberFromHref(withSlash);
+}
+export function parseStudentFromUrl(url) {
+    const studentNumber = studentNumberFromHref(url);
+    if (!studentNumber) {
+        return null;
+    }
+    return {
+        studentNumber,
+        name: studentNumber,
+        href: `/!${studentNumber}/`,
+    };
+}
+function roleType(rec) {
+    return rec.Type ?? rec.type ?? rec.RoleType ?? rec.roleType;
+}
+function roleName(rec, fallback) {
+    return String(rec.Name ?? rec.name ?? rec.Caption ?? rec.caption ?? fallback);
+}
+function collectStudent(students, studentNumber, name) {
+    if (!students.has(studentNumber)) {
+        students.set(studentNumber, {
+            studentNumber,
+            name,
+            href: `/!${studentNumber}/`,
+        });
+    }
+}
+/**
+ * Parse GET /api/v1/accounts/me/roles.
+ * Accepts `{ payload: AccountRole[] }` or a raw array.
+ * Skips the account itself (`type === "passwd"` / type 7). Guardian (and other
+ * non-passwd) roles contribute a student from `slug` + `name`.
+ */
+export function parseStudentsFromAccountsRoles(data) {
     const students = new Map();
-    $("a[href^='/!']").each((_, anchor) => {
+    let roles = [];
+    if (Array.isArray(data)) {
+        roles = data;
+    }
+    else if (data && typeof data === "object") {
+        const rec = data;
+        const payload = rec.payload ?? rec.Payload;
+        if (Array.isArray(payload)) {
+            roles = payload;
+        }
+    }
+    for (const item of roles) {
+        if (!item || typeof item !== "object") {
+            continue;
+        }
+        const rec = item;
+        if (isPasswdAccountRole(roleType(rec))) {
+            continue;
+        }
+        const slug = String(rec.slug ?? rec.Slug ?? "");
+        const studentNumber = studentNumberFromSlug(slug);
+        if (!studentNumber) {
+            continue;
+        }
+        const name = roleName(rec, studentNumber);
+        if (!name) {
+            continue;
+        }
+        collectStudent(students, studentNumber, name);
+    }
+    return [...students.values()];
+}
+export function parseStudentsFromHome(html, pageUrl) {
+    const $ = cheerio.load(html);
+    const named = new Map();
+    const fromHref = new Map();
+    $("a[href]").each((_, anchor) => {
         const href = $(anchor).attr("href") ?? "";
-        const match = /\/!(\d+)\//.exec(href);
-        if (!match) {
+        const studentNumber = studentNumberFromHref(href);
+        if (!studentNumber) {
             return;
         }
-        const studentNumber = match[1];
+        fromHref.set(studentNumber, {
+            studentNumber,
+            name: studentNumber,
+            href,
+        });
         const cloned = $(anchor).clone();
         cloned.find("small, span.lem").remove();
         const text = cloned.text().trim();
@@ -32,13 +122,25 @@ export function parseStudentsFromHome(html) {
         if (NAV_KEYWORDS.some((kw) => lower.includes(kw))) {
             return;
         }
-        if (!students.has(studentNumber)) {
-            students.set(studentNumber, {
+        if (!named.has(studentNumber)) {
+            named.set(studentNumber, {
                 studentNumber,
                 name: text,
                 href,
             });
         }
     });
-    return [...students.values()];
+    if (named.size > 0) {
+        return [...named.values()];
+    }
+    if (fromHref.size > 0) {
+        return [...fromHref.values()];
+    }
+    if (pageUrl) {
+        const fromUrl = parseStudentFromUrl(pageUrl);
+        if (fromUrl) {
+            return [fromUrl];
+        }
+    }
+    return [];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wilm-ai/wilma-client",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,7 +17,7 @@
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "lint": "echo 'add lint'",
-    "test": "pnpm run build && node test/parser-messages.mjs && node test/parser-news.mjs && node test/parser-schedule.mjs && node test/client-schedule.mjs && node test/client-news-resources.mjs && node test/network-error.mjs",
+    "test": "pnpm run build && node test/parser-messages.mjs && node test/parser-news.mjs && node test/parser-schedule.mjs && node test/parser-students.mjs && node test/client-students.mjs && node test/client-schedule.mjs && node test/client-news-resources.mjs && node test/network-error.mjs",
     "test:smoke": "tsc -p tsconfig.json && node test/smoke.mjs",
     "test:live": "tsc -p tsconfig.json && node test/live.spec.mjs"
   },