@powerhousedao/reactor-api 6.0.0-dev.235 → 6.0.0-dev.236

package/dist/index.mjs

@@ -31,7 +31,7 @@ import { typeDefs } from "@powerhousedao/document-engineering/graphql";
 import { camelCase, kebabCase, pascalCase } from "change-case";
 import { GraphQLJSONObject } from "graphql-type-json";
 import { setName } from "@powerhousedao/shared/document-model";
-import { PropagationMode as PropagationMode$1, consolidateSyncOperations, driveIdFromUrl, envelopesToSyncOperations, parseDriveUrl, trimMailboxFromAckOrdinal } from "@powerhousedao/reactor";
+import { PropagationMode as PropagationMode$1, consolidateSyncOperations, driveIdFromUrl, envelopesToSyncOperations, parseDriveUrl } from "@powerhousedao/reactor";
 import * as z$1 from "zod";
 import { z } from "zod";
 import { createHandler } from "graphql-sse/lib/use/fetch";
@@ -3184,14 +3184,22 @@ function pollSyncEnvelopes(syncManager, args) {
 		scopes: syncOp.scopes,
 		operationCount: syncOp.operations.length
 	}));
-	if (args.outboxAck > 0) trimMailboxFromAckOrdinal(remote.channel.outbox, args.outboxAck);
-	let operations = remote.channel.outbox.items;
-	operations = operations.filter((syncOp) => {
-		let maxOrdinal = 0;
-		for (const op of syncOp.operations) maxOrdinal = Math.max(maxOrdinal, op.context.ordinal);
-		if (maxOrdinal > args.outboxLatest) return true;
-		return false;
-	});
+	if (args.outboxAck > 0) {
+		const ackOrdinal = args.outboxAck;
+		const outbox = remote.channel.outbox;
+		const toRemove = [];
+		for (const syncOp of outbox.items) {
+			if (!((syncOp.emittedCount ?? 0) >= syncOp.operations.length)) continue;
+			let maxOrdinal = 0;
+			for (const op of syncOp.operations) if (op.context.ordinal > maxOrdinal) maxOrdinal = op.context.ordinal;
+			if (maxOrdinal <= ackOrdinal) toRemove.push(syncOp);
+		}
+		if (toRemove.length > 0) {
+			for (const syncOp of toRemove) syncOp.executed();
+			outbox.remove(...toRemove);
+		}
+	}
+	const operations = remote.channel.outbox.items;
 	if (operations.length === 0) return {
 		envelopes: [],
 		ackOrdinal: remote.channel.inbox.ackOrdinal,
@@ -3210,20 +3218,23 @@ function pollSyncEnvelopes(syncManager, args) {
 			hasMore = true;
 			break;
 		}
-		const unseen = syncOp.operations.filter((op) => op.context.ordinal > args.outboxLatest);
-		if (unseen.length === 0) continue;
+		syncOp.deliveredCount ??= 0;
+		syncOp.emittedCount ??= 0;
+		while (syncOp.deliveredCount < syncOp.emittedCount && syncOp.operations[syncOp.deliveredCount].context.ordinal <= args.outboxLatest) syncOp.deliveredCount += 1;
+		const remaining = syncOp.operations.slice(syncOp.deliveredCount);
+		if (remaining.length === 0) continue;
 		let prevPartKey;
 		let partIdx = 0;
 		let i = 0;
-		while (i < unseen.length) {
+		while (i < remaining.length) {
 			if (pageOps >= 100) {
 				hasMore = true;
 				break outer;
 			}
 			const remainingPage = 100 - pageOps;
-			const chunkSize = Math.max(1, Math.min(25, remainingPage, unseen.length - i));
-			const slice = unseen.slice(i, i + chunkSize);
-			const isOnly = unseen.length <= 25 && unseen.length <= remainingPage;
+			const chunkSize = Math.max(1, Math.min(25, remainingPage, remaining.length - i));
+			const slice = remaining.slice(i, i + chunkSize);
+			const isOnly = remaining.length <= 25 && remaining.length <= remainingPage;
 			const baseKey = syncOp.jobId || void 0;
 			const partKey = isOnly ? baseKey : baseKey ? `${baseKey}__p${partIdx}` : void 0;
 			const partDeps = partIdx === 0 ? syncOp.jobDependencies.filter(Boolean) : prevPartKey ? [prevPartKey] : [];
@@ -3247,7 +3258,9 @@ function pollSyncEnvelopes(syncManager, args) {
 			i += slice.length;
 			prevPartKey = partKey;
 			partIdx++;
-			if (i < unseen.length && pageOps >= 100) {
+			const emittedThrough = syncOp.deliveredCount + i;
+			if (emittedThrough > syncOp.emittedCount) syncOp.emittedCount = emittedThrough;
+			if (i < remaining.length && pageOps >= 100) {
 				hasMore = true;
 				break outer;
 			}
@@ -4900,10 +4913,10 @@ const ADMIN_USERS = getAdminUsers();
 //#endregion
 //#region src/graphql/system/version.ts
 function getVersion() {
-	return "6.0.0-dev.235";
+	return "6.0.0-dev.236";
 }
 function getGitHash() {
-	return "19586d46c40853beb2c2c88e7991f7734804b94b";
+	return "839d5949da4a0211c001b057c9cc1012ea149d7b";
 }
 function getGitUrl() {
 	return buildTreeUrl(getGitHash());