@tak-ps/node-cot 12.10.0 → 12.12.0

package/lib/data-package.ts

@@ -362,7 +362,7 @@ export class DataPackage {
      * @param opts.ignore - Should the file be ignore, defaults to false
      * @param opts.attachment - Should the file be associated as an attachment to a CoT. If so this should contain the UID of the CoT
      */
-    async addFile(file: Readable, opts: {
+    async addFile(file: Readable | Buffer | string, opts: {
         uid?: string;
         name: string;
         ignore?: boolean;

package/lib/types/feature.ts

@@ -6,6 +6,7 @@ import {
     GeofenceAttributes,
     StatusAttributes,
     PrecisionLocationAttributes,
+    VideoConnectionEntryAttributes,
     MartiDestAttributes,
     TakVersionAttributes,
     FileShareAttributes,
@@ -88,7 +89,12 @@ export const InputProperties = Type.Object({
     attachments: Type.Optional(Type.Array(Type.String())),
     ackrequest: Type.Optional(ACKRequestAttributes),
     sensor: Type.Optional(SensorAttributes),
-    video: Type.Optional(VideoAttributes),
+    video: Type.Optional(Type.Composite([
+        VideoAttributes,
+        Type.Optional(Type.Object({
+            connection: Type.Optional(VideoConnectionEntryAttributes)
+        }))
+    ])),
     links: Type.Optional(Type.Array(LinkAttributes)),
     chat: Type.Optional(Type.Object({
         parent: Type.Optional(Type.String()),
@@ -145,7 +151,12 @@ export const Properties = Type.Object({
     ackrequest: Type.Optional(ACKRequestAttributes),
     attachments: Type.Optional(Type.Array(Type.String())),
     sensor: Type.Optional(SensorAttributes),
-    video: Type.Optional(VideoAttributes),
+    video: Type.Optional(Type.Composite([
+        VideoAttributes,
+        Type.Optional(Type.Object({
+            connection: Type.Optional(VideoConnectionEntryAttributes)
+        }))
+    ])),
     links: Type.Optional(Type.Array(LinkAttributes)),
     chat: Type.Optional(Type.Object({
         parent: Type.Optional(Type.String()),

package/lib/types/types.ts

@@ -261,6 +261,7 @@ export const Sensor = Type.Object({
 })
 
 export const VideoAttributes = Type.Object({
+    uid: Type.Optional(Type.String()),
     sensor: Type.Optional(Type.String()),
     spi: Type.Optional(Type.String()),
     url: Type.Optional(Type.String())
@@ -281,12 +282,12 @@ export const VideoConnectionEntryAttributes = Type.Object({
 })
 
 export const VideoConnectionEntry = Type.Object({
-    _attributes: Type.Optional(VideoConnectionEntryAttributes)
+    _attributes: VideoConnectionEntryAttributes
 })
 
 export const Video = Type.Object({
     _attributes: Type.Optional(VideoAttributes),
-    ConnectionEntry: Type.Optional(Type.Union([Type.Array(VideoConnectionEntry), VideoConnectionEntry]))
+    ConnectionEntry: Type.Optional(VideoConnectionEntry)
 })
 
 export const GeofenceAttributes = Type.Object({

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@tak-ps/node-cot",
     "type": "module",
-    "version": "12.10.0",
+    "version": "12.12.0",
     "description": "Lightweight JavaScript library for parsing and manipulating TAK messages",
     "author": "Nick Ingalls <nick@ingalls.ca>",
     "main": "dist/index.js",

package/test/cot-video.test.ts

@@ -1,6 +1,60 @@
 import test from 'tape';
 import CoT from '../index.js';
 
+test('CoT.addVideo', (t) => {
+    const cot = new CoT(`<event version='2.0' uid='0ed16b9e-a0c8-480f-8860-284b9afb2b1d' type='b-m-p-s-p-loc' time='2023-11-15T20:48:16.097Z' start='2023-11-15T20:48:16.097Z' stale='2024-11-14T20:48:16.097Z' how='h-g-i-g-o' access='Undefined'><point lat='38.2089117' lon='-104.6282182' hae='1455.285' ce='9999999.0' le='9999999.0' /></event>`);
+
+    cot.addVideo({ uid: '123', url: 'https://publicstreamer3.cotrip.org/rtplive/123/playlist.m3u8' })
+
+    if (!cot.raw.event.detail) {
+        throw new Error('Detail Object must be populated');
+    }
+
+    t.ok(cot.raw.event.detail['_flow-tags_']);
+    delete cot.raw.event.detail['_flow-tags_'];
+
+    t.deepEquals(cot.raw, {
+        event: {
+            _attributes: {
+                version: '2.0',
+                uid: '0ed16b9e-a0c8-480f-8860-284b9afb2b1d',
+                type: 'b-m-p-s-p-loc',
+                time: '2023-11-15T20:48:16.097Z',
+                start: '2023-11-15T20:48:16.097Z',
+                stale: '2024-11-14T20:48:16.097Z',
+                how: 'h-g-i-g-o',
+                access: 'Undefined'
+            },
+            point: { _attributes: { lat: '38.2089117', lon: '-104.6282182', hae: '1455.285', ce: '9999999.0', le: '9999999.0' } },
+            detail: {
+                __video: {
+                    _attributes: {
+                        url: 'https://publicstreamer3.cotrip.org/rtplive/123/playlist.m3u8',
+                        uid: '123'
+                    },
+                    ConnectionEntry: {
+                        _attributes: {
+                            uid: '123',
+                            networkTimeout: 12000,
+                            path: '',
+                            protocol: 'raw',
+                            bufferTime: -1,
+                            address: 'https://publicstreamer3.cotrip.org/rtplive/123/playlist.m3u8',
+                            port: -1,
+                            roverPort: -1,
+                            rtspReliable: 0,
+                            ignoreEmbeddedKLV: false,
+                            alias: 'UNKNOWN'
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    t.end();
+});
+
 test('Decode MultiMissionAircraft CoTs', (t) => {
     const cot = new CoT(`<event version='2.0' uid='0ed16b9e-a0c8-480f-8860-284b9afb2b1d' type='b-m-p-s-p-loc' time='2023-11-15T20:48:16.097Z' start='2023-11-15T20:48:16.097Z' stale='2024-11-14T20:48:16.097Z' how='h-g-i-g-o' access='Undefined'><point lat='38.2089117' lon='-104.6282182' hae='1455.285' ce='9999999.0' le='9999999.0' /><detail><status readiness='true'/><archive/><__video uid='05bf6c59-c7ea-465f-8337-da16ddcc82d4' url='https://publicstreamer3.cotrip.org/rtplive/123/playlist.m3u8'><ConnectionEntry networkTimeout='12000' uid='05bf6c59-c7ea-465f-8337-da16ddcc82d4' path='' protocol='raw' bufferTime='-1' address='https://publicstreamer3.cotrip.org/rtplive/123/playlist.m3u8' port='-1' roverPort='-1' rtspReliable='0' ignoreEmbeddedKLV='false' alias='I-25 .8 mi S CO-45'/></__video><color argb='-1'/><link uid='ANDROID-94e13cc4880cbcce' production_time='2022-01-31T17:35:49.565Z' type='a-f-G-U-C' parent_callsign='CO-DFPC-54-Schmidt' relation='p-p'/><sensor vfov='45' elevation='0' fovBlue='1.0' fovRed='1.0' strokeWeight='0.0' roll='0' range='100' azimuth='270' rangeLineStrokeWeight='0.0' fov='45' hideFov='true' rangeLineStrokeColor='-3355444' fovGreen='1.0' displayMagneticReference='0' strokeColor='-16777216' rangeLines='100' fovAlpha='0.2980392156862745'/><archive/><contact callsign='I-25 .8 mi S CO-45'/><remarks></remarks><precisionlocation altsrc='DTED2'/></detail></event>`);
     if (!cot.raw.event.detail) {
@@ -114,7 +168,23 @@ test('Decode MultiMissionAircraft CoTs', (t) => {
                     rangeLines: 100,
                     fovAlpha: 0.2980392156862745
                 },
-                video: { uid: '05bf6c59-c7ea-465f-8337-da16ddcc82d4', url: 'https://publicstreamer3.cotrip.org/rtplive/123/playlist.m3u8' },
+                video: {
+                    uid: '05bf6c59-c7ea-465f-8337-da16ddcc82d4',
+                    url: 'https://publicstreamer3.cotrip.org/rtplive/123/playlist.m3u8',
+                    connection: {
+                        "networkTimeout": 12000,
+                        "uid": "05bf6c59-c7ea-465f-8337-da16ddcc82d4",
+                        "path": "",
+                        "protocol": "raw",
+                        "bufferTime": -1,
+                        "address": "https://publicstreamer3.cotrip.org/rtplive/123/playlist.m3u8",
+                        "port": -1,
+                        "roverPort": -1,
+                        "rtspReliable": 0,
+                        "ignoreEmbeddedKLV": false,
+                        "alias": "I-25 .8 mi S CO-45"
+                    }
+                },
                 archived: true,
                 status: { readiness: 'true' },
                 precisionlocation: { altsrc: 'DTED2' },

package/test/fixtures/video-connection.geojson

@@ -0,0 +1,26 @@
+{
+    "id": "123",
+    "type": "Feature",
+    "properties": {
+        "type": "a-f-G",
+        "how": "m-g",
+        "callsign": "BasicTest",
+        "center": [ 1.1, 2.2, 0 ],
+        "time": "2023-08-04T15:17:43.649Z",
+        "start": "2023-08-04T15:17:43.649Z",
+        "stale": "2023-08-04T15:17:43.649Z",
+        "video": {
+            "uid": "123",
+            "url": "rtsp://18.254.132.90:8554/money",
+            "connection": {
+                "uid": "123",
+                "address": "rtsp://18.254.132.90:8554/money"
+            }
+        },
+        "metadata": {}
+    },
+    "geometry": {
+        "type": "Point",
+        "coordinates": [1.1, 2.2, 0]
+    }
+}

package/test/reversal-geojson.test.ts

@@ -11,6 +11,7 @@ for (const fixturename of await fs.readdir(new URL('./fixtures/', import.meta.ur
         const fixture: Static<typeof Feature> = JSON.parse(String(await fs.readFile(path.join(path.parse(fileURLToPath(import.meta.url)).dir, 'fixtures/', fixturename))));
         const geo = CoT.from_geojson(fixture)
         const output = geo.to_geojson();
+
         t.deepEquals(fixture, output, fixturename);
 
         t.end();