hk-bus-eta 1.7.3 → 1.7.6

package/Kmb.js

@@ -5,11 +5,15 @@ module.exports = {
   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'
-    }).then( response => response.json() )
-    .then(({data}) => data.filter(e => 
-      e.dir === bound 
-      && e.seq === seq + 1 // api return 1-based seq
-    ).map(e => ({
+    })
+    .then( response => response.json() )
+    .then(({data}) => (
+      data.filter(e => 
+        e.eta !== null
+        && e.dir === bound 
+        && e.seq === seq + 1 // api return 1-based seq
+      )
+      .map(e => ({
         eta: e.eta,
         remark: {
           zh: e.rmk_tc,
@@ -17,7 +21,7 @@ module.exports = {
         },
         co: 'kmb'
       }))
-    )
+    ))
   ),
   fetchStopEtas: ( stopId ) => (
     fetch(`https://data.etabus.gov.hk/v1/transport/kmb/stop-eta/${stopId}`, { 

package/LightRail.js

@@ -12,7 +12,11 @@ module.exports = {
         .reduce((acc, {route_list, platform_id}) => [
           ...acc,
           ...route_list
-            .filter(({route_no, dest_ch, stop}) => route === route_no && dest_ch === dest.zh && stop === 0)
+            .filter(({route_no, dest_ch, dest_en, stop}) => (
+              route === route_no 
+              && ( dest_ch === dest.zh || dest_en.includes('Circular') ) 
+              && stop === 0
+            ))
             .map( ({time_en}) => {
               let waitTime = 0
               switch ( time_en.toLowerCase() ) {

package/index.js

@@ -14,11 +14,11 @@ module.exports = {
     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]}) 
-        )
+          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 ) {

package/package.json

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