@avelonjs/core 0.8.2 → 0.8.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -15,6 +15,7 @@ import { backoffSeconds, jobBoard } from './jobs'
|
|
|
15
15
|
import { holdUntilCommit, isInTransaction } from './transaction'
|
|
16
16
|
|
|
17
17
|
interface StoredRegistration {
|
|
18
|
+
id: string
|
|
18
19
|
event?: EventConstructor
|
|
19
20
|
pattern?: string
|
|
20
21
|
listener: ListenerDefinition<Event>
|
|
@@ -37,7 +38,7 @@ class JsonEventSerializer implements EventSerializer {
|
|
|
37
38
|
|
|
38
39
|
async deserialize(serialized: SerializedEvent): Promise<Event> {
|
|
39
40
|
const ctor = this.#constructors.get(serialized.name)
|
|
40
|
-
const event =
|
|
41
|
+
const event = Object.assign(new Event(), serialized.payload)
|
|
41
42
|
if (ctor !== undefined) Object.setPrototypeOf(event, ctor.prototype)
|
|
42
43
|
return event
|
|
43
44
|
}
|
|
@@ -56,12 +57,12 @@ function isFalse(result: ListenerResult): result is false {
|
|
|
56
57
|
export class InProcessEventDispatcher implements EventDispatcher {
|
|
57
58
|
readonly #registrations: StoredRegistration[] = []
|
|
58
59
|
readonly #after: Array<() => Promise<void>> = []
|
|
59
|
-
readonly #serializer:
|
|
60
|
+
readonly #serializer: EventSerializer
|
|
60
61
|
#queue: QueueDriver | undefined
|
|
61
62
|
|
|
62
63
|
constructor(options: { queue?: QueueDriver; serializer?: EventSerializer } = {}) {
|
|
63
64
|
this.#queue = options.queue
|
|
64
|
-
this.#serializer = new JsonEventSerializer()
|
|
65
|
+
this.#serializer = options.serializer ?? new JsonEventSerializer()
|
|
65
66
|
}
|
|
66
67
|
|
|
67
68
|
/** Wires a queue driver for `delivery: 'queued'` listeners. Omitting `queue` uses the memory board. */
|
|
@@ -78,15 +79,17 @@ export class InProcessEventDispatcher implements EventDispatcher {
|
|
|
78
79
|
): void {
|
|
79
80
|
if (typeof event === 'string') {
|
|
80
81
|
this.#registrations.push({
|
|
82
|
+
id: `${event}:${this.#registrations.length}`,
|
|
81
83
|
pattern: event,
|
|
82
84
|
listener: listeners as ListenerDefinition<Event>,
|
|
83
85
|
})
|
|
84
86
|
return
|
|
85
87
|
}
|
|
86
|
-
this.#serializer.register(event)
|
|
88
|
+
if (this.#serializer instanceof JsonEventSerializer) this.#serializer.register(event)
|
|
87
89
|
const list = Array.isArray(listeners) ? listeners : [listeners]
|
|
88
90
|
for (const listener of list) {
|
|
89
91
|
this.#registrations.push({
|
|
92
|
+
id: `${event.name}:${this.#registrations.length}`,
|
|
90
93
|
event,
|
|
91
94
|
listener: listener as ListenerDefinition<Event>,
|
|
92
95
|
})
|
|
@@ -243,10 +246,9 @@ export class InProcessEventDispatcher implements EventDispatcher {
|
|
|
243
246
|
const event = await this.#serializer.deserialize(envelope.event)
|
|
244
247
|
const registration = this.#registrations.find(
|
|
245
248
|
(entry) =>
|
|
249
|
+
entry.id === envelope.listener &&
|
|
246
250
|
entry.listener.delivery === 'queued' &&
|
|
247
|
-
entry.listener.queue === envelope.queue
|
|
248
|
-
(entry.event?.name === envelope.eventName ||
|
|
249
|
-
(entry.pattern !== undefined && matchesPattern(entry.pattern, envelope.eventName))),
|
|
251
|
+
entry.listener.queue === envelope.queue,
|
|
250
252
|
)
|
|
251
253
|
if (registration === undefined || registration.listener.delivery !== 'queued') return
|
|
252
254
|
await registration.listener.handle(event, {
|
|
@@ -270,7 +272,7 @@ export class InProcessEventDispatcher implements EventDispatcher {
|
|
|
270
272
|
eventName: string
|
|
271
273
|
} = {
|
|
272
274
|
event: serialized,
|
|
273
|
-
listener: entry.
|
|
275
|
+
listener: entry.id,
|
|
274
276
|
queue,
|
|
275
277
|
attempt: 0,
|
|
276
278
|
availableAt: Date.now(),
|
|
@@ -23,19 +23,20 @@ export async function runInTransaction<TResult>(
|
|
|
23
23
|
callback: () => Promise<TResult>,
|
|
24
24
|
): Promise<TResult> {
|
|
25
25
|
depth += 1
|
|
26
|
+
let result: TResult
|
|
26
27
|
try {
|
|
27
|
-
|
|
28
|
-
depth -= 1
|
|
29
|
-
if (depth === 0) {
|
|
30
|
-
const tasks = held.splice(0, held.length)
|
|
31
|
-
for (const task of tasks) await task()
|
|
32
|
-
}
|
|
33
|
-
return result
|
|
28
|
+
result = await callback()
|
|
34
29
|
} catch (error) {
|
|
35
30
|
depth -= 1
|
|
36
31
|
if (depth === 0) held.length = 0
|
|
37
32
|
throw error
|
|
38
33
|
}
|
|
34
|
+
depth -= 1
|
|
35
|
+
if (depth === 0) {
|
|
36
|
+
const tasks = held.splice(0, held.length)
|
|
37
|
+
for (const task of tasks) await task()
|
|
38
|
+
}
|
|
39
|
+
return result
|
|
39
40
|
}
|
|
40
41
|
|
|
41
42
|
/** Clears transaction state. Intended for tests. */
|