IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-03-01 12:44:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into admin_add_registerdAt_on_usersearch

Browse Source
This commit is contained in:
einhornimmond 2025-12-04 09:03:12 +01:00 committed by GitHub
commit d701e5c5cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
43 changed files with 659 additions and 463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/test_backend.yml vendored
View File

@ -51,8 +51,8 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: docker-compose mariadb
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
- name: docker-compose mariadb redis
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb redis
- name: install bun
uses: oven-sh/setup-bun@v2

2
.github/workflows/test_database.yml vendored
View File

@ -49,7 +49,7 @@ jobs:
node-version: '18.20.7'
- name: Database | docker-compose
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb redis
- name: install bun
uses: oven-sh/setup-bun@v2

4
.github/workflows/test_dht_node.yml vendored
View File

@ -48,8 +48,8 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: docker-compose mariadb
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
- name: docker-compose mariadb redis
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb redis
- name: install bun
uses: oven-sh/setup-bun@v2

21
.github/workflows/test_e2e.yml vendored
View File

@ -20,8 +20,8 @@ jobs:
with:
bun-version-file: '.bun-version'
- name: Boot up test system | docker-compose mariadb mailserver
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver
- name: Boot up test system | docker-compose mariadb mailserver redis
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver redis
- name: Prepare test system
run: |
@ -63,10 +63,11 @@ jobs:
sudo nginx -t
sudo systemctl start nginx
- name: wait for nginx and mailserver to be ready
- name: wait for nginx, mailserver and redis to be ready
run: |
until nc -z 127.0.0.1 80; do echo waiting for nginx; sleep 1; done;
until nc -z 127.0.0.1 1025; do echo waiting for mailserver; sleep 1; done;
until nc -z 127.0.0.1 6379; do echo waiting for redis; sleep 1; done;
- name: End-to-end tests | run tests
id: e2e-tests
@ -125,8 +126,8 @@ jobs:
with:
bun-version-file: '.bun-version'
- name: Boot up test system | docker-compose mariadb mailserver
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver
- name: Boot up test system | docker-compose mariadb mailserver redis
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver redis
- name: Prepare test system
run: |
@ -169,10 +170,11 @@ jobs:
sudo nginx -t
sudo systemctl start nginx
- name: wait for nginx and mailserver to be ready
- name: wait for nginx, mailserver and redis to be ready
run: |
until nc -z 127.0.0.1 80; do echo waiting for nginx; sleep 1; done;
until nc -z 127.0.0.1 1025; do echo waiting for mailserver; sleep 1; done;
until nc -z 127.0.0.1 6379; do echo waiting for redis; sleep 1; done;
- name: End-to-end tests | run tests
id: e2e-tests
@ -210,8 +212,8 @@ jobs:
with:
bun-version-file: '.bun-version'
- name: Boot up test system | docker-compose mariadb mailserver
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver
- name: Boot up test system | docker-compose mariadb mailserver redis
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver redis
- name: Prepare test system
run: |
@ -250,10 +252,11 @@ jobs:
sudo nginx -t
sudo systemctl start nginx
- name: wait for nginx and mailserver to be ready
- name: wait for nginx, mailserver and redis to be ready
run: |
until nc -z 127.0.0.1 80; do echo waiting for nginx; sleep 1; done;
until nc -z 127.0.0.1 1025; do echo waiting for mailserver; sleep 1; done;
until nc -z 127.0.0.1 6379; do echo waiting for redis; sleep 1; done;
- name: End-to-end tests | run tests
id: e2e-tests

4
.github/workflows/test_federation.yml vendored
View File

@ -48,8 +48,8 @@ jobs:
- name: Checkout code
uses: actions/checkout@v3
- name: docker-compose mariadb
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
- name: docker-compose mariadb redis
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb redis
- name: install bun
uses: oven-sh/setup-bun@v2

16
README.md
View File

@ -105,6 +105,22 @@ turbo start
[More Infos for using turbo](./working-native.md)
### Dependencies & Bundling
This project uses esbuild to bundle the main modules (backend, dht-node, federation) into single JavaScript files for optimized deployment. To ensure a minimal and reliable Docker image, dependencies are intentionally split:
- dependencies: Only packages that cannot be bundled by esbuild into the output files.
Examples include:
- Native modules (sodium-native)
- Packages incompatible with bundling (email-templates)
- Runtime helpers (cross-env)
- devDependencies: All other packages that are fully bundled into the build output by esbuild.
This setup ensures that:
- The production Docker image contains only the minimal set of necessary runtime modules.
- Native or runtime-sensitive packages are included in node_modules for proper execution.
Note: Even if Docker is not used in all environments, this organization ensures consistent and predictable builds across different platforms.
### For Windows

1
backend/package.json
View File

@ -84,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": "*",

6
backend/src/federation/validateCommunities.test.ts
View File

