From 77674c6b1c02879c1940cae41ab95440e859d011 Mon Sep 17 00:00:00 2001 From: William Mantly Date: Fri, 3 Jul 2026 20:13:38 -0400 Subject: [PATCH] Upgrade model-redis to ^1.4.0 and redis to ^6.1.0 model-redis 1.4.0 requires redis 6, so bump both together to keep a single deduped redis version. Verified: unit tests pass (38), and the real models load and run against live redis 7 on the new stack, including model-redis 1.4.0's findOrphans(). Co-Authored-By: Claude Opus 4.8 --- nodejs/package-lock.json | 175 ++++++++++----------------------------- nodejs/package.json | 4 +- 2 files changed, 46 insertions(+), 133 deletions(-) diff --git a/nodejs/package-lock.json b/nodejs/package-lock.json index 9e28265..17e2bd4 100644 --- a/nodejs/package-lock.json +++ b/nodejs/package-lock.json @@ -23,11 +23,11 @@ "jquery": "^3.7.1", "ldapts": "^8.1.2", "linux-sys-user": "^1.2.0", - "model-redis": "^0.4.0", + "model-redis": "^1.4.0", "moment": "^2.30.1", "mustache": "^4.2.0", "p2psub": "^0.2.0", - "redis": "^5.10.0", + "redis": "^6.1.0", "socket.io": "^4.8.3", "tld-extract": "^2.1.0" }, @@ -206,71 +206,75 @@ } }, "node_modules/@redis/bloom": { - "version": "5.11.0", - "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-5.11.0.tgz", - "integrity": "sha512-KYiVilAhAFN3057afUb/tfYJpsEyTkQB+tQcn5gVVA7DgcNOAj8lLxe4j8ov8BF6I9C1Fe/kwlbuAICcTMX8Lw==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-6.1.0.tgz", + "integrity": "sha512-Rzascjd9J9bJsM45T/Z9CTg1QY/B63B6YO8QorLVMeXnbBDsKiSCVR/+GQ061hYPk8FpTzWmPY8tAv2sT+JEtQ==", "license": "MIT", "engines": { - "node": ">= 18" + "node": ">= 20.0.0" }, "peerDependencies": { - "@redis/client": "^5.11.0" + "@redis/client": "^6.1.0" } }, "node_modules/@redis/client": { - "version": "5.11.0", - "resolved": "https://registry.npmjs.org/@redis/client/-/client-5.11.0.tgz", - "integrity": "sha512-GHoprlNQD51Xq2Ztd94HHV94MdFZQ3CVrpA04Fz8MVoHM0B7SlbmPEVIjwTbcv58z8QyjnrOuikS0rWF03k5dQ==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@redis/client/-/client-6.1.0.tgz", + "integrity": "sha512-7u1LefkezJF0HESlhO7ZFLEPfyY+NejP3SGv+Z4pGaT3oM5GVVLa0u3f4rDLUrcw+SRo8IlX9Y8JAONeDdg1Ag==", "license": "MIT", "dependencies": { "cluster-key-slot": "1.1.2" }, "engines": { - "node": ">= 18" + "node": ">= 20.0.0" }, "peerDependencies": { - "@node-rs/xxhash": "^1.1.0" + "@node-rs/xxhash": "^1.1.0", + "@opentelemetry/api": ">=1 <2" }, "peerDependenciesMeta": { "@node-rs/xxhash": { "optional": true + }, + "@opentelemetry/api": { + "optional": true } } }, "node_modules/@redis/json": { - "version": "5.11.0", - "resolved": "https://registry.npmjs.org/@redis/json/-/json-5.11.0.tgz", - "integrity": "sha512-1iAy9kAtcD0quB21RbPTbUqqy+T2Uu2JxucwE+B4A+VaDbIRvpZR6DMqV8Iqaws2YxJYB3GC5JVNzPYio2ErUg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@redis/json/-/json-6.1.0.tgz", + "integrity": "sha512-/GFjQA6bu5pG9ClCJAI5Xx4bNXe7UTpxBBlIupBNTrn1+nY860apGnYJuaSCDV2BmEbTidpa7O2qa28oxKx+rg==", "license": "MIT", "engines": { - "node": ">= 18" + "node": ">= 20.0.0" }, "peerDependencies": { - "@redis/client": "^5.11.0" + "@redis/client": "^6.1.0" } }, "node_modules/@redis/search": { - "version": "5.11.0", - "resolved": "https://registry.npmjs.org/@redis/search/-/search-5.11.0.tgz", - "integrity": "sha512-g1l7f3Rnyk/xI99oGHIgWHSKFl45Re5YTIcO8j/JE8olz389yUFyz2+A6nqVy/Zi031VgPDWscbbgOk8hlhZ3g==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@redis/search/-/search-6.1.0.tgz", + "integrity": "sha512-kS5agg+3yZbrdrt8omrew7FLCD8eOm7tarG1CROekPBRe+QGDR9aOpnHIQaYsYi6wPRTH70nQiF06AIjgURefQ==", "license": "MIT", "engines": { - "node": ">= 18" + "node": ">= 20.0.0" }, "peerDependencies": { - "@redis/client": "^5.11.0" + "@redis/client": "^6.1.0" } }, "node_modules/@redis/time-series": { - "version": "5.11.0", - "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-5.11.0.tgz", - "integrity": "sha512-TWFeOcU4xkj0DkndnOyhtxvX1KWD+78UHT3XX3x3XRBUGWeQrKo3jqzDsZwxbggUgf9yLJr/akFHXru66X5UQA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-6.1.0.tgz", + "integrity": "sha512-uIDBtV8MmG/xpJsRqbGSO4iX6ryj37MLMP82lRpFvI7ykAVe5GyqgxigEbU+uZNv9kDPNMKw3dvI/S/J1BNBzA==", "license": "MIT", "engines": { - "node": ">= 18" + "node": ">= 20.0.0" }, "peerDependencies": { - "@redis/client": "^5.11.0" + "@redis/client": "^6.1.0" } }, "node_modules/@simpleworkjs/conf": { @@ -1048,15 +1052,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/generic-pool": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz", - "integrity": "sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==", - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, "node_modules/get-intrinsic": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", @@ -1403,88 +1398,12 @@ } }, "node_modules/model-redis": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/model-redis/-/model-redis-0.4.0.tgz", - "integrity": "sha512-E6WEhjrKhL8C+2cc9g6htpPqthwz89BREke+hIE/KAEROaUy/7xAi0dUf4BVsrUCKXzHEXlsyyjQZ72aS8bS/g==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/model-redis/-/model-redis-1.4.0.tgz", + "integrity": "sha512-mbs92tMdyPvKrP/VorXXUeMJXWV66A6MVlU3te13f8IYKl0yxyLMF6eoPzuQN7FDCtXpqUeudZe1TxZQeM7QHQ==", "license": "MIT", "dependencies": { - "redis": "^4.6.10" - } - }, - "node_modules/model-redis/node_modules/@redis/bloom": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz", - "integrity": "sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==", - "license": "MIT", - "peerDependencies": { - "@redis/client": "^1.0.0" - } - }, - "node_modules/model-redis/node_modules/@redis/client": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.6.1.tgz", - "integrity": "sha512-/KCsg3xSlR+nCK8/8ZYSknYxvXHwubJrU82F3Lm1Fp6789VQ0/3RJKfsmRXjqfaTA++23CvC3hqmqe/2GEt6Kw==", - "license": "MIT", - "dependencies": { - "cluster-key-slot": "1.1.2", - "generic-pool": "3.9.0", - "yallist": "4.0.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/model-redis/node_modules/@redis/graph": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.1.1.tgz", - "integrity": "sha512-FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw==", - "license": "MIT", - "peerDependencies": { - "@redis/client": "^1.0.0" - } - }, - "node_modules/model-redis/node_modules/@redis/json": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.7.tgz", - "integrity": "sha512-6UyXfjVaTBTJtKNG4/9Z8PSpKE6XgSyEb8iwaqDcy+uKrd/DGYHTWkUdnQDyzm727V7p21WUMhsqz5oy65kPcQ==", - "license": "MIT", - "peerDependencies": { - "@redis/client": "^1.0.0" - } - }, - "node_modules/model-redis/node_modules/@redis/search": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@redis/search/-/search-1.2.0.tgz", - "integrity": "sha512-tYoDBbtqOVigEDMAcTGsRlMycIIjwMCgD8eR2t0NANeQmgK/lvxNAvYyb6bZDD4frHRhIHkJu2TBRvB0ERkOmw==", - "license": "MIT", - "peerDependencies": { - "@redis/client": "^1.0.0" - } - }, - "node_modules/model-redis/node_modules/@redis/time-series": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.1.0.tgz", - "integrity": "sha512-c1Q99M5ljsIuc4YdaCwfUEXsofakb9c8+Zse2qxTadu8TalLXuAESzLvFAvNVbkmSlvlzIQOLpBCmWI9wTOt+g==", - "license": "MIT", - "peerDependencies": { - "@redis/client": "^1.0.0" - } - }, - "node_modules/model-redis/node_modules/redis": { - "version": "4.7.1", - "resolved": "https://registry.npmjs.org/redis/-/redis-4.7.1.tgz", - "integrity": "sha512-S1bJDnqLftzHXHP8JsT5II/CtHWQrASX5K96REjWjlmWKrviSOLWmM7QnRLstAWsu1VBBV1ffV6DzCvxNP0UJQ==", - "license": "MIT", - "workspaces": [ - "./packages/*" - ], - "dependencies": { - "@redis/bloom": "1.2.0", - "@redis/client": "1.6.1", - "@redis/graph": "1.1.1", - "@redis/json": "1.0.7", - "@redis/search": "1.2.0", - "@redis/time-series": "1.1.0" + "redis": "^6.1.0" } }, "node_modules/moment": { @@ -1771,19 +1690,19 @@ } }, "node_modules/redis": { - "version": "5.11.0", - "resolved": "https://registry.npmjs.org/redis/-/redis-5.11.0.tgz", - "integrity": "sha512-YwXjATVDT+AuxcyfOwZn046aml9jMlQPvU1VXIlLDVAExe0u93aTfPYSeRgG4p9Q/Jlkj+LXJ1XEoFV+j2JKcQ==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/redis/-/redis-6.1.0.tgz", + "integrity": "sha512-0kvUPM8RHP/ZMa0xYaDTcG5e8tIGW6kz6MToVT0V8iOnk6bkXp2jncGRGe2bZEk41lZwiDspUqjZCSk5ohjcKw==", "license": "MIT", "dependencies": { - "@redis/bloom": "5.11.0", - "@redis/client": "5.11.0", - "@redis/json": "5.11.0", - "@redis/search": "5.11.0", - "@redis/time-series": "5.11.0" + "@redis/bloom": "6.1.0", + "@redis/client": "6.1.0", + "@redis/json": "6.1.0", + "@redis/search": "6.1.0", + "@redis/time-series": "6.1.0" }, "engines": { - "node": ">= 18" + "node": ">= 20.0.0" } }, "node_modules/reflect-metadata": { @@ -2208,12 +2127,6 @@ "optional": true } } - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" } } } diff --git a/nodejs/package.json b/nodejs/package.json index f7b0d5f..c4645c5 100644 --- a/nodejs/package.json +++ b/nodejs/package.json @@ -34,11 +34,11 @@ "jquery": "^3.7.1", "ldapts": "^8.1.2", "linux-sys-user": "^1.2.0", - "model-redis": "^0.4.0", + "model-redis": "^1.4.0", "moment": "^2.30.1", "mustache": "^4.2.0", "p2psub": "^0.2.0", - "redis": "^5.10.0", + "redis": "^6.1.0", "socket.io": "^4.8.3", "tld-extract": "^2.1.0" },