hk-bus-eta 3.2.0 → 3.3.0

package/dist/fortuneferry.d.ts

@@ -0,0 +1,11 @@
+import type { Eta, StopList } from "./type";
+interface fetchEtasProps {
+    route: string;
+    stops: {
+        fortuneferry: string[];
+    };
+    seq: number;
+    stopList: StopList;
+}
+export default function fetchEtas({ route, stops: { fortuneferry: stops }, seq, stopList }: fetchEtasProps): Promise<Eta[]>;
+export {};

package/dist/fortuneferry.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("./utils");
+const getCode = (zhName) => {
+    if (zhName.includes("中環")) {
+        return "CL";
+    }
+    else if (zhName.includes("紅磡")) {
+        return "HH";
+    }
+    else if (zhName.includes("北角")) {
+        return "NP";
+    }
+    else if (zhName.includes("觀塘")) {
+        return "KT";
+    }
+    else if (zhName.includes("啟德")) {
+        return "KT";
+    }
+    else if (zhName.includes("屯門")) {
+        return "TM";
+    }
+    else if (zhName.includes("東涌")) {
+        return "TC";
+    }
+    else if (zhName.includes("沙螺灣")) {
+        return "SLW";
+    }
+    else if (zhName.includes("大澳")) {
+        return "TO";
+    }
+    return "CL";
+};
+function fetchEtas({ route, stops: { fortuneferry: stops }, seq, stopList }) {
+    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);
+    return fetch(`https://www.hongkongwatertaxi.com.hk/eta/?route=${u}${v}`, {
+        cache: utils_1.isSafari ? "default" : "no-store",
+    })
+        .then((response) => response.json())
+        .then(({ data }) => {
+        if (!data)
+            return [];
+        return data
+            .map(({ depart_time, rmk_tc, rmk_en }) => {
+            const date = new Date();
+            let guess = `${date.getFullYear()}-${date.getMonth()}-${date.getDate()}T${depart_time}:00+08:00}`;
+            if ((new Date(guess)) < date) {
+                date.setDate(date.getDate() + 1);
+                guess = `${date.getFullYear()}-${date.getMonth()}-${date.getDate()}T${depart_time}:00+08:00}`;
+            }
+            return {
+                eta: guess,
+                remark: {
+                    zh: rmk_tc,
+                    en: rmk_en,
+                },
+                dest: {
+                    zh: "",
+                    en: "",
+                },
+                co: "fortuneferry",
+            };
+        });
+    });
+}
+exports.default = fetchEtas;
+//# sourceMappingURL=fortuneferry.js.map

package/dist/fortuneferry.js.map

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

package/dist/gmb.js

@@ -12,18 +12,21 @@ function fetchEtas({ gtfsId, stopId, bound, seq, }) {
         .filter(({ stop_seq }) => stop_seq === seq + 1)
         .reduce((acc, { eta }) => [
         ...acc,
-        ...eta.map((data) => ({
-            eta: data.timestamp,
-            remark: {
-                zh: data.remarks_tc,
-                en: data.remarks_en,
-            },
-            dest: {
-                zh: "",
-                en: "",
-            },
-            co: "gmb",
-        })),
+        ...eta.map((data) => {
+            var _a, _b;
+            return ({
+                eta: data.timestamp,
+                remark: {
+                    zh: (_a = data.remarks_tc) !== null && _a !== void 0 ? _a : "",
+                    en: (_b = data.remarks_en) !== null && _b !== void 0 ? _b : "",
+                },
+                dest: {
+                    zh: "",
+                    en: "",
+                },
+                co: "gmb",
+            });
+        }),
     ], []));
 }
 exports.default = fetchEtas;

package/dist/gmb.js.map

