Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e115edd79e | |||
| 1f07951b88 | |||
| b0a45f4000 | |||
| b42e37c569 |
@@ -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
|
||||||
|
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ async function main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check if package already processed HERE...
|
// Check if package already processed HERE...
|
||||||
|
log('WARN', 'Version check disabled, downloading data from source');
|
||||||
// exit(0) if done, else continue
|
// 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);
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
20
src/sss.ts
20
src/sss.ts
@@ -1,4 +1,4 @@
|
|||||||
import { S3Client } from "@aws-sdk/client-s3";
|
import { S3Client, CreateBucketCommand, HeadBucketCommand, S3ServiceException } from "@aws-sdk/client-s3";
|
||||||
import { Upload } from "@aws-sdk/lib-storage";
|
import { Upload } from "@aws-sdk/lib-storage";
|
||||||
import { createWriteStream } from "node:fs";
|
import { createWriteStream } from "node:fs";
|
||||||
import { Readable } from "node:stream";
|
import { Readable } from "node:stream";
|
||||||
@@ -24,7 +24,8 @@ export async function processAndStore(
|
|||||||
log("DEBUG", "Missing required variables for S3 Support - EXIT CODE 24");
|
log("DEBUG", "Missing required variables for S3 Support - EXIT CODE 24");
|
||||||
process.exit(24);
|
process.exit(24);
|
||||||
}
|
}
|
||||||
log('INFO', `Streaming to S3: ${cfg.S3_BUCKET}/${filename}`);
|
|
||||||
|
log("DEBUG", "Opening connection to S3 Server");
|
||||||
|
|
||||||
const client = new S3Client({
|
const client = new S3Client({
|
||||||
endpoint: cfg.S3_ENDPOINT,
|
endpoint: cfg.S3_ENDPOINT,
|
||||||
@@ -36,6 +37,21 @@ export async function processAndStore(
|
|||||||
forcePathStyle: true,
|
forcePathStyle: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Check bucket exists, and create if needed
|
||||||
|
try {
|
||||||
|
await client.send(new HeadBucketCommand({ Bucket: cfg.S3_BUCKET }));
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof S3ServiceException && err.$metadata.httpStatusCode === 404) {
|
||||||
|
log('INFO', `Bucket ${cfg.S3_BUCKET} does not exist, creating...`);
|
||||||
|
await client.send(new CreateBucketCommand({ Bucket: cfg.S3_BUCKET }));
|
||||||
|
} else {
|
||||||
|
log(`ERROR`, `Failed to verify bucket: ${cfg.S3_BUCKET}`);
|
||||||
|
process.exit(21);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
log('INFO', `Streaming to S3: ${cfg.S3_BUCKET}/${filename}`);
|
||||||
|
|
||||||
const upload = new Upload({
|
const upload = new Upload({
|
||||||
client,
|
client,
|
||||||
params: {
|
params: {
|
||||||
|
|||||||
Reference in New Issue
Block a user