@airframes/acars-decoder 1.6.3 → 1.6.4

package/dist/index.js

@@ -1240,12 +1240,19 @@ var RouteUtils = class _RouteUtils {
     if (waypoint.latitude && waypoint.longitude) {
       s += `(${CoordinateUtils.coordinateString({ latitude: waypoint.latitude, longitude: waypoint.longitude })})`;
     }
+    if (waypoint.offset) {
+      s += `[${waypoint.offset.bearing}\xB0 ${waypoint.offset.distance}nm]`;
+    }
     if (waypoint.time && waypoint.timeFormat) {
       s += `@${_RouteUtils.timestampToString(waypoint.time, waypoint.timeFormat)}`;
     }
     return s;
   }
   static getWaypoint(leg) {
+    const regex = leg.match(/^([A-Z]+)(\d{3})-(\d{4})$/);
+    if (regex?.length == 4) {
+      return { name: regex[1], offset: { bearing: parseInt(regex[2]), distance: parseInt(regex[3]) / 10 } };
+    }
     const waypoint = leg.split(",");
     if (waypoint.length == 2) {
       const position = CoordinateUtils.decodeStringCoordinates(waypoint[1]);
@@ -1253,10 +1260,11 @@ var RouteUtils = class _RouteUtils {
         return { name: waypoint[0], latitude: position.latitude, longitude: position.longitude };
       }
     }
-    if (leg.length == 14) {
+    if (leg.length == 13 || leg.length == 14) {
       const position = CoordinateUtils.decodeStringCoordinates(leg);
+      const name = waypoint.length == 2 ? waypoint[0] : "";
       if (position) {
-        return { name: waypoint[0], latitude: position.latitude, longitude: position.longitude };
+        return { name, latitude: position.latitude, longitude: position.longitude };
       }
     }
     return { name: leg };
@@ -1317,7 +1325,7 @@ var FlightPlanUtils = class {
           addRoute(decodeResult, value);
           break;
         case "R":
-          addDepartureRunway(decodeResult, value);
+          addRunway(decodeResult, value);
           break;
         default:
           if (allKnownFields) {
@@ -1331,41 +1339,106 @@ var FlightPlanUtils = class {
     return allKnownFields;
   }
 };
+function parseMessageType(decodeResult, messageType) {
+  let decoded = true;
+  const parts = messageType.split("#");
+  if (parts.length == 1) {
+    if (parts[0].startsWith("POS") && parts[0].length !== 3 && !parts[0].startsWith("POS/")) {
+      decoded = processPosition(decodeResult, parts[0].substring(3));
+    }
+    return decoded;
+  } else if (parts.length == 2) {
+    if (parts[0].length > 0) {
+      decodeResult.remaining.text += parts[0].substring(0, 3);
+      decodeResult.raw.flight_number = parts[0].substring(3);
+      decodeResult.remaining.text += "#" + parts[1].substring(0, 3);
+    }
+    if (parts[1].substring(3, 6) === "POS" && parts[1].length !== 6 && parts[1].substring(3, 7) !== "POS/") {
+      decoded = processPosition(decodeResult, parts[1].substring(6));
+    }
+    decodeResult.raw.message_type = messageType;
+    return decoded;
+  }
+  decodeResult.remaining.text += messageType;
+  return false;
+}
 function parseHeader(decodeResult, header) {
   let allKnownFields = true;
   const fields = header.split("/");
-  for (let i = 1; i < fields.length - 1; ++i) {
+  allKnownFields = allKnownFields && parseMessageType(decodeResult, fields[0]);
+  for (let i = 1; i < fields.length; ++i) {
     if (fields[i].startsWith("FN")) {
       decodeResult.raw.flight_number = fields[i].substring(2);
     } else if (fields[i].startsWith("SN")) {
       decodeResult.raw.serial_number = fields[i].substring(2);
     } else if (fields[i].startsWith("TS")) {
       const ts = fields[i].substring(2).split(",");
-      decodeResult.raw.message_timestamp = DateTimeUtils.convertDateTimeToEpoch(ts[0], ts[1]);
+      let time = DateTimeUtils.convertDateTimeToEpoch(ts[0], ts[1]);
+      if (Number.isNaN(time)) {
+        const date = ts[1].substring(2, 4) + ts[1].substring(0, 2) + ts[1].substring(4, 6);
+        time = DateTimeUtils.convertDateTimeToEpoch(ts[0], date);
+      }
+      decodeResult.raw.message_timestamp = time;
+    } else if (fields[i].startsWith("PS")) {
+      const pos = fields[i].substring(2);
+      allKnownFields == allKnownFields && processPosition(decodeResult, pos);
+    } else if (fields[i].startsWith("DT")) {
+      const icao = fields[i].substring(2);
+      decodeResult.raw.arrival_icao = icao;
+      decodeResult.formatted.items.push({
+        type: "destination",
+        code: "DST",
+        label: "Destination",
+        value: decodeResult.raw.arrival_icao
+      });
+    } else if (fields[i].startsWith("RF")) {
+      decodeResult.formatted.items.push({
+        type: "status",
+        code: "ROUTE_STATUS",
+        label: "Route Status",
+        value: "Route Filed"
+      });
+      decodeResult.raw.route_status = "RF";
+      if (fields[i].length > 2) {
+        addRoute(decodeResult, fields[i].substring(2));
+      }
+    } else if (fields[i] == "RP") {
+      decodeResult.raw.route_status = "RP";
+      decodeResult.formatted.items.push({
+        type: "status",
+        code: "ROUTE_STATUS",
+        label: "Route Status",
+        value: "Route Planned"
+      });
+      decodeResult.raw.route_status = fields[i];
+    } else if (fields[i] == "RI") {
+      decodeResult.raw.route_status = "RI";
+      decodeResult.formatted.items.push({
+        type: "status",
+        code: "ROUTE_STATUS",
+        label: "Route Status",
+        value: "Route Inactive"
+      });
     } else {
       decodeResult.remaining.text += "/" + fields[i];
       allKnownFields = false;
     }
   }
-  decodeResult.raw.route_status = fields[fields.length - 1];
-  var text;
-  if (decodeResult.raw.route_status == "RP") {
-    text = "Route Planned";
-  } else if (decodeResult.raw.route_status == "RI") {
-    text = "Route Inactive";
-  } else if (decodeResult.raw.route_status == "RF") {
-    text = "Route Filed";
-  } else {
-    text = decodeResult.raw.route_status;
-  }
-  decodeResult.formatted.items.push({
-    type: "status",
-    code: "ROUTE_STATUS",
-    label: "Route Status",
-    value: text
-  });
   return allKnownFields;
 }
+function processPosition(decodeResult, value) {
+  const position = CoordinateUtils.decodeStringCoordinates(value);
+  if (position) {
+    decodeResult.raw.position = position;
+    decodeResult.formatted.items.push({
+      type: "aircraft_position",
+      code: "POS",
+      label: "Aircraft Position",
+      value: CoordinateUtils.coordinateString(position)
+    });
+  }
+  return !!position;
+}
 function addArrivalAirport(decodeResult, value) {
   decodeResult.raw.arrival_icao = value;
   decodeResult.formatted.items.push({
@@ -1384,12 +1457,20 @@ function addDepartureAirport(decodeResult, value) {
     value: decodeResult.raw.departure_icao
   });
 }
-function addDepartureRunway(decodeResult, value) {
-  decodeResult.raw.runway = value;
+function addRunway(decodeResult, value) {
+  if (value.length === 8) {
+    decodeResult.raw.arrival_runway = value.substring(4, 7);
+    decodeResult.formatted.items.push({
+      type: "runway",
+      label: "Arrival Runway",
+      value: decodeResult.raw.arrival_runway
+    });
+  }
+  decodeResult.raw.departure_runway = value.substring(0, 3);
   decodeResult.formatted.items.push({
     type: "runway",
-    label: "Runway",
-    value: decodeResult.raw.runway
+    label: "Departure Runway",
+    value: decodeResult.raw.departure_runway
   });
 }
 function addRoute(decodeResult, value) {
@@ -1499,7 +1580,7 @@ var Label_H1_POS = class extends DecoderPlugin {
   qualifiers() {
     return {
       labels: ["H1"],
-      preambles: ["POS", "#M1BPOS"]
+      preambles: ["POS", "#M1BPOS", "/.POS"]
       //TODO - support data before #
     };
   }
@@ -1508,29 +1589,25 @@ var Label_H1_POS = class extends DecoderPlugin {
     decodeResult.decoder.name = this.name;
     decodeResult.formatted.description = "Position Report";
     decodeResult.message = message;
+    decodeResult.remaining.text = "";
     const checksum = message.text.slice(-4);
-    const parts = message.text.replace("#M1B", "").replace("POS", "").slice(0, -4).split(",");
-    if (parts.length == 1 && parts[0].startsWith("/RF")) {
-      decodeResult.raw.route_status == "RF";
-      decodeResult.formatted.items.push({
-        type: "status",
-        code: "ROUTE_STATUS",
-        label: "Route Status",
-        value: "Route Filed"
-      });
-      decodeResult.raw.route = { waypoints: parts[0].substring(3, parts[0].length).split(".").map((leg) => RouteUtils.getWaypoint(leg)) };
-      decodeResult.formatted.items.push({
-        type: "aircraft_route",
-        code: "ROUTE",
-        label: "Aircraft Route",
-        value: RouteUtils.routeToString(decodeResult.raw.route)
-      });
-      processChecksum(decodeResult, checksum);
-      decodeResult.decoded = true;
-      decodeResult.decoder.decodeLevel = "full";
+    const header = findHeader(message.text.slice(0, -4));
+    const decoded = FlightPlanUtils.processFlightPlan(decodeResult, header.split(":"));
+    const parts = message.text.replace(header, "").slice(0, -4).split(",");
+    if (parts.length == 1) {
+      if (decoded) {
+        processChecksum(decodeResult, checksum);
+        decodeResult.decoded = true;
+        decodeResult.decoder.decodeLevel = "full";
+      } else if (decodeResult.remaining.text.length > 0) {
+        processChecksum(decodeResult, checksum);
+        decodeResult.decoded = true;
+        decodeResult.decoder.decodeLevel = "partial";
+      } else {
+        decodeResult.decoded = false;
+        decodeResult.decoder.decodeLevel = "none";
+      }
     } else if (parts.length === 10) {
-      decodeResult.remaining.text = "";
-      processPosition(decodeResult, parts[0]);
       processAlt(decodeResult, parts[3]);
       processRoute(decodeResult, parts[1], parts[2], parts[4], parts[5], parts[6]);
       processTemp(decodeResult, parts[7]);
@@ -1540,8 +1617,6 @@ var Label_H1_POS = class extends DecoderPlugin {
       decodeResult.decoded = true;
       decodeResult.decoder.decodeLevel = "partial";
     } else if (parts.length === 11) {
-      decodeResult.remaining.text = "";
-      processPosition(decodeResult, parts[0]);
       processAlt(decodeResult, parts[3]);
       processRoute(decodeResult, parts[1], parts[2], parts[4], parts[5], parts[6], parts[10]);
       processTemp(decodeResult, parts[7]);
@@ -1550,9 +1625,18 @@ var Label_H1_POS = class extends DecoderPlugin {
       processChecksum(decodeResult, checksum);
       decodeResult.decoded = true;
       decodeResult.decoder.decodeLevel = "partial";
+    } else if (parts.length === 12) {
+      const date = parts[11].substring(2, 4) + parts[11].substring(0, 2) + parts[11].substring(4, 6);
+      processUnknown(decodeResult, parts[3]);
+      processRoute(decodeResult, parts[1], parts[2], parts[4], parts[5], parts[6], date);
+      processTemp(decodeResult, parts[7]);
+      processUnknown(decodeResult, parts[8]);
+      processUnknown(decodeResult, parts[9]);
+      processUnknown(decodeResult, parts[10]);
+      processChecksum(decodeResult, checksum);
+      decodeResult.decoded = true;
+      decodeResult.decoder.decodeLevel = "partial";
     } else if (parts.length === 14) {
-      decodeResult.remaining.text = "";
-      processPosition(decodeResult, parts[0]);
       processAlt(decodeResult, parts[3]);
       processRoute(decodeResult, parts[1], parts[2], parts[4], parts[5], parts[6]);
       processTemp(decodeResult, parts[7]);
@@ -1566,8 +1650,6 @@ var Label_H1_POS = class extends DecoderPlugin {
       decodeResult.decoded = true;
       decodeResult.decoder.decodeLevel = "partial";
     } else if (parts.length === 15) {
-      decodeResult.remaining.text = "";
-      processUnknown(decodeResult, parts[0]);
       processUnknown(decodeResult, parts[1]);
       let date = void 0;
       if (parts[2].startsWith("/DC")) {
@@ -1580,7 +1662,7 @@ var Label_H1_POS = class extends DecoderPlugin {
       for (let i = 0; i < fields.length; ++i) {
         const field = fields[i];
         if (field.startsWith("PS")) {
-          processPosition(decodeResult, field.substring(2));
+          processPosition2(decodeResult, field.substring(2));
         } else {
           if (i === 0) {
             processUnknown(decodeResult, field);
@@ -1599,9 +1681,16 @@ var Label_H1_POS = class extends DecoderPlugin {
       processChecksum(decodeResult, checksum);
       decodeResult.decoded = true;
       decodeResult.decoder.decodeLevel = "partial";
+    } else if (parts.length === 21) {
+      processRunway(decodeResult, parts[1]);
+      processUnknown(decodeResult, parts.slice(2, 11).join(","));
+      processTemp(decodeResult, parts[11]);
+      processUnknown(decodeResult, parts.slice(12, 20).join(","));
+      FlightPlanUtils.processFlightPlan(decodeResult, parts[20].split(":"));
+      processChecksum(decodeResult, checksum);
+      decodeResult.decoded = true;
+      decodeResult.decoder.decodeLevel = "partial";
     } else if (parts.length === 32) {
-      decodeResult.remaining.text = "";
-      processPosition(decodeResult, parts[0]);
       processRunway(decodeResult, parts[1]);
       const time = parts[2];
       processUnknown(decodeResult, parts[3]);
@@ -1626,7 +1715,7 @@ var Label_H1_POS = class extends DecoderPlugin {
       if (options.debug) {
         console.log(`Decoder: Unknown H1 message: ${message.text}`);
       }
-      decodeResult.remaining.text = message.text;
+      decodeResult.remaining.text += message.text;
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = "none";
     }
@@ -1636,7 +1725,7 @@ var Label_H1_POS = class extends DecoderPlugin {
 function processUnknown(decodeResult, value) {
   decodeResult.remaining.text += "," + value;
 }
-function processPosition(decodeResult, value) {
+function processPosition2(decodeResult, value) {
   const position = CoordinateUtils.decodeStringCoordinates(value);
   if (position) {
     decodeResult.raw.position = position;
@@ -1667,11 +1756,11 @@ function processTemp(decodeResult, value) {
   });
 }
 function processRunway(decodeResult, value) {
-  decodeResult.raw.runway = value.replace("RW", "");
+  decodeResult.raw.arrival_runway = value.replace("RW", "");
   decodeResult.formatted.items.push({
     type: "runway",
-    label: "Runway",
-    value: decodeResult.raw.runway
+    label: "Arrival Runway",
+    value: decodeResult.raw.arrival_runway
   });
 }
 function processGndspd(decodeResult, value) {
@@ -1684,14 +1773,17 @@ function processGndspd(decodeResult, value) {
   });
 }
 function processRoute(decodeResult, last, time, next, eta, then, date) {
-  const lastCoords = CoordinateUtils.decodeStringCoordinates(last);
-  const nextCoords = CoordinateUtils.decodeStringCoordinates(next);
   const lastTime = date ? DateTimeUtils.convertDateTimeToEpoch(time, date) : DateTimeUtils.convertHHMMSSToTod(time);
   const nextTime = date ? DateTimeUtils.convertDateTimeToEpoch(eta, date) : DateTimeUtils.convertHHMMSSToTod(eta);
   const timeFormat = date ? "epoch" : "tod";
-  const lastWaypoint = lastCoords ? { name: "", latitude: lastCoords.latitude, longitude: lastCoords.longitude, time: lastTime, timeFormat } : { name: last, time: lastTime, timeFormat };
-  const nextWaypoint = nextCoords ? { name: "", latitude: nextCoords.latitude, longitude: nextCoords.longitude, time: nextTime, timeFormat } : { name: next, time: nextTime, timeFormat };
-  const waypoints = [lastWaypoint, nextWaypoint, { name: then || "?" }];
+  const lastWaypoint = RouteUtils.getWaypoint(last);
+  lastWaypoint.time = lastTime;
+  lastWaypoint.timeFormat = timeFormat;
+  const nextWaypoint = RouteUtils.getWaypoint(next);
+  nextWaypoint.time = nextTime;
+  nextWaypoint.timeFormat = timeFormat;
+  const thenWaypoint = RouteUtils.getWaypoint(then || "?");
+  const waypoints = [lastWaypoint, nextWaypoint, thenWaypoint];
   decodeResult.raw.route = { waypoints };
   decodeResult.formatted.items.push({
     type: "aircraft_route",
@@ -1709,6 +1801,14 @@ function processChecksum(decodeResult, value) {
     value: "0x" + ("0000" + decodeResult.raw.checksum.toString(16)).slice(-4)
   });
 }
+function findHeader(text) {
+  const parts = text.split(",");
+  const header = parts[0];
+  if (header.indexOf("/TS") === -1) {
+    return header;
+  }
+  return parts[0] + "," + parts[1];
+}
 
 // lib/plugins/Label_H1_WRN.ts
 var Label_H1_WRN = class extends DecoderPlugin {
@@ -2047,7 +2147,7 @@ var Label_QQ = class extends DecoderPlugin {
 
 // lib/utils/miam.ts
 var Base85 = __toESM(require("base85"));
-var Zlib = __toESM(require("zlib"));
+var zlib = __toESM(require("minizlib"));
 var MIAMCoreV1CRCLength = 4;
 var MIAMCoreV2CRCLength = 2;
 var MIAMCoreUtils = class {
@@ -2757,7 +2857,10 @@ var MIAMCoreUtils = class {
     if (body !== void 0 && body.length > 0) {
       if ([1 /* Deflate */, 1 /* Deflate */].indexOf(pduCompression) >= 0) {
         try {
-          pduData = Zlib.inflateRawSync(body, { windowBits: 15 });
+          const decompress = new zlib.InflateRaw({ windowBits: 15 });
+          decompress.write(body);
+          decompress.flush(zlib.constants.Z_SYNC_FLUSH);
+          pduData = decompress.read();
         } catch (e) {
           pduErrors.push("Inflation failed for body: " + e);
         }