hk-bus-eta 1.2.2 → 1.3.1

package/Ctb.js

@@ -1,10 +1,8 @@
-const utils = require('./utils')
-
 module.exports = {
   co: 'ctb',
   fetchEtas: ({stopId, route, bound }) => (
     fetch(`https://rt.data.gov.hk//v1/transport/citybus-nwfb/eta/CTB/${stopId}/${route}`, {
-      cache: utils.isSafari ? 'default' : 'no-store'
+      cache: "reload"
     }).then(
       response => response.json()
     ).then(({data}) => data.filter(eta => eta.eta && eta.dir === bound).map(e => ({
@@ -19,7 +17,7 @@ module.exports = {
   ),
   fetchStopEtas: ( stopId ) => (
     fetch(`https://rt.data.gov.hk/v1/transport/batch/stop-eta/CTB/${stopId}`, { 
-      cache: utils.isSafari ? 'default' : 'no-store'
+      cache: "reload"
     }).then(
       response => response.json()
     ).then(({data}) => data.map( e => ({
@@ -37,4 +35,4 @@ module.exports = {
       co: 'ctb'
     })))
   )
-}
+}

package/Kmb.js

@@ -1,11 +1,9 @@
-const utils = require('./utils')
-
 module.exports = {
   co: 'kmb',
   fetchEtas: ({stopId, route, seq, serviceType, bound}) => (
     fetch(
       `https://data.etabus.gov.hk/v1/transport/kmb/eta/${stopId}/${route}/${serviceType}`,
-      { cache: utils.isSafari ? 'default' : 'no-store' }
+      { cache: "reload" }
     ).then( response => response.json() )
     .then(({data}) => data.filter(e => 
       e.dir === bound 
@@ -22,7 +20,7 @@ module.exports = {
   ),
   fetchStopEtas: ( stopId ) => (
     fetch(`https://data.etabus.gov.hk/v1/transport/kmb/stop-eta/${stopId}`, { 
-      cache: utils.isSafari ? 'default' : 'no-store'
+      cache: "reload"
     })
     .then(response => response.json())
     .then(({data}) => data.map( e => ({
@@ -42,4 +40,4 @@ module.exports = {
       co: 'kmb'
     })))
   )
-}
+}

package/Lrtfeeder.js

@@ -0,0 +1,34 @@
+module.exports = {
+  co: 'lrtfeeder',
+  fetchEtas: ({stopId, route, language}) => (
+    fetch(`https://rt.data.gov.hk/v1/transport/mtr/bus/getSchedule`, {
+      method: "POST",
+      cache: "reload",
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({
+        'language': language,
+        'routeName': route
+      })
+    }).then( response => response.json() )
+    .then(({busStop}) => 
+      busStop.filter(({busStopId}) => busStopId === stopId)
+      .reduce((ret, {bus: buses}) => ([...ret, ...buses.reduce( (etas, bus) => {
+        const etaDate = new Date(Date.now() + parseInt(bus.arrivalTimeInSecond, 10) * 1000)
+        if ( bus.arrivalTimeInSecond === "108000" ) return [...etas];
+        return [
+          ...etas,
+          {
+            eta: etaDate.toISOString(),
+            remark: {
+              [language]: bus.busRemark
+            },
+            co: 'lrtfeeder'
+          }
+        ]
+      }, [])]), [])
+    )
+  ),
+  fetchStopEtas: ( stopId ) => []
+}

package/Nlb.js

@@ -1,5 +1,3 @@
-const utils = require('./utils')
-
 module.exports = {
   co: 'nlb',
   fetchEtas: ({stopId, nlbId }) => (
@@ -30,7 +28,7 @@ module.exports = {
   ),
   fetchStopEtas: ( stopId ) => (
     fetch(`https://rt.data.gov.hk/v1/transport/batch/stop-eta/NLB/${stopId}`, { 
-      cache: utils.isSafari ? 'default' : 'no-store'
+      cache: "reload"
     }).then( response => {
         if (response.ok)
           return response.json()

package/Nwfb.js

@@ -1,10 +1,8 @@
-const utils = require('./utils')
-
 module.exports = {
   co: 'nwfb',
   fetchEtas: ({stopId, route, bound }) => (
     fetch(`https://rt.data.gov.hk//v1/transport/citybus-nwfb/eta/NWFB/${stopId}/${route}`, {
-      cache: utils.isSafari ? 'default' : 'no-store'
+      cache: "reload"
     }).then(
       response => response.json()
     ).then(({data}) => data.filter(eta => eta.eta && eta.dir === bound).map(e => ({
@@ -19,7 +17,7 @@ module.exports = {
   ),
   fetchStopEtas: ( stopId ) => (
     fetch(`https://rt.data.gov.hk/v1/transport/batch/stop-eta/NWFB/${stopId}`, { 
-      cache: utils.isSafari ? 'default' : 'no-store'
+      cache: "reload"
     }).then(
       response => response.json()
     ).then(({data}) => data.map( e => ({
@@ -37,4 +35,4 @@ module.exports = {
       co: 'nwfb'
     })))
   )
-}
+}

package/index.d.ts

@@ -1,4 +1,4 @@
-export type Company = "kmb" | "nlb" | "ctb" |  "nwfb"
+export type Company = "kmb" | "nlb" | "ctb" |  "nwfb" | 'lrtfeeder'
 
 export type Terminal = {
   en: string,
@@ -21,6 +21,7 @@ export type RouteListEntry = {
   readonly fares: string[] | null,
   readonly faresHoliday: string[] | null,
   readonly freq: Freq | null,
+  readonly jt: string | null,
   readonly seq: number,
   readonly serviceType: string,
   readonly stops: {
@@ -69,7 +70,7 @@ export type Eta = {
   co: Company
 }
 
-export declare function fetchEtas(route: Route): Promise<Eta[]>
+export declare function fetchEtas(route: any): Promise<Eta[]>
 
 export declare function fetchEtaObj(): Promise<BusDb>
 

package/index.js

@@ -2,29 +2,29 @@ const KmbApi = require('./Kmb')
 const NwfbApi = require('./Nwfb')
 const CtbApi = require('./Ctb')
 const NlbApi = require('./Nlb')
+const LrtfeederApi = require('./Lrtfeeder')
 
 module.exports = {
   // seq is 0-based here
-  fetchEtas: async ( {route, stops, bound, seq, serviceType, co, nlbId }) => {
+  fetchEtas: async ( {route, stops, bound, seq, serviceType, co, nlbId, language }) => {
     let _etas = []
     for ( const company_id of co ) {
-    if (company_id === 'kmb' && stops.kmb ){
-      _etas = _etas.concat( await KmbApi.fetchEtas({
-      route,
-      stopId: stops.kmb[seq], 
-      seq: (seq + 1 === stops.kmb.length ? 1000 : seq), 
-      serviceType, bound: bound[company_id]}) 
-      )
-    }
-    else if ( company_id === 'ctb' && stops.ctb ) {
-      _etas = _etas.concat( await CtbApi.fetchEtas({stopId: stops.ctb[seq], route, bound: bound[company_id] }))
-    }
-    else if ( company_id === 'nwfb' && stops.nwfb ) {
-      _etas = _etas.concat( await NwfbApi.fetchEtas({stopId: stops.nwfb[seq], route, bound: bound[company_id] }))
-    }
-    else if ( company_id === 'nlb' && stops.nlb ) {
-      _etas = _etas.concat( await NlbApi.fetchEtas({stopId: stops.nlb[seq], nlbId}) )
-    }
+      if (company_id === 'kmb' && stops.kmb ){
+        _etas = _etas.concat( await KmbApi.fetchEtas({
+        route,
+        stopId: stops.kmb[seq], 
+        seq,
+        serviceType, bound: bound[company_id]}) 
+        )
+      } else if ( company_id === 'ctb' && stops.ctb ) {
+        _etas = _etas.concat( await CtbApi.fetchEtas({stopId: stops.ctb[seq], route, bound: bound[company_id] }))
+      } else if ( company_id === 'nwfb' && stops.nwfb ) {
+        _etas = _etas.concat( await NwfbApi.fetchEtas({stopId: stops.nwfb[seq], route, bound: bound[company_id] }))
+      } else if ( company_id === 'nlb' && stops.nlb ) {
+        _etas = _etas.concat( await NlbApi.fetchEtas({stopId: stops.nlb[seq], nlbId}) )
+      } else if ( company_id === 'lrtfeeder' && stops.lrtfeeder ) {
+        _etas = _etas.concat( await LrtfeederApi.fetchEtas({stopId: stops.lrtfeeder[seq], route, language}))
+      }
     }
 
     return _etas.sort((a,b) => { 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hk-bus-eta",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "description": "Query the ETA (Estimated Time of Arrival) of HK Bus",
   "main": "index.js",
   "scripts": {

package/utils.js

@@ -1,3 +0,0 @@
-module.exports = {
-  isSafari: navigator && navigator.userAgent && navigator.userAgent.includes('Safari/') && !(navigator.userAgent.includes('Chrome/') || navigator.userAgent.includes('Chromium/'))
-}