@volontariapp/database 1.10.0-snap-2fc7103 → 1.10.0-snap-67b30c3
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/dist/outbox/runners/outbox.runner.d.ts +7 -4
- package/dist/outbox/runners/outbox.runner.d.ts.map +1 -1
- package/dist/outbox/runners/outbox.runner.js +45 -14
- package/dist/outbox/runners/outbox.runner.js.map +1 -1
- package/dist/test/outbox/outbox.runner.int.spec.js +6 -6
- package/dist/test/outbox/outbox.runner.int.spec.js.map +1 -1
- package/dist/test/outbox/outbox.runner.unit.spec.js +116 -22
- package/dist/test/outbox/outbox.runner.unit.spec.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,15 +1,18 @@
|
|
|
1
|
-
import type { OutboxEntity, OutboxModel } from '../index.js';
|
|
2
1
|
import type { OutboxRunnerConfig } from '@volontariapp/config';
|
|
2
|
+
import type { OutboxEntity, OutboxModel } from '../index.js';
|
|
3
3
|
import type { BaseRepository } from '../../core/base.repository.js';
|
|
4
4
|
export declare class OutboxRunner<TOutboxModel extends OutboxModel, TOutboxEntity extends OutboxEntity> {
|
|
5
5
|
private readonly repository;
|
|
6
6
|
private readonly config;
|
|
7
|
-
private
|
|
7
|
+
private abortController?;
|
|
8
|
+
private loopPromise?;
|
|
8
9
|
private readonly logger;
|
|
9
10
|
private readonly consumer;
|
|
10
11
|
constructor(repository: BaseRepository<TOutboxModel, TOutboxEntity, string>, config: OutboxRunnerConfig);
|
|
12
|
+
get isRunning(): boolean;
|
|
13
|
+
start(): void;
|
|
14
|
+
private runLoop;
|
|
11
15
|
runCycle(): Promise<void>;
|
|
12
|
-
|
|
13
|
-
stop(): void;
|
|
16
|
+
stop(): Promise<void>;
|
|
14
17
|
}
|
|
15
18
|
//# sourceMappingURL=outbox.runner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outbox.runner.d.ts","sourceRoot":"","sources":["../../../src/outbox/runners/outbox.runner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"outbox.runner.d.ts","sourceRoot":"","sources":["../../../src/outbox/runners/outbox.runner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,qBAAa,YAAY,CAAC,YAAY,SAAS,WAAW,EAAE,aAAa,SAAS,YAAY;IAQ1F,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,eAAe,CAAC,CAAkB;IAC1C,OAAO,CAAC,WAAW,CAAC,CAAgB;IAEpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8C;gBAGpD,UAAU,EAAE,cAAc,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,EAC/D,MAAM,EAAE,kBAAkB;IAS7C,IAAW,SAAS,IAAI,OAAO,CAE9B;IAED,KAAK,IAAI,IAAI;YAaC,OAAO;IAoBf,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAQzB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAgB5B"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { setTimeout } from 'node:timers/promises';
|
|
2
2
|
import { Logger } from '@volontariapp/logger';
|
|
3
|
+
import { OutboxConsumer } from '../consumers/outbox.consumer.js';
|
|
3
4
|
export class OutboxRunner {
|
|
4
5
|
repository;
|
|
5
6
|
config;
|
|
6
|
-
|
|
7
|
+
abortController;
|
|
8
|
+
loopPromise;
|
|
7
9
|
logger;
|
|
8
10
|
consumer;
|
|
9
11
|
constructor(repository, config) {
|
|
@@ -12,6 +14,37 @@ export class OutboxRunner {
|
|
|
12
14
|
this.logger = new Logger(config.logger);
|
|
13
15
|
this.consumer = new OutboxConsumer(this.logger, this.repository, config.batchSize);
|
|
14
16
|
}
|
|
17
|
+
get isRunning() {
|
|
18
|
+
return !!this.abortController && !this.abortController.signal.aborted;
|
|
19
|
+
}
|
|
20
|
+
start() {
|
|
21
|
+
if (this.isRunning) {
|
|
22
|
+
this.logger.warn('Outbox runner is already running');
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
this.logger.info('Starting outbox runner');
|
|
26
|
+
this.abortController = new AbortController();
|
|
27
|
+
this.loopPromise = this.runLoop(this.abortController.signal);
|
|
28
|
+
}
|
|
29
|
+
async runLoop(signal) {
|
|
30
|
+
try {
|
|
31
|
+
while (!signal.aborted) {
|
|
32
|
+
await this.runCycle();
|
|
33
|
+
await setTimeout(this.config.batchIntervalMs, undefined, { signal });
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
catch (error) {
|
|
37
|
+
if (error instanceof Error && error.name === 'AbortError') {
|
|
38
|
+
this.logger.debug('Outbox runner wait interrupted by stop');
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
this.logger.error('Critical error in outbox runner loop', { error });
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
finally {
|
|
45
|
+
this.logger.info('Outbox runner loop terminated');
|
|
46
|
+
}
|
|
47
|
+
}
|
|
15
48
|
async runCycle() {
|
|
16
49
|
try {
|
|
17
50
|
await this.consumer.fetchPendingItems();
|
|
@@ -20,21 +53,19 @@ export class OutboxRunner {
|
|
|
20
53
|
this.logger.error('Error during outbox run cycle', { error });
|
|
21
54
|
}
|
|
22
55
|
}
|
|
23
|
-
async
|
|
24
|
-
if (this.
|
|
25
|
-
this.logger.warn('Outbox runner is already running');
|
|
56
|
+
async stop() {
|
|
57
|
+
if (!this.abortController) {
|
|
26
58
|
return;
|
|
27
59
|
}
|
|
28
|
-
this.logger.info('
|
|
29
|
-
this.
|
|
30
|
-
|
|
31
|
-
await this.
|
|
32
|
-
|
|
60
|
+
this.logger.info('Stopping outbox runner gracefully');
|
|
61
|
+
this.abortController.abort();
|
|
62
|
+
try {
|
|
63
|
+
await this.loopPromise;
|
|
64
|
+
}
|
|
65
|
+
finally {
|
|
66
|
+
this.loopPromise = undefined;
|
|
67
|
+
this.abortController = undefined;
|
|
33
68
|
}
|
|
34
|
-
}
|
|
35
|
-
stop() {
|
|
36
|
-
this.logger.info('Stopping outbox runner');
|
|
37
|
-
this.running = false;
|
|
38
69
|
}
|
|
39
70
|
}
|
|
40
71
|
//# sourceMappingURL=outbox.runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outbox.runner.js","sourceRoot":"","sources":["../../../src/outbox/runners/outbox.runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"outbox.runner.js","sourceRoot":"","sources":["../../../src/outbox/runners/outbox.runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,8 +27,8 @@ describe('Outbox Flow (Integration)', () => {
|
|
|
27
27
|
config.logger.level = 'debug';
|
|
28
28
|
runner = new OutboxRunner(repository, config);
|
|
29
29
|
});
|
|
30
|
-
afterAll(() => {
|
|
31
|
-
runner.stop();
|
|
30
|
+
afterAll(async () => {
|
|
31
|
+
await runner.stop();
|
|
32
32
|
});
|
|
33
33
|
it('should complete the whole flow for EventQueue: write -> run cycle -> mark as processing', async () => {
|
|
34
34
|
const repo = testDataSource.getRepository(EventQueueModel);
|
|
@@ -48,7 +48,7 @@ describe('Outbox Flow (Integration)', () => {
|
|
|
48
48
|
expect(dbItem).toBeDefined();
|
|
49
49
|
expect(dbItem?.status).toBe(OutboxStatus.PENDING);
|
|
50
50
|
expect(dbItem?.payload).toEqual({ after: { foo: 'bar' } });
|
|
51
|
-
|
|
51
|
+
runner.start();
|
|
52
52
|
const maxAttempts = 10;
|
|
53
53
|
let attempts = 0;
|
|
54
54
|
let processed = false;
|
|
@@ -61,7 +61,7 @@ describe('Outbox Flow (Integration)', () => {
|
|
|
61
61
|
attempts++;
|
|
62
62
|
}
|
|
63
63
|
expect(dbItem?.status).toBe(OutboxStatus.PROCESSING);
|
|
64
|
-
runner.stop();
|
|
64
|
+
await runner.stop();
|
|
65
65
|
});
|
|
66
66
|
it('should process multiple EventQueue items in the flow', async () => {
|
|
67
67
|
const repo = testDataSource.getRepository(EventQueueModel);
|
|
@@ -77,7 +77,7 @@ describe('Outbox Flow (Integration)', () => {
|
|
|
77
77
|
payload: { after: { index: i } },
|
|
78
78
|
}, () => new EventQueueEntity()));
|
|
79
79
|
await writer.createMany(events);
|
|
80
|
-
|
|
80
|
+
runner.start();
|
|
81
81
|
const maxAttempts = 10;
|
|
82
82
|
let attempts = 0;
|
|
83
83
|
let allProcessed = false;
|
|
@@ -94,7 +94,7 @@ describe('Outbox Flow (Integration)', () => {
|
|
|
94
94
|
expect(processedIds).toContain(events[0].id);
|
|
95
95
|
expect(processedIds).toContain(events[1].id);
|
|
96
96
|
expect(processedIds).toContain(events[2].id);
|
|
97
|
-
runner.stop();
|
|
97
|
+
await runner.stop();
|
|
98
98
|
});
|
|
99
99
|
});
|
|
100
100
|
//# sourceMappingURL=outbox.runner.int.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outbox.runner.int.spec.js","sourceRoot":"","sources":["../../../src/test/outbox/outbox.runner.int.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,sDAAsD,CAAC;AAChG,OAAO,EAAE,cAAc,EAAuB,MAAM,wCAAwC,CAAC;AAC7F,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE1E,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEtF,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,IAAI,UAAoC,CAAC;IACzC,IAAI,UAA0B,CAAC;IAC/B,IAAI,MAAuD,CAAC;IAC5D,IAAI,MAAuD,CAAC;IAE5D,oBAAoB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC;IAExC,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,GAAG,cAAc,EAAE,CAAC;QAC9B,UAAU,GAAG,IAAI,wBAAwB,CAAC,cAAc,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,CAAC;QACzF,MAAM,GAAG,IAAI,YAAY,CAAC,UAAmB,EAAE,UAAU,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACxC,MAAM,CAAC,eAAe,GAAG,EAAE,CAAC;QAC5B,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC;QACtB,MAAM,CAAC,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC;QACzC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC;QAE9B,MAAM,GAAG,IAAI,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"outbox.runner.int.spec.js","sourceRoot":"","sources":["../../../src/test/outbox/outbox.runner.int.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,74 +3,168 @@ import { OutboxRunner } from '../../outbox/runners/outbox.runner.js';
|
|
|
3
3
|
import { OutboxConsumer } from '../../outbox/consumers/outbox.consumer.js';
|
|
4
4
|
import { OutboxRunnerConfig, LoggerConfig, LoggerFormat } from '@volontariapp/config';
|
|
5
5
|
import { Logger } from '@volontariapp/logger';
|
|
6
|
+
const internalMockSetTimeout = jest.fn();
|
|
7
|
+
jest.mock('node:timers/promises', () => ({
|
|
8
|
+
__esModule: true,
|
|
9
|
+
setTimeout: (...args) => internalMockSetTimeout(...args),
|
|
10
|
+
}));
|
|
6
11
|
jest.mock('@volontariapp/logger');
|
|
7
12
|
describe('OutboxRunner (Unit)', () => {
|
|
8
13
|
let runner;
|
|
9
14
|
let repositoryMock;
|
|
10
15
|
let fetchPendingItemsSpy;
|
|
11
|
-
let loggerErrorSpy;
|
|
12
|
-
let loggerWarnSpy;
|
|
13
16
|
const config = new OutboxRunnerConfig();
|
|
14
17
|
config.batchIntervalMs = 200;
|
|
15
18
|
config.batchSize = 10;
|
|
16
19
|
config.logger = new LoggerConfig();
|
|
17
20
|
config.logger.format = LoggerFormat.JSON;
|
|
18
21
|
config.logger.level = 'info';
|
|
22
|
+
const flush = async () => {
|
|
23
|
+
for (let i = 0; i < 20; i++) {
|
|
24
|
+
await Promise.resolve();
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
const waitForCalls = async (target, timeoutMs = 1000) => {
|
|
28
|
+
const start = Date.now();
|
|
29
|
+
while (fetchPendingItemsSpy.mock.calls.length < target && Date.now() - start < timeoutMs) {
|
|
30
|
+
await flush();
|
|
31
|
+
await jest.advanceTimersByTimeAsync(0);
|
|
32
|
+
}
|
|
33
|
+
};
|
|
19
34
|
beforeEach(() => {
|
|
20
35
|
jest.useFakeTimers();
|
|
21
36
|
repositoryMock = {
|
|
22
37
|
metadata: { tableName: 'outbox' },
|
|
23
38
|
};
|
|
24
39
|
fetchPendingItemsSpy = jest.spyOn(OutboxConsumer.prototype, 'fetchPendingItems');
|
|
25
|
-
|
|
26
|
-
|
|
40
|
+
internalMockSetTimeout.mockImplementation((ms, value, options) => {
|
|
41
|
+
return new Promise((resolve, reject) => {
|
|
42
|
+
const delay = typeof ms === 'number' ? ms : 1;
|
|
43
|
+
const timeout = global.setTimeout(() => {
|
|
44
|
+
resolve(value);
|
|
45
|
+
}, delay);
|
|
46
|
+
const timerOptions = options;
|
|
47
|
+
if (timerOptions?.signal) {
|
|
48
|
+
const signal = timerOptions.signal;
|
|
49
|
+
if (signal.aborted) {
|
|
50
|
+
global.clearTimeout(timeout);
|
|
51
|
+
const error = new Error('The operation was aborted');
|
|
52
|
+
error.name = 'AbortError';
|
|
53
|
+
reject(error);
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
signal.addEventListener('abort', () => {
|
|
57
|
+
global.clearTimeout(timeout);
|
|
58
|
+
const error = new Error('The operation was aborted');
|
|
59
|
+
error.name = 'AbortError';
|
|
60
|
+
reject(error);
|
|
61
|
+
}, { once: true });
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
});
|
|
27
65
|
runner = new OutboxRunner(repositoryMock, config);
|
|
28
66
|
});
|
|
29
|
-
afterEach(() => {
|
|
30
|
-
runner
|
|
67
|
+
afterEach(async () => {
|
|
68
|
+
if (runner !== undefined) {
|
|
69
|
+
await runner.stop();
|
|
70
|
+
}
|
|
71
|
+
internalMockSetTimeout.mockReset();
|
|
31
72
|
jest.useRealTimers();
|
|
32
73
|
jest.restoreAllMocks();
|
|
33
74
|
});
|
|
34
75
|
it('should call fetchPendingItems periodically after start', async () => {
|
|
35
76
|
fetchPendingItemsSpy.mockResolvedValue([]);
|
|
36
|
-
|
|
37
|
-
|
|
77
|
+
if (runner !== undefined) {
|
|
78
|
+
runner.start();
|
|
79
|
+
}
|
|
80
|
+
await waitForCalls(1);
|
|
38
81
|
expect(fetchPendingItemsSpy).toHaveBeenCalledTimes(1);
|
|
39
|
-
|
|
82
|
+
jest.advanceTimersByTime(200);
|
|
83
|
+
await waitForCalls(2);
|
|
40
84
|
expect(fetchPendingItemsSpy).toHaveBeenCalledTimes(2);
|
|
41
|
-
|
|
85
|
+
jest.advanceTimersByTime(200);
|
|
86
|
+
await waitForCalls(3);
|
|
42
87
|
expect(fetchPendingItemsSpy).toHaveBeenCalledTimes(3);
|
|
43
88
|
});
|
|
44
89
|
it('runCycle() should execute a single fetch and return', async () => {
|
|
45
90
|
fetchPendingItemsSpy.mockResolvedValue([]);
|
|
46
|
-
|
|
91
|
+
if (runner !== undefined) {
|
|
92
|
+
await runner.runCycle();
|
|
93
|
+
}
|
|
47
94
|
expect(fetchPendingItemsSpy).toHaveBeenCalledTimes(1);
|
|
48
|
-
expect(jest.getTimerCount()).toBe(0);
|
|
49
95
|
});
|
|
50
96
|
it('should log error if runCycle fails but continue running in start loop', async () => {
|
|
51
97
|
const error = new Error('Fetch failed');
|
|
52
98
|
fetchPendingItemsSpy.mockRejectedValueOnce(error);
|
|
53
99
|
fetchPendingItemsSpy.mockResolvedValue([]);
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
100
|
+
if (runner !== undefined) {
|
|
101
|
+
runner.start();
|
|
102
|
+
}
|
|
103
|
+
await waitForCalls(1);
|
|
57
104
|
expect(fetchPendingItemsSpy).toHaveBeenCalledTimes(1);
|
|
58
|
-
|
|
105
|
+
jest.advanceTimersByTime(200);
|
|
106
|
+
await waitForCalls(2);
|
|
59
107
|
expect(fetchPendingItemsSpy).toHaveBeenCalledTimes(2);
|
|
60
108
|
});
|
|
61
109
|
it('should stop running when stop is called', async () => {
|
|
62
110
|
fetchPendingItemsSpy.mockResolvedValue([]);
|
|
63
|
-
|
|
64
|
-
|
|
111
|
+
if (runner !== undefined) {
|
|
112
|
+
runner.start();
|
|
113
|
+
}
|
|
114
|
+
await waitForCalls(1);
|
|
65
115
|
expect(fetchPendingItemsSpy).toHaveBeenCalledTimes(1);
|
|
66
|
-
runner
|
|
67
|
-
|
|
116
|
+
if (runner !== undefined) {
|
|
117
|
+
const stopPromise = runner.stop();
|
|
118
|
+
await flush();
|
|
119
|
+
jest.advanceTimersByTime(0);
|
|
120
|
+
await flush();
|
|
121
|
+
await stopPromise;
|
|
122
|
+
}
|
|
123
|
+
jest.advanceTimersByTime(400);
|
|
124
|
+
await flush();
|
|
68
125
|
expect(fetchPendingItemsSpy).toHaveBeenCalledTimes(1);
|
|
69
126
|
});
|
|
127
|
+
it('should wait for current cycle to finish during graceful shutdown', async () => {
|
|
128
|
+
let cycleFinished = false;
|
|
129
|
+
fetchPendingItemsSpy.mockImplementation(async () => {
|
|
130
|
+
await new Promise((resolve) => global.setTimeout(resolve, 50));
|
|
131
|
+
cycleFinished = true;
|
|
132
|
+
return [];
|
|
133
|
+
});
|
|
134
|
+
if (runner !== undefined) {
|
|
135
|
+
runner.start();
|
|
136
|
+
}
|
|
137
|
+
await flush();
|
|
138
|
+
expect(fetchPendingItemsSpy).toHaveBeenCalledTimes(1);
|
|
139
|
+
if (runner !== undefined) {
|
|
140
|
+
const stopPromise = runner.stop();
|
|
141
|
+
await flush();
|
|
142
|
+
expect(cycleFinished).toBe(false);
|
|
143
|
+
jest.advanceTimersByTime(50);
|
|
144
|
+
await flush();
|
|
145
|
+
await stopPromise;
|
|
146
|
+
expect(cycleFinished).toBe(true);
|
|
147
|
+
}
|
|
148
|
+
});
|
|
70
149
|
it('should not start multiple times', () => {
|
|
71
|
-
|
|
72
|
-
|
|
150
|
+
if (runner !== undefined) {
|
|
151
|
+
runner.start();
|
|
152
|
+
}
|
|
153
|
+
const loggerWarnSpy = jest.spyOn(Logger.prototype, 'warn');
|
|
154
|
+
if (runner !== undefined) {
|
|
155
|
+
runner.start();
|
|
156
|
+
}
|
|
73
157
|
expect(loggerWarnSpy).toHaveBeenCalledWith('Outbox runner is already running');
|
|
74
158
|
});
|
|
159
|
+
it('isRunning should reflect correct state', async () => {
|
|
160
|
+
if (runner !== undefined) {
|
|
161
|
+
expect(runner.isRunning).toBe(false);
|
|
162
|
+
runner.start();
|
|
163
|
+
await waitForCalls(1);
|
|
164
|
+
expect(runner.isRunning).toBe(true);
|
|
165
|
+
await runner.stop();
|
|
166
|
+
expect(runner.isRunning).toBe(false);
|
|
167
|
+
}
|
|
168
|
+
});
|
|
75
169
|
});
|
|
76
170
|
//# sourceMappingURL=outbox.runner.unit.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outbox.runner.unit.spec.js","sourceRoot":"","sources":["../../../src/test/outbox/outbox.runner.unit.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAItF,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"outbox.runner.unit.spec.js","sourceRoot":"","sources":["../../../src/test/outbox/outbox.runner.unit.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@volontariapp/database",
|
|
3
|
-
"version": "1.10.0-snap-
|
|
3
|
+
"version": "1.10.0-snap-67b30c3",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public",
|
|
6
6
|
"provenance": true
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
"db:down": "docker-compose -f ../../docker-compose.test.yml down"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@volontariapp/bridge": "0.2.10-snap-
|
|
40
|
-
"@volontariapp/config": "2.1.0-snap-
|
|
39
|
+
"@volontariapp/bridge": "0.2.10-snap-67b30c3",
|
|
40
|
+
"@volontariapp/config": "2.1.0-snap-67b30c3",
|
|
41
41
|
"@volontariapp/errors": "0.5.0",
|
|
42
42
|
"@volontariapp/logger": "0.2.3",
|
|
43
43
|
"class-transformer": "^0.5.1",
|