hk-bus-eta 1.6.0 → 1.7.2

package/LightRail.js

@@ -14,11 +14,23 @@ module.exports = {
           ...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();
+              let waitTime = 0
+              switch ( time_en.toLowerCase() ) {
+                case 'arriving':
+                case 'departing':
+                case '-':
+                  waitTime = 0;
+                  break;
+                default:
+                  waitTime = parseInt(time_en, 10)
+                  break;
+              }
+              const etaDate = new Date(Date.now() + waitTime * 60 * 1000 + 8 * 3600000);
               return {
-                eta: etaDate,
+                eta: `${etaDate.getUTCFullYear()}-${`0${etaDate.getUTCMonth() + 1}`.slice(-2)}-${`0${etaDate.getUTCDate()}`.slice(-2)}`
+                  +`T${`0${etaDate.getUTCHours()}`.slice(-2)}:${`0${etaDate.getMinutes()}`.slice(-2)}:${`0${etaDate.getSeconds()}`.slice(-2)}+08:00`,
                 remark: {
-                  zh: `${platform_id}號平台`,
+                  zh: `${platform_id}號月台`,
                   en: `Platform ${platform_id}`
                 },
                 co: 'lightRail'
@@ -26,6 +38,10 @@ module.exports = {
             }, [])
         ], [])
     ))
+    .catch(e => {
+      console.error(e);
+      return [];
+    })
   ),
   fetchStopEtas: ( stopId ) => []
 }

package/Mtr.js

@@ -0,0 +1,27 @@
+const utils = require('./utils');
+
+module.exports = {
+  co: 'mtr',
+  fetchEtas: ({stopId, route, bound }) => (
+    fetch(`https://rt.data.gov.hk/v1/transport/mtr/getSchedule.php?line=${route}&sta=${stopId}`, {
+      cache: utils.isSafari ? 'default' : 'no-store',
+    }).then( response => response.json() )
+    .then(({data, status}) => (
+      status === 0 
+        ? [] 
+        : data[`${route}-${stopId}`][bound.slice(-2,1) === 'U' ? 'UP' : 'DOWN']  
+            .reduce((acc, {time, plat, dest}) => [
+              ...acc,
+              {
+                eta: time.replace(' ', 'T')+'+08:00',
+                remark: {
+                  zh: `${plat}號月台`,
+                  en: `Platform ${plat}`
+                },
+                co: 'mtr'
+              }
+            ], [])
+    ))
+  ),
+  fetchStopEtas: ( stopId ) => []
+}

package/index.d.ts

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

package/index.js

@@ -5,6 +5,7 @@ const NlbApi = require('./Nlb')
 const LrtfeederApi = require('./Lrtfeeder')
 const GmbApi = require('./Gmb')
 const LightRailApi = require('./LightRail')
+const MtrApi = require('./Mtr')
 
 module.exports = {
   // seq is 0-based here
@@ -30,6 +31,8 @@ module.exports = {
         _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 }) )
       }
     }
 

package/package.json

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