Skip to content
Merged
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@athenna/event",
"version": "5.2.0",
"version": "5.4.0",
"description": "The Athenna events handler with queue store. Based on Emittery syntax.",
"license": "MIT",
"author": "João Lenon <lenon@athenna.io>",
Expand Down
1 change: 1 addition & 0 deletions src/annotations/Listener.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import type { ListenerOptions } from '#src/types'
export function Listener(options?: ListenerOptions): ClassDecorator {
return (target: any) => {
options = Options.create(options, {
camelAlias: target.name,
alias: `App/Listeners/${target.name}`,
connection: Config.get('queue.default'),
type: 'transient'
Expand Down
10 changes: 10 additions & 0 deletions src/events/Listener.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,20 @@ export class Listener {
this.id = this.createId()
}

/**
* Remove the listener.
*/
public remove() {
Event.removeListenerById(this.id)
}

/**
* Run the listener.
*/
public async run(data: any) {
await this.closure(data)
}

private createId() {
return createHash('sha256')
.update(`${this.event ?? '*'}|${this.closure.toString()}`)
Expand Down
8 changes: 2 additions & 6 deletions src/providers/EventProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,8 @@ export class EventProvider extends ServiceProvider {
* Register the events file by importing the file.
*/
private async registerEvents(path: string) {
// Bust ESM import cache to guarantee the events file re-runs (tests/providers
// may register/shutdown provider multiple times in same process).
const resolvedPath = `${path}?version=${Math.random()}`

if (path.startsWith('#')) {
await Module.resolve(resolvedPath, this.getMeta())
await Module.resolve(path, this.getMeta())

return
}
Expand All @@ -72,6 +68,6 @@ export class EventProvider extends ServiceProvider {
return
}

await Module.resolve(`${path}?version=${Math.random()}`, this.getMeta())
await Module.resolve(path, this.getMeta())
}
}
4 changes: 2 additions & 2 deletions tests/fixtures/events/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import { Event } from '#src'
import { constants } from '#tests/fixtures/constants/index'

Event.on('annotatedListener', 'annotatedListener')
Event.on('helloListener', 'helloListener')
Event.on('productListener', 'productListener')
Event.on('helloListener', 'HelloListener')
Event.on('productListener', 'ProductListener')

Event.on('closureListener', ctx => {
constants.RUN_MAP.closureListener = true
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/annotations/ListenerAnnotationTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default class ListenerAnnotationTest extends BaseTest {
const metadata = Annotation.getMeta(ProductListener)

assert.isFalse(metadata.registered)
assert.isUndefined(metadata.camelAlias)
assert.equal(metadata.camelAlias, 'ProductListener')
assert.equal(metadata.type, 'transient')
assert.equal(metadata.connection, 'memory')
assert.equal(metadata.alias, 'App/Listeners/ProductListener')
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/providers/EventProviderTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ export class EventProviderTest {

await new EventProvider().register()

assert.isTrue(ioc.has('helloListener'))
assert.isTrue(ioc.has('productListener'))
assert.isTrue(ioc.has('HelloListener'))
assert.isTrue(ioc.has('ProductListener'))
assert.isTrue(ioc.has('annotatedListener'))

assert.equal(Event.listenerCount('helloListener'), 1)
Expand Down
Loading