@transportme/vline-nsp-reader 1.0.4 → 1.0.5

package/lib/heat/constants.mjs

@@ -0,0 +1,4 @@
+export default {
+  VLINE_HOST: 'https://vline.com.au',
+  HEAT_PAGE: '/Timetables/heat'
+}

package/lib/heat/vline-heat.mjs

@@ -0,0 +1,93 @@
+import fetch from 'node-fetch';
+import constants from './constants.mjs'
+import { load as parseHTML } from 'cheerio'
+import async from 'async'
+import fs from 'fs/promises'
+import path from 'path'
+import { pipeline } from 'stream/promises'
+import { createWriteStream } from 'fs'
+import PassPDFReader from '../pass/pass-pdf-reader.mjs'
+
+export class HeatTimetable {
+
+  files = []
+
+  constructor() {
+  }
+
+  addFile(file) {
+    this.files.push(file)
+  }
+
+  async saveFiles(outputDir) {
+    try {
+      await fs.mkdir(outputDir)
+    } catch (e) {}
+    await async.forEach(this.files, async file => {
+      await file.download(outputDir)
+    })
+  }
+
+}
+
+export class HeatTimetableFile {
+
+  line
+  type
+  href
+
+  #filePath 
+
+  constructor(line, type, href) {
+    this.line = line
+    this.type = type
+    this.href = href
+  }
+
+  async download(outputDir) {
+    this.#filePath = path.join(outputDir, `${this.line} - ${this.type}.pdf`)
+
+    let response = await fetch(constants.VLINE_HOST + this.href)
+    let outputStream = createWriteStream(this.#filePath)
+
+    await pipeline(response.body, outputStream)
+  }
+
+  setFilePath(filePath) {
+    this.#filePath = filePath
+  }
+
+  async extractRuns() {
+    let reader = new PassPDFReader(this.#filePath)
+    return await reader.readRuns()
+  }
+
+  static fromFile(pathname) {
+    const filename = path.basename(pathname).replace('.pdf', '')
+    const [line, type] = filename.split(' - ')
+    const file = new HeatTimetableFile(line, type, '')
+    file.setFilePath(pathname)
+
+    return file
+  }
+
+}
+
+export async function getHeatTimetables() {
+  let body = await (await fetch(constants.VLINE_HOST + constants.HEAT_PAGE)).text()
+  let $ = parseHTML(body)
+
+  let buttons = Array.from($('div.TimeTableHeaderMainContainer > a.button-file-link-caption'))
+  const timetable = new HeatTimetable()
+
+  buttons.forEach(button => {
+    let text = $(button).text().replace(/PDF.+/, '').replace(' extreme heat timetable', '').replace(/via .+\(/, '(').replace(/ \/ \w+/, '')
+    let data = text.match(/([\w ]+) \((.+)\)/)
+    if (!data) return null
+
+    let [_, line, type] = data
+    timetable.addFile(new HeatTimetableFile(line, type, $(button).attr('href')))
+  })
+
+  return timetable.files.length ? timetable : null
+}

package/lib/pass/pass-pdf-reader.mjs

@@ -43,6 +43,7 @@ export default class PassPDFReader {
           }
           if (stationName === 'Service Information') continue
           if (!stopData || stopData.length === 1) continue
+          if (stationName === 'Change Service' && !currentRun.stops.length) continue
           if (stationName === 'Change Service' && stopData.length) {
             currentRun.stops.push(lastStation)
             runs.push(currentRun)
@@ -67,8 +68,8 @@ export default class PassPDFReader {
           }
         }
 
-        currentRun.stops.push(lastStation)
-        runs.push(currentRun)
+        if (lastStation) currentRun.stops.push(lastStation)
+        if (currentRun.stops.length) runs.push(currentRun)
       }
     }
 

package/lib/pass/pass-table-reader.mjs

@@ -56,11 +56,12 @@ export default class PassTableReader {
         const tableData = []
 
         page.Texts.forEach(text => {
+          if (text.y < tableStart - commonHeight || text.y > tableEnd + commonHeight * 1.5) return
+
           let textContent = decodeURIComponent(text.R[0].T)
 
-          let firstYGreater = rowStarts.find(r => r > text.y + 0.3)
-          let currentRow = rowStarts.indexOf(firstYGreater) - 1
-          if (currentRow < 0) return
+          let currentRow = rowStarts.findIndex(r => r > text.y + 0.3) - 1
+          if (currentRow < 0) currentRow = rowStarts.length - 1
 
           let currentCol = colStarts.findLastIndex(c => c < text.x + 0.4)
 

package/lib.mjs

@@ -1,9 +1,13 @@
+import { getHeatTimetables, HeatTimetable, HeatTimetableFile } from './lib/heat/vline-heat.mjs'
 import { getNSPVersion, NSPFile, NSPVersion } from './lib/nsp/vline-nsp.mjs'
 import PassPDFReader from './lib/pass/pass-pdf-reader.mjs'
 
 export {
   getNSPVersion,
+  getHeatTimetables,
   NSPFile,
   NSPVersion,
-  PassPDFReader
+  PassPDFReader,
+  HeatTimetable,
+  HeatTimetableFile
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transportme/vline-nsp-reader",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "lib.mjs",
   "scripts": {
     "test": "mocha './{,!(node_modules)/**}/*.test.mjs'"