@@ -1 +1 @@
-{"version":3,"file":"gmb.js","sourceRoot":"","sources":["../src/gmb.ts"],"names":[],"mappings":";;AACA,mCAAmC;AASnC,SAAwB,SAAS,CAAC,EAChC,MAAM,EACN,MAAM,EACN,KAAK,EACL,GAAG,GACY;IACf,OAAO,KAAK,CACV,6CAA6C,MAAM,IAAI,MAAM,EAAE,EAC/D;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,IAAI,EAAE,EAAE,EAAE,CACjB,IAAI;SACD,MAAM,CACL,CAAC,EAAE,SAAS,EAAO,EAAE,EAAE,CACrB,CAAC,KAAK,KAAK,GAAG,IAAI,SAAS,KAAK,CAAC,CAAC;QAClC,CAAC,KAAK,KAAK,GAAG,IAAI,SAAS,KAAK,CAAC,CAAC,CACrC;SACA,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAO,EAAE,EAAE,CAAC,QAAQ,KAAK,GAAG,GAAG,CAAC,CAAC;SACnD,MAAM,CACL,CAAC,GAAU,EAAE,EAAE,GAAG,EAAO,EAAE,EAAE,CAAC;QAC5B,GAAG,GAAG;QACN,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC;YACzB,GAAG,EAAE,IAAI,CAAC,SAAS;YACnB,MAAM,EAAE;gBACN,EAAE,EAAE,IAAI,CAAC,UAAU;gBACnB,EAAE,EAAE,IAAI,CAAC,UAAU;aACpB;YACD,IAAI,EAAE;gBACJ,EAAE,EAAE,EAAE;gBACN,EAAE,EAAE,EAAE;aACP;YACD,EAAE,EAAE,KAAK;SACV,CAAC,CAAC;KACJ,EACD,EAAE,CACH,CACJ,CAAC;AACN,CAAC;AAxCD,4BAwCC"}
+{"version":3,"file":"gmb.js","sourceRoot":"","sources":["../src/gmb.ts"],"names":[],"mappings":";;AACA,mCAAmC;AASnC,SAAwB,SAAS,CAAC,EAChC,MAAM,EACN,MAAM,EACN,KAAK,EACL,GAAG,GACY;IACf,OAAO,KAAK,CACV,6CAA6C,MAAM,IAAI,MAAM,EAAE,EAC/D;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,IAAI,EAAE,EAAE,EAAE,CACjB,IAAI;SACD,MAAM,CACL,CAAC,EAAE,SAAS,EAAO,EAAE,EAAE,CACrB,CAAC,KAAK,KAAK,GAAG,IAAI,SAAS,KAAK,CAAC,CAAC;QAClC,CAAC,KAAK,KAAK,GAAG,IAAI,SAAS,KAAK,CAAC,CAAC,CACrC;SACA,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAO,EAAE,EAAE,CAAC,QAAQ,KAAK,GAAG,GAAG,CAAC,CAAC;SACnD,MAAM,CACL,CAAC,GAAU,EAAE,EAAE,GAAG,EAAO,EAAE,EAAE,CAAC;QAC5B,GAAG,GAAG;QACN,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;;YAAC,OAAA,CAAC;gBACzB,GAAG,EAAE,IAAI,CAAC,SAAS;gBACnB,MAAM,EAAE;oBACN,EAAE,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,EAAE;oBACzB,EAAE,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,EAAE;iBAC1B;gBACD,IAAI,EAAE;oBACJ,EAAE,EAAE,EAAE;oBACN,EAAE,EAAE,EAAE;iBACP;gBACD,EAAE,EAAE,KAAK;aACV,CAAC,CAAA;SAAA,CAAC;KACJ,EACD,EAAE,CACH,CACJ,CAAC;AACN,CAAC;AAxCD,4BAwCC"}

package/dist/hkkf.d.ts

@@ -0,0 +1,8 @@
+import type { Eta, RouteListEntry } from "./type";
+interface fetchEtasProps {
+    route: string;
+    bound: RouteListEntry["bound"]["hkkf"];
+    seq: number;
+}
+export default function fetchEtas({ route, bound, seq }: fetchEtasProps): Promise<Eta[]>;
+export {};

package/dist/hkkf.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("./utils");
+function fetchEtas({ route, bound, seq }) {
+    if (seq === 0)
+        return Promise.resolve([]);
+    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",
+            };
+        });
+    });
+}
+exports.default = fetchEtas;
+//# sourceMappingURL=hkkf.js.map

package/dist/hkkf.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hkkf.js","sourceRoot":"","sources":["../src/hkkf.ts"],"names":[],"mappings":";;AACA,mCAAmC;AAQnC,SAAwB,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,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,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;AA9BD,4BA8BC"}

package/dist/index.js

@@ -20,6 +20,9 @@ const lrtfeeder_1 = __importDefault(require("./lrtfeeder"));
 const gmb_1 = __importDefault(require("./gmb"));
 const lightRail_1 = __importDefault(require("./lightRail"));
 const mtr_1 = __importDefault(require("./mtr"));
