@syncular/server-hono 0.0.6-185 → 0.0.6-201

package/dist/routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAcH,OAAO,KAAK,EACV,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,oBAAoB,EACpB,SAAS,EACT,UAAU,EACV,uBAAuB,EAEvB,cAAc,EACd,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,KAAK,cAAc,EAKnB,KAAK,YAAY,EASlB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,OAAO,EAAqB,MAAM,MAAM,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,OAAO,EAAE,KAAK,MAAM,EAAO,MAAM,QAAQ,CAAC;AAG1C,OAAO,EAGL,KAAK,mBAAmB,EACzB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAIL,0BAA0B,EAC3B,MAAM,MAAM,CAAC;AAQd,MAAM,WAAW,cAAe,SAAQ,cAAc;CAAG;AAEzD;;;;GAIG;AACH,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;OAGG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;CACjC;AAED,MAAM,WAAW,6BAA6B;IAC5C;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;OAGG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC;;;OAGG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC;;;OAGG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC;;;OAGG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;OAEG;IACH,uBAAuB,CAAC,EAAE;QACxB;;;WAGG;QACH,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB;;;;WAIG;QACH,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IACF;;;OAGG;IACH,SAAS,CAAC,EAAE,mBAAmB,GAAG,KAAK,CAAC;IACxC;;OAEG;IACH,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAEhC;;;OAGG;IACH,KAAK,CAAC,EAAE;QACN,2DAA2D;QAC3D,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,iCAAiC;QACjC,OAAO,CAAC,EAAE,YAAY,CAAC;KACxB,CAAC;IAEF;;;OAGG;IACH,OAAO,CAAC,EAAE;QACR,iEAAiE;QACjE,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,0BAA0B;QAC1B,OAAO,CAAC,EAAE,cAAc,CAAC;KAC1B,CAAC;IAEF;;;OAGG;IACH,QAAQ,CAAC,EAAE;QACT,WAAW,EAAE,uBAAuB,CAAC;QACrC,qDAAqD;QACrD,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,MAAM,WAAW,uBAAuB,CACtC,EAAE,SAAS,UAAU,GAAG,UAAU,EAClC,IAAI,SAAS,cAAc,GAAG,cAAc,EAC5C,CAAC,SAAS,SAAS,GAAG,SAAS;IAE/B,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAC9B,QAAQ,EAAE,kBAAkB,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;IACzC,OAAO,CAAC,EAAE,oBAAoB,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;IAC3C,YAAY,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;IACnD,IAAI,CAAC,EAAE,6BAA6B,CAAC;IACrC,mBAAmB,CAAC,EAAE,0BAA0B,CAAC;IACjD;;;;OAIG;IACH,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC;;;OAGG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B;;;OAGG;IACH,kBAAkB,CAAC,EAAE;QACnB,IAAI,CAAC,KAAK,EAAE;YACV,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,GAAG,eAAe,CAAC;YACnD,SAAS,EAAE,MAAM,CAAC;YAClB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SAC/B,GAAG,IAAI,CAAC;KACV,CAAC;IACF;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AA8TD,wBAAgB,gBAAgB,CAC9B,EAAE,SAAS,UAAU,GAAG,UAAU,EAClC,IAAI,SAAS,cAAc,GAAG,cAAc,EAC5C,CAAC,SAAS,SAAS,GAAG,SAAS,EAC/B,OAAO,EAAE,uBAAuB,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CA4yDrD;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,IAAI,GACX,0BAA0B,GAAG,SAAS,CAExC;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,IAAI,GACX,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAE1B"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"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"}

package/dist/routes.js

@@ -7,7 +7,7 @@
  * - GET  /realtime (optional WebSocket "wake up" notifications)
  */
 import { captureSyncException, countSyncMetric, createSyncTimer, distributionSyncMetric, ErrorResponseSchema, logSyncEvent, ScopeValuesSchema, SyncCombinedRequestSchema, SyncCombinedResponseSchema, SyncPushRequestSchema, } from '@syncular/core';
