log-server: fix request with querystrings

This pins express-openapi-validator while cdimascio/express-openapi-validator#1071 is being fixed

Author: QuentinRoy

.changeset/real-regions-attack.md

@@ -0,0 +1,5 @@
+---
+'@lightmill/log-server': patch
+---
+
+Fix broken requests with query strings

packages/log-server/__tests__/app-errors.test.ts

@@ -9,6 +9,7 @@ import {
   createAllRoute,
   createMockStore,
   MockSessionStore,
+  type MockStore,
 } from './test-utils.js';
 
 let allRoutes = createAllRoute();

packages/log-server/package.json

@@ -30,8 +30,8 @@
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",
     "@types/cookie-parser": "^1.4.8",
-    "@types/cors": "^2.8.17",
-    "@types/express": "^5.0.1",
+    "@types/cors": "^2.8.18",
+    "@types/express": "^5.0.2",
     "@types/express-session": "^1.18.1",
     "@types/node": "catalog:",
     "@types/supertest": "^6.0.3",
@@ -40,9 +40,9 @@
     "cross-env": "^7.0.3",
     "onchange": "^7.1.0",
     "string-dedent": "^3.0.1",
-    "supertest": "^7.1.0",
+    "supertest": "^7.1.1",
     "tsx": "catalog:",
-    "type-fest": "^4.39.1",
+    "type-fest": "^4.41.0",
     "typescript": "catalog:",
     "vitest": "catalog:"
   },
@@ -51,21 +51,21 @@
     "express": "^5.1.0"
   },
   "dependencies": {
-    "@gabriel/ts-pattern": "npm:@jsr/gabriel__ts-pattern@^5.6.2",
-    "better-sqlite3": "^11.9.1",
+    "@gabriel/ts-pattern": "npm:@jsr/gabriel__ts-pattern@^5.7.1",
+    "better-sqlite3": "^11.10.0",
     "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
     "csv": "^6.3.11",
-    "dotenv": "^16.4.7",
+    "dotenv": "^16.5.0",
     "express": "^5.1.0",
-    "express-openapi-validator": "^5.4.9",
+    "express-openapi-validator": "5.4.9",
     "express-session": "^1.18.1",
-    "kysely": "^0.28.1",
+    "kysely": "^0.28.2",
     "loglevel": "^1.9.2",
     "memorystore": "^1.6.7",
-    "remeda": "^2.21.2",
+    "remeda": "^2.21.8",
     "yargs": "17.7.2",
-    "zod": "^3.24.2"
+    "zod": "^3.25.7"
   },
   "engines": {
     "node": "^22.x.x"

packages/log-server/src/api-utils.ts

@@ -100,9 +100,13 @@ export type ApiOperation<
   M extends HttpMethod = HttpMethod,
 > = NonNullable<A[P][M]>;
 
+interface QueryParameter {
+  [key: string]: string | string[] | QueryParameter;
+}
+
 export interface RequestParameters {
   path?: Record<string, string>;
-  query?: Record<string, string | string[]>;
+  query?: QueryParameter;
   header?: Record<string, string>;
   cookie?: Record<string, string>;
 }

packages/log-server/src/app.ts

@@ -46,7 +46,24 @@ export function LogServer({
   sessionStore = new MemorySessionStore({ checkPeriod: 1000 * 60 * 60 * 24 }),
   baseUrl = '/',
 }: CreateLogServerOptions): { middleware: express.RequestHandler } {
-  const app = express.Router();
+  const app = express();
+
+  app.set('query parser', (str: string | null) => {
+    if (str == null) return {};
+    let params = new URLSearchParams(decodeURIComponent(str));
+    let values: Record<string, string[] | string> = {};
+    for (const [key, value] of params.entries()) {
+      let oldValue = values[key];
+      if (oldValue == null) {
+        values[key] = value;
+      } else if (Array.isArray(oldValue)) {
+        oldValue.push(value);
+      } else {
+        values[key] = [oldValue, value];
+      }
+    }
+    return values;
+  });
 
   app.use(express.json());
 
@@ -89,34 +106,6 @@ export function LogServer({
     }),
   );
 
-  app.use(
-    (
-      request: express.Request,
-      _res: express.Response,
-      next: NextFunction,
-    ): void => {
-      let str = request.url.split('?')[1];
-      if (str == null) {
-        next();
-        return;
-      }
-      let params = new URLSearchParams(decodeURIComponent(str));
-      let values: Record<string, string[] | string> = {};
-      for (const [key, value] of params.entries()) {
-        let oldValue = values[key];
-        if (oldValue == null) {
-          values[key] = value;
-        } else if (Array.isArray(oldValue)) {
-          oldValue.push(value);
-        } else {
-          values[key] = [oldValue, value];
-        }
-      }
-      request.query = values;
-      next();
-    },
-  );
-
   createTypedExpressServer<ServerApi>(
     store,
     {