+const sunferry_1 = __importDefault(require("./sunferry"));
+const fortuneferry_1 = __importDefault(require("./fortuneferry"));
+const hkkf_1 = __importDefault(require("./hkkf"));
 function fetchEtas({ route, stops, bound, dest, seq, serviceType, co, nlbId, gtfsId, stopList, language, }) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -59,29 +62,16 @@ function fetchEtas({ route, stops, bound, dest, seq, serviceType, co, nlbId, gtf
                         bound: bound.mtr,
                     }));
                 }
-                else if (company_id === "gmbHki" && stops.gmbHki) {
-                    _etas = _etas.concat(yield (0, gmb_1.default)({
-                        stopId: stops.gmbHki[seq],
-                        gtfsId,
-                        seq,
-                        bound: bound.gmbHki,
+                else if (company_id === "fortuneferry" && stops.fortuneferry) {
+                    _etas = _etas.concat(yield (0, fortuneferry_1.default)({
+                        route, stops, seq, stopList
                     }));
                 }
-                else if (company_id === "gmbKln" && stops.gmbKln) {
-                    _etas = _etas.concat(yield (0, gmb_1.default)({
-                        stopId: stops.gmbKln[seq],
-                        gtfsId,
-                        seq,
-                        bound: bound.gmbKln,
-                    }));
+                else if (company_id === "sunferry" && stops.sunferry) {
+                    _etas = _etas.concat(yield (0, sunferry_1.default)({ route, seq }));
                 }
-                else if (company_id === "gmbNt" && stops.gmbNt) {
-                    _etas = _etas.concat(yield (0, gmb_1.default)({
-                        stopId: stops.gmbNt[seq],
-                        gtfsId,
-                        seq,
-                        bound: bound.gmbNt,
-                    }));
+                else if (company_id === "hkkf" && stops.hkkf) {
+                    _etas = _etas.concat(yield (0, hkkf_1.default)({ route, bound: bound.hkkf, seq }));
                 }
             }
             return _etas.sort((a, b) => {
@@ -101,18 +91,18 @@ function fetchEtas({ route, stops, bound, dest, seq, serviceType, co, nlbId, gtf
 exports.fetchEtas = fetchEtas;
 function fetchEtaDb() {
     return __awaiter(this, void 0, void 0, function* () {
-        return fetch("https://data.hkbus.app/routeFareList.min.json")
+        return fetch("https://data.hkbus.app/routeFareList.min.json", { cache: "no-store" })
             .then((r) => r.json())
-            .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json")
+            .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json", { cache: "no-store" })
             .then(r => r.json()));
     });
 }
 exports.fetchEtaDb = fetchEtaDb;
 function fetchEtaDbMd5() {
     return __awaiter(this, void 0, void 0, function* () {
-        return fetch("https://data.hkbus.app/routeFareList.md5")
+        return fetch("https://data.hkbus.app/routeFareList.md5", { cache: "no-store" })
             .then((r) => r.text())
-            .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.md5")
+            .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.md5", { cache: "no-store" })
             .then(r => r.text()));
     });
 }

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.d.ts

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

package/dist/sunferry.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("./utils");
+function fetchEtas({ route, seq }) {
+    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 }) => {
+        if (!data)
+            return [];
+        return data
+            .map(({ depart_time, rmk_en, rmk_tc, route_tc, route_en }) => {
+            const date = new Date();
+            let guess = `${date.getFullYear()}-${date.getMonth()}-${date.getDate()}T${depart_time}:00+08:00}`;
+            if ((new Date(guess)) < date) {
+                date.setDate(date.getDate() + 1);
+                guess = `${date.getFullYear()}-${date.getMonth()}-${date.getDate()}T${depart_time}:00+08:00}`;
+            }
+            return {
+                eta: guess,
+                remark: {
+                    zh: rmk_tc,
+                    en: rmk_en,
+                },
+                dest: {
+                    zh: route_tc.split(" - ")[1],
+                    en: route_en.split(" - ")[1],
+                },
+                co: "sunferry",
+            };
+        });
+    });
+}
+exports.default = fetchEtas;
+//# sourceMappingURL=sunferry.js.map

package/dist/sunferry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sunferry.js","sourceRoot":"","sources":["../src/sunferry.ts"],"names":[],"mappings":";;AACA,mCAAmC;AAOnC,SAAwB,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,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,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,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,IAAI,WAAW,YAAY,CAAA;YACjG,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,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,IAAI,WAAW,YAAY,CAAA;aAC9F;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;AApCD,4BAoCC"}

package/dist/type.d.ts

@@ -1,4 +1,4 @@
-export type Company = "kmb" | "nlb" | "ctb" | "lrtfeeder" | "gmb" | "lightRail" | "mtr" | "gmbHki" | "gmbKln" | "gmbNt";
+export type Company = "kmb" | "nlb" | "ctb" | "lrtfeeder" | "gmb" | "lightRail" | "mtr" | "sunferry" | "hkkf" | "fortuneferry";
 export type Terminal = {
     en: string;
     zh: string;
@@ -69,4 +69,6 @@ export type Eta = {
         en: string;
     };
     co: Company;
+    lat?: number;
+    lng: number;
 };

package/esm/fortuneferry.d.ts

@@ -0,0 +1,11 @@
+import type { Eta, StopList } from "./type";
+interface fetchEtasProps {
+    route: string;
+    stops: {
+        fortuneferry: string[];
+    };
+    seq: number;
+    stopList: StopList;
+}
+export default function fetchEtas({ route, stops: { fortuneferry: stops }, seq, stopList }: fetchEtasProps): Promise<Eta[]>;
+export {};

package/esm/fortuneferry.js

@@ -0,0 +1,67 @@
+import { isSafari } from "./utils";
+const getCode = (zhName) => {
+    if (zhName.includes("中環")) {
+        return "CL";
+    }
+    else if (zhName.includes("紅磡")) {
+        return "HH";
+    }
+    else if (zhName.includes("北角")) {
+        return "NP";
+    }
+    else if (zhName.includes("觀塘")) {
+        return "KT";
+    }
+    else if (zhName.includes("啟德")) {
+        return "KT";
+    }
+    else if (zhName.includes("屯門")) {
+        return "TM";
+    }
+    else if (zhName.includes("東涌")) {
+        return "TC";
+    }
+    else if (zhName.includes("沙螺灣")) {
+        return "SLW";
+    }
+    else if (zhName.includes("大澳")) {
+        return "TO";
+    }
+    return "CL";
+};
+export default function fetchEtas({ route, stops: { fortuneferry: stops }, seq, stopList }) {
+    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);
+    return fetch(`https://www.hongkongwatertaxi.com.hk/eta/?route=${u}${v}`, {
+        cache: isSafari ? "default" : "no-store",
+    })
+        .then((response) => response.json())
+        .then(({ data }) => {
+        if (!data)
+            return [];
+        return data
+            .map(({ depart_time, rmk_tc, rmk_en }) => {
+            const date = new Date();
+            let guess = `${date.getFullYear()}-${date.getMonth()}-${date.getDate()}T${depart_time}:00+08:00}`;
+            if ((new Date(guess)) < date) {
+                date.setDate(date.getDate() + 1);
+                guess = `${date.getFullYear()}-${date.getMonth()}-${date.getDate()}T${depart_time}:00+08:00}`;
+            }
+            return {
+                eta: guess,
+                remark: {
+                    zh: rmk_tc,
+                    en: rmk_en,
+                },
+                dest: {
+                    zh: "",
+                    en: "",
+                },
+                co: "fortuneferry",
+            };
+        });
+    });
+}
+//# sourceMappingURL=fortuneferry.js.map

package/esm/fortuneferry.js.map

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

package/esm/gmb.js

@@ -10,18 +10,21 @@ export default function fetchEtas({ gtfsId, stopId, bound, seq, }) {
         .filter(({ stop_seq }) => stop_seq === seq + 1)
         .reduce((acc, { eta }) => [
         ...acc,
-        ...eta.map((data) => ({
-            eta: data.timestamp,
-            remark: {
-                zh: data.remarks_tc,
-                en: data.remarks_en,
-            },
-            dest: {
-                zh: "",
-                en: "",
-            },
-            co: "gmb",
-        })),
+        ...eta.map((data) => {
+            var _a, _b;
+            return ({
+                eta: data.timestamp,
+                remark: {
+                    zh: (_a = data.remarks_tc) !== null && _a !== void 0 ? _a : "",
+                    en: (_b = data.remarks_en) !== null && _b !== void 0 ? _b : "",
+                },
+                dest: {
+                    zh: "",
+                    en: "",
+                },
+                co: "gmb",
+            });
+        }),
     ], []));
 }
 //# sourceMappingURL=gmb.js.map

package/esm/gmb.js.map

@@ -1 +1 @@
-{"version":3,"file":"gmb.js","sourceRoot":"","sources":["../src/gmb.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AASnC,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,MAAM,EACN,MAAM,EACN,KAAK,EACL,GAAG,GACY;IACf,OAAO,KAAK,CACV,6CAA6C,MAAM,IAAI,MAAM,EAAE,EAC/D;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,CACjB,IAAI;SACD,MAAM,CACL,CAAC,EAAE,SAAS,EAAO,EAAE,EAAE,CACrB,CAAC,KAAK,KAAK,GAAG,IAAI,SAAS,KAAK,CAAC,CAAC;QAClC,CAAC,KAAK,KAAK,GAAG,IAAI,SAAS,KAAK,CAAC,CAAC,CACrC;SACA,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAO,EAAE,EAAE,CAAC,QAAQ,KAAK,GAAG,GAAG,CAAC,CAAC;SACnD,MAAM,CACL,CAAC,GAAU,EAAE,EAAE,GAAG,EAAO,EAAE,EAAE,CAAC;QAC5B,GAAG,GAAG;QACN,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC;YACzB,GAAG,EAAE,IAAI,CAAC,SAAS;YACnB,MAAM,EAAE;gBACN,EAAE,EAAE,IAAI,CAAC,UAAU;gBACnB,EAAE,EAAE,IAAI,CAAC,UAAU;aACpB;YACD,IAAI,EAAE;gBACJ,EAAE,EAAE,EAAE;gBACN,EAAE,EAAE,EAAE;aACP;YACD,EAAE,EAAE,KAAK;SACV,CAAC,CAAC;KACJ,EACD,EAAE,CACH,CACJ,CAAC;AACN,CAAC"}
+{"version":3,"file":"gmb.js","sourceRoot":"","sources":["../src/gmb.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AASnC,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,MAAM,EACN,MAAM,EACN,KAAK,EACL,GAAG,GACY;IACf,OAAO,KAAK,CACV,6CAA6C,MAAM,IAAI,MAAM,EAAE,EAC/D;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,CACjB,IAAI;SACD,MAAM,CACL,CAAC,EAAE,SAAS,EAAO,EAAE,EAAE,CACrB,CAAC,KAAK,KAAK,GAAG,IAAI,SAAS,KAAK,CAAC,CAAC;QAClC,CAAC,KAAK,KAAK,GAAG,IAAI,SAAS,KAAK,CAAC,CAAC,CACrC;SACA,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAO,EAAE,EAAE,CAAC,QAAQ,KAAK,GAAG,GAAG,CAAC,CAAC;SACnD,MAAM,CACL,CAAC,GAAU,EAAE,EAAE,GAAG,EAAO,EAAE,EAAE,CAAC;QAC5B,GAAG,GAAG;QACN,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;;YAAC,OAAA,CAAC;gBACzB,GAAG,EAAE,IAAI,CAAC,SAAS;gBACnB,MAAM,EAAE;oBACN,EAAE,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,EAAE;oBACzB,EAAE,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,EAAE;iBAC1B;gBACD,IAAI,EAAE;oBACJ,EAAE,EAAE,EAAE;oBACN,EAAE,EAAE,EAAE;iBACP;gBACD,EAAE,EAAE,KAAK;aACV,CAAC,CAAA;SAAA,CAAC;KACJ,EACD,EAAE,CACH,CACJ,CAAC;AACN,CAAC"}

package/esm/hkkf.d.ts

@@ -0,0 +1,8 @@
+import type { Eta, RouteListEntry } from "./type";
+interface fetchEtasProps {
+    route: string;
+    bound: RouteListEntry["bound"]["hkkf"];
+    seq: number;
+}
+export default function fetchEtas({ route, bound, seq }: fetchEtasProps): Promise<Eta[]>;
+export {};

package/esm/hkkf.js

@@ -0,0 +1,29 @@
+import { isSafari } from "./utils";
+export default function fetchEtas({ route, bound, seq }) {
+    if (seq === 0)
+        return Promise.resolve([]);
+    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",
+            };
+        });
+    });
+}
+//# sourceMappingURL=hkkf.js.map

