hk-bus-eta 3.7.7 → 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":"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"}

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

package/esm/hkkf.js.map

@@ -1 +1 @@
-{"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,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,gBAAgB,CAAC,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"}
+{"version":3,"file":"hkkf.js","sourceRoot":"","sources":["../src/hkkf.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAWrD,MAAM,CAAC,OAAO,UAAU,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,gBAAgB,CAAC,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,QAAQ,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"}

package/esm/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/esm/index.js

@@ -39,6 +39,9 @@ export async function fetchEtas({ route, stops, bound, dest, freq, seq, serviceT
                 _etas = _etas.concat(await lightrail({ stopId: stops.lightRail[seq], route, dest }));
             }
             else if (company_id === "mtr" && stops.mtr) {
+                if (!stopList) {
+                    throw new Error("mtr requires stopList");
+                }
                 _etas = _etas.concat(await mtr({
                     stopId: stops.mtr[seq],
                     route,
@@ -47,6 +50,15 @@ export async function fetchEtas({ route, stops, bound, dest, freq, seq, serviceT
                 }));
             }
             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(await fortuneferry({
                     stops,
                     seq,
@@ -57,10 +69,29 @@ export async function fetchEtas({ route, stops, bound, dest, freq, seq, serviceT
                 }));
             }
             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(await sunferry({ route, seq, holidays, serviceDayMap, freq }));
             }
             else if (company_id === "hkkf" && stops.hkkf) {
-                _etas = _etas.concat(await hkkf({ freq, seq, holidays, serviceDayMap }));
+                if (!serviceDayMap) {
+                    throw new Error("hkkf requires serviceDayMap");
+                }
+                if (!holidays) {
+                    throw new Error("hkkf requires holidays");
+                }
+                _etas = _etas.concat(await hkkf({
+                    route,
+                    bound: bound.hkkf,
+                    freq,
+                    seq,
+                    holidays,
+                    serviceDayMap,
+                }));
             }
         }
         if (_etas.some((e) => e.eta)) {

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.js

@@ -1,58 +1,121 @@
+import { TZDate } from "@date-fns/tz";
+import { add, closestTo, endOfMinute, formatISO, max, set, startOfMinute, sub, } from "date-fns";
 import { getUpcomingFerry, isSafari } from "./utils";
-export default function fetchEtas({ route, seq, freq, holidays, serviceDayMap, }) {
-    if (seq === 1)
+export default async function fetchEtas({ route, seq, freq, holidays, serviceDayMap, }) {
+    if (seq > 1) {
         return Promise.resolve([]);
-    return fetch(`https://www.sunferry.com.hk/eta/?route=${route}`, {
+    }
+    const apiEtas = await fetch(`https://www.sunferry.com.hk/eta/?route=${route}`, {
         cache: isSafari ? "default" : "no-store",
     })
         .then((response) => response.json())
-        .then(({ data }) => {
-        throw new Error("");
+        .then(({ data, generated_timestamp, }) => {
         if (!data)
             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 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 TZDate(generated_timestamp, "Asia/Hong_Kong");
+                const time = startOfMinute(set(generated, {
+                    hours: parseInt(timeString.split(":")[0], 10),
+                    minutes: parseInt(timeString.split(":")[1], 10),
+                }));
+                return closestTo(generated, [
+                    sub(time, { days: 1 }),
+                    time,
+                    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 {
-                eta: guess,
+                departTime: formatISO(guessDateTimeByTimeString(depart_time)),
+                eta: eta ? formatISO(guessDateTimeByTimeString(eta)) : null,
                 remark: {
-                    zh: rmk_tc,
-                    en: rmk_en,
+                    zh: rmk_tc !== null && rmk_tc !== void 0 ? rmk_tc : "",
+                    en: rmk_en !== null && rmk_en !== void 0 ? rmk_en : "",
                 },
                 dest: {
-                    zh: route_tc.split(" - ")[1],
-                    en: route_en.split(" - ")[1],
+                    zh: destZh,
+                    en: destEn,
                 },
                 co: "sunferry",
             };
         });
     })
-        .catch(() => {
-        // the API gives CORS error, the below handling is for browser
+        .catch((err) => {
+        console.error("Error fetching Sun Ferry ETAs:", err);
+        return [];
+    });
+    if (seq === 0) {
+        const greatestApiEtaTime = apiEtas.length > 0
+            ? max(apiEtas.map((e) => new Date(e.departTime)))
+            : undefined;
         const now = new Date();
-        return getUpcomingFerry({
-            holidays,
-            serviceDayMap,
-            freq,
-            date: new Date(),
-        })
-            .filter((v) => new Date(v).getTime() - now.getTime() < 180 * 60 * 1000)
+        return [
+            ...apiEtas
+                .filter((eta) => 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,
+            })),
+            ...getUpcomingFerry({
+                holidays,
+                serviceDayMap,
+                freq,
+                date: max([
+                    ...(greatestApiEtaTime
+                        ? [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: eta.eta,
             remark: {
-                zh: "預定班次",
-                en: "Scheduled",
+                zh: eta.remark.zh,
+                en: eta.remark.en,
             },
-            dest: {
-                zh: "",
-                en: "",
-            },
-            co: "sunferry",
+            dest: eta.dest,
+            co: eta.co,
         }));
-    });
+    }
+    else {
+        return [];
+    }
 }
 //# sourceMappingURL=sunferry.js.map

package/esm/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hk-bus-eta",
-  "version": "3.7.7",
+  "version": "3.7.8",
   "description": "Query the ETA (Estimated Time of Arrival) of HK Bus/Minibus/MTR/Lightrail",
   "main": "dist/index.js",
   "module": "esm/index.js",
@@ -51,6 +51,7 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
+    "@date-fns/tz": "^1.4.1",
     "date-fns": "^4.1.0",
     "date-fns-tz": "^3.2.0"
   }

package/src/hkkf.ts

@@ -2,6 +2,8 @@ import type { Eta, EtaDb, RouteListEntry } from "./type";
 import { getUpcomingFerry, isSafari } from "./utils";
 
 interface fetchEtasProps {
+  route: RouteListEntry["route"];
+  bound: RouteListEntry["bound"]["hkkf"];
   freq: RouteListEntry["freq"];
   seq: number;
   holidays: EtaDb["holidays"];
@@ -9,43 +11,43 @@ interface fetchEtasProps {
 }
 
 export default function fetchEtas({
+  route,
+  bound,
   freq,
   seq,
   holidays,
   serviceDayMap,
 }: fetchEtasProps): Promise<Eta[]> {
-  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) => {
+  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",
+        }))
+    );
+  } 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 }: any) => {
           return {
             eta: ETA,
             remark: {
@@ -59,6 +61,8 @@ export default function fetchEtas({
             co: "hkkf",
           }
         });
-    });
-    */
+      });
+  } else {
+    return Promise.resolve([]);
+  }
 }

package/src/index.ts

@@ -11,10 +11,19 @@ import hkkf from "./hkkf";
 import { RouteListEntry, EtaDb, Eta, StopList } from "./type";
 
 interface fetchEtasProps extends RouteListEntry {
-  stopList: StopList;
-  holidays: EtaDb["holidays"];
-  serviceDayMap: EtaDb["serviceDayMap"];
+  // For mtr and fortuneferry query. Optional
+  stopList?: StopList;
+
+  // For fortuneferry, sunferry, hkkf query. Optional
+  holidays?: EtaDb["holidays"];
+
+  // For fortuneferry, sunferry, hkkf query. Optional
+  serviceDayMap?: EtaDb["serviceDayMap"];
+
+  // Language for the output ETA
   language: "zh" | "en";
+
+  // Sequence number of the stop in the stops array
   seq: number;
 }
 
@@ -68,6 +77,9 @@ export async function fetchEtas({
           await lightrail({ stopId: stops.lightRail[seq], route, dest }),
         );
       } else if (company_id === "mtr" && stops.mtr) {
+        if (!stopList) {
+          throw new Error("mtr requires stopList");
+        }
         _etas = _etas.concat(
           await mtr({
             stopId: stops.mtr[seq],
@@ -77,6 +89,15 @@ export async function fetchEtas({
           }),
         );
       } 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(
           await fortuneferry({
             stops,
@@ -88,12 +109,31 @@ export async function fetchEtas({
           }),
         );
       } 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(
           await sunferry({ route, seq, holidays, serviceDayMap, freq }),
         );
       } else if (company_id === "hkkf" && stops.hkkf) {
+        if (!serviceDayMap) {
+          throw new Error("hkkf requires serviceDayMap");
+        }
+        if (!holidays) {
+          throw new Error("hkkf requires holidays");
+        }
         _etas = _etas.concat(
-          await hkkf({ freq, seq, holidays, serviceDayMap }),
+          await hkkf({
+            route,
+            bound: bound.hkkf,
+            freq,
+            seq,
+            holidays,
+            serviceDayMap,
+          })
         );
       }
     }

package/src/sunferry.ts

@@ -1,3 +1,14 @@
+import { TZDate } from "@date-fns/tz";
+import {
+  add,
+  closestTo,
+  endOfMinute,
+  formatISO,
+  max,
+  set,
+  startOfMinute,
+  sub,
+} from "date-fns";
 import type { Eta, EtaDb, Freq, RouteListEntry } from "./type";
 import { getUpcomingFerry, isSafari } from "./utils";
 
@@ -9,53 +20,139 @@ interface fetchEtasProps {
   serviceDayMap: EtaDb["serviceDayMap"];
 }
 
-export default function fetchEtas({
+export default async function fetchEtas({
   route,
   seq,
   freq,
   holidays,
   serviceDayMap,
 }: fetchEtasProps): Promise<Eta[]> {
-  if (seq === 1) return Promise.resolve([]);
+  if (seq > 1) {
+    return Promise.resolve([]);
+  }
 
-  return fetch(`https://www.sunferry.com.hk/eta/?route=${route}`, {
-    cache: isSafari ? "default" : "no-store",
-  })
+  const apiEtas = await fetch(
+    `https://www.sunferry.com.hk/eta/?route=${route}`,
+    {
+      cache: isSafari ? "default" : "no-store",
+    }
+  )
     .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();
-          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`;
+    .then(
+      ({
+        data,
+        generated_timestamp,
+      }: {
+        data:
+          | {
+              routecode: string;
+              route_en: string;
+              route_tc: string;
+              route_sc: string;
+              vesselcode?: string;
+              depart_time: string;
+              lat: string | null;
+              lng: string | null;
+              eta: string | null;
+              rmk_en: string | null;
+              rmk_tc: string | null;
+              rmk_sc: string | null;
+              date_timestamp: string;
+            }[]
+          | null;
+        generated_timestamp: string;
+      }) => {
+        if (!data) return [];
+        return data.map(
+          ({ depart_time, eta, rmk_en, rmk_tc, route_tc, route_en }) => {
+            /**
+             * @param timeString HH:mm
+             */
+            const guessDateTimeByTimeString = (timeString: string) => {
+              const generated = new TZDate(
+                generated_timestamp,
+                "Asia/Hong_Kong"
+              );
+              const time = startOfMinute(
+                set(generated, {
+                  hours: parseInt(timeString.split(":")[0], 10),
+                  minutes: parseInt(timeString.split(":")[1], 10),
+                })
+              );
+              return closestTo(generated, [
+                sub(time, { days: 1 }),
+                time,
+                add(time, { days: 1 }),
+              ])!;
+            };
+
+            // 橫水渡 - (坪洲-梅窩)
+            // 中環 - 長洲
+            const [originZh, destZh] = (
+              /^橫水渡 - \((.*)\)$/.exec(route_tc)?.[1] || route_tc
+            )
+              .split("-")
+              .map((s) => s.trim());
+            // Inter Islands (Peng Chau - Mui Wo)
+            // Central - Cheung Chau
+            const [originEn, destEn] = (
+              /^Inter Islands \((.*)\)$/.exec(route_en)?.[1] || route_en
+            )
+              .split("-")
+              .map((s) => s.trim());
+
+            return {
+              departTime: formatISO(guessDateTimeByTimeString(depart_time)),
+              eta: eta ? formatISO(guessDateTimeByTimeString(eta)) : null, // No ETA: Not yet departed OR already arrived at destination
+              remark: {
+                zh: rmk_tc ?? "",
+                en: rmk_en ?? "",
+              },
+              dest: {
+                zh: destZh,
+                en: destEn,
+              },
+              co: "sunferry" as const,
+            };
           }
-          return {
-            eta: guess,
-            remark: {
-              zh: rmk_tc,
-              en: rmk_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 getUpcomingFerry({
+        );
+      }
+    )
+    .catch((err) => {
+      console.error("Error fetching Sun Ferry ETAs:", err);
+      return [];
+    });
+
+  if (seq === 0) {
+    const greatestApiEtaTime =
+      apiEtas.length > 0
+        ? max(apiEtas.map((e) => new Date(e.departTime)))
+        : undefined;
+    const now = new Date();
+    return [
+      ...apiEtas
+        .filter(
+          (eta) => 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,
+        })),
+      ...getUpcomingFerry({
         holidays,
         serviceDayMap,
         freq,
-        date: new Date(),
+        date: max([
+          ...(greatestApiEtaTime
+            ? [add(greatestApiEtaTime, { minutes: 1 })]
+            : []),
+          now,
+        ]),
       })
         .filter((v) => new Date(v).getTime() - now.getTime() < 180 * 60 * 1000)
         .map((eta) => ({
@@ -68,7 +165,22 @@ export default function fetchEtas({
             zh: "",
             en: "",
           },
-          co: "sunferry",
-        }));
-    });
+          co: "sunferry" as const,
+        })),
+    ];
+  } else if (seq === 1) {
+    return apiEtas
+      .filter((eta) => eta.eta !== null)
+      .map((eta) => ({
+        eta: eta.eta!,
+        remark: {
+          zh: eta.remark.zh,
+          en: eta.remark.en,
+        },
+        dest: eta.dest,
+        co: eta.co,
+      }));
+  } else {
+    return [];
+  }
 }