experimental-a2 0.19.0 → 0.20.0

package/dist/{server-D-Y4pqwu.js → server-qyb5aJJG.js}

@@ -1386,7 +1386,10 @@ function createServer(options) {
 		const signal = createDrainSignal();
 		const p = new Promise((resolve) => {
 			queueMicrotask(() => {
-				drainSession(sessionId, watchdogDueAt, signal).then(() => resolve()).catch(() => resolve());
+				drainSession(sessionId, {
+					watchdogDueAt,
+					signal
+				}).then(() => resolve()).catch(() => resolve());
 			});
 		}).finally(() => {
 			if (scheduledDrains.get(sessionId)?.promise === p) scheduledDrains.delete(sessionId);
@@ -2551,7 +2554,7 @@ function createServer(options) {
 			}
 		}));
 	};
-	const drainSession = (sessionId, watchdogDueAt, signal) => telemetry.span("a2.drain", {
+	const drainSession = (sessionId, { watchdogDueAt, signal, handOffFailure = false } = {}) => telemetry.span("a2.drain", {
 		"a2.contract": name,
 		"a2.session_id": sessionId
 	}, async (span) => {
@@ -2671,7 +2674,8 @@ function createServer(options) {
 			}, async (eventSpan) => {
 				let subscription;
 				let handlerSignal = supersedeSignal;
-				let returned;
+				let completion;
+				let completing = false;
 				try {
 					if (registration?.abortOn) {
 						subscription = await subscribeAbort(store, ns, event, registration.abortOn, event.attemptCount);
@@ -2683,7 +2687,25 @@ function createServer(options) {
 						await subscription.close();
 						subscription = void 0;
 					}
-					returned = await returnedEvents(sessionId, event, result);
+					const returned = await returnedEvents(sessionId, event, result);
+					await renewal;
+					completing = true;
+					completion = await telemetry.span("a2.commit", {
+						"a2.contract": name,
+						"a2.session_id": sessionId,
+						"a2.commit.operation": "complete",
+						"a2.commit.index": event.index,
+						"a2.commit.attempt": event.attemptCount
+					}, async (commitSpan) => {
+						const committed = await store.completeAttempt({
+							sessionId: ns,
+							index: event.index,
+							attempt: event.attemptCount,
+							events: returned
+						});
+						commitSpan.setAttribute("a2.commit.outcome", committed.outcome);
+						return committed;
+					});
 				} catch (err) {
 					if (supersedeSignal.aborted && err === supersedeSignal.reason) {
 						eventSpan.setAttribute("a2.event.outcome", "surrendered");
@@ -2693,6 +2715,8 @@ function createServer(options) {
 							appendsEvents: false
 						};
 					}
+					const refused = completing && err instanceof A2Error && err.code === "PARTIAL_DUPLICATE_BATCH";
+					if (completing && !refused) throw err;
 					eventSpan.recordError(err);
 					const failure = await telemetry.span("a2.commit", {
 						"a2.contract": name,
@@ -2706,7 +2730,7 @@ function createServer(options) {
 							index: event.index,
 							attempt: event.attemptCount,
 							error: describeError(err),
-							maxFailures: err instanceof NonRetriableError ? 1 : MAX_FAILURES,
+							maxFailures: err instanceof NonRetriableError || refused ? 1 : MAX_FAILURES,
 							retryAfterMs: failureRetryDelayMs(event.failureCount + 1)
 						});
 						commitSpan.setAttribute("a2.commit.outcome", result.outcome);
@@ -2721,23 +2745,6 @@ function createServer(options) {
 				} finally {
 					await subscription?.close();
 				}
-				await renewal;
-				const completion = await telemetry.span("a2.commit", {
-					"a2.contract": name,
-					"a2.session_id": sessionId,
-					"a2.commit.operation": "complete",
-					"a2.commit.index": event.index,
-					"a2.commit.attempt": event.attemptCount
-				}, async (commitSpan) => {
-					const result = await store.completeAttempt({
-						sessionId: ns,
-						index: event.index,
-						attempt: event.attemptCount,
-						events: returned
-					});
-					commitSpan.setAttribute("a2.commit.outcome", result.outcome);
-					return result;
-				});
 				eventSpan.setAttribute("a2.event.outcome", completion.outcome === "completed" ? "processed" : completion.outcome);
 				if (completion.outcome === "superseded") return {
 					status: "superseded",
@@ -2748,7 +2755,7 @@ function createServer(options) {
 				return {
 					status: "processed",
 					opensLane: event.lane !== null,
-					appendsEvents: returned.length > 0
+					appendsEvents: completion.events.length > 0
 				};
 			});
 		};
@@ -2860,6 +2867,10 @@ function createServer(options) {
 				if (signal) signal.closed = true;
 				break;
 			}
+		} catch (error) {
+			if (!handOffFailure || schedulerArm === void 0) throw error;
+			span.recordError(error);
+			outcome = "failed";
 		} finally {
 			if (signal) signal.closed = true;
 			stopRenewing = true;
@@ -2920,7 +2931,10 @@ function createServer(options) {
 		},
 		schedulerDrain: (sessionId, opts) => {
 			assertSessionId(sessionId);
-			return drainSession(sessionId, opts?.watchdogDueAt);
+			return drainSession(sessionId, {
+				watchdogDueAt: opts?.watchdogDueAt,
+				handOffFailure: true
+			});
 		},
 		schedulerAppend: async (sessionId, events, originIndex) => {
 			if (!scheduler) throw new TypeError("scheduled append delivery requires a configured scheduler adapter");
@@ -3049,4 +3063,4 @@ const stateCacheKey = (sessionId, reducerName) => `${sessionId}\u0000${reducerNa
 //#endregion
 export { CONSOLE_TELEMETRY as a, parsePresenceSibling as c, handler as i, deliverSchedulerAppend as n, setServerFetchHooks as o, deliverSchedulerClear as r, sseResponse as s, createServer as t };
 
-//# sourceMappingURL=server-D-Y4pqwu.js.map
+//# sourceMappingURL=server-qyb5aJJG.js.map