node-red-contrib-tak-registration 0.11.5 → 0.12.0

package/node_modules/uuid/dist/v6ToV1.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = v6ToV1;
+var _parse = _interopRequireDefault(require("./parse.js"));
+var _stringify = require("./stringify.js");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+/**
+ * Convert a v6 UUID to a v1 UUID
+ *
+ * @param {string|Uint8Array} uuid - The v6 UUID to convert to v6
+ * @returns {string|Uint8Array} The v1 UUID as the same type as the `uuid` arg
+ * (string or Uint8Array)
+ */
+function v6ToV1(uuid) {
+  const v6Bytes = typeof uuid === 'string' ? (0, _parse.default)(uuid) : uuid;
+  const v1Bytes = _v6ToV1(v6Bytes);
+  return typeof uuid === 'string' ? (0, _stringify.unsafeStringify)(v1Bytes) : v1Bytes;
+}
+
+// Do the field transformation needed for v6 -> v1
+function _v6ToV1(v6Bytes) {
+  return Uint8Array.of((v6Bytes[3] & 0x0f) << 4 | v6Bytes[4] >> 4 & 0x0f, (v6Bytes[4] & 0x0f) << 4 | (v6Bytes[5] & 0xf0) >> 4, (v6Bytes[5] & 0x0f) << 4 | v6Bytes[6] & 0x0f, v6Bytes[7], (v6Bytes[1] & 0x0f) << 4 | (v6Bytes[2] & 0xf0) >> 4, (v6Bytes[2] & 0x0f) << 4 | (v6Bytes[3] & 0xf0) >> 4, 0x10 | (v6Bytes[0] & 0xf0) >> 4, (v6Bytes[0] & 0x0f) << 4 | (v6Bytes[1] & 0xf0) >> 4, v6Bytes[8], v6Bytes[9], v6Bytes[10], v6Bytes[11], v6Bytes[12], v6Bytes[13], v6Bytes[14], v6Bytes[15]);
+}

package/node_modules/uuid/dist/v7.js

