Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/gcp-pubsub/lib/pubsub/AbstractPubSubPublisher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,4 +173,11 @@ export abstract class AbstractPubSubPublisher<MessagePayloadType extends object>
protected override resolveSchema(message: MessagePayloadType) {
return this.messageSchemaContainer.resolveSchema(message)
}

override async close(): Promise<void> {
// Dropped so a publish after close() starts a fresh lazy init, rather than awaiting an attempt
// that began before the close. Matches AbstractAmqpPublisher.
this.initPromise = undefined
await super.close()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,30 @@ describe('PubSubPermissionPublisher', () => {
await newPublisher.close()
})

it('starts a fresh lazy init when publishing after close', async () => {
const newPublisher = new PubSubPermissionPublisher(diContainer.cradle)
// The first attempt never settles, as if it were still in flight when close() ran
const initSpy = vi
.spyOn(newPublisher, 'init')
.mockImplementationOnce(() => new Promise(() => {}))
const message = (id: string) => ({
id,
messageType: 'add' as const,
timestamp: new Date().toISOString(),
userIds: ['userId1'],
})

void newPublisher.publish(message('close-reinit-1'))
await newPublisher.close()
await newPublisher.publish(message('close-reinit-2'))

const spy = await newPublisher.handlerSpy.waitForMessageWithId('close-reinit-2', 'published')
expect(spy.processingResult).toEqual({ status: 'published' })
expect(initSpy).toHaveBeenCalledTimes(2)

await newPublisher.close()
})

it('publishes a message to topic', async () => {
const message = {
id: '1',
Expand Down
7 changes: 7 additions & 0 deletions packages/sns/lib/sns/AbstractSnsPublisher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,4 +301,11 @@ export abstract class AbstractSnsPublisher<MessagePayloadType extends object>
return resolvedOptions
}
/* c8 ignore stop */

override async close(): Promise<void> {
// Dropped so a publish after close() starts a fresh lazy init, rather than awaiting an attempt
// that began before the close. Matches AbstractAmqpPublisher.
this.initPromise = undefined
await super.close()
}
}
18 changes: 18 additions & 0 deletions packages/sns/test/publishers/SnsPermissionPublisher.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -408,5 +408,23 @@ describe('SnsPermissionPublisher', () => {

await newPublisher.close()
})

it('starts a fresh lazy init when publishing after close', async () => {
const newPublisher = new SnsPermissionPublisher(diContainer.cradle)
// The first attempt never settles, as if it were still in flight when close() ran
const initSpy = vi
.spyOn(newPublisher, 'init')
.mockImplementationOnce(() => new Promise(() => {}))

void newPublisher.publish({ id: '1', messageType: 'add' })
await newPublisher.close()
await newPublisher.publish({ id: '2', messageType: 'add' })

const spy = await newPublisher.handlerSpy.waitForMessageWithId('2', 'published')
expect(spy.processingResult).toEqual({ status: 'published' })
expect(initSpy).toHaveBeenCalledTimes(2)

await newPublisher.close()
})
})
})
7 changes: 7 additions & 0 deletions packages/sqs/lib/sqs/AbstractSqsPublisher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -290,4 +290,11 @@ export abstract class AbstractSqsPublisher<MessagePayloadType extends object>

return resolvedOptions
}

override async close(): Promise<void> {
// Dropped so a publish after close() starts a fresh lazy init, rather than awaiting an attempt
// that began before the close. Matches AbstractAmqpPublisher.
this.initPromise = undefined
await super.close()
}
}
18 changes: 18 additions & 0 deletions packages/sqs/test/publishers/SqsPermissionPublisher.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -567,5 +567,23 @@ describe('SqsPermissionPublisher', () => {

await newPublisher.close()
})

it('starts a fresh lazy init when publishing after close', async () => {
const newPublisher = new SqsPermissionPublisher(diContainer.cradle)
// The first attempt never settles, as if it were still in flight when close() ran
const initSpy = vi
.spyOn(newPublisher, 'init')
.mockImplementationOnce(() => new Promise(() => {}))

void newPublisher.publish({ id: '1', messageType: 'add' })
await newPublisher.close()
await newPublisher.publish({ id: '2', messageType: 'add' })

const spy = await newPublisher.handlerSpy.waitForMessageWithId('2', 'published')
expect(spy.processingResult).toEqual({ status: 'published' })
expect(initSpy).toHaveBeenCalledTimes(2)

await newPublisher.close()
})
})
})
Loading