@idm-plugin/meteo2 0.6.2 → 0.6.3

package/dist/index.js

@@ -25,9 +25,9 @@ class Q0 {
    * @param source
    * @param options
    */
-  static async queryPointMeteo(M, z, b, A = !1, c = "", o = {}) {
+  static async queryPointMeteo(M, z, b, A = !1, c = "", W = {}) {
     typeof b == "number" && (b = b < 1e12 ? b * 1e3 : b);
-    const O = L(b), W = {
+    const O = L(b), o = {
       searchParams: {
         lng: M,
         lat: z,
@@ -37,14 +37,14 @@ class Q0 {
       },
       timeout: 3e4
     }, Y = L(), n = Y.valueOf();
-    O.isBefore(Y.subtract(1, "month")) && (s == null || s.warn("[%s] get history meteo on %s: %j", o.requestId, O.format(), W));
-    const X = "https://aod4idm.idmwx.com/api/ocean/point", q = await Q.get(X, W).json(), T = L().valueOf();
-    if (s == null || s.info("[%s] get meteo(cost: %d ms) from %s with options: %j", o.requestId, T - n, X, W), (q == null ? void 0 : q.code) === 0)
+    O.isBefore(Y.subtract(1, "month")) && (s == null || s.warn("[%s] get history meteo on %s: %j", W.requestId, O.format(), o));
+    const X = "https://aod4idm.idmwx.com/api/ocean/point", q = await Q.get(X, o).json(), T = L().valueOf();
+    if (s == null || s.info("[%s] get meteo(cost: %d ms) from %s with options: %j", W.requestId, T - n, X, o), (q == null ? void 0 : q.code) === 0)
       return {
         ...q.data,
         source: c
       };
-    s == null || s.warn("[%s] get meteo failed: %j", o.requestId, q);
+    s == null || s.warn("[%s] get meteo failed: %j", W.requestId, q);
   }
   /**
    * 点查海洋气象要素(指定要素组合)
@@ -60,9 +60,9 @@ class Q0 {
    * @param source
    * @param options
    */
-  static async queryPointFactor(M, z, b, A = "wind,wave,current,watertemp,visibility", c = "", o = {}) {
+  static async queryPointFactor(M, z, b, A = "wind,wave,current,watertemp,visibility", c = "", W = {}) {
     typeof b == "number" && (b = b < 1e12 ? b * 1e3 : b);
-    const O = L(b), W = {
+    const O = L(b), o = {
       searchParams: {
         lng: M,
         lat: z,
@@ -72,24 +72,24 @@ class Q0 {
       },
       timeout: 3e4
     }, Y = L(), n = Y.valueOf();
-    O.isBefore(Y.subtract(1, "month")) && (s == null || s.warn("[%s] get history factors on %s: %j", o.requestId, O.format(), W));
-    const X = "https://aod4idm.idmwx.com/api/ocean/factor", q = await Q.get(X, W).json(), T = L().valueOf();
-    if (s == null || s.info("[%s] get factors(cost: %d ms) from %s with options: %j", o.requestId, T - n, X, W), (q == null ? void 0 : q.code) === 0)
+    O.isBefore(Y.subtract(1, "month")) && (s == null || s.warn("[%s] get history factors on %s: %j", W.requestId, O.format(), o));
+    const X = "https://aod4idm.idmwx.com/api/ocean/factor", q = await Q.get(X, o).json(), T = L().valueOf();
+    if (s == null || s.info("[%s] get factors(cost: %d ms) from %s with options: %j", W.requestId, T - n, X, o), (q == null ? void 0 : q.code) === 0)
       return {
         ...q.data,
         source: c
       };
-    s == null || s.warn("[%s] get factors failed: %j", o.requestId, q);
+    s == null || s.warn("[%s] get factors failed: %j", W.requestId, q);
   }
   /**
    * @see https://api.windy.com/point-forecast/docs
    * @param key
    */
   static async queryWindyPointForecast(M, z, b, A = {}) {
-    const c = "https://api.windy.com/api/point-forecast/v2", o = [];
+    const c = "https://api.windy.com/api/point-forecast/v2", W = [];
     try {
       let O = L().valueOf();
-      const W = await Q.post(c, {
+      const o = await Q.post(c, {
         headers: {
           "Content-Type": "application/json"
         },
@@ -134,28 +134,28 @@ class Q0 {
         }
       }).json();
       Y = L().valueOf(), s == null || s.info("[%s] get gfs-wave-factors(cost: %d ms) from %s", A.requestId, Y - O, c);
-      for (let q = 0; q < W.ts.length; q++) {
-        const T = this.populateUVFactor(W["wind_u-surface"][q], W["wind_v-surface"][q], !1, A);
-        T.scale = this.calculateBeaufortWindForceScale(T.speed), o.push({
-          utc: L(W.ts[q]).utc().format(),
-          temp: W["temp-surface"][q] ? Math.round((W["temp-surface"][q] - 273.15) * 100) / 100 : void 0,
-          dp_temp: W["dewpoint-surface"][q] ? Math.round((W["dewpoint-surface"][q] - 273.15) * 100) / 100 : void 0,
+      for (let q = 0; q < o.ts.length; q++) {
+        const T = this.populateUVFactor(o["wind_u-surface"][q], o["wind_v-surface"][q], !1, A);
+        T.scale = this.calculateBeaufortWindForceScale(T.speed), W.push({
+          utc: L(o.ts[q]).utc().format(),
+          temp: o["temp-surface"][q] ? Math.round((o["temp-surface"][q] - 273.15) * 100) / 100 : void 0,
+          dp_temp: o["dewpoint-surface"][q] ? Math.round((o["dewpoint-surface"][q] - 273.15) * 100) / 100 : void 0,
           precip: {
-            inter3h: W["past3hprecip-surface"][q] ? Math.round(W["past3hprecip-surface"][q] * 1e3 * 1e3) / 1e3 : 0,
-            inter3hSnow: W["past3hsnowprecip-surface"][q] ? Math.round(W["past3hsnowprecip-surface"][q] * 1e3 * 1e3) / 1e3 : 0,
-            inter3hConv: W["past3hconvprecip-surface"][q] ? Math.round(W["past3hconvprecip-surface"][q] * 1e3 * 1e3) / 1e3 : 0
+            inter3h: o["past3hprecip-surface"][q] ? Math.round(o["past3hprecip-surface"][q] * 1e3 * 1e3) / 1e3 : 0,
+            inter3hSnow: o["past3hsnowprecip-surface"][q] ? Math.round(o["past3hsnowprecip-surface"][q] * 1e3 * 1e3) / 1e3 : 0,
+            inter3hConv: o["past3hconvprecip-surface"][q] ? Math.round(o["past3hconvprecip-surface"][q] * 1e3 * 1e3) / 1e3 : 0
           },
           wind: T,
           gusts: {
-            speed: Math.round((W["gust-surface"][q] || 0) * 100) / 100,
-            kts: this.convertMs2Kts(W["gust-surface"][q])
+            speed: Math.round((o["gust-surface"][q] || 0) * 100) / 100,
+            kts: this.convertMs2Kts(o["gust-surface"][q])
           },
-          lclouds: W["lclouds-surface"][q] ? Math.round(W["lclouds-surface"][q] * 100) / 100 : 0,
-          mclouds: W["mclouds-surface"][q] ? Math.round(W["mclouds-surface"][q] * 100) / 100 : 0,
-          hclouds: W["hclouds-surface"][q] ? Math.round(W["hclouds-surface"][q] * 100) / 100 : 0,
-          rh: W["rh-surface"][q] ? Math.round(W["rh-surface"][q] * 100) / 100 : 0,
-          gh: W["gh-surface"][q] ? Math.round(W["gh-surface"][q] * 100) / 100 : 0,
-          pressure: Math.round(W["pressure-surface"][q] / 100 * 100) / 100
+          lclouds: o["lclouds-surface"][q] ? Math.round(o["lclouds-surface"][q] * 100) / 100 : 0,
+          mclouds: o["mclouds-surface"][q] ? Math.round(o["mclouds-surface"][q] * 100) / 100 : 0,
+          hclouds: o["hclouds-surface"][q] ? Math.round(o["hclouds-surface"][q] * 100) / 100 : 0,
+          rh: o["rh-surface"][q] ? Math.round(o["rh-surface"][q] * 100) / 100 : 0,
+          gh: o["gh-surface"][q] ? Math.round(o["gh-surface"][q] * 100) / 100 : 0,
+          pressure: Math.round(o["pressure-surface"][q] / 100 * 100) / 100
         });
       }
       const X = [];
@@ -171,14 +171,14 @@ class Q0 {
           }
         });
       }
-      for (const q of o) {
+      for (const q of W) {
         const T = X.find((i) => i.utc === q.utc);
         q.wave = T == null ? void 0 : T.wave;
       }
     } catch (O) {
       s.warn("[%s] get-gfs-factor failed: %s", A.requestId, O);
     }
-    return o;
+    return W;
   }
   /**
    * 填充UV向量
@@ -188,11 +188,11 @@ class Q0 {
    * @param options
    */
   static populateUVFactor(M, z, b = !1, A = {}) {
-    const c = Math.round(Math.sqrt(Math.pow(M, 2) + Math.pow(z, 2)) * 1e4) / 1e4, { degree: o, direction: O } = this.calculateUVDirection(M, z, b, A), W = this.convertMs2Kts(c);
+    const c = Math.round(Math.sqrt(Math.pow(M, 2) + Math.pow(z, 2)) * 1e4) / 1e4, { degree: W, direction: O } = this.calculateUVDirection(M, z, b, A), o = this.convertMs2Kts(c);
     return {
       speed: c,
-      kts: W,
-      degree: o,
+      kts: o,
+      degree: W,
       direction: O,
       eastward: Math.round(M * 1e4) / 1e4,
       northward: Math.round(z * 1e4) / 1e4
@@ -211,11 +211,11 @@ class Q0 {
   static calculateUVDirection(M, z, b = !1, A = {}) {
     let c = Math.atan2(M, z) + Math.PI;
     b && (c = Math.atan2(M, z));
-    const o = this.convert2Direction(c);
+    const W = this.convert2Direction(c);
     return c = Math.round(c / (2 * Math.PI) * 360 * 1e4) / 1e4, {
       angle: c,
       degree: c,
-      direction: o
+      direction: W
     };
   }
   /**
@@ -271,9 +271,9 @@ var a0 = { exports: {} };
       throw new RangeError("invalid coordinates");
     if (90 <= z)
       return "Etc/GMT";
-    var o = -1, O = 48 * (180 + b) / 360.00000000000006, W = 24 * (90 - z) / 180.00000000000003, Y = 0 | O, n = 0 | W, X = 96 * n + 2 * Y;
+    var W = -1, O = 48 * (180 + b) / 360.00000000000006, o = 24 * (90 - z) / 180.00000000000003, Y = 0 | O, n = 0 | o, X = 96 * n + 2 * Y;
     for (X = 56 * A.charCodeAt(X) + A.charCodeAt(X + 1) - 1995; X + c.length < 3136; )
-      X = 56 * A.charCodeAt(X = 8 * (o = o + X + 1) + 4 * (n = 0 | (W = 2 * (W - n) % 2)) + 2 * (Y = 0 | (O = 2 * (O - Y) % 2)) + 2304) + A.charCodeAt(X + 1) - 1995;
+      X = 56 * A.charCodeAt(X = 8 * (W = W + X + 1) + 4 * (n = 0 | (o = 2 * (o - n) % 2)) + 2 * (Y = 0 | (O = 2 * (O - Y) % 2)) + 2304) + A.charCodeAt(X + 1) - 1995;
     return c[X + c.length - 3136];
   }
   r.exports = M;
@@ -291,7 +291,7 @@ var n0 = { exports: {} };
     r.exports ? r.exports = z(L) : z(M.moment);
   })(B0, function(M) {
     M.version === void 0 && M.default && (M = M.default);
-    var z = "0.5.48", b = {}, A = {}, c = {}, o = {}, O = {}, W;
+    var z = "0.5.48", b = {}, A = {}, c = {}, W = {}, O = {}, o;
     (!M || typeof M.version != "string") && v("Moment Timezone requires Moment.js. See https://momentjs.com/timezone/docs/#/use-it/browser/");
     var Y = M.version.split("."), n = +Y[0], X = +Y[1];
     (n < 2 || n === 2 && X < 6) && v("Moment Timezone requires Moment.js >= 2.6.0. You are using Moment.js " + M.version + ". See momentjs.com");
@@ -422,14 +422,14 @@ var n0 = { exports: {} };
           N[B] = !0;
         }
       for (u in a)
-        a.hasOwnProperty(u) && R.push(o[u]);
+        a.hasOwnProperty(u) && R.push(W[u]);
       return R;
     }
     function Z() {
       try {
         var p = Intl.DateTimeFormat().resolvedOptions().timeZone;
         if (p && p.length > 3) {
-          var d = o[_(p)];
+          var d = W[_(p)];
           if (d)
             return d;
           v("Moment Timezone found " + p + " from the Intl api, but did not have that data loaded.");
@@ -445,7 +445,7 @@ var n0 = { exports: {} };
       return u.sort(g), u.length > 0 ? u[0].zone.name : void 0;
     }
     function k(p) {
-      return (!W || p) && (W = Z()), W;
+      return (!o || p) && (o = Z()), o;
     }
     function _(p) {
       return (p || "").toLowerCase().replace(/\//g, "_");
@@ -453,17 +453,17 @@ var n0 = { exports: {} };
     function W0(p) {
       var d, a, R, N;
       for (typeof p == "string" && (p = [p]), d = 0; d < p.length; d++)
-        R = p[d].split("|"), a = R[0], N = _(a), b[N] = p[d], o[N] = a, D(N, R[2].split(" "));
+        R = p[d].split("|"), a = R[0], N = _(a), b[N] = p[d], W[N] = a, D(N, R[2].split(" "));
     }
     function y(p, d) {
       p = _(p);
       var a = b[p], R;
-      return a instanceof V ? a : typeof a == "string" ? (a = new V(a), b[p] = a, a) : A[p] && d !== y && (R = y(A[p], y)) ? (a = b[p] = new V(), a._set(R), a.name = o[p], a) : null;
+      return a instanceof V ? a : typeof a == "string" ? (a = new V(a), b[p] = a, a) : A[p] && d !== y && (R = y(A[p], y)) ? (a = b[p] = new V(), a._set(R), a.name = W[p], a) : null;
     }
     function L0() {
       var p, d = [];
-      for (p in o)
-        o.hasOwnProperty(p) && (b[p] || b[A[p]]) && o[p] && d.push(o[p]);
+      for (p in W)
+        W.hasOwnProperty(p) && (b[p] || b[A[p]]) && W[p] && d.push(W[p]);
       return d.sort();
     }
     function e0() {
@@ -472,7 +472,7 @@ var n0 = { exports: {} };
     function o0(p) {
       var d, a, R, N;
       for (typeof p == "string" && (p = [p]), d = 0; d < p.length; d++)
-        a = p[d].split("|"), R = _(a[0]), N = _(a[1]), A[R] = N, o[R] = a[0], A[N] = R, o[N] = a[1];
+        a = p[d].split("|"), R = _(a[0]), N = _(a[1]), A[R] = N, W[R] = a[0], A[N] = R, W[N] = a[1];
     }
     function T0(p) {
       var d, a, R, N;
@@ -515,7 +515,7 @@ var n0 = { exports: {} };
       var d = Array.prototype.slice.call(arguments, 0, -1), a = arguments[arguments.length - 1], R = M.utc.apply(null, d), N;
       return !M.isMoment(p) && A0(R) && (N = y(a)) && R.add(N.parse(R), "minutes"), R.tz(a), R;
     }
-    l.version = z, l.dataVersion = "", l._zones = b, l._links = A, l._names = o, l._countries = c, l.add = W0, l.link = o0, l.load = f0, l.zone = y, l.zoneExists = O0, l.guess = k, l.names = L0, l.Zone = V, l.unpack = U, l.unpackBase60 = T, l.needsOffset = A0, l.moveInvalidForward = !0, l.moveAmbiguousForward = !1, l.countries = e0, l.zonesForCountry = r0;
+    l.version = z, l.dataVersion = "", l._zones = b, l._links = A, l._names = W, l._countries = c, l.add = W0, l.link = o0, l.load = f0, l.zone = y, l.zoneExists = O0, l.guess = k, l.names = L0, l.Zone = V, l.unpack = U, l.unpackBase60 = T, l.needsOffset = A0, l.moveInvalidForward = !0, l.moveAmbiguousForward = !1, l.countries = e0, l.zonesForCountry = r0;
     var w = M.fn;
     M.tz = l, M.defaultZone = null, M.updateOffset = function(p, d) {
       var a = M.defaultZone, R;
@@ -1489,21 +1489,21 @@ class J0 {
       const b = L();
       let A;
       if (M.start_dates instanceof Array)
-        for (let o = 0; o < M.start_dates.length; o++) {
-          M.start_date = M.start_dates[o], M.end_date = M.end_dates[o], M.fake = M.fakes[o];
-          const O = M.url[o];
+        for (let W = 0; W < M.start_dates.length; W++) {
+          M.start_date = M.start_dates[W], M.end_date = M.end_dates[W], M.fake = M.fakes[W];
+          const O = M.url[W];
           this.debug && K.debug("[%s] fetch weather via %s with %j", z.requestId, O, {
             start_date: M.start_date,
             end_date: M.end_date,
             fake: M.fake,
-            step: o
+            step: W
           });
-          const W = await z0(O, M), Y = await this.parseWeatherData(W, M, z);
+          const o = await z0(O, M), Y = await this.parseWeatherData(o, M, z);
           A ? await this.mergeSegments(A, Y) : A = Y;
         }
       else {
-        const o = await z0(M.url, M);
-        A = await this.parseWeatherData(o, M, z);
+        const W = await z0(M.url, M);
+        A = await this.parseWeatherData(W, M, z);
       }
       delete M.apikey;
       const c = L();
@@ -1529,7 +1529,7 @@ class J0 {
    * @param options
    */
   async marineForecast(M, z = {}) {
-    var b, A, c, o, O, W, Y, n;
+    var b, A, c, W, O, o, Y, n;
     try {
       const X = L();
       let q;
@@ -1554,7 +1554,7 @@ class J0 {
       const T = L();
       this.debug && K.info("[%s] fetch marine api (%j) cost: %d ms", z.requestId, M.url, T.diff(X, "ms"));
       const i = await this.mergeMarineData(q), S = i.find((f) => f.model === "ncep_gfswave016"), t = i.find((f) => f.model === "ncep_gfswave025"), U = i.find((f) => f.model === "meteofrance_wave"), V = i.find((f) => f.model === "best_match");
-      return (A = (b = V == null ? void 0 : V.hourly) == null ? void 0 : b.wave_height) != null && A.every((f) => f !== null) ? [V] : (o = (c = U == null ? void 0 : U.hourly) == null ? void 0 : c.wave_height) != null && o.every((f) => f !== null) ? [U] : (W = (O = S == null ? void 0 : S.hourly) == null ? void 0 : O.wave_height) != null && W.every((f) => f !== null) ? [S] : (n = (Y = t == null ? void 0 : t.hourly) == null ? void 0 : Y.wave_height) != null && n.every((f) => f !== null) ? [t] : i != null && i.length ? [i[0]] : [];
+      return (A = (b = V == null ? void 0 : V.hourly) == null ? void 0 : b.wave_height) != null && A.every((f) => f !== null) ? [V] : (W = (c = U == null ? void 0 : U.hourly) == null ? void 0 : c.wave_height) != null && W.every((f) => f !== null) ? [U] : (o = (O = S == null ? void 0 : S.hourly) == null ? void 0 : O.wave_height) != null && o.every((f) => f !== null) ? [S] : (n = (Y = t == null ? void 0 : t.hourly) == null ? void 0 : Y.wave_height) != null && n.every((f) => f !== null) ? [t] : i != null && i.length ? [i[0]] : [];
     } catch (X) {
       return K.warn("[%s] marine forecast failed: %s, with %j", z.requestId, X, M), [];
     }
@@ -1567,11 +1567,11 @@ class J0 {
    * @private
    */
   async parseWeatherData(M, z, b = {}) {
-    var o, O, W, Y, n, X, q, T, i, S;
+    var W, O, o, Y, n, X, q, T, i, S;
     const A = [], c = Math.pow(10, b.precision || 6);
     for (let t = 0; t < M.length; t++) {
       const U = M[t], V = U.utcOffsetSeconds(), f = U.timezone(), G = U.current(), E = U.hourly(), C = U.sixHourly(), H = U.daily(), h = {};
-      if (h.timezone = f || void 0, h.offset = this.prettyTimezoneOffset(V), h.model = z.models instanceof Array ? (o = z.models) == null ? void 0 : o[t] : z.models || "best_match", G) {
+      if (h.timezone = f || void 0, h.offset = this.prettyTimezoneOffset(V), h.model = z.models instanceof Array ? (W = z.models) == null ? void 0 : W[t] : z.models || "best_match", G) {
         const g = L();
         h.current = {
           time: L.unix(Number(G.time())).utc().format()
@@ -1592,7 +1592,7 @@ class J0 {
           )
         };
         for (let Z = 0; Z < E.variablesLength(); Z++) {
-          const k = (Y = (W = (O = E.variables(Z).valuesArray()) == null ? void 0 : O.toString()) == null ? void 0 : W.split(",")) == null ? void 0 : Y.map((_) => isNaN(_) ? null : Math.round(Number(_) * c) / c);
+          const k = (Y = (o = (O = E.variables(Z).valuesArray()) == null ? void 0 : O.toString()) == null ? void 0 : o.split(",")) == null ? void 0 : Y.map((_) => isNaN(_) ? null : Math.round(Number(_) * c) / c);
           h.hourly[z.hourly[Z]] = k;
         }
         const m = L();
@@ -1638,38 +1638,38 @@ class J0 {
           for (const c in z[b][A])
             if (M[b][A][c] instanceof Array)
               if (c === "time" && A === "hourly") {
-                const o = M[b][A][c].at(-1);
-                z[b][A][c] = z[b][A][c].map((O) => O + o + 1), M[b][A][c].push(...z[b][A][c]);
+                const W = M[b][A][c].at(-1);
+                z[b][A][c] = z[b][A][c].map((O) => O + W + 1), M[b][A][c].push(...z[b][A][c]);
               } else
                 M[b][A][c].push(...z[b][A][c]);
         }
     return M;
   }
   async mergeMarineData(M) {
-    var c, o, O, W;
+    var c, W, O, o;
     const z = [], b = M.find((Y) => Y.model === "best_match");
     b && z.push(b);
     const A = M.find((Y) => Y.model === "meteofrance_currents");
     for (const Y of M)
-      ["best_match", "meteofrance_currents"].includes(Y.model) || (Y.hourly.ocean_current_velocity = (c = A == null ? void 0 : A.hourly) == null ? void 0 : c.ocean_current_velocity, Y.hourly.ocean_current_direction = (o = A == null ? void 0 : A.hourly) == null ? void 0 : o.ocean_current_direction, Y.hourly.sea_level_height_msl = (O = A == null ? void 0 : A.hourly) == null ? void 0 : O.sea_level_height_msl, Y.hourly.sea_surface_temperature = (W = A == null ? void 0 : A.hourly) == null ? void 0 : W.sea_surface_temperature, z.push(Y));
+      ["best_match", "meteofrance_currents"].includes(Y.model) || (Y.hourly.ocean_current_velocity = (c = A == null ? void 0 : A.hourly) == null ? void 0 : c.ocean_current_velocity, Y.hourly.ocean_current_direction = (W = A == null ? void 0 : A.hourly) == null ? void 0 : W.ocean_current_direction, Y.hourly.sea_level_height_msl = (O = A == null ? void 0 : A.hourly) == null ? void 0 : O.sea_level_height_msl, Y.hourly.sea_surface_temperature = (o = A == null ? void 0 : A.hourly) == null ? void 0 : o.sea_surface_temperature, z.push(Y));
     return z;
   }
   pickForecastUrl(M, z, b, A = {}) {
     return M ? b && !A.noFake ? A.selfHistory ? this.FORECAST.ORM_HISTORY_MARINE_URL : this.FORECAST.OM_MARINE_URL : z ? A.marineUrl || this.FORECAST.ORM_MARINE_URL : this.FORECAST.OM_MARINE_URL : b && !A.noFake ? A.selfHistory ? this.FORECAST.ORM_HISTORY_URL : this.FORECAST.OM_HISTORY_URL : z ? A.weatherUrl || this.FORECAST.ORM_URL : this.FORECAST.OM_URL;
   }
   pickMarineModels(M) {
-    var o;
-    const z = (o = M == null ? void 0 : M.trim()) == null ? void 0 : o.split(",");
+    var W;
+    const z = (W = M == null ? void 0 : M.trim()) == null ? void 0 : W.split(",");
     if (!(z != null && z.length))
       return ["best_match"];
     const b = [];
     for (let O = 0; O < z.length; O++) {
-      const W = z[O];
-      ["ecmwf_wam025", "meteofrance_wave", "ewam", "gwam", "era5_ocean"].includes(W) ? b.push("meteofrance_currents", W) : ["gfswave", "ncep_gfswave025", "ncep_gfswave016"].includes(W) ? b.push("meteofrance_currents", "ncep_gfswave025", "ncep_gfswave016") : b.push("best_match");
+      const o = z[O];
+      ["ecmwf_wam025", "meteofrance_wave", "ewam", "gwam", "era5_ocean"].includes(o) ? b.push("meteofrance_currents", o) : ["gfswave", "ncep_gfswave025", "ncep_gfswave016"].includes(o) ? b.push("meteofrance_currents", "ncep_gfswave025", "ncep_gfswave016") : b.push("best_match");
     }
-    const A = b.reduce((O, W) => (O.includes(W) || O.push(W), O), []), c = ["best_match", "meteofrance_currents", "meteofrance_wave", "ecmwf_wam025", "ncep_gfswave025", "gwam", "era5_ocean", "ewam", "ncep_gfswave016"];
-    return A.sort((O, W) => {
-      const Y = c.indexOf(O), n = c.indexOf(W);
+    const A = b.reduce((O, o) => (O.includes(o) || O.push(o), O), []), c = ["best_match", "meteofrance_currents", "meteofrance_wave", "ecmwf_wam025", "ncep_gfswave025", "gwam", "era5_ocean", "ewam", "ncep_gfswave016"];
+    return A.sort((O, o) => {
+      const Y = c.indexOf(O), n = c.indexOf(o);
       return Y - n;
     }), A;
   }
@@ -1682,21 +1682,21 @@ class J0 {
    * @private
    */
   prepare(M, z, b, A = {}) {
-    var W;
-    const c = L().utc(), o = M ? L.utc(M) : void 0, O = c.clone().utc().add(z && ((W = b.models) != null && W.includes("meteofrance_wave")) ? 10 : 15, "day");
+    var o;
+    const c = L().utc(), W = M ? L.utc(M) : void 0, O = c.clone().utc().add(z && ((o = b.models) != null && o.includes("meteofrance_wave")) ? 10 : 15, "day");
     if (M) {
-      const Y = o.clone().utc().add(A.forecastDays ?? 1, "day");
-      Y.isAfter(O) ? (Y.subtract(1, "year"), o.isAfter(O) ? (o.subtract(1, "year"), b.start_dates = [
-        o.clone().subtract(A.pastDays || 0, "day").utc().format("YYYY-MM-DD")
+      const Y = W.clone().utc().add(A.forecastDays ?? 1, "day");
+      Y.isAfter(O) ? (Y.subtract(1, "year"), W.isAfter(O) ? (W.subtract(1, "year"), b.start_dates = [
+        W.clone().subtract(A.pastDays || 0, "day").utc().format("YYYY-MM-DD")
       ], b.end_dates = [Y.utc().format("YYYY-MM-DD")], b.fakes = [!0], b.url = [this.pickForecastUrl(z, A.selfHosted ?? !0, !0, A)]) : (b.start_dates = [
-        o.clone().subtract(A.pastDays || 0, "day").utc().format("YYYY-MM-DD"),
+        W.clone().subtract(A.pastDays || 0, "day").utc().format("YYYY-MM-DD"),
         O.clone().subtract(1, "year").utc().format("YYYY-MM-DD")
       ], b.end_dates = [O.clone().subtract(1, "day").utc().format("YYYY-MM-DD"), Y.utc().format("YYYY-MM-DD")], b.fakes = [!1, !0], b.url = [
         this.pickForecastUrl(z, A.selfHosted ?? !0, !1, A),
         this.pickForecastUrl(z, A.selfHosted ?? !0, !0, A)
       ])) : (b.start_dates = [
-        o.clone().subtract(A.pastDays || 0, "day").utc().format("YYYY-MM-DD")
-      ], b.end_dates = [Y.utc().format("YYYY-MM-DD")], b.fakes = [!1], b.url = [this.pickForecastUrl(z, A.selfHosted ?? !0, o.isBefore(c.clone().subtract(30, "day")), A)]);
+        W.clone().subtract(A.pastDays || 0, "day").utc().format("YYYY-MM-DD")
+      ], b.end_dates = [Y.utc().format("YYYY-MM-DD")], b.fakes = [!1], b.url = [this.pickForecastUrl(z, A.selfHosted ?? !0, W.isBefore(c.clone().subtract(30, "day")), A)]);
     } else
       b.forecast_days = A.forecastDays, b.past_days = A.pastDays, b.fake = !1, b.url = this.pickForecastUrl(z, A.selfHosted ?? !0, !1, A);
     return b;
@@ -1746,15 +1746,15 @@ class J0 {
    * @param withHourly
    * @param options
    */
-  async spotForecast(M, z, b, A = !0, c = !0, o = !1, O = {
+  async spotForecast(M, z, b, A = !0, c = !0, W = !1, O = {
     forecastDays: 1,
     pastDays: 0,
     precision: 6,
     selfHosted: !0
   }) {
     var T, i, S, t, U, V;
-    z = this.toStdLng(z), this.debug && K.info("[%s] spot forecast params: %j", O.requestId, { lat: M, lng: z, datetime: b, simplify: A, withDaily: c, withHourly: o, options: O });
-    const W = {
+    z = this.toStdLng(z), this.debug && K.info("[%s] spot forecast params: %j", O.requestId, { lat: M, lng: z, datetime: b, simplify: A, withDaily: c, withHourly: W, options: O });
+    const o = {
       apikey: this.apikey,
       latitude: M,
       longitude: z,
@@ -1768,8 +1768,8 @@ class J0 {
       const f = this.timezoneOffset(M, z);
       Y = L.utc(b).utcOffset(f), Y.subtract(f > 0 ? f : -f, "h"), O.selfHistory = !(Y != null && Y.isBefore(L.utc().subtract(120, "days")));
     }
-    c && (W.daily = ((i = this.FORECAST.WEATHER_VARIABLES.NORMAL.DAILY) == null ? void 0 : i.split(",")) || []), Y || (O.forecastDays = O.forecastDays || 1, O.pastDays = 0, o = !0), o && (W.hourly = ((S = this.FORECAST.WEATHER_VARIABLES.NORMAL.HOURLY) == null ? void 0 : S.split(",")) || []), O.pastDays = O.pastDays || 0, O.pastDays = O.pastDays > 7 ? 7 : O.pastDays < 0 ? 0 : O.pastDays, O.forecastDays = O.forecastDays ?? 1, O.forecastDays = O.forecastDays > 14 ? 14 : O.forecastDays < 0 ? 1 : O.forecastDays, this.prepare(Y == null ? void 0 : Y.utc().format(), !1, W, O);
-    const n = await this.weatherForecast(W, O), X = {
+    c && (o.daily = ((i = this.FORECAST.WEATHER_VARIABLES.NORMAL.DAILY) == null ? void 0 : i.split(",")) || []), Y || (O.forecastDays = O.forecastDays || 1, O.pastDays = 0, W = !0), W && (o.hourly = ((S = this.FORECAST.WEATHER_VARIABLES.NORMAL.HOURLY) == null ? void 0 : S.split(",")) || []), O.pastDays = O.pastDays || 0, O.pastDays = O.pastDays > 7 ? 7 : O.pastDays < 0 ? 0 : O.pastDays, O.forecastDays = O.forecastDays ?? 1, O.forecastDays = O.forecastDays > 14 ? 14 : O.forecastDays < 0 ? 1 : O.forecastDays, this.prepare(Y == null ? void 0 : Y.utc().format(), !1, o, O);
+    const n = await this.weatherForecast(o, O), X = {
       apikey: this.apikey,
       latitude: M,
       longitude: z,
@@ -1778,7 +1778,7 @@ class J0 {
       wind_speed_unit: "kn",
       models: this.pickMarineModels(O.marineModels)
     };
-    c && (X.daily = this.FORECAST.MARINE_VARIABLES.DAILY.split(",")), Y || (O.forecastDays = O.forecastDays || 1, o = !0), o && (X.hourly = this.FORECAST.MARINE_VARIABLES.HOURLY.split(",")), this.prepare(Y == null ? void 0 : Y.utc().format(), !0, X, O);
+    c && (X.daily = this.FORECAST.MARINE_VARIABLES.DAILY.split(",")), Y || (O.forecastDays = O.forecastDays || 1, W = !0), W && (X.hourly = this.FORECAST.MARINE_VARIABLES.HOURLY.split(",")), this.prepare(Y == null ? void 0 : Y.utc().format(), !0, X, O);
     let q = await this.marineForecast(X, O);
     return (V = (U = (t = q[0]) == null ? void 0 : t.hourly) == null ? void 0 : U.wave_height) != null && V.every((f) => f === null) && (X.models = this.pickMarineModels("best_match,ncep_gfswave025,meteofrance_wave"), q = await this.marineForecast(X, O)), { weather: n, marine: q };
   }
@@ -1803,11 +1803,11 @@ class J0 {
    * @param withMarine
    * @param options
    */
-  async spotHistorical(M, z, b, A, c = !0, o = !0, O = !1, W = {
+  async spotHistorical(M, z, b, A, c = !0, W = !0, O = !1, o = {
     precision: 6
   }) {
     var S, t;
-    z = this.toStdLng(z), this.debug && K.info("[%s] spot historical params: %j", W.requestId, { lat: M, lng: z, startDate: b, endDate: A, withMarine: O, options: W });
+    z = this.toStdLng(z), this.debug && K.info("[%s] spot historical params: %j", o.requestId, { lat: M, lng: z, startDate: b, endDate: A, withMarine: O, options: o });
     const Y = this.timezoneOffset(M, z), n = L.utc(b).utcOffset(Y), X = L.utc(A).utcOffset(Y);
     n.subtract(Y > 0 ? Y : -Y, "h"), X.subtract(Y > 0 ? Y : -Y, "h");
     const q = {
@@ -1816,14 +1816,14 @@ class J0 {
       longitude: z,
       cell_selection: "sea",
       wind_speed_unit: "kn",
-      models: ((S = W.weatherModels) == null ? void 0 : S.split(",")) || ["best_match"],
+      models: ((S = o.weatherModels) == null ? void 0 : S.split(",")) || ["best_match"],
       timezone: "auto",
       url: this.HISTORICAL.OM_URL,
       start_date: n.format("YYYY-MM-DD"),
       end_date: X.format("YYYY-MM-DD")
     };
-    c && (q.daily = this.HISTORICAL.WEATHER_VARIABLES.DAILY.split(",")), o && (q.hourly = this.HISTORICAL.WEATHER_VARIABLES.HOURLY.split(","));
-    const T = await this.weatherForecast(q, W);
+    c && (q.daily = this.HISTORICAL.WEATHER_VARIABLES.DAILY.split(",")), W && (q.hourly = this.HISTORICAL.WEATHER_VARIABLES.HOURLY.split(","));
+    const T = await this.weatherForecast(q, o);
     let i;
     if (O) {
       const U = {
@@ -1833,14 +1833,14 @@ class J0 {
         cell_selection: "sea",
         timezone: "auto",
         wind_speed_unit: "kn",
-        models: ((t = W.marineModels) == null ? void 0 : t.split(",")) || ["best_match"],
+        models: ((t = o.marineModels) == null ? void 0 : t.split(",")) || ["best_match"],
         daily: this.FORECAST.MARINE_VARIABLES.DAILY.split(","),
         hourly: this.FORECAST.MARINE_VARIABLES.HOURLY.split(","),
         url: this.FORECAST.OM_MARINE_URL,
         start_date: n.format("YYYY-MM-DD"),
         end_date: X.format("YYYY-MM-DD")
       };
-      i = await this.marineForecast(U, W);
+      i = await this.marineForecast(U, o);
     }
     return { weather: T, marine: i };
   }
@@ -1855,12 +1855,12 @@ class J0 {
    * @param endDate
    * @param options
    */
-  async spotSeasonal(M, z, b, A, c = !1, o = {
+  async spotSeasonal(M, z, b, A, c = !1, W = {
     precision: 6
   }) {
-    z = this.toStdLng(z), this.debug && K.info("[%s] spot seasonal params: %j", o.requestId, { lat: M, lng: z, startDate: b, endDate: A, options: o });
-    const O = this.timezoneOffset(M, z), W = L.utc(b).utcOffset(O), Y = A ? L.utc(A).utcOffset(O) : W.clone().add(1, "month");
-    W.subtract(O > 0 ? O : -O, "h"), Y.subtract(O > 0 ? O : -O, "h");
+    z = this.toStdLng(z), this.debug && K.info("[%s] spot seasonal params: %j", W.requestId, { lat: M, lng: z, startDate: b, endDate: A, options: W });
+    const O = this.timezoneOffset(M, z), o = L.utc(b).utcOffset(O), Y = A ? L.utc(A).utcOffset(O) : o.clone().add(1, "month");
+    o.subtract(O > 0 ? O : -O, "h"), Y.subtract(O > 0 ? O : -O, "h");
     const n = {
       apikey: this.apikey,
       latitude: M,
@@ -1869,11 +1869,11 @@ class J0 {
       wind_speed_unit: "kn",
       timezone: "auto",
       url: this.SEASONAL.OM_URL,
-      start_date: W.format("YYYY-MM-DD"),
+      start_date: o.format("YYYY-MM-DD"),
       end_date: Y.format("YYYY-MM-DD"),
       daily: this.SEASONAL.WEATHER_VARIABLES.DAILY.split(",")
     };
-    return c && (n.six_hourly = this.SEASONAL.WEATHER_VARIABLES.SIX_HOURLY.split(",")), o.memberLength = 4, { weather: await this.weatherForecast(n, o) };
+    return c && (n.six_hourly = this.SEASONAL.WEATHER_VARIABLES.SIX_HOURLY.split(",")), W.memberLength = 4, { weather: await this.weatherForecast(n, W) };
   }
   /**
    * 气候态数据
@@ -1900,8 +1900,8 @@ class J0 {
   }) {
     var X;
     z = this.toStdLng(z), this.debug && K.info("[%s] spot climate params: %j", c.requestId, { lat: M, lng: z, startDate: b, endDate: A, options: c });
-    const o = this.timezoneOffset(M, z), O = L.utc(b).utcOffset(o), W = A ? L.utc(A).utcOffset(o) : O.clone().add(1, "day");
-    W.subtract(o > 0 ? o : -o, "h"), O.subtract(o > 0 ? o : -o, "h");
+    const W = this.timezoneOffset(M, z), O = L.utc(b).utcOffset(W), o = A ? L.utc(A).utcOffset(W) : O.clone().add(1, "day");
+    o.subtract(W > 0 ? W : -W, "h"), O.subtract(W > 0 ? W : -W, "h");
     const Y = {
       apikey: this.apikey,
       latitude: M,
@@ -1912,7 +1912,7 @@ class J0 {
       timezone: "auto",
       url: this.CLIMATE.OM_URL,
       start_date: O.format("YYYY-MM-DD"),
-      end_date: W.format("YYYY-MM-DD"),
+      end_date: o.format("YYYY-MM-DD"),
       daily: this.CLIMATE.WEATHER_VARIABLES.DAILY.split(",")
     };
     return { weather: await this.weatherForecast(Y, c) };
@@ -1927,9 +1927,9 @@ class J0 {
         }
       })).json();
       if (O.code === 0) {
-        const W = O.data, Y = M0.standardWeatherModels();
+        const o = O.data, Y = M0.standardWeatherModels();
         for (const n of Y) {
-          const X = M0.autoPickSubCategories(n.alias), T = W.filter((i) => X.includes(i.category)).map((i) => {
+          const X = M0.autoPickSubCategories(n.alias), T = o.filter((i) => X.includes(i.category)).map((i) => {
             var S, t, U, V, f, G;
             return {
               category: i.category,
@@ -1995,10 +1995,10 @@ class k0 {
    * @param datum
    * @param options
    */
-  async tidesForecast(M, z, b = 7, A = "today", c = !0, o = !1, O = !1, W = "CD", Y = {}) {
-    A = A || "today", b = b || 7, z = this.toStdLng(z), this.debug && R0.info("[%s] spot tides forecast params: %j", Y.requestId, { lat: M, lng: z, date: A, extremes: c, heights: o, datums: O, datum: W });
-    let n = `https://www.worldtides.info/api/v3?lat=${M}&lon=${z}&days=${b}&date=${A}&datum=${W}&key=${this.apikey}&localtime`;
-    c && (n = `${n}&extremes`), o && (n = `${n}&heights`), O && (n = `${n}&datums`);
+  async tidesForecast(M, z, b = 7, A = "today", c = !0, W = !1, O = !1, o = "CD", Y = {}) {
+    A = A || "today", b = b || 7, z = this.toStdLng(z), this.debug && R0.info("[%s] spot tides forecast params: %j", Y.requestId, { lat: M, lng: z, date: A, extremes: c, heights: W, datums: O, datum: o });
+    let n = `https://www.worldtides.info/api/v3?lat=${M}&lon=${z}&days=${b}&date=${A}&datum=${o}&key=${this.apikey}&localtime`;
+    c && (n = `${n}&extremes`), W && (n = `${n}&heights`), O && (n = `${n}&datums`);
     const q = await (await fetch(n)).json();
     return q.status === 200 ? {
       rqt: {
@@ -2027,14 +2027,14 @@ try {
 class $ {
   static async parseHistory(M) {
     return M == null ? void 0 : M.map((z) => {
-      const b = Number(z.pressure / 100), A = Number(z.lat), c = Number(z.lon), o = Number(z.windSpeed * 3600 / 1852);
+      const b = Number(z.pressure / 100), A = Number(z.lat), c = Number(z.lon), W = Number(z.windSpeed * 3600 / 1852);
       return {
         updated: L.utc(z.time).format(),
         lat: isNaN(A) ? null : A,
         lng: isNaN(c) ? null : c,
         pressure: isNaN(b) ? null : Math.round(b) || null,
-        kts: isNaN(o) ? null : Math.round(o) || null,
-        type: e.parseTropicalType(o),
+        kts: isNaN(W) ? null : Math.round(W) || null,
+        type: e.parseTropicalType(W),
         wind: {
           r7: null,
           r7ne: null,
@@ -2059,9 +2059,9 @@ class $ {
     return M.map((z) => {
       var c;
       const b = L.utc(z.reftime).format(), A = {};
-      return (c = z.records) == null || c.forEach((o) => {
-        const O = L.utc(o.time), W = O.diff(b, "hour"), Y = Number(o.pressure / 100), n = Number(o.lat), X = Number(o.lon), q = Number(o.windSpeed * 3600 / 1852);
-        A[W] = {
+      return (c = z.records) == null || c.forEach((W) => {
+        const O = L.utc(W.time), o = O.diff(b, "hour"), Y = Number(W.pressure / 100), n = Number(W.lat), X = Number(W.lon), q = Number(W.windSpeed * 3600 / 1852);
+        A[o] = {
           lat: isNaN(n) ? null : n,
           lng: isNaN(X) ? null : X,
           pressure: isNaN(Y) ? null : Math.round(Y) || null,
@@ -2111,7 +2111,7 @@ class $ {
   static async realtimeForecast() {
     const M = "https://node.windy.com/tc/v2/storms", z = await Q.get(M).json(), b = [];
     for (const A of z.storms) {
-      const c = `https://node.windy.com/tc/v2/storms/${A.id}`, o = await Q.get(c).json(), O = await $.parseTropical(o);
+      const c = `https://node.windy.com/tc/v2/storms/${A.id}`, W = await Q.get(c).json(), O = await $.parseTropical(W);
       b.push(O);
     }
     return b;
@@ -2119,10 +2119,10 @@ class $ {
 }
 const J = class J {
   static async parseHistory(M) {
-    const z = `https://hifleet.com/hifleetapi/gettyphooninfo2.do?xuhao=${M}`, b = await Q.post(z).text(), A = await J.parser.parseStringPromise(b), c = A.typhoon.position instanceof Array ? A.typhoon.position : [A.typhoon.position], o = [];
+    const z = `https://hifleet.com/hifleetapi/gettyphooninfo2.do?xuhao=${M}`, b = await Q.post(z).text(), A = await J.parser.parseStringPromise(b), c = A.typhoon.position instanceof Array ? A.typhoon.position : [A.typhoon.position], W = [];
     for (const O of c) {
-      const W = L(O.updatetime).utcOffset(8).utc().format(), Y = Number(O.lat), n = Number(O.lon), X = Number(O.pressure), q = Number(O.windspeed * 3600 / 1852), T = e.parseWindCircle(O.c7quad1 / 1.852), i = e.parseWindCircle(O.c7quad2 / 1.852), S = e.parseWindCircle(O.c7quad3 / 1.852), t = e.parseWindCircle(O.c7quad4 / 1.852), U = e.parseWindCircle(O.c10quad1 / 1.852), V = e.parseWindCircle(O.c10quad2 / 1.852), f = e.parseWindCircle(O.c10quad3 / 1.852), G = e.parseWindCircle(O.c10quad4 / 1.852), E = e.parseWindCircle(O.c12quad1 / 1.852), C = e.parseWindCircle(O.c12quad2 / 1.852), H = e.parseWindCircle(O.c12quad3 / 1.852), h = e.parseWindCircle(O.c12quad4 / 1.852), { r7: g, r10: D, r12: m } = e.estimateWindRadii(q, X, Y), Z = {
-        updated: W,
+      const o = L(O.updatetime).utcOffset(8).utc().format(), Y = Number(O.lat), n = Number(O.lon), X = Number(O.pressure), q = Number(O.windspeed * 3600 / 1852), T = e.parseWindCircle(O.c7quad1 / 1.852), i = e.parseWindCircle(O.c7quad2 / 1.852), S = e.parseWindCircle(O.c7quad3 / 1.852), t = e.parseWindCircle(O.c7quad4 / 1.852), U = e.parseWindCircle(O.c10quad1 / 1.852), V = e.parseWindCircle(O.c10quad2 / 1.852), f = e.parseWindCircle(O.c10quad3 / 1.852), G = e.parseWindCircle(O.c10quad4 / 1.852), E = e.parseWindCircle(O.c12quad1 / 1.852), C = e.parseWindCircle(O.c12quad2 / 1.852), H = e.parseWindCircle(O.c12quad3 / 1.852), h = e.parseWindCircle(O.c12quad4 / 1.852), { r7: g, r10: D, r12: m } = e.estimateWindRadii(q, X, Y), Z = {
+        updated: o,
         lat: isNaN(Y) ? null : Y,
         lng: isNaN(n) ? null : n,
         pressure: isNaN(X) ? null : Math.round(X),
@@ -2146,15 +2146,15 @@ const J = class J {
           r12se: h
         }
       };
-      o.push(Z);
+      W.push(Z);
     }
-    return o.sort((O, W) => L(W.updated).unix() - L(O.updated).unix()), o;
+    return W.sort((O, o) => L(o.updated).unix() - L(O.updated).unix()), W;
   }
   static async parseForecast(M, z) {
-    const b = `https://hifleet.com/hifleetapi/gettyphooforecast.do?xuhao=${M}`, A = await Q.post(b).text(), c = await J.parser.parseStringPromise(A), o = c.list.forecast instanceof Array ? c.list.forecast : [c.list.forecast], O = [];
-    for (const W of o)
-      if (W.xuhao === M) {
-        const Y = W.positions.forecastposition instanceof Array ? W.positions.forecastposition : [W.positions.forecastposition];
+    const b = `https://hifleet.com/hifleetapi/gettyphooforecast.do?xuhao=${M}`, A = await Q.post(b).text(), c = await J.parser.parseStringPromise(A), W = c.list.forecast instanceof Array ? c.list.forecast : [c.list.forecast], O = [];
+    for (const o of W)
+      if (o.xuhao === M) {
+        const Y = o.positions.forecastposition instanceof Array ? o.positions.forecastposition : [o.positions.forecastposition];
         if (Y.length) {
           z = z || L(Y.at(0).forecasttime).utcOffset(8).utc();
           const n = {};
@@ -2195,7 +2195,7 @@ const J = class J {
           }
           const X = {
             date: z.utc().format(),
-            model: e.parseTropicalModel(W.country).toLowerCase(),
+            model: e.parseTropicalModel(o.country).toLowerCase(),
             hours: n
           };
           O.push(X);
@@ -2204,10 +2204,10 @@ const J = class J {
     return O;
   }
   static async parseTropical(M) {
-    var o, O, W;
-    const z = await J.parseHistory(M.xuhao), b = (o = z.at(0)) == null ? void 0 : o.updated, A = await J.parseForecast(M.xuhao, b ? L(b) : void 0), c = {
+    var W, O, o;
+    const z = await J.parseHistory(M.xuhao), b = (W = z.at(0)) == null ? void 0 : W.updated, A = await J.parseForecast(M.xuhao, b ? L(b) : void 0), c = {
       id: (O = M.enname) == null ? void 0 : O.toLowerCase(),
-      name: (W = M.enname) == null ? void 0 : W.toLowerCase(),
+      name: (o = M.enname) == null ? void 0 : o.toLowerCase(),
       cnName: M.name,
       history: z,
       forecasts: A
@@ -2216,10 +2216,11 @@ const J = class J {
   }
   static async realtimeForecast() {
     const M = "https://hifleet.com/hifleetapi/getCurrentTyphoon2.do", z = await Q.post(M).text(), b = await J.parser.parseStringPromise(z), A = [], c = b.typhoon.position instanceof Array ? b.typhoon.position : [b.typhoon.position];
-    for (const o of c) {
-      const O = await J.parseTropical(o);
-      A.push(O);
-    }
+    for (const W of c)
+      if (W) {
+        const O = await J.parseTropical(W);
+        A.push(O);
+      }
     return A;
   }
 };
@@ -2228,7 +2229,7 @@ let b0 = J;
 class j {
   static async parseHistory(M) {
     return M.map((z) => {
-      const b = Number(z.lat), A = Number(z.lon), c = Number(z.maxSP * 3600 / 1852), o = Number(z.minP), O = e.parseWindCircle(z.r7Ne / 1.852), W = e.parseWindCircle(z.r7Nw / 1.852), Y = e.parseWindCircle(z.r7Se / 1.852), n = e.parseWindCircle(z.r7Sw / 1.852), X = e.parseWindCircle(z.r10Ne / 1.852), q = e.parseWindCircle(z.r10Nw / 1.852), T = e.parseWindCircle(z.r10Se / 1.852), i = e.parseWindCircle(z.r10Sw / 1.852), S = e.parseWindCircle(z.r12Ne / 1.852), t = e.parseWindCircle(z.r12Nw / 1.852), U = e.parseWindCircle(z.r12Se / 1.852), V = e.parseWindCircle(z.r12Sw / 1.852), { r7: f, r10: G, r12: E } = e.estimateWindRadii(c, o, b);
+      const b = Number(z.lat), A = Number(z.lon), c = Number(z.maxSP * 3600 / 1852), W = Number(z.minP), O = e.parseWindCircle(z.r7Ne / 1.852), o = e.parseWindCircle(z.r7Nw / 1.852), Y = e.parseWindCircle(z.r7Se / 1.852), n = e.parseWindCircle(z.r7Sw / 1.852), X = e.parseWindCircle(z.r10Ne / 1.852), q = e.parseWindCircle(z.r10Nw / 1.852), T = e.parseWindCircle(z.r10Se / 1.852), i = e.parseWindCircle(z.r10Sw / 1.852), S = e.parseWindCircle(z.r12Ne / 1.852), t = e.parseWindCircle(z.r12Nw / 1.852), U = e.parseWindCircle(z.r12Se / 1.852), V = e.parseWindCircle(z.r12Sw / 1.852), { r7: f, r10: G, r12: E } = e.estimateWindRadii(c, W, b);
       return {
         updated: L.utc(z.realTime).format(),
         lat: isNaN(b) ? null : b || null,
@@ -2238,7 +2239,7 @@ class j {
         wind: {
           r7: f,
           r7ne: O,
-          r7nw: W,
+          r7nw: o,
           r7se: Y,
           r7sw: n,
           r10: G,
@@ -2257,18 +2258,18 @@ class j {
   }
   static async parseForecast(M) {
     return M.map((z) => {
-      const b = z.currentPosition, A = z.forecastPoints, c = L.utc(b.realTime).format(), o = {};
+      const b = z.currentPosition, A = z.forecastPoints, c = L.utc(b.realTime).format(), W = {};
       return A.forEach((O) => {
-        const W = L.utc(O.forecastTime), Y = W.diff(c, "hour"), n = Math.round(O.maxSP * 3600 / 1852), X = Math.round(O.maxSP * 3600 / 1852), q = O.pressure, T = e.parseWindCircle(O.r7Ne / 1.852), i = e.parseWindCircle(O.r7Nw / 1.852), S = e.parseWindCircle(O.r7Sw / 1.852), t = e.parseWindCircle(O.r7Se / 1.852), U = e.parseWindCircle(O.r10Ne / 1.852), V = e.parseWindCircle(O.r10Nw / 1.852), f = e.parseWindCircle(O.r10Sw / 1.852), G = e.parseWindCircle(O.r10Se / 1.852), E = e.parseWindCircle(O.r12Ne / 1.852), C = e.parseWindCircle(O.r12Nw / 1.852), H = e.parseWindCircle(O.r12Sw / 1.852), h = e.parseWindCircle(O.r12Se / 1.852), { r7: g, r10: D, r12: m } = e.estimateWindRadii(n, q, O.lat);
-        o[Y] = {
+        const o = L.utc(O.forecastTime), Y = o.diff(c, "hour"), n = Math.round(O.maxSP * 3600 / 1852), X = Math.round(O.maxSP * 3600 / 1852), q = O.pressure, T = e.parseWindCircle(O.r7Ne / 1.852), i = e.parseWindCircle(O.r7Nw / 1.852), S = e.parseWindCircle(O.r7Sw / 1.852), t = e.parseWindCircle(O.r7Se / 1.852), U = e.parseWindCircle(O.r10Ne / 1.852), V = e.parseWindCircle(O.r10Nw / 1.852), f = e.parseWindCircle(O.r10Sw / 1.852), G = e.parseWindCircle(O.r10Se / 1.852), E = e.parseWindCircle(O.r12Ne / 1.852), C = e.parseWindCircle(O.r12Nw / 1.852), H = e.parseWindCircle(O.r12Sw / 1.852), h = e.parseWindCircle(O.r12Se / 1.852), { r7: g, r10: D, r12: m } = e.estimateWindRadii(n, q, O.lat);
+        W[Y] = {
           lat: O.lat,
           lng: O.lon,
           pressure: O.pressure,
-          utc: W.format(),
+          utc: o.format(),
           wind: {
             kts: isNaN(n) ? null : n || null,
             type: e.parseTropicalType(n),
-            datetime: W.format(),
+            datetime: o.format(),
             r7: g,
             r7ne: T,
             r7nw: i,
@@ -2292,13 +2293,13 @@ class j {
       }), {
         date: c,
         model: e.parseTropicalModel(z.source).toLowerCase(),
-        hours: o
+        hours: W
       };
     });
   }
   static async parseTropical(M) {
-    var o;
-    const z = M.baseInfo, b = M.currentPosition, A = (o = z == null ? void 0 : z.eName) == null ? void 0 : o.toLowerCase(), c = {
+    var W;
+    const z = M.baseInfo, b = M.currentPosition, A = (W = z == null ? void 0 : z.eName) == null ? void 0 : W.toLowerCase(), c = {
       id: z == null ? void 0 : z.stormID,
       name: A,
       cName: z == null ? void 0 : z.cName,
@@ -2330,19 +2331,19 @@ class e {
     var b;
     const z = Object.values(c0);
     return (b = M.forecasts) == null || b.sort((A, c) => {
-      var W, Y;
-      const o = z.indexOf((W = A.model) == null ? void 0 : W.toUpperCase()), O = z.indexOf((Y = c.model) == null ? void 0 : Y.toUpperCase());
-      return (o === -1 ? 999 : o) - (O === -1 ? 999 : O);
+      var o, Y;
+      const W = z.indexOf((o = A.model) == null ? void 0 : o.toUpperCase()), O = z.indexOf((Y = c.model) == null ? void 0 : Y.toUpperCase());
+      return (W === -1 ? 999 : W) - (O === -1 ? 999 : O);
     }), M;
   }
   static async mergeTropicals(M = !0, z = !1, b = {}) {
-    var O, W;
-    const A = await $.realtimeForecast(), c = M ? await b0.realtimeForecast() : [], o = z ? await j.realtimeForecast() : [];
+    var O, o;
+    const A = await $.realtimeForecast(), c = M ? await b0.realtimeForecast() : [], W = z ? await j.realtimeForecast() : [];
     for (const Y of A) {
       const n = c.find((q) => {
         var T, i;
         return ((T = q.name) == null ? void 0 : T.toLowerCase()) === ((i = Y.name) == null ? void 0 : i.toLowerCase());
-      }), X = o.find((q) => {
+      }), X = W.find((q) => {
         var T, i;
         return ((T = q.name) == null ? void 0 : T.toLowerCase()) === ((i = Y.name) == null ? void 0 : i.toLowerCase());
       });
@@ -2357,7 +2358,7 @@ class e {
       if (n) {
         Y.history.push(...n.history), Y.history.sort((q, T) => L(T.updated).valueOf() - L(q.updated).valueOf());
         for (const q of n.forecasts)
-          ["CMA", "JMA", "CNTW", "CNHK", "KMA"].includes((W = q.model) == null ? void 0 : W.toUpperCase()) && !Y.forecasts.find((T) => T.model.toLowerCase() === q.model.toLowerCase()) && Y.forecasts.push(q);
+          ["CMA", "JMA", "CNTW", "CNHK", "KMA"].includes((o = q.model) == null ? void 0 : o.toUpperCase()) && !Y.forecasts.find((T) => T.model.toLowerCase() === q.model.toLowerCase()) && Y.forecasts.push(q);
       }
       Y.history = Y.history.reduce((q, T) => (q.find((i) => i.updated === T.updated) || q.push(T), q), []), await e.tropicalMovement(Y);
     }
@@ -2371,20 +2372,20 @@ class e {
     await e.sortTropical(M);
     let z = null;
     M.forecasts.forEach((A) => {
-      const c = A.hours, o = Object.keys(c);
-      for (let O = 0; O < o.length - 1; O++) {
-        const W = c[o[O]];
-        z = z || W;
-        const Y = c[o[O + 1]];
-        W.movement = e.calculateMovement(W, Y);
-        const n = e.supplementWindRadii(W);
-        W.wind = { ...W.wind || {}, ...n };
+      const c = A.hours, W = Object.keys(c);
+      for (let O = 0; O < W.length - 1; O++) {
+        const o = c[W[O]];
+        z = z || o;
+        const Y = c[W[O + 1]];
+        o.movement = e.calculateMovement(o, Y);
+        const n = e.supplementWindRadii(o);
+        o.wind = { ...o.wind || {}, ...n };
       }
     });
     let b = null;
     for (let A = 0; A < M.history.length - 1; A++) {
-      const c = M.history[A + 1], o = M.history[A];
-      b = b || o, c.movement = e.calculateMovement(c, o);
+      const c = M.history[A + 1], W = M.history[A];
+      b = b || W, c.movement = e.calculateMovement(c, W);
       const O = e.supplementWindRadii(c);
       c.wind = { ...c.wind || {}, ...O };
     }
@@ -2412,8 +2413,8 @@ class e {
     let A;
     const c = Math.abs(b || 25);
     if (z && z > 0) {
-      const o = 1013 - z;
-      A = 51.6 * Math.exp(-0.0223 * M + 0.0281 * c) * Math.pow(Math.max(o, 10) / 100, 0.155);
+      const W = 1013 - z;
+      A = 51.6 * Math.exp(-0.0223 * M + 0.0281 * c) * Math.pow(Math.max(W, 10) / 100, 0.155);
     } else
       A = 46.4 * Math.exp(-0.0155 * M + 0.0169 * c);
     return Math.max(10 / 1.852, Math.min(150 / 1.852, A));
@@ -2428,10 +2429,10 @@ class e {
   static estimateWindRadii(M, z, b) {
     if (!M || M < 17)
       return { r7: null, r10: null, r12: null };
-    const A = e.estimateRMW(M, z, b), c = A * 2.5, o = M >= 50 ? A * 1.8 : null, O = M >= 64 ? A * 1.3 : null;
+    const A = e.estimateRMW(M, z, b), c = A * 2.5, W = M >= 50 ? A * 1.8 : null, O = M >= 64 ? A * 1.3 : null;
     return {
       r7: Math.round(c),
-      r10: o ? Math.round(o) : null,
+      r10: W ? Math.round(W) : null,
       r12: O ? Math.round(O) : null
     };
   }
@@ -2448,20 +2449,20 @@ class e {
       return { ne: null, nw: null, se: null, sw: null };
     if (z < 9)
       return { ne: M, nw: M, se: M, sw: M };
-    const o = 0.15 * Math.min(z / (20 / 1.852), 1), O = {
+    const W = 0.15 * Math.min(z / (20 / 1.852), 1), O = {
       ne: (45 - b + 360) % 360,
       nw: (315 - b + 360) % 360,
       se: (135 - b + 360) % 360,
       sw: (225 - b + 360) % 360
-    }, W = (Y) => {
+    }, o = (Y) => {
       const n = Y > 180 ? Y - 360 : Y, X = Math.cos(n * Math.PI / 180);
-      return 1 - o * X;
+      return 1 - W * X;
     };
     return {
-      ne: Math.round(M * W(O.ne)),
-      nw: Math.round(M * W(O.nw)),
-      se: Math.round(M * W(O.se)),
-      sw: Math.round(M * W(O.sw))
+      ne: Math.round(M * o(O.ne)),
+      nw: Math.round(M * o(O.nw)),
+      se: Math.round(M * o(O.se)),
+      sw: Math.round(M * o(O.sw))
     };
   }
   /**
@@ -2475,8 +2476,8 @@ class e {
         /^r[7,10,12]/.test(n) && (isNaN(Number(z[n])) || z[n] < 0) && (z[n] = null);
       return z;
     }
-    const o = z.kts;
-    if (!o || o < 17)
+    const W = z.kts;
+    if (!W || W < 17)
       return {
         r7: null,
         r7ne: null,
@@ -2494,16 +2495,16 @@ class e {
         r12se: null,
         r12sw: null
       };
-    const O = e.estimateWindRadii(o, b, A), W = {};
+    const O = e.estimateWindRadii(W, b, A), o = {};
     return ["r7", "r10", "r12"].forEach((n) => {
       const X = O[n];
       if (X) {
-        W[n] = X;
+        o[n] = X;
         const q = e.estimateAsymmetricRadii(X, (c == null ? void 0 : c.kts) || 0, (c == null ? void 0 : c.deg) || 0, A > 0 ? "N" : "S");
-        W[`${n}ne`] = q.ne, W[`${n}nw`] = q.nw, W[`${n}se`] = q.se, W[`${n}sw`] = q.sw;
+        o[`${n}ne`] = q.ne, o[`${n}nw`] = q.nw, o[`${n}se`] = q.se, o[`${n}sw`] = q.sw;
       } else
-        W[n] = null, W[`${n}ne`] = null, W[`${n}nw`] = null, W[`${n}se`] = null, W[`${n}sw`] = null;
-    }), W;
+        o[n] = null, o[`${n}ne`] = null, o[`${n}nw`] = null, o[`${n}se`] = null, o[`${n}sw`] = null;
+    }), o;
   }
   /**
    * 台风类型