@airframes/acars-decoder 1.6.7 → 1.6.8

package/dist/index.mjs

@@ -171,6 +171,12 @@ var Label_5Z = class extends DecoderPlugin {
 
 // lib/utils/coordinate_utils.ts
 var CoordinateUtils = class {
+  /**
+   * Decode a string of coordinates into an object with latitude and longitude in millidegrees
+   * @param stringCoords - The string of coordinates to decode
+   * 
+   * @returns An object with latitude and longitude properties
+   */
   static decodeStringCoordinates(stringCoords) {
     var results = {};
     const firstChar = stringCoords.substring(0, 1);
@@ -188,6 +194,33 @@ var CoordinateUtils = class {
     }
     return results;
   }
+  /**
+  * Decode a string of coordinates into an object with latitude and longitude in degrees and decimal minutes
+  * @param stringCoords - The string of coordinates to decode
+  * 
+  * @returns An object with latitude and longitude properties
+  */
+  static decodeStringCoordinatesDecimalMinutes(stringCoords) {
+    var results = {};
+    const firstChar = stringCoords.substring(0, 1);
+    let middleChar = stringCoords.substring(6, 7);
+    let longitudeChars = stringCoords.substring(7, 13);
+    if (middleChar == " ") {
+      middleChar = stringCoords.substring(7, 8);
+      longitudeChars = stringCoords.substring(8, 14);
+    }
+    const latDeg = Math.trunc(Number(stringCoords.substring(1, 6)) / 1e3);
+    const latMin = Number(stringCoords.substring(1, 6)) % 1e3 / 10;
+    const lonDeg = Math.trunc(Number(longitudeChars) / 1e3);
+    const lonMin = Number(longitudeChars) % 1e3 / 10;
+    if ((firstChar === "N" || firstChar === "S") && (middleChar === "W" || middleChar === "E")) {
+      results.latitude = (latDeg + latMin / 60) * (firstChar === "S" ? -1 : 1);
+      results.longitude = (lonDeg + lonMin / 60) * (middleChar === "W" ? -1 : 1);
+    } else {
+      return;
+    }
+    return results;
+  }
   static coordinateString(coords) {
     const latDir = coords.latitude > 0 ? "N" : "S";
     const lonDir = coords.longitude > 0 ? "E" : "W";
@@ -558,6 +591,96 @@ var Label_20_POS = class extends DecoderPlugin {
   }
 };
 
+// lib/plugins/Label_21_POS.ts
+var Label_21_POS = class extends DecoderPlugin {
+  name = "label-21-pos";
+  qualifiers() {
+    return {
+      labels: ["21"],
+      preambles: ["POS"]
+    };
+  }
+  decode(message, options = {}) {
+    const decodeResult = this.defaultResult();
+    decodeResult.decoder.name = this.name;
+    decodeResult.formatted.description = "Position Report";
+    decodeResult.message = message;
+    decodeResult.raw.preamble = message.text.substring(0, 3);
+    const content = message.text.substring(3);
+    console.log("Content: " + content);
+    const fields = content.split(",");
+    console.log("Field Count: " + fields.length);
+    if (fields.length == 9) {
+      processPosition(decodeResult, fields[0].trim());
+      processAlt(decodeResult, fields[3]);
+      processTemp(decodeResult, fields[6]);
+      processArrvApt(decodeResult, fields[8]);
+      decodeResult.raw.remaining = [
+        fields[1],
+        fields[2],
+        fields[4],
+        fields[5],
+        fields[7]
+      ].join(",");
+      decodeResult.decoded = true;
+      decodeResult.decoder.decodeLevel = "partial";
+    } else {
+      console.log(`DEBUG: ${this.name}: Unknown variation. Field count: ${fields.length}, content: ${content}`);
+      decodeResult.decoded = false;
+      decodeResult.decoder.decodeLevel = "none";
+    }
+    return decodeResult;
+  }
+};
+function processPosition(decodeResult, value) {
+  if (value.length !== 16 && value[0] !== "N" && value[0] !== "S" && value[8] !== "W" && value[8] !== "E") {
+    return false;
+  }
+  const latDir = value[0] === "N" ? 1 : -1;
+  const lonDir = value[8] === "E" ? 1 : -1;
+  const position = {
+    latitude: latDir * Number(value.substring(1, 7)),
+    longitude: lonDir * Number(value.substring(9, 15))
+  };
+  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 processAlt(decodeResult, value) {
+  decodeResult.raw.altitude = Number(value);
+  decodeResult.formatted.items.push({
+    type: "altitude",
+    code: "ALT",
+    label: "Altitude",
+    value: `${decodeResult.raw.altitude} feet`
+  });
+}
+function processTemp(decodeResult, value) {
+  decodeResult.raw.outside_air_temperature = Number(value.substring(1)) * (value.charAt(0) === "M" ? -1 : 1);
+  decodeResult.formatted.items.push({
+    type: "outside_air_temperature",
+    code: "OATEMP",
+    label: "Outside Air Temperature (C)",
+    value: `${decodeResult.raw.outside_air_temperature}`
+  });
+}
+function processArrvApt(decodeResult, value) {
+  decodeResult.raw.arrival_icao = value;
+  decodeResult.formatted.items.push({
+    type: "destination",
+    code: "DST",
+    label: "Destination",
+    value: decodeResult.raw.arrival_icao
+  });
+}
+
 // lib/plugins/Label_30_Slash_EA.ts
 var Label_30_Slash_EA = class extends DecoderPlugin {
   name = "label-30-slash-ea";
@@ -855,7 +978,7 @@ var Label_44_POS = class extends DecoderPlugin {
         console.log(`Label 44 Position Report: groups`);
         console.log(results.groups);
       }
-      decodeResult.raw.position = CoordinateUtils.decodeStringCoordinates(results.groups.unsplit_coords);
+      decodeResult.raw.position = CoordinateUtils.decodeStringCoordinatesDecimalMinutes(results.groups.unsplit_coords);
       decodeResult.raw.flight_level = results.groups.flight_level_or_ground == "GRD" || results.groups.flight_level_or_ground == "***" ? "0" : Number(results.groups.flight_level_or_ground);
       decodeResult.raw.departure_icao = results.groups.departure_icao;
       decodeResult.raw.arrival_icao = results.groups.arrival_icao;
@@ -870,9 +993,9 @@ var Label_44_POS = class extends DecoderPlugin {
       }
       if (decodeResult.raw.position) {
         decodeResult.formatted.items.push({
-          type: "position",
+          type: "aircraft_position",
           code: "POS",
-          label: "Position",
+          label: "Aircraft Position",
           value: CoordinateUtils.coordinateString(decodeResult.raw.position)
         });
       }
@@ -1180,6 +1303,112 @@ var Label_ColonComma = class extends DecoderPlugin {
   }
 };
 
+// lib/utils/result_formatter.ts
+var ResultFormatter = class {
+  static altitude(decodeResult, value) {
+    decodeResult.raw.altitude = value;
+    decodeResult.formatted.items.push({
+      type: "altitude",
+      code: "ALT",
+      label: "Altitude",
+      value: `${decodeResult.raw.altitude} feet`
+    });
+  }
+  static flightNumber(decodeResult, value) {
+    decodeResult.raw.flight_number = value;
+  }
+  static departureAirport(decodeResult, value) {
+    decodeResult.raw.departure_icao = value;
+    decodeResult.formatted.items.push({
+      type: "origin",
+      code: "ORG",
+      label: "Origin",
+      value: decodeResult.raw.departure_icao
+    });
+  }
+  static departureRunway(decodeResult, value) {
+    decodeResult.raw.departure_runway = value;
+    decodeResult.formatted.items.push({
+      type: "runway",
+      code: "DEPRWY",
+      label: "Departure Runway",
+      value: decodeResult.raw.departure_runway
+    });
+  }
+  static arrivalAirport(decodeResult, value) {
+    decodeResult.raw.arrival_icao = value;
+    decodeResult.formatted.items.push({
+      type: "destination",
+      code: "DST",
+      label: "Destination",
+      value: decodeResult.raw.arrival_icao
+    });
+  }
+  static eta(decodeResult, value) {
+    decodeResult.formatted.items.push({
+      type: "eta",
+      code: "ETA",
+      label: "Estimated Time of Arrival",
+      value: value.substring(0, 2) + ":" + value.substring(2, 4) + ":" + value.substring(4, 6)
+    });
+  }
+  static arrivalRunway(decodeResult, value) {
+    decodeResult.raw.arrival_runway = value;
+    decodeResult.formatted.items.push({
+      type: "runway",
+      label: "Arrival Runway",
+      value: decodeResult.raw.arrival_runway
+    });
+  }
+  static currentFuel(decodeResult, value) {
+    decodeResult.raw.fuel_on_board = value;
+    decodeResult.formatted.items.push({
+      type: "fuel_on_board",
+      code: "FOB",
+      label: "Fuel On Board",
+      value: decodeResult.raw.fuel_on_board.toString()
+    });
+  }
+  static remainingFuel(decodeResult, value) {
+    decodeResult.raw.fuel_remaining = value;
+    decodeResult.formatted.items.push({
+      type: "fuel_remaining",
+      label: "Fuel Remaining",
+      value: decodeResult.raw.fuel_remaining.toString()
+    });
+  }
+  static checksum(decodeResult, value) {
+    decodeResult.raw.checksum = Number("0x" + value);
+    decodeResult.formatted.items.push({
+      type: "message_checksum",
+      code: "CHECKSUM",
+      label: "Message Checksum",
+      value: "0x" + ("0000" + decodeResult.raw.checksum.toString(16)).slice(-4)
+    });
+  }
+  static groundspeed(decodeResult, value) {
+    decodeResult.raw.groundspeed = value;
+    decodeResult.formatted.items.push({
+      type: "aircraft_groundspeed",
+      code: "GSPD",
+      label: "Aircraft Groundspeed",
+      value: `${decodeResult.raw.groundspeed}`
+    });
+  }
+  static temperature(decodeResult, value) {
+    decodeResult.raw.outside_air_temperature = Number(value.substring(1)) * (value.charAt(0) === "M" ? -1 : 1);
+    decodeResult.formatted.items.push({
+      type: "outside_air_temperature",
+      code: "OATEMP",
+      label: "Outside Air Temperature (C)",
+      value: `${decodeResult.raw.outside_air_temperature}`
+    });
+  }
+  static unknown(decodeResult, value) {
+    decodeResult.remaining.text += "," + value;
+  }
+};
+
 // lib/utils/route_utils.ts
 var RouteUtils = class _RouteUtils {
   static routeToString(route) {
@@ -1220,13 +1449,13 @@ var RouteUtils = class _RouteUtils {
     }
     const waypoint = leg.split(",");
     if (waypoint.length == 2) {
-      const position = CoordinateUtils.decodeStringCoordinates(waypoint[1]);
+      const position = CoordinateUtils.decodeStringCoordinatesDecimalMinutes(waypoint[1]);
       if (position) {
         return { name: waypoint[0], latitude: position.latitude, longitude: position.longitude };
       }
     }
     if (leg.length == 13 || leg.length == 14) {
-      const position = CoordinateUtils.decodeStringCoordinates(leg);
+      const position = CoordinateUtils.decodeStringCoordinatesDecimalMinutes(leg);
       const name = waypoint.length == 2 ? waypoint[0] : "";
       if (position) {
         return { name, latitude: position.latitude, longitude: position.longitude };
@@ -1305,13 +1534,126 @@ var FlightPlanUtils = class _FlightPlanUtils {
   }
   static parseHeader(decodeResult, header) {
     let allKnownFields = true;
-    const fields = header.split("/");
+    if (header.startsWith("RF")) {
+      decodeResult.formatted.items.push({
+        type: "status",
+        code: "ROUTE_STATUS",
+        label: "Route Status",
+        value: "Route Filed"
+      });
+      decodeResult.raw.route_status = "RF";
+      if (header.length > 2) {
+        addRoute(decodeResult, header.substring(2));
+      }
+    } else if (header.startsWith("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 = header;
+    } else if (header.startsWith("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 += header;
+      allKnownFields = false;
+    }
+    return allKnownFields;
+  }
+};
+function addArrivalAirport(decodeResult, value) {
+  ResultFormatter.arrivalAirport(decodeResult, value);
+}
+function addDepartureAirport(decodeResult, value) {
+  ResultFormatter.departureAirport(decodeResult, value);
+}
+function addRunway(decodeResult, value) {
+  if (value.length === 8) {
+    ResultFormatter.arrivalRunway(decodeResult, value.substring(4, 7));
+  }
+  ResultFormatter.departureRunway(decodeResult, value.substring(0, 3));
+}
+function addRoute(decodeResult, value) {
+  const route = value.split(".");
+  decodeResult.raw.route = { waypoints: route.map((leg) => RouteUtils.getWaypoint(leg)) };
+  decodeResult.formatted.items.push({
+    type: "aircraft_route",
+    code: "ROUTE",
+    label: "Aircraft Route",
+    value: RouteUtils.routeToString(decodeResult.raw.route)
+  });
+}
+function addProcedure(decodeResult, value, type) {
+  if (decodeResult.raw.procedures === void 0) {
+    decodeResult.raw.procedures = [];
+  }
+  const data = value.split(".");
+  let waypoints;
+  if (data.length > 1) {
+    waypoints = data.slice(1).map((leg) => RouteUtils.getWaypoint(leg));
+  }
+  const route = { name: data[0], waypoints };
+  decodeResult.raw.procedures.push({ type, route });
+  const procedureName = type.substring(0, 1).toUpperCase() + type.slice(1);
+  let procedureValue = route.name;
+  decodeResult.formatted.items.push({
+    type: `procedure`,
+    code: "proc",
+    label: `${procedureName} Procedure`,
+    value: RouteUtils.routeToString(route)
+  });
+}
+function addCompanyRoute(decodeResult, value) {
+  const segments = value.split(".");
+  const parens_idx = segments[0].indexOf("(");
+  let name;
+  let runway;
+  if (parens_idx === -1) {
+    name = segments[0];
+  } else {
+    name = segments[0].slice(0, parens_idx);
+    runway = segments[0].slice(parens_idx + 1, segments[0].indexOf(")"));
+  }
+  let waypoints;
+  if (segments.length > 1) {
+    waypoints = segments.slice(1).map((leg) => RouteUtils.getWaypoint(leg));
+  }
+  decodeResult.raw.company_route = {
+    name,
+    runway,
+    waypoints
+  };
+  decodeResult.formatted.items.push({
+    type: "company_route",
+    code: "CR",
+    label: "Company Route",
+    value: RouteUtils.routeToString(decodeResult.raw.company_route)
+  });
+}
+
+// lib/utils/h1_helper.ts
+var H1Helper = class {
+  static decodeH1Message(decodeResult, message) {
+    let allKnownFields = true;
+    const checksum = message.slice(-4);
+    const data = message.slice(0, message.length - 4);
+    const fields = data.split("/");
     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("DC")) {
+        processDC(decodeResult, fields[i].substring(2).split(","));
       } else if (fields[i].startsWith("TS")) {
         const ts = fields[i].substring(2).split(",");
         let time = DateTimeUtils.convertDateTimeToEpoch(ts[0], ts[1]);
@@ -1319,69 +1661,101 @@ var FlightPlanUtils = class _FlightPlanUtils {
           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_date = ts[1];
         decodeResult.raw.message_timestamp = time;
       } else if (fields[i].startsWith("PS")) {
-        const pos = fields[i].substring(2);
-        allKnownFields == allKnownFields && processPosition(decodeResult, pos);
+        const pos = processPS(decodeResult, fields[i].substring(2).split(","));
+        allKnownFields == allKnownFields && 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
-        });
+        const data2 = fields[i].substring(2).split(",");
+        const dt = processDT(decodeResult, data2);
+        allKnownFields = allKnownFields && dt;
       } else if (fields[i].startsWith("ID")) {
-        const tail = fields[i].substring(2);
-        decodeResult.raw.tail = tail;
+        const data2 = fields[i].substring(2).split(",");
+        decodeResult.raw.tail = data2[0];
         decodeResult.formatted.items.push({
           type: "tail",
+          code: "TAIL",
           label: "Tail",
           value: decodeResult.raw.tail
         });
-      } 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));
+        if (data2.length > 1) {
+          decodeResult.raw.flight_number = data2[1];
         }
-      } 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"
-        });
+        if (data2.length > 2) {
+          allKnownFields = false;
+          decodeResult.remaining.text += "," + data2.slice(2).join(",");
+        }
+      } else if (fields[i].startsWith("LR")) {
+        const data2 = fields[i].substring(2).split(",");
+        const lr = processLR(decodeResult, data2);
+        allKnownFields = allKnownFields && lr;
+      } else if (fields[i].startsWith("RI") || fields[i].startsWith("RF") || fields[i].startsWith("RP")) {
+        const fp = FlightPlanUtils.processFlightPlan(decodeResult, fields[i].split(":"));
+        allKnownFields = allKnownFields && fp;
+      } else if (fields[i].startsWith("PR")) {
+        allKnownFields = false;
+        decodeResult.remaining.text += "/" + fields[i];
+      } else if (fields[i].startsWith("PS")) {
+        allKnownFields = false;
+        decodeResult.remaining.text += fields[i];
       } else {
         decodeResult.remaining.text += "/" + fields[i];
         allKnownFields = false;
       }
     }
+    if (decodeResult.formatted.items.length > 0) {
+      ResultFormatter.checksum(decodeResult, checksum);
+    }
     return allKnownFields;
   }
 };
