hk-bus-eta 3.7.6 → 3.7.8

package/README.md

@@ -19,28 +19,29 @@ or
 
 __Crawling traffic database:__
 ```ts
-import { fetchEtaObj } from "hk-bus-eta";
-import type { BusDb } from "hk-bus-eta";
+import { fetchEtaDb } from "hk-bus-eta";
+import type { EtaDb } from "hk-bus-eta";
 
-fetchEtaDb().then((db: BusDb) => {
+(async function () {
+  const etaDb: EtaDb = await fetchEtaDb();
   console.log(db)
-})
+})();
 ```
 
 __Crawling ETA__
 ```ts
 import { fetchEtas } from "hk-bus-eta";
-import tyep { Eta } from "hk-bus-eta";
-
-// busDb is the BusDb object fetched by fetchEtaObj
-
-fetchEtas({
-  ...busDb.routeList["1+1+CHUK YUEN ESTATE+STAR FERRY"],
-  seq: 0,
-  language: "en",
-}).then(etas => {
-  console.log(etas)
-})
+import type { Eta } from "hk-bus-eta";
+
+(async function () {
+  // etaDb is the EtaDb object fetched by fetchEtaObj
+  const etas: Eta[] = await fetchEtas({
+    ...etaDb.routeList["1+1+CHUK YUEN ESTATE+STAR FERRY"],
+    seq: 0,
+    language: "en",
+  });
+  console.log(etas);
+})();
 ```
 
 ## Data Structure

package/dist/hkkf.d.ts

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

package/dist/hkkf.js

@@ -1,53 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("./utils");
-function fetchEtas({ freq, seq, holidays, serviceDayMap, }) {
-    if (seq >= 1)
-        return Promise.resolve([]);
-    const now = new Date();
-    return Promise.resolve((0, utils_1.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 [];
-        
-        return data
-          .map(({ETA}: any) => {
-            return {
-              eta: ETA,
-              remark: {
-                zh: "",
-                en: "",
-              },
-              dest: {
+function fetchEtas({ route, bound, freq, seq, holidays, serviceDayMap, }) {
+    if (seq === 0) {
+        const now = new Date();
+        return Promise.resolve((0, utils_1.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: "hkkf",
-            }
-          });
-      });
-      */
+            },
+            co: "hkkf",
+        })));
+    }
+    else if (seq === 1) {
+        return fetch(`https://www.hkkfeta.com/opendata/eta/${route.slice(2)}/${bound === "I" ? "inbound" : "outbound"}`, {
+            cache: utils_1.isSafari ? "default" : "no-store",
+        })
+            .then((response) => response.json())
+            .then(({ data }) => {
+            if (!data)
+                return [];
+            return data.map(({ ETA }) => {
+                return {
+                    eta: ETA,
+                    remark: {
+                        zh: "",
+                        en: "",
+                    },
+                    dest: {
+                        zh: "",
+                        en: "",
+                    },
+                    co: "hkkf",
+                };
+            });
+        });
+    }
+    else {
+        return Promise.resolve([]);
+    }
 }
 exports.default = fetchEtas;
 //# sourceMappingURL=hkkf.js.map

package/dist/hkkf.js.map

