@syncular/server 0.33.0 → 0.34.0

package/dist/d1-storage.js

@@ -45,7 +45,7 @@ import { StorageQueryError } from './storage-errors.js';
 import { decodeRow } from '@syncular/core';
 import { bindAuthoritativePartition, prepareAuthoritativeQuery, } from './authoritative-query.js';
 import { syncError } from './errors.js';
-import { assertAppendOnlyMigration, assertPhysicalColumns, assertStoredLayouts, commitWindowPageSql, latestScopedChangeSeqSql, deleteRowSql, deleteSqliteRowScopesSql, dropTableDdl, indexRowPageStatement, layoutsOf, migratePayload, parseLayouts, quoteIdent, retiredTableNames, rewritePlan, rewriteRowSql, rewriteValues, SCHEMA_META_DDL_SQLITE, SYNC_COLUMN_VERSIONS_COLUMN, SYNC_PARTITION_COLUMN, SYNC_PAYLOAD_COLUMN, SYNC_ROW_ID_COLUMN, SYNC_SCOPES_COLUMN, SYNC_VERSION_COLUMN, scanRowPageSql, schemaDdl, selectRowScopesSql, selectRowSql, selectRowsForRewriteSql, tableColumnNames, toSqlValue, upsertSql, upsertValues, } from './relational-rows.js';
+import { assertAppendOnlyMigration, assertPhysicalColumns, assertStoredLayouts, commitWindowPageSql, LATEST_SCOPED_CHANGE_SEQ_SQLITE_SQL, deleteRowSql, deleteSqliteRowScopesSql, dropTableDdl, indexRowPageStatement, layoutsOf, migratePayload, parseLayouts, quoteIdent, retiredTableNames, rewritePlan, rewriteRowSql, rewriteValues, SCHEMA_META_DDL_SQLITE, SYNC_COLUMN_VERSIONS_COLUMN, SYNC_PARTITION_COLUMN, SYNC_PAYLOAD_COLUMN, SYNC_ROW_ID_COLUMN, SYNC_SCOPES_COLUMN, SYNC_VERSION_COLUMN, scanRowPageSql, schemaDdl, selectRowScopesSql, selectRowSql, selectRowsForRewriteSql, tableColumnNames, toSqlValue, upsertSql, upsertValues, } from './relational-rows.js';
 import { matchesEffective } from './scopes.js';
 import { asUint8Array, collectCommitWindowPage, deserializePushResult, placeholders, serializePushResult, sqliteDdlStatements, toStoredChange, toStoredRow, } from './sqlite-dialect.js';
 import { isD1ConstraintError, StorageConstraintError } from './storage-errors.js';
