fix: harden multi-instance scheduler and worker execution
This commit is contained in:
1 parent
df7dcd3a9c
commit
60a006008a
23 files changed
+1442
-299
No files matched your search
@@ -16,6 +16,11 @@ export interface StreamReadResult {
|
||||
name: string;
|
||||
}
|
||||
|
||||
export interface ClaimStalePendingStreamMessagesResult {
|
||||
messages: StreamEntry[];
|
||||
nextStartId: string;
|
||||
}
|
||||
|
||||
interface RawStreamMessage {
|
||||
deliveriesCounter?: number;
|
||||
id: string;
|
||||
@@ -29,6 +34,16 @@ interface RawStreamReadResult {
|
||||
}
|
||||
|
||||
function normalizeStreamFields(fields: unknown): Record<string, string> {
|
||||
if (Array.isArray(fields)) {
|
||||
const normalized: Record<string, string> = {};
|
||||
for (let index = 0; index < fields.length; index += 2) {
|
||||
const key = fields[index];
|
||||
if (key === undefined) continue;
|
||||
normalized[String(key)] = String(fields[index + 1] ?? '');
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
if (fields instanceof Map) {
|
||||
return Object.fromEntries(
|
||||
[...fields.entries()].map(([key, value]) => [String(key), String(value)]),
|
||||
@@ -188,6 +203,38 @@ export class RedisService implements OnModuleDestroy {
|
||||
}));
|
||||
}
|
||||
|
||||
public async claimStalePendingStreamMessages(options: {
|
||||
key: string;
|
||||
group: string;
|
||||
consumer: string;
|
||||
stalePendingMessageMinimumIdleMilliseconds: number;
|
||||
startId?: string;
|
||||
count?: number;
|
||||
}): Promise<ClaimStalePendingStreamMessagesResult> {
|
||||
const response = (await this.client.sendCommand([
|
||||
'XAUTOCLAIM',
|
||||
options.key,
|
||||
options.group,
|
||||
options.consumer,
|
||||
String(options.stalePendingMessageMinimumIdleMilliseconds),
|
||||
options.startId ?? '0-0',
|
||||
'COUNT',
|
||||
String(options.count ?? 1),
|
||||
])) as unknown;
|
||||
|
||||
const responseItems = Array.isArray(response) ? response : [];
|
||||
const rawMessages = Array.isArray(responseItems[1])
|
||||
? responseItems[1]
|
||||
: [];
|
||||
|
||||
return {
|
||||
nextStartId: String(responseItems[0] ?? '0-0'),
|
||||
messages: rawMessages
|
||||
.map((rawMessage) => this.normalizeClaimedStreamMessage(rawMessage))
|
||||
.filter((message): message is StreamEntry => Boolean(message)),
|
||||
};
|
||||
}
|
||||
|
||||
public async acknowledgeStream(
|
||||
key: string,
|
||||
group: string,
|
||||
@@ -210,4 +257,37 @@ export class RedisService implements OnModuleDestroy {
|
||||
public async publish(channel: string, message: string): Promise<number> {
|
||||
return this.client.publish(channel, message);
|
||||
}
|
||||
|
||||
private normalizeClaimedStreamMessage(rawMessage: unknown): StreamEntry | null {
|
||||
if (Array.isArray(rawMessage)) {
|
||||
const [id, fields] = rawMessage;
|
||||
if (id === undefined) return null;
|
||||
return {
|
||||
id: String(id),
|
||||
message: normalizeStreamFields(fields),
|
||||
};
|
||||
}
|
||||
|
||||
if (
|
||||
typeof rawMessage === 'object' &&
|
||||
rawMessage !== null &&
|
||||
'id' in rawMessage
|
||||
) {
|
||||
const message = rawMessage as RawStreamMessage;
|
||||
return {
|
||||
deliveriesCounter:
|
||||
typeof message.deliveriesCounter === 'number'
|
||||
? message.deliveriesCounter
|
||||
: undefined,
|
||||
id: String(message.id),
|
||||
message: normalizeStreamFields(message.message),
|
||||
millisElapsedFromDelivery:
|
||||
typeof message.millisElapsedFromDelivery === 'number'
|
||||
? message.millisElapsedFromDelivery
|
||||
: undefined,
|
||||
};
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user