From 444ffe28c2e375b8e5097b0e4a82036334f4c579 Mon Sep 17 00:00:00 2001 From: mldangelo Date: Fri, 19 Dec 2025 11:24:11 -0800 Subject: [PATCH 1/2] feat: migrate from better-sqlite3 to Node.js built-in node:sqlite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Replace better-sqlite3 with node:sqlite (requires Node >= 24) - Add type-safe query helper with exec, prepare, all, get, run methods - Add safe bigint-to-number conversion with overflow protection - Add graceful database shutdown on process exit - Fix Eval.save() falsy check bug (id=0 would incorrectly INSERT) - Fix Eval.delete() to cascade delete eval_results (prevent orphans) - Suppress ExperimentalWarning in all npm scripts - Remove 38 native dependencies (~400 lines from lock file) BREAKING CHANGE: Requires Node.js >= 24 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- package-lock.json | 435 +------------------------------------- package.json | 2 +- server/bootstrap.ts | 40 ++-- server/package.json | 12 +- server/src/db.ts | 63 +++++- server/src/models/eval.ts | 54 ++--- 6 files changed, 107 insertions(+), 499 deletions(-) diff --git a/package-lock.json b/package-lock.json index 40450ab..6cf846a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "prettier": "^3.7.4" }, "engines": { - "node": ">=22" + "node": ">=24" } }, "app": { @@ -1769,16 +1769,6 @@ "@babel/types": "^7.28.2" } }, - "node_modules/@types/better-sqlite3": { - "version": "7.6.13", - "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.13.tgz", - "integrity": "sha512-NMv9ASNARoKksWtsq/SHakpYAYnhBrQgGD8zkLYk/jaK8jUGn08CfEdTRgYhMypUQAfzSP8W6gNLe0q19/t4VA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, "node_modules/@types/body-parser": { "version": "1.19.6", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz", @@ -2477,26 +2467,6 @@ "dev": true, "license": "MIT" }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "node_modules/baseline-browser-mapping": { "version": "2.9.3", "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.3.tgz", @@ -2507,20 +2477,6 @@ "baseline-browser-mapping": "dist/cli.js" } }, - "node_modules/better-sqlite3": { - "version": "12.5.0", - "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.5.0.tgz", - "integrity": "sha512-WwCZ/5Diz7rsF29o27o0Gcc1Du+l7Zsv7SYtVPG0X3G/uUI1LqdxrQI7c9Hs2FWpqXXERjW9hp6g3/tH7DlVKg==", - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "bindings": "^1.5.0", - "prebuild-install": "^7.1.1" - }, - "engines": { - "node": "20.x || 22.x || 23.x || 24.x || 25.x" - } - }, "node_modules/bidi-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz", @@ -2544,26 +2500,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "license": "MIT", - "dependencies": { - "file-uri-to-path": "1.0.0" - } - }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "license": "MIT", - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, "node_modules/body-parser": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.1.tgz", @@ -2645,30 +2581,6 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, - "node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -2816,12 +2728,6 @@ "node": ">= 6" } }, - "node_modules/chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "license": "ISC" - }, "node_modules/cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", @@ -3045,30 +2951,6 @@ "dev": true, "license": "MIT" }, - "node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "license": "MIT", - "dependencies": { - "mimic-response": "^3.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "license": "MIT", - "engines": { - "node": ">=4.0.0" - } - }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -3095,15 +2977,6 @@ "node": ">=6" } }, - "node_modules/detect-libc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", - "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", - "license": "Apache-2.0", - "engines": { - "node": ">=8" - } - }, "node_modules/dom-accessibility-api": { "version": "0.5.16", "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", @@ -3154,15 +3027,6 @@ "node": ">= 0.8" } }, - "node_modules/end-of-stream": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", - "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==", - "license": "MIT", - "dependencies": { - "once": "^1.4.0" - } - }, "node_modules/entities": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz", @@ -3517,15 +3381,6 @@ "node": ">= 0.6" } }, - "node_modules/expand-template": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", - "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", - "license": "(MIT OR WTFPL)", - "engines": { - "node": ">=6" - } - }, "node_modules/expect-type": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.2.tgz", @@ -3638,12 +3493,6 @@ "node": ">=16.0.0" } }, - "node_modules/file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "license": "MIT" - }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", @@ -3734,12 +3583,6 @@ "node": ">= 0.8" } }, - "node_modules/fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "license": "MIT" - }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -3834,12 +3677,6 @@ "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" } }, - "node_modules/github-from-package": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", - "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", - "license": "MIT" - }, "node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -3996,26 +3833,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "BSD-3-Clause" - }, "node_modules/ignore": { "version": "7.0.5", "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", @@ -4076,12 +3893,6 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "license": "ISC" }, - "node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "license": "ISC" - }, "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -4413,18 +4224,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -4459,21 +4258,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "license": "MIT" - }, "node_modules/mrmime": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz", @@ -4509,12 +4293,6 @@ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, - "node_modules/napi-build-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", - "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==", - "license": "MIT" - }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -4531,18 +4309,6 @@ "node": ">= 0.6" } }, - "node_modules/node-abi": { - "version": "3.85.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.85.0.tgz", - "integrity": "sha512-zsFhmbkAzwhTft6nd3VxcG0cvJsT70rL+BIGHWVq5fi6MwGrHwzqKaxXE+Hl2GmnGItnDKPPkO5/LQqjVkIdFg==", - "license": "MIT", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/node-releases": { "version": "2.0.27", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz", @@ -4860,32 +4626,6 @@ "node": "^10 || ^12 || >=14" } }, - "node_modules/prebuild-install": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", - "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==", - "license": "MIT", - "dependencies": { - "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^2.0.0", - "node-abi": "^3.3.0", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^4.0.0", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - }, - "bin": { - "prebuild-install": "bin.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -4960,16 +4700,6 @@ "dev": true, "license": "MIT" }, - "node_modules/pump": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz", - "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==", - "license": "MIT", - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -5019,30 +4749,6 @@ "node": ">= 0.10" } }, - "node_modules/rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", - "dependencies": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "bin": { - "rc": "cli.js" - } - }, - "node_modules/rc/node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/react": { "version": "19.2.1", "resolved": "https://registry.npmjs.org/react/-/react-19.2.1.tgz", @@ -5081,20 +4787,6 @@ "node": ">=0.10.0" } }, - "node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -5243,26 +4935,6 @@ "tslib": "^2.1.0" } }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -5292,6 +4964,7 @@ "version": "7.7.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", + "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -5458,51 +5131,6 @@ "dev": true, "license": "ISC" }, - "node_modules/simple-concat": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", - "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/simple-get": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", - "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "decompress-response": "^6.0.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, "node_modules/simple-update-notifier": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", @@ -5564,15 +5192,6 @@ "dev": true, "license": "MIT" }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -5650,34 +5269,6 @@ "dev": true, "license": "MIT" }, - "node_modules/tar-fs": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz", - "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==", - "license": "MIT", - "dependencies": { - "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", - "pump": "^3.0.0", - "tar-stream": "^2.1.4" - } - }, - "node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "license": "MIT", - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/tinybench": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", @@ -5860,18 +5451,6 @@ "fsevents": "~2.3.3" } }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", - "license": "Apache-2.0", - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -5977,12 +5556,6 @@ "punycode": "^2.1.0" } }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "license": "MIT" - }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -6872,12 +6445,10 @@ "version": "0.1.0", "license": "MIT", "dependencies": { - "better-sqlite3": "^12.5.0", "cors": "^2.8.5", "express": "^5.2.1" }, "devDependencies": { - "@types/better-sqlite3": "^7.6.13", "@types/cors": "^2.8.19", "@types/express": "^5.0.6", "@types/node": "^24.10.1", @@ -6886,7 +6457,7 @@ "typescript": "^5.9.3" }, "engines": { - "node": ">=22" + "node": ">=24" } } } diff --git a/package.json b/package.json index dd798db..dd6798d 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,6 @@ "prettier": "^3.7.4" }, "engines": { - "node": ">=22" + "node": ">=24" } } diff --git a/server/bootstrap.ts b/server/bootstrap.ts index 0d27b82..051f5a9 100644 --- a/server/bootstrap.ts +++ b/server/bootstrap.ts @@ -1,28 +1,21 @@ -import Database from 'better-sqlite3'; import { evals, evalResults } from './sample_data'; +import { query } from './src/db'; -const dbPath = 'db.sqlite'; - -const db = new Database(dbPath); - -db.exec( +query.exec( 'CREATE TABLE IF NOT EXISTS evals (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT)' ); -db.exec( +query.exec( 'CREATE TABLE IF NOT EXISTS eval_results (id INTEGER PRIMARY KEY AUTOINCREMENT, eval_id INTEGER, input TEXT, output TEXT, passed BOOLEAN)' ); const insertEvals = () => { // Check if data already exists - const existingCount = ( - db.prepare('SELECT COUNT(*) as count FROM evals').get() as { count: number } - ).count; + const result = query.get<{ count: number }>('SELECT COUNT(*) as count FROM evals'); + const existingCount = result?.count ?? 0; if (existingCount === 0) { - const stmt = db.prepare( - 'INSERT OR IGNORE INTO evals (id, name) VALUES (?, ?)' - ); + const stmt = query.prepare('INSERT OR IGNORE INTO evals (id, name) VALUES (?, ?)'); evals.forEach((eval_) => { stmt.run(eval_.id, eval_.name); @@ -36,26 +29,23 @@ const insertEvals = () => { const insertEvalResults = () => { // Check if data already exists - const existingCount = ( - db.prepare('SELECT COUNT(*) as count FROM eval_results').get() as { - count: number; - } - ).count; + const result = query.get<{ count: number }>('SELECT COUNT(*) as count FROM eval_results'); + const existingCount = result?.count ?? 0; if (existingCount === 0) { - const stmt = db.prepare( + const stmt = query.prepare( 'INSERT OR IGNORE INTO eval_results (id, eval_id, input, output, passed) VALUES (?, ?, ?, ?, ?)' ); - evalResults.forEach((result) => { + evalResults.forEach((evalResult) => { // Convert boolean to integer (0 or 1) for SQLite compatibility - const passedValue = result.passed ? 1 : 0; + const passedValue = evalResult.passed ? 1 : 0; stmt.run( - result.id, - result.evalId, - result.input, - result.output, + evalResult.id, + evalResult.evalId, + evalResult.input, + evalResult.output, passedValue ); }); diff --git a/server/package.json b/server/package.json index 8022d02..b8377e8 100644 --- a/server/package.json +++ b/server/package.json @@ -5,9 +5,9 @@ "main": "index.ts", "type": "module", "scripts": { - "test": "tsx --test src/**/*.test.ts", - "bootstrap": "tsx bootstrap.ts", - "start": "tsx bootstrap.ts && nodemon", + "test": "node --no-warnings=ExperimentalWarning --import tsx --test src/**/*.test.ts", + "bootstrap": "node --no-warnings=ExperimentalWarning --import tsx bootstrap.ts", + "start": "node --no-warnings=ExperimentalWarning --import tsx bootstrap.ts && nodemon", "build": "tsc --noEmit" }, "author": "Promptfoo Team", @@ -19,12 +19,10 @@ "typescript" ], "dependencies": { - "better-sqlite3": "^12.5.0", "cors": "^2.8.5", "express": "^5.2.1" }, "devDependencies": { - "@types/better-sqlite3": "^7.6.13", "@types/cors": "^2.8.19", "@types/express": "^5.0.6", "@types/node": "^24.10.1", @@ -33,7 +31,7 @@ "typescript": "^5.9.3" }, "engines": { - "node": ">=22" + "node": ">=24" }, "nodemonConfig": { "watch": [ @@ -48,7 +46,7 @@ "*.test.ts", "db.sqlite" ], - "exec": "tsx src/index.ts", + "exec": "node --no-warnings=ExperimentalWarning --import tsx src/index.ts", "env": { "NODE_ENV": "development" } diff --git a/server/src/db.ts b/server/src/db.ts index b106c84..f91f947 100644 --- a/server/src/db.ts +++ b/server/src/db.ts @@ -1,3 +1,62 @@ -import Database from 'better-sqlite3'; +import { DatabaseSync, type StatementSync } from 'node:sqlite'; -export const db: Database.Database = new Database('db.sqlite'); +export type { StatementSync }; + +const db = new DatabaseSync('db.sqlite'); + +// Graceful shutdown - close db before process exits +process.on('exit', () => { + if (db.isOpen) { + db.close(); + } +}); + +type QueryParam = null | number | bigint | string; + +/** Result of an INSERT/UPDATE/DELETE with safe number conversion */ +export interface RunResult { + changes: number; + lastInsertRowid: number; +} + +/** Safely convert bigint to number, throwing if overflow would occur */ +function safeNumber(value: number | bigint): number { + if (typeof value === 'bigint') { + if (value > Number.MAX_SAFE_INTEGER || value < Number.MIN_SAFE_INTEGER) { + throw new RangeError(`Value ${value} exceeds safe integer range`); + } + return Number(value); + } + return value; +} + +/** + * Type-safe query helpers for node:sqlite + */ +export const query = { + /** Execute raw SQL without returning results (for DDL statements) */ + exec(sql: string): void { + db.exec(sql); + }, + + /** Get a prepared statement for batch operations */ + prepare(sql: string): StatementSync { + return db.prepare(sql); + }, + + all(sql: string, ...params: QueryParam[]): T[] { + return db.prepare(sql).all(...params) as T[]; + }, + + get(sql: string, ...params: QueryParam[]): T | undefined { + return db.prepare(sql).get(...params) as T | undefined; + }, + + run(sql: string, ...params: QueryParam[]): RunResult { + const result = db.prepare(sql).run(...params); + return { + changes: safeNumber(result.changes), + lastInsertRowid: safeNumber(result.lastInsertRowid), + }; + }, +}; diff --git a/server/src/models/eval.ts b/server/src/models/eval.ts index 393cf33..4c738fb 100644 --- a/server/src/models/eval.ts +++ b/server/src/models/eval.ts @@ -1,4 +1,4 @@ -import { db } from '../db'; +import { query } from '../db'; export interface EvalResult { id: number; @@ -18,20 +18,18 @@ interface EvalRow { } export class Eval { - id: number; + id: number | undefined; name: string; results: EvalResult[]; - constructor(id: number, name: string, results: EvalResult[] = []) { + constructor(name: string, id?: number, results: EvalResult[] = []) { this.id = id; this.name = name; this.results = results; } static findAll(): Eval[] { - const rows = db - .prepare( - ` + const rows = query.all(` SELECT e.id as eval_id, e.name as eval_name, @@ -41,15 +39,13 @@ export class Eval { r.passed FROM evals e LEFT JOIN eval_results r ON e.id = r.eval_id - ` - ) - .all() as EvalRow[]; + `); const evalsMap = new Map(); - rows.forEach((row: EvalRow) => { + rows.forEach((row) => { if (!evalsMap.has(row.eval_id)) { - evalsMap.set(row.eval_id, new Eval(row.eval_id, row.eval_name)); + evalsMap.set(row.eval_id, new Eval(row.eval_name, row.eval_id)); } if (row.result_id) { @@ -68,9 +64,8 @@ export class Eval { } static findById(id: number): Eval | null { - const rows = db - .prepare( - ` + const rows = query.all( + ` SELECT e.id as eval_id, e.name as eval_name, @@ -81,20 +76,17 @@ export class Eval { FROM evals e LEFT JOIN eval_results r ON e.id = r.eval_id WHERE e.id = ? - ` - ) - .all(id) as EvalRow[]; + `, + id + ); if (rows.length === 0) { return null; } - const eval_ = new Eval( - (rows[0] as EvalRow).eval_id, - (rows[0] as EvalRow).eval_name - ); + const eval_ = new Eval(rows[0].eval_name, rows[0].eval_id); - rows.forEach((row: EvalRow) => { + rows.forEach((row) => { if (row.result_id) { eval_.results.push({ id: row.result_id, @@ -110,22 +102,20 @@ export class Eval { } save(): void { - if (this.id) { + if (this.id !== undefined) { // Update - db.prepare('UPDATE evals SET name = ? WHERE id = ?').run( - this.name, - this.id - ); + query.run('UPDATE evals SET name = ? WHERE id = ?', this.name, this.id); } else { // Insert - const result = db - .prepare('INSERT INTO evals (name) VALUES (?)') - .run(this.name); - this.id = result.lastInsertRowid as number; + const result = query.run('INSERT INTO evals (name) VALUES (?)', this.name); + this.id = result.lastInsertRowid; } } delete(): void { - db.prepare('DELETE FROM evals WHERE id = ?').run(this.id); + if (this.id === undefined) return; + // Delete results first to avoid orphans (no FK cascade in schema) + query.run('DELETE FROM eval_results WHERE eval_id = ?', this.id); + query.run('DELETE FROM evals WHERE id = ?', this.id); } } From c1bb0c9e66b4ca050082a5a88946410b30a414f2 Mon Sep 17 00:00:00 2001 From: mldangelo Date: Fri, 19 Dec 2025 11:27:39 -0800 Subject: [PATCH 2/2] chore: update .nvmrc to Node 24 and fix formatting --- .nvmrc | 4 ++-- server/bootstrap.ts | 12 +++++++++--- server/src/models/eval.ts | 5 ++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.nvmrc b/.nvmrc index d8fd48f..b2a2589 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1,2 +1,2 @@ -22 -# Note: Project requires Node 22+ \ No newline at end of file +24 +# Note: Project requires Node 24+ (for built-in node:sqlite) \ No newline at end of file diff --git a/server/bootstrap.ts b/server/bootstrap.ts index 051f5a9..55219a7 100644 --- a/server/bootstrap.ts +++ b/server/bootstrap.ts @@ -11,11 +11,15 @@ query.exec( const insertEvals = () => { // Check if data already exists - const result = query.get<{ count: number }>('SELECT COUNT(*) as count FROM evals'); + const result = query.get<{ count: number }>( + 'SELECT COUNT(*) as count FROM evals' + ); const existingCount = result?.count ?? 0; if (existingCount === 0) { - const stmt = query.prepare('INSERT OR IGNORE INTO evals (id, name) VALUES (?, ?)'); + const stmt = query.prepare( + 'INSERT OR IGNORE INTO evals (id, name) VALUES (?, ?)' + ); evals.forEach((eval_) => { stmt.run(eval_.id, eval_.name); @@ -29,7 +33,9 @@ const insertEvals = () => { const insertEvalResults = () => { // Check if data already exists - const result = query.get<{ count: number }>('SELECT COUNT(*) as count FROM eval_results'); + const result = query.get<{ count: number }>( + 'SELECT COUNT(*) as count FROM eval_results' + ); const existingCount = result?.count ?? 0; if (existingCount === 0) { diff --git a/server/src/models/eval.ts b/server/src/models/eval.ts index 4c738fb..9cfb339 100644 --- a/server/src/models/eval.ts +++ b/server/src/models/eval.ts @@ -107,7 +107,10 @@ export class Eval { query.run('UPDATE evals SET name = ? WHERE id = ?', this.name, this.id); } else { // Insert - const result = query.run('INSERT INTO evals (name) VALUES (?)', this.name); + const result = query.run( + 'INSERT INTO evals (name) VALUES (?)', + this.name + ); this.id = result.lastInsertRowid; } }