Skip to content

Commit

Permalink
Merge pull request #11 from italia/test/crawler_version
Browse files Browse the repository at this point in the history
fix: crawler version from package.json in dist folder
  • Loading branch information
GiandonatoGreco authored Jan 12, 2023
2 parents 5e3787e + ec9f194 commit 8fb2a6f
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "crawler-handler",
"version": "1.2.1",
"version": "1.2.2",
"description": "Handler per il validatore di comuni e scuole",
"main": "index.js",
"type": "module",
Expand All @@ -16,7 +16,7 @@
"ts-queue-manager": "node --no-warnings --experimental-modules --es-module-specifier-resolution=node --loader ts-node/esm ./command/queueManager.ts",
"ts-scan-manager": "node --no-warnings --experimental-modules --es-module-specifier-resolution=node --loader ts-node/esm ./command/scanManager.ts",
"ts-PA2026-manager": "node --no-warnings --experimental-modules --es-module-specifier-resolution=node --loader ts-node/esm ./command/PA2026Manager.ts",
"build": "tsc && cp -rp ./.env ./dist && cp -rp ./.env.example ./dist",
"build": "tsc && cp -rp ./.env ./dist && cp -rp ./.env.example ./dist && cp -rp ./package.json ./dist",
"format:check": "prettier -c .",
"lint:check": "eslint --ext .js,.ts --max-warnings 0 .",
"prepack": "npm run build",
Expand Down
33 changes: 31 additions & 2 deletions routes/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ import { jobController } from "../controller/jobController";
import { dbWS } from "../database/connection";
import { allowedMunicipalitySubTypes } from "../database/models/entity";
import { Entity } from "../types/models";
import { readFileSync } from "fs";
import path from "path";
import { dirname } from "path";
import { fileURLToPath } from "url";

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
const __dirname = dirname(fileURLToPath(import.meta.url));

/**
* @openapi
Expand Down Expand Up @@ -614,8 +622,29 @@ router.post(

router.get(
"/api/info",
(req: emptyBodyType, res: successResponseType | errorResponseType): void => {
succesResponse({ version: "1.2.1" }, res, 200);
async (req: emptyBodyType, res: successResponseType | errorResponseType) => {
let packageJSON;
try {
packageJSON =
JSON.parse(
await readFileSync(
path.resolve(__dirname, "../package.json")
).toString()
) ?? {};
} catch (e) {
packageJSON = null;
errorResponse(0, { message: e.toString() }, 400, res);
}

const handlerVersion = packageJSON?.version ?? "";
const validatorVersion =
packageJSON?.dependencies["pa-website-validator"]?.split("#")[1] ?? "";

succesResponse(
{ handlerVersion: handlerVersion, validatorVersion: validatorVersion },
res,
200
);
}
);

Expand Down

0 comments on commit 8fb2a6f

Please sign in to comment.