diff --git a/Dockerfile b/Dockerfile index ccc3aa3..7d361d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,4 +33,4 @@ EXPOSE 50051 USER root USER node -CMD [ "npm", "start" ] +CMD [ "node", "./lib/start.cjs" ] diff --git a/package-lock.json b/package-lock.json index 51210dc..b9605f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@restorecommerce/kafka-client": "^1.2.10", "@restorecommerce/logger": "^1.3.1", "@restorecommerce/rc-grpc-clients": "^5.1.32", - "@restorecommerce/scs-jobs": "^0.1.34", + "@restorecommerce/scs-jobs": "^0.1.38", "@restorecommerce/service-config": "^1.0.15", "bullmq": "^5.8.2", "cache-manager": "^5.6.1", @@ -2564,12 +2564,13 @@ } }, "node_modules/@restorecommerce/kafka-client": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@restorecommerce/kafka-client/-/kafka-client-1.2.10.tgz", - "integrity": "sha512-PC58Yr7Hx5AVNo3rfRZ7nWrT/2xWN155t9I3WjgqZK3/IBByvLjl5rMhGBlbElRb0fsCU+Y0ujhrYdQtIiX+mA==", + "version": "1.2.14", + "resolved": "https://registry.npmjs.org/@restorecommerce/kafka-client/-/kafka-client-1.2.14.tgz", + "integrity": "sha512-tpCvr8A+CBnxIDB2WiYFXIioHwZSk0bHF83G69xkT1P6zmu1pROCPtAMMzh8MN+MJx2p9IT/AEMIUkVgs+gZuw==", + "license": "MIT", "dependencies": { "@restorecommerce/logger": "^1.3.1", - "@restorecommerce/rc-grpc-clients": "^5.1.32", + "@restorecommerce/rc-grpc-clients": "^5.1.36", "async": "^3.2.5", "cls-rtracer": "^2.6.3", "events": "^3.3.0", @@ -2605,9 +2606,10 @@ "integrity": "sha512-J/GspWIGoosderB5IRpWrVRZV/rhYl4eiS5lQsNi4VkR2F3vf5uZx63jlyU+0GdD9hwsLZ9p6YhB0vY4ZcwajQ==" }, "node_modules/@restorecommerce/rc-grpc-clients": { - "version": "5.1.32", - "resolved": "https://registry.npmjs.org/@restorecommerce/rc-grpc-clients/-/rc-grpc-clients-5.1.32.tgz", - "integrity": "sha512-Q2wl28Jy20wjO3xSwholPdwtoL5OFfWOzAkO3Ff60gQHk+HFrjPirbQQASw5BKIp2RaNFyTLjmeLElm4kgaR7Q==", + "version": "5.1.36", + "resolved": "https://registry.npmjs.org/@restorecommerce/rc-grpc-clients/-/rc-grpc-clients-5.1.36.tgz", + "integrity": "sha512-d5TNDvTftHT1Nxcwbd6RLAaCsM8Hhfc1CfglxX1lQiqXcfZUEAQajQEKXm6sLHaVUJPGb6YV/Hg2qqAmtf09bg==", + "license": "MIT", "dependencies": { "@grpc/grpc-js": "^1.9.11", "@restorecommerce/grpc-client": "^2.2.4", @@ -2624,18 +2626,18 @@ } }, "node_modules/@restorecommerce/scs-jobs": { - "version": "0.1.34", - "resolved": "https://registry.npmjs.org/@restorecommerce/scs-jobs/-/scs-jobs-0.1.34.tgz", - "integrity": "sha512-thLEnNb1VEeQ7E2yNFtOd70jQBW5odIbD1dYG4npnz9+w3p5hyOmCbbXMEcYJ6iqUZ4alUgIReYzLL3tLsQfeQ==", + "version": "0.1.38", + "resolved": "https://registry.npmjs.org/@restorecommerce/scs-jobs/-/scs-jobs-0.1.38.tgz", + "integrity": "sha512-CaRHewZZ/qQgBI9iUkdBskvs+cUKhdPXipc3pCu1OosUVgolb7onqVmmNLilUxlx5GOKBCNOV7skLn59tRrvVg==", + "license": "MIT", "dependencies": { "@restorecommerce/grpc-client": "^2.2.4", - "@restorecommerce/kafka-client": "^1.2.10", + "@restorecommerce/kafka-client": "^1.2.14", "@restorecommerce/logger": "^1.3.1", - "@restorecommerce/rc-grpc-clients": "^5.1.32", + "@restorecommerce/rc-grpc-clients": "^5.1.36", "bullmq": "^5.7.15", "lodash": "^4.17.21", - "redis": "^4.6.8", - "winston": "^3.11.0" + "redis": "^4.6.8" }, "engines": { "node": ">= 18.0.0" diff --git a/package.json b/package.json index a4f4908..90ed2e9 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@restorecommerce/kafka-client": "^1.2.10", "@restorecommerce/logger": "^1.3.1", "@restorecommerce/rc-grpc-clients": "^5.1.32", - "@restorecommerce/scs-jobs": "^0.1.34", + "@restorecommerce/scs-jobs": "^0.1.38", "@restorecommerce/service-config": "^1.0.15", "bullmq": "^5.8.2", "cache-manager": "^5.6.1", @@ -76,7 +76,7 @@ "dev": "cross-env NODE_ENV=development node lib/start.cjs", "test": "npm run lint && c8 --reporter=text npm run mocha", "test-debug": "npm run mochadebug", - "lint": "eslint src --ext .ts", + "lint": "eslint src --ext .ts --fix", "mocha": "cross-env NODE_ENV=test mocha --full-trace --exit --trace-warnings --exit", "mochadebug": "cross-env NODE_ENV=test mocha --inspect-brk --full-trace --exit --trace-warnings --exit", "lcov-report": "c8 report --reporter=lcov", diff --git a/src/external-jobs/default_queue_jobs.ts b/src/external-jobs/default_queue_jobs.ts index 2751418..831bb3d 100644 --- a/src/external-jobs/default_queue_jobs.ts +++ b/src/external-jobs/default_queue_jobs.ts @@ -1,5 +1,11 @@ -export default async (cfg, logger, events, runWorker) => { - await runWorker('default-queue', 1, cfg, logger, events, async (job) => { +import { + type DefaultExportFunc +} from '@restorecommerce/scs-jobs'; + +const main: DefaultExportFunc = async (cfg, logger, events, runWorker) => { + await runWorker('default-queue', 1, cfg, logger, events as any, async (job: any) => { // depending on job type add implementation here for Jobs to be run on default-queue }); -}; \ No newline at end of file +}; + +export default main; \ No newline at end of file diff --git a/src/worker.ts b/src/worker.ts index 10f8728..cfba202 100644 --- a/src/worker.ts +++ b/src/worker.ts @@ -344,7 +344,7 @@ export class Worker { externalJobFiles.forEach(async (externalFile) => { if (externalFile.endsWith('.js') || externalFile.endsWith('.cjs')) { const require_dir = process.env.EXTERNAL_JOBS_REQUIRE_DIR ?? './jobs/'; - + try { const fileImport = await import(require_dir + externalFile); // check for double default