@ -7,7 +7,7 @@ import { DataSource, Not } from 'typeorm'
import { cleanDB, testEnvironment } from '@test/helpers'
import { getLogger } from 'config-schema/test/testSetup'
import { LOG4JS_BASE_CATEGORY_NAME } from '@/config/const'
import { AppDatabase } from 'database'
import { validateCommunities } from './validateCommunities'
const logger = getLogger(`${LOG4JS_BASE_CATEGORY_NAME}.federation.validateCommunities`)
@ -16,21 +16,25 @@ const federationClientLogger = getLogger(
)
let con: DataSource
let db: AppDatabase
let testEnv: {
mutate: ApolloServerTestClient['mutate']
query: ApolloServerTestClient['query']
con: DataSource
db: AppDatabase
}
beforeAll(async () => {
testEnv = await testEnvironment(logger)
con = testEnv.con
db = testEnv.db
await cleanDB()
})
afterAll(async () => {
// await cleanDB()
await con.destroy()
await db.getRedisClient().quit()
})
describe('validate Communities', () => {

6
backend/src/graphql/resolver/CommunityResolver.test.ts
View File

@ -19,6 +19,7 @@ import { createCommunity, createVerifiedFederatedCommunity } from 'database/src/
import { getLogger } from 'config-schema/test/testSetup'
import { CONFIG } from '@/config'
import { AppDatabase } from 'database'
jest.mock('@/password/EncryptorUtils')
@ -28,11 +29,12 @@ CONFIG.FEDERATION_VALIDATE_COMMUNITY_TIMER = 1000
let mutate: ApolloServerTestClient['mutate']
let query: ApolloServerTestClient['query']
let con: DataSource
let db: AppDatabase
let testEnv: {
mutate: ApolloServerTestClient['mutate']
query: ApolloServerTestClient['query']
con: DataSource
db: AppDatabase
}
const peterLoginData = {
@ -46,6 +48,7 @@ beforeAll(async () => {
mutate = testEnv.mutate
query = testEnv.query
con = testEnv.con
db = testEnv.db
await cleanDB()
// reset id auto increment
await DbCommunity.clear()
@ -54,6 +57,7 @@ beforeAll(async () => {
afterAll(async () => {
await con.destroy()
await db.getRedisClient().quit()
})
// real valid ed25519 key pairs

5
backend/src/graphql/resolver/ContributionLinkResolver.test.ts
View File

@ -19,6 +19,7 @@ import { listContributionLinks } from '@/seeds/graphql/queries'
import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
import { peterLustig } from '@/seeds/users/peter-lustig'
import { getLogger } from 'config-schema/test/testSetup'
import { AppDatabase } from 'database'
jest.mock('@/password/EncryptorUtils')
@ -27,10 +28,12 @@ const logErrorLogger = getLogger(`${LOG4JS_BASE_CATEGORY_NAME}.server.LogError`)
let mutate: ApolloServerTestClient['mutate']
let query: ApolloServerTestClient['query']
let con: DataSource
let db: AppDatabase
let testEnv: {
mutate: ApolloServerTestClient['mutate']
query: ApolloServerTestClient['query']
con: DataSource
db: AppDatabase
}
beforeAll(async () => {
@ -38,6 +41,7 @@ beforeAll(async () => {
mutate = testEnv.mutate
query = testEnv.query
con = testEnv.con
db = testEnv.db
await cleanDB()
await userFactory(testEnv, bibiBloxberg)
await userFactory(testEnv, peterLustig)
@ -46,6 +50,7 @@ beforeAll(async () => {
afterAll(async () => {
await cleanDB()
await con.destroy()
await db.getRedisClient().quit()
})
describe('Contribution Links', () => {

5
backend/src/graphql/resolver/ContributionMessageResolver.test.ts
View File

@ -21,6 +21,7 @@ import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
import { bobBaumeister } from '@/seeds/users/bob-baumeister'
import { peterLustig } from '@/seeds/users/peter-lustig'
import { getLogger} from 'config-schema/test/testSetup'
import { AppDatabase } from 'database'
const logger = getLogger(`${LOG4JS_BASE_CATEGORY_NAME}.graphql.resolver.ContributionMessageResolver`)
const logErrorLogger = getLogger(`${LOG4JS_BASE_CATEGORY_NAME}.server.LogError`)
@ -40,10 +41,12 @@ jest.mock('core', () => {
let mutate: ApolloServerTestClient['mutate']
let con: DataSource
let db: AppDatabase
let testEnv: {
mutate: ApolloServerTestClient['mutate']
query: ApolloServerTestClient['query']
con: DataSource
db: AppDatabase
}
let result: any
@ -51,12 +54,14 @@ beforeAll(async () => {
testEnv = await testEnvironment(logger)
mutate = testEnv.mutate
con = testEnv.con
db = testEnv.db
await cleanDB()
})
afterAll(async () => {
await cleanDB()
await con.destroy()
await db.getRedisClient().quit()
})
describe('ContributionMessageResolver', () => {

5
backend/src/graphql/resolver/ContributionResolver.test.ts
View File

@ -52,6 +52,7 @@ import { stephenHawking } from '@/seeds/users/stephen-hawking'
import { getFirstDayOfPreviousNMonth } from 'core'
import { getLogger } from 'config-schema/test/testSetup'
import { getLogger as originalGetLogger } from 'log4js'
import { AppDatabase } from 'database'
jest.mock('core', () => {
const originalModule = jest.requireActual('core')
@ -71,10 +72,12 @@ const logger = getLogger(`${LOG4JS_BASE_CATEGORY_NAME}.server.LogError`)
let mutate: ApolloServerTestClient['mutate']
let query: ApolloServerTestClient['query']
let con: DataSource
let db: AppDatabase
let testEnv: {
mutate: ApolloServerTestClient['mutate']
query: ApolloServerTestClient['query']
con: DataSource
db: AppDatabase
}
let creation: Contribution | null
let admin: User
@ -90,12 +93,14 @@ beforeAll(async () => {
mutate = testEnv.mutate
query = testEnv.query
con = testEnv.con
db = testEnv.db
await cleanDB()
})
afterAll(async () => {
await cleanDB()
await con.destroy()
await db.getRedisClient().quit()
})
describe('ContributionResolver', () => {

54
backend/src/graphql/resolver/ContributionResolver.ts
View File

@ -1,8 +1,9 @@
import {
AppDatabase,
Contribution as DbContribution,
Transaction as DbTransaction,
User as DbUser,
DltTransaction as DbDltTransaction,
getLastTransaction,
UserContact,
} from 'database'
import { Decimal } from 'decimal.js-light'
@ -10,26 +11,7 @@ import { GraphQLResolveInfo } from 'graphql'
import { Arg, Args, Authorized, Ctx, Info, Int, Mutation, Query, Resolver } from 'type-graphql'
import { EntityManager, IsNull } from 'typeorm'
import { AdminCreateContributionArgs } from '@arg/AdminCreateContributionArgs'
import { AdminUpdateContributionArgs } from '@arg/AdminUpdateContributionArgs'
import { ContributionArgs } from '@arg/ContributionArgs'
import { Paginated } from '@arg/Paginated'
import { SearchContributionsFilterArgs } from '@arg/SearchContributionsFilterArgs'
import { ContributionStatus } from '@enum/ContributionStatus'
import { ContributionType } from '@enum/ContributionType'
import { AdminUpdateContribution } from '@model/AdminUpdateContribution'
import { Contribution, ContributionListResult } from '@model/Contribution'
import { OpenCreation } from '@model/OpenCreation'
import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
import { RIGHTS } from '@/auth/RIGHTS'
import {
fullName,
sendContributionChangedByModeratorEmail,
sendContributionConfirmedEmail,
sendContributionDeletedEmail,
sendContributionDeniedEmail,
TransactionTypeId
} from 'core'
import {
EVENT_ADMIN_CONTRIBUTION_CONFIRM,
EVENT_ADMIN_CONTRIBUTION_CREATE,
@ -43,13 +25,32 @@ import {
import { UpdateUnconfirmedContributionContext } from '@/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context'
import { LogError } from '@/server/LogError'
import { Context, getClientTimezoneOffset, getUser } from '@/server/context'
import { TRANSACTIONS_LOCK } from 'database'
import { AdminCreateContributionArgs } from '@arg/AdminCreateContributionArgs'
import { AdminUpdateContributionArgs } from '@arg/AdminUpdateContributionArgs'
import { ContributionArgs } from '@arg/ContributionArgs'
import { Paginated } from '@arg/Paginated'
import { SearchContributionsFilterArgs } from '@arg/SearchContributionsFilterArgs'
import { ContributionStatus } from '@enum/ContributionStatus'
import { ContributionType } from '@enum/ContributionType'
import { AdminUpdateContribution } from '@model/AdminUpdateContribution'
import { Contribution, ContributionListResult } from '@model/Contribution'
import { OpenCreation } from '@model/OpenCreation'
import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
import {
fullName,
sendContributionChangedByModeratorEmail,
sendContributionConfirmedEmail,
sendContributionDeletedEmail,
sendContributionDeniedEmail,
TransactionTypeId
} from 'core'
import { calculateDecay, Decay } from 'shared'
import { contributionTransaction } from '@/apis/dltConnector'
import { LOG4JS_BASE_CATEGORY_NAME } from '@/config/const'
import { ContributionMessageType } from '@enum/ContributionMessageType'
import { AppDatabase } from 'database'
import { getLogger } from 'log4js'
import { Mutex } from 'redis-semaphore'
import {
contributionFrontendLink,
loadAllContributions,
@ -58,8 +59,6 @@ import {
import { getOpenCreations, getUserCreation, validateContribution } from './util/creations'
import { extractGraphQLFields } from './util/extractGraphQLFields'
import { findContributions } from './util/findContributions'
import { getLastTransaction } from 'database'
import { contributionTransaction } from '@/apis/dltConnector'
const db = AppDatabase.getInstance()
const createLogger = () => getLogger(`${LOG4JS_BASE_CATEGORY_NAME}.graphql.resolver.ContributionResolver`)
@ -436,7 +435,9 @@ export class ContributionResolver {
const logger = createLogger()
logger.addContext('contribution', id)
// acquire lock
const releaseLock = await TRANSACTIONS_LOCK.acquire()
const mutex = new Mutex (db.getRedisClient(), 'TRANSACTIONS_LOCK')
await mutex.acquire()
try {
const clientTimezoneOffset = getClientTimezoneOffset(context)
const contribution = await DbContribution.findOne({ where: { id }, relations: {user: {emailContact: true}} })
@ -549,7 +550,8 @@ export class ContributionResolver {
}
await EVENT_ADMIN_CONTRIBUTION_CONFIRM(user, moderatorUser, contribution, contribution.amount)
} finally {
releaseLock()
// releaseLock()
await mutex.release()
}
return true
}

5
backend/src/graphql/resolver/EmailOptinCodes.test.ts
View File

@ -10,14 +10,17 @@ import { CONFIG } from '@/config'
import { writeHomeCommunityEntry } from '@/seeds/community'
import { createUser, forgotPassword, setPassword } from '@/seeds/graphql/mutations'
import { queryOptIn } from '@/seeds/graphql/queries'
import { AppDatabase } from 'database'
let mutate: ApolloServerTestClient['mutate']
let query: ApolloServerTestClient['query']
let con: DataSource
let db: AppDatabase
let testEnv: {
mutate: ApolloServerTestClient['mutate']
query: ApolloServerTestClient['query']
con: DataSource
db: AppDatabase
}
CONFIG.EMAIL_CODE_VALID_TIME = 1440
@ -29,12 +32,14 @@ beforeAll(async () => {
mutate = testEnv.mutate
query = testEnv.query
con = testEnv.con
db = testEnv.db
await cleanDB()
})
afterAll(async () => {
await cleanDB()
await con.destroy()
await db.getRedisClient().quit()
})
describe('EmailOptinCodes', () => {

4
backend/src/graphql/resolver/KlicktippResolver.test.ts
View File

@ -9,6 +9,7 @@ import { userFactory } from '@/seeds/factory/user'
import { login, subscribeNewsletter, unsubscribeNewsletter } from '@/seeds/graphql/mutations'
import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
import { LOG4JS_BASE_CATEGORY_NAME } from '@/config/const'
import { AppDatabase } from 'database'
jest.mock('@/password/EncryptorUtils')
@ -17,17 +18,20 @@ const logger = getLogger(`${LOG4JS_BASE_CATEGORY_NAME}.graphql.resolver.Klicktip
let testEnv: any
let mutate: any
let con: any
let db: AppDatabase
beforeAll(async () => {
testEnv = await testEnvironment(logger)
mutate = testEnv.mutate
con = testEnv.con
db = testEnv.db
await cleanDB()
})
afterAll(async () => {
await cleanDB()
await con.destroy()
await db.getRedisClient().quit()
})
describe('KlicktippResolver', () => {

11
backend/src/graphql/resolver/TransactionLinkResolver.test.ts
View File

@ -32,12 +32,11 @@ import { listTransactionLinksAdmin } from '@/seeds/graphql/queries'
import { transactionLinks } from '@/seeds/transactionLink/index'
import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
import { peterLustig } from '@/seeds/users/peter-lustig'
import { TRANSACTIONS_LOCK } from 'database'
import { LOG4JS_BASE_CATEGORY_NAME } from '@/config/const'
import { getLogger } from 'config-schema/test/testSetup'
import { transactionLinkCode } from './TransactionLinkResolver'
import { CONFIG } from '@/config'
import { AppDatabase } from 'database'
const logErrorLogger = getLogger(`${LOG4JS_BASE_CATEGORY_NAME}.server.LogError`)
@ -46,16 +45,18 @@ jest.mock('@/password/EncryptorUtils')
CONFIG.DLT_CONNECTOR = false
// mock semaphore to allow use fake timers
jest.mock('database/src/util/TRANSACTIONS_LOCK')
TRANSACTIONS_LOCK.acquire = jest.fn().mockResolvedValue(jest.fn())
// jest.mock('database/src/util/TRANSACTIONS_LOCK')
// TRANSACTIONS_LOCK.acquire = jest.fn().mockResolvedValue(jest.fn())
let mutate: ApolloServerTestClient['mutate']
let query: ApolloServerTestClient['query']
let con: DataSource
let db: AppDatabase
let testEnv: {
mutate: ApolloServerTestClient['mutate']
query: ApolloServerTestClient['query']
con: DataSource
db: AppDatabase
}
let user: User
@ -65,6 +66,7 @@ beforeAll(async () => {
mutate = testEnv.mutate
query = testEnv.query
con = testEnv.con
db = testEnv.db
await cleanDB()
await userFactory(testEnv, bibiBloxberg)
await userFactory(testEnv, peterLustig)
@ -73,6 +75,7 @@ beforeAll(async () => {
afterAll(async () => {
await cleanDB()
await con.destroy()
await db.getRedisClient().quit()
})
describe('TransactionLinkResolver', () => {

18
backend/src/graphql/resolver/TransactionLinkResolver.ts
View File

@ -39,7 +39,7 @@ import { LogError } from '@/server/LogError'
import { Context, getClientTimezoneOffset, getUser } from '@/server/context'
import { calculateBalance } from '@/util/validate'
import { fullName } from 'core'
import { TRANSACTION_LINK_LOCK, TRANSACTIONS_LOCK } from 'database'
// import { TRANSACTION_LINK_LOCK, TRANSACTIONS_LOCK } from 'database'
import {
calculateDecay,
compoundInterest,
@ -68,6 +68,8 @@ import { transactionLinkList } from './util/transactionLinkList'
import { SignedTransferPayloadType } from 'shared'
import { contributionTransaction, deferredTransferTransaction, redeemDeferredTransferTransaction } from '@/apis/dltConnector'
import { CODE_VALID_DAYS_DURATION } from './const/const'
import { Redis } from 'ioredis'
import { Mutex } from 'redis-semaphore'
const createLogger = (method: string) => getLogger(`${LOG4JS_BASE_CATEGORY_NAME}.graphql.resolver.TransactionLinkResolver.${method}`)
@ -237,7 +239,9 @@ export class TransactionLinkResolver {
const user = getUser(context)
if (code.match(/^CL-/)) {
// acquire lock
const releaseLock = await TRANSACTIONS_LOCK.acquire()
// const releaseLock = await TRANSACTIONS_LOCK.acquire()
const mutex = new Mutex(db.getRedisClient(), 'TRANSACTIONS_LOCK')
await mutex.acquire()
try {
methodLogger.info('redeem contribution link...')
const now = new Date()
@ -392,11 +396,14 @@ export class TransactionLinkResolver {
await queryRunner.release()
}
} finally {
releaseLock()
// releaseLock()
await mutex.release()
}
return true
} else {
const releaseLinkLock = await TRANSACTION_LINK_LOCK.acquire()
// const releaseLinkLock = await TRANSACTION_LINK_LOCK.acquire()
const mutex = new Mutex(db.getRedisClient(), 'TRANSACTION_LINK_LOCK')
await mutex.acquire()
const now = new Date()
try {
const transactionLink = await DbTransactionLink.findOne({ where: { code } })
@ -441,7 +448,8 @@ export class TransactionLinkResolver {
transactionLink.amount,
)
} finally {
releaseLinkLock()
// releaseLinkLock()
await mutex.release()
}
return true
}

3
backend/src/graphql/resolver/TransactionResolver.test.ts
View File

@ -35,6 +35,7 @@ import { stephenHawking } from '@/seeds/users/stephen-hawking'
import { getLogger } from 'config-schema/test/testSetup'
import { CONFIG } from '@/config'
import { CONFIG as CORE_CONFIG} from 'core'
import { AppDatabase } from 'database'
jest.mock('@/password/EncryptorUtils')
@ -49,6 +50,7 @@ let testEnv: {
mutate: ApolloServerTestClient['mutate']
query: ApolloServerTestClient['query']
con: DataSource
db: AppDatabase
}
beforeAll(async () => {
@ -62,6 +64,7 @@ beforeAll(async () => {
afterAll(async () => {
await cleanDB()
await con.destroy() // close()
await testEnv.db.getRedisClient().quit()
})
let bobData: any

12
backend/src/graphql/resolver/TransactionResolver.ts
View File

@ -33,7 +33,7 @@ import { Context, getUser } from '@/server/context'
import { communityUser } from '@/util/communityUser'
import { calculateBalance } from '@/util/validate'
import { virtualDecayTransaction, virtualLinkTransaction } from '@/util/virtualTransactions'
import { TRANSACTIONS_LOCK } from 'database'
// import { TRANSACTIONS_LOCK } from 'database'
import { LOG4JS_BASE_CATEGORY_NAME } from '@/config/const'
import { getLastTransaction } from 'database'
@ -44,6 +44,8 @@ import { getCommunityName, isHomeCommunity } from './util/communities'
import { getTransactionList } from './util/getTransactionList'
import { transactionLinkSummary } from './util/transactionLinkSummary'
import { transferTransaction, redeemDeferredTransferTransaction } from '@/apis/dltConnector'
import { Redis } from 'ioredis'
import { Mutex } from 'redis-semaphore'
const db = AppDatabase.getInstance()
const createLogger = () => getLogger(`${LOG4JS_BASE_CATEGORY_NAME}.graphql.resolver.TransactionResolver`)
@ -57,7 +59,10 @@ export const executeTransaction = async (
transactionLink?: dbTransactionLink | null,
): Promise<boolean> => {
// acquire lock
const releaseLock = await TRANSACTIONS_LOCK.acquire()
// const releaseLock = await TRANSACTIONS_LOCK.acquire()
const mutex = new Mutex(db.getRedisClient(), 'TRANSACTIONS_LOCK')
await mutex.acquire()
const receivedCallDate = new Date()
let dltTransactionPromise: Promise<DbDltTransaction | null> = Promise.resolve(null)
if (!transactionLink) {
@ -210,7 +215,8 @@ export const executeTransaction = async (
}
logger.info(`finished executeTransaction successfully`)
} finally {
releaseLock()
// releaseLock()
await mutex.release()
}
return true
}

5
backend/src/graphql/resolver/UserResolver.test.ts
View File

@ -1,6 +1,7 @@
import { UserInputError } from 'apollo-server-express'
import { ApolloServerTestClient } from 'apollo-server-testing'
import {
AppDatabase,
Community as DbCommunity,
Event as DbEvent,
TransactionLink,
@ -103,10 +104,12 @@ let user: User
let mutate: ApolloServerTestClient['mutate']
let query: ApolloServerTestClient['query']
let con: DataSource
let db: AppDatabase
let testEnv: {
mutate: ApolloServerTestClient['mutate']
query: ApolloServerTestClient['query']
con: DataSource
db: AppDatabase
}
beforeAll(async () => {
@ -114,6 +117,7 @@ beforeAll(async () => {
mutate = testEnv.mutate
query = testEnv.query
con = testEnv.con
db = testEnv.db
CONFIG.HUMHUB_ACTIVE = false
CONFIG.DLT_CONNECTOR = false
await cleanDB()
@ -122,6 +126,7 @@ beforeAll(async () => {
afterAll(async () => {
await cleanDB()
await con.destroy()
await db.getRedisClient().quit()
})
describe('UserResolver', () => {

58
backend/src/graphql/resolver/semaphore.test.ts
View File

@ -23,7 +23,9 @@ import { bobBaumeister } from '@/seeds/users/bob-baumeister'
import { peterLustig } from '@/seeds/users/peter-lustig'
import { CONFIG } from '@/config'
import { CONFIG as CORE_CONFIG } from 'core'
import { TRANSACTIONS_LOCK } from 'database'
// import { TRANSACTIONS_LOCK } from 'database'
import { Mutex } from 'redis-semaphore'
import { AppDatabase } from 'database'
jest.mock('@/password/EncryptorUtils')
@ -36,8 +38,8 @@ let testEnv: {
mutate: ApolloServerTestClient['mutate']
query: ApolloServerTestClient['query']
con: DataSource
db: AppDatabase
}
beforeAll(async () => {
testEnv = await testEnvironment()
mutate = testEnv.mutate
@ -48,41 +50,41 @@ beforeAll(async () => {
afterAll(async () => {
await cleanDB()
await con.destroy()
await testEnv.db.getRedisClient().quit()
})
type RunOrder = { [key: number]: { start: number, end: number } }
async function fakeWork(runOrder: RunOrder, index: number) {
const releaseLock = await TRANSACTIONS_LOCK.acquire()
type WorkData = { start: number, end: number }
async function fakeWork(workData: WorkData[], index: number) {
// const releaseLock = await TRANSACTIONS_LOCK.acquire()
// create a new mutex for every function call, like in production code
const mutex = new Mutex(testEnv.db.getRedisClient(), 'TRANSACTIONS_LOCK')
await mutex.acquire()
const startDate = new Date()
await new Promise((resolve) => setTimeout(resolve, Math.random() * 50))
const endDate = new Date()
runOrder[index] = { start: startDate.getTime(), end: endDate.getTime() }
releaseLock()
workData[index] = { start: startDate.getTime(), end: endDate.getTime() }
// releaseLock()
await mutex.release()
}
describe('semaphore', () => {
it("didn't should run in parallel", async () => {
const runOrder: RunOrder = {}
await Promise.all([
fakeWork(runOrder, 1),
fakeWork(runOrder, 2),
fakeWork(runOrder, 3),
fakeWork(runOrder, 4),
fakeWork(runOrder, 5),
])
expect(runOrder[1].start).toBeLessThan(runOrder[1].end)
expect(runOrder[1].start).toBeLessThan(runOrder[2].start)
expect(runOrder[2].start).toBeLessThan(runOrder[2].end)
expect(runOrder[2].start).toBeLessThan(runOrder[3].start)
expect(runOrder[3].start).toBeLessThan(runOrder[3].end)
expect(runOrder[3].start).toBeLessThan(runOrder[4].start)
expect(runOrder[4].start).toBeLessThan(runOrder[4].end)
expect(runOrder[4].start).toBeLessThan(runOrder[5].start)
expect(runOrder[5].start).toBeLessThan(runOrder[5].end)
expect(runOrder[1].end).toBeLessThan(runOrder[2].end)
expect(runOrder[2].end).toBeLessThan(runOrder[3].end)
expect(runOrder[3].end).toBeLessThan(runOrder[4].end)
expect(runOrder[4].end).toBeLessThan(runOrder[5].end)
const workData: WorkData[] = []
const promises: Promise<void>[] = []
for(let i = 0; i < 20; i++) {
promises.push(fakeWork(workData, i))
}
await Promise.all(promises)
workData.sort((a, b) => a.start - b.start)
workData.forEach((work, index) => {
expect(work.start).toBeLessThan(work.end)
if(index < workData.length - 1) {
expect(work.start).toBeLessThan(workData[index + 1].start)
expect(work.end).toBeLessThanOrEqual(workData[index + 1].start)
}
})
})
})

5
backend/src/graphql/resolver/util/creations.test.ts
View File

@ -1,6 +1,7 @@
import { ApolloServerTestClient } from 'apollo-server-testing'
import { Contribution, User } from 'database'
import { DataSource } from 'typeorm'
import { AppDatabase } from 'database'
import { cleanDB, contributionDateFormatter, testEnvironment } from '@test/helpers'
@ -18,22 +19,26 @@ CONFIG.HUMHUB_ACTIVE = false
let mutate: ApolloServerTestClient['mutate']
let con: DataSource
let db: AppDatabase
let testEnv: {
mutate: ApolloServerTestClient['mutate']
query: ApolloServerTestClient['query']
con: DataSource
db: AppDatabase
}
beforeAll(async () => {
testEnv = await testEnvironment()
mutate = testEnv.mutate
con = testEnv.con
db = testEnv.db
await cleanDB()
})
afterAll(async () => {
await cleanDB()
await con.destroy()
await db.getRedisClient().quit()
})
const setZeroHours = (date: Date): Date => {

4
backend/src/server/createServer.ts
View File

@ -9,7 +9,6 @@ import { slowDown } from 'express-slow-down'
import helmet from 'helmet'
import { Logger, getLogger } from 'log4js'
import { DataSource } from 'typeorm'
import { GRADIDO_REALM, LOG4JS_BASE_CATEGORY_NAME } from '@/config/const'
import { AppDatabase } from 'database'
import { context as serverContext } from './context'
@ -23,6 +22,7 @@ interface ServerDef {
apollo: ApolloServer
app: Express
con: DataSource
db: AppDatabase
}
export const createServer = async (
@ -100,5 +100,5 @@ export const createServer = async (
)
logger.debug('createServer...successful')
return { apollo, app, con: db.getDataSource() }
return { apollo, app, con: db.getDataSource(), db }
}

5
backend/src/util/klicktipp.test.ts
View File

@ -1,6 +1,7 @@
import { ApolloServerTestClient } from 'apollo-server-testing'
import { Event as DbEvent } from 'database'
import { DataSource } from 'typeorm'
import { AppDatabase } from 'database'
import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
@ -19,22 +20,26 @@ jest.mock('@/password/EncryptorUtils')
let mutate: ApolloServerTestClient['mutate']
let con: DataSource
let db: AppDatabase
let testEnv: {
mutate: ApolloServerTestClient['mutate']
query: ApolloServerTestClient['query']
con: DataSource
db: AppDatabase
}
beforeAll(async () => {
testEnv = await testEnvironment()
mutate = testEnv.mutate
con = testEnv.con
db = testEnv.db
await DbEvent.clear()
})
afterAll(async () => {
await cleanDB()
await con.destroy()
await db.getRedisClient().quit()
})
describe('klicktipp', () => {

2
backend/test/helpers.ts
View File

@ -33,7 +33,7 @@ export const testEnvironment = async (testLogger = getLogger('apollo')) => {
const testClient = createTestClient(server.apollo)
const mutate = testClient.mutate
const query = testClient.query
return { mutate, query, con }
return { mutate, query, con, db: server.db }
}
export const resetEntity = async (entity: any) => {

755
bun.lock
View File

File diff suppressed because it is too large Load Diff

1
core/package.json
View File

@ -36,6 +36,7 @@
"log4js": "^6.9.1",
"nodemailer": "^6.6.5",
"pug": "^3.0.2",
"redis-semaphore": "^5.6.2",
"shared": "*",
"sodium-native": "^3.4.1",
"zod": "^3.25.61"

2
core/src/emails/sendEmailTranslated.test.ts
View File

@ -41,7 +41,7 @@ const spySetLocale = jest.spyOn(i18n, 'setLocale')
const spyTranslate = jest.spyOn(i18n, '__')
describe('sendEmailTranslated', () => {
let result: Record<string, unknown> | boolean | Error | null
let result: Record<string, unknown> | boolean | null | Error
describe('config email is false', () => {
beforeEach(async () => {

3
core/src/emails/sendEmailVariants.test.ts
View File

@ -1,5 +1,6 @@
import { Decimal } from 'decimal.js-light'
import { CONFIG } from '../config'
import { mock, jest, describe, it, expect, beforeAll, afterEach } from 'bun:test'
import * as sendEmailTranslatedApi from './sendEmailTranslated'
import {
@ -25,7 +26,7 @@ CONFIG.EMAIL_SMTP_HOST = testMailServerHost
CONFIG.EMAIL_SMTP_PORT = testMailServerPort
CONFIG.EMAIL_TLS = testMailTLS
jest.mock('nodemailer', () => {
mock.module('nodemailer', () => {
return {
__esModule: true,
createTransport: jest.fn(() => {

12
core/src/graphql/logic/settlePendingSenderTransaction.ts
View File

@ -14,8 +14,10 @@ import { LOG4JS_BASE_CATEGORY_NAME } from '../../config/const'
import { PendingTransactionState } from 'shared'
// import { LogError } from '@/server/LogError'
import { calculateSenderBalance } from '../../util/calculateSenderBalance'
import { TRANSACTIONS_LOCK, getLastTransaction } from 'database'
// import { TRANSACTIONS_LOCK, getLastTransaction } from 'database'
import { getLastTransaction } from 'database'
import { getLogger } from 'log4js'
import { Mutex } from 'redis-semaphore'
const db = AppDatabase.getInstance()
const logger = getLogger(
@ -29,7 +31,10 @@ export async function settlePendingSenderTransaction(
): Promise<boolean> {
// TODO: synchronisation with TRANSACTION_LOCK of federation-modul necessary!!!
// acquire lock
const releaseLock = await TRANSACTIONS_LOCK.acquire()
// const releaseLock = await TRANSACTIONS_LOCK.acquire()
const mutex = new Mutex(db.getRedisClient(), 'TRANSACTIONS_LOCK')
await mutex.acquire()
const queryRunner = db.getDataSource().createQueryRunner()
await queryRunner.connect()
await queryRunner.startTransaction('REPEATABLE READ')
@ -121,7 +126,8 @@ export async function settlePendingSenderTransaction(
throw new Error('X-Com: send Transaction was not successful')
} finally {
await queryRunner.release()
releaseLock()
// releaseLock()
await mutex.release()
}
/*
void sendTransactionReceivedEmail({

2
database/package.json
View File

@ -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",

16
database/src/AppDatabase.ts
View File

@ -5,12 +5,14 @@ import { getLogger } from 'log4js'
import { latestDbVersion } from '.'
import { CONFIG } from './config'
import { LOG4JS_BASE_CATEGORY_NAME } from './config/const'
import Redis from 'ioredis'
const logger = getLogger(`${LOG4JS_BASE_CATEGORY_NAME}.AppDatabase`)
export class AppDatabase {
private static instance: AppDatabase
private dataSource: DBDataSource | undefined
private redisClient: Redis | undefined
/**
* The Singleton's constructor should always be private to prevent direct
@ -88,10 +90,24 @@ export class AppDatabase {
}
// check for correct database version
await this.checkDBVersion()
this.redisClient = new Redis(CONFIG.REDIS_URL)
logger.info('Redis status=', this.redisClient.status)
}
public async destroy(): Promise<void> {
await this.dataSource?.destroy()
if (this.redisClient) {
await this.redisClient.quit()
this.redisClient = undefined
}
}
public getRedisClient(): Redis {
if (!this.redisClient) {
throw new Error('Redis client not initialized')
}
return this.redisClient
}
// ######################################

3
database/src/config/index.ts
View File

@ -24,5 +24,6 @@ const database = {
}
const PRODUCTION = process.env.NODE_ENV === 'production' || false
const nodeEnv = process.env.NODE_ENV || 'development'
const REDIS_URL = process.env.REDIS_URL || 'redis://localhost:6379'
export const CONFIG = { ...database, NODE_ENV: nodeEnv, PRODUCTION, ...defaults }
export const CONFIG = { ...database, NODE_ENV: nodeEnv, PRODUCTION, REDIS_URL, ...defaults }

3
database/src/index.ts
View File

@ -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'

4
database/src/util/TRANSACTIONS_LOCK.ts
View File

@ -1,4 +0,0 @@
import { Semaphore } from 'await-semaphore'
const CONCURRENT_TRANSACTIONS = 1
export const TRANSACTIONS_LOCK = new Semaphore(CONCURRENT_TRANSACTIONS)

4
database/src/util/TRANSACTION_LINK_LOCK.ts
View File

@ -1,4 +0,0 @@
import { Semaphore } from 'await-semaphore'
const CONCURRENT_TRANSACTIONS = 1
export const TRANSACTION_LINK_LOCK = new Semaphore(CONCURRENT_TRANSACTIONS)

2
database/src/util/index.ts
View File

@ -1,2 +0,0 @@
export * from './TRANSACTIONS_LOCK'
export * from './TRANSACTION_LINK_LOCK'

20
deployment/bare_metal/install-missing-deps.sh
View File

@ -5,7 +5,7 @@
# make sure correct node version is installed
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
if ! command -v nvm &> /dev/null
if ! command -v nvm > /dev/null
then
echo "'nvm' is missing, will be installed now!"
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
@ -20,7 +20,7 @@ install_nvm() {
nvm use || install_nvm
# unzip needed for bun install script
if ! command -v unzip &> /dev/null
if ! command -v unzip > /dev/null
then
echo "'unzip' is missing, will be installed now!"
sudo apt-get install -y unzip
@ -34,7 +34,7 @@ if [ ! -f "$BUN_VERSION_FILE" ]; then
exit 1
fi
BUN_VERSION="$(cat "$BUN_VERSION_FILE" | tr -d '[:space:]')"
if ! command -v bun &> /dev/null
if ! command -v bun > /dev/null
then
echo "'bun' is missing, v$BUN_VERSION will be installed now!"
curl -fsSL https://bun.com/install | bash -s "bun-v${BUN_VERSION}"
@ -49,22 +49,30 @@ else
fi
fi
# turbo https://turborepo.com/docs/getting-started
if ! command -v turbo &> /dev/null
if ! command -v turbo > /dev/null
then
echo "'turbo' is missing, will be installed now!"
bun install --global turbo
fi
# rust and grass
if ! command -v cargo &> /dev/null
if ! command -v cargo > /dev/null
then
echo "'cargo' is missing, will be installed now!"
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
export CARGO_HOME="$HOME/.cargo"
export PATH="$CARGO_HOME/bin:$PATH"
fi
if ! command -v grass &> /dev/null
if ! command -v grass > /dev/null
then
echo "'grass' is missing, will be installed now!"
cargo install grass
fi
# redis
if ! command -v redis-cli --version > /dev/null
then
echo "redis is missing, will be installed now!"
sudo apt update
sudo apt install redis -y
fi

1
dht-node/package.json
View File

@ -45,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",

8
docker-compose.override.yml
View File

@ -159,6 +159,14 @@ services:
- internal-net
- external-net
#########################################################
## REDIS ################################################
#########################################################
redis:
networks:
- internal-net
- external-net
#########################################################
## NGINX ################################################
#########################################################

8
docker-compose.test.yml
View File

@ -87,6 +87,14 @@ services:
volumes:
- db_test_vol:/var/lib/mysql
#########################################################
## REDIS ################################################
#########################################################
redis:
networks:
- internal-net
- external-net
#########################################################
## PHPMYADMIN ###########################################
#########################################################

12
docker-compose.yml
View File

@ -76,6 +76,18 @@ services:
volumes:
- db_vol:/var/lib/mysql
#########################################################
## REDIS ################################################
#########################################################
redis:
image: redis:6.2.6
networks:
- internal-net
ports:
- ${REDIS_PORT:-6379}:6379
volumes:
- ./logs/redis:/logs/redis
########################################################
# BACKEND ##############################################
########################################################

1
federation/package.json
View File

@ -66,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",