@@ -1 +1 @@
-{"version":3,"file":"hkkf.js","sourceRoot":"","sources":["../src/hkkf.ts"],"names":[],"mappings":";;AACA,mCAAqD;AASrD,SAAwB,SAAS,CAAC,EAChC,IAAI,EACJ,GAAG,EACH,QAAQ,EACR,aAAa,GACE;IACf,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,wBAAgB,EAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC;SAClE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC;SACtE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACb,GAAG,EAAE,GAAG;QACR,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;KACnB,CAAC,CAAC,CACN,CAAC;IACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4BI;AACN,CAAC;AArDD,4BAqDC"}
+{"version":3,"file":"hkkf.js","sourceRoot":"","sources":["../src/hkkf.ts"],"names":[],"mappings":";;AACA,mCAAqD;AAWrD,SAAwB,SAAS,CAAC,EAChC,KAAK,EACL,KAAK,EACL,IAAI,EACJ,GAAG,EACH,QAAQ,EACR,aAAa,GACE;IACf,IAAI,GAAG,KAAK,CAAC,EAAE;QACb,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,wBAAgB,EAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC;aAClE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC;aACtE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACb,GAAG,EAAE,GAAG;YACR,MAAM,EAAE;gBACN,EAAE,EAAE,MAAM;gBACV,EAAE,EAAE,WAAW;aAChB;YACD,IAAI,EAAE;gBACJ,EAAE,EAAE,EAAE;gBACN,EAAE,EAAE,EAAE;aACP;YACD,EAAE,EAAE,MAAM;SACX,CAAC,CAAC,CACN,CAAC;KACH;SAAM,IAAI,GAAG,KAAK,CAAC,EAAE;QACpB,OAAO,KAAK,CACV,wCAAwC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,EAClG;YACE,KAAK,EAAE,gBAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;SACzC,CACF;aACE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;aACnC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;YACjB,IAAI,CAAC,IAAI;gBAAE,OAAO,EAAE,CAAC;YAErB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAO,EAAE,EAAE;gBAC/B,OAAO;oBACL,GAAG,EAAE,GAAG;oBACR,MAAM,EAAE;wBACN,EAAE,EAAE,EAAE;wBACN,EAAE,EAAE,EAAE;qBACP;oBACD,IAAI,EAAE;wBACJ,EAAE,EAAE,EAAE;wBACN,EAAE,EAAE,EAAE;qBACP;oBACD,EAAE,EAAE,MAAM;iBACX,CAAA;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;KACN;SAAM;QACL,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAC5B;AACH,CAAC;AAvDD,4BAuDC"}

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { RouteListEntry, EtaDb, Eta, StopList } from "./type";
 interface fetchEtasProps extends RouteListEntry {
-    stopList: StopList;
-    holidays: EtaDb["holidays"];
-    serviceDayMap: EtaDb["serviceDayMap"];
+    stopList?: StopList;
+    holidays?: EtaDb["holidays"];
+    serviceDayMap?: EtaDb["serviceDayMap"];
     language: "zh" | "en";
     seq: number;
 }

package/dist/index.js

