refactor(shared): unified queue handling (#4691)

* feat(shared): unified queue initialization in shared

* feat(queues): use the new queue creation everywhere

* chore(shared): move to redis module

* chore(shared): fix export maps

* chore(fileimport): add deps properly

* fix(shared): import fix

* fix(everything): moear imports

* fix(server): cjs imports
This commit is contained in:
Gergő Jedlicska
2025-05-08 16:58:43 +02:00
committed by GitHub
parent a26a5a90a1
commit 2fdcf1bd1d
27 changed files with 281 additions and 221 deletions
+69
View File
@@ -0,0 +1,69 @@
import Bull from 'bull'
import { Redis } from 'ioredis'
import { isRedisReady } from '../redis/isRedisReady.js'
// we're caching this here, so that there is one client for the app lifecycle
type ClientCache = Record<string, { client?: Redis; subscriber?: Redis }>
const clientCache: ClientCache = {}
export const initializeQueue = async <T>({
queueName,
redisUrl,
options
}: {
queueName: string
redisUrl: string
options?: Partial<Bull.QueueOptions>
}): Promise<Bull.Queue<T>> => {
if (!(redisUrl in clientCache)) clientCache[redisUrl] = {}
const opts: Bull.QueueOptions = {
...options,
// redisOpts here will contain at least a property of connectionName which will identify the queue based on its name
createClient(type, redisOpts) {
switch (type) {
case 'client':
if (redisUrl in clientCache && clientCache[redisUrl].client !== undefined) {
return clientCache[redisUrl].client
} else {
const client = new Redis(redisUrl, redisOpts ?? {})
clientCache[redisUrl].client = client
return client
}
case 'subscriber':
if (
redisUrl in clientCache &&
clientCache[redisUrl].subscriber !== undefined
) {
return clientCache[redisUrl].subscriber
} else {
const subscriber = new Redis(redisUrl, {
...redisOpts,
maxRetriesPerRequest: null,
enableReadyCheck: false
})
clientCache[redisUrl].subscriber = subscriber
return subscriber
}
case 'bclient':
return new Redis(redisUrl, {
...redisOpts,
maxRetriesPerRequest: null,
enableReadyCheck: false
})
default:
throw new Error(`Unexpected connection type: ${type}`)
}
}
}
const newQueue = new Bull<T>(queueName, opts)
// bull does not check if redis is ready...
//
// logger.info('Checking Redis connection is ready...')
if (!clientCache[redisUrl].client)
throw new Error('Redis client not properly initialized')
await isRedisReady(clientCache[redisUrl].client)
// await isRedisReady(clientCache[redisUrl].subscriber)
return await newQueue.isReady()
}
+1
View File
@@ -0,0 +1 @@
export * from './config.js'