hk-bus-eta 1.7.6 → 1.8.2

package/Ctb.js

@@ -9,7 +9,7 @@ module.exports = {
       response => response.json()
     ).then(({data}) => (
       data
-        .filter(eta => eta.eta && eta.dir === bound)
+        .filter(eta => eta.eta && bound.includes(eta.dir))
         // filter the eta by the stop sequence information 
         // as the route data may not 100% match
         // use the nearest seq

package/Kmb.js

@@ -11,8 +11,9 @@ module.exports = {
       data.filter(e => 
         e.eta !== null
         && e.dir === bound 
-        && e.seq === seq + 1 // api return 1-based seq
       )
+      .sort((a,b) => Math.abs(a.seq - seq) < Math.abs(b.seq - seq) ? -1 : 1 )
+      .filter((eta, idx, self) => eta.seq === self[0].seq)
       .map(e => ({
         eta: e.eta,
         remark: {

package/Nwfb.js

@@ -9,7 +9,7 @@ module.exports = {
       response => response.json()
     ).then(({data}) => (
       data
-        .filter(eta => eta.eta && eta.dir === bound)
+        .filter(eta => eta.eta && bound.includes(eta.dir))
         // filter the eta by the stop sequence information 
         // as the route data may not 100% match
         // use the nearest seq

package/index.d.ts

@@ -28,7 +28,7 @@ export type RouteListEntry = {
     [co in Company]: string[]
   },
   readonly bound: {
-    [co in Company]: "O" | "I"
+    [co in Company]: "O" | "I" | "OI" | "IO"
   },
   readonly gtfsId: string,
   readonly nlbId: string

package/index.js

@@ -10,37 +10,42 @@ const MtrApi = require('./Mtr')
 module.exports = {
   // seq is 0-based here
   fetchEtas: async ( {route, stops, bound, dest, seq, serviceType, co, nlbId, gtfsId, 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,
-          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], seq }))
-      } else if ( company_id === 'nwfb' && stops.nwfb ) {
-        _etas = _etas.concat( await NwfbApi.fetchEtas({stopId: stops.nwfb[seq], route, bound: bound[company_id], seq }))
-      } 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}))
-      } else if ( company_id === 'gmb' && stops.gmb ) {
-        _etas = _etas.concat( await GmbApi.fetchEtas({stopId: stops.gmb[seq], gtfsId, seq, bound: bound[company_id]}) )
-      } else if ( company_id === 'lightRail' && stops.lightRail ) {
-        _etas = _etas.concat( await LightRailApi.fetchEtas({ stopId: stops.lightRail[seq], route, dest }) )
-      } else if ( company_id === 'mtr' && stops.mtr ) {
-        _etas = _etas.concat( await MtrApi.fetchEtas({ stopId: stops.mtr[seq], route, bound: bound.mtr }) )
+    try {
+      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,
+            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], seq }))
+        } else if ( company_id === 'nwfb' && stops.nwfb ) {
+          _etas = _etas.concat( await NwfbApi.fetchEtas({stopId: stops.nwfb[seq], route, bound: bound[company_id], seq }))
+        } 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}))
+        } else if ( company_id === 'gmb' && stops.gmb ) {
+          _etas = _etas.concat( await GmbApi.fetchEtas({stopId: stops.gmb[seq], gtfsId, seq, bound: bound[company_id]}) )
+        } else if ( company_id === 'lightRail' && stops.lightRail ) {
+          _etas = _etas.concat( await LightRailApi.fetchEtas({ stopId: stops.lightRail[seq], route, dest }) )
+        } else if ( company_id === 'mtr' && stops.mtr ) {
+          _etas = _etas.concat( await MtrApi.fetchEtas({ stopId: stops.mtr[seq], route, bound: bound.mtr }) )
+        }
       }
-    }
 
-    return _etas.sort((a,b) => { 
-    if ( a.eta === '' ) return 1
-    else if ( b.eta === '' ) return -1
-    return a.eta < b.eta ? -1 : 1
-    })
+      return _etas.sort((a,b) => { 
+        if ( a.eta === '' ) return 1
+        else if ( b.eta === '' ) return -1
+        return a.eta < b.eta ? -1 : 1
+      })
+    } catch (err) {
+      console.error(err)
+      return []
+    }
   },
   fetchEtaObj: () => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json").then(r => r.json()),
   fetchEtaObjMd5: () => fetch('https://hkbus.github.io/hk-bus-crawling/routeFareList.md5').then(r => r.text())

package/package.json

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