-import { createServerHandlerCollection, InvalidSubscriptionScopeError, maybeCompactChanges, maybePruneSync, parseJsonValue, pull, pushCommit, readSnapshotChunk, recordClientCursor, resolveEffectiveScopesForSubscriptions, scopesToSnapshotChunkScopeKey, } from '@syncular/server';
+import { createServerHandlerCollection, InvalidSubscriptionScopeError, maybeCompactChanges, maybePruneSync, parseJsonValue, pull, pushCommit, pushCommitBatch, readSnapshotChunk, recordClientCursor, resolveEffectiveScopesForSubscriptions, scopesToSnapshotChunkScopeKey, } from '@syncular/server';
 import { Hono } from 'hono';
 import { describeRoute, resolver, validator as zValidator } from 'hono-openapi';
 import { sql } from 'kysely';
@@ -488,6 +488,206 @@ export function createSyncRoutes(options) {
             });
         });
     };
+    function notifyRealtimeForAppliedPushes(ctx, pushedCommits) {
+        if (!wsConnectionManager && !realtimeBroadcaster) {
+            return;
+        }
+        let latestCommitSeq = 0;
+        let latestActorId = ctx.auth.actorId;
+        let latestCreatedAt;
+        const scopeKeys = new Set();
+        const emittedChanges = [];
+        for (const pushed of pushedCommits) {
+            if (pushed.response.ok !== true ||
+                pushed.response.status !== 'applied' ||
+                typeof pushed.response.commitSeq !== 'number') {
+                continue;
+            }
+            latestCommitSeq = Math.max(latestCommitSeq, pushed.response.commitSeq);
+            latestActorId = pushed.commitActorId ?? latestActorId;
+            latestCreatedAt = pushed.commitCreatedAt ?? latestCreatedAt;
+            for (const scopeKey of applyPartitionToScopeKeys(ctx.partitionId, pushed.scopeKeys)) {
+                scopeKeys.add(scopeKey);
+            }
+            emittedChanges.push(...pushed.emittedChanges);
+        }
+        if (latestCommitSeq <= 0 || scopeKeys.size === 0) {
+            return;
+        }
+        const combinedScopeKeys = Array.from(scopeKeys);
+        if (wsConnectionManager) {
+            wsConnectionManager.notifyScopeKeys(combinedScopeKeys, latestCommitSeq, {
+                excludeClientIds: [ctx.clientId],
+                changes: emittedChanges,
+                actorId: latestActorId,
+                createdAt: latestCreatedAt,
+            });
+        }
+        if (realtimeBroadcaster) {
+            realtimeBroadcaster
+                .publish({
+                type: 'commit',
+                commitSeq: latestCommitSeq,
+                partitionId: ctx.partitionId,
+                scopeKeys: combinedScopeKeys,
+                sourceInstanceId: instanceId,
+            })
+                .catch((error) => {
+                logAsyncFailureOnce('sync.realtime.broadcast_publish_failed', {
+                    event: 'sync.realtime.broadcast_publish_failed',
+                    userId: ctx.auth.actorId,
+                    clientId: ctx.clientId,
+                    error: error instanceof Error ? error.message : String(error),
+                });
+            });
+        }
+    }
+    function recordPushExecutionSideEffects(ctx, summary) {
+        recordRequestEventInBackground(() => ({
+            partitionId: ctx.partitionId,
+            requestId: ctx.requestId,
+            traceId: ctx.traceContext.traceId,
+            spanId: ctx.traceContext.spanId,
+            eventType: 'push',
+            syncPath: ctx.syncPath,
+            actorId: ctx.auth.actorId,
+            clientId: ctx.clientId,
+            transportPath: ctx.transportPath,
+            statusCode: 200,
+            outcome: summary.outcome,
+            responseStatus: normalizeResponseStatus(200, summary.outcome),
+            durationMs: summary.durationMs,
+            errorCode: firstPushErrorCode(summary.results),
+            commitSeq: summary.commitSeq,
+            operationCount: summary.operationCount,
+            tables: summary.tables,
+            payloadSnapshot: summary.payloadSnapshot,
+        }));
+        emitConsoleLiveEvent(consoleLiveEmitter, 'push', () => ({
+            partitionId: ctx.partitionId,
+            requestId: ctx.requestId,
+            traceId: ctx.traceContext.traceId,
+            spanId: ctx.traceContext.spanId,
+            actorId: ctx.auth.actorId,
+            clientId: ctx.clientId,
+            transportPath: ctx.transportPath,
+            syncPath: ctx.syncPath,
+            outcome: summary.outcome,
+            statusCode: 200,
+            durationMs: summary.durationMs,
+            commitSeq: summary.commitSeq,
+            operationCount: summary.operationCount,
+            tables: summary.tables,
+        }));
+    }
+    function maybeCountPushConflicts(ctx, results, enabled) {
+        if (enabled !== true) {
+            return;
+        }
+        const detectedConflicts = results.reduce((count, result) => count + (result.status === 'conflict' ? 1 : 0), 0);
+        if (detectedConflicts <= 0) {
+            return;
+        }
+        countSyncMetric('sync.conflicts.detected', detectedConflicts, {
+            attributes: {
+                syncPath: ctx.syncPath,
+                transportPath: ctx.transportPath,
+            },
+        });
+    }
+    function emitCommitLiveEvents(ctx, pushedCommits) {
+        for (const pushed of pushedCommits) {
+            if (pushed.response.ok !== true ||
+                pushed.response.status !== 'applied' ||
+                typeof pushed.response.commitSeq !== 'number') {
+                continue;
+            }
+            emitConsoleLiveEvent(consoleLiveEmitter, 'commit', () => ({
+                partitionId: ctx.partitionId,
+                commitSeq: pushed.response.commitSeq,
+                actorId: ctx.auth.actorId,
+                clientId: ctx.clientId,
+                affectedTables: pushed.affectedTables,
+            }));
+        }
+    }
+    async function executePushCommitBatchWithSideEffects(ctx, pushBodies, execOptions = {}) {
+        const timer = createSyncTimer();
+        const totalOperationCount = pushBodies.reduce((count, pushBody) => count + (pushBody.operations?.length ?? 0), 0);
+        const executedPushes = await pushCommitBatch({
+            db: options.db,
+            dialect: options.dialect,
+            handlers: handlerRegistry,
+            plugins: options.plugins,
+            auth: ctx.auth,
+            suppressTelemetry: true,
+            requests: pushBodies.map((pushBody) => ({
+                clientId: ctx.clientId,
+                clientCommitId: pushBody.clientCommitId,
+                operations: pushBody.operations,
+                schemaVersion: pushBody.schemaVersion,
+            })),
+        });
+        const affectedTables = new Set();
+        for (const pushed of executedPushes) {
+            for (const table of pushed.affectedTables) {
+                affectedTables.add(table);
+            }
+        }
+        const pushDurationMs = timer();
+        const latestCommitSeq = executedPushes.reduce((latest, pushed) => {
+            if (typeof pushed.response.commitSeq === 'number') {
+                return Math.max(latest, pushed.response.commitSeq);
+            }
+            return latest;
+        }, 0);
+        const aggregateStatus = executedPushes.every((pushed) => pushed.response.status === 'cached')
+            ? 'cached'
+            : executedPushes.every((pushed) => pushed.response.status === 'applied' ||
+                pushed.response.status === 'cached')
+                ? 'applied'
+                : 'rejected';
+        const aggregatedResults = executedPushes.flatMap((pushed) => pushed.response.results);
+        logSyncEvent({
+            event: 'sync.push',
+            userId: ctx.auth.actorId,
+            durationMs: pushDurationMs,
+            operationCount: totalOperationCount,
+            status: aggregateStatus,
+            commitSeq: latestCommitSeq > 0 ? latestCommitSeq : undefined,
+        });
+        recordPushExecutionSideEffects(ctx, {
+            durationMs: pushDurationMs,
+            outcome: aggregateStatus,
+            commitSeq: latestCommitSeq > 0 ? latestCommitSeq : null,
+            operationCount: totalOperationCount,
+            tables: Array.from(affectedTables),
+            results: aggregatedResults,
+            payloadSnapshot: shouldCaptureRequestPayloadSnapshots
+                ? {
+                    request: {
+                        clientId: ctx.clientId,
+                        commits: pushBodies.map((pushBody) => ({
+                            clientCommitId: pushBody.clientCommitId,
+                            schemaVersion: pushBody.schemaVersion,
+                            operations: pushBody.operations,
+                        })),
+                    },
+                    response: {
+                        ok: true,
+                        commits: executedPushes.map((pushed, index) => ({
+                            clientCommitId: pushBodies[index]?.clientCommitId ?? '',
+                            ...pushed.response,
+                        })),
+                    },
+                }
+                : null,
+        });
+        maybeCountPushConflicts(ctx, aggregatedResults, execOptions.countConflictsMetric);
+        notifyRealtimeForAppliedPushes(ctx, executedPushes);
+        emitCommitLiveEvents(ctx, executedPushes);
+        return executedPushes;
+    }
     async function executePushCommitWithSideEffects(ctx, pushBody, execOptions = {}) {
         const timer = createSyncTimer();
         const pushOps = pushBody.operations ?? [];
@@ -513,24 +713,13 @@ export function createSyncRoutes(options) {
             status: pushed.response.status,
             commitSeq: pushed.response.commitSeq,
         });
