node-cqrs 1.0.0-rc.37 → 1.0.0-rc.39
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/CHANGELOG.md +22 -0
- package/README.md +2 -1
- package/dist/cjs/AbstractProjection.js +1 -2
- package/dist/cjs/AbstractProjection.js.map +1 -1
- package/dist/cjs/AggregateCommandHandler.js +23 -3
- package/dist/cjs/AggregateCommandHandler.js.map +1 -1
- package/dist/cjs/CqrsContainerBuilder.js +5 -3
- package/dist/cjs/CqrsContainerBuilder.js.map +1 -1
- package/dist/cjs/EventStore.js +5 -2
- package/dist/cjs/EventStore.js.map +1 -1
- package/dist/cjs/in-memory/InMemoryEventStorage.js +14 -8
- package/dist/cjs/in-memory/InMemoryEventStorage.js.map +1 -1
- package/dist/cjs/in-memory/InMemoryLock.js +6 -2
- package/dist/cjs/in-memory/InMemoryLock.js.map +1 -1
- package/dist/cjs/in-memory/InMemoryView.js +2 -5
- package/dist/cjs/in-memory/InMemoryView.js.map +1 -1
- package/dist/cjs/interfaces/IEventStorageWriter.js.map +1 -1
- package/dist/cjs/interfaces/isObject.js.map +1 -1
- package/dist/cjs/utils/assert.js +10 -0
- package/dist/cjs/utils/assert.js.map +1 -1
- package/dist/cjs/workers/AbstractWorkerProjection.js +13 -119
- package/dist/cjs/workers/AbstractWorkerProjection.js.map +1 -1
- package/dist/cjs/workers/WorkerProxyProjection.js +142 -0
- package/dist/cjs/workers/WorkerProxyProjection.js.map +1 -0
- package/dist/cjs/workers/index.js +1 -0
- package/dist/cjs/workers/index.js.map +1 -1
- package/dist/cjs/workers/protocol.js.map +1 -1
- package/dist/esm/AbstractProjection.js +1 -2
- package/dist/esm/AbstractProjection.js.map +1 -1
- package/dist/esm/AggregateCommandHandler.js +24 -4
- package/dist/esm/AggregateCommandHandler.js.map +1 -1
- package/dist/esm/CqrsContainerBuilder.js +6 -4
- package/dist/esm/CqrsContainerBuilder.js.map +1 -1
- package/dist/esm/EventStore.js +5 -2
- package/dist/esm/EventStore.js.map +1 -1
- package/dist/esm/in-memory/InMemoryEventStorage.js +14 -8
- package/dist/esm/in-memory/InMemoryEventStorage.js.map +1 -1
- package/dist/esm/in-memory/InMemoryLock.js +6 -2
- package/dist/esm/in-memory/InMemoryLock.js.map +1 -1
- package/dist/esm/in-memory/InMemoryView.js +2 -5
- package/dist/esm/in-memory/InMemoryView.js.map +1 -1
- package/dist/esm/interfaces/IEventStorageWriter.js.map +1 -1
- package/dist/esm/interfaces/isObject.js.map +1 -1
- package/dist/esm/utils/assert.js +8 -0
- package/dist/esm/utils/assert.js.map +1 -1
- package/dist/esm/workers/AbstractWorkerProjection.js +15 -121
- package/dist/esm/workers/AbstractWorkerProjection.js.map +1 -1
- package/dist/esm/workers/WorkerProxyProjection.js +105 -0
- package/dist/esm/workers/WorkerProxyProjection.js.map +1 -0
- package/dist/esm/workers/index.js +1 -0
- package/dist/esm/workers/index.js.map +1 -1
- package/dist/esm/workers/protocol.js.map +1 -1
- package/package.json +1 -1
- package/src/AbstractProjection.ts +1 -3
- package/src/AggregateCommandHandler.ts +41 -11
- package/src/CqrsContainerBuilder.ts +10 -5
- package/src/EventStore.ts +5 -2
- package/src/in-memory/InMemoryEventStorage.ts +19 -10
- package/src/in-memory/InMemoryLock.ts +11 -5
- package/src/in-memory/InMemoryView.ts +2 -6
- package/src/interfaces/IAggregate.ts +19 -2
- package/src/interfaces/IEventStorageWriter.ts +5 -1
- package/src/interfaces/IProjection.ts +1 -1
- package/src/interfaces/isObject.ts +1 -1
- package/src/utils/assert.ts +10 -0
- package/src/workers/AbstractWorkerProjection.ts +17 -182
- package/src/workers/WorkerProxyProjection.ts +154 -0
- package/src/workers/index.ts +1 -0
- package/src/workers/protocol.ts +7 -0
- package/types/AbstractProjection.d.ts +1 -1
- package/types/AggregateCommandHandler.d.ts +2 -4
- package/types/CqrsContainerBuilder.d.ts +2 -2
- package/types/EventStore.d.ts +1 -1
- package/types/in-memory/InMemoryEventStorage.d.ts +5 -3
- package/types/in-memory/InMemoryLock.d.ts +5 -3
- package/types/interfaces/IAggregate.d.ts +11 -2
- package/types/interfaces/IEventStorageWriter.d.ts +4 -1
- package/types/interfaces/IProjection.d.ts +1 -1
- package/types/interfaces/isObject.d.ts +1 -1
- package/types/utils/assert.d.ts +2 -0
- package/types/workers/AbstractWorkerProjection.d.ts +8 -53
- package/types/workers/WorkerProxyProjection.d.ts +32 -0
- package/types/workers/index.d.ts +1 -0
- package/types/workers/protocol.d.ts +6 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,25 @@
|
|
|
1
|
+
# [1.0.0-rc.39](https://github.com/snatalenko/node-cqrs/compare/v1.0.0-rc.38...v1.0.0-rc.39) (2026-02-26)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Changes
|
|
5
|
+
|
|
6
|
+
* Add an option for ES concurrency errors ignoring ([5189ba0](https://github.com/snatalenko/node-cqrs/commit/5189ba05c6fb0c5f8635251062acf76d032da8b0))
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
# [1.0.0-rc.38](https://github.com/snatalenko/node-cqrs/compare/v1.0.0-rc.37...v1.0.0-rc.38) (2026-02-24)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
### Tests
|
|
13
|
+
|
|
14
|
+
* Allow running individual integration tests with `npm t` ([cfef9a8](https://github.com/snatalenko/node-cqrs/commit/cfef9a87b6e0fce159205a1d55f38e51c6f9e8de))
|
|
15
|
+
|
|
16
|
+
### Internal Fixes
|
|
17
|
+
|
|
18
|
+
* Split AbstractWorkerProjection into worker-side and main-thread proxy ([751bfcf](https://github.com/snatalenko/node-cqrs/commit/751bfcf9f63547bafcec51af4e949d77ca1d0077))
|
|
19
|
+
* Rename InMemoryLock event to match IViewLocker interface ([1fe2eb1](https://github.com/snatalenko/node-cqrs/commit/1fe2eb149f8801e1b7e935a90cca05691d5d2017))
|
|
20
|
+
* Separate projection restoring from subscription; start explicitly in DI container ([3ddc649](https://github.com/snatalenko/node-cqrs/commit/3ddc649feaa65e267d7eb5646289e88f8a4a332b))
|
|
21
|
+
|
|
22
|
+
|
|
1
23
|
# [1.0.0-rc.37](https://github.com/snatalenko/node-cqrs/compare/v1.0.0-rc.36...v1.0.0-rc.37) (2026-02-23)
|
|
2
24
|
|
|
3
25
|
|
package/README.md
CHANGED
|
@@ -136,7 +136,8 @@ const aggregateCommandHandler = new AggregateCommandHandler({ eventStore, aggreg
|
|
|
136
136
|
aggregateCommandHandler.subscribe(commandBus);
|
|
137
137
|
|
|
138
138
|
const projection = new UsersProjection();
|
|
139
|
-
|
|
139
|
+
projection.subscribe(eventStore);
|
|
140
|
+
projection.restore(eventStore);
|
|
140
141
|
const users = projection.view;
|
|
141
142
|
```
|
|
142
143
|
|
|
@@ -66,11 +66,10 @@ class AbstractProjection {
|
|
|
66
66
|
* Subscribe to event store
|
|
67
67
|
* and restore view state from not yet projected events
|
|
68
68
|
*/
|
|
69
|
-
|
|
69
|
+
subscribe(eventStore) {
|
|
70
70
|
(0, index_ts_2.subscribe)(eventStore, this, {
|
|
71
71
|
masterHandler: this.project
|
|
72
72
|
});
|
|
73
|
-
await this.restore(eventStore);
|
|
74
73
|
}
|
|
75
74
|
/** Pass event to projection event handler */
|
|
76
75
|
async project(event) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractProjection.js","sourceRoot":"","sources":["../../src/AbstractProjection.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,iEAA2D;AAC3D,oDAW+B;AAE/B,+CAO0B;AAwB1B;;GAEG;AACH,MAAsB,kBAAkB;IAEvC;;;OAGG;IACH,MAAM,KAAK,OAAO;QACjB,OAAO,IAAA,iCAAsB,EAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAS;IACd,WAAW,CAAsB;IACjC,YAAY,CAAuB;IACzB,OAAO,CAAW;IAE5B;;;OAGG;IACH,IAAW,IAAI;QACd,OAAO,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,8BAAY,EAAW,CAAC,CAAC;IACjE,CAAC;IAED,IAAc,IAAI,CAAC,KAAY;QAC9B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,CAAC;IAED;;;OAGG;IACH,IAAc,WAAW;QACxB,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS;YACjC,IAAI,CAAC,WAAW,GAAG,IAAA,uBAAY,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QAE/D,OAAO,IAAI,CAAC,WAAW,CAAC;IACzB,CAAC;IAED,IAAc,WAAW,CAAC,KAAqC;QAC9D,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,IAAc,YAAY;QACzB,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS;YAClC,IAAI,CAAC,YAAY,GAAG,IAAA,wBAAa,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QAEjE,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED,IAAc,YAAY,CAAC,KAAsC;QAChE,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,YAAY,EACX,IAAI,EACJ,UAAU,EACV,WAAW,EACX,MAAM,KAC8B,EAAE;QACtC,IAAA,2BAAgB,EAAC,IAAI,CAAC,CAAC;QAEvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAEhC,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,OAAO,IAAI,MAAM,CAAC,CAAC;YAC3C,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAA,uBAAY,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAC/C,MAAM,CAAC;IACT,CAAC;IAED;;;OAGG;IACH,
|
|
1
|
+
{"version":3,"file":"AbstractProjection.js","sourceRoot":"","sources":["../../src/AbstractProjection.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.AggregateCommandHandler = void 0;
|
|
4
4
|
const index_ts_1 = require("./utils/index.js");
|
|
5
5
|
const index_ts_2 = require("./errors/index.js");
|
|
6
|
+
const isObject_ts_1 = require("./interfaces/isObject.js");
|
|
6
7
|
const DEFAULT_MAX_RETRY_ATTEMPTS = 5;
|
|
7
8
|
function normalizeRetryResolver(value) {
|
|
8
9
|
if (typeof value === 'function')
|
|
@@ -10,7 +11,19 @@ function normalizeRetryResolver(value) {
|
|
|
10
11
|
if (value === false)
|
|
11
12
|
return () => false;
|
|
12
13
|
if (typeof value === 'number')
|
|
13
|
-
return (
|
|
14
|
+
return (err, attempt) => err instanceof index_ts_2.ConcurrencyError && attempt < value;
|
|
15
|
+
if ((0, isObject_ts_1.isObject)(value)) {
|
|
16
|
+
const { maxRetries = DEFAULT_MAX_RETRY_ATTEMPTS, ignoreAfterMaxRetries = false } = value;
|
|
17
|
+
(0, index_ts_1.assertNonNegativeInteger)(maxRetries, 'retryOnConcurrencyError.maxRetries');
|
|
18
|
+
(0, index_ts_1.assertBoolean)(ignoreAfterMaxRetries, 'retryOnConcurrencyError.ignoreAfterMaxRetries');
|
|
19
|
+
return (err, attempt) => {
|
|
20
|
+
if (!(err instanceof index_ts_2.ConcurrencyError))
|
|
21
|
+
return false;
|
|
22
|
+
if (attempt < maxRetries)
|
|
23
|
+
return true;
|
|
24
|
+
return ignoreAfterMaxRetries ? 'ignore' : false;
|
|
25
|
+
};
|
|
26
|
+
}
|
|
14
27
|
// undefined or true — default behavior
|
|
15
28
|
return (err, attempt) => err instanceof index_ts_2.ConcurrencyError && attempt < DEFAULT_MAX_RETRY_ATTEMPTS;
|
|
16
29
|
}
|
|
@@ -110,8 +123,9 @@ class AggregateCommandHandler {
|
|
|
110
123
|
const aggregate = aggregateId ?
|
|
111
124
|
await this.#aggregatesCache.get(aggregateId) :
|
|
112
125
|
await this.#createAggregate();
|
|
126
|
+
let events;
|
|
113
127
|
try {
|
|
114
|
-
|
|
128
|
+
events = await aggregate.handle(cmd);
|
|
115
129
|
this.#logger?.info(`${aggregate} "${cmd.type}" command processed, ${events.length} event(s) produced`);
|
|
116
130
|
if (events.length)
|
|
117
131
|
await this.#eventStore.dispatch(events);
|
|
@@ -123,8 +137,14 @@ class AggregateCommandHandler {
|
|
|
123
137
|
// queued on the lock start from a clean state.
|
|
124
138
|
if (aggregateId)
|
|
125
139
|
this.#aggregatesCache.set(aggregateId, this.#restoreAggregate(aggregateId));
|
|
126
|
-
|
|
140
|
+
const retryDecision = this.#shouldRetry(err, attempt);
|
|
141
|
+
if (!retryDecision)
|
|
127
142
|
throw err;
|
|
143
|
+
if (retryDecision === 'ignore' && events?.length) {
|
|
144
|
+
this.#logger?.info(`"${cmd.type}" concurrency error ignored after ${attempt + 1} attempt(s), force-dispatching`);
|
|
145
|
+
await this.#eventStore.dispatch(events, { ignoreConcurrencyError: true });
|
|
146
|
+
return events;
|
|
147
|
+
}
|
|
128
148
|
}
|
|
129
149
|
}
|
|
130
150
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AggregateCommandHandler.js","sourceRoot":"","sources":["../../src/AggregateCommandHandler.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"AggregateCommandHandler.js","sourceRoot":"","sources":["../../src/AggregateCommandHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,11 +50,13 @@ class CqrsContainerBuilder extends di0_1.ContainerBuilder {
|
|
|
50
50
|
* Register projection, which will expose view and will be subscribed
|
|
51
51
|
* to eventStore and will restore its state upon instance creation
|
|
52
52
|
*/
|
|
53
|
-
registerProjection(
|
|
54
|
-
(0, assert_ts_1.
|
|
53
|
+
registerProjection(typeOrFactory, exposedViewAlias) {
|
|
54
|
+
(0, assert_ts_1.assertFunction)(typeOrFactory, 'typeOrFactory');
|
|
55
55
|
const projectionFactory = (container) => {
|
|
56
|
-
const projection = container.createInstance(
|
|
56
|
+
const projection = container.createInstance(typeOrFactory);
|
|
57
57
|
projection.subscribe(container.eventStore);
|
|
58
|
+
// start async projection restoring
|
|
59
|
+
void projection.restore(container.eventStore);
|
|
58
60
|
if (exposedViewAlias)
|
|
59
61
|
return projection.view;
|
|
60
62
|
return projection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CqrsContainerBuilder.js","sourceRoot":"","sources":["../../src/CqrsContainerBuilder.ts"],"names":[],"mappings":";;;AAAA,6BAA6E;AAC7E,6EAAuE;AACvE,mDAA6C;AAC7C,mDAA6C;AAC7C,+DAAyD;AACzD,6DAAuD;AACvD,mDAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"CqrsContainerBuilder.js","sourceRoot":"","sources":["../../src/CqrsContainerBuilder.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/EventStore.js
CHANGED
|
@@ -78,9 +78,12 @@ class EventStore {
|
|
|
78
78
|
* @param events - a set of events to commit
|
|
79
79
|
* @returns Signed and committed events
|
|
80
80
|
*/
|
|
81
|
-
async dispatch(events) {
|
|
81
|
+
async dispatch(events, meta) {
|
|
82
82
|
(0, index_ts_2.assertArray)(events, 'events');
|
|
83
|
-
return this.#eventDispatcher.dispatch(events, {
|
|
83
|
+
return this.#eventDispatcher.dispatch(events, {
|
|
84
|
+
origin: 'internal',
|
|
85
|
+
...meta
|
|
86
|
+
});
|
|
84
87
|
}
|
|
85
88
|
on(messageType, handler) {
|
|
86
89
|
this.eventBus.on(messageType, handler);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventStore.js","sourceRoot":"","sources":["../../src/EventStore.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"EventStore.js","sourceRoot":"","sources":["../../src/EventStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,14 +15,16 @@ class InMemoryEventStorage {
|
|
|
15
15
|
this.#nextId += 1;
|
|
16
16
|
return String(this.#nextId);
|
|
17
17
|
}
|
|
18
|
-
async commitEvents(events) {
|
|
18
|
+
async commitEvents(events, options) {
|
|
19
19
|
await (0, index_ts_2.nextCycle)();
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
e.
|
|
24
|
-
|
|
25
|
-
|
|
20
|
+
if (!options?.ignoreConcurrencyError) {
|
|
21
|
+
for (const event of events) {
|
|
22
|
+
if (event.aggregateId !== undefined && event.aggregateVersion !== undefined) {
|
|
23
|
+
const conflict = this.#events.find(e => e.aggregateId === event.aggregateId &&
|
|
24
|
+
e.aggregateVersion === event.aggregateVersion);
|
|
25
|
+
if (conflict)
|
|
26
|
+
throw new index_ts_3.ConcurrencyError(`Duplicate aggregateVersion ${event.aggregateVersion} for aggregate ${event.aggregateId}`);
|
|
27
|
+
}
|
|
26
28
|
}
|
|
27
29
|
}
|
|
28
30
|
this.#events = this.#events.concat(events);
|
|
@@ -93,7 +95,11 @@ class InMemoryEventStorage {
|
|
|
93
95
|
throw new Error('Event batch does not contain `event`');
|
|
94
96
|
events.push(event);
|
|
95
97
|
}
|
|
96
|
-
|
|
98
|
+
const ignoreConcurrencyError = batch.some(item => item.ignoreConcurrencyError === true);
|
|
99
|
+
if (ignoreConcurrencyError)
|
|
100
|
+
await this.commitEvents(events, { ignoreConcurrencyError: true });
|
|
101
|
+
else
|
|
102
|
+
await this.commitEvents(events);
|
|
97
103
|
return batch;
|
|
98
104
|
}
|
|
99
105
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InMemoryEventStorage.js","sourceRoot":"","sources":["../../../src/in-memory/InMemoryEventStorage.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"InMemoryEventStorage.js","sourceRoot":"","sources":["../../../src/in-memory/InMemoryEventStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,14 +10,18 @@ class InMemoryLock {
|
|
|
10
10
|
get locked() {
|
|
11
11
|
return !!this.#lockMarker;
|
|
12
12
|
}
|
|
13
|
+
get ready() {
|
|
14
|
+
return !this.locked;
|
|
15
|
+
}
|
|
13
16
|
/**
|
|
14
17
|
* Acquire the lock on the current instance.
|
|
15
18
|
* Resolves when the lock is successfully acquired
|
|
16
19
|
*/
|
|
17
20
|
async lock() {
|
|
18
21
|
while (this.locked)
|
|
19
|
-
await this.once('
|
|
22
|
+
await this.once('ready');
|
|
20
23
|
this.#lockMarker = new index_ts_1.Deferred();
|
|
24
|
+
return this.locked;
|
|
21
25
|
}
|
|
22
26
|
/**
|
|
23
27
|
* Release the lock acquired earlier
|
|
@@ -31,7 +35,7 @@ class InMemoryLock {
|
|
|
31
35
|
* Resolves immediately if the lock is not acquired
|
|
32
36
|
*/
|
|
33
37
|
once(event) {
|
|
34
|
-
if (event !== '
|
|
38
|
+
if (event !== 'ready')
|
|
35
39
|
throw new TypeError(`Unexpected event type: ${event}`);
|
|
36
40
|
return this.#lockMarker?.promise ?? Promise.resolve();
|
|
37
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InMemoryLock.js","sourceRoot":"","sources":["../../../src/in-memory/InMemoryLock.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"InMemoryLock.js","sourceRoot":"","sources":["../../../src/in-memory/InMemoryLock.ts"],"names":[],"mappings":";;;AACA,gDAA6C;AAE7C,MAAa,YAAY;IAExB,WAAW,CAA6B;IAExC;;OAEG;IACH,IAAI,MAAM;QACT,OAAO,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;IAC3B,CAAC;IAED,IAAI,KAAK;QACR,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,IAAI;QACT,OAAO,IAAI,CAAC,MAAM;YACjB,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE1B,IAAI,CAAC,WAAW,GAAG,IAAI,mBAAQ,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM;QACX,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACH,IAAI,CAAC,KAAc;QAClB,IAAI,KAAK,KAAK,OAAO;YACpB,MAAM,IAAI,SAAS,CAAC,0BAA0B,KAAK,EAAE,CAAC,CAAC;QAExD,OAAO,IAAI,CAAC,WAAW,EAAE,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IACvD,CAAC;CACD;AA7CD,oCA6CC"}
|
|
@@ -40,8 +40,7 @@ class InMemoryView {
|
|
|
40
40
|
}
|
|
41
41
|
/** Lock the view to prevent concurrent modifications */
|
|
42
42
|
async lock() {
|
|
43
|
-
|
|
44
|
-
return this.#lock.locked;
|
|
43
|
+
return this.#lock.lock();
|
|
45
44
|
}
|
|
46
45
|
/** Release the lock */
|
|
47
46
|
async unlock() {
|
|
@@ -49,9 +48,7 @@ class InMemoryView {
|
|
|
49
48
|
}
|
|
50
49
|
/** Create a Promise which will resolve to a first emitted event of a given type */
|
|
51
50
|
once(eventType) {
|
|
52
|
-
|
|
53
|
-
throw new TypeError(`Unexpected event type: ${eventType}`);
|
|
54
|
-
return this.#lock.once('unlocked');
|
|
51
|
+
return this.#lock.once(eventType);
|
|
55
52
|
}
|
|
56
53
|
/**
|
|
57
54
|
* Check if view contains a record with a given key.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InMemoryView.js","sourceRoot":"","sources":["../../../src/in-memory/InMemoryView.ts"],"names":[],"mappings":";;;AAAA,uDAAiD;AAEjD,+CAA6C;AAC7C,kDAAmE;AAEnE;;;GAGG;AACH,SAAS,WAAW,CAAI,IAAO,EAAE,MAAmB;IACnD,MAAM,qBAAqB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3C,OAAO,qBAAqB,KAAK,SAAS,CAAC,CAAC;QAC3C,IAAI,CAAC,CAAC;QACN,qBAAqB,CAAC;AACxB,CAAC;AAED;;GAEG;AACH,MAAa,YAAY;IAExB,MAAM,CAAC,OAAO;QACb,OAAQ,IAAI,YAAY,EAAuB,CAAC;IACjD,CAAC;IAES,IAAI,GAA6B,IAAI,GAAG,EAAE,CAAC;IAErD,KAAK,CAAe;IAEpB,mCAAmC;IACnC,IAAI,KAAK;QACR,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,oCAAoC;IACpC,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IACvB,CAAC;IAED;QACC,IAAI,CAAC,KAAK,GAAG,IAAI,8BAAY,EAAE,CAAC;QAEhC,+EAA+E;QAC/E,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;YAC1C,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;SAC1B,CAAC,CAAC;IACJ,CAAC;IAED,wDAAwD;IACxD,KAAK,CAAC,IAAI;QACT,
|
|
1
|
+
{"version":3,"file":"InMemoryView.js","sourceRoot":"","sources":["../../../src/in-memory/InMemoryView.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IEventStorageWriter.js","sourceRoot":"","sources":["../../../src/interfaces/IEventStorageWriter.ts"],"names":[],"mappings":";;;AACA,+CAAyC;
|
|
1
|
+
{"version":3,"file":"IEventStorageWriter.js","sourceRoot":"","sources":["../../../src/interfaces/IEventStorageWriter.ts"],"names":[],"mappings":";;;AACA,+CAAyC;AAelC,MAAM,oBAAoB,GAAG,CAAC,GAAY,EAA8B,EAAE,CAChF,IAAA,sBAAQ,EAAC,GAAG,CAAC;OACV,cAAc,IAAI,GAAG;OACrB,OAAO,GAAG,CAAC,YAAY,KAAK,UAAU,CAAC;AAH9B,QAAA,oBAAoB,wBAGU"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isObject.js","sourceRoot":"","sources":["../../../src/interfaces/isObject.ts"],"names":[],"mappings":";;;AAAO,MAAM,QAAQ,GAAG,CAAC,GAAY,
|
|
1
|
+
{"version":3,"file":"isObject.js","sourceRoot":"","sources":["../../../src/interfaces/isObject.ts"],"names":[],"mappings":";;;AAAO,MAAM,QAAQ,GAAG,CAAC,GAAY,EAA8B,EAAE,CACpE,OAAO,GAAG,KAAK,QAAQ;OACpB,GAAG,KAAK,IAAI;OACZ,CAAC,CAAC,GAAG,YAAY,IAAI,CAAC;OACtB,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAJX,QAAA,QAAQ,YAIG"}
|
package/dist/cjs/utils/assert.js
CHANGED
|
@@ -12,6 +12,8 @@ exports.assertSnapshotEvent = assertSnapshotEvent;
|
|
|
12
12
|
exports.assertObservable = assertObservable;
|
|
13
13
|
exports.assertNumber = assertNumber;
|
|
14
14
|
exports.assertClass = assertClass;
|
|
15
|
+
exports.assertNonNegativeInteger = assertNonNegativeInteger;
|
|
16
|
+
exports.assertBoolean = assertBoolean;
|
|
15
17
|
const IMessage_ts_1 = require("../interfaces/IMessage.js");
|
|
16
18
|
const IEvent_ts_1 = require("../interfaces/IEvent.js");
|
|
17
19
|
const ISnapshotEvent_ts_1 = require("../interfaces/ISnapshotEvent.js");
|
|
@@ -65,4 +67,12 @@ function assertClass(value, argName) {
|
|
|
65
67
|
if (!(0, isClass_ts_1.isClass)(value))
|
|
66
68
|
throw new TypeError(`${argName} must be a class`);
|
|
67
69
|
}
|
|
70
|
+
function assertNonNegativeInteger(value, argName) {
|
|
71
|
+
if (typeof value !== 'number' || !Number.isSafeInteger(value) || value < 0)
|
|
72
|
+
throw new TypeError(`${argName} must be a non-negative integer`);
|
|
73
|
+
}
|
|
74
|
+
function assertBoolean(value, argName) {
|
|
75
|
+
if (typeof value !== 'boolean')
|
|
76
|
+
throw new TypeError(`${argName} must be a Boolean`);
|
|
77
|
+
}
|
|
68
78
|
//# sourceMappingURL=assert.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assert.js","sourceRoot":"","sources":["../../../src/utils/assert.ts"],"names":[],"mappings":";;AAMA,sCAGC;AAED,oCAGC;AAED,wCAGC;AAED,oCAGC;AAED,kCAGC;AAED,kDAGC;AAED,sCAGC;AAED,kCAGC;AAED,kDAGC;AAED,4CAGC;AAED,oCAGC;AAED,kCAGC;
|
|
1
|
+
{"version":3,"file":"assert.js","sourceRoot":"","sources":["../../../src/utils/assert.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,18 +38,13 @@ const node_worker_threads_1 = require("node:worker_threads");
|
|
|
38
38
|
const AbstractProjection_ts_1 = require("../AbstractProjection.js");
|
|
39
39
|
const Comlink = __importStar(require("comlink"));
|
|
40
40
|
const index_ts_1 = require("./utils/index.js");
|
|
41
|
-
const index_ts_2 = require("../utils/index.js");
|
|
42
41
|
const protocol_ts_1 = require("./protocol.js");
|
|
42
|
+
const WorkerProxyProjection_ts_1 = require("./WorkerProxyProjection.js");
|
|
43
43
|
/**
|
|
44
44
|
* Projection base class that can run projection handlers and the associated view in a worker thread
|
|
45
45
|
* to isolate CPU-heavy work and keep the main thread responsive
|
|
46
46
|
*/
|
|
47
47
|
class AbstractWorkerProjection extends AbstractProjection_ts_1.AbstractProjection {
|
|
48
|
-
#worker;
|
|
49
|
-
#workerInit;
|
|
50
|
-
#remoteProjection;
|
|
51
|
-
#remoteView;
|
|
52
|
-
#useWorkerThreads;
|
|
53
48
|
/**
|
|
54
49
|
* Creates an instance of a class derived from AbstractWorkerProjection in a Worker thread
|
|
55
50
|
*
|
|
@@ -82,127 +77,26 @@ class AbstractWorkerProjection extends AbstractProjection_ts_1.AbstractProjectio
|
|
|
82
77
|
return undefined;
|
|
83
78
|
return this.createWorkerInstance(factory);
|
|
84
79
|
}
|
|
85
|
-
async project(event) {
|
|
86
|
-
if (this.#useWorkerThreads && node_worker_threads_1.isMainThread) {
|
|
87
|
-
if (!this.#worker)
|
|
88
|
-
await this.#workerInit;
|
|
89
|
-
return this.remoteProjection.project(event);
|
|
90
|
-
}
|
|
91
|
-
return super.project(event);
|
|
92
|
-
}
|
|
93
|
-
/**
|
|
94
|
-
* Proxy to the projection instance in the worker thread
|
|
95
|
-
*/
|
|
96
|
-
get remoteProjection() {
|
|
97
|
-
this.assertMainThread();
|
|
98
|
-
return this.#remoteProjection;
|
|
99
|
-
}
|
|
100
|
-
/**
|
|
101
|
-
* Proxy to the projection instance in the worker thread (awaits worker init)
|
|
102
|
-
*/
|
|
103
|
-
get remoteProjectionInitializer() {
|
|
104
|
-
this.assertMainThread();
|
|
105
|
-
return this.ensureWorkerReady().then(() => this.remoteProjection);
|
|
106
|
-
}
|
|
107
|
-
/**
|
|
108
|
-
* Proxy to the view instance in the worker thread
|
|
109
|
-
*/
|
|
110
|
-
get remoteView() {
|
|
111
|
-
this.assertMainThread();
|
|
112
|
-
return this.#remoteView;
|
|
113
|
-
}
|
|
114
|
-
get view() {
|
|
115
|
-
if (this.#useWorkerThreads && node_worker_threads_1.isMainThread)
|
|
116
|
-
return this.remoteView;
|
|
117
|
-
return super.view;
|
|
118
|
-
}
|
|
119
80
|
/**
|
|
120
|
-
*
|
|
81
|
+
* Creates a factory that returns a `WorkerProxyProjection` for this projection type.
|
|
82
|
+
* Use it in the main thread (for example, `builder.registerProjection(MyProjection.workerProxyFactory)`),
|
|
83
|
+
* so events are proxied to the worker instance while exposing the remote view API.
|
|
121
84
|
*/
|
|
122
|
-
get
|
|
123
|
-
this
|
|
124
|
-
return
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
super({
|
|
128
|
-
view,
|
|
129
|
-
viewLocker,
|
|
130
|
-
eventLocker,
|
|
131
|
-
logger
|
|
85
|
+
static get workerProxyFactory() {
|
|
86
|
+
const ProjectionType = this;
|
|
87
|
+
return () => new WorkerProxyProjection_ts_1.WorkerProxyProjection({
|
|
88
|
+
workerModulePath: ProjectionType.workerModulePath,
|
|
89
|
+
messageTypes: ProjectionType.handles
|
|
132
90
|
});
|
|
133
|
-
this.#useWorkerThreads = useWorkerThreads;
|
|
134
|
-
if (this.#useWorkerThreads && node_worker_threads_1.isMainThread) {
|
|
135
|
-
if (!workerModulePath)
|
|
136
|
-
throw new TypeError('workerModulePath parameter is required in the main thread when useWorkerThreads=true');
|
|
137
|
-
const { port1: projectionPortMain, port2: projectionPort } = new node_worker_threads_1.MessageChannel();
|
|
138
|
-
const { port1: viewPortMain, port2: viewPort } = new node_worker_threads_1.MessageChannel();
|
|
139
|
-
this.#workerInit = this._createWorker(workerModulePath, {
|
|
140
|
-
projectionPort,
|
|
141
|
-
viewPort
|
|
142
|
-
}).then(worker => {
|
|
143
|
-
this.#worker = worker;
|
|
144
|
-
worker.once('error', this._onWorkerError);
|
|
145
|
-
worker.once('exit', this._onWorkerExit);
|
|
146
|
-
return worker;
|
|
147
|
-
});
|
|
148
|
-
this.#workerInit.catch(() => { });
|
|
149
|
-
this.#remoteProjection = Comlink.wrap((0, index_ts_1.nodeEndpoint)(projectionPortMain));
|
|
150
|
-
this.#remoteView = Comlink.wrap((0, index_ts_1.nodeEndpoint)(viewPortMain));
|
|
151
|
-
}
|
|
152
91
|
}
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
return (0, index_ts_1.createWorker)(workerModulePath, data);
|
|
92
|
+
static get workerModulePath() {
|
|
93
|
+
throw new Error('not implemented');
|
|
156
94
|
}
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
error: (0, index_ts_2.extractErrorDetails)(error)
|
|
160
|
-
});
|
|
161
|
-
};
|
|
162
|
-
_onWorkerExit = (exitCode) => {
|
|
163
|
-
if (exitCode !== 0)
|
|
164
|
-
this._logger?.error(`worker exited with code ${exitCode}`);
|
|
165
|
-
};
|
|
95
|
+
/** Responds to a ping from the main thread to confirm the worker is alive */
|
|
96
|
+
// eslint-disable-next-line class-methods-use-this
|
|
166
97
|
_pong() {
|
|
167
|
-
this.assertWorkerThread();
|
|
168
98
|
return true;
|
|
169
99
|
}
|
|
170
|
-
assertMainThread() {
|
|
171
|
-
if (!node_worker_threads_1.isMainThread)
|
|
172
|
-
throw new Error('This method can only be called from the main thread');
|
|
173
|
-
if (!this.#useWorkerThreads)
|
|
174
|
-
throw new Error('Worker threads are disabled for this projection instance');
|
|
175
|
-
if (!this.#workerInit)
|
|
176
|
-
throw new Error('Worker instance is not initialized');
|
|
177
|
-
if (!this.#remoteProjection)
|
|
178
|
-
throw new Error('Remote projection instance is not initialized');
|
|
179
|
-
if (!this.#remoteView)
|
|
180
|
-
throw new Error('Remote view instance is not initialized');
|
|
181
|
-
}
|
|
182
|
-
// eslint-disable-next-line class-methods-use-this
|
|
183
|
-
assertWorkerThread() {
|
|
184
|
-
if (!node_worker_threads_1.parentPort)
|
|
185
|
-
throw new Error('This method can only be called from a Worker thread');
|
|
186
|
-
}
|
|
187
|
-
async ensureWorkerReady() {
|
|
188
|
-
if (this.#useWorkerThreads && node_worker_threads_1.isMainThread)
|
|
189
|
-
await this.#workerInit;
|
|
190
|
-
}
|
|
191
|
-
async _project(event) {
|
|
192
|
-
if (this.#useWorkerThreads && node_worker_threads_1.isMainThread) {
|
|
193
|
-
if (!this.#worker)
|
|
194
|
-
await this.#workerInit;
|
|
195
|
-
return this.remoteProjection._project(event);
|
|
196
|
-
}
|
|
197
|
-
return super._project(event);
|
|
198
|
-
}
|
|
199
|
-
dispose() {
|
|
200
|
-
if (this.#useWorkerThreads && node_worker_threads_1.isMainThread) {
|
|
201
|
-
this.#remoteProjection?.[Comlink.releaseProxy]();
|
|
202
|
-
this.#remoteView?.[Comlink.releaseProxy]();
|
|
203
|
-
this.#worker?.terminate();
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
100
|
}
|
|
207
101
|
exports.AbstractWorkerProjection = AbstractWorkerProjection;
|
|
208
102
|
//# sourceMappingURL=AbstractWorkerProjection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractWorkerProjection.js","sourceRoot":"","sources":["../../../src/workers/AbstractWorkerProjection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"AbstractWorkerProjection.js","sourceRoot":"","sources":["../../../src/workers/AbstractWorkerProjection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA2E;AAC3E,oEAA8D;AAC9D,iDAAmC;AACnC,+CAAgD;AAChD,+CAAgG;AAChG,yEAAmE;AAEnE;;;GAGG;AACH,MAAsB,wBAAgC,SAAQ,0CAAyB;IAEtF;;;;OAIG;IACH,MAAM,CAAC,oBAAoB,CAE1B,OAAiB;QAEjB,IAAI,CAAC,gCAAU;YACd,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;QACjF,IAAI,CAAC,IAAA,0BAAY,EAAC,gCAAU,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;QAE5E,MAAM,wBAAwB,GAAG,OAAO,EAAE,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC;QAC3D,MAAM,2BAA2B,GAAyB;YACzD,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAAC,OAAO,CAAC,KAAK,CAAC;YACzD,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC3D,IAAI,EAAE,GAAG,EAAE,CAAC,wBAAwB,CAAC,KAAK,EAAE;SAC5C,CAAC;QAEF,OAAO,CAAC,MAAM,CAAC,2BAA2B,EAAE,IAAA,uBAAY,EAAC,gCAAU,CAAC,cAAc,CAAC,CAAC,CAAC;QACrF,OAAO,CAAC,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,IAAA,uBAAY,EAAC,gCAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEjF,gCAAU,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,EAA8B,CAAC,CAAC;QAEtE,OAAO,wBAAwB,CAAC;IACjC,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,4BAA4B,CAElC,OAAiB;QAEjB,IAAI,kCAAY;YACf,OAAO,SAAS,CAAC;QAElB,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED;;;;OAIG;IACH,MAAM,KAAK,kBAAkB;QAC5B,MAAM,cAAc,GAAG,IAAuC,CAAC;QAC/D,OAAO,GAAG,EAAE,CAAC,IAAI,gDAAqB,CAAM;YAC3C,gBAAgB,EAAE,cAAc,CAAC,gBAAgB;YACjD,YAAY,EAAE,cAAc,CAAC,OAAO;SACpC,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,gBAAgB;QAC1B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACpC,CAAC;IAED,6EAA6E;IAC7E,kDAAkD;IACxC,KAAK;QACd,OAAO,IAAI,CAAC;IACb,CAAC;CACD;AArED,4DAqEC"}
|