node-red-contrib-tak-registration 0.10.0 → 0.11.1

package/README.md

@@ -82,5 +82,7 @@ It will produce a well formatted JSON object containing the event. It is returne
 
 **msg.topic** is set to the COT type.
 
+If an event arrives with a *fileshare* link, it will fetch the file and add **msg.filename** and **msg.datapackage** to the output msg. The datapackage will be a buffer.
+
 It can also accept input from a UDP node configured to listen to *multicast* on group 239.2.3.1 port 6969. The JSON object produced contains similar information but formatted/organised slightly differently. (Very annoying).
 It is returned as **msg.payload.cotEvent**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-tak-registration",
-    "version": "0.10.0",
+    "version": "0.11.1",
     "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",

package/tak-ingest.html

@@ -37,4 +37,7 @@
         <code>_takgatewaycs</code> and <code>_takgatewayId</code> that can be used
         as look ups for other messages.</p>
     <p>It also sets <code>msg.topic</code> to the event type to make switching easier.</p>
+    <p>If an event arrives with a <i>fileshare</i> link, it will fetch the file and add
+        <code>msg.filename</code> and <code>msg.datapackage</code> to the output msg.
+        The datapackage will be a buffer.</p>
 </script>

package/tak-ingest.js

@@ -1,4 +1,5 @@
 const { XMLParser, XMLBuilder, XMLValidator} = require("fast-xml-parser");
+const axios = require('axios').default;
 var Long = require('long').Long;
 var protobuf = require('protobufjs');
 var path = require('path');
@@ -86,7 +87,26 @@ module.exports = function(RED) {
                 global.set("_takgatewayid", b);
             }
             if (msg.payload?.event?.type) { msg.topic = msg.payload?.event?.type; }
-            node.send(msg);
+            if (msg.payload?.event?.detail?.fileshare) {
+                msg.filename = msg.payload.event.detail.fileshare.filename;
+                axios({
+                    method: 'get',
+                    url: msg.payload.event.detail.fileshare.senderUrl,
+                    headers: { 'Accept': 'application/zip' },
+                    responseType: 'arraybuffer'
+                    })
+                    .then(function (response) {
+                        msg.datapackage = Buffer.from(response.data);
+                        node.send(msg);
+                    })
+                    .catch(function (error) {
+                        node.error(error.message, error);
+                        node.send(msg);
+                    })
+            }
+            else {
+                node.send(msg);
+            }
         });
 
         node.on("close", function() {

package/tak-registration.js

@@ -104,7 +104,7 @@ module.exports = function (RED) {
                 node.status({ fill: "green", shape: "dot", text: node.repeat / 1000 + "s - " + node.callsign });
                 return;
             }
-            // if it's just a simple filename and payload then make it look like an attachment etc...
+            // if it's just a simple filename and buffer payload then make it look like an attachment etc...
             if (msg.hasOwnProperty("filename") && Buffer.isBuffer(msg.payload) && !msg.hasOwnProperty("attachments")) {
                 msg.attachments = [{
                     filename: msg.filename.split('/').pop(),
@@ -118,8 +118,8 @@ module.exports = function (RED) {
             if (msg.hasOwnProperty("attachments") && Array.isArray(msg.attachments) && msg.attachments.length > 0) {
                 if (!msg.sendTo) { node.error("Missing 'sendTo' user TAK callsign property.", msg); return; }
                 var UUID = uuid.v5(msg.topic, 'd5d4a57d-48fb-58b6-93b8-d9fde658481a');
-                var fnam = msg.topic;
-                var fname = msg.topic + '.zip';
+                var fnam = msg.topic || msg.attachments[0].filename.split('.')[0];
+                var fname = fnam + '.zip';
                 var da = new Date();
                 var dn = da.toISOString().split('-')[2].split('.')[0];
                 var calls = msg.from || node.callsign;
@@ -166,7 +166,6 @@ module.exports = function (RED) {
                     cott = cott.replace(/>\s+</g, "><");
                     var hsh = crypto.createHash('md5').update(cott).digest('hex');
                     zip.addFile(hsh+'/'+hsh+'.cot', cott, "Added by Node-RED");
-
                     mf += `<Content ignore="false" zipEntry="${hsh+'/'+hsh+'.cot'}"><Parameter name="uid" value="${UUID}"/></Content>\n`;
                 }
 
@@ -174,13 +173,12 @@ module.exports = function (RED) {
                 mf = mf.replace(/>\s+</g, "><");
                 zip.addFile('MANIFEST/manifest.xml', Buffer.from(mf, 'utf8'), msg.topic);
                 var zipbuff = zip.toBuffer();
-                zip.writeZip("/tmp/takfile.zip")
 
                 msg = {
-                    from: node.callsign || msg.from || "Anonymous",
+                    from: msg.from || node.callsign || "Anonymous",
                     sendTo: msg.sendTo,
-                    lat: node.lat || msg.lat || 0,
-                    lon: node.lon || msg.lon || 0,
+                    lat: msg.lat || node.lat || 0,
+                    lon: msg.lon || node.lon || 0,
                     assetfile: fname,
                     len: zipbuff.length,
                     uid: node.uuid,