+function processDT(decodeResult, data) {
+  let allKnownFields = true;
+  if (!decodeResult.raw.arrival_icao) {
+    ResultFormatter.arrivalAirport(decodeResult, data[0]);
+  } else if (decodeResult.raw.arrival_icao != data[0]) {
+    decodeResult.remaining.text += "/" + data;
+  }
+  if (data.length > 1) {
+    ResultFormatter.arrivalRunway(decodeResult, data[1]);
+  }
+  if (data.length > 2) {
+    ResultFormatter.currentFuel(decodeResult, Number(data[2]));
+  }
+  if (data.length > 3) {
+    ResultFormatter.eta(decodeResult, data[3]);
+  }
+  if (data.length > 4) {
+    ResultFormatter.remainingFuel(decodeResult, Number(data[4]));
+  }
+  if (data.length > 5) {
+    allKnownFields = false;
+    decodeResult.remaining.text += "," + data.slice(5).join(",");
+  }
+  return allKnownFields;
+}
+function processLR(decodeResult, data) {
+  let allKnownFields = true;
+  if (data.length === 19) {
+    ResultFormatter.unknown(decodeResult, data[1]);
+    ResultFormatter.flightNumber(decodeResult, data[2]);
+    ResultFormatter.departureAirport(decodeResult, data[3]);
+    ResultFormatter.arrivalAirport(decodeResult, data[4]);
+    ResultFormatter.arrivalRunway(decodeResult, data[5]);
+    ResultFormatter.unknown(decodeResult, data.slice(6, 19).join(","));
+    allKnownFields = false;
+  } else {
+    allKnownFields = false;
+  }
+  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));
+      decoded = processPosition2(decodeResult, parts[0].substring(3).split(","));
     }
     return decoded;
   } else if (parts.length == 2) {
@@ -1391,7 +1765,7 @@ function parseMessageType(decodeResult, messageType) {
       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));
