From 2afa07902e5e83e20fc3d71ebedc08bb9b0edce8 Mon Sep 17 00:00:00 2001 From: Andrii Arsenin Date: Wed, 30 Sep 2026 20:57:33 +0300 Subject: [PATCH] chore: upgrade to node 24 and read app version from workspace root - base the docker image on node:24-slim and require node >=24 via engines in the root package.json - read app name and version from the workspace root package.json for config, swagger, startup log and mcp server info; drop the server workspace version - bind test http servers to 127.0.0.1 so tests pass in containers without ipv6 loopback - bump version to 1.19.1 --- CHANGELOG.md | 13 +++++++++ Dockerfile | 6 ++-- docs/development.md | 2 +- package-lock.json | 10 ++++--- package.json | 5 +++- server/package.json | 2 +- server/src/common/app-package.ts | 40 ++++++++++++++++++++++++++ server/src/config/app.config.ts | 6 ++-- server/src/main.ts | 3 +- server/src/mcp/mcp.service.ts | 5 ++-- server/test/app-package.spec.ts | 21 ++++++++++++++ server/test/exec-context-files.spec.ts | 6 ++-- server/test/mcp.controller.spec.ts | 6 ++-- 13 files changed, 105 insertions(+), 20 deletions(-) create mode 100644 server/src/common/app-package.ts create mode 100644 server/test/app-package.spec.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bbe39c..66b47c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ All notable changes to this project will be documented in this file. +## 1.19.1 - 2026-09-30 + +Changes since 1.19.0: + +### Changed + +- Upgraded to Node.js 24: the Docker image is based on `node:24-slim`, and the root `package.json` declares `"engines": { "node": ">=24" }`. +- The server reads the app name and version (startup log, Swagger, MCP server info, `APP_NAME`/`APP_VERSION`) from the workspace root `package.json`. Previously local runs reported the server workspace's own `liqa-server` / `1.0.0`; the server workspace no longer has a version. + +### Fixed + +- Tests using a local HTTP server bind to `127.0.0.1` instead of `localhost`, which could resolve to an unreachable `::1` inside Docker containers. + ## 1.19.0 - 2026-09-30 Changes since 1.18.0: diff --git a/Dockerfile b/Dockerfile index b8ac6a3..9ae72c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # scheduler) also serves the built client, so one container is enough. # ── Client build ────────────────────────────────────────────────────────────── -FROM node:22-slim AS client-build +FROM node:24-slim AS client-build WORKDIR /app @@ -15,7 +15,7 @@ COPY client ./client RUN npm run -w client build # ── Server build ────────────────────────────────────────────────────────────── -FROM node:22-slim AS server-build +FROM node:24-slim AS server-build WORKDIR /app @@ -29,7 +29,7 @@ COPY server/src ./server/src RUN npm run -w server build # ── Runtime ─────────────────────────────────────────────────────────────────── -FROM node:22-slim AS runtime +FROM node:24-slim AS runtime # Shared libraries chrome-headless-shell links against (from `ldd`), plus # fontconfig and basic fonts for text rendering. Playwright's `--with-deps` diff --git a/docs/development.md b/docs/development.md index 296cb10..49dc4d4 100644 --- a/docs/development.md +++ b/docs/development.md @@ -2,7 +2,7 @@ ## Prerequisites -- Node.js 20+ +- Node.js 24+ (required by `engines` in `package.json`; the Docker image uses Node.js 24) - Docker + Docker Compose The repository is a **npm workspace monorepo** with two packages: diff --git a/package-lock.json b/package-lock.json index 39fdc46..9081c0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,19 @@ { "name": "liqa", - "version": "1.19.0", + "version": "1.19.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "liqa", - "version": "1.19.0", + "version": "1.19.1", "workspaces": [ "server", "client" - ] + ], + "engines": { + "node": ">=24" + } }, "client": { "name": "liqa-client", @@ -16693,7 +16696,6 @@ }, "server": { "name": "liqa-server", - "version": "1.0.0", "license": "ISC", "dependencies": { "@modelcontextprotocol/sdk": "^1.29.0", diff --git a/package.json b/package.json index 7b314a8..b8878ed 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,10 @@ { "name": "liqa", - "version": "1.19.0", + "version": "1.19.1", "private": true, + "engines": { + "node": ">=24" + }, "workspaces": [ "server", "client" diff --git a/server/package.json b/server/package.json index b47bc77..d3399a7 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "liqa-server", - "version": "1.0.0", + "private": true, "main": "index.js", "scripts": { "build": "nest build", diff --git a/server/src/common/app-package.ts b/server/src/common/app-package.ts new file mode 100644 index 0000000..8ff64f9 --- /dev/null +++ b/server/src/common/app-package.ts @@ -0,0 +1,40 @@ +import * as fs from "node:fs"; +import * as path from "node:path"; + +export interface AppPackage { + name: string; + version: string; +} + +let cached: AppPackage | undefined; + +/** + * Name and version of the application, read from the workspace root + * `package.json` (the one declaring `workspaces`) - the single source of the + * app version. Found by walking up from this file, which covers both the repo + * (`server/src/common` → repo root) and the Docker image + * (`/app/dist/common` → `/app/package.json`). + */ +export function appPackage(): AppPackage { + if (cached) return cached; + let dir = __dirname; + for (;;) { + const file = path.join(dir, "package.json"); + if (fs.existsSync(file)) { + const pkg = JSON.parse(fs.readFileSync(file, "utf8")) as Partial< + AppPackage & { workspaces: unknown } + >; + if (pkg.workspaces && pkg.name && pkg.version) { + cached = { name: pkg.name, version: pkg.version }; + return cached; + } + } + const parent = path.dirname(dir); + if (parent === dir) { + throw new Error( + `Workspace root package.json (with "workspaces", "name" and "version") not found above ${__dirname}`, + ); + } + dir = parent; + } +} diff --git a/server/src/config/app.config.ts b/server/src/config/app.config.ts index e266309..d5d70ad 100644 --- a/server/src/config/app.config.ts +++ b/server/src/config/app.config.ts @@ -8,7 +8,7 @@ import { validateSync, } from "class-validator"; -import pkg from "../../package.json"; +import { appPackage } from "../common/app-package"; export enum TraceMode { On = "on", @@ -26,10 +26,10 @@ export class AppConfig { PORT: number = 3000; @IsString() - APP_NAME: string = pkg.name; + APP_NAME: string = appPackage().name; @IsString() - APP_VERSION: string = pkg.version; + APP_VERSION: string = appPackage().version; @IsString() KEYS_DIR: string = "keys"; diff --git a/server/src/main.ts b/server/src/main.ts index 71b234d..593c7fd 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -3,8 +3,8 @@ import { ConfigService } from "@nestjs/config"; import { NestFactory } from "@nestjs/core"; import type { NestExpressApplication } from "@nestjs/platform-express"; import { DocumentBuilder, SwaggerModule } from "@nestjs/swagger"; -import { name as pkgName, version as pkgVersion } from "../package.json"; import { AppModule } from "./app.module"; +import { appPackage } from "./common/app-package"; import { configureBodyParsers } from "./common/body-parsers"; import { TraceLogger } from "./common/trace-logger"; import { AppConfig } from "./config/app.config"; @@ -28,6 +28,7 @@ process.on("unhandledRejection", (reason) => { }); async function bootstrap() { + const { name: pkgName, version: pkgVersion } = appPackage(); const API_PREFIX = "api/v1"; const logger = new TraceLogger("Bootstrap"); const app = await NestFactory.create(AppModule, { diff --git a/server/src/mcp/mcp.service.ts b/server/src/mcp/mcp.service.ts index 19b49bf..d97626f 100644 --- a/server/src/mcp/mcp.service.ts +++ b/server/src/mcp/mcp.service.ts @@ -16,7 +16,7 @@ import { E2eExportService } from "../scenario/e2e-export.service"; import { SnippetService } from "../snippet/snippet.service"; import { ImportService } from "../import/import.service"; -import pkg from "../../package.json"; +import { appPackage } from "../common/app-package"; @Injectable() export class McpService { @@ -34,7 +34,8 @@ export class McpService { ) {} private createServer(): McpServer { - const server = new McpServer({ name: pkg.name, version: pkg.version }); + const { name, version } = appPackage(); + const server = new McpServer({ name, version }); this.registerTools(server); return server; } diff --git a/server/test/app-package.spec.ts b/server/test/app-package.spec.ts new file mode 100644 index 0000000..9fe1ea2 --- /dev/null +++ b/server/test/app-package.spec.ts @@ -0,0 +1,21 @@ +import * as fs from "node:fs"; +import * as path from "node:path"; +import { appPackage } from "../src/common/app-package"; +import { validateAppConfig } from "../src/config/app.config"; + +describe("appPackage", () => { + const root = JSON.parse( + fs.readFileSync(path.resolve(__dirname, "../../package.json"), "utf8"), + ) as { name: string; version: string; workspaces: string[] }; + + it("reads name and version from the workspace root package.json", () => { + expect(root.workspaces).toContain("server"); + expect(appPackage()).toEqual({ name: root.name, version: root.version }); + }); + + it("feeds APP_NAME and APP_VERSION", () => { + const config = validateAppConfig({}); + expect(config.APP_NAME).toBe(root.name); + expect(config.APP_VERSION).toBe(root.version); + }); +}); diff --git a/server/test/exec-context-files.spec.ts b/server/test/exec-context-files.spec.ts index c25dd65..37dba4a 100644 --- a/server/test/exec-context-files.spec.ts +++ b/server/test/exec-context-files.spec.ts @@ -58,7 +58,7 @@ describe("Exec Context File Methods Integration Tests", () => { // Start a test HTTP server for downloadFile tests testServer = await createTestServer(); - testServerUrl = `http://localhost:${(testServer.address() as AddressInfo).port}`; + testServerUrl = `http://127.0.0.1:${(testServer.address() as AddressInfo).port}`; }); afterAll(async () => { @@ -94,7 +94,9 @@ describe("Exec Context File Methods Integration Tests", () => { } }); - server.listen(0, "localhost", () => { + // Explicit IPv4: "localhost" may bind ::1, which is unreachable in some + // containers (e.g. Docker without IPv6) + server.listen(0, "127.0.0.1", () => { resolve(server); }); }); diff --git a/server/test/mcp.controller.spec.ts b/server/test/mcp.controller.spec.ts index 921ec53..e6429db 100644 --- a/server/test/mcp.controller.spec.ts +++ b/server/test/mcp.controller.spec.ts @@ -51,7 +51,7 @@ describe("McpController", () => { // Start a test HTTP server for downloadFile tests testServer = await createTestServer(); - testServerUrl = `http://localhost:${(testServer.address() as AddressInfo).port}`; + testServerUrl = `http://127.0.0.1:${(testServer.address() as AddressInfo).port}`; }); afterAll(async () => { @@ -78,7 +78,9 @@ describe("McpController", () => { } }); - server.listen(0, "localhost", () => { + // Explicit IPv4: "localhost" may bind ::1, which is unreachable in some + // containers (e.g. Docker without IPv6) + server.listen(0, "127.0.0.1", () => { resolve(server); }); });