4 Commits

Author SHA1 Message Date
1f07951b88 Remove excessive logging per line 2026-02-18 19:17:45 +00:00
b0a45f4000 Add WARN log warning that version checking is not enabled. 2026-02-17 18:56:09 +00:00
b42e37c569 Fix import path in three places.
Switch Dockerfile to use absolute paths
2026-02-17 18:53:41 +00:00
2cb9c320cf Remove DB connection.
Move to using internal API to check current version.
2026-01-16 22:41:18 +00:00
6 changed files with 8 additions and 72 deletions

View File

@@ -20,7 +20,7 @@ WORKDIR /app
COPY package*.json ./ COPY package*.json ./
RUN npm ci --omit=dev RUN npm ci --omit=dev
COPY --from=builder /app/dist ./dist COPY --from=builder /app/dist /app/dist
USER node USER node

View File

@@ -1,6 +1,6 @@
import { readFileSync, existsSync } from "node:fs" import { readFileSync, existsSync } from "node:fs"
import { join } from "node:path" import { join } from "node:path"
import { log } from "./logger"; import { log } from "./logger.js";
interface Config { interface Config {
Mq: Mq, Mq: Mq,

View File

@@ -1,62 +0,0 @@
// Functions to check the current applied version
// updating will be handled by the processing service
import { MongoClient } from "mongodb";
import { log } from "./logger";
import type { Mongo } from "./config";
const collection = "data_ingress_meta";
function uriBuild(cfg: Mongo): string {
if(!cfg.MONGO_URI || !cfg.MONGO_DB || !cfg.MONGO_USER || !cfg.MONGO_PASS) {
log('ERROR', "Missing MONGO Configuration - EXIT CODE: 35");
process.exit(35);
} else {
log("DEBUG", `MongoDB Connection`, {
uri: cfg.MONGO_URI,
db: cfg.MONGO_DB,
collection: collection,
user: cfg.MONGO_USER,
pass: "****",
});
};
return `mongodb://${encodeURIComponent(cfg.MONGO_USER)}:${encodeURIComponent(cfg.MONGO_PASS)}@${cfg.MONGO_URI}`
}
let mongoClient: MongoClient | null = null;
async function getMongoClient(cfg: Mongo) {
if (mongoClient) return mongoClient;
mongoClient = new MongoClient(uriBuild(cfg));
await mongoClient.connect();
return mongoClient;
}
export async function isPackageProcessed(cfg: Mongo, serviceName: string, packageName: string): Promise<boolean> {
try {
const client = await getMongoClient(cfg);
const database = client.db(cfg.MONGO_DB);
const coll = database.collection(collection);
const result = await coll.findOne({ service_name: serviceName });
if (!result) {
log('INFO', `No metadata found for ${serviceName}. Fetching PIS Data`);
return false;
}
if (result.latest_package === packageName) {
log('INFO', 'No update needed');
return true;
}
log('INFO', `Version mismatch. DB: ${result.latest_package}, Current: ${packageName}. Update required`)
return false;
} catch (err) {
log('ERROR', 'Failed to check Mongo for version state:', err);
process.exit(1);
}
}

View File

@@ -4,7 +4,6 @@ import { processAndStore } from './sss.js'
import { getLatestPackageName, getRequestStream } from './sources/gitea.js' import { getLatestPackageName, getRequestStream } from './sources/gitea.js'
import { processPisStream } from './process.js' import { processPisStream } from './process.js'
import { isPackageProcessed } from './database.js'
import { ConfigLoader } from './config.js' import { ConfigLoader } from './config.js'
import { sendFileUpdateMessage } from './nats.js' import { sendFileUpdateMessage } from './nats.js'
@@ -26,10 +25,9 @@ async function main() {
process.exit(9); process.exit(9);
} }
if (await isPackageProcessed(config.Mongo, SERVICE_NAME, packageInfo.name)) { // Check if package already processed HERE...
log('INFO', `Database matches latest release. Exiting`); log('WARN', 'Version check disabled, downloading data from source');
process.exit(0); // exit(0) if done, else continue
}
const inputStream: Readable = await getRequestStream(packageInfo.assets[0].browser_download_url); const inputStream: Readable = await getRequestStream(packageInfo.assets[0].browser_download_url);
const objectGenerator = processPisStream(config.General, inputStream); const objectGenerator = processPisStream(config.General, inputStream);

View File

@@ -1,9 +1,9 @@
import { connect, JSONCodec } from "nats"; import { connect, JSONCodec } from "nats";
import type { ConnectionOptions, NatsConnection, Payload } from "nats"; import type { ConnectionOptions, NatsConnection, Payload } from "nats";
import { log } from "./logger"; import { log } from "./logger.js";
import { hostname } from "node:os"; import { hostname } from "node:os";
import type { MQFileUpdate } from "@owlboard/backend-data-contracts/dist/data-ingress_mq-file-update"; import type { MQFileUpdate } from "@owlboard/backend-data-contracts/dist/data-ingress_mq-file-update";
import type { Mq } from "./config"; import type { Mq } from "./config.js";
const jc = JSONCodec(); const jc = JSONCodec();

View File

@@ -36,7 +36,7 @@ export async function* processPisStream(cfg: GeneralConfig, inputStream: Readabl
if (!line.trim()) continue; if (!line.trim()) continue;
const record = JSON.parse(line) as InputRecord; const record = JSON.parse(line) as InputRecord;
log('DEBUG', `JSON Line Parsed: ${JSON.stringify(record)}`) // log('DEBUG', `JSON Line Parsed: ${JSON.stringify(record)}`)
const crsHash = XXH.h64(record.stops.join('|'), SEED); const crsHash = XXH.h64(record.stops.join('|'), SEED);
const tiplocStops = await mapStopsToTiploc(record.stops); const tiplocStops = await mapStopsToTiploc(record.stops);