From 3cb34a226aa4d3d226e09175477f40add85ce4a0 Mon Sep 17 00:00:00 2001 From: ztimson Date: Mon, 6 Apr 2026 02:49:14 -0400 Subject: [PATCH] Added new codebook page --- .gitignore | 2 +- client/package-lock.json | 1170 ++++++++++ {code => client}/package.json | 2 + client/public/code-book-print.html | 284 +++ client/public/code-book.html | 669 ++++++ .../public/downloads/ATAK_5.4.0.16.apk | Bin {code => client}/public/downloads/Element.apk | Bin .../public/downloads/Meshtastic_2.7.1.apk | Bin .../downloads/Remote Desktop 8_8.1.82.445.apk | Bin .../public/downloads/SDRangel_7.21.3.1.apk | Bin client/public/encryption.js | 113 + {code => client}/public/favicon.png | Bin client/public/icons/cog.svg | 1 + client/public/icons/download.svg | 1 + client/public/icons/guage.svg | 1 + client/public/icons/open-sight.png | Bin 0 -> 25596 bytes {code => client}/public/index.html | 1879 ++++++++--------- {code => client}/public/index.js | 742 +++---- {public => client/public}/manifest.json | 38 +- {code => client}/src/config.json | 0 {code => client}/src/main.mjs | 102 +- {code => client}/src/services/environment.mjs | 76 +- {src => client/src}/services/status.mjs | 852 ++++---- code/package-lock.json | 370 ---- code/public/manifest.json | 19 - code/src/services/status.mjs | 426 ---- public/favicon.png | Bin 33248 -> 0 bytes public/index.html | 939 -------- public/index.js | 368 ---- src/main.mjs | 51 - src/services/environment.mjs | 38 - 31 files changed, 4076 insertions(+), 4067 deletions(-) create mode 100644 client/package-lock.json rename {code => client}/package.json (87%) mode change 100755 => 100644 create mode 100644 client/public/code-book-print.html create mode 100644 client/public/code-book.html rename {code => client}/public/downloads/ATAK_5.4.0.16.apk (100%) mode change 100755 => 100644 rename {code => client}/public/downloads/Element.apk (100%) mode change 100755 => 100644 rename {code => client}/public/downloads/Meshtastic_2.7.1.apk (100%) mode change 100755 => 100644 rename {code => client}/public/downloads/Remote Desktop 8_8.1.82.445.apk (100%) mode change 100755 => 100644 rename {code => client}/public/downloads/SDRangel_7.21.3.1.apk (100%) mode change 100755 => 100644 create mode 100644 client/public/encryption.js rename {code => client}/public/favicon.png (100%) mode change 100755 => 100644 create mode 100644 client/public/icons/cog.svg create mode 100644 client/public/icons/download.svg create mode 100644 client/public/icons/guage.svg create mode 100644 client/public/icons/open-sight.png rename {code => client}/public/index.html (87%) mode change 100755 => 100644 rename {code => client}/public/index.js (97%) mode change 100755 => 100644 rename {public => client/public}/manifest.json (94%) mode change 100755 => 100644 rename {code => client}/src/config.json (100%) rename {code => client}/src/main.mjs (96%) mode change 100755 => 100644 rename {code => client}/src/services/environment.mjs (96%) mode change 100755 => 100644 rename {src => client/src}/services/status.mjs (96%) mode change 100755 => 100644 delete mode 100755 code/package-lock.json delete mode 100755 code/public/manifest.json delete mode 100755 code/src/services/status.mjs delete mode 100755 public/favicon.png delete mode 100755 public/index.html delete mode 100755 public/index.js delete mode 100755 src/main.mjs delete mode 100755 src/services/environment.mjs diff --git a/.gitignore b/.gitignore index 7a1537b..a8dce37 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ .idea -node_modules +client/node_modules diff --git a/client/package-lock.json b/client/package-lock.json new file mode 100644 index 0000000..a77e10e --- /dev/null +++ b/client/package-lock.json @@ -0,0 +1,1170 @@ +{ + "name": "dashboard", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "dashboard", + "version": "1.0.0", + "license": "MIT", + "dependencies": { + "dotenv": "^17.4.1", + "express": "^5.2.1", + "node-gpsd": "^0.3.4" + }, + "devDependencies": { + "nodemon": "^3.1.10" + } + }, + "node_modules/accepts": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", + "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", + "license": "MIT", + "dependencies": { + "mime-types": "^3.0.0", + "negotiator": "^1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/body-parser": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz", + "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==", + "license": "MIT", + "dependencies": { + "bytes": "^3.1.2", + "content-type": "^1.0.5", + "debug": "^4.4.3", + "http-errors": "^2.0.0", + "iconv-lite": "^0.7.0", + "on-finished": "^2.4.1", + "qs": "^6.14.1", + "raw-body": "^3.0.1", + "type-is": "^2.0.1" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/content-disposition": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz", + "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", + "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", + "license": "MIT", + "engines": { + "node": ">=6.6.0" + } + }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/dotenv": { + "version": "17.4.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.1.tgz", + "integrity": "sha512-k8DaKGP6r1G30Lx8V4+pCsLzKr8vLmV2paqEj1Y55GdAgJuIqpRp5FfajGF8KtwMxCz9qJc6wUIJnm053d/WCw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "license": "MIT" + }, + "node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "license": "MIT" + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz", + "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==", + "license": "MIT", + "dependencies": { + "accepts": "^2.0.0", + "body-parser": "^2.2.1", + "content-disposition": "^1.0.0", + "content-type": "^1.0.5", + "cookie": "^0.7.1", + "cookie-signature": "^1.2.1", + "debug": "^4.4.0", + "depd": "^2.0.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "finalhandler": "^2.1.0", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "merge-descriptors": "^2.0.0", + "mime-types": "^3.0.0", + "on-finished": "^2.4.1", + "once": "^1.4.0", + "parseurl": "^1.3.3", + "proxy-addr": "^2.0.7", + "qs": "^6.14.0", + "range-parser": "^1.2.1", + "router": "^2.2.0", + "send": "^1.1.0", + "serve-static": "^2.2.0", + "statuses": "^2.0.1", + "type-is": "^2.0.1", + "vary": "^1.1.2" + }, + "engines": { + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/finalhandler": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.1.tgz", + "integrity": "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==", + "license": "MIT", + "dependencies": { + "debug": "^4.4.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "on-finished": "^2.4.1", + "parseurl": "^1.3.3", + "statuses": "^2.0.1" + }, + "engines": { + "node": ">= 18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", + "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", + "license": "MIT", + "dependencies": { + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/iconv-lite": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", + "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", + "dev": true + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-promise": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", + "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", + "license": "MIT" + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/media-typer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", + "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/merge-descriptors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", + "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz", + "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==", + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/negotiator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", + "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/node-gpsd": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/node-gpsd/-/node-gpsd-0.3.4.tgz", + "integrity": "sha512-sI9hPfHiaWDmhjE1oJZnhMo7UF2vQVGl3qk0K4HbN1L8BkS0I+rd6V687eHOj/6ervXiHrhwXzYYsWdXxGy0Qg==", + "engines": { + "node": ">=v0.8.0" + } + }, + "node_modules/nodemon": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz", + "integrity": "sha512-WDjw3pJ0/0jMFmyNDp3gvY2YizjLmmOUQo6DEBY+JgdvW/yQ9mEeSw6H5ythl5Ny2ytb7f9C2nIbjSxMNzbJXw==", + "dev": true, + "dependencies": { + "chokidar": "^3.5.2", + "debug": "^4", + "ignore-by-default": "^1.0.1", + "minimatch": "^3.1.2", + "pstree.remy": "^1.1.8", + "semver": "^7.5.3", + "simple-update-notifier": "^2.0.0", + "supports-color": "^5.5.0", + "touch": "^3.1.0", + "undefsafe": "^2.0.5" + }, + "bin": { + "nodemon": "bin/nodemon.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/nodemon" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-to-regexp": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz", + "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "license": "MIT", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/pstree.remy": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", + "dev": true + }, + "node_modules/qs": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz", + "integrity": "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz", + "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==", + "license": "MIT", + "dependencies": { + "bytes": "~3.1.2", + "http-errors": "~2.0.1", + "iconv-lite": "~0.7.0", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/router": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", + "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", + "license": "MIT", + "dependencies": { + "debug": "^4.4.0", + "depd": "^2.0.0", + "is-promise": "^4.0.0", + "parseurl": "^1.3.3", + "path-to-regexp": "^8.0.0" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/send": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz", + "integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==", + "license": "MIT", + "dependencies": { + "debug": "^4.4.3", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "fresh": "^2.0.0", + "http-errors": "^2.0.1", + "mime-types": "^3.0.2", + "ms": "^2.1.3", + "on-finished": "^2.4.1", + "range-parser": "^1.2.1", + "statuses": "^2.0.2" + }, + "engines": { + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/serve-static": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz", + "integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==", + "license": "MIT", + "dependencies": { + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "parseurl": "^1.3.3", + "send": "^1.2.0" + }, + "engines": { + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "license": "ISC" + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/simple-update-notifier": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", + "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", + "dev": true, + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/touch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz", + "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==", + "dev": true, + "bin": { + "nodetouch": "bin/nodetouch.js" + } + }, + "node_modules/type-is": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", + "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "license": "MIT", + "dependencies": { + "content-type": "^1.0.5", + "media-typer": "^1.1.0", + "mime-types": "^3.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/undefsafe": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", + "dev": true + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" + } + } +} diff --git a/code/package.json b/client/package.json old mode 100755 new mode 100644 similarity index 87% rename from code/package.json rename to client/package.json index 6b47216..0b00fba --- a/code/package.json +++ b/client/package.json @@ -11,6 +11,8 @@ "license": "MIT", "description": "Dashboard", "dependencies": { + "dotenv": "^17.4.1", + "express": "^5.2.1", "node-gpsd": "^0.3.4" }, "devDependencies": { diff --git a/client/public/code-book-print.html b/client/public/code-book-print.html new file mode 100644 index 0000000..aa45674 --- /dev/null +++ b/client/public/code-book-print.html @@ -0,0 +1,284 @@ + + + + Code Book + + + + + +
+
+

Encryption Key

+ +
+ +

ASCII Reference Table

+
+
+ + +
+

ONE-TIME PASSWORDS (HOTP)

+
+
+ + +
+

AUTHENTICATION TABLES

+
+
+ + +
+

ONE-TIME PAD

+
+
+ + + + + + diff --git a/client/public/code-book.html b/client/public/code-book.html new file mode 100644 index 0000000..3f7a99b --- /dev/null +++ b/client/public/code-book.html @@ -0,0 +1,669 @@ + + + + Code Book + + + + + + + +
+
+
+ Logo + +
+
+
+ +
+
+
+ +
+ + + +
+
+
+ + +
+
One Time Password (HOTP)
+
+ Description + +
+

Use a 3-digit challenge to generate & verify a corresponding 3-letter response.

+

Provides higher entropy and security than authentication tables while being easier to use.

+ +
+ Pre-Authenticate: +
+

A->B: AUTH 123 ABC

+

B->A: ACK. AUTH 456 DEF

+
+
+ +
+ Challenge-Response: +
+

A->B: CONFIRM 123

+

B->A: ACK ABC. CONFIRM 456

+

A->B: ACK DEF

+
+
+
+
+
+ + +
---
+
+
+ + +
+
Authentication Tables
+
+ Description + +
+

Challenge-response tables for authentication.

+ +
+ Example: +
+

A->B: CONFIRM CEY (Table: Charlie, Column: E, Row: Y)

+

B->A: ACK 7. CONFIRM AIT (Table: Alpha, Column: I, Row: T)

+

A->B: ACK T

+
+
+
+
+
+ + +
+
+
+ + +
+
One-Time Pad
+
+ Description + +
+

Use a 5-digit key to generate a corresponding fixed (paper friendly) or streamed (more secure) cipher.

+

Cipher values are added to the ASCII encoded message to create encrypted message.

+ +
+ Encoding: +
+ Message: "HI"
+ Pad Key: 12345
+ Cipher: 42 85 28 71 14 ...

+ + H = ASCII 72 → 72 + 42 = 114 → Hex 72
+ I = ASCII 73 → 73 + 85 = 158 → Hex 9E

+ + Encoded: 729E +
+
+ +
+ Decoding: +
+ Encoded: 729E
+ Pad Key: 12345
+ Cipher: 42 85 28 71 14 ...

+ + 72 (Hex) = 114 → 114 - 42 = 72 → ASCII 'H'
+ 9E (Hex) = 158 → 158 - 85 = 73 → ASCII 'I'

+ + Decoded: "HI" +
+
+
+
+
+
+ + +
+ + +
+
+
+
+
+
+ +
+ + +
+ +
+
+ + +
+
ASCII Reference Table
+
+
+
+ + + + + + diff --git a/code/public/downloads/ATAK_5.4.0.16.apk b/client/public/downloads/ATAK_5.4.0.16.apk old mode 100755 new mode 100644 similarity index 100% rename from code/public/downloads/ATAK_5.4.0.16.apk rename to client/public/downloads/ATAK_5.4.0.16.apk diff --git a/code/public/downloads/Element.apk b/client/public/downloads/Element.apk old mode 100755 new mode 100644 similarity index 100% rename from code/public/downloads/Element.apk rename to client/public/downloads/Element.apk diff --git a/code/public/downloads/Meshtastic_2.7.1.apk b/client/public/downloads/Meshtastic_2.7.1.apk old mode 100755 new mode 100644 similarity index 100% rename from code/public/downloads/Meshtastic_2.7.1.apk rename to client/public/downloads/Meshtastic_2.7.1.apk diff --git a/code/public/downloads/Remote Desktop 8_8.1.82.445.apk b/client/public/downloads/Remote Desktop 8_8.1.82.445.apk old mode 100755 new mode 100644 similarity index 100% rename from code/public/downloads/Remote Desktop 8_8.1.82.445.apk rename to client/public/downloads/Remote Desktop 8_8.1.82.445.apk diff --git a/code/public/downloads/SDRangel_7.21.3.1.apk b/client/public/downloads/SDRangel_7.21.3.1.apk old mode 100755 new mode 100644 similarity index 100% rename from code/public/downloads/SDRangel_7.21.3.1.apk rename to client/public/downloads/SDRangel_7.21.3.1.apk diff --git a/client/public/encryption.js b/client/public/encryption.js new file mode 100644 index 0000000..288eec1 --- /dev/null +++ b/client/public/encryption.js @@ -0,0 +1,113 @@ +// encryption.js + +// Phonetic alphabet for table names +const PHONETIC = ['Alpha', 'Bravo', 'Charlie', 'Delta', 'Echo', 'Foxtrot', 'Golf', 'Hotel', + 'India', 'Juliet', 'Kilo', 'Lima', 'Mike', 'November', 'Oscar', 'Papa', + 'Quebec', 'Romeo', 'Sierra', 'Tango', 'Uniform', 'Victor', 'Whiskey', + 'Xray', 'Yankee', 'Zulu']; + +const CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; +const LETTERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; + +// Seeded RNG using SHA256 +class SeededRandom { + constructor(seed) { + this.seed = seed; + this.counter = 0; + } + + next() { + const hash = CryptoJS.SHA256(this.seed + ':' + this.counter); + this.counter++; + const hex = hash.toString(CryptoJS.enc.Hex); + return parseInt(hex.substring(0, 8), 16) / 0xFFFFFFFF; + } + + nextInt(min, max) { + return Math.floor(this.next() * (max - min)) + min; + } + + choice(arr) { + return arr[this.nextInt(0, arr.length)]; + } +} + +// HOTP Generation - 3 digit nonce -> 3 letter code +function generateHOTP(secret, nonce) { + const rng = new SeededRandom(secret + ':hotp:' + nonce); + let code = ''; + for (let i = 0; i < 3; i++) { + code += rng.choice(LETTERS.split('')); + } + return code; +} + +// Auth Tables +function generateAuthTable(seed, tableIndex) { + const rng = new SeededRandom(seed + ':table:' + tableIndex); + const rows = 'NOPQRSTUVWXYZ'.split(''); + const cols = 'ABCDEFGHIJKLM'.split(''); + + const table = []; + for (let row of rows) { + const rowData = []; + for (let col of cols) { + rowData.push(rng.choice(CHARS.split(''))); + } + table.push(rowData); + } + + return table; +} + +// One-Time Pad (for encode/decode) +function generatePad(seed, padKey, length = 60) { + const rng = new SeededRandom(seed + ':pad:' + padKey); + const pad = []; + for (let i = 0; i < length; i++) { + pad.push(rng.nextInt(0, 256)); + } + return pad; +} + +function generatePadDisplay(seed, padKey) { + const rng = new SeededRandom(seed + ':pad:' + padKey); + const groups = []; + for (let i = 0; i < 12; i++) { + const num = rng.nextInt(0, 100000).toString().padStart(5, '0'); + groups.push(num); + } + return groups.join(' '); +} + +function encodeMessage(message, key, padKey, useStream = true) { + const messageBytes = new TextEncoder().encode(message); + const padLength = useStream ? messageBytes.length : 60; + const pad = generatePad(key, padKey, padLength); + + const encoded = []; + for (let i = 0; i < messageBytes.length; i++) { + const padByte = pad[i % pad.length]; + encoded.push(messageBytes[i] ^ padByte); + } + + return Array.from(encoded).map(b => b.toString(16).padStart(2, '0')).join(''); +} + +function decodeMessage(encoded, key, padKey, useStream = true) { + const bytes = []; + for (let i = 0; i < encoded.length; i += 2) { + bytes.push(parseInt(encoded.substr(i, 2), 16)); + } + + const padLength = useStream ? bytes.length : 60; + const pad = generatePad(key, padKey, padLength); + + const decoded = []; + for (let i = 0; i < bytes.length; i++) { + const padByte = pad[i % pad.length]; + decoded.push(bytes[i] ^ padByte); + } + + return new TextDecoder().decode(new Uint8Array(decoded)); +} diff --git a/code/public/favicon.png b/client/public/favicon.png old mode 100755 new mode 100644 similarity index 100% rename from code/public/favicon.png rename to client/public/favicon.png diff --git a/client/public/icons/cog.svg b/client/public/icons/cog.svg new file mode 100644 index 0000000..d8bf436 --- /dev/null +++ b/client/public/icons/cog.svg @@ -0,0 +1 @@ + diff --git a/client/public/icons/download.svg b/client/public/icons/download.svg new file mode 100644 index 0000000..7077ced --- /dev/null +++ b/client/public/icons/download.svg @@ -0,0 +1 @@ + diff --git a/client/public/icons/guage.svg b/client/public/icons/guage.svg new file mode 100644 index 0000000..9137cff --- /dev/null +++ b/client/public/icons/guage.svg @@ -0,0 +1 @@ + diff --git a/client/public/icons/open-sight.png b/client/public/icons/open-sight.png new file mode 100644 index 0000000000000000000000000000000000000000..63671a76ec0fce209203a1f2b7da9888e65334de GIT binary patch literal 25596 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 - - - MRS Dashboard - - - - - - - -
-
-
- Logo -
- -
Hostname
-
-
-
-
-
-
Local
-
00:00:00
-
Jan 1, 2025
-
-
-
Zulu / UTC
-
00:00:00
-
Jan 1, 2025
-
-
-
-
-
-
- - - - - - - - - - - - - - - -
-
- - - - - -
-
- - - - - - - - - - - - - - - - -
-
- - - - - - -
-
- - - - -
-
- - - -
-
-
-
- -
-
-
-
- - - - - - - - -
System ?°C
-
-
-
-
CPU - Load
-
-
-
0%
-
-
-
-
Memory
-
-
-
0%
-
-
-
-
Disk
-
-
-
0%
-
-
-
-
- -
-
- - - - - - - - - - - - - - - -
GPS
-
-
-
39.2000, -49.0000
-
No Fix
-
-
- -
-
- - - - - -
LoRa
-
-
-
0 / 0 Online
-
Ch 0% Air 0%
-
-
- -
-
- - - - - - - - - - - - - - - - -
Mesh
-
-
-
Connected
-
900 Mhz -45 dBm
-
-
- -
-
- - - - - - -
WiFi
-
-
-
Access Point
-
SSID: Hostname
-
-
- -
-
- - - - -
Ethernet
-
-
-
Disconnected
-
No cable detected
-
-
- -
-
-
- -
-
- - - - - -
- - -
- - - - + + + + MRS Dashboard + + + + + + + +
+
+
+ Logo +
+ +
Hostname
+
+
+
+
+
+
Local
+
00:00:00
+
Jan 1, 2025
+
+
+
Zulu / UTC
+
00:00:00
+
Jan 1, 2025
+
+
+
+
+
+
+ + + + + + + + + + + + + + + +
+
+ + + + + +
+
+ + + + + + + + + + + + + + + + +
+
+ + + + + + +
+
+ + + + +
+
+ + + +
+
+
+
+ +
+
+
+
+ + + + + + + + +
System ?°C
+
+
+
+
CPU - Load
+
+
+
0%
+
+
+
+
Memory
+
+
+
0%
+
+
+
+
Disk
+
+
+
0%
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + +
GPS
+
+
+
39.2000, -49.0000
+
No Fix
+
+
+ +
+
+ + + + + +
LoRa
+
+
+
0 / 0 Online
+
Ch 0% Air 0%
+
+
+ +
+
+ + + + + + + + + + + + + + + + +
Mesh
+
+
+
Connected
+
900 Mhz -45 dBm
+
+
+ +
+
+ + + + + + +
WiFi
+
+
+
Access Point
+
SSID: Hostname
+
+
+ +
+
+ + + + +
Ethernet
+
+
+
Disconnected
+
No cable detected
+
+
+ +
+
+
+ +
+
+ + + + + +
+ + +
+ + + + diff --git a/code/public/index.js b/client/public/index.js old mode 100755 new mode 100644 similarity index 97% rename from code/public/index.js rename to client/public/index.js index d07c59d..949deb0 --- a/code/public/index.js +++ b/client/public/index.js @@ -1,368 +1,374 @@ - -class Dashboard { - constructor() { - this.statusCache = null; - this.lastFetch = 0; - this.hostname = 'localhost'; - this.serverTimeOffset = null; // Track difference between server and client time - this.isTimeServerSynced = false; // Track if we're using server time - this.init(); - } - - async init() { - await this.fetchHostname(); - this.updateHostname(); - this.startTimeUpdates(); // Start with client time immediately - this.startStatusUpdates(); - this.initializeEventListeners(); - } - - async fetchHostname() { - try { - const response = await fetch('/api/hostname'); - const data = await response.json(); - this.hostname = data.hostname.toLowerCase(); - } catch (error) { - console.warn('Failed to fetch hostname:', error); - } - } - - updateHostname() { - const hostnameElement = document.querySelector('.hostname'); - if (hostnameElement) { - hostnameElement.textContent = this.hostname; - } - } - - async fetchStatus() { - try { - // Record start time for latency calculation - const requestStart = performance.now(); - const response = await fetch('/api/status'); - const requestEnd = performance.now(); - - if (!response.ok) throw new Error('Status fetch failed'); - - const status = await response.json(); - this.statusCache = status; - this.updateUI(status, requestStart, requestEnd); - } catch (error) { - console.error('Failed to fetch status:', error); - this.showOfflineStatus(); - } - } - - updateUI(status, requestStart, requestEnd) { - this.updateSystemMetrics(status.system); - this.updateGPSStatus(status.gps); - this.updateNetworkStatus(status.network); - this.updateLoRaStatus(status.lora); - this.updateTimeSync(status.time, requestStart, requestEnd); - } - - updateSystemMetrics(system) { - // Update temperature - const tempElement = document.getElementById('temp'); - if (tempElement && system.temperature) { - tempElement.textContent = `${system.temperature}°C`; - } - - // Update load average - const loadElement = document.getElementById('load'); - if (loadElement && system.load !== undefined) { - loadElement.textContent = `${system.load.toFixed(1)} Load`; - } - - // Update progress bars - this.updateProgressBar('cpu-usage', system.cpu); - this.updateProgressBar('memory-usage', system.memory); - this.updateProgressBar('disk-usage', system.storage); - } - - updateProgressBar(id, percentage) { - const fillElement = document.getElementById(`${id}-fill`); - const textElement = document.getElementById(`${id}-text`); - - if (fillElement && textElement) { - const value = Math.round(percentage); - fillElement.style.width = `${value}%`; - textElement.textContent = `${value}%`; - - // Update color based on usage - if (value > 80) { - fillElement.style.background = '#ef4444'; // Red - } else if (value > 60) { - fillElement.style.background = '#f59e0b'; // Orange - } else { - fillElement.style.background = '#10b981'; // Green - } - } - } - - updateGPSStatus(gps) { - const gpsStatus = document.getElementById('gps-status'); - const gpsTile = document.getElementById('gps-tile'); - - if (gpsStatus && gpsTile) { - const hasValidFix = gps.fix !== 'No Fix' && gps.latitude !== null; - - // Update status indicator - if (hasValidFix) { - gpsStatus.classList.remove('disconnected'); - gpsStatus.classList.add('connected'); - gpsTile.classList.remove('disconnected'); - gpsTile.classList.add('connected'); - } else { - gpsStatus.classList.remove('connected'); - gpsStatus.classList.add('disconnected'); - gpsTile.classList.remove('connected'); - gpsTile.classList.add('disconnected'); - } - - // Update GPS tile info - const gpsInfo = gpsTile.querySelector('.tile-info'); - const gpsDetail = gpsTile.querySelector('.tile-detail'); - - if (gpsInfo && gpsDetail) { - if (hasValidFix) { - gpsInfo.textContent = `${gps.latitude.toFixed(4)}, ${gps.longitude.toFixed(4)}`; - gpsDetail.textContent = `${gps.fix} • ${gps.satellites} sats • Alt: ${Math.round(gps.altitude)}m`; - } else { - gpsInfo.textContent = gps.satellites > 0 ? 'Acquiring Fix...' : 'No Signal'; - gpsDetail.textContent = `${gps.satellites} satellites`; - } - } - } - } - - updateNetworkStatus(network) { - // Update WiFi status - const wifiTile = document.getElementById('wifi-tile'); - if (wifiTile) { - const wifiInfo = wifiTile.querySelector('.tile-info'); - const wifiDetail = wifiTile.querySelector('.tile-detail'); - - if (wifiInfo && wifiDetail) { - if (network.wifi.mode === 'ap') { - wifiInfo.textContent = 'Access Point'; - wifiDetail.textContent = `SSID: ${network.wifi.ssid}`; - } else { - wifiInfo.textContent = 'Client Mode'; - wifiDetail.textContent = `SSID: ${network.wifi.ssid}`; - } - } - } - - // Update Ethernet status - const ethernetStatus = document.getElementById('ethernet-status'); - const ethernetTile = document.getElementById('ethernet-tile'); - - if (ethernetStatus && ethernetTile) { - if (network.ethernet.connected) { - ethernetStatus.classList.remove('disconnected'); - ethernetStatus.classList.add('connected'); - ethernetTile.classList.remove('disconnected'); - ethernetTile.classList.add('connected'); - - const ethernetInfo = ethernetTile.querySelector('.tile-info'); - const ethernetDetail = ethernetTile.querySelector('.tile-detail'); - if (ethernetInfo && ethernetDetail) { - ethernetInfo.textContent = 'Connected'; - ethernetDetail.textContent = 'Link detected'; - } - } else { - ethernetStatus.classList.remove('connected'); - ethernetStatus.classList.add('disconnected'); - ethernetTile.classList.remove('connected'); - ethernetTile.classList.add('disconnected'); - - const ethernetInfo = ethernetTile.querySelector('.tile-info'); - const ethernetDetail = ethernetTile.querySelector('.tile-detail'); - if (ethernetInfo && ethernetDetail) { - ethernetInfo.textContent = 'Disconnected'; - ethernetDetail.textContent = 'No cable detected'; - } - } - } - } - - updateLoRaStatus(lora) { - const loraStatus = document.getElementById('lora-status'); - const loraTile = document.getElementById('lora-tile'); - - if (loraStatus && loraTile) { - if (lora.connected) { - loraStatus.classList.remove('disconnected'); - loraStatus.classList.add('connected'); - loraTile.classList.remove('disconnected'); - loraTile.classList.add('connected'); - - const loraInfo = loraTile.querySelector('.tile-info'); - const loraDetail = loraTile.querySelector('.tile-detail'); - - if (loraInfo && loraDetail) { - loraInfo.textContent = `${lora.onlineNodes}/${lora.totalNodes} Online`; - loraDetail.textContent = `CH: ${lora.channelUtilization.toFixed(1)}% • Air: ${lora.airtimeUtilization.toFixed(1)}%`; - } - } else { - loraStatus.classList.remove('connected'); - loraStatus.classList.add('disconnected'); - loraTile.classList.remove('connected'); - loraTile.classList.add('disconnected'); - - const loraInfo = loraTile.querySelector('.tile-info'); - const loraDetail = loraTile.querySelector('.tile-detail'); - - if (loraInfo && loraDetail) { - loraInfo.textContent = 'Disconnected'; - loraDetail.textContent = 'No device found'; - } - } - } - } - - updateTimeSync(serverTimeString, requestStart, requestEnd) { - if (serverTimeString && requestStart && requestEnd) { - // Calculate network latency (round-trip time / 2) - const networkLatency = (requestEnd - requestStart) / 2; - - // Parse server time and adjust for network latency - const serverTime = new Date(serverTimeString); - const adjustedServerTime = new Date(serverTime.getTime() + networkLatency); - - // Calculate the offset between adjusted server time and client time - const clientTime = new Date(); - this.serverTimeOffset = adjustedServerTime.getTime() - clientTime.getTime(); - this.isTimeServerSynced = true; - - console.log(`Time synchronized with server (latency: ${networkLatency.toFixed(1)}ms, offset: ${this.serverTimeOffset.toFixed(1)}ms)`); - } - - // Update time displays - this.updateCurrentTime(); - } - - updateCurrentTime() { - const now = new Date(); - let displayTime; - - if (this.isTimeServerSynced && this.serverTimeOffset !== null) { - // Use server-synchronized time - displayTime = new Date(now.getTime() + this.serverTimeOffset); - } else { - // Use client time (default) - displayTime = now; - } - - this.updateTimeDisplay('local', displayTime, false); - this.updateTimeDisplay('zulu', displayTime, true); - } - - updateTimeDisplay(type, date, isUtc) { - const timeElement = document.getElementById(`${type}-time`); - const dateElement = document.getElementById(`${type}-date`); - - if (timeElement && dateElement) { - const displayDate = isUtc ? new Date(date.getTime()) : date; - - const timeStr = isUtc ? - displayDate.toUTCString().split(' ')[4] : - displayDate.toLocaleTimeString(); - - const dateStr = isUtc ? - displayDate.toUTCString().split(' ').slice(0, 4).join(' ') : - displayDate.toLocaleDateString('en-US', { - month: 'short', - day: 'numeric', - year: 'numeric' - }); - - timeElement.textContent = timeStr; - dateElement.textContent = dateStr; - - // Color time orange when using client time, white when server-synced - if (this.isTimeServerSynced) { - timeElement.style.color = '#fff'; - dateElement.style.color = '#64748b'; - } else { - timeElement.style.color = '#f59e0b'; - dateElement.style.color = '#f59e0b'; - } - } - } - - showOfflineStatus() { - // Reset to client time and show orange color - this.serverTimeOffset = null; - this.isTimeServerSynced = false; - console.warn('System appears offline - falling back to client time'); - } - - startStatusUpdates() { - // Initial fetch - this.fetchStatus(); - - // Update every 60 seconds - setInterval(() => { - this.fetchStatus(); - }, 60000); - } - - startTimeUpdates() { - // Start immediately with client time - this.updateCurrentTime(); - - // Update time every second - setInterval(() => { - this.updateCurrentTime(); - }, 1000); - } - - initializeEventListeners() { - // Expand/collapse status - const expandToggle = document.getElementById('expand-toggle'); - const expandedStatus = document.getElementById('expanded-status'); - const expandIcon = document.getElementById('expand-icon'); - - if (expandToggle && expandedStatus && expandIcon) { - expandToggle.addEventListener('click', () => { - expandedStatus.classList.toggle('visible'); - expandIcon.classList.toggle('expanded'); - }); - } - - // Search functionality - const searchInput = document.getElementById('search-input'); - const appsGrid = document.getElementById('apps-grid'); - - if (searchInput && appsGrid) { - searchInput.addEventListener('input', (e) => { - const query = e.target.value.toLowerCase(); - const apps = appsGrid.querySelectorAll('.app-item'); - - apps.forEach(app => { - const name = app.getAttribute('data-name')?.toLowerCase() || ''; - app.style.display = name.includes(query) ? 'flex' : 'none'; - }); - }); - } - } -} - -function openKiwixm(event) { - event.stopPropagation(); - event.preventDefault(); - window.location.href = window.location.origin.replace(/:\d+/g, '') + ':1300/admin'; -} - -// Initialize dashboard when DOM is ready -document.addEventListener('DOMContentLoaded', () => { - new Dashboard(); - - document.querySelectorAll('.app-item[href^=":"]').forEach(link => { - const port = link.getAttribute('href').substring(1); // Remove the ':' - const url = new URL(location.origin); - url.port = port; - link.href = url.toString(); - }); -}); + +class Dashboard { + constructor() { + this.statusCache = null; + this.lastFetch = 0; + this.hostname = 'localhost'; + this.serverTimeOffset = null; // Track difference between server and client time + this.isTimeServerSynced = false; // Track if we're using server time + this.init(); + } + + async init() { + await this.fetchHostname(); + this.updateHostname(); + this.startTimeUpdates(); // Start with client time immediately + this.startStatusUpdates(); + this.initializeEventListeners(); + } + + async fetchHostname() { + try { + const response = await fetch('/api/hostname'); + const data = await response.json(); + this.hostname = data.hostname.toLowerCase(); + } catch (error) { + console.warn('Failed to fetch hostname:', error); + } + } + + updateHostname() { + const hostnameElement = document.querySelector('.hostname'); + if (hostnameElement) { + hostnameElement.textContent = this.hostname; + } + } + + async fetchStatus() { + try { + // Record start time for latency calculation + const requestStart = performance.now(); + const response = await fetch('/api/status'); + const requestEnd = performance.now(); + + if (!response.ok) throw new Error('Status fetch failed'); + + const status = await response.json(); + this.statusCache = status; + this.updateUI(status, requestStart, requestEnd); + } catch (error) { + console.error('Failed to fetch status:', error); + this.showOfflineStatus(); + } + } + + updateUI(status, requestStart, requestEnd) { + this.updateSystemMetrics(status.system); + this.updateGPSStatus(status.gps); + this.updateNetworkStatus(status.network); + this.updateLoRaStatus(status.lora); + this.updateTimeSync(status.time, requestStart, requestEnd); + } + + updateSystemMetrics(system) { + // Update temperature + const tempElement = document.getElementById('temp'); + if (tempElement && system.temperature) { + tempElement.textContent = `${system.temperature}°C`; + } + + // Update load average + const loadElement = document.getElementById('load'); + if (loadElement && system.load !== undefined) { + loadElement.textContent = `${system.load.toFixed(1)} Load`; + } + + // Update progress bars + this.updateProgressBar('cpu-usage', system.cpu); + this.updateProgressBar('memory-usage', system.memory); + this.updateProgressBar('disk-usage', system.storage); + } + + updateProgressBar(id, percentage) { + const fillElement = document.getElementById(`${id}-fill`); + const textElement = document.getElementById(`${id}-text`); + + if (fillElement && textElement) { + const value = Math.round(percentage); + fillElement.style.width = `${value}%`; + textElement.textContent = `${value}%`; + + // Update color based on usage + if (value > 80) { + fillElement.style.background = '#ef4444'; // Red + } else if (value > 60) { + fillElement.style.background = '#f59e0b'; // Orange + } else { + fillElement.style.background = '#10b981'; // Green + } + } + } + + updateGPSStatus(gps) { + const gpsStatus = document.getElementById('gps-status'); + const gpsTile = document.getElementById('gps-tile'); + + if (gpsStatus && gpsTile) { + const hasValidFix = gps.fix !== 'No Fix' && gps.latitude !== null; + + // Update status indicator + if (hasValidFix) { + gpsStatus.classList.remove('disconnected'); + gpsStatus.classList.add('connected'); + gpsTile.classList.remove('disconnected'); + gpsTile.classList.add('connected'); + } else { + gpsStatus.classList.remove('connected'); + gpsStatus.classList.add('disconnected'); + gpsTile.classList.remove('connected'); + gpsTile.classList.add('disconnected'); + } + + // Update GPS tile info + const gpsInfo = gpsTile.querySelector('.tile-info'); + const gpsDetail = gpsTile.querySelector('.tile-detail'); + + if (gpsInfo && gpsDetail) { + if (hasValidFix) { + gpsInfo.textContent = `${gps.latitude.toFixed(4)}, ${gps.longitude.toFixed(4)}`; + gpsDetail.textContent = `${gps.fix} • ${gps.satellites} sats • Alt: ${Math.round(gps.altitude)}m`; + } else { + gpsInfo.textContent = gps.satellites > 0 ? 'Acquiring Fix...' : 'No Signal'; + gpsDetail.textContent = `${gps.satellites} satellites`; + } + } + } + } + + updateNetworkStatus(network) { + // Update WiFi status + const wifiTile = document.getElementById('wifi-tile'); + if (wifiTile) { + const wifiInfo = wifiTile.querySelector('.tile-info'); + const wifiDetail = wifiTile.querySelector('.tile-detail'); + + if (wifiInfo && wifiDetail) { + if (network.wifi.mode === 'ap') { + wifiInfo.textContent = 'Access Point'; + wifiDetail.textContent = `SSID: ${network.wifi.ssid}`; + } else { + wifiInfo.textContent = 'Client Mode'; + wifiDetail.textContent = `SSID: ${network.wifi.ssid}`; + } + } + } + + // Update Ethernet status + const ethernetStatus = document.getElementById('ethernet-status'); + const ethernetTile = document.getElementById('ethernet-tile'); + + if (ethernetStatus && ethernetTile) { + if (network.ethernet.connected) { + ethernetStatus.classList.remove('disconnected'); + ethernetStatus.classList.add('connected'); + ethernetTile.classList.remove('disconnected'); + ethernetTile.classList.add('connected'); + + const ethernetInfo = ethernetTile.querySelector('.tile-info'); + const ethernetDetail = ethernetTile.querySelector('.tile-detail'); + if (ethernetInfo && ethernetDetail) { + ethernetInfo.textContent = 'Connected'; + ethernetDetail.textContent = 'Link detected'; + } + } else { + ethernetStatus.classList.remove('connected'); + ethernetStatus.classList.add('disconnected'); + ethernetTile.classList.remove('connected'); + ethernetTile.classList.add('disconnected'); + + const ethernetInfo = ethernetTile.querySelector('.tile-info'); + const ethernetDetail = ethernetTile.querySelector('.tile-detail'); + if (ethernetInfo && ethernetDetail) { + ethernetInfo.textContent = 'Disconnected'; + ethernetDetail.textContent = 'No cable detected'; + } + } + } + } + + updateLoRaStatus(lora) { + const loraStatus = document.getElementById('lora-status'); + const loraTile = document.getElementById('lora-tile'); + + if (loraStatus && loraTile) { + if (lora.connected) { + loraStatus.classList.remove('disconnected'); + loraStatus.classList.add('connected'); + loraTile.classList.remove('disconnected'); + loraTile.classList.add('connected'); + + const loraInfo = loraTile.querySelector('.tile-info'); + const loraDetail = loraTile.querySelector('.tile-detail'); + + if (loraInfo && loraDetail) { + loraInfo.textContent = `${lora.onlineNodes}/${lora.totalNodes} Online`; + loraDetail.textContent = `CH: ${lora.channelUtilization.toFixed(1)}% • Air: ${lora.airtimeUtilization.toFixed(1)}%`; + } + } else { + loraStatus.classList.remove('connected'); + loraStatus.classList.add('disconnected'); + loraTile.classList.remove('connected'); + loraTile.classList.add('disconnected'); + + const loraInfo = loraTile.querySelector('.tile-info'); + const loraDetail = loraTile.querySelector('.tile-detail'); + + if (loraInfo && loraDetail) { + loraInfo.textContent = 'Disconnected'; + loraDetail.textContent = 'No device found'; + } + } + } + } + + updateTimeSync(serverTimeString, requestStart, requestEnd) { + if (serverTimeString && requestStart && requestEnd) { + // Calculate network latency (round-trip time / 2) + const networkLatency = (requestEnd - requestStart) / 2; + + // Parse server time and adjust for network latency + const serverTime = new Date(serverTimeString); + const adjustedServerTime = new Date(serverTime.getTime() + networkLatency); + + // Calculate the offset between adjusted server time and client time + const clientTime = new Date(); + this.serverTimeOffset = adjustedServerTime.getTime() - clientTime.getTime(); + this.isTimeServerSynced = true; + + console.log(`Time synchronized with server (latency: ${networkLatency.toFixed(1)}ms, offset: ${this.serverTimeOffset.toFixed(1)}ms)`); + } + + // Update time displays + this.updateCurrentTime(); + } + + updateCurrentTime() { + const now = new Date(); + let displayTime; + + if (this.isTimeServerSynced && this.serverTimeOffset !== null) { + // Use server-synchronized time + displayTime = new Date(now.getTime() + this.serverTimeOffset); + } else { + // Use client time (default) + displayTime = now; + } + + this.updateTimeDisplay('local', displayTime, false); + this.updateTimeDisplay('zulu', displayTime, true); + } + + updateTimeDisplay(type, date, isUtc) { + const timeElement = document.getElementById(`${type}-time`); + const dateElement = document.getElementById(`${type}-date`); + + if (timeElement && dateElement) { + const displayDate = isUtc ? new Date(date.getTime()) : date; + + const timeStr = isUtc ? + displayDate.toUTCString().split(' ')[4] : + displayDate.toLocaleTimeString(); + + const dateStr = isUtc ? + displayDate.toUTCString().split(' ').slice(0, 4).join(' ') : + displayDate.toLocaleDateString('en-US', { + month: 'short', + day: 'numeric', + year: 'numeric' + }); + + timeElement.textContent = timeStr; + dateElement.textContent = dateStr; + + // Color time orange when using client time, white when server-synced + if (this.isTimeServerSynced) { + timeElement.style.color = '#fff'; + dateElement.style.color = '#64748b'; + } else { + timeElement.style.color = '#f59e0b'; + dateElement.style.color = '#f59e0b'; + } + } + } + + showOfflineStatus() { + // Reset to client time and show orange color + this.serverTimeOffset = null; + this.isTimeServerSynced = false; + console.warn('System appears offline - falling back to client time'); + } + + startStatusUpdates() { + // Initial fetch + this.fetchStatus(); + + // Update every 60 seconds + setInterval(() => { + this.fetchStatus(); + }, 60000); + } + + startTimeUpdates() { + // Start immediately with client time + this.updateCurrentTime(); + + // Update time every second + setInterval(() => { + this.updateCurrentTime(); + }, 1000); + } + + initializeEventListeners() { + // Expand/collapse status + const expandToggle = document.getElementById('expand-toggle'); + const expandedStatus = document.getElementById('expanded-status'); + const expandIcon = document.getElementById('expand-icon'); + + if (expandToggle && expandedStatus && expandIcon) { + expandToggle.addEventListener('click', () => { + expandedStatus.classList.toggle('visible'); + expandIcon.classList.toggle('expanded'); + }); + } + + // Search functionality + const searchInput = document.getElementById('search-input'); + const appsGrid = document.getElementById('apps-grid'); + + if (searchInput && appsGrid) { + searchInput.addEventListener('input', (e) => { + const query = e.target.value.toLowerCase(); + const apps = appsGrid.querySelectorAll('.app-item'); + + apps.forEach(app => { + const name = app.getAttribute('data-name')?.toLowerCase() || ''; + app.style.display = name.includes(query) ? 'flex' : 'none'; + }); + }); + } + } +} + +function saveCodeBook() { + event.stopPropagation(); + event.preventDefault(); + window.location.href = '/code-book-print.html'; +} + +function openKiwixm(event) { + event.stopPropagation(); + event.preventDefault(); + window.location.href = window.location.origin.replace(/:\d+/g, '') + ':1400/admin'; +} + +// Initialize dashboard when DOM is ready +document.addEventListener('DOMContentLoaded', () => { + new Dashboard(); + + document.querySelectorAll('.app-item[href^=":"]').forEach(link => { + const port = link.getAttribute('href').substring(1); // Remove the ':' + const url = new URL(location.origin); + url.port = port; + link.href = url.toString(); + }); +}); diff --git a/public/manifest.json b/client/public/manifest.json old mode 100755 new mode 100644 similarity index 94% rename from public/manifest.json rename to client/public/manifest.json index 7b9f337..18263a2 --- a/public/manifest.json +++ b/client/public/manifest.json @@ -1,19 +1,19 @@ -{ - "name": "MRS", - "short_name": "MRS", - "description": "Multipurpose Radio Server", - "start_url": "/", - "display": "standalone", - "background_color": "#000000", - "theme_color": "#000000", - "orientation": "portrait-primary", - "icons": [ - { - "src": "/favicon.png", - "sizes": "512x512", - "type": "image/png" - } - ], - "lang": "en-US", - "scope": "/" -} +{ + "name": "MRS", + "short_name": "MRS", + "description": "Multipurpose Radio Server", + "start_url": "/", + "display": "standalone", + "background_color": "#000000", + "theme_color": "#000000", + "orientation": "portrait-primary", + "icons": [ + { + "src": "/favicon.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "lang": "en-US", + "scope": "/" +} diff --git a/code/src/config.json b/client/src/config.json similarity index 100% rename from code/src/config.json rename to client/src/config.json diff --git a/code/src/main.mjs b/client/src/main.mjs old mode 100755 new mode 100644 similarity index 96% rename from code/src/main.mjs rename to client/src/main.mjs index ebecdb9..6877a30 --- a/code/src/main.mjs +++ b/client/src/main.mjs @@ -1,51 +1,51 @@ - -import express from "express"; -import { join } from 'path'; -import {environment} from './services/environment.mjs'; -import { statusRouter } from './services/status.mjs'; - -(async () => { - const app = express(); - - // Middleware - app.use(express.json()); - app.use((err, req, res, next) => { - console.error('Middleware error:', err); - res.status(500).json({ error: 'Internal server error' }); - }); - - // Routes - console.log(join(environment.root, '../public')); - app.use(express.static(join(environment.root, '../public'))); - - app.use('/api', statusRouter); - - // Error handler - app.use((err, req, res, next) => { - console.error('Unhandled error:', err); - res.status(500).json({ error: 'Internal server error' }); - }); - - // Startup - const server = app.listen(environment.port, () => { - console.log(`Dashboard running on http://localhost:${environment.port}`); - }).on('error', (err) => { - console.error('Server startup error:', err); - process.exit(1); - }); - - // Shutdown - const gracefulShutdown = (signal) => { - console.log(`Received ${signal}, shutting down gracefully`); - server.close((err) => { - if (err) { - console.error('Error during server shutdown:', err); - process.exit(1); - } - console.log('Server closed'); - process.exit(0); - }); - }; - process.on('SIGTERM', () => gracefulShutdown('SIGTERM')); - process.on('SIGINT', () => gracefulShutdown('SIGINT')); -})(); + +import express from "express"; +import { join } from 'path'; +import {environment} from './services/environment.mjs'; +import { statusRouter } from './services/status.mjs'; + +(async () => { + const app = express(); + + // Middleware + app.use(express.json()); + app.use((err, req, res, next) => { + console.error('Middleware error:', err); + res.status(500).json({ error: 'Internal server error' }); + }); + + // Routes + console.log(join(environment.root, '../public')); + app.use(express.static(join(environment.root, '../public'))); + + app.use('/api', statusRouter); + + // Error handler + app.use((err, req, res, next) => { + console.error('Unhandled error:', err); + res.status(500).json({ error: 'Internal server error' }); + }); + + // Startup + const server = app.listen(environment.port, () => { + console.log(`Dashboard running on http://localhost:${environment.port}`); + }).on('error', (err) => { + console.error('Server startup error:', err); + process.exit(1); + }); + + // Shutdown + const gracefulShutdown = (signal) => { + console.log(`Received ${signal}, shutting down gracefully`); + server.close((err) => { + if (err) { + console.error('Error during server shutdown:', err); + process.exit(1); + } + console.log('Server closed'); + process.exit(0); + }); + }; + process.on('SIGTERM', () => gracefulShutdown('SIGTERM')); + process.on('SIGINT', () => gracefulShutdown('SIGINT')); +})(); diff --git a/code/src/services/environment.mjs b/client/src/services/environment.mjs old mode 100755 new mode 100644 similarity index 96% rename from code/src/services/environment.mjs rename to client/src/services/environment.mjs index ca0ef1d..5a39e1c --- a/code/src/services/environment.mjs +++ b/client/src/services/environment.mjs @@ -1,38 +1,38 @@ -import dotenv from 'dotenv'; -import * as fs from 'node:fs'; -import { fileURLToPath } from 'url'; -import { dirname } from 'path'; -import { execSync } from "child_process"; - -dotenv.config(); - -export const environment = { - config: process.env.CONFIG || 'config.json', - hostname: process.env.HOSTNAME || execSync('hostname', { encoding: "utf-8" }) || 'localhost', - gpsd: process.env.GPSD || 2947, - port: process.env.PORT || 80, - root: dirname(dirname(fileURLToPath(import.meta.url))), - settings: {}, -} - -if(!environment.config.startsWith('/')) environment.config = `${environment.root}/${environment.config}`; - -export function loadSettings() { - if(!fs.existsSync(environment.config)) fs.writeFileSync(environment.config, '', { flag: 'a' }); - const value = fs.readFileSync(environment.config, 'utf-8'); - try { return JSON.parse(value); } - catch (e) { - return { - lora: { - mode: 'MESH', - telemetry: true, - } - }; - } -} - -export function saveSettings() { - fs.writeFileSync(environment.config, JSON.stringify(environment.settings, null, 4)); -} - -loadSettings(); +import dotenv from 'dotenv'; +import * as fs from 'node:fs'; +import { fileURLToPath } from 'url'; +import { dirname } from 'path'; +import { execSync } from "child_process"; + +dotenv.config(); + +export const environment = { + config: process.env.CONFIG || 'config.json', + hostname: process.env.HOSTNAME || execSync('hostname', { encoding: "utf-8" }) || 'localhost', + gpsd: process.env.GPSD || 2947, + port: process.env.PORT || 80, + root: dirname(dirname(fileURLToPath(import.meta.url))), + settings: {}, +} + +if(!environment.config.startsWith('/')) environment.config = `${environment.root}/${environment.config}`; + +export function loadSettings() { + if(!fs.existsSync(environment.config)) fs.writeFileSync(environment.config, '', { flag: 'a' }); + const value = fs.readFileSync(environment.config, 'utf-8'); + try { return JSON.parse(value); } + catch (e) { + return { + lora: { + mode: 'MESH', + telemetry: true, + } + }; + } +} + +export function saveSettings() { + fs.writeFileSync(environment.config, JSON.stringify(environment.settings, null, 4)); +} + +loadSettings(); diff --git a/src/services/status.mjs b/client/src/services/status.mjs old mode 100755 new mode 100644 similarity index 96% rename from src/services/status.mjs rename to client/src/services/status.mjs index 7d6f7ee..2fbb8c9 --- a/src/services/status.mjs +++ b/client/src/services/status.mjs @@ -1,426 +1,426 @@ - -import express from 'express'; -import { exec } from 'child_process'; -import { promisify } from 'util'; -import { readFileSync, existsSync } from 'fs'; -import pkg from 'node-gpsd'; -const { GPS } = pkg; -import {environment} from './environment.mjs'; - -const router = express.Router(); -const execAsync = promisify(exec); - -// Status cache with TTL -let statusCache = null; -let lastUpdate = 0; -const CACHE_TTL = 15 * 1000; // 15 seconds - -// GPS client setup -let gpsClient = null; -let gpsData = { - fix: 'No Fix', - latitude: null, - longitude: null, - altitude: null, - satellites: 0 -}; - -// Initialize GPS connection -async function initGPS() { - try { - gpsClient = new GPS({ hostname: 'localhost', port: 2947 }); - - gpsClient.on('TPV', (data) => { - gpsData.latitude = data.lat || null; - gpsData.longitude = data.lon || null; - gpsData.altitude = data.alt || null; - gpsData.fix = data.mode === 3 ? '3D Fix' : data.mode === 2 ? '2D Fix' : 'No Fix'; - }); - - gpsClient.on('SKY', (data) => { - gpsData.satellites = (data.satellites || []).length; - }); - - gpsClient.on('error', (err) => { - console.warn('GPS error:', err.message); - }); - - await gpsClient.watch(); - console.log('GPS client initialized'); - } catch (error) { - console.warn('GPS not available:', error.message); - } -} - -// CLI-based system information gathering -async function getSystemInfo() { - const info = { - temperature: 0, - load: 0, - cpu: 0, - memory: 0, - storage: 0 - }; - - try { - // CPU temperature (Raspberry Pi specific) - if (existsSync('/sys/class/thermal/thermal_zone0/temp')) { - const tempData = readFileSync('/sys/class/thermal/thermal_zone0/temp', 'utf8'); - info.temperature = Math.round(parseInt(tempData.trim()) / 1000); - } - - // Load average - const { stdout: loadAvg } = await execAsync("cat /proc/loadavg | awk '{print $1}'"); - info.load = parseFloat(loadAvg.trim()) || 0; - - // CPU usage - const { stdout: cpuUsage } = await execAsync("grep 'cpu ' /proc/stat | awk '{usage=($2+$4)*100/($2+$3+$4+$5)} END {print usage}'"); - info.cpu = parseFloat(cpuUsage.trim()) || 0; - - // Memory usage percentage - const { stdout: memUsage } = await execAsync("free | awk 'NR==2{printf \"%.1f\", $3*100/$2}'"); - info.memory = parseFloat(memUsage.trim()) || 0; - - // Disk usage percentage for root filesystem - const { stdout: diskUsage } = await execAsync("df / | awk 'NR==2{printf \"%.1f\", $5}' | sed 's/%//'"); - info.storage = parseFloat(diskUsage.trim()) || 0; - - } catch (error) { - console.warn('System info error:', error.message); - } - - return info; -} - -async function getGPSInfo() { - const gpsInfo = { - satellites: 0, - latitude: null, - longitude: null, - altitude: null - }; - - try { - // Check if gpsd is running - await execAsync('systemctl is-active gpsd'); - - // Try to get GPS data using gpspipe - const { stdout: gpsRaw } = await execAsync('timeout 3s gpspipe -w -n 5 | grep -E \'"class":"TPV"\' | head -1', { timeout: 4000 }); - - if (gpsRaw.trim()) { - const gpsJson = JSON.parse(gpsRaw.trim()); - gpsInfo.latitude = gpsJson.lat || null; - gpsInfo.longitude = gpsJson.lon || null; - gpsInfo.altitude = gpsJson.alt || null; - } - - // Get satellite count - try { - const { stdout: skyRaw } = await execAsync('timeout 2s gpspipe -w -n 3 | grep -E \'"class":"SKY"\' | head -1', { timeout: 3000 }); - if (skyRaw.trim()) { - const skyJson = JSON.parse(skyRaw.trim()); - gpsInfo.satellites = (skyJson.satellites || []).length; - } - } catch (skyError) { } - } catch (error) { - console.warn('GPS info error:', error.message); - // Use cached GPS data from node-gpsd if available - if (gpsData.latitude !== null) { - return gpsData; - } - } - - return gpsInfo; -} - -async function getNetworkInfo() { - const networkInfo = { - wifi: { - mode: 'client', - ssid: 'Unknown' - }, - ethernet: { - connected: false - } - }; - - try { - // Check if hostapd is running (AP mode) - try { - await execAsync('systemctl is-active hostapd'); - networkInfo.wifi.mode = 'ap'; - - // Get AP SSID from hostapd config or use hostname - try { - const { stdout: hostname } = await execAsync('hostname'); - networkInfo.wifi.ssid = process.env.AP_SSID || hostname.trim(); - } catch { - networkInfo.wifi.ssid = 'MRS-AP'; - } - } catch { - // Not in AP mode, check if connected to WiFi - try { - // First, try iwconfig directly since it's more reliable for ESSID - const { stdout: iwconfig } = await execAsync("iwconfig wlan0 2>/dev/null"); - const essidMatch = iwconfig.match(/ESSID:"([^"]+)"/); - - if (essidMatch && essidMatch[1] && essidMatch[1] !== 'off/any') { - networkInfo.wifi.mode = 'client'; - networkInfo.wifi.ssid = essidMatch[1]; - } else { - // Fallback to nmcli if iwconfig doesn't work - try { - const { stdout: activeWifi } = await execAsync("nmcli -t -f NAME,TYPE,DEVICE connection show --active | grep -E '(wifi|802-11-wireless)' | cut -d':' -f1 | head -1"); - if (activeWifi.trim()) { - networkInfo.wifi.mode = 'client'; - networkInfo.wifi.ssid = activeWifi.trim(); - } else { - // Try getting SSID from currently connected interface - const { stdout: connectedSSID } = await execAsync("nmcli -t -f active,ssid dev wifi | grep '^yes' | cut -d':' -f2 | head -1"); - if (connectedSSID.trim()) { - networkInfo.wifi.mode = 'client'; - networkInfo.wifi.ssid = connectedSSID.trim(); - } else { - throw new Error('No active WiFi connection found'); - } - } - } catch { - // Final fallback: check if wlan0 interface is up and get info via ip - const { stdout: wlanStatus } = await execAsync("ip addr show wlan0 2>/dev/null | grep 'inet ' | wc -l"); - if (parseInt(wlanStatus.trim()) > 0) { - // Interface has IP but we can't determine SSID - networkInfo.wifi.mode = 'client'; - networkInfo.wifi.ssid = 'Connected (Unknown SSID)'; - } else { - networkInfo.wifi.mode = 'disconnected'; - networkInfo.wifi.ssid = 'Not Connected'; - } - } - } - } catch (error) { - console.warn('WiFi detection error:', error.message); - networkInfo.wifi.mode = 'disconnected'; - networkInfo.wifi.ssid = 'Not Connected'; - } - } - - // Check Ethernet status - try { - const { stdout: ethStatus } = await execAsync("ip link show eth0 | grep 'state UP'"); - networkInfo.ethernet.connected = ethStatus.includes('state UP'); - } catch { - networkInfo.ethernet.connected = false; - } - - } catch (error) { - console.warn('Network info error:', error.message); - } - - return networkInfo; -} - -let loraInfo = null; -async function getLoRaInfo() { - if(loraInfo) return loraInfo; - - loraInfo = { - connected: false, - onlineNodes: 0, - totalNodes: 0, - channelUtilization: 0, - airtimeUtilization: 0 - }; - - try { - console.log('Getting LoRa/Meshtastic status...'); - - // Get node information first - const { stdout: nodeList } = await execAsync('timeout 10s meshtastic --nodes 2>/dev/null', { timeout: 15000 }); - - if (nodeList && nodeList.trim()) { - loraInfo.connected = true; - - // Parse node list - look for actual node entries - const lines = nodeList.split('\n'); - let totalNodes = 0; - let onlineNodes = 0; - - for (const line of lines) { - const trimmedLine = line.trim(); - - // Skip header lines and separators - if (trimmedLine.includes('│') && - !trimmedLine.includes('User') && - !trimmedLine.includes('───') && - !trimmedLine.includes('Node') && - trimmedLine.length > 10) { - - totalNodes++; - - // Check if node is online (has recent lastHeard or SNR data) - if (trimmedLine.includes('SNR') || - trimmedLine.match(/\d+[smh]/) || // Time indicators like 5m, 2h, 30s - trimmedLine.includes('now')) { - onlineNodes++; - } - } - } - - loraInfo.totalNodes = totalNodes; - loraInfo.onlineNodes = onlineNodes; - } - - // Get channel and airtime utilization from --info - try { - const { stdout: meshInfo } = await execAsync('timeout 10s meshtastic --info 2>/dev/null', { timeout: 15000 }); - - if (meshInfo && meshInfo.trim()) { - const lines = meshInfo.split('\n'); - - for (const line of lines) { - const trimmedLine = line.trim(); - - // Look for channel utilization (various formats) - if (trimmedLine.includes('channelUtilization') || trimmedLine.includes('Channel utilization')) { - const channelMatch = trimmedLine.match(/([\d.]+)%?/) || trimmedLine.match(/:\s*([\d.]+)/); - if (channelMatch) { - loraInfo.channelUtilization = parseFloat(channelMatch[1]); - } - } - - // Look for airtime utilization (various formats) - if (trimmedLine.includes('airUtilTx') || trimmedLine.includes('Air time') || trimmedLine.includes('Airtime')) { - const airtimeMatch = trimmedLine.match(/([\d.]+)%?/) || trimmedLine.match(/:\s*([\d.]+)/); - if (airtimeMatch) { - loraInfo.airtimeUtilization = parseFloat(airtimeMatch[1]); - } - } - } - } - } catch (infoError) { - console.warn('Failed to get mesh info:', infoError.message); - } - - } catch (error) { - console.warn('LoRa info error:', error.message); - loraInfo.connected = false; - } - - setTimeout(() => loraInfo = null, 60000) - return loraInfo; -} - -// Main status generation function - matches frontend expectations -async function generateStatus() { - try { - console.log('Generating fresh status...'); - - const [systemInfo, gpsInfo, networkInfo, loraInfo] = await Promise.all([ - getSystemInfo(), - getGPSInfo(), - getNetworkInfo(), - getLoRaInfo() - ]); - - // Format exactly as the frontend expects - const status = { - system: { - temperature: systemInfo.temperature, - load: systemInfo.load, - cpu: systemInfo.cpu, - memory: systemInfo.memory, - storage: systemInfo.storage - }, - gps: { - fix: gpsInfo.fix, - satellites: gpsInfo.satellites, - latitude: gpsInfo.latitude, - longitude: gpsInfo.longitude, - altitude: gpsInfo.altitude - }, - network: { - wifi: networkInfo.wifi, - ethernet: networkInfo.ethernet - }, - lora: loraInfo, - time: new Date().toISOString() - }; - - return status; - } catch (error) { - console.error('Status generation error:', error); - throw error; - } -} - -router.get('/hostname', (req, res) => res.json({ hostname: environment.hostname })); - -// Main status endpoint that matches frontend expectations -router.get('/status', async (req, res) => { - try { - const now = Date.now(); - - // Return cached status if within TTL - if (statusCache && (now - lastUpdate) < CACHE_TTL) { - console.log('Returning cached status'); - return res.json(statusCache); - } - - // Generate fresh status - statusCache = await generateStatus(); - lastUpdate = now; - - console.log('Status updated successfully'); - res.json(statusCache); - } catch (error) { - console.error('Status API error:', error); - res.status(500).json({ - error: 'Failed to get system status', - message: error.message, - timestamp: new Date().toISOString() - }); - } -}); - -// Individual debug endpoints -router.get('/system', async (req, res) => { - try { - const systemInfo = await getSystemInfo(); - res.json(systemInfo); - } catch (error) { - res.status(500).json({ error: error.message }); - } -}); - -router.get('/gps', async (req, res) => { - try { - const gpsInfo = await getGPSInfo(); - res.json(gpsInfo); - } catch (error) { - res.status(500).json({ error: error.message }); - } -}); - -router.get('/network', async (req, res) => { - try { - const networkInfo = await getNetworkInfo(); - res.json(networkInfo); - } catch (error) { - res.status(500).json({ error: error.message }); - } -}); - -// Add individual LoRa endpoint -router.get('/lora', async (req, res) => { - try { - const loraInfo = await getLoRaInfo(); - res.json(loraInfo); - } catch (error) { - res.status(500).json({ error: error.message }); - } -}); - -// Initialize GPS on startup -initGPS().catch(err => console.warn('GPS initialization failed:', err.message)); - -export { router as statusRouter }; + +import express from 'express'; +import { exec } from 'child_process'; +import { promisify } from 'util'; +import { readFileSync, existsSync } from 'fs'; +import pkg from 'node-gpsd'; +const { GPS } = pkg; +import {environment} from './environment.mjs'; + +const router = express.Router(); +const execAsync = promisify(exec); + +// Status cache with TTL +let statusCache = null; +let lastUpdate = 0; +const CACHE_TTL = 15 * 1000; // 15 seconds + +// GPS client setup +let gpsClient = null; +let gpsData = { + fix: 'No Fix', + latitude: null, + longitude: null, + altitude: null, + satellites: 0 +}; + +// Initialize GPS connection +async function initGPS() { + try { + gpsClient = new GPS({ hostname: 'localhost', port: 2947 }); + + gpsClient.on('TPV', (data) => { + gpsData.latitude = data.lat || null; + gpsData.longitude = data.lon || null; + gpsData.altitude = data.alt || null; + gpsData.fix = data.mode === 3 ? '3D Fix' : data.mode === 2 ? '2D Fix' : 'No Fix'; + }); + + gpsClient.on('SKY', (data) => { + gpsData.satellites = (data.satellites || []).length; + }); + + gpsClient.on('error', (err) => { + console.warn('GPS error:', err.message); + }); + + await gpsClient.watch(); + console.log('GPS client initialized'); + } catch (error) { + console.warn('GPS not available:', error.message); + } +} + +// CLI-based system information gathering +async function getSystemInfo() { + const info = { + temperature: 0, + load: 0, + cpu: 0, + memory: 0, + storage: 0 + }; + + try { + // CPU temperature (Raspberry Pi specific) + if (existsSync('/sys/class/thermal/thermal_zone0/temp')) { + const tempData = readFileSync('/sys/class/thermal/thermal_zone0/temp', 'utf8'); + info.temperature = Math.round(parseInt(tempData.trim()) / 1000); + } + + // Load average + const { stdout: loadAvg } = await execAsync("cat /proc/loadavg | awk '{print $1}'"); + info.load = parseFloat(loadAvg.trim()) || 0; + + // CPU usage + const { stdout: cpuUsage } = await execAsync("grep 'cpu ' /proc/stat | awk '{usage=($2+$4)*100/($2+$3+$4+$5)} END {print usage}'"); + info.cpu = parseFloat(cpuUsage.trim()) || 0; + + // Memory usage percentage + const { stdout: memUsage } = await execAsync("free | awk 'NR==2{printf \"%.1f\", $3*100/$2}'"); + info.memory = parseFloat(memUsage.trim()) || 0; + + // Disk usage percentage for root filesystem + const { stdout: diskUsage } = await execAsync("df / | awk 'NR==2{printf \"%.1f\", $5}' | sed 's/%//'"); + info.storage = parseFloat(diskUsage.trim()) || 0; + + } catch (error) { + console.warn('System info error:', error.message); + } + + return info; +} + +async function getGPSInfo() { + const gpsInfo = { + satellites: 0, + latitude: null, + longitude: null, + altitude: null + }; + + try { + // Check if gpsd is running + await execAsync('systemctl is-active gpsd'); + + // Try to get GPS data using gpspipe + const { stdout: gpsRaw } = await execAsync('timeout 3s gpspipe -w -n 5 | grep -E \'"class":"TPV"\' | head -1', { timeout: 4000 }); + + if (gpsRaw.trim()) { + const gpsJson = JSON.parse(gpsRaw.trim()); + gpsInfo.latitude = gpsJson.lat || null; + gpsInfo.longitude = gpsJson.lon || null; + gpsInfo.altitude = gpsJson.alt || null; + } + + // Get satellite count + try { + const { stdout: skyRaw } = await execAsync('timeout 2s gpspipe -w -n 3 | grep -E \'"class":"SKY"\' | head -1', { timeout: 3000 }); + if (skyRaw.trim()) { + const skyJson = JSON.parse(skyRaw.trim()); + gpsInfo.satellites = (skyJson.satellites || []).length; + } + } catch (skyError) { } + } catch (error) { + console.warn('GPS info error:', error.message); + // Use cached GPS data from node-gpsd if available + if (gpsData.latitude !== null) { + return gpsData; + } + } + + return gpsInfo; +} + +async function getNetworkInfo() { + const networkInfo = { + wifi: { + mode: 'client', + ssid: 'Unknown' + }, + ethernet: { + connected: false + } + }; + + try { + // Check if hostapd is running (AP mode) + try { + await execAsync('systemctl is-active hostapd'); + networkInfo.wifi.mode = 'ap'; + + // Get AP SSID from hostapd config or use hostname + try { + const { stdout: hostname } = await execAsync('hostname'); + networkInfo.wifi.ssid = process.env.AP_SSID || hostname.trim(); + } catch { + networkInfo.wifi.ssid = 'MRS-AP'; + } + } catch { + // Not in AP mode, check if connected to WiFi + try { + // First, try iwconfig directly since it's more reliable for ESSID + const { stdout: iwconfig } = await execAsync("iwconfig wlan0 2>/dev/null"); + const essidMatch = iwconfig.match(/ESSID:"([^"]+)"/); + + if (essidMatch && essidMatch[1] && essidMatch[1] !== 'off/any') { + networkInfo.wifi.mode = 'client'; + networkInfo.wifi.ssid = essidMatch[1]; + } else { + // Fallback to nmcli if iwconfig doesn't work + try { + const { stdout: activeWifi } = await execAsync("nmcli -t -f NAME,TYPE,DEVICE connection show --active | grep -E '(wifi|802-11-wireless)' | cut -d':' -f1 | head -1"); + if (activeWifi.trim()) { + networkInfo.wifi.mode = 'client'; + networkInfo.wifi.ssid = activeWifi.trim(); + } else { + // Try getting SSID from currently connected interface + const { stdout: connectedSSID } = await execAsync("nmcli -t -f active,ssid dev wifi | grep '^yes' | cut -d':' -f2 | head -1"); + if (connectedSSID.trim()) { + networkInfo.wifi.mode = 'client'; + networkInfo.wifi.ssid = connectedSSID.trim(); + } else { + throw new Error('No active WiFi connection found'); + } + } + } catch { + // Final fallback: check if wlan0 interface is up and get info via ip + const { stdout: wlanStatus } = await execAsync("ip addr show wlan0 2>/dev/null | grep 'inet ' | wc -l"); + if (parseInt(wlanStatus.trim()) > 0) { + // Interface has IP but we can't determine SSID + networkInfo.wifi.mode = 'client'; + networkInfo.wifi.ssid = 'Connected (Unknown SSID)'; + } else { + networkInfo.wifi.mode = 'disconnected'; + networkInfo.wifi.ssid = 'Not Connected'; + } + } + } + } catch (error) { + console.warn('WiFi detection error:', error.message); + networkInfo.wifi.mode = 'disconnected'; + networkInfo.wifi.ssid = 'Not Connected'; + } + } + + // Check Ethernet status + try { + const { stdout: ethStatus } = await execAsync("ip link show eth0 | grep 'state UP'"); + networkInfo.ethernet.connected = ethStatus.includes('state UP'); + } catch { + networkInfo.ethernet.connected = false; + } + + } catch (error) { + console.warn('Network info error:', error.message); + } + + return networkInfo; +} + +let loraInfo = null; +async function getLoRaInfo() { + if(loraInfo) return loraInfo; + + loraInfo = { + connected: false, + onlineNodes: 0, + totalNodes: 0, + channelUtilization: 0, + airtimeUtilization: 0 + }; + + try { + console.log('Getting LoRa/Meshtastic status...'); + + // Get node information first + const { stdout: nodeList } = await execAsync('timeout 10s meshtastic --nodes 2>/dev/null', { timeout: 15000 }); + + if (nodeList && nodeList.trim()) { + loraInfo.connected = true; + + // Parse node list - look for actual node entries + const lines = nodeList.split('\n'); + let totalNodes = 0; + let onlineNodes = 0; + + for (const line of lines) { + const trimmedLine = line.trim(); + + // Skip header lines and separators + if (trimmedLine.includes('│') && + !trimmedLine.includes('User') && + !trimmedLine.includes('───') && + !trimmedLine.includes('Node') && + trimmedLine.length > 10) { + + totalNodes++; + + // Check if node is online (has recent lastHeard or SNR data) + if (trimmedLine.includes('SNR') || + trimmedLine.match(/\d+[smh]/) || // Time indicators like 5m, 2h, 30s + trimmedLine.includes('now')) { + onlineNodes++; + } + } + } + + loraInfo.totalNodes = totalNodes; + loraInfo.onlineNodes = onlineNodes; + } + + // Get channel and airtime utilization from --info + try { + const { stdout: meshInfo } = await execAsync('timeout 10s meshtastic --info 2>/dev/null', { timeout: 15000 }); + + if (meshInfo && meshInfo.trim()) { + const lines = meshInfo.split('\n'); + + for (const line of lines) { + const trimmedLine = line.trim(); + + // Look for channel utilization (various formats) + if (trimmedLine.includes('channelUtilization') || trimmedLine.includes('Channel utilization')) { + const channelMatch = trimmedLine.match(/([\d.]+)%?/) || trimmedLine.match(/:\s*([\d.]+)/); + if (channelMatch) { + loraInfo.channelUtilization = parseFloat(channelMatch[1]); + } + } + + // Look for airtime utilization (various formats) + if (trimmedLine.includes('airUtilTx') || trimmedLine.includes('Air time') || trimmedLine.includes('Airtime')) { + const airtimeMatch = trimmedLine.match(/([\d.]+)%?/) || trimmedLine.match(/:\s*([\d.]+)/); + if (airtimeMatch) { + loraInfo.airtimeUtilization = parseFloat(airtimeMatch[1]); + } + } + } + } + } catch (infoError) { + console.warn('Failed to get mesh info:', infoError.message); + } + + } catch (error) { + console.warn('LoRa info error:', error.message); + loraInfo.connected = false; + } + + setTimeout(() => loraInfo = null, 60000) + return loraInfo; +} + +// Main status generation function - matches frontend expectations +async function generateStatus() { + try { + console.log('Generating fresh status...'); + + const [systemInfo, gpsInfo, networkInfo, loraInfo] = await Promise.all([ + getSystemInfo(), + getGPSInfo(), + getNetworkInfo(), + getLoRaInfo() + ]); + + // Format exactly as the frontend expects + const status = { + system: { + temperature: systemInfo.temperature, + load: systemInfo.load, + cpu: systemInfo.cpu, + memory: systemInfo.memory, + storage: systemInfo.storage + }, + gps: { + fix: gpsInfo.fix, + satellites: gpsInfo.satellites, + latitude: gpsInfo.latitude, + longitude: gpsInfo.longitude, + altitude: gpsInfo.altitude + }, + network: { + wifi: networkInfo.wifi, + ethernet: networkInfo.ethernet + }, + lora: loraInfo, + time: new Date().toISOString() + }; + + return status; + } catch (error) { + console.error('Status generation error:', error); + throw error; + } +} + +router.get('/hostname', (req, res) => res.json({ hostname: environment.hostname })); + +// Main status endpoint that matches frontend expectations +router.get('/status', async (req, res) => { + try { + const now = Date.now(); + + // Return cached status if within TTL + if (statusCache && (now - lastUpdate) < CACHE_TTL) { + console.log('Returning cached status'); + return res.json(statusCache); + } + + // Generate fresh status + statusCache = await generateStatus(); + lastUpdate = now; + + console.log('Status updated successfully'); + res.json(statusCache); + } catch (error) { + console.error('Status API error:', error); + res.status(500).json({ + error: 'Failed to get system status', + message: error.message, + timestamp: new Date().toISOString() + }); + } +}); + +// Individual debug endpoints +router.get('/system', async (req, res) => { + try { + const systemInfo = await getSystemInfo(); + res.json(systemInfo); + } catch (error) { + res.status(500).json({ error: error.message }); + } +}); + +router.get('/gps', async (req, res) => { + try { + const gpsInfo = await getGPSInfo(); + res.json(gpsInfo); + } catch (error) { + res.status(500).json({ error: error.message }); + } +}); + +router.get('/network', async (req, res) => { + try { + const networkInfo = await getNetworkInfo(); + res.json(networkInfo); + } catch (error) { + res.status(500).json({ error: error.message }); + } +}); + +// Add individual LoRa endpoint +router.get('/lora', async (req, res) => { + try { + const loraInfo = await getLoRaInfo(); + res.json(loraInfo); + } catch (error) { + res.status(500).json({ error: error.message }); + } +}); + +// Initialize GPS on startup +initGPS().catch(err => console.warn('GPS initialization failed:', err.message)); + +export { router as statusRouter }; diff --git a/code/package-lock.json b/code/package-lock.json deleted file mode 100755 index 0e95487..0000000 --- a/code/package-lock.json +++ /dev/null @@ -1,370 +0,0 @@ -{ - "name": "dashboard", - "version": "1.0.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "dashboard", - "version": "1.0.0", - "license": "MIT", - "dependencies": { - "node-gpsd": "^0.3.4" - }, - "devDependencies": { - "nodemon": "^3.1.10" - } - }, - "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "node_modules/binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "dev": true, - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/ignore-by-default": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", - "dev": true - }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - }, - "node_modules/node-gpsd": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/node-gpsd/-/node-gpsd-0.3.4.tgz", - "integrity": "sha512-sI9hPfHiaWDmhjE1oJZnhMo7UF2vQVGl3qk0K4HbN1L8BkS0I+rd6V687eHOj/6ervXiHrhwXzYYsWdXxGy0Qg==", - "engines": { - "node": ">=v0.8.0" - } - }, - "node_modules/nodemon": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz", - "integrity": "sha512-WDjw3pJ0/0jMFmyNDp3gvY2YizjLmmOUQo6DEBY+JgdvW/yQ9mEeSw6H5ythl5Ny2ytb7f9C2nIbjSxMNzbJXw==", - "dev": true, - "dependencies": { - "chokidar": "^3.5.2", - "debug": "^4", - "ignore-by-default": "^1.0.1", - "minimatch": "^3.1.2", - "pstree.remy": "^1.1.8", - "semver": "^7.5.3", - "simple-update-notifier": "^2.0.0", - "supports-color": "^5.5.0", - "touch": "^3.1.0", - "undefsafe": "^2.0.5" - }, - "bin": { - "nodemon": "bin/nodemon.js" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/nodemon" - } - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pstree.remy": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", - "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", - "dev": true - }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/simple-update-notifier": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", - "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", - "dev": true, - "dependencies": { - "semver": "^7.5.3" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/touch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz", - "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==", - "dev": true, - "bin": { - "nodetouch": "bin/nodetouch.js" - } - }, - "node_modules/undefsafe": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", - "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", - "dev": true - } - } -} diff --git a/code/public/manifest.json b/code/public/manifest.json deleted file mode 100755 index 7b9f337..0000000 --- a/code/public/manifest.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "MRS", - "short_name": "MRS", - "description": "Multipurpose Radio Server", - "start_url": "/", - "display": "standalone", - "background_color": "#000000", - "theme_color": "#000000", - "orientation": "portrait-primary", - "icons": [ - { - "src": "/favicon.png", - "sizes": "512x512", - "type": "image/png" - } - ], - "lang": "en-US", - "scope": "/" -} diff --git a/code/src/services/status.mjs b/code/src/services/status.mjs deleted file mode 100755 index 7d6f7ee..0000000 --- a/code/src/services/status.mjs +++ /dev/null @@ -1,426 +0,0 @@ - -import express from 'express'; -import { exec } from 'child_process'; -import { promisify } from 'util'; -import { readFileSync, existsSync } from 'fs'; -import pkg from 'node-gpsd'; -const { GPS } = pkg; -import {environment} from './environment.mjs'; - -const router = express.Router(); -const execAsync = promisify(exec); - -// Status cache with TTL -let statusCache = null; -let lastUpdate = 0; -const CACHE_TTL = 15 * 1000; // 15 seconds - -// GPS client setup -let gpsClient = null; -let gpsData = { - fix: 'No Fix', - latitude: null, - longitude: null, - altitude: null, - satellites: 0 -}; - -// Initialize GPS connection -async function initGPS() { - try { - gpsClient = new GPS({ hostname: 'localhost', port: 2947 }); - - gpsClient.on('TPV', (data) => { - gpsData.latitude = data.lat || null; - gpsData.longitude = data.lon || null; - gpsData.altitude = data.alt || null; - gpsData.fix = data.mode === 3 ? '3D Fix' : data.mode === 2 ? '2D Fix' : 'No Fix'; - }); - - gpsClient.on('SKY', (data) => { - gpsData.satellites = (data.satellites || []).length; - }); - - gpsClient.on('error', (err) => { - console.warn('GPS error:', err.message); - }); - - await gpsClient.watch(); - console.log('GPS client initialized'); - } catch (error) { - console.warn('GPS not available:', error.message); - } -} - -// CLI-based system information gathering -async function getSystemInfo() { - const info = { - temperature: 0, - load: 0, - cpu: 0, - memory: 0, - storage: 0 - }; - - try { - // CPU temperature (Raspberry Pi specific) - if (existsSync('/sys/class/thermal/thermal_zone0/temp')) { - const tempData = readFileSync('/sys/class/thermal/thermal_zone0/temp', 'utf8'); - info.temperature = Math.round(parseInt(tempData.trim()) / 1000); - } - - // Load average - const { stdout: loadAvg } = await execAsync("cat /proc/loadavg | awk '{print $1}'"); - info.load = parseFloat(loadAvg.trim()) || 0; - - // CPU usage - const { stdout: cpuUsage } = await execAsync("grep 'cpu ' /proc/stat | awk '{usage=($2+$4)*100/($2+$3+$4+$5)} END {print usage}'"); - info.cpu = parseFloat(cpuUsage.trim()) || 0; - - // Memory usage percentage - const { stdout: memUsage } = await execAsync("free | awk 'NR==2{printf \"%.1f\", $3*100/$2}'"); - info.memory = parseFloat(memUsage.trim()) || 0; - - // Disk usage percentage for root filesystem - const { stdout: diskUsage } = await execAsync("df / | awk 'NR==2{printf \"%.1f\", $5}' | sed 's/%//'"); - info.storage = parseFloat(diskUsage.trim()) || 0; - - } catch (error) { - console.warn('System info error:', error.message); - } - - return info; -} - -async function getGPSInfo() { - const gpsInfo = { - satellites: 0, - latitude: null, - longitude: null, - altitude: null - }; - - try { - // Check if gpsd is running - await execAsync('systemctl is-active gpsd'); - - // Try to get GPS data using gpspipe - const { stdout: gpsRaw } = await execAsync('timeout 3s gpspipe -w -n 5 | grep -E \'"class":"TPV"\' | head -1', { timeout: 4000 }); - - if (gpsRaw.trim()) { - const gpsJson = JSON.parse(gpsRaw.trim()); - gpsInfo.latitude = gpsJson.lat || null; - gpsInfo.longitude = gpsJson.lon || null; - gpsInfo.altitude = gpsJson.alt || null; - } - - // Get satellite count - try { - const { stdout: skyRaw } = await execAsync('timeout 2s gpspipe -w -n 3 | grep -E \'"class":"SKY"\' | head -1', { timeout: 3000 }); - if (skyRaw.trim()) { - const skyJson = JSON.parse(skyRaw.trim()); - gpsInfo.satellites = (skyJson.satellites || []).length; - } - } catch (skyError) { } - } catch (error) { - console.warn('GPS info error:', error.message); - // Use cached GPS data from node-gpsd if available - if (gpsData.latitude !== null) { - return gpsData; - } - } - - return gpsInfo; -} - -async function getNetworkInfo() { - const networkInfo = { - wifi: { - mode: 'client', - ssid: 'Unknown' - }, - ethernet: { - connected: false - } - }; - - try { - // Check if hostapd is running (AP mode) - try { - await execAsync('systemctl is-active hostapd'); - networkInfo.wifi.mode = 'ap'; - - // Get AP SSID from hostapd config or use hostname - try { - const { stdout: hostname } = await execAsync('hostname'); - networkInfo.wifi.ssid = process.env.AP_SSID || hostname.trim(); - } catch { - networkInfo.wifi.ssid = 'MRS-AP'; - } - } catch { - // Not in AP mode, check if connected to WiFi - try { - // First, try iwconfig directly since it's more reliable for ESSID - const { stdout: iwconfig } = await execAsync("iwconfig wlan0 2>/dev/null"); - const essidMatch = iwconfig.match(/ESSID:"([^"]+)"/); - - if (essidMatch && essidMatch[1] && essidMatch[1] !== 'off/any') { - networkInfo.wifi.mode = 'client'; - networkInfo.wifi.ssid = essidMatch[1]; - } else { - // Fallback to nmcli if iwconfig doesn't work - try { - const { stdout: activeWifi } = await execAsync("nmcli -t -f NAME,TYPE,DEVICE connection show --active | grep -E '(wifi|802-11-wireless)' | cut -d':' -f1 | head -1"); - if (activeWifi.trim()) { - networkInfo.wifi.mode = 'client'; - networkInfo.wifi.ssid = activeWifi.trim(); - } else { - // Try getting SSID from currently connected interface - const { stdout: connectedSSID } = await execAsync("nmcli -t -f active,ssid dev wifi | grep '^yes' | cut -d':' -f2 | head -1"); - if (connectedSSID.trim()) { - networkInfo.wifi.mode = 'client'; - networkInfo.wifi.ssid = connectedSSID.trim(); - } else { - throw new Error('No active WiFi connection found'); - } - } - } catch { - // Final fallback: check if wlan0 interface is up and get info via ip - const { stdout: wlanStatus } = await execAsync("ip addr show wlan0 2>/dev/null | grep 'inet ' | wc -l"); - if (parseInt(wlanStatus.trim()) > 0) { - // Interface has IP but we can't determine SSID - networkInfo.wifi.mode = 'client'; - networkInfo.wifi.ssid = 'Connected (Unknown SSID)'; - } else { - networkInfo.wifi.mode = 'disconnected'; - networkInfo.wifi.ssid = 'Not Connected'; - } - } - } - } catch (error) { - console.warn('WiFi detection error:', error.message); - networkInfo.wifi.mode = 'disconnected'; - networkInfo.wifi.ssid = 'Not Connected'; - } - } - - // Check Ethernet status - try { - const { stdout: ethStatus } = await execAsync("ip link show eth0 | grep 'state UP'"); - networkInfo.ethernet.connected = ethStatus.includes('state UP'); - } catch { - networkInfo.ethernet.connected = false; - } - - } catch (error) { - console.warn('Network info error:', error.message); - } - - return networkInfo; -} - -let loraInfo = null; -async function getLoRaInfo() { - if(loraInfo) return loraInfo; - - loraInfo = { - connected: false, - onlineNodes: 0, - totalNodes: 0, - channelUtilization: 0, - airtimeUtilization: 0 - }; - - try { - console.log('Getting LoRa/Meshtastic status...'); - - // Get node information first - const { stdout: nodeList } = await execAsync('timeout 10s meshtastic --nodes 2>/dev/null', { timeout: 15000 }); - - if (nodeList && nodeList.trim()) { - loraInfo.connected = true; - - // Parse node list - look for actual node entries - const lines = nodeList.split('\n'); - let totalNodes = 0; - let onlineNodes = 0; - - for (const line of lines) { - const trimmedLine = line.trim(); - - // Skip header lines and separators - if (trimmedLine.includes('│') && - !trimmedLine.includes('User') && - !trimmedLine.includes('───') && - !trimmedLine.includes('Node') && - trimmedLine.length > 10) { - - totalNodes++; - - // Check if node is online (has recent lastHeard or SNR data) - if (trimmedLine.includes('SNR') || - trimmedLine.match(/\d+[smh]/) || // Time indicators like 5m, 2h, 30s - trimmedLine.includes('now')) { - onlineNodes++; - } - } - } - - loraInfo.totalNodes = totalNodes; - loraInfo.onlineNodes = onlineNodes; - } - - // Get channel and airtime utilization from --info - try { - const { stdout: meshInfo } = await execAsync('timeout 10s meshtastic --info 2>/dev/null', { timeout: 15000 }); - - if (meshInfo && meshInfo.trim()) { - const lines = meshInfo.split('\n'); - - for (const line of lines) { - const trimmedLine = line.trim(); - - // Look for channel utilization (various formats) - if (trimmedLine.includes('channelUtilization') || trimmedLine.includes('Channel utilization')) { - const channelMatch = trimmedLine.match(/([\d.]+)%?/) || trimmedLine.match(/:\s*([\d.]+)/); - if (channelMatch) { - loraInfo.channelUtilization = parseFloat(channelMatch[1]); - } - } - - // Look for airtime utilization (various formats) - if (trimmedLine.includes('airUtilTx') || trimmedLine.includes('Air time') || trimmedLine.includes('Airtime')) { - const airtimeMatch = trimmedLine.match(/([\d.]+)%?/) || trimmedLine.match(/:\s*([\d.]+)/); - if (airtimeMatch) { - loraInfo.airtimeUtilization = parseFloat(airtimeMatch[1]); - } - } - } - } - } catch (infoError) { - console.warn('Failed to get mesh info:', infoError.message); - } - - } catch (error) { - console.warn('LoRa info error:', error.message); - loraInfo.connected = false; - } - - setTimeout(() => loraInfo = null, 60000) - return loraInfo; -} - -// Main status generation function - matches frontend expectations -async function generateStatus() { - try { - console.log('Generating fresh status...'); - - const [systemInfo, gpsInfo, networkInfo, loraInfo] = await Promise.all([ - getSystemInfo(), - getGPSInfo(), - getNetworkInfo(), - getLoRaInfo() - ]); - - // Format exactly as the frontend expects - const status = { - system: { - temperature: systemInfo.temperature, - load: systemInfo.load, - cpu: systemInfo.cpu, - memory: systemInfo.memory, - storage: systemInfo.storage - }, - gps: { - fix: gpsInfo.fix, - satellites: gpsInfo.satellites, - latitude: gpsInfo.latitude, - longitude: gpsInfo.longitude, - altitude: gpsInfo.altitude - }, - network: { - wifi: networkInfo.wifi, - ethernet: networkInfo.ethernet - }, - lora: loraInfo, - time: new Date().toISOString() - }; - - return status; - } catch (error) { - console.error('Status generation error:', error); - throw error; - } -} - -router.get('/hostname', (req, res) => res.json({ hostname: environment.hostname })); - -// Main status endpoint that matches frontend expectations -router.get('/status', async (req, res) => { - try { - const now = Date.now(); - - // Return cached status if within TTL - if (statusCache && (now - lastUpdate) < CACHE_TTL) { - console.log('Returning cached status'); - return res.json(statusCache); - } - - // Generate fresh status - statusCache = await generateStatus(); - lastUpdate = now; - - console.log('Status updated successfully'); - res.json(statusCache); - } catch (error) { - console.error('Status API error:', error); - res.status(500).json({ - error: 'Failed to get system status', - message: error.message, - timestamp: new Date().toISOString() - }); - } -}); - -// Individual debug endpoints -router.get('/system', async (req, res) => { - try { - const systemInfo = await getSystemInfo(); - res.json(systemInfo); - } catch (error) { - res.status(500).json({ error: error.message }); - } -}); - -router.get('/gps', async (req, res) => { - try { - const gpsInfo = await getGPSInfo(); - res.json(gpsInfo); - } catch (error) { - res.status(500).json({ error: error.message }); - } -}); - -router.get('/network', async (req, res) => { - try { - const networkInfo = await getNetworkInfo(); - res.json(networkInfo); - } catch (error) { - res.status(500).json({ error: error.message }); - } -}); - -// Add individual LoRa endpoint -router.get('/lora', async (req, res) => { - try { - const loraInfo = await getLoRaInfo(); - res.json(loraInfo); - } catch (error) { - res.status(500).json({ error: error.message }); - } -}); - -// Initialize GPS on startup -initGPS().catch(err => console.warn('GPS initialization failed:', err.message)); - -export { router as statusRouter }; diff --git a/public/favicon.png b/public/favicon.png deleted file mode 100755 index 4e81999d922da92ff5ff2364b485cc547967bacb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33248 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 - - - MRS Dashboard - - - - - - - -
-
-
- Logo -
- -
Hostname
-
-
-
-
-
-
Local
-
00:00:00
-
Jan 1, 2025
-
-
-
Zulu
-
00:00:00
-
Jan 1, 2025
-
-
-
-
-
-
- - - - - - - - - - - - - - - -
-
- - - - - -
-
- - - - - - - - - - - - - - - - -
-
- - - - - - -
-
- - - - -
-
- - - -
-
-
-
- -
-
-
-
- - - - - - - - -
System ?°C
-
-
-
-
CPU - Load
-
-
-
0%
-
-
-
-
Memory
-
-
-
0%
-
-
-
-
Disk
-
-
-
0%
-
-
-
-
- -
-
- - - - - - - - - - - - - - - -
GPS
-
-
-
39.2000, -49.0000
-
No Fix
-
-
- -
-
- - - - - -
LoRa
-
-
-
0 / 0 Online
-
Ch 0% Air 0%
-
-
- -
-
- - - - - - - - - - - - - - - - -
Mesh
-
-
-
Connected
-
900 Mhz -45 dBm
-
-
- -
-
- - - - - - -
WiFi
-
-
-
Access Point
-
SSID: Hostname
-
-
- -
-
- - - - -
Ethernet
-
-
-
Disconnected
-
No cable detected
-
-
- -
-
-
- -
-
- - - - - -
- - -
- - - - diff --git a/public/index.js b/public/index.js deleted file mode 100755 index f30310f..0000000 --- a/public/index.js +++ /dev/null @@ -1,368 +0,0 @@ - -class Dashboard { - constructor() { - this.statusCache = null; - this.lastFetch = 0; - this.hostname = 'localhost'; - this.serverTimeOffset = null; // Track difference between server and client time - this.isTimeServerSynced = false; // Track if we're using server time - this.init(); - } - - async init() { - await this.fetchHostname(); - this.updateHostname(); - this.startTimeUpdates(); // Start with client time immediately - this.startStatusUpdates(); - this.initializeEventListeners(); - } - - async fetchHostname() { - try { - const response = await fetch('/api/hostname'); - const data = await response.json(); - this.hostname = data.hostname; - } catch (error) { - console.warn('Failed to fetch hostname:', error); - } - } - - updateHostname() { - const hostnameElement = document.querySelector('.hostname'); - if (hostnameElement) { - hostnameElement.textContent = this.hostname; - } - } - - async fetchStatus() { - try { - // Record start time for latency calculation - const requestStart = performance.now(); - const response = await fetch('/api/status'); - const requestEnd = performance.now(); - - if (!response.ok) throw new Error('Status fetch failed'); - - const status = await response.json(); - this.statusCache = status; - this.updateUI(status, requestStart, requestEnd); - } catch (error) { - console.error('Failed to fetch status:', error); - this.showOfflineStatus(); - } - } - - updateUI(status, requestStart, requestEnd) { - this.updateSystemMetrics(status.system); - this.updateGPSStatus(status.gps); - this.updateNetworkStatus(status.network); - this.updateLoRaStatus(status.lora); - this.updateTimeSync(status.time, requestStart, requestEnd); - } - - updateSystemMetrics(system) { - // Update temperature - const tempElement = document.getElementById('temp'); - if (tempElement && system.temperature) { - tempElement.textContent = `${system.temperature}°C`; - } - - // Update load average - const loadElement = document.getElementById('load'); - if (loadElement && system.load !== undefined) { - loadElement.textContent = `${system.load.toFixed(1)} Load`; - } - - // Update progress bars - this.updateProgressBar('cpu-usage', system.cpu); - this.updateProgressBar('memory-usage', system.memory); - this.updateProgressBar('disk-usage', system.storage); - } - - updateProgressBar(id, percentage) { - const fillElement = document.getElementById(`${id}-fill`); - const textElement = document.getElementById(`${id}-text`); - - if (fillElement && textElement) { - const value = Math.round(percentage); - fillElement.style.width = `${value}%`; - textElement.textContent = `${value}%`; - - // Update color based on usage - if (value > 80) { - fillElement.style.background = '#ef4444'; // Red - } else if (value > 60) { - fillElement.style.background = '#f59e0b'; // Orange - } else { - fillElement.style.background = '#10b981'; // Green - } - } - } - - updateGPSStatus(gps) { - const gpsStatus = document.getElementById('gps-status'); - const gpsTile = document.getElementById('gps-tile'); - - if (gpsStatus && gpsTile) { - const hasValidFix = gps.fix !== 'No Fix' && gps.latitude !== null; - - // Update status indicator - if (hasValidFix) { - gpsStatus.classList.remove('disconnected'); - gpsStatus.classList.add('connected'); - gpsTile.classList.remove('disconnected'); - gpsTile.classList.add('connected'); - } else { - gpsStatus.classList.remove('connected'); - gpsStatus.classList.add('disconnected'); - gpsTile.classList.remove('connected'); - gpsTile.classList.add('disconnected'); - } - - // Update GPS tile info - const gpsInfo = gpsTile.querySelector('.tile-info'); - const gpsDetail = gpsTile.querySelector('.tile-detail'); - - if (gpsInfo && gpsDetail) { - if (hasValidFix) { - gpsInfo.textContent = `${gps.latitude.toFixed(4)}, ${gps.longitude.toFixed(4)}`; - gpsDetail.textContent = `${gps.fix} • ${gps.satellites} sats • Alt: ${Math.round(gps.altitude)}m`; - } else { - gpsInfo.textContent = gps.satellites > 0 ? 'Acquiring Fix...' : 'No Signal'; - gpsDetail.textContent = `${gps.satellites} satellites`; - } - } - } - } - - updateNetworkStatus(network) { - // Update WiFi status - const wifiTile = document.getElementById('wifi-tile'); - if (wifiTile) { - const wifiInfo = wifiTile.querySelector('.tile-info'); - const wifiDetail = wifiTile.querySelector('.tile-detail'); - - if (wifiInfo && wifiDetail) { - if (network.wifi.mode === 'ap') { - wifiInfo.textContent = 'Access Point'; - wifiDetail.textContent = `SSID: ${network.wifi.ssid}`; - } else { - wifiInfo.textContent = 'Client Mode'; - wifiDetail.textContent = `SSID: ${network.wifi.ssid}`; - } - } - } - - // Update Ethernet status - const ethernetStatus = document.getElementById('ethernet-status'); - const ethernetTile = document.getElementById('ethernet-tile'); - - if (ethernetStatus && ethernetTile) { - if (network.ethernet.connected) { - ethernetStatus.classList.remove('disconnected'); - ethernetStatus.classList.add('connected'); - ethernetTile.classList.remove('disconnected'); - ethernetTile.classList.add('connected'); - - const ethernetInfo = ethernetTile.querySelector('.tile-info'); - const ethernetDetail = ethernetTile.querySelector('.tile-detail'); - if (ethernetInfo && ethernetDetail) { - ethernetInfo.textContent = 'Connected'; - ethernetDetail.textContent = 'Link detected'; - } - } else { - ethernetStatus.classList.remove('connected'); - ethernetStatus.classList.add('disconnected'); - ethernetTile.classList.remove('connected'); - ethernetTile.classList.add('disconnected'); - - const ethernetInfo = ethernetTile.querySelector('.tile-info'); - const ethernetDetail = ethernetTile.querySelector('.tile-detail'); - if (ethernetInfo && ethernetDetail) { - ethernetInfo.textContent = 'Disconnected'; - ethernetDetail.textContent = 'No cable detected'; - } - } - } - } - - updateLoRaStatus(lora) { - const loraStatus = document.getElementById('lora-status'); - const loraTile = document.getElementById('lora-tile'); - - if (loraStatus && loraTile) { - if (lora.connected) { - loraStatus.classList.remove('disconnected'); - loraStatus.classList.add('connected'); - loraTile.classList.remove('disconnected'); - loraTile.classList.add('connected'); - - const loraInfo = loraTile.querySelector('.tile-info'); - const loraDetail = loraTile.querySelector('.tile-detail'); - - if (loraInfo && loraDetail) { - loraInfo.textContent = `${lora.onlineNodes}/${lora.totalNodes} Online`; - loraDetail.textContent = `CH: ${lora.channelUtilization.toFixed(1)}% • Air: ${lora.airtimeUtilization.toFixed(1)}%`; - } - } else { - loraStatus.classList.remove('connected'); - loraStatus.classList.add('disconnected'); - loraTile.classList.remove('connected'); - loraTile.classList.add('disconnected'); - - const loraInfo = loraTile.querySelector('.tile-info'); - const loraDetail = loraTile.querySelector('.tile-detail'); - - if (loraInfo && loraDetail) { - loraInfo.textContent = 'Disconnected'; - loraDetail.textContent = 'No device found'; - } - } - } - } - - updateTimeSync(serverTimeString, requestStart, requestEnd) { - if (serverTimeString && requestStart && requestEnd) { - // Calculate network latency (round-trip time / 2) - const networkLatency = (requestEnd - requestStart) / 2; - - // Parse server time and adjust for network latency - const serverTime = new Date(serverTimeString); - const adjustedServerTime = new Date(serverTime.getTime() + networkLatency); - - // Calculate the offset between adjusted server time and client time - const clientTime = new Date(); - this.serverTimeOffset = adjustedServerTime.getTime() - clientTime.getTime(); - this.isTimeServerSynced = true; - - console.log(`Time synchronized with server (latency: ${networkLatency.toFixed(1)}ms, offset: ${this.serverTimeOffset.toFixed(1)}ms)`); - } - - // Update time displays - this.updateCurrentTime(); - } - - updateCurrentTime() { - const now = new Date(); - let displayTime; - - if (this.isTimeServerSynced && this.serverTimeOffset !== null) { - // Use server-synchronized time - displayTime = new Date(now.getTime() + this.serverTimeOffset); - } else { - // Use client time (default) - displayTime = now; - } - - this.updateTimeDisplay('local', displayTime, false); - this.updateTimeDisplay('zulu', displayTime, true); - } - - updateTimeDisplay(type, date, isUtc) { - const timeElement = document.getElementById(`${type}-time`); - const dateElement = document.getElementById(`${type}-date`); - - if (timeElement && dateElement) { - const displayDate = isUtc ? new Date(date.getTime()) : date; - - const timeStr = isUtc ? - displayDate.toUTCString().split(' ')[4] : - displayDate.toLocaleTimeString(); - - const dateStr = isUtc ? - displayDate.toUTCString().split(' ').slice(0, 4).join(' ') : - displayDate.toLocaleDateString('en-US', { - month: 'short', - day: 'numeric', - year: 'numeric' - }); - - timeElement.textContent = timeStr; - dateElement.textContent = dateStr; - - // Color time orange when using client time, white when server-synced - if (this.isTimeServerSynced) { - timeElement.style.color = '#fff'; - dateElement.style.color = '#64748b'; - } else { - timeElement.style.color = '#f59e0b'; - dateElement.style.color = '#f59e0b'; - } - } - } - - showOfflineStatus() { - // Reset to client time and show orange color - this.serverTimeOffset = null; - this.isTimeServerSynced = false; - console.warn('System appears offline - falling back to client time'); - } - - startStatusUpdates() { - // Initial fetch - this.fetchStatus(); - - // Update every 60 seconds - setInterval(() => { - this.fetchStatus(); - }, 60000); - } - - startTimeUpdates() { - // Start immediately with client time - this.updateCurrentTime(); - - // Update time every second - setInterval(() => { - this.updateCurrentTime(); - }, 1000); - } - - initializeEventListeners() { - // Expand/collapse status - const expandToggle = document.getElementById('expand-toggle'); - const expandedStatus = document.getElementById('expanded-status'); - const expandIcon = document.getElementById('expand-icon'); - - if (expandToggle && expandedStatus && expandIcon) { - expandToggle.addEventListener('click', () => { - expandedStatus.classList.toggle('visible'); - expandIcon.classList.toggle('expanded'); - }); - } - - // Search functionality - const searchInput = document.getElementById('search-input'); - const appsGrid = document.getElementById('apps-grid'); - - if (searchInput && appsGrid) { - searchInput.addEventListener('input', (e) => { - const query = e.target.value.toLowerCase(); - const apps = appsGrid.querySelectorAll('.app-item'); - - apps.forEach(app => { - const name = app.getAttribute('data-name')?.toLowerCase() || ''; - app.style.display = name.includes(query) ? 'flex' : 'none'; - }); - }); - } - } -} - -function openKiwixm(event) { - event.stopPropagation(); - event.preventDefault(); - window.location.href = window.location.origin.replace(/:\d+/g, '') + ':1300/admin'; -} - -// Initialize dashboard when DOM is ready -document.addEventListener('DOMContentLoaded', () => { - new Dashboard(); - - document.querySelectorAll('.app-item[href^=":"]').forEach(link => { - const port = link.getAttribute('href').substring(1); // Remove the ':' - const url = new URL(location.origin); - url.port = port; - link.href = url.toString(); - }); -}); diff --git a/src/main.mjs b/src/main.mjs deleted file mode 100755 index ebecdb9..0000000 --- a/src/main.mjs +++ /dev/null @@ -1,51 +0,0 @@ - -import express from "express"; -import { join } from 'path'; -import {environment} from './services/environment.mjs'; -import { statusRouter } from './services/status.mjs'; - -(async () => { - const app = express(); - - // Middleware - app.use(express.json()); - app.use((err, req, res, next) => { - console.error('Middleware error:', err); - res.status(500).json({ error: 'Internal server error' }); - }); - - // Routes - console.log(join(environment.root, '../public')); - app.use(express.static(join(environment.root, '../public'))); - - app.use('/api', statusRouter); - - // Error handler - app.use((err, req, res, next) => { - console.error('Unhandled error:', err); - res.status(500).json({ error: 'Internal server error' }); - }); - - // Startup - const server = app.listen(environment.port, () => { - console.log(`Dashboard running on http://localhost:${environment.port}`); - }).on('error', (err) => { - console.error('Server startup error:', err); - process.exit(1); - }); - - // Shutdown - const gracefulShutdown = (signal) => { - console.log(`Received ${signal}, shutting down gracefully`); - server.close((err) => { - if (err) { - console.error('Error during server shutdown:', err); - process.exit(1); - } - console.log('Server closed'); - process.exit(0); - }); - }; - process.on('SIGTERM', () => gracefulShutdown('SIGTERM')); - process.on('SIGINT', () => gracefulShutdown('SIGINT')); -})(); diff --git a/src/services/environment.mjs b/src/services/environment.mjs deleted file mode 100755 index 08590a2..0000000 --- a/src/services/environment.mjs +++ /dev/null @@ -1,38 +0,0 @@ -import dotenv from 'dotenv'; -import * as fs from 'node:fs'; -import { fileURLToPath } from 'url'; -import { dirname } from 'path'; -import { execSync } from "child_process"; - -dotenv.config(); - -export const environment = { - config: process.env.CONFIG || 'config.json', - hostname: process.env.HOSTNAME || execSync('hostname', { encoding: "utf-8" }) || 'localhost', - gpsd: process.env.GPSD || 2947, - port: process.env.PORT || 3000, - root: dirname(dirname(fileURLToPath(import.meta.url))), - settings: {}, -} - -if(!environment.config.startsWith('/')) environment.config = `${environment.root}/${environment.config}`; - -export function loadSettings() { - if(!fs.existsSync(environment.config)) fs.writeFileSync(environment.config, '', { flag: 'a' }); - const value = fs.readFileSync(environment.config, 'utf-8'); - try { return JSON.parse(value); } - catch (e) { - return { - lora: { - mode: 'MESH', - telemetry: true, - } - }; - } -} - -export function saveSettings() { - fs.writeFileSync(environment.config, JSON.stringify(environment.settings, null, 4)); -} - -loadSettings();