hk-bus-eta 1.5.0 → 1.6.0

package/Gmb.js

@@ -2,13 +2,14 @@ const utils = require('./utils');
 
 module.exports = {
   co: 'gmb',
-  fetchEtas: ({gtfsId, stopId, bound}) => (
+  fetchEtas: ({gtfsId, stopId, bound,seq}) => (
     fetch(`https://data.etagmb.gov.hk/eta/route-stop/${gtfsId}/${stopId}`, {
       cache: utils.isSafari ? 'default' : 'no-store'
     }).then( response => response.json() )
     .then(({data}) => (
       data
         .filter(({route_seq}) => ( bound === 'O' && route_seq === 1 ) || ( bound === 'I' && route_seq === 2 ) )
+        .filter(({stop_seq}) => stop_seq === seq + 1)
         .reduce( (acc, {eta}) => [
           ...acc, 
           ...eta.map( data => ({
@@ -21,10 +22,6 @@ module.exports = {
           }))
         ], [] )
     ))
-    .then(ret => {
-      console.log(ret)
-      return ret
-    })
   ),
   fetchStopEtas: ( stopId ) => []
 }

package/LightRail.js

@@ -0,0 +1,31 @@
+const utils = require('./utils');
+
+module.exports = {
+  co: 'lightRail',
+  fetchEtas: ({stopId, route, dest }) => (
+    fetch(`https://rt.data.gov.hk/v1/transport/mtr/lrt/getSchedule?station_id=${stopId.slice(2)}`, {
+      cache: utils.isSafari ? 'default' : 'no-store',
+
+    }).then( response => response.json() )
+    .then(({platform_list}) => (
+      platform_list
+        .reduce((acc, {route_list, platform_id}) => [
+          ...acc,
+          ...route_list
+            .filter(({route_no, dest_ch, stop}) => route === route_no && dest_ch === dest.zh && stop === 0)
+            .map( ({time_en}) => {
+              const etaDate = new Date(Date.now() + parseInt(time_en, 10) * 60 * 1000).toISOString();
+              return {
+                eta: etaDate,
+                remark: {
+                  zh: `${platform_id}號平台`,
+                  en: `Platform ${platform_id}`
+                },
+                co: 'lightRail'
+              }
+            }, [])
+        ], [])
+    ))
+  ),
+  fetchStopEtas: ( stopId ) => []
+}

package/index.d.ts

@@ -1,4 +1,4 @@
-export type Company = "kmb" | "nlb" | "ctb" |  "nwfb" | 'lrtfeeder' | 'gmb'
+export type Company = "kmb" | "nlb" | "ctb" |  "nwfb" | 'lrtfeeder' | 'gmb' | 'lightRail'
 
 export type Terminal = {
   en: string,

package/index.js

@@ -4,10 +4,11 @@ const CtbApi = require('./Ctb')
 const NlbApi = require('./Nlb')
 const LrtfeederApi = require('./Lrtfeeder')
 const GmbApi = require('./Gmb')
+const LightRailApi = require('./LightRail')
 
 module.exports = {
   // seq is 0-based here
-  fetchEtas: async ( {route, stops, bound, seq, serviceType, co, nlbId, gtfsId, language }) => {
+  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 ){
@@ -26,7 +27,9 @@ module.exports = {
       } 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, bound: bound[company_id]}) )
+        _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 }) )
       }
     }
 

package/package.json

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