node-red-contrib-tak-registration 0.8.0 → 0.9.0

package/node_modules/protobufjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protobufjs",
-  "version": "7.2.4",
+  "version": "7.2.5",
   "versionScheme": "~",
   "description": "Protocol Buffers for JavaScript (& TypeScript).",
   "author": "Daniel Wirtz <dcode+protobufjs@dcode.io>",

package/node_modules/protobufjs/src/converter.js

@@ -62,7 +62,7 @@ function genValuePartial_fromObject(gen, field, fieldIndex, prop) {
                 break;
             case "uint64":
                 isUnsigned = true;
-                // eslint-disable-line no-fallthrough
+                // eslint-disable-next-line no-fallthrough
             case "int64":
             case "sint64":
             case "fixed64":
@@ -176,7 +176,7 @@ function genValuePartial_toObject(gen, field, fieldIndex, prop) {
                 break;
             case "uint64":
                 isUnsigned = true;
-                // eslint-disable-line no-fallthrough
+                // eslint-disable-next-line no-fallthrough
             case "int64":
             case "sint64":
             case "fixed64":

package/node_modules/protobufjs/src/parse.js

@@ -227,7 +227,7 @@ function parse(source, root, options) {
                 break;
             case "public":
                 next();
-                // eslint-disable-line no-fallthrough
+                // eslint-disable-next-line no-fallthrough
             default:
                 whichImports = imports || (imports = []);
                 break;
@@ -621,6 +621,9 @@ function parse(source, root, options) {
                 if (!nameRe.test(token = next())) {
                     throw illegal(token, "name");
                 }
+                if (token === null) {
+                  throw illegal(token, "end of input");
+                }
 
                 var value;
                 var propName = token;

package/node_modules/protobufjs/src/reader.js

@@ -312,9 +312,14 @@ Reader.prototype.bytes = function read_bytes() {
     this.pos += length;
     if (Array.isArray(this.buf)) // plain array
         return this.buf.slice(start, end);
-    return start === end // fix for IE 10/Win8 and others' subarray returning array of size 1
-        ? new this.buf.constructor(0)
-        : this._slice.call(this.buf, start, end);
+
+    if (start === end) { // fix for IE 10/Win8 and others' subarray returning array of size 1
+        var nativeBuffer = util.Buffer;
+        return nativeBuffer
+            ? nativeBuffer.alloc(0)
+            : new this.buf.constructor(0);
+    }
+    return this._slice.call(this.buf, start, end);
 };
 
 /**

package/node_modules/protobufjs/src/tokenize.js

@@ -197,9 +197,7 @@ function tokenize(source, alternateCommentMode) {
 
         // see if remaining line matches comment pattern
         var lineText = source.substring(startOffset, endOffset);
-        // look for 1 or 2 slashes since startOffset would already point past
-        // the first slash that started the comment.
-        var isComment = /^\s*\/{1,2}/.test(lineText);
+        var isComment = /^\s*\/\//.test(lineText);
         return isComment;
     }
 
@@ -268,7 +266,7 @@ function tokenize(source, alternateCommentMode) {
                         // check for double-slash comments, consolidating consecutive lines
                         start = offset;
                         isDoc = false;
-                        if (isDoubleSlashCommentLine(offset)) {
+                        if (isDoubleSlashCommentLine(offset - 1)) {
                             isDoc = true;
                             do {
                                 offset = findEndOfLine(offset);

package/package.json

@@ -1,15 +1,15 @@
 {
     "name": "node-red-contrib-tak-registration",
-    "version": "0.8.0",
+    "version": "0.9.0",
     "description": "A Node-RED node to register to TAK and to help wrap files as datapackages to send to TAK",
     "dependencies": {
         "@turf/turf": "6.5.0",
         "adm-zip": "0.5.10",
-        "axios": "1.4.0",
+        "axios": "1.5.0",
         "fast-xml-parser": "4.2.7",
         "form-data": "4.0.0",
         "long": "5.2.3",
-        "protobufjs": "7.2.4",
+        "protobufjs": "7.2.5",
         "uuid": "9.0.0"
     },
     "bundledDependencies": [

package/tak-ingest.js

@@ -9,7 +9,7 @@ module.exports = function(RED) {
     "use strict";
     const fastXmlOptions = {
         attributeNamePrefix: "",
-        // attrNodeName: "attr",
+        // attributesGroupName: "attr",
         ignoreAttributes: false,
     };
 

package/tak-registration.js

@@ -35,6 +35,7 @@ module.exports = function(RED) {
         var gr = {};
         gr[node.callsign] = node.uuid;
         globalContext.set("_takgatewaycs",gr);
+        globalContext.set("_takdphost",node.host);
 
         if (node.role !== "Gateway") { node.ntype = "a-f-G-U-C" }
 
@@ -73,7 +74,7 @@ module.exports = function(RED) {
         var sendIt = function() {
             node.emit("input", {
                 time: new Date().toISOString(),
-                etime: new Date(Date.now() + 2000 * node.repeat).toISOString(),
+                etime: new Date(Date.now() + (2 * node.repeat)).toISOString(),
                 lat: node.lat,
                 lon: node.lon,
                 alt: node.alt,
@@ -98,8 +99,8 @@ module.exports = function(RED) {
 
         node.on("input",function(msg) {
             if (msg.heartbeat) {  // Register gateway and do the heartbeats
-                var template = `<event version="2.0" uid="${node.uuid}" type="${msg.type}" how="h-e" time="${msg.time}" start="${msg.time}" stale="${msg.etime}"><point lat="${msg.lat}" lon="${msg.lon}" hae="${msg.alt}" ce="9999999" le="9999999"/><detail><takv device="${os.hostname()}" os="${os.platform()}" platform="NRedTAK" version="${ver}"/><contact endpoint="*:-1:stcp" callsign="${msg.callsign}"/><uid Droid="${msg.callsign}"/><__group name="${msg.group}" role="${msg.role}"/><status battery="99"/></detail></event>`;
-                node.send({payload:template});
+                var template = `<event version="2.0" uid="${node.uuid}" type="${msg.type}" how="h-e" time="${msg.time}" start="${msg.time}" stale="${msg.etime}"><point lat="${msg.lat}" lon="${msg.lon}" hae="${msg.alt}" ce="9999999" le="9999999"/><detail><takv device="${os.hostname()}" os="${os.platform()}" platform="NRedTAK" version="${ver}"/><contact endpoint="*:-1:stcp" callsign="${msg.callsign}"/><uid Droid="${msg.callsign}"/><__group name="${msg.group}" role="${msg.role}"/><status battery="99"/><track course="0.00000000" speed="0.00000000"/></detail></event>`;
+                node.send({payload:template, topic:msg.type});
                 node.status({fill:"green", shape:"dot", text:node.repeat/1000+"s - "+node.callsign});
                 return;
             }
@@ -183,6 +184,7 @@ module.exports = function(RED) {
                                     m += '</detail></event>';
                                     node.log( "DP: " + node.host + "/Marti/sync/content?hash=" + msg.hash );
                                     msg.payload = m.replace(/>\s+</g, "><");
+                                    msg.topic = "b-f-t-r";
                                     node.send(msg);
                                 }
                             })
@@ -197,6 +199,7 @@ module.exports = function(RED) {
             // Otherwise if it's a string maybe it's raw cot xml - or NMEA from GPS - or maybe a simple chat message
             else if (typeof msg.payload === "string" ) {
                 if (msg.payload.trim().startsWith('<') && msg.payload.trim().endsWith('>')) { // Assume it's proper XML event so pass straight through
+                    msg.topic = msg.payload.split('type="')[1].split('"')[0];
                     node.send(msg);
                 }
                 else if (msg.payload.trim().startsWith('$GPGGA')) { // maybe it's an NMEA string
@@ -244,6 +247,7 @@ module.exports = function(RED) {
     </event>`;
                         // console.log(xm);
                         m.payload = xm.replace(/>\s+</g, "><");
+                        m.topic = "b-t-f";
                         node.send(m);
                     }
                 }
@@ -277,8 +281,13 @@ module.exports = function(RED) {
                             type = s.split('').join('-').replace('s-','a-').replace('-p-','-');
                         }
                     }
-                    // console.log("TYPE",type)
+                    if (msg.payload.icon === 'fa-circle fa-fw') {
+                        type = 'b-m-p-s-m';
+                        shapeXML = '<color argb="' + convertWMtoCOTColour(msg.payload.iconColor.replace('#', '')) + '"/>';
+                        shapeXML = shapeXML+'<usericon iconsetpath="COT_MAPPING_SPOTMAP/b-m-p-s-m/-16711681"/>';
+                    }
                 }
+
                 // Handle Worldmap drawing shapes
                 if (msg.payload.hasOwnProperty("action") && msg.payload.action === "draw") {
                     ttl = 24*60*60*1000;  /// set TTL to 1 day for shapes...
@@ -342,7 +351,6 @@ module.exports = function(RED) {
                         msg.payload.lon = polyCent.geometry.coordinates[1];
                     }
                     // console.log("SHAPE",shape)
-
                     if (shape.type === 'ellipse') {
                         type = "u-d-c-c";
 
@@ -399,13 +407,37 @@ module.exports = function(RED) {
                     <point lat="${msg.payload.lat || 0}" lon="${msg.payload.lon || 0}" hae="${parseInt(msg.payload.alt || invalid)}" le="9999999.0" ce="9999999.0"/>
                     <detail>
                         <takv device="${os.hostname()}" os="${os.platform()}" platform="NRedTAK" version="${ver}"/>
-                        <track course="${msg.payload.bearing || 0}" speed="${parseInt(msg.payload.speed) || 0}"/>
+                        <track course="${msg.payload.bearing || 9999999.0}" speed="${parseInt(msg.payload.speed) || 0}"/>
                         <contact callsign="${msg.payload.name}"/>
                         <remarks source="NRedTAK">${tag}</remarks>
                         ${shapeXML}
                     </detail>
                 </event>`
                 msg.payload = msg.payload.replace(/>\s+</g, "><");
+                msg.topic = type;
+                node.send(msg);
+            }
+
+            // Maybe a simple event json update (eg from an ingest - tweak and send back)
+            // Note this is not 100% reverse of the ingest... but seems to work mostly...
+            else if (typeof msg.payload === "object" && msg.payload.hasOwnProperty("event") ) {
+                const ev = msg.payload.event;
+                msg.topic = ev.type;
+                msg.payload = `<event version="${ev.version}" uid="${ev.uid}" type="${ev.type}" time="${ev.time}" start="${ev.start}" stale="${ev.stale}" how="${ev.how}">
+                    <point lat="${ev.point.lat || 0}" lon="${ev.point.lon || 0}" hae="${ev.detail?.height?.value || ev.point.hae || 9999999.0}" le="${ev.point.le}" ce="${ev.point.ce}"/>
+                    <detail>
+                    <takv device="${os.hostname()}" os="${os.platform()}" platform="NRedTAK" version="${ver}"/>`
+                    if (ev.detail?.track) {
+                        msg.payload += `<track speed="${ev.detail.track.speed}" course="${ev.detail.track.course}"/>`;
+                    }
+                    if (ev.detail?.color) {
+                        msg.payload += `<color argb="${ev.detail.color.argb}"/>`;
+                    }
+                msg.payload += `<contact callsign="${ev.detail?.contact?.callsign}"/>
+                    <remarks source="${node.callsign}">${msg.remarks || ev.detail?.remarks}</remarks>
+                    </detail>
+                    </event>`
+                msg.payload = msg.payload.replace(/>\s+</g, "><");
                 node.send(msg);
             }