-        recordRequestEventInBackground(() => ({
-            partitionId: ctx.partitionId,
-            requestId: ctx.requestId,
-            traceId: ctx.traceContext.traceId,
-            spanId: ctx.traceContext.spanId,
-            eventType: 'push',
-            syncPath: ctx.syncPath,
-            actorId: ctx.auth.actorId,
-            clientId: ctx.clientId,
-            transportPath: ctx.transportPath,
-            statusCode: 200,
-            outcome: pushed.response.status,
-            responseStatus: normalizeResponseStatus(200, pushed.response.status),
+        recordPushExecutionSideEffects(ctx, {
             durationMs: pushDurationMs,
-            errorCode: firstPushErrorCode(pushed.response.results),
-            commitSeq: pushed.response.commitSeq,
+            outcome: pushed.response.status,
+            commitSeq: pushed.response.commitSeq ?? null,
             operationCount: pushOps.length,
             tables: pushed.affectedTables,
+            results: pushed.response.results,
             payloadSnapshot: shouldCaptureRequestPayloadSnapshots
                 ? {
                     request: {
@@ -542,77 +731,12 @@ export function createSyncRoutes(options) {
                     response: pushed.response,
                 }
                 : null,
-        }));
-        emitConsoleLiveEvent(consoleLiveEmitter, 'push', () => ({
-            partitionId: ctx.partitionId,
-            requestId: ctx.requestId,
-            traceId: ctx.traceContext.traceId,
-            spanId: ctx.traceContext.spanId,
-            actorId: ctx.auth.actorId,
-            clientId: ctx.clientId,
-            transportPath: ctx.transportPath,
-            syncPath: ctx.syncPath,
-            outcome: pushed.response.status,
-            statusCode: 200,
-            durationMs: pushDurationMs,
-            commitSeq: pushed.response.commitSeq ?? null,
-            operationCount: pushOps.length,
-            tables: pushed.affectedTables,
-        }));
-        if (execOptions.countConflictsMetric === true) {
-            const detectedConflicts = pushed.response.results.reduce((count, result) => count + (result.status === 'conflict' ? 1 : 0), 0);
-            if (detectedConflicts > 0) {
-                countSyncMetric('sync.conflicts.detected', detectedConflicts, {
-                    attributes: {
-                        syncPath: ctx.syncPath,
-                        transportPath: ctx.transportPath,
-                    },
-                });
-            }
-        }
-        if (wsConnectionManager &&
-            pushed.response.ok === true &&
-            pushed.response.status === 'applied' &&
-            typeof pushed.response.commitSeq === 'number') {
-            const scopeKeys = applyPartitionToScopeKeys(ctx.partitionId, pushed.scopeKeys);
-            if (scopeKeys.length > 0) {
-                wsConnectionManager.notifyScopeKeys(scopeKeys, pushed.response.commitSeq, {
-                    excludeClientIds: [ctx.clientId],
-                    changes: pushed.emittedChanges,
-                    actorId: pushed.commitActorId ?? ctx.auth.actorId,
-                    createdAt: pushed.commitCreatedAt ?? new Date().toISOString(),
-                });
-                if (realtimeBroadcaster) {
-                    realtimeBroadcaster
-                        .publish({
-                        type: 'commit',
-                        commitSeq: pushed.response.commitSeq,
-                        partitionId: ctx.partitionId,
-                        scopeKeys,
-                        sourceInstanceId: instanceId,
-                    })
-                        .catch((error) => {
-                        logAsyncFailureOnce('sync.realtime.broadcast_publish_failed', {
-                            event: 'sync.realtime.broadcast_publish_failed',
-                            userId: ctx.auth.actorId,
-                            clientId: ctx.clientId,
-                            error: error instanceof Error ? error.message : String(error),
-                        });
-                    });
-                }
-            }
-        }
-        if (pushed.response.ok === true &&
-            pushed.response.status === 'applied' &&
-            typeof pushed.response.commitSeq === 'number') {
-            emitConsoleLiveEvent(consoleLiveEmitter, 'commit', () => ({
-                partitionId: ctx.partitionId,
-                commitSeq: pushed.response.commitSeq,
-                actorId: ctx.auth.actorId,
-                clientId: ctx.clientId,
-                affectedTables: pushed.affectedTables,
-            }));
+        });
+        maybeCountPushConflicts(ctx, pushed.response.results, execOptions.countConflictsMetric);
+        if (execOptions.deferRealtimeNotifications !== true) {
+            notifyRealtimeForAppliedPushes(ctx, [pushed]);
         }
+        emitCommitLiveEvents(ctx, [pushed]);
         return pushed;
     }
     const authCache = new WeakMap();
@@ -937,26 +1061,62 @@ export function createSyncRoutes(options) {
         }
         let pushResponse;
         let pullResponse;
+        const exposeBenchPullTimings = c.req.header('x-syncular-bench-timings') === '1';
         // --- Push phase ---
         if (body.push) {
-            const pushBody = body.push;
-            const pushOps = pushBody.operations ?? [];
-            if (pushOps.length > maxOperationsPerPush) {
-                return c.json({
-                    error: 'TOO_MANY_OPERATIONS',
-                    message: `Maximum ${maxOperationsPerPush} operations per push`,
-                }, 400);
+            const pushBodies = body.push.commits ?? [];
+            const pushedCommits = [];
+            for (const pushBody of pushBodies) {
+                const pushOps = pushBody.operations ?? [];
+                if (pushOps.length > maxOperationsPerPush) {
+                    return c.json({
+                        error: 'TOO_MANY_OPERATIONS',
+                        message: `Maximum ${maxOperationsPerPush} operations per push`,
+                    }, 400);
+                }
             }
-            const pushed = await executePushCommitWithSideEffects({
-                auth,
-                clientId,
-                partitionId,
-                requestId,
-                traceContext,
-                transportPath,
-                syncPath: 'http-combined',
-            }, pushBody);
-            pushResponse = pushed.response;
+            const executedPushes = pushBodies.length > 1
+                ? await executePushCommitBatchWithSideEffects({
+                    auth,
+                    clientId,
+                    partitionId,
+                    requestId,
+                    traceContext,
+                    transportPath,
+                    syncPath: 'http-combined',
+                }, pushBodies, {
+                    countConflictsMetric: true,
+                })
+                : [];
+            for (let index = 0; index < pushBodies.length; index += 1) {
+                const pushBody = pushBodies[index];
+                if (!pushBody)
+                    continue;
+                const pushed = pushBodies.length > 1
+                    ? executedPushes[index]
+                    : await executePushCommitWithSideEffects({
+                        auth,
+                        clientId,
+                        partitionId,
+                        requestId,
+                        traceContext,
+                        transportPath,
+                        syncPath: 'http-combined',
+                    }, pushBody, {
+                        countConflictsMetric: true,
+                    });
+                if (!pushed) {
+                    throw new Error('Server returned incomplete batched push result');
+                }
+                pushedCommits.push({
+                    clientCommitId: pushBody.clientCommitId,
+                    ...pushed.response,
+                });
+            }
+            pushResponse = {
+                ok: true,
+                commits: pushedCommits,
+            };
         }
         // --- Pull phase ---
         if (body.pull) {
@@ -1111,6 +1271,9 @@ export function createSyncRoutes(options) {
                     clientCursor: pullResult.clientCursor,
                 };
             });
+            if (exposeBenchPullTimings && pullResult.bootstrapTimings) {
+                c.header('x-syncular-bench-pull-timings', JSON.stringify(pullResult.bootstrapTimings));
+            }
             pullResponse = pullResult.response;
         }
         triggerAutoMaintenance({