+      decoded = processPosition2(decodeResult, parts[1].substring(6).split(","));
     }
     decodeResult.raw.message_type = messageType;
     return decoded;
@@ -1399,8 +1773,21 @@ function parseMessageType(decodeResult, messageType) {
   decodeResult.remaining.text += messageType;
   return false;
 }
-function processPosition(decodeResult, value) {
-  const position = CoordinateUtils.decodeStringCoordinates(value);
+function processDC(decodeResult, data) {
+  decodeResult.raw.message_date = data[0];
+  if (data.length === 1) {
+  } else if (data.length === 2) {
+    const date = data[0].substring(2, 4) + data[0].substring(0, 2) + data[0].substring(4, 6);
+    const time = DateTimeUtils.convertDateTimeToEpoch(data[1], data[0]);
+    decodeResult.raw.message_timestamp = time;
+  } else {
+    return false;
+  }
+  return true;
+}
+function processPS(decodeResult, data) {
+  let allKnownFields = true;
+  const position = CoordinateUtils.decodeStringCoordinates(data[0]);
   if (position) {
     decodeResult.raw.position = position;
     decodeResult.formatted.items.push({
@@ -1409,46 +1796,76 @@ function processPosition(decodeResult, value) {
       label: "Aircraft Position",
       value: CoordinateUtils.coordinateString(position)
     });
-  }
-  return !!position;
-}
-function addArrivalAirport(decodeResult, value) {
-  decodeResult.raw.arrival_icao = value;
-  decodeResult.formatted.items.push({
-    type: "destination",
-    code: "DST",
-    label: "Destination",
-    value: decodeResult.raw.arrival_icao
-  });
-}
-function addDepartureAirport(decodeResult, value) {
-  decodeResult.raw.departure_icao = value;
-  decodeResult.formatted.items.push({
-    type: "origin",
-    code: "ORG",
-    label: "Origin",
-    value: decodeResult.raw.departure_icao
-  });
+  } else {
+    allKnownFields = false;
+  }
+  console.log("PS data.length: ", data.length);
+  console.log("PS data: ", data);
+  if (data.length === 9) {
+    processRoute(decodeResult, data[3], data[1], data[5], data[4], void 0);
+    ResultFormatter.altitude(decodeResult, Number(data[2]) * 100);
+    ResultFormatter.temperature(decodeResult, data[6]);
+    ResultFormatter.unknown(decodeResult, data[7]);
+    ResultFormatter.unknown(decodeResult, data[8]);
+  }
+  if (data.length === 14) {
+    ResultFormatter.altitude(decodeResult, Number(data[3]) * 100);
+    processRoute(decodeResult, data[4], data[2], data[6], data[5], void 0);
+    ResultFormatter.temperature(decodeResult, data[7]);
+    ResultFormatter.groundspeed(decodeResult, Number(data[10]));
+    ResultFormatter.unknown(decodeResult, data[1]);
+    ResultFormatter.unknown(decodeResult, data[8]);
+    ResultFormatter.unknown(decodeResult, data[9]);
+    ResultFormatter.unknown(decodeResult, data.slice(11).join(","));
+  }
+  allKnownFields = false;
+  return allKnownFields;
 }
-function addRunway(decodeResult, value) {
-  if (value.length === 8) {
-    decodeResult.raw.arrival_runway = value.substring(4, 7);
+function processPosition2(decodeResult, data) {
+  let allKnownFields = true;
+  const position = CoordinateUtils.decodeStringCoordinates(data[0]);
+  if (position) {
+    decodeResult.raw.position = position;
     decodeResult.formatted.items.push({
-      type: "runway",
-      label: "Arrival Runway",
-      value: decodeResult.raw.arrival_runway
+      type: "aircraft_position",
+      code: "POS",
+      label: "Aircraft Position",
+      value: CoordinateUtils.coordinateString(position)
     });
-  }
-  decodeResult.raw.departure_runway = value.substring(0, 3);
-  decodeResult.formatted.items.push({
-    type: "runway",
-    label: "Departure Runway",
-    value: decodeResult.raw.departure_runway
-  });
+  } else {
+    allKnownFields = false;
+  }
+  console.log("data.length: ", data.length);
+  console.log("data: ", data);
+  if (data.length >= 10) {
+    ResultFormatter.altitude(decodeResult, Number(data[3]) * 100);
+    processRoute(decodeResult, data[1], data[2], data[4], data[5], data[6]);
+    ResultFormatter.temperature(decodeResult, data[7]);
+    ResultFormatter.unknown(decodeResult, data[8]);
+    ResultFormatter.unknown(decodeResult, data[9]);
+  }
+  if (data.length >= 14) {
+    ResultFormatter.groundspeed(decodeResult, Number(data[10]));
+    ResultFormatter.unknown(decodeResult, data[11]);
+    ResultFormatter.unknown(decodeResult, data[12]);
+    ResultFormatter.unknown(decodeResult, data[13]);
+  }
+  allKnownFields = false;
+  return allKnownFields;
 }
-function addRoute(decodeResult, value) {
-  const route = value.split(".");
-  decodeResult.raw.route = { waypoints: route.map((leg) => RouteUtils.getWaypoint(leg)) };
+function processRoute(decodeResult, last, time, next, eta, then, date) {
+  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 = 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",
     code: "ROUTE",
@@ -1456,53 +1873,6 @@ function addRoute(decodeResult, value) {
     value: RouteUtils.routeToString(decodeResult.raw.route)
   });
 }
-function addProcedure(decodeResult, value, type) {
-  if (decodeResult.raw.procedures === void 0) {
-    decodeResult.raw.procedures = [];
-  }
-  const data = value.split(".");
-  let waypoints;
-  if (data.length > 1) {
-    waypoints = data.slice(1).map((leg) => RouteUtils.getWaypoint(leg));
-  }
-  const route = { name: data[0], waypoints };
-  decodeResult.raw.procedures.push({ type, route });
-  const procedureName = type.substring(0, 1).toUpperCase() + type.slice(1);
-  let procedureValue = route.name;
-  decodeResult.formatted.items.push({
-    type: `procedure`,
-    code: "proc",
-    label: `${procedureName} Procedure`,
-    value: RouteUtils.routeToString(route)
-  });
-}
-function addCompanyRoute(decodeResult, value) {
-  const segments = value.split(".");
-  const parens_idx = segments[0].indexOf("(");
-  let name;
-  let runway;
-  if (parens_idx === -1) {
-    name = segments[0];
-  } else {
-    name = segments[0].slice(0, parens_idx);
-    runway = segments[0].slice(parens_idx + 1, segments[0].indexOf(")"));
-  }
-  let waypoints;
-  if (segments.length > 1) {
-    waypoints = segments.slice(1).map((leg) => RouteUtils.getWaypoint(leg));
-  }
-  decodeResult.raw.company_route = {
-    name,
-    runway,
-    waypoints
-  };
-  decodeResult.formatted.items.push({
-    type: "company_route",
-    code: "CR",
-    label: "Company Route",
-    value: RouteUtils.routeToString(decodeResult.raw.company_route)
-  });
-}
 
 // lib/plugins/Label_H1_FPN.ts
 var Label_H1_FPN = class extends DecoderPlugin {
@@ -1518,15 +1888,12 @@ var Label_H1_FPN = class extends DecoderPlugin {
     decodeResult.decoder.name = this.name;
     decodeResult.formatted.description = "Flight Plan";
     decodeResult.message = message;
+    decodeResult.remaining.text = "";
     const msg = message.text.replace(/\n|\r/g, "");
-    const checksum = msg.slice(-4);
-    const data = msg.slice(0, msg.length - 4).split(":");
-    if (data.length > 1) {
-      const fulllyDecoded = FlightPlanUtils.processFlightPlan(decodeResult, data);
-      addChecksum(decodeResult, checksum);
-      decodeResult.decoded = true;
-      decodeResult.decoder.decodeLevel = fulllyDecoded ? "full" : "partial";
-    } else {
+    const fulllyDecoded = H1Helper.decodeH1Message(decodeResult, msg);
+    decodeResult.decoded = true;
+    decodeResult.decoder.decodeLevel = fulllyDecoded ? "full" : "partial";
+    if (decodeResult.formatted.items.length === 0) {
       if (options?.debug) {
         console.log(`Decoder: Unknown H1 message: ${message.text}`);
       }
@@ -1537,15 +1904,6 @@ var Label_H1_FPN = class extends DecoderPlugin {
     return decodeResult;
   }
 };
-function addChecksum(decodeResult, value) {
-  decodeResult.raw.checksum = Number("0x" + value);
-  decodeResult.formatted.items.push({
-    type: "message_checksum",
-    code: "CHECKSUM",
-    label: "Message Checksum",
-    value: "0x" + ("0000" + decodeResult.raw.checksum.toString(16)).slice(-4)
-  });
-}
 
 // lib/plugins/Label_H1_OHMA.ts
 import * as zlib from "minizlib";
@@ -1571,13 +1929,18 @@ var Label_H1_OHMA = class extends DecoderPlugin {
       decompress.flush(zlib.constants.Z_SYNC_FLUSH);
       const result = decompress.read();
       const jsonText = result.toString();
-      const json = JSON.parse(jsonText);
       let formattedMsg;
-      if (json.message.startsWith("{")) {
-        const ohmaMsg = JSON.parse(json.message);
+      let jsonMessage;
+      try {
+        jsonMessage = JSON.parse(jsonText).message;
+      } catch {
+        jsonMessage = jsonText;
+      }
+      try {
+        const ohmaMsg = JSON.parse(jsonMessage);
         formattedMsg = JSON.stringify(ohmaMsg, null, 2);
-      } else {
-        formattedMsg = json.message;
+      } catch {
+        formattedMsg = jsonMessage;
       }
       decodeResult.decoded = true;
       decodeResult.decoder.decodeLevel = "full";
@@ -1616,225 +1979,20 @@ var Label_H1_POS = class extends DecoderPlugin {
     decodeResult.formatted.description = "Position Report";
     decodeResult.message = message;
     decodeResult.remaining.text = "";
-    const checksum = message.text.slice(-4);
-    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) {
-      processAlt(decodeResult, parts[3]);
-      processRoute(decodeResult, parts[1], parts[2], parts[4], parts[5], parts[6]);
-      processTemp(decodeResult, parts[7]);
-      processUnknown(decodeResult, parts[8]);
-      processUnknown(decodeResult, parts[9]);
-      processChecksum(decodeResult, checksum);
-      decodeResult.decoded = true;
-      decodeResult.decoder.decodeLevel = "partial";
-    } else if (parts.length === 11) {
-      processAlt(decodeResult, parts[3]);
-      processRoute(decodeResult, parts[1], parts[2], parts[4], parts[5], parts[6], parts[10]);
-      processTemp(decodeResult, parts[7]);
-      processUnknown(decodeResult, parts[8]);
-      processUnknown(decodeResult, parts[9]);
-      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) {
-      processAlt(decodeResult, parts[3]);
-      processRoute(decodeResult, parts[1], parts[2], parts[4], parts[5], parts[6]);
-      processTemp(decodeResult, parts[7]);
-      processUnknown(decodeResult, parts[8]);
-      processUnknown(decodeResult, parts[9]);
-      processGndspd(decodeResult, parts[10]);
-      processUnknown(decodeResult, parts[11]);
-      processUnknown(decodeResult, parts[12]);
-      processUnknown(decodeResult, parts[13]);
-      processChecksum(decodeResult, checksum);
-      decodeResult.decoded = true;
-      decodeResult.decoder.decodeLevel = "partial";
-    } else if (parts.length === 15) {
-      decodeResult.raw.flight_number = parts[1];
-      let date = void 0;
-      if (parts[2].startsWith("/DC")) {
-        date = parts[2].substring(3);
-      } else {
-        processUnknown(decodeResult, parts[2]);
-      }
-      processUnknown(decodeResult, parts[3]);
-      const fields = parts[4].split("/");
-      for (let i = 0; i < fields.length; ++i) {
-        const field = fields[i];
-        if (field.startsWith("PS")) {
-          processPosition2(decodeResult, field.substring(2));
-        } else {
-          if (i === 0) {
-            processUnknown(decodeResult, field);
-          } else {
-            processUnknown(decodeResult, "/" + field);
-          }
-        }
-      }
-      processRoute(decodeResult, parts[7], parts[5], parts[9], parts[8], void 0, date);
-      processAlt(decodeResult, parts[6]);
-      processTemp(decodeResult, parts[10]);
-      processUnknown(decodeResult, parts[11]);
-      processUnknown(decodeResult, parts[12]);
-      processUnknown(decodeResult, parts[13]);
-      processUnknown(decodeResult, parts[14]);
-      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) {
-      processRunway(decodeResult, parts[1]);
-      const time = parts[2];
-      processUnknown(decodeResult, parts[3]);
-      const past = parts[4];
-      processUnknown(decodeResult, parts[5]);
-      const eta = parts[6];
-      const next = parts[7];
-      processUnknown(decodeResult, parts.slice(8, 14).join(","));
-      processUnknown(decodeResult, parts[16]);
-      processUnknown(decodeResult, parts[17]);
-      processUnknown(decodeResult, parts[18]);
-      processGndspd(decodeResult, parts[19]);
-      processUnknown(decodeResult, parts[20]);
-      processUnknown(decodeResult, parts[21]);
-      processAlt(decodeResult, parts[22]);
-      processUnknown(decodeResult, parts.slice(23, 31).join(","));
-      const allProcessed = FlightPlanUtils.processFlightPlan(decodeResult, (parts[31] + checksum).split(":"));
-      processRoute(decodeResult, past, time, next, eta);
-      decodeResult.decoded = true;
-      decodeResult.decoder.decodeLevel = "partial";
-    } else {
-      if (options.debug) {
+    const fulllyDecoded = H1Helper.decodeH1Message(decodeResult, message.text);
+    decodeResult.decoded = true;
+    decodeResult.decoder.decodeLevel = fulllyDecoded ? "full" : "partial";
+    if (decodeResult.formatted.items.length === 0) {
+      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";
     }
     return decodeResult;
   }
 };
-function processUnknown(decodeResult, value) {
-  decodeResult.remaining.text += "," + value;
-}
-function processPosition2(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)
-    });
-  }
-}
-function processAlt(decodeResult, value) {
-  decodeResult.raw.altitude = Number(value) * 100;
-  decodeResult.formatted.items.push({
-    type: "altitude",
-    code: "ALT",
-    label: "Altitude",
-    value: `${decodeResult.raw.altitude} feet`
-  });
-}
-function processTemp(decodeResult, value) {
-  decodeResult.raw.outside_air_temperature = Number(value.substring(1)) * (value.charAt(0) === "M" ? -1 : 1);
-  decodeResult.formatted.items.push({
-    type: "outside_air_temperature",
-    code: "OATEMP",
-    label: "Outside Air Temperature (C)",
-    value: `${decodeResult.raw.outside_air_temperature}`
-  });
-}
-function processRunway(decodeResult, value) {
-  decodeResult.raw.arrival_runway = value.replace("RW", "");
-  decodeResult.formatted.items.push({
-    type: "runway",
-    label: "Arrival Runway",
-    value: decodeResult.raw.arrival_runway
-  });
-}
-function processGndspd(decodeResult, value) {
-  decodeResult.raw.groundspeed = Number(value);
-  decodeResult.formatted.items.push({
-    type: "aircraft_groundspeed",
-    code: "GSPD",
-    label: "Aircraft Groundspeed",
-    value: `${decodeResult.raw.groundspeed}`
-  });
-}
-function processRoute(decodeResult, last, time, next, eta, then, date) {
-  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 = 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",
-    code: "ROUTE",
-    label: "Aircraft Route",
-    value: RouteUtils.routeToString(decodeResult.raw.route)
-  });
-}
-function processChecksum(decodeResult, value) {
-  decodeResult.raw.checksum = Number("0x" + value);
-  decodeResult.formatted.items.push({
-    type: "message_checksum",
-    code: "CHECKSUM",
-    label: "Message Checksum",
-    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 {
@@ -1857,16 +2015,16 @@ var Label_H1_WRN = class extends DecoderPlugin {
       for (let i = 1; i < fields.length; i++) {
         const field = fields[i];
         if (field.startsWith("PN")) {
-          processUnknown2(decodeResult, "/" + field);
+          processUnknown(decodeResult, "/" + field);
         } else {
-          processUnknown2(decodeResult, "/" + field);
+          processUnknown(decodeResult, "/" + field);
         }
       }
       const data = parts[1].substring(0, 20);
       const msg = parts[1].substring(20);
       const datetime = data.substring(0, 12);
       const date = datetime.substring(4, 6) + datetime.substring(2, 4) + datetime.substring(0, 2);
-      processUnknown2(decodeResult, data.substring(12));
+      processUnknown(decodeResult, data.substring(12));
       decodeResult.raw.message_timestamp = DateTimeUtils.convertDateTimeToEpoch(datetime.substring(6), date);
       decodeResult.raw.warning_message = msg;
       decodeResult.formatted.items.push({
@@ -1888,7 +2046,7 @@ var Label_H1_WRN = class extends DecoderPlugin {
     return decodeResult;
   }
 };
-function processUnknown2(decodeResult, value) {
+function processUnknown(decodeResult, value) {
   decodeResult.remaining.text += value;
 }
 
@@ -2989,6 +3147,7 @@ var MessageDecoder = class {
     this.registerPlugin(new Label_15_FST(this));
     this.registerPlugin(new Label_16_N_Space(this));
     this.registerPlugin(new Label_20_POS(this));
+    this.registerPlugin(new Label_21_POS(this));
     this.registerPlugin(new Label_30_Slash_EA(this));
     this.registerPlugin(new Label_44_ETA(this));
     this.registerPlugin(new Label_44_IN(this));