@udondan/dsbmobile 1.1.0 → 1.2.0

package/README.md

@@ -183,12 +183,10 @@ Lädt und parst alle Vertretungsplan-Seiten und gibt strukturierte Einträge zur
 
 - `className` (optional): Klassenfilter, z. B. `07b` oder `Q2_Kra`. Groß-/Kleinschreibung wird ignoriert. Standardmäßig wird `DSB_CLASS` verwendet, falls gesetzt.
 
-**Rückgabe**: Liste von Plänen, jeweils mit:
+**Rückgabe**: Liste von Plänen (ein Objekt pro Tag), jeweils mit:
 
-- `title`: Planname
-- `planDate`: Datum laut Plan (z. B. „20.3.2026 Freitag (Seite 1 / 8)")
+- `date`: Datum im ISO-Format (z. B. `2026-03-20`)
 - `lastUpdated`: Zeitstempel der letzten Aktualisierung
-- `affectedClasses`: Kommagetrennte Liste betroffener Klassen
 - `entries`: Liste der Vertretungseinträge, jeweils mit:
   - `className`: Klasse (z. B. `07b`, `Q2_Kra`)
   - `type`: Art der Vertretung (z. B. `Vertretung`, `Statt-Vertretung`, `Entfall`)
@@ -224,8 +222,8 @@ Listet alle verfügbaren Dokumente und Dateien auf.
 
 ```bash
 # Repository klonen
-git clone https://github.com/udondan/dsbmobile-mcp.git
-cd dsbmobile-mcp
+git clone https://github.com/udondan/dsbmobile.git
+cd dsbmobile
 
 # Abhängigkeiten installieren
 bun install

package/dist/services/dsbmobile.d.ts

@@ -64,7 +64,7 @@ export declare class DsbmobileClient {
      * This fetches the actual HTML content of each timetable page and parses the
      * substitution table into structured data.
      *
-     * @returns Array of parsed substitution plans (one per HTML page)
+     * @returns Array of parsed substitution plans (one per calendar day, pages merged)
      * @throws Error if authentication fails or the request fails
      */
     getSubstitutions(): Promise<SubstitutionPlan[]>;
@@ -78,4 +78,4 @@ export declare class DsbmobileClient {
  * The HTML is generated by Untis and has a consistent structure.
  * Exported for unit testing.
  */
-export declare function parseSubstitutionHtml(html: string, title: string, lastUpdated: string, url: string): SubstitutionPlan;
+export declare function parseSubstitutionHtml(html: string, lastUpdated: string): SubstitutionPlan;

package/dist/services/dsbmobile.js

@@ -215,13 +215,13 @@ export class DsbmobileClient {
      * This fetches the actual HTML content of each timetable page and parses the
      * substitution table into structured data.
      *
-     * @returns Array of parsed substitution plans (one per HTML page)
+     * @returns Array of parsed substitution plans (one per calendar day, pages merged)
      * @throws Error if authentication fails or the request fails
      */
     async getSubstitutions() {
         try {
             const timetables = await this.getTimetables();
-            const plans = [];
+            const merged = new Map();
             for (const timetable of timetables) {
                 try {
                     // Use a standalone axios call with the full URL (not the base-URL-bound instance)
@@ -232,14 +232,20 @@ export class DsbmobileClient {
                     });
                     // The HTML is encoded in iso-8859-1/windows-1252 — decode it properly
                     const htmlText = new TextDecoder('windows-1252').decode(response.data);
-                    const plan = parseSubstitutionHtml(htmlText, timetable.title, timetable.date, timetable.url);
-                    plans.push(plan);
+                    const plan = parseSubstitutionHtml(htmlText, timetable.date);
+                    const existing = merged.get(plan.date);
+                    if (existing) {
+                        existing.entries.push(...plan.entries);
+                    }
+                    else {
+                        merged.set(plan.date, { ...plan, entries: [...plan.entries] });
+                    }
                 }
                 catch {
                     // Skip pages that fail to load; don't abort the whole request
                 }
             }
-            return plans;
+            return [...merged.values()];
         }
         catch (error) {
             if (error instanceof Error && error.message.startsWith('Error:')) {
@@ -284,20 +290,15 @@ export class DsbmobileClient {
  * The HTML is generated by Untis and has a consistent structure.
  * Exported for unit testing.
  */
-export function parseSubstitutionHtml(html, title, lastUpdated, url) {
-    // Extract plan date (e.g. "20.3.2026 Freitag (Seite 1 / 8)")
+export function parseSubstitutionHtml(html, lastUpdated) {
+    // Extract plan date (e.g. "20.3.2026 Freitag (Seite 1 / 8)") and convert to ISO date string
     const dateMatch = /class="mon_title">(.*?)<\/div>/.exec(html);
-    const planDate = dateMatch ? decodeHtmlEntities(stripHtmlTags(dateMatch[1])) : '';
-    // Extract affected classes from info table
-    let affectedClasses = '';
-    const infoRows = html.matchAll(/<tr class="info"><td[^>]*>(.*?)<\/td><td[^>]*>(.*?)<\/td><\/tr>/gs);
-    for (const match of infoRows) {
-        const label = decodeHtmlEntities(stripHtmlTags(match[1]));
-        const value = decodeHtmlEntities(stripHtmlTags(match[2]));
-        if (label.toLowerCase().includes('klassen')) {
-            affectedClasses = value;
-        }
+    const rawDate = dateMatch ? decodeHtmlEntities(stripHtmlTags(dateMatch[1])) : '';
+    const datePartMatch = /^(\d{1,2})\.(\d{1,2})\.(\d{4})/.exec(rawDate);
+    if (!datePartMatch) {
+        throw new Error(`Could not parse plan date from HTML: "${rawDate}"`);
     }
+    const date = `${datePartMatch[3]}-${datePartMatch[2].padStart(2, '0')}-${datePartMatch[1].padStart(2, '0')}`;
     // Parse all table rows
     const entries = [];
     let currentClass = '';
@@ -337,5 +338,5 @@ export function parseSubstitutionHtml(html, title, lastUpdated, url) {
             text: text === '\u00A0' ? '' : text,
         });
     }
-    return { title, planDate, lastUpdated, url, affectedClasses, entries };
+    return { date, lastUpdated, entries };
 }

package/dist/tools/substitutions.js

@@ -12,11 +12,9 @@ export function registerSubstitutionsTool(server, client) {
         description: `Fetches and parses the actual substitution plan (Vertretungsplan) pages from DSBmobile,
 returning structured substitution entries for each class.
 
-Returns a list of substitution plans (one per page), each containing:
-- title: Plan name (e.g., "V-Homepage heute - subst_001 (Seite 1)")
-- planDate: Date shown on the plan (e.g., "20.3.2026 Freitag (Seite 1 / 8)")
+Returns a list of substitution plans (one per day), each containing:
+- date: ISO date string (e.g., "2026-03-20")
 - lastUpdated: When the plan was last updated
-- affectedClasses: Comma-separated list of affected class names
 - entries: Array of substitution entries, each with:
   - className: The class (e.g., "05b", "Q2_Kra")
   - type: Substitution type (e.g., "Vertretung", "Statt-Vertretung", "Entfall")
@@ -126,11 +124,7 @@ function formatSubstitutions(plans, filter) {
     for (const plan of plans) {
         if (plan.entries.length === 0)
             continue;
-        lines.push(`## ${plan.title}`, `**Date**: ${plan.planDate}`, `**Last Updated**: ${plan.lastUpdated}`);
-        if (plan.affectedClasses) {
-            lines.push(`**Affected Classes**: ${plan.affectedClasses}`);
-        }
-        lines.push('');
+        lines.push(`## ${plan.date}`, `**Last Updated**: ${plan.lastUpdated}`, '');
         // Group entries by class
         const byClass = new Map();
         for (const entry of plan.entries) {

package/dist/types.d.ts

@@ -75,20 +75,14 @@ export interface SubstitutionEntry {
     text: string;
 }
 /**
- * A fully parsed substitution plan page
+ * A substitution plan for a single date, merging all pages for that day
  */
 export interface SubstitutionPlan {
-    /** Plan title including date (e.g., "V-Homepage heute - subst_001") */
-    title: string;
-    /** Date string from the plan (e.g., "20.3.2026 Freitag (Seite 1 / 8)") */
-    planDate: string;
+    /** ISO date string (e.g., "2026-03-20") */
+    date: string;
     /** Last updated timestamp */
     lastUpdated: string;
-    /** URL the plan was fetched from */
-    url: string;
-    /** Affected classes */
-    affectedClasses: string;
-    /** All substitution entries */
+    /** All substitution entries for this date */
     entries: SubstitutionEntry[];
 }
 /**

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@udondan/dsbmobile",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "SDK, CLI, and MCP server for DSBmobile — access German school substitution plans (Vertretungspläne)",
   "repository": {
     "type": "git",
-    "url": "https://github.com/udondan/dsbmobile-mcp.git"
+    "url": "https://github.com/udondan/dsbmobile.git"
   },
   "author": {
     "name": "Daniel Schroeder",