Merge pull request #145 from kolplattformen/fix/remove-errors-from-sc…

…hema

fix: 🐛 Remove errors when fetching schedule and timetable

devrun.js

@@ -7,6 +7,9 @@
  * - Support for proxy (i recommend Burp Suite https://portswigger.net/burp/communitydownload)
  * - Saves sessionCoookie to a file and tries to use it again
  */
+
+const { DateTime } = require('luxon')
+const { inspect } = require('util')
 const nodeFetch = require('node-fetch')
 const { CookieJar } = require('tough-cookie')
 const fetchCookie = require('fetch-cookie/node-fetch')
@@ -18,6 +21,7 @@ const HttpProxyAgent = require('https-proxy-agent')
 const agentWrapper = require('./agentFetchWrapper')
 const init = require('./dist').default
 
+
 const [, , personalNumber] = process.argv
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
 const cookieJar = new CookieJar()
@@ -61,11 +65,32 @@ async function run() {
       console.log('classmates')
       const classmates = await api.getClassmates(children[0])
       console.log(classmates)
-
-      console.log('schedule')
-      const schedule = await api.getSchedule(children[0], DateTime.local(), DateTime.local().plus({ week: 1 }))
-      console.log(schedule)
-
+*/
+      try {
+        console.log('schedule')
+        const schedule = await api.getSchedule(children[1], DateTime.local(), DateTime.local().plus({ week: 1 }))
+        console.log(schedule)
+      } catch (error) {
+        console.error(error)
+      }
+
+      let skola24children
+      try {
+        skola24children = await api.getSkola24Children()
+        console.log(skola24children)
+      } catch (error) {
+        console.error(error)
+      }
+
+      try {
+        console.log('timetable')
+            const timetable = await api.getTimetable(skola24children[0], 15, 2021, "sv")
+            console.log(inspect(timetable, false, 1000, true))
+      } catch (error) {
+        console.error(error)
+      }
+
+/*
       console.log('news')
       const news = await api.getNews(children[0])
 */

lib/api.ts

@@ -20,6 +20,7 @@ import {
   Skola24Child,
   EtjanstChild,
   SSOSystem,
+  TimetableEntry
 } from './types'
 import * as routes from './routes'
 import * as parse from './parse/index'
@@ -259,7 +260,7 @@ export class Api extends EventEmitter {
   ): Promise<ScheduleItem[]> {
     if (this.isFake) return fakeResponse(fake.schedule(child))
 
-    const url = routes.schedule(child.sdsId, from.toISODate(), to.toISODate())
+    const url = routes.schedule(child.id, from.toISODate(), to.toISODate())
     const session = this.getRequestInit()
     const response = await this.fetch('schedule', url, session)
     const data = await response.json()
@@ -416,8 +417,13 @@ export class Api extends EventEmitter {
     return key as string
   }
 
-  public async getTimetable(child: Skola24Child, week: number, year: number, lang: Language): Promise<any> {
+  public async getTimetable(child: Skola24Child, week: number, year: number, lang: Language)
+    : Promise<TimetableEntry[]> {
     if (this.isFake) return fakeResponse(fake.timetable(child))
+
+    if(!child.timetableID) {
+      return new Array<TimetableEntry>()
+    }
 
     const url = routes.timetable
     const renderKey = await this.getRenderKey()

lib/parse/schedule.ts

@@ -20,5 +20,21 @@ export const scheduleItem = ({
   oneDayEvent: isSameDay,
 })
 
-export const schedule = (data: any): ScheduleItem[] =>
-  etjanst(data).map(scheduleItem)
+export const schedule = (data: any): ScheduleItem[] => {
+  try{
+    const scheduleData = etjanst(data)
+    const mapped = scheduleData.map(scheduleItem)
+    return mapped
+  }
+  catch(e){
+    if (e instanceof Error) {
+      // If this happens the child has no schedule 
+      // It is the same on the official web
+      // Instead of retrying and spamming errors - lets return en empty array
+      if(e.message === 'A task was canceled.'){
+        return new Array<ScheduleItem>()
+      }     
+    }
+    throw e
+  }
+}