@@ -1456,7 +1456,7 @@ export class D1ServerStorage {
         if (firstVariable === undefined || values.length === 0)
             return 0;
         // Concurrent reads of a pull share one `db.batch` round trip.
-        const [row] = await this.#batchedAll(latestScopedChangeSeqSql(values.length), values.flatMap((value) => [partition, query.table, firstVariable, value]));
+        const [row] = await this.#batchedAll(LATEST_SCOPED_CHANGE_SEQ_SQLITE_SQL, [partition, query.table, firstVariable, JSON.stringify(values)]);
         return row?.seq ?? 0;
     }
     async readCommitWindow(partition, query) {

package/dist/operations.d.ts

@@ -1,6 +1,6 @@
 import { type AuthoritativeRelationPlan } from './authoritative-query.js';
-import { type RemoteOperationResponse, type RowValue } from '@syncular/core';
-import type { SyncRequestContext } from './context.js';
+import { type RemoteOperationRequest, type RemoteOperationResponse, type RowValue } from '@syncular/core';
+import type { ResolveScopes, SyncRequestContext } from './context.js';
 import type { AuthoritativeQueryRequest, AuthoritativeQueryResult, AuthoritativeQueryValue } from './storage.js';
 import { type ValidateRow } from './validate.js';
 export interface RemoteQueryDependency {
@@ -101,5 +101,22 @@ export declare class RemoteOperationRegistry {
     constructor(operations: readonly RegisteredRemoteOperation[]);
     get(id: string): RegisteredRemoteOperation | undefined;
 }
-export declare function handleRemoteOperation(bytes: Uint8Array, ctx: SyncRequestContext, registry: RemoteOperationRegistry): Promise<Uint8Array>;
+/**
+ * The registry and identity one remote operation request runs with
+ * (REMOTE.md §5.1). `actorId` is the commit's actor and defaults to the
+ * authenticated actor; `resolveScopes` replaces the configured resolver for
+ * this request.
+ */
+export interface RemoteOperationBinding {
+    readonly registry: RemoteOperationRegistry;
+    readonly actorId?: string;
+    readonly resolveScopes?: ResolveScopes;
+}
+/**
+ * Chooses the binding of one decoded request (REMOTE.md §5.1). `ctx` carries
+ * the authenticated actor; the resolver runs after the client-id binding
+ * check and may throw a `SyncError` or a `ValidationRejection`.
+ */
+export type RemoteOperationResolver = (request: RemoteOperationRequest, ctx: SyncRequestContext) => RemoteOperationBinding | Promise<RemoteOperationBinding>;
+export declare function handleRemoteOperation(bytes: Uint8Array, authenticated: SyncRequestContext, operations: RemoteOperationRegistry | RemoteOperationResolver): Promise<Uint8Array>;
 export {};

package/dist/operations.js

@@ -6,7 +6,7 @@ import { processPushOperationsWithTrace } from './push.js';
 import { compileSchema } from './schema.js';
 import { authorizeWrite, renderScopeValue, } from './scopes.js';
 import { transactionQuery } from './storage-query.js';
-import { toValidateRow } from './validate.js';
+import { toValidateRow, ValidationRejection, } from './validate.js';
 function scopeAllowed(allowed, variable, value) {
     const values = allowed[variable];
     return (values !== undefined && (values.includes('*') || values.includes(value)));
@@ -353,6 +353,15 @@ export class RemoteOperationRegistry {
     }
 }
 function encodeRemoteOperationError(error, fallbackCode) {
+    if (error instanceof ValidationRejection) {
+        return encodeRemoteOperationResponse({
+            revision: 1,
+            kind: 'error',
+            code: error.code,
+            message: error.message,
+            retryable: false,
+        });
+    }
     const sync = error instanceof SyncError
         ? error
         : syncError(fallbackCode, fallbackCode === 'operation.invalid_request'
@@ -366,7 +375,7 @@ function encodeRemoteOperationError(error, fallbackCode) {
         retryable: sync.retryable,
     });
 }
-export async function handleRemoteOperation(bytes, ctx, registry) {
+export async function handleRemoteOperation(bytes, authenticated, operations) {
     let request;
     try {
         request = decodeRemoteOperationRequest(bytes);
@@ -384,6 +393,7 @@ export async function handleRemoteOperation(bytes, ctx, registry) {
     catch (error) {
         return encodeRemoteOperationError(error, 'operation.invalid_request');
     }
+    let ctx = authenticated;
     try {
         await touchAuthenticatedPartition(ctx);
         if (request.clientId.startsWith(REMOTE_COMMAND_CLIENT_ID_PREFIX)) {
@@ -397,6 +407,16 @@ export async function handleRemoteOperation(bytes, ctx, registry) {
             (typeof request.requestId !== 'string' || request.requestId.length === 0)) {
             throw syncError('operation.invalid_request');
         }
+        let registry = operations;
+        if (typeof registry === 'function') {
+            const binding = await registry(request, ctx);
+            registry = binding.registry;
+            ctx = {
+                ...ctx,
+                actorId: binding.actorId ?? ctx.actorId,
+                resolveScopes: binding.resolveScopes ?? ctx.resolveScopes,
+            };
+        }
         const operation = registry.get(request.operationId);
         if (operation === undefined) {
             throw syncError('operation.unknown');
@@ -411,7 +431,7 @@ export async function handleRemoteOperation(bytes, ctx, registry) {
         return encodeRemoteOperationResponse(await operation.run(ctx, request.clientId, request.requestId, request.params));
     }
     catch (error) {
-        if (!(error instanceof SyncError)) {
+        if (!(error instanceof SyncError || error instanceof ValidationRejection)) {
             reportError(error, ctx.onError, 'operations');
         }
         return encodeRemoteOperationError(error, 'operation.execution_failed');

package/dist/relational-rows.d.ts

@@ -259,11 +259,14 @@ export declare function prefetchRowsSql(table: CompiledTable): string;
  * SQLite/D1: the newest `commit_seq` in the inverted change-scope index for
  * one variable's values, as one index-only max per value (a `(partition,
  * tbl, var, value)` prefix), so the cost is independent of the table's
- * history. Bind order: [partition, tbl, var, value] per value.
+ * history. The values arrive as one JSON array, so the statement has no
+ * compound SELECT and four bound parameters for any value count (D1 caps a
+ * compound SELECT at 5 terms and a statement at 100 parameters).
+ * Params: [partition, tbl, var, values as JSON array text].
  */
-export declare function latestScopedChangeSeqSql(valueCount: number): string;
+export declare const LATEST_SCOPED_CHANGE_SEQ_SQLITE_SQL = "SELECT max((SELECT max(commit_seq) FROM sync_change_scopes\n           WHERE partition=? AND tbl=? AND var=? AND value=v.value)) AS seq\n     FROM json_each(?) AS v";
 /**
- * PostgreSQL set-based form of `latestScopedChangeSeqSql` for the
+ * PostgreSQL set-based form of `LATEST_SCOPED_CHANGE_SEQ_SQLITE_SQL` for the
  * subscriptions of one table in a pull. `$2` is a JSON array of
  * `{i, var, vals}` records. Params: [partition, specs (JSON text), tbl].
  */

package/dist/relational-rows.js

@@ -610,17 +610,16 @@ export function prefetchRowsSql(table) {
  * SQLite/D1: the newest `commit_seq` in the inverted change-scope index for
  * one variable's values, as one index-only max per value (a `(partition,
  * tbl, var, value)` prefix), so the cost is independent of the table's
- * history. Bind order: [partition, tbl, var, value] per value.
+ * history. The values arrive as one JSON array, so the statement has no
+ * compound SELECT and four bound parameters for any value count (D1 caps a
+ * compound SELECT at 5 terms and a statement at 100 parameters).
+ * Params: [partition, tbl, var, values as JSON array text].
  */
-export function latestScopedChangeSeqSql(valueCount) {
-    const perValue = [];
-    for (let i = 0; i < valueCount; i++) {
-        perValue.push('SELECT (SELECT max(commit_seq) FROM sync_change_scopes WHERE partition=? AND tbl=? AND var=? AND value=?) AS seq');
-    }
-    return `SELECT max(seq) AS seq FROM (${perValue.join(' UNION ALL ')})`;
-}
+export const LATEST_SCOPED_CHANGE_SEQ_SQLITE_SQL = `SELECT max((SELECT max(commit_seq) FROM sync_change_scopes
+           WHERE partition=? AND tbl=? AND var=? AND value=v.value)) AS seq
+     FROM json_each(?) AS v`;
 /**
- * PostgreSQL set-based form of `latestScopedChangeSeqSql` for the
+ * PostgreSQL set-based form of `LATEST_SCOPED_CHANGE_SEQ_SQLITE_SQL` for the
  * subscriptions of one table in a pull. `$2` is a JSON array of
  * `{i, var, vals}` records. Params: [partition, specs (JSON text), tbl].
  */

package/dist/sqlite-storage.js

@@ -13,7 +13,7 @@ import { serveNotReadyError } from './readiness.js';
  */
 import { bindAuthoritativePartition, prepareAuthoritativeQuery, } from './authoritative-query.js';
 import { syncError } from './errors.js';
-import { assertPhysicalColumns, assertStoredLayouts, commitWindowPageSql, latestScopedChangeSeqSql, deleteRowSql, deleteSqliteRowScopesSql, dropTableDdl, indexRowPageStatement, layoutsOf, migratePayload, parseLayouts, quoteIdent, retiredTableNames, rewritePlan, rewriteRowSql, rewriteValues, SCHEMA_META_DDL_SQLITE, SYNC_COLUMN_VERSIONS_COLUMN, SYNC_PARTITION_COLUMN, SYNC_PAYLOAD_COLUMN, SYNC_ROW_ID_COLUMN, SYNC_SCOPES_COLUMN, SYNC_VERSION_COLUMN, scanRowPageSql, schemaDdl, selectRowScopesSql, selectRowSql, selectRowsForRewriteSql, upsertSql, upsertValues, } from './relational-rows.js';
+import { assertPhysicalColumns, assertStoredLayouts, commitWindowPageSql, LATEST_SCOPED_CHANGE_SEQ_SQLITE_SQL, deleteRowSql, deleteSqliteRowScopesSql, dropTableDdl, indexRowPageStatement, layoutsOf, migratePayload, parseLayouts, quoteIdent, retiredTableNames, rewritePlan, rewriteRowSql, rewriteValues, SCHEMA_META_DDL_SQLITE, SYNC_COLUMN_VERSIONS_COLUMN, SYNC_PARTITION_COLUMN, SYNC_PAYLOAD_COLUMN, SYNC_ROW_ID_COLUMN, SYNC_SCOPES_COLUMN, SYNC_VERSION_COLUMN, scanRowPageSql, schemaDdl, selectRowScopesSql, selectRowSql, selectRowsForRewriteSql, upsertSql, upsertValues, } from './relational-rows.js';
 import { matchesEffective } from './scopes.js';
 import { collectCommitWindowPage, deserializePushResult, placeholders, SQLITE_DDL, serializePushResult, toStoredChange, toStoredRow, } from './sqlite-dialect.js';
 import { SqliteAdapterRequiredError, } from './sqlite-driver.js';
@@ -1034,13 +1034,8 @@ END`);
         if (firstVariable === undefined || values.length === 0)
             return 0;
         const row = this.db
-            .query(latestScopedChangeSeqSql(values.length))
-            .get(...values.flatMap((value) => [
-            partition,
-            query.table,
-            firstVariable,
-            value,
-        ]));
+            .query(LATEST_SCOPED_CHANGE_SEQ_SQLITE_SQL)
+            .get(partition, query.table, firstVariable, JSON.stringify(values));
         return row?.seq ?? 0;
     }
     async readCommitWindow(partition, query) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncular/server",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "Syncular server: handleSyncRequest + storage/auth interfaces for the sync protocol",
   "license": "Apache-2.0",
   "author": "Benjamin Kniffler",
@@ -68,7 +68,7 @@
     "verify:node": "cd ../.. && bun build ./packages/server/test/sqlite-runtime/verify-node.mjs --target=node --conditions=bun --outfile=./packages/server/.verify-node.built.mjs && node ./packages/server/.verify-node.built.mjs"
   },
   "dependencies": {
-    "@syncular/core": "0.33.0"
+    "@syncular/core": "0.34.0"
   },
   "devDependencies": {
     "@electric-sql/pglite": "^0.5.4"

package/src/d1-storage.ts

@@ -54,7 +54,7 @@ import {
   assertPhysicalColumns,
   assertStoredLayouts,
   commitWindowPageSql,
-  latestScopedChangeSeqSql,
+  LATEST_SCOPED_CHANGE_SEQ_SQLITE_SQL,
   deleteRowSql,
   deleteSqliteRowScopesSql,
   dropTableDdl,
@@ -2189,8 +2189,8 @@ export class D1ServerStorage implements ServerStorage {
     if (firstVariable === undefined || values.length === 0) return 0;
     // Concurrent reads of a pull share one `db.batch` round trip.
     const [row] = await this.#batchedAll<{ seq: number | null }>(
-      latestScopedChangeSeqSql(values.length),
-      values.flatMap((value) => [partition, query.table, firstVariable, value]),
+      LATEST_SCOPED_CHANGE_SEQ_SQLITE_SQL,
+      [partition, query.table, firstVariable, JSON.stringify(values)],
     );
     return row?.seq ?? 0;
   }

package/src/operations.ts

@@ -8,11 +8,12 @@ import {
   encodeRemoteOperationResponse,
   encodeSparseRow,
   type PushOperation,
+  type RemoteOperationRequest,
   type RemoteOperationResponse,
   type RowValue,
   type ScopeMap,
 } from '@syncular/core';
-import type { SyncRequestContext } from './context';
+import type { ResolveScopes, SyncRequestContext } from './context';
 import {
   REMOTE_COMMAND_CLIENT_ID_PREFIX,
   RESOLVER_OUTAGE,
@@ -33,7 +34,11 @@ import type {
 } from './storage';
 import type { StorageTransaction } from './storage';
 import { transactionQuery } from './storage-query';
-import { toValidateRow, type ValidateRow } from './validate';
+import {
+  toValidateRow,
+  ValidationRejection,
+  type ValidateRow,
+} from './validate';
 
 export interface RemoteQueryDependency {
   readonly table: string;
@@ -683,10 +688,41 @@ export class RemoteOperationRegistry {
   }
 }
 
+/**
+ * The registry and identity one remote operation request runs with
+ * (REMOTE.md §5.1). `actorId` is the commit's actor and defaults to the
+ * authenticated actor; `resolveScopes` replaces the configured resolver for
+ * this request.
+ */
+export interface RemoteOperationBinding {
+  readonly registry: RemoteOperationRegistry;
+  readonly actorId?: string;
+  readonly resolveScopes?: ResolveScopes;
+}
+
+/**
+ * Chooses the binding of one decoded request (REMOTE.md §5.1). `ctx` carries
+ * the authenticated actor; the resolver runs after the client-id binding
+ * check and may throw a `SyncError` or a `ValidationRejection`.
+ */
+export type RemoteOperationResolver = (
+  request: RemoteOperationRequest,
+  ctx: SyncRequestContext,
+) => RemoteOperationBinding | Promise<RemoteOperationBinding>;
+
 function encodeRemoteOperationError(
   error: unknown,
   fallbackCode: 'operation.invalid_request' | 'operation.execution_failed',
 ): Uint8Array {
+  if (error instanceof ValidationRejection) {
+    return encodeRemoteOperationResponse({
+      revision: 1,
+      kind: 'error',
+      code: error.code,
+      message: error.message,
+      retryable: false,
+    });
+  }
   const sync =
     error instanceof SyncError
       ? error
@@ -707,8 +743,8 @@ function encodeRemoteOperationError(
 
 export async function handleRemoteOperation(
   bytes: Uint8Array,
-  ctx: SyncRequestContext,
-  registry: RemoteOperationRegistry,
+  authenticated: SyncRequestContext,
+  operations: RemoteOperationRegistry | RemoteOperationResolver,
 ): Promise<Uint8Array> {
   let request;
   try {
@@ -728,6 +764,7 @@ export async function handleRemoteOperation(
   } catch (error) {
     return encodeRemoteOperationError(error, 'operation.invalid_request');
   }
+  let ctx = authenticated;
   try {
     await touchAuthenticatedPartition(ctx);
     if (request.clientId.startsWith(REMOTE_COMMAND_CLIENT_ID_PREFIX)) {
@@ -752,6 +789,16 @@ export async function handleRemoteOperation(
     ) {
       throw syncError('operation.invalid_request');
     }
+    let registry = operations;
+    if (typeof registry === 'function') {
+      const binding = await registry(request, ctx);
+      registry = binding.registry;
+      ctx = {
+        ...ctx,
+        actorId: binding.actorId ?? ctx.actorId,
+        resolveScopes: binding.resolveScopes ?? ctx.resolveScopes,
+      };
+    }
     const operation = registry.get(request.operationId);
     if (operation === undefined) {
       throw syncError('operation.unknown');
@@ -772,7 +819,7 @@ export async function handleRemoteOperation(
       ),
     );
   } catch (error) {
-    if (!(error instanceof SyncError)) {
+    if (!(error instanceof SyncError || error instanceof ValidationRejection)) {
       reportError(error, ctx.onError, 'operations');
     }
     return encodeRemoteOperationError(error, 'operation.execution_failed');

package/src/relational-rows.ts

@@ -709,20 +709,17 @@ export function prefetchRowsSql(table: CompiledTable): string {
  * SQLite/D1: the newest `commit_seq` in the inverted change-scope index for
  * one variable's values, as one index-only max per value (a `(partition,
  * tbl, var, value)` prefix), so the cost is independent of the table's
- * history. Bind order: [partition, tbl, var, value] per value.
+ * history. The values arrive as one JSON array, so the statement has no
+ * compound SELECT and four bound parameters for any value count (D1 caps a
+ * compound SELECT at 5 terms and a statement at 100 parameters).
+ * Params: [partition, tbl, var, values as JSON array text].
  */
-export function latestScopedChangeSeqSql(valueCount: number): string {
-  const perValue: string[] = [];
-  for (let i = 0; i < valueCount; i++) {
-    perValue.push(
-      'SELECT (SELECT max(commit_seq) FROM sync_change_scopes WHERE partition=? AND tbl=? AND var=? AND value=?) AS seq',
-    );
-  }
-  return `SELECT max(seq) AS seq FROM (${perValue.join(' UNION ALL ')})`;
-}
+export const LATEST_SCOPED_CHANGE_SEQ_SQLITE_SQL = `SELECT max((SELECT max(commit_seq) FROM sync_change_scopes
+           WHERE partition=? AND tbl=? AND var=? AND value=v.value)) AS seq
+     FROM json_each(?) AS v`;
 
 /**
- * PostgreSQL set-based form of `latestScopedChangeSeqSql` for the
+ * PostgreSQL set-based form of `LATEST_SCOPED_CHANGE_SEQ_SQLITE_SQL` for the
  * subscriptions of one table in a pull. `$2` is a JSON array of
  * `{i, var, vals}` records. Params: [partition, specs (JSON text), tbl].
  */

package/src/sqlite-storage.ts

@@ -22,7 +22,7 @@ import {
   assertPhysicalColumns,
   assertStoredLayouts,
   commitWindowPageSql,
-  latestScopedChangeSeqSql,
+  LATEST_SCOPED_CHANGE_SEQ_SQLITE_SQL,
   deleteRowSql,
   deleteSqliteRowScopesSql,
   dropTableDdl,
@@ -1639,16 +1639,9 @@ END`);
     if (firstVariable === undefined || values.length === 0) return 0;
     const row = this.db
       .query<{ seq: number | null }, string[]>(
-        latestScopedChangeSeqSql(values.length),
+        LATEST_SCOPED_CHANGE_SEQ_SQLITE_SQL,
       )
-      .get(
-        ...values.flatMap((value) => [
-          partition,
-          query.table,
-          firstVariable,
-          value,
-        ]),
-      );
+      .get(partition, query.table, firstVariable, JSON.stringify(values));
     return row?.seq ?? 0;
   }