From c885c55118719d0aac4d917d23378ad898d39260 Mon Sep 17 00:00:00 2001 From: BatLeDev Date: Wed, 30 Oct 2024 17:21:17 +0100 Subject: [PATCH] fix: bad type paths --- package-lock.json | 71 ++++++++++++++++++++++++++++++++++++++++ worker/package.json | 5 +-- worker/src/types.ts | 4 +-- worker/src/utils/runs.ts | 3 +- worker/src/worker.ts | 8 ++--- 5 files changed, 81 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index a821b72f..51e1bbc7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1976,6 +1976,55 @@ "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==", "license": "MIT" }, + "node_modules/child-process-promise": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz", + "integrity": "sha512-Fi4aNdqBsr0mv+jgWxcZ/7rAIC2mgihrptyVI4foh/rrjY/3BNjfP9+oaiFx/fzim+1ZyCNBae0DlyfQhSugog==", + "license": "MIT", + "dependencies": { + "cross-spawn": "^4.0.2", + "node-version": "^1.0.0", + "promise-polyfill": "^6.0.1" + } + }, + "node_modules/child-process-promise/node_modules/cross-spawn": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", + "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==", + "license": "MIT", + "dependencies": { + "lru-cache": "^4.0.1", + "which": "^1.2.9" + } + }, + "node_modules/child-process-promise/node_modules/lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "license": "ISC", + "dependencies": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "node_modules/child-process-promise/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/child-process-promise/node_modules/yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==", + "license": "ISC" + }, "node_modules/cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", @@ -5381,6 +5430,15 @@ "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", "license": "ISC" }, + "node_modules/node-version": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz", + "integrity": "sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==", + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -5780,6 +5838,12 @@ "node": "^16 || ^18 || >=20" } }, + "node_modules/promise-polyfill": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", + "integrity": "sha512-g0LWaH0gFsxovsU7R5LrrhHhWAWiHRnh1GPrhXnPgYsDkIqjRYUYSZEsej/wtleDrz5xVSIDbeKfidztp2XHFQ==", + "license": "MIT" + }, "node_modules/prop-types": { "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", @@ -5812,6 +5876,12 @@ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", "license": "MIT" }, + "node_modules/pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==", + "license": "ISC" + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -7449,6 +7519,7 @@ "dependencies": { "@data-fair/lib-node": "^1.4.0", "axios-retry": "^4.5.0", + "child-process-promise": "^2.2.1", "tree-kill": "^1.2.2" }, "devDependencies": { diff --git a/worker/package.json b/worker/package.json index ceb82e31..7f0ea8dc 100644 --- a/worker/package.json +++ b/worker/package.json @@ -1,9 +1,9 @@ { "name": "worker", - "main": "index.js", + "main": "index.ts", "type": "module", "scripts": { - "dev": "NODE_ENV=development DEBUG=worker,upgrade* node --watch index.js" + "dev": "NODE_ENV=development DEBUG=worker,upgrade* node --watch --experimental-strip-types index.ts" }, "imports": { "#config": "./src/config.ts", @@ -17,6 +17,7 @@ "dependencies": { "@data-fair/lib-node": "^1.4.0", "axios-retry": "^4.5.0", + "child-process-promise": "^2.2.1", "tree-kill": "^1.2.2" } } diff --git a/worker/src/types.ts b/worker/src/types.ts index 1c257ab2..ee36533b 100644 --- a/worker/src/types.ts +++ b/worker/src/types.ts @@ -1,3 +1 @@ -import type { Run, Processing } from '../../api/types/index.ts' - -export type { Run, Processing } +export type { Run, Processing } from '../../api/types/index.ts' diff --git a/worker/src/utils/runs.ts b/worker/src/utils/runs.ts index 34302f98..791466dc 100644 --- a/worker/src/utils/runs.ts +++ b/worker/src/utils/runs.ts @@ -1,8 +1,9 @@ import type { Db } from 'mongodb' +import type { Run, Processing } from '#types' + import { incrementConsumption } from './limits.ts' import { runsMetrics } from './metrics.ts' import notifications from './notifications.ts' -import { Run, Processing } from '../../../api/types/index.ts' export const running = async (db: Db, wsPublish: (channel: string, data: any) => Promise, run: Run) => { const patch = { status: 'running' as Run['status'], startedAt: new Date().toISOString() } diff --git a/worker/src/worker.ts b/worker/src/worker.ts index 1cb676cb..07e8c51b 100644 --- a/worker/src/worker.ts +++ b/worker/src/worker.ts @@ -1,5 +1,6 @@ /* eslint-disable no-async-promise-executor */ import type { AggregationCursor, Collection, Db } from 'mongodb' +import type { Processing, Run } from '#types' import { spawn } from 'child-process-promise' import Debug from 'debug' @@ -12,12 +13,11 @@ import { startObserver, stopObserver, internalError } from '@data-fair/lib-node/ import upgradeScripts from '@data-fair/lib-node/upgrade-scripts.js' import config from '#config' import mongo from '#mongo' -import { Processing, Run } from '#types' import { createNext } from '../../shared/runs.ts' import { initPublisher } from '../../shared/ws.js' -import limits from './utils/limits.js' -import { initMetrics } from './utils/metrics.js' -import { finish } from './utils/runs.js' +import limits from './utils/limits.ts' +import { initMetrics } from './utils/metrics.ts' +import { finish } from './utils/runs.ts' const debug = Debug('worker') const debugLoop = Debug('worker-loop')