@sqlite-sync/cloudflare 0.1.1 → 0.2.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _sqlite_sync_core from '@sqlite-sync/core';
-import { SyncDbSchema, CrdtStorageMutator, TypedEventTarget, CrdtEventStatus, CrdtEventType, CrdtEventOrigin, Migrations } from '@sqlite-sync/core';
+import { InternalSQLiteWrapper, SyncDbSchema, CrdtStorageMutator, TypedEventTarget, CrdtEventStatus, CrdtEventType, CrdtEventOrigin, Migrations } from '@sqlite-sync/core';
 import { Compilable, Kysely } from 'kysely';
 
 type ExecuteParams = {
@@ -17,6 +17,7 @@ type KyselyExecutor<TDatabase> = {
     transaction: (callback: (tx: Pick<KyselyExecutor<TDatabase>, "execute" | "executeKysely">) => void) => void;
 };
 declare function createKyselyExecutor<TDatabase>(db: DurableObjectStorage): KyselyExecutor<TDatabase>;
+declare function createCrdtStorageDb(executor: KyselyExecutor<any>): InternalSQLiteWrapper<any>;
 
 type TypedPersistedCrdtEvent<Schema extends SyncDbSchema> = {
     schema_version: number;
@@ -41,10 +42,10 @@ declare function createDurableObjectCrdtStorage<Schema extends SyncDbSchema>({ s
     crdtEventsTable: string;
     batchSize?: number;
     broadcastPayload: (payload: string) => void;
-}): {
+}): Promise<{
     syncDb: ServerSyncDb<Schema>;
     remoteHandler: RemoteHandler;
-};
+}>;
 type MessageResult = {
     success: true;
     payload: string;
@@ -68,4 +69,4 @@ declare function createMigrator(kv: SyncKvStorage, sqlExecutor: KyselyExecutor<a
 };
 type SyncDbMigrator = ReturnType<typeof createMigrator>;
 
-export { type KyselyExecutor, type RemoteHandler, type ServerSyncDb, type SyncDbMigrator, type TypedPersistedCrdtEvent, createKyselyExecutor, createMigrator, durableObjectAdapter };
+export { type KyselyExecutor, type RemoteHandler, type ServerSyncDb, type SyncDbMigrator, type TypedPersistedCrdtEvent, createCrdtStorageDb, createKyselyExecutor, createMigrator, durableObjectAdapter };

package/dist/index.js

@@ -1,17 +1,16 @@
 // src/durable-object-adapter.ts
 import {
-  applyKyselyEventsBatchFilters,
   baseSystemMigrations,
-  createCrdtApplyFunction,
   createCrdtStorage,
   createCrdtStorageMutator,
   createCrdtSyncProducer,
   createStoredValue as createStoredValue2,
+  createSystemDbConfig,
   createTypedEventTarget,
   HLCCounter,
   jsonSafeParse,
-  quoteId,
-  runSystemMigrations
+  runSystemMigrations,
+  xxhash
 } from "@sqlite-sync/core";
 import {
   syncServerZodSchema
@@ -38,6 +37,32 @@ function createKyselyExecutor(db) {
   };
   return executor;
 }
+function createCrdtStorageDb(executor) {
+  const wrapper = {
+    executePreparedRaw: ({
+      sql,
+      params
+    }) => executor.execute({
+      sql,
+      parameters: params ?? []
+    }).rows,
+    executePrepared: (_, params, factory) => {
+      const query = factory(dummyKysely, (key) => key).compile();
+      const parameters = query.parameters.map((param) => params[param]);
+      const result = executor.execute({
+        sql: query.sql,
+        parameters
+      });
+      return result.rows;
+    }
+  };
+  return {
+    ...wrapper,
+    executeTransaction: (callback) => executor.transaction(() => {
+      callback(wrapper);
+    })
+  };
+}
 
 // src/migrator.ts
 import { createMigrator as createBaseMigrator, createStoredValue } from "@sqlite-sync/core";
@@ -72,21 +97,7 @@ function createMigrator(kv, sqlExecutor, migrations, updateLogTableName2) {
 
 // src/durable-object-adapter.ts
 var updateLogTableName = "__crdt_update_log";
-var durableObjectMigrations = [
-  ...baseSystemMigrations,
-  {
-    version: 2,
-    up: (ctx) => {
-      ctx.execute(
-        `DELETE FROM ${ctx.eventsTableName} WHERE "sync_id" NOT IN (SELECT MIN("sync_id") FROM ${ctx.eventsTableName} GROUP BY "timestamp", "source_node_id")`
-      );
-      ctx.execute(
-        `CREATE UNIQUE INDEX IF NOT EXISTS "idx_crdt_events_dedup" ON ${ctx.eventsTableName} ("timestamp", "source_node_id")`
-      );
-    }
-  }
-];
-function createDurableObjectCrdtStorage({
+async function createDurableObjectCrdtStorage({
   storage,
   syncDbSchema,
   nodeId,
@@ -94,98 +105,49 @@ function createDurableObjectCrdtStorage({
   batchSize = 50,
   broadcastPayload
 }) {
+  await xxhash.ensureLoaded();
+  const dbConfig = createSystemDbConfig({
+    eventsTableName: crdtEventsTable,
+    updateLogTableName
+  });
   const eventTarget = createTypedEventTarget();
   const sqlExecutor = createKyselyExecutor(storage);
+  const crdtStorageDb = createCrdtStorageDb(sqlExecutor);
   runSystemMigrations({
-    migrations: durableObjectMigrations,
+    migrations: baseSystemMigrations,
     version: createStoredValue2({
       initialValue: storage.kv.get("internal-schema-version") ?? -1,
       saveToStorage: (val) => storage.kv.put("internal-schema-version", val)
     }),
-    eventsTableName: quoteId(crdtEventsTable),
-    updateLogTableName: quoteId(updateLogTableName),
+    dbConfig,
     execute: (sql) => sqlExecutor.execute({ sql, parameters: [] }),
     transaction: (callback) => sqlExecutor.transaction(callback)
   });
-  const syncId = createStoredValue2({
-    initialValue: getLatestSyncId(sqlExecutor)
-  });
-  const migrator = createMigrator(storage.kv, sqlExecutor, syncDbSchema.migrations, quoteId(updateLogTableName));
+  const migrator = createMigrator(
+    storage.kv,
+    sqlExecutor,
+    syncDbSchema.migrations,
+    dbConfig.updateLogTable.fullIdentifier
+  );
   migrator.migrateDbToLatest();
-  const baseApply = createCrdtApplyFunction({
-    getCrdtUpdateLog(opts) {
-      const [metaRow] = sqlExecutor.executeKysely(
-        (db) => db.selectFrom(updateLogTableName).select("payload").where("item_id", "=", opts.itemId).where("dataset", "=", opts.dataset)
-      ).rows;
-      return metaRow ? JSON.parse(metaRow.payload) : null;
-    },
-    insertCrdtUpdateLog(opts) {
-      sqlExecutor.executeKysely(
-        (db) => db.insertInto(updateLogTableName).values({
-          item_id: opts.itemId,
-          dataset: opts.dataset,
-          payload: opts.payload
-        })
-      );
-    },
-    updateCrdtUpdateLog(opts) {
-      sqlExecutor.executeKysely(
-        (db) => db.updateTable(updateLogTableName).set({
-          payload: opts.payload
-        }).where("item_id", "=", opts.itemId).where("dataset", "=", opts.dataset)
-      );
-    },
-    insertItem(opts) {
-      sqlExecutor.executeKysely((db) => db.insertInto(opts.dataset).values(opts.payload));
-    },
-    updateItem(opts) {
-      const keys = Array.from(Object.keys(opts.payload));
-      sqlExecutor.execute({
-        sql: `update ${quoteId(opts.dataset)} set ${keys.map((key) => `${quoteId(key)} = ?`).join(",")} where id = ?`,
-        parameters: [...keys.map((key) => opts.payload[key]), opts.itemId]
-      });
-    }
-  });
-  const handleCrdtEventApply = (event) => {
-    sqlExecutor.transaction(() => {
-      baseApply(event);
-    });
-    queueMicrotask(() => {
-      eventTarget.dispatchEvent("event-applied", event);
-    });
-  };
   const truncatedNodeId = nodeId.slice(0, 12);
   const hlc = new HLCCounter(truncatedNodeId, () => Date.now());
   const crdtStorage = createCrdtStorage({
     nodeId: truncatedNodeId,
-    syncId,
+    initialLocalSyncId: getLatestSyncId(sqlExecutor),
     hlc,
     migrator,
-    handleCrdtEventApply,
-    transaction: (callback) => sqlExecutor.transaction(callback),
-    getEventsBatch: (opts) => {
-      return sqlExecutor.executeKysely(
-        (db) => applyKyselyEventsBatchFilters(db.selectFrom(crdtEventsTable).selectAll(), {
-          ...opts,
-          limit: opts.limit ?? batchSize
-        })
-      ).rows;
-    },
-    persistEvent: (event) => {
-      sqlExecutor.executeKysely(
-        (db) => db.insertInto(crdtEventsTable).values(event).onConflict((oc) => oc.columns(["timestamp", "source_node_id"]).doNothing())
-      );
-    },
-    updateEvent: (syncId2, event) => sqlExecutor.executeKysely(
-      (db) => db.updateTable(crdtEventsTable).set({
-        status: event.status,
-        dataset: event.dataset,
-        item_id: event.item_id,
-        schema_version: event.schema_version,
-        type: event.type,
-        payload: event.payload
-      }).where("sync_id", "=", syncId2)
-    )
+    db: crdtStorageDb,
+    dbConfig,
+    eventHlcAccumulator: createStoredValue2({
+      initialValue: storage.kv.get("crdt.consistency.event_hlc_sum.v3") ?? "",
+      saveToStorage: (val) => storage.kv.put("crdt.consistency.event_hlc_sum.v3", val)
+    }),
+    onEventApplied: (event) => {
+      queueMicrotask(() => {
+        eventTarget.dispatchEvent("event-applied", event);
+      });
+    }
   });
   const remoteHandler = createDurableObjectRemoteHandler({
     bufferSize: batchSize,
@@ -218,7 +180,8 @@ function createDurableObjectRemoteHandler({
       broadcastPayload(
         JSON.stringify({
           type: "events-applied",
-          newSyncId: chunk.newSyncId
+          newSyncId: chunk.newSyncId,
+          eventHlcSum: chunk.eventHlcSum
         })
       );
     }
@@ -249,7 +212,7 @@ function createDurableObjectRemoteHandler({
       limit: bufferSize,
       status: "applied",
       afterSyncId: request.afterSyncId,
-      excludeNodeId: request.excludeNodeId
+      excludeNodeId: request.excludeNodeId ?? ""
     });
     const eventsPullMessage = {
       type: "events-pull-response",
@@ -273,12 +236,14 @@ function createDurableObjectRemoteHandler({
     };
   };
   const handlePushEvents = (request) => {
-    crdtStorage.enqueueLocalEvents(request.events, request.nodeId);
+    const { beforeSyncId, afterSyncId } = crdtStorage.enqueueLocalEvents(request.events, request.nodeId);
     const eventsAppliedMessage = {
       type: "events-push-response",
       requestId: request.requestId,
       data: {
-        ok: true
+        ok: true,
+        beforeSyncId,
+        afterSyncId
       }
     };
     return {
@@ -298,6 +263,7 @@ var durableObjectAdapter = {
   createCrdtStorage: createDurableObjectCrdtStorage
 };
 export {
+  createCrdtStorageDb,
   createKyselyExecutor,
   createMigrator,
   durableObjectAdapter

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/durable-object-adapter.ts","../src/kysely-executor.ts","../src/migrator.ts"],"sourcesContent":["import {\n  applyKyselyEventsBatchFilters,\n  baseSystemMigrations,\n  type CrdtEventOrigin,\n  type CrdtEventStatus,\n  type CrdtEventType,\n  type CrdtStorage,\n  type CrdtStorageMutator,\n  type CrdtUpdateLogItem,\n  type CrdtUpdateLogPayload,\n  createCrdtApplyFunction,\n  createCrdtStorage,\n  createCrdtStorageMutator,\n  createCrdtSyncProducer,\n  createStoredValue,\n  createTypedEventTarget,\n  HLCCounter,\n  jsonSafeParse,\n  type PersistedCrdtEvent,\n  quoteId,\n  runSystemMigrations,\n  type SyncDbSchema,\n  type SystemMigration,\n  type TypedEventTarget,\n} from \"@sqlite-sync/core\";\nimport {\n  type ExtractSyncServerRequest,\n  type SyncServerMessage,\n  type SyncServerRequest,\n  syncServerZodSchema,\n} from \"@sqlite-sync/core/server\";\nimport { createKyselyExecutor, type KyselyExecutor } from \"./kysely-executor\";\nimport { createMigrator } from \"./migrator\";\n\nconst updateLogTableName = \"__crdt_update_log\";\n\nconst durableObjectMigrations: SystemMigration[] = [\n  ...baseSystemMigrations,\n  {\n    version: 2,\n    up: (ctx) => {\n      ctx.execute(\n        `DELETE FROM ${ctx.eventsTableName} WHERE \"sync_id\" NOT IN ` +\n          `(SELECT MIN(\"sync_id\") FROM ${ctx.eventsTableName} GROUP BY \"timestamp\", \"source_node_id\")`,\n      );\n      ctx.execute(\n        `CREATE UNIQUE INDEX IF NOT EXISTS \"idx_crdt_events_dedup\" ` +\n          `ON ${ctx.eventsTableName} (\"timestamp\", \"source_node_id\")`,\n      );\n    },\n  },\n];\n\ntype AdapterDb = {\n  crdtEvents: PersistedCrdtEvent;\n  [updateLogTableName]: CrdtUpdateLogItem;\n};\n\nexport type TypedPersistedCrdtEvent<Schema extends SyncDbSchema> = {\n  schema_version: number;\n  sync_id: number;\n  status: CrdtEventStatus;\n  type: CrdtEventType;\n  timestamp: string;\n  origin: CrdtEventOrigin;\n  source_node_id: string;\n  dataset: keyof Schema[`~mutationsSchema`];\n  item_id: string;\n  payload: string;\n};\n\ntype ServerSyncDbEvents<Schema extends SyncDbSchema> = {\n  \"event-applied\": TypedPersistedCrdtEvent<Schema>;\n};\n\nexport type ServerSyncDb<Schema extends SyncDbSchema> = Pick<\n  KyselyExecutor<Schema[`~serverSchema`]>,\n  \"execute\" | \"executeKysely\"\n> &\n  CrdtStorageMutator<Schema[`~mutationsSchema`]> &\n  Pick<TypedEventTarget<ServerSyncDbEvents<Schema>>, \"addEventListener\" | \"removeEventListener\">;\n\nfunction createDurableObjectCrdtStorage<Schema extends SyncDbSchema>({\n  storage,\n  syncDbSchema,\n  nodeId,\n  crdtEventsTable = \"crdt_events\",\n  batchSize = 50,\n  broadcastPayload,\n}: {\n  storage: DurableObjectStorage;\n  syncDbSchema: Schema;\n  nodeId: string;\n  crdtEventsTable: string;\n  batchSize?: number;\n  broadcastPayload: (payload: string) => void;\n}): {\n  syncDb: ServerSyncDb<Schema>;\n  remoteHandler: RemoteHandler;\n} {\n  const eventTarget = createTypedEventTarget<ServerSyncDbEvents<Schema>>();\n  const sqlExecutor = createKyselyExecutor<AdapterDb>(storage);\n\n  runSystemMigrations({\n    migrations: durableObjectMigrations,\n    version: createStoredValue<number>({\n      initialValue: storage.kv.get(\"internal-schema-version\") ?? -1,\n      saveToStorage: (val) => storage.kv.put(\"internal-schema-version\", val),\n    }),\n    eventsTableName: quoteId(crdtEventsTable),\n    updateLogTableName: quoteId(updateLogTableName),\n    execute: (sql) => sqlExecutor.execute({ sql, parameters: [] }),\n    transaction: (callback) => sqlExecutor.transaction(callback),\n  });\n\n  const syncId = createStoredValue({\n    initialValue: getLatestSyncId(sqlExecutor),\n  });\n\n  const migrator = createMigrator(storage.kv, sqlExecutor, syncDbSchema.migrations, quoteId(updateLogTableName));\n  migrator.migrateDbToLatest();\n\n  const baseApply = createCrdtApplyFunction({\n    getCrdtUpdateLog(opts) {\n      const [metaRow] = sqlExecutor.executeKysely((db) =>\n        db\n          .selectFrom(updateLogTableName)\n          .select(\"payload\")\n          .where(\"item_id\", \"=\", opts.itemId)\n          .where(\"dataset\", \"=\", opts.dataset),\n      ).rows;\n      return metaRow ? (JSON.parse(metaRow.payload) as CrdtUpdateLogPayload) : null;\n    },\n    insertCrdtUpdateLog(opts) {\n      sqlExecutor.executeKysely((db) =>\n        db.insertInto(updateLogTableName).values({\n          item_id: opts.itemId,\n          dataset: opts.dataset,\n          payload: opts.payload,\n        }),\n      );\n    },\n    updateCrdtUpdateLog(opts) {\n      sqlExecutor.executeKysely((db) =>\n        db\n          .updateTable(updateLogTableName)\n          .set({\n            payload: opts.payload,\n          })\n          .where(\"item_id\", \"=\", opts.itemId)\n          .where(\"dataset\", \"=\", opts.dataset),\n      );\n    },\n    insertItem(opts) {\n      sqlExecutor.executeKysely((db) => db.insertInto(opts.dataset as any).values(opts.payload));\n    },\n    updateItem(opts) {\n      const keys = Array.from(Object.keys(opts.payload));\n      sqlExecutor.execute({\n        sql: `update ${quoteId(opts.dataset)} set ${keys.map((key) => `${quoteId(key)} = ?`).join(\",\")} where id = ?`,\n        parameters: [...keys.map((key) => opts.payload[key]), opts.itemId],\n      });\n    },\n  });\n\n  const handleCrdtEventApply = (event: PersistedCrdtEvent) => {\n    sqlExecutor.transaction(() => {\n      baseApply(event);\n    });\n\n    queueMicrotask(() => {\n      eventTarget.dispatchEvent(\"event-applied\", event as TypedPersistedCrdtEvent<Schema>);\n    });\n  };\n\n  const truncatedNodeId = nodeId.slice(0, 12);\n  const hlc = new HLCCounter(truncatedNodeId, () => Date.now());\n\n  const crdtStorage = createCrdtStorage({\n    nodeId: truncatedNodeId,\n    syncId,\n    hlc,\n    migrator: migrator,\n    handleCrdtEventApply,\n    transaction: (callback) => sqlExecutor.transaction(callback),\n    getEventsBatch: (opts) => {\n      return sqlExecutor.executeKysely((db) =>\n        applyKyselyEventsBatchFilters(db.selectFrom(crdtEventsTable as \"crdtEvents\").selectAll(), {\n          ...opts,\n          limit: opts.limit ?? batchSize,\n        }),\n      ).rows;\n    },\n    persistEvent: (event) => {\n      sqlExecutor.executeKysely((db) =>\n        db\n          .insertInto(crdtEventsTable as \"crdtEvents\")\n          .values(event)\n          .onConflict((oc) => oc.columns([\"timestamp\", \"source_node_id\"]).doNothing()),\n      );\n    },\n    updateEvent: (syncId, event) =>\n      sqlExecutor.executeKysely((db) =>\n        db\n          .updateTable(crdtEventsTable as \"crdtEvents\")\n          .set({\n            status: event.status,\n            dataset: event.dataset,\n            item_id: event.item_id,\n            schema_version: event.schema_version,\n            type: event.type,\n            payload: event.payload,\n          })\n          .where(\"sync_id\", \"=\", syncId),\n      ),\n  });\n\n  const remoteHandler = createDurableObjectRemoteHandler({\n    bufferSize: batchSize,\n    crdtStorage,\n    broadcastPayload,\n  });\n\n  const syncDbMutator = createCrdtStorageMutator<Schema[`~mutationsSchema`]>({\n    storage: crdtStorage,\n  });\n\n  const syncDbExecutor = sqlExecutor as unknown as KyselyExecutor<Schema[`~serverSchema`]>;\n  const syncDb: ServerSyncDb<Schema> = {\n    ...syncDbExecutor,\n    ...syncDbMutator,\n    addEventListener: eventTarget.addEventListener,\n    removeEventListener: eventTarget.removeEventListener,\n  };\n\n  return {\n    syncDb,\n    remoteHandler,\n  };\n}\n\ntype MessageResult = { success: true; payload: string } | { success: false; error: unknown };\nexport type RemoteHandler = {\n  handleMessage: (message: string) => MessageResult;\n};\n\nfunction createDurableObjectRemoteHandler({\n  bufferSize = 50,\n  crdtStorage,\n  broadcastPayload,\n}: {\n  bufferSize?: number;\n  crdtStorage: CrdtStorage;\n  broadcastPayload: (payload: string) => void;\n}): RemoteHandler {\n  createCrdtSyncProducer({\n    storage: crdtStorage,\n    broadcastEvents: (chunk) => {\n      broadcastPayload(\n        JSON.stringify({\n          type: \"events-applied\",\n          newSyncId: chunk.newSyncId,\n        }),\n      );\n    },\n  });\n\n  const handleMessage = (message: string): MessageResult => {\n    const requestRaw = jsonSafeParse<SyncServerRequest>(message);\n\n    if (!requestRaw.success) {\n      return { success: false, error: requestRaw.error };\n    }\n\n    const requestResult = syncServerZodSchema.request.safeParse(requestRaw.data);\n\n    if (!requestResult.success) {\n      console.log(\"Invalid request\", requestResult.error);\n      return { success: false, error: requestResult.error };\n    }\n\n    const request = requestResult.data;\n\n    switch (request.type) {\n      case \"pull-events\":\n        return handlePullEvents(request);\n      case \"push-events\":\n        return handlePushEvents(request);\n      default:\n        request satisfies never;\n        return { success: false, error: new Error(\"Invalid request type\") };\n    }\n  };\n\n  const handlePullEvents = (request: ExtractSyncServerRequest<\"pull-events\">): MessageResult => {\n    const batch = crdtStorage.getEventsBatch({\n      limit: bufferSize,\n      status: \"applied\",\n      afterSyncId: request.afterSyncId,\n      excludeNodeId: request.excludeNodeId,\n    });\n\n    const eventsPullMessage: SyncServerMessage = {\n      type: \"events-pull-response\",\n      requestId: request.requestId,\n      data: {\n        hasMore: batch.hasMore,\n        nextSyncId: batch.nextSyncId,\n        events: batch.events.map((x) => ({\n          schema_version: x.schema_version,\n          timestamp: x.timestamp,\n          type: x.type,\n          dataset: x.dataset,\n          item_id: x.item_id,\n          payload: x.payload,\n        })),\n      },\n    };\n\n    return {\n      success: true,\n      payload: JSON.stringify(eventsPullMessage),\n    };\n  };\n\n  const handlePushEvents = (request: ExtractSyncServerRequest<\"push-events\">): MessageResult => {\n    crdtStorage.enqueueLocalEvents(request.events, request.nodeId);\n    const eventsAppliedMessage: SyncServerMessage = {\n      type: \"events-push-response\",\n      requestId: request.requestId,\n      data: {\n        ok: true,\n      },\n    };\n\n    return {\n      success: true,\n      payload: JSON.stringify(eventsAppliedMessage),\n    };\n  };\n\n  return { handleMessage };\n}\n\nfunction getLatestSyncId(executor: KyselyExecutor<any>) {\n  const result = executor.executeKysely((db) =>\n    db.selectFrom(\"crdt_events\").select((eb) => eb.fn.max(\"sync_id\").as(\"sync_id\")),\n  );\n  return result.rows[0]?.sync_id ?? 0;\n}\n\nexport const durableObjectAdapter = {\n  createCrdtStorage: createDurableObjectCrdtStorage,\n};\n","import { dummyKysely } from \"@sqlite-sync/core\";\nimport type { Compilable, Kysely } from \"kysely\";\n\ntype ExecuteParams = {\n  sql: string;\n  parameters: readonly unknown[];\n};\n\ntype ExecuteResult<T> = {\n  rows: T[];\n};\n\ntype QueryBuilderOutput<QB> = QB extends Compilable<infer O> ? O : never;\n\ntype KyselyQueryFactory<TDatabase, TQuery extends Compilable<TResult>, TResult = QueryBuilderOutput<TQuery>> = (\n  kysely: Kysely<TDatabase>,\n) => TQuery;\n\nexport type KyselyExecutor<TDatabase> = {\n  execute<TResult = unknown>(query: ExecuteParams): ExecuteResult<TResult>;\n  executeKysely<TQuery extends Compilable<TResult>, TResult = QueryBuilderOutput<TQuery>>(\n    factory: KyselyQueryFactory<TDatabase, TQuery, TResult>,\n  ): ExecuteResult<TResult>;\n  transaction: (callback: (tx: Pick<KyselyExecutor<TDatabase>, \"execute\" | \"executeKysely\">) => void) => void;\n};\n\nexport function createKyselyExecutor<TDatabase>(db: DurableObjectStorage): KyselyExecutor<TDatabase> {\n  const execute = <TResult = unknown>(query: ExecuteParams): ExecuteResult<TResult> => {\n    const rows = db.sql.exec(query.sql, ...query.parameters).toArray();\n    return { rows: rows as TResult[] };\n  };\n\n  const executeKysely = <TQuery extends Compilable<TResult>, TResult = QueryBuilderOutput<TQuery>>(\n    factory: KyselyQueryFactory<TDatabase, TQuery, TResult>,\n  ): ExecuteResult<TResult> => {\n    const query = factory(dummyKysely as any).compile();\n    return execute(query);\n  };\n\n  const transaction = (callback: (tx: Pick<KyselyExecutor<TDatabase>, \"execute\" | \"executeKysely\">) => void) => {\n    db.transactionSync(() => callback(executor));\n  };\n\n  const executor = {\n    execute,\n    executeKysely,\n    transaction,\n  };\n\n  return executor;\n}\n","import { createMigrator as createBaseMigrator, createStoredValue, type Migrations } from \"@sqlite-sync/core\";\nimport type { KyselyExecutor } from \"./kysely-executor\";\n\nexport function createMigrator(\n  kv: SyncKvStorage,\n  sqlExecutor: KyselyExecutor<any>,\n  migrations: Migrations,\n  updateLogTableName?: string,\n) {\n  const schemaVersion = createStoredValue<number>({\n    initialValue: kv.get(\"schema-version\") ?? -1,\n    saveToStorage: (val) => kv.put(\"schema-version\", val),\n  });\n\n  const baseMigrator = createBaseMigrator({\n    migrations,\n    schemaVersion,\n    updateLogTableName,\n  });\n\n  return {\n    ...baseMigrator,\n    migrateDbToLatest: () => {\n      baseMigrator.migrateDbToLatest({\n        startTransaction: (callback) => {\n          sqlExecutor.transaction(() => {\n            return callback({\n              execute: (sql, parameters) =>\n                sqlExecutor.execute({\n                  sql,\n                  parameters,\n                }),\n            });\n          });\n        },\n      });\n    },\n  };\n}\n\nexport type SyncDbMigrator = ReturnType<typeof createMigrator>;\n"],"mappings":"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","names":["createStoredValue","updateLogTableName","createStoredValue","syncId"]}
+{"version":3,"sources":["../src/durable-object-adapter.ts","../src/kysely-executor.ts","../src/migrator.ts"],"sourcesContent":["import {\n  baseSystemMigrations,\n  type CrdtEventOrigin,\n  type CrdtEventStatus,\n  type CrdtEventType,\n  type CrdtStorage,\n  type CrdtStorageMutator,\n  type CrdtUpdateLogItem,\n  createCrdtStorage,\n  createCrdtStorageMutator,\n  createCrdtSyncProducer,\n  createStoredValue,\n  createSystemDbConfig,\n  createTypedEventTarget,\n  HLCCounter,\n  jsonSafeParse,\n  type PersistedCrdtEvent,\n  runSystemMigrations,\n  type SyncDbSchema,\n  type TypedEventTarget,\n  xxhash,\n} from \"@sqlite-sync/core\";\nimport {\n  type ExtractSyncServerRequest,\n  type SyncServerMessage,\n  type SyncServerRequest,\n  syncServerZodSchema,\n} from \"@sqlite-sync/core/server\";\nimport { createCrdtStorageDb, createKyselyExecutor, type KyselyExecutor } from \"./kysely-executor\";\nimport { createMigrator } from \"./migrator\";\n\nconst updateLogTableName = \"__crdt_update_log\";\n\ntype AdapterDb = {\n  crdtEvents: PersistedCrdtEvent;\n  [updateLogTableName]: CrdtUpdateLogItem;\n};\n\nexport type TypedPersistedCrdtEvent<Schema extends SyncDbSchema> = {\n  schema_version: number;\n  sync_id: number;\n  status: CrdtEventStatus;\n  type: CrdtEventType;\n  timestamp: string;\n  origin: CrdtEventOrigin;\n  source_node_id: string;\n  dataset: keyof Schema[`~mutationsSchema`];\n  item_id: string;\n  payload: string;\n};\n\ntype ServerSyncDbEvents<Schema extends SyncDbSchema> = {\n  \"event-applied\": TypedPersistedCrdtEvent<Schema>;\n};\n\nexport type ServerSyncDb<Schema extends SyncDbSchema> = Pick<\n  KyselyExecutor<Schema[`~serverSchema`]>,\n  \"execute\" | \"executeKysely\"\n> &\n  CrdtStorageMutator<Schema[`~mutationsSchema`]> &\n  Pick<TypedEventTarget<ServerSyncDbEvents<Schema>>, \"addEventListener\" | \"removeEventListener\">;\n\nasync function createDurableObjectCrdtStorage<Schema extends SyncDbSchema>({\n  storage,\n  syncDbSchema,\n  nodeId,\n  crdtEventsTable = \"crdt_events\",\n  batchSize = 50,\n  broadcastPayload,\n}: {\n  storage: DurableObjectStorage;\n  syncDbSchema: Schema;\n  nodeId: string;\n  crdtEventsTable: string;\n  batchSize?: number;\n  broadcastPayload: (payload: string) => void;\n}): Promise<{\n  syncDb: ServerSyncDb<Schema>;\n  remoteHandler: RemoteHandler;\n}> {\n  await xxhash.ensureLoaded();\n\n  const dbConfig = createSystemDbConfig({\n    eventsTableName: crdtEventsTable,\n    updateLogTableName: updateLogTableName,\n  });\n\n  const eventTarget = createTypedEventTarget<ServerSyncDbEvents<Schema>>();\n  const sqlExecutor = createKyselyExecutor<AdapterDb>(storage);\n  const crdtStorageDb = createCrdtStorageDb(sqlExecutor);\n\n  runSystemMigrations({\n    migrations: baseSystemMigrations,\n    version: createStoredValue<number>({\n      initialValue: storage.kv.get(\"internal-schema-version\") ?? -1,\n      saveToStorage: (val) => storage.kv.put(\"internal-schema-version\", val),\n    }),\n    dbConfig,\n    execute: (sql) => sqlExecutor.execute({ sql, parameters: [] }),\n    transaction: (callback) => sqlExecutor.transaction(callback),\n  });\n\n  const migrator = createMigrator(\n    storage.kv,\n    sqlExecutor,\n    syncDbSchema.migrations,\n    dbConfig.updateLogTable.fullIdentifier,\n  );\n  migrator.migrateDbToLatest();\n\n  const truncatedNodeId = nodeId.slice(0, 12);\n  const hlc = new HLCCounter(truncatedNodeId, () => Date.now());\n\n  const crdtStorage = createCrdtStorage({\n    nodeId: truncatedNodeId,\n    initialLocalSyncId: getLatestSyncId(sqlExecutor),\n    hlc,\n    migrator: migrator,\n    db: crdtStorageDb,\n    dbConfig,\n    eventHlcAccumulator: createStoredValue<string>({\n      initialValue: storage.kv.get(\"crdt.consistency.event_hlc_sum.v3\") ?? \"\",\n      saveToStorage: (val) => storage.kv.put(\"crdt.consistency.event_hlc_sum.v3\", val),\n    }),\n    onEventApplied: (event) => {\n      queueMicrotask(() => {\n        eventTarget.dispatchEvent(\"event-applied\", event as TypedPersistedCrdtEvent<Schema>);\n      });\n    },\n  });\n\n  const remoteHandler = createDurableObjectRemoteHandler({\n    bufferSize: batchSize,\n    crdtStorage,\n    broadcastPayload,\n  });\n\n  const syncDbMutator = createCrdtStorageMutator<Schema[`~mutationsSchema`]>({\n    storage: crdtStorage,\n  });\n\n  const syncDbExecutor = sqlExecutor as unknown as KyselyExecutor<Schema[`~serverSchema`]>;\n  const syncDb: ServerSyncDb<Schema> = {\n    ...syncDbExecutor,\n    ...syncDbMutator,\n    addEventListener: eventTarget.addEventListener,\n    removeEventListener: eventTarget.removeEventListener,\n  };\n\n  return {\n    syncDb,\n    remoteHandler,\n  };\n}\n\ntype MessageResult = { success: true; payload: string } | { success: false; error: unknown };\nexport type RemoteHandler = {\n  handleMessage: (message: string) => MessageResult;\n};\n\nfunction createDurableObjectRemoteHandler({\n  bufferSize = 50,\n  crdtStorage,\n  broadcastPayload,\n}: {\n  bufferSize?: number;\n  crdtStorage: CrdtStorage;\n  broadcastPayload: (payload: string) => void;\n}): RemoteHandler {\n  createCrdtSyncProducer({\n    storage: crdtStorage,\n    broadcastEvents: (chunk) => {\n      broadcastPayload(\n        JSON.stringify({\n          type: \"events-applied\",\n          newSyncId: chunk.newSyncId,\n          eventHlcSum: chunk.eventHlcSum,\n        }),\n      );\n    },\n  });\n\n  const handleMessage = (message: string): MessageResult => {\n    const requestRaw = jsonSafeParse<SyncServerRequest>(message);\n\n    if (!requestRaw.success) {\n      return { success: false, error: requestRaw.error };\n    }\n\n    const requestResult = syncServerZodSchema.request.safeParse(requestRaw.data);\n\n    if (!requestResult.success) {\n      console.log(\"Invalid request\", requestResult.error);\n      return { success: false, error: requestResult.error };\n    }\n\n    const request = requestResult.data;\n\n    switch (request.type) {\n      case \"pull-events\":\n        return handlePullEvents(request);\n      case \"push-events\":\n        return handlePushEvents(request);\n      default:\n        request satisfies never;\n        return { success: false, error: new Error(\"Invalid request type\") };\n    }\n  };\n\n  const handlePullEvents = (request: ExtractSyncServerRequest<\"pull-events\">): MessageResult => {\n    const batch = crdtStorage.getEventsBatch({\n      limit: bufferSize,\n      status: \"applied\",\n      afterSyncId: request.afterSyncId,\n      excludeNodeId: request.excludeNodeId ?? \"\",\n    });\n\n    const eventsPullMessage: SyncServerMessage = {\n      type: \"events-pull-response\",\n      requestId: request.requestId,\n      data: {\n        hasMore: batch.hasMore,\n        nextSyncId: batch.nextSyncId,\n        events: batch.events.map((x) => ({\n          schema_version: x.schema_version,\n          timestamp: x.timestamp,\n          type: x.type,\n          dataset: x.dataset,\n          item_id: x.item_id,\n          payload: x.payload,\n        })),\n      },\n    };\n\n    return {\n      success: true,\n      payload: JSON.stringify(eventsPullMessage),\n    };\n  };\n\n  const handlePushEvents = (request: ExtractSyncServerRequest<\"push-events\">): MessageResult => {\n    const { beforeSyncId, afterSyncId } = crdtStorage.enqueueLocalEvents(request.events, request.nodeId);\n    const eventsAppliedMessage: SyncServerMessage = {\n      type: \"events-push-response\",\n      requestId: request.requestId,\n      data: {\n        ok: true,\n        beforeSyncId,\n        afterSyncId,\n      },\n    };\n\n    return {\n      success: true,\n      payload: JSON.stringify(eventsAppliedMessage),\n    };\n  };\n\n  return { handleMessage };\n}\n\nfunction getLatestSyncId(executor: KyselyExecutor<any>) {\n  const result = executor.executeKysely((db) =>\n    db.selectFrom(\"crdt_events\").select((eb) => eb.fn.max(\"sync_id\").as(\"sync_id\")),\n  );\n  return result.rows[0]?.sync_id ?? 0;\n}\n\nexport const durableObjectAdapter = {\n  createCrdtStorage: createDurableObjectCrdtStorage,\n};\n","import { dummyKysely, type InternalSQLiteWrapper, type KyselyStatementFactory } from \"@sqlite-sync/core\";\nimport type { Compilable, Kysely } from \"kysely\";\n\ntype ExecuteParams = {\n  sql: string;\n  parameters: readonly unknown[];\n};\n\ntype ExecuteResult<T> = {\n  rows: T[];\n};\n\ntype QueryBuilderOutput<QB> = QB extends Compilable<infer O> ? O : never;\n\ntype KyselyQueryFactory<TDatabase, TQuery extends Compilable<TResult>, TResult = QueryBuilderOutput<TQuery>> = (\n  kysely: Kysely<TDatabase>,\n) => TQuery;\n\nexport type KyselyExecutor<TDatabase> = {\n  execute<TResult = unknown>(query: ExecuteParams): ExecuteResult<TResult>;\n  executeKysely<TQuery extends Compilable<TResult>, TResult = QueryBuilderOutput<TQuery>>(\n    factory: KyselyQueryFactory<TDatabase, TQuery, TResult>,\n  ): ExecuteResult<TResult>;\n  transaction: (callback: (tx: Pick<KyselyExecutor<TDatabase>, \"execute\" | \"executeKysely\">) => void) => void;\n};\n\nexport function createKyselyExecutor<TDatabase>(db: DurableObjectStorage): KyselyExecutor<TDatabase> {\n  const execute = <TResult = unknown>(query: ExecuteParams): ExecuteResult<TResult> => {\n    const rows = db.sql.exec(query.sql, ...query.parameters).toArray();\n    return { rows: rows as TResult[] };\n  };\n\n  const executeKysely = <TQuery extends Compilable<TResult>, TResult = QueryBuilderOutput<TQuery>>(\n    factory: KyselyQueryFactory<TDatabase, TQuery, TResult>,\n  ): ExecuteResult<TResult> => {\n    const query = factory(dummyKysely as any).compile();\n    return execute(query);\n  };\n\n  const transaction = (callback: (tx: Pick<KyselyExecutor<TDatabase>, \"execute\" | \"executeKysely\">) => void) => {\n    db.transactionSync(() => callback(executor));\n  };\n\n  const executor = {\n    execute,\n    executeKysely,\n    transaction,\n  };\n\n  return executor;\n}\n\nexport function createCrdtStorageDb(executor: KyselyExecutor<any>): InternalSQLiteWrapper<any> {\n  const wrapper: Omit<InternalSQLiteWrapper<any>, \"executeTransaction\"> = {\n    executePreparedRaw: <TParams extends unknown[], TResult>({\n      sql,\n      params,\n    }: {\n      sql: string;\n      params?: TParams | undefined;\n    }) =>\n      executor.execute<TResult>({\n        sql,\n        parameters: params ?? [],\n      }).rows,\n\n    executePrepared: <\n      TParams extends Record<string, unknown>,\n      TQuery extends Compilable<TResult>,\n      TResult = QueryBuilderOutput<TQuery>,\n    >(\n      _: string,\n      params: TParams,\n      factory: KyselyStatementFactory<TParams, any, TQuery, TResult>,\n    ) => {\n      const query = factory(dummyKysely as any, (key) => key as any).compile();\n      const parameters = query.parameters.map((param) => params[param as keyof TParams]);\n      const result = executor.execute<TResult>({\n        sql: query.sql,\n        parameters,\n      });\n      return result.rows;\n    },\n  };\n\n  return {\n    ...wrapper,\n    executeTransaction: (callback) =>\n      executor.transaction(() => {\n        callback(wrapper);\n      }),\n  };\n}\n","import { createMigrator as createBaseMigrator, createStoredValue, type Migrations } from \"@sqlite-sync/core\";\nimport type { KyselyExecutor } from \"./kysely-executor\";\n\nexport function createMigrator(\n  kv: SyncKvStorage,\n  sqlExecutor: KyselyExecutor<any>,\n  migrations: Migrations,\n  updateLogTableName?: string,\n) {\n  const schemaVersion = createStoredValue<number>({\n    initialValue: kv.get(\"schema-version\") ?? -1,\n    saveToStorage: (val) => kv.put(\"schema-version\", val),\n  });\n\n  const baseMigrator = createBaseMigrator({\n    migrations,\n    schemaVersion,\n    updateLogTableName,\n  });\n\n  return {\n    ...baseMigrator,\n    migrateDbToLatest: () => {\n      baseMigrator.migrateDbToLatest({\n        startTransaction: (callback) => {\n          sqlExecutor.transaction(() => {\n            return callback({\n              execute: (sql, parameters) =>\n                sqlExecutor.execute({\n                  sql,\n                  parameters,\n                }),\n            });\n          });\n        },\n      });\n    },\n  };\n}\n\nexport type SyncDbMigrator = ReturnType<typeof createMigrator>;\n"],"mappings":"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","names":["createStoredValue","updateLogTableName","createStoredValue"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sqlite-sync/cloudflare",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Cloudflare utilities for @sqlite-sync/core",
   "type": "module",
   "license": "MIT",
@@ -30,7 +30,7 @@
     "dist"
   ],
   "dependencies": {
-    "@sqlite-sync/core": "0.1.1"
+    "@sqlite-sync/core": "0.2.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.0.0",
@@ -45,6 +45,6 @@
   "scripts": {
     "build": "tsup",
     "dev": "tsup --watch",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsgo --noEmit"
   }
 }