package/esm/hkkf.js.map

@@ -0,0 +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"}

package/esm/index.js

@@ -5,6 +5,9 @@ import lrtfeeder from "./lrtfeeder";
 import gmb from "./gmb";
 import lightrail from "./lightRail";
 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, }) {
     try {
         let _etas = [];
@@ -43,29 +46,16 @@ export async function fetchEtas({ route, stops, bound, dest, seq, serviceType, c
                     bound: bound.mtr,
                 }));
             }
-            else if (company_id === "gmbHki" && stops.gmbHki) {
-                _etas = _etas.concat(await gmb({
-                    stopId: stops.gmbHki[seq],
-                    gtfsId,
-                    seq,
-                    bound: bound.gmbHki,
+            else if (company_id === "fortuneferry" && stops.fortuneferry) {
+                _etas = _etas.concat(await fortuneferry({
+                    route, stops, seq, stopList
                 }));
             }
-            else if (company_id === "gmbKln" && stops.gmbKln) {
-                _etas = _etas.concat(await gmb({
-                    stopId: stops.gmbKln[seq],
-                    gtfsId,
-                    seq,
-                    bound: bound.gmbKln,
-                }));
+            else if (company_id === "sunferry" && stops.sunferry) {
+                _etas = _etas.concat(await sunferry({ route, seq }));
             }
-            else if (company_id === "gmbNt" && stops.gmbNt) {
-                _etas = _etas.concat(await gmb({
-                    stopId: stops.gmbNt[seq],
-                    gtfsId,
-                    seq,
-                    bound: bound.gmbNt,
-                }));
+            else if (company_id === "hkkf" && stops.hkkf) {
+                _etas = _etas.concat(await hkkf({ route, bound: bound.hkkf, seq }));
             }
         }
         return _etas.sort((a, b) => {
@@ -82,15 +72,15 @@ export async function fetchEtas({ route, stops, bound, dest, seq, serviceType, c
     }
 }
 export async function fetchEtaDb() {
-    return fetch("https://data.hkbus.app/routeFareList.min.json")
+    return fetch("https://data.hkbus.app/routeFareList.min.json", { cache: "no-store" })
         .then((r) => r.json())
-        .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json")
+        .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json", { cache: "no-store" })
         .then(r => r.json()));
 }
 export async function fetchEtaDbMd5() {
-    return fetch("https://data.hkbus.app/routeFareList.md5")
+    return fetch("https://data.hkbus.app/routeFareList.md5", { cache: "no-store" })
         .then((r) => r.text())
-        .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.md5")
+        .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.md5", { cache: "no-store" })
         .then(r => r.text()));
 }
 //# sourceMappingURL=index.js.map

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

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

package/esm/sunferry.js

@@ -0,0 +1,35 @@
+import { isSafari } from "./utils";
+export default function fetchEtas({ route, seq }) {
+    if (seq === 1)
+        return Promise.resolve([]);
+    return fetch(`https://www.sunferry.com.hk/eta/?route=${route}`, {
+        cache: isSafari ? "default" : "no-store",
+    })
+        .then((response) => response.json())
+        .then(({ data }) => {
+        if (!data)
+            return [];
+        return data
+            .map(({ depart_time, rmk_en, rmk_tc, route_tc, route_en }) => {
+            const date = new Date();
+            let guess = `${date.getFullYear()}-${date.getMonth()}-${date.getDate()}T${depart_time}:00+08:00}`;
+            if ((new Date(guess)) < date) {
+                date.setDate(date.getDate() + 1);
+                guess = `${date.getFullYear()}-${date.getMonth()}-${date.getDate()}T${depart_time}:00+08:00}`;
+            }
+            return {
+                eta: guess,
+                remark: {
+                    zh: rmk_tc,
+                    en: rmk_en,
+                },
+                dest: {
+                    zh: route_tc.split(" - ")[1],
+                    en: route_en.split(" - ")[1],
+                },
+                co: "sunferry",
+            };
+        });
+    });
+}
+//# sourceMappingURL=sunferry.js.map

package/esm/sunferry.js.map

@@ -0,0 +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,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,IAAI,WAAW,YAAY,CAAA;YACjG,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,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,IAAI,WAAW,YAAY,CAAA;aAC9F;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"}

package/esm/type.d.ts

@@ -1,4 +1,4 @@
-export type Company = "kmb" | "nlb" | "ctb" | "lrtfeeder" | "gmb" | "lightRail" | "mtr" | "gmbHki" | "gmbKln" | "gmbNt";
+export type Company = "kmb" | "nlb" | "ctb" | "lrtfeeder" | "gmb" | "lightRail" | "mtr" | "sunferry" | "hkkf" | "fortuneferry";
 export type Terminal = {
     en: string;
     zh: string;
@@ -69,4 +69,6 @@ export type Eta = {
         en: string;
     };
     co: Company;
+    lat?: number;
+    lng: number;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hk-bus-eta",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Query the ETA (Estimated Time of Arrival) of HK Bus/Minibus/MTR/Lightrail",
   "main": "dist/index.js",
   "module": "esm/index.js",

package/src/fortuneferry.ts

@@ -0,0 +1,75 @@
+import type { Eta, RouteListEntry, StopList } from "./type";
+import { isSafari } from "./utils";
+
+interface fetchEtasProps {
+  route: string;
+  stops: {
+    fortuneferry: string[];
+  }
+  seq: number;
+  stopList: StopList;
+}
+
+const getCode = (zhName: string) => {
+  if ( zhName.includes("中環") ) {
+    return "CL"
+  } else if ( zhName.includes("紅磡") ) {
+    return "HH"
+  } else if ( zhName.includes("北角") ) {
+    return "NP"
+  } else if ( zhName.includes("觀塘") ) {
+    return "KT"
+  } else if ( zhName.includes("啟德") ) {
+    return "KT"
+  } else if ( zhName.includes("屯門") ) {
+    return "TM"
+  } else if ( zhName.includes("東涌") ) {
+    return "TC"
+  } else if ( zhName.includes("沙螺灣") ) {
+    return "SLW"
+  } else if ( zhName.includes("大澳") ) {
+    return "TO"
+  }
+  return "CL";
+}
+
+export default function fetchEtas({
+  route, stops: { fortuneferry: stops }, seq, stopList
+}: 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)
+
+  return fetch(
+    `https://www.hongkongwatertaxi.com.hk/eta/?route=${u}${v}`,
+    {
+      cache: isSafari ? "default" : "no-store",
+    },
+  )
+    .then((response) => response.json())
+    .then(({ data }) => {
+      if (!data) return [];
+      
+      return data
+        .map(({ depart_time, rmk_tc, rmk_en }: any) => {
+          const date = new Date();
+          let guess = `${date.getFullYear()}-${date.getMonth()}-${date.getDate()}T${depart_time}:00+08:00}`
+          if ( (new Date(guess)) < date ) {
+            date.setDate(date.getDate() + 1)
+            guess = `${date.getFullYear()}-${date.getMonth()}-${date.getDate()}T${depart_time}:00+08:00}`
+          }
+          return {
+            eta: guess,
+            remark: {
+              zh: rmk_tc,
+              en: rmk_en,
+            },
+            dest: {
+              zh: "",
+              en: "",
+            },
+            co: "fortuneferry",
+          }
+        });
+    });
+}

package/src/gmb.ts

@@ -35,8 +35,8 @@ export default function fetchEtas({
             ...eta.map((data: any) => ({
               eta: data.timestamp,
               remark: {
-                zh: data.remarks_tc,
-                en: data.remarks_en,
+                zh: data.remarks_tc ?? "",
+                en: data.remarks_en ?? "",
               },
               dest: {
                 zh: "",

package/src/hkkf.ts

@@ -0,0 +1,40 @@
+import type { Eta, RouteListEntry } from "./type";
+import { isSafari } from "./utils";
+
+interface fetchEtasProps {
+  route: string;
+  bound: RouteListEntry["bound"]["hkkf"];
+  seq: number;
+}
+
+export default function fetchEtas({
+  route, bound, seq
+}: fetchEtasProps): Promise<Eta[]> {
+  if ( seq === 0 ) return Promise.resolve([])
+  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: {
+              zh: "",
+              en: "",
+            },
+            co: "hkkf",
+          }
+        });
+    });
+}

package/src/index.ts

@@ -5,6 +5,9 @@ import lrtfeeder from "./lrtfeeder";
 import gmb from "./gmb";
 import lightrail from "./lightRail";
 import mtr from "./mtr";
+import sunferry from "./sunferry"
+import fortuneferry from "./fortuneferry";
+import hkkf from "./hkkf";
 import { RouteListEntry, EtaDb, Eta, StopList } from "./type";
 
 interface fetchEtasProps extends RouteListEntry {
@@ -68,33 +71,16 @@ export async function fetchEtas({
             bound: bound.mtr,
           }),
         );
-      } else if (company_id === "gmbHki" && stops.gmbHki) {
+      } else if (company_id === "fortuneferry" && stops.fortuneferry) {
         _etas = _etas.concat(
-          await gmb({
-            stopId: stops.gmbHki[seq],
-            gtfsId,
-            seq,
-            bound: bound.gmbHki,
-          }),
-        );
-      } else if (company_id === "gmbKln" && stops.gmbKln) {
-        _etas = _etas.concat(
-          await gmb({
-            stopId: stops.gmbKln[seq],
-            gtfsId,
-            seq,
-            bound: bound.gmbKln,
-          }),
-        );
-      } else if (company_id === "gmbNt" && stops.gmbNt) {
-        _etas = _etas.concat(
-          await gmb({
-            stopId: stops.gmbNt[seq],
-            gtfsId,
-            seq,
-            bound: bound.gmbNt,
-          }),
-        );
+          await fortuneferry({
+            route, stops, seq, stopList
+          })
+        )
+      } else if (company_id === "sunferry" && stops.sunferry) {
+        _etas = _etas.concat(await sunferry({route, seq}))
+      } else if (company_id === "hkkf" && stops.hkkf) {
+        _etas = _etas.concat(await hkkf({route, bound: bound.hkkf, seq}))
       }
     }
 
@@ -110,17 +96,17 @@ export async function fetchEtas({
 }
 
 export async function fetchEtaDb(): Promise<EtaDb> {
-  return fetch("https://data.hkbus.app/routeFareList.min.json")
+  return fetch("https://data.hkbus.app/routeFareList.min.json", {cache: "no-store"})
     .then((r) => r.json())
-    .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json")
+    .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json", {cache: "no-store"})
       .then(r => r.json())
     );
 }
 
 export async function fetchEtaDbMd5(): Promise<string> {
-  return fetch("https://data.hkbus.app/routeFareList.md5")
+  return fetch("https://data.hkbus.app/routeFareList.md5", {cache: "no-store"})
     .then((r) => r.text())
-    .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.md5")
+    .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.md5", {cache: "no-store"})
       .then(r => r.text())
     );
 }

package/src/sunferry.ts

@@ -0,0 +1,45 @@
+import type { Eta } from "./type";
+import { isSafari } from "./utils";
+
+interface fetchEtasProps {
+  route: string;
+  seq: number;
+}
+
+export default function fetchEtas({
+  route, seq
+}: fetchEtasProps): Promise<Eta[]> {
+  if ( seq === 1 ) return Promise.resolve([])
+  return fetch(
+    `https://www.sunferry.com.hk/eta/?route=${route}`,
+    {
+      cache: isSafari ? "default" : "no-store",
+    },
+  )
+    .then((response) => response.json())
+    .then(({ data }) => {
+      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()}-${date.getMonth()}-${date.getDate()}T${depart_time}:00+08:00}`
+          if ( (new Date(guess)) < date ) {
+            date.setDate(date.getDate() + 1)
+            guess = `${date.getFullYear()}-${date.getMonth()}-${date.getDate()}T${depart_time}:00+08:00}`
+          }
+          return {
+            eta: guess,
+            remark: {
+              zh: rmk_tc,
+              en: rmk_en,
+            },
+            dest: {
+              zh: route_tc.split(" - ")[1],
+              en: route_en.split(" - ")[1],
+            },
+            co: "sunferry",
+          }
+        });
+    });
+}

package/src/type.ts

@@ -6,9 +6,9 @@ export type Company =
   | "gmb"
   | "lightRail"
   | "mtr"
-  | "gmbHki"
-  | "gmbKln"
-  | "gmbNt";
+  | "sunferry"
+  | "hkkf"
+  | "fortuneferry";
 
 export type Terminal = {
   en: string;
@@ -85,4 +85,6 @@ export type Eta = {
     en: string;
   };
   co: Company;
+  lat?: number;
+  lng: number;
 };