@zeeshan60/event-processor 1.0.21 → 1.0.23
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/BaseEventHandler.d.ts +0 -5
- package/dist/BaseEventHandler.d.ts.map +1 -1
- package/dist/BaseEventHandler.js +0 -13
- package/dist/BaseEventHandler.js.map +1 -1
- package/dist/FriendEventHandler.d.ts +2 -4
- package/dist/FriendEventHandler.d.ts.map +1 -1
- package/dist/FriendEventHandler.js +4 -86
- package/dist/FriendEventHandler.js.map +1 -1
- package/dist/TransactionEventHandler.d.ts +0 -1
- package/dist/TransactionEventHandler.d.ts.map +1 -1
- package/dist/TransactionEventHandler.js +26 -57
- package/dist/TransactionEventHandler.js.map +1 -1
- package/dist/UserEventHandler.d.ts +0 -1
- package/dist/UserEventHandler.d.ts.map +1 -1
- package/dist/UserEventHandler.js +9 -52
- package/dist/UserEventHandler.js.map +1 -1
- package/dist/index.d.ts +0 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -6
- package/dist/index.js.map +1 -1
- package/dist/utils/tryLater.js +1 -1
- package/dist/utils/tryLater.js.map +1 -1
- package/package.json +1 -1
|
@@ -12,10 +12,5 @@ export declare abstract class BaseEventHandler<T extends Event> {
|
|
|
12
12
|
abstract handleClientEventsFromRemoteListenerBulk(events: T[]): Promise<void>;
|
|
13
13
|
abstract getModelStore(): ModelStore;
|
|
14
14
|
protected shouldSkipSave(existingModel: Model | undefined, updatedModel: Model): boolean;
|
|
15
|
-
protected shouldTryLater(existingModel: Model | undefined, updatedModel: Model): {
|
|
16
|
-
shouldRetry: boolean;
|
|
17
|
-
delayMs: number;
|
|
18
|
-
versionGap: number;
|
|
19
|
-
};
|
|
20
15
|
}
|
|
21
16
|
//# sourceMappingURL=BaseEventHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseEventHandler.d.ts","sourceRoot":"","sources":["../src/BaseEventHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,8BAAsB,gBAAgB,CAAC,CAAC,SAAS,KAAK;IAClD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IACrC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;gBAE/C,QAAQ,EAAE,OAAO,EAAE,kBAAkB,CAAC,EAAE,kBAAkB;IAKtE,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC;IACtE,QAAQ,CAAC,mCAAmC,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IACrE,QAAQ,CAAC,wCAAwC,CAC7C,MAAM,EAAE,CAAC,EAAE,GACZ,OAAO,CAAC,IAAI,CAAC;IAChB,QAAQ,CAAC,aAAa,IAAI,UAAU;IAEpC,SAAS,CAAC,cAAc,CACpB,aAAa,EAAE,KAAK,GAAG,SAAS,EAChC,YAAY,EAAE,KAAK,GACpB,OAAO;
|
|
1
|
+
{"version":3,"file":"BaseEventHandler.d.ts","sourceRoot":"","sources":["../src/BaseEventHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,8BAAsB,gBAAgB,CAAC,CAAC,SAAS,KAAK;IAClD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IACrC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;gBAE/C,QAAQ,EAAE,OAAO,EAAE,kBAAkB,CAAC,EAAE,kBAAkB;IAKtE,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC;IACtE,QAAQ,CAAC,mCAAmC,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IACrE,QAAQ,CAAC,wCAAwC,CAC7C,MAAM,EAAE,CAAC,EAAE,GACZ,OAAO,CAAC,IAAI,CAAC;IAChB,QAAQ,CAAC,aAAa,IAAI,UAAU;IAEpC,SAAS,CAAC,cAAc,CACpB,aAAa,EAAE,KAAK,GAAG,SAAS,EAChC,YAAY,EAAE,KAAK,GACpB,OAAO;CASb"}
|
package/dist/BaseEventHandler.js
CHANGED
|
@@ -13,19 +13,6 @@ class BaseEventHandler {
|
|
|
13
13
|
return (existingModel.streamId === updatedModel.streamId &&
|
|
14
14
|
existingModel.version >= updatedModel.version);
|
|
15
15
|
}
|
|
16
|
-
shouldTryLater(existingModel, updatedModel) {
|
|
17
|
-
if (!existingModel) {
|
|
18
|
-
return { shouldRetry: false, delayMs: 0, versionGap: 0 };
|
|
19
|
-
}
|
|
20
|
-
const expectedVersion = existingModel.version + 1;
|
|
21
|
-
const receivedVersion = updatedModel.version;
|
|
22
|
-
if (receivedVersion <= expectedVersion) {
|
|
23
|
-
return { shouldRetry: false, delayMs: 0, versionGap: 0 };
|
|
24
|
-
}
|
|
25
|
-
const versionGap = receivedVersion - existingModel.version;
|
|
26
|
-
const delayMs = versionGap * 50;
|
|
27
|
-
return { shouldRetry: true, delayMs, versionGap };
|
|
28
|
-
}
|
|
29
16
|
}
|
|
30
17
|
exports.BaseEventHandler = BaseEventHandler;
|
|
31
18
|
//# sourceMappingURL=BaseEventHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseEventHandler.js","sourceRoot":"","sources":["../src/BaseEventHandler.ts"],"names":[],"mappings":";;;AAMA,MAAsB,gBAAgB;IAIlC,YAAY,QAAiB,EAAE,kBAAuC;QAClE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IACjD,CAAC;IASS,cAAc,CACpB,aAAgC,EAChC,YAAmB;QAEnB,IAAI,CAAC,aAAa,EAAE,CAAC;YACjB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,CACH,aAAa,CAAC,QAAQ,KAAK,YAAY,CAAC,QAAQ;YAChD,aAAa,CAAC,OAAO,IAAI,YAAY,CAAC,OAAO,CAChD,CAAC;IACN,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseEventHandler.js","sourceRoot":"","sources":["../src/BaseEventHandler.ts"],"names":[],"mappings":";;;AAMA,MAAsB,gBAAgB;IAIlC,YAAY,QAAiB,EAAE,kBAAuC;QAClE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IACjD,CAAC;IASS,cAAc,CACpB,aAAgC,EAChC,YAAmB;QAEnB,IAAI,CAAC,aAAa,EAAE,CAAC;YACjB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,CACH,aAAa,CAAC,QAAQ,KAAK,YAAY,CAAC,QAAQ;YAChD,aAAa,CAAC,OAAO,IAAI,YAAY,CAAC,OAAO,CAChD,CAAC;IACN,CAAC;CACJ;AA5BD,4CA4BC"}
|
|
@@ -13,10 +13,8 @@ export declare class FriendEventHandler extends BaseEventHandler<FriendEvent> {
|
|
|
13
13
|
handleClientEventFromRemoteListener(event: FriendEvent): Promise<void>;
|
|
14
14
|
handleClientEventsFromRemoteListenerBulk(events: FriendEvent[]): Promise<void>;
|
|
15
15
|
handleEvent(event: FriendEvent, context?: import("./common/LoggingContext").LoggingContext): Promise<void>;
|
|
16
|
-
handleFriendCreated(event: FriendCreated
|
|
17
|
-
|
|
18
|
-
handleGenericFriendEvent(event: FriendEvent, context?: import("./common/LoggingContext").LoggingContext): Promise<void>;
|
|
19
|
-
private _handleGenericFriendEventWithRetryCheck;
|
|
16
|
+
handleFriendCreated(event: FriendCreated): Promise<void>;
|
|
17
|
+
handleGenericFriendEvent(event: FriendEvent): Promise<void>;
|
|
20
18
|
handleFriendCreatedOnBackend(event: FriendCreated): Promise<void>;
|
|
21
19
|
private handleFriendCreatedServer;
|
|
22
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FriendEventHandler.d.ts","sourceRoot":"","sources":["../src/FriendEventHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,aAAa,EACb,WAAW,EACX,gBAAgB,EAGhB,gBAAgB,EAGhB,cAAc,EAEd,cAAc,EACjB,MAAM,GAAG,CAAC;AACX,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"FriendEventHandler.d.ts","sourceRoot":"","sources":["../src/FriendEventHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,aAAa,EACb,WAAW,EACX,gBAAgB,EAGhB,gBAAgB,EAGhB,cAAc,EAEd,cAAc,EACjB,MAAM,GAAG,CAAC;AACX,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,qBAAa,kBAAmB,SAAQ,gBAAgB,CAAC,WAAW,CAAC;IAE7D,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,cAAc;IAGtB,OAAO,CAAC,oBAAoB,CAAC;gBANrB,UAAU,EAAE,gBAAgB,EAC5B,cAAc,EAAE,cAAc,EAC9B,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,cAAc,EACtC,QAAQ,EAAE,OAAO,EACjB,kBAAkB,CAAC,EAAE,kBAAkB,EAC/B,oBAAoB,CAAC,EAAE,oBAAoB,YAAA;IAKhD,aAAa,IAAI,gBAAgB;IAI3B,mCAAmC,CAC5C,KAAK,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC;IAWH,wCAAwC,CACjD,MAAM,EAAE,WAAW,EAAE,GACtB,OAAO,CAAC,IAAI,CAAC;IAqBV,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO,yBAAyB,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAW1G,mBAAmB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BxD,wBAAwB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB3D,4BAA4B,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;YAYzD,yBAAyB;CA4I1C"}
|
|
@@ -4,8 +4,6 @@ exports.FriendEventHandler = void 0;
|
|
|
4
4
|
const _1 = require(".");
|
|
5
5
|
const BaseEventHandler_1 = require("./BaseEventHandler");
|
|
6
6
|
const uuid_1 = require("uuid");
|
|
7
|
-
const tryLater_1 = require("./utils/tryLater");
|
|
8
|
-
const RetryError_1 = require("./errors/RetryError");
|
|
9
7
|
class FriendEventHandler extends BaseEventHandler_1.BaseEventHandler {
|
|
10
8
|
constructor(modelStore, userModelStore, friendEventStore, userEventStore, isClient, modelChangeEmitter, activityEventHandler) {
|
|
11
9
|
super(isClient, modelChangeEmitter);
|
|
@@ -46,57 +44,17 @@ class FriendEventHandler extends BaseEventHandler_1.BaseEventHandler {
|
|
|
46
44
|
const eventType = event.constructor.name;
|
|
47
45
|
switch (eventType) {
|
|
48
46
|
case "FriendCreated":
|
|
49
|
-
return await this.handleFriendCreated(event
|
|
47
|
+
return await this.handleFriendCreated(event);
|
|
50
48
|
default:
|
|
51
|
-
return await this.handleGenericFriendEvent(event
|
|
49
|
+
return await this.handleGenericFriendEvent(event);
|
|
52
50
|
}
|
|
53
51
|
}
|
|
54
|
-
async handleFriendCreated(event
|
|
55
|
-
const maxRetries = 3;
|
|
56
|
-
for (let attempt = 1; attempt <= maxRetries; attempt++) {
|
|
57
|
-
try {
|
|
58
|
-
return await this._handleFriendCreatedWithRetryCheck(event, context, attempt);
|
|
59
|
-
}
|
|
60
|
-
catch (error) {
|
|
61
|
-
if (error instanceof RetryError_1.RetryError && attempt < maxRetries) {
|
|
62
|
-
continue;
|
|
63
|
-
}
|
|
64
|
-
throw error;
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
throw new Error("Max retries exhausted");
|
|
68
|
-
}
|
|
69
|
-
async _handleFriendCreatedWithRetryCheck(event, context, attempt) {
|
|
52
|
+
async handleFriendCreated(event) {
|
|
70
53
|
const existingModel = await this.modelStore.getByStreamIdWhereDeletedIsFalse(event.streamId);
|
|
71
54
|
const updatedModel = event.apply(existingModel);
|
|
72
55
|
if (this.shouldSkipSave(existingModel, updatedModel)) {
|
|
73
56
|
return;
|
|
74
57
|
}
|
|
75
|
-
const retryCheck = this.shouldTryLater(existingModel, updatedModel);
|
|
76
|
-
if (retryCheck.shouldRetry) {
|
|
77
|
-
context?.logger?.info("[FriendEventHandler] Version gap detected", {
|
|
78
|
-
requestId: context?.requestId,
|
|
79
|
-
eventType: "FriendCreated",
|
|
80
|
-
streamId: event.streamId,
|
|
81
|
-
existingVersion: existingModel?.version,
|
|
82
|
-
eventVersion: updatedModel.version,
|
|
83
|
-
versionGap: retryCheck.versionGap,
|
|
84
|
-
delayMs: retryCheck.delayMs,
|
|
85
|
-
attempt,
|
|
86
|
-
});
|
|
87
|
-
await (0, tryLater_1.tryLater)({
|
|
88
|
-
shouldRetry: true,
|
|
89
|
-
delayMs: retryCheck.delayMs,
|
|
90
|
-
versionGap: retryCheck.versionGap,
|
|
91
|
-
maxRetries: 3,
|
|
92
|
-
currentAttempt: attempt,
|
|
93
|
-
context,
|
|
94
|
-
logContext: {
|
|
95
|
-
eventType: "FriendCreated",
|
|
96
|
-
streamId: event.streamId,
|
|
97
|
-
},
|
|
98
|
-
});
|
|
99
|
-
}
|
|
100
58
|
await this.modelStore.save(updatedModel);
|
|
101
59
|
if (this.isClient) {
|
|
102
60
|
await this.friendEventStore.addEvent(event);
|
|
@@ -109,52 +67,12 @@ class FriendEventHandler extends BaseEventHandler_1.BaseEventHandler {
|
|
|
109
67
|
await this.handleFriendCreatedServer(event, updatedModel);
|
|
110
68
|
}
|
|
111
69
|
}
|
|
112
|
-
async handleGenericFriendEvent(event
|
|
113
|
-
const maxRetries = 3;
|
|
114
|
-
for (let attempt = 1; attempt <= maxRetries; attempt++) {
|
|
115
|
-
try {
|
|
116
|
-
return await this._handleGenericFriendEventWithRetryCheck(event, context, attempt);
|
|
117
|
-
}
|
|
118
|
-
catch (error) {
|
|
119
|
-
if (error instanceof RetryError_1.RetryError && attempt < maxRetries) {
|
|
120
|
-
continue;
|
|
121
|
-
}
|
|
122
|
-
throw error;
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
throw new Error("Max retries exhausted");
|
|
126
|
-
}
|
|
127
|
-
async _handleGenericFriendEventWithRetryCheck(event, context, attempt) {
|
|
70
|
+
async handleGenericFriendEvent(event) {
|
|
128
71
|
const existingModel = await this.modelStore.getByStreamIdWhereDeletedIsFalse(event.streamId);
|
|
129
72
|
const updatedModel = event.apply(existingModel);
|
|
130
73
|
if (this.shouldSkipSave(existingModel, updatedModel)) {
|
|
131
74
|
return;
|
|
132
75
|
}
|
|
133
|
-
const retryCheck = this.shouldTryLater(existingModel, updatedModel);
|
|
134
|
-
if (retryCheck.shouldRetry) {
|
|
135
|
-
context?.logger?.info("[FriendEventHandler] Version gap detected", {
|
|
136
|
-
requestId: context?.requestId,
|
|
137
|
-
eventType: event.constructor.name,
|
|
138
|
-
streamId: event.streamId,
|
|
139
|
-
existingVersion: existingModel?.version,
|
|
140
|
-
eventVersion: updatedModel.version,
|
|
141
|
-
versionGap: retryCheck.versionGap,
|
|
142
|
-
delayMs: retryCheck.delayMs,
|
|
143
|
-
attempt,
|
|
144
|
-
});
|
|
145
|
-
await (0, tryLater_1.tryLater)({
|
|
146
|
-
shouldRetry: true,
|
|
147
|
-
delayMs: retryCheck.delayMs,
|
|
148
|
-
versionGap: retryCheck.versionGap,
|
|
149
|
-
maxRetries: 3,
|
|
150
|
-
currentAttempt: attempt,
|
|
151
|
-
context,
|
|
152
|
-
logContext: {
|
|
153
|
-
eventType: event.constructor.name,
|
|
154
|
-
streamId: event.streamId,
|
|
155
|
-
},
|
|
156
|
-
});
|
|
157
|
-
}
|
|
158
76
|
await this.modelStore.save(updatedModel);
|
|
159
77
|
if (this.isClient) {
|
|
160
78
|
await this.friendEventStore.addEvent(event);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FriendEventHandler.js","sourceRoot":"","sources":["../src/FriendEventHandler.ts"],"names":[],"mappings":";;;AAAA,wBAYW;AACX,yDAAsD;AAEtD,+BAAoC;
|
|
1
|
+
{"version":3,"file":"FriendEventHandler.js","sourceRoot":"","sources":["../src/FriendEventHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,6 @@ export declare class TransactionEventHandler extends BaseEventHandler<Transactio
|
|
|
11
11
|
handleClientEventFromRemoteListener(event: TransactionEvent): Promise<void>;
|
|
12
12
|
handleClientEventsFromRemoteListenerBulk(events: TransactionEvent[]): Promise<void>;
|
|
13
13
|
handleEvent(event: TransactionEvent, context?: import("./common/LoggingContext").LoggingContext): Promise<TransactionModel>;
|
|
14
|
-
private _handleEventWithRetryCheck;
|
|
15
14
|
private createMirrorEvent;
|
|
16
15
|
}
|
|
17
16
|
//# sourceMappingURL=TransactionEventHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransactionEventHandler.d.ts","sourceRoot":"","sources":["../src/TransactionEventHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EASH,gBAAgB,EAChB,qBAAqB,EACrB,gBAAgB,EAChB,qBAAqB,EACxB,MAAM,GAAG,CAAC;AACX,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAM9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"TransactionEventHandler.d.ts","sourceRoot":"","sources":["../src/TransactionEventHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EASH,gBAAgB,EAChB,qBAAqB,EACrB,gBAAgB,EAChB,qBAAqB,EACxB,MAAM,GAAG,CAAC;AACX,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAM9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,qBAAa,uBAAwB,SAAQ,gBAAgB,CAAC,gBAAgB,CAAC;IAEvE,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,oBAAoB,CAAC;gBAJrB,UAAU,EAAE,qBAAqB,EACjC,UAAU,EAAE,qBAAqB,EACzC,QAAQ,EAAE,OAAO,EACjB,kBAAkB,CAAC,EAAE,kBAAkB,EAC/B,oBAAoB,CAAC,EAAE,oBAAoB,YAAA;IAKhD,aAAa,IAAI,qBAAqB;IAIhC,mCAAmC,CAC5C,KAAK,EAAE,gBAAgB,GACxB,OAAO,CAAC,IAAI,CAAC;IAWH,wCAAwC,CACjD,MAAM,EAAE,gBAAgB,EAAE,GAC3B,OAAO,CAAC,IAAI,CAAC;IAqBV,WAAW,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,OAAO,yBAAyB,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAuEnH,iBAAiB;CA0MlC"}
|
|
@@ -5,8 +5,6 @@ const _1 = require(".");
|
|
|
5
5
|
const BaseEventHandler_1 = require("./BaseEventHandler");
|
|
6
6
|
const splitTypeUtils_1 = require("./utils/splitTypeUtils");
|
|
7
7
|
const uuid_1 = require("uuid");
|
|
8
|
-
const tryLater_1 = require("./utils/tryLater");
|
|
9
|
-
const RetryError_1 = require("./errors/RetryError");
|
|
10
8
|
class TransactionEventHandler extends BaseEventHandler_1.BaseEventHandler {
|
|
11
9
|
constructor(modelStore, eventStore, isClient, modelChangeEmitter, activityEventHandler) {
|
|
12
10
|
super(isClient, modelChangeEmitter);
|
|
@@ -42,21 +40,6 @@ class TransactionEventHandler extends BaseEventHandler_1.BaseEventHandler {
|
|
|
42
40
|
}
|
|
43
41
|
}
|
|
44
42
|
async handleEvent(event, context) {
|
|
45
|
-
const maxRetries = 3;
|
|
46
|
-
for (let attempt = 1; attempt <= maxRetries; attempt++) {
|
|
47
|
-
try {
|
|
48
|
-
return await this._handleEventWithRetryCheck(event, context, attempt);
|
|
49
|
-
}
|
|
50
|
-
catch (error) {
|
|
51
|
-
if (error instanceof RetryError_1.RetryError && attempt < maxRetries) {
|
|
52
|
-
continue;
|
|
53
|
-
}
|
|
54
|
-
throw error;
|
|
55
|
-
}
|
|
56
|
-
}
|
|
57
|
-
throw new Error("Max retries exhausted");
|
|
58
|
-
}
|
|
59
|
-
async _handleEventWithRetryCheck(event, context, attempt) {
|
|
60
43
|
const eventType = event.constructor.name;
|
|
61
44
|
const logData = {
|
|
62
45
|
requestId: context?.requestId,
|
|
@@ -65,7 +48,6 @@ class TransactionEventHandler extends BaseEventHandler_1.BaseEventHandler {
|
|
|
65
48
|
version: event.version,
|
|
66
49
|
eventId: event.eventId,
|
|
67
50
|
userId: event.userId,
|
|
68
|
-
attempt,
|
|
69
51
|
};
|
|
70
52
|
context?.logger?.info("[TransactionEventHandler] Starting event processing", logData);
|
|
71
53
|
const existingModel = await this.modelStore.getByStreamIdWhereDeletedIsFalse(event.streamId);
|
|
@@ -75,52 +57,39 @@ class TransactionEventHandler extends BaseEventHandler_1.BaseEventHandler {
|
|
|
75
57
|
existingModelVersion: existingModel?.version,
|
|
76
58
|
});
|
|
77
59
|
const model = event.apply(existingModel);
|
|
78
|
-
|
|
79
|
-
context?.logger?.warn("[TransactionEventHandler] Skipping outdated event", {
|
|
80
|
-
...logData,
|
|
81
|
-
existingVersion: existingModel?.version,
|
|
82
|
-
eventVersion: model.version,
|
|
83
|
-
});
|
|
84
|
-
return model;
|
|
85
|
-
}
|
|
86
|
-
const retryCheck = this.shouldTryLater(existingModel, model);
|
|
87
|
-
if (retryCheck.shouldRetry) {
|
|
88
|
-
context?.logger?.info("[TransactionEventHandler] Version gap detected", {
|
|
89
|
-
...logData,
|
|
90
|
-
existingVersion: existingModel?.version,
|
|
91
|
-
eventVersion: model.version,
|
|
92
|
-
versionGap: retryCheck.versionGap,
|
|
93
|
-
delayMs: retryCheck.delayMs,
|
|
94
|
-
});
|
|
95
|
-
await (0, tryLater_1.tryLater)({
|
|
96
|
-
shouldRetry: true,
|
|
97
|
-
delayMs: retryCheck.delayMs,
|
|
98
|
-
versionGap: retryCheck.versionGap,
|
|
99
|
-
maxRetries: 3,
|
|
100
|
-
currentAttempt: attempt,
|
|
101
|
-
context,
|
|
102
|
-
logContext: logData,
|
|
103
|
-
});
|
|
104
|
-
}
|
|
105
|
-
await this.modelStore.save(model);
|
|
106
|
-
context?.logger?.info("[TransactionEventHandler] Model saved successfully", {
|
|
60
|
+
context?.logger?.info("[TransactionEventHandler] Event applied to model", {
|
|
107
61
|
...logData,
|
|
108
|
-
|
|
109
|
-
|
|
62
|
+
newModelVersion: model.version,
|
|
63
|
+
shouldSkipSave: this.shouldSkipSave(existingModel, model),
|
|
110
64
|
});
|
|
111
|
-
if (this.
|
|
112
|
-
await this.
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
65
|
+
if (!this.shouldSkipSave(existingModel, model)) {
|
|
66
|
+
await this.modelStore.save(model);
|
|
67
|
+
context?.logger?.info("[TransactionEventHandler] Model saved successfully", {
|
|
68
|
+
...logData,
|
|
69
|
+
modelVersion: model.version,
|
|
70
|
+
isClient: this.isClient,
|
|
71
|
+
});
|
|
72
|
+
if (this.isClient) {
|
|
73
|
+
await this.eventStore.addEvent(event);
|
|
74
|
+
this.modelChangeEmitter?.emit("TransactionModel", model);
|
|
75
|
+
if (this.activityEventHandler) {
|
|
76
|
+
await this.activityEventHandler.createActivityLog(event, existingModel, model);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
context?.logger?.info("[TransactionEventHandler] Creating mirror event", {
|
|
81
|
+
...logData,
|
|
82
|
+
recipientUserId: model.recipientUserId,
|
|
83
|
+
});
|
|
84
|
+
await this.createMirrorEvent(event, model, context);
|
|
116
85
|
}
|
|
117
86
|
}
|
|
118
87
|
else {
|
|
119
|
-
context?.logger?.
|
|
88
|
+
context?.logger?.warn("[TransactionEventHandler] Skipping save due to version conflict", {
|
|
120
89
|
...logData,
|
|
121
|
-
|
|
90
|
+
existingVersion: existingModel?.version,
|
|
91
|
+
newVersion: model.version,
|
|
122
92
|
});
|
|
123
|
-
await this.createMirrorEvent(event, model, context);
|
|
124
93
|
}
|
|
125
94
|
context?.logger?.info("[TransactionEventHandler] Event processing completed", logData);
|
|
126
95
|
return model;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransactionEventHandler.js","sourceRoot":"","sources":["../src/TransactionEventHandler.ts"],"names":[],"mappings":";;;AAAA,wBAaW;AACX,yDAAsD;AAEtD,2DAGgC;AAChC,+BAAoC;
|
|
1
|
+
{"version":3,"file":"TransactionEventHandler.js","sourceRoot":"","sources":["../src/TransactionEventHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,6 @@ export declare class UserEventHandler extends BaseEventHandler<UserEvent> {
|
|
|
11
11
|
handleClientEventFromRemoteListener(event: UserEvent): Promise<void>;
|
|
12
12
|
handleClientEventsFromRemoteListenerBulk(events: UserEvent[]): Promise<void>;
|
|
13
13
|
handleEvent(event: UserEvent, context?: import("./common/LoggingContext").LoggingContext): Promise<UserModel>;
|
|
14
|
-
private _handleEventWithRetryCheck;
|
|
15
14
|
handleUserCreatedBackend(event: UserCreated): Promise<UserModel>;
|
|
16
15
|
}
|
|
17
16
|
//# sourceMappingURL=UserEventHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserEventHandler.d.ts","sourceRoot":"","sources":["../src/UserEventHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,WAAW,EACX,SAAS,EACT,cAAc,EACd,SAAS,EACT,cAAc,EACjB,MAAM,GAAG,CAAC;AACX,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"UserEventHandler.d.ts","sourceRoot":"","sources":["../src/UserEventHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,WAAW,EACX,SAAS,EACT,cAAc,EACd,SAAS,EACT,cAAc,EACjB,MAAM,GAAG,CAAC;AACX,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,qBAAa,gBAAiB,SAAQ,gBAAgB,CAAC,SAAS,CAAC;IAEzD,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,oBAAoB,CAAC;gBAJrB,UAAU,EAAE,cAAc,EAC1B,UAAU,EAAE,cAAc,EAClC,QAAQ,EAAE,OAAO,EACjB,kBAAkB,CAAC,EAAE,kBAAkB,EAC/B,oBAAoB,CAAC,EAAE,oBAAoB,YAAA;IAKhD,aAAa,IAAI,cAAc;IAIzB,mCAAmC,CAC5C,KAAK,EAAE,SAAS,GACjB,OAAO,CAAC,IAAI,CAAC;IAWH,wCAAwC,CACjD,MAAM,EAAE,SAAS,EAAE,GACpB,OAAO,CAAC,IAAI,CAAC;IAqBV,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,OAAO,yBAAyB,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC;IA6B7G,wBAAwB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC;CAuDzE"}
|
package/dist/UserEventHandler.js
CHANGED
|
@@ -4,8 +4,6 @@ exports.UserEventHandler = void 0;
|
|
|
4
4
|
const _1 = require(".");
|
|
5
5
|
const BaseEventHandler_1 = require("./BaseEventHandler");
|
|
6
6
|
const uuid_1 = require("uuid");
|
|
7
|
-
const tryLater_1 = require("./utils/tryLater");
|
|
8
|
-
const RetryError_1 = require("./errors/RetryError");
|
|
9
7
|
class UserEventHandler extends BaseEventHandler_1.BaseEventHandler {
|
|
10
8
|
constructor(modelStore, eventStore, isClient, modelChangeEmitter, activityEventHandler) {
|
|
11
9
|
super(isClient, modelChangeEmitter);
|
|
@@ -46,61 +44,20 @@ class UserEventHandler extends BaseEventHandler_1.BaseEventHandler {
|
|
|
46
44
|
return await this.handleUserCreatedBackend(event);
|
|
47
45
|
}
|
|
48
46
|
else {
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
47
|
+
const existingModel = await this.modelStore.getByStreamIdWhereDeletedIsFalse(event.streamId);
|
|
48
|
+
const updatedModel = event.apply(existingModel);
|
|
49
|
+
if (!this.shouldSkipSave(existingModel, updatedModel)) {
|
|
50
|
+
await this.modelStore.save(updatedModel);
|
|
51
|
+
if (this.isClient) {
|
|
52
|
+
await this.eventStore.addEvent(event);
|
|
53
|
+
this.modelChangeEmitter?.emit("UserModel", updatedModel);
|
|
54
|
+
if (this.activityEventHandler) {
|
|
55
|
+
await this.activityEventHandler.createActivityLog(event, existingModel, updatedModel);
|
|
57
56
|
}
|
|
58
|
-
throw error;
|
|
59
57
|
}
|
|
60
58
|
}
|
|
61
|
-
throw new Error("Max retries exhausted");
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
async _handleEventWithRetryCheck(event, context, attempt) {
|
|
65
|
-
const existingModel = await this.modelStore.getByStreamIdWhereDeletedIsFalse(event.streamId);
|
|
66
|
-
const updatedModel = event.apply(existingModel);
|
|
67
|
-
if (this.shouldSkipSave(existingModel, updatedModel)) {
|
|
68
59
|
return updatedModel;
|
|
69
60
|
}
|
|
70
|
-
const retryCheck = this.shouldTryLater(existingModel, updatedModel);
|
|
71
|
-
if (retryCheck.shouldRetry) {
|
|
72
|
-
context?.logger?.info("[UserEventHandler] Version gap detected", {
|
|
73
|
-
requestId: context?.requestId,
|
|
74
|
-
eventType: event.constructor.name,
|
|
75
|
-
streamId: event.streamId,
|
|
76
|
-
existingVersion: existingModel?.version,
|
|
77
|
-
eventVersion: updatedModel.version,
|
|
78
|
-
versionGap: retryCheck.versionGap,
|
|
79
|
-
delayMs: retryCheck.delayMs,
|
|
80
|
-
attempt,
|
|
81
|
-
});
|
|
82
|
-
await (0, tryLater_1.tryLater)({
|
|
83
|
-
shouldRetry: true,
|
|
84
|
-
delayMs: retryCheck.delayMs,
|
|
85
|
-
versionGap: retryCheck.versionGap,
|
|
86
|
-
maxRetries: 3,
|
|
87
|
-
currentAttempt: attempt,
|
|
88
|
-
context,
|
|
89
|
-
logContext: {
|
|
90
|
-
eventType: event.constructor.name,
|
|
91
|
-
streamId: event.streamId,
|
|
92
|
-
},
|
|
93
|
-
});
|
|
94
|
-
}
|
|
95
|
-
await this.modelStore.save(updatedModel);
|
|
96
|
-
if (this.isClient) {
|
|
97
|
-
await this.eventStore.addEvent(event);
|
|
98
|
-
this.modelChangeEmitter?.emit("UserModel", updatedModel);
|
|
99
|
-
if (this.activityEventHandler) {
|
|
100
|
-
await this.activityEventHandler.createActivityLog(event, existingModel, updatedModel);
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
return updatedModel;
|
|
104
61
|
}
|
|
105
62
|
async handleUserCreatedBackend(event) {
|
|
106
63
|
if (this.isClient) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserEventHandler.js","sourceRoot":"","sources":["../src/UserEventHandler.ts"],"names":[],"mappings":";;;AAAA,wBAQW;AACX,yDAAsD;AAEtD,+BAAoC;
|
|
1
|
+
{"version":3,"file":"UserEventHandler.js","sourceRoot":"","sources":["../src/UserEventHandler.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
export * from "./events";
|
|
2
2
|
export { BaseEventHandler } from "./BaseEventHandler";
|
|
3
3
|
export type { LoggingContext } from "./common/LoggingContext";
|
|
4
|
-
export { RetryError } from "./errors/RetryError";
|
|
5
|
-
export { tryLater } from "./utils/tryLater";
|
|
6
|
-
export type { TryLaterOptions } from "./utils/tryLater";
|
|
7
4
|
export { TransactionEvent, UserEvent, FriendEvent, GroupEvent, GroupTransactionEvent, ActivityLogEvent, } from "./common/DomainEvents";
|
|
8
5
|
export { UserController } from "./client/controllers/UserController";
|
|
9
6
|
export { FriendController } from "./client/controllers/FriendController";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,UAAU,CAAC;AAGzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,YAAY,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAG9D,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,UAAU,CAAC;AAGzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,YAAY,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAG9D,OAAO,EACH,gBAAgB,EAChB,SAAS,EACT,WAAW,EACX,UAAU,EACV,qBAAqB,EACrB,gBAAgB,GACnB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAGnF,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,EACH,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,mBAAmB,EACnB,wBAAwB,EACxB,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,EACrB,0BAA0B,EAC1B,oBAAoB,EACpB,+BAA+B,EAC/B,uBAAuB,EACvB,kBAAkB,EAClB,gBAAgB,EAChB,wBAAwB,EACxB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,GACd,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGvE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,YAAY,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAG1D,YAAY,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAGpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -14,17 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.__resetSDKForTesting = exports.EventConverterFactory = exports.CurrencyStore = exports.ModelChangeEmitter = exports.isSDKInitialized = exports.firestoreToEvent = exports.eventToFirestore = exports.getModelChangeObservable = exports.getCurrencyStore = exports.getFirebaseAdapter = exports.getActivityEventHandler = exports.getGroupTransactionEventHandler = exports.getGroupEventHandler = exports.getTransactionEventHandler = exports.getFriendEventHandler = exports.getUserEventHandler = exports.getUIEventHandler = exports.getTransactionController = exports.getFriendController = exports.getUserController = exports.initializeSDK = exports.EventProcessorSDK = exports.UIEventHandler = exports.TransactionController = exports.FriendController = exports.UserController = exports.
|
|
17
|
+
exports.__resetSDKForTesting = exports.EventConverterFactory = exports.CurrencyStore = exports.ModelChangeEmitter = exports.isSDKInitialized = exports.firestoreToEvent = exports.eventToFirestore = exports.getModelChangeObservable = exports.getCurrencyStore = exports.getFirebaseAdapter = exports.getActivityEventHandler = exports.getGroupTransactionEventHandler = exports.getGroupEventHandler = exports.getTransactionEventHandler = exports.getFriendEventHandler = exports.getUserEventHandler = exports.getUIEventHandler = exports.getTransactionController = exports.getFriendController = exports.getUserController = exports.initializeSDK = exports.EventProcessorSDK = exports.UIEventHandler = exports.TransactionController = exports.FriendController = exports.UserController = exports.BaseEventHandler = void 0;
|
|
18
18
|
// Export all backend event definitions here
|
|
19
19
|
__exportStar(require("./events"), exports);
|
|
20
20
|
// Export base event handler interface
|
|
21
21
|
var BaseEventHandler_1 = require("./BaseEventHandler");
|
|
22
22
|
Object.defineProperty(exports, "BaseEventHandler", { enumerable: true, get: function () { return BaseEventHandler_1.BaseEventHandler; } });
|
|
23
|
-
// Export retry utilities
|
|
24
|
-
var RetryError_1 = require("./errors/RetryError");
|
|
25
|
-
Object.defineProperty(exports, "RetryError", { enumerable: true, get: function () { return RetryError_1.RetryError; } });
|
|
26
|
-
var tryLater_1 = require("./utils/tryLater");
|
|
27
|
-
Object.defineProperty(exports, "tryLater", { enumerable: true, get: function () { return tryLater_1.tryLater; } });
|
|
28
23
|
// Export controllers
|
|
29
24
|
var UserController_1 = require("./client/controllers/UserController");
|
|
30
25
|
Object.defineProperty(exports, "UserController", { enumerable: true, get: function () { return UserController_1.UserController; } });
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4CAA4C;AAC5C,2CAAyB;AAEzB,sCAAsC;AACtC,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4CAA4C;AAC5C,2CAAyB;AAEzB,sCAAsC;AACtC,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AAezB,qBAAqB;AACrB,sEAAqE;AAA5D,gHAAA,cAAc,OAAA;AACvB,0EAAyE;AAAhE,oHAAA,gBAAgB,OAAA;AACzB,oFAAmF;AAA1E,8HAAA,qBAAqB,OAAA;AAE9B,yBAAyB;AACzB,mEAAkE;AAAzD,gHAAA,cAAc,OAAA;AAEvB,4BAA4B;AAC5B,yDAoB6B;AAnBzB,sHAAA,iBAAiB,OAAA;AACjB,kHAAA,aAAa,OAAA;AACb,sHAAA,iBAAiB,OAAA;AACjB,wHAAA,mBAAmB,OAAA;AACnB,6HAAA,wBAAwB,OAAA;AACxB,sHAAA,iBAAiB,OAAA;AACjB,wHAAA,mBAAmB,OAAA;AACnB,0HAAA,qBAAqB,OAAA;AACrB,+HAAA,0BAA0B,OAAA;AAC1B,yHAAA,oBAAoB,OAAA;AACpB,oIAAA,+BAA+B,OAAA;AAC/B,4HAAA,uBAAuB,OAAA;AACvB,uHAAA,kBAAkB,OAAA;AAClB,qHAAA,gBAAgB,OAAA;AAChB,6HAAA,wBAAwB,OAAA;AACxB,qHAAA,gBAAgB,OAAA;AAChB,qHAAA,gBAAgB,OAAA;AAChB,qHAAA,gBAAgB,OAAA;AAIpB,4BAA4B;AAC5B,2DAAuE;AAA9D,wHAAA,kBAAkB,OAAA;AAK3B,kCAAkC;AAClC,uDAAsD;AAA7C,8GAAA,aAAa,OAAA;AAKtB,8DAAoE;AAA3D,uHAAA,qBAAqB,OAAA;AAE9B,yCAAyC;AACzC,yDAA2D;AAAlD,yHAAA,oBAAoB,OAAA"}
|
package/dist/utils/tryLater.js
CHANGED
|
@@ -12,7 +12,7 @@ async function tryLater(options) {
|
|
|
12
12
|
if (options.currentAttempt >= options.maxRetries) {
|
|
13
13
|
throw new Error(`Max retries (${options.maxRetries}) exhausted for version gap of ${options.versionGap}`);
|
|
14
14
|
}
|
|
15
|
-
const delayMs = options.currentAttempt === 1 ? options.delayMs :
|
|
15
|
+
const delayMs = options.currentAttempt === 1 ? options.delayMs : 1000;
|
|
16
16
|
options.context?.logger?.info("[tryLater] Retrying after adaptive delay", {
|
|
17
17
|
...options.logContext,
|
|
18
18
|
requestId: options.context?.requestId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tryLater.js","sourceRoot":"","sources":["../../src/utils/tryLater.ts"],"names":[],"mappings":";;AAiBA,4BA6BC;AA9CD,qDAAkD;AAGlD,SAAS,KAAK,CAAC,EAAU;IACrB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC;AAYM,KAAK,UAAU,QAAQ,CAAC,OAAwB;IACnD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACvB,OAAO;IACX,CAAC;IAED,IAAI,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CACX,gBAAgB,OAAO,CAAC,UAAU,kCAAkC,OAAO,CAAC,UAAU,EAAE,CAC3F,CAAC;IACN,CAAC;IAED,MAAM,OAAO,GACT,OAAO,CAAC,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"tryLater.js","sourceRoot":"","sources":["../../src/utils/tryLater.ts"],"names":[],"mappings":";;AAiBA,4BA6BC;AA9CD,qDAAkD;AAGlD,SAAS,KAAK,CAAC,EAAU;IACrB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC;AAYM,KAAK,UAAU,QAAQ,CAAC,OAAwB;IACnD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACvB,OAAO;IACX,CAAC;IAED,IAAI,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CACX,gBAAgB,OAAO,CAAC,UAAU,kCAAkC,OAAO,CAAC,UAAU,EAAE,CAC3F,CAAC;IACN,CAAC;IAED,MAAM,OAAO,GACT,OAAO,CAAC,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAE1D,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,0CAA0C,EAAE;QACtE,GAAG,OAAO,CAAC,UAAU;QACrB,SAAS,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS;QACrC,OAAO,EAAE,OAAO,CAAC,cAAc;QAC/B,OAAO;QACP,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,aAAa,EAAE,OAAO,CAAC,cAAc,KAAK,CAAC;KAC9C,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;IACrB,MAAM,IAAI,uBAAU,CAChB,gCAAgC,EAChC,OAAO,CAAC,UAAU,EAClB,OAAO,CACV,CAAC;AACN,CAAC"}
|