node-red-contrib-web-worldmap 2.39.0 → 2.40.1

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 ### Change Log for Node-RED Worldmap
 
+ - v2.40.1 - Fix missing countries overlay when starting disconnected.
+ - v2.40.0 - Add handling for TAK event points from TAK ingest node.
  - v2.39.0 - Add client timezone to connect message. PR #245
  - v2.38.3 - Better fix for geojson multipoint icons.
  - v2.38.1 - Fix for geojson multipoint icons.

package/README.md

@@ -13,6 +13,8 @@ Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%
 
 ### Updates
 
+- v2.40.1 - Fix missing countries overlay when starting disconnected.
+- v2.40.0 - Add handling for TAK event points from TAK ingest node.
 - v2.39.0 - Add client timezone to connect message. PR #245
 - v2.38.3 - Better fix for geojson multipoint icons.
 - v2.38.1 - Fix for geojson multipoint icons.
@@ -118,10 +120,18 @@ To do this you need to supply a `msg.payload.SIDC` 2525 code instead of an icon,
         "options": { "fillOpacity":0.8, "additionalInformation":"Extra info" }
     }
 
-SIDC codes can be generated using the online tool - https://spatialillusions.com/unitgenerator/
+SIDC codes can be generated using the online tool - https://www.spatialillusions.com/unitgenerator-legacy/
 
 There are lots of extra options you can specify as `msg.payload.options` - see the <a href="https://spatialillusions.com/milsymbol/documentation.html" target="mapinfo">milsymbol docs here</a>.
 
