@aeroswarm/codec 0.1.11 → 0.1.12

package/dist/index.js

@@ -116,11 +116,15 @@ function parseBits(s) {
   }
   return out;
 }
+function repetitionBytes(body, fallback) {
+  if (/<BDS[\s/>]/.test(body)) return 8;
+  const m = body.match(/<Fixed\s+length="(\d+)"/);
+  return m ? parseInt(m[1]) : fallback;
+}
 function parseRepetitive(s) {
   const inner = firstContent(s, "Repetitive");
   const repAttr = inner.match(/<Repetitive\s+rep="(\d+)"/);
-  const m = inner.match(/<Fixed\s+length="(\d+)"/);
-  return { type: "repetitive", repBytes: repAttr ? parseInt(repAttr[1]) : 1, itemBytes: m ? parseInt(m[1]) : 0 };
+  return { type: "repetitive", repBytes: repAttr ? parseInt(repAttr[1]) : 1, itemBytes: repetitionBytes(inner, 0) };
 }
 function parseCompound(s) {
   const inner = firstContent(s, "Compound");
@@ -139,7 +143,7 @@ function parseCompound(s) {
       subs.push({ type: "variable", chunkBytes: first ? parseInt(first[1]) : 1 });
     } else if (child.tag === "Repetitive") {
       const repAttr = child.open.match(/rep="(\d+)"/);
-      subs.push({ type: "repetitive", repBytes: repAttr ? parseInt(repAttr[1]) : 1, itemBytes: first ? parseInt(first[1]) : 1 });
+      subs.push({ type: "repetitive", repBytes: repAttr ? parseInt(repAttr[1]) : 1, itemBytes: repetitionBytes(child.body, 1) });
     } else {
       subs.push({ type: "explicit" });
     }
@@ -188,23 +192,23 @@ function parseFspec(buf, start = 0) {
   return { bits, end: i };
 }
 function skipItem(buf, off, def) {
-  if (off >= buf.length) return buf.length;
+  if (off >= buf.length) return buf.length + 1;
   switch (def.type) {
     case "fixed":
-      return Math.min(off + def.bytes, buf.length);
+      return off + def.bytes;
     case "variable": {
       while (off + def.chunkBytes <= buf.length) {
         const last = buf[off + def.chunkBytes - 1];
         off += def.chunkBytes;
         if ((last & 1) === 0) break;
       }
-      return Math.min(off, buf.length);
+      return off;
     }
     case "repetitive": {
-      if (off + def.repBytes > buf.length) return buf.length;
+      if (off + def.repBytes > buf.length) return buf.length + 1;
       let rep = 0;
       for (let i = 0; i < def.repBytes; i++) rep = rep << 8 | buf[off + i];
-      return Math.min(off + def.repBytes + rep * def.itemBytes, buf.length);
+      return off + def.repBytes + rep * def.itemBytes;
     }
     case "compound": {
       const presentIdxs = [];
@@ -222,13 +226,12 @@ function skipItem(buf, off, def) {
         if (idx >= def.subs.length) break;
         off = skipItem(buf, off, def.subs[idx]);
       }
-      return Math.min(off, buf.length);
+      return off;
     }
     case "explicit": {
-      if (off >= buf.length) return off;
+      if (off >= buf.length) return buf.length + 1;
       const len = buf[off];
-      off++;
-      return Math.min(off + len - 1, buf.length);
+      return off + Math.max(len, 1);
     }
   }
 }
@@ -238,17 +241,18 @@ function decodeBlock(block, def, onField) {
   const uapMap = new Map(def.uap.map((e) => [e.bit, e.id]));
   for (let i = 0; i < bits.length; i++) {
     if (!bits[i]) continue;
-    if (off >= block.length) return { end: block.length, complete: true };
+    if (off >= block.length) return { end: block.length, complete: true, overrun: true };
     const uapPos = i + Math.floor(i / 7);
     const id = uapMap.get(uapPos);
-    if (id === void 0) return { end: off, complete: false };
+    if (id === void 0) return { end: off, complete: false, overrun: false };
     const itemDef = def.items.get(id);
-    if (!itemDef) return { end: off, complete: false };
+    if (!itemDef) return { end: off, complete: false, overrun: false };
     const start = off;
     off = skipItem(block, off, itemDef);
-    onField(id, block.slice(start, off), itemDef);
+    onField(id, block.slice(start, Math.min(off, block.length)), itemDef);
+    if (off > block.length) return { end: block.length, complete: true, overrun: true };
   }
-  return { end: off, complete: true };
+  return { end: off, complete: true, overrun: false };
 }
 
 // src/surveillance/asterix/fields.ts
@@ -936,12 +940,12 @@ function parseAsterixBlocks(buf, defaultEdition) {
     for (const edition of toTry) {
       const def = loadDef(cat, edition);
       if (!def) continue;
-      const { all, consumed } = decodeRecords(block, def, cat);
+      const { all, consumed, full } = decodeRecords(block, def, cat);
       const first = all[0];
       if (!first) continue;
       const score = plausibilityScore(first);
-      if (!best || score > best.score) {
-        best = { edition, all, consumed, score };
+      if (!best || full && !best.full || full === best.full && score > best.score) {
+        best = { edition, all, consumed, score, full };
       }
     }
     blocks.push({
@@ -949,15 +953,16 @@ function parseAsterixBlocks(buf, defaultEdition) {
       edition: best?.edition ?? null,
       length: block.length,
       consumed: best?.consumed ?? 0,
+      clean: best?.full ?? false,
       records: best?.all ?? []
     });
   }
   return blocks;
 }
 function decodeRecords(block, def, cat) {
-  const out = [];
+  const records = [];
   let pos = 0;
-  let consumed = 0;
+  let clean = false;
   while (pos < block.length) {
     const fields = {};
     let result;
@@ -972,13 +977,19 @@ function decodeRecords(block, def, cat) {
       break;
     }
     if (!isPlausible(fields)) break;
-    if (out.length > 0 && Object.keys(fields).length === 0) break;
-    out.push(fields);
-    if (!result.complete || result.end <= 0) break;
+    if (result.overrun && records.length > 0) break;
+    records.push({ fields, end: pos + result.end });
+    if (!result.complete || result.end <= 0 || result.overrun) break;
     pos += result.end;
-    consumed = pos;
+    clean = pos >= block.length;
+  }
+  if (clean) {
+    const kept = records.filter((r, i) => i === 0 || Object.keys(r.fields).length > 0).map((r) => r.fields);
+    return { all: kept, consumed: block.length, full: true };
   }
-  return { all: out, consumed };
+  const firstEmpty = records.findIndex((r, i) => i > 0 && Object.keys(r.fields).length === 0);
+  const usable = firstEmpty === -1 ? records : records.slice(0, firstEmpty);
+  return { all: usable.map((r) => r.fields), consumed: usable.length > 0 ? usable[usable.length - 1].end : 0, full: false };
 }
 function isPlausible(f) {
   if (f.lat !== void 0 && (f.lat < -90 || f.lat > 90)) return false;
@@ -1333,6 +1344,7 @@ export {
   decodeMlatFrame,
   parseAftn,
   parseAsterix,
+  parseAsterixBlocks,
   resolveAsterixAltitudeFt,
   resolveAsterixPosition,
   splitAftnStream

package/dist/surveillance/asterix/decoder.d.ts

@@ -4,16 +4,21 @@ export declare function parseFspec(buf: Buffer, start?: number): {
     bits: boolean[];
     end: number;
 };
-/** Advance offset past one DataItem, returning new offset. */
+/**
+ * Advance offset past one DataItem, returning new offset. The result is NOT clamped to the buffer: an offset past
+ * `buf.length` means the item needs more octets than there are (an overrun), which `decodeBlock` reports.
+ */
 export declare function skipItem(buf: Buffer, off: number, def: ItemDef): number;
 /**
  * Decode ONE record at the start of `block` (a data block can carry many records back to back, each with its own
  * FSPEC). Calls `onField(id, bytes, itemDef)` for each present DataItem. Returns where the record ended, so the caller
  * can go on with the next one, and whether that position can be trusted: `complete` is false when an item the
- * definition does not know stopped the decode (the length of what follows is then unknown).
+ * definition does not know stopped the decode (the length of what follows is then unknown); `overrun` is true when an
+ * item needed more octets than the block has (the record is cut short or an item was sized wrongly).
  */
 export declare function decodeBlock(block: Buffer, def: AsterixDef, onField: (id: string, data: Buffer, itemDef: ItemDef) => void): {
     end: number;
     complete: boolean;
+    overrun: boolean;
 };
 //# sourceMappingURL=decoder.d.ts.map

package/dist/surveillance/asterix/decoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decoder.d.ts","sourceRoot":"","sources":["../../../src/surveillance/asterix/decoder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAI3D,sFAAsF;AACtF,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,SAAI,GAAG;IAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAUnF;AAID,8DAA8D;AAC9D,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,CAiDvE;AAID;;;;;GAKG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAC5D;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CA0BpC"}
+{"version":3,"file":"decoder.d.ts","sourceRoot":"","sources":["../../../src/surveillance/asterix/decoder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAI3D,sFAAsF;AACtF,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,SAAI,GAAG;IAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAUnF;AAID;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,CAiDvE;AAID;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAC5D;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CA2BtD"}

package/dist/surveillance/asterix/index.d.ts

@@ -1,4 +1,5 @@
-export { parseAsterix } from './parser.js';
+export { parseAsterix, parseAsterixBlocks } from './parser.js';
+export type { AsterixBlockInfo } from './parser.js';
 export { resolveAsterixPosition, resolveAsterixAltitudeFt } from './resolvers.js';
 export type { RadarSite } from './resolvers.js';
 export type { AsterixRecord, AsterixFields } from './types.js';

package/dist/surveillance/asterix/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/surveillance/asterix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAClF,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/surveillance/asterix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAC/D,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAClF,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC"}

package/dist/surveillance/asterix/parser.d.ts

@@ -19,8 +19,10 @@ export interface AsterixBlockInfo {
     edition: string | null;
     /** Octets of the block after its 3-octet header. */
     length: number;
-    /** Octets taken up by the decoded records. Less than `length` means an item was sized wrongly or the tail was not understood. */
+    /** Octets taken up by the decoded records. */
     consumed: number;
+    /** The records tile the block exactly: no octets left over, none missing, no item that ran past the end. False points at an item sized wrongly or a tail that was not understood. */
+    clean: boolean;
     records: AsterixFields[];
 }
 /**

package/dist/surveillance/asterix/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/surveillance/asterix/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAsB/D;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,aAAa,EAAE,CAOjB;AAED,iJAAiJ;AACjJ,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,oDAAoD;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,iIAAiI;IACjI,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,aAAa,EAAE,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,gBAAgB,EAAE,CAwCpB"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/surveillance/asterix/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAsB/D;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,aAAa,EAAE,CAOjB;AAED,iJAAiJ;AACjJ,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,oDAAoD;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,qLAAqL;IACrL,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,gBAAgB,EAAE,CA2CpB"}

package/dist/surveillance/asterix/repetitive.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=repetitive.test.d.ts.map

package/dist/surveillance/asterix/repetitive.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"repetitive.test.d.ts","sourceRoot":"","sources":["../../../src/surveillance/asterix/repetitive.test.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeroswarm/codec",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",