@aeroswarm/ingest 0.1.1 → 0.1.4

package/dist/feed/asterix.d.ts

@@ -17,6 +17,8 @@ export interface AsterixFeedStats extends IngestSourceStats {
         operationalRangeNm?: number;
         at: number;
     } | null;
+    /** AFTN messages recovered from non-ASTERIX datagrams on a mixed stream */
+    aftnMessages: number;
 }
 /** Per-feed configuration — every field explicit (no env fallbacks inside the
  *  package; the host process supplies them). */
@@ -35,6 +37,9 @@ export interface AsterixFeedConfig {
     multicastIface?: string;
     /** Radar site position for CAT020/048 polar→WGS84 resolution */
     radarSite?: RadarSite;
+    /** Optional per-sensor override keyed "sac:sic" — a single stream can carry
+     *  plots from several radars, each referenced to its own origin */
+    radarSites?: Record<string, RadarSite>;
 }
 /** Direct ASTERIX feed source: UDP datagrams (unicast or multicast) or a TCP
  *  client stream ([CAT][LEN]… blocks), decoded to FusedTrackEvents. Emits
@@ -54,6 +59,7 @@ export declare class AsterixFeedSource implements IngestSource {
     private emit;
     constructor(cfg?: AsterixFeedConfig);
     private sourceId;
+    private siteFor;
     private meta;
     private makeFused;
     /** CAT23 report → source health event. NOGO means the ground station itself
@@ -61,6 +67,10 @@ export declare class AsterixFeedSource implements IngestSource {
     private handleGsStatus;
     /** Decode one ASTERIX datagram/block and emit the resulting tracks. */
     processDatagram(buf: Buffer): void;
+    /** A datagram that decodes to no ASTERIX record may be AFTN/ATS text —
+     *  some sites send both over one forwarded UDP port. Emits a flightplan
+     *  event per ATS message found; returns true when at least one emitted. */
+    private processAftnDatagram;
     private resetState;
     start(onEvent: IngestEventHandler): void;
     private startUdp;