@@ -0,0 +1,152 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _rng = _interopRequireDefault(require("./rng.js"));
+var _stringify = require("./stringify.js");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+/**
+ * UUID V7 - Unix Epoch time-based UUID
+ *
+ * The IETF has published RFC9562, introducing 3 new UUID versions (6,7,8). This
+ * implementation of V7 is based on the accepted, though not yet approved,
+ * revisions.
+ *
+ * RFC 9562:https://www.rfc-editor.org/rfc/rfc9562.html Universally Unique
+ * IDentifiers (UUIDs)
+
+ *
+ * Sample V7 value:
+ * https://www.rfc-editor.org/rfc/rfc9562.html#name-example-of-a-uuidv7-value
+ *
+ * Monotonic Bit Layout: RFC rfc9562.6.2 Method 1, Dedicated Counter Bits ref:
+ *     https://www.rfc-editor.org/rfc/rfc9562.html#section-6.2-5.1
+ *
+ *   0                   1                   2                   3 0 1 2 3 4 5 6
+ *   7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |                          unix_ts_ms                           |
+ *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |          unix_ts_ms           |  ver  |        seq_hi         |
+ *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |var|               seq_low               |        rand         |
+ *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |                             rand                              |
+ *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ * seq is a 31 bit serialized counter; comprised of 12 bit seq_hi and 19 bit
+ * seq_low, and randomly initialized upon timestamp change. 31 bit counter size
+ * was selected as any bitwise operations in node are done as _signed_ 32 bit
+ * ints. we exclude the sign bit.
+ */
+
+let _seqLow = null;
+let _seqHigh = null;
+let _msecs = 0;
+function v7(options, buf, offset) {
+  options = options || {};
+
+  // initialize buffer and pointer
+  let i = buf && offset || 0;
+  const b = buf || new Uint8Array(16);
+
+  // rnds is Uint8Array(16) filled with random bytes
+  const rnds = options.random || (options.rng || _rng.default)();
+
+  // milliseconds since unix epoch, 1970-01-01 00:00
+  const msecs = options.msecs !== undefined ? options.msecs : Date.now();
+
+  // seq is user provided 31 bit counter
+  let seq = options.seq !== undefined ? options.seq : null;
+
+  // initialize local seq high/low parts
+  let seqHigh = _seqHigh;
+  let seqLow = _seqLow;
+
+  // check if clock has advanced and user has not provided msecs
+  if (msecs > _msecs && options.msecs === undefined) {
+    _msecs = msecs;
+
+    // unless user provided seq, reset seq parts
+    if (seq !== null) {
+      seqHigh = null;
+      seqLow = null;
+    }
+  }
+
+  // if we have a user provided seq
+  if (seq !== null) {
+    // trim provided seq to 31 bits of value, avoiding overflow
+    if (seq > 0x7fffffff) {
+      seq = 0x7fffffff;
+    }
+
+    // split provided seq into high/low parts
+    seqHigh = seq >>> 19 & 0xfff;
+    seqLow = seq & 0x7ffff;
+  }
+
+  // randomly initialize seq
+  if (seqHigh === null || seqLow === null) {
+    seqHigh = rnds[6] & 0x7f;
+    seqHigh = seqHigh << 8 | rnds[7];
+    seqLow = rnds[8] & 0x3f; // pad for var
+    seqLow = seqLow << 8 | rnds[9];
+    seqLow = seqLow << 5 | rnds[10] >>> 3;
+  }
+
+  // increment seq if within msecs window
+  if (msecs + 10000 > _msecs && seq === null) {
+    if (++seqLow > 0x7ffff) {
+      seqLow = 0;
+      if (++seqHigh > 0xfff) {
+        seqHigh = 0;
+
+        // increment internal _msecs. this allows us to continue incrementing
+        // while staying monotonic. Note, once we hit 10k milliseconds beyond system
+        // clock, we will reset breaking monotonicity (after (2^31)*10000 generations)
+        _msecs++;
+      }
+    }
+  } else {
+    // resetting; we have advanced more than
+    // 10k milliseconds beyond system clock
+    _msecs = msecs;
+  }
+  _seqHigh = seqHigh;
+  _seqLow = seqLow;
+
+  // [bytes 0-5] 48 bits of local timestamp
+  b[i++] = _msecs / 0x10000000000 & 0xff;
+  b[i++] = _msecs / 0x100000000 & 0xff;
+  b[i++] = _msecs / 0x1000000 & 0xff;
+  b[i++] = _msecs / 0x10000 & 0xff;
+  b[i++] = _msecs / 0x100 & 0xff;
+  b[i++] = _msecs & 0xff;
+
+  // [byte 6] - set 4 bits of version (7) with first 4 bits seq_hi
+  b[i++] = seqHigh >>> 4 & 0x0f | 0x70;
+
+  // [byte 7] remaining 8 bits of seq_hi
+  b[i++] = seqHigh & 0xff;
+
+  // [byte 8] - variant (2 bits), first 6 bits seq_low
+  b[i++] = seqLow >>> 13 & 0x3f | 0x80;
+
+  // [byte 9] 8 bits seq_low
+  b[i++] = seqLow >>> 5 & 0xff;
+
+  // [byte 10] remaining 5 bits seq_low, 3 bits random
+  b[i++] = seqLow << 3 & 0xff | rnds[10] & 0x07;
+
+  // [bytes 11-15] always random
+  b[i++] = rnds[11];
+  b[i++] = rnds[12];
+  b[i++] = rnds[13];
+  b[i++] = rnds[14];
+  b[i++] = rnds[15];
+  return buf || (0, _stringify.unsafeStringify)(b);
+}
+var _default = exports.default = v7;

package/node_modules/uuid/dist/validate.js

