@idm-plugin/vessel 1.5.4 → 1.5.6

package/dist/index.js

@@ -1,15 +1,15 @@
 var st = Object.defineProperty;
-var at = (I, s, t) => s in I ? st(I, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : I[s] = t;
-var Z = (I, s, t) => (at(I, typeof s != "symbol" ? s + "" : s, t), t);
-import A from "got";
+var at = (k, s, t) => s in k ? st(k, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : k[s] = t;
+var Z = (k, s, t) => (at(k, typeof s != "symbol" ? s + "" : s, t), t);
+import O from "got";
 import z from "@log4js-node/log4js-api";
 import v from "moment";
 import { LngLatHelper as B, LaneHelper as V } from "@idm-plugin/geo";
 import { MeteoHelper2 as ot, MeteoHelper as nt } from "@idm-plugin/meteo2";
 import { Meteo2Assist as tt } from "@idm-plugin/meteo";
-let h;
+let u;
 try {
-  h = z.getLogger("vessel");
+  u = z.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -19,79 +19,79 @@ class K {
    * @param status
    */
   parseStatus(s) {
-    let t, o;
+    let t, i;
     switch (s) {
       case 0:
-        t = "在航（主机推动）", o = "The engine is in use";
+        t = "在航（主机推动）", i = "The engine is in use";
         break;
       case 1:
-        t = "锚泊", o = "Anchored";
+        t = "锚泊", i = "Anchored";
         break;
       case 2:
-        t = "失控", o = "Not operated";
+        t = "失控", i = "Not operated";
         break;
       case 3:
-        t = "操纵受限", o = "Limited airworthiness";
+        t = "操纵受限", i = "Limited airworthiness";
         break;
       case 4:
-        t = "吃水受限", o = "Limited by ship's draft";
+        t = "吃水受限", i = "Limited by ship's draft";
         break;
       case 5:
-        t = "靠泊", o = "Mooring";
+        t = "靠泊", i = "Mooring";
         break;
       case 6:
-        t = "搁浅", o = "Stranded";
+        t = "搁浅", i = "Stranded";
         break;
       case 7:
-        t = "捕捞作业", o = "Engaged in fishing";
+        t = "捕捞作业", i = "Engaged in fishing";
         break;
       case 8:
-        t = "靠帆船提供动力", o = "Sailing";
+        t = "靠帆船提供动力", i = "Sailing";
         break;
       default:
-        t = "未定义", o = "Undefined";
+        t = "未定义", i = "Undefined";
     }
-    return { labelCn: t, labelEn: o };
+    return { labelCn: t, labelEn: i };
   }
 }
 class bt extends K {
-  constructor(t, o) {
+  constructor(t, i) {
     super();
     Z(this, "clientId");
     Z(this, "clientSecret");
     Z(this, "token");
-    this.clientId = t, this.clientSecret = o;
+    this.clientId = t, this.clientSecret = i;
   }
   async authToken(t = {}) {
-    const o = "https://svc.data.myvessel.cn/ada/oauth/token", n = {
+    const i = "https://svc.data.myvessel.cn/ada/oauth/token", o = {
       searchParams: {
         client_id: this.clientId,
         client_secret: this.clientSecret,
         grant_type: "client_credentials"
       }
-    }, i = await A.post(o, n).json();
-    h == null || h.info("[%s] fetch access token from: %s - %j", t.requestId, o, i), i.error || (this.token = {
-      accessToken: i.access_token,
-      tokenType: i.token_type,
-      expiresIn: i.expires_in,
-      scope: i.scope,
-      jti: i.jti,
+    }, n = await O.post(i, o).json();
+    u == null || u.info("[%s] fetch access token from: %s - %j", t.requestId, i, n), n.error || (this.token = {
+      accessToken: n.access_token,
+      tokenType: n.token_type,
+      expiresIn: n.expires_in,
+      scope: n.scope,
+      jti: n.jti,
       issuedAt: v().utc().format()
     });
   }
-  async realTimePosition(t, o = {}) {
+  async realTimePosition(t, i = {}) {
     var d, f, M;
-    (!this.token || v().diff(v(this.token.issuedAt), "seconds") > ((d = this.token) == null ? void 0 : d.expiresIn) - 300) && await this.authToken(o);
-    const n = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", i = {
+    (!this.token || v().diff(v(this.token.issuedAt), "seconds") > ((d = this.token) == null ? void 0 : d.expiresIn) - 300) && await this.authToken(i);
+    const o = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", n = {
       headers: {
         Authorization: `${(f = this.token) == null ? void 0 : f.tokenType} ${(M = this.token) == null ? void 0 : M.accessToken}`
       },
       searchParams: { mmsi: t }
     };
-    h == null || h.info("[%s] fetch realtime position from: %s - %j", o.requestId, n, i);
-    const a = await A.get(n, i).json();
+    u == null || u.info("[%s] fetch realtime position from: %s - %j", i.requestId, o, n);
+    const a = await O.get(o, n).json();
     if (a.code)
-      return h == null || h.warn("[%s] fetch realtime position failed: %j", o.requestId, n, { message: a.message, status: a.status, code: a.code }), a;
+      return u == null || u.warn("[%s] fetch realtime position failed: %j", i.requestId, o, { message: a.message, status: a.status, code: a.code }), a;
     const e = a.data;
     for (const m in e)
       !isNaN(e[m]) && Number(e[m]) !== 1 / 0 && (e[m] = Number(e[m]));
@@ -121,54 +121,54 @@ class bt extends K {
       utc: c.utc().format()
     };
   }
-  async trajectory(t, o, n, i, a = !0, e = {}) {
+  async trajectory(t, i, o, n, a = !0, e = {}) {
     (!this.token || v().diff(v(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(e);
-    const c = await this.realTimePosition(t, e), r = v(o), d = v(n), f = [];
+    const c = await this.realTimePosition(t, e), r = v(i), d = v(o), f = [];
     for (; d.diff(r, "day", !0) > 30; )
-      await this.trajectoryIn30Day(t, r, r.clone().add(30, "day"), c, i, f, e), r.add(30, "day");
-    return await this.trajectoryIn30Day(t, r, d, c, i, f, e), f;
+      await this.trajectoryIn30Day(t, r, r.clone().add(30, "day"), c, n, f, e), r.add(30, "day");
+    return await this.trajectoryIn30Day(t, r, d, c, n, f, e), f;
   }
-  async trajectoryIn30Day(t, o, n, i, a, e, c = {}) {
-    var u, Y, j, b, p;
+  async trajectoryIn30Day(t, i, o, n, a, e, c = {}) {
+    var h, w, I, b, p;
     const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", d = {
       headers: {
-        Authorization: `${(u = this.token) == null ? void 0 : u.tokenType} ${(Y = this.token) == null ? void 0 : Y.accessToken}`
+        Authorization: `${(h = this.token) == null ? void 0 : h.tokenType} ${(w = this.token) == null ? void 0 : w.accessToken}`
       },
       json: {
         mmsi: t,
-        startTime: o.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
-        endTime: n.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
+        startTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
+        endTime: o.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    h == null || h.info("[%s] fetch trajectory from: %s - %j", c.requestId, r, d);
-    const f = await A.post(r, d).json();
+    u == null || u.info("[%s] fetch trajectory from: %s - %j", c.requestId, r, d);
+    const f = await O.post(r, d).json();
     if (f.code)
-      return h == null || h.warn("[%s] fetch trajectory failed: %j", c.requestId, r, { message: f.message, status: f.status, code: f.code }), f;
+      return u == null || u.warn("[%s] fetch trajectory failed: %j", c.requestId, r, { message: f.message, status: f.status, code: f.code }), f;
     let M = -1;
-    const m = v(`${(b = (j = f.data) == null ? void 0 : j[0]) == null ? void 0 : b.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const m = v(`${(b = (I = f.data) == null ? void 0 : I[0]) == null ? void 0 : b.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return (p = f.data) == null || p.forEach((l) => {
-      for (const O in l)
-        !isNaN(l[O]) && Number(l[O]) !== 1 / 0 && (l[O] = Number(l[O]));
-      const k = v(`${l.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), w = l.status, { labelCn: y, labelEn: g } = this.parseStatus(w), H = {
+      for (const R in l)
+        !isNaN(l[R]) && Number(l[R]) !== 1 / 0 && (l[R] = Number(l[R]));
+      const Y = v(`${l.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), j = l.status, { labelCn: y, labelEn: g } = this.parseStatus(j), D = {
         mmsi: l.mmsi,
-        imo: i == null ? void 0 : i.imo,
+        imo: n == null ? void 0 : n.imo,
         lat: l.lat,
         lng: l.lon,
         sog: l.sog,
         cog: l.cog,
         hdg: l.hdg,
         draught: l.draught,
-        status: w,
+        status: j,
         eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(l.eta) ? v(`${l.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
         destination: l.dest,
-        positionTime: k.unix(),
+        positionTime: Y.unix(),
         labelCn: y,
         labelEn: g,
         method: "trajectory",
         vendor: "myVessel",
-        utc: k.utc().format()
-      }, F = Math.floor(k.diff(m, "minute", !0) / (a || 1));
-      F !== M && (M = F, e.push(H));
+        utc: Y.utc().format()
+      }, F = Math.floor(Y.diff(m, "minute", !0) / (a || 1));
+      F !== M && (M = F, e.push(D));
     }), e;
   }
 }
@@ -178,17 +178,17 @@ class vt extends K {
     Z(this, "token");
     this.token = t;
   }
-  async realTimePosition(t, o = {}) {
-    const n = "https://api.hifleet.com/position/position/get/token", i = {
+  async realTimePosition(t, i = {}) {
+    const o = "https://api.hifleet.com/position/position/get/token", n = {
       searchParams: {
         mmsi: t,
         usertoken: this.token
       }
-    }, a = await A.post(n, i).json();
-    h == null || h.info("[%s] fetch realtime position from: %s - %j", o.requestId, n, i);
+    }, a = await O.post(o, n).json();
+    u == null || u.info("[%s] fetch realtime position from: %s - %j", i.requestId, o, n);
     const e = a == null ? void 0 : a.list;
     if (!e)
-      return h == null || h.warn("[%s] fetch realtime position failed: %j", o.requestId, n, a), a;
+      return u == null || u.warn("[%s] fetch realtime position failed: %j", i.requestId, o, a), a;
     for (const m in e)
       !isNaN(e[m]) && Number(e[m]) !== 1 / 0 && (e[m] = Number(e[m]));
     e.status = e.sp > 3 ? 0 : 1;
@@ -218,9 +218,9 @@ class vt extends K {
       vendor: "hifleet"
     };
   }
-  async search(t, o = {}) {
-    let n = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
-    const i = {
+  async search(t, i = {}) {
+    let o = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
+    const n = {
       searchParams: {
         keyword: t
       },
@@ -230,8 +230,8 @@ class vt extends K {
         Host: "www.hifleet.com"
       }
     };
-    let a = await A.post(n, i).json();
-    h == null || h.info("[%s] fetch vessel props from: %s - %j", o.requestId, n, i), a instanceof Array && (a = a[0]);
+    let a = await O.post(o, n).json();
+    u == null || u.info("[%s] fetch vessel props from: %s - %j", i.requestId, o, n), a instanceof Array && (a = a[0]);
     for (const c in a)
       !isNaN(a[c]) && Number(a[c]) !== 1 / 0 && (a[c] = Number(a[c]));
     const e = {
@@ -241,15 +241,39 @@ class vt extends K {
       callSign: a.c,
       length: a.l,
       breadth: a.b,
-      draught: a.dr
+      draught: a.dr,
+      type: a.t
     };
-    return n = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", a = await A.post(n, i).json(), h == null || h.info("[%s] fetch vessel dead weight from: %s - %j", o.requestId, n, i), a instanceof Array && (a = a[0]), a && (e.deadweight = Number(a.dwt)), e;
+    return o = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", a = await O.post(o, n).json(), u == null || u.info("[%s] search vessel dead weight from: %s - %j", i.requestId, o, n), a instanceof Array && (a = a[0]), a && (e.deadweight = Number(a.dwt)), e;
+  }
+  async suggest(t, i = {}) {
+    const o = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", n = {
+      searchParams: {
+        q: t
+      },
+      headers: {
+        Referer: "https://www.hifleet.com",
+        Origin: "https://www.hifleet.com",
+        Host: "www.hifleet.com"
+      }
+    }, a = await O.post(o, n).json();
+    u == null || u.info("[%s] suggest vessel props from: %s - %j", i.requestId, o, n);
+    const e = [];
+    for (const c of a)
+      e.push({
+        mmsi: !c.mmsi || isNaN(c.mmsi) ? null : Number(c.mmsi),
+        name: c.name,
+        callSign: c.callsign,
+        imo: !c.imo || isNaN(c.imo) ? null : Number(c.imo),
+        score: c._score
+      });
+    return e.sort((c, r) => r.score - c.score), e;
   }
-  async trajectory(t, o, n, i, a = !0, e = {}) {
-    var l, k, w;
+  async trajectory(t, i, o, n, a = !0, e = {}) {
+    var l, Y, j;
     const c = await this.realTimePosition(t, e);
-    let r = v(o);
-    const d = v(n), f = v();
+    let r = v(i);
+    const d = v(o), f = v();
     if (a) {
       let y = d.diff(r, "d", !0);
       y < 0 ? r = d.clone().subtract(40, "d") : y < 30 ? r.subtract(10, "d") : y < 60 ? r.subtract(5, "d") : r = d.clone().subtract(80, "d"), y = f.diff(d, "d", !0), d.add(y > 10 ? 240 : y * 24, "h");
@@ -261,19 +285,19 @@ class vt extends K {
         mmsi: t,
         usertoken: this.token
       }
-    }, m = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", u = await A.get(m, M).json();
-    h == null || h.info("[%s] fetch trajectory from: %s - %j", e.requestId, m, M);
-    let Y;
-    u && (Y = ((k = (l = u.ships) == null ? void 0 : l.offors) == null ? void 0 : k.ship) || [], Y.length || h == null || h.warn("[%s] fetch trajectory failed: %j", e.requestId, u));
-    const j = [];
+    }, m = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", h = await O.get(m, M).json();
+    u == null || u.info("[%s] fetch trajectory from: %s - %j", e.requestId, m, M);
+    let w;
+    h && (w = ((Y = (l = h.ships) == null ? void 0 : l.offors) == null ? void 0 : Y.ship) || [], w.length || u == null || u.warn("[%s] fetch trajectory failed: %j", e.requestId, h));
+    const I = [];
     let b = -1;
-    const p = v(`${(w = Y == null ? void 0 : Y[0]) == null ? void 0 : w.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const y of Y) {
+    const p = v(`${(j = w == null ? void 0 : w[0]) == null ? void 0 : j.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const y of w) {
       for (const L in y)
         !isNaN(y[L]) && Number(y[L]) !== 1 / 0 && (y[L] = Number(y[L]));
       const g = v(`${y.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       y.status = y.sp > 4 ? 0 : 1;
-      const { labelEn: H, labelCn: F } = this.parseStatus(y.status), O = {
+      const { labelEn: D, labelCn: F } = this.parseStatus(y.status), R = {
         mmsi: y.m,
         name: y.n,
         imo: c == null ? void 0 : c.imo,
@@ -287,30 +311,30 @@ class vt extends K {
         utc: g.utc().format(),
         status: y.status,
         labelCn: F,
-        labelEn: H,
+        labelEn: D,
         method: "trajectory",
         vendor: "hifleet"
-      }, N = Math.floor(g.diff(p, "minute", !0) / (i || 1));
-      N !== b && (b = N, j.push(O));
+      }, H = Math.floor(g.diff(p, "minute", !0) / (n || 1));
+      H !== b && (b = H, I.push(R));
     }
-    return j;
+    return I;
   }
 }
-class Yt extends K {
+class wt extends K {
   constructor(t) {
     super();
     Z(this, "token");
     this.token = t;
   }
-  async realTimePosition(t, o = {}) {
-    const n = {
+  async realTimePosition(t, i = {}) {
+    const o = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1
       }
-    }, i = "https://api.shipxy.com/apicall/GetSingleShip", a = await A.get(i, n).json();
-    if (h == null || h.info("[%s] fetch realtime position from: %s - %j", o.requestId, i, n), (a == null ? void 0 : a.status) !== 0)
+    }, n = "https://api.shipxy.com/apicall/GetSingleShip", a = await O.get(n, o).json();
+    if (u == null || u.info("[%s] fetch realtime position from: %s - %j", i.requestId, n, o), (a == null ? void 0 : a.status) !== 0)
       return a;
     const e = a.data[0];
     for (const M in e)
@@ -339,9 +363,9 @@ class Yt extends K {
       vendor: "shipxy"
     };
   }
-  async trajectory(t, o, n, i, a = !0, e = {}) {
+  async trajectory(t, i, o, n, a = !0, e = {}) {
     var p;
-    const c = await this.realTimePosition(t, e), r = v(o), d = v(n), f = "https://api.shipxy.com/apicall/GetShipTrack", M = {
+    const c = await this.realTimePosition(t, e), r = v(i), d = v(o), f = "https://api.shipxy.com/apicall/GetShipTrack", M = {
       searchParams: {
         id: t,
         k: this.token,
@@ -350,60 +374,60 @@ class Yt extends K {
         btm: r.unix(),
         etm: d.unix()
       }
-    }, m = await A.get(f, M).json();
-    if (h == null || h.info("[%s] fetch trajectory from: %s - %j", e.requestId, f, M), (m == null ? void 0 : m.status) !== 0)
+    }, m = await O.get(f, M).json();
+    if (u == null || u.info("[%s] fetch trajectory from: %s - %j", e.requestId, f, M), (m == null ? void 0 : m.status) !== 0)
       return m;
-    const u = m == null ? void 0 : m.points, Y = [], j = v.unix((p = u[0]) == null ? void 0 : p.utc);
+    const h = m == null ? void 0 : m.points, w = [], I = v.unix((p = h[0]) == null ? void 0 : p.utc);
     let b = -1;
-    for (const l of u) {
-      const k = v.unix(l.utc), w = {
+    for (const l of h) {
+      const Y = v.unix(l.utc), j = {
         imo: c == null ? void 0 : c.imo,
         mmsi: t,
         sog: Math.round(l.sog * 3600 / 1e3 / 1852 * 100) / 100,
         cog: Math.round(l.cog / 100 * 100) / 100,
         lat: Math.round(l.lat / 1e6 * 1e5) / 1e5,
         lng: Math.round(l.lon / 1e6 * 1e5) / 1e5,
-        positionTime: k.unix(),
-        utc: k.utc().format(),
+        positionTime: Y.unix(),
+        utc: Y.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, y = Math.floor(k.diff(j, "minute", !0) / (i || 1));
-      y !== b && (b = y, Y.push(w));
+      }, y = Math.floor(Y.diff(I, "minute", !0) / (n || 1));
+      y !== b && (b = y, w.push(j));
     }
-    return Y;
+    return w;
   }
 }
-class kt extends K {
+class Yt extends K {
   constructor(t) {
     super();
     Z(this, "token");
     this.token = t;
   }
-  async getShipId(t, o = {}) {
-    const n = {
+  async getShipId(t, i = {}) {
+    const o = {
       headers: {
         appKey: this.token
       },
       json: {
         mmsiList: t
       }
-    }, i = "https://api3.myships.com/sp/ships/getShipIdByMMSI", a = await A.post(i, n).json();
-    return h == null || h.info("[%s] fetch ship id from: %s - %j", o.requestId, i, n), a.code !== "0" ? a : a.data[0].shipId;
+    }, n = "https://api3.myships.com/sp/ships/getShipIdByMMSI", a = await O.post(n, o).json();
+    return u == null || u.info("[%s] fetch ship id from: %s - %j", i.requestId, n, o), a.code !== "0" ? a : a.data[0].shipId;
   }
-  async getShipInfo(t, o = {}) {
-    const n = {
+  async getShipInfo(t, i = {}) {
+    const o = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: t
       }
-    }, i = "https://api3.myships.com/sp/ships/aissta", a = await A.post(i, n).json();
-    if (h == null || h.info("[%s] fetch ship info from: %s - %j", o.requestId, i, n), a.code !== "0")
+    }, n = "https://api3.myships.com/sp/ships/aissta", a = await O.post(n, o).json();
+    if (u == null || u.info("[%s] fetch ship info from: %s - %j", i.requestId, n, o), a.code !== "0")
       return a;
     const e = a.data;
     let c = e.imo;
-    return t === "407170" && (c = "9198379", h == null || h.warn("[%s] ship(%s) imo error: %s, should be %s", o.requestId, t, e.imo, c)), {
+    return t === "407170" && (c = "9198379", u == null || u.warn("[%s] ship(%s) imo error: %s, should be %s", i.requestId, t, e.imo, c)), {
       mmsi: e.mmsi,
       name: e.shipnameEn,
       imo: c,
@@ -413,22 +437,22 @@ class kt extends K {
       draught: (e.draught || 100) / 10
     };
   }
-  async realTimePosition(t, o = {}) {
-    const n = await this.getShipId(t, o), i = await this.getShipInfo(n, o), a = {
+  async realTimePosition(t, i = {}) {
+    const o = await this.getShipId(t, i), n = await this.getShipInfo(o, i), a = {
       headers: {
         appKey: this.token
       },
       json: {
-        shipId: n
+        shipId: o
       }
-    }, e = "https://api3.myships.com/sp/ships/position/latest", c = await A.post(e, a).json();
-    h == null || h.info("[%s] fetch realtime position from: %s - %j", o.requestId, e, a);
+    }, e = "https://api3.myships.com/sp/ships/position/latest", c = await O.post(e, a).json();
+    u == null || u.info("[%s] fetch realtime position from: %s - %j", i.requestId, e, a);
     const r = c.data[0];
-    for (const u in r)
-      !isNaN(r[u]) && Number(r[u]) !== 1 / 0 && (r[u] = Number(r[u]));
+    for (const h in r)
+      !isNaN(r[h]) && Number(r[h]) !== 1 / 0 && (r[h] = Number(r[h]));
     const { labelCn: d, labelEn: f } = await this.parseStatus(r.aisNavStatus), M = v.unix(r.posTime);
     return {
-      ...i,
+      ...n,
       mmsi: t,
       lat: Math.round(r.lat / 1e4 / 60 * 1e5) / 1e5,
       lng: Math.round(r.lon / 1e4 / 60 * 1e5) / 1e5,
@@ -445,34 +469,34 @@ class kt extends K {
       vendor: "myship"
     };
   }
-  async trajectory(t, o, n, i, a = !0, e = {}) {
-    const c = v(o), r = v(n), d = await this.getShipId(t), f = await this.getShipInfo(d), M = [];
+  async trajectory(t, i, o, n, a = !0, e = {}) {
+    const c = v(i), r = v(o), d = await this.getShipId(t), f = await this.getShipInfo(d), M = [];
     for (; r.diff(c, "day", !0) > 30; )
-      await this.trajectoryIn30Day(d, c.unix(), c.add(30, "day").unix(), f, t, i, M);
-    return await this.trajectoryIn30Day(d, c.unix(), r.unix(), f, t, i, M), M;
+      await this.trajectoryIn30Day(d, c.unix(), c.add(30, "day").unix(), f, t, n, M);
+    return await this.trajectoryIn30Day(d, c.unix(), r.unix(), f, t, n, M), M;
   }
-  async trajectoryIn30Day(t, o, n, i, a, e, c, r = {}) {
-    var j;
+  async trajectoryIn30Day(t, i, o, n, a, e, c, r = {}) {
+    var I;
     const d = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: t,
-        startTime: o,
-        endTime: n
+        startTime: i,
+        endTime: o
       }
-    }, f = "https://api3.myships.com/sp/ships/position/history", M = await A.post(f, d).json();
-    if (h == null || h.info("[%s] fetch trajectory from: %s - %j", r.requestId, f, d), M.code !== "0")
-      return h == null || h.warn("[%s] invoke myship trajectory failed: %j", r.requestId, M), M;
+    }, f = "https://api3.myships.com/sp/ships/position/history", M = await O.post(f, d).json();
+    if (u == null || u.info("[%s] fetch trajectory from: %s - %j", r.requestId, f, d), M.code !== "0")
+      return u == null || u.warn("[%s] invoke myship trajectory failed: %j", r.requestId, M), M;
     const m = M.data;
     for (const b in m)
       !isNaN(m[b]) && Number(m[b]) !== 1 / 0 && (m[b] = Number(m[b]));
-    const u = v.unix((j = m[0]) == null ? void 0 : j.posTime);
-    let Y = -1;
+    const h = v.unix((I = m[0]) == null ? void 0 : I.posTime);
+    let w = -1;
     for (const b of m) {
       const p = v.unix(b.posTime), l = {
-        imo: i == null ? void 0 : i.imo,
+        imo: n == null ? void 0 : n.imo,
         mmsi: a,
         lat: Math.round(b.lat / 1e4 / 60 * 1e5) / 1e5,
         lng: Math.round(b.lon / 1e4 / 60 * 1e5) / 1e5,
@@ -484,19 +508,19 @@ class kt extends K {
         utc: p.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, k = Math.floor(p.diff(u, "minute", !0) / (e || 1));
-      k !== Y && (Y = k, c.push(l));
+      }, Y = Math.floor(p.diff(h, "minute", !0) / (e || 1));
+      Y !== w && (w = Y, c.push(l));
     }
     return c;
   }
 }
-let R;
+let A;
 try {
-  R = z.getLogger("vessel");
+  A = z.getLogger("vessel");
 } catch {
 } finally {
 }
-var it = /* @__PURE__ */ ((I) => (I.NOTICE = "NOTICE", I.WARN = "WARN", I.HEAVY = "HEAVY", I.SEVERE = "SEVERE", I.ERROR = "ERROR", I.FATAL = "FATAL", I))(it || {});
+var it = /* @__PURE__ */ ((k) => (k.NOTICE = "NOTICE", k.WARN = "WARN", k.HEAVY = "HEAVY", k.SEVERE = "SEVERE", k.ERROR = "ERROR", k.FATAL = "FATAL", k))(it || {});
 class rt {
   /**
    * 解析告警规则, 多规则场景
@@ -508,19 +532,19 @@ class rt {
    */
   parsePrinciple(s, t = {}) {
     var e, c, r;
-    R == null || R.info("[%s] parse rule: %s", t.requestId, s);
-    const o = new RegExp("(?<=\\[)(.+)(?=])", "g"), n = s.match(o) ? (e = s.match(o)) == null ? void 0 : e[0] : void 0, i = n == null ? void 0 : n.split(";");
-    if (!i)
+    A == null || A.info("[%s] parse rule: %s", t.requestId, s);
+    const i = new RegExp("(?<=\\[)(.+)(?=])", "g"), o = s.match(i) ? (e = s.match(i)) == null ? void 0 : e[0] : void 0, n = o == null ? void 0 : o.split(";");
+    if (!n)
       return;
     const a = {};
-    for (let d = 0; d < (i == null ? void 0 : i.length); d++) {
-      const f = (r = (c = i[d].match(o)) == null ? void 0 : c[0]) == null ? void 0 : r.split("],");
+    for (let d = 0; d < (n == null ? void 0 : n.length); d++) {
+      const f = (r = (c = n[d].match(i)) == null ? void 0 : c[0]) == null ? void 0 : r.split("],");
       if (d === 0 && !f)
-        a.scope = i[0];
+        a.scope = n[0];
       else if (f)
         for (let M = 0, m = f.length; M < m; M++) {
-          const u = this.parseRule(f[M]);
-          u && (a[u.level] ? u.key ? a[u.level][u == null ? void 0 : u.key] = u : a[u.level] = u : u.key ? a[u.level] = { [u == null ? void 0 : u.key]: u } : a[u.level] = u);
+          const h = this.parseRule(f[M]);
+          h && (a[h.level] ? h.key ? a[h.level][h == null ? void 0 : h.key] = h : a[h.level] = h : h.key ? a[h.level] = { [h == null ? void 0 : h.key]: h } : a[h.level] = h);
         }
     }
     return a;
@@ -533,15 +557,15 @@ class rt {
    */
   parseRule(s, t = {}) {
     var a;
-    R == null || R.info("[%s] parse rule: %s", t.requestId, s), s = s.startsWith("[") ? s : `[${s}`, s = s.endsWith("]") ? s : `${s}]`;
-    const o = new RegExp("(?<=\\[)(.+?)(?=])", "g"), n = (a = s == null ? void 0 : s.match(o)) == null ? void 0 : a[0], i = n == null ? void 0 : n.split(",");
-    if (i)
+    A == null || A.info("[%s] parse rule: %s", t.requestId, s), s = s.startsWith("[") ? s : `[${s}`, s = s.endsWith("]") ? s : `${s}]`;
+    const i = new RegExp("(?<=\\[)(.+?)(?=])", "g"), o = (a = s == null ? void 0 : s.match(i)) == null ? void 0 : a[0], n = o == null ? void 0 : o.split(",");
+    if (n)
       return {
-        operator: i[0],
-        number: Number.isNaN(Number(i[1])) ? i[1] : Number(i[1]),
-        level: i[2],
-        time: Number(i[3]),
-        key: i[4]
+        operator: n[0],
+        number: Number.isNaN(Number(n[1])) ? n[1] : Number(n[1]),
+        level: n[2],
+        time: Number(n[3]),
+        key: n[4]
       };
   }
   /**
@@ -550,26 +574,26 @@ class rt {
    * @param principle 告警规则
    * @param options
    */
-  checkWeather(s, t, o = {}) {
-    var u, Y, j, b, p, l, k, w, y, g, H, F, O, N, L;
-    let n = 0, i = 0, a = 0, e = 0;
-    const c = Math.round(((Y = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.sigWave) == null ? void 0 : Y.number) * 1.6 * 100) / 100, r = (b = (j = t == null ? void 0 : t.SEVERE) == null ? void 0 : j.sigWave) == null ? void 0 : b.number, d = (l = (p = t == null ? void 0 : t.HEAVY) == null ? void 0 : p.sigWave) == null ? void 0 : l.number, f = Math.round((((w = (k = t == null ? void 0 : t.SEVERE) == null ? void 0 : k.wind) == null ? void 0 : w.number) + 2) * 100) / 100, M = (g = (y = t == null ? void 0 : t.SEVERE) == null ? void 0 : y.wind) == null ? void 0 : g.number, m = (F = (H = t == null ? void 0 : t.HEAVY) == null ? void 0 : H.wind) == null ? void 0 : F.number;
+  checkWeather(s, t, i = {}) {
+    var h, w, I, b, p, l, Y, j, y, g, D, F, R, H, L;
+    let o = 0, n = 0, a = 0, e = 0;
+    const c = Math.round(((w = (h = t == null ? void 0 : t.SEVERE) == null ? void 0 : h.sigWave) == null ? void 0 : w.number) * 1.6 * 100) / 100, r = (b = (I = t == null ? void 0 : t.SEVERE) == null ? void 0 : I.sigWave) == null ? void 0 : b.number, d = (l = (p = t == null ? void 0 : t.HEAVY) == null ? void 0 : p.sigWave) == null ? void 0 : l.number, f = Math.round((((j = (Y = t == null ? void 0 : t.SEVERE) == null ? void 0 : Y.wind) == null ? void 0 : j.number) + 2) * 100) / 100, M = (g = (y = t == null ? void 0 : t.SEVERE) == null ? void 0 : y.wind) == null ? void 0 : g.number, m = (F = (D = t == null ? void 0 : t.HEAVY) == null ? void 0 : D.wind) == null ? void 0 : F.number;
     for (let W = 0; W < (s == null ? void 0 : s.length); W++) {
-      const T = s[W], P = (N = (O = T == null ? void 0 : T.meteo) == null ? void 0 : O.wave) == null ? void 0 : N.sig, D = (L = T == null ? void 0 : T.meteo) == null ? void 0 : L.wind, E = W ? v(T.eta).diff(v(s[W - 1].eta), "hour", !0) : 0;
-      e = E > e ? E : e, R == null || R.info("[%s] check sig.wave: %j", o.requestId, { ...P, dgThd4Wv: c, svThd4Wv: r, hvThd4Wv: d }), (P == null ? void 0 : P.height) >= c ? T.isDangerous = !0 : (P == null ? void 0 : P.height) >= r ? T.isSevere = !0 : (P == null ? void 0 : P.height) >= d && (T.isHeavy = !0), R == null || R.info("[%s] check wind: %j", o.requestId, { ...D, dgThd4Wd: f, svThd4Wd: M, hvThd4Wd: m }), (D == null ? void 0 : D.scale) >= f ? (T.isDangerous = !0, delete T.isSevere, delete T.isHeavy) : (D == null ? void 0 : D.scale) > M ? (T.isDangerous || (T.isSevere = !0), delete T.isHeavy) : (D == null ? void 0 : D.scale) === m && !T.isDangerous && !T.isSevere && (T.isHeavy = !0), n += T.isDangerous ? E : 0, i += T.isSevere ? E : 0, a += T.isHeavy ? E : 0;
+      const S = s[W], P = (H = (R = S == null ? void 0 : S.meteo) == null ? void 0 : R.wave) == null ? void 0 : H.sig, N = (L = S == null ? void 0 : S.meteo) == null ? void 0 : L.wind, E = W ? v(S.eta).diff(v(s[W - 1].eta), "hour", !0) : 0;
+      e = E > e ? E : e, A == null || A.info("[%s] check sig.wave: %j", i.requestId, { ...P, dgThd4Wv: c, svThd4Wv: r, hvThd4Wv: d }), (P == null ? void 0 : P.height) >= c ? S.isDangerous = !0 : (P == null ? void 0 : P.height) >= r ? S.isSevere = !0 : (P == null ? void 0 : P.height) >= d && (S.isHeavy = !0), A == null || A.info("[%s] check wind: %j", i.requestId, { ...N, dgThd4Wd: f, svThd4Wd: M, hvThd4Wd: m }), (N == null ? void 0 : N.scale) >= f ? (S.isDangerous = !0, delete S.isSevere, delete S.isHeavy) : (N == null ? void 0 : N.scale) > M ? (S.isDangerous || (S.isSevere = !0), delete S.isHeavy) : (N == null ? void 0 : N.scale) === m && !S.isDangerous && !S.isSevere && (S.isHeavy = !0), o += S.isDangerous ? E : 0, n += S.isSevere ? E : 0, a += S.isHeavy ? E : 0;
     }
-    return n = Math.round(n * 100) / 100, i = Math.round(i * 100) / 100, a = Math.round(a * 100) / 100, e = Math.round(e), { sample: s, dangerous: n, severe: i, heavy: a, step: e < 3 ? 3 : e, wind: { dgThd4Wd: f, svThd4Wd: M, hvThd4Wd: m }, sig: { dgThd4Wv: c, svThd4Wv: r, hvThd4Wv: d } };
+    return o = Math.round(o * 100) / 100, n = Math.round(n * 100) / 100, a = Math.round(a * 100) / 100, e = Math.round(e), { sample: s, dangerous: o, severe: n, heavy: a, step: e < 3 ? 3 : e, wind: { dgThd4Wd: f, svThd4Wd: M, hvThd4Wd: m }, sig: { dgThd4Wv: c, svThd4Wv: r, hvThd4Wv: d } };
   }
 }
-const It = new rt();
-let S;
+const kt = new rt();
+let T;
 try {
-  S = z.getLogger("vessel");
+  T = z.getLogger("vessel");
 } catch {
 } finally {
 }
 const ct = new ot("", !0);
-var dt = /* @__PURE__ */ ((I) => (I.common = "common", I.container = "container", I.tugs = "tugs", I))(dt || {}), ut = /* @__PURE__ */ ((I) => (I.Ballast = "Ballast", I.Laden = "Laden", I))(ut || {}), ht = /* @__PURE__ */ ((I) => (I.Cp = "CP", I.Perf = "Basis", I.Instruct = "Other", I))(ht || {});
+var dt = /* @__PURE__ */ ((k) => (k.common = "common", k.container = "container", k.tugs = "tugs", k))(dt || {}), ut = /* @__PURE__ */ ((k) => (k.Ballast = "Ballast", k.Laden = "Laden", k))(ut || {}), ht = /* @__PURE__ */ ((k) => (k.Cp = "CP", k.Perf = "Basis", k.Instruct = "Other", k))(ht || {});
 class C {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
@@ -583,10 +607,10 @@ class C {
    * @param draught 吃水 m
    * @return [0.55, 0.85]
    */
-  static blockCoefficient(s, t, o, n) {
-    let i = Math.round(s / (t * o * n) * 100) / 100;
-    i = i < 0.55 ? 0.55 : i > 0.85 ? 0.85 : i;
-    const a = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], e = a.map((c) => Math.abs(c - i));
+  static blockCoefficient(s, t, i, o) {
+    let n = Math.round(s / (t * i * o) * 100) / 100;
+    n = n < 0.55 ? 0.55 : n > 0.85 ? 0.85 : n;
+    const a = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], e = a.map((c) => Math.abs(c - n));
     return a[e.indexOf(Math.min(...e))];
   }
   /**
@@ -600,9 +624,9 @@ class C {
    * @param g 重力加速度 9.80 m/s^2
    * @return [0.05, 0.30]
    */
-  static froudeNumber(s, t, o = 9.8) {
-    let n = Math.round(Math.sqrt(s * s / (o * t)) * 100) / 100;
-    return n = n < 0.05 ? 0.05 : n > 0.3 ? 0.3 : n, n;
+  static froudeNumber(s, t, i = 9.8) {
+    let o = Math.round(Math.sqrt(s * s / (i * t)) * 100) / 100;
+    return o = o < 0.05 ? 0.05 : o > 0.3 ? 0.3 : o, o;
   }
   /**
    * 失速修正系數
@@ -611,8 +635,8 @@ class C {
    * @param loadCondition
    * @private
    */
-  static amendFactor(s, t, o) {
-    const n = {
+  static amendFactor(s, t, i) {
+    const o = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
       0.65: [2.6, -3.7, -11.6],
@@ -630,7 +654,7 @@ class C {
       0.8: [3, -16.3, -21.6],
       0.85: [3.4, -20.9, 31.8]
     }[s];
-    return o === "Laden" && (a = n[s]), a[0] + a[1] * t + a[2] * Math.pow(t, 2);
+    return i === "Laden" && (a = o[s]), a[0] + a[1] * t + a[2] * Math.pow(t, 2);
   }
   /**
    * 失速方向因子
@@ -644,8 +668,8 @@ class C {
    * @private
    */
   static directionFactor(s, t = 0) {
-    let o;
-    return s > 30 && s <= 60 ? o = (1.7 - 0.03 * Math.pow(t - 4, 2)) / 2 : s > 60 && s <= 150 ? o = (0.9 - 0.06 * Math.pow(t - 6, 2)) / 2 : s > 150 && s <= 180 ? o = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2 : o = 1, Math.round(o * 1e5) / 1e5;
+    let i;
+    return s > 30 && s <= 60 ? i = (1.7 - 0.03 * Math.pow(t - 4, 2)) / 2 : s > 60 && s <= 150 ? i = (0.9 - 0.06 * Math.pow(t - 6, 2)) / 2 : s > 150 && s <= 180 ? i = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2 : i = 1, Math.round(i * 1e5) / 1e5;
   }
   /**
    * 失速船型因子
@@ -658,10 +682,10 @@ class C {
    * @param bn
    * @private
    */
-  static vesselTagFactor(s, t, o, n = 0) {
-    n = n > 6 ? n - 0.9 * (n - 6) : n;
-    let i;
-    return o === "container" ? i = 0.7 * n + Math.pow(n, 6.5) / (22 * Math.pow(s, 2 / 3)) : t === "Ballast" ? i = 0.7 * n + Math.pow(n, 6.5) / (2.7 * Math.pow(s, 2 / 3)) : i = 0.5 * n + Math.pow(n, 6.5) / (2.7 * Math.pow(s, 2 / 3)), i;
+  static vesselTagFactor(s, t, i, o = 0) {
+    o = o > 6 ? o - 0.9 * (o - 6) : o;
+    let n;
+    return i === "container" ? n = 0.7 * o + Math.pow(o, 6.5) / (22 * Math.pow(s, 2 / 3)) : t === "Ballast" ? n = 0.7 * o + Math.pow(o, 6.5) / (2.7 * Math.pow(s, 2 / 3)) : n = 0.5 * o + Math.pow(o, 6.5) / (2.7 * Math.pow(s, 2 / 3)), n;
   }
   /**
    * 浪高影响因子
@@ -670,8 +694,8 @@ class C {
    */
   static waveHeightFactor(s, t) {
     s = s < 0 ? 0.2 : s, s = s > 6 ? s - 0.9 * (s - 6) : s, s = s > 9 ? 9 : s;
-    let o;
-    return t > 30 && t <= 60 ? o = -0.6 : t > 60 && t <= 90 ? o = -0.4 : t > 90 && t <= 120 ? o = s < 3 ? 0.4 : -0.3 : t > 120 && t <= 150 ? o = s < 3 ? 0.6 : -0.5 : t > 150 && t <= 180 ? o = s < 3 ? 0.7 : -0.6 : o = -0.7, Math.round(o * (0.144 * Math.pow(s, 2) + 0.178 * s) * 1e4) / 1e4;
+    let i;
+    return t > 30 && t <= 60 ? i = -0.6 : t > 60 && t <= 90 ? i = -0.4 : t > 90 && t <= 120 ? i = s < 3 ? 0.4 : -0.3 : t > 120 && t <= 150 ? i = s < 3 ? 0.6 : -0.5 : t > 150 && t <= 180 ? i = s < 3 ? 0.7 : -0.6 : i = -0.7, Math.round(i * (0.144 * Math.pow(s, 2) + 0.178 * s) * 1e4) / 1e4;
   }
   /**
    * 组装船舶运行参数
@@ -681,21 +705,21 @@ class C {
    * @param bearing 方位角
    * @private
    */
-  static assembleProperties(s, t, o, n) {
+  static assembleProperties(s, t, i, o) {
     var M;
-    const i = s.lbp ?? s.length ?? s.lengthOverall ?? 198.9642, a = s.draught ?? 8, e = s.breadthMoulded ?? s.breadth ?? s.breadthExtreme ?? 32.4572, c = s.deadweight ?? 67035.7773, r = ((M = s == null ? void 0 : s.type) == null ? void 0 : M.toLowerCase()) || "common";
+    const n = s.lbp ?? s.length ?? s.lengthOverall ?? 198.9642, a = s.draught ?? 8, e = s.breadthMoulded ?? s.breadth ?? s.breadthExtreme ?? 32.4572, c = s.deadweight ?? 67035.7773, r = ((M = s == null ? void 0 : s.type) == null ? void 0 : M.toLowerCase()) || "common";
     return {
       tag: r.indexOf("container") > -1 ? "container" : r.indexOf("tugs") > -1 ? "tugs" : "common",
-      lbp: i,
+      lbp: n,
       loadCondition: t,
       draught: a,
       breadthMoulded: e,
       // 排水量（吨）= 载重量（吨）/ 1.025 + 吃水（米）× 船舶型宽（米）× 船舶型长（米）× 0.7
       // 其中，1.025是指海水的密度，吨是指公吨，吃水是指船舶的最大吃水深度。船舶型宽是指船舶的最大型宽，船舶型长是指船舶的设计型长。上述公式是针对常规船舶适用的，不同类型的船舶可能会有一些差异。
-      displacement: Math.round((c / 1.025 + a * e * i * 0.7) * 1e4) / 1e4,
+      displacement: Math.round((c / 1.025 + a * e * n * 0.7) * 1e4) / 1e4,
       // 换算为m/s
-      speed: Math.round((o ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
-      bearing: n || 90
+      speed: Math.round((i ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
+      bearing: o || 90
     };
   }
   /**
@@ -708,35 +732,35 @@ class C {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam true 启用设置速度
    */
-  static async speedLoseAt(s, t, o, n = "", i = 2, a = !0, e = !1, c = {}) {
+  static async speedLoseAt(s, t, i, o = "", n = 2, a = !0, e = !1, c = {}) {
     let r;
     if (t.velocity && e && (s.speed = B.roundPrecision(t.velocity * 1852 / 3600, 6)), a) {
       let d;
       if (c.meteo2)
         try {
-          const u = await ct.spotForecast(t.lat, t.lng, o.utc().format(), !1, !1, !0, c), [Y] = tt.pickHourly(u, o);
-          d = tt.toLegacy(Y);
-        } catch (u) {
-          S.warn("[%s] meteo2 spot(%j) forecast failed: %s", c.requestId, { ...t, eta: o.utc().format() }, u);
+          const h = await ct.spotForecast(t.lat, t.lng, i.utc().format(), !1, !1, !0, c), [w] = tt.pickHourly(h, i);
+          d = tt.toLegacy(w);
+        } catch (h) {
+          T.warn("[%s] meteo2 spot(%j) forecast failed: %s", c.requestId, { ...t, eta: i.utc().format() }, h);
         }
       else
-        d = await nt.queryPointFactor(t.lng, t.lat, o.valueOf(), "wind,wave,current,watertemp", n, c);
-      const f = C.weatherFactor(s, d), M = C.currentFactor(s.bearing, d == null ? void 0 : d.current, i), m = Math.round((s.speed * 1.943844 + f + M) * 100) / 100;
+        d = await nt.queryPointFactor(t.lng, t.lat, i.valueOf(), "wind,wave,current,watertemp", o, c);
+      const f = C.weatherFactor(s, d), M = C.currentFactor(s.bearing, d == null ? void 0 : d.current, n), m = Math.round((s.speed * 1.943844 + f + M) * 100) / 100;
       r = {
         meteo: { ...d },
         wxFactor: f,
         cFactor: M,
         speed: t.velocity && e ? t.velocity : m < 0 ? 1 : m,
-        eta: o.utc().format("YYYY-MM-DDTHH:mm[Z]"),
-        etd: o.utc().format("YYYY-MM-DDTHH:mm[Z]")
+        eta: i.utc().format("YYYY-MM-DDTHH:mm[Z]"),
+        etd: i.utc().format("YYYY-MM-DDTHH:mm[Z]")
       };
     } else
       r = {
         wxFactor: 0,
         cFactor: 0,
         speed: t.velocity && e ? t.velocity : Math.round((s.speed * 1.943844 + 0 + 0) * 100) / 100,
-        eta: o.utc().format("YYYY-MM-DDTHH:mm[Z]"),
-        etd: o.utc().format("YYYY-MM-DDTHH:mm[Z]")
+        eta: i.utc().format("YYYY-MM-DDTHH:mm[Z]"),
+        etd: i.utc().format("YYYY-MM-DDTHH:mm[Z]")
       };
     return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...r, ...t };
   }
@@ -753,53 +777,53 @@ class C {
    * @param useRouteParam true 启用航线上设置的参数 { suspend: 停留时长（小时）, velocity: 速度（kts）}
    * @private
    */
-  static async speedLoseInHoursStep(s, t, o, n, i, a, e = "", c = !0, r = !1, d = {}) {
+  static async speedLoseInHoursStep(s, t, i, o, n, a, e = "", c = !0, r = !1, d = {}) {
     t.utc();
     const f = [], M = [];
-    let m = 0, u = 0, Y, j;
+    let m = 0, h = 0, w, I;
     for (let b = 0; b < a.length - 1; b++) {
       let p = a[b];
-      p.distanceFromStart = i + u;
+      p.distanceFromStart = n + h;
       const l = a[b + 1];
       if (s.bearing = V.calculateBearing(p, l, !l.gcToPrevious), p.bearing = s.bearing, p.suspend && r) {
         p.eta = p.eta || t.format("YYYY-MM-DDTHH:mm[Z]"), p.elapsed = p.elapsed ?? 0;
         const y = p.suspend - p.elapsed;
-        if (n - m > y)
-          n = n - m - y, t.add(y, "hour"), p.elapsed = p.suspend;
+        if (o - m > y)
+          o = o - m - y, t.add(y, "hour"), p.elapsed = p.suspend;
         else {
-          const g = n - m;
-          p.elapsed += g, t.add(g, "hour"), n = 0;
+          const g = o - m;
+          p.elapsed += g, t.add(g, "hour"), o = 0;
         }
-        if (S == null || S.info(`[%s] suspend ${p.elapsed} hours at %j, and remain ${n} hours need to go...`, d.requestId, p), n === 0)
-          return p.distanceFromPrevious = u, { etd: t, from: j || p, to: p, next: a.filter((g) => g), wps: f, days: M };
+        if (T == null || T.info(`[%s] suspend ${p.elapsed} hours at %j, and remain ${o} hours need to go...`, d.requestId, p), o === 0)
+          return p.distanceFromPrevious = h, { etd: t, from: I || p, to: p, next: a.filter((g) => g), wps: f, days: M };
       } else
         p.suspend = 0;
-      p = await C.speedLoseAt(s, p, t, e, 0, c, r, d), j = j || p, p.important && f.push(p), t.isSameOrAfter(o) && (M.push(p), o.add(24, "hour"));
-      const k = V.calculateDistance(p, l, !l.gcToPrevious);
-      let w = Math.ceil(k / j.speed * 1e4) / 1e4;
-      if (m + w < n) {
-        if (m += w, t.add(w, "hour"), delete a[b], S == null || S.info(
-          `[%s] go to %j from %j with ${k}nm, and cost ${w} hours`,
+      p = await C.speedLoseAt(s, p, t, e, 0, c, r, d), I = I || p, p.important && f.push(p), t.isSameOrAfter(i) && (M.push(p), i.add(24, "hour"));
+      const Y = V.calculateDistance(p, l, !l.gcToPrevious);
+      let j = Math.ceil(Y / I.speed * 1e4) / 1e4;
+      if (m + j < o) {
+        if (m += j, t.add(j, "hour"), delete a[b], T == null || T.info(
+          `[%s] go to %j from %j with ${Y}nm, and cost ${j} hours`,
           d.requestId,
           { lat: l.lat, lng: l.lng },
-          { lat: j.lat, lng: j.lng, etd: j.etd }
-        ), u += k, a.filter((y) => y).length <= 1) {
-          Y = l, Y.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), Y.distanceFromPrevious = k, Y.distanceFromStart = i + u, f.push(Y), delete a[b + 1];
+          { lat: I.lat, lng: I.lng, etd: I.etd }
+        ), h += Y, a.filter((y) => y).length <= 1) {
+          w = l, w.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), w.distanceFromPrevious = Y, w.distanceFromStart = n + h, f.push(w), delete a[b + 1];
           break;
         }
       } else {
-        w = n - m, t.add(w, "hour");
-        const y = B.roundPrecision(j.speed * w, 4);
-        Y = V.calculateCoordinate(p, s.bearing, y, "nauticalmiles", !l.gcToPrevious), Y.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), a[b] = Y, S == null || S.info(
-          `[%s] go to %j from %j with ${y}nm, and cost ${w} hours`,
+        j = o - m, t.add(j, "hour");
+        const y = B.roundPrecision(I.speed * j, 4);
+        w = V.calculateCoordinate(p, s.bearing, y, "nauticalmiles", !l.gcToPrevious), w.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), a[b] = w, T == null || T.info(
+          `[%s] go to %j from %j with ${y}nm, and cost ${j} hours`,
           d.requestId,
-          { lat: Y.lat, lng: Y.lng },
+          { lat: w.lat, lng: w.lng },
           { lat: p.lat, lng: p.lng, etd: p.etd }
-        ), u += y, Y.distanceFromPrevious = u, Y.distanceFromStart = i + u;
+        ), h += y, w.distanceFromPrevious = h, w.distanceFromStart = n + h;
         break;
       }
     }
-    return { etd: t, from: j, to: Y, next: a.filter((b) => b), wps: f, days: M };
+    return { etd: t, from: I, to: w, next: a.filter((b) => b), wps: f, days: M };
   }
   /**
    * 洋流影响因子
@@ -807,12 +831,12 @@ class C {
    * @param current 洋流要素
    * @param role  1: 船东, 2: 租家, 0: 未知
    */
-  static currentFactor(s, t, o = 0) {
-    const n = (s - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
-    if (Math.abs(n) === Math.PI / 2)
+  static currentFactor(s, t, i = 0) {
+    const o = (s - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
+    if (Math.abs(o) === Math.PI / 2)
       return 0;
-    let i = ((t == null ? void 0 : t.kts) || 0) * Math.cos(n);
-    return o & 2 ? i = Math.ceil(i * 100) / 100 : o & 1 ? i = Math.floor(i * 100) / 100 : i = Math.round(i * 100) / 100, Math.abs(i) > 5 ? 0 : i;
+    let n = ((t == null ? void 0 : t.kts) || 0) * Math.cos(o);
+    return i & 2 ? n = Math.ceil(n * 100) / 100 : i & 1 ? n = Math.floor(n * 100) / 100 : n = Math.round(n * 100) / 100, Math.abs(n) > 5 ? 0 : n;
   }
   /**
    * 风浪影响因子
@@ -820,16 +844,16 @@ class C {
    * @param wwc 气象要素
    */
   static weatherFactor(s, t) {
-    var f, M, m, u, Y, j, b;
-    S == null || S.debug("calculate weather factor via: %j", { ...s, ...t });
-    const o = C.blockCoefficient(s.displacement, s.lbp, s.breadthMoulded, s.draught), n = C.froudeNumber(s.speed, s.lbp), i = C.amendFactor(o, n, s.loadCondition);
+    var f, M, m, h, w, I, b;
+    T == null || T.debug("calculate weather factor via: %j", { ...s, ...t });
+    const i = C.blockCoefficient(s.displacement, s.lbp, s.breadthMoulded, s.draught), o = C.froudeNumber(s.speed, s.lbp), n = C.amendFactor(i, o, s.loadCondition);
     let a = Math.abs(s.bearing % 360 - (((f = t == null ? void 0 : t.wind) == null ? void 0 : f.degree) % 360 || 0));
     a = a > 180 ? 360 - a : a;
     const e = C.directionFactor(a, (M = t == null ? void 0 : t.wind) == null ? void 0 : M.scale), c = C.vesselTagFactor(s.displacement, s.loadCondition, s.tag, (m = t == null ? void 0 : t.wind) == null ? void 0 : m.scale);
-    let r = e * i * c / 100 * s.speed;
-    r = Math.round(r * 1.943844 * 1e4) / 1e4 * -1, s.tag === "tugs" && Math.abs(r) > 1 && (r = r / (Math.abs(Math.round(r)) + 1)), S == null || S.debug("wind wx factor = %d", r), a = Math.abs(s.bearing % 360 - (((Y = (u = t == null ? void 0 : t.wave) == null ? void 0 : u.sig) == null ? void 0 : Y.degree) % 360 || 0));
-    const d = C.waveHeightFactor(((b = (j = t == null ? void 0 : t.wave) == null ? void 0 : j.sig) == null ? void 0 : b.height) ?? 1, a);
-    return S == null || S.debug("wave wx factor = %d", d), r = r * 0.4 + d, S == null || S.debug("weather factor = %d", r), r = Math.abs(r) > 4 ? 4 * (Math.abs(r) / r) + Math.abs(r) / r * (Math.abs(r) - 4) * 0.1 : r, Math.round((r || 0) * 100) / 100;
+    let r = e * n * c / 100 * s.speed;
+    r = Math.round(r * 1.943844 * 1e4) / 1e4 * -1, s.tag === "tugs" && Math.abs(r) > 1 && (r = r / (Math.abs(Math.round(r)) + 1)), T == null || T.debug("wind wx factor = %d", r), a = Math.abs(s.bearing % 360 - (((w = (h = t == null ? void 0 : t.wave) == null ? void 0 : h.sig) == null ? void 0 : w.degree) % 360 || 0));
+    const d = C.waveHeightFactor(((b = (I = t == null ? void 0 : t.wave) == null ? void 0 : I.sig) == null ? void 0 : b.height) ?? 1, a);
+    return T == null || T.debug("wave wx factor = %d", d), r = r * 0.4 + d, T == null || T.debug("weather factor = %d", r), r = Math.abs(r) > 4 ? 4 * (Math.abs(r) / r) + Math.abs(r) / r * (Math.abs(r) - 4) * 0.1 : r, Math.round((r || 0) * 100) / 100;
   }
   /**
    * 全程失速分析(走完航程)
@@ -843,61 +867,61 @@ class C {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstant(s, t, o, n, i, a = "", e = 0, c = !0, r = !1, d = {}) {
+  static async analyseInstant(s, t, i, o, n, a = "", e = 0, c = !0, r = !1, d = {}) {
     var E, G, U, J, Q;
     const f = v().valueOf();
     s.lng = B.convertToStdLng(s.lng);
-    const { route: M, waypoints: m } = i.points, u = V.calculateSubRoute(s, M);
-    if (((E = u[0]) == null ? void 0 : E.length) <= 1)
+    const { route: M, waypoints: m } = n.points, h = V.calculateSubRoute(s, M);
+    if (((E = h[0]) == null ? void 0 : E.length) <= 1)
       return;
-    const { v0: Y, label: j } = s.sog ? {
+    const { v0: w, label: I } = s.sog ? {
       v0: s.sog,
       label: "Other"
       /* Instruct */
     } : {
-      v0: n.speed,
+      v0: o.speed,
       label: "CP"
       /* Cp */
-    }, b = C.assembleProperties(o, n.loadCondition, Y, 0), p = m.length ? V.calculateSubWaypoints(s, m) : [];
+    }, b = C.assembleProperties(i, o.loadCondition, w, 0), p = m.length ? V.calculateSubWaypoints(s, m) : [];
     p.forEach((x) => x.important = !0);
     const l = {
       from: { ...s },
-      route: u,
+      route: h,
       waypoints: p,
-      v0: Y,
-      label: j
-    }, k = {
+      v0: w,
+      label: I
+    }, Y = {
       hours: [],
       days: [],
       wps: []
     };
-    e || (V.calculateRouteDistance(u) / n.speed <= 72 ? e = 3 : e = 6);
-    let w = V.simplifyRouteToCoordinates(u, p, 0), y = 0, g = 0, H = 0, F = 0;
+    e || (V.calculateRouteDistance(h) / o.speed <= 72 ? e = 3 : e = 6);
+    let j = V.simplifyRouteToCoordinates(h, p, 0), y = 0, g = 0, D = 0, F = 0;
     t = v(t).utc();
-    const O = t.clone();
-    for (; w.length > 0; ) {
+    const R = t.clone();
+    for (; j.length > 0; ) {
       const x = e - t.hour() % e, _ = Math.ceil(t.clone().add(x, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, q = await C.speedLoseInHoursStep(
         b,
         t,
-        O,
+        R,
         _,
         y,
-        w,
+        j,
         a,
         c,
         r,
         d
       );
-      (G = q.from) != null && G.speed && (k.hours.push(q.from), k.wps.push(...q.wps), k.days.push(...q.days)), w = q == null ? void 0 : q.next, w.length || k.hours.push(q == null ? void 0 : q.to), y += ((U = q == null ? void 0 : q.to) == null ? void 0 : U.distanceFromPrevious) ?? 0;
+      (G = q.from) != null && G.speed && (Y.hours.push(q.from), Y.wps.push(...q.wps), Y.days.push(...q.days)), j = q == null ? void 0 : q.next, j.length || Y.hours.push(q == null ? void 0 : q.to), y += ((U = q == null ? void 0 : q.to) == null ? void 0 : U.distanceFromPrevious) ?? 0;
     }
-    const N = k.hours;
-    for (let x = 0; x < N.length - 1; x++) {
-      const _ = v(N[x + 1].eta).diff(N[x].etd, "hour", !0) || 1;
-      g += (N[x].wxFactor || 0) * _, H += (N[x].cFactor || 0) * _, F += _;
+    const H = Y.hours;
+    for (let x = 0; x < H.length - 1; x++) {
+      const _ = v(H[x + 1].eta).diff(H[x].etd, "hour", !0) || 1;
+      g += (H[x].wxFactor || 0) * _, D += (H[x].cFactor || 0) * _, F += _;
     }
-    (J = k.wps) == null || J.forEach((x, _) => {
+    (J = Y.wps) == null || J.forEach((x, _) => {
       if (_) {
-        const q = k.wps[_ - 1], et = x.distanceFromStart - q.distanceFromStart, X = v(x.eta).diff(v(q.etd), "h", !0);
+        const q = Y.wps[_ - 1], et = x.distanceFromStart - q.distanceFromStart, X = v(x.eta).diff(v(q.etd), "h", !0);
         if (X < 1)
           x.avgSpd = q.speed;
         else {
@@ -906,11 +930,11 @@ class C {
           x.avgSpd = x.avgSpd > $ ? $ : x.avgSpd;
         }
       }
-    }), l.sample = k;
-    const L = k.hours.at(0), W = k.hours.at(-1);
-    l.distance = Math.round(W.distanceFromStart * 1e4) / 1e4, l.etd = v(L.eta).utc().format(), l.eta = v(W.eta).utc().format(), l.wxFactor = Math.round(g / F * 1e4) / 1e4, l.cFactor = Math.round(H / F * 1e4) / 1e4, l.avgSpeed = Math.round(W.distanceFromStart / F * 1e4) / 1e4, l.totalHrs = Math.round(F * 1e4) / 1e4, l.totalFoCons = Math.round((n == null ? void 0 : n.fo) / 24 * l.totalHrs * 1e3) / 1e3, l.totalDgoCons = Math.round((n == null ? void 0 : n.dgo) / 24 * l.totalHrs * 1e3) / 1e3;
-    const P = v().valueOf() - f, D = ((Q = k == null ? void 0 : k.hours) == null ? void 0 : Q.length) || 1;
-    return S == null || S.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", d == null ? void 0 : d.requestId, P, D, Math.round(P / D * 1e3) / 1e3), l;
+    }), l.sample = Y;
+    const L = Y.hours.at(0), W = Y.hours.at(-1);
+    l.distance = Math.round(W.distanceFromStart * 1e4) / 1e4, l.etd = v(L.eta).utc().format(), l.eta = v(W.eta).utc().format(), l.wxFactor = Math.round(g / F * 1e4) / 1e4, l.cFactor = Math.round(D / F * 1e4) / 1e4, l.avgSpeed = Math.round(W.distanceFromStart / F * 1e4) / 1e4, l.totalHrs = Math.round(F * 1e4) / 1e4, l.totalFoCons = Math.round((o == null ? void 0 : o.fo) / 24 * l.totalHrs * 1e3) / 1e3, l.totalDgoCons = Math.round((o == null ? void 0 : o.dgo) / 24 * l.totalHrs * 1e3) / 1e3;
+    const P = v().valueOf() - f, N = ((Q = Y == null ? void 0 : Y.hours) == null ? void 0 : Q.length) || 1;
+    return T == null || T.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", d == null ? void 0 : d.requestId, P, N, Math.round(P / N * 1e3) / 1e3), l;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -925,36 +949,36 @@ class C {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstantWithThreshed(s, t, o, n, i, a, e, c = "", r = 3, d = !0, f = !1, M = {}) {
-    var W, T, P;
+  static async analyseInstantWithThreshed(s, t, i, o, n, a, e, c = "", r = 3, d = !0, f = !1, M = {}) {
+    var W, S, P;
     s.lng = B.convertToStdLng(s.lng);
-    const { v0: m, label: u } = s.sog ? {
+    const { v0: m, label: h } = s.sog ? {
       v0: s.sog,
       label: "Other"
       /* Instruct */
     } : {
-      v0: i.speed,
+      v0: n.speed,
       label: "CP"
       /* Cp */
-    }, Y = C.assembleProperties(n, i.loadCondition, m, 0), j = V.calculateSubRoute(s, a);
-    if (((W = j[0]) == null ? void 0 : W.length) <= 1)
+    }, w = C.assembleProperties(o, n.loadCondition, m, 0), I = V.calculateSubRoute(s, a);
+    if (((W = I[0]) == null ? void 0 : W.length) <= 1)
       return;
     const b = e.length ? V.calculateSubWaypoints(s, e) : [];
-    b.forEach((D) => D.important = !0);
-    let p = V.simplifyRouteToCoordinates(j, b, 0), l = 0, k = 0, w = 0, y = 0, g;
-    const H = {
+    b.forEach((N) => N.important = !0);
+    let p = V.simplifyRouteToCoordinates(I, b, 0), l = 0, Y = 0, j = 0, y = 0, g;
+    const D = {
       hours: [],
       wps: [],
       days: []
     };
     for (t = v(t).utc(); p.length > 0; ) {
-      const D = r - t.hour() % r;
-      let E = Math.ceil(t.clone().add(D, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
-      if (E = t.clone().add(E, "h").isAfter(o) ? o.diff(t, "h", !0) * 1e4 / 1e4 : E, E)
+      const N = r - t.hour() % r;
+      let E = Math.ceil(t.clone().add(N, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
+      if (E = t.clone().add(E, "h").isAfter(i) ? i.diff(t, "h", !0) * 1e4 / 1e4 : E, E)
         g = await C.speedLoseInHoursStep(
-          Y,
+          w,
           t,
-          o.clone(),
+          i.clone(),
           E,
           l,
           p,
@@ -962,34 +986,34 @@ class C {
           d,
           f,
           M
-        ), (T = g.from) != null && T.speed && (H.hours.push(g.from), g != null && g.wps && H.wps.push(...g.wps), H.days.push(...g.days)), p = g == null ? void 0 : g.next, p.length || (H.hours.push(g == null ? void 0 : g.to), g != null && g.wps && H.wps.push(...g.wps), H.days.push(g == null ? void 0 : g.to)), l += ((P = g == null ? void 0 : g.to) == null ? void 0 : P.distanceFromPrevious) ?? 0;
+        ), (S = g.from) != null && S.speed && (D.hours.push(g.from), g != null && g.wps && D.wps.push(...g.wps), D.days.push(...g.days)), p = g == null ? void 0 : g.next, p.length || (D.hours.push(g == null ? void 0 : g.to), g != null && g.wps && D.wps.push(...g.wps), D.days.push(g == null ? void 0 : g.to)), l += ((P = g == null ? void 0 : g.to) == null ? void 0 : P.distanceFromPrevious) ?? 0;
       else {
-        g && (H.hours.push(g.to), g != null && g.wps && H.wps.push(...g.wps), H.days.push(g.to));
+        g && (D.hours.push(g.to), g != null && g.wps && D.wps.push(...g.wps), D.days.push(g.to));
         break;
       }
     }
-    const F = H.hours;
-    for (let D = 0; D < F.length - 1; D++) {
-      const E = v(F[D + 1].eta).diff(F[D].etd, "hour", !0);
-      k += F[D].wxFactor * E, w += F[D].cFactor * E, y += E;
+    const F = D.hours;
+    for (let N = 0; N < F.length - 1; N++) {
+      const E = v(F[N + 1].eta).diff(F[N].etd, "hour", !0);
+      Y += F[N].wxFactor * E, j += F[N].cFactor * E, y += E;
     }
-    const O = H.hours.at(0), N = H.hours.at(-1);
+    const R = D.hours.at(0), H = D.hours.at(-1);
     return {
-      sample: H,
-      distance: Math.round(((N == null ? void 0 : N.distanceFromStart) || 0) * 1e4) / 1e4,
+      sample: D,
+      distance: Math.round(((H == null ? void 0 : H.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: v(O.eta).utc().format(),
-      eta: v(N == null ? void 0 : N.eta).utc().format(),
-      wxFactor: Math.round(k / y * 1e4) / 1e4,
-      cFactor: Math.round(w / y * 1e4) / 1e4,
-      avgSpeed: Math.round(((N == null ? void 0 : N.distanceFromStart) || 0) / y * 1e4) / 1e4,
+      etd: v(R.eta).utc().format(),
+      eta: v(H == null ? void 0 : H.eta).utc().format(),
+      wxFactor: Math.round(Y / y * 1e4) / 1e4,
+      cFactor: Math.round(j / y * 1e4) / 1e4,
+      avgSpeed: Math.round(((H == null ? void 0 : H.distanceFromStart) || 0) / y * 1e4) / 1e4,
       totalHrs: Math.round(y * 1e4) / 1e4,
       from: s,
-      to: N,
-      route: j,
+      to: H,
+      route: I,
       waypoints: b,
       v0: m,
-      label: u
+      label: h
     };
   }
 }
@@ -999,11 +1023,11 @@ export {
   it as AlertLevel,
   vt as HifleetImpl,
   ut as LoadCondition,
-  kt as MyShipImpl,
+  Yt as MyShipImpl,
   bt as MyVesselImpl,
-  Yt as ShipxyImpl,
+  wt as ShipxyImpl,
   C as SpeedHelper,
   ht as SpeedLabel,
   dt as VesselTag,
-  It as alertHelper
+  kt as alertHelper
 };