package/dist/feed/asterix.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"asterix.d.ts","sourceRoot":"","sources":["../../src/feed/asterix.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAiB,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGjE,OAAO,KAAK,EAAe,kBAAkB,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAgBpG,MAAM,WAAW,gBAAiB,SAAQ,iBAAiB;IACzD,WAAW,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACnH,gDAAgD;IAChD,QAAQ,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,SAAS,CAAC;QAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CACtI;AAED;gDACgD;AAChD,MAAM,WAAW,iBAAiB;IAChC,iDAAiD;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAC1B,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gEAAgE;IAChE,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAID;;;8DAG8D;AAC9D,qBAAa,iBAAkB,YAAW,YAAY;IAwBxC,OAAO,CAAC,QAAQ,CAAC,GAAG;IAvBhC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAM9B;IAEF,OAAO,CAAC,UAAU,CAAyB;IAC3C,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,SAAS,CAA2B;IAC5C,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAKX;IACL,OAAO,CAAC,UAAU,CAA+B;IACjD,OAAO,CAAC,IAAI,CAAgC;gBAEf,GAAG,GAAE,iBAA+B;IAEjE,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,IAAI;IASZ,OAAO,CAAC,SAAS;IAoBjB;wDACoD;IACpD,OAAO,CAAC,cAAc;IAqCtB,uEAAuE;IACvE,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IA6IlC,OAAO,CAAC,UAAU;IAkBlB,KAAK,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAUxC,OAAO,CAAC,QAAQ;IAyBhB,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,UAAU;YAgDJ,YAAY;IAM1B,OAAO,CAAC,WAAW;IASnB;8CAC0C;IAC1C,OAAO,CAAC,aAAa;IASf,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAU5B"}
+{"version":3,"file":"asterix.d.ts","sourceRoot":"","sources":["../../src/feed/asterix.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAiB,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGjE,OAAO,KAAK,EAAe,kBAAkB,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAgBpG,MAAM,WAAW,gBAAiB,SAAQ,iBAAiB;IACzD,WAAW,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACnH,gDAAgD;IAChD,QAAQ,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,SAAS,CAAC;QAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACrI,2EAA2E;IAC3E,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;gDACgD;AAChD,MAAM,WAAW,iBAAiB;IAChC,iDAAiD;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAC1B,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gEAAgE;IAChE,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;uEACmE;IACnE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACxC;AAID;;;8DAG8D;AAC9D,qBAAa,iBAAkB,YAAW,YAAY;IAyBxC,OAAO,CAAC,QAAQ,CAAC,GAAG;IAxBhC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAO9B;IAEF,OAAO,CAAC,UAAU,CAAyB;IAC3C,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,SAAS,CAA2B;IAC5C,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAKX;IACL,OAAO,CAAC,UAAU,CAA+B;IACjD,OAAO,CAAC,IAAI,CAAgC;gBAEf,GAAG,GAAE,iBAA+B;IAEjE,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,OAAO;IAMf,OAAO,CAAC,IAAI;IASZ,OAAO,CAAC,SAAS;IAoBjB;wDACoD;IACpD,OAAO,CAAC,cAAc;IAqCtB,uEAAuE;IACvE,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IA4JlC;;+EAE2E;IAC3E,OAAO,CAAC,mBAAmB;IA0B3B,OAAO,CAAC,UAAU;IAmBlB,KAAK,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAUxC,OAAO,CAAC,QAAQ;IAyBhB,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,UAAU;YAgDJ,YAAY;IAM1B,OAAO,CAAC,WAAW;IASnB;8CAC0C;IAC1C,OAAO,CAAC,aAAa;IASf,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAU5B"}

package/dist/index.js

@@ -1,7 +1,7 @@
 // src/feed/asterix.ts
 import { createSocket } from "dgram";
 import { connect as tcpConnect } from "net";
-import { parseAsterix, resolveAsterixPosition, resolveAsterixAltitudeFt } from "@aeroswarm/codec";
+import { parseAsterix, parseAftn, splitAftnStream, resolveAsterixPosition, resolveAsterixAltitudeFt } from "@aeroswarm/codec";
 import { createLogger, createNanoid } from "@aeroswarm/core";
 var log = createLogger("ingest:asterix");
 var RAW_CAT21_TOPIC = "aero.raw.asterix.cat021.v1";
@@ -29,7 +29,8 @@ var AsterixFeedSource = class {
     packetsUndecoded: 0,
     lastDecoded: null,
     gsStatus: null,
-    lastError: null
+    lastError: null,
+    aftnMessages: 0
   };
   lastHealth = { at: 0, packets: 0 };
   socket = null;
@@ -44,6 +45,11 @@ var AsterixFeedSource = class {
   sourceId() {
     return this.cfg.sourceId ?? "ingest";
   }
+  siteFor(f) {
+    const { sac, sic } = f.dataSource ?? {};
+    const keyed = sac != null && sic != null ? this.cfg.radarSites?.[`${sac}:${sic}`] : void 0;
+    return keyed ?? this.cfg.radarSite ?? null;
+  }
   meta() {
     return {
       sourceType: this.stats.transport === "tcp" ? "ASTERIX_TCP" : "ASTERIX_UDP",
@@ -116,6 +122,7 @@ var AsterixFeedSource = class {
         this.cfg.forcedEditions && Object.keys(this.cfg.forcedEditions).length > 0 ? this.cfg.forcedEditions : void 0
       );
       if (records.length === 0) {
+        if (this.processAftnDatagram(buf)) return;
         this.stats.packetsUndecoded++;
         if (this.stats.packetsUndecoded === 1 || this.stats.packetsUndecoded % 1e3 === 0) {
           log.warn(
@@ -136,6 +143,10 @@ var AsterixFeedSource = class {
           continue;
         }
         const f = rec.fields;
+        if (f.testTarget || f.fixedTransponder) {
+          this.stats.packetsSkipped++;
+          continue;
+        }
         const isSurface = rec.category === 10 || rec.category === 11;
         let icao24 = f.icao24;
         if (!icao24 && f.trackNumber !== void 0) {
@@ -146,7 +157,7 @@ var AsterixFeedSource = class {
           this.stats.packetsSkipped++;
           continue;
         }
-        const pos = resolveAsterixPosition(f, this.cfg.radarSite ?? null);
+        const pos = resolveAsterixPosition(f, this.siteFor(f));
         if (!pos) {
           this.stats.packetsSkipped++;
           continue;
@@ -225,8 +236,8 @@ var AsterixFeedSource = class {
         );
         if (squawk) fused.identity = { ...fused.identity, squawk };
         if (this.cfg.airportId) fused.airportId = this.cfg.airportId;
-        if (isSurface) {
-          const targetType = f.targetType ?? (f.icao24 ? "aircraft" : "unknown");
+        const targetType = f.targetType ?? (isSurface ? f.icao24 ? "aircraft" : "unknown" : void 0);
+        if (targetType !== void 0 || f.vehicleFleet !== void 0) {
           fused.identity = {
             ...fused.identity,
             targetType,
@@ -237,10 +248,42 @@ var AsterixFeedSource = class {
         this.stats.packetsForwarded++;
       }
     } catch (err) {
+      if (this.processAftnDatagram(buf)) {
+        this.stats.lastError = null;
+        return;
+      }
       this.stats.packetsRejected++;
       this.stats.lastError = err instanceof Error ? err.message : String(err);
     }
   }
+  /** A datagram that decodes to no ASTERIX record may be AFTN/ATS text —
+   *  some sites send both over one forwarded UDP port. Emits a flightplan
+   *  event per ATS message found; returns true when at least one emitted. */
+  processAftnDatagram(buf) {
+    const text = buf.toString("latin1");
+    const { messages, rest } = splitAftnStream(text);
+    const all = messages.length > 0 ? [...messages, ...rest.includes("(") ? [rest] : []] : [text];
+    let emitted = false;
+    for (const m of all) {
+      const now = Date.now();
+      const parsed = parseAftn(m, { now });
+      if (!parsed?.callsign) continue;
+      this.emit({
+        kind: "flightplan",
+        event: {
+          messageId: createNanoid(12),
+          sourceId: this.sourceId(),
+          ...this.cfg.feedId && { feedId: this.cfg.feedId },
+          ...this.cfg.airportId && { airportId: this.cfg.airportId },
+          receivedAt: now,
+          message: parsed
+        }
+      });
+      this.stats.aftnMessages++;
+      emitted = true;
+    }
+    return emitted;
+  }
   resetState(patch) {
     Object.assign(this.stats, {
       running: true,
@@ -255,6 +298,7 @@ var AsterixFeedSource = class {
       lastDecoded: null,
       gsStatus: null,
       lastError: null,
+      aftnMessages: 0,
       ...patch
     });
     this.lastHealth = { at: 0, packets: 0 };
@@ -405,7 +449,7 @@ var AsterixFeedSource = class {
 // src/feed/aftn.ts
 import { createSocket as createSocket2 } from "dgram";
 import { connect as tcpConnect2 } from "net";
-import { parseAftn, splitAftnStream } from "@aeroswarm/codec";
+import { parseAftn as parseAftn2, splitAftnStream as splitAftnStream2 } from "@aeroswarm/codec";
 import { createLogger as createLogger2, createNanoid as createNanoid2 } from "@aeroswarm/core";
 var log2 = createLogger2("ingest:aftn");
 var TCP_RECONNECT_MS2 = 5e3;
@@ -458,7 +502,7 @@ var AftnFeedSource = class {
   processMessage(raw) {
     this.stats.packetsReceived++;
     const now = Date.now();
-    const parsed = parseAftn(raw, { now });
+    const parsed = parseAftn2(raw, { now });
     if (!parsed) {
       this.stats.packetsUndecoded++;
       if (this.stats.packetsUndecoded === 1 || this.stats.packetsUndecoded % 1e3 === 0) {
@@ -494,7 +538,7 @@ var AftnFeedSource = class {
   /** A UDP datagram normally holds one message; tolerate several back to back. */
   processDatagram(buf) {
     const text = buf.toString("latin1");
-    const { messages, rest } = splitAftnStream(text);
+    const { messages, rest } = splitAftnStream2(text);
     const all = messages.length > 0 ? [...messages, ...rest.includes("(") ? [rest] : []] : [text];
     for (const m of all) this.processMessage(m);
   }
@@ -544,7 +588,7 @@ var AftnFeedSource = class {
       log2.info({ host, port, airport: this.cfg.airportId ?? "unscoped" }, "aftn TCP feed connected");
     });
     sock.on("data", (chunk) => {
-      const { messages, rest } = splitAftnStream(this.tcpBuffer + chunk.toString("latin1"));
+      const { messages, rest } = splitAftnStream2(this.tcpBuffer + chunk.toString("latin1"));
       this.tcpBuffer = rest;
       for (const m of messages) this.processMessage(m);
       if (this.tcpBuffer.length > TCP_MAX_BUFFER2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeroswarm/ingest",
-  "version": "0.1.1",
+  "version": "0.1.4",
   "description": "Switchable surveillance ingest sources — direct ASTERIX/AFTN feeds (UDP/TCP) or AeroSwarm relays (Kafka/WS), one event stream",
   "type": "module",
   "main": "./dist/index.js",