From 6803b5b95a0fd35ba68ff569c4a453e7cab8ff52 Mon Sep 17 00:00:00 2001 From: sbarn-okstate Date: Wed, 26 Feb 2025 17:11:02 -0600 Subject: [PATCH 1/7] commit --- frontend/src/backend/model.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/backend/model.js b/frontend/src/backend/model.js index be4e07d1..379a7210 100644 --- a/frontend/src/backend/model.js +++ b/frontend/src/backend/model.js @@ -48,9 +48,10 @@ export async function trainModel(xs, ys, worker) { return; } + await tf.ready(); // Ensure TensorFlow.js is initialized + xs = tf.tensor2d(xs, [xs.length, 1]); ys = tf.tensor2d(ys, [ys.length, 1]); - await tf.ready(); // Ensure TensorFlow.js is initialized await model.fit(xs, ys, { epochs: 500, From dfa98ec7aacdd44daa86bef1c63a40b29f05afd7 Mon Sep 17 00:00:00 2001 From: sbarn-okstate Date: Sun, 2 Mar 2025 12:25:58 -0600 Subject: [PATCH 2/7] support for https and SharedArrayBuffer --- frontend/localhost-key.pem | 28 ++ frontend/localhost.pem | 26 ++ frontend/package-lock.json | 591 ++++++++++++++++++++++++++++++-- frontend/package.json | 1 + frontend/src/backend/backend.js | 22 ++ frontend/src/backend/model.js | 43 +++ frontend/vite.config.js | 16 +- 7 files changed, 703 insertions(+), 24 deletions(-) create mode 100644 frontend/localhost-key.pem create mode 100644 frontend/localhost.pem diff --git a/frontend/localhost-key.pem b/frontend/localhost-key.pem new file mode 100644 index 00000000..9c7343ac --- /dev/null +++ b/frontend/localhost-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD24TRfqF9u3wWd +8FhVbNbVlHYw+ncUzyTG16Z1m0S3lSwL/NZWJ1uHW03EGHeyc7TAN5qPpFz+60/K +s9lKECnA/ktUhdmZfuiEsX02U9+WEZKbPAFmDydlej+BQsQKo0h3i96o0y71RkdF +m+qR7IxtISzPM7Jdg6YH35ssZyZ6R606o6RhyeIZv72zkLJGXl8vXDLuAKI2rmPp +kpv7OwLu3ccYzq7O/hkwg8G39r+aWS/pczj97n2gbwr9E2lOucPsPm/4skXP8h6j +7/zsh3dcyQPHofYNTDeijwFaaSml0ZVCO1bK6E84rqmF0AiXUtM7fwrAsgHbxXQa +BUZfLBUlAgMBAAECggEBAJRENg8I8J+GYzoyQOq03eURL1ZE5cVijiS5GKhi4oca +mIRuiU7efjKxW+fcBe7vXGtgOXvw60TRj28eSe4X/OuCDT2q0T9FH2GpspgxEQNw +dEq0Y+amTTO9kmwP6+qzm27oWoWrpvT5Cw68D8kpdkCH/wBFfOZ6jPkHiorFPC+M +tH19mSukc5JviIJmA+nzsNxujwepODS0xkocR9zlt8rfK+qruBTroUHB/FV5wezp +IJ7YjUHss5CvxJlpG5Yz69l3gBC3amTwdbflmzG9+OcB8xE00z7UVgftg4Nf3Hkw +tezZCcDPWwpxZKAD1hWkExD4wsRatbMOw4OZglMbP/UCgYEA/LG9YitRNOPHEr4l +39rstvl1jYVzlA67Q5HuIzWvSPpKzDCuCZwi0ZZJg8vAcZKXWdzuoPWIqlITifbq +7pPF/P/2VcoAJH9Msa8awCcobCL1SZ4NOe9Bw6ECIPgtKpCDjnopx4q3BEwAk1ot +WPr7Xy7stt7Xk9F8uJIqtBf6ge8CgYEA+hv99lbgv9ifONRSAZus58M43p5BOtcx +fSo7lAXyaSLvwFZRbBFeP2roXApxdUrAGkCfSVxtGbfmQBkAtmrmwVb+iTVNDb3S +FfxqLwTOUg6dKagsbG4FApBmL7xuvlBSrsnlgk7uMIMdEV4f9PFU09fWH3oWkU7A +SiIxSUpF3isCgYEA02siOHBlkQrCFDxjE9fnFW/BmpZ9DPMGWpJN28ee0EAZNJ3F +/uRTfWdwOoTOjjdHyje+r4y+u0HQdy3PgazBidveDgjj9aVMVZ1blEku2MqmzuEd +z8sOCs87KLp7j5E5gItVSU4VsdKk6KQaLMhQaGKqSpZHZ7Vt1D7225b0UKECgYBh +3JALUkUQa8cpKlKIFIycBpP67zsgtdDEY8D6EzWdk7DxthSXz1fsQn12fhOUzFHM +M9rfjo2V0ZIDJIVV2xA9ODfSIgvrQ4mvVpuJmDzOeK9f/FCdgJLvRObm6LkAOFeR +0qe9y/qA+txlzkl8wuzpEvvSRygLZR/yIdzdC3W5DwKBgQCCcoMhBlTirCJ9Wdx2 +p6JSAUTd4fCMlxu3R13Uav3BN361duhln+sHG1hgkTNZXdy5MtdkX+1anHK9gTKf +yzMm2tpI/EFPP5j1uFrWk9mNpE2N6/awMPWBAuwa9OZSqucJlNNDQpY9G0Soeh8Z +xpZG89zq1SMt/0LgRg6207gwuQ== +-----END PRIVATE KEY----- diff --git a/frontend/localhost.pem b/frontend/localhost.pem new file mode 100644 index 00000000..822a131c --- /dev/null +++ b/frontend/localhost.pem @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE----- +MIIEUDCCArigAwIBAgIRAPbGAycGxuGiPIrfUoxKni4wDQYJKoZIhvcNAQELBQAw +gYsxHjAcBgNVBAoTFW1rY2VydCBkZXZlbG9wbWVudCBDQTEwMC4GA1UECwwnU0FN +VUVMUy1QQ1xsZXVtYUBTQU1VRUxTLVBDIChTYW11ZWwgQi4pMTcwNQYDVQQDDC5t +a2NlcnQgU0FNVUVMUy1QQ1xsZXVtYUBTQU1VRUxTLVBDIChTYW11ZWwgQi4pMB4X +DTI1MDMwMjE4MjQzMFoXDTI3MDYwMjE3MjQzMFowWzEnMCUGA1UEChMebWtjZXJ0 +IGRldmVsb3BtZW50IGNlcnRpZmljYXRlMTAwLgYDVQQLDCdTQU1VRUxTLVBDXGxl +dW1hQFNBTVVFTFMtUEMgKFNhbXVlbCBCLikwggEiMA0GCSqGSIb3DQEBAQUAA4IB +DwAwggEKAoIBAQD24TRfqF9u3wWd8FhVbNbVlHYw+ncUzyTG16Z1m0S3lSwL/NZW +J1uHW03EGHeyc7TAN5qPpFz+60/Ks9lKECnA/ktUhdmZfuiEsX02U9+WEZKbPAFm +Dydlej+BQsQKo0h3i96o0y71RkdFm+qR7IxtISzPM7Jdg6YH35ssZyZ6R606o6Rh +yeIZv72zkLJGXl8vXDLuAKI2rmPpkpv7OwLu3ccYzq7O/hkwg8G39r+aWS/pczj9 +7n2gbwr9E2lOucPsPm/4skXP8h6j7/zsh3dcyQPHofYNTDeijwFaaSml0ZVCO1bK +6E84rqmF0AiXUtM7fwrAsgHbxXQaBUZfLBUlAgMBAAGjXjBcMA4GA1UdDwEB/wQE +AwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAfBgNVHSMEGDAWgBSDYicH1G8lagxz +NAmTpCLu4sPx6TAUBgNVHREEDTALgglsb2NhbGhvc3QwDQYJKoZIhvcNAQELBQAD +ggGBAHFO5FLafWDzFgmpcYso17Ogpssz5Un1M9m6NVBbyexmFmMt83kRkNy6DwOh +ChEEZFjKu9lZpzbEcUwoHLTll7v5+VDDKWu9IqMzhUUKV3h1Zc+kHFQSFfwzhFbV +AJd86I3MPFuQ1MkV0ZZ2FOdXRok1bgiaOyw3pu4VARuk6Us9N8rTnLgnubx9Xp0c +A/HTfvcz6Fz2tKyYH46NPJQ6TlOPC4LTIRGhxr5anSEs8SrpXcFxRkCTrLF+GrSr +4vHRfFP65E94UMUtb3TCpf4PeJC8Yavp69ctVjrOxT297veiA0o4ka8ZBpo+PuNv +QDRXqQWww5mNhLmIcizbWld4KwUN7Io2pBFqxwxzz0qiNe5qquTeJZDt04byMmij +Jy9Cozpt2BHaA8kEox0BkuJfrtJ+GtkV+OVwyY2owBUUVrXAHXNmXecdHwNxQDzq +RmNiFMOfJ1wJkbVFzvtsOpjSXNCRkxDdaM0u5C0PmhngyBXv9IzeltK5EVT+J0pY +W3BWug== +-----END CERTIFICATE----- diff --git a/frontend/package-lock.json b/frontend/package-lock.json index b4759268..4af11cc4 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -12,6 +12,7 @@ "babel": "^6.23.0", "babel-loader": "^9.2.1", "cssprefix": "^2.0.17", + "express": "^4.21.2", "m-class-list": "^1.1.10", "plain-draggable": "^2.5.15", "pointer-event": "^1.3.1", @@ -1592,6 +1593,19 @@ "license": "Apache-2.0", "peer": true }, + "node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "license": "MIT", + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/acorn": { "version": "8.14.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", @@ -1716,6 +1730,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "license": "MIT" + }, "node_modules/array-includes": { "version": "3.1.8", "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", @@ -1897,6 +1917,45 @@ "dev": true, "license": "MIT" }, + "node_modules/body-parser": { + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "content-type": "~1.0.5", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.13.0", + "raw-body": "2.5.2", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/body-parser/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/body-parser/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1947,6 +2006,15 @@ "license": "MIT", "peer": true }, + "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": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", @@ -1970,7 +2038,6 @@ "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==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -1984,7 +2051,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", @@ -2094,6 +2160,27 @@ "dev": true, "license": "MIT" }, + "node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "license": "MIT", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "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/convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", @@ -2109,6 +2196,12 @@ "node": ">=18" } }, + "node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", + "license": "MIT" + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -2251,6 +2344,25 @@ "url": "https://github.com/sponsors/ljharb" } }, + "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/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "license": "MIT", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, "node_modules/doctrine": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", @@ -2268,7 +2380,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", @@ -2279,12 +2390,27 @@ "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/electron-to-chromium": { "version": "1.5.98", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.98.tgz", "integrity": "sha512-bI/LbtRBxU2GzK7KK5xxFd2y9Lf9XguHooPYbcXWy6wUoT8NMnffsvRhPmSeUHLSDKAEtKuTaEtK4Ms15zkIEA==", "license": "ISC" }, + "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/enhanced-resolve": { "version": "5.18.1", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz", @@ -2369,7 +2495,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -2379,7 +2504,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -2424,7 +2548,6 @@ "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==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0" @@ -2530,6 +2653,12 @@ "node": ">=6" } }, + "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/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -2751,6 +2880,15 @@ "node": ">=0.10.0" } }, + "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/events": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", @@ -2761,6 +2899,76 @@ "node": ">=0.8.x" } }, + "node_modules/express": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", + "license": "MIT", + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.3", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.7.1", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.3.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.3", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.12", + "proxy-addr": "~2.0.7", + "qs": "6.13.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.19.0", + "serve-static": "1.16.2", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/express/node_modules/cookie": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/express/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -2810,6 +3018,39 @@ "node": ">=16.0.0" } }, + "node_modules/finalhandler": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/finalhandler/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/finalhandler/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" + }, "node_modules/find-cache-dir": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz", @@ -2880,6 +3121,24 @@ "url": "https://github.com/sponsors/ljharb" } }, + "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": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -2899,7 +3158,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2949,7 +3207,6 @@ "version": "1.2.7", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", @@ -2974,7 +3231,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", @@ -3056,7 +3312,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -3127,7 +3382,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -3156,7 +3410,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.2" @@ -3165,6 +3418,34 @@ "node": ">= 0.4" } }, + "node_modules/http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "license": "MIT", + "dependencies": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", @@ -3202,6 +3483,12 @@ "node": ">=0.8.19" } }, + "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/internal-slot": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", @@ -3217,6 +3504,15 @@ "node": ">= 0.4" } }, + "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-array-buffer": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", @@ -3824,12 +4120,29 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" } }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -3837,12 +4150,32 @@ "license": "MIT", "peer": true }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "license": "MIT", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "license": "MIT", - "peer": true, "engines": { "node": ">= 0.6" } @@ -3852,7 +4185,6 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "license": "MIT", - "peer": true, "dependencies": { "mime-db": "1.52.0" }, @@ -3905,6 +4237,15 @@ "dev": true, "license": "MIT" }, + "node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", @@ -3932,7 +4273,6 @@ "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -4025,6 +4365,18 @@ "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/optionator": { "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", @@ -4106,6 +4458,15 @@ "node": ">=6" } }, + "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-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -4133,6 +4494,12 @@ "dev": true, "license": "MIT" }, + "node_modules/path-to-regexp": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "license": "MIT" + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -4309,6 +4676,19 @@ "react-is": "^16.13.1" } }, + "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/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -4319,6 +4699,21 @@ "node": ">=6" } }, + "node_modules/qs": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.0.6" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -4329,6 +4724,30 @@ "safe-buffer": "^5.1.0" } }, + "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": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/react": { "version": "19.0.0", "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz", @@ -4549,8 +4968,7 @@ "url": "https://feross.org/support" } ], - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/safe-push-apply": { "version": "1.0.0", @@ -4587,6 +5005,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "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/scheduler": { "version": "0.25.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz", @@ -4655,6 +5079,54 @@ "semver": "bin/semver.js" } }, + "node_modules/send": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/send/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" + }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/serialize-javascript": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", @@ -4665,6 +5137,21 @@ "randombytes": "^2.1.0" } }, + "node_modules/serve-static": { + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "license": "MIT", + "dependencies": { + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.19.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/set-cookie-parser": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", @@ -4720,6 +5207,12 @@ "node": ">= 0.4" } }, + "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/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -4747,7 +5240,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -4767,7 +5259,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -4784,7 +5275,6 @@ "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==", - "dev": true, "license": "MIT", "dependencies": { "call-bound": "^1.0.2", @@ -4803,7 +5293,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "dev": true, "license": "MIT", "dependencies": { "call-bound": "^1.0.2", @@ -4850,6 +5339,15 @@ "source-map": "^0.6.0" } }, + "node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/string.prototype.matchall": { "version": "4.0.12", "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz", @@ -5051,6 +5549,15 @@ } } }, + "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/turbo-stream": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", @@ -5070,6 +5577,19 @@ "node": ">= 0.8.0" } }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "license": "MIT", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/typed-array-buffer": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", @@ -5174,6 +5694,15 @@ "license": "MIT", "peer": 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/update-browserslist-db": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz", @@ -5214,6 +5743,24 @@ "punycode": "^2.1.0" } }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", + "license": "MIT", + "engines": { + "node": ">= 0.4.0" + } + }, + "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/vite": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index 8e7e89e5..82c9ee9f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -14,6 +14,7 @@ "babel": "^6.23.0", "babel-loader": "^9.2.1", "cssprefix": "^2.0.17", + "express": "^4.21.2", "m-class-list": "^1.1.10", "plain-draggable": "^2.5.15", "pointer-event": "^1.3.1", diff --git a/frontend/src/backend/backend.js b/frontend/src/backend/backend.js index c8b880fb..aa8f7db2 100644 --- a/frontend/src/backend/backend.js +++ b/frontend/src/backend/backend.js @@ -1,6 +1,9 @@ // backend.js let backend_worker = null; +let sharedBuffer; +let weightArray; +let layerSizes; export function createBackendWorker() { if (!backend_worker) { @@ -19,6 +22,15 @@ export function createBackendWorker() { const {func, args} = message; switch (func){ + case "sharedBuffer": + sharedBuffer = args.sharedBuffer; + layerSizes = args.layerSizes; + weightArray = new Float32Array(sharedBuffer); + console.log("Shared buffer initialized."); + break; + case "weightsUpdated": + console.log("Weights updated:", getLayerWeights()); + break; default: console.log('Unknown function call from backend worker:', func); } @@ -33,6 +45,16 @@ export function createBackendWorker() { console.log('Backend worker already created.'); } +function getLayerWeights() { + let offset = 0; + return layerSizes.map(layerSize => { + const layerWeights = weightArray.slice(offset, offset + layerSize); + offset += layerSize; + return layerWeights; // Float32Array of this layer’s weights + }); +} + + export function getBackendWorker(){ if (!backend_worker) createBackendWorker(); return backend_worker; diff --git a/frontend/src/backend/model.js b/frontend/src/backend/model.js index 379a7210..2678167d 100644 --- a/frontend/src/backend/model.js +++ b/frontend/src/backend/model.js @@ -3,6 +3,10 @@ import * as defaults from './defaults.js' let model = null; +let sharedBuffer = null; +let weightArray = null; +let layerSizes = []; // Stores offsets for each layer's weights + export async function prepareModel(layers) { await tf.ready(); // Ensure TensorFlow.js is initialized @@ -38,6 +42,8 @@ export async function prepareModel(layers) { loss: undefined || defaults.COMPILE.loss, optimizer: undefined || defaults.COMPILE.optimizer }); + + initSharedBuffer(); } @@ -53,11 +59,17 @@ export async function trainModel(xs, ys, worker) { xs = tf.tensor2d(xs, [xs.length, 1]); ys = tf.tensor2d(ys, [ys.length, 1]); + xs = tf.randomNormal([100, 1]); + ys = tf.randomNormal([100, 1]); + + postMessage({ func: "sharedBuffer", args: {sharedBuffer, layerSizes }}); + await model.fit(xs, ys, { epochs: 500, callbacks: { onEpochEnd: (epoch, logs) => { worker.postMessage(`Epoch ${epoch + 1}: loss = ${logs.loss}`); + saveWeightsToSharedMemory(); } } }); @@ -67,3 +79,34 @@ export async function trainModel(xs, ys, worker) { worker.postMessage(`Error during training: ${error.message}`); } } + + +function initSharedBuffer(){ + const bufferSize = calculateBufferSize(); + sharedBuffer = new SharedArrayBuffer(bufferSize); + weightArray = new Float32Array(sharedBuffer); +} + +function calculateBufferSize() { + let totalParams = 0; + layerSizes = model.layers.map(layer => { + let layerParams = layer.getWeights().reduce((sum, tensor) => sum + tensor.size, 0); + totalParams += layerParams; + return layerParams; + }); + + return totalParams * 4; // 4 bytes per float32 +} + +function saveWeightsToSharedMemory() { + let offset = 0; + model.layers.forEach((layer, layerIndex) => { + layer.getWeights().forEach(tensor => { + const data = tensor.dataSync(); + weightArray.set(data, offset); + offset += data.length; + }); + }); + + postMessage({ action: "weightsUpdated" }); +} diff --git a/frontend/vite.config.js b/frontend/vite.config.js index 8b0f57b9..a66fc024 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -1,7 +1,19 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' +import fs from 'fs' +import path from 'path' -// https://vite.dev/config/ +// https://vitejs.dev/config/ export default defineConfig({ plugins: [react()], -}) + server: { + https: { + key: fs.readFileSync(path.resolve(__dirname, './localhost-key.pem')), + cert: fs.readFileSync(path.resolve(__dirname, './localhost.pem')), + }, + headers: { + 'Cross-Origin-Opener-Policy': 'same-origin', + 'Cross-Origin-Embedder-Policy': 'require-corp', + }, + }, +}) \ No newline at end of file From e427763587677b0123bfd8aa0e965c2fed7ab488 Mon Sep 17 00:00:00 2001 From: sbarn-okstate Date: Thu, 6 Mar 2025 10:43:36 -0600 Subject: [PATCH 3/7] commit --- frontend/src/backend/backend.js | 2 +- frontend/src/backend/model.js | 9 +++------ frontend/src/sandbox/SandboxTest.jsx | 5 ++--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/frontend/src/backend/backend.js b/frontend/src/backend/backend.js index aa8f7db2..3170dc08 100644 --- a/frontend/src/backend/backend.js +++ b/frontend/src/backend/backend.js @@ -29,7 +29,7 @@ export function createBackendWorker() { console.log("Shared buffer initialized."); break; case "weightsUpdated": - console.log("Weights updated:", getLayerWeights()); + // console.log("Weights updated:", getLayerWeights()); break; default: console.log('Unknown function call from backend worker:', func); diff --git a/frontend/src/backend/model.js b/frontend/src/backend/model.js index 2678167d..081cb4bf 100644 --- a/frontend/src/backend/model.js +++ b/frontend/src/backend/model.js @@ -56,11 +56,8 @@ export async function trainModel(xs, ys, worker) { await tf.ready(); // Ensure TensorFlow.js is initialized - xs = tf.tensor2d(xs, [xs.length, 1]); - ys = tf.tensor2d(ys, [ys.length, 1]); - - xs = tf.randomNormal([100, 1]); - ys = tf.randomNormal([100, 1]); + xs = tf.randomNormal([100, 1]);//test values + ys = tf.randomNormal([100, 1]);//test values postMessage({ func: "sharedBuffer", args: {sharedBuffer, layerSizes }}); @@ -108,5 +105,5 @@ function saveWeightsToSharedMemory() { }); }); - postMessage({ action: "weightsUpdated" }); + postMessage({ func: "weightsUpdated" }); } diff --git a/frontend/src/sandbox/SandboxTest.jsx b/frontend/src/sandbox/SandboxTest.jsx index 9915d830..e16c0005 100644 --- a/frontend/src/sandbox/SandboxTest.jsx +++ b/frontend/src/sandbox/SandboxTest.jsx @@ -27,11 +27,10 @@ function createBackend() { function createModel() { //FIXME: This is just a test - console.log("Button 2 pressed!"); - let test_model = [ + let test_model = [ //replace with actual model { type: "dense", - inputShape: [5], + inputShape: [1], //retrieve from input dataset units: 128, activation: "relu" }, From 863f59216ca5eb543a4e9d92c37c8265f486e25f Mon Sep 17 00:00:00 2001 From: sbarn-okstate Date: Thu, 6 Mar 2025 12:08:02 -0600 Subject: [PATCH 4/7] commit --- frontend/src/sandbox/SandboxTest.jsx | 203 ++++++++++++++++----------- frontend/src/sandbox/snapPoints.js | 26 ++++ 2 files changed, 146 insertions(+), 83 deletions(-) create mode 100644 frontend/src/sandbox/snapPoints.js diff --git a/frontend/src/sandbox/SandboxTest.jsx b/frontend/src/sandbox/SandboxTest.jsx index e16c0005..1da35027 100644 --- a/frontend/src/sandbox/SandboxTest.jsx +++ b/frontend/src/sandbox/SandboxTest.jsx @@ -4,20 +4,11 @@ import PlainDraggable from "plain-draggable"; import './SandboxTest.css'; import SandboxController from './SandboxController.jsx'; import * as backend from '../backend/backend.js' +import snapPoints from './snapPoints.js'; var count = 0; var draggables = []; -var controller = new SandboxController("poo"); -var controller1 = new SandboxController("pee"); -// Define test draggable -/* -function TestDraggable() { - const draggable = document.getElementById("draggable"); - //let testdrag = new PlainDraggable(draggable); - draggables.push(new PlainDraggable(draggable)); -} -*/ let backend_worker = null function createBackend() { @@ -64,81 +55,127 @@ function train() { } // Programmatically add draggable -function AddDraggable() { - //console.log("creating count" + count + " draggable element"); - let newDiv = document.createElement("div"); // Create the div - newDiv.id = "drag" + count; // Set the id of the div for referencing - newDiv.className = "testdraggable"; // Set the classname of the div for CSS - const newDivContent = document.createTextNode("Drag" + count); // Create the content for the div - newDiv.appendChild(newDivContent); // Set the content of the div - - // Add to the stage - const stageDiv = document.getElementById("stage"); // Get the stage div from document - stageDiv.appendChild(newDiv); // Add the new div to the stage - const poop = document.getElementById("drag" + count); // Get the div - draggables.push(new PlainDraggable(poop)); // Make the div draggable - //let poopdrag = new PlainDraggable(poop); - count += 1; // Iterate the count - - // Need to run the PlainDraggable.position() method on all existing draggables - // This recalculates the bounds that the draggables can move in - // Without doing this, the bounds will be incorrect on some draggables - RecalcPos(); -} - -// Recalculate position for all draggables -// Required for bounds to function properly -function RecalcPos() { - draggables.forEach((thing) => { - thing.position(); - }); -} - function SandboxTest() { - /* - useEffect(() => { - TestDraggable(); - }) - */ + const [elements, setElements] = useState([]); + const containerRef = useRef(null); + const elementRefs = useRef(new Map()); + + function getSnapPoints(el) { + if (!el) return []; + const rect = el.getBoundingClientRect(); + return [ + { x: rect.left, y: rect.top + rect.height / 2 }, // Left-center + { x: rect.right, y: rect.top + rect.height / 2 }, // Right-center + { x: rect.left + rect.width / 2, y: rect.top }, // Top-center + { x: rect.left + rect.width / 2, y: rect.bottom }, // Bottom-center + ]; + } + + function findClosestSnapPoint(el, elementsList) { + const elSnapPoints = getSnapPoints(el); + let closestPoint = null; + let minDistance = 20; // Max snap distance + + elementsList.forEach((otherEl) => { + if (otherEl === el) return; + const otherSnapPoints = getSnapPoints(otherEl); + + elSnapPoints.forEach((elPoint) => { + otherSnapPoints.forEach((otherPoint) => { + const distance = Math.hypot(elPoint.x - otherPoint.x, elPoint.y - otherPoint.y); + if (distance < minDistance) { + minDistance = distance; + closestPoint = { elPoint, otherPoint }; + } + }); + }); + }); + + return closestPoint; + } + useEffect(() => { - controller.test(); - controller1.test(); - }) - - return( - <> -
- Go Back -
- - - - - {/* - - // I don't know if we still need this - // Maybe the svg stuff can be reused - - - - - - - - - - test("rect")} width="100" height="100" x="10" y="10" rx="10" ry="10" fill="white" /> - test("circle")} r="4" cx="110" cy="60" /> - - - */} -
- {/* -
Drag Me
- */} -
- + elements.forEach((id) => { + const el = elementRefs.current.get(id); + if (!el) return; + + const draggable = new PlainDraggable(el); + draggable.onMove = function () { + const allElements = Array.from(elementRefs.current.values()); + const snap = findClosestSnapPoint(el, allElements); + + if (snap) { + const dx = snap.otherPoint.x - snap.elPoint.x; + const dy = snap.otherPoint.y - snap.elPoint.y; + draggable.left += dx; + draggable.top += dy; + } + }; + }); + }, [elements]); + + function addElement() { + const newId = elements.length ? elements[elements.length - 1] + 1 : 1; + setElements(function (prev) { + return [...prev, newId]; + }); + } + + return ( +
+ +
+ {elements.map(function (id) { + return ( +
+ {id} +
+ ); + })} +
+
); -} + } export default SandboxTest \ No newline at end of file diff --git a/frontend/src/sandbox/snapPoints.js b/frontend/src/sandbox/snapPoints.js new file mode 100644 index 00000000..2327e256 --- /dev/null +++ b/frontend/src/sandbox/snapPoints.js @@ -0,0 +1,26 @@ +const snapPoints = { + dense: [ + { xOffset: 0, yOffset: 0.5 }, // Left-center + { xOffset: 1, yOffset: 0.5 }, // Right-center + ], + dropout: [ + { xOffset: 0, yOffset: 0.5 }, // Left-center + { xOffset: 1, yOffset: 0.5 }, // Right-center + ], + input: [ + { xOffset: 1, yOffset: 0.5 }, // Top-center + ], + output: [ + { xOffset: 0, yOffset: 0.5 }, // Bottom-center + ], + activation: [ + { xOffset: 0, yOffset: 0.5 }, // Left-center + { xOffset: 1, yOffset: 0.5 }, // Right-center + ], + conv2d: [ + { xOffset: 0, yOffset: 0.5 }, // Left-center + { xOffset: 1, yOffset: 0.5 }, // Right-center + ] +}; + +export default snapPoints; \ No newline at end of file From 9257d74adfd1ea83104cf29b4f7d208a9b8183ae Mon Sep 17 00:00:00 2001 From: sbarn-okstate Date: Thu, 6 Mar 2025 13:58:31 -0600 Subject: [PATCH 5/7] commit --- .gitignore | 2 + frontend/package-lock.json | 155 +++++-------------------------------- frontend/package.json | 2 +- 3 files changed, 22 insertions(+), 137 deletions(-) diff --git a/.gitignore b/.gitignore index e69de29b..7c65e4f6 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +frontend/localhost-key.pem +frontend/localhost.pem \ No newline at end of file diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 4af11cc4..c4a4d8b6 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "anim-event": "^1.0.17", "babel": "^6.23.0", - "babel-loader": "^9.2.1", + "babel-loader": "^10.0.0", "cssprefix": "^2.0.17", "express": "^4.21.2", "m-class-list": "^1.1.10", @@ -1650,6 +1650,7 @@ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", "license": "MIT", + "peer": true, "dependencies": { "ajv": "^8.0.0" }, @@ -1667,6 +1668,7 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "license": "MIT", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -1682,7 +1684,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/anim-event": { "version": "1.0.17", @@ -1894,20 +1897,19 @@ } }, "node_modules/babel-loader": { - "version": "9.2.1", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.2.1.tgz", - "integrity": "sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-10.0.0.tgz", + "integrity": "sha512-z8jt+EdS61AMw22nSfoNJAZ0vrtmhPRVi6ghL3rCeRZI8cdNYFiV5xeV3HbE7rlZZNmGH8BVccwWt8/ED0QOHA==", "license": "MIT", "dependencies": { - "find-cache-dir": "^4.0.0", - "schema-utils": "^4.0.0" + "find-up": "^5.0.0" }, "engines": { - "node": ">= 14.15.0" + "node": "^18.20.0 || ^20.10.0 || >=22.0.0" }, "peerDependencies": { "@babel/core": "^7.12.0", - "webpack": ">=5" + "webpack": ">=5.61.0" } }, "node_modules/balanced-match": { @@ -2147,12 +2149,6 @@ "license": "MIT", "peer": true }, - "node_modules/common-path-prefix": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz", - "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==", - "license": "ISC" - }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -3003,7 +2999,8 @@ "url": "https://opencollective.com/fastify" } ], - "license": "BSD-3-Clause" + "license": "BSD-3-Clause", + "peer": true }, "node_modules/file-entry-cache": { "version": "8.0.0", @@ -3051,27 +3048,10 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "license": "MIT" }, - "node_modules/find-cache-dir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz", - "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==", - "license": "MIT", - "dependencies": { - "common-path-prefix": "^3.0.0", - "pkg-dir": "^7.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, "license": "MIT", "dependencies": { "locate-path": "^6.0.0", @@ -4069,7 +4049,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, "license": "MIT", "dependencies": { "p-locate": "^5.0.0" @@ -4417,7 +4396,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" @@ -4433,7 +4411,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, "license": "MIT", "dependencies": { "p-limit": "^3.0.2" @@ -4471,7 +4448,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -4506,103 +4482,6 @@ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", "license": "ISC" }, - "node_modules/pkg-dir": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz", - "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==", - "license": "MIT", - "dependencies": { - "find-up": "^6.3.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/find-up": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", - "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", - "license": "MIT", - "dependencies": { - "locate-path": "^7.1.0", - "path-exists": "^5.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/locate-path": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", - "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", - "license": "MIT", - "dependencies": { - "p-locate": "^6.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/p-limit": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", - "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", - "license": "MIT", - "dependencies": { - "yocto-queue": "^1.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/p-locate": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", - "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", - "license": "MIT", - "dependencies": { - "p-limit": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/path-exists": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", - "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, - "node_modules/pkg-dir/node_modules/yocto-queue": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz", - "integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==", - "license": "MIT", - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/plain-draggable": { "version": "2.5.15", "resolved": "https://registry.npmjs.org/plain-draggable/-/plain-draggable-2.5.15.tgz", @@ -4859,6 +4738,7 @@ "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "license": "MIT", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -5022,6 +4902,7 @@ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz", "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==", "license": "MIT", + "peer": true, "dependencies": { "@types/json-schema": "^7.0.9", "ajv": "^8.9.0", @@ -5041,6 +4922,7 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "license": "MIT", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -5057,6 +4939,7 @@ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", "license": "MIT", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3" }, @@ -5068,7 +4951,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/semver": { "version": "6.3.1", @@ -6052,7 +5936,6 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, "license": "MIT", "engines": { "node": ">=10" diff --git a/frontend/package.json b/frontend/package.json index 82c9ee9f..90fd8c94 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,7 +12,7 @@ "dependencies": { "anim-event": "^1.0.17", "babel": "^6.23.0", - "babel-loader": "^9.2.1", + "babel-loader": "^10.0.0", "cssprefix": "^2.0.17", "express": "^4.21.2", "m-class-list": "^1.1.10", From fe099e9100a2df0f11c1cbec112ff38f94c7afe9 Mon Sep 17 00:00:00 2001 From: sbarn-okstate Date: Thu, 6 Mar 2025 14:19:13 -0600 Subject: [PATCH 6/7] security changes --- .gitignore | 2 -- frontend/cert/.gitignore | 2 ++ frontend/cert/REAME.md | 9 +++++++++ frontend/localhost-key.pem | 28 ---------------------------- frontend/localhost.pem | 26 -------------------------- frontend/vite.config.js | 4 ++-- 6 files changed, 13 insertions(+), 58 deletions(-) create mode 100644 frontend/cert/.gitignore create mode 100644 frontend/cert/REAME.md delete mode 100644 frontend/localhost-key.pem delete mode 100644 frontend/localhost.pem diff --git a/.gitignore b/.gitignore index 7c65e4f6..e69de29b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +0,0 @@ -frontend/localhost-key.pem -frontend/localhost.pem \ No newline at end of file diff --git a/frontend/cert/.gitignore b/frontend/cert/.gitignore new file mode 100644 index 00000000..45b2ceae --- /dev/null +++ b/frontend/cert/.gitignore @@ -0,0 +1,2 @@ +localhost-key.pem +localhost.pem \ No newline at end of file diff --git a/frontend/cert/REAME.md b/frontend/cert/REAME.md new file mode 100644 index 00000000..93be468b --- /dev/null +++ b/frontend/cert/REAME.md @@ -0,0 +1,9 @@ +# Run powershell as Administrator + +choco install mkcert + +mkcert -install + +# In the MLLE/frontend/cert directory (normal cmd prompt) + +mkcert localhost \ No newline at end of file diff --git a/frontend/localhost-key.pem b/frontend/localhost-key.pem deleted file mode 100644 index 9c7343ac..00000000 --- a/frontend/localhost-key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD24TRfqF9u3wWd -8FhVbNbVlHYw+ncUzyTG16Z1m0S3lSwL/NZWJ1uHW03EGHeyc7TAN5qPpFz+60/K -s9lKECnA/ktUhdmZfuiEsX02U9+WEZKbPAFmDydlej+BQsQKo0h3i96o0y71RkdF -m+qR7IxtISzPM7Jdg6YH35ssZyZ6R606o6RhyeIZv72zkLJGXl8vXDLuAKI2rmPp -kpv7OwLu3ccYzq7O/hkwg8G39r+aWS/pczj97n2gbwr9E2lOucPsPm/4skXP8h6j -7/zsh3dcyQPHofYNTDeijwFaaSml0ZVCO1bK6E84rqmF0AiXUtM7fwrAsgHbxXQa -BUZfLBUlAgMBAAECggEBAJRENg8I8J+GYzoyQOq03eURL1ZE5cVijiS5GKhi4oca -mIRuiU7efjKxW+fcBe7vXGtgOXvw60TRj28eSe4X/OuCDT2q0T9FH2GpspgxEQNw -dEq0Y+amTTO9kmwP6+qzm27oWoWrpvT5Cw68D8kpdkCH/wBFfOZ6jPkHiorFPC+M -tH19mSukc5JviIJmA+nzsNxujwepODS0xkocR9zlt8rfK+qruBTroUHB/FV5wezp -IJ7YjUHss5CvxJlpG5Yz69l3gBC3amTwdbflmzG9+OcB8xE00z7UVgftg4Nf3Hkw -tezZCcDPWwpxZKAD1hWkExD4wsRatbMOw4OZglMbP/UCgYEA/LG9YitRNOPHEr4l -39rstvl1jYVzlA67Q5HuIzWvSPpKzDCuCZwi0ZZJg8vAcZKXWdzuoPWIqlITifbq -7pPF/P/2VcoAJH9Msa8awCcobCL1SZ4NOe9Bw6ECIPgtKpCDjnopx4q3BEwAk1ot -WPr7Xy7stt7Xk9F8uJIqtBf6ge8CgYEA+hv99lbgv9ifONRSAZus58M43p5BOtcx -fSo7lAXyaSLvwFZRbBFeP2roXApxdUrAGkCfSVxtGbfmQBkAtmrmwVb+iTVNDb3S -FfxqLwTOUg6dKagsbG4FApBmL7xuvlBSrsnlgk7uMIMdEV4f9PFU09fWH3oWkU7A -SiIxSUpF3isCgYEA02siOHBlkQrCFDxjE9fnFW/BmpZ9DPMGWpJN28ee0EAZNJ3F -/uRTfWdwOoTOjjdHyje+r4y+u0HQdy3PgazBidveDgjj9aVMVZ1blEku2MqmzuEd -z8sOCs87KLp7j5E5gItVSU4VsdKk6KQaLMhQaGKqSpZHZ7Vt1D7225b0UKECgYBh -3JALUkUQa8cpKlKIFIycBpP67zsgtdDEY8D6EzWdk7DxthSXz1fsQn12fhOUzFHM -M9rfjo2V0ZIDJIVV2xA9ODfSIgvrQ4mvVpuJmDzOeK9f/FCdgJLvRObm6LkAOFeR -0qe9y/qA+txlzkl8wuzpEvvSRygLZR/yIdzdC3W5DwKBgQCCcoMhBlTirCJ9Wdx2 -p6JSAUTd4fCMlxu3R13Uav3BN361duhln+sHG1hgkTNZXdy5MtdkX+1anHK9gTKf -yzMm2tpI/EFPP5j1uFrWk9mNpE2N6/awMPWBAuwa9OZSqucJlNNDQpY9G0Soeh8Z -xpZG89zq1SMt/0LgRg6207gwuQ== ------END PRIVATE KEY----- diff --git a/frontend/localhost.pem b/frontend/localhost.pem deleted file mode 100644 index 822a131c..00000000 --- a/frontend/localhost.pem +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEUDCCArigAwIBAgIRAPbGAycGxuGiPIrfUoxKni4wDQYJKoZIhvcNAQELBQAw -gYsxHjAcBgNVBAoTFW1rY2VydCBkZXZlbG9wbWVudCBDQTEwMC4GA1UECwwnU0FN -VUVMUy1QQ1xsZXVtYUBTQU1VRUxTLVBDIChTYW11ZWwgQi4pMTcwNQYDVQQDDC5t -a2NlcnQgU0FNVUVMUy1QQ1xsZXVtYUBTQU1VRUxTLVBDIChTYW11ZWwgQi4pMB4X -DTI1MDMwMjE4MjQzMFoXDTI3MDYwMjE3MjQzMFowWzEnMCUGA1UEChMebWtjZXJ0 -IGRldmVsb3BtZW50IGNlcnRpZmljYXRlMTAwLgYDVQQLDCdTQU1VRUxTLVBDXGxl -dW1hQFNBTVVFTFMtUEMgKFNhbXVlbCBCLikwggEiMA0GCSqGSIb3DQEBAQUAA4IB -DwAwggEKAoIBAQD24TRfqF9u3wWd8FhVbNbVlHYw+ncUzyTG16Z1m0S3lSwL/NZW -J1uHW03EGHeyc7TAN5qPpFz+60/Ks9lKECnA/ktUhdmZfuiEsX02U9+WEZKbPAFm -Dydlej+BQsQKo0h3i96o0y71RkdFm+qR7IxtISzPM7Jdg6YH35ssZyZ6R606o6Rh -yeIZv72zkLJGXl8vXDLuAKI2rmPpkpv7OwLu3ccYzq7O/hkwg8G39r+aWS/pczj9 -7n2gbwr9E2lOucPsPm/4skXP8h6j7/zsh3dcyQPHofYNTDeijwFaaSml0ZVCO1bK -6E84rqmF0AiXUtM7fwrAsgHbxXQaBUZfLBUlAgMBAAGjXjBcMA4GA1UdDwEB/wQE -AwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAfBgNVHSMEGDAWgBSDYicH1G8lagxz -NAmTpCLu4sPx6TAUBgNVHREEDTALgglsb2NhbGhvc3QwDQYJKoZIhvcNAQELBQAD -ggGBAHFO5FLafWDzFgmpcYso17Ogpssz5Un1M9m6NVBbyexmFmMt83kRkNy6DwOh -ChEEZFjKu9lZpzbEcUwoHLTll7v5+VDDKWu9IqMzhUUKV3h1Zc+kHFQSFfwzhFbV -AJd86I3MPFuQ1MkV0ZZ2FOdXRok1bgiaOyw3pu4VARuk6Us9N8rTnLgnubx9Xp0c -A/HTfvcz6Fz2tKyYH46NPJQ6TlOPC4LTIRGhxr5anSEs8SrpXcFxRkCTrLF+GrSr -4vHRfFP65E94UMUtb3TCpf4PeJC8Yavp69ctVjrOxT297veiA0o4ka8ZBpo+PuNv -QDRXqQWww5mNhLmIcizbWld4KwUN7Io2pBFqxwxzz0qiNe5qquTeJZDt04byMmij -Jy9Cozpt2BHaA8kEox0BkuJfrtJ+GtkV+OVwyY2owBUUVrXAHXNmXecdHwNxQDzq -RmNiFMOfJ1wJkbVFzvtsOpjSXNCRkxDdaM0u5C0PmhngyBXv9IzeltK5EVT+J0pY -W3BWug== ------END CERTIFICATE----- diff --git a/frontend/vite.config.js b/frontend/vite.config.js index a66fc024..a91a691e 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -8,8 +8,8 @@ export default defineConfig({ plugins: [react()], server: { https: { - key: fs.readFileSync(path.resolve(__dirname, './localhost-key.pem')), - cert: fs.readFileSync(path.resolve(__dirname, './localhost.pem')), + key: fs.readFileSync(path.resolve(__dirname, './cert/localhost-key.pem')), + cert: fs.readFileSync(path.resolve(__dirname, './cert/localhost.pem')), }, headers: { 'Cross-Origin-Opener-Policy': 'same-origin', From 8b2daaa28d99ccf5d89fdb36ae70a31085d2e94d Mon Sep 17 00:00:00 2001 From: sbarn-okstate Date: Thu, 6 Mar 2025 14:21:48 -0600 Subject: [PATCH 7/7] rename --- frontend/cert/{REAME.md => README.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename frontend/cert/{REAME.md => README.md} (100%) diff --git a/frontend/cert/REAME.md b/frontend/cert/README.md similarity index 100% rename from frontend/cert/REAME.md rename to frontend/cert/README.md