From 90d318df779394240e2e62102ec0354575b544b5 Mon Sep 17 00:00:00 2001 From: Parnic Date: Mon, 4 May 2026 22:58:46 -0500 Subject: [PATCH] Drop dependency on uuid lib Dependabot wanted to update to v14, but it was breaking in cjs, and it felt like more trouble to try and keep it than to just use the built-in uuid generator. Also updated CI to build against still-maintained nodejs versions. --- .github/workflows/ci.yml | 8 ++++---- cjs/messages/request.js | 3 +-- cjs/messages/request.js.map | 2 +- esm/messages/request.js | 3 +-- esm/messages/request.js.map | 2 +- mise.toml | 2 ++ package-lock.json | 22 ---------------------- package.json | 2 -- src/messages/request.ts | 3 +-- 9 files changed, 11 insertions(+), 36 deletions(-) create mode 100644 mise.toml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 429c0eb..cf31510 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,16 +13,16 @@ jobs: strategy: matrix: - node-version: [18.x, 20.x, 22.x] + node-version: [20.x, 22.x, 24.x] steps: - name: Checkout id: checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Setup Node.js ${{ matrix.node-version }} id: setup-node - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: ${{ matrix.node-version }} @@ -73,7 +73,7 @@ jobs: - if: ${{ failure() && steps.diff.outcome == 'failure' }} name: Upload Artifact id: upload - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: outdir-${{ matrix.node-version }}-diff path: | diff --git a/cjs/messages/request.js b/cjs/messages/request.js index bef4232..f44a4b3 100644 --- a/cjs/messages/request.js +++ b/cjs/messages/request.js @@ -2,7 +2,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.ICRequest = exports.ICRequestObj = void 0; exports.GetRequest = GetRequest; -const uuid_1 = require("uuid"); class ICRequestObj { objnam = ""; keys = []; @@ -20,7 +19,7 @@ class ICRequest { exports.ICRequest = ICRequest; function GetRequest() { const req = new ICRequest(); - req.messageID = (0, uuid_1.v4)(); + req.messageID = crypto.randomUUID(); return req; } //# sourceMappingURL=request.js.map \ No newline at end of file diff --git a/cjs/messages/request.js.map b/cjs/messages/request.js.map index 9595768..7f90522 100644 --- a/cjs/messages/request.js.map +++ b/cjs/messages/request.js.map @@ -1 +1 @@ -{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/messages/request.ts"],"names":[],"mappings":";;;AAkBA,gCAIC;AAtBD,+BAAoC;AAGpC,MAAa,YAAY;IAChB,MAAM,GAAG,EAAE,CAAC;IACZ,IAAI,GAAa,EAAE,CAAC;IACpB,MAAM,CAAW;CACzB;AAJD,oCAIC;AAED,MAAa,SAAS;IACb,SAAS,CAAU;IACnB,UAAU,CAAkB;IAC5B,SAAS,CAAU;IACnB,SAAS,CAAqB;IAC9B,OAAO,GAAG,EAAE,CAAC;IACb,SAAS,GAAG,EAAE,CAAC;CACvB;AAPD,8BAOC;AAED,SAAgB,UAAU;IACxB,MAAM,GAAG,GAAG,IAAI,SAAS,EAAE,CAAC;IAC5B,GAAG,CAAC,SAAS,GAAG,IAAA,SAAM,GAAE,CAAC;IACzB,OAAO,GAAG,CAAC;AACb,CAAC"} \ No newline at end of file +{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/messages/request.ts"],"names":[],"mappings":";;;AAiBA,gCAIC;AAnBD,MAAa,YAAY;IAChB,MAAM,GAAG,EAAE,CAAC;IACZ,IAAI,GAAa,EAAE,CAAC;IACpB,MAAM,CAAW;CACzB;AAJD,oCAIC;AAED,MAAa,SAAS;IACb,SAAS,CAAU;IACnB,UAAU,CAAkB;IAC5B,SAAS,CAAU;IACnB,SAAS,CAAqB;IAC9B,OAAO,GAAG,EAAE,CAAC;IACb,SAAS,GAAG,EAAE,CAAC;CACvB;AAPD,8BAOC;AAED,SAAgB,UAAU;IACxB,MAAM,GAAG,GAAG,IAAI,SAAS,EAAE,CAAC;IAC5B,GAAG,CAAC,SAAS,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IACpC,OAAO,GAAG,CAAC;AACb,CAAC"} \ No newline at end of file diff --git a/esm/messages/request.js b/esm/messages/request.js index 546a68a..2b61094 100644 --- a/esm/messages/request.js +++ b/esm/messages/request.js @@ -1,4 +1,3 @@ -import { v4 as uuidv4 } from "uuid"; export class ICRequestObj { objnam = ""; keys = []; @@ -14,7 +13,7 @@ export class ICRequest { } export function GetRequest() { const req = new ICRequest(); - req.messageID = uuidv4(); + req.messageID = crypto.randomUUID(); return req; } //# sourceMappingURL=request.js.map \ No newline at end of file diff --git a/esm/messages/request.js.map b/esm/messages/request.js.map index 5e00453..8aa0d27 100644 --- a/esm/messages/request.js.map +++ b/esm/messages/request.js.map @@ -1 +1 @@ -{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/messages/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAGpC,MAAM,OAAO,YAAY;IAChB,MAAM,GAAG,EAAE,CAAC;IACZ,IAAI,GAAa,EAAE,CAAC;IACpB,MAAM,CAAW;CACzB;AAED,MAAM,OAAO,SAAS;IACb,SAAS,CAAU;IACnB,UAAU,CAAkB;IAC5B,SAAS,CAAU;IACnB,SAAS,CAAqB;IAC9B,OAAO,GAAG,EAAE,CAAC;IACb,SAAS,GAAG,EAAE,CAAC;CACvB;AAED,MAAM,UAAU,UAAU;IACxB,MAAM,GAAG,GAAG,IAAI,SAAS,EAAE,CAAC;IAC5B,GAAG,CAAC,SAAS,GAAG,MAAM,EAAE,CAAC;IACzB,OAAO,GAAG,CAAC;AACb,CAAC"} \ No newline at end of file +{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/messages/request.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,YAAY;IAChB,MAAM,GAAG,EAAE,CAAC;IACZ,IAAI,GAAa,EAAE,CAAC;IACpB,MAAM,CAAW;CACzB;AAED,MAAM,OAAO,SAAS;IACb,SAAS,CAAU;IACnB,UAAU,CAAkB;IAC5B,SAAS,CAAU;IACnB,SAAS,CAAqB;IAC9B,OAAO,GAAG,EAAE,CAAC;IACb,SAAS,GAAG,EAAE,CAAC;CACvB;AAED,MAAM,UAAU,UAAU;IACxB,MAAM,GAAG,GAAG,IAAI,SAAS,EAAE,CAAC;IAC5B,GAAG,CAAC,SAAS,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IACpC,OAAO,GAAG,CAAC;AACb,CAAC"} \ No newline at end of file diff --git a/mise.toml b/mise.toml new file mode 100644 index 0000000..6ea5a7e --- /dev/null +++ b/mise.toml @@ -0,0 +1,2 @@ +[tools] +node = "24" diff --git a/package-lock.json b/package-lock.json index aeb260f..a487c92 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,6 @@ "license": "MIT", "dependencies": { "debug": "^4.4.0", - "uuid": "^11.0.3", "ws": "^8.18.0" }, "devDependencies": { @@ -18,7 +17,6 @@ "@types/debug": "^4.1.12", "@types/jest": "^29.5.14", "@types/minimist": "^1.2.5", - "@types/uuid": "^10.0.0", "@types/ws": "^8.5.14", "eslint": "^9.17.0", "jest": "^29.7.0", @@ -1525,13 +1523,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/uuid": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz", - "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/ws": { "version": "8.5.14", "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.14.tgz", @@ -6110,19 +6101,6 @@ "punycode": "^2.1.0" } }, - "node_modules/uuid": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.3.tgz", - "integrity": "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==", - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "license": "MIT", - "bin": { - "uuid": "dist/esm/bin/uuid" - } - }, "node_modules/v8-to-istanbul": { "version": "9.3.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", diff --git a/package.json b/package.json index 1844130..f73dbe9 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,6 @@ }, "dependencies": { "debug": "^4.4.0", - "uuid": "^11.0.3", "ws": "^8.18.0" }, "devDependencies": { @@ -89,7 +88,6 @@ "@types/debug": "^4.1.12", "@types/jest": "^29.5.14", "@types/minimist": "^1.2.5", - "@types/uuid": "^10.0.0", "@types/ws": "^8.5.14", "eslint": "^9.17.0", "jest": "^29.7.0", diff --git a/src/messages/request.ts b/src/messages/request.ts index 244a2c2..14aa9ce 100644 --- a/src/messages/request.ts +++ b/src/messages/request.ts @@ -1,4 +1,3 @@ -import { v4 as uuidv4 } from "uuid"; import { ICParam } from "./param.js"; export class ICRequestObj { @@ -18,6 +17,6 @@ export class ICRequest { export function GetRequest(): ICRequest { const req = new ICRequest(); - req.messageID = uuidv4(); + req.messageID = crypto.randomUUID(); return req; }