@idm-plugin/vessel 2.2.9 → 2.3.1

package/dist/index.js

@@ -1,15 +1,15 @@
 var ht = Object.defineProperty;
-var lt = (x, t, e) => t in x ? ht(x, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : x[t] = e;
-var K = (x, t, e) => (lt(x, typeof t != "symbol" ? t + "" : t, e), e);
-import B from "got";
-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 } from "@idm-plugin/meteo2";
+var lt = (E, e, t) => e in E ? ht(E, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : E[e] = t;
+var U = (E, e, t) => (lt(E, typeof e != "symbol" ? e + "" : e, t), t);
+import L from "got";
+import ct from "@log4js-node/log4js-api";
+import w from "moment";
+import { LngLatHelper as _, LaneHelper as W } from "@idm-plugin/geo2";
+import { MeteoHelper2 as mt } from "@idm-plugin/meteo2";
 import { Meteo2Assist as it } from "@idm-plugin/meteo";
-let v;
+let M;
 try {
-  v = rt.getLogger("vessel");
+  M = ct.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -18,85 +18,182 @@ class st {
    * 解析AIS状态码
    * @param status
    */
-  parseStatus(t) {
-    let e, a;
-    switch (t) {
+  parseStatus(e) {
+    let t, a;
+    switch (e) {
       case 0:
-        e = "在航（主机推动）", a = "Underway Using Engine";
+        t = "在航（主机推动）", a = "Underway Using Engine";
         break;
       case 1:
-        e = "锚泊", a = "Anchored";
+        t = "锚泊", a = "Anchored";
         break;
       case 2:
-        e = "失控", a = "Not under command";
+        t = "失控", a = "Not under command";
         break;
       case 3:
-        e = "操纵受限", a = "Limited airworthiness";
+        t = "操纵受限", a = "Limited airworthiness";
         break;
       case 4:
-        e = "吃水受限", a = "Limited by ship's draft";
+        t = "吃水受限", a = "Limited by ship's draft";
         break;
       case 5:
-        e = "靠泊", a = "Mooring";
+        t = "靠泊", a = "Mooring";
         break;
       case 6:
-        e = "搁浅", a = "Stranded";
+        t = "搁浅", a = "Stranded";
         break;
       case 7:
-        e = "捕捞作业", a = "Engaged in fishing";
+        t = "捕捞作业", a = "Engaged in fishing";
         break;
       case 8:
-        e = "靠帆船提供动力", a = "Sailing";
+        t = "靠帆船提供动力", a = "Sailing";
         break;
       default:
-        e = "未定义", a = "Undefined";
+        t = "未定义", a = "Undefined";
     }
-    return { labelCn: e, labelEn: a };
+    return { labelCn: t, labelEn: a };
   }
 }
-class Et extends st {
-  constructor(e, a) {
+class jt extends st {
+  constructor(t, a) {
     super();
-    K(this, "clientId");
-    K(this, "clientSecret");
-    K(this, "token");
-    this.clientId = e, this.clientSecret = a;
+    U(this, "clientId");
+    U(this, "clientSecret");
+    U(this, "token");
+    this.clientId = t, this.clientSecret = a;
   }
-  async authToken(e = {}) {
+  async authToken(t = {}) {
     const a = "https://svc.data.myvessel.cn/ada/oauth/token", i = {
       searchParams: {
         client_id: this.clientId,
         client_secret: this.clientSecret,
         grant_type: "client_credentials"
       }
-    }, o = await B.post(a, i).json();
-    v == null || v.info("[%s] fetch access token from: %s - %j", e.requestId, a, o), o.error || (this.token = {
+    }, o = await L.post(a, i).json();
+    M == null || M.info("[%s] fetch access token from: %s - %j", t.requestId, a, o), o.error || (this.token = {
       accessToken: o.access_token,
       tokenType: o.token_type,
       expiresIn: o.expires_in,
       scope: o.scope,
       jti: o.jti,
-      issuedAt: g().utc().format()
+      issuedAt: w().utc().format()
     });
   }
-  async realTimePosition(e, a = {}) {
-    var d, r, m;
-    (!this.token || g().diff(g(this.token.issuedAt), "seconds") > ((d = this.token) == null ? void 0 : d.expiresIn) - 300) && await this.authToken(a);
+  async checkToken(t = {}) {
+    var a;
+    return (!this.token || w().diff(w(this.token.issuedAt), "seconds") > (((a = this.token) == null ? void 0 : a.expiresIn) || 0) - 300) && await this.authToken(t), this.token;
+  }
+  /**
+   * 模糊查询
+   * @param kw
+   * @param options
+   */
+  async suggest(t, a = {}) {
+    var s, r;
+    await this.checkToken(a);
+    const i = "https://market.myvessel.cn/sdc/v1/mkt/vessels/fuzzy", o = {
+      headers: {
+        Authorization: `${(s = this.token) == null ? void 0 : s.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
+      },
+      json: {
+        kw: t,
+        recordNum: a.ps || 10
+      }
+    };
+    M == null || M.info("[%s] fetch suggest vessels from: %s - %j", a.requestId, i, o);
+    const n = await L.post(i, o).json();
+    return n.code ? (M == null || M.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: n.message, status: n.status, code: n.code }), []) : n.data.map((u) => ({
+      mmsi: u.mmsi,
+      name: u.nameEn,
+      nameCn: u.nameCn,
+      imo: Number.isNaN(u.imo) ? null : Number(u.imo),
+      callSign: u.callsign,
+      type: u.vesselTypeNameEn,
+      flagName: u.flagCtry,
+      vendor: "myvessel",
+      raw: u
+    }));
+  }
+  /**
+   * imo/mmsi 精确查询
+   * @param imo
+   * @param options
+   */
+  async search(t, a = {}) {
+    var c, u;
+    await this.checkToken(a);
+    const i = /^\d{7}$/.test(t.toString()), o = i ? "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/imo" : "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/mmsi", n = i ? { imo: t } : { mmsi: t }, s = {
+      headers: {
+        Authorization: `${(c = this.token) == null ? void 0 : c.tokenType} ${(u = this.token) == null ? void 0 : u.accessToken}`
+      },
+      searchParams: n
+    };
+    M == null || M.info("[%s] fetch vessel from: %s - %j", a.requestId, o, s);
+    const r = await L.get(o, s).json();
+    if (r.status !== 200)
+      return M == null || M.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: r.message, status: r.status, code: r.code }), {};
+    {
+      const l = r.data;
+      if (l)
+        return {
+          mmsi: l.mmsi,
+          imo: Number.isNaN(l.imo) ? null : Number(l.imo),
+          callSign: l.callsign,
+          name: l.nameEn,
+          nameCn: l.nameCn,
+          type: l.vesselTypeNameEn,
+          flagName: l.flagCtry,
+          clasz: l.classSociety,
+          dateOfBuild: l.buildYearMonth,
+          deadweight: l.dwt,
+          grossTonnage: l.grt,
+          netTonnage: l.net,
+          teu: l.teu,
+          length: l.length,
+          breadth: l.width,
+          height: l.height,
+          draught: l.draught,
+          speed: l.speed,
+          passengerCapacity: l.passengercapacity,
+          vendor: "myvessel",
+          raw: l
+        };
+    }
+    return null;
+  }
+  async archives(t, a = {}) {
+    var s, r;
+    await this.checkToken(a);
+    const i = "https://svc.data.myvessel.cn/sdc/v1/ship/info/batch", o = {
+      headers: {
+        Authorization: `${(s = this.token) == null ? void 0 : s.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
+      },
+      json: {
+        mmsiList: typeof t == "number" ? [t] : t
+      }
+    };
+    M == null || M.info("[%s] fetch vessel archive from: %s - %j", a.requestId, i, o);
+    const n = await L.post(i, o).json();
+    return n.status !== 200 ? (M == null || M.warn("[%s] fetch vessel archive failed: %j", a.requestId, { message: n.message, status: n.status, code: n.code }), {}) : n.data;
+  }
+  async realTimePosition(t, a = {}) {
+    var r, c;
+    await this.checkToken(a);
     const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", o = {
       headers: {
-        Authorization: `${(r = this.token) == null ? void 0 : r.tokenType} ${(m = this.token) == null ? void 0 : m.accessToken}`
+        Authorization: `${(r = this.token) == null ? void 0 : r.tokenType} ${(c = this.token) == null ? void 0 : c.accessToken}`
       },
-      searchParams: { mmsi: e }
+      searchParams: { mmsi: t }
     };
-    v == null || v.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, o);
-    const n = await B.get(i, o).json();
+    M == null || M.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, o);
+    const n = await L.get(i, o).json();
     if (n.code)
-      return v == null || v.warn("[%s] fetch realtime position failed: %j", a.requestId, i, { message: n.message, status: n.status, code: n.code }), n;
+      return M == null || M.warn("[%s] fetch realtime position failed: %j", a.requestId, { message: n.message, status: n.status, code: n.code }), n;
     const s = n.data;
-    for (const M in s)
-      !isNaN(s[M]) && Number(s[M]) !== 1 / 0 && (s[M] = Number(s[M]));
+    for (const u in s)
+      !isNaN(s[u]) && Number(s[u]) !== 1 / 0 && (s[u] = Number(s[u]));
     if (s) {
-      const M = g(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      const u = w(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       return {
         mmsi: s.mmsi,
         name: s.vesselName || s.aisVesselName,
@@ -111,9 +208,9 @@ class Et extends st {
         cog: s.cog,
         hdg: s.hdg,
         rot: s.rot,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? g.utc(s.eta).format() : void 0,
+        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? w.utc(s.eta).format() : void 0,
         destination: s.dest,
-        positionTime: M.unix(),
+        positionTime: u.unix(),
         status: s.status,
         labelCn: s.statusNameCn,
         labelEn: s.statusNameEn,
@@ -126,83 +223,83 @@ class Et extends st {
         net: s.net,
         method: "position",
         vendor: "myVessel",
-        utc: M.utc().format()
+        utc: u.utc().format()
       };
     } else
       return {};
   }
-  async trajectory(e, a, i, o, n = !0, s = {}) {
-    (!this.token || g().diff(g(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
-    const d = await this.realTimePosition(e, s), r = g(a), m = g(i), M = [];
-    for (; m.diff(r, "day", !0) > 30; )
-      await this.trajectoryIn30Day(e, r, r.clone().add(30, "day"), d, o, M, s), r.add(30, "day");
-    return await this.trajectoryIn30Day(e, r, m, d, o, M, s), M;
+  async trajectory(t, a, i, o, n = !0, s = {}) {
+    await this.checkToken(s);
+    const r = await this.realTimePosition(t, s), c = w(a), u = w(i), l = [];
+    for (; u.diff(c, "day", !0) > 30; )
+      await this.trajectoryIn30Day(t, c, c.clone().add(30, "day"), r, o, l, s), c.add(30, "day");
+    return await this.trajectoryIn30Day(t, c, u, r, o, l, s), l;
   }
-  async trajectoryIn30Day(e, a, i, o, n, s, d = {}) {
-    var f, C, S, p, w;
-    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", m = {
+  async trajectoryIn30Day(t, a, i, o, n, s, r = {}) {
+    var y, F, I, p, v;
+    const c = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", u = {
       headers: {
-        Authorization: `${(f = this.token) == null ? void 0 : f.tokenType} ${(C = this.token) == null ? void 0 : C.accessToken}`
+        Authorization: `${(y = this.token) == null ? void 0 : y.tokenType} ${(F = this.token) == null ? void 0 : F.accessToken}`
       },
       json: {
-        mmsi: e,
+        mmsi: t,
         startTime: a.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
         endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    v == null || v.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, m);
-    const M = await B.post(r, m).json();
-    if (M.code)
-      return v == null || v.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: M.message, status: M.status, code: M.code }), M;
-    let l = -1;
-    const b = g(`${(p = (S = M.data) == null ? void 0 : S[0]) == null ? void 0 : p.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (w = M.data) == null || w.forEach((c) => {
-      for (const Y in c)
-        !isNaN(c[Y]) && Number(c[Y]) !== 1 / 0 && (c[Y] = Number(c[Y]));
-      const y = g(`${c.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), h = c.status, { labelCn: u, labelEn: I } = this.parseStatus(h), k = {
-        mmsi: c.mmsi,
+    M == null || M.info("[%s] fetch trajectory from: %s - %j", r.requestId, c, u);
+    const l = await L.post(c, u).json();
+    if (l.code)
+      return M == null || M.warn("[%s] fetch trajectory failed: %j", r.requestId, c, { message: l.message, status: l.status, code: l.code }), l;
+    let f = -1;
+    const b = w(`${(p = (I = l.data) == null ? void 0 : I[0]) == null ? void 0 : p.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (v = l.data) == null || v.forEach((d) => {
+      for (const P in d)
+        !isNaN(d[P]) && Number(d[P]) !== 1 / 0 && (d[P] = Number(d[P]));
+      const g = w(`${d.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), m = d.status, { labelCn: h, labelEn: k } = this.parseStatus(m), S = {
+        mmsi: d.mmsi,
         imo: o == null ? void 0 : o.imo,
-        lat: c.lat,
-        lng: c.lon,
-        sog: c.sog,
-        cog: c.cog,
-        hdg: c.hdg,
-        draught: c.draught,
-        status: h,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(c.eta) ? g(`${c.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
-        destination: c.dest,
-        positionTime: y.unix(),
-        labelCn: u,
-        labelEn: I,
+        lat: d.lat,
+        lng: d.lon,
+        sog: d.sog,
+        cog: d.cog,
+        hdg: d.hdg,
+        draught: d.draught,
+        status: m,
+        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(d.eta) ? w(`${d.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
+        destination: d.dest,
+        positionTime: g.unix(),
+        labelCn: h,
+        labelEn: k,
         method: "trajectory",
         vendor: "myVessel",
-        utc: y.utc().format()
-      }, D = Math.floor(y.diff(b, "minute", !0) / (n || 1));
-      D !== l && (l = D, s.push(k));
+        utc: g.utc().format()
+      }, D = Math.floor(g.diff(b, "minute", !0) / (n || 1));
+      D !== f && (f = D, s.push(S));
     }), s;
   }
 }
-class xt extends st {
-  constructor(e) {
+class Et extends st {
+  constructor(t) {
     super();
-    K(this, "token");
-    this.token = e;
+    U(this, "token");
+    this.token = t;
   }
-  async realTimePosition(e, a = {}) {
+  async realTimePosition(t, a = {}) {
     const i = "https://api.hifleet.com/position/position/get/token", o = {
       searchParams: {
-        mmsi: e,
+        mmsi: t,
         usertoken: this.token
       }
-    }, n = await B.post(i, o).json();
-    v == null || v.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, o);
+    }, n = await L.post(i, o).json();
+    M == null || M.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, o);
     const s = n == null ? void 0 : n.list;
     if (!s)
-      return v == null || v.warn("[%s] fetch realtime position failed: %j", a.requestId, i, n), n;
+      return M == null || M.warn("[%s] fetch realtime position failed: %j", a.requestId, i, n), n;
     for (const b in s)
       !isNaN(s[b]) && Number(s[b]) !== 1 / 0 && (s[b] = Number(s[b]));
     s.status = s.sp > 3 ? 0 : 1;
-    const d = s.status, { labelCn: r, labelEn: m } = this.parseStatus(d), M = g(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const r = s.status, { labelCn: c, labelEn: u } = this.parseStatus(r), l = w(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.m,
       name: s.n,
@@ -217,26 +314,26 @@ class xt extends st {
       cog: s.co,
       hdg: s.h,
       rot: isNaN(s.rot) ? 0 : s.rot,
-      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? g.utc(s.eta).format() : void 0,
+      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? w.utc(s.eta).format() : void 0,
       destination: s.destination,
       vesselType: s.type,
       dwt: s.dwt,
       build: s.buildyear,
       flag: s.fn,
-      positionTime: M.unix(),
-      utc: M.utc().format(),
-      status: d,
-      labelCn: r,
-      labelEn: m,
+      positionTime: l.unix(),
+      utc: l.utc().format(),
+      status: r,
+      labelCn: c,
+      labelEn: u,
       method: "position",
       vendor: "hifleet"
     };
   }
-  async search(e, a = {}) {
+  async search(t, a = {}) {
     let i = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
     const o = {
       searchParams: {
-        keyword: e
+        keyword: t
       },
       headers: {
         Referer: "https://www.hifleet.com",
@@ -244,10 +341,10 @@ class xt extends st {
         Host: "www.hifleet.com"
       }
     };
-    let n = await B.post(i, o).json();
-    v == null || v.info("[%s] fetch vessel props from: %s - %j", a.requestId, i, o), n instanceof Array && (n = n[0]);
-    for (const d in n)
-      !isNaN(n[d]) && Number(n[d]) !== 1 / 0 && (n[d] = Number(n[d]));
+    let n = await L.post(i, o).json();
+    M == null || M.info("[%s] fetch vessel props from: %s - %j", a.requestId, i, o), n instanceof Array && (n = n[0]);
+    for (const r in n)
+      !isNaN(n[r]) && Number(n[r]) !== 1 / 0 && (n[r] = Number(n[r]));
     const s = {
       mmsi: n.m,
       name: n.n,
@@ -258,102 +355,102 @@ class xt extends st {
       draught: n.dr,
       type: n.t
     };
-    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", n = await B.post(i, o).json(), v == null || v.info("[%s] search vessel dead weight from: %s - %j", a.requestId, i, o), n instanceof Array && (n = n[0]), n && (s.deadweight = Number(n.dwt)), s;
+    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", n = await L.post(i, o).json(), M == null || M.info("[%s] search vessel dead weight from: %s - %j", a.requestId, i, o), n instanceof Array && (n = n[0]), n && (s.deadweight = Number(n.dwt)), s;
   }
-  async suggest(e, a = {}) {
+  async suggest(t, a = {}) {
     const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", o = {
       searchParams: {
-        q: e
+        q: t
       },
       headers: {
         Referer: "https://www.hifleet.com",
         Origin: "https://www.hifleet.com",
         Host: "www.hifleet.com"
       }
-    }, n = await B.post(i, o).json();
-    v == null || v.info("[%s] suggest vessel props from: %s - %j", a.requestId, i, o);
+    }, n = await L.post(i, o).json();
+    M == null || M.info("[%s] suggest vessel props from: %s - %j", a.requestId, i, o);
     const s = [];
-    for (const d of n)
+    for (const r of n)
       s.push({
-        mmsi: !d.mmsi || isNaN(d.mmsi) ? null : Number(d.mmsi),
-        name: d.name,
-        callSign: d.callsign,
-        imo: !d.imo || isNaN(d.imo) ? null : Number(d.imo),
-        score: d._score
+        mmsi: !r.mmsi || isNaN(r.mmsi) ? null : Number(r.mmsi),
+        name: r.name,
+        callSign: r.callsign,
+        imo: !r.imo || isNaN(r.imo) ? null : Number(r.imo),
+        score: r._score
       });
-    return s.sort((d, r) => r.score - d.score), s;
+    return s.sort((r, c) => c.score - r.score), s;
   }
-  async trajectory(e, a, i, o, n = !0, s = {}) {
-    var c, y, h;
-    const d = await this.realTimePosition(e, s);
-    let r = g(a);
-    const m = g(i), M = g();
+  async trajectory(t, a, i, o, n = !0, s = {}) {
+    var d, g, m;
+    const r = await this.realTimePosition(t, s);
+    let c = w(a);
+    const u = w(i), l = w();
     if (n) {
-      let u = m.diff(r, "d", !0);
-      u < 0 ? r = m.clone().subtract(40, "d") : u < 30 ? r.subtract(10, "d") : u < 60 ? r.subtract(5, "d") : r = m.clone().subtract(80, "d"), u = M.diff(m, "d", !0), m.add(u > 10 ? 240 : u * 24, "h");
+      let h = u.diff(c, "d", !0);
+      h < 0 ? c = u.clone().subtract(40, "d") : h < 30 ? c.subtract(10, "d") : h < 60 ? c.subtract(5, "d") : c = u.clone().subtract(80, "d"), h = l.diff(u, "d", !0), u.add(h > 10 ? 240 : h * 24, "h");
     }
-    const l = {
+    const f = {
       searchParams: {
-        endtime: m.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
-        starttime: r.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
-        mmsi: e,
+        endtime: u.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        starttime: c.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        mmsi: t,
         usertoken: this.token
       }
-    }, b = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", f = await B.get(b, l).json();
-    v == null || v.info("[%s] fetch trajectory from: %s - %j", s.requestId, b, l);
-    let C;
-    f && (C = ((y = (c = f.ships) == null ? void 0 : c.offors) == null ? void 0 : y.ship) || [], C.length || v == null || v.warn("[%s] fetch trajectory failed: %j", s.requestId, f));
-    const S = [];
+    }, b = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", y = await L.get(b, f).json();
+    M == null || M.info("[%s] fetch trajectory from: %s - %j", s.requestId, b, f);
+    let F;
+    y && (F = ((g = (d = y.ships) == null ? void 0 : d.offors) == null ? void 0 : g.ship) || [], F.length || M == null || M.warn("[%s] fetch trajectory failed: %j", s.requestId, y));
+    const I = [];
     let p = -1;
-    const w = g(`${(h = C == null ? void 0 : C[0]) == null ? void 0 : h.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const u of C) {
-      for (const A in u)
-        !isNaN(u[A]) && Number(u[A]) !== 1 / 0 && (u[A] = Number(u[A]));
-      const I = g(`${u.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-      u.status = u.sp > 4 ? 0 : 1;
-      const { labelEn: k, labelCn: D } = this.parseStatus(u.status), Y = {
-        mmsi: u.m,
-        name: u.n,
-        imo: d == null ? void 0 : d.imo,
-        lat: u.la,
-        lng: u.lo,
-        draught: u.draught,
-        sog: u.sp,
-        cog: u.co,
-        hdg: u.hdg,
-        positionTime: I.unix(),
-        utc: I.utc().format(),
-        status: u.status,
+    const v = w(`${(m = F == null ? void 0 : F[0]) == null ? void 0 : m.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const h of F) {
+      for (const A in h)
+        !isNaN(h[A]) && Number(h[A]) !== 1 / 0 && (h[A] = Number(h[A]));
+      const k = w(`${h.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      h.status = h.sp > 4 ? 0 : 1;
+      const { labelEn: S, labelCn: D } = this.parseStatus(h.status), P = {
+        mmsi: h.m,
+        name: h.n,
+        imo: r == null ? void 0 : r.imo,
+        lat: h.la,
+        lng: h.lo,
+        draught: h.draught,
+        sog: h.sp,
+        cog: h.co,
+        hdg: h.hdg,
+        positionTime: k.unix(),
+        utc: k.utc().format(),
+        status: h.status,
         labelCn: D,
-        labelEn: k,
+        labelEn: S,
         method: "trajectory",
         vendor: "hifleet"
-      }, j = Math.floor(I.diff(w, "minute", !0) / (o || 1));
-      j !== p && (p = j, S.push(Y));
+      }, N = Math.floor(k.diff(v, "minute", !0) / (o || 1));
+      N !== p && (p = N, I.push(P));
     }
-    return S;
+    return I;
   }
 }
-class jt extends st {
-  constructor(e) {
+class Nt extends st {
+  constructor(t) {
     super();
-    K(this, "token");
-    this.token = e;
+    U(this, "token");
+    this.token = t;
   }
-  async realTimePosition(e, a = {}) {
+  async realTimePosition(t, a = {}) {
     const i = {
       searchParams: {
-        id: e,
+        id: t,
         k: this.token,
         enc: 1
       }
-    }, o = "https://api.shipxy.com/apicall/GetSingleShip", n = await B.get(o, i).json();
-    if (v == null || v.info("[%s] fetch realtime position from: %s - %j", a.requestId, o, i), (n == null ? void 0 : n.status) !== 0)
+    }, o = "https://api.shipxy.com/apicall/GetSingleShip", n = await L.get(o, i).json();
+    if (M == null || M.info("[%s] fetch realtime position from: %s - %j", a.requestId, o, i), (n == null ? void 0 : n.status) !== 0)
       return n;
     const s = n.data[0];
-    for (const l in s)
-      !isNaN(s[l]) && Number(s[l]) !== 1 / 0 && (s[l] = Number(s[l]));
-    const { labelCn: d, labelEn: r } = await this.parseStatus(s.navistat), m = g.unix(s.lasttime);
+    for (const f in s)
+      !isNaN(s[f]) && Number(s[f]) !== 1 / 0 && (s[f] = Number(s[f]));
+    const { labelCn: r, labelEn: c } = await this.parseStatus(s.navistat), u = w.unix(s.lasttime);
     return {
       mmsi: s.ShipID,
       name: s.name,
@@ -369,147 +466,147 @@ class jt extends st {
       hdg: Math.round(s.hdg / 100 * 100) / 100,
       rot: Math.round(s.rot / 100 * 100) / 100,
       positionTime: s.lasttime,
-      utc: m.utc().format(),
+      utc: u.utc().format(),
       status: s.navistat,
-      labelEn: r,
-      labelCn: d,
+      labelEn: c,
+      labelCn: r,
       method: "position",
       vendor: "shipxy"
     };
   }
-  async trajectory(e, a, i, o, n = !0, s = {}) {
-    var w;
-    const d = await this.realTimePosition(e, s), r = g(a), m = g(i), M = "https://api.shipxy.com/apicall/GetShipTrack", l = {
+  async trajectory(t, a, i, o, n = !0, s = {}) {
+    var v;
+    const r = await this.realTimePosition(t, s), c = w(a), u = w(i), l = "https://api.shipxy.com/apicall/GetShipTrack", f = {
       searchParams: {
-        id: e,
+        id: t,
         k: this.token,
         enc: 1,
         cut: 0,
-        btm: r.unix(),
-        etm: m.unix()
+        btm: c.unix(),
+        etm: u.unix()
       }
-    }, b = await B.get(M, l).json();
-    if (v == null || v.info("[%s] fetch trajectory from: %s - %j", s.requestId, M, l), (b == null ? void 0 : b.status) !== 0)
+    }, b = await L.get(l, f).json();
+    if (M == null || M.info("[%s] fetch trajectory from: %s - %j", s.requestId, l, f), (b == null ? void 0 : b.status) !== 0)
       return b;
-    const f = b == null ? void 0 : b.points, C = [], S = g.unix((w = f[0]) == null ? void 0 : w.utc);
+    const y = b == null ? void 0 : b.points, F = [], I = w.unix((v = y[0]) == null ? void 0 : v.utc);
     let p = -1;
-    for (const c of f) {
-      const y = g.unix(c.utc), h = {
-        imo: d == null ? void 0 : d.imo,
-        mmsi: e,
-        sog: Math.round(c.sog * 3600 / 1e3 / 1852 * 100) / 100,
-        cog: Math.round(c.cog / 100 * 100) / 100,
-        lat: Math.round(c.lat / 1e6 * 1e5) / 1e5,
-        lng: Math.round(c.lon / 1e6 * 1e5) / 1e5,
-        positionTime: y.unix(),
-        utc: y.utc().format(),
+    for (const d of y) {
+      const g = w.unix(d.utc), m = {
+        imo: r == null ? void 0 : r.imo,
+        mmsi: t,
+        sog: Math.round(d.sog * 3600 / 1e3 / 1852 * 100) / 100,
+        cog: Math.round(d.cog / 100 * 100) / 100,
+        lat: Math.round(d.lat / 1e6 * 1e5) / 1e5,
+        lng: Math.round(d.lon / 1e6 * 1e5) / 1e5,
+        positionTime: g.unix(),
+        utc: g.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, u = Math.floor(y.diff(S, "minute", !0) / (o || 1));
-      u !== p && (p = u, C.push(h));
+      }, h = Math.floor(g.diff(I, "minute", !0) / (o || 1));
+      h !== p && (p = h, F.push(m));
     }
-    return C;
+    return F;
   }
 }
-class Nt extends st {
-  constructor(e) {
+class Tt extends st {
+  constructor(t) {
     super();
-    K(this, "token");
-    this.token = e;
+    U(this, "token");
+    this.token = t;
   }
-  async getShipId(e, a = {}) {
+  async getShipId(t, a = {}) {
     const i = {
       headers: {
         appKey: this.token
       },
       json: {
-        mmsiList: e
+        mmsiList: t
       }
-    }, o = "https://api3.myships.com/sp/ships/getShipIdByMMSI", n = await B.post(o, i).json();
-    return v == null || v.info("[%s] fetch ship id from: %s - %j", a.requestId, o, i), n.code !== "0" ? n : n.data[0].shipId;
+    }, o = "https://api3.myships.com/sp/ships/getShipIdByMMSI", n = await L.post(o, i).json();
+    return M == null || M.info("[%s] fetch ship id from: %s - %j", a.requestId, o, i), n.code !== "0" ? n : n.data[0].shipId;
   }
-  async getShipInfo(e, a = {}) {
+  async getShipInfo(t, a = {}) {
     const i = {
       headers: {
         appKey: this.token
       },
       json: {
-        shipId: e
+        shipId: t
       }
-    }, o = "https://api3.myships.com/sp/ships/aissta", n = await B.post(o, i).json();
-    if (v == null || v.info("[%s] fetch ship info from: %s - %j", a.requestId, o, i), n.code !== "0")
+    }, o = "https://api3.myships.com/sp/ships/aissta", n = await L.post(o, i).json();
+    if (M == null || M.info("[%s] fetch ship info from: %s - %j", a.requestId, o, i), n.code !== "0")
       return n;
     const s = n.data;
-    let d = s.imo;
-    return e === "407170" && (d = "9198379", v == null || v.warn("[%s] ship(%s) imo error: %s, should be %s", a.requestId, e, s.imo, d)), {
+    let r = s.imo;
+    return t === "407170" && (r = "9198379", M == null || M.warn("[%s] ship(%s) imo error: %s, should be %s", a.requestId, t, s.imo, r)), {
       mmsi: s.mmsi,
       name: s.shipnameEn,
-      imo: d,
+      imo: r,
       callSign: s.callSign,
       length: s.length,
       width: s.breadth,
       draught: (s.draught || 100) / 10
     };
   }
-  async realTimePosition(e, a = {}) {
-    const i = await this.getShipId(e, a), o = await this.getShipInfo(i, a), n = {
+  async realTimePosition(t, a = {}) {
+    const i = await this.getShipId(t, a), o = await this.getShipInfo(i, a), n = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: i
       }
-    }, s = "https://api3.myships.com/sp/ships/position/latest", d = await B.post(s, n).json();
-    v == null || v.info("[%s] fetch realtime position from: %s - %j", a.requestId, s, n);
-    const r = d.data[0];
-    for (const f in r)
-      !isNaN(r[f]) && Number(r[f]) !== 1 / 0 && (r[f] = Number(r[f]));
-    const { labelCn: m, labelEn: M } = await this.parseStatus(r.aisNavStatus), l = g.unix(r.posTime);
+    }, s = "https://api3.myships.com/sp/ships/position/latest", r = await L.post(s, n).json();
+    M == null || M.info("[%s] fetch realtime position from: %s - %j", a.requestId, s, n);
+    const c = r.data[0];
+    for (const y in c)
+      !isNaN(c[y]) && Number(c[y]) !== 1 / 0 && (c[y] = Number(c[y]));
+    const { labelCn: u, labelEn: l } = await this.parseStatus(c.aisNavStatus), f = w.unix(c.posTime);
     return {
       ...o,
-      mmsi: e,
-      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,
-      utc: l.utc().format(),
-      status: r.aisNavStatus,
-      labelEn: M,
-      labelCn: m,
+      mmsi: t,
+      lat: Math.round(c.lat / 1e4 / 60 * 1e5) / 1e5,
+      lng: Math.round(c.lon / 1e4 / 60 * 1e5) / 1e5,
+      sog: Math.round(c.sog / 10 * 100) / 100,
+      cog: Math.round(c.cog / 10 * 100) / 100,
+      hdg: Math.round(c.heading * 100) / 100,
+      rot: Math.round(c.rot * 100) / 100,
+      positionTime: c.posTime,
+      utc: f.utc().format(),
+      status: c.aisNavStatus,
+      labelEn: l,
+      labelCn: u,
       method: "position",
       vendor: "myship"
     };
   }
-  async trajectory(e, a, i, o, n = !0, s = {}) {
-    const d = g(a), r = g(i), m = await this.getShipId(e), M = await this.getShipInfo(m), l = [];
-    for (; r.diff(d, "day", !0) > 30; )
-      await this.trajectoryIn30Day(m, d.unix(), d.add(30, "day").unix(), M, e, o, l);
-    return await this.trajectoryIn30Day(m, d.unix(), r.unix(), M, e, o, l), l;
+  async trajectory(t, a, i, o, n = !0, s = {}) {
+    const r = w(a), c = w(i), u = await this.getShipId(t), l = await this.getShipInfo(u), f = [];
+    for (; c.diff(r, "day", !0) > 30; )
+      await this.trajectoryIn30Day(u, r.unix(), r.add(30, "day").unix(), l, t, o, f);
+    return await this.trajectoryIn30Day(u, r.unix(), c.unix(), l, t, o, f), f;
   }
-  async trajectoryIn30Day(e, a, i, o, n, s, d, r = {}) {
-    var S;
-    const m = {
+  async trajectoryIn30Day(t, a, i, o, n, s, r, c = {}) {
+    var I;
+    const u = {
       headers: {
         appKey: this.token
       },
       json: {
-        shipId: e,
+        shipId: t,
         startTime: a,
         endTime: i
       }
-    }, M = "https://api3.myships.com/sp/ships/position/history", l = await B.post(M, m).json();
-    if (v == null || v.info("[%s] fetch trajectory from: %s - %j", r.requestId, M, m), l.code !== "0")
-      return v == null || v.warn("[%s] invoke myship trajectory failed: %j", r.requestId, l), l;
-    const b = l.data;
+    }, l = "https://api3.myships.com/sp/ships/position/history", f = await L.post(l, u).json();
+    if (M == null || M.info("[%s] fetch trajectory from: %s - %j", c.requestId, l, u), f.code !== "0")
+      return M == null || M.warn("[%s] invoke myship trajectory failed: %j", c.requestId, f), f;
+    const b = f.data;
     for (const p in b)
       !isNaN(b[p]) && Number(b[p]) !== 1 / 0 && (b[p] = Number(b[p]));
-    const f = g.unix((S = b[0]) == null ? void 0 : S.posTime);
-    let C = -1;
+    const y = w.unix((I = b[0]) == null ? void 0 : I.posTime);
+    let F = -1;
     for (const p of b) {
-      const w = g.unix(p.posTime), c = {
+      const v = w.unix(p.posTime), d = {
         imo: o == null ? void 0 : o.imo,
         mmsi: n,
         lat: Math.round(p.lat / 1e4 / 60 * 1e5) / 1e5,
@@ -518,23 +615,23 @@ class Nt extends st {
         cog: Math.round(p.cog / 10 * 100) / 100,
         hdg: Math.round(p.heading * 100) / 100,
         rot: Math.round(p.rot * 100) / 100,
-        positionTime: w.unix(),
-        utc: w.utc().format(),
+        positionTime: v.unix(),
+        utc: v.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, y = Math.floor(w.diff(f, "minute", !0) / (s || 1));
-      y !== C && (C = y, d.push(c));
+      }, g = Math.floor(v.diff(y, "minute", !0) / (s || 1));
+      g !== F && (F = g, r.push(d));
     }
-    return d;
+    return r;
   }
 }
-let _;
+let z;
 try {
-  _ = rt.getLogger("vessel");
+  z = ct.getLogger("vessel");
 } catch {
 } finally {
 }
-var mt = /* @__PURE__ */ ((x) => (x.NOTICE = "NOTICE", x.WARN = "WARN", x.HEAVY = "HEAVY", x.SEVERE = "SEVERE", x.ERROR = "ERROR", x.FATAL = "FATAL", x))(mt || {});
+var ft = /* @__PURE__ */ ((E) => (E.NOTICE = "NOTICE", E.WARN = "WARN", E.HEAVY = "HEAVY", E.SEVERE = "SEVERE", E.ERROR = "ERROR", E.FATAL = "FATAL", E))(ft || {});
 class yt {
   /**
    * 解析告警规则, 多规则场景
@@ -544,21 +641,21 @@ class yt {
    *
    * @param options
    */
-  parsePrinciple(t, e = {}) {
-    var s, d, r;
-    _ == null || _.debug("[%s] parse rule: %s", e.requestId, t);
-    const a = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = t.match(a) ? (s = t.match(a)) == null ? void 0 : s[0] : void 0, o = i == null ? void 0 : i.split(";");
+  parsePrinciple(e, t = {}) {
+    var s, r, c;
+    z == null || z.debug("[%s] parse rule: %s", t.requestId, e);
+    const a = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = e.match(a) ? (s = e.match(a)) == null ? void 0 : s[0] : void 0, o = i == null ? void 0 : i.split(";");
     if (!o)
       return;
     const n = {};
-    for (let m = 0; m < (o == null ? void 0 : o.length); m++) {
-      const M = (r = (d = o[m].match(a)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
-      if (m === 0 && !M)
+    for (let u = 0; u < (o == null ? void 0 : o.length); u++) {
+      const l = (c = (r = o[u].match(a)) == null ? void 0 : r[0]) == null ? void 0 : c.split("],");
+      if (u === 0 && !l)
         n.scope = o[0];
-      else if (M)
-        for (let l = 0, b = M.length; l < b; l++) {
-          const f = this.parseRule(M[l]);
-          f && (n[f.level] ? f.key ? n[f.level][f == null ? void 0 : f.key] = f : n[f.level] = f : f.key ? n[f.level] = { [f == null ? void 0 : f.key]: f } : n[f.level] = f);
+      else if (l)
+        for (let f = 0, b = l.length; f < b; f++) {
+          const y = this.parseRule(l[f]);
+          y && (n[y.level] ? y.key ? n[y.level][y == null ? void 0 : y.key] = y : n[y.level] = y : y.key ? n[y.level] = { [y == null ? void 0 : y.key]: y } : n[y.level] = y);
         }
     }
     return n;
@@ -569,10 +666,10 @@ class yt {
    * @param rule
    * @param options
    */
-  parseRule(t, e = {}) {
+  parseRule(e, t = {}) {
     var n;
-    _ == null || _.debug("[%s] parse rule: %s", e.requestId, t), t = t.startsWith("[") ? t : `[${t}`, t = t.endsWith("]") ? t : `${t}]`;
-    const a = new RegExp("(?<=\\[)(.+?)(?=])", "g"), i = (n = t == null ? void 0 : t.match(a)) == null ? void 0 : n[0], o = i == null ? void 0 : i.split(",");
+    z == null || z.debug("[%s] parse rule: %s", t.requestId, e), e = e.startsWith("[") ? e : `[${e}`, e = e.endsWith("]") ? e : `${e}]`;
+    const a = new RegExp("(?<=\\[)(.+?)(?=])", "g"), i = (n = e == null ? void 0 : e.match(a)) == null ? void 0 : n[0], o = i == null ? void 0 : i.split(",");
     if (o) {
       let s = o[3] === "Number.MAX_VALUE" ? 100 : Number(o[3]);
       return s = isNaN(s) ? 1 : s, {
@@ -590,26 +687,26 @@ class yt {
    * @param principle 告警规则
    * @param options
    */
-  checkWeather(t, e, a = {}) {
-    var f, C, S, p, w, c, y, h, u, I, k, D, Y, j, A;
+  checkWeather(e, t, a = {}) {
+    var y, F, I, p, v, d, g, m, h, k, S, D, P, N, A;
     let i = 0, o = 0, n = 0, s = 0;
-    const d = Math.round(((C = (f = e == null ? void 0 : e.SEVERE) == null ? void 0 : f.sigWave) == null ? void 0 : C.number) * 1.6 * 100) / 100, r = (p = (S = e == null ? void 0 : e.SEVERE) == null ? void 0 : S.sigWave) == null ? void 0 : p.number, m = (c = (w = e == null ? void 0 : e.HEAVY) == null ? void 0 : w.sigWave) == null ? void 0 : c.number, M = Math.round((((h = (y = e == null ? void 0 : e.SEVERE) == null ? void 0 : y.wind) == null ? void 0 : h.number) + 2) * 100) / 100, l = (I = (u = e == null ? void 0 : e.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : I.number, b = (D = (k = e == null ? void 0 : e.HEAVY) == null ? void 0 : k.wind) == null ? void 0 : D.number;
-    for (let T = 0; T < (t == null ? void 0 : t.length); T++) {
-      const N = t[T], P = (j = (Y = N == null ? void 0 : N.meteo) == null ? void 0 : Y.wave) == null ? void 0 : j.sig, R = (A = N == null ? void 0 : N.meteo) == null ? void 0 : A.wind, U = T ? g(N.eta).diff(g(t[T - 1].eta), "hour", !0) : 0;
-      s = U > s ? U : s, _ == null || _.debug("[%s] check sig.wave: %j", a.requestId, { ...P, dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: m }), (P == null ? void 0 : P.height) >= d ? N.isDangerous = !0 : (P == null ? void 0 : P.height) >= r ? N.isSevere = !0 : (P == null ? void 0 : P.height) >= m && (N.isHeavy = !0), _ == null || _.debug("[%s] check wind: %j", a.requestId, { ...R, dgThd4Wd: M, svThd4Wd: l, hvThd4Wd: b }), (R == null ? void 0 : R.scale) >= M ? (N.isDangerous = !0, delete N.isSevere, delete N.isHeavy) : (R == null ? void 0 : R.scale) > l ? (N.isDangerous || (N.isSevere = !0), delete N.isHeavy) : (R == null ? void 0 : R.scale) === b && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), i += N.isDangerous ? U : 0, o += N.isSevere ? U : 0, n += N.isHeavy ? U : 0;
+    const r = Math.round(((F = (y = t == null ? void 0 : t.SEVERE) == null ? void 0 : y.sigWave) == null ? void 0 : F.number) * 1.6 * 100) / 100, c = (p = (I = t == null ? void 0 : t.SEVERE) == null ? void 0 : I.sigWave) == null ? void 0 : p.number, u = (d = (v = t == null ? void 0 : t.HEAVY) == null ? void 0 : v.sigWave) == null ? void 0 : d.number, l = Math.round((((m = (g = t == null ? void 0 : t.SEVERE) == null ? void 0 : g.wind) == null ? void 0 : m.number) + 2) * 100) / 100, f = (k = (h = t == null ? void 0 : t.SEVERE) == null ? void 0 : h.wind) == null ? void 0 : k.number, b = (D = (S = t == null ? void 0 : t.HEAVY) == null ? void 0 : S.wind) == null ? void 0 : D.number;
+    for (let x = 0; x < (e == null ? void 0 : e.length); x++) {
+      const T = e[x], q = (N = (P = T == null ? void 0 : T.meteo) == null ? void 0 : P.wave) == null ? void 0 : N.sig, R = (A = T == null ? void 0 : T.meteo) == null ? void 0 : A.wind, J = x ? w(T.eta).diff(w(e[x - 1].eta), "hour", !0) : 0;
+      s = J > s ? J : s, z == null || z.debug("[%s] check sig.wave: %j", a.requestId, { ...q, dgThd4Wv: r, svThd4Wv: c, hvThd4Wv: u }), (q == null ? void 0 : q.height) >= r ? T.isDangerous = !0 : (q == null ? void 0 : q.height) >= c ? T.isSevere = !0 : (q == null ? void 0 : q.height) >= u && (T.isHeavy = !0), z == null || z.debug("[%s] check wind: %j", a.requestId, { ...R, dgThd4Wd: l, svThd4Wd: f, hvThd4Wd: b }), (R == null ? void 0 : R.scale) >= l ? (T.isDangerous = !0, delete T.isSevere, delete T.isHeavy) : (R == null ? void 0 : R.scale) > f ? (T.isDangerous || (T.isSevere = !0), delete T.isHeavy) : (R == null ? void 0 : R.scale) === b && !T.isDangerous && !T.isSevere && (T.isHeavy = !0), i += T.isDangerous ? J : 0, o += T.isSevere ? J : 0, n += T.isHeavy ? J : 0;
     }
-    return i = Math.round(i * 100) / 100, o = Math.round(o * 100) / 100, n = Math.round(n * 100) / 100, s = Math.round(s), { sample: t, dangerous: i, severe: o, heavy: n, step: s < 3 ? 3 : s, wind: { dgThd4Wd: M, svThd4Wd: l, hvThd4Wd: b }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: m } };
+    return i = Math.round(i * 100) / 100, o = Math.round(o * 100) / 100, n = Math.round(n * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: o, heavy: n, step: s < 3 ? 3 : s, wind: { dgThd4Wd: l, svThd4Wd: f, hvThd4Wd: b }, sig: { dgThd4Wv: r, svThd4Wv: c, hvThd4Wv: u } };
   }
 }
-const Tt = new yt();
-let F;
+const xt = new yt();
+let C;
 try {
-  F = rt.getLogger("vessel");
+  C = ct.getLogger("vessel");
 } catch {
 } finally {
 }
-const Mt = new ft("", !0);
-var bt = /* @__PURE__ */ ((x) => (x.common = "common", x.container = "container", x.tugs = "tugs", x))(bt || {}), gt = /* @__PURE__ */ ((x) => (x.Ballast = "Ballast", x.Laden = "Laden", x))(gt || {}), wt = /* @__PURE__ */ ((x) => (x.Cp = "CP", x.Perf = "Basis", x.Instruct = "Other", x))(wt || {});
+const Mt = new mt("", !0);
+var gt = /* @__PURE__ */ ((E) => (E.common = "common", E.container = "container", E.tugs = "tugs", E))(gt || {}), bt = /* @__PURE__ */ ((E) => (E.Ballast = "Ballast", E.Laden = "Laden", E))(bt || {}), vt = /* @__PURE__ */ ((E) => (E.Cp = "CP", E.Perf = "Basis", E.Instruct = "Other", E))(vt || {});
 class O {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
@@ -623,10 +720,10 @@ class O {
    * @param draught 吃水 m
    * @return [0.55, 0.85]
    */
-  static blockCoefficient(t, e, a, i) {
-    let o = Math.round(t / (e * a * i) * 100) / 100;
+  static blockCoefficient(e, t, a, i) {
+    let o = Math.round(e / (t * a * i) * 100) / 100;
     o = o < 0.55 ? 0.55 : o > 0.85 ? 0.85 : o;
-    const n = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], s = n.map((d) => Math.abs(d - o));
+    const n = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], s = n.map((r) => Math.abs(r - o));
     return n[s.indexOf(Math.min(...s))];
   }
   /**
@@ -640,8 +737,8 @@ class O {
    * @param g 重力加速度 9.80 m/s^2
    * @return [0.05, 0.30]
    */
-  static froudeNumber(t, e, a = 9.8) {
-    let i = Math.round(Math.sqrt(t * t / (a * e)) * 100) / 100;
+  static froudeNumber(e, t, a = 9.8) {
+    let i = Math.round(Math.sqrt(e * e / (a * t)) * 100) / 100;
     return i = i < 0.05 ? 0.05 : i > 0.3 ? 0.3 : i, i;
   }
   /**
@@ -651,7 +748,7 @@ class O {
    * @param loadCondition
    * @private
    */
-  static amendFactor(t, e, a) {
+  static amendFactor(e, t, a) {
     const i = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
@@ -669,8 +766,8 @@ class O {
       0.75: [2.6, -12.5, -13.5],
       0.8: [3, -16.3, -21.6],
       0.85: [3.4, -20.9, 31.8]
-    }[t];
-    return a === "Laden" && (n = i[t]), n[0] + n[1] * e + n[2] * Math.pow(e, 2);
+    }[e];
+    return a === "Laden" && (n = i[e]), n[0] + n[1] * t + n[2] * Math.pow(t, 2);
   }
   /**
    * 失速方向因子
@@ -683,9 +780,9 @@ class O {
    * @param bn
    * @private
    */
-  static directionFactor(t, e = 0) {
+  static directionFactor(e, t = 0) {
     let a;
-    return t > 30 && t <= 60 ? a = (1.7 - 0.03 * Math.pow(e - 4, 2)) / 2 : t > 60 && t <= 150 ? a = (0.9 - 0.06 * Math.pow(e - 6, 2)) / 2 : t > 150 && t <= 180 ? a = (0.4 - 0.03 * Math.pow(e - 8, 2)) / 2 : a = 1, Math.round(a * 1e5) / 1e5;
+    return e > 30 && e <= 60 ? a = (1.7 - 0.03 * Math.pow(t - 4, 2)) / 2 : e > 60 && e <= 150 ? a = (0.9 - 0.06 * Math.pow(t - 6, 2)) / 2 : e > 150 && e <= 180 ? a = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2 : a = 1, Math.round(a * 1e5) / 1e5;
   }
   /**
    * 失速船型因子
@@ -698,20 +795,20 @@ class O {
    * @param bn
    * @private
    */
-  static vesselTagFactor(t, e, a, i = 0) {
+  static vesselTagFactor(e, t, a, i = 0) {
     i = i > 6 ? i - 0.9 * (i - 6) : i;
     let o;
-    return a === "container" ? o = 0.7 * i + Math.pow(i, 6.5) / (22 * Math.pow(t, 2 / 3)) : e === "Ballast" ? o = 0.7 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(t, 2 / 3)) : o = 0.5 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(t, 2 / 3)), o;
+    return a === "container" ? o = 0.7 * i + Math.pow(i, 6.5) / (22 * Math.pow(e, 2 / 3)) : t === "Ballast" ? o = 0.7 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(e, 2 / 3)) : o = 0.5 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(e, 2 / 3)), o;
   }
   /**
    * 浪高影响因子
    * @param ht 浪高，单位m
    * @private
    */
-  static waveHeightFactor(t, e) {
-    t = t < 3 ? t * 0.7 : t, t = t < 0 ? 0.2 : t, t = t > 6 ? t - 0.9 * (t - 6) : t, t = t > 9 ? 9 : t;
+  static waveHeightFactor(e, t) {
+    e = e < 3 ? e * 0.7 : e, e = e < 0 ? 0.2 : e, e = e > 6 ? e - 0.9 * (e - 6) : e, e = e > 9 ? 9 : e;
     let a;
-    return e > 30 && e <= 60 ? a = -0.6 : e > 60 && e <= 90 ? a = -0.4 : e > 90 && e <= 120 ? a = t < 3 ? 0.4 : -0.3 : e > 120 && e <= 150 ? a = t < 3 ? 0.6 : -0.5 : e > 150 && e <= 180 ? a = t < 3 ? 0.7 : -0.6 : a = -0.7, Math.round(a * (0.144 * Math.pow(t, 2) + 0.278 * t) * 1e4) / 1e4;
+    return t > 30 && t <= 60 ? a = -0.6 : t > 60 && t <= 90 ? a = -0.4 : t > 90 && t <= 120 ? a = e < 3 ? 0.4 : -0.3 : t > 120 && t <= 150 ? a = e < 3 ? 0.6 : -0.5 : t > 150 && t <= 180 ? a = e < 3 ? 0.7 : -0.6 : a = -0.7, Math.round(a * (0.144 * Math.pow(e, 2) + 0.278 * e) * 1e4) / 1e4;
   }
   /**
    * 组装船舶运行参数
@@ -721,18 +818,18 @@ class O {
    * @param bearing 方位角
    * @private
    */
-  static assembleProperties(t, e, a, i) {
-    var l;
-    const o = t.lbp ?? t.length ?? t.lengthOverall ?? 198.9642, n = t.draught ?? 8, s = t.breadthMoulded ?? t.breadth ?? t.breadthExtreme ?? 32.4572, d = t.deadweight ?? 67035.7773, r = ((l = t == null ? void 0 : t.type) == null ? void 0 : l.toLowerCase()) || "common";
+  static assembleProperties(e, t, a, i) {
+    var f;
+    const o = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, n = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, r = e.deadweight ?? 67035.7773, c = ((f = e == null ? void 0 : e.type) == null ? void 0 : f.toLowerCase()) || "common";
     return {
-      tag: r.indexOf("container") > -1 ? "container" : r.indexOf("tugs") > -1 ? "tugs" : "common",
+      tag: c.indexOf("container") > -1 ? "container" : c.indexOf("tugs") > -1 ? "tugs" : "common",
       lbp: o,
-      loadCondition: e,
+      loadCondition: t,
       draught: n,
       breadthMoulded: s,
       // 排水量（吨）= 载重量（吨）/ 1.025 + 吃水（米）× 船舶型宽（米）× 船舶型长（米）× 0.7
       // 其中，1.025是指海水的密度，吨是指公吨，吃水是指船舶的最大吃水深度。船舶型宽是指船舶的最大型宽，船舶型长是指船舶的设计型长。上述公式是针对常规船舶适用的，不同类型的船舶可能会有一些差异。
-      displacement: Math.round((d / 1.025 + n * s * o * 0.7) * 1e4) / 1e4,
+      displacement: Math.round((r / 1.025 + n * s * o * 0.7) * 1e4) / 1e4,
       // 换算为m/s
       speed: Math.round((a ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
       bearing: i || 90
@@ -749,41 +846,41 @@ class O {
    * @param useRouteParam true 启用设置速度
    * @param options
    */
-  static async speedLoseAt(t, e, a, i = "", o = 2, n = !0, s = !1, d = {}) {
-    let r;
-    if (e.velocity && s && (t.speed = J.roundPrecision(e.velocity * 1852 / 3600, 6)), n) {
-      let m;
+  static async speedLoseAt(e, t, a, i = "", o = 2, n = !0, s = !1, r = {}) {
+    let c;
+    if (t.velocity && s && (e.speed = _.roundPrecision(t.velocity * 1852 / 3600, 6)), n) {
+      let u;
       try {
         i = (i == null ? void 0 : i.toUpperCase()) === "CMEMS" ? "ECMWF" : i, i = (i == null ? void 0 : i.toUpperCase()) === "METEO2" ? "best_match" : i;
-        const { weatherModels: f, marineModels: C } = await it.autoPickMeteoModel(i), S = await Mt.spotForecast(e.lat, e.lng, a.utc().format(), !1, !1, !0, {
-          ...d,
+        const { weatherModels: y, marineModels: F } = await it.autoPickMeteoModel(i), I = await Mt.spotForecast(t.lat, t.lng, a.utc().format(), !1, !1, !0, {
+          ...r,
           pastDays: 1,
           forecastDays: 1,
-          weatherModels: f,
-          marineModels: C
-        }), [p] = it.pickHourly(S, a);
-        m = it.toLegacy(p);
-      } catch (f) {
-        F.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...e, eta: a.utc().format(), source: i }, f);
+          weatherModels: y,
+          marineModels: F
+        }), [p] = it.pickHourly(I, a);
+        u = it.toLegacy(p);
+      } catch (y) {
+        C.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...t, eta: a.utc().format(), source: i }, y);
       }
-      const M = O.weatherFactor(t, m), l = O.currentFactor(t.bearing, m == null ? void 0 : m.current, o), b = Math.round((t.speed * 1.943844 + M + l) * 100) / 100;
-      r = {
-        meteo: { ...m },
-        wxFactor: M,
-        cFactor: l,
-        speed: e.velocity && s ? e.velocity : b < 0 ? 1 : b,
+      const l = O.weatherFactor(e, u), f = O.currentFactor(e.bearing, u == null ? void 0 : u.current, o), b = Math.round((e.speed * 1.943844 + l + f) * 100) / 100;
+      c = {
+        meteo: { ...u },
+        wxFactor: l,
+        cFactor: f,
+        speed: t.velocity && s ? t.velocity : b < 0 ? 1 : b,
         eta: a.utc().format(),
         etd: a.utc().format()
       };
     } else
-      r = {
+      c = {
         wxFactor: 0,
         cFactor: 0,
-        speed: e.velocity && s ? e.velocity : Math.round((t.speed * 1.943844 + 0 + 0) * 100) / 100,
+        speed: t.velocity && s ? t.velocity : Math.round((e.speed * 1.943844 + 0 + 0) * 100) / 100,
         eta: a.utc().format(),
         etd: a.utc().format()
       };
-    return delete e.meteo, delete e.wxFactor, delete e.cFactor, delete e.speed, delete e.etd, { ...r, ...e };
+    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...c, ...t };
   }
   /**
    * 基于步长计算失速样本
@@ -799,53 +896,53 @@ class O {
    * @param options
    * @private
    */
-  static async speedLoseInHoursStep(t, e, a, i, o, n, s = "", d = !0, r = !1, m = {}) {
-    e.utc();
-    const M = e.clone().add(14, "days"), l = [], b = [];
-    let f = 0, C = 0, S, p;
-    for (let w = 0; w < n.length - 1; w++) {
-      let c = n[w];
-      c.distanceFromStart = Math.round((o + C) * 1e3) / 1e3;
-      const y = n[w + 1];
-      if (t.bearing = W.calculateBearing(c, y, !y.gcToPrevious), c.bearing = t.bearing, c.suspend && r) {
-        c.eta = c.eta || e.utc().format(), c.elapsed = c.elapsed ?? 0;
-        const I = c.suspend - c.elapsed;
-        if (i - f > I)
-          i = i - f - I, e.add(I, "hour"), c.elapsed = c.suspend;
+  static async speedLoseInHoursStep(e, t, a, i, o, n, s = "", r = !0, c = !1, u = {}) {
+    t.utc();
+    const l = t.clone().add(14, "days"), f = [], b = [];
+    let y = 0, F = 0, I, p;
+    for (let v = 0; v < n.length - 1; v++) {
+      let d = n[v];
+      d.distanceFromStart = Math.round((o + F) * 1e3) / 1e3;
+      const g = n[v + 1];
+      if (e.bearing = W.calculateBearing(d, g, !g.gcToPrevious), d.bearing = e.bearing, d.suspend && c) {
+        d.eta = d.eta || t.utc().format(), d.elapsed = d.elapsed ?? 0;
+        const k = d.suspend - d.elapsed;
+        if (i - y > k)
+          i = i - y - k, t.add(k, "hour"), d.elapsed = d.suspend;
         else {
-          const k = i - f;
-          c.elapsed += k, e.add(k, "hour"), i = 0;
+          const S = i - y;
+          d.elapsed += S, t.add(S, "hour"), i = 0;
         }
-        if (F == null || F.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${i} hours need to go...`, m.requestId, c), i === 0)
-          return c.distanceFromPrevious = C, { etd: e, from: p || c, to: c, next: n.filter((k) => k), wps: l, days: b };
+        if (C == null || C.info(`[%s] suspend ${d.elapsed} hours at %j, and remain ${i} hours need to go...`, u.requestId, d), i === 0)
+          return d.distanceFromPrevious = F, { etd: t, from: p || d, to: d, next: n.filter((S) => S), wps: f, days: b };
       } else
-        c.suspend = 0;
-      d = e.isAfter(M) ? !1 : d, c = await O.speedLoseAt(t, c, e, s, 0, d, r, m), p = p || c, c.important && l.push(c), e.isSameOrAfter(a) && (b.push(c), a.add(24, "hour"));
-      const h = W.calculateDistance(c, y, !y.gcToPrevious);
-      let u = Math.round(h / p.speed * 1e5) / 1e5;
-      if (f + u < i) {
-        if (f += u, e.add(u, "hour"), delete n[w], F == null || F.debug(
-          `[%s] go to %j from %j with ${h}nm, and cost ${u} hours`,
-          m.requestId,
-          { lat: y.lat, lng: y.lng },
+        d.suspend = 0;
+      r = t.isAfter(l) ? !1 : r, d = await O.speedLoseAt(e, d, t, s, 0, r, c, u), p = p || d, d.important && f.push(d), t.isSameOrAfter(a) && (b.push(d), a.add(24, "hour"));
+      const m = W.calculateDistance(d, g, !g.gcToPrevious);
+      let h = Math.round(m / p.speed * 1e5) / 1e5;
+      if (y + h < i) {
+        if (y += h, t.add(h, "hour"), delete n[v], C == null || C.debug(
+          `[%s] go to %j from %j with ${m}nm, and cost ${h} hours`,
+          u.requestId,
+          { lat: g.lat, lng: g.lng },
           { lat: p.lat, lng: p.lng, etd: p.etd }
-        ), C += h, n.filter((I) => I).length <= 1) {
-          S = y, S.eta = e.utc().format(), S.distanceFromPrevious = h, S.distanceFromStart = Math.round((o + C) * 1e4) / 1e4, l.push(S), delete n[w + 1];
+        ), F += m, n.filter((k) => k).length <= 1) {
+          I = g, I.eta = t.utc().format(), I.distanceFromPrevious = m, I.distanceFromStart = Math.round((o + F) * 1e4) / 1e4, f.push(I), delete n[v + 1];
           break;
         }
       } else {
-        u = i - f, e.add(u, "hour");
-        const I = J.roundPrecision(p.speed * u, 5);
-        S = W.calculateCoordinate(c, t.bearing, I, "nauticalmiles", !y.gcToPrevious), S.eta = e.utc().format(), n[w] = S, F == null || F.debug(
-          `[%s] go to %j from %j with ${I}nm, and cost ${u} hours`,
-          m.requestId,
-          { lat: S.lat, lng: S.lng },
-          { lat: c.lat, lng: c.lng, etd: c.etd }
-        ), C += I, S.distanceFromPrevious = Math.round(C * 1e4) / 1e4, S.distanceFromStart = Math.round((o + C) * 1e4) / 1e4;
+        h = i - y, t.add(h, "hour");
+        const k = _.roundPrecision(p.speed * h, 5);
+        I = W.calculateCoordinate(d, e.bearing, k, "nauticalmiles", !g.gcToPrevious), I.eta = t.utc().format(), n[v] = I, C == null || C.debug(
+          `[%s] go to %j from %j with ${k}nm, and cost ${h} hours`,
+          u.requestId,
+          { lat: I.lat, lng: I.lng },
+          { lat: d.lat, lng: d.lng, etd: d.etd }
+        ), F += k, I.distanceFromPrevious = Math.round(F * 1e4) / 1e4, I.distanceFromStart = Math.round((o + F) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: e, from: p, to: S, next: n.filter((w) => w), wps: l, days: b };
+    return { etd: t, from: p, to: I, next: n.filter((v) => v), wps: f, days: b };
   }
   /**
    * 洋流影响因子
@@ -853,11 +950,11 @@ class O {
    * @param current 洋流要素
    * @param role  1: 船东, 2: 租家, 0: 未知
    */
-  static currentFactor(t, e, a = 0) {
-    const i = (t - (e == null ? void 0 : e.degree) || 0) / 180 * Math.PI;
+  static currentFactor(e, t, a = 0) {
+    const i = (e - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
     if (Math.abs(i) === Math.PI / 2)
       return 0;
-    let o = ((e == null ? void 0 : e.kts) || 0) * Math.cos(i);
+    let o = ((t == null ? void 0 : t.kts) || 0) * Math.cos(i);
     return a & 2 ? o = Math.ceil(o * 100) / 100 : a & 1 ? o = Math.floor(o * 100) / 100 : o = Math.round(o * 100) / 100, Math.abs(o) > 5 ? 0 : o;
   }
   /**
@@ -865,17 +962,17 @@ class O {
    * @param props 船舶档案
    * @param wwc 气象要素
    */
-  static weatherFactor(t, e) {
-    var M, l, b, f, C, S, p;
-    F == null || F.debug("calculate weather factor via: %j", { ...t, ...e });
-    const a = O.blockCoefficient(t.displacement, t.lbp, t.breadthMoulded, t.draught), i = O.froudeNumber(t.speed, t.lbp), o = O.amendFactor(a, i, t.loadCondition);
-    let n = Math.abs(t.bearing % 360 - (((M = e == null ? void 0 : e.wind) == null ? void 0 : M.degree) % 360 || 0));
+  static weatherFactor(e, t) {
+    var l, f, b, y, F, I, p;
+    C == null || C.debug("calculate weather factor via: %j", { ...e, ...t });
+    const a = O.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), i = O.froudeNumber(e.speed, e.lbp), o = O.amendFactor(a, i, e.loadCondition);
+    let n = Math.abs(e.bearing % 360 - (((l = t == null ? void 0 : t.wind) == null ? void 0 : l.degree) % 360 || 0));
     n = n > 180 ? 360 - n : n;
-    const s = O.directionFactor(n, (l = e == null ? void 0 : e.wind) == null ? void 0 : l.scale), d = O.vesselTagFactor(t.displacement, t.loadCondition, t.tag, (b = e == null ? void 0 : e.wind) == null ? void 0 : b.scale);
-    let r = s * o * d / 100 * t.speed;
-    r = Math.round(r * 1.943844 * 1e4) / 1e4 * -1, t.tag === "tugs" && Math.abs(r) > 1 && (r = r / (Math.abs(Math.round(r)) + 1)), F == null || F.debug("wind wx factor = %d", r), n = Math.abs(t.bearing % 360 - (((C = (f = e == null ? void 0 : e.wave) == null ? void 0 : f.sig) == null ? void 0 : C.degree) % 360 || 0));
-    const m = O.waveHeightFactor(((p = (S = e == null ? void 0 : e.wave) == null ? void 0 : S.sig) == null ? void 0 : p.height) ?? 1, n);
-    return F == null || F.debug("wave wx factor = %d", m), r = Math.abs(r) > Math.abs(m) ? r : r * 0.3 + m * 0.7, F == null || F.debug("weather factor = %d", r), r = Math.abs(r) > 3 ? 3 * (Math.abs(r) / r) + Math.abs(r) / r * (Math.abs(r) - 2) * 0.1 : r, Math.round((r || 0) * 100) / 100;
+    const s = O.directionFactor(n, (f = t == null ? void 0 : t.wind) == null ? void 0 : f.scale), r = O.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (b = t == null ? void 0 : t.wind) == null ? void 0 : b.scale);
+    let c = s * o * r / 100 * e.speed;
+    c = Math.round(c * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(c) > 1 && (c = c / (Math.abs(Math.round(c)) + 1)), C == null || C.debug("wind wx factor = %d", c), n = Math.abs(e.bearing % 360 - (((F = (y = t == null ? void 0 : t.wave) == null ? void 0 : y.sig) == null ? void 0 : F.degree) % 360 || 0));
+    const u = O.waveHeightFactor(((p = (I = t == null ? void 0 : t.wave) == null ? void 0 : I.sig) == null ? void 0 : p.height) ?? 1, n);
+    return C == null || C.debug("wave wx factor = %d", u), c = Math.abs(c) > Math.abs(u) ? c : c * 0.3 + u * 0.7, C == null || C.debug("weather factor = %d", c), c = Math.abs(c) > 3 ? 3 * (Math.abs(c) / c) + Math.abs(c) / c * (Math.abs(c) - 2) * 0.1 : c, Math.round((c || 0) * 100) / 100;
   }
   /**
    * 全程失速分析(走完航程)
@@ -890,77 +987,77 @@ class O {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstant(t, e, a, i, o, n = "", s = 0, d = !0, r = !1, m = {}) {
-    var z, G, X, Q, Z, $;
-    const M = g().valueOf();
-    t.lng = J.convertToStdLng(t.lng);
-    const { route: l, waypoints: b } = o.points, f = W.calculateSubRoute(t, l);
-    if (((z = f[0]) == null ? void 0 : z.length) <= 1)
+  static async analyseInstant(e, t, a, i, o, n = "", s = 0, r = !0, c = !1, u = {}) {
+    var K, G, X, Q, Z, $;
+    const l = w().valueOf();
+    e.lng = _.convertToStdLng(e.lng);
+    const { route: f, waypoints: b } = o.points, y = W.calculateSubRoute(e, f);
+    if (((K = y[0]) == null ? void 0 : K.length) <= 1)
       return;
-    const { v0: C, label: S } = t.sog ? {
-      v0: t.sog,
-      label: t.label || "Other"
+    const { v0: F, label: I } = e.sog ? {
+      v0: e.sog,
+      label: e.label || "Other"
       /* Instruct */
     } : {
       v0: i.speed,
       label: "CP"
       /* Cp */
-    }, p = O.assembleProperties(a, i.loadCondition, C, 0), w = b.length ? W.calculateSubWaypoints(t, b) : [];
-    w.forEach((q) => q.important = !0);
-    const c = {
-      from: { ...t },
-      route: f,
-      waypoints: w,
-      v0: C,
-      label: S
-    }, y = {
+    }, p = O.assembleProperties(a, i.loadCondition, F, 0), v = b.length ? W.calculateSubWaypoints(e, b) : [];
+    v.forEach((Y) => Y.important = !0);
+    const d = {
+      from: { ...e },
+      route: y,
+      waypoints: v,
+      v0: F,
+      label: I
+    }, g = {
       hours: [],
       days: [],
       wps: []
     };
-    s || (W.calculateRouteDistance(f) / i.speed <= 72 ? s = 3 : s = 6);
-    let h = W.simplifyRouteToCoordinates(f, w, 0), u = 0, I = 0, k = 0, D = 0;
-    e = g(e).utc();
-    const Y = e.clone();
-    for (; h.length > 0; ) {
-      const q = s - e.hour() % s, V = Math.ceil(e.clone().add(q, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(e, "h", !0) * 1e4) / 1e4, E = await O.speedLoseInHoursStep(
+    s || (W.calculateRouteDistance(y) / i.speed <= 72 ? s = 3 : s = 6);
+    let m = W.simplifyRouteToCoordinates(y, v, 0), h = 0, k = 0, S = 0, D = 0;
+    t = w(t).utc();
+    const P = t.clone();
+    for (; m.length > 0; ) {
+      const Y = s - t.hour() % s, B = Math.ceil(t.clone().add(Y, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, j = await O.speedLoseInHoursStep(
         p,
-        e,
-        Y,
-        V,
-        u,
+        t,
+        P,
+        B,
         h,
+        m,
         n,
-        d,
         r,
-        m
+        c,
+        u
       );
-      (G = E.from) != null && G.speed && (y.hours.push(E.from), y.wps.push(...E.wps), y.days.push(...E.days)), h = E == null ? void 0 : E.next, h.length || y.hours.push(E == null ? void 0 : E.to), u += Math.round((((X = E == null ? void 0 : E.to) == null ? void 0 : X.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      (G = j.from) != null && G.speed && (g.hours.push(j.from), g.wps.push(...j.wps), g.days.push(...j.days)), m = j == null ? void 0 : j.next, m.length || g.hours.push(j == null ? void 0 : j.to), h += Math.round((((X = j == null ? void 0 : j.to) == null ? void 0 : X.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const j = y.hours;
-    for (let q = 0; q < j.length - 1; q++) {
-      const V = g(j[q + 1].eta).diff(j[q].etd, "hour", !0) || 1;
-      I += (j[q].wxFactor || 0) * V, k += (j[q].cFactor || 0) * V, D += V;
+    const N = g.hours;
+    for (let Y = 0; Y < N.length - 1; Y++) {
+      const B = w(N[Y + 1].eta).diff(N[Y].etd, "hour", !0) || 1;
+      k += (N[Y].wxFactor || 0) * B, S += (N[Y].cFactor || 0) * B, D += B;
     }
-    (Q = y.wps) == null || Q.forEach((q, V) => {
-      q.positionTime = g.utc(q.etd || q.eta).unix();
-      const E = y.wps[V - 1];
-      if (E) {
-        const L = q.distanceFromStart - E.distanceFromStart, H = g(q.eta || q.etd).diff(g(E.etd || E.eta), "h", !0);
-        q.avgSpd = Math.round(L / H * 100) / 100, E.bearing = W.calculateBearing(E, q);
+    (Q = g.wps) == null || Q.forEach((Y, B) => {
+      Y.positionTime = w.utc(Y.etd || Y.eta).unix();
+      const j = g.wps[B - 1];
+      if (j) {
+        const V = Y.distanceFromStart - j.distanceFromStart, H = w(Y.eta || Y.etd).diff(w(j.etd || j.eta), "h", !0);
+        Y.avgSpd = Math.round(V / H * 100) / 100, j.bearing = W.calculateBearing(j, Y);
       }
-    }), y.wps = (Z = y.wps) == null ? void 0 : Z.reduce((q, V) => (q.some((E) => Math.round(E.positionTime / 60) === Math.round(V.positionTime / 60)) || q.push(V), q), []), c.sample = y;
-    const A = y.hours.at(0), T = y.hours.at(-1);
-    c.distance = Math.round(T.distanceFromStart * 1e3) / 1e3, c.etd = g(A.eta).utc().format(), c.eta = g(T.eta).utc().format(), c.wxFactor = Math.round(I / D * 1e3) / 1e3, c.cFactor = Math.round(k / D * 1e3) / 1e3, c.avgSpeed = Math.round(T.distanceFromStart / D * 1e3) / 1e3, c.totalHrs = Math.round(D * 1e3) / 1e3;
-    const { distanceInECA: N, hoursInECA: P, totalDgoConsInECA: R, eca: U } = await this.calculateECA(c, i, m), tt = J.roundPrecision(i.fo / 24 * (D - P), 3), at = J.roundPrecision(i.dgo / 24 * D, 3);
-    c.extend = {
-      eca: U,
-      distanceInECA: N,
-      hoursInECA: P,
+    }), g.wps = (Z = g.wps) == null ? void 0 : Z.reduce((Y, B) => (Y.some((j) => Math.round(j.positionTime / 60) === Math.round(B.positionTime / 60)) || Y.push(B), Y), []), d.sample = g;
+    const A = g.hours.at(0), x = g.hours.at(-1);
+    d.distance = Math.round(x.distanceFromStart * 1e3) / 1e3, d.etd = w(A.eta).utc().format(), d.eta = w(x.eta).utc().format(), d.wxFactor = Math.round(k / D * 1e3) / 1e3, d.cFactor = Math.round(S / D * 1e3) / 1e3, d.avgSpeed = Math.round(x.distanceFromStart / D * 1e3) / 1e3, d.totalHrs = Math.round(D * 1e3) / 1e3;
+    const { distanceInECA: T, hoursInECA: q, totalDgoConsInECA: R, eca: J } = await this.calculateECA(d, i, u), tt = _.roundPrecision(i.fo / 24 * (D - q), 3), at = _.roundPrecision(i.dgo / 24 * D, 3);
+    d.extend = {
+      eca: J,
+      distanceInECA: T,
+      hoursInECA: q,
       totalDgoConsInECA: R
-    }, c.totalFoCons = tt < 0 ? 0 : tt, c.totalDgoCons = at;
-    const et = g().valueOf() - M, nt = (($ = y == null ? void 0 : y.hours) == null ? void 0 : $.length) || 1;
-    return F == null || F.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", m == null ? void 0 : m.requestId, et, nt, Math.round(et / nt * 1e3) / 1e3), c;
+    }, d.totalFoCons = tt < 0 ? 0 : tt, d.totalDgoCons = at;
+    const et = w().valueOf() - l, ot = (($ = g == null ? void 0 : g.hours) == null ? void 0 : $.length) || 1;
+    return C == null || C.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", u == null ? void 0 : u.requestId, et, ot, Math.round(et / ot * 1e3) / 1e3), d;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -970,83 +1067,85 @@ class O {
    * @param vessel 船舶属性 @see VesselAssemble, 注意吃水为船舶实时吃水，非档案中的固定吃水，一般可以从ais获取; 如获取不得，用档案吃水代替
    * @param cp { loadCondition, speed } LoadCondition: Ballast or Laden, speed(kts)
    * @param route 航路[[[lng, lat]]]
+   * @param waypoints
    * @param source 气象数据源，GFS or CMEMES, 默认CMEMS
    * @param stepHrs
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
+   * @param options
    */
-  static async analyseInstantWithThreshed(t, e, a, i, o, n, s, d = "", r = 3, m = !0, M = !1, l = {}) {
-    var X, Q, Z, $, q, V;
-    const b = g().valueOf();
-    t.lng = J.convertToStdLng(t.lng);
-    const { v0: f, label: C } = t.sog ? {
-      v0: t.sog,
-      label: t.label || "Other"
+  static async analyseInstantWithThreshed(e, t, a, i, o, n, s, r = "", c = 3, u = !0, l = !1, f = {}) {
+    var X, Q, Z, $, Y, B;
+    const b = w().valueOf();
+    e.lng = _.convertToStdLng(e.lng);
+    const { v0: y, label: F } = e.sog ? {
+      v0: e.sog,
+      label: e.label || "Other"
       /* Instruct */
     } : {
       v0: o.speed,
       label: "CP"
       /* Cp */
-    }, S = O.assembleProperties(i, o.loadCondition, f, 0), p = W.calculateSubRoute(t, n);
+    }, I = O.assembleProperties(i, o.loadCondition, y, 0), p = W.calculateSubRoute(e, n);
     if (((X = p[0]) == null ? void 0 : X.length) <= 1)
       return;
-    const w = s.length ? W.calculateSubWaypoints(t, s) : [];
-    w.forEach((E) => E.important = !0);
-    let c = W.simplifyRouteToCoordinates(p, w, 0), y = 0, h = 0, u = 0, I = 0;
-    const k = {
+    const v = s.length ? W.calculateSubWaypoints(e, s) : [];
+    v.forEach((j) => j.important = !0);
+    let d = W.simplifyRouteToCoordinates(p, v, 0), g = 0, m = 0, h = 0, k = 0;
+    const S = {
       hours: [],
       wps: [],
       days: []
     };
-    e = g(e).utc();
-    const D = e.clone();
-    for (; c.length > 0; ) {
-      const E = r - e.hour() % r;
-      let L = Math.ceil(e.clone().add(E, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(e, "h", !0) * 1e4) / 1e4;
-      L = e.clone().add(L, "h").isSameOrAfter(a) ? a.diff(e, "h", !0) * 1e4 / 1e4 : L;
-      const H = await O.speedLoseInHoursStep(S, e, D, L, y, c, d, m, M, l);
-      if ((Q = H.from) != null && Q.speed && (k.hours.push(H.from), H != null && H.wps && k.wps.push(...H.wps), k.days.push(...H.days)), c = H == null ? void 0 : H.next, c.length || k.hours.push(H == null ? void 0 : H.to), y += Math.round((((Z = H == null ? void 0 : H.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !L)
+    t = w(t).utc();
+    const D = t.clone();
+    for (; d.length > 0; ) {
+      const j = c - t.hour() % c;
+      let V = Math.ceil(t.clone().add(j, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
+      V = t.clone().add(V, "h").isSameOrAfter(a) ? a.diff(t, "h", !0) * 1e4 / 1e4 : V;
+      const H = await O.speedLoseInHoursStep(I, t, D, V, g, d, r, u, l, f);
+      if ((Q = H.from) != null && Q.speed && (S.hours.push(H.from), H != null && H.wps && S.wps.push(...H.wps), S.days.push(...H.days)), d = H == null ? void 0 : H.next, d.length || S.hours.push(H == null ? void 0 : H.to), g += Math.round((((Z = H == null ? void 0 : H.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !V)
         break;
     }
-    k.wps = ($ = k.wps) == null ? void 0 : $.reduce((E, L) => (E.some((H) => Math.round(g(H.etd).unix() / 60) === Math.round(g(L.etd).unix() / 60)) || E.push(L), E), []), (q = k.wps) == null || q.forEach((E, L) => {
-      const H = k.wps[L - 1];
+    S.wps = ($ = S.wps) == null ? void 0 : $.reduce((j, V) => (j.some((H) => Math.round(w(H.etd).unix() / 60) === Math.round(w(V.etd).unix() / 60)) || j.push(V), j), []), (Y = S.wps) == null || Y.forEach((j, V) => {
+      const H = S.wps[V - 1];
       if (H) {
-        const ct = E.distanceFromStart - H.distanceFromStart, dt = g(E.eta || E.etd).diff(g(H.etd || H.eta), "h", !0);
-        E.avgSpd = Math.round(ct / dt * 100) / 100;
-        const ut = W.calculateBearing(H, E);
+        const rt = j.distanceFromStart - H.distanceFromStart, dt = w(j.eta || j.etd).diff(w(H.etd || H.eta), "h", !0);
+        j.avgSpd = Math.round(rt / dt * 100) / 100;
+        const ut = W.calculateBearing(H, j);
         H.bearing = ut;
       }
     });
-    const Y = k.hours;
-    for (let E = 0; E < Y.length - 1; E++) {
-      const L = g(Y[E + 1].eta).diff(Y[E].etd, "hour", !0);
-      h += Y[E].wxFactor * L, u += Y[E].cFactor * L, I += L;
+    const P = S.hours;
+    for (let j = 0; j < P.length - 1; j++) {
+      const V = w(P[j + 1].eta).diff(P[j].etd, "hour", !0);
+      m += P[j].wxFactor * V, h += P[j].cFactor * V, k += V;
     }
-    const j = k.hours.at(0), A = k.hours.at(-1), T = await W.calculateRangeRoute(j, A, p), N = await W.calculateRangeWaypoints(j, A, p, w), P = {
-      sample: k,
+    const N = S.hours.at(0), A = S.hours.at(-1), x = await W.calculateRangeRoute(N, A, p), T = await W.calculateRangeWaypoints(N, A, p, v), q = {
+      sample: S,
       distance: Math.round(((A == null ? void 0 : A.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: g(j.eta).utc().format(),
-      eta: g(A == null ? void 0 : A.eta).utc().format(),
-      wxFactor: Math.round(h / I * 1e3) / 1e3,
-      cFactor: Math.round(u / I * 1e3) / 1e3,
-      avgSpeed: Math.round(((A == null ? void 0 : A.distanceFromStart) || 0) / I * 1e3) / 1e3,
-      totalHrs: Math.round(I * 1e3) / 1e3,
-      from: j,
+      etd: w(N.eta).utc().format(),
+      eta: w(A == null ? void 0 : A.eta).utc().format(),
+      wxFactor: Math.round(m / k * 1e3) / 1e3,
+      cFactor: Math.round(h / k * 1e3) / 1e3,
+      avgSpeed: Math.round(((A == null ? void 0 : A.distanceFromStart) || 0) / k * 1e3) / 1e3,
+      totalHrs: Math.round(k * 1e3) / 1e3,
+      from: N,
       to: A,
-      route: T,
-      waypoints: N,
-      v0: f,
-      label: C
-    }, { distanceInECA: R, hoursInECA: U, totalDgoConsInECA: tt, eca: at } = await this.calculateECA(P, o, l), ot = J.roundPrecision(o.fo / 24 * (I - U), 3), et = J.roundPrecision(o.dgo / 24 * I, 3);
-    P.extend = {
+      route: x,
+      waypoints: T,
+      v0: y,
+      label: F
+    }, { distanceInECA: R, hoursInECA: J, totalDgoConsInECA: tt, eca: at } = await this.calculateECA(q, o, f), nt = _.roundPrecision(o.fo / 24 * (k - J), 3), et = _.roundPrecision(o.dgo / 24 * k, 3);
+    q.extend = {
       eca: at,
       distanceInECA: R,
-      hoursInECA: U,
+      hoursInECA: J,
       totalDgoConsInECA: tt
-    }, P.totalDgoCons = et, P.totalFoCons = ot < 0 ? 0 : ot;
-    const z = g().valueOf() - b, G = ((V = k == null ? void 0 : k.hours) == null ? void 0 : V.length) || 1;
-    return F == null || F.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, z, G, Math.round(z / G * 1e3) / 1e3), P;
+    }, q.totalDgoCons = et, q.totalFoCons = nt < 0 ? 0 : nt;
+    const K = w().valueOf() - b, G = ((B = S == null ? void 0 : S.hours) == null ? void 0 : B.length) || 1;
+    return C == null || C.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", f == null ? void 0 : f.requestId, K, G, Math.round(K / G * 1e3) / 1e3), q;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1063,59 +1162,59 @@ class O {
    * @param lane 基础航线（重要转向点）
    * @param options
    */
-  static async analyseCost(t, e, a, i, o = {}) {
-    var p, w;
-    const n = g().valueOf(), s = [];
-    t.speedStep = t.speedStep || 3, t.alterStep = t.alterStep ?? 1;
-    const d = W.calculateRouteDistance(i.route);
-    let r = 0;
-    a.forEach((c) => {
-      const y = Math.ceil(d / c.speed / 24);
-      r = r < y ? y : r;
-    }), r = r * 1.3;
-    const m = g.utc(t.etd).add(r ?? 14, "day");
-    let M = 1;
-    for (const c of a) {
-      const y = JSON.parse(JSON.stringify(i.route)), h = JSON.parse(JSON.stringify(i.waypoints)), u = await O.analyseInstantWithThreshed(
-        { lat: t.lat, lng: t.lng },
-        t.etd,
+  static async analyseCost(e, t, a, i, o = {}) {
+    var p, v;
+    const n = w().valueOf(), s = [];
+    e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
+    const r = W.calculateRouteDistance(i.route);
+    let c = 0;
+    a.forEach((d) => {
+      const g = Math.ceil(r / d.speed / 24);
+      c = c < g ? g : c;
+    }), c = c * 1.3;
+    const u = w.utc(e.etd).add(c ?? 14, "day");
+    let l = 1;
+    for (const d of a) {
+      const g = JSON.parse(JSON.stringify(i.route)), m = JSON.parse(JSON.stringify(i.waypoints)), h = await O.analyseInstantWithThreshed(
+        { lat: e.lat, lng: e.lng },
+        e.etd,
+        u,
+        t,
+        d,
+        g,
         m,
-        e,
-        c,
-        y,
-        h,
-        t.meteoVendor,
-        t.speedStep,
-        t.useMeteo,
-        t.useRouteParam,
+        e.meteoVendor,
+        e.speedStep,
+        e.useMeteo,
+        e.useRouteParam,
         o
       );
-      u && (await O.calculateCost(u, c, t, o), s.push(u), F == null || F.info("[%s][L%d-%d] analyse from %s to %s cost: %j", o.requestId, 1, M, t.etd, m.format(), {
-        cost: u.cost.total,
-        hire: u.cost.hire,
-        bunker: u.cost.bunker,
-        distance: u.distance,
-        hours: u.totalHrs,
-        cp: `${c.speed}/${c.fo}/${c.dgo}`
-      })), M++;
+      h && (await O.calculateCost(h, d, e, o), s.push(h), C == null || C.info("[%s][L%d-%d] analyse from %s to %s cost: %j", o.requestId, 1, l, e.etd, u.format(), {
+        cost: h.cost.total,
+        hire: h.cost.hire,
+        bunker: h.cost.bunker,
+        distance: h.distance,
+        hours: h.totalHrs,
+        cp: `${d.speed}/${d.fo}/${d.dgo}`
+      })), l++;
     }
-    s.sort((c, y) => c.cost.total - y.cost.total);
-    const l = s.at(0), b = s.at(1), f = [];
-    if (f.push({ combined: !1, speeds: [l], cost: (p = l.cost) == null ? void 0 : p.total }), b) {
-      const c = l.cost.cp, y = b.cost.cp, h = g(l.eta), u = g(l.etd), I = h.diff(u, "days", !0);
-      let k = Math.ceil(I / 2);
-      k = k > 7 ? 7 : k < t.alterStep ? t.alterStep : k;
-      let D = 2, Y = { combined: !1, speeds: [b], cost: (w = b.cost) == null ? void 0 : w.total }, j;
-      for (; k >= t.alterStep; ) {
-        const A = await O.combinedAnalyse(t, e, m, [c, y], i, k, { ...o, level: D });
-        if (Y.cost > A.cost ? j ? (j == null ? void 0 : j.cost) > A.cost && (j = A) : (j = Y, Y = A) : (!j || (j == null ? void 0 : j.cost) > A.cost) && (j = A), k <= t.alterStep)
+    s.sort((d, g) => d.cost.total - g.cost.total);
+    const f = s.at(0), b = s.at(1), y = [];
+    if (y.push({ combined: !1, speeds: [f], cost: (p = f.cost) == null ? void 0 : p.total }), b) {
+      const d = f.cost.cp, g = b.cost.cp, m = w(f.eta), h = w(f.etd), k = m.diff(h, "days", !0);
+      let S = Math.ceil(k / 2);
+      S = S > 7 ? 7 : S < e.alterStep ? e.alterStep : S;
+      let D = 2, P = { combined: !1, speeds: [b], cost: (v = b.cost) == null ? void 0 : v.total }, N;
+      for (; S >= e.alterStep; ) {
+        const A = await O.combinedAnalyse(e, t, u, [d, g], i, S, { ...o, level: D });
+        if (P.cost > A.cost ? N ? (N == null ? void 0 : N.cost) > A.cost && (N = A) : (N = P, P = A) : (!N || (N == null ? void 0 : N.cost) > A.cost) && (N = A), S <= e.alterStep)
           break;
-        k = Math.ceil(k / 2), D += 1;
+        S = Math.ceil(S / 2), D += 1;
       }
-      f.push(Y), j && f.push(j);
+      y.push(P), N && y.push(N);
     }
-    const S = g().valueOf() - n;
-    return F == null || F.info("[%s] analyse elapsed: %d ms", o == null ? void 0 : o.requestId, S), f.sort((c, y) => c.cost - y.cost);
+    const I = w().valueOf() - n;
+    return C == null || C.info("[%s] analyse elapsed: %d ms", o == null ? void 0 : o.requestId, I), y.sort((d, g) => d.cost - g.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1127,24 +1226,24 @@ class O {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async combinedAnalyse(t, e, a, i, o, n, s = {}) {
-    s.counter = 1, F == null || F.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, n);
-    const d = await O.alternateAnalyse(t, e, a, i, 0, o, n, s), r = d.reduce((y, h) => y + h.cost.total, 0), m = d.reduce((y, h) => y + h.cost.hire, 0), M = d.reduce((y, h) => y + h.cost.bunker, 0), l = d.reduce((y, h) => y + h.distance, 0), b = d.reduce((y, h) => y + h.totalHrs, 0);
-    F == null || F.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
-      cost: r,
-      hire: m,
-      bunker: M,
-      distance: l,
+  static async combinedAnalyse(e, t, a, i, o, n, s = {}) {
+    s.counter = 1, C == null || C.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, n);
+    const r = await O.alternateAnalyse(e, t, a, i, 0, o, n, s), c = r.reduce((g, m) => g + m.cost.total, 0), u = r.reduce((g, m) => g + m.cost.hire, 0), l = r.reduce((g, m) => g + m.cost.bunker, 0), f = r.reduce((g, m) => g + m.distance, 0), b = r.reduce((g, m) => g + m.totalHrs, 0);
+    C == null || C.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
+      cost: c,
+      hire: u,
+      bunker: l,
+      distance: f,
       hours: b
     });
-    const f = await O.alternateAnalyse(t, e, a, i, 1, o, n, s), C = f.reduce((y, h) => y + h.cost.total, 0), S = f.reduce((y, h) => y + h.cost.hire, 0), p = f.reduce((y, h) => y + h.cost.bunker, 0), w = f.reduce((y, h) => y + h.distance, 0), c = f.reduce((y, h) => y + h.totalHrs, 0);
-    return F == null || F.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
-      cost: C,
-      hire: S,
+    const y = await O.alternateAnalyse(e, t, a, i, 1, o, n, s), F = y.reduce((g, m) => g + m.cost.total, 0), I = y.reduce((g, m) => g + m.cost.hire, 0), p = y.reduce((g, m) => g + m.cost.bunker, 0), v = y.reduce((g, m) => g + m.distance, 0), d = y.reduce((g, m) => g + m.totalHrs, 0);
+    return C == null || C.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
+      cost: F,
+      hire: I,
       bunker: p,
-      distance: w,
-      hours: c
-    }), r < C ? { combined: !0, cost: Math.round(r * 1e3) / 1e3, speeds: d, step: n } : { combined: !0, cost: Math.round(C * 1e3) / 1e3, speeds: f, step: n };
+      distance: v,
+      hours: d
+    }), c < F ? { combined: !0, cost: Math.round(c * 1e3) / 1e3, speeds: r, step: n } : { combined: !0, cost: Math.round(F * 1e3) / 1e3, speeds: y, step: n };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1157,48 +1256,48 @@ class O {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async alternateAnalyse(t, e, a, i, o, n, s, d = {}) {
-    var l, b;
-    let r = g.utc(t.etd);
-    const m = { lat: t.lat, lng: t.lng }, M = [];
-    for (; r.isBefore(a); ) {
-      const f = r.clone().utc().add(s, "day"), C = JSON.parse(JSON.stringify(n.route)), S = JSON.parse(JSON.stringify(n.waypoints)), p = i[o], w = await O.analyseInstantWithThreshed(
-        m,
-        r.utc().format(),
-        f,
-        e,
+  static async alternateAnalyse(e, t, a, i, o, n, s, r = {}) {
+    var f, b;
+    let c = w.utc(e.etd);
+    const u = { lat: e.lat, lng: e.lng }, l = [];
+    for (; c.isBefore(a); ) {
+      const y = c.clone().utc().add(s, "day"), F = JSON.parse(JSON.stringify(n.route)), I = JSON.parse(JSON.stringify(n.waypoints)), p = i[o], v = await O.analyseInstantWithThreshed(
+        u,
+        c.utc().format(),
+        y,
+        t,
         p,
-        C,
-        S,
-        t.meteoVendor,
-        t.speedStep,
-        t.useMeteo,
-        t.useRouteParam,
-        d
+        F,
+        I,
+        e.meteoVendor,
+        e.speedStep,
+        e.useMeteo,
+        e.useRouteParam,
+        r
       );
-      w && (await O.calculateCost(w, p, t, d), F == null || F.info(
+      v && (await O.calculateCost(v, p, e, r), C == null || C.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
-        d.requestId,
-        d.level,
-        d.counter,
-        r.utc().format(),
-        f.utc().format(),
+        r.requestId,
+        r.level,
+        r.counter,
+        c.utc().format(),
+        y.utc().format(),
         {
-          cost: w.cost.total,
-          hire: w.cost.hire,
-          bunker: w.cost.bunker,
-          distance: w.distance,
-          hours: w.totalHrs,
+          cost: v.cost.total,
+          hire: v.cost.hire,
+          bunker: v.cost.bunker,
+          distance: v.distance,
+          hours: v.totalHrs,
           cp: `${p.speed}/${p.fo}/${p.dgo}`
         }
-      )), d.counter = d.counter + 1;
-      const c = (b = (l = w == null ? void 0 : w.sample) == null ? void 0 : l.hours) == null ? void 0 : b.at(-1);
-      if (c)
-        m.lat = c.lat, m.lng = c.lng, r = g(c.eta), M.push(w), o = o ? 0 : 1;
+      )), r.counter = r.counter + 1;
+      const d = (b = (f = v == null ? void 0 : v.sample) == null ? void 0 : f.hours) == null ? void 0 : b.at(-1);
+      if (d)
+        u.lat = d.lat, u.lng = d.lng, c = w(d.eta), l.push(v), o = o ? 0 : 1;
       else
         break;
     }
-    return M;
+    return l;
   }
   /**
    * 计算Speed的cost
@@ -1207,36 +1306,36 @@ class O {
    * @param props
    * @param options
    */
-  static async calculateCost(t, e, a, i = {}) {
+  static async calculateCost(e, t, a, i = {}) {
     var o;
-    if (t) {
-      const n = (a.addComm || 0) >= 1 ? (a.addComm || 0) / 100 : a.addComm || 0, s = Math.round(t.totalHrs / 24 * (a.dailyHire || 0) * (1 - n) * 1e3) / 1e3, d = Math.round(t.totalFoCons * (a.priceFO || 0) * 1e3) / 1e3, r = Math.round((t.totalDgoCons + (((o = t.extend) == null ? void 0 : o.totalDgoConsInECA) || 0)) * (a.priceDGO || 0) * 1e3) / 1e3;
-      t.cost = {
-        total: Math.round((s + d + r) * 1e3) / 1e3,
+    if (e) {
+      const n = (a.addComm || 0) >= 1 ? (a.addComm || 0) / 100 : a.addComm || 0, s = Math.round(e.totalHrs / 24 * (a.dailyHire || 0) * (1 - n) * 1e3) / 1e3, r = Math.round(e.totalFoCons * (a.priceFO || 0) * 1e3) / 1e3, c = Math.round((e.totalDgoCons + (((o = e.extend) == null ? void 0 : o.totalDgoConsInECA) || 0)) * (a.priceDGO || 0) * 1e3) / 1e3;
+      e.cost = {
+        total: Math.round((s + r + c) * 1e3) / 1e3,
         hire: s,
-        bunker: Math.round((d + r) * 1e3) / 1e3,
-        cp: e
+        bunker: Math.round((r + c) * 1e3) / 1e3,
+        cp: t
       };
     }
-    return t;
+    return e;
   }
   /**
    * 计算单cp模式下的ECA属性
    *
    */
-  static async calculateECA(t, e, a = {}) {
-    var d, r, m, M;
-    const i = await W.intersectInECA((t == null ? void 0 : t.route) || []);
+  static async calculateECA(e, t, a = {}) {
+    var r, c, u, l;
+    const i = await W.intersectInECA((e == null ? void 0 : e.route) || []);
     let o = 0, n = 0, s = 0;
-    (r = (d = t == null ? void 0 : t.sample) == null ? void 0 : d.wps) == null || r.forEach((l) => {
-      l.positionTime = g.utc(l.etd || l.eta).unix();
+    (c = (r = e == null ? void 0 : e.sample) == null ? void 0 : r.wps) == null || c.forEach((f) => {
+      f.positionTime = w.utc(f.etd || f.eta).unix();
     });
-    for (const l of i) {
-      o += l.distance;
-      const b = await W.deadReckoningTime((m = l.waypoints) == null ? void 0 : m.at(0), t.sample.wps), f = await W.deadReckoningTime((M = l.waypoints) == null ? void 0 : M.at(-1), t.sample.wps);
-      l.in = b, l.out = f, l.totalHrs = J.roundPrecision((f.positionTime - b.positionTime) / 3600, 3), l.totalDgoCons = J.roundPrecision(e.fo / 24 * l.totalHrs, 3), n += l.totalHrs, s += l.totalDgoCons;
+    for (const f of i) {
+      o += f.distance;
+      const b = await W.deadReckoningTime((u = f.waypoints) == null ? void 0 : u.at(0), e.sample.wps), y = await W.deadReckoningTime((l = f.waypoints) == null ? void 0 : l.at(-1), e.sample.wps);
+      f.in = b, f.out = y, f.totalHrs = _.roundPrecision((y.positionTime - b.positionTime) / 3600, 3), f.totalDgoCons = _.roundPrecision(t.fo / 24 * f.totalHrs, 3), n += f.totalHrs, s += f.totalDgoCons;
     }
-    return o = J.roundPrecision(o, 3), n = J.roundPrecision(n, 3), s = J.roundPrecision(s, 3), {
+    return o = _.roundPrecision(o, 3), n = _.roundPrecision(n, 3), s = _.roundPrecision(s, 3), {
       distanceInECA: o,
       hoursInECA: n,
       totalDgoConsInECA: s,
@@ -1248,84 +1347,84 @@ class O {
    * @param speeds
    * @param options
    */
-  static async mergeSpeeds(t, e = {}) {
-    var c, y;
+  static async mergeSpeeds(e, t = {}) {
+    var d, g;
     const a = {
       hours: [],
       wps: [],
       days: []
-    }, i = t.reduce((h, u) => h + u.distance, 0), o = t.reduce((h, u) => {
-      var I;
-      return h + (((I = u.extend) == null ? void 0 : I.distanceInECA) || 0);
-    }, 0), n = t.reduce((h, u) => h + u.totalHrs, 0), s = t.reduce((h, u) => {
-      var I;
-      return h + (((I = u.extend) == null ? void 0 : I.hoursInECA) || 0);
-    }, 0), d = t.reduce((h, u) => {
-      var I;
-      return h + (((I = u.extend) == null ? void 0 : I.totalDgoConsInECA) || 0);
-    }, 0), r = t.reduce((h, u) => h + u.wxFactor * u.totalHrs / n, 0), m = t.reduce((h, u) => h + u.cFactor * u.totalHrs / n, 0), M = t.reduce((h, u) => h + u.totalFoCons, 0), l = t.reduce((h, u) => h + u.totalDgoCons, 0), b = t.reduce((h, u) => h + u.cost.total, 0), f = t.reduce((h, u) => h + u.cost.hire, 0), C = t.reduce((h, u) => h + u.cost.bunker, 0), S = [], p = [];
-    let w;
-    for (const h of t) {
-      p.push(...((c = h.extend) == null ? void 0 : c.eca) || []);
-      const u = h.sample.hours, I = h.sample.wps, k = h.sample.days, D = u.at(0);
-      w && (D.distanceFromPrevious = w.distanceFromPrevious, D.distanceFromStart = w.distanceFromStart, u.forEach((T, N) => {
-        N && (T.distanceFromStart = T.distanceFromStart + w.distanceFromStart);
-      }), I.at(0).distanceFromPrevious = w.distanceFromPrevious, I.at(0).distanceFromStart = w.distanceFromStart, I.forEach((T, N) => {
-        N && (T.distanceFromStart = T.distanceFromStart + w.distanceFromStart);
-      }), k.at(0).distanceFromPrevious = w.distanceFromPrevious, k.at(0).distanceFromStart = w.distanceFromStart, k.forEach((T, N) => {
-        N && (T.distanceFromStart = T.distanceFromStart + w.distanceFromStart);
-      })), D.cp = h.cost.cp;
-      const Y = [h.etd, h.eta], j = S.findIndex((T) => T.id === D.cp.id);
-      j === -1 ? (D.cp.segment = [Y], S.push(D.cp)) : S[j].segment.push(Y), u.forEach((T) => {
-        var P;
-        ((P = a.hours) == null ? void 0 : P.findIndex((R) => R.eta === T.eta)) === -1 && a.hours.push(T);
-      }), I.forEach((T) => {
-        var P;
-        ((P = a.wps) == null ? void 0 : P.findIndex((R) => R.eta === T.eta)) === -1 && a.wps.push(T);
-      }), k.forEach((T) => {
-        var P;
-        ((P = a == null ? void 0 : a.days) == null ? void 0 : P.findIndex((R) => R.eta === T.eta)) === -1 && a.days.push(T);
+    }, i = e.reduce((m, h) => m + h.distance, 0), o = e.reduce((m, h) => {
+      var k;
+      return m + (((k = h.extend) == null ? void 0 : k.distanceInECA) || 0);
+    }, 0), n = e.reduce((m, h) => m + h.totalHrs, 0), s = e.reduce((m, h) => {
+      var k;
+      return m + (((k = h.extend) == null ? void 0 : k.hoursInECA) || 0);
+    }, 0), r = e.reduce((m, h) => {
+      var k;
+      return m + (((k = h.extend) == null ? void 0 : k.totalDgoConsInECA) || 0);
+    }, 0), c = e.reduce((m, h) => m + h.wxFactor * h.totalHrs / n, 0), u = e.reduce((m, h) => m + h.cFactor * h.totalHrs / n, 0), l = e.reduce((m, h) => m + h.totalFoCons, 0), f = e.reduce((m, h) => m + h.totalDgoCons, 0), b = e.reduce((m, h) => m + h.cost.total, 0), y = e.reduce((m, h) => m + h.cost.hire, 0), F = e.reduce((m, h) => m + h.cost.bunker, 0), I = [], p = [];
+    let v;
+    for (const m of e) {
+      p.push(...((d = m.extend) == null ? void 0 : d.eca) || []);
+      const h = m.sample.hours, k = m.sample.wps, S = m.sample.days, D = h.at(0);
+      v && (D.distanceFromPrevious = v.distanceFromPrevious, D.distanceFromStart = v.distanceFromStart, h.forEach((x, T) => {
+        T && (x.distanceFromStart = x.distanceFromStart + v.distanceFromStart);
+      }), k.at(0).distanceFromPrevious = v.distanceFromPrevious, k.at(0).distanceFromStart = v.distanceFromStart, k.forEach((x, T) => {
+        T && (x.distanceFromStart = x.distanceFromStart + v.distanceFromStart);
+      }), S.at(0).distanceFromPrevious = v.distanceFromPrevious, S.at(0).distanceFromStart = v.distanceFromStart, S.forEach((x, T) => {
+        T && (x.distanceFromStart = x.distanceFromStart + v.distanceFromStart);
+      })), D.cp = m.cost.cp;
+      const P = [m.etd, m.eta], N = I.findIndex((x) => x.id === D.cp.id);
+      N === -1 ? (D.cp.segment = [P], I.push(D.cp)) : I[N].segment.push(P), h.forEach((x) => {
+        var q;
+        ((q = a.hours) == null ? void 0 : q.findIndex((R) => R.eta === x.eta)) === -1 && a.hours.push(x);
+      }), k.forEach((x) => {
+        var q;
+        ((q = a.wps) == null ? void 0 : q.findIndex((R) => R.eta === x.eta)) === -1 && a.wps.push(x);
+      }), S.forEach((x) => {
+        var q;
+        ((q = a == null ? void 0 : a.days) == null ? void 0 : q.findIndex((R) => R.eta === x.eta)) === -1 && a.days.push(x);
       });
-      const A = (y = a.wps) == null ? void 0 : y.findIndex((T) => T.eta === D.eta);
-      A === -1 ? a.wps.push(D) : a.wps[A] = D, w = u.at(-1);
+      const A = (g = a.wps) == null ? void 0 : g.findIndex((x) => x.eta === D.eta);
+      A === -1 ? a.wps.push(D) : a.wps[A] = D, v = h.at(-1);
     }
-    return a.wps.sort((h, u) => {
-      g(h.etd).unix() - g(u.etd).unix();
-    }), a.wps.forEach((h, u) => {
-      const I = a.wps[u - 1];
-      if (I) {
-        const k = h.distanceFromStart - (I.distanceFromStart || 0), D = g(h.eta || h.etd).diff(g(I.etd || I.eta), "hour", !0), Y = Math.round(k / D * 100) / 100;
-        h.avgSpd = Y;
-        const j = W.calculateBearing(I, h);
-        I.bearing = j;
+    return a.wps.sort((m, h) => {
+      w(m.etd).unix() - w(h.etd).unix();
+    }), a.wps.forEach((m, h) => {
+      const k = a.wps[h - 1];
+      if (k) {
+        const S = m.distanceFromStart - (k.distanceFromStart || 0), D = w(m.eta || m.etd).diff(w(k.etd || k.eta), "hour", !0), P = Math.round(S / D * 100) / 100;
+        m.avgSpd = P;
+        const N = W.calculateBearing(k, m);
+        k.bearing = N;
       }
     }), {
       sample: a,
-      etd: t.at(0).etd,
-      eta: t.at(-1).eta,
-      from: t.at(0).from,
-      to: t.at(-1).to,
-      v0: t.at(0).v0,
+      etd: e.at(0).etd,
+      eta: e.at(-1).eta,
+      from: e.at(0).from,
+      to: e.at(-1).to,
+      v0: e.at(0).v0,
       label: "Combined",
       distance: Math.round(i * 1e3) / 1e3,
       totalHrs: Math.round(n * 1e3) / 1e3,
       avgSpeed: Math.round(i / n * 1e3) / 1e3,
-      wxFactor: Math.round(r * 1e3) / 1e3,
-      cFactor: Math.round(m * 1e3) / 1e3,
-      totalFoCons: Math.round(M * 1e3) / 1e3,
-      totalDgoCons: Math.round(l * 1e3) / 1e3,
+      wxFactor: Math.round(c * 1e3) / 1e3,
+      cFactor: Math.round(u * 1e3) / 1e3,
+      totalFoCons: Math.round(l * 1e3) / 1e3,
+      totalDgoCons: Math.round(f * 1e3) / 1e3,
       cost: {
         total: Math.round(b * 1e3) / 1e3,
-        hire: Math.round(f * 1e3) / 1e3,
-        bunker: Math.round(C * 1e3) / 1e3
+        hire: Math.round(y * 1e3) / 1e3,
+        bunker: Math.round(F * 1e3) / 1e3
       },
       extend: {
-        cps: S,
+        cps: I,
         eca: p,
         distanceInECA: Math.round(o * 1e3) / 1e3,
         hoursInECA: Math.round(s * 1e3) / 1e3,
-        totalDgoConsInECA: Math.round(d * 1e3) / 1e3,
-        speeds: t
+        totalDgoConsInECA: Math.round(r * 1e3) / 1e3,
+        speeds: e
       }
     };
   }
@@ -1333,14 +1432,14 @@ class O {
 export {
   st as AISImpl,
   yt as AlertHelper,
-  mt as AlertLevel,
-  xt as HifleetImpl,
-  gt as LoadCondition,
-  Nt as MyShipImpl,
-  Et as MyVesselImpl,
-  jt as ShipxyImpl,
+  ft as AlertLevel,
+  Et as HifleetImpl,
+  bt as LoadCondition,
+  Tt as MyShipImpl,
+  jt as MyVesselImpl,
+  Nt as ShipxyImpl,
   O as SpeedHelper,
-  wt as SpeedLabel,
-  bt as VesselTag,
-  Tt as alertHelper
+  vt as SpeedLabel,
+  gt as VesselTag,
+  xt as alertHelper
 };