@tak-ps/node-cot 2.8.1 → 3.1.0

package/lib/{xml.js → xml.ts}

@@ -1,39 +1,94 @@
 import xmljs from 'xml-js';
+import { Feature } from 'geojson';
+import { AllGeoJSON } from "@turf/helpers";
 import Util from './util.js';
 import Color from './color.js';
 import PointOnFeature from '@turf/point-on-feature';
 import AJV from 'ajv';
 import fs from 'fs';
 
-const ajv = (new AJV({ allErrors: true })).compile(JSON.parse(fs.readFileSync(new URL('./schema.json', import.meta.url))));
+const ajv = (new AJV({ allErrors: true }))
+    .compile(JSON.parse(String(fs.readFileSync(new URL('./schema.json', import.meta.url)))));
 
+export interface Attributes {
+    version: string,
+    uid: string;
+    type: string;
+    how: string;
+    [k: string]: string;
+}
+
+export interface GenericAttributes {
+    _attributes: {
+        [k: string]: string;
+    }
+}
+
+export interface Detail {
+    contact?: GenericAttributes,
+    tog?: GenericAttributes,
+    strokeColor?: GenericAttributes,
+    strokeWeight?: GenericAttributes,
+    strokeStyle?: GenericAttributes,
+    labels_on?: GenericAttributes,
+    fillColor?: GenericAttributes,
+    link?: object[],
+    TakControl?: {
+        TakServerVersionInfo?: GenericAttributes
+    },
+    [k: string]: unknown
+}
+
+export interface Point {
+    _attributes: {
+        lat: string | number;
+        lon: string | number;
+        hae: string | number;
+        ce: string | number;
+        le: string | number;
+        [k: string]: string | number
+    }
+}
+
+export interface JSONCoT {
+    event: {
+        _attributes: Attributes,
+        detail: Detail,
+        point: Point,
+        [k: string]: unknown
+    },
+    [k: string]: unknown
+}
 
 /**
  * Convert to and from an XML CoT message
  * @class
  *
- * @param {String|Object|Buffer} cot A string/buffer containing the XML representation or the xml-js object tree
+ * @param cot A string/buffer containing the XML representation or the xml-js object tree
  *
- * @prop {Object} raw Raw XML-JS representation of CoT
+ * @prop raw Raw XML-JS representation of CoT
  */
 export default class XMLCot {
-    constructor(cot) {
-        if (cot instanceof Buffer) String(cot);
+    raw: JSONCoT;
+
+    constructor(cot: Buffer | JSONCoT | string) {
+        if (typeof cot === 'string' || cot instanceof Buffer) {
+            if (cot instanceof Buffer) cot = String(cot);
 
-        if (typeof cot === 'string') {
-            this.raw = xmljs.xml2js(cot, { compact: true });
+            const raw: any = xmljs.xml2js(cot, { compact: true });
+            this.raw = raw as JSONCoT;
         } else {
             this.raw = cot;
         }
 
         // Attempt to cast all point to numerics
         for (const key of Object.keys(this.raw.event.point._attributes)) {
-            if (!isNaN(parseFloat(this.raw.event.point._attributes[key]))) {
-                this.raw.event.point._attributes[key] = parseFloat(this.raw.event.point._attributes[key]);
+            if (!isNaN(parseFloat(String(this.raw.event.point._attributes[key])))) {
+                this.raw.event.point._attributes[key] = parseFloat(String(this.raw.event.point._attributes[key]));
             }
         }
 
-        if (!this.raw.event._attributes.uid) this.raw.event._attributes.uuid = Util.cot_uuid().uid;
+        if (!this.raw.event._attributes.uid) this.raw.event._attributes.uuid = Util.cot_uuid();
 
         ajv(this.raw);
         if (ajv.errors) throw new Error(ajv.errors[0].message);
@@ -46,11 +101,11 @@ export default class XMLCot {
      *
      * @return {XMLCot}
      */
-    static from_geojson(feature) {
+    static from_geojson(feature: Feature) {
         if (feature.type !== 'Feature') throw new Error('Must be GeoJSON Feature');
         if (!feature.properties) throw new Error('Feature must have properties');
 
-        const cot = {
+        const cot: JSONCoT = {
             event: {
                 _attributes: Util.cot_event_attr(
                     feature.properties.type || 'a-f-G',
@@ -64,23 +119,23 @@ export default class XMLCot {
             }
         };
 
-        if (feature.id) cot.event._attributes.uid = feature.id;
+        if (feature.id) cot.event._attributes.uid = String(feature.id);
         if (feature.properties.callsign && !feature.id) cot.event._attributes.uid = feature.properties.callsign;
 
         if (!feature.geometry) throw new Error('Must have Geometry');
         if (!['Point', 'Polygon', 'LineString'].includes(feature.geometry.type)) throw new Error('Unsupported Geometry Type');
 
         if (feature.geometry.type === 'Point') {
-            cot.event.point._attributes.lon = feature.geometry.coordinates[0];
-            cot.event.point._attributes.lat = feature.geometry.coordinates[1];
+            cot.event.point._attributes.lon = String(feature.geometry.coordinates[0]);
+            cot.event.point._attributes.lat = String(feature.geometry.coordinates[1]);
         } else if (['Polygon', 'LineString'].includes(feature.geometry.type)) {
             const stroke = new Color(feature.properties.stroke || -1761607936);
             if (feature.properties['stroke-opacity']) stroke.a = feature.properties['stroke-opacity'];
-            cot.event.detail.strokeColor = { _attributes: { value: stroke.as_32bit() } };
+            cot.event.detail.strokeColor = { _attributes: { value: String(stroke.as_32bit()) } };
 
             if (!feature.properties['stroke-width']) feature.properties['stroke-width'] = 3;
             cot.event.detail.strokeWeight = { _attributes: {
-                value: feature.properties['stroke-width']
+                value: String(feature.properties['stroke-width'])
             } };
 
             if (!feature.properties['stroke-style']) feature.properties['stroke-style'] = 'solid';
@@ -111,15 +166,15 @@ export default class XMLCot {
 
                 const fill = new Color(feature.properties.fill || -1761607936);
                 if (feature.properties['fill-opacity']) fill.a = feature.properties['fill-opacity'];
-                cot.event.detail.fillColor = { _attributes: { value: fill.as_32bit() } };
+                cot.event.detail.fillColor = { _attributes: { value: String(fill.as_32bit()) } };
             }
 
             cot.event.detail.labels_on = { _attributes: { value: 'false' } };
             cot.event.detail.tog = { _attributes: { enabled: '0' } };
 
-            const centre = PointOnFeature(feature);
-            cot.event.point._attributes.lon = centre.geometry.coordinates[0];
-            cot.event.point._attributes.lat = centre.geometry.coordinates[1];
+            const centre = PointOnFeature(feature as AllGeoJSON);
+            cot.event.point._attributes.lon = String(centre.geometry.coordinates[0]);
+            cot.event.point._attributes.lat = String(centre.geometry.coordinates[1]);
         }
 
         return new XMLCot(cot);
@@ -127,16 +182,14 @@ export default class XMLCot {
 
     /**
      * Return a GeoJSON Feature from an XML CoT message
-     *
-     * @returns {Object}
      */
-    to_geojson() {
+    to_geojson(): Feature {
         const raw = JSON.parse(JSON.stringify(this.raw));
         if (!raw.event.detail) raw.event.detail = {};
         if (!raw.event.detail.contact) raw.event.detail.contact = {};
         if (!raw.event.detail.contact._attributes) raw.event.detail.contact._attributes = {};
 
-        const geojson = {
+        const geojson: Feature = {
             id: raw.event._attributes.uid,
             type: 'Feature',
             properties: {
@@ -174,6 +227,7 @@ export default class XMLCot {
         return new XMLCot({
             event: {
                 _attributes: Util.cot_event_attr('t-x-c-t', 'h-g-i-g-o'),
+                detail: {},
                 point: Util.cot_point()
             }
         });

package/package.json

@@ -1,25 +1,37 @@
 {
     "name": "@tak-ps/node-cot",
     "type": "module",
-    "version": "2.8.1",
+    "version": "3.1.0",
     "description": "Lightweight JavaScript library for parsing and manipulating TAK messages",
-    "main": "index.js",
+    "main": "dist/index.js",
+    "types": "index.js",
     "scripts": {
-        "test": "tape test/**.test.js",
-        "lint": "eslint *.js lib/*.js test/*.js"
+        "test": "ts-node-test test/",
+        "lint": "eslint *.ts lib/*.ts",
+        "build": "tsc --build",
+        "pretest": "npm run lint"
     },
     "dependencies": {
+        "@turf/helpers": "^6.5.0",
         "@turf/point-on-feature": "^6.5.0",
+        "@types/color": "^3.0.3",
+        "@types/geojson": "^7946.0.10",
         "ajv": "^8.11.2",
         "color": "^4.2.3",
         "protobufjs": "^7.1.2",
-        "uuid": "^9.0.0",
         "xml-js": "^1.6.11"
     },
     "devDependencies": {
-        "eslint": "^8.28.0",
+        "@types/node": "^18.14.2",
+        "@types/tape": "^4.13.2",
+        "@typescript-eslint/eslint-plugin": "^5.54.0",
+        "@typescript-eslint/parser": "^5.54.0",
+        "eslint": "^8.35.0",
         "eslint-plugin-node": "^11.1.0",
-        "tape": "^5.6.1"
+        "tape": "^5.6.1",
+        "ts-node": "^10.9.1",
+        "ts-node-test": "^0.3.0",
+        "typescript": "^4.9.5"
     },
     "repository": {
         "type": "git",

package/test/{from_geojson.test.js → from_geojson.test.ts}

@@ -68,10 +68,10 @@ test('XML.from_geojson - Polygon', (t) => {
         ],
         labels_on: { _attributes: { value: 'false' } },
         tog: { _attributes: { enabled: '0' } },
-        strokeColor: { _attributes: { value: 16776960 } },
-        strokeWeight: { _attributes: { value: 3 } },
+        strokeColor: { _attributes: { value: '16776960' } },
+        strokeWeight: { _attributes: { value: '3' } },
         strokeStyle: { _attributes: { value: 'solid' } },
-        fillColor: { _attributes: { value: 16776960 } }
+        fillColor: { _attributes: { value: '16776960' } }
     });
 
     t.end();
@@ -116,8 +116,8 @@ test('XML.from_geojson - LineString', (t) => {
         ],
         labels_on: { _attributes: { value: 'false' } },
         tog: { _attributes: { enabled: '0' } },
-        strokeColor: { _attributes: { value: 16776960 } },
-        strokeWeight: { _attributes: { value: 3 } },
+        strokeColor: { _attributes: { value: '16776960' } },
+        strokeWeight: { _attributes: { value: '3' } },
         strokeStyle: { _attributes: { value: 'solid' } }
     });
 

package/tsconfig.json

@@ -0,0 +1,26 @@
+{
+    "ts-node": {
+        "esm": true
+    },
+    "compilerOptions": {
+        "module": "es2022",
+        "esModuleInterop": true,
+        "target": "es2022",
+        "lib": ["es2022", "dom"],
+        "noImplicitAny": true,
+        "moduleResolution": "node",
+        "sourceMap": true,
+        "outDir": "dist",
+        "baseUrl": ".",
+        "paths": {
+            "*": [
+                "node_modules/*"
+            ]
+        }
+    },
+    "include": [
+        "index.ts", 
+        "test/**/*",
+        "lib/**/*"
+    ]
+}

package/lib/util.js

@@ -1,111 +0,0 @@
-import { v4 as uuidv4 } from 'uuid';
-
-/**
- * Helper functions for generating CoT data
- * @class
- */
-export default class Util {
-    /**
-     * Return an event._attributes object with as many defaults as possible
-     *
-     * @param {String} type CoT Type
-     * @param {String} how CoT how
-     * @param {Date|string|null} time              Time of CoT Message - if omitted, current time is used
-     * @param {Date|string|null} start             Start Time of CoT - if omitted, current time is used
-     * @param {Date|string|null|numeric} stale     Expiration of CoT - if null now+20s is used. Alternative an integer representing the ms offset
-     *
-     * @returns {Object}
-     */
-    static cot_event_attr(type, how, time, start, stale) {
-        if (!type) throw new Error('type param required');
-        if (!how) throw new Error('how param required');
-
-        return {
-            ...Util.cot_version(),
-            ...Util.cot_uuid(),
-            type,
-            how,
-            ...Util.cot_date(time, start, stale)
-        };
-    }
-
-    /**
-     * Return an event.detail object with as many defaults as possible
-     *
-     * @param {String} [callsign=UNKNOWN] Display Callsign
-     *
-     * @returns {Object}
-     */
-    static cot_event_detail(callsign = 'UNKNOWN') {
-        return {
-            contact: {
-                _attributes: { callsign }
-            }
-        };
-    }
-
-    /**
-     * Generate a random UUID
-     *
-     * @returns {Object}
-     */
-    static cot_uuid() {
-        return {
-            uid: uuidv4()
-        };
-    }
-
-    /**
-     * Return the current version number this library supports
-     *
-     * @returns {Object}
-     */
-    static cot_version() {
-        return {
-            version: '2.0'
-        };
-    }
-
-    /**
-     * Generate Null Island CoT point object
-     *
-     * @returns {Object}
-     */
-    static cot_point() {
-        return {
-            '_attributes': {
-                'lat': '0.000000',
-                'lon': '0.000000',
-                'hae': '0.0',
-                'ce': '9999999.0',
-                'le': '9999999.0'
-            }
-        };
-    }
-
-    /**
-     * Generate CoT date objects
-     *
-     * cot_date() - Time: now, Start: now, Stale: now + 20s
-     *
-     * @param {Date|string|null} time              Time of CoT Message - if omitted, current time is used
-     * @param {Date|string|null} start             Start Time of CoT - if omitted, current time is used
-     * @param {Date|string|null|numeric} stale     Expiration of CoT - if null now+20s is used. Alternative an integer representing the ms offset
-     *
-     * @returns {Object}
-     */
-    static cot_date(time, start, stale) {
-        const now = Date.now();
-
-        time = new Date(time || now).toISOString();
-        start = new Date(start || now).toISOString();
-
-        if (!stale) {
-            stale = new Date(+new Date(start) + 20 * 1000).toISOString();
-        } else if (!isNaN(parseInt(stale))) {
-            stale = new Date(+new Date(start) + stale).toISOString();
-        }
-
-        return { time, start, stale };
-    }
-}