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
This commit is contained in:
1 parent
d1e16f0386
commit
2afa07902e
13 files changed
+105
-20
No files matched your search
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "liqa-server",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"build": "nest build",
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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";
|
||||
|
||||
+2
-1
@@ -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<NestExpressApplication>(AppModule, {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
});
|
||||
});
|
||||
@@ -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);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -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);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user