@@ -69,6 +69,9 @@ function fetchEtas({ route, stops, bound, dest, freq, seq, serviceType, co, nlbI
                     _etas = _etas.concat(yield (0, lightRail_1.default)({ stopId: stops.lightRail[seq], route, dest }));
                 }
                 else if (company_id === "mtr" && stops.mtr) {
+                    if (!stopList) {
+                        throw new Error("mtr requires stopList");
+                    }
                     _etas = _etas.concat(yield (0, mtr_1.default)({
                         stopId: stops.mtr[seq],
                         route,
@@ -77,6 +80,15 @@ function fetchEtas({ route, stops, bound, dest, freq, seq, serviceType, co, nlbI
                     }));
                 }
                 else if (company_id === "fortuneferry" && stops.fortuneferry) {
+                    if (!stopList) {
+                        throw new Error("fortuneferry requires stopList");
+                    }
+                    if (!serviceDayMap) {
+                        throw new Error("fortuneferry requires serviceDayMap");
+                    }
+                    if (!holidays) {
+                        throw new Error("fortuneferry requires holidays");
+                    }
                     _etas = _etas.concat(yield (0, fortuneferry_1.default)({
                         stops,
                         seq,
@@ -87,10 +99,29 @@ function fetchEtas({ route, stops, bound, dest, freq, seq, serviceType, co, nlbI
                     }));
                 }
                 else if (company_id === "sunferry" && stops.sunferry) {
+                    if (!serviceDayMap) {
+                        throw new Error("sunferry requires serviceDayMap");
+                    }
+                    if (!holidays) {
+                        throw new Error("sunferry requires holidays");
+                    }
                     _etas = _etas.concat(yield (0, sunferry_1.default)({ route, seq, holidays, serviceDayMap, freq }));
                 }
                 else if (company_id === "hkkf" && stops.hkkf) {
-                    _etas = _etas.concat(yield (0, hkkf_1.default)({ freq, seq, holidays, serviceDayMap }));
+                    if (!serviceDayMap) {
+                        throw new Error("hkkf requires serviceDayMap");
+                    }
+                    if (!holidays) {
+                        throw new Error("hkkf requires holidays");
+                    }
+                    _etas = _etas.concat(yield (0, hkkf_1.default)({
+                        route,
+                        bound: bound.hkkf,
+                        freq,
+                        seq,
+                        holidays,
+                        serviceDayMap,
+                    }));
                 }
             }
             if (_etas.some((e) => e.eta)) {

package/dist/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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,gDAAwB;AACxB,gDAAwB;AACxB,4DAAoC;AACpC,gDAAwB;AACxB,4DAAoC;AACpC,gDAAwB;AACxB,0DAAkC;AAClC,kEAA0C;AAC1C,kDAA0B;AAoB1B,SAAsB,SAAS,CAAC,EAC9B,KAAK,EACL,KAAK,EACL,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,GAAG,EACH,WAAW,EACX,EAAE,EACF,KAAK,EACL,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,aAAa,GACE;;QACf,IAAI;YACF,IAAI,KAAK,GAAU,EAAE,CAAC;YACtB,KAAK,MAAM,UAAU,IAAI,EAAE,EAAE;gBAC3B,IAAI,UAAU,KAAK,KAAK,IAAI,KAAK,CAAC,GAAG,EAAE;oBACrC,KAAK,GAAG,KAAK,CAAC,MAAM,CAClB,MAAM,IAAA,aAAG,EAAC;wBACR,KAAK;wBACL,KAAK,EAAE,KAAK,CAAC,GAAG;wBAChB,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC;wBACtB,GAAG;wBACH,EAAE;wBACF,WAAW;wBACX,KAAK,EAAE,KAAK,CAAC,GAAG;qBACjB,CAAC,CACH,CAAC;iBACH;qBAAM,IAAI,UAAU,KAAK,KAAK,IAAI,KAAK,CAAC,GAAG,EAAE;oBAC5C,KAAK,GAAG,KAAK,CAAC,MAAM,CAClB,MAAM,IAAA,aAAG,EAAC,EAAE,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CACpE,CAAC;iBACH;qBAAM,IAAI,UAAU,KAAK,KAAK,IAAI,KAAK,CAAC,GAAG,EAAE;oBAC5C,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,IAAA,aAAG,EAAC,EAAE,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;iBAC9E;qBAAM,IAAI,UAAU,KAAK,WAAW,IAAI,KAAK,CAAC,SAAS,EAAE;oBACxD,KAAK,GAAG,KAAK,CAAC,MAAM,CAClB,MAAM,IAAA,mBAAS,EAAC,EAAE,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CACnE,CAAC;iBACH;qBAAM,IAAI,UAAU,KAAK,KAAK,IAAI,KAAK,CAAC,GAAG,EAAE;oBAC5C,KAAK,GAAG,KAAK,CAAC,MAAM,CAClB,MAAM,IAAA,aAAG,EAAC,EAAE,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CACrE,CAAC;iBACH;qBAAM,IAAI,UAAU,KAAK,WAAW,IAAI,KAAK,CAAC,SAAS,EAAE;oBACxD,KAAK,GAAG,KAAK,CAAC,MAAM,CAClB,MAAM,IAAA,mBAAS,EAAC,EAAE,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAC/D,CAAC;iBACH;qBAAM,IAAI,UAAU,KAAK,KAAK,IAAI,KAAK,CAAC,GAAG,EAAE;oBAC5C,IAAI,CAAC,QAAQ,EAAE;wBACb,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;qBAC1C;oBACD,KAAK,GAAG,KAAK,CAAC,MAAM,CAClB,MAAM,IAAA,aAAG,EAAC;wBACR,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC;wBACtB,KAAK;wBACL,QAAQ;wBACR,KAAK,EAAE,KAAK,CAAC,GAAG;qBACjB,CAAC,CACH,CAAC;iBACH;qBAAM,IAAI,UAAU,KAAK,cAAc,IAAI,KAAK,CAAC,YAAY,EAAE;oBAC9D,IAAI,CAAC,QAAQ,EAAE;wBACb,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;qBACnD;oBACD,IAAI,CAAC,aAAa,EAAE;wBAClB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;qBACxD;oBACD,IAAI,CAAC,QAAQ,EAAE;wBACb,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;qBACnD;oBACD,KAAK,GAAG,KAAK,CAAC,MAAM,CAClB,MAAM,IAAA,sBAAY,EAAC;wBACjB,KAAK;wBACL,GAAG;wBACH,QAAQ;wBACR,IAAI;wBACJ,aAAa;wBACb,QAAQ;qBACT,CAAC,CACH,CAAC;iBACH;qBAAM,IAAI,UAAU,KAAK,UAAU,IAAI,KAAK,CAAC,QAAQ,EAAE;oBACtD,IAAI,CAAC,aAAa,EAAE;wBAClB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;qBACpD;oBACD,IAAI,CAAC,QAAQ,EAAE;wBACb,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;qBAC/C;oBACD,KAAK,GAAG,KAAK,CAAC,MAAM,CAClB,MAAM,IAAA,kBAAQ,EAAC,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAC9D,CAAC;iBACH;qBAAM,IAAI,UAAU,KAAK,MAAM,IAAI,KAAK,CAAC,IAAI,EAAE;oBAC9C,IAAI,CAAC,aAAa,EAAE;wBAClB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;qBAChD;oBACD,IAAI,CAAC,QAAQ,EAAE;wBACb,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;qBAC3C;oBACD,KAAK,GAAG,KAAK,CAAC,MAAM,CAClB,MAAM,IAAA,cAAI,EAAC;wBACT,KAAK;wBACL,KAAK,EAAE,KAAK,CAAC,IAAI;wBACjB,IAAI;wBACJ,GAAG;wBACH,QAAQ;wBACR,aAAa;qBACd,CAAC,CACH,CAAC;iBACH;aACF;YAED,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;gBAC5B,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;aACpC;YACD,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACzB,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,KAAK,EAAE;oBAAE,OAAO,CAAC,CAAC;qBAChC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,KAAK,EAAE;oBAAE,OAAO,CAAC,CAAC,CAAC;gBAC3C,OAAO,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,OAAO,EAAE,CAAC;SACX;IACH,CAAC;CAAA;AA3HD,8BA2HC;AAED,SAAsB,UAAU;;QAC9B,OAAO,KAAK,CAAC,+CAA+C,EAAE;YAC5D,KAAK,EAAE,UAAU;SAClB,CAAC;aACC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACrB,KAAK,CAAC,GAAG,EAAE,CACV,KAAK,CAAC,gEAAgE,EAAE;YACtE,KAAK,EAAE,UAAU;SAClB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CACzB,CAAC;IACN,CAAC;CAAA;AAVD,gCAUC;AAED,SAAsB,aAAa;;QACjC,OAAO,KAAK,CAAC,0CAA0C,EAAE;YACvD,KAAK,EAAE,UAAU;SAClB,CAAC;aACC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACrB,KAAK,CAAC,GAAG,EAAE,CACV,KAAK,CAAC,2DAA2D,EAAE;YACjE,KAAK,EAAE,UAAU;SAClB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CACzB,CAAC;IACN,CAAC;CAAA;AAVD,sCAUC;AAED,SAAsB,mBAAmB,CACvC,KAAqB;;QAErB,MAAM,QAAQ,GACZ,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,WAAW,EAAE,CAAC;QACxF,OAAO,KAAK,CACV,mCAAmC,QAAQ,CAAC,OAAO,CAAC,2BAA2B,EAAE,EAAE,CAAC,EAAE,CACvF;aACE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACV,IAAI,CAAC,CAAC,EAAE,EAAE;gBACR,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;aACjB;YACD,MAAM,KAAK,CAAC,WAAW,CAAC,CAAC;QAC3B,CAAC,CAAC;aACD,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC;aACnC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACP,CAAC;CAAA;AAlBD,kDAkBC;AAED,gDAA8B"}

package/dist/lrtfeeder.js

@@ -51,12 +51,8 @@ function fetchEtas({ stopId, route, language, }) {
                         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: {
-                            [language]: bus.busRemark ||
-                                (bus.isScheduled === "1"
-                                    ? language === "en"
-                                        ? "Scheduled"
-                                        : "預定班次"
-                                    : ""),
+                            zh: bus.busRemark || (bus.isScheduled === "1" ? "預定班次" : ""),
+                            en: bus.busRemark || (bus.isScheduled === "1" ? "Scheduled" : ""),
                         },
                         dest: {
                             zh: "",

package/dist/lrtfeeder.js.map

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

package/dist/nlb.js

@@ -20,7 +20,8 @@ function fetchEtas({ stopId, nlbId, language, }) {
                 dest: {
                     // e.g. 經: 梅窩舊墟
                     // e.g. Via: Mui Wo Old Town
-                    [language]: e.routeVariantName,
+                    zh: language === "zh" ? e.routeVariantName : "",
+                    en: language === "en" ? e.routeVariantName : "",
                 },
                 co: "nlb",
             };
@@ -31,7 +32,8 @@ function fetchEtas({ stopId, nlbId, language, }) {
                     {
                         eta: "",
                         remark: {
-                            [language]: message,
+                            zh: language === "zh" ? message : "",
+                            en: language === "en" ? message : "",
                         },
                         dest: {
                             zh: "",

package/dist/nlb.js.map

@@ -1 +1 @@
-{"version":3,"file":"nlb.js","sourceRoot":"","sources":["../src/nlb.ts"],"names":[],"mappings":";;AACA,mCAAmC;AAQnC,SAAwB,SAAS,CAAC,EAChC,MAAM,EACN,KAAK,EACL,QAAQ,GACO;IACf,OAAO,KAAK,CACV,qFAAqF,KAAK,WAAW,MAAM,aAAa,QAAQ,EAAE,EAClI;QACE,KAAK,EAAE,gBAAQ,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,iBAAiB,EAAE,OAAO,EAAE,EAAE,EAAE;QACvC,MAAM,OAAO,GAAG,CAAC,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,EAAE,CAAC;aACtC,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,oBAAoB,CAAC;aAC9C,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE;YACd,MAAM,WAAW,GAAG,CAAC,CAAC,QAAQ,KAAK,GAAG,IAAI,CAAC,CAAC,KAAK,KAAK,GAAG,CAAC;YAC1D,OAAO;gBACL,GAAG,EAAE,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,YAAY;gBAC5D,MAAM,EAAE;oBACN,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;oBAC7B,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;iBACnC;gBACD,IAAI,EAAE;oBACJ,eAAe;oBACf,4BAA4B;oBAC5B,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,gBAAgB;iBAC/B;gBACD,EAAE,EAAE,KAAK;aACV,CAAC;QACJ,CAAC,CAAC,CAAC;QAEL,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;gBAC1C,OAAO;oBACL;wBACE,GAAG,EAAE,EAAE;wBACP,MAAM,EAAE;4BACN,CAAC,QAAQ,CAAC,EAAE,OAAO;yBACpB;wBACD,IAAI,EAAE;4BACJ,EAAE,EAAE,EAAE;4BACN,EAAE,EAAE,EAAE;yBACP;wBACD,EAAE,EAAE,KAAK;qBACV;iBACF,CAAC;aACH;SACF;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;AACP,CAAC;AApDD,4BAoDC"}
+{"version":3,"file":"nlb.js","sourceRoot":"","sources":["../src/nlb.ts"],"names":[],"mappings":";;AACA,mCAAmC;AAQnC,SAAwB,SAAS,CAAC,EAChC,MAAM,EACN,KAAK,EACL,QAAQ,GACO;IACf,OAAO,KAAK,CACV,qFAAqF,KAAK,WAAW,MAAM,aAAa,QAAQ,EAAE,EAClI;QACE,KAAK,EAAE,gBAAQ,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,iBAAiB,EAAE,OAAO,EAAE,EAAE,EAAE;QACvC,MAAM,OAAO,GAAG,CAAC,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,EAAE,CAAC;aACtC,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,oBAAoB,CAAC;aAC9C,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE;YACd,MAAM,WAAW,GAAG,CAAC,CAAC,QAAQ,KAAK,GAAG,IAAI,CAAC,CAAC,KAAK,KAAK,GAAG,CAAC;YAC1D,OAAO;gBACL,GAAG,EAAE,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,YAAY;gBAC5D,MAAM,EAAE;oBACN,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;oBAC7B,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;iBACnC;gBACD,IAAI,EAAE;oBACJ,eAAe;oBACf,4BAA4B;oBAC5B,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE;oBAC/C,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE;iBAChD;gBACD,EAAE,EAAE,KAAK;aACV,CAAC;QACJ,CAAC,CAAC,CAAC;QAEL,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;gBAC1C,OAAO;oBACL;wBACE,GAAG,EAAE,EAAE;wBACP,MAAM,EAAE;4BACN,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;4BACpC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;yBACrC;wBACD,IAAI,EAAE;4BACJ,EAAE,EAAE,EAAE;4BACN,EAAE,EAAE,EAAE;yBACP;wBACD,EAAE,EAAE,KAAK;qBACV;iBACF,CAAC;aACH;SACF;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;AACP,CAAC;AAtDD,4BAsDC"}

package/dist/sunferry.js

@@ -1,60 +1,134 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tz_1 = require("@date-fns/tz");
+const date_fns_1 = require("date-fns");
 const utils_1 = require("./utils");
 function fetchEtas({ route, seq, freq, holidays, serviceDayMap, }) {
-    if (seq === 1)
-        return Promise.resolve([]);
-    return fetch(`https://www.sunferry.com.hk/eta/?route=${route}`, {
-        cache: utils_1.isSafari ? "default" : "no-store",
-    })
-        .then((response) => response.json())
-        .then(({ data }) => {
-        throw new Error("");
-        if (!data)
+    return __awaiter(this, void 0, void 0, function* () {
+        if (seq > 1) {
+            return Promise.resolve([]);
+        }
+        const apiEtas = yield fetch(`https://www.sunferry.com.hk/eta/?route=${route}`, {
+            cache: utils_1.isSafari ? "default" : "no-store",
+        })
+            .then((response) => response.json())
+            .then(({ data, generated_timestamp, }) => {
+            if (!data)
+                return [];
+            return data.map(({ depart_time, eta, rmk_en, rmk_tc, route_tc, route_en }) => {
+                var _a, _b;
+                /**
+                 * @param timeString HH:mm
+                 */
+                const guessDateTimeByTimeString = (timeString) => {
+                    const generated = new tz_1.TZDate(generated_timestamp, "Asia/Hong_Kong");
+                    const time = (0, date_fns_1.startOfMinute)((0, date_fns_1.set)(generated, {
+                        hours: parseInt(timeString.split(":")[0], 10),
+                        minutes: parseInt(timeString.split(":")[1], 10),
+                    }));
+                    return (0, date_fns_1.closestTo)(generated, [
+                        (0, date_fns_1.sub)(time, { days: 1 }),
+                        time,
+                        (0, date_fns_1.add)(time, { days: 1 }),
+                    ]);
+                };
+                // 橫水渡 - (坪洲-梅窩)
+                // 中環 - 長洲
+                const [originZh, destZh] = (((_a = /^橫水渡 - \((.*)\)$/.exec(route_tc)) === null || _a === void 0 ? void 0 : _a[1]) || route_tc)
+                    .split("-")
+                    .map((s) => s.trim());
+                // Inter Islands (Peng Chau - Mui Wo)
+                // Central - Cheung Chau
+                const [originEn, destEn] = (((_b = /^Inter Islands \((.*)\)$/.exec(route_en)) === null || _b === void 0 ? void 0 : _b[1]) || route_en)
+                    .split("-")
+                    .map((s) => s.trim());
+                return {
+                    departTime: (0, date_fns_1.formatISO)(guessDateTimeByTimeString(depart_time)),
+                    eta: eta ? (0, date_fns_1.formatISO)(guessDateTimeByTimeString(eta)) : null,
+                    remark: {
+                        zh: rmk_tc !== null && rmk_tc !== void 0 ? rmk_tc : "",
+                        en: rmk_en !== null && rmk_en !== void 0 ? rmk_en : "",
+                    },
+                    dest: {
+                        zh: destZh,
+                        en: destEn,
+                    },
+                    co: "sunferry",
+                };
+            });
+        })
+            .catch((err) => {
+            console.error("Error fetching Sun Ferry ETAs:", err);
             return [];
-        return data.map(({ depart_time, rmk_en, rmk_tc, route_tc, route_en }) => {
-            const date = new Date();
-            let guess = `${date.getFullYear()}-${("0" + (date.getMonth() + 1)).slice(-2)}-${("0" + date.getDate()).slice(-2)}T${depart_time}:00+08:00`;
-            if (new Date(guess) < date) {
-                date.setDate(date.getDate() + 1);
-                guess = `${date.getFullYear()}-${("0" + (date.getMonth() + 1)).slice(-2)}-${("0" + date.getDate()).slice(-2)}T${depart_time}:00+08:00`;
-            }
-            return {
-                eta: guess,
+        });
+        if (seq === 0) {
+            const greatestApiEtaTime = apiEtas.length > 0
+                ? (0, date_fns_1.max)(apiEtas.map((e) => new Date(e.departTime)))
+                : undefined;
+            const now = new Date();
+            return [
+                ...apiEtas
+                    .filter((eta) => (0, date_fns_1.endOfMinute)(new Date(eta.departTime)) >= now && !eta.eta)
+                    .map((eta) => ({
+                    eta: eta.departTime,
+                    remark: {
+                        zh: [eta.remark.zh, "預定班次"].filter(Boolean).join("；"),
+                        en: [eta.remark.en, "Scheduled"].filter(Boolean).join("; "),
+                    },
+                    dest: eta.dest,
+                    co: eta.co,
+                })),
+                ...(0, utils_1.getUpcomingFerry)({
+                    holidays,
+                    serviceDayMap,
+                    freq,
+                    date: (0, date_fns_1.max)([
+                        ...(greatestApiEtaTime
+                            ? [(0, date_fns_1.add)(greatestApiEtaTime, { minutes: 1 })]
+                            : []),
+                        now,
+                    ]),
+                })
+                    .filter((v) => new Date(v).getTime() - now.getTime() < 180 * 60 * 1000)
+                    .map((eta) => ({
+                    eta: eta,
+                    remark: {
+                        zh: "預定班次",
+                        en: "Scheduled",
+                    },
+                    dest: {
+                        zh: "",
+                        en: "",
+                    },
+                    co: "sunferry",
+                })),
+            ];
+        }
+        else if (seq === 1) {
+            return apiEtas
+                .filter((eta) => eta.eta !== null)
+                .map((eta) => ({
+                eta: eta.eta,
                 remark: {
-                    zh: rmk_tc,
-                    en: rmk_en,
+                    zh: eta.remark.zh,
+                    en: eta.remark.en,
                 },
-                dest: {
-                    zh: route_tc.split(" - ")[1],
-                    en: route_en.split(" - ")[1],
-                },
-                co: "sunferry",
-            };
-        });
-    })
-        .catch(() => {
-        // the API gives CORS error, the below handling is for browser
-        const now = new Date();
-        return (0, utils_1.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",
-        }));
+                dest: eta.dest,
+                co: eta.co,
+            }));
+        }
+        else {
+            return [];
+        }
     });
 }
 exports.default = fetchEtas;

package/dist/sunferry.js.map

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

package/esm/hkkf.d.ts

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

package/esm/hkkf.js

@@ -1,50 +1,48 @@
-import { getUpcomingFerry } from "./utils";
-export default function fetchEtas({ freq, seq, holidays, serviceDayMap, }) {
-    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"}`,
-      {
-        cache: isSafari ? "default" : "no-store",
-      },
-    )
-      .then((response) => response.json())
-      .then(({ data }) => {
-        if (!data) return [];
-        
-        return data
-          .map(({ETA}: any) => {
-            return {
-              eta: ETA,
-              remark: {
-                zh: "",
-                en: "",
-              },
-              dest: {
+import { getUpcomingFerry, isSafari } from "./utils";
+export default function fetchEtas({ route, bound, freq, seq, holidays, serviceDayMap, }) {
+    if (seq === 0) {
+        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: "hkkf",
-            }
-          });
-      });
-      */
+            },
+            co: "hkkf",
+        })));
+    }
+    else if (seq === 1) {
+        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 [];
+            return data.map(({ ETA }) => {
+                return {
+                    eta: ETA,
+                    remark: {
+                        zh: "",
+                        en: "",
+                    },
+                    dest: {
+                        zh: "",
+                        en: "",
+                    },
+                    co: "hkkf",
+                };
+            });
+        });
+    }
+    else {
+        return Promise.resolve([]);
+    }
 }
 //# sourceMappingURL=hkkf.js.map