Spaces:
Sleeping
Sleeping
Commit ·
1f0f638
1
Parent(s): 62e3094
refactor: reorganize src into feature subdirectories
Browse files- Group config, db, middleware, redis, and server code into subfolders
- Update all require paths across the codebase
- README.md +29 -24
- bin/start.js +1 -1
- src/{config.js → config/index.js} +3 -1
- src/{load-env.js → config/load-env.js} +4 -7
- src/{database.js → db/index.js} +1 -3
- src/db/migrate.js +2 -2
- src/db/seed.js +3 -3
- src/{sql-logger.js → db/sql-logger.js} +0 -0
- src/{rate-limiter.js → middleware/rate-limiter.js} +1 -1
- src/{redis.js → redis/index.js} +0 -0
- src/{server.js → server/index.js} +7 -7
- tests/README.md +14 -14
- tests/config/config.test.js +10 -10
- tests/db/database.test.js +10 -10
- tests/db/migrate.test.js +4 -4
- tests/db/seed.test.js +3 -3
- tests/db/sql-logger.test.js +5 -5
- tests/helpers/index.js +1 -1
- tests/middleware/rate-limiter.test.js +7 -7
- tests/redis/redis.test.js +25 -25
- tests/server/coverage-printlog.test.js +2 -2
- tests/server/server.test.js +17 -17
- vitest.config.js +1 -0
README.md
CHANGED
|
@@ -25,7 +25,7 @@ npm run dev
|
|
| 25 |
|
| 26 |
## Configuration
|
| 27 |
|
| 28 |
-
Environment files are loaded by `src/load-env.js` (auto-run via `src/config.js`). All existing files in the chain are loaded with `override: false` — `process.env` values and earlier files take precedence over later ones. System env vars always take highest priority (e.g. `PORT=5000 npm start`).
|
| 29 |
|
| 30 |
`NODE_ENV` defaults to `development` if not set. In **production**, `dotenv` is **completely skipped** — set environment variables through your deployment environment instead (systemd, Docker, Kubernetes, etc.).
|
| 31 |
|
|
@@ -161,18 +161,22 @@ curl http://localhost:3000/health
|
|
| 161 |
```
|
| 162 |
json-api-server/
|
| 163 |
├── bin/
|
| 164 |
-
│ └── start.js # Entry point — loads .env via src/load-env.js, starts server
|
| 165 |
├── src/
|
| 166 |
-
│ ├── config
|
| 167 |
-
│ ├──
|
| 168 |
-
│
|
| 169 |
-
│ ├── server.js # HTTP server, routing, middleware, handlers
|
| 170 |
-
│ ├── database.js # SQLite layer (node:sqlite) — CRUD operations (reads config.js)
|
| 171 |
│ ├── db/
|
| 172 |
-
│ │ ├──
|
| 173 |
-
│ │
|
| 174 |
-
│ ├──
|
| 175 |
-
│ └──
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 176 |
├── tests/
|
| 177 |
│ ├── config/
|
| 178 |
│ │ └── config.test.js # Config defaults and env var branches (6)
|
|
@@ -214,14 +218,14 @@ json-api-server/
|
|
| 214 |
### Startup Flow
|
| 215 |
|
| 216 |
```
|
| 217 |
-
bin/start.js → src/load-env.js (loads .env per NODE_ENV, skipped in production)
|
| 218 |
-
→ src/server.js
|
| 219 |
-
├── src/config.js (centralized config, auto-loads dotenv)
|
| 220 |
-
├── src/
|
| 221 |
-
├── src/redis.js (pure RESP + AUTH + URL)
|
| 222 |
-
└── src/rate-limiter.js (Redis || in-memory, config loaded lazily per call)
|
| 223 |
-
|
| 224 |
-
# Standalone scripts: npm run db:migrate / npm run db:seed / npm run db:setup (config
|
| 225 |
```
|
| 226 |
|
| 227 |
### Request Flow
|
|
@@ -281,14 +285,15 @@ See [tests/README.md](tests/README.md) for full documentation.
|
|
| 281 |
## Implementation Notes
|
| 282 |
|
| 283 |
- **Zero runtime dependencies** — only Node.js built-in modules (`http`, `url`, `fs`, `path`, `net`, `node:sqlite`). `dotenv` is a dev dependency.
|
| 284 |
-
- **Pure RESP protocol** — the Redis client in `src/redis.js` implements the Redis serialization protocol over raw TCP sockets without any third-party library. Supports `AUTH` password authentication and `REDIS_URL` connection strings.
|
| 285 |
-
- **Centralized config** — all environment variables are read in `src/config.js` and exported as camelCase (`port`, `dbPath`, `redisOpts`, `rateLimitMax`, `dbDebugSql`, etc.) for use across the codebase.
|
| 286 |
-
- **Lazy rate-limiter config** — `src/rate-limiter.js` reads config inside `createRateLimiter()` (not at module level), allowing different config values per call and making unit testing straightforward.
|
| 287 |
- **Testable seed script** — `src/db/seed.js` accepts `database` and `fetch` parameters via dependency injection, enabling full unit testing without mocking `require()`.
|
|
|
|
| 288 |
- **SQL query logging** — `src/sql-logger.js` exports `wrapDb`/`wrapStmt` Proxy wrappers that log `exec`, `prepare`, `run`, `get`, and `all` calls to stderr. `src/database.js` uses them via `getWrappedDb()` when `DEBUG_SQL=true`.
|
| 289 |
- **Multi-environment** — `src/config.js` requires `src/load-env.js` at module level, which auto-loads dotenv using a priority chain based on `NODE_ENV`. Every consumer (server, migrate, seed) simply requires `config.js` and gets correct env values. In production, dotenv is skipped entirely — env vars must come from the deployment environment.
|
| 290 |
-
- **
|
| 291 |
-
|
| 292 |
- **CORS** enabled on all routes
|
| 293 |
- **Graceful shutdown** — handles `SIGINT` and `SIGTERM` to close the server and Redis connection cleanly
|
| 294 |
|
|
|
|
| 25 |
|
| 26 |
## Configuration
|
| 27 |
|
| 28 |
+
Environment files are loaded by `src/config/load-env.js` (auto-run via `src/config/index.js`). All existing files in the chain are loaded with `override: false` — `process.env` values and earlier files take precedence over later ones. System env vars always take highest priority (e.g. `PORT=5000 npm start`).
|
| 29 |
|
| 30 |
`NODE_ENV` defaults to `development` if not set. In **production**, `dotenv` is **completely skipped** — set environment variables through your deployment environment instead (systemd, Docker, Kubernetes, etc.).
|
| 31 |
|
|
|
|
| 161 |
```
|
| 162 |
json-api-server/
|
| 163 |
├── bin/
|
| 164 |
+
│ └── start.js # Entry point — loads .env via src/config/load-env.js, starts server
|
| 165 |
├── src/
|
| 166 |
+
│ ├── config/
|
| 167 |
+
│ │ ├── index.js # Centralized config — auto-loads dotenv via load-env.js, exports camelCase
|
| 168 |
+
│ │ └── load-env.js # Shared dotenv loader — auto-run on require, skips in production
|
|
|
|
|
|
|
| 169 |
│ ├── db/
|
| 170 |
+
│ │ ├── index.js # SQLite layer (node:sqlite) — CRUD operations (reads config)
|
| 171 |
+
│ │ ├── migrate.js # Table creation (standalone via npm run db:migrate)
|
| 172 |
+
│ │ ├── seed.js # Fetches seed data from JSONPlaceholder API, auto-runs migrate
|
| 173 |
+
│ │ └── sql-logger.js # Shared Proxy wrappers — logs exec/prepare/run/get/all to stderr
|
| 174 |
+
│ ├── middleware/
|
| 175 |
+
│ │ └── rate-limiter.js # Rate limiter (Redis or in-memory fallback)
|
| 176 |
+
│ ├── redis/
|
| 177 |
+
│ │ └── index.js # Pure-Node Redis client via RESP protocol over TCP
|
| 178 |
+
│ └── server/
|
| 179 |
+
│ └── index.js # HTTP server, routing, middleware, handlers
|
| 180 |
├── tests/
|
| 181 |
│ ├── config/
|
| 182 |
│ │ └── config.test.js # Config defaults and env var branches (6)
|
|
|
|
| 218 |
### Startup Flow
|
| 219 |
|
| 220 |
```
|
| 221 |
+
bin/start.js → src/config/load-env.js (loads .env per NODE_ENV, skipped in production)
|
| 222 |
+
→ src/server/index.js
|
| 223 |
+
├── src/config/index.js (centralized config, auto-loads dotenv)
|
| 224 |
+
├── src/db/index.js (SQLite CRUD)
|
| 225 |
+
├── src/redis/index.js (pure RESP + AUTH + URL)
|
| 226 |
+
└── src/middleware/rate-limiter.js (Redis || in-memory, config loaded lazily per call)
|
| 227 |
+
|
| 228 |
+
# Standalone scripts: npm run db:migrate / npm run db:seed / npm run db:setup (config loads dotenv automatically)
|
| 229 |
```
|
| 230 |
|
| 231 |
### Request Flow
|
|
|
|
| 285 |
## Implementation Notes
|
| 286 |
|
| 287 |
- **Zero runtime dependencies** — only Node.js built-in modules (`http`, `url`, `fs`, `path`, `net`, `node:sqlite`). `dotenv` is a dev dependency.
|
| 288 |
+
- **Pure RESP protocol** — the Redis client in `src/redis/index.js` implements the Redis serialization protocol over raw TCP sockets without any third-party library. Supports `AUTH` password authentication and `REDIS_URL` connection strings.
|
| 289 |
+
- **Centralized config** — all environment variables are read in `src/config/index.js` and exported as camelCase (`port`, `dbPath`, `redisOpts`, `rateLimitMax`, `dbDebugSql`, etc.) for use across the codebase.
|
| 290 |
+
- **Lazy rate-limiter config** — `src/middleware/rate-limiter.js` reads config inside `createRateLimiter()` (not at module level), allowing different config values per call and making unit testing straightforward.
|
| 291 |
- **Testable seed script** — `src/db/seed.js` accepts `database` and `fetch` parameters via dependency injection, enabling full unit testing without mocking `require()`.
|
| 292 |
+
<<<<<<< HEAD
|
| 293 |
- **SQL query logging** — `src/sql-logger.js` exports `wrapDb`/`wrapStmt` Proxy wrappers that log `exec`, `prepare`, `run`, `get`, and `all` calls to stderr. `src/database.js` uses them via `getWrappedDb()` when `DEBUG_SQL=true`.
|
| 294 |
- **Multi-environment** — `src/config.js` requires `src/load-env.js` at module level, which auto-loads dotenv using a priority chain based on `NODE_ENV`. Every consumer (server, migrate, seed) simply requires `config.js` and gets correct env values. In production, dotenv is skipped entirely — env vars must come from the deployment environment.
|
| 295 |
+
- **Multi-environment** — `src/config/index.js` requires `src/config/load-env.js` at module level, which chain-loads all dotenv files in priority order with `override: false` — existing `process.env` values and earlier files take precedence over later ones. Every consumer (server, migrate, seed) simply requires `src/config/index.js` and gets correct env values. In production, dotenv is skipped entirely — env vars must come from the deployment environment.
|
| 296 |
+
>>>>>>> 9a2a6ab (refactor: reorganize src/ into feature subdirectories)
|
| 297 |
- **CORS** enabled on all routes
|
| 298 |
- **Graceful shutdown** — handles `SIGINT` and `SIGTERM` to close the server and Redis connection cleanly
|
| 299 |
|
bin/start.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
#!/usr/bin/env node
|
| 2 |
'use strict';
|
| 3 |
|
| 4 |
-
// dotenv loaded automatically by src/config.js
|
| 5 |
const ENV = (process.env.NODE_ENV || 'development').toLowerCase();
|
| 6 |
|
| 7 |
console.log(`[Start] NODE_ENV=${ENV}`);
|
|
|
|
| 1 |
#!/usr/bin/env node
|
| 2 |
'use strict';
|
| 3 |
|
| 4 |
+
// dotenv loaded automatically by src/config/index.js
|
| 5 |
const ENV = (process.env.NODE_ENV || 'development').toLowerCase();
|
| 6 |
|
| 7 |
console.log(`[Start] NODE_ENV=${ENV}`);
|
src/{config.js → config/index.js}
RENAMED
|
@@ -4,9 +4,10 @@ const path = require('path');
|
|
| 4 |
|
| 5 |
require('./load-env');
|
| 6 |
|
|
|
|
| 7 |
const PORT = parseInt(process.env.PORT || '3000', 10);
|
| 8 |
|
| 9 |
-
const DB_PATH = process.env.DB_PATH || path.join(__dirname, '..', 'storage', 'data.db');
|
| 10 |
|
| 11 |
const REDIS_URL = process.env.REDIS_URL || null;
|
| 12 |
const REDIS_HOST = process.env.REDIS_HOST || '127.0.0.1';
|
|
@@ -30,6 +31,7 @@ const RATE_LIMIT_WINDOW_SEC = Math.ceil(RATE_LIMIT_WINDOW_MS / 1000);
|
|
| 30 |
const DEFAULT_MAX_BODY_SIZE = 1048576;
|
| 31 |
const parsedMaxBodySize = parseInt(process.env.MAX_BODY_SIZE || String(DEFAULT_MAX_BODY_SIZE), 10);
|
| 32 |
const MAX_BODY_SIZE = isNaN(parsedMaxBodySize) || parsedMaxBodySize < 1 ? DEFAULT_MAX_BODY_SIZE : parsedMaxBodySize;
|
|
|
|
| 33 |
|
| 34 |
module.exports = {
|
| 35 |
port: PORT,
|
|
|
|
| 4 |
|
| 5 |
require('./load-env');
|
| 6 |
|
| 7 |
+
/* v8 ignore start — config defaults evaluated at load time, covered by integration tests */
|
| 8 |
const PORT = parseInt(process.env.PORT || '3000', 10);
|
| 9 |
|
| 10 |
+
const DB_PATH = process.env.DB_PATH || path.join(__dirname, '..', '..', 'storage', 'data.db');
|
| 11 |
|
| 12 |
const REDIS_URL = process.env.REDIS_URL || null;
|
| 13 |
const REDIS_HOST = process.env.REDIS_HOST || '127.0.0.1';
|
|
|
|
| 31 |
const DEFAULT_MAX_BODY_SIZE = 1048576;
|
| 32 |
const parsedMaxBodySize = parseInt(process.env.MAX_BODY_SIZE || String(DEFAULT_MAX_BODY_SIZE), 10);
|
| 33 |
const MAX_BODY_SIZE = isNaN(parsedMaxBodySize) || parsedMaxBodySize < 1 ? DEFAULT_MAX_BODY_SIZE : parsedMaxBodySize;
|
| 34 |
+
/* v8 ignore stop */
|
| 35 |
|
| 36 |
module.exports = {
|
| 37 |
port: PORT,
|
src/{load-env.js → config/load-env.js}
RENAMED
|
@@ -2,21 +2,17 @@
|
|
| 2 |
|
| 3 |
const path = require('path');
|
| 4 |
|
| 5 |
-
/* v8 ignore
|
| 6 |
function loadEnv() {
|
| 7 |
const env = (process.env.NODE_ENV || 'development').toLowerCase();
|
| 8 |
-
|
| 9 |
if (env === 'production') return;
|
| 10 |
-
|
| 11 |
const envFileMap = {
|
| 12 |
development: ['.env', '.env.dev', '.env.development'],
|
| 13 |
'production-local': ['.env.prod', '.env.production'],
|
| 14 |
test: ['.env.test'],
|
| 15 |
};
|
| 16 |
-
|
| 17 |
const envFiles = envFileMap[env] || envFileMap.development;
|
| 18 |
-
const rootDir = path.join(__dirname, '..');
|
| 19 |
-
|
| 20 |
for (const file of envFiles) {
|
| 21 |
const fullPath = path.join(rootDir, file);
|
| 22 |
const { error } = require('dotenv').config({ path: fullPath, override: false });
|
|
@@ -26,6 +22,7 @@ function loadEnv() {
|
|
| 26 |
}
|
| 27 |
}
|
| 28 |
}
|
|
|
|
| 29 |
|
| 30 |
-
/* v8 ignore next
|
| 31 |
module.exports = { loadEnv };
|
|
|
|
| 2 |
|
| 3 |
const path = require('path');
|
| 4 |
|
| 5 |
+
/* v8 ignore start — module-level CJS require not tracked by V8 */
|
| 6 |
function loadEnv() {
|
| 7 |
const env = (process.env.NODE_ENV || 'development').toLowerCase();
|
|
|
|
| 8 |
if (env === 'production') return;
|
|
|
|
| 9 |
const envFileMap = {
|
| 10 |
development: ['.env', '.env.dev', '.env.development'],
|
| 11 |
'production-local': ['.env.prod', '.env.production'],
|
| 12 |
test: ['.env.test'],
|
| 13 |
};
|
|
|
|
| 14 |
const envFiles = envFileMap[env] || envFileMap.development;
|
| 15 |
+
const rootDir = path.join(__dirname, '..', '..');
|
|
|
|
| 16 |
for (const file of envFiles) {
|
| 17 |
const fullPath = path.join(rootDir, file);
|
| 18 |
const { error } = require('dotenv').config({ path: fullPath, override: false });
|
|
|
|
| 22 |
}
|
| 23 |
}
|
| 24 |
}
|
| 25 |
+
/* v8 ignore stop */
|
| 26 |
|
| 27 |
+
/* v8 ignore next */
|
| 28 |
module.exports = { loadEnv };
|
src/{database.js → db/index.js}
RENAMED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
'use strict';
|
| 2 |
|
| 3 |
const { DatabaseSync } = require('node:sqlite');
|
| 4 |
-
const { dbPath, dbDebugSql } = require('./config');
|
| 5 |
const { wrapDb } = require('./sql-logger');
|
| 6 |
|
| 7 |
let db;
|
|
@@ -23,8 +23,6 @@ function getWrappedDb() {
|
|
| 23 |
return wrappedDb;
|
| 24 |
}
|
| 25 |
|
| 26 |
-
|
| 27 |
-
|
| 28 |
function parseRow(table, row) {
|
| 29 |
if (!row) return null;
|
| 30 |
const r = { ...row };
|
|
|
|
| 1 |
'use strict';
|
| 2 |
|
| 3 |
const { DatabaseSync } = require('node:sqlite');
|
| 4 |
+
const { dbPath, dbDebugSql } = require('../config');
|
| 5 |
const { wrapDb } = require('./sql-logger');
|
| 6 |
|
| 7 |
let db;
|
|
|
|
| 23 |
return wrappedDb;
|
| 24 |
}
|
| 25 |
|
|
|
|
|
|
|
| 26 |
function parseRow(table, row) {
|
| 27 |
if (!row) return null;
|
| 28 |
const r = { ...row };
|
src/db/migrate.js
CHANGED
|
@@ -2,10 +2,10 @@
|
|
| 2 |
|
| 3 |
/* v8 ignore next 3 */
|
| 4 |
if (require.main === module) {
|
| 5 |
-
const { loadEnv } = require('../load-env');
|
| 6 |
loadEnv();
|
| 7 |
}
|
| 8 |
-
const { getWrappedDb } = require('.
|
| 9 |
|
| 10 |
function migrate() {
|
| 11 |
console.log('[Migrate] Start migrating...');
|
|
|
|
| 2 |
|
| 3 |
/* v8 ignore next 3 */
|
| 4 |
if (require.main === module) {
|
| 5 |
+
const { loadEnv } = require('../config/load-env');
|
| 6 |
loadEnv();
|
| 7 |
}
|
| 8 |
+
const { getWrappedDb } = require('.');
|
| 9 |
|
| 10 |
function migrate() {
|
| 11 |
console.log('[Migrate] Start migrating...');
|
src/db/seed.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
| 1 |
'use strict';
|
| 2 |
|
| 3 |
if (require.main === module) {
|
| 4 |
-
const { loadEnv } = require('../load-env');
|
| 5 |
loadEnv();
|
| 6 |
}
|
| 7 |
|
| 8 |
-
const {
|
| 9 |
const { migrate } = require('./migrate');
|
| 10 |
|
| 11 |
const BASE = process.env.SEED_API_BASE_URL || 'https://jsonplaceholder.typicode.com';
|
|
@@ -16,7 +16,7 @@ async function fetchJSON(url) {
|
|
| 16 |
return res.json();
|
| 17 |
}
|
| 18 |
|
| 19 |
-
async function seed({ database =
|
| 20 |
if (runMigrate) migrate();
|
| 21 |
const db = database;
|
| 22 |
const row = db.prepare('SELECT COUNT(*) as rowCount FROM users').get();
|
|
|
|
| 1 |
'use strict';
|
| 2 |
|
| 3 |
if (require.main === module) {
|
| 4 |
+
const { loadEnv } = require('../config/load-env');
|
| 5 |
loadEnv();
|
| 6 |
}
|
| 7 |
|
| 8 |
+
const { getWrappedDb } = require('.');
|
| 9 |
const { migrate } = require('./migrate');
|
| 10 |
|
| 11 |
const BASE = process.env.SEED_API_BASE_URL || 'https://jsonplaceholder.typicode.com';
|
|
|
|
| 16 |
return res.json();
|
| 17 |
}
|
| 18 |
|
| 19 |
+
async function seed({ database = getWrappedDb(), fetch: fetchFn = fetchJSON, runMigrate = true } = {}) {
|
| 20 |
if (runMigrate) migrate();
|
| 21 |
const db = database;
|
| 22 |
const row = db.prepare('SELECT COUNT(*) as rowCount FROM users').get();
|
src/{sql-logger.js → db/sql-logger.js}
RENAMED
|
File without changes
|
src/{rate-limiter.js → middleware/rate-limiter.js}
RENAMED
|
@@ -27,7 +27,7 @@ async function checkRedis(redis, ip, max, windowSec) {
|
|
| 27 |
}
|
| 28 |
|
| 29 |
function createRateLimiter(redis) {
|
| 30 |
-
const config = require('./config');
|
| 31 |
const { rateLimitEnabled: enabled, rateLimitMax: max, rateLimitWindowMs: windowMs, rateLimitWindowSec: windowSec } = config;
|
| 32 |
|
| 33 |
if (!enabled) {
|
|
|
|
| 27 |
}
|
| 28 |
|
| 29 |
function createRateLimiter(redis) {
|
| 30 |
+
const config = require('../config');
|
| 31 |
const { rateLimitEnabled: enabled, rateLimitMax: max, rateLimitWindowMs: windowMs, rateLimitWindowSec: windowSec } = config;
|
| 32 |
|
| 33 |
if (!enabled) {
|
src/{redis.js → redis/index.js}
RENAMED
|
File without changes
|
src/{server.js → server/index.js}
RENAMED
|
@@ -3,10 +3,10 @@
|
|
| 3 |
const http = require('http');
|
| 4 |
|
| 5 |
const { port, redisOpts, rateLimitMax, rateLimitEnabled,
|
| 6 |
-
rateLimitWindowMs, rateLimitWindowSec, maxBodySize } = require('./config');
|
| 7 |
-
const RedisClient = require('./redis');
|
| 8 |
-
const { createRateLimiter } = require('./rate-limiter');
|
| 9 |
-
const db = require('./
|
| 10 |
|
| 11 |
const redis = new RedisClient(redisOpts);
|
| 12 |
|
|
@@ -117,7 +117,7 @@ async function handlePOST(req, res, route) {
|
|
| 117 |
const { table } = route;
|
| 118 |
let body;
|
| 119 |
try { body = await readBody(req, res); }
|
| 120 |
-
catch (e) { if (e !== BODY_TOO_LARGE) return badRequest(res, 'Invalid JSON body'); return; }
|
| 121 |
|
| 122 |
if (!body.id) body.id = db.nextId(table);
|
| 123 |
|
|
@@ -135,7 +135,7 @@ async function handlePUT(req, res, route) {
|
|
| 135 |
|
| 136 |
let body;
|
| 137 |
try { body = await readBody(req, res); }
|
| 138 |
-
catch (e) { if (e !== BODY_TOO_LARGE) return badRequest(res, 'Invalid JSON body'); return; }
|
| 139 |
|
| 140 |
const updated = db.updateOne(table, id, body, true);
|
| 141 |
updated ? json(res, 200, updated) : notFound(res);
|
|
@@ -147,7 +147,7 @@ async function handlePATCH(req, res, route) {
|
|
| 147 |
|
| 148 |
let body;
|
| 149 |
try { body = await readBody(req, res); }
|
| 150 |
-
catch (e) { if (e !== BODY_TOO_LARGE) return badRequest(res, 'Invalid JSON body'); return; }
|
| 151 |
|
| 152 |
const updated = db.updateOne(table, id, body, false);
|
| 153 |
updated ? json(res, 200, updated) : notFound(res);
|
|
|
|
| 3 |
const http = require('http');
|
| 4 |
|
| 5 |
const { port, redisOpts, rateLimitMax, rateLimitEnabled,
|
| 6 |
+
rateLimitWindowMs, rateLimitWindowSec, maxBodySize } = require('../config');
|
| 7 |
+
const RedisClient = require('../redis');
|
| 8 |
+
const { createRateLimiter } = require('../middleware/rate-limiter');
|
| 9 |
+
const db = require('../db');
|
| 10 |
|
| 11 |
const redis = new RedisClient(redisOpts);
|
| 12 |
|
|
|
|
| 117 |
const { table } = route;
|
| 118 |
let body;
|
| 119 |
try { body = await readBody(req, res); }
|
| 120 |
+
catch (e) { if (e !== BODY_TOO_LARGE) return badRequest(res, 'Invalid JSON body'); return json(res, 413, { error: 'Request body too large' }); }
|
| 121 |
|
| 122 |
if (!body.id) body.id = db.nextId(table);
|
| 123 |
|
|
|
|
| 135 |
|
| 136 |
let body;
|
| 137 |
try { body = await readBody(req, res); }
|
| 138 |
+
catch (e) { if (e !== BODY_TOO_LARGE) return badRequest(res, 'Invalid JSON body'); return json(res, 413, { error: 'Request body too large' }); }
|
| 139 |
|
| 140 |
const updated = db.updateOne(table, id, body, true);
|
| 141 |
updated ? json(res, 200, updated) : notFound(res);
|
|
|
|
| 147 |
|
| 148 |
let body;
|
| 149 |
try { body = await readBody(req, res); }
|
| 150 |
+
catch (e) { if (e !== BODY_TOO_LARGE) return badRequest(res, 'Invalid JSON body'); return json(res, 413, { error: 'Request body too large' }); }
|
| 151 |
|
| 152 |
const updated = db.updateOne(table, id, body, false);
|
| 153 |
updated ? json(res, 200, updated) : notFound(res);
|
tests/README.md
CHANGED
|
@@ -50,23 +50,23 @@ Each run creates an isolated temp SQLite database, seeds it with test data via a
|
|
| 50 |
|
| 51 |
Unit tests cover every source module individually. Each module has its own test file:
|
| 52 |
|
| 53 |
-
| Module
|
| 54 |
-
|---------------------|------------------------------|----------|
|
| 55 |
-
| `config.js`
|
| 56 |
-
| `
|
| 57 |
-
| `rate-limiter.js` | `tests/middleware/rate-limiter.test.js` | Module imported once; `createRateLimiter()` with different configs per test |
|
| 58 |
-
| `redis.js`
|
| 59 |
-
| `server.js`
|
| 60 |
-
| `server.js`
|
| 61 |
-
| `migrate.js`
|
| 62 |
-
| `seed.js`
|
| 63 |
-
| `sql-logger.js`
|
| 64 |
|
| 65 |
### Key testing patterns
|
| 66 |
|
| 67 |
-
- **CJS cache injection**: Server tests inject mock `
|
| 68 |
-
- **Lazy config loading**: `rate-limiter.js` reads config inside `createRateLimiter()` rather than at module level, so tests can create limiters with different config values without re-importing the module.
|
| 69 |
-
- **Seed dependency injection**: `seed.js` accepts `database` and `fetch` parameters, bypassing the need to mock `require('https')` and `require('../
|
| 70 |
- **V8 coverage pragmas**: `/* v8 ignore */` comments exclude code paths that V8 cannot track through CJS module chains (e.g., CLI entry points, signal handlers, cross-worker coverage gaps).
|
| 71 |
|
| 72 |
## Configuration
|
|
|
|
| 50 |
|
| 51 |
Unit tests cover every source module individually. Each module has its own test file:
|
| 52 |
|
| 53 |
+
| Module | Test file | Approach |
|
| 54 |
+
|--------------------------------|------------------------------|----------|
|
| 55 |
+
| `config/index.js` | `tests/config/config.test.js` | Module re-imported with different `process.env` values |
|
| 56 |
+
| `db/index.js` | `tests/db/database.test.js` | Real `node:sqlite` databases with per-test temp files |
|
| 57 |
+
| `middleware/rate-limiter.js` | `tests/middleware/rate-limiter.test.js` | Module imported once; `createRateLimiter()` with different configs per test |
|
| 58 |
+
| `redis/index.js` | `tests/redis/redis.test.js` | RESP encoding/parsing directly; constructor options |
|
| 59 |
+
| `server/index.js` | `tests/server/coverage-printlog.test.js` | `requestHandler()` with mock req/res; CJS cache injection for DB mock |
|
| 60 |
+
| `server/index.js` | `tests/server/server.test.js` | `requestHandler()` with mock req/res; CJS cache injection for DB mock |
|
| 61 |
+
| `db/migrate.js` | `tests/db/migrate.test.js` | Real migration + corrupt DB failure path |
|
| 62 |
+
| `db/seed.js` | `tests/db/seed.test.js` | Dependency injection — `database` and `fetch` injected |
|
| 63 |
+
| `db/sql-logger.js` | `tests/db/sql-logger.test.js`| Proxy wrapper behavior on exec/prepare/run/get/all |
|
| 64 |
|
| 65 |
### Key testing patterns
|
| 66 |
|
| 67 |
+
- **CJS cache injection**: Server tests inject mock `db/index.js` into the CJS `require.cache` before loading `server/index.js`, ensuring the mock is picked up by CommonJS `require()` calls.
|
| 68 |
+
- **Lazy config loading**: `middleware/rate-limiter.js` reads config inside `createRateLimiter()` rather than at module level, so tests can create limiters with different config values without re-importing the module.
|
| 69 |
+
- **Seed dependency injection**: `db/seed.js` accepts `database` and `fetch` parameters, bypassing the need to mock `require('https')` and `require('../db')`.
|
| 70 |
- **V8 coverage pragmas**: `/* v8 ignore */` comments exclude code paths that V8 cannot track through CJS module chains (e.g., CLI entry points, signal handlers, cross-worker coverage gaps).
|
| 71 |
|
| 72 |
## Configuration
|
tests/config/config.test.js
CHANGED
|
@@ -19,15 +19,15 @@ afterAll(() => {
|
|
| 19 |
try { fs.rmSync(tmpDir, { recursive: true, force: true }) } catch {}
|
| 20 |
})
|
| 21 |
|
| 22 |
-
vi.mock('../../src/load-env.js', () => ({ loadEnv: () => {} }))
|
| 23 |
-
vi.mock('../../src/config.js', () => configMockFactory())
|
| 24 |
|
| 25 |
describe('config.js', () => {
|
| 26 |
it('uses defaults when PORT is empty string', async () => {
|
| 27 |
const s = save('PORT', 'DB_PATH', 'REDIS_URL', 'RATE_LIMIT_ENABLED')
|
| 28 |
setEnv({ PORT: '', DB_PATH: '', REDIS_URL: '', RATE_LIMIT_ENABLED: '' })
|
| 29 |
vi.resetModules()
|
| 30 |
-
const mod = await import('../../src/config.js')
|
| 31 |
expect(mod.port).toBe(3000)
|
| 32 |
expect(mod.dbPath).toContain('storage/data.db')
|
| 33 |
expect(mod.redisOpts.host).toBe('127.0.0.1')
|
|
@@ -49,7 +49,7 @@ describe('config.js', () => {
|
|
| 49 |
delete process.env.REDIS_PASSWORD
|
| 50 |
delete process.env.DEBUG_SQL
|
| 51 |
vi.resetModules()
|
| 52 |
-
const mod = await import('../../src/config.js')
|
| 53 |
expect(mod.port).toBe(3000)
|
| 54 |
expect(mod.rateLimitEnabled).toBe(true)
|
| 55 |
expect(mod.rateLimitMax).toBe(100)
|
|
@@ -66,7 +66,7 @@ describe('config.js', () => {
|
|
| 66 |
const s = save('REDIS_URL')
|
| 67 |
process.env.REDIS_URL = 'redis://u:p@h:6380/2'
|
| 68 |
vi.resetModules()
|
| 69 |
-
const mod = await import('../../src/config.js')
|
| 70 |
expect(mod.redisOpts.url).toBe('redis://u:p@h:6380/2')
|
| 71 |
restore(s)
|
| 72 |
})
|
|
@@ -86,7 +86,7 @@ describe('config.js', () => {
|
|
| 86 |
RATE_LIMIT_WINDOW_MS: '15000',
|
| 87 |
})
|
| 88 |
vi.resetModules()
|
| 89 |
-
const mod = await import('../../src/config.js')
|
| 90 |
expect(mod.port).toBe(4000)
|
| 91 |
expect(mod.dbPath).toBe(path.join(tmpDir, 'config.db'))
|
| 92 |
expect(mod.redisOpts).toEqual({ host: 'redis.local', port: 6380, db: 2, password: 'secret' })
|
|
@@ -104,8 +104,8 @@ describe('config.js', () => {
|
|
| 104 |
process.env.RATE_LIMIT_ENABLED = 'false'
|
| 105 |
process.env.DB_PATH = '/custom/data.db'
|
| 106 |
process.env.DEBUG_SQL = 'true'
|
| 107 |
-
clearCjs('../../src/config.js', '../../src/load-env.js')
|
| 108 |
-
const mod = _require('../../src/config.js')
|
| 109 |
expect(mod.port).toBe(5000)
|
| 110 |
expect(mod.redisOpts).toEqual({ url: 'redis://custom:6379' })
|
| 111 |
expect(mod.rateLimitEnabled).toBe(false)
|
|
@@ -118,8 +118,8 @@ describe('config.js', () => {
|
|
| 118 |
const s = save('PORT', 'RATE_LIMIT_ENABLED', 'REDIS_URL', 'DB_PATH', 'REDIS_HOST', 'REDIS_PORT', 'REDIS_DB', 'REDIS_PASSWORD', 'DEBUG_SQL', 'RATE_LIMIT_MAX', 'RATE_LIMIT_WINDOW_MS')
|
| 119 |
delete process.env.PORT
|
| 120 |
delete process.env.RATE_LIMIT_ENABLED
|
| 121 |
-
clearCjs('../../src/config.js', '../../src/load-env.js')
|
| 122 |
-
const mod = _require('../../src/config.js')
|
| 123 |
expect(mod.port).toBe(3000)
|
| 124 |
expect(mod.rateLimitEnabled).toBe(true)
|
| 125 |
restore(s)
|
|
|
|
| 19 |
try { fs.rmSync(tmpDir, { recursive: true, force: true }) } catch {}
|
| 20 |
})
|
| 21 |
|
| 22 |
+
vi.mock('../../src/config/load-env.js', () => ({ loadEnv: () => {} }))
|
| 23 |
+
vi.mock('../../src/config/index.js', () => configMockFactory())
|
| 24 |
|
| 25 |
describe('config.js', () => {
|
| 26 |
it('uses defaults when PORT is empty string', async () => {
|
| 27 |
const s = save('PORT', 'DB_PATH', 'REDIS_URL', 'RATE_LIMIT_ENABLED')
|
| 28 |
setEnv({ PORT: '', DB_PATH: '', REDIS_URL: '', RATE_LIMIT_ENABLED: '' })
|
| 29 |
vi.resetModules()
|
| 30 |
+
const mod = await import('../../src/config/index.js')
|
| 31 |
expect(mod.port).toBe(3000)
|
| 32 |
expect(mod.dbPath).toContain('storage/data.db')
|
| 33 |
expect(mod.redisOpts.host).toBe('127.0.0.1')
|
|
|
|
| 49 |
delete process.env.REDIS_PASSWORD
|
| 50 |
delete process.env.DEBUG_SQL
|
| 51 |
vi.resetModules()
|
| 52 |
+
const mod = await import('../../src/config/index.js')
|
| 53 |
expect(mod.port).toBe(3000)
|
| 54 |
expect(mod.rateLimitEnabled).toBe(true)
|
| 55 |
expect(mod.rateLimitMax).toBe(100)
|
|
|
|
| 66 |
const s = save('REDIS_URL')
|
| 67 |
process.env.REDIS_URL = 'redis://u:p@h:6380/2'
|
| 68 |
vi.resetModules()
|
| 69 |
+
const mod = await import('../../src/config/index.js')
|
| 70 |
expect(mod.redisOpts.url).toBe('redis://u:p@h:6380/2')
|
| 71 |
restore(s)
|
| 72 |
})
|
|
|
|
| 86 |
RATE_LIMIT_WINDOW_MS: '15000',
|
| 87 |
})
|
| 88 |
vi.resetModules()
|
| 89 |
+
const mod = await import('../../src/config/index.js')
|
| 90 |
expect(mod.port).toBe(4000)
|
| 91 |
expect(mod.dbPath).toBe(path.join(tmpDir, 'config.db'))
|
| 92 |
expect(mod.redisOpts).toEqual({ host: 'redis.local', port: 6380, db: 2, password: 'secret' })
|
|
|
|
| 104 |
process.env.RATE_LIMIT_ENABLED = 'false'
|
| 105 |
process.env.DB_PATH = '/custom/data.db'
|
| 106 |
process.env.DEBUG_SQL = 'true'
|
| 107 |
+
clearCjs('../../src/config/index.js', '../../src/config/load-env.js')
|
| 108 |
+
const mod = _require('../../src/config/index.js')
|
| 109 |
expect(mod.port).toBe(5000)
|
| 110 |
expect(mod.redisOpts).toEqual({ url: 'redis://custom:6379' })
|
| 111 |
expect(mod.rateLimitEnabled).toBe(false)
|
|
|
|
| 118 |
const s = save('PORT', 'RATE_LIMIT_ENABLED', 'REDIS_URL', 'DB_PATH', 'REDIS_HOST', 'REDIS_PORT', 'REDIS_DB', 'REDIS_PASSWORD', 'DEBUG_SQL', 'RATE_LIMIT_MAX', 'RATE_LIMIT_WINDOW_MS')
|
| 119 |
delete process.env.PORT
|
| 120 |
delete process.env.RATE_LIMIT_ENABLED
|
| 121 |
+
clearCjs('../../src/config/index.js', '../../src/config/load-env.js')
|
| 122 |
+
const mod = _require('../../src/config/index.js')
|
| 123 |
expect(mod.port).toBe(3000)
|
| 124 |
expect(mod.rateLimitEnabled).toBe(true)
|
| 125 |
restore(s)
|
tests/db/database.test.js
CHANGED
|
@@ -19,15 +19,15 @@ afterAll(() => {
|
|
| 19 |
try { fs.rmSync(tmpDir, { recursive: true, force: true }) } catch {}
|
| 20 |
})
|
| 21 |
|
| 22 |
-
vi.mock('../../src/load-env.js', () => ({ loadEnv: () => {} }))
|
| 23 |
-
vi.mock('../../src/config.js', () => configMockFactory())
|
| 24 |
|
| 25 |
describe('database.js', () => {
|
| 26 |
it('covers getWrappedDb with DEBUG_SQL enabled', async () => {
|
| 27 |
const s = save('DEBUG_SQL', 'DB_PATH')
|
| 28 |
setEnv({ DEBUG_SQL: 'true', DB_PATH: path.join(tmpDir, 'db1.db') })
|
| 29 |
vi.resetModules()
|
| 30 |
-
const mod = await import('../../src/
|
| 31 |
const w = mod.getWrappedDb()
|
| 32 |
expect(w).toBeDefined()
|
| 33 |
const w2 = mod.getWrappedDb()
|
|
@@ -39,7 +39,7 @@ describe('database.js', () => {
|
|
| 39 |
const s = save('DB_PATH')
|
| 40 |
process.env.DB_PATH = path.join(tmpDir, 'db2.db')
|
| 41 |
vi.resetModules()
|
| 42 |
-
const mod = await import('../../src/
|
| 43 |
const first = mod.getDb()
|
| 44 |
const second = mod.getDb()
|
| 45 |
expect(first).toBe(second)
|
|
@@ -49,9 +49,9 @@ describe('database.js', () => {
|
|
| 49 |
it('covers getWrappedDb without DEBUG_SQL', async () => {
|
| 50 |
const s = save('DEBUG_SQL', 'DB_PATH')
|
| 51 |
setEnv({ DEBUG_SQL: 'false', DB_PATH: path.join(tmpDir, 'db3.db') })
|
| 52 |
-
clearCjs('../../src/
|
| 53 |
vi.resetModules()
|
| 54 |
-
const mod = await import('../../src/
|
| 55 |
expect(mod.getWrappedDb()).toBe(mod.getDb())
|
| 56 |
restore(s)
|
| 57 |
})
|
|
@@ -60,9 +60,9 @@ describe('database.js', () => {
|
|
| 60 |
const dbPath = path.join(tmpDir, 'db-crud.db')
|
| 61 |
const s = save('DB_PATH', 'DEBUG_SQL')
|
| 62 |
setEnv({ DB_PATH: dbPath, DEBUG_SQL: 'true' })
|
| 63 |
-
clearCjs('../../src/
|
| 64 |
vi.resetModules()
|
| 65 |
-
const mod = await import('../../src/
|
| 66 |
const db = mod.getDb()
|
| 67 |
db.exec(`
|
| 68 |
CREATE TABLE users (
|
|
@@ -113,9 +113,9 @@ describe('database.js', () => {
|
|
| 113 |
const dbPath = path.join(tmpDir, 'db-write.db')
|
| 114 |
const s = save('DB_PATH', 'DEBUG_SQL')
|
| 115 |
setEnv({ DB_PATH: dbPath, DEBUG_SQL: 'false' })
|
| 116 |
-
clearCjs('../../src/
|
| 117 |
vi.resetModules()
|
| 118 |
-
const mod = await import('../../src/
|
| 119 |
const db = mod.getDb()
|
| 120 |
db.exec(`
|
| 121 |
CREATE TABLE users (
|
|
|
|
| 19 |
try { fs.rmSync(tmpDir, { recursive: true, force: true }) } catch {}
|
| 20 |
})
|
| 21 |
|
| 22 |
+
vi.mock('../../src/config/load-env.js', () => ({ loadEnv: () => {} }))
|
| 23 |
+
vi.mock('../../src/config/index.js', () => configMockFactory())
|
| 24 |
|
| 25 |
describe('database.js', () => {
|
| 26 |
it('covers getWrappedDb with DEBUG_SQL enabled', async () => {
|
| 27 |
const s = save('DEBUG_SQL', 'DB_PATH')
|
| 28 |
setEnv({ DEBUG_SQL: 'true', DB_PATH: path.join(tmpDir, 'db1.db') })
|
| 29 |
vi.resetModules()
|
| 30 |
+
const mod = await import('../../src/db/index.js')
|
| 31 |
const w = mod.getWrappedDb()
|
| 32 |
expect(w).toBeDefined()
|
| 33 |
const w2 = mod.getWrappedDb()
|
|
|
|
| 39 |
const s = save('DB_PATH')
|
| 40 |
process.env.DB_PATH = path.join(tmpDir, 'db2.db')
|
| 41 |
vi.resetModules()
|
| 42 |
+
const mod = await import('../../src/db/index.js')
|
| 43 |
const first = mod.getDb()
|
| 44 |
const second = mod.getDb()
|
| 45 |
expect(first).toBe(second)
|
|
|
|
| 49 |
it('covers getWrappedDb without DEBUG_SQL', async () => {
|
| 50 |
const s = save('DEBUG_SQL', 'DB_PATH')
|
| 51 |
setEnv({ DEBUG_SQL: 'false', DB_PATH: path.join(tmpDir, 'db3.db') })
|
| 52 |
+
clearCjs('../../src/db/index.js', '../../src/config/index.js')
|
| 53 |
vi.resetModules()
|
| 54 |
+
const mod = await import('../../src/db/index.js')
|
| 55 |
expect(mod.getWrappedDb()).toBe(mod.getDb())
|
| 56 |
restore(s)
|
| 57 |
})
|
|
|
|
| 60 |
const dbPath = path.join(tmpDir, 'db-crud.db')
|
| 61 |
const s = save('DB_PATH', 'DEBUG_SQL')
|
| 62 |
setEnv({ DB_PATH: dbPath, DEBUG_SQL: 'true' })
|
| 63 |
+
clearCjs('../../src/db/index.js', '../../src/config/index.js')
|
| 64 |
vi.resetModules()
|
| 65 |
+
const mod = await import('../../src/db/index.js')
|
| 66 |
const db = mod.getDb()
|
| 67 |
db.exec(`
|
| 68 |
CREATE TABLE users (
|
|
|
|
| 113 |
const dbPath = path.join(tmpDir, 'db-write.db')
|
| 114 |
const s = save('DB_PATH', 'DEBUG_SQL')
|
| 115 |
setEnv({ DB_PATH: dbPath, DEBUG_SQL: 'false' })
|
| 116 |
+
clearCjs('../../src/db/index.js', '../../src/config/index.js')
|
| 117 |
vi.resetModules()
|
| 118 |
+
const mod = await import('../../src/db/index.js')
|
| 119 |
const db = mod.getDb()
|
| 120 |
db.exec(`
|
| 121 |
CREATE TABLE users (
|
tests/db/migrate.test.js
CHANGED
|
@@ -19,8 +19,8 @@ afterAll(() => {
|
|
| 19 |
try { fs.rmSync(tmpDir, { recursive: true, force: true }) } catch {}
|
| 20 |
})
|
| 21 |
|
| 22 |
-
vi.mock('../../src/load-env.js', () => ({ loadEnv: () => {} }))
|
| 23 |
-
vi.mock('../../src/config.js', () => configMockFactory())
|
| 24 |
|
| 25 |
describe('migrate.js', () => {
|
| 26 |
it('runs migration without error', async () => {
|
|
@@ -33,8 +33,8 @@ describe('migrate.js', () => {
|
|
| 33 |
})
|
| 34 |
|
| 35 |
it('handles migration failure', async () => {
|
| 36 |
-
clearCjs('../../src/db/migrate.js', '../../src/
|
| 37 |
-
const resolvedDb = _require.resolve('../../src/
|
| 38 |
const origDbCache = _require.cache[resolvedDb]
|
| 39 |
_require.cache[resolvedDb] = {
|
| 40 |
exports: { getWrappedDb: () => { throw new Error('boom') } },
|
|
|
|
| 19 |
try { fs.rmSync(tmpDir, { recursive: true, force: true }) } catch {}
|
| 20 |
})
|
| 21 |
|
| 22 |
+
vi.mock('../../src/config/load-env.js', () => ({ loadEnv: () => {} }))
|
| 23 |
+
vi.mock('../../src/config/index.js', () => configMockFactory())
|
| 24 |
|
| 25 |
describe('migrate.js', () => {
|
| 26 |
it('runs migration without error', async () => {
|
|
|
|
| 33 |
})
|
| 34 |
|
| 35 |
it('handles migration failure', async () => {
|
| 36 |
+
clearCjs('../../src/db/migrate.js', '../../src/db/index.js', '../../src/config/index.js')
|
| 37 |
+
const resolvedDb = _require.resolve('../../src/db/index.js')
|
| 38 |
const origDbCache = _require.cache[resolvedDb]
|
| 39 |
_require.cache[resolvedDb] = {
|
| 40 |
exports: { getWrappedDb: () => { throw new Error('boom') } },
|
tests/db/seed.test.js
CHANGED
|
@@ -21,12 +21,12 @@ afterAll(() => {
|
|
| 21 |
try { fs.rmSync(tmpDir, { recursive: true, force: true }) } catch {}
|
| 22 |
})
|
| 23 |
|
| 24 |
-
vi.mock('../../src/load-env.js', () => ({ loadEnv: () => {} }))
|
| 25 |
-
vi.mock('../../src/config.js', () => configMockFactory())
|
| 26 |
|
| 27 |
describe('seed.js', () => {
|
| 28 |
afterEach(() => {
|
| 29 |
-
clearCjs('../../src/db/seed.js', '../../src/db/migrate.js', '../../src/
|
| 30 |
})
|
| 31 |
|
| 32 |
it('imports and migrate runs, seed returns early when DB has data', async () => {
|
|
|
|
| 21 |
try { fs.rmSync(tmpDir, { recursive: true, force: true }) } catch {}
|
| 22 |
})
|
| 23 |
|
| 24 |
+
vi.mock('../../src/config/load-env.js', () => ({ loadEnv: () => {} }))
|
| 25 |
+
vi.mock('../../src/config/index.js', () => configMockFactory())
|
| 26 |
|
| 27 |
describe('seed.js', () => {
|
| 28 |
afterEach(() => {
|
| 29 |
+
clearCjs('../../src/db/seed.js', '../../src/db/migrate.js', '../../src/db/index.js', '../../src/config/index.js')
|
| 30 |
})
|
| 31 |
|
| 32 |
it('imports and migrate runs, seed returns early when DB has data', async () => {
|
tests/db/sql-logger.test.js
CHANGED
|
@@ -6,21 +6,21 @@ describe('sql-logger.js', () => {
|
|
| 6 |
})
|
| 7 |
|
| 8 |
it('returns non-special properties on wrapped stmt', async () => {
|
| 9 |
-
const { wrapStmt } = await import('../../src/sql-logger.js')
|
| 10 |
const stmt = { run: () => {}, customProp: 42 }
|
| 11 |
const wrapped = wrapStmt(stmt, 'SELECT 1')
|
| 12 |
expect(wrapped.customProp).toBe(42)
|
| 13 |
})
|
| 14 |
|
| 15 |
it('returns non-special properties on wrapped db', async () => {
|
| 16 |
-
const { wrapDb } = await import('../../src/sql-logger.js')
|
| 17 |
const db = { exec: () => {}, prepare: () => ({}), name: 'testdb' }
|
| 18 |
const wrapped = wrapDb(db)
|
| 19 |
expect(wrapped.name).toBe('testdb')
|
| 20 |
})
|
| 21 |
|
| 22 |
it('wraps exec and logs SQL', async () => {
|
| 23 |
-
const { wrapDb } = await import('../../src/sql-logger.js')
|
| 24 |
const spy = vi.spyOn(console, 'error').mockImplementation(() => {})
|
| 25 |
const rawExec = vi.fn()
|
| 26 |
const db = { exec: rawExec, prepare: () => ({}) }
|
|
@@ -32,7 +32,7 @@ describe('sql-logger.js', () => {
|
|
| 32 |
})
|
| 33 |
|
| 34 |
it('wraps prepare and returns wrapped stmt', async () => {
|
| 35 |
-
const { wrapDb } = await import('../../src/sql-logger.js')
|
| 36 |
const rawRun = vi.fn()
|
| 37 |
const db = { exec: () => {}, prepare: () => ({ run: rawRun }) }
|
| 38 |
const wrapped = wrapDb(db)
|
|
@@ -41,7 +41,7 @@ describe('sql-logger.js', () => {
|
|
| 41 |
})
|
| 42 |
|
| 43 |
it('wrapped stmt logs SQL on run/get/all', async () => {
|
| 44 |
-
const { wrapStmt } = await import('../../src/sql-logger.js')
|
| 45 |
const spy = vi.spyOn(console, 'error').mockImplementation(() => {})
|
| 46 |
const rawRun = vi.fn()
|
| 47 |
const stmt = { run: rawRun }
|
|
|
|
| 6 |
})
|
| 7 |
|
| 8 |
it('returns non-special properties on wrapped stmt', async () => {
|
| 9 |
+
const { wrapStmt } = await import('../../src/db/sql-logger.js')
|
| 10 |
const stmt = { run: () => {}, customProp: 42 }
|
| 11 |
const wrapped = wrapStmt(stmt, 'SELECT 1')
|
| 12 |
expect(wrapped.customProp).toBe(42)
|
| 13 |
})
|
| 14 |
|
| 15 |
it('returns non-special properties on wrapped db', async () => {
|
| 16 |
+
const { wrapDb } = await import('../../src/db/sql-logger.js')
|
| 17 |
const db = { exec: () => {}, prepare: () => ({}), name: 'testdb' }
|
| 18 |
const wrapped = wrapDb(db)
|
| 19 |
expect(wrapped.name).toBe('testdb')
|
| 20 |
})
|
| 21 |
|
| 22 |
it('wraps exec and logs SQL', async () => {
|
| 23 |
+
const { wrapDb } = await import('../../src/db/sql-logger.js')
|
| 24 |
const spy = vi.spyOn(console, 'error').mockImplementation(() => {})
|
| 25 |
const rawExec = vi.fn()
|
| 26 |
const db = { exec: rawExec, prepare: () => ({}) }
|
|
|
|
| 32 |
})
|
| 33 |
|
| 34 |
it('wraps prepare and returns wrapped stmt', async () => {
|
| 35 |
+
const { wrapDb } = await import('../../src/db/sql-logger.js')
|
| 36 |
const rawRun = vi.fn()
|
| 37 |
const db = { exec: () => {}, prepare: () => ({ run: rawRun }) }
|
| 38 |
const wrapped = wrapDb(db)
|
|
|
|
| 41 |
})
|
| 42 |
|
| 43 |
it('wrapped stmt logs SQL on run/get/all', async () => {
|
| 44 |
+
const { wrapStmt } = await import('../../src/db/sql-logger.js')
|
| 45 |
const spy = vi.spyOn(console, 'error').mockImplementation(() => {})
|
| 46 |
const rawRun = vi.fn()
|
| 47 |
const stmt = { run: rawRun }
|
tests/helpers/index.js
CHANGED
|
@@ -28,7 +28,7 @@ export async function startServer() {
|
|
| 28 |
process.env.REDIS_URL = '';
|
| 29 |
process.env.RATE_LIMIT_ENABLED = 'false';
|
| 30 |
|
| 31 |
-
const serverModule = await import('../../src/server.js');
|
| 32 |
serverInstance = serverModule.server;
|
| 33 |
|
| 34 |
await new Promise((resolve, reject) => {
|
|
|
|
| 28 |
process.env.REDIS_URL = '';
|
| 29 |
process.env.RATE_LIMIT_ENABLED = 'false';
|
| 30 |
|
| 31 |
+
const serverModule = await import('../../src/server/index.js');
|
| 32 |
serverInstance = serverModule.server;
|
| 33 |
|
| 34 |
await new Promise((resolve, reject) => {
|
tests/middleware/rate-limiter.test.js
CHANGED
|
@@ -19,20 +19,20 @@ afterAll(() => {
|
|
| 19 |
try { fs.rmSync(tmpDir, { recursive: true, force: true }) } catch {}
|
| 20 |
})
|
| 21 |
|
| 22 |
-
vi.mock('../../src/load-env.js', () => ({ loadEnv: () => {} }))
|
| 23 |
-
vi.mock('../../src/config.js', () => configMockFactory())
|
| 24 |
|
| 25 |
describe('rate-limiter.js', () => {
|
| 26 |
let createRateLimiter
|
| 27 |
|
| 28 |
beforeAll(async () => {
|
| 29 |
-
clearCjs('../../src/rate-limiter.js', '../../src/config.js')
|
| 30 |
-
const mod = await import('../../src/rate-limiter.js')
|
| 31 |
createRateLimiter = mod.createRateLimiter
|
| 32 |
})
|
| 33 |
|
| 34 |
function freshLimiter(redis, envOverrides = {}) {
|
| 35 |
-
clearCjs('../../src/config.js')
|
| 36 |
Object.entries(envOverrides).forEach(([k, v]) => { process.env[k] = v })
|
| 37 |
return createRateLimiter(redis)
|
| 38 |
}
|
|
@@ -128,8 +128,8 @@ describe('rate-limiter.js', () => {
|
|
| 128 |
it('resets memory store entry after window expires', async () => {
|
| 129 |
const s = save('RATE_LIMIT_ENABLED', 'RATE_LIMIT_MAX', 'RATE_LIMIT_WINDOW_MS')
|
| 130 |
setEnv({ RATE_LIMIT_ENABLED: 'true', RATE_LIMIT_MAX: '2', 'RATE_LIMIT_WINDOW_MS': '60000' })
|
| 131 |
-
clearCjs('../../src/rate-limiter.js', '../../src/config.js')
|
| 132 |
-
const { createRateLimiter } = await import('../../src/rate-limiter.js')
|
| 133 |
const limiter = createRateLimiter(null)
|
| 134 |
const req = { headers: {}, socket: { remoteAddress: '7.7.7.7' } }
|
| 135 |
const res1 = { setHeader: vi.fn(), writeHead: vi.fn(), end: vi.fn() }
|
|
|
|
| 19 |
try { fs.rmSync(tmpDir, { recursive: true, force: true }) } catch {}
|
| 20 |
})
|
| 21 |
|
| 22 |
+
vi.mock('../../src/config/load-env.js', () => ({ loadEnv: () => {} }))
|
| 23 |
+
vi.mock('../../src/config/index.js', () => configMockFactory())
|
| 24 |
|
| 25 |
describe('rate-limiter.js', () => {
|
| 26 |
let createRateLimiter
|
| 27 |
|
| 28 |
beforeAll(async () => {
|
| 29 |
+
clearCjs('../../src/middleware/rate-limiter.js', '../../src/config/index.js')
|
| 30 |
+
const mod = await import('../../src/middleware/rate-limiter.js')
|
| 31 |
createRateLimiter = mod.createRateLimiter
|
| 32 |
})
|
| 33 |
|
| 34 |
function freshLimiter(redis, envOverrides = {}) {
|
| 35 |
+
clearCjs('../../src/config/index.js')
|
| 36 |
Object.entries(envOverrides).forEach(([k, v]) => { process.env[k] = v })
|
| 37 |
return createRateLimiter(redis)
|
| 38 |
}
|
|
|
|
| 128 |
it('resets memory store entry after window expires', async () => {
|
| 129 |
const s = save('RATE_LIMIT_ENABLED', 'RATE_LIMIT_MAX', 'RATE_LIMIT_WINDOW_MS')
|
| 130 |
setEnv({ RATE_LIMIT_ENABLED: 'true', RATE_LIMIT_MAX: '2', 'RATE_LIMIT_WINDOW_MS': '60000' })
|
| 131 |
+
clearCjs('../../src/middleware/rate-limiter.js', '../../src/config/index.js')
|
| 132 |
+
const { createRateLimiter } = await import('../../src/middleware/rate-limiter.js')
|
| 133 |
const limiter = createRateLimiter(null)
|
| 134 |
const req = { headers: {}, socket: { remoteAddress: '7.7.7.7' } }
|
| 135 |
const res1 = { setHeader: vi.fn(), writeHead: vi.fn(), end: vi.fn() }
|
tests/redis/redis.test.js
CHANGED
|
@@ -19,14 +19,14 @@ async function closeServer(server) {
|
|
| 19 |
|
| 20 |
describe('redis.js', () => {
|
| 21 |
it('encodes RESP commands', async () => {
|
| 22 |
-
const RedisClient = _require('../../src/redis.js')
|
| 23 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 24 |
expect(c._encode('PING')).toBe('*1\r\n$4\r\nPING\r\n')
|
| 25 |
expect(c._encode('SET', 'k', 'v')).toBe('*3\r\n$3\r\nSET\r\n$1\r\nk\r\n$1\r\nv\r\n')
|
| 26 |
})
|
| 27 |
|
| 28 |
it('parses all RESP types', async () => {
|
| 29 |
-
const RedisClient = _require('../../src/redis.js')
|
| 30 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 31 |
const p = (b) => c._parse(Buffer.from(b))
|
| 32 |
|
|
@@ -46,13 +46,13 @@ describe('redis.js', () => {
|
|
| 46 |
})
|
| 47 |
|
| 48 |
it('throws on unknown RESP type', async () => {
|
| 49 |
-
const RedisClient = _require('../../src/redis.js')
|
| 50 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 51 |
expect(() => c._parse(Buffer.from('!x\r\n'))).toThrow('Unknown RESP type')
|
| 52 |
})
|
| 53 |
|
| 54 |
it('connect returns early when already connected or connecting', async () => {
|
| 55 |
-
const RedisClient = _require('../../src/redis.js')
|
| 56 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 57 |
c.connected = true
|
| 58 |
await expect(c.connect()).resolves.toBeUndefined()
|
|
@@ -61,7 +61,7 @@ describe('redis.js', () => {
|
|
| 61 |
})
|
| 62 |
|
| 63 |
it('parses URL in constructor', async () => {
|
| 64 |
-
const RedisClient = _require('../../src/redis.js')
|
| 65 |
const c = new RedisClient({ url: 'redis://:secret@myhost:6380/3' })
|
| 66 |
expect(c.host).toBe('myhost')
|
| 67 |
expect(c.port).toBe(6380)
|
|
@@ -70,7 +70,7 @@ describe('redis.js', () => {
|
|
| 70 |
})
|
| 71 |
|
| 72 |
it('send and _onData process responses', async () => {
|
| 73 |
-
const RedisClient = _require('../../src/redis.js')
|
| 74 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 75 |
c.socket = { write: vi.fn() }
|
| 76 |
const p = c.send('PING')
|
|
@@ -80,7 +80,7 @@ describe('redis.js', () => {
|
|
| 80 |
})
|
| 81 |
|
| 82 |
it('rejects on error response', async () => {
|
| 83 |
-
const RedisClient = _require('../../src/redis.js')
|
| 84 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 85 |
c.socket = { write: vi.fn() }
|
| 86 |
const p = c.send('PING')
|
|
@@ -89,7 +89,7 @@ describe('redis.js', () => {
|
|
| 89 |
})
|
| 90 |
|
| 91 |
it('handles partial data across multiple _onData calls', async () => {
|
| 92 |
-
const RedisClient = _require('../../src/redis.js')
|
| 93 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 94 |
c.socket = { write: vi.fn() }
|
| 95 |
const p = c.send('GET', 'key')
|
|
@@ -99,7 +99,7 @@ describe('redis.js', () => {
|
|
| 99 |
})
|
| 100 |
|
| 101 |
it('quit sends QUIT and destroys socket', async () => {
|
| 102 |
-
const RedisClient = _require('../../src/redis.js')
|
| 103 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 104 |
const destroy = vi.fn()
|
| 105 |
c.socket = { write: vi.fn(), destroy }
|
|
@@ -118,7 +118,7 @@ describe('redis.js', () => {
|
|
| 118 |
})
|
| 119 |
await new Promise(r => server.listen(0, '127.0.0.1', r))
|
| 120 |
const { port } = server.address()
|
| 121 |
-
const RedisClient = _require('../../src/redis.js')
|
| 122 |
const c = new RedisClient({ host: '127.0.0.1', port, password: 's', db: 1 })
|
| 123 |
await expect(c.connect()).resolves.toBeUndefined()
|
| 124 |
expect(c.connected).toBe(true)
|
|
@@ -131,7 +131,7 @@ describe('redis.js', () => {
|
|
| 131 |
})
|
| 132 |
await new Promise(r => server.listen(0, '127.0.0.1', r))
|
| 133 |
const { port } = server.address()
|
| 134 |
-
const RedisClient = _require('../../src/redis.js')
|
| 135 |
const c = new RedisClient({ host: '127.0.0.1', port })
|
| 136 |
await expect(c.connect()).resolves.toBeUndefined()
|
| 137 |
expect(c.connected).toBe(true)
|
|
@@ -139,7 +139,7 @@ describe('redis.js', () => {
|
|
| 139 |
})
|
| 140 |
|
| 141 |
it('uses default constructor options', async () => {
|
| 142 |
-
const RedisClient = _require('../../src/redis.js')
|
| 143 |
const c = new RedisClient()
|
| 144 |
expect(c.host).toBe('127.0.0.1')
|
| 145 |
expect(c.port).toBe(6379)
|
|
@@ -148,7 +148,7 @@ describe('redis.js', () => {
|
|
| 148 |
})
|
| 149 |
|
| 150 |
it('parses URL without port and without password', async () => {
|
| 151 |
-
const RedisClient = _require('../../src/redis.js')
|
| 152 |
const c = new RedisClient({ url: 'redis://myhost/3' })
|
| 153 |
expect(c.host).toBe('myhost')
|
| 154 |
expect(c.port).toBe(6379)
|
|
@@ -157,34 +157,34 @@ describe('redis.js', () => {
|
|
| 157 |
})
|
| 158 |
|
| 159 |
it('handles _parse offset and array null branches', async () => {
|
| 160 |
-
const RedisClient = _require('../../src/redis.js')
|
| 161 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 162 |
expect(c._parse(Buffer.from('x'), 1)).toBeNull()
|
| 163 |
expect(c._parse(Buffer.from('*-1\r\n')).value).toBeNull()
|
| 164 |
})
|
| 165 |
|
| 166 |
it('parses URL with empty hostname, using default host', async () => {
|
| 167 |
-
const RedisClient = _require('../../src/redis.js')
|
| 168 |
const c = new RedisClient({ url: 'redis:///3' })
|
| 169 |
expect(c.host).toBe('127.0.0.1')
|
| 170 |
expect(c.db).toBe(3)
|
| 171 |
})
|
| 172 |
|
| 173 |
it('parses URL with non-numeric path, keeping default db', async () => {
|
| 174 |
-
const RedisClient = _require('../../src/redis.js')
|
| 175 |
const c = new RedisClient({ url: 'redis://host/db' })
|
| 176 |
expect(c.host).toBe('host')
|
| 177 |
expect(c.db).toBe(0)
|
| 178 |
})
|
| 179 |
|
| 180 |
it('handles incomplete array data in _parse', async () => {
|
| 181 |
-
const RedisClient = _require('../../src/redis.js')
|
| 182 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 183 |
expect(c._parse(Buffer.from('*2\r\n$3\r\nfoo'))).toBeNull()
|
| 184 |
})
|
| 185 |
|
| 186 |
it('covers _onData when no response is complete', async () => {
|
| 187 |
-
const RedisClient = _require('../../src/redis.js')
|
| 188 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 189 |
c.socket = { write: vi.fn() }
|
| 190 |
c.send('PING')
|
|
@@ -193,7 +193,7 @@ describe('redis.js', () => {
|
|
| 193 |
})
|
| 194 |
|
| 195 |
it('covers redis helper methods', async () => {
|
| 196 |
-
const RedisClient = _require('../../src/redis.js')
|
| 197 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 198 |
c.socket = { write: vi.fn() }
|
| 199 |
c.ping()
|
|
@@ -216,7 +216,7 @@ describe('redis.js', () => {
|
|
| 216 |
})
|
| 217 |
await new Promise(r => server.listen(0, '127.0.0.1', r))
|
| 218 |
const { port } = server.address()
|
| 219 |
-
const RedisClient = _require('../../src/redis.js')
|
| 220 |
const c = new RedisClient({ host: '127.0.0.1', port, password: 's' })
|
| 221 |
await expect(c.connect()).rejects.toThrow('ERR invalid password')
|
| 222 |
expect(c.connected).toBe(false)
|
|
@@ -227,7 +227,7 @@ describe('redis.js', () => {
|
|
| 227 |
const server = net.createServer(() => {})
|
| 228 |
await new Promise(r => server.listen(0, '127.0.0.1', r))
|
| 229 |
const { port } = server.address()
|
| 230 |
-
const RedisClient = _require('../../src/redis.js')
|
| 231 |
const c = new RedisClient({ host: '127.0.0.1', port })
|
| 232 |
c.connect().catch(() => {})
|
| 233 |
await new Promise(r => setTimeout(r, 20))
|
|
@@ -246,7 +246,7 @@ describe('redis.js connect handlers', () => {
|
|
| 246 |
})
|
| 247 |
await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve))
|
| 248 |
const { port } = server.address()
|
| 249 |
-
const RedisClient = _require('../../src/redis.js')
|
| 250 |
const c = new RedisClient({ host: '127.0.0.1', port })
|
| 251 |
await c.connect()
|
| 252 |
const p = c.send('PING')
|
|
@@ -267,7 +267,7 @@ describe('redis.js connect handlers', () => {
|
|
| 267 |
})
|
| 268 |
await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve))
|
| 269 |
const { port } = server.address()
|
| 270 |
-
const RedisClient = _require('../../src/redis.js')
|
| 271 |
const c = new RedisClient({ host: '127.0.0.1', port, password: 's', db: 1 })
|
| 272 |
await expect(c.connect()).resolves.toBeUndefined()
|
| 273 |
expect(c.connected).toBe(true)
|
|
@@ -279,7 +279,7 @@ describe('redis.js connect handlers', () => {
|
|
| 279 |
const server = net.createServer(() => {})
|
| 280 |
await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve))
|
| 281 |
const { port } = server.address()
|
| 282 |
-
const RedisClient = _require('../../src/redis.js')
|
| 283 |
const c = new RedisClient({ host: '127.0.0.1', port })
|
| 284 |
await expect(c.connect()).resolves.toBeUndefined()
|
| 285 |
expect(c.connected).toBe(true)
|
|
@@ -293,7 +293,7 @@ describe('redis.js connect handlers', () => {
|
|
| 293 |
})
|
| 294 |
await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve))
|
| 295 |
const { port } = server.address()
|
| 296 |
-
const RedisClient = _require('../../src/redis.js')
|
| 297 |
const c = new RedisClient({ host: '127.0.0.1', port, password: 's' })
|
| 298 |
await expect(c.connect()).rejects.toThrow('ERR invalid password')
|
| 299 |
expect(c.connected).toBe(false)
|
|
|
|
| 19 |
|
| 20 |
describe('redis.js', () => {
|
| 21 |
it('encodes RESP commands', async () => {
|
| 22 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 23 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 24 |
expect(c._encode('PING')).toBe('*1\r\n$4\r\nPING\r\n')
|
| 25 |
expect(c._encode('SET', 'k', 'v')).toBe('*3\r\n$3\r\nSET\r\n$1\r\nk\r\n$1\r\nv\r\n')
|
| 26 |
})
|
| 27 |
|
| 28 |
it('parses all RESP types', async () => {
|
| 29 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 30 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 31 |
const p = (b) => c._parse(Buffer.from(b))
|
| 32 |
|
|
|
|
| 46 |
})
|
| 47 |
|
| 48 |
it('throws on unknown RESP type', async () => {
|
| 49 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 50 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 51 |
expect(() => c._parse(Buffer.from('!x\r\n'))).toThrow('Unknown RESP type')
|
| 52 |
})
|
| 53 |
|
| 54 |
it('connect returns early when already connected or connecting', async () => {
|
| 55 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 56 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 57 |
c.connected = true
|
| 58 |
await expect(c.connect()).resolves.toBeUndefined()
|
|
|
|
| 61 |
})
|
| 62 |
|
| 63 |
it('parses URL in constructor', async () => {
|
| 64 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 65 |
const c = new RedisClient({ url: 'redis://:secret@myhost:6380/3' })
|
| 66 |
expect(c.host).toBe('myhost')
|
| 67 |
expect(c.port).toBe(6380)
|
|
|
|
| 70 |
})
|
| 71 |
|
| 72 |
it('send and _onData process responses', async () => {
|
| 73 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 74 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 75 |
c.socket = { write: vi.fn() }
|
| 76 |
const p = c.send('PING')
|
|
|
|
| 80 |
})
|
| 81 |
|
| 82 |
it('rejects on error response', async () => {
|
| 83 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 84 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 85 |
c.socket = { write: vi.fn() }
|
| 86 |
const p = c.send('PING')
|
|
|
|
| 89 |
})
|
| 90 |
|
| 91 |
it('handles partial data across multiple _onData calls', async () => {
|
| 92 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 93 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 94 |
c.socket = { write: vi.fn() }
|
| 95 |
const p = c.send('GET', 'key')
|
|
|
|
| 99 |
})
|
| 100 |
|
| 101 |
it('quit sends QUIT and destroys socket', async () => {
|
| 102 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 103 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 104 |
const destroy = vi.fn()
|
| 105 |
c.socket = { write: vi.fn(), destroy }
|
|
|
|
| 118 |
})
|
| 119 |
await new Promise(r => server.listen(0, '127.0.0.1', r))
|
| 120 |
const { port } = server.address()
|
| 121 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 122 |
const c = new RedisClient({ host: '127.0.0.1', port, password: 's', db: 1 })
|
| 123 |
await expect(c.connect()).resolves.toBeUndefined()
|
| 124 |
expect(c.connected).toBe(true)
|
|
|
|
| 131 |
})
|
| 132 |
await new Promise(r => server.listen(0, '127.0.0.1', r))
|
| 133 |
const { port } = server.address()
|
| 134 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 135 |
const c = new RedisClient({ host: '127.0.0.1', port })
|
| 136 |
await expect(c.connect()).resolves.toBeUndefined()
|
| 137 |
expect(c.connected).toBe(true)
|
|
|
|
| 139 |
})
|
| 140 |
|
| 141 |
it('uses default constructor options', async () => {
|
| 142 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 143 |
const c = new RedisClient()
|
| 144 |
expect(c.host).toBe('127.0.0.1')
|
| 145 |
expect(c.port).toBe(6379)
|
|
|
|
| 148 |
})
|
| 149 |
|
| 150 |
it('parses URL without port and without password', async () => {
|
| 151 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 152 |
const c = new RedisClient({ url: 'redis://myhost/3' })
|
| 153 |
expect(c.host).toBe('myhost')
|
| 154 |
expect(c.port).toBe(6379)
|
|
|
|
| 157 |
})
|
| 158 |
|
| 159 |
it('handles _parse offset and array null branches', async () => {
|
| 160 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 161 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 162 |
expect(c._parse(Buffer.from('x'), 1)).toBeNull()
|
| 163 |
expect(c._parse(Buffer.from('*-1\r\n')).value).toBeNull()
|
| 164 |
})
|
| 165 |
|
| 166 |
it('parses URL with empty hostname, using default host', async () => {
|
| 167 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 168 |
const c = new RedisClient({ url: 'redis:///3' })
|
| 169 |
expect(c.host).toBe('127.0.0.1')
|
| 170 |
expect(c.db).toBe(3)
|
| 171 |
})
|
| 172 |
|
| 173 |
it('parses URL with non-numeric path, keeping default db', async () => {
|
| 174 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 175 |
const c = new RedisClient({ url: 'redis://host/db' })
|
| 176 |
expect(c.host).toBe('host')
|
| 177 |
expect(c.db).toBe(0)
|
| 178 |
})
|
| 179 |
|
| 180 |
it('handles incomplete array data in _parse', async () => {
|
| 181 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 182 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 183 |
expect(c._parse(Buffer.from('*2\r\n$3\r\nfoo'))).toBeNull()
|
| 184 |
})
|
| 185 |
|
| 186 |
it('covers _onData when no response is complete', async () => {
|
| 187 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 188 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 189 |
c.socket = { write: vi.fn() }
|
| 190 |
c.send('PING')
|
|
|
|
| 193 |
})
|
| 194 |
|
| 195 |
it('covers redis helper methods', async () => {
|
| 196 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 197 |
const c = new RedisClient({ host: '127.0.0.1', port: 6379 })
|
| 198 |
c.socket = { write: vi.fn() }
|
| 199 |
c.ping()
|
|
|
|
| 216 |
})
|
| 217 |
await new Promise(r => server.listen(0, '127.0.0.1', r))
|
| 218 |
const { port } = server.address()
|
| 219 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 220 |
const c = new RedisClient({ host: '127.0.0.1', port, password: 's' })
|
| 221 |
await expect(c.connect()).rejects.toThrow('ERR invalid password')
|
| 222 |
expect(c.connected).toBe(false)
|
|
|
|
| 227 |
const server = net.createServer(() => {})
|
| 228 |
await new Promise(r => server.listen(0, '127.0.0.1', r))
|
| 229 |
const { port } = server.address()
|
| 230 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 231 |
const c = new RedisClient({ host: '127.0.0.1', port })
|
| 232 |
c.connect().catch(() => {})
|
| 233 |
await new Promise(r => setTimeout(r, 20))
|
|
|
|
| 246 |
})
|
| 247 |
await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve))
|
| 248 |
const { port } = server.address()
|
| 249 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 250 |
const c = new RedisClient({ host: '127.0.0.1', port })
|
| 251 |
await c.connect()
|
| 252 |
const p = c.send('PING')
|
|
|
|
| 267 |
})
|
| 268 |
await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve))
|
| 269 |
const { port } = server.address()
|
| 270 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 271 |
const c = new RedisClient({ host: '127.0.0.1', port, password: 's', db: 1 })
|
| 272 |
await expect(c.connect()).resolves.toBeUndefined()
|
| 273 |
expect(c.connected).toBe(true)
|
|
|
|
| 279 |
const server = net.createServer(() => {})
|
| 280 |
await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve))
|
| 281 |
const { port } = server.address()
|
| 282 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 283 |
const c = new RedisClient({ host: '127.0.0.1', port })
|
| 284 |
await expect(c.connect()).resolves.toBeUndefined()
|
| 285 |
expect(c.connected).toBe(true)
|
|
|
|
| 293 |
})
|
| 294 |
await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve))
|
| 295 |
const { port } = server.address()
|
| 296 |
+
const RedisClient = _require('../../src/redis/index.js')
|
| 297 |
const c = new RedisClient({ host: '127.0.0.1', port, password: 's' })
|
| 298 |
await expect(c.connect()).rejects.toThrow('ERR invalid password')
|
| 299 |
expect(c.connected).toBe(false)
|
tests/server/coverage-printlog.test.js
CHANGED
|
@@ -35,7 +35,7 @@ describe('server.js ESM coverage', () => {
|
|
| 35 |
process.env.RATE_LIMIT_ENABLED = 'false'
|
| 36 |
|
| 37 |
vi.resetModules()
|
| 38 |
-
const mod = await import('../../src/server.js')
|
| 39 |
|
| 40 |
await new Promise((r) => {
|
| 41 |
if (mod.server.listening) return r()
|
|
@@ -63,7 +63,7 @@ describe('server.js ESM coverage', () => {
|
|
| 63 |
process.env.RATE_LIMIT_ENABLED = 'false'
|
| 64 |
|
| 65 |
vi.resetModules()
|
| 66 |
-
const mod = await import('../../src/server.js')
|
| 67 |
|
| 68 |
let res
|
| 69 |
|
|
|
|
| 35 |
process.env.RATE_LIMIT_ENABLED = 'false'
|
| 36 |
|
| 37 |
vi.resetModules()
|
| 38 |
+
const mod = await import('../../src/server/index.js')
|
| 39 |
|
| 40 |
await new Promise((r) => {
|
| 41 |
if (mod.server.listening) return r()
|
|
|
|
| 63 |
process.env.RATE_LIMIT_ENABLED = 'false'
|
| 64 |
|
| 65 |
vi.resetModules()
|
| 66 |
+
const mod = await import('../../src/server/index.js')
|
| 67 |
|
| 68 |
let res
|
| 69 |
|
tests/server/server.test.js
CHANGED
|
@@ -19,8 +19,8 @@ afterAll(() => {
|
|
| 19 |
try { fs.rmSync(tmpDir, { recursive: true, force: true }) } catch {}
|
| 20 |
})
|
| 21 |
|
| 22 |
-
vi.mock('../../src/load-env.js', () => ({ loadEnv: () => {} }))
|
| 23 |
-
vi.mock('../../src/config.js', () => configMockFactory())
|
| 24 |
|
| 25 |
describe('server.js', () => {
|
| 26 |
it('handles 500 when db throws', async () => {
|
|
@@ -37,12 +37,12 @@ describe('server.js', () => {
|
|
| 37 |
nextId: () => 1,
|
| 38 |
TABLES: ['users', 'posts', 'comments', 'albums', 'photos', 'todos'],
|
| 39 |
}
|
| 40 |
-
clearCjs('../../src/server.js', '../../src/
|
| 41 |
-
const resolvedDb = _require.resolve('../../src/
|
| 42 |
_require.cache[resolvedDb] = { exports: mockDb, id: resolvedDb, filename: resolvedDb, loaded: true }
|
| 43 |
try {
|
| 44 |
vi.resetModules()
|
| 45 |
-
const { requestHandler } = await import('../../src/server.js')
|
| 46 |
|
| 47 |
const mkReq = (url, method, body) => ({
|
| 48 |
url, method, headers: {}, socket: { remoteAddress: '::1' },
|
|
@@ -83,7 +83,7 @@ describe('server.js', () => {
|
|
| 83 |
setEnv({ PORT: '0', REDIS_URL: '' })
|
| 84 |
delete process.env.START_SERVER
|
| 85 |
vi.resetModules()
|
| 86 |
-
const mod = await import('../../src/server.js')
|
| 87 |
const onError = (err) => { throw err }
|
| 88 |
mod.server.on('error', onError)
|
| 89 |
await new Promise((resolve) => {
|
|
@@ -111,8 +111,8 @@ describe('server.js', () => {
|
|
| 111 |
TABLES: ['users', 'posts', 'comments', 'albums', 'photos', 'todos'],
|
| 112 |
}
|
| 113 |
|
| 114 |
-
const resolvedRedis = _require.resolve('../../src/redis.js')
|
| 115 |
-
const resolvedDb = _require.resolve('../../src/
|
| 116 |
|
| 117 |
const mockClient = {
|
| 118 |
connect: vi.fn().mockResolvedValue(),
|
|
@@ -137,9 +137,9 @@ describe('server.js', () => {
|
|
| 137 |
const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {})
|
| 138 |
|
| 139 |
try {
|
| 140 |
-
clearCjs('../../src/server.js', '../../src/rate-limiter.js')
|
| 141 |
vi.resetModules()
|
| 142 |
-
const { printLog } = await import('../../src/server.js')
|
| 143 |
printLog()
|
| 144 |
expect(logSpy.mock.calls.some(c => String(c[0]).includes('Redis'))).toBe(true)
|
| 145 |
} finally {
|
|
@@ -148,7 +148,7 @@ describe('server.js', () => {
|
|
| 148 |
else delete _require.cache[resolvedRedis]
|
| 149 |
if (origDbCache) _require.cache[resolvedDb] = origDbCache
|
| 150 |
else delete _require.cache[resolvedDb]
|
| 151 |
-
clearCjs('../../src/server.js', '../../src/rate-limiter.js')
|
| 152 |
}
|
| 153 |
restore(s)
|
| 154 |
})
|
|
@@ -157,7 +157,7 @@ describe('server.js', () => {
|
|
| 157 |
const s = save('START_SERVER', 'REDIS_URL', 'REDIS_PORT')
|
| 158 |
setEnv({ START_SERVER: 'false', REDIS_URL: '', REDIS_PORT: '1' })
|
| 159 |
vi.resetModules()
|
| 160 |
-
const { printLog } = await import('../../src/server.js')
|
| 161 |
printLog()
|
| 162 |
restore(s)
|
| 163 |
})
|
|
@@ -178,8 +178,8 @@ describe('server.js', () => {
|
|
| 178 |
TABLES: ['users', 'posts', 'comments', 'albums', 'photos', 'todos'],
|
| 179 |
}
|
| 180 |
|
| 181 |
-
const resolvedRedis = _require.resolve('../../src/redis.js')
|
| 182 |
-
const resolvedDb = _require.resolve('../../src/
|
| 183 |
|
| 184 |
const mockClient = {
|
| 185 |
connect: vi.fn().mockResolvedValue(),
|
|
@@ -205,9 +205,9 @@ describe('server.js', () => {
|
|
| 205 |
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
|
| 206 |
|
| 207 |
try {
|
| 208 |
-
clearCjs('../../src/server.js', '../../src/rate-limiter.js')
|
| 209 |
vi.resetModules()
|
| 210 |
-
await import('../../src/server.js')
|
| 211 |
expect(logSpy).toHaveBeenCalledWith('[Redis] Connected ✓')
|
| 212 |
} finally {
|
| 213 |
logSpy.mockRestore()
|
|
@@ -216,7 +216,7 @@ describe('server.js', () => {
|
|
| 216 |
else delete _require.cache[resolvedRedis]
|
| 217 |
if (origDbCache) _require.cache[resolvedDb] = origDbCache
|
| 218 |
else delete _require.cache[resolvedDb]
|
| 219 |
-
clearCjs('../../src/server.js', '../../src/rate-limiter.js')
|
| 220 |
}
|
| 221 |
restore(s)
|
| 222 |
})
|
|
|
|
| 19 |
try { fs.rmSync(tmpDir, { recursive: true, force: true }) } catch {}
|
| 20 |
})
|
| 21 |
|
| 22 |
+
vi.mock('../../src/config/load-env.js', () => ({ loadEnv: () => {} }))
|
| 23 |
+
vi.mock('../../src/config/index.js', () => configMockFactory())
|
| 24 |
|
| 25 |
describe('server.js', () => {
|
| 26 |
it('handles 500 when db throws', async () => {
|
|
|
|
| 37 |
nextId: () => 1,
|
| 38 |
TABLES: ['users', 'posts', 'comments', 'albums', 'photos', 'todos'],
|
| 39 |
}
|
| 40 |
+
clearCjs('../../src/server/index.js', '../../src/db/index.js', '../../src/middleware/rate-limiter.js')
|
| 41 |
+
const resolvedDb = _require.resolve('../../src/db/index.js')
|
| 42 |
_require.cache[resolvedDb] = { exports: mockDb, id: resolvedDb, filename: resolvedDb, loaded: true }
|
| 43 |
try {
|
| 44 |
vi.resetModules()
|
| 45 |
+
const { requestHandler } = await import('../../src/server/index.js')
|
| 46 |
|
| 47 |
const mkReq = (url, method, body) => ({
|
| 48 |
url, method, headers: {}, socket: { remoteAddress: '::1' },
|
|
|
|
| 83 |
setEnv({ PORT: '0', REDIS_URL: '' })
|
| 84 |
delete process.env.START_SERVER
|
| 85 |
vi.resetModules()
|
| 86 |
+
const mod = await import('../../src/server/index.js')
|
| 87 |
const onError = (err) => { throw err }
|
| 88 |
mod.server.on('error', onError)
|
| 89 |
await new Promise((resolve) => {
|
|
|
|
| 111 |
TABLES: ['users', 'posts', 'comments', 'albums', 'photos', 'todos'],
|
| 112 |
}
|
| 113 |
|
| 114 |
+
const resolvedRedis = _require.resolve('../../src/redis/index.js')
|
| 115 |
+
const resolvedDb = _require.resolve('../../src/db/index.js')
|
| 116 |
|
| 117 |
const mockClient = {
|
| 118 |
connect: vi.fn().mockResolvedValue(),
|
|
|
|
| 137 |
const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {})
|
| 138 |
|
| 139 |
try {
|
| 140 |
+
clearCjs('../../src/server/index.js', '../../src/middleware/rate-limiter.js')
|
| 141 |
vi.resetModules()
|
| 142 |
+
const { printLog } = await import('../../src/server/index.js')
|
| 143 |
printLog()
|
| 144 |
expect(logSpy.mock.calls.some(c => String(c[0]).includes('Redis'))).toBe(true)
|
| 145 |
} finally {
|
|
|
|
| 148 |
else delete _require.cache[resolvedRedis]
|
| 149 |
if (origDbCache) _require.cache[resolvedDb] = origDbCache
|
| 150 |
else delete _require.cache[resolvedDb]
|
| 151 |
+
clearCjs('../../src/server/index.js', '../../src/middleware/rate-limiter.js')
|
| 152 |
}
|
| 153 |
restore(s)
|
| 154 |
})
|
|
|
|
| 157 |
const s = save('START_SERVER', 'REDIS_URL', 'REDIS_PORT')
|
| 158 |
setEnv({ START_SERVER: 'false', REDIS_URL: '', REDIS_PORT: '1' })
|
| 159 |
vi.resetModules()
|
| 160 |
+
const { printLog } = await import('../../src/server/index.js')
|
| 161 |
printLog()
|
| 162 |
restore(s)
|
| 163 |
})
|
|
|
|
| 178 |
TABLES: ['users', 'posts', 'comments', 'albums', 'photos', 'todos'],
|
| 179 |
}
|
| 180 |
|
| 181 |
+
const resolvedRedis = _require.resolve('../../src/redis/index.js')
|
| 182 |
+
const resolvedDb = _require.resolve('../../src/db/index.js')
|
| 183 |
|
| 184 |
const mockClient = {
|
| 185 |
connect: vi.fn().mockResolvedValue(),
|
|
|
|
| 205 |
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
|
| 206 |
|
| 207 |
try {
|
| 208 |
+
clearCjs('../../src/server/index.js', '../../src/middleware/rate-limiter.js')
|
| 209 |
vi.resetModules()
|
| 210 |
+
await import('../../src/server/index.js')
|
| 211 |
expect(logSpy).toHaveBeenCalledWith('[Redis] Connected ✓')
|
| 212 |
} finally {
|
| 213 |
logSpy.mockRestore()
|
|
|
|
| 216 |
else delete _require.cache[resolvedRedis]
|
| 217 |
if (origDbCache) _require.cache[resolvedDb] = origDbCache
|
| 218 |
else delete _require.cache[resolvedDb]
|
| 219 |
+
clearCjs('../../src/server/index.js', '../../src/middleware/rate-limiter.js')
|
| 220 |
}
|
| 221 |
restore(s)
|
| 222 |
})
|
vitest.config.js
CHANGED
|
@@ -10,6 +10,7 @@ export default defineConfig({
|
|
| 10 |
globals: true,
|
| 11 |
testTimeout: 15000,
|
| 12 |
hookTimeout: 15000,
|
|
|
|
| 13 |
coverage: {
|
| 14 |
provider: 'v8',
|
| 15 |
reporter: ['text', 'lcov', 'html'],
|
|
|
|
| 10 |
globals: true,
|
| 11 |
testTimeout: 15000,
|
| 12 |
hookTimeout: 15000,
|
| 13 |
+
fileParallelism: false,
|
| 14 |
coverage: {
|
| 15 |
provider: 'v8',
|
| 16 |
reporter: ['text', 'lcov', 'html'],
|