@powersync/service-core 1.12.0 → 1.13.0

package/src/sync/sync.ts

@@ -93,7 +93,7 @@ async function* streamResponseInner(
 ): AsyncGenerator<util.StreamingSyncLine | string | null> {
   const { raw_data, binary_data } = params;
 
-  const checkpointUserId = util.checkpointUserId(syncParams.token_parameters.user_id as string, params.client_id);
+  const checkpointUserId = util.checkpointUserId(syncParams.tokenParameters.user_id as string, params.client_id);
 
   const checksumState = new BucketChecksumState({
     syncContext,
@@ -228,7 +228,7 @@ async function* streamResponseInner(
           onRowsSent: markOperationsSent,
           abort_connection: signal,
           abort_batch: abortCheckpointSignal,
-          user_id: syncParams.user_id,
+          user_id: syncParams.userId,
           // Passing null here will emit a full sync complete message at the end. If we pass a priority, we'll emit a partial
           // sync complete message instead.
           forPriority: !isLast ? priority : null,
@@ -440,7 +440,7 @@ async function* bucketDataBatch(request: BucketDataRequest): AsyncGenerator<Buck
   }
 }
 
-function transformLegacyResponse(bucketData: util.SyncBucketData): any {
+function transformLegacyResponse(bucketData: util.SyncBucketData): util.SyncBucketData<util.ProtocolOplogData> {
   return {
     ...bucketData,
     data: bucketData.data.map((entry) => {

package/src/system/ServiceContext.ts

@@ -59,6 +59,12 @@ export class ServiceContextContainer implements ServiceContext {
     this.storageEngine = new storage.StorageEngine({
       configuration
     });
+    this.storageEngine.registerListener({
+      storageFatalError: (error) => {
+        // Propagate the error to the lifecycle engine
+        this.lifeCycleEngine.stopWithError(error);
+      }
+    });
 
     this.lifeCycleEngine.withLifecycle(this.storageEngine, {
       start: (storageEngine) => storageEngine.start(),

package/src/util/protocol-types.ts

@@ -1,5 +1,6 @@
 import * as t from 'ts-codec';
-import { BucketDescription, BucketPriority, SqliteJsonValue } from '@powersync/service-sync-rules';
+import { BucketDescription, BucketPriority, SqliteJsonRow } from '@powersync/service-sync-rules';
+import { JsonContainer } from '@powersync/service-jsonbig';
 
 export const BucketRequest = t.object({
   name: t.string,
@@ -65,7 +66,7 @@ export interface StreamingSyncCheckpointDiff {
 }
 
 export interface StreamingSyncData {
-  data: SyncBucketData;
+  data: SyncBucketData<ProtocolOplogData>;
 }
 
 export interface StreamingSyncCheckpointComplete {
@@ -109,13 +110,9 @@ export interface BucketState {
   op_id: string;
 }
 
-export interface SyncDataBatch {
-  buckets: SyncBucketData[];
-}
-
-export interface SyncBucketData {
+export interface SyncBucketData<Data extends ProtocolOplogData = StoredOplogData> {
   bucket: string;
-  data: OplogEntry[];
+  data: OplogEntry<Data>[];
   /**
    * True if there _could_ be more data for this bucket, and another request must be made.
    */
@@ -130,12 +127,20 @@ export interface SyncBucketData {
   next_after: ProtocolOpId;
 }
 
-export interface OplogEntry {
+export type StoredOplogData = string | null;
+
+// Note: When clients have both raw_data and binary_data disabled (this only affects legacy
+// clients), data is actually a `Record<string, SqliteJsonValue>`. Oplog entries are always
+// stored as a serialized (JSON) string so that they don't have to be parsed in the sync service,
+// this representation only exists on the way out for legacy clients.
+export type ProtocolOplogData = SqliteJsonRow | JsonContainer | StoredOplogData;
+
+export interface OplogEntry<Data extends ProtocolOplogData = StoredOplogData> {
   op_id: ProtocolOpId;
   op: 'PUT' | 'REMOVE' | 'MOVE' | 'CLEAR';
   object_type?: string;
   object_id?: string;
-  data?: Record<string, SqliteJsonValue> | string | null;
+  data?: Data;
   checksum: number | bigint;
   subkey?: string;
 }