@idm-plugin/meteo2 0.5.3 → 0.5.5

package/dist/index.js

@@ -3,9 +3,9 @@ var n0 = (f, M, b) => M in f ? L0(f, M, { enumerable: !0, configurable: !0, writ
 var H = (f, M, b) => (n0(f, typeof M != "symbol" ? M + "" : M, b), b);
 import M0 from "@log4js-node/log4js-api";
 import L from "moment";
-import v from "got";
+import k from "got";
 import { fetchWeatherApi as $ } from "openmeteo";
-import { Meteo2Assist as k } from "@idm-plugin/meteo";
+import { Meteo2Assist as v } from "@idm-plugin/meteo";
 let U;
 try {
   U = M0.getLogger("meteo");
@@ -36,7 +36,7 @@ class m0 {
       timeout: 3e4
     }, X = L(), R = X.valueOf();
     A.isBefore(X.subtract(1, "month")) && (U == null || U.warn("[%s] get history meteo on %s: %j", d.requestId, A.format(), q));
-    const n = "https://aod4idm.idmwx.com/api/ocean/point", o = await v.get(n, q).json(), S = L().valueOf();
+    const n = "https://aod4idm.idmwx.com/api/ocean/point", o = await k.get(n, q).json(), S = L().valueOf();
     if (U == null || U.info("[%s] get meteo(cost: %d ms) from %s with options: %j", d.requestId, S - R, n, q), (o == null ? void 0 : o.code) === 0)
       return {
         ...o.data,
@@ -71,7 +71,7 @@ class m0 {
       timeout: 3e4
     }, X = L(), R = X.valueOf();
     A.isBefore(X.subtract(1, "month")) && (U == null || U.warn("[%s] get history factors on %s: %j", d.requestId, A.format(), q));
-    const n = "https://aod4idm.idmwx.com/api/ocean/factor", o = await v.get(n, q).json(), S = L().valueOf();
+    const n = "https://aod4idm.idmwx.com/api/ocean/factor", o = await k.get(n, q).json(), S = L().valueOf();
     if (U == null || U.info("[%s] get factors(cost: %d ms) from %s with options: %j", d.requestId, S - R, n, q), (o == null ? void 0 : o.code) === 0)
       return {
         ...o.data,
@@ -87,7 +87,7 @@ class m0 {
     const Y = "https://api.windy.com/api/point-forecast/v2", d = [];
     try {
       let A = L().valueOf();
-      const q = await v.post(Y, {
+      const q = await k.post(Y, {
         headers: {
           "Content-Type": "application/json"
         },
@@ -118,7 +118,7 @@ class m0 {
       }).json();
       let X = L().valueOf();
       U == null || U.info("[%s] get gfs-factors(cost: %d ms) from %s", O.requestId, X - A, Y), A = X;
-      const R = await v.post(Y, {
+      const R = await k.post(Y, {
         headers: {
           "Content-Type": "application/json"
         },
@@ -1423,9 +1423,11 @@ class C0 {
     H(this, "FORECAST", {
       OM_URL: "https://customer-api.open-meteo.com/v1/forecast",
       ORM_URL: "https://meteo3.idmwx.com/v1/forecast",
+      ORM_HISTORY_URL: "https://meteo1.idmwx.com/v1/forecast",
       OM_HISTORY_URL: "https://customer-historical-forecast-api.open-meteo.com/v1/forecast",
       OM_MARINE_URL: "https://customer-marine-api.open-meteo.com/v1/marine",
       ORM_MARINE_URL: "https://meteo3.idmwx.com/v1/marine",
+      ORM_HISTORY_MARINE_URL: "https://meteo1.idmwx.com/v1/marine",
       WEATHER_VARIABLES: {
         NORMAL: {
           DAILY: "weather_code,temperature_2m_max,temperature_2m_min,apparent_temperature_max,apparent_temperature_min,sunrise,sunset,precipitation_sum,precipitation_hours,precipitation_probability_max,rain_sum,showers_sum,snowfall_sum,wind_speed_10m_max,wind_gusts_10m_max,wind_direction_10m_dominant",
@@ -1464,13 +1466,13 @@ class C0 {
     this.apikey = M || "smE3JnDLHy3TizVv", this.debug = b;
   }
   async standardWeatherModels() {
-    return k.standardWeatherModels();
+    return v.standardWeatherModels();
   }
   async standardMarineModels() {
-    return k.standardMarineModels();
+    return v.standardMarineModels();
   }
   async autoPickMeteoModel(M = "best_match") {
-    return k.autoPickMeteoModel(M);
+    return v.autoPickMeteoModel(M);
   }
   range(M, b, p) {
     return Array.from({ length: (b - M) / p }, (O, Y) => M + Y * p);
@@ -1550,7 +1552,7 @@ class C0 {
       const S = L();
       this.debug && G.info("[%s] fetch marine api (%j) cost: %d ms", b.requestId, M.url, S.diff(n, "ms"));
       const i = await this.mergeMarineData(o), l = i.find((e) => e.model === "ncep_gfswave016"), u = i.find((e) => e.model === "ncep_gfswave025"), V = i.find((e) => e.model === "meteofrance_wave"), E = i.find((e) => e.model === "best_match");
-      return (O = (p = E == null ? void 0 : E.hourly) == null ? void 0 : p.wave_height) != null && O.every((e) => e !== null) ? [E] : (d = (Y = V == null ? void 0 : V.hourly) == null ? void 0 : Y.wave_height) != null && d.every((e) => e !== null) ? [V] : (q = (A = l == null ? void 0 : l.hourly) == null ? void 0 : A.wave_height) != null && q.every((e) => e !== null) ? [l] : (R = (X = u == null ? void 0 : u.hourly) == null ? void 0 : X.wave_height) != null && R.every((e) => e !== null) ? [u] : i;
+      return (O = (p = E == null ? void 0 : E.hourly) == null ? void 0 : p.wave_height) != null && O.every((e) => e !== null) ? [E] : (d = (Y = V == null ? void 0 : V.hourly) == null ? void 0 : Y.wave_height) != null && d.every((e) => e !== null) ? [V] : (q = (A = l == null ? void 0 : l.hourly) == null ? void 0 : A.wave_height) != null && q.every((e) => e !== null) ? [l] : (R = (X = u == null ? void 0 : u.hourly) == null ? void 0 : X.wave_height) != null && R.every((e) => e !== null) ? [u] : i != null && i.length ? [i[0]] : [];
     } catch (n) {
       return G.warn("[%s] marine forecast failed: %s, with %j", b.requestId, n, M), [];
     }
@@ -1651,7 +1653,7 @@ class C0 {
     return b;
   }
   pickForecastUrl(M, b, p, O = {}) {
-    return M ? p && !O.noFake ? this.FORECAST.OM_MARINE_URL : b ? O.marineUrl || this.FORECAST.ORM_MARINE_URL : this.FORECAST.OM_MARINE_URL : p && !O.noFake ? this.FORECAST.OM_HISTORY_URL : b ? O.weatherUrl || this.FORECAST.ORM_URL : this.FORECAST.OM_URL;
+    return M ? p && !O.noFake ? O.selfHistory ? this.FORECAST.ORM_HISTORY_MARINE_URL : this.FORECAST.OM_MARINE_URL : b ? O.marineUrl || this.FORECAST.ORM_MARINE_URL : this.FORECAST.OM_MARINE_URL : p && !O.noFake ? O.selfHistory ? this.FORECAST.ORM_HISTORY_URL : this.FORECAST.OM_HISTORY_URL : b ? O.weatherUrl || this.FORECAST.ORM_URL : this.FORECAST.OM_URL;
   }
   pickMarineModels(M) {
     var d;
@@ -1923,9 +1925,9 @@ class C0 {
         }
       })).json();
       if (A.code === 0) {
-        const q = A.data, X = k.standardWeatherModels();
+        const q = A.data, X = v.standardWeatherModels();
         for (const R of X) {
-          const n = k.autoPickSubCategories(R.alias), S = q.filter((i) => n.includes(i.category)).map((i) => {
+          const n = v.autoPickSubCategories(R.alias), S = q.filter((i) => n.includes(i.category)).map((i) => {
             var l, u, V, E, e, D;
             return {
               category: i.category,