atomic-queues 2.1.1 → 2.3.0
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/README.md +31 -44
- package/dist/cli/generators/classes.d.ts.map +1 -1
- package/dist/cli/generators/classes.js +15 -11
- package/dist/cli/generators/classes.js.map +1 -1
- package/dist/cli/generators/typescript.js +16 -9
- package/dist/cli/generators/typescript.js.map +1 -1
- package/dist/cli/index.js +34 -20
- package/dist/cli/index.js.map +1 -1
- package/dist/decorators/constants.d.ts +0 -3
- package/dist/decorators/constants.d.ts.map +1 -1
- package/dist/decorators/constants.js +1 -5
- package/dist/decorators/constants.js.map +1 -1
- package/dist/decorators/entity.decorators.d.ts.map +1 -1
- package/dist/decorators/entity.decorators.js.map +1 -1
- package/dist/decorators/index.d.ts +0 -1
- package/dist/decorators/index.d.ts.map +1 -1
- package/dist/decorators/index.js +0 -1
- package/dist/decorators/index.js.map +1 -1
- package/dist/decorators/interfaces.d.ts +0 -18
- package/dist/decorators/interfaces.d.ts.map +1 -1
- package/dist/decorators/job.decorators.d.ts.map +1 -1
- package/dist/decorators/job.decorators.js +2 -6
- package/dist/decorators/job.decorators.js.map +1 -1
- package/dist/decorators/metadata-readers.d.ts +1 -3
- package/dist/decorators/metadata-readers.d.ts.map +1 -1
- package/dist/decorators/metadata-readers.js +0 -8
- package/dist/decorators/metadata-readers.js.map +1 -1
- package/dist/decorators/utils.d.ts +2 -1
- package/dist/decorators/utils.d.ts.map +1 -1
- package/dist/decorators/utils.js +15 -20
- package/dist/decorators/utils.js.map +1 -1
- package/dist/domain/interfaces/config.interfaces.d.ts +0 -4
- package/dist/domain/interfaces/config.interfaces.d.ts.map +1 -1
- package/dist/domain/interfaces/cqrs.interfaces.d.ts +2 -2
- package/dist/domain/interfaces/cqrs.interfaces.d.ts.map +1 -1
- package/dist/module/atomic-queues.module.d.ts +1 -1
- package/dist/module/atomic-queues.module.d.ts.map +1 -1
- package/dist/module/atomic-queues.module.js +21 -45
- package/dist/module/atomic-queues.module.js.map +1 -1
- package/dist/services/command-discovery/command-discovery.service.d.ts +6 -10
- package/dist/services/command-discovery/command-discovery.service.d.ts.map +1 -1
- package/dist/services/command-discovery/command-discovery.service.js +12 -25
- package/dist/services/command-discovery/command-discovery.service.js.map +1 -1
- package/dist/services/entity-type-registry/entity-type-registry.service.d.ts +13 -0
- package/dist/services/entity-type-registry/entity-type-registry.service.d.ts.map +1 -0
- package/dist/services/entity-type-registry/entity-type-registry.service.js +75 -0
- package/dist/services/entity-type-registry/entity-type-registry.service.js.map +1 -0
- package/dist/services/entity-type-registry/index.d.ts +2 -0
- package/dist/services/entity-type-registry/index.d.ts.map +1 -0
- package/dist/services/{actor-registry → entity-type-registry}/index.js +1 -1
- package/dist/services/entity-type-registry/index.js.map +1 -0
- package/dist/services/executor-pool/executor-pool.service.d.ts +3 -3
- package/dist/services/executor-pool/executor-pool.service.d.ts.map +1 -1
- package/dist/services/executor-pool/executor-pool.service.js +12 -26
- package/dist/services/executor-pool/executor-pool.service.js.map +1 -1
- package/dist/services/gate/gate.service.d.ts +2 -2
- package/dist/services/gate/gate.service.d.ts.map +1 -1
- package/dist/services/gate/gate.service.js +19 -4
- package/dist/services/gate/gate.service.js.map +1 -1
- package/dist/services/handler-executor/handler-executor.service.d.ts +4 -12
- package/dist/services/handler-executor/handler-executor.service.d.ts.map +1 -1
- package/dist/services/handler-executor/handler-executor.service.js +19 -51
- package/dist/services/handler-executor/handler-executor.service.js.map +1 -1
- package/dist/services/index.d.ts +1 -1
- package/dist/services/index.d.ts.map +1 -1
- package/dist/services/index.js +1 -1
- package/dist/services/index.js.map +1 -1
- package/dist/services/log/log.service.d.ts.map +1 -1
- package/dist/services/log/log.service.js +1 -1
- package/dist/services/log/log.service.js.map +1 -1
- package/dist/services/queue-bus/cluster-contracts.d.ts +1 -1
- package/dist/services/queue-bus/cluster-contracts.d.ts.map +1 -1
- package/dist/services/queue-bus/cluster-contracts.js +16 -9
- package/dist/services/queue-bus/cluster-contracts.js.map +1 -1
- package/dist/services/queue-bus/queue-bus.service.d.ts +46 -29
- package/dist/services/queue-bus/queue-bus.service.d.ts.map +1 -1
- package/dist/services/queue-bus/queue-bus.service.js +77 -60
- package/dist/services/queue-bus/queue-bus.service.js.map +1 -1
- package/dist/services/queue-bus/queue-bus.utils.d.ts.map +1 -1
- package/dist/services/queue-bus/queue-bus.utils.js.map +1 -1
- package/dist/services/registry/registry.service.d.ts.map +1 -1
- package/dist/services/registry/registry.service.js +8 -41
- package/dist/services/registry/registry.service.js.map +1 -1
- package/dist/services/scheduler/scheduler.service.d.ts +2 -2
- package/dist/services/scheduler/scheduler.service.d.ts.map +1 -1
- package/dist/services/scheduler/scheduler.service.js +11 -9
- package/dist/services/scheduler/scheduler.service.js.map +1 -1
- package/dist/utils/cqrs-discovery.utils.d.ts +9 -0
- package/dist/utils/cqrs-discovery.utils.d.ts.map +1 -0
- package/dist/utils/cqrs-discovery.utils.js +28 -0
- package/dist/utils/cqrs-discovery.utils.js.map +1 -0
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +1 -0
- package/dist/utils/index.js.map +1 -1
- package/package.json +10 -6
- package/dist/decorators/actor.decorators.d.ts +0 -4
- package/dist/decorators/actor.decorators.d.ts.map +0 -1
- package/dist/decorators/actor.decorators.js +0 -32
- package/dist/decorators/actor.decorators.js.map +0 -1
- package/dist/services/actor-registry/actor-registry.service.d.ts +0 -30
- package/dist/services/actor-registry/actor-registry.service.d.ts.map +0 -1
- package/dist/services/actor-registry/actor-registry.service.js +0 -203
- package/dist/services/actor-registry/actor-registry.service.js.map +0 -1
- package/dist/services/actor-registry/index.d.ts +0 -2
- package/dist/services/actor-registry/index.d.ts.map +0 -1
- package/dist/services/actor-registry/index.js.map +0 -1
|
@@ -5,7 +5,7 @@ import { SchedulerService } from '../scheduler';
|
|
|
5
5
|
import { GateService } from '../gate';
|
|
6
6
|
import { LogService } from '../log';
|
|
7
7
|
import { HandlerExecutor } from '../handler-executor';
|
|
8
|
-
import {
|
|
8
|
+
import { EntityTypeRegistry } from '../entity-type-registry';
|
|
9
9
|
export declare class ExecutorPoolService implements OnModuleInit, OnApplicationShutdown {
|
|
10
10
|
private readonly redis;
|
|
11
11
|
private readonly config;
|
|
@@ -13,7 +13,7 @@ export declare class ExecutorPoolService implements OnModuleInit, OnApplicationS
|
|
|
13
13
|
private readonly gateService;
|
|
14
14
|
private readonly logService;
|
|
15
15
|
private readonly handlerExecutor;
|
|
16
|
-
private readonly
|
|
16
|
+
private readonly entityTypeRegistry;
|
|
17
17
|
private readonly logger;
|
|
18
18
|
private readonly keyPrefix;
|
|
19
19
|
private readonly poolSize;
|
|
@@ -21,7 +21,7 @@ export declare class ExecutorPoolService implements OnModuleInit, OnApplicationS
|
|
|
21
21
|
private running;
|
|
22
22
|
private subscriberClient;
|
|
23
23
|
private ownedEntityTypes;
|
|
24
|
-
constructor(redis: Redis, config: IAtomicQueuesModuleConfig, scheduler: SchedulerService, gateService: GateService, logService: LogService, handlerExecutor: HandlerExecutor,
|
|
24
|
+
constructor(redis: Redis, config: IAtomicQueuesModuleConfig, scheduler: SchedulerService, gateService: GateService, logService: LogService, handlerExecutor: HandlerExecutor, entityTypeRegistry: EntityTypeRegistry);
|
|
25
25
|
onModuleInit(): Promise<void>;
|
|
26
26
|
onApplicationShutdown(): Promise<void>;
|
|
27
27
|
tickle(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor-pool.service.d.ts","sourceRoot":"","sources":["../../../src/services/executor-pool/executor-pool.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,YAAY,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACjG,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,yBAAyB,
|
|
1
|
+
{"version":3,"file":"executor-pool.service.d.ts","sourceRoot":"","sources":["../../../src/services/executor-pool/executor-pool.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,YAAY,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACjG,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,yBAAyB,EAAsB,MAAM,cAAc,CAAC;AAE7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D,qBACa,mBAAoB,YAAW,YAAY,EAAE,qBAAqB;IAU9C,OAAO,CAAC,QAAQ,CAAC,KAAK;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACrD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAfrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAC/D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,gBAAgB,CAAsB;IAC9C,OAAO,CAAC,gBAAgB,CAAuB;gBAGC,KAAK,EAAE,KAAK,EACX,MAAM,EAAE,yBAAyB,EAC/D,SAAS,EAAE,gBAAgB,EAC3B,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,kBAAkB;IAMnD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB7B,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBtC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;YAKf,WAAW;YAkBX,cAAc;YA8Bd,aAAa;IAW3B;;;;OAIG;IACH,OAAO,CAAC,uBAAuB;CAuBhC"}
|
|
@@ -24,17 +24,17 @@ const scheduler_1 = require("../scheduler");
|
|
|
24
24
|
const gate_1 = require("../gate");
|
|
25
25
|
const log_1 = require("../log");
|
|
26
26
|
const handler_executor_1 = require("../handler-executor");
|
|
27
|
-
const
|
|
27
|
+
const entity_type_registry_1 = require("../entity-type-registry");
|
|
28
28
|
const constants_1 = require("../constants");
|
|
29
29
|
let ExecutorPoolService = ExecutorPoolService_1 = class ExecutorPoolService {
|
|
30
|
-
constructor(redis, config, scheduler, gateService, logService, handlerExecutor,
|
|
30
|
+
constructor(redis, config, scheduler, gateService, logService, handlerExecutor, entityTypeRegistry) {
|
|
31
31
|
this.redis = redis;
|
|
32
32
|
this.config = config;
|
|
33
33
|
this.scheduler = scheduler;
|
|
34
34
|
this.gateService = gateService;
|
|
35
35
|
this.logService = logService;
|
|
36
36
|
this.handlerExecutor = handlerExecutor;
|
|
37
|
-
this.
|
|
37
|
+
this.entityTypeRegistry = entityTypeRegistry;
|
|
38
38
|
this.logger = new common_1.Logger(ExecutorPoolService_1.name);
|
|
39
39
|
this.activeExecutors = 0;
|
|
40
40
|
this.running = false;
|
|
@@ -66,7 +66,7 @@ let ExecutorPoolService = ExecutorPoolService_1 = class ExecutorPoolService {
|
|
|
66
66
|
const maxWait = 30000;
|
|
67
67
|
const start = Date.now();
|
|
68
68
|
while (this.activeExecutors > 0 && Date.now() - start < maxWait) {
|
|
69
|
-
await new Promise(resolve => setTimeout(resolve, 100));
|
|
69
|
+
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
70
70
|
}
|
|
71
71
|
if (this.activeExecutors > 0) {
|
|
72
72
|
this.logger.warn(`Shutdown with ${this.activeExecutors} active executors still running`);
|
|
@@ -85,8 +85,7 @@ let ExecutorPoolService = ExecutorPoolService_1 = class ExecutorPoolService {
|
|
|
85
85
|
if (!result)
|
|
86
86
|
break;
|
|
87
87
|
this.activeExecutors++;
|
|
88
|
-
this.executeMessage(result.entityKey, result.message, result.ownerToken)
|
|
89
|
-
.finally(() => {
|
|
88
|
+
this.executeMessage(result.entityKey, result.message, result.ownerToken).finally(() => {
|
|
90
89
|
this.activeExecutors--;
|
|
91
90
|
if (this.running) {
|
|
92
91
|
this.tryDispatch();
|
|
@@ -98,32 +97,22 @@ let ExecutorPoolService = ExecutorPoolService_1 = class ExecutorPoolService {
|
|
|
98
97
|
const entityType = message.entityType;
|
|
99
98
|
const entityId = message.entityId;
|
|
100
99
|
const ttl = this.gateService.getTTLForEntity(entityType);
|
|
101
|
-
const refreshInterval = this.config.executor?.gateRefreshInterval ??
|
|
100
|
+
const refreshInterval = this.config.executor?.gateRefreshInterval ?? ttl * 500;
|
|
102
101
|
const refresher = setInterval(async () => {
|
|
103
102
|
try {
|
|
104
|
-
await this.gateService.extend(entityKey, ttl);
|
|
103
|
+
await this.gateService.extend(entityKey, ownerToken, ttl);
|
|
105
104
|
}
|
|
106
105
|
catch (err) {
|
|
107
106
|
this.logger.error(`Gate refresh failed for ${entityKey}: ${err.message}`);
|
|
108
107
|
}
|
|
109
108
|
}, refreshInterval);
|
|
110
109
|
try {
|
|
111
|
-
if (this.actorRegistry.hasActor(entityType)) {
|
|
112
|
-
const actor = await this.actorRegistry.getOrCreateInstance(entityType, entityId);
|
|
113
|
-
const methodName = this.actorRegistry.getHandlerMethod(entityType, message.name);
|
|
114
|
-
if (actor && methodName) {
|
|
115
|
-
const result = await actor[methodName]({ ...message.data });
|
|
116
|
-
await this.publishResult(message, result);
|
|
117
|
-
await this.scheduler.complete(entityKey);
|
|
118
|
-
return;
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
110
|
const result = await this.handlerExecutor.execute(message, entityKey);
|
|
122
111
|
await this.publishResult(message, result);
|
|
123
|
-
await this.scheduler.complete(entityKey);
|
|
112
|
+
await this.scheduler.complete(entityKey, ownerToken);
|
|
124
113
|
}
|
|
125
114
|
catch (err) {
|
|
126
|
-
await this.scheduler.fail(entityKey, message, err);
|
|
115
|
+
await this.scheduler.fail(entityKey, ownerToken, message, err);
|
|
127
116
|
await this.publishResult(message, undefined, err);
|
|
128
117
|
}
|
|
129
118
|
finally {
|
|
@@ -134,9 +123,7 @@ let ExecutorPoolService = ExecutorPoolService_1 = class ExecutorPoolService {
|
|
|
134
123
|
if (!message.correlationId)
|
|
135
124
|
return;
|
|
136
125
|
const channel = `${this.keyPrefix}:results:${message.correlationId}`;
|
|
137
|
-
const payload = error
|
|
138
|
-
? JSON.stringify({ error: error.message })
|
|
139
|
-
: JSON.stringify({ result });
|
|
126
|
+
const payload = error ? JSON.stringify({ error: error.message }) : JSON.stringify({ result });
|
|
140
127
|
await this.redis.publish(channel, payload);
|
|
141
128
|
}
|
|
142
129
|
/**
|
|
@@ -146,8 +133,7 @@ let ExecutorPoolService = ExecutorPoolService_1 = class ExecutorPoolService {
|
|
|
146
133
|
*/
|
|
147
134
|
collectOwnedEntityTypes() {
|
|
148
135
|
const types = new Set();
|
|
149
|
-
|
|
150
|
-
for (const et of this.actorRegistry.getRegisteredEntityTypes()) {
|
|
136
|
+
for (const et of this.entityTypeRegistry.getRegisteredEntityTypes()) {
|
|
151
137
|
types.add(et);
|
|
152
138
|
}
|
|
153
139
|
// Entity types declared in config
|
|
@@ -175,6 +161,6 @@ exports.ExecutorPoolService = ExecutorPoolService = ExecutorPoolService_1 = __de
|
|
|
175
161
|
gate_1.GateService,
|
|
176
162
|
log_1.LogService,
|
|
177
163
|
handler_executor_1.HandlerExecutor,
|
|
178
|
-
|
|
164
|
+
entity_type_registry_1.EntityTypeRegistry])
|
|
179
165
|
], ExecutorPoolService);
|
|
180
166
|
//# sourceMappingURL=executor-pool.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor-pool.service.js","sourceRoot":"","sources":["../../../src/services/executor-pool/executor-pool.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,2CAAiG;AACjG,sDAA4B;AAE5B,uCAA+C;AAC/C,4CAAgD;AAChD,kCAAsC;AACtC,gCAAoC;AACpC,0DAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"executor-pool.service.js","sourceRoot":"","sources":["../../../src/services/executor-pool/executor-pool.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,8 @@ export declare class GateService {
|
|
|
9
9
|
constructor(redis: Redis, config: IAtomicQueuesModuleConfig);
|
|
10
10
|
getGateKey(entityKey: string): string;
|
|
11
11
|
acquire(entityKey: string, ownerToken: string, ttlSeconds?: number): Promise<boolean>;
|
|
12
|
-
release(entityKey: string): Promise<
|
|
13
|
-
extend(entityKey: string, ttlSeconds?: number): Promise<boolean>;
|
|
12
|
+
release(entityKey: string, ownerToken: string): Promise<boolean>;
|
|
13
|
+
extend(entityKey: string, ownerToken: string, ttlSeconds?: number): Promise<boolean>;
|
|
14
14
|
isHeld(entityKey: string): Promise<boolean>;
|
|
15
15
|
getTTLForEntity(entityType: string): number;
|
|
16
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gate.service.d.ts","sourceRoot":"","sources":["../../../src/services/gate/gate.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"gate.service.d.ts","sourceRoot":"","sources":["../../../src/services/gate/gate.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AAoBzD,qBACa,WAAW;IAMS,OAAO,CAAC,QAAQ,CAAC,KAAK;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IANvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IACvD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAGY,KAAK,EAAE,KAAK,EACX,MAAM,EAAE,yBAAyB;IAMlF,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAI/B,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOrF,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWhE,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAapF,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKjD,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;CAG5C"}
|
|
@@ -21,6 +21,20 @@ const common_1 = require("@nestjs/common");
|
|
|
21
21
|
const ioredis_1 = __importDefault(require("ioredis"));
|
|
22
22
|
const utils_1 = require("../../utils");
|
|
23
23
|
const constants_1 = require("../constants");
|
|
24
|
+
const RELEASE_IF_OWNER_SCRIPT = `
|
|
25
|
+
if redis.call("GET", KEYS[1]) == ARGV[1] then
|
|
26
|
+
return redis.call("DEL", KEYS[1])
|
|
27
|
+
else
|
|
28
|
+
return 0
|
|
29
|
+
end
|
|
30
|
+
`;
|
|
31
|
+
const EXTEND_IF_OWNER_SCRIPT = `
|
|
32
|
+
if redis.call("GET", KEYS[1]) == ARGV[1] then
|
|
33
|
+
return redis.call("EXPIRE", KEYS[1], ARGV[2])
|
|
34
|
+
else
|
|
35
|
+
return 0
|
|
36
|
+
end
|
|
37
|
+
`;
|
|
24
38
|
let GateService = GateService_1 = class GateService {
|
|
25
39
|
constructor(redis, config) {
|
|
26
40
|
this.redis = redis;
|
|
@@ -38,14 +52,15 @@ let GateService = GateService_1 = class GateService {
|
|
|
38
52
|
const result = await this.redis.set(gateKey, ownerToken, 'EX', ttl, 'NX');
|
|
39
53
|
return result === 'OK';
|
|
40
54
|
}
|
|
41
|
-
async release(entityKey) {
|
|
55
|
+
async release(entityKey, ownerToken) {
|
|
42
56
|
const gateKey = this.getGateKey(entityKey);
|
|
43
|
-
await this.redis.
|
|
57
|
+
const result = (await this.redis.eval(RELEASE_IF_OWNER_SCRIPT, 1, gateKey, ownerToken));
|
|
58
|
+
return result === 1;
|
|
44
59
|
}
|
|
45
|
-
async extend(entityKey, ttlSeconds) {
|
|
60
|
+
async extend(entityKey, ownerToken, ttlSeconds) {
|
|
46
61
|
const gateKey = this.getGateKey(entityKey);
|
|
47
62
|
const ttl = ttlSeconds ?? this.defaultTTL;
|
|
48
|
-
const result = await this.redis.
|
|
63
|
+
const result = (await this.redis.eval(EXTEND_IF_OWNER_SCRIPT, 1, gateKey, ownerToken, ttl.toString()));
|
|
49
64
|
return result === 1;
|
|
50
65
|
}
|
|
51
66
|
async isHeld(entityKey) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gate.service.js","sourceRoot":"","sources":["../../../src/services/gate/gate.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,sDAA4B;AAE5B,uCAA+C;AAC/C,4CAAyE;
|
|
1
|
+
{"version":3,"file":"gate.service.js","sourceRoot":"","sources":["../../../src/services/gate/gate.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,sDAA4B;AAE5B,uCAA+C;AAC/C,4CAAyE;AAEzE,MAAM,uBAAuB,GAAG;;;;;;CAM/B,CAAC;AAEF,MAAM,sBAAsB,GAAG;;;;;;CAM9B,CAAC;AAGK,IAAM,WAAW,mBAAjB,MAAM,WAAW;IAKtB,YAC+B,KAA6B,EAC5B,MAAkD;QADlC,UAAK,GAAL,KAAK,CAAO;QACX,WAAM,GAAN,MAAM,CAA2B;QANjE,WAAM,GAAG,IAAI,eAAM,CAAC,aAAW,CAAC,IAAI,CAAC,CAAC;QAQrD,IAAI,CAAC,SAAS,GAAG,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,EAAE,CAAC;IACnD,CAAC;IAED,UAAU,CAAC,SAAiB;QAC1B,OAAO,GAAG,IAAI,CAAC,SAAS,SAAS,SAAS,EAAE,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,SAAiB,EAAE,UAAkB,EAAE,UAAmB;QACtE,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC;QAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QAC1E,OAAO,MAAM,KAAK,IAAI,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,SAAiB,EAAE,UAAkB;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CACnC,uBAAuB,EACvB,CAAC,EACD,OAAO,EACP,UAAU,CACX,CAAW,CAAC;QACb,OAAO,MAAM,KAAK,CAAC,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,SAAiB,EAAE,UAAkB,EAAE,UAAmB;QACrE,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC;QAC1C,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CACnC,sBAAsB,EACtB,CAAC,EACD,OAAO,EACP,UAAU,EACV,GAAG,CAAC,QAAQ,EAAE,CACf,CAAW,CAAC;QACb,OAAO,MAAM,KAAK,CAAC,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,SAAiB;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC3C,OAAO,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;IAED,eAAe,CAAC,UAAkB;QAChC,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,EAAE,OAAO,IAAI,IAAI,CAAC,UAAU,CAAC;IACxE,CAAC;CACF,CAAA;AAxDY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAOR,WAAA,IAAA,eAAM,EAAC,+BAAmB,CAAC,CAAA;IAC3B,WAAA,IAAA,eAAM,EAAC,gCAAoB,CAAC,CAAA;qCADwB,iBAAK;GANjD,WAAW,CAwDvB"}
|
|
@@ -1,13 +1,7 @@
|
|
|
1
1
|
import { Type, OnModuleInit } from '@nestjs/common';
|
|
2
2
|
import { DiscoveryService, ModuleRef } from '@nestjs/core';
|
|
3
|
-
import { ISerializedMessage } from '../../domain';
|
|
3
|
+
import { ISerializedMessage, ICommandBus, IQueryBus } from '../../domain';
|
|
4
4
|
import { CommandDiscoveryService } from '../command-discovery';
|
|
5
|
-
interface ICommandBus {
|
|
6
|
-
execute<T>(command: T): Promise<any>;
|
|
7
|
-
}
|
|
8
|
-
interface IQueryBus {
|
|
9
|
-
execute<T>(query: T): Promise<any>;
|
|
10
|
-
}
|
|
11
5
|
export declare class HandlerExecutor implements OnModuleInit {
|
|
12
6
|
private readonly commandDiscoveryService;
|
|
13
7
|
private readonly discoveryService;
|
|
@@ -15,7 +9,6 @@ export declare class HandlerExecutor implements OnModuleInit {
|
|
|
15
9
|
private readonly logger;
|
|
16
10
|
private commandBus;
|
|
17
11
|
private queryBus;
|
|
18
|
-
private actorFactories;
|
|
19
12
|
private commandRegistry;
|
|
20
13
|
private commandDiscovery;
|
|
21
14
|
constructor(commandDiscoveryService: CommandDiscoveryService, discoveryService: DiscoveryService, moduleRef: ModuleRef);
|
|
@@ -23,11 +16,10 @@ export declare class HandlerExecutor implements OnModuleInit {
|
|
|
23
16
|
private discoverCqrsHandlers;
|
|
24
17
|
setCommandBus(bus: ICommandBus): void;
|
|
25
18
|
setQueryBus(bus: IQueryBus): void;
|
|
26
|
-
setCommandDiscovery(discovery:
|
|
27
|
-
|
|
28
|
-
registerCommand(className: string, targetClass: Type<any>, isQuery: boolean): void;
|
|
19
|
+
setCommandDiscovery(discovery: CommandDiscoveryService): void;
|
|
20
|
+
registerCommand(className: string, targetClass: Type<unknown>, isQuery: boolean): void;
|
|
29
21
|
canHandle(entityType: string, messageName: string): boolean;
|
|
30
22
|
execute(message: ISerializedMessage, entityKey: string): Promise<unknown>;
|
|
23
|
+
private getParamNames;
|
|
31
24
|
}
|
|
32
|
-
export {};
|
|
33
25
|
//# sourceMappingURL=handler-executor.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler-executor.service.d.ts","sourceRoot":"","sources":["../../../src/services/handler-executor/handler-executor.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,IAAI,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"handler-executor.service.d.ts","sourceRoot":"","sources":["../../../src/services/handler-executor/handler-executor.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,IAAI,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,qBACa,eAAgB,YAAW,YAAY;IAUhD,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAX5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAE3D,OAAO,CAAC,UAAU,CAA4B;IAC9C,OAAO,CAAC,QAAQ,CAA0B;IAE1C,OAAO,CAAC,eAAe,CAAuE;IAC9F,OAAO,CAAC,gBAAgB,CAAwC;gBAG7C,uBAAuB,EAAE,uBAAuB,EAChD,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,SAAS;IAGjC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BnC,OAAO,CAAC,oBAAoB;IAoB5B,aAAa,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI;IAIrC,WAAW,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI;IAIjC,mBAAmB,CAAC,SAAS,EAAE,uBAAuB,GAAG,IAAI;IAI7D,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAItF,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;IAQrD,OAAO,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAuC/E,OAAO,CAAC,aAAa;CAGtB"}
|
|
@@ -46,6 +46,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
46
46
|
exports.HandlerExecutor = void 0;
|
|
47
47
|
const common_1 = require("@nestjs/common");
|
|
48
48
|
const core_1 = require("@nestjs/core");
|
|
49
|
+
const utils_1 = require("../../decorators/utils");
|
|
50
|
+
const utils_2 = require("../../utils");
|
|
49
51
|
const command_discovery_1 = require("../command-discovery");
|
|
50
52
|
let HandlerExecutor = HandlerExecutor_1 = class HandlerExecutor {
|
|
51
53
|
constructor(commandDiscoveryService, discoveryService, moduleRef) {
|
|
@@ -55,7 +57,6 @@ let HandlerExecutor = HandlerExecutor_1 = class HandlerExecutor {
|
|
|
55
57
|
this.logger = new common_1.Logger(HandlerExecutor_1.name);
|
|
56
58
|
this.commandBus = null;
|
|
57
59
|
this.queryBus = null;
|
|
58
|
-
this.actorFactories = new Map();
|
|
59
60
|
this.commandRegistry = new Map();
|
|
60
61
|
this.commandDiscovery = null;
|
|
61
62
|
}
|
|
@@ -86,32 +87,20 @@ let HandlerExecutor = HandlerExecutor_1 = class HandlerExecutor {
|
|
|
86
87
|
this.discoverCqrsHandlers();
|
|
87
88
|
}
|
|
88
89
|
discoverCqrsHandlers() {
|
|
89
|
-
const COMMAND_HANDLER_METADATA = '__commandHandler__';
|
|
90
|
-
const QUERY_HANDLER_METADATA = '__queryHandler__';
|
|
91
|
-
let commandCount = 0;
|
|
92
|
-
let queryCount = 0;
|
|
93
90
|
const providers = this.discoveryService.getProviders();
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
if (!
|
|
97
|
-
|
|
98
|
-
const commandClass = Reflect.getMetadata(COMMAND_HANDLER_METADATA, metatype);
|
|
99
|
-
if (commandClass && typeof commandClass === 'function') {
|
|
100
|
-
if (!this.commandRegistry.has(commandClass.name)) {
|
|
101
|
-
this.registerCommand(commandClass.name, commandClass, false);
|
|
102
|
-
commandCount++;
|
|
103
|
-
}
|
|
91
|
+
const { commands, queries } = (0, utils_2.discoverCqrsClasses)(providers);
|
|
92
|
+
for (const [name, cls] of commands) {
|
|
93
|
+
if (!this.commandRegistry.has(name)) {
|
|
94
|
+
this.registerCommand(name, cls, false);
|
|
104
95
|
}
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
queryCount++;
|
|
110
|
-
}
|
|
96
|
+
}
|
|
97
|
+
for (const [name, cls] of queries) {
|
|
98
|
+
if (!this.commandRegistry.has(name)) {
|
|
99
|
+
this.registerCommand(name, cls, true);
|
|
111
100
|
}
|
|
112
101
|
}
|
|
113
|
-
if (
|
|
114
|
-
this.logger.log(`Auto-discovered ${
|
|
102
|
+
if (commands.size > 0 || queries.size > 0) {
|
|
103
|
+
this.logger.log(`Auto-discovered ${commands.size} CQRS commands and ${queries.size} queries`);
|
|
115
104
|
}
|
|
116
105
|
}
|
|
117
106
|
setCommandBus(bus) {
|
|
@@ -123,44 +112,18 @@ let HandlerExecutor = HandlerExecutor_1 = class HandlerExecutor {
|
|
|
123
112
|
setCommandDiscovery(discovery) {
|
|
124
113
|
this.commandDiscovery = discovery;
|
|
125
114
|
}
|
|
126
|
-
registerActor(entityType, actorInstance, handlers) {
|
|
127
|
-
this.actorFactories.set(entityType, {
|
|
128
|
-
create: () => actorInstance,
|
|
129
|
-
handlers,
|
|
130
|
-
});
|
|
131
|
-
}
|
|
132
115
|
registerCommand(className, targetClass, isQuery) {
|
|
133
116
|
this.commandRegistry.set(className, { targetClass, isQuery });
|
|
134
117
|
}
|
|
135
118
|
canHandle(entityType, messageName) {
|
|
136
|
-
// 1. Actor handler
|
|
137
|
-
const actorEntry = this.actorFactories.get(entityType);
|
|
138
|
-
if (actorEntry && actorEntry.handlers.has(messageName))
|
|
139
|
-
return true;
|
|
140
|
-
// 2. CommandDiscovery (@JobCommand / @JobQuery)
|
|
141
119
|
if (this.commandDiscovery?.hasHandler(messageName, entityType))
|
|
142
120
|
return true;
|
|
143
|
-
// 3. QueueBus static registry
|
|
144
|
-
if (this.commandRegistry.has(messageName))
|
|
145
|
-
return true;
|
|
146
|
-
// 4. CQRS auto-discovered handlers
|
|
147
121
|
if (this.commandRegistry.has(messageName))
|
|
148
122
|
return true;
|
|
149
123
|
return false;
|
|
150
124
|
}
|
|
151
125
|
async execute(message, entityKey) {
|
|
152
126
|
const { name, data, entityType, entityId } = message;
|
|
153
|
-
// 1. Try actor handler
|
|
154
|
-
const actorEntry = this.actorFactories.get(entityType);
|
|
155
|
-
if (actorEntry) {
|
|
156
|
-
const methodName = actorEntry.handlers.get(name);
|
|
157
|
-
if (methodName) {
|
|
158
|
-
const actor = actorEntry.create();
|
|
159
|
-
const msgInstance = { ...data };
|
|
160
|
-
return actor[methodName](msgInstance);
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
// 2. Try CommandDiscovery (@JobCommand / @JobQuery)
|
|
164
127
|
if (this.commandDiscovery) {
|
|
165
128
|
const fakeJob = { name, data, id: message.id };
|
|
166
129
|
const result = await this.commandDiscovery.executeJob(fakeJob, entityId, entityType);
|
|
@@ -168,11 +131,13 @@ let HandlerExecutor = HandlerExecutor_1 = class HandlerExecutor {
|
|
|
168
131
|
return result;
|
|
169
132
|
}
|
|
170
133
|
}
|
|
171
|
-
// 3. Try QueueBus registry
|
|
172
134
|
const registryEntry = this.commandRegistry.get(name);
|
|
173
135
|
if (registryEntry) {
|
|
174
136
|
const { targetClass, isQuery } = registryEntry;
|
|
175
|
-
const
|
|
137
|
+
const Ctor = targetClass;
|
|
138
|
+
const paramNames = this.getParamNames(Ctor);
|
|
139
|
+
const args = paramNames.length > 0 ? paramNames.map((p) => data[p]) : [];
|
|
140
|
+
const instance = args.length > 0 ? new Ctor(...args) : Object.assign(new Ctor(), data);
|
|
176
141
|
if (isQuery) {
|
|
177
142
|
if (!this.queryBus) {
|
|
178
143
|
this.logger.error(`QueryBus not set. Cannot execute query ${name}.`);
|
|
@@ -191,6 +156,9 @@ let HandlerExecutor = HandlerExecutor_1 = class HandlerExecutor {
|
|
|
191
156
|
this.logger.warn(`No handler found for message '${name}' on entity type '${entityType}'`);
|
|
192
157
|
return null;
|
|
193
158
|
}
|
|
159
|
+
getParamNames(ctor) {
|
|
160
|
+
return (0, utils_1.getConstructorParamNames)(ctor);
|
|
161
|
+
}
|
|
194
162
|
};
|
|
195
163
|
exports.HandlerExecutor = HandlerExecutor;
|
|
196
164
|
exports.HandlerExecutor = HandlerExecutor = HandlerExecutor_1 = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler-executor.service.js","sourceRoot":"","sources":["../../../src/services/handler-executor/handler-executor.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAwE;AACxE,uCAA2D;AAE3D,4DAA+D;
|
|
1
|
+
{"version":3,"file":"handler-executor.service.js","sourceRoot":"","sources":["../../../src/services/handler-executor/handler-executor.service.ts"],"names":[],"mappings":"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"}
|
package/dist/services/index.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ export * from './gate';
|
|
|
4
4
|
export * from './scheduler';
|
|
5
5
|
export * from './executor-pool';
|
|
6
6
|
export * from './handler-executor';
|
|
7
|
-
export * from './
|
|
7
|
+
export * from './entity-type-registry';
|
|
8
8
|
export * from './actor-system';
|
|
9
9
|
export * from './queue-bus';
|
|
10
10
|
export * from './command-discovery';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC"}
|
package/dist/services/index.js
CHANGED
|
@@ -20,7 +20,7 @@ __exportStar(require("./gate"), exports);
|
|
|
20
20
|
__exportStar(require("./scheduler"), exports);
|
|
21
21
|
__exportStar(require("./executor-pool"), exports);
|
|
22
22
|
__exportStar(require("./handler-executor"), exports);
|
|
23
|
-
__exportStar(require("./
|
|
23
|
+
__exportStar(require("./entity-type-registry"), exports);
|
|
24
24
|
__exportStar(require("./actor-system"), exports);
|
|
25
25
|
__exportStar(require("./queue-bus"), exports);
|
|
26
26
|
__exportStar(require("./command-discovery"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,wCAAsB;AACtB,yCAAuB;AACvB,8CAA4B;AAC5B,kDAAgC;AAChC,qDAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,wCAAsB;AACtB,yCAAuB;AACvB,8CAA4B;AAC5B,kDAAgC;AAChC,qDAAmC;AACnC,yDAAuC;AACvC,iDAA+B;AAC/B,8CAA4B;AAC5B,sDAAoC;AACpC,6CAA2B;AAC3B,qDAAmC;AACnC,6CAA2B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.service.d.ts","sourceRoot":"","sources":["../../../src/services/log/log.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAI7E,qBACa,UAAU;IAKU,OAAO,CAAC,QAAQ,CAAC,KAAK;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IALvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+B;IACtD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBAGa,KAAK,EAAE,KAAK,EACX,MAAM,EAAE,yBAAyB;IAKlF,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAIpC,cAAc,IAAI,MAAM;IAIxB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAItC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC;IAcvE,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAO9D,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK1C,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3C,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7C,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"log.service.d.ts","sourceRoot":"","sources":["../../../src/services/log/log.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAI7E,qBACa,UAAU;IAKU,OAAO,CAAC,QAAQ,CAAC,KAAK;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IALvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+B;IACtD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBAGa,KAAK,EAAE,KAAK,EACX,MAAM,EAAE,yBAAyB;IAKlF,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAIpC,cAAc,IAAI,MAAM;IAIxB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAItC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC;IAcvE,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAO9D,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK1C,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3C,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7C,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAc1E,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,SAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAM9E,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;CAGpC"}
|
|
@@ -76,7 +76,7 @@ let LogService = LogService_1 = class LogService {
|
|
|
76
76
|
async getDeadLetters(entityType, limit = 100) {
|
|
77
77
|
const deadKey = this.getDeadLetterKey(entityType);
|
|
78
78
|
const raw = await this.redis.lrange(deadKey, 0, limit - 1);
|
|
79
|
-
return raw.map(r => JSON.parse(r));
|
|
79
|
+
return raw.map((r) => JSON.parse(r));
|
|
80
80
|
}
|
|
81
81
|
async readyCount() {
|
|
82
82
|
return this.redis.scard(this.getReadySetKey());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.service.js","sourceRoot":"","sources":["../../../src/services/log/log.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,sDAA4B;AAE5B,uCAA+C;AAC/C,4CAAyE;AAGlE,IAAM,UAAU,kBAAhB,MAAM,UAAU;IAIrB,YAC+B,KAA6B,EAC5B,MAAkD;QADlC,UAAK,GAAL,KAAK,CAAO;QACX,WAAM,GAAN,MAAM,CAA2B;QALjE,WAAM,GAAG,IAAI,eAAM,CAAC,YAAU,CAAC,IAAI,CAAC,CAAC;QAOpD,IAAI,CAAC,SAAS,GAAG,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,SAAS,CAAC,SAAiB;QACzB,OAAO,GAAG,IAAI,CAAC,SAAS,QAAQ,SAAS,EAAE,CAAC;IAC9C,CAAC;IAED,cAAc;QACZ,OAAO,GAAG,IAAI,CAAC,SAAS,QAAQ,CAAC;IACnC,CAAC;IAED,gBAAgB,CAAC,UAAkB;QACjC,OAAO,GAAG,IAAI,CAAC,SAAS,SAAS,UAAU,EAAE,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,SAAiB,EAAE,OAA2B;QACzD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAEvC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QACvC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QAChD,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAEtC,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"log.service.js","sourceRoot":"","sources":["../../../src/services/log/log.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,5 +73,5 @@ export type TypedEnqueue<TMap> = <E extends keyof TMap & string, M extends keyof
|
|
|
73
73
|
* // balance is typed as ReplyMap['account']['GetBalanceQuery']
|
|
74
74
|
* ```
|
|
75
75
|
*/
|
|
76
|
-
export type TypedEnqueueAndWait<TMap, TReplyMap = Record<string, Record<string, any>>> = <E extends keyof TMap & string, M extends keyof TMap[E] & string>(entityType: E, messageName: M, entityId: string, data: TMap[E][M], timeout?: number) => Promise<E extends keyof TReplyMap ? M extends keyof TReplyMap[E] ? TReplyMap[E][M] : any : any>;
|
|
76
|
+
export type TypedEnqueueAndWait<TMap, TReplyMap = Record<string, Record<string, any>>> = <E extends keyof TMap & string, M extends keyof TMap[E] & string>(entityType: E, messageName: M, entityId: string, data: TMap[E][M], timeout?: number) => Promise<E extends keyof TReplyMap ? (M extends keyof TReplyMap[E] ? TReplyMap[E][M] : any) : any>;
|
|
77
77
|
//# sourceMappingURL=cluster-contracts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cluster-contracts.d.ts","sourceRoot":"","sources":["../../../src/services/queue-bus/cluster-contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAM3C,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClC,MAAM,EAAE,aAAa,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B;AAED,qBAAa,gBAAgB;IAGf,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAFrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;gBAE3B,QAAQ,EAAE,gBAAgB;IAOvD,kDAAkD;IAClD,WAAW,IAAI,MAAM,EAAE;IAIvB,qDAAqD;IACrD,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAItC,iEAAiE;IACjE,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI;IAkBjD,yDAAyD;IACzD,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE;IAMzC,kDAAkD;IAClD,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAM9E,gDAAgD;IAChD,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAMnF,gEAAgE;IAChE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;IAMzD,8DAA8D;IAC9D,GAAG,IAAI,cAAc,EAAE;IAIvB,mCAAmC;IACnC,GAAG,IAAI,gBAAgB;IAIvB,sDAAsD;IACtD,QAAQ,IAAI,MAAM;
|
|
1
|
+
{"version":3,"file":"cluster-contracts.d.ts","sourceRoot":"","sources":["../../../src/services/queue-bus/cluster-contracts.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,7 @@ class ClusterContracts {
|
|
|
65
65
|
}
|
|
66
66
|
/** All entities with their messages as structured objects. */
|
|
67
67
|
all() {
|
|
68
|
-
return this.entityTypes().map(et => this.entity(et));
|
|
68
|
+
return this.entityTypes().map((et) => this.entity(et));
|
|
69
69
|
}
|
|
70
70
|
/** The raw snapshot from Redis. */
|
|
71
71
|
raw() {
|
|
@@ -81,7 +81,7 @@ class ClusterContracts {
|
|
|
81
81
|
for (const msg of entity.messages) {
|
|
82
82
|
const tag = msg.kind === 'query' ? 'query' : 'cmd';
|
|
83
83
|
const fieldList = msg.fields.length > 0
|
|
84
|
-
? msg.fields.map(f => `${f.name}${f.required ? '' : '?'}: ${f.type}`).join(', ')
|
|
84
|
+
? msg.fields.map((f) => `${f.name}${f.required ? '' : '?'}: ${f.type}`).join(', ')
|
|
85
85
|
: 'untyped';
|
|
86
86
|
lines.push(` [${tag}] ${msg.name}({ ${fieldList} })`);
|
|
87
87
|
}
|
|
@@ -105,14 +105,21 @@ function jsonSchemaTypeLabel(schema) {
|
|
|
105
105
|
if (!schema.type)
|
|
106
106
|
return 'any';
|
|
107
107
|
switch (schema.type) {
|
|
108
|
-
case 'string':
|
|
108
|
+
case 'string':
|
|
109
|
+
return schema.enum ? schema.enum.map((v) => `"${v}"`).join(' | ') : 'string';
|
|
109
110
|
case 'number':
|
|
110
|
-
case 'integer':
|
|
111
|
-
|
|
112
|
-
case '
|
|
113
|
-
|
|
114
|
-
case '
|
|
115
|
-
|
|
111
|
+
case 'integer':
|
|
112
|
+
return 'number';
|
|
113
|
+
case 'boolean':
|
|
114
|
+
return 'boolean';
|
|
115
|
+
case 'array':
|
|
116
|
+
return schema.items ? `${jsonSchemaTypeLabel(schema.items)}[]` : 'any[]';
|
|
117
|
+
case 'object':
|
|
118
|
+
return 'object';
|
|
119
|
+
case 'null':
|
|
120
|
+
return 'null';
|
|
121
|
+
default:
|
|
122
|
+
return 'any';
|
|
116
123
|
}
|
|
117
124
|
}
|
|
118
125
|
//# sourceMappingURL=cluster-contracts.js.map
|