@@ -4,14 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _regex = _interopRequireDefault(require("./regex.js"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function validate(uuid) {
   return typeof uuid === 'string' && _regex.default.test(uuid);
 }
-
-var _default = validate;
-exports.default = _default;
+var _default = exports.default = validate;

package/node_modules/uuid/dist/version.js

@@ -4,18 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _validate = _interopRequireDefault(require("./validate.js"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function version(uuid) {
   if (!(0, _validate.default)(uuid)) {
     throw TypeError('Invalid UUID');
   }
-
   return parseInt(uuid.slice(14, 15), 16);
 }
-
-var _default = version;
-exports.default = _default;
+var _default = exports.default = version;

package/node_modules/uuid/package.json

@@ -1,7 +1,7 @@
 {
   "name": "uuid",
-  "version": "9.0.1",
-  "description": "RFC4122 (v1, v4, and v5) UUIDs",
+  "version": "10.0.0",
+  "description": "RFC9562 UUIDs",
   "funding": [
     "https://github.com/sponsors/broofa",
     "https://github.com/sponsors/ctavan"
@@ -14,11 +14,12 @@
   "keywords": [
     "uuid",
     "guid",
-    "rfc4122"
+    "rfc4122",
+    "rfc9562"
   ],
   "license": "MIT",
   "bin": {
-    "uuid": "./dist/bin/uuid"
+    "uuid": "dist/bin/uuid"
   },
   "sideEffects": false,
   "main": "./dist/index.js",
@@ -39,11 +40,11 @@
   },
   "module": "./dist/esm-node/index.js",
   "browser": {
+    "./dist/esm-node/index.js": "./dist/esm-browser/index.js",
     "./dist/md5.js": "./dist/md5-browser.js",
     "./dist/native.js": "./dist/native-browser.js",
     "./dist/rng.js": "./dist/rng-browser.js",
-    "./dist/sha1.js": "./dist/sha1-browser.js",
-    "./dist/esm-node/index.js": "./dist/esm-browser/index.js"
+    "./dist/sha1.js": "./dist/sha1-browser.js"
   },
   "files": [
     "CHANGELOG.md",
@@ -54,26 +55,30 @@
     "wrapper.mjs"
   ],
   "devDependencies": {
-    "@babel/cli": "7.18.10",
-    "@babel/core": "7.18.10",
-    "@babel/eslint-parser": "7.18.9",
-    "@babel/preset-env": "7.18.10",
-    "@commitlint/cli": "17.0.3",
-    "@commitlint/config-conventional": "17.0.3",
+    "@babel/cli": "7.24.6",
+    "@babel/core": "7.24.6",
+    "@babel/eslint-parser": "7.24.6",
+    "@babel/plugin-syntax-import-attributes": "7.24.6",
+    "@babel/preset-env": "7.24.6",
+    "@commitlint/cli": "19.3.0",
+    "@commitlint/config-conventional": "19.2.2",
+    "@wdio/browserstack-service": "7.16.10",
+    "@wdio/cli": "7.16.10",
+    "@wdio/jasmine-framework": "7.16.6",
+    "@wdio/local-runner": "7.16.10",
+    "@wdio/spec-reporter": "7.16.9",
+    "@wdio/static-server-service": "7.16.6",
     "bundlewatch": "0.3.3",
-    "eslint": "8.21.0",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-config-standard": "17.0.0",
-    "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-promise": "6.0.0",
-    "husky": "8.0.1",
-    "jest": "28.1.3",
-    "lint-staged": "13.0.3",
+    "eslint": "9.4.0",
+    "eslint-plugin-prettier": "5.1.3",
+    "globals": "15.3.0",
+    "husky": "9.0.11",
+    "jest": "29.7.0",
+    "lint-staged": "15.2.5",
+    "neostandard": "0.5.1",
     "npm-run-all": "4.1.5",
     "optional-dev-dependency": "2.0.1",
-    "prettier": "2.7.1",
+    "prettier": "3.3.0",
     "random-seed": "0.3.0",
     "runmd": "1.3.9",
     "standard-version": "9.5.0"
@@ -92,24 +97,25 @@
     "examples:node:commonjs:test": "cd examples/node-commonjs && npm install && npm test",
     "examples:node:esmodules:test": "cd examples/node-esmodules && npm install && npm test",
     "examples:node:jest:test": "cd examples/node-jest && npm install && npm test",
-    "prepare": "cd $( git rev-parse --show-toplevel ) && husky install",
+    "prepare": "husky install",
     "lint": "npm run eslint:check && npm run prettier:check",
     "eslint:check": "eslint src/ test/ examples/ *.js",
     "eslint:fix": "eslint --fix src/ test/ examples/ *.js",
-    "pretest": "[ -n $CI ] || npm run build",
+    "pretest": "npm run build",
     "test": "BABEL_ENV=commonjsNode node --throw-deprecation node_modules/.bin/jest test/unit/",
+    "test:matching": "BABEL_ENV=commonjsNode node --throw-deprecation node_modules/.bin/jest test/unit/ -t",
     "pretest:browser": "optional-dev-dependency && npm run build && npm-run-all --parallel examples:browser:**",
     "test:browser": "wdio run ./wdio.conf.js",
     "pretest:node": "npm run build",
     "test:node": "npm-run-all --parallel examples:node:**",
     "test:pack": "./scripts/testpack.sh",
     "pretest:benchmark": "npm run build",
-    "test:benchmark": "cd examples/benchmark && npm install && npm test",
-    "prettier:check": "prettier --check '**/*.{js,jsx,json,md}'",
-    "prettier:fix": "prettier --write '**/*.{js,jsx,json,md}'",
+    "test:benchmark": "cd examples/benchmark && HUSKY=0 npm install && npm test",
+    "prettier:check": "prettier --check .",
+    "prettier:fix": "prettier --write .",
     "bundlewatch": "npm run pretest:browser && bundlewatch --config bundlewatch.config.json",
     "md": "runmd --watch --output=README.md README_js.md",
-    "docs": "( node --version | grep -q 'v18' ) && ( npm run build && npx runmd --output=README.md README_js.md )",
+    "docs": "npm run build && npx runmd --output=README.md README_js.md",
     "docs:diff": "npm run docs && git diff --quiet README.md",
     "build": "./scripts/build.sh",
     "prepack": "npm run build",
@@ -117,19 +123,20 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/uuidjs/uuid.git"
+    "url": "git+https://github.com/uuidjs/uuid.git"
   },
   "lint-staged": {
-    "*.{js,jsx,json,md}": [
-      "prettier --write"
+    "*": [
+      "prettier --no-error-on-unmatched-pattern --write"
     ],
     "*.{js,jsx}": [
-      "eslint --fix"
+      "eslint --no-error-on-unmatched-pattern --fix"
     ]
   },
   "standard-version": {
     "scripts": {
       "postchangelog": "prettier --write CHANGELOG.md"
     }
-  }
+  },
+  "packageManager": "npm@10.8.1+sha256.b8807aebb9656758e2872fa6e7c564b506aa2faa9297439a478d471d2fe32483"
 }

package/node_modules/uuid/wrapper.mjs

@@ -1,9 +1,14 @@
 import uuid from './dist/index.js';
 export const v1 = uuid.v1;
+export const v1ToV6 = uuid.v1ToV6;
 export const v3 = uuid.v3;
 export const v4 = uuid.v4;
 export const v5 = uuid.v5;
+export const v6 = uuid.v6;
+export const v6ToV1 = uuid.v6ToV1;
+export const v7 = uuid.v7;
 export const NIL = uuid.NIL;
+export const MAX = uuid.MAX;
 export const version = uuid.version;
 export const validate = uuid.validate;
 export const stringify = uuid.stringify;

package/package.json

@@ -1,16 +1,16 @@
 {
     "name": "node-red-contrib-tak-registration",
-    "version": "0.11.5",
+    "version": "0.12.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.6.2",
-        "fast-xml-parser": "4.3.2",
+        "adm-zip": "0.5.14",
+        "axios": "1.7.2",
+        "fast-xml-parser": "4.4.0",
         "form-data": "4.0.0",
         "long": "5.2.3",
-        "protobufjs": "7.2.5",
-        "uuid": "9.0.1"
+        "protobufjs": "7.3.2",
+        "uuid": "10.0.0"
     },
     "bundledDependencies": [
         "@turf/turf",

package/tak-ingest.js

@@ -86,7 +86,11 @@ module.exports = function(RED) {
                 node.error("Input is not a string.",msg);
                 return;
             }
-            msg.payload = msg.payload.trim();
+            msg.payload = msg.payload.trim().replace(/>\s+</g, "><");
+            var p = msg.payload.indexOf("<event");
+            if (p >= 0) {
+                msg.payload = msg.payload.substr(p);
+            }
             if (msg.payload.indexOf("<event") !== 0) {
                 if (msg.payload.trim().length > 0 && msg.payload !== '</event>') { // ignore blank lines
                     node.error("Input is not an XML event string.",msg);

package/tak-registration.js

@@ -298,6 +298,7 @@ module.exports = function (RED) {
             // Handle a generic worldmap style object
             else if (typeof msg.payload === "object" && msg.payload.hasOwnProperty("name")) {
                 var shapeXML = ``;
+                var linkXML = ``;
                 var d = new Date();
                 var st = d.toISOString();
                 var ttl = ((msg.payload.ttl || 0) * 1000) || 60000;
@@ -325,6 +326,11 @@ module.exports = function (RED) {
                     }
                 }
 
+                // for markers that aren't us, then need to add a link tag
+                if (msg.payload.hasOwnProperty("name")) {
+                    linkXML = `<link uid="${node.uuid}" production_time="${st}" type="${node.ntype}" parent_callsign="${node.callsign}" relation="p-p"/>`;
+                }
+
                 // 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...
@@ -444,8 +450,9 @@ 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 || 9999999.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}"/>
+                        ${linkXML}
                         <remarks source="${node.callsign}">${tag}</remarks>
                         ${shapeXML}
                     </detail>

package/node_modules/@types/node/ts4.8/assert/strict.d.ts

@@ -1,8 +0,0 @@
-declare module "assert/strict" {
-    import { strict } from "node:assert";
-    export = strict;
-}
-declare module "node:assert/strict" {
-    import { strict } from "node:assert";
-    export = strict;
-}