From 38f7ab87a53c74c02a51aca6858235c91aa55d1c Mon Sep 17 00:00:00 2001 From: Einhornimmond Date: Wed, 3 Dec 2025 12:22:36 +0100 Subject: [PATCH] fix module dependencies in correct category --- backend/package.json | 2 +- bun.lock | 35 +++++++++++----------- database/package.json | 2 +- database/src/index.ts | 3 +- database/src/util/TRANSACTIONS_LOCK.ts | 4 --- database/src/util/TRANSACTION_LINK_LOCK.ts | 4 --- database/src/util/index.ts | 2 -- dht-node/package.json | 2 +- federation/package.json | 2 +- package.json | 1 - 10 files changed, 23 insertions(+), 34 deletions(-) delete mode 100644 database/src/util/TRANSACTIONS_LOCK.ts delete mode 100644 database/src/util/TRANSACTION_LINK_LOCK.ts delete mode 100644 database/src/util/index.ts diff --git a/backend/package.json b/backend/package.json index fe5472c15..8ce613b3a 100644 --- a/backend/package.json +++ b/backend/package.json @@ -31,7 +31,6 @@ "dependencies": { "cross-env": "^7.0.3", "email-templates": "^10.0.1", - "redis-semaphore": "^5.6.2", "sodium-native": "^3.4.1" }, "devDependencies": { @@ -85,6 +84,7 @@ "openai": "^4.87.3", "prettier": "^3.5.3", "random-bigint": "^0.0.1", + "redis-semaphore": "^5.6.2", "reflect-metadata": "^0.1.13", "regenerator-runtime": "^0.14.1", "shared": "*", diff --git a/bun.lock b/bun.lock index 09b282865..d076c2e3b 100644 --- a/bun.lock +++ b/bun.lock @@ -6,7 +6,6 @@ "dependencies": { "auto-changelog": "^2.4.0", "cross-env": "^7.0.3", - "ioredis": "^5.8.2", "jose": "^4.14.4", "redis-semaphore": "^5.6.2", "turbo": "^2.5.0", @@ -20,7 +19,7 @@ }, "admin": { "name": "admin", - "version": "2.7.1", + "version": "2.7.2", "dependencies": { "@iconify/json": "^2.2.228", "@popperjs/core": "^2.11.8", @@ -90,11 +89,10 @@ }, "backend": { "name": "backend", - "version": "2.7.1", + "version": "2.7.2", "dependencies": { "cross-env": "^7.0.3", "email-templates": "^10.0.1", - "redis-semaphore": "^5.6.2", "sodium-native": "^3.4.1", }, "devDependencies": { @@ -148,6 +146,7 @@ "openai": "^4.87.3", "prettier": "^3.5.3", "random-bigint": "^0.0.1", + "redis-semaphore": "^5.6.2", "reflect-metadata": "^0.1.13", "regenerator-runtime": "^0.14.1", "shared": "*", @@ -166,7 +165,7 @@ }, "config-schema": { "name": "config-schema", - "version": "2.7.1", + "version": "2.7.2", "dependencies": { "esbuild": "^0.25.2", "joi": "17.13.3", @@ -184,7 +183,7 @@ }, "core": { "name": "core", - "version": "2.7.1", + "version": "2.7.2", "dependencies": { "database": "*", "email-templates": "^10.0.1", @@ -221,7 +220,7 @@ }, "database": { "name": "database", - "version": "2.7.1", + "version": "2.7.2", "dependencies": { "@types/uuid": "^8.3.4", "cross-env": "^7.0.3", @@ -229,6 +228,7 @@ "dotenv": "^10.0.0", "esbuild": "^0.25.2", "geojson": "^0.5.0", + "ioredis": "^5.8.2", "log4js": "^6.9.1", "mysql": "^2.18.1", "mysql2": "^3.15.3", @@ -247,7 +247,6 @@ "@types/geojson": "^7946.0.13", "@types/mysql": "^2.15.27", "@types/node": "^18.7.14", - "await-semaphore": "^0.1.3", "random-bigint": "^0.0.1", "ts-node": "^10.9.2", "typescript": "^4.9.5", @@ -255,11 +254,10 @@ }, "dht-node": { "name": "dht-node", - "version": "2.7.1", + "version": "2.7.2", "dependencies": { "cross-env": "^7.0.3", "dht-rpc": "6.18.1", - "require-addon": "1.1.0", "sodium-universal": "4.0.1", }, "devDependencies": { @@ -282,6 +280,7 @@ "log4js": "^6.9.1", "nodemon": "^2.0.7", "prettier": "^2.8.8", + "require-addon": "1.1.0", "source-map-support": "^0.5.21", "ts-jest": "27.1.4", "tsconfig-paths": "^4.1.1", @@ -293,11 +292,10 @@ }, "federation": { "name": "federation", - "version": "2.7.1", + "version": "2.7.2", "dependencies": { "cross-env": "^7.0.3", "email-templates": "^10.0.1", - "redis-semaphore": "^5.6.2", "sodium-native": "^3.4.1", }, "devDependencies": { @@ -339,6 +337,7 @@ "ncp": "^2.0.0", "nodemon": "^2.0.7", "prettier": "^3.5.3", + "redis-semaphore": "^5.6.2", "reflect-metadata": "^0.1.13", "shared": "*", "source-map-support": "^0.5.21", @@ -353,7 +352,7 @@ }, "frontend": { "name": "frontend", - "version": "2.7.1", + "version": "2.7.2", "dependencies": { "@morev/vue-transitions": "^3.0.2", "@types/leaflet": "^1.9.12", @@ -449,7 +448,7 @@ }, "shared": { "name": "shared", - "version": "2.7.1", + "version": "2.7.2", "dependencies": { "decimal.js-light": "^2.5.1", "esbuild": "^0.25.2", @@ -1743,7 +1742,7 @@ "content-type": ["content-type@1.0.5", "", {}, "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="], - "convert-source-map": ["convert-source-map@1.9.0", "", {}, "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="], + "convert-source-map": ["convert-source-map@2.0.0", "", {}, "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="], "cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="], @@ -3609,8 +3608,6 @@ "@babel/code-frame/js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="], - "@babel/core/convert-source-map": ["convert-source-map@2.0.0", "", {}, "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="], - "@babel/core/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], "@babel/helper-compilation-targets/lru-cache": ["lru-cache@5.1.1", "", { "dependencies": { "yallist": "^3.0.2" } }, "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="], @@ -3697,6 +3694,8 @@ "@jest/source-map/source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="], + "@jest/transform/convert-source-map": ["convert-source-map@1.9.0", "", {}, "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="], + "@jest/transform/source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="], "@jest/transform/write-file-atomic": ["write-file-atomic@3.0.3", "", { "dependencies": { "imurmurhash": "^0.1.4", "is-typedarray": "^1.0.0", "signal-exit": "^3.0.2", "typedarray-to-buffer": "^3.1.5" } }, "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="], @@ -4197,6 +4196,8 @@ "unplugin-vue-components/chokidar": ["chokidar@3.6.0", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="], + "v8-to-istanbul/convert-source-map": ["convert-source-map@1.9.0", "", {}, "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="], + "vee-validate/@vue/devtools-api": ["@vue/devtools-api@7.7.9", "", { "dependencies": { "@vue/devtools-kit": "^7.7.9" } }, "sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g=="], "vee-validate/type-fest": ["type-fest@4.41.0", "", {}, "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA=="], diff --git a/database/package.json b/database/package.json index 30a2b5bf3..29df64fc4 100644 --- a/database/package.json +++ b/database/package.json @@ -37,7 +37,6 @@ "@types/geojson": "^7946.0.13", "@types/mysql": "^2.15.27", "@types/node": "^18.7.14", - "await-semaphore": "^0.1.3", "random-bigint": "^0.0.1", "ts-node": "^10.9.2", "typescript": "^4.9.5" @@ -49,6 +48,7 @@ "dotenv": "^10.0.0", "esbuild": "^0.25.2", "geojson": "^0.5.0", + "ioredis": "^5.8.2", "log4js": "^6.9.1", "mysql": "^2.18.1", "mysql2": "^3.15.3", diff --git a/database/src/index.ts b/database/src/index.ts index 2afe19cad..b062add6d 100644 --- a/database/src/index.ts +++ b/database/src/index.ts @@ -4,7 +4,6 @@ export { latestDbVersion } export * from './entity' export * from './logging' export * from './queries' -export * from './seeds' -export * from './util' +export * from './seeds' export * from './enum' export { AppDatabase } from './AppDatabase' diff --git a/database/src/util/TRANSACTIONS_LOCK.ts b/database/src/util/TRANSACTIONS_LOCK.ts deleted file mode 100644 index 847386e4d..000000000 --- a/database/src/util/TRANSACTIONS_LOCK.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { Semaphore } from 'await-semaphore' - -const CONCURRENT_TRANSACTIONS = 1 -export const TRANSACTIONS_LOCK = new Semaphore(CONCURRENT_TRANSACTIONS) diff --git a/database/src/util/TRANSACTION_LINK_LOCK.ts b/database/src/util/TRANSACTION_LINK_LOCK.ts deleted file mode 100644 index 8058d9a81..000000000 --- a/database/src/util/TRANSACTION_LINK_LOCK.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { Semaphore } from 'await-semaphore' - -const CONCURRENT_TRANSACTIONS = 1 -export const TRANSACTION_LINK_LOCK = new Semaphore(CONCURRENT_TRANSACTIONS) diff --git a/database/src/util/index.ts b/database/src/util/index.ts deleted file mode 100644 index d2fde2126..000000000 --- a/database/src/util/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './TRANSACTIONS_LOCK' -export * from './TRANSACTION_LINK_LOCK' diff --git a/dht-node/package.json b/dht-node/package.json index 207324e06..4eed12b91 100644 --- a/dht-node/package.json +++ b/dht-node/package.json @@ -23,7 +23,6 @@ "dependencies": { "cross-env": "^7.0.3", "dht-rpc": "6.18.1", - "require-addon": "1.1.0", "sodium-universal": "4.0.1" }, "devDependencies": { @@ -46,6 +45,7 @@ "log4js": "^6.9.1", "nodemon": "^2.0.7", "prettier": "^2.8.8", + "require-addon": "1.1.0", "source-map-support": "^0.5.21", "ts-jest": "27.1.4", "tsconfig-paths": "^4.1.1", diff --git a/federation/package.json b/federation/package.json index 5f9634d04..6e0fc2710 100644 --- a/federation/package.json +++ b/federation/package.json @@ -25,7 +25,6 @@ "dependencies": { "cross-env": "^7.0.3", "email-templates": "^10.0.1", - "redis-semaphore": "^5.6.2", "sodium-native": "^3.4.1" }, "devDependencies": { @@ -67,6 +66,7 @@ "ncp": "^2.0.0", "nodemon": "^2.0.7", "prettier": "^3.5.3", + "redis-semaphore": "^5.6.2", "reflect-metadata": "^0.1.13", "shared": "*", "source-map-support": "^0.5.21", diff --git a/package.json b/package.json index d17ccd018..d249aad4b 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ "dependencies": { "auto-changelog": "^2.4.0", "cross-env": "^7.0.3", - "ioredis": "^5.8.2", "jose": "^4.14.4", "redis-semaphore": "^5.6.2", "turbo": "^2.5.0",