@syncular/relay 0.0.1 → 0.0.2-127

package/src/server-role/index.ts

@@ -7,6 +7,7 @@
 import type { SyncPullRequest, SyncPushRequest } from '@syncular/core';
 import {
   createSyncTimer,
+  isRecord,
   logSyncEvent,
   ScopeValuesSchema,
   SyncBootstrapStateSchema,
@@ -31,7 +32,7 @@ export interface CreateRelayRoutesOptions<
 > {
   db: Kysely<DB>;
   dialect: ServerSyncDialect;
-  shapes: TableRegistry<DB>;
+  handlers: TableRegistry<DB>;
   realtime: RelayRealtime;
   /**
    * Called after a commit is successfully applied locally.
@@ -64,10 +65,6 @@ function clampInt(value: number, min: number, max: number): number {
   return Math.max(min, Math.min(max, value));
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-
 /**
  * Create Hono routes for relay server-role endpoints.
  *
@@ -139,12 +136,12 @@ export function createRelayRoutes<DB extends RelayDatabase = RelayDatabase>(
       }
 
       const id = typeof subValue.id === 'string' ? subValue.id : null;
-      const shape = typeof subValue.shape === 'string' ? subValue.shape : null;
-      if (!id || !shape) {
+      const table = typeof subValue.table === 'string' ? subValue.table : null;
+      if (!id || !table) {
         return c.json(
           {
             error: 'INVALID_REQUEST',
-            message: 'Subscription id/shape required',
+            message: 'Subscription id/table required',
           },
           400
         );
@@ -198,7 +195,7 @@ export function createRelayRoutes<DB extends RelayDatabase = RelayDatabase>(
 
       subscriptions.push({
         id,
-        shape,
+        table,
         scopes: scopesParsed.data,
         params: rawParams,
         cursor,
@@ -250,7 +247,7 @@ export function createRelayRoutes<DB extends RelayDatabase = RelayDatabase>(
     const pullResult = await relayPull({
       db: options.db,
       dialect: options.dialect,
-      shapes: options.shapes,
+      handlers: options.handlers,
       actorId: auth.actorId,
       request: validatedRequest.data,
     });
@@ -308,7 +305,7 @@ export function createRelayRoutes<DB extends RelayDatabase = RelayDatabase>(
     const pushed = await relayPushCommit({
       db: options.db,
       dialect: options.dialect,
-      shapes: options.shapes,
+      handlers: options.handlers,
       actorId: auth.actorId,
       request: body,
     });

package/src/server-role/pull.ts

@@ -22,15 +22,15 @@ export async function relayPull<
 >(args: {
   db: Kysely<DB>;
   dialect: ServerSyncDialect;
-  shapes: TableRegistry<DB>;
+  handlers: TableRegistry<DB>;
   actorId: string;
   request: SyncPullRequest;
 }): Promise<PullResult> {
-  // Use the standard pull - scope authorization is handled by shapes
+  // Use the standard pull - scope authorization is handled by handlers
   return pull({
     db: args.db,
     dialect: args.dialect,
-    shapes: args.shapes,
+    handlers: args.handlers,
     actorId: args.actorId,
     request: args.request,
   });

package/src/server-role/push.ts

@@ -6,21 +6,12 @@
  */
 
 import type { SyncPushRequest } from '@syncular/core';
+import { randomId } from '@syncular/core';
 import type { ServerSyncDialect, TableRegistry } from '@syncular/server';
 import { type PushCommitResult, pushCommit } from '@syncular/server';
 import { type Kysely, sql } from 'kysely';
 import type { RelayDatabase } from '../schema';
 
-function randomId(): string {
-  if (
-    typeof crypto !== 'undefined' &&
-    typeof crypto.randomUUID === 'function'
-  ) {
-    return crypto.randomUUID();
-  }
-  return `${Date.now()}-${Math.random().toString(16).slice(2)}`;
-}
-
 /**
  * Push a commit from a local client to the relay.
  *
@@ -34,37 +25,39 @@ export async function relayPushCommit<
 >(args: {
   db: Kysely<DB>;
   dialect: ServerSyncDialect;
-  shapes: TableRegistry<DB>;
+  handlers: TableRegistry<DB>;
   actorId: string;
   request: SyncPushRequest;
 }): Promise<PushCommitResult> {
   const { request } = args;
 
-  // Use the standard pushCommit - scope authorization is handled by shapes
-  const result = await pushCommit({
-    db: args.db,
-    dialect: args.dialect,
-    shapes: args.shapes,
-    actorId: args.actorId,
-    request,
-  });
-
-  // If the commit was applied, enqueue it for forwarding to main server
-  if (
-    result.response.ok === true &&
-    result.response.status === 'applied' &&
-    typeof result.response.commitSeq === 'number'
-  ) {
-    await enqueueForForwarding(args.db, {
-      localCommitSeq: result.response.commitSeq,
-      clientId: request.clientId,
-      clientCommitId: request.clientCommitId,
-      operations: request.operations,
-      schemaVersion: request.schemaVersion,
+  return args.db.transaction().execute(async (trx) => {
+    // Use the standard pushCommit - scope authorization is handled by handlers
+    const result = await pushCommit({
+      db: trx,
+      dialect: args.dialect,
+      handlers: args.handlers,
+      actorId: args.actorId,
+      request,
     });
-  }
 
-  return result;
+    // If the commit was applied, enqueue it for forwarding to main server
+    if (
+      result.response.ok === true &&
+      result.response.status === 'applied' &&
+      typeof result.response.commitSeq === 'number'
+    ) {
+      await enqueueForForwarding(trx, {
+        localCommitSeq: result.response.commitSeq,
+        clientId: request.clientId,
+        clientCommitId: request.clientCommitId,
+        operations: request.operations,
+        schemaVersion: request.schemaVersion,
+      });
+    }
+
+    return result;
+  });
 }
 
 /**