@idm-plugin/vessel 1.9.4 → 1.9.6

package/dist/index.js

@@ -2,14 +2,14 @@ var ht = Object.defineProperty;
 var lt = (j, e, t) => e in j ? ht(j, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : j[e] = t;
 var z = (j, e, t) => (lt(j, typeof e != "symbol" ? e + "" : e, t), t);
 import B from "got";
-import it from "@log4js-node/log4js-api";
+import rt from "@log4js-node/log4js-api";
 import g from "moment";
 import { LngLatHelper as J, LaneHelper as W } from "@idm-plugin/geo2";
 import { MeteoHelper2 as ft, MeteoHelper as mt } from "@idm-plugin/meteo2";
 import { Meteo2Assist as ct } from "@idm-plugin/meteo";
 let p;
 try {
-  p = it.getLogger("vessel");
+  p = rt.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -22,7 +22,7 @@ class et {
     let t, n;
     switch (e) {
       case 0:
-        t = "在航（主机推动）", n = "The engine is in use";
+        t = "在航（主机推动）", n = "Underway Using Engine";
         break;
       case 1:
         t = "锚泊", n = "Anchored";
@@ -63,13 +63,13 @@ class jt extends et {
     this.clientId = t, this.clientSecret = n;
   }
   async authToken(t = {}) {
-    const n = "https://svc.data.myvessel.cn/ada/oauth/token", i = {
+    const n = "https://svc.data.myvessel.cn/ada/oauth/token", r = {
       searchParams: {
         client_id: this.clientId,
         client_secret: this.clientSecret,
         grant_type: "client_credentials"
       }
-    }, a = await B.post(n, i).json();
+    }, a = await B.post(n, r).json();
     p == null || p.info("[%s] fetch access token from: %s - %j", t.requestId, n, a), a.error || (this.token = {
       accessToken: a.access_token,
       tokenType: a.token_type,
@@ -80,18 +80,18 @@ class jt extends et {
     });
   }
   async realTimePosition(t, n = {}) {
-    var d, r, h;
+    var d, i, h;
     (!this.token || g().diff(g(this.token.issuedAt), "seconds") > ((d = this.token) == null ? void 0 : d.expiresIn) - 300) && await this.authToken(n);
-    const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", a = {
+    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", a = {
       headers: {
-        Authorization: `${(r = this.token) == null ? void 0 : r.tokenType} ${(h = this.token) == null ? void 0 : h.accessToken}`
+        Authorization: `${(i = this.token) == null ? void 0 : i.tokenType} ${(h = this.token) == null ? void 0 : h.accessToken}`
       },
       searchParams: { mmsi: t }
     };
-    p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, a);
-    const o = await B.get(i, a).json();
+    p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, r, a);
+    const o = await B.get(r, a).json();
     if (o.code)
-      return p == null || p.warn("[%s] fetch realtime position failed: %j", n.requestId, i, { message: o.message, status: o.status, code: o.code }), o;
+      return p == null || p.warn("[%s] fetch realtime position failed: %j", n.requestId, r, { message: o.message, status: o.status, code: o.code }), o;
     const s = o.data;
     for (const M in s)
       !isNaN(s[M]) && Number(s[M]) !== 1 / 0 && (s[M] = Number(s[M]));
@@ -131,31 +131,31 @@ class jt extends et {
     } else
       return {};
   }
-  async trajectory(t, n, i, a, o = !0, s = {}) {
+  async trajectory(t, n, r, a, o = !0, s = {}) {
     (!this.token || g().diff(g(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
-    const d = await this.realTimePosition(t, s), r = g(n), h = g(i), M = [];
-    for (; h.diff(r, "day", !0) > 30; )
-      await this.trajectoryIn30Day(t, r, r.clone().add(30, "day"), d, a, M, s), r.add(30, "day");
-    return await this.trajectoryIn30Day(t, r, h, d, a, M, s), M;
+    const d = await this.realTimePosition(t, s), i = g(n), h = g(r), M = [];
+    for (; h.diff(i, "day", !0) > 30; )
+      await this.trajectoryIn30Day(t, i, i.clone().add(30, "day"), d, a, M, s), i.add(30, "day");
+    return await this.trajectoryIn30Day(t, i, h, d, a, M, s), M;
   }
-  async trajectoryIn30Day(t, n, i, a, o, s, d = {}) {
-    var m, F, x, w, b;
-    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", h = {
+  async trajectoryIn30Day(t, n, r, a, o, s, d = {}) {
+    var m, F, x, v, b;
+    const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", h = {
       headers: {
         Authorization: `${(m = this.token) == null ? void 0 : m.tokenType} ${(F = this.token) == null ? void 0 : F.accessToken}`
       },
       json: {
         mmsi: t,
         startTime: n.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
-        endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
+        endTime: r.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    p == null || p.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, h);
-    const M = await B.post(r, h).json();
+    p == null || p.info("[%s] fetch trajectory from: %s - %j", d.requestId, i, h);
+    const M = await B.post(i, h).json();
     if (M.code)
-      return p == null || p.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: M.message, status: M.status, code: M.code }), M;
+      return p == null || p.warn("[%s] fetch trajectory failed: %j", d.requestId, i, { message: M.message, status: M.status, code: M.code }), M;
     let y = -1;
-    const v = g(`${(w = (x = M.data) == null ? void 0 : x[0]) == null ? void 0 : w.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const w = g(`${(v = (x = M.data) == null ? void 0 : x[0]) == null ? void 0 : v.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return (b = M.data) == null || b.forEach((c) => {
       for (const Y in c)
         !isNaN(c[Y]) && Number(c[Y]) !== 1 / 0 && (c[Y] = Number(c[Y]));
@@ -177,7 +177,7 @@ class jt extends et {
         method: "trajectory",
         vendor: "myVessel",
         utc: f.utc().format()
-      }, D = Math.floor(f.diff(v, "minute", !0) / (o || 1));
+      }, D = Math.floor(f.diff(w, "minute", !0) / (o || 1));
       D !== y && (y = D, s.push(S));
     }), s;
   }
@@ -189,20 +189,20 @@ class Et extends et {
     this.token = t;
   }
   async realTimePosition(t, n = {}) {
-    const i = "https://api.hifleet.com/position/position/get/token", a = {
+    const r = "https://api.hifleet.com/position/position/get/token", a = {
       searchParams: {
         mmsi: t,
         usertoken: this.token
       }
-    }, o = await B.post(i, a).json();
-    p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, a);
+    }, o = await B.post(r, a).json();
+    p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, r, a);
     const s = o == null ? void 0 : o.list;
     if (!s)
-      return p == null || p.warn("[%s] fetch realtime position failed: %j", n.requestId, i, o), o;
-    for (const v in s)
-      !isNaN(s[v]) && Number(s[v]) !== 1 / 0 && (s[v] = Number(s[v]));
+      return p == null || p.warn("[%s] fetch realtime position failed: %j", n.requestId, r, o), o;
+    for (const w in s)
+      !isNaN(s[w]) && Number(s[w]) !== 1 / 0 && (s[w] = Number(s[w]));
     s.status = s.sp > 3 ? 0 : 1;
-    const d = s.status, { labelCn: r, labelEn: h } = this.parseStatus(d), M = g(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const d = s.status, { labelCn: i, labelEn: h } = this.parseStatus(d), M = g(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.m,
       name: s.n,
@@ -226,14 +226,14 @@ class Et extends et {
       positionTime: M.unix(),
       utc: M.utc().format(),
       status: d,
-      labelCn: r,
+      labelCn: i,
       labelEn: h,
       method: "position",
       vendor: "hifleet"
     };
   }
   async search(t, n = {}) {
-    let i = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
+    let r = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
     const a = {
       searchParams: {
         keyword: t
@@ -244,8 +244,8 @@ class Et extends et {
         Host: "www.hifleet.com"
       }
     };
-    let o = await B.post(i, a).json();
-    p == null || p.info("[%s] fetch vessel props from: %s - %j", n.requestId, i, a), o instanceof Array && (o = o[0]);
+    let o = await B.post(r, a).json();
+    p == null || p.info("[%s] fetch vessel props from: %s - %j", n.requestId, r, a), o instanceof Array && (o = o[0]);
     for (const d in o)
       !isNaN(o[d]) && Number(o[d]) !== 1 / 0 && (o[d] = Number(o[d]));
     const s = {
@@ -258,10 +258,10 @@ class Et extends et {
       draught: o.dr,
       type: o.t
     };
-    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", o = await B.post(i, a).json(), p == null || p.info("[%s] search vessel dead weight from: %s - %j", n.requestId, i, a), o instanceof Array && (o = o[0]), o && (s.deadweight = Number(o.dwt)), s;
+    return r = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", o = await B.post(r, a).json(), p == null || p.info("[%s] search vessel dead weight from: %s - %j", n.requestId, r, a), o instanceof Array && (o = o[0]), o && (s.deadweight = Number(o.dwt)), s;
   }
   async suggest(t, n = {}) {
-    const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", a = {
+    const r = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", a = {
       searchParams: {
         q: t
       },
@@ -270,8 +270,8 @@ class Et extends et {
         Origin: "https://www.hifleet.com",
         Host: "www.hifleet.com"
       }
-    }, o = await B.post(i, a).json();
-    p == null || p.info("[%s] suggest vessel props from: %s - %j", n.requestId, i, a);
+    }, o = await B.post(r, a).json();
+    p == null || p.info("[%s] suggest vessel props from: %s - %j", n.requestId, r, a);
     const s = [];
     for (const d of o)
       s.push({
@@ -281,30 +281,30 @@ class Et extends et {
         imo: !d.imo || isNaN(d.imo) ? null : Number(d.imo),
         score: d._score
       });
-    return s.sort((d, r) => r.score - d.score), s;
+    return s.sort((d, i) => i.score - d.score), s;
   }
-  async trajectory(t, n, i, a, o = !0, s = {}) {
+  async trajectory(t, n, r, a, o = !0, s = {}) {
     var c, f, l;
     const d = await this.realTimePosition(t, s);
-    let r = g(n);
-    const h = g(i), M = g();
+    let i = g(n);
+    const h = g(r), M = g();
     if (o) {
-      let u = h.diff(r, "d", !0);
-      u < 0 ? r = h.clone().subtract(40, "d") : u < 30 ? r.subtract(10, "d") : u < 60 ? r.subtract(5, "d") : r = h.clone().subtract(80, "d"), u = M.diff(h, "d", !0), h.add(u > 10 ? 240 : u * 24, "h");
+      let u = h.diff(i, "d", !0);
+      u < 0 ? i = h.clone().subtract(40, "d") : u < 30 ? i.subtract(10, "d") : u < 60 ? i.subtract(5, "d") : i = h.clone().subtract(80, "d"), u = M.diff(h, "d", !0), h.add(u > 10 ? 240 : u * 24, "h");
     }
     const y = {
       searchParams: {
         endtime: h.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
-        starttime: r.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        starttime: i.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
         mmsi: t,
         usertoken: this.token
       }
-    }, v = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", m = await B.get(v, y).json();
-    p == null || p.info("[%s] fetch trajectory from: %s - %j", s.requestId, v, y);
+    }, w = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", m = await B.get(w, y).json();
+    p == null || p.info("[%s] fetch trajectory from: %s - %j", s.requestId, w, y);
     let F;
     m && (F = ((f = (c = m.ships) == null ? void 0 : c.offors) == null ? void 0 : f.ship) || [], F.length || p == null || p.warn("[%s] fetch trajectory failed: %j", s.requestId, m));
     const x = [];
-    let w = -1;
+    let v = -1;
     const b = g(`${(l = F == null ? void 0 : F[0]) == null ? void 0 : l.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     for (const u of F) {
       for (const P in u)
@@ -329,7 +329,7 @@ class Et extends et {
         method: "trajectory",
         vendor: "hifleet"
       }, E = Math.floor(I.diff(b, "minute", !0) / (a || 1));
-      E !== w && (w = E, x.push(Y));
+      E !== v && (v = E, x.push(Y));
     }
     return x;
   }
@@ -341,19 +341,19 @@ class Nt extends et {
     this.token = t;
   }
   async realTimePosition(t, n = {}) {
-    const i = {
+    const r = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1
       }
-    }, a = "https://api.shipxy.com/apicall/GetSingleShip", o = await B.get(a, i).json();
-    if (p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, a, i), (o == null ? void 0 : o.status) !== 0)
+    }, a = "https://api.shipxy.com/apicall/GetSingleShip", o = await B.get(a, r).json();
+    if (p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, a, r), (o == null ? void 0 : o.status) !== 0)
       return o;
     const s = o.data[0];
     for (const y in s)
       !isNaN(s[y]) && Number(s[y]) !== 1 / 0 && (s[y] = Number(s[y]));
-    const { labelCn: d, labelEn: r } = await this.parseStatus(s.navistat), h = g.unix(s.lasttime);
+    const { labelCn: d, labelEn: i } = await this.parseStatus(s.navistat), h = g.unix(s.lasttime);
     return {
       mmsi: s.ShipID,
       name: s.name,
@@ -371,28 +371,28 @@ class Nt extends et {
       positionTime: s.lasttime,
       utc: h.utc().format(),
       status: s.navistat,
-      labelEn: r,
+      labelEn: i,
       labelCn: d,
       method: "position",
       vendor: "shipxy"
     };
   }
-  async trajectory(t, n, i, a, o = !0, s = {}) {
+  async trajectory(t, n, r, a, o = !0, s = {}) {
     var b;
-    const d = await this.realTimePosition(t, s), r = g(n), h = g(i), M = "https://api.shipxy.com/apicall/GetShipTrack", y = {
+    const d = await this.realTimePosition(t, s), i = g(n), h = g(r), M = "https://api.shipxy.com/apicall/GetShipTrack", y = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1,
         cut: 0,
-        btm: r.unix(),
+        btm: i.unix(),
         etm: h.unix()
       }
-    }, v = await B.get(M, y).json();
-    if (p == null || p.info("[%s] fetch trajectory from: %s - %j", s.requestId, M, y), (v == null ? void 0 : v.status) !== 0)
-      return v;
-    const m = v == null ? void 0 : v.points, F = [], x = g.unix((b = m[0]) == null ? void 0 : b.utc);
-    let w = -1;
+    }, w = await B.get(M, y).json();
+    if (p == null || p.info("[%s] fetch trajectory from: %s - %j", s.requestId, M, y), (w == null ? void 0 : w.status) !== 0)
+      return w;
+    const m = w == null ? void 0 : w.points, F = [], x = g.unix((b = m[0]) == null ? void 0 : b.utc);
+    let v = -1;
     for (const c of m) {
       const f = g.unix(c.utc), l = {
         imo: d == null ? void 0 : d.imo,
@@ -406,7 +406,7 @@ class Nt extends et {
         method: "trajectory",
         vendor: "shipxy"
       }, u = Math.floor(f.diff(x, "minute", !0) / (a || 1));
-      u !== w && (w = u, F.push(l));
+      u !== v && (v = u, F.push(l));
     }
     return F;
   }
@@ -418,26 +418,26 @@ class Tt extends et {
     this.token = t;
   }
   async getShipId(t, n = {}) {
-    const i = {
+    const r = {
       headers: {
         appKey: this.token
       },
       json: {
         mmsiList: t
       }
-    }, a = "https://api3.myships.com/sp/ships/getShipIdByMMSI", o = await B.post(a, i).json();
-    return p == null || p.info("[%s] fetch ship id from: %s - %j", n.requestId, a, i), o.code !== "0" ? o : o.data[0].shipId;
+    }, a = "https://api3.myships.com/sp/ships/getShipIdByMMSI", o = await B.post(a, r).json();
+    return p == null || p.info("[%s] fetch ship id from: %s - %j", n.requestId, a, r), o.code !== "0" ? o : o.data[0].shipId;
   }
   async getShipInfo(t, n = {}) {
-    const i = {
+    const r = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: t
       }
-    }, a = "https://api3.myships.com/sp/ships/aissta", o = await B.post(a, i).json();
-    if (p == null || p.info("[%s] fetch ship info from: %s - %j", n.requestId, a, i), o.code !== "0")
+    }, a = "https://api3.myships.com/sp/ships/aissta", o = await B.post(a, r).json();
+    if (p == null || p.info("[%s] fetch ship info from: %s - %j", n.requestId, a, r), o.code !== "0")
       return o;
     const s = o.data;
     let d = s.imo;
@@ -452,44 +452,44 @@ class Tt extends et {
     };
   }
   async realTimePosition(t, n = {}) {
-    const i = await this.getShipId(t, n), a = await this.getShipInfo(i, n), o = {
+    const r = await this.getShipId(t, n), a = await this.getShipInfo(r, n), o = {
       headers: {
         appKey: this.token
       },
       json: {
-        shipId: i
+        shipId: r
       }
     }, s = "https://api3.myships.com/sp/ships/position/latest", d = await B.post(s, o).json();
     p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, s, o);
-    const r = d.data[0];
-    for (const m in r)
-      !isNaN(r[m]) && Number(r[m]) !== 1 / 0 && (r[m] = Number(r[m]));
-    const { labelCn: h, labelEn: M } = await this.parseStatus(r.aisNavStatus), y = g.unix(r.posTime);
+    const i = d.data[0];
+    for (const m in i)
+      !isNaN(i[m]) && Number(i[m]) !== 1 / 0 && (i[m] = Number(i[m]));
+    const { labelCn: h, labelEn: M } = await this.parseStatus(i.aisNavStatus), y = g.unix(i.posTime);
     return {
       ...a,
       mmsi: t,
-      lat: Math.round(r.lat / 1e4 / 60 * 1e5) / 1e5,
-      lng: Math.round(r.lon / 1e4 / 60 * 1e5) / 1e5,
-      sog: Math.round(r.sog / 10 * 100) / 100,
-      cog: Math.round(r.cog / 10 * 100) / 100,
-      hdg: Math.round(r.heading * 100) / 100,
-      rot: Math.round(r.rot * 100) / 100,
-      positionTime: r.posTime,
+      lat: Math.round(i.lat / 1e4 / 60 * 1e5) / 1e5,
+      lng: Math.round(i.lon / 1e4 / 60 * 1e5) / 1e5,
+      sog: Math.round(i.sog / 10 * 100) / 100,
+      cog: Math.round(i.cog / 10 * 100) / 100,
+      hdg: Math.round(i.heading * 100) / 100,
+      rot: Math.round(i.rot * 100) / 100,
+      positionTime: i.posTime,
       utc: y.utc().format(),
-      status: r.aisNavStatus,
+      status: i.aisNavStatus,
       labelEn: M,
       labelCn: h,
       method: "position",
       vendor: "myship"
     };
   }
-  async trajectory(t, n, i, a, o = !0, s = {}) {
-    const d = g(n), r = g(i), h = await this.getShipId(t), M = await this.getShipInfo(h), y = [];
-    for (; r.diff(d, "day", !0) > 30; )
+  async trajectory(t, n, r, a, o = !0, s = {}) {
+    const d = g(n), i = g(r), h = await this.getShipId(t), M = await this.getShipInfo(h), y = [];
+    for (; i.diff(d, "day", !0) > 30; )
       await this.trajectoryIn30Day(h, d.unix(), d.add(30, "day").unix(), M, t, a, y);
-    return await this.trajectoryIn30Day(h, d.unix(), r.unix(), M, t, a, y), y;
+    return await this.trajectoryIn30Day(h, d.unix(), i.unix(), M, t, a, y), y;
   }
-  async trajectoryIn30Day(t, n, i, a, o, s, d, r = {}) {
+  async trajectoryIn30Day(t, n, r, a, o, s, d, i = {}) {
     var x;
     const h = {
       headers: {
@@ -498,26 +498,26 @@ class Tt extends et {
       json: {
         shipId: t,
         startTime: n,
-        endTime: i
+        endTime: r
       }
     }, M = "https://api3.myships.com/sp/ships/position/history", y = await B.post(M, h).json();
-    if (p == null || p.info("[%s] fetch trajectory from: %s - %j", r.requestId, M, h), y.code !== "0")
-      return p == null || p.warn("[%s] invoke myship trajectory failed: %j", r.requestId, y), y;
-    const v = y.data;
-    for (const w in v)
-      !isNaN(v[w]) && Number(v[w]) !== 1 / 0 && (v[w] = Number(v[w]));
-    const m = g.unix((x = v[0]) == null ? void 0 : x.posTime);
+    if (p == null || p.info("[%s] fetch trajectory from: %s - %j", i.requestId, M, h), y.code !== "0")
+      return p == null || p.warn("[%s] invoke myship trajectory failed: %j", i.requestId, y), y;
+    const w = y.data;
+    for (const v in w)
+      !isNaN(w[v]) && Number(w[v]) !== 1 / 0 && (w[v] = Number(w[v]));
+    const m = g.unix((x = w[0]) == null ? void 0 : x.posTime);
     let F = -1;
-    for (const w of v) {
-      const b = g.unix(w.posTime), c = {
+    for (const v of w) {
+      const b = g.unix(v.posTime), c = {
         imo: a == null ? void 0 : a.imo,
         mmsi: o,
-        lat: Math.round(w.lat / 1e4 / 60 * 1e5) / 1e5,
-        lng: Math.round(w.lon / 1e4 / 60 * 1e5) / 1e5,
-        sog: Math.round(w.sog / 10 * 100) / 100,
-        cog: Math.round(w.cog / 10 * 100) / 100,
-        hdg: Math.round(w.heading * 100) / 100,
-        rot: Math.round(w.rot * 100) / 100,
+        lat: Math.round(v.lat / 1e4 / 60 * 1e5) / 1e5,
+        lng: Math.round(v.lon / 1e4 / 60 * 1e5) / 1e5,
+        sog: Math.round(v.sog / 10 * 100) / 100,
+        cog: Math.round(v.cog / 10 * 100) / 100,
+        hdg: Math.round(v.heading * 100) / 100,
+        rot: Math.round(v.rot * 100) / 100,
         positionTime: b.unix(),
         utc: b.utc().format(),
         method: "trajectory",
@@ -530,7 +530,7 @@ class Tt extends et {
 }
 let _;
 try {
-  _ = it.getLogger("vessel");
+  _ = rt.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -545,18 +545,18 @@ class Mt {
    * @param options
    */
   parsePrinciple(e, t = {}) {
-    var s, d, r;
+    var s, d, i;
     _ == null || _.info("[%s] parse rule: %s", t.requestId, e);
-    const n = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = e.match(n) ? (s = e.match(n)) == null ? void 0 : s[0] : void 0, a = i == null ? void 0 : i.split(";");
+    const n = new RegExp("(?<=\\[)(.+)(?=])", "g"), r = e.match(n) ? (s = e.match(n)) == null ? void 0 : s[0] : void 0, a = r == null ? void 0 : r.split(";");
     if (!a)
       return;
     const o = {};
     for (let h = 0; h < (a == null ? void 0 : a.length); h++) {
-      const M = (r = (d = a[h].match(n)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
+      const M = (i = (d = a[h].match(n)) == null ? void 0 : d[0]) == null ? void 0 : i.split("],");
       if (h === 0 && !M)
         o.scope = a[0];
       else if (M)
-        for (let y = 0, v = M.length; y < v; y++) {
+        for (let y = 0, w = M.length; y < w; y++) {
           const m = this.parseRule(M[y]);
           m && (o[m.level] ? m.key ? o[m.level][m == null ? void 0 : m.key] = m : o[m.level] = m : m.key ? o[m.level] = { [m == null ? void 0 : m.key]: m } : o[m.level] = m);
         }
@@ -572,7 +572,7 @@ class Mt {
   parseRule(e, t = {}) {
     var o;
     _ == null || _.info("[%s] parse rule: %s", t.requestId, e), e = e.startsWith("[") ? e : `[${e}`, e = e.endsWith("]") ? e : `${e}]`;
-    const n = new RegExp("(?<=\\[)(.+?)(?=])", "g"), i = (o = e == null ? void 0 : e.match(n)) == null ? void 0 : o[0], a = i == null ? void 0 : i.split(",");
+    const n = new RegExp("(?<=\\[)(.+?)(?=])", "g"), r = (o = e == null ? void 0 : e.match(n)) == null ? void 0 : o[0], a = r == null ? void 0 : r.split(",");
     if (a)
       return {
         operator: a[0],
@@ -589,25 +589,25 @@ class Mt {
    * @param options
    */
   checkWeather(e, t, n = {}) {
-    var m, F, x, w, b, c, f, l, u, I, S, D, Y, E, P;
-    let i = 0, a = 0, o = 0, s = 0;
-    const d = Math.round(((F = (m = t == null ? void 0 : t.SEVERE) == null ? void 0 : m.sigWave) == null ? void 0 : F.number) * 1.6 * 100) / 100, r = (w = (x = t == null ? void 0 : t.SEVERE) == null ? void 0 : x.sigWave) == null ? void 0 : w.number, h = (c = (b = t == null ? void 0 : t.HEAVY) == null ? void 0 : b.sigWave) == null ? void 0 : c.number, M = Math.round((((l = (f = t == null ? void 0 : t.SEVERE) == null ? void 0 : f.wind) == null ? void 0 : l.number) + 2) * 100) / 100, y = (I = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : I.number, v = (D = (S = t == null ? void 0 : t.HEAVY) == null ? void 0 : S.wind) == null ? void 0 : D.number;
+    var m, F, x, v, b, c, f, l, u, I, S, D, Y, E, P;
+    let r = 0, a = 0, o = 0, s = 0;
+    const d = Math.round(((F = (m = t == null ? void 0 : t.SEVERE) == null ? void 0 : m.sigWave) == null ? void 0 : F.number) * 1.6 * 100) / 100, i = (v = (x = t == null ? void 0 : t.SEVERE) == null ? void 0 : x.sigWave) == null ? void 0 : v.number, h = (c = (b = t == null ? void 0 : t.HEAVY) == null ? void 0 : b.sigWave) == null ? void 0 : c.number, M = Math.round((((l = (f = t == null ? void 0 : t.SEVERE) == null ? void 0 : f.wind) == null ? void 0 : l.number) + 2) * 100) / 100, y = (I = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : I.number, w = (D = (S = t == null ? void 0 : t.HEAVY) == null ? void 0 : S.wind) == null ? void 0 : D.number;
     for (let T = 0; T < (e == null ? void 0 : e.length); T++) {
       const N = e[T], A = (E = (Y = N == null ? void 0 : N.meteo) == null ? void 0 : Y.wave) == null ? void 0 : E.sig, R = (P = N == null ? void 0 : N.meteo) == null ? void 0 : P.wind, K = T ? g(N.eta).diff(g(e[T - 1].eta), "hour", !0) : 0;
-      s = K > s ? K : s, _ == null || _.info("[%s] check sig.wave: %j", n.requestId, { ...A, dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: h }), (A == null ? void 0 : A.height) >= d ? N.isDangerous = !0 : (A == null ? void 0 : A.height) >= r ? N.isSevere = !0 : (A == null ? void 0 : A.height) >= h && (N.isHeavy = !0), _ == null || _.info("[%s] check wind: %j", n.requestId, { ...R, dgThd4Wd: M, svThd4Wd: y, hvThd4Wd: v }), (R == null ? void 0 : R.scale) >= M ? (N.isDangerous = !0, delete N.isSevere, delete N.isHeavy) : (R == null ? void 0 : R.scale) > y ? (N.isDangerous || (N.isSevere = !0), delete N.isHeavy) : (R == null ? void 0 : R.scale) === v && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), i += N.isDangerous ? K : 0, a += N.isSevere ? K : 0, o += N.isHeavy ? K : 0;
+      s = K > s ? K : s, _ == null || _.info("[%s] check sig.wave: %j", n.requestId, { ...A, dgThd4Wv: d, svThd4Wv: i, hvThd4Wv: h }), (A == null ? void 0 : A.height) >= d ? N.isDangerous = !0 : (A == null ? void 0 : A.height) >= i ? N.isSevere = !0 : (A == null ? void 0 : A.height) >= h && (N.isHeavy = !0), _ == null || _.info("[%s] check wind: %j", n.requestId, { ...R, dgThd4Wd: M, svThd4Wd: y, hvThd4Wd: w }), (R == null ? void 0 : R.scale) >= M ? (N.isDangerous = !0, delete N.isSevere, delete N.isHeavy) : (R == null ? void 0 : R.scale) > y ? (N.isDangerous || (N.isSevere = !0), delete N.isHeavy) : (R == null ? void 0 : R.scale) === w && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), r += N.isDangerous ? K : 0, a += N.isSevere ? K : 0, o += N.isHeavy ? K : 0;
     }
-    return i = Math.round(i * 100) / 100, a = Math.round(a * 100) / 100, o = Math.round(o * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: a, heavy: o, step: s < 3 ? 3 : s, wind: { dgThd4Wd: M, svThd4Wd: y, hvThd4Wd: v }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: h } };
+    return r = Math.round(r * 100) / 100, a = Math.round(a * 100) / 100, o = Math.round(o * 100) / 100, s = Math.round(s), { sample: e, dangerous: r, severe: a, heavy: o, step: s < 3 ? 3 : s, wind: { dgThd4Wd: M, svThd4Wd: y, hvThd4Wd: w }, sig: { dgThd4Wv: d, svThd4Wv: i, hvThd4Wv: h } };
   }
 }
 const Dt = new Mt();
 let k;
 try {
-  k = it.getLogger("vessel");
+  k = rt.getLogger("vessel");
 } catch {
 } finally {
 }
 const gt = new ft("", !0);
-var bt = /* @__PURE__ */ ((j) => (j.common = "common", j.container = "container", j.tugs = "tugs", j))(bt || {}), pt = /* @__PURE__ */ ((j) => (j.Ballast = "Ballast", j.Laden = "Laden", j))(pt || {}), vt = /* @__PURE__ */ ((j) => (j.Cp = "CP", j.Perf = "Basis", j.Instruct = "Other", j))(vt || {});
+var bt = /* @__PURE__ */ ((j) => (j.common = "common", j.container = "container", j.tugs = "tugs", j))(bt || {}), pt = /* @__PURE__ */ ((j) => (j.Ballast = "Ballast", j.Laden = "Laden", j))(pt || {}), wt = /* @__PURE__ */ ((j) => (j.Cp = "CP", j.Perf = "Basis", j.Instruct = "Other", j))(wt || {});
 class O {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
@@ -621,8 +621,8 @@ class O {
    * @param draught 吃水 m
    * @return [0.55, 0.85]
    */
-  static blockCoefficient(e, t, n, i) {
-    let a = Math.round(e / (t * n * i) * 100) / 100;
+  static blockCoefficient(e, t, n, r) {
+    let a = Math.round(e / (t * n * r) * 100) / 100;
     a = a < 0.55 ? 0.55 : a > 0.85 ? 0.85 : a;
     const o = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], s = o.map((d) => Math.abs(d - a));
     return o[s.indexOf(Math.min(...s))];
@@ -639,8 +639,8 @@ class O {
    * @return [0.05, 0.30]
    */
   static froudeNumber(e, t, n = 9.8) {
-    let i = Math.round(Math.sqrt(e * e / (n * t)) * 100) / 100;
-    return i = i < 0.05 ? 0.05 : i > 0.3 ? 0.3 : i, i;
+    let r = Math.round(Math.sqrt(e * e / (n * t)) * 100) / 100;
+    return r = r < 0.05 ? 0.05 : r > 0.3 ? 0.3 : r, r;
   }
   /**
    * 失速修正系數
@@ -650,7 +650,7 @@ class O {
    * @private
    */
   static amendFactor(e, t, n) {
-    const i = {
+    const r = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
       0.65: [2.6, -3.7, -11.6],
@@ -668,7 +668,7 @@ class O {
       0.8: [3, -16.3, -21.6],
       0.85: [3.4, -20.9, 31.8]
     }[e];
-    return n === "Laden" && (o = i[e]), o[0] + o[1] * t + o[2] * Math.pow(t, 2);
+    return n === "Laden" && (o = r[e]), o[0] + o[1] * t + o[2] * Math.pow(t, 2);
   }
   /**
    * 失速方向因子
@@ -696,10 +696,10 @@ class O {
    * @param bn
    * @private
    */
-  static vesselTagFactor(e, t, n, i = 0) {
-    i = i > 6 ? i - 0.9 * (i - 6) : i;
+  static vesselTagFactor(e, t, n, r = 0) {
+    r = r > 6 ? r - 0.9 * (r - 6) : r;
     let a;
-    return n === "container" ? a = 0.7 * i + Math.pow(i, 6.5) / (22 * Math.pow(e, 2 / 3)) : t === "Ballast" ? a = 0.7 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(e, 2 / 3)) : a = 0.5 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(e, 2 / 3)), a;
+    return n === "container" ? a = 0.7 * r + Math.pow(r, 6.5) / (22 * Math.pow(e, 2 / 3)) : t === "Ballast" ? a = 0.7 * r + Math.pow(r, 6.5) / (2.7 * Math.pow(e, 2 / 3)) : a = 0.5 * r + Math.pow(r, 6.5) / (2.7 * Math.pow(e, 2 / 3)), a;
   }
   /**
    * 浪高影响因子
@@ -719,11 +719,11 @@ class O {
    * @param bearing 方位角
    * @private
    */
-  static assembleProperties(e, t, n, i) {
+  static assembleProperties(e, t, n, r) {
     var y;
-    const a = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, o = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, d = e.deadweight ?? 67035.7773, r = ((y = e == null ? void 0 : e.type) == null ? void 0 : y.toLowerCase()) || "common";
+    const a = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, o = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, d = e.deadweight ?? 67035.7773, i = ((y = e == null ? void 0 : e.type) == null ? void 0 : y.toLowerCase()) || "common";
     return {
-      tag: r.indexOf("container") > -1 ? "container" : r.indexOf("tugs") > -1 ? "tugs" : "common",
+      tag: i.indexOf("container") > -1 ? "container" : i.indexOf("tugs") > -1 ? "tugs" : "common",
       lbp: a,
       loadCondition: t,
       draught: o,
@@ -733,7 +733,7 @@ class O {
       displacement: Math.round((d / 1.025 + o * s * a * 0.7) * 1e4) / 1e4,
       // 换算为m/s
       speed: Math.round((n ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
-      bearing: i || 90
+      bearing: r || 90
     };
   }
   /**
@@ -746,8 +746,8 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam true 启用设置速度
    */
-  static async speedLoseAt(e, t, n, i = "", a = 2, o = !0, s = !1, d = {}) {
-    let r;
+  static async speedLoseAt(e, t, n, r = "", a = 2, o = !0, s = !1, d = {}) {
+    let i;
     if (t.velocity && s && (e.speed = J.roundPrecision(t.velocity * 1852 / 3600, 6)), o) {
       let h;
       if (d.meteo2)
@@ -758,25 +758,25 @@ class O {
           k.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: n.utc().format() }, m);
         }
       else
-        h = await mt.queryPointFactor(t.lng, t.lat, n.valueOf(), "wind,wave,current,watertemp", i, d);
-      const M = O.weatherFactor(e, h), y = O.currentFactor(e.bearing, h == null ? void 0 : h.current, a), v = Math.round((e.speed * 1.943844 + M + y) * 100) / 100;
-      r = {
+        h = await mt.queryPointFactor(t.lng, t.lat, n.valueOf(), "wind,wave,current,watertemp", r, d);
+      const M = O.weatherFactor(e, h), y = O.currentFactor(e.bearing, h == null ? void 0 : h.current, a), w = Math.round((e.speed * 1.943844 + M + y) * 100) / 100;
+      i = {
         meteo: { ...h },
         wxFactor: M,
         cFactor: y,
-        speed: t.velocity && s ? t.velocity : v < 0 ? 1 : v,
+        speed: t.velocity && s ? t.velocity : w < 0 ? 1 : w,
         eta: n.utc().format(),
         etd: n.utc().format()
       };
     } else
-      r = {
+      i = {
         wxFactor: 0,
         cFactor: 0,
         speed: t.velocity && s ? t.velocity : Math.round((e.speed * 1.943844 + 0 + 0) * 100) / 100,
         eta: n.utc().format(),
         etd: n.utc().format()
       };
-    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...r, ...t };
+    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...i, ...t };
   }
   /**
    * 基于步长计算失速样本
@@ -791,43 +791,43 @@ class O {
    * @param useRouteParam true 启用航线上设置的参数 { suspend: 停留时长（小时）, velocity: 速度（kts）}
    * @private
    */
-  static async speedLoseInHoursStep(e, t, n, i, a, o, s = "", d = !0, r = !1, h = {}) {
+  static async speedLoseInHoursStep(e, t, n, r, a, o, s = "", d = !0, i = !1, h = {}) {
     t.utc();
-    const M = t.clone().add(14, "days"), y = [], v = [];
-    let m = 0, F = 0, x, w;
+    const M = t.clone().add(14, "days"), y = [], w = [];
+    let m = 0, F = 0, x, v;
     for (let b = 0; b < o.length - 1; b++) {
       let c = o[b];
       c.distanceFromStart = Math.round((a + F) * 1e4) / 1e4;
       const f = o[b + 1];
-      if (e.bearing = W.calculateBearing(c, f, !f.gcToPrevious), c.bearing = e.bearing, c.suspend && r) {
+      if (e.bearing = W.calculateBearing(c, f, !f.gcToPrevious), c.bearing = e.bearing, c.suspend && i) {
         c.eta = c.eta || t.utc().format(), c.elapsed = c.elapsed ?? 0;
         const I = c.suspend - c.elapsed;
-        if (i - m > I)
-          i = i - m - I, t.add(I, "hour"), c.elapsed = c.suspend;
+        if (r - m > I)
+          r = r - m - I, t.add(I, "hour"), c.elapsed = c.suspend;
         else {
-          const S = i - m;
-          c.elapsed += S, t.add(S, "hour"), i = 0;
+          const S = r - m;
+          c.elapsed += S, t.add(S, "hour"), r = 0;
         }
-        if (k == null || k.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${i} hours need to go...`, h.requestId, c), i === 0)
-          return c.distanceFromPrevious = F, { etd: t, from: w || c, to: c, next: o.filter((S) => S), wps: y, days: v };
+        if (k == null || k.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${r} hours need to go...`, h.requestId, c), r === 0)
+          return c.distanceFromPrevious = F, { etd: t, from: v || c, to: c, next: o.filter((S) => S), wps: y, days: w };
       } else
         c.suspend = 0;
-      d = t.isAfter(M) ? !1 : d, c = await O.speedLoseAt(e, c, t, s, 0, d, r, h), w = w || c, c.important && y.push(c), t.isSameOrAfter(n) && (v.push(c), n.add(24, "hour"));
+      d = t.isAfter(M) ? !1 : d, c = await O.speedLoseAt(e, c, t, s, 0, d, i, h), v = v || c, c.important && y.push(c), t.isSameOrAfter(n) && (w.push(c), n.add(24, "hour"));
       const l = W.calculateDistance(c, f, !f.gcToPrevious);
-      let u = Math.round(l / w.speed * 1e5) / 1e5;
-      if (m + u < i) {
+      let u = Math.round(l / v.speed * 1e5) / 1e5;
+      if (m + u < r) {
         if (m += u, t.add(u, "hour"), delete o[b], k == null || k.debug(
           `[%s] go to %j from %j with ${l}nm, and cost ${u} hours`,
           h.requestId,
           { lat: f.lat, lng: f.lng },
-          { lat: w.lat, lng: w.lng, etd: w.etd }
+          { lat: v.lat, lng: v.lng, etd: v.etd }
         ), F += l, o.filter((I) => I).length <= 1) {
           x = f, x.eta = t.utc().format(), x.distanceFromPrevious = l, x.distanceFromStart = Math.round((a + F) * 1e4) / 1e4, y.push(x), delete o[b + 1];
           break;
         }
       } else {
-        u = i - m, t.add(u, "hour");
-        const I = J.roundPrecision(w.speed * u, 5);
+        u = r - m, t.add(u, "hour");
+        const I = J.roundPrecision(v.speed * u, 5);
         x = W.calculateCoordinate(c, e.bearing, I, "nauticalmiles", !f.gcToPrevious), x.eta = t.utc().format(), o[b] = x, k == null || k.debug(
           `[%s] go to %j from %j with ${I}nm, and cost ${u} hours`,
           h.requestId,
@@ -837,7 +837,7 @@ class O {
         break;
       }
     }
-    return { etd: t, from: w, to: x, next: o.filter((b) => b), wps: y, days: v };
+    return { etd: t, from: v, to: x, next: o.filter((b) => b), wps: y, days: w };
   }
   /**
    * 洋流影响因子
@@ -846,10 +846,10 @@ class O {
    * @param role  1: 船东, 2: 租家, 0: 未知
    */
   static currentFactor(e, t, n = 0) {
-    const i = (e - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
-    if (Math.abs(i) === Math.PI / 2)
+    const r = (e - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
+    if (Math.abs(r) === Math.PI / 2)
       return 0;
-    let a = ((t == null ? void 0 : t.kts) || 0) * Math.cos(i);
+    let a = ((t == null ? void 0 : t.kts) || 0) * Math.cos(r);
     return n & 2 ? a = Math.ceil(a * 100) / 100 : n & 1 ? a = Math.floor(a * 100) / 100 : a = Math.round(a * 100) / 100, Math.abs(a) > 5 ? 0 : a;
   }
   /**
@@ -858,16 +858,16 @@ class O {
    * @param wwc 气象要素
    */
   static weatherFactor(e, t) {
-    var M, y, v, m, F, x, w;
+    var M, y, w, m, F, x, v;
     k == null || k.debug("calculate weather factor via: %j", { ...e, ...t });
-    const n = O.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), i = O.froudeNumber(e.speed, e.lbp), a = O.amendFactor(n, i, e.loadCondition);
+    const n = O.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), r = O.froudeNumber(e.speed, e.lbp), a = O.amendFactor(n, r, e.loadCondition);
     let o = Math.abs(e.bearing % 360 - (((M = t == null ? void 0 : t.wind) == null ? void 0 : M.degree) % 360 || 0));
     o = o > 180 ? 360 - o : o;
-    const s = O.directionFactor(o, (y = t == null ? void 0 : t.wind) == null ? void 0 : y.scale), d = O.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (v = t == null ? void 0 : t.wind) == null ? void 0 : v.scale);
-    let r = s * a * d / 100 * e.speed;
-    r = Math.round(r * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(r) > 1 && (r = r / (Math.abs(Math.round(r)) + 1)), k == null || k.debug("wind wx factor = %d", r), o = Math.abs(e.bearing % 360 - (((F = (m = t == null ? void 0 : t.wave) == null ? void 0 : m.sig) == null ? void 0 : F.degree) % 360 || 0));
-    const h = O.waveHeightFactor(((w = (x = t == null ? void 0 : t.wave) == null ? void 0 : x.sig) == null ? void 0 : w.height) ?? 1, o);
-    return k == null || k.debug("wave wx factor = %d", h), r = r * 0.4 + h, k == null || k.debug("weather factor = %d", r), r = Math.abs(r) > 4 ? 4 * (Math.abs(r) / r) + Math.abs(r) / r * (Math.abs(r) - 4) * 0.1 : r, Math.round((r || 0) * 100) / 100;
+    const s = O.directionFactor(o, (y = t == null ? void 0 : t.wind) == null ? void 0 : y.scale), d = O.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (w = t == null ? void 0 : t.wind) == null ? void 0 : w.scale);
+    let i = s * a * d / 100 * e.speed;
+    i = Math.round(i * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(i) > 1 && (i = i / (Math.abs(Math.round(i)) + 1)), k == null || k.debug("wind wx factor = %d", i), o = Math.abs(e.bearing % 360 - (((F = (m = t == null ? void 0 : t.wave) == null ? void 0 : m.sig) == null ? void 0 : F.degree) % 360 || 0));
+    const h = O.waveHeightFactor(((v = (x = t == null ? void 0 : t.wave) == null ? void 0 : x.sig) == null ? void 0 : v.height) ?? 1, o);
+    return k == null || k.debug("wave wx factor = %d", h), i = i * 0.4 + h, k == null || k.debug("weather factor = %d", i), i = Math.abs(i) > 4 ? 4 * (Math.abs(i) / i) + Math.abs(i) / i * (Math.abs(i) - 4) * 0.1 : i, Math.round((i || 0) * 100) / 100;
   }
   /**
    * 全程失速分析(走完航程)
@@ -881,11 +881,11 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstant(e, t, n, i, a, o = "", s = 0, d = !0, r = !1, h = {}) {
+  static async analyseInstant(e, t, n, r, a, o = "", s = 0, d = !0, i = !1, h = {}) {
     var G, U, Q, X, Z, $;
     const M = g().valueOf();
     e.lng = J.convertToStdLng(e.lng);
-    const { route: y, waypoints: v } = a.points, m = W.calculateSubRoute(e, y);
+    const { route: y, waypoints: w } = a.points, m = W.calculateSubRoute(e, y);
     if (((G = m[0]) == null ? void 0 : G.length) <= 1)
       return;
     const { v0: F, label: x } = e.sog ? {
@@ -893,10 +893,10 @@ class O {
       label: "Other"
       /* Instruct */
     } : {
-      v0: i.speed,
+      v0: r.speed,
       label: "CP"
       /* Cp */
-    }, w = O.assembleProperties(n, i.loadCondition, F, 0), b = v.length ? W.calculateSubWaypoints(e, v) : [];
+    }, v = O.assembleProperties(n, r.loadCondition, F, 0), b = w.length ? W.calculateSubWaypoints(e, w) : [];
     b.forEach((q) => q.important = !0);
     const c = {
       from: { ...e },
@@ -909,13 +909,13 @@ class O {
       days: [],
       wps: []
     };
-    s || (W.calculateRouteDistance(m) / i.speed <= 72 ? s = 3 : s = 6);
+    s || (W.calculateRouteDistance(m) / r.speed <= 72 ? s = 3 : s = 6);
     let l = W.simplifyRouteToCoordinates(m, b, 0), u = 0, I = 0, S = 0, D = 0;
     t = g(t).utc();
     const Y = t.clone();
     for (; l.length > 0; ) {
       const q = s - t.hour() % s, V = Math.ceil(t.clone().add(q, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, C = await O.speedLoseInHoursStep(
-        w,
+        v,
         t,
         Y,
         V,
@@ -923,7 +923,7 @@ class O {
         l,
         o,
         d,
-        r,
+        i,
         h
       );
       (U = C.from) != null && U.speed && (f.hours.push(C.from), f.wps.push(...C.wps), f.days.push(...C.days)), l = C == null ? void 0 : C.next, l.length || f.hours.push(C == null ? void 0 : C.to), u += Math.round((((Q = C == null ? void 0 : C.to) == null ? void 0 : Q.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
@@ -945,7 +945,7 @@ class O {
     }), f.wps = (Z = f.wps) == null ? void 0 : Z.reduce((q, V) => (q.some((C) => Math.round(C.positionTime / 60) === Math.round(V.positionTime / 60)) || q.push(V), q), []), c.sample = f;
     const P = f.hours.at(0), T = f.hours.at(-1);
     c.distance = Math.round(T.distanceFromStart * 1e4) / 1e4, c.etd = g(P.eta).utc().format(), c.eta = g(T.eta).utc().format(), c.wxFactor = Math.round(I / D * 1e4) / 1e4, c.cFactor = Math.round(S / D * 1e4) / 1e4, c.avgSpeed = Math.round(T.distanceFromStart / D * 1e4) / 1e4, c.totalHrs = Math.round(D * 1e4) / 1e4;
-    const { distanceInECA: N, hoursInECA: A, totalDgoConsInECA: R, eca: K } = await this.calculateECA(c, i, h), st = J.roundPrecision(i.fo / 24 * (D - A), 3), at = J.roundPrecision(i.dgo / 24 * D, 3);
+    const { distanceInECA: N, hoursInECA: A, totalDgoConsInECA: R, eca: K } = await this.calculateECA(c, r, h), st = J.roundPrecision(r.fo / 24 * (D - A), 3), at = J.roundPrecision(r.dgo / 24 * D, 3);
     c.extend = {
       eca: K,
       distanceInECA: N,
@@ -968,9 +968,9 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstantWithThreshed(e, t, n, i, a, o, s, d = "", r = 3, h = !0, M = !1, y = {}) {
+  static async analyseInstantWithThreshed(e, t, n, r, a, o, s, d = "", i = 3, h = !0, M = !1, y = {}) {
     var Q, X, Z, $, q, V;
-    const v = g().valueOf();
+    const w = g().valueOf();
     e.lng = J.convertToStdLng(e.lng);
     const { v0: m, label: F } = e.sog ? {
       v0: e.sog,
@@ -980,12 +980,12 @@ class O {
       v0: a.speed,
       label: "CP"
       /* Cp */
-    }, x = O.assembleProperties(i, a.loadCondition, m, 0), w = W.calculateSubRoute(e, o);
-    if (((Q = w[0]) == null ? void 0 : Q.length) <= 1)
+    }, x = O.assembleProperties(r, a.loadCondition, m, 0), v = W.calculateSubRoute(e, o);
+    if (((Q = v[0]) == null ? void 0 : Q.length) <= 1)
       return;
     const b = s.length ? W.calculateSubWaypoints(e, s) : [];
     b.forEach((C) => C.important = !0);
-    let c = W.simplifyRouteToCoordinates(w, b, 0), f = 0, l = 0, u = 0, I = 0;
+    let c = W.simplifyRouteToCoordinates(v, b, 0), f = 0, l = 0, u = 0, I = 0;
     const S = {
       hours: [],
       wps: [],
@@ -994,7 +994,7 @@ class O {
     t = g(t).utc();
     const D = t.clone();
     for (; c.length > 0; ) {
-      const C = r - t.hour() % r;
+      const C = i - t.hour() % i;
       let L = Math.ceil(t.clone().add(C, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
       L = t.clone().add(L, "h").isSameOrAfter(n) ? n.diff(t, "h", !0) * 1e4 / 1e4 : L;
       const H = await O.speedLoseInHoursStep(x, t, D, L, f, c, d, h, M, y);
@@ -1015,7 +1015,7 @@ class O {
       const L = g(Y[C + 1].eta).diff(Y[C].etd, "hour", !0);
       l += Y[C].wxFactor * L, u += Y[C].cFactor * L, I += L;
     }
-    const E = S.hours.at(0), P = S.hours.at(-1), T = await W.calculateRangeRoute(E, P, w), N = await W.calculateRangeWaypoints(E, P, w, b), A = {
+    const E = S.hours.at(0), P = S.hours.at(-1), T = await W.calculateRangeRoute(E, P, v), N = await W.calculateRangeWaypoints(E, P, v, b), A = {
       sample: S,
       distance: Math.round(((P == null ? void 0 : P.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
@@ -1031,14 +1031,14 @@ class O {
       waypoints: N,
       v0: m,
       label: F
-    }, { distanceInECA: R, hoursInECA: K, totalDgoConsInECA: st, eca: at } = await this.calculateECA(A, a, y), rt = J.roundPrecision(a.fo / 24 * (I - K), 3), tt = J.roundPrecision(a.dgo / 24 * I, 3);
+    }, { distanceInECA: R, hoursInECA: K, totalDgoConsInECA: st, eca: at } = await this.calculateECA(A, a, y), it = J.roundPrecision(a.fo / 24 * (I - K), 3), tt = J.roundPrecision(a.dgo / 24 * I, 3);
     A.extend = {
       eca: at,
       distanceInECA: R,
       hoursInECA: K,
       totalDgoConsInECA: st
-    }, A.totalDgoCons = tt, A.totalFoCons = rt;
-    const G = g().valueOf() - v, U = ((V = S == null ? void 0 : S.hours) == null ? void 0 : V.length) || 1;
+    }, A.totalDgoCons = tt, A.totalFoCons = it;
+    const G = g().valueOf() - w, U = ((V = S == null ? void 0 : S.hours) == null ? void 0 : V.length) || 1;
     return k == null || k.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", y == null ? void 0 : y.requestId, G, U, Math.round(G / U * 1e3) / 1e3), A;
   }
   /**
@@ -1056,20 +1056,20 @@ class O {
    * @param lane 基础航线（重要转向点）
    * @param options
    */
-  static async analyseCost(e, t, n, i, a = {}) {
-    var w, b;
+  static async analyseCost(e, t, n, r, a = {}) {
+    var v, b;
     const o = g().valueOf(), s = [];
     a.meteo2 = a.meteo2 || !0, e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
-    const d = W.calculateRouteDistance(i.route);
-    let r = 0;
+    const d = W.calculateRouteDistance(r.route);
+    let i = 0;
     n.forEach((c) => {
       const f = Math.ceil(d / c.speed / 24);
-      r = r < f ? f : r;
-    }), r = r * 1.3;
-    const h = g.utc(e.etd).add(r ?? 14, "day");
+      i = i < f ? f : i;
+    }), i = i * 1.3;
+    const h = g.utc(e.etd).add(i ?? 14, "day");
     let M = 1;
     for (const c of n) {
-      const f = JSON.parse(JSON.stringify(i.route)), l = JSON.parse(JSON.stringify(i.waypoints)), u = await O.analyseInstantWithThreshed(
+      const f = JSON.parse(JSON.stringify(r.route)), l = JSON.parse(JSON.stringify(r.waypoints)), u = await O.analyseInstantWithThreshed(
         { lat: e.lat, lng: e.lng },
         e.etd,
         h,
@@ -1093,14 +1093,14 @@ class O {
       })), M++;
     }
     s.sort((c, f) => c.cost.total - f.cost.total);
-    const y = s.at(0), v = s.at(1), m = [];
-    if (m.push({ combined: !1, speeds: [y], cost: (w = y.cost) == null ? void 0 : w.total }), v) {
-      const c = y.cost.cp, f = v.cost.cp, l = g(y.eta), u = g(y.etd), I = l.diff(u, "days", !0);
+    const y = s.at(0), w = s.at(1), m = [];
+    if (m.push({ combined: !1, speeds: [y], cost: (v = y.cost) == null ? void 0 : v.total }), w) {
+      const c = y.cost.cp, f = w.cost.cp, l = g(y.eta), u = g(y.etd), I = l.diff(u, "days", !0);
       let S = Math.ceil(I / 2);
       S = S > 7 ? 7 : S < e.alterStep ? e.alterStep : S;
-      let D = 2, Y = { combined: !1, speeds: [v], cost: (b = v.cost) == null ? void 0 : b.total }, E;
+      let D = 2, Y = { combined: !1, speeds: [w], cost: (b = w.cost) == null ? void 0 : b.total }, E;
       for (; S >= e.alterStep; ) {
-        const P = await O.combinedAnalyse(e, t, h, [c, f], i, S, { ...a, level: D });
+        const P = await O.combinedAnalyse(e, t, h, [c, f], r, S, { ...a, level: D });
         if (Y.cost > P.cost ? E ? (E == null ? void 0 : E.cost) > P.cost && (E = P) : (E = Y, Y = P) : (!E || (E == null ? void 0 : E.cost) > P.cost) && (E = P), S <= e.alterStep)
           break;
         S = Math.ceil(S / 2), D += 1;
@@ -1120,24 +1120,24 @@ class O {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async combinedAnalyse(e, t, n, i, a, o, s = {}) {
+  static async combinedAnalyse(e, t, n, r, a, o, s = {}) {
     s.counter = 1, k == null || k.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, o);
-    const d = await O.alternateAnalyse(e, t, n, i, 0, a, o, s), r = d.reduce((f, l) => f + l.cost.total, 0), h = d.reduce((f, l) => f + l.cost.hire, 0), M = d.reduce((f, l) => f + l.cost.bunker, 0), y = d.reduce((f, l) => f + l.distance, 0), v = d.reduce((f, l) => f + l.totalHrs, 0);
+    const d = await O.alternateAnalyse(e, t, n, r, 0, a, o, s), i = d.reduce((f, l) => f + l.cost.total, 0), h = d.reduce((f, l) => f + l.cost.hire, 0), M = d.reduce((f, l) => f + l.cost.bunker, 0), y = d.reduce((f, l) => f + l.distance, 0), w = d.reduce((f, l) => f + l.totalHrs, 0);
     k == null || k.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
-      cost: r,
+      cost: i,
       hire: h,
       bunker: M,
       distance: y,
-      hours: v
+      hours: w
     });
-    const m = await O.alternateAnalyse(e, t, n, i, 1, a, o, s), F = m.reduce((f, l) => f + l.cost.total, 0), x = m.reduce((f, l) => f + l.cost.hire, 0), w = m.reduce((f, l) => f + l.cost.bunker, 0), b = m.reduce((f, l) => f + l.distance, 0), c = m.reduce((f, l) => f + l.totalHrs, 0);
+    const m = await O.alternateAnalyse(e, t, n, r, 1, a, o, s), F = m.reduce((f, l) => f + l.cost.total, 0), x = m.reduce((f, l) => f + l.cost.hire, 0), v = m.reduce((f, l) => f + l.cost.bunker, 0), b = m.reduce((f, l) => f + l.distance, 0), c = m.reduce((f, l) => f + l.totalHrs, 0);
     return k == null || k.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
       cost: F,
       hire: x,
-      bunker: w,
+      bunker: v,
       distance: b,
       hours: c
-    }), r < F ? { combined: !0, cost: Math.round(r * 1e3) / 1e3, speeds: d, step: o } : { combined: !0, cost: Math.round(F * 1e3) / 1e3, speeds: m, step: o };
+    }), i < F ? { combined: !0, cost: Math.round(i * 1e3) / 1e3, speeds: d, step: o } : { combined: !0, cost: Math.round(F * 1e3) / 1e3, speeds: m, step: o };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1150,17 +1150,17 @@ class O {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async alternateAnalyse(e, t, n, i, a, o, s, d = {}) {
-    var y, v;
-    let r = g.utc(e.etd);
+  static async alternateAnalyse(e, t, n, r, a, o, s, d = {}) {
+    var y, w;
+    let i = g.utc(e.etd);
     const h = { lat: e.lat, lng: e.lng }, M = [];
-    for (; r.isBefore(n); ) {
-      const m = r.clone().utc().add(s, "day"), F = JSON.parse(JSON.stringify(o.route)), x = JSON.parse(JSON.stringify(o.waypoints)), w = i[a], b = await O.analyseInstantWithThreshed(
+    for (; i.isBefore(n); ) {
+      const m = i.clone().utc().add(s, "day"), F = JSON.parse(JSON.stringify(o.route)), x = JSON.parse(JSON.stringify(o.waypoints)), v = r[a], b = await O.analyseInstantWithThreshed(
         h,
-        r.utc().format(),
+        i.utc().format(),
         m,
         t,
-        w,
+        v,
         F,
         x,
         e.meteoVendor,
@@ -1169,12 +1169,12 @@ class O {
         e.useRouteParam,
         d
       );
-      b && (await O.calculateCost(b, w, e, d), k == null || k.info(
+      b && (await O.calculateCost(b, v, e, d), k == null || k.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
         d.requestId,
         d.level,
         d.counter,
-        r.utc().format(),
+        i.utc().format(),
         m.utc().format(),
         {
           cost: b.cost.total,
@@ -1182,12 +1182,12 @@ class O {
           bunker: b.cost.bunker,
           distance: b.distance,
           hours: b.totalHrs,
-          cp: `${w.speed}/${w.fo}/${w.dgo}`
+          cp: `${v.speed}/${v.fo}/${v.dgo}`
         }
       )), d.counter = d.counter + 1;
-      const c = (v = (y = b == null ? void 0 : b.sample) == null ? void 0 : y.hours) == null ? void 0 : v.at(-1);
+      const c = (w = (y = b == null ? void 0 : b.sample) == null ? void 0 : y.hours) == null ? void 0 : w.at(-1);
       if (c)
-        h.lat = c.lat, h.lng = c.lng, r = g(c.eta), M.push(b), a = a ? 0 : 1;
+        h.lat = c.lat, h.lng = c.lng, i = g(c.eta), M.push(b), a = a ? 0 : 1;
       else
         break;
     }
@@ -1200,7 +1200,7 @@ class O {
    * @param props
    * @param options
    */
-  static async calculateCost(e, t, n, i = {}) {
+  static async calculateCost(e, t, n, r = {}) {
     var a;
     if (e) {
       const o = Math.round(e.totalHrs / 24 * (n.dailyHire || 0) * (1 - (n.addComm || 0)) * 1e3) / 1e3, s = Math.round(e.totalFoCons * (n.priceFO || 0) * 1e3) / 1e3, d = Math.round((e.totalDgoCons + (((a = e.extend) == null ? void 0 : a.totalDgoConsInECA) || 0)) * (n.priceDGO || 0) * 1e3) / 1e3;
@@ -1217,22 +1217,22 @@ class O {
    * 计算单cp模式下的ECA属性
    */
   static async calculateECA(e, t, n = {}) {
-    var d, r;
-    const i = await W.intersectInECA(e.route);
+    var d, i;
+    const r = await W.intersectInECA(e.route);
     let a = 0, o = 0, s = 0;
     e.sample.wps.forEach((h) => {
       h.positionTime = g.utc(h.etd || h.eta).unix();
     });
-    for (const h of i) {
+    for (const h of r) {
       a += h.distance;
-      const M = await W.deadReckoningTime((d = h.waypoints) == null ? void 0 : d.at(0), e.sample.wps), y = await W.deadReckoningTime((r = h.waypoints) == null ? void 0 : r.at(-1), e.sample.wps);
+      const M = await W.deadReckoningTime((d = h.waypoints) == null ? void 0 : d.at(0), e.sample.wps), y = await W.deadReckoningTime((i = h.waypoints) == null ? void 0 : i.at(-1), e.sample.wps);
       h.in = M, h.out = y, h.totalHrs = J.roundPrecision((y.positionTime - M.positionTime) / 3600, 2), h.totalDgoCons = J.roundPrecision(t.fo / 24 * h.totalHrs, 3), o += h.totalHrs, s += h.totalDgoCons;
     }
     return a = J.roundPrecision(a, 3), o = J.roundPrecision(o, 3), s = J.roundPrecision(s, 3), {
       distanceInECA: a,
       hoursInECA: o,
       totalDgoConsInECA: s,
-      eca: i
+      eca: r
     };
   }
   /**
@@ -1246,7 +1246,7 @@ class O {
       hours: [],
       wps: [],
       days: []
-    }, i = e.reduce((l, u) => l + u.distance, 0), a = e.reduce((l, u) => {
+    }, r = e.reduce((l, u) => l + u.distance, 0), a = e.reduce((l, u) => {
       var I;
       return l + (((I = u.extend) == null ? void 0 : I.distanceInECA) || 0);
     }, 0), o = e.reduce((l, u) => l + u.totalHrs, 0), s = e.reduce((l, u) => {
@@ -1255,10 +1255,10 @@ class O {
     }, 0), d = e.reduce((l, u) => {
       var I;
       return l + (((I = u.extend) == null ? void 0 : I.totalDgoConsInECA) || 0);
-    }, 0), r = e.reduce((l, u) => l + u.wxFactor * u.totalHrs / o, 0), h = e.reduce((l, u) => l + u.cFactor * u.totalHrs / o, 0), M = e.reduce((l, u) => l + u.totalFoCons, 0), y = e.reduce((l, u) => l + u.totalDgoCons, 0), v = e.reduce((l, u) => l + u.cost.total, 0), m = e.reduce((l, u) => l + u.cost.hire, 0), F = e.reduce((l, u) => l + u.cost.bunker, 0), x = [], w = [];
+    }, 0), i = e.reduce((l, u) => l + u.wxFactor * u.totalHrs / o, 0), h = e.reduce((l, u) => l + u.cFactor * u.totalHrs / o, 0), M = e.reduce((l, u) => l + u.totalFoCons, 0), y = e.reduce((l, u) => l + u.totalDgoCons, 0), w = e.reduce((l, u) => l + u.cost.total, 0), m = e.reduce((l, u) => l + u.cost.hire, 0), F = e.reduce((l, u) => l + u.cost.bunker, 0), x = [], v = [];
     let b;
     for (const l of e) {
-      w.push(...((c = l.extend) == null ? void 0 : c.eca) || []);
+      v.push(...((c = l.extend) == null ? void 0 : c.eca) || []);
       const u = l.sample.hours, I = l.sample.wps, S = l.sample.days, D = u.at(0);
       b && (D.distanceFromPrevious = b.distanceFromPrevious, D.distanceFromStart = b.distanceFromStart, u.forEach((T, N) => {
         N && (T.distanceFromStart = T.distanceFromStart + b.distanceFromStart);
@@ -1299,21 +1299,21 @@ class O {
       to: e.at(-1).to,
       v0: e.at(0).v0,
       label: "Combined",
-      distance: Math.round(i * 1e4) / 1e4,
+      distance: Math.round(r * 1e4) / 1e4,
       totalHrs: Math.round(o * 1e3) / 1e3,
-      avgSpeed: Math.round(i / o * 1e3) / 1e3,
-      wxFactor: Math.round(r * 1e3) / 1e3,
+      avgSpeed: Math.round(r / o * 1e3) / 1e3,
+      wxFactor: Math.round(i * 1e3) / 1e3,
       cFactor: Math.round(h * 1e3) / 1e3,
       totalFoCons: Math.round(M * 1e3) / 1e3,
       totalDgoCons: Math.round(y * 1e3) / 1e3,
       cost: {
-        total: Math.round(v * 1e3) / 1e3,
+        total: Math.round(w * 1e3) / 1e3,
         hire: Math.round(m * 1e3) / 1e3,
         bunker: Math.round(F * 1e3) / 1e3
       },
       extend: {
         cps: x,
-        eca: w,
+        eca: v,
         distanceInECA: Math.round(a * 1e4) / 1e4,
         hoursInECA: Math.round(s * 1e3) / 1e3,
         totalDgoConsInECA: Math.round(d * 1e3) / 1e3,
@@ -1332,7 +1332,7 @@ export {
   jt as MyVesselImpl,
   Nt as ShipxyImpl,
   O as SpeedHelper,
-  vt as SpeedLabel,
+  wt as SpeedLabel,
   bt as VesselTag,
   Dt as alertHelper
 };