Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(control-api): release change-feed listeners safely

Josué41b14d9a00c5
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index 07501440f..a5035d477 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.606",
+ "version": "0.1.607",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.606",
+ "version": "0.1.607",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/grok-provider-attempt-contract": "file:../packages/grok-provider-attempt-contract",
diff --git a/control-api/package.json b/control-api/package.json
index 0f2f7f103..59d3d2ffd 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.606",
+ "version": "0.1.607",
"description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets",
"main": "dist/main.js",
"engines": {
diff --git a/control-api/src/services/entityChangeService.ts b/control-api/src/services/entityChangeService.ts
index 2d6bc640d..abd2f1bc6 100644
--- a/control-api/src/services/entityChangeService.ts
+++ b/control-api/src/services/entityChangeService.ts
@@ -86,20 +86,29 @@ async function runDispatcherTick(): Promise<void> {
async function connectWakeupListener(): Promise<void> {
if (wakeupListener || !dispatcherTimer) return
+ let client: PoolClient | null = null
try {
- const client = await pool.connect()
+ client = await pool.connect()
if (!dispatcherTimer) {
client.release()
+ client = null
return
}
await client.query('LISTEN entity_change_outbox')
- wakeupListener = client
- client.on('notification', () => void runDispatcherTick())
+ if (!dispatcherTimer) {
+ client.release(true)
+ client = null
+ return
+ }
+ const activeClient = client
+ wakeupListener = activeClient
+ client = null
+ activeClient.on('notification', () => void runDispatcherTick())
const disconnected = (err?: Error) => {
- if (wakeupListener !== client) return
+ if (wakeupListener !== activeClient) return
wakeupListener = null
- client.removeAllListeners('notification')
- client.release(true)
+ activeClient.removeAllListeners('notification')
+ activeClient.release(true)
if (err) {
logger.warn(
{ event: 'entity_change_dispatch_listener_lost', err },
@@ -113,9 +122,10 @@ async function connectWakeupListener(): Promise<void> {
}, 5000)
}
}
- client.on('error', disconnected)
- client.on('end', () => disconnected())
+ activeClient.on('error', disconnected)
+ activeClient.on('end', () => disconnected())
} catch (err) {
+ client?.release(true)
logger.warn(
{ event: 'entity_change_dispatch_listener_unavailable', err },
'dispatcher wake-up unavailable'
@@ -149,7 +159,7 @@ export function stopEntityChangeDispatcher(): void {
wakeupListener = null
if (listener) {
listener.removeAllListeners('notification')
- listener.release()
+ listener.release(true)
}
}
@@ -178,11 +188,13 @@ async function connectFeedWakeListener(): Promise<void> {
}
await client.query('LISTEN entity_change_feed')
if (feedWakeSubscribers.size === 0) {
- client.release()
+ client.release(true)
+ client = null
return
}
- feedWakeListener = client
const connectedClient = client
+ feedWakeListener = connectedClient
+ client = null
connectedClient.on('notification', () => {
for (const subscriber of Array.from(feedWakeSubscribers)) {
try {
@@ -241,7 +253,7 @@ export function subscribeEntityChangeFeedWake(onWake: () => void): () => void {
listener.removeAllListeners('notification')
listener.removeAllListeners('error')
listener.removeAllListeners('end')
- listener.release()
+ listener.release(true)
}
}
}
diff --git a/control-api/test/services.entityChangeService.test.ts b/control-api/test/services.entityChangeService.test.ts
index 63597aef5..ecb063347 100644
--- a/control-api/test/services.entityChangeService.test.ts
+++ b/control-api/test/services.entityChangeService.test.ts
@@ -4,6 +4,8 @@ import {
dispatchEntityChangeOutbox,
isEntityChangeCursor,
readEntityChangeCheckpoint,
+ startEntityChangeDispatcher,
+ stopEntityChangeDispatcher,
subscribeEntityChangeFeedWake,
} from '../src/services/entityChangeService.js'
@@ -86,5 +88,38 @@ describe('entityChangeService', () => {
unsubscribeFirst()
unsubscribeSecond()
expect(listener.release).toHaveBeenCalledOnce()
+ expect(listener.release).toHaveBeenCalledWith(true)
+ })
+
+ it('destroys a wake connection when LISTEN setup fails', async () => {
+ const listener = new EventEmitter() as EventEmitter & {
+ query: ReturnType<typeof vi.fn>
+ release: ReturnType<typeof vi.fn>
+ }
+ listener.query = vi.fn().mockRejectedValue(new Error('database connection lost'))
+ listener.release = vi.fn()
+ dbMock.connect.mockResolvedValueOnce(listener)
+
+ const unsubscribe = subscribeEntityChangeFeedWake(vi.fn())
+ await vi.waitFor(() => expect(listener.release).toHaveBeenCalledWith(true))
+ unsubscribe()
+ })
+
+ it('destroys the dispatcher LISTEN connection during shutdown', async () => {
+ const listener = new EventEmitter() as EventEmitter & {
+ query: ReturnType<typeof vi.fn>
+ release: ReturnType<typeof vi.fn>
+ }
+ listener.query = vi.fn().mockResolvedValue({ rows: [] })
+ listener.release = vi.fn()
+ dbMock.connect.mockResolvedValueOnce(listener)
+ dbMock.query.mockResolvedValue({ rows: [] })
+
+ startEntityChangeDispatcher()
+ await vi.waitFor(() =>
+ expect(listener.query).toHaveBeenCalledWith('LISTEN entity_change_outbox')
+ )
+ stopEntityChangeDispatcher()
+ expect(listener.release).toHaveBeenCalledWith(true)
})
})