+#### TAK Visualisation
+
+Users of [TAK](https://tak.gov) can use the [TAK ingest node](https://flows.nodered.org/node/node-red-contrib-tak-registration) to create a JSON formatted TAK event object, received from a TAK server. This can be fed directly into the worldmap node.
+
+![Tak Flow](https://github.com/dceejay/pages/blob/master/TAKflow.png?raw=true)
+![Tak Image](https://github.com/dceejay/pages/blob/master/TAKicons.png?raw=true)
+
+
 ### Areas, Rectangles, Lines, and GreatCircles
 
 If the msg.payload contains an **area** property - that is an array of co-ordinates, e.g.
@@ -698,7 +708,7 @@ and use a url like `"url": "http://localhost:1882/?map=/maps/my-app.map",`
 
 To use a vector mbtiles server like **MapTiler** then you can download your mbtiles file into a directory and then from that directory run
 ```
-docker run --name maptiler -d -v $(pwd):/data -p 1884:8080 maptiler/tileserver-gl -p 8080
+docker run --name maptiler -d -v $(pwd):/data -p 1884:8080 maptiler/tileserver-gl -p 8080 --mbtiles yourMapFile.mbtiles
 ```
 and use a url like `"url": "http://localhost:1884/styles/basic-preview/{z}/{x}/{y}.png"`
 

package/node_modules/faye-websocket/CHANGELOG.md

@@ -0,0 +1,139 @@
+### 0.11.4 / 2021-05-24
+
+- Prevent the client hanging if `close()` is called when already closing
+
+### 0.11.3 / 2019-06-10
+
+- Fix a race condition that caused a timeout not to be cancelled immediately
+  when the WebSocket is closed
+- Change license from MIT to Apache 2.0
+
+### 0.11.2 / 2019-06-10
+
+(This version was pulled due to an error when publishing)
+
+### 0.11.1 / 2017-01-22
+
+- Forcibly close the I/O stream after a timeout if the peer does not respond
+  after calling `close()`
+
+### 0.11.0 / 2016-02-24
+
+- Introduce a `net` option to the `Client` class for setting things like, say,
+  `servername`
+
+### 0.10.0 / 2015-07-08
+
+- Add the standard `code` and `reason` parameters to the `close` method
+
+### 0.9.4 / 2015-03-08
+
+- Don't send input to the driver before `start()` is called
+
+### 0.9.3 / 2015-02-19
+
+- Make sure the TCP socket is not left open when closing the connection
+
+### 0.9.2 / 2014-12-21
+
+- Only emit `error` once, and don't emit it after `close`
+
+### 0.9.1 / 2014-12-18
+
+- Check that all options to the WebSocket constructor are recognized
+
+### 0.9.0 / 2014-12-13
+
+- Allow protocol extensions to be passed into websocket-extensions
+
+### 0.8.1 / 2014-11-12
+
+- Send the correct hostname when upgrading a connection to TLS
+
+### 0.8.0 / 2014-11-08
+
+- Support connections via HTTP proxies
+- Close the connection cleanly if we're still waiting for a handshake response
+
+### 0.7.3 / 2014-10-04
+
+- Allow sockets to be closed when they are in any state other than `CLOSED`
+
+### 0.7.2 / 2013-12-29
+
+- Make sure the `close` event is emitted by clients on Node v0.10
+
+### 0.7.1 / 2013-12-03
+
+- Support the `maxLength` websocket-driver option
+- Make the client emit `error` events on network errors
+
+### 0.7.0 / 2013-09-09
+
+- Allow the server to send custom headers with EventSource responses
+
+### 0.6.1 / 2013-07-05
+
+- Add `ca` option to the client for specifying certificate authorities
+- Start the server driver asynchronously so that `onopen` handlers can be added
+
+### 0.6.0 / 2013-05-12
+
+- Add support for custom headers
+
+### 0.5.0 / 2013-05-05
+
+- Extract the protocol handlers into the `websocket-driver` library
+- Support the Node streaming API
+
+### 0.4.4 / 2013-02-14
+
+- Emit the `close` event if TCP is closed before CLOSE frame is acked
+
+### 0.4.3 / 2012-07-09
+
+- Add `Connection: close` to EventSource response
+- Handle situations where `request.socket` is undefined
+
+### 0.4.2 / 2012-04-06
+
+- Add WebSocket error code `1011`.
+- Handle URLs with no path correctly by sending `GET /`
+
+### 0.4.1 / 2012-02-26
+
+- Treat anything other than a `Buffer` as a string when calling `send()`
+
+### 0.4.0 / 2012-02-13
+
+- Add `ping()` method to server-side `WebSocket` and `EventSource`
+- Buffer `send()` calls until the draft-76 handshake is complete
+- Fix HTTPS problems on Node 0.7
+
+### 0.3.1 / 2012-01-16
+
+- Call `setNoDelay(true)` on `net.Socket` objects to reduce latency
+
+### 0.3.0 / 2012-01-13
+
+- Add support for `EventSource` connections
+
+### 0.2.0 / 2011-12-21
+
+- Add support for `Sec-WebSocket-Protocol` negotiation
+- Support `hixie-76` close frames and 75/76 ignored segments
+- Improve performance of HyBi parsing/framing functions
+- Decouple parsers from TCP and reduce write volume
+
+### 0.1.2 / 2011-12-05
+
+- Detect closed sockets on the server side when TCP connection breaks
+- Make `hixie-76` sockets work through HAProxy
+
+### 0.1.1 / 2011-11-30
+
+- Fix `addEventListener()` interface methods
+
+### 0.1.0 / 2011-11-27
+
+- Initial release, based on WebSocket components from Faye

package/node_modules/path-to-regexp/History.md

@@ -0,0 +1,36 @@
+0.1.7 / 2015-07-28
+==================
+
+  * Fixed regression with escaped round brackets and matching groups.
+
+0.1.6 / 2015-06-19
+==================
+
+  * Replace `index` feature by outputting all parameters, unnamed and named.
+
+0.1.5 / 2015-05-08
+==================
+
+  * Add an index property for position in match result.
+
+0.1.4 / 2015-03-05
+==================
+
+  * Add license information
+
+0.1.3 / 2014-07-06
+==================
+
+  * Better array support
+  * Improved support for trailing slash in non-ending mode
+
+0.1.0 / 2014-03-06
+==================
+
+  * add options.end
+
+0.0.2 / 2013-02-10
+==================
+
+  * Update to match current express
+  * add .license property to component.json

package/node_modules/websocket-driver/CHANGELOG.md

@@ -0,0 +1,142 @@
+### 0.7.4 / 2020-05-22
+
+- Avoid crashing if `process.version` does not contain any digits
+- Emit `ping` and `pong` events from the `Server` driver
+- Require http-parser-js >=0.5.1 which fixes the bug we addressed in 0.7.3
+
+### 0.7.3 / 2019-06-13
+
+- Cap version of http-parser-js below 0.4.11, which introduced a bug that
+  prevents us from handling messages that are part of the same input buffer as
+  the handshake response if chunked encoding is specified
+
+### 0.7.2 / 2019-06-13
+
+(This version was pulled due to an error when publishing)
+
+### 0.7.1 / 2019-06-10
+
+- Catch any exceptions produced while generating a handshake response and send a
+  `400 Bad Request` response to the client
+- Pick the RFC-6455 protocol version if the request contains any of the headers
+  used by that version
+- Use the `Buffer.alloc()` and `Buffer.from()` functions instead of the unsafe
+  `Buffer()` constructor
+- Handle errors encountered while handling malformed draft-76 requests
+- Change license from MIT to Apache 2.0
+
+### 0.7.0 / 2017-09-11
+
+- Add `ping` and `pong` to the set of events users can listen to
+- Replace the bindings to Node's HTTP parser with `http-parser-js`
+
+### 0.6.5 / 2016-05-20
+
+- Don't mutate buffers passed in by the application when masking
+
+### 0.6.4 / 2016-01-07
+
+- If a number is given as input for a frame payload, send it as a string
+
+### 0.6.3 / 2015-11-06
+
+- Reject draft-76 handshakes if their Sec-WebSocket-Key headers are invalid
+- Throw a more helpful error if a client is created with an invalid URL
+
+### 0.6.2 / 2015-07-18
+
+- When the peer sends a close frame with no error code, emit 1000
+
+### 0.6.1 / 2015-07-13
+
+- Use the `buffer.{read,write}UInt{16,32}BE` methods for reading/writing numbers
+  to buffers rather than including duplicate logic for this
+
+### 0.6.0 / 2015-07-08
+
+- Allow the parser to recover cleanly if event listeners raise an error
+- Add a `pong` method for sending unsolicited pong frames
+
+### 0.5.4 / 2015-03-29
+
+- Don't emit extra close frames if we receive a close frame after we already
+  sent one
+- Fail the connection when the driver receives an invalid
+  `Sec-WebSocket-Extensions` header
+
+### 0.5.3 / 2015-02-22
+
+- Don't treat incoming data as WebSocket frames if a client driver is closed
+  before receiving the server handshake
+
+### 0.5.2 / 2015-02-19
+
+- Fix compatibility with the HTTP parser on io.js
+- Use `websocket-extensions` to make sure messages and close frames are kept in
+  order
+- Don't emit multiple `error` events
+
+### 0.5.1 / 2014-12-18
+
+- Don't allow drivers to be created with unrecognized options
+
+### 0.5.0 / 2014-12-13
+
+- Support protocol extensions via the websocket-extensions module
+
+### 0.4.0 / 2014-11-08
+
+- Support connection via HTTP proxies using `CONNECT`
+
+### 0.3.6 / 2014-10-04
+
+- It is now possible to call `close()` before `start()` and close the driver
+
+### 0.3.5 / 2014-07-06
+
+- Don't hold references to frame buffers after a message has been emitted
+- Make sure that `protocol` and `version` are exposed properly by the TCP driver
+
+### 0.3.4 / 2014-05-08
+
+- Don't hold memory-leaking references to I/O buffers after they have been
+  parsed
+
+### 0.3.3 / 2014-04-24
+
+- Correct the draft-76 status line reason phrase
+
+### 0.3.2 / 2013-12-29
+
+- Expand `maxLength` to cover sequences of continuation frames and
+  `draft-{75,76}`
+- Decrease default maximum frame buffer size to 64MB
+- Stop parsing when the protocol enters a failure mode, to save CPU cycles
+
+### 0.3.1 / 2013-12-03
+
+- Add a `maxLength` option to limit allowed frame size
+- Don't pre-allocate a message buffer until the whole frame has arrived
+- Fix compatibility with Node v0.11 `HTTPParser`
+
+### 0.3.0 / 2013-09-09
+
+- Support client URLs with Basic Auth credentials
+
+### 0.2.2 / 2013-07-05
+
+- No functional changes, just updates to package.json
+
+### 0.2.1 / 2013-05-17
+
+- Export the isSecureRequest() method since faye-websocket relies on it
+- Queue sent messages in the client's initial state
+
+### 0.2.0 / 2013-05-12
+
+- Add API for setting and reading headers
+- Add Driver.server() method for getting a driver for TCP servers
+
+### 0.1.0 / 2013-05-04
+
+- First stable release

package/node_modules/websocket-driver/node_modules/http-parser-js/CHANGELOG.md

@@ -0,0 +1,14 @@
+# HTTP Parser
+
+## 0.4.4
+
+Made 'maxHeaderSize' configurable.
+
+```js
+// Monkey patch before you require http for the first time.
+process.binding('http_parser').HTTPParser = require('http-parser-js').HTTPParser;
+require('http-parser-js').HTTPParser.maxHeaderSize = 1024 * 1024; // 1MB instead of 80kb
+
+var http = require('http');
+// ...
+```

package/node_modules/websocket-extensions/CHANGELOG.md

@@ -0,0 +1,28 @@
+### 0.1.4 / 2020-06-02
+
+- Remove a ReDoS vulnerability in the header parser (CVE-2020-7662, reported by
+  Robert McLaughlin)
+- Change license from MIT to Apache 2.0
+
+### 0.1.3 / 2017-11-11
+
+- Accept extension names and parameters including uppercase letters
+- Handle extension names that clash with `Object.prototype` properties
+
+### 0.1.2 / 2017-09-10
+
+- Catch synchronous exceptions thrown when calling an extension
+- Fix race condition caused when a message is pushed after a cell has stopped
+  due to an error
+- Fix failure of `close()` to return if a message that's queued after one that
+  produces an error never finishes being processed
+
+### 0.1.1 / 2015-02-19
+
+- Prevent sessions being closed before they have finished processing messages
+- Add a callback to `Extensions.close()` so the caller can tell when it's safe
+  to close the socket
+
+### 0.1.0 / 2014-12-12
+
+- Initial release

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "2.39.0",
+    "version": "2.40.1",
     "description": "A Node-RED node to provide a web page of a world map for plotting things on.",
     "dependencies": {
         "@turf/bezier-spline": "~6.5.0",
@@ -24,7 +24,8 @@
     "keywords": [
         "node-red",
         "map",
-        "world"
+        "world",
+        "tak"
     ],
     "node-red": {
         "version": ">=1.0.0",

package/worldmap/worldmap.js

@@ -18,7 +18,7 @@ var menuOpen = false;
 var clusterAt = 0;
 var maxage = 900;   // default max age of icons on map in seconds - cleared after 10 mins
 var baselayername = "OSM grey";     // Default base layer OSM but uniform grey
-var pagefoot = " © DCJ 2022"
+var pagefoot = " © DCJ 2023"
 var inIframe = false;
 var showUserMenu = true;
 var showLayerMenu = true;
@@ -117,12 +117,23 @@ var handleData = function(data) {
             }
         }
         if (data.command) { doCommand(data.command); delete data.command; }
+
+        // handle raw geojson type msg
         if (data.hasOwnProperty("type") && data.type.indexOf("Feature") === 0) {
             if (data.hasOwnProperty('properties') && data.properties.hasOwnProperty('title')) {
                 doGeojson(data.properties.title,data)
             }
             else { doGeojson("geojson",data); }
         }
+        // handle TAK json (from tak-ingest node or fastxml node)
+        else if (data.hasOwnProperty("event") && data.event.hasOwnProperty("point")) {
+            doTAKjson(data.event);
+        }
+        // handle TAK json (from multicast Protobuf)
+        else if (data.hasOwnProperty("cotEvent") && data.cotEvent.hasOwnProperty("lat") && data.cotEvent.hasOwnProperty("lon")) {
+            doTAKMCjson(data.cotEvent);
+        }
+        // handle default worldmap json msg
         else if (data.hasOwnProperty("name")) { setMarker(data); }
         else {
             if (JSON.stringify(data) !== '{}') {
@@ -136,7 +147,13 @@ var handleData = function(data) {
 
 window.onunload = function() { if (ws) ws.close(); }
 
-var onoffline = function() { if (!navigator.onLine) { map.addLayer(layers["_countries"]); } }
+var customTopoLayer = L.geoJson(null, {clickable:false, style: {color:"blue", weight:2, fillColor:"#cf6", fillOpacity:0.04}});
+layers["_countries"] = omnivore.topojson('images/world-50m-flat.json',null,customTopoLayer);
+overlays["countries"] = layers["_countries"];
+
+var onoffline = function() { if (!navigator.onLine) {
+    map.addLayer(overlays["countries"]);
+} }
 
 document.addEventListener ("keydown", function (ev) {
     // Set Ctl-Alt-3 to switch to 3d view
@@ -1205,7 +1222,6 @@ var addOverlays = function(overlist) {
                     sendDrawing(n);
                 });
         }
-
     }
 
     // Add the countries (world-110m) for offline use
@@ -2910,3 +2926,59 @@ function doGeojson(n,g,l,o) {
     layers[lay].addLayer(markers[n]);
     map.addLayer(layers[lay]);
 }
+
+// handle TAK messages from TAK server tcp - XML->JSON
+function doTAKjson(p) {
+    // console.log("TAK event",p);
+    if (p.type.indexOf('a') === 0) {
+        var d = {};
+        d.lat = Number(p.point.lat);
+        d.lon = Number(p.point.lon);
+        d.group = p.detail?.__group?.name;
+        d.role = p.detail?.__group?.role;
+        d.type = p.type;
+        d.uid = p.uid;
+        d.name = p.detail?.contact?.callsign || p.uid;
+        d.hdg = p.detail?.track?.course;
+        d.speed = p.detail?.track?.speed;
+        var i = d.type.split('-').join('').toUpperCase();
+        if (i[0] === 'A') { i = 'S' + i.substr(1,2) + 'P' + i.substr(3); }
+        d.SIDC = (i + '------------').substr(0,12);
+        d.timestamp = Date.parse(p.time);
+        d.ttl = Date.parse(p.stale);
+        // d.now = Date.now();
+        d.alt = Number(p.point.hae) || 9999999;
+        setMarker(d);
+    }
+    else {
+        console.log("Skip TAK type",p.type);
+    }
+}
+
+// handle TAK messages from TAK Multicast - Protobuf->JSON
+function doTAKMCjson(p) {
+    // console.log("TAK Multicast event",p);
+    if (p.type.indexOf('a') === 0) {
+        var d = {};
+        d.lat = p.lat;
+        d.lon = p.lon;
+        d.group = p.detail?.group?.name;
+        d.role = p.detail?.group?.role;
+        d.type = p.type;
+        d.uid = p.uid;
+        d.name = p.detail?.contact?.callsign || p.uid;
+        d.hdg = p.detail?.track?.course;
+        d.speed = p.detail?.track?.speed;
+        var i = d.type.split('-').join('').toUpperCase();
+        if (i[0] === 'A') { i = 'S' + i.substr(1,2) + 'P' + i.substr(3); }
+        d.SIDC = (i + '------------').substr(0,12);
+        d.timestamp = Number(p.sendTime);
+        d.ttl = Number(p.staleTime);
+        // d.now = Date.now();
+        d.alt = p.hae || 9999999;
+        setMarker(d);
+    }
+    else {
+        console.log("Skip TAK type",p.type);
+    }
+}

package/worldmap.html

@@ -146,7 +146,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
     <p>Icons of type <i>plane</i>, <i>ship</i>, <i>car</i>, <i>uav</i> or <i>arrow</i> will use built in SVG icons that align to the
     <code>bearing</code> value.</p>
     <p>Font Awesome (<a href="https://fontawesome.com/v4.7.0/icons/" target="_new">fa-icons 4.7</a>) can also be used, as can
-    NATO symbology codes (<a href="https://spatialillusions.com/unitgenerator/">SIDC</a>), or <a href="https://github.com/dceejay/RedMap/blob/master/emojilist.md" target="_new">:emoji name:</a>,
+    NATO symbology codes (<a href="https://www.spatialillusions.com/unitgenerator-legacy/">SIDC</a>), or <a href="https://github.com/dceejay/RedMap/blob/master/emojilist.md" target="_new">:emoji name:</a>,
     or the url of a small icon image (32x32)</p>
     <p>See the <a href="https://www.npmjs.com/package/node-red-contrib-web-worldmap" target="_new">README</a> for further
     details and examples of icons and commands for drawing <b>lines</b> and <b>areas</b>, and to <b>add layers</b> and
@@ -312,7 +312,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
     <p>Icons of type <i>plane</i>, <i>ship</i>, <i>car</i>, <i>uav</i> or <i>arrow</i> will use built in SVG icons that align to the
     <code>bearing</code> value.</p>
     <p>Font Awesome (<a href="https://fontawesome.com/v4.7.0/icons/" target="_new">fa-icons 4.7</a>) can also be used, as can
-    NATO symbology codes (<a href="https://spatialillusions.com/unitgenerator/">SIDC</a>), or <a href="https://github.com/dceejay/RedMap/blob/master/emojilist.md" target="_new">:emoji name:</a>,
+    NATO symbology codes (<a href="https://www.spatialillusions.com/unitgenerator-legacy/">SIDC</a>), or <a href="https://github.com/dceejay/RedMap/blob/master/emojilist.md" target="_new">:emoji name:</a>,
     or the url of a small icon image (32x32)</p>
     <p>See the <a href="https://www.npmjs.com/package/node-red-contrib-web-worldmap" target="_new">README</a> for further
     details and examples of icons and commands for drawing <b>lines</b> and <b>areas</b>, and to <b>add layers</b> and