hk-bus-eta 3.3.2 → 3.3.3

package/esm/hkkf.js

@@ -1,29 +1,50 @@
-import { isSafari } from "./utils";
-export default function fetchEtas({ route, bound, seq }) {
-    if (seq === 0)
+import { getUpcomingFerry } from "./utils";
+export default function fetchEtas({ freq, seq, holidays, serviceDayMap, }) {
+    if (seq >= 1)
         return Promise.resolve([]);
-    return fetch(`https://www.hkkfeta.com/opendata/eta/${route.slice(2)}/${bound === "I" ? "inbound" : "outbound"}`, {
+    const now = new Date();
+    return Promise.resolve(getUpcomingFerry({ holidays, serviceDayMap, freq, date: new Date() })
+        .filter(v => (new Date(v)).getTime() - now.getTime() < 180 * 60 * 1000)
+        .map(eta => ({
+        eta: eta,
+        remark: {
+            zh: "預定班次",
+            en: "Scheduled",
+        },
+        dest: {
+            zh: "",
+            en: "",
+        },
+        co: "fortuneferry",
+    })));
+    /*
+     * the official API is broken most of the time, keep it for reference
+    return fetch(
+      `https://www.hkkfeta.com/opendata/eta/${route.slice(2)}/${bound === "I" ? "inbound" : "outbound"}`,
+      {
         cache: isSafari ? "default" : "no-store",
-    })
-        .then((response) => response.json())
-        .then(({ data }) => {
-        if (!data)
-            return [];
+      },
+    )
+      .then((response) => response.json())
+      .then(({ data }) => {
+        if (!data) return [];
+        
         return data
-            .map(({ ETA }) => {
+          .map(({ETA}: any) => {
             return {
-                eta: ETA,
-                remark: {
-                    zh: "",
-                    en: "",
-                },
-                dest: {
-                    zh: "",
-                    en: "",
-                },
-                co: "hkkf",
-            };
-        });
-    });
+              eta: ETA,
+              remark: {
+                zh: "",
+                en: "",
+              },
+              dest: {
+                zh: "",
+                en: "",
+              },
+              co: "hkkf",
+            }
+          });
+      });
+      */
 }
 //# sourceMappingURL=hkkf.js.map

package/esm/hkkf.js.map

@@ -1 +1 @@
-{"version":3,"file":"hkkf.js","sourceRoot":"","sources":["../src/hkkf.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAQnC,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,KAAK,EAAE,KAAK,EAAE,GAAG,EACF;IACf,IAAK,GAAG,KAAK,CAAC;QAAG,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC3C,OAAO,KAAK,CACV,wCAAwC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,EAClG;QACE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;KACzC,CACF;SACE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;SACnC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACjB,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QAErB,OAAO,IAAI;aACR,GAAG,CAAC,CAAC,EAAC,GAAG,EAAM,EAAE,EAAE;YAClB,OAAO;gBACL,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE;oBACN,EAAE,EAAE,EAAE;oBACN,EAAE,EAAE,EAAE;iBACP;gBACD,IAAI,EAAE;oBACJ,EAAE,EAAE,EAAE;oBACN,EAAE,EAAE,EAAE;iBACP;gBACD,EAAE,EAAE,MAAM;aACX,CAAA;QACH,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"hkkf.js","sourceRoot":"","sources":["../src/hkkf.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAY,MAAM,SAAS,CAAC;AASrD,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,aAAa,GACnB;IACf,IAAK,GAAG,IAAI,CAAC;QAAG,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC1C,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,OAAO,OAAO,CAAC,OAAO,CACpB,gBAAgB,CAAC,EAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAC,CAAC;SAChE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,IAAI,CAAE;SACvE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACX,GAAG,EAAE,GAAG;QACN,MAAM,EAAE;YACN,EAAE,EAAE,MAAM;YACV,EAAE,EAAE,WAAW;SAChB;QACD,IAAI,EAAE;YACJ,EAAE,EAAE,EAAE;YACN,EAAE,EAAE,EAAE;SACP;QACD,EAAE,EAAE,cAAc;KACrB,CAAC,CAAC,CACN,CAAA;IACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4BI;AACN,CAAC"}

package/esm/index.d.ts

@@ -1,10 +1,12 @@
 import { RouteListEntry, EtaDb, Eta, StopList } from "./type";
 interface fetchEtasProps extends RouteListEntry {
     stopList: StopList;
+    holidays: EtaDb["holidays"];
+    serviceDayMap: EtaDb["serviceDayMap"];
     language: "zh" | "en";
     seq: number;
 }
-export declare function fetchEtas({ route, stops, bound, dest, seq, serviceType, co, nlbId, gtfsId, stopList, language, }: fetchEtasProps): Promise<Eta[]>;
+export declare function fetchEtas({ route, stops, bound, dest, freq, seq, serviceType, co, nlbId, gtfsId, stopList, language, holidays, serviceDayMap, }: fetchEtasProps): Promise<Eta[]>;
 export declare function fetchEtaDb(): Promise<EtaDb>;
 export declare function fetchEtaDbMd5(): Promise<string>;
 export type * from "./type";

package/esm/index.js

@@ -8,7 +8,7 @@ import mtr from "./mtr";
 import sunferry from "./sunferry";
 import fortuneferry from "./fortuneferry";
 import hkkf from "./hkkf";
-export async function fetchEtas({ route, stops, bound, dest, seq, serviceType, co, nlbId, gtfsId, stopList, language, }) {
+export async function fetchEtas({ route, stops, bound, dest, freq, seq, serviceType, co, nlbId, gtfsId, stopList, language, holidays, serviceDayMap, }) {
     try {
         let _etas = [];
         for (const company_id of co) {
@@ -48,14 +48,14 @@ export async function fetchEtas({ route, stops, bound, dest, seq, serviceType, c
             }
             else if (company_id === "fortuneferry" && stops.fortuneferry) {
                 _etas = _etas.concat(await fortuneferry({
-                    route, stops, seq, stopList
+                    stops, seq, stopList, freq, serviceDayMap, holidays,
                 }));
             }
             else if (company_id === "sunferry" && stops.sunferry) {
-                _etas = _etas.concat(await sunferry({ route, seq }));
+                _etas = _etas.concat(await sunferry({ route, seq, holidays, serviceDayMap, freq }));
             }
             else if (company_id === "hkkf" && stops.hkkf) {
-                _etas = _etas.concat(await hkkf({ route, bound: bound.hkkf, seq }));
+                _etas = _etas.concat(await hkkf({ freq, seq, holidays, serviceDayMap }));
             }
         }
         return _etas.sort((a, b) => {

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/esm/sunferry.d.ts

@@ -1,7 +1,10 @@
-import type { Eta } from "./type";
+import type { Eta, EtaDb, RouteListEntry } from "./type";
 interface fetchEtasProps {
+    freq: RouteListEntry["freq"];
     route: string;
     seq: number;
+    holidays: EtaDb["holidays"];
+    serviceDayMap: EtaDb["serviceDayMap"];
 }
-export default function fetchEtas({ route, seq }: fetchEtasProps): Promise<Eta[]>;
+export default function fetchEtas({ route, seq, freq, holidays, serviceDayMap, }: fetchEtasProps): Promise<Eta[]>;
 export {};

package/esm/sunferry.js

@@ -1,5 +1,5 @@
-import { isSafari } from "./utils";
-export default function fetchEtas({ route, seq }) {
+import { getUpcomingFerry, isSafari } from "./utils";
+export default function fetchEtas({ route, seq, freq, holidays, serviceDayMap, }) {
     if (seq === 1)
         return Promise.resolve([]);
     return fetch(`https://www.sunferry.com.hk/eta/?route=${route}`, {
@@ -7,6 +7,7 @@ export default function fetchEtas({ route, seq }) {
     })
         .then((response) => response.json())
         .then(({ data }) => {
+        throw new Error("");
         if (!data)
             return [];
         return data
@@ -30,6 +31,24 @@ export default function fetchEtas({ route, seq }) {
                 co: "sunferry",
             };
         });
+    })
+        .catch(() => {
+        // the API gives CORS error, the below handling is for browser
+        const now = new Date();
+        return getUpcomingFerry({ holidays, serviceDayMap, freq, date: new Date() })
+            .filter(v => (new Date(v)).getTime() - now.getTime() < 180 * 60 * 1000)
+            .map(eta => ({
+            eta: eta,
+            remark: {
+                zh: "預定班次",
+                en: "Scheduled",
+            },
+            dest: {
+                zh: "",
+                en: "",
+            },
+            co: "sunferry",
+        }));
     });
 }
 //# sourceMappingURL=sunferry.js.map

package/esm/sunferry.js.map

@@ -1 +1 @@
-{"version":3,"file":"sunferry.js","sourceRoot":"","sources":["../src/sunferry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAOnC,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,KAAK,EAAE,GAAG,EACK;IACf,IAAK,GAAG,KAAK,CAAC;QAAG,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC3C,OAAO,KAAK,CACV,0CAA0C,KAAK,EAAE,EACjD;QACE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;KACzC,CACF;SACE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;SACnC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACjB,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QAErB,OAAO,IAAI;aACR,GAAG,CAAC,CAAC,EAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAM,EAAE,EAAE;YAC9D,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;YACxB,IAAI,KAAK,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,GAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,GAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,WAAW,WAAW,CAAA;YACpI,IAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,EAAG;gBAC9B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;gBAChC,KAAK,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,GAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,GAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,WAAW,WAAW,CAAA;aACjI;YACD,OAAO;gBACL,GAAG,EAAE,KAAK;gBACV,MAAM,EAAE;oBACN,EAAE,EAAE,MAAM;oBACV,EAAE,EAAE,MAAM;iBACX;gBACD,IAAI,EAAE;oBACJ,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAC5B,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBAC7B;gBACD,EAAE,EAAE,UAAU;aACf,CAAA;QACH,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"sunferry.js","sourceRoot":"","sources":["../src/sunferry.ts"],"names":[],"mappings":"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"}

package/esm/type.d.ts

@@ -49,13 +49,13 @@ export type EtaDb = {
     stopList: StopList;
     stopMap: StopMap;
     serviceDayMap: Record<string, [
-        0 | 1,
-        0 | 1,
-        0 | 1,
-        0 | 1,
-        0 | 1,
-        0 | 1,
-        0 | 1
+        "0" | "1",
+        "0" | "1",
+        "0" | "1",
+        "0" | "1",
+        "0" | "1",
+        "0" | "1",
+        "0" | "1"
     ]>;
 };
 export type Eta = {
@@ -70,5 +70,5 @@ export type Eta = {
     };
     co: Company;
     lat?: number;
-    lng: number;
+    lng?: number;
 };

package/esm/utils.d.ts

@@ -1 +1,8 @@
+import { EtaDb, RouteListEntry } from "./type";
 export declare const isSafari: boolean;
+export declare const getUpcomingFerry: ({ holidays, serviceDayMap, date, freq, }: {
+    holidays: string[];
+    serviceDayMap: EtaDb["serviceDayMap"];
+    freq: RouteListEntry["freq"];
+    date: Date;
+}) => string[];

package/esm/utils.js

@@ -10,4 +10,49 @@ export const isSafari = (() => {
         return false;
     }
 })();
+// fancy handling for timezone, not recommend to use it unless you know what's going on
+// i.e, calling isHoliday(holidays, new Date()) is checking if it was being a holiday at the moment of 8 hours ago
+const isHoliday = (holidays, utcDate) => {
+    if (utcDate.getDay() === 0)
+        return true;
+    return holidays.includes(String(utcDate.getUTCFullYear()) +
+        String(utcDate.getUTCMonth() + 1).padStart(2, "0") +
+        String(utcDate.getUTCDate()).padStart(2, "0"));
+};
+export const getUpcomingFerry = ({ holidays, serviceDayMap, date, freq, }) => {
+    if (freq === null) {
+        return [];
+    }
+    const getEta = (serviceFreq, date) => (Object.keys(serviceFreq).sort((a, b) => a < b ? -1 : 1).reduce((acc, tp) => {
+        const ferryTime = new Date(date.getTime());
+        ferryTime.setUTCHours(parseInt(tp.slice(0, 2), 10));
+        ferryTime.setUTCMinutes(parseInt(tp.slice(2), 10));
+        if (ferryTime >= date) {
+            acc.push(String(ferryTime.getUTCFullYear()) + "-" +
+                String(ferryTime.getUTCMonth() + 1).padStart(2, "0") + "-" +
+                String(ferryTime.getUTCDate()).padStart(2, "0") + "T" +
+                String(ferryTime.getUTCHours()).padStart(2, "0") + ":" +
+                String(ferryTime.getUTCMinutes()).padStart(2, "0") + ":00" +
+                ".000+08:00");
+        }
+        return acc;
+    }, []));
+    // obtain all ETAs sampling for next 24 hours, fancy handling for timezone
+    const ret = Array(24).fill(0).reduce((acc, _, idx) => {
+        const refDate = new Date(date.getTime());
+        refDate.setUTCHours(refDate.getUTCHours() + 8 + idx);
+        for (let serviceKey in freq) {
+            if (isHoliday(holidays, refDate)) {
+                if (serviceDayMap[serviceKey][0] === '1') {
+                    return acc.concat(getEta(freq[serviceKey], refDate));
+                }
+            }
+            else if (serviceDayMap[serviceKey][refDate.getDay()]) {
+                return acc.concat(getEta(freq[serviceKey], refDate)).sort();
+            }
+        }
+        return acc;
+    }, []);
+    return [...new Set(ret)].sort((a, b) => a < b ? -1 : 1);
+};
 //# sourceMappingURL=utils.js.map

package/esm/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE;IAC5B,IAAI;QACF,OAAO,OAAO,CACZ,SAAS;YACP,SAAS,CAAC,SAAS;YACnB,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC;YACvC,CAAC,CACC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC;gBACvC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAC1C,CACJ,CAAC;KACH;IAAC,WAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAC,EAAE,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hk-bus-eta",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Query the ETA (Estimated Time of Arrival) of HK Bus/Minibus/MTR/Lightrail",
   "main": "dist/index.js",
   "module": "esm/index.js",
@@ -16,8 +16,7 @@
     "build:esm": "tsc --target es2018 --outDir esm",
     "build:cjs": "tsc --target es2015 --module commonjs --outDir dist",
     "build": "yarn build:cjs && yarn build:esm",
-    "prepublish": "yarn build",
-    "publish": "npm publish"
+    "prepublish": "yarn build"
   },
   "repository": {
     "type": "git",

package/src/fortuneferry.ts

@@ -1,13 +1,15 @@
-import type { Eta, RouteListEntry, StopList } from "./type";
-import { isSafari } from "./utils";
+import type { Eta, EtaDb, RouteListEntry, StopList } from "./type";
+import { getUpcomingFerry, isSafari } from "./utils";
 
 interface fetchEtasProps {
-  route: string;
   stops: {
     fortuneferry: string[];
   }
   seq: number;
   stopList: StopList;
+  freq: RouteListEntry["freq"],
+  holidays: EtaDb["holidays"];
+  serviceDayMap: EtaDb["serviceDayMap"];
 }
 
 const getCode = (zhName: string) => {
@@ -34,12 +36,33 @@ const getCode = (zhName: string) => {
 }
 
 export default function fetchEtas({
-  route, stops: { fortuneferry: stops }, seq, stopList
+  stops: { fortuneferry: stops }, seq,
+  holidays, freq, serviceDayMap
 }: fetchEtasProps): Promise<Eta[]> {
   if ( stops.length === seq - 1 ) return Promise.resolve([]);
-  const u = getCode(stopList[stops[seq]].name.zh)
-  const v = getCode(stopList[stops[seq+1]].name.zh)
+  const now = new Date()
+  return Promise.resolve(
+    getUpcomingFerry({holidays, serviceDayMap, freq, date: new Date()})
+      .filter(v => (new Date(v)).getTime() - now.getTime() < 180 * 60 * 1000 )
+      .map(eta => ({
+        eta: eta,
+          remark: {
+            zh: "預定班次",
+            en: "Scheduled",
+          },
+          dest: {
+            zh: "",
+            en: "",
+          },
+          co: "fortuneferry",
+      }))
+  )
+  
+  /*
+   * the official API is broken most of the time, keep it for reference
 
+  const v = getCode(stopList[stops[seq+1]].name.zh)
+  const u = getCode(stopList[stops[seq]].name.zh)
   return fetch(
     `https://www.hongkongwatertaxi.com.hk/eta/?route=${u}${v}`,
     {
@@ -72,4 +95,5 @@ export default function fetchEtas({
           }
         });
     });
+  */
 }

package/src/hkkf.ts

@@ -1,16 +1,36 @@
-import type { Eta, RouteListEntry } from "./type";
-import { isSafari } from "./utils";
+import type { Eta, EtaDb, RouteListEntry } from "./type";
+import { getUpcomingFerry, isSafari } from "./utils";
 
 interface fetchEtasProps {
-  route: string;
-  bound: RouteListEntry["bound"]["hkkf"];
+  freq: RouteListEntry["freq"];
   seq: number;
+  holidays: EtaDb["holidays"];
+  serviceDayMap: EtaDb["serviceDayMap"];
 }
 
 export default function fetchEtas({
-  route, bound, seq
+  freq, seq, holidays, serviceDayMap,
 }: fetchEtasProps): Promise<Eta[]> {
-  if ( seq === 0 ) return Promise.resolve([])
+  if ( seq >= 1 ) return Promise.resolve([])
+  const now = new Date()
+  return Promise.resolve(
+    getUpcomingFerry({holidays, serviceDayMap, freq, date: new Date()})
+      .filter(v => (new Date(v)).getTime() - now.getTime() < 180 * 60 * 1000 )
+      .map(eta => ({
+        eta: eta,
+          remark: {
+            zh: "預定班次",
+            en: "Scheduled",
+          },
+          dest: {
+            zh: "",
+            en: "",
+          },
+          co: "fortuneferry",
+      }))
+  )
+  /*
+   * the official API is broken most of the time, keep it for reference
   return fetch(
     `https://www.hkkfeta.com/opendata/eta/${route.slice(2)}/${bound === "I" ? "inbound" : "outbound"}`,
     {
@@ -37,4 +57,5 @@ export default function fetchEtas({
           }
         });
     });
+    */
 }

package/src/index.ts

@@ -12,6 +12,8 @@ import { RouteListEntry, EtaDb, Eta, StopList } from "./type";
 
 interface fetchEtasProps extends RouteListEntry {
   stopList: StopList;
+  holidays: EtaDb["holidays"],
+  serviceDayMap: EtaDb["serviceDayMap"],
   language: "zh" | "en";
   seq: number;
 }
@@ -21,6 +23,7 @@ export async function fetchEtas({
   stops,
   bound,
   dest,
+  freq,
   seq,
   serviceType,
   co,
@@ -28,6 +31,8 @@ export async function fetchEtas({
   gtfsId,
   stopList,
   language,
+  holidays,
+  serviceDayMap,
 }: fetchEtasProps): Promise<Eta[]> {
   try {
     let _etas: Eta[] = [];
@@ -74,13 +79,13 @@ export async function fetchEtas({
       } else if (company_id === "fortuneferry" && stops.fortuneferry) {
         _etas = _etas.concat(
           await fortuneferry({
-            route, stops, seq, stopList
+            stops, seq, stopList, freq, serviceDayMap, holidays,
           })
         )
       } else if (company_id === "sunferry" && stops.sunferry) {
-        _etas = _etas.concat(await sunferry({route, seq}))
+        _etas = _etas.concat(await sunferry({route, seq, holidays, serviceDayMap, freq}))
       } else if (company_id === "hkkf" && stops.hkkf) {
-        _etas = _etas.concat(await hkkf({route, bound: bound.hkkf, seq}))
+        _etas = _etas.concat(await hkkf({freq, seq, holidays, serviceDayMap}))
       }
     }
 

package/src/sunferry.ts

@@ -1,15 +1,20 @@
-import type { Eta } from "./type";
-import { isSafari } from "./utils";
+import type { Eta, EtaDb, Freq, RouteListEntry } from "./type";
+import { getUpcomingFerry, isSafari } from "./utils";
 
 interface fetchEtasProps {
+  freq: RouteListEntry["freq"],
   route: string;
   seq: number;
+  holidays: EtaDb["holidays"],
+  serviceDayMap: EtaDb["serviceDayMap"],
 }
 
 export default function fetchEtas({
-  route, seq
+  route, seq,
+  freq, holidays, serviceDayMap,
 }: fetchEtasProps): Promise<Eta[]> {
   if ( seq === 1 ) return Promise.resolve([])
+  
   return fetch(
     `https://www.sunferry.com.hk/eta/?route=${route}`,
     {
@@ -18,8 +23,8 @@ export default function fetchEtas({
   )
     .then((response) => response.json())
     .then(({ data }) => {
+      throw new Error("")
       if (!data) return [];
-      
       return data
         .map(({depart_time, rmk_en, rmk_tc, route_tc, route_en}: any) => {
           const date = new Date();
@@ -41,5 +46,23 @@ export default function fetchEtas({
             co: "sunferry",
           }
         });
+    })
+    .catch(() => {
+      // the API gives CORS error, the below handling is for browser
+      const now = new Date()
+      return getUpcomingFerry({holidays, serviceDayMap, freq, date: new Date()})
+        .filter(v => (new Date(v)).getTime() - now.getTime() < 180 * 60 * 1000 )
+        .map(eta => ({
+          eta: eta,
+            remark: {
+              zh: "預定班次",
+              en: "Scheduled",
+            },
+            dest: {
+              zh: "",
+              en: "",
+            },
+            co: "sunferry",
+        }))
     });
 }

package/src/type.ts

@@ -70,7 +70,7 @@ export type EtaDb = {
   stopMap: StopMap;
   serviceDayMap: Record<
     string,
-    [0 | 1, 0 | 1, 0 | 1, 0 | 1, 0 | 1, 0 | 1, 0 | 1]
+    ["0" | "1", "0" | "1", "0" | "1", "0" | "1", "0" | "1", "0" | "1", "0" | "1"]
   >;
 };
 
@@ -86,5 +86,5 @@ export type Eta = {
   };
   co: Company;
   lat?: number;
-  lng: number;
+  lng?: number;
 };

package/src/utils.ts

@@ -1,3 +1,5 @@
+import { EtaDb, Freq, RouteListEntry } from "./type";
+
 export const isSafari = (() => {
   try {
     return Boolean(
@@ -13,3 +15,66 @@ export const isSafari = (() => {
     return false;
   }
 })();
+
+// fancy handling for timezone, not recommend to use it unless you know what's going on
+// i.e, calling isHoliday(holidays, new Date()) is checking if it was being a holiday at the moment of 8 hours ago
+const isHoliday = (holidays: string[], utcDate: Date): boolean => {
+  if ( utcDate.getDay() === 0 ) return true
+  return holidays.includes(
+    String(utcDate.getUTCFullYear()) +
+    String(utcDate.getUTCMonth()+1).padStart(2, "0") +
+    String(utcDate.getUTCDate()).padStart(2, "0")
+  );
+}
+
+export const getUpcomingFerry = ({
+  holidays,
+  serviceDayMap,
+  date,
+  freq,
+}:  { 
+  holidays: string[],
+  serviceDayMap: EtaDb["serviceDayMap"], 
+  freq: RouteListEntry["freq"], 
+  date: Date
+}): string[] => {
+  if ( freq === null ) {
+    return [];
+  }
+  
+  const getEta = (serviceFreq: Record<string, any>, date: Date): string[] => (
+    Object.keys(serviceFreq).sort((a, b) => a < b ? -1 : 1).reduce((acc, tp) => {
+      const ferryTime = new Date(date.getTime())
+      ferryTime.setUTCHours(parseInt(tp.slice(0, 2), 10))
+      ferryTime.setUTCMinutes(parseInt(tp.slice(2), 10))
+      if ( ferryTime >= date ) {
+        acc.push(
+          String(ferryTime.getUTCFullYear()) + "-" +
+          String(ferryTime.getUTCMonth()+1).padStart(2, "0") + "-" +
+          String(ferryTime.getUTCDate()).padStart(2, "0") + "T" +
+          String(ferryTime.getUTCHours()).padStart(2, "0") + ":" +
+          String(ferryTime.getUTCMinutes()).padStart(2, "0") + ":00" +
+          ".000+08:00"
+        )
+      }
+      return acc
+    }, [] as string[])
+  )
+
+  // obtain all ETAs sampling for next 24 hours, fancy handling for timezone
+  const ret = Array(24).fill(0).reduce((acc, _, idx) => {
+    const refDate = new Date(date.getTime())
+    refDate.setUTCHours(refDate.getUTCHours() + 8 + idx)
+    for ( let serviceKey in freq ) {
+      if ( isHoliday(holidays, refDate) ) {
+        if ( serviceDayMap[serviceKey][0] === '1' ) {
+          return acc.concat(getEta(freq[serviceKey], refDate))
+        }
+      } else if ( serviceDayMap[serviceKey][refDate.getDay()] ) {
+         return acc.concat(getEta(freq[serviceKey], refDate)).sort()
+      }
+    }
+    return acc
+  }, [] as string[]);
+  return ([...new Set(ret)] as string[]).sort((a,b) => a < b ? -1 : 1)
+}