@powersync/common 1.52.0 → 1.53.0

package/dist/bundle.node.cjs

@@ -1819,8 +1819,15 @@ class BaseTransaction {
 class TransactionImplementation extends DBGetUtilsDefaultMixin(BaseTransaction) {
     static async runWith(ctx, fn) {
         let tx = new TransactionImplementation(ctx);
+        // For write transactions, use BEGIN IMMEDIATE to immediately obtain a write lock on the database (instead of doing
+        // that on the first statement). If we have a genuine read-only connection, we also use BEGIN IMMEDIATE there: In
+        // WAL mode, that ensures we pin the current state of the database (instead of the state at the first statement in
+        // the transaction). But if we have a "fake" read-only connection implemented through `pragma query_only = true`, we
+        // can't use this trick because it would attempt to lock the connection. So there, we use a regular `BEGIN`
+        // statement.
+        const useBeginImmediate = ctx.connectionType != 'queryOnly';
         try {
-            await ctx.execute('BEGIN IMMEDIATE');
+            await ctx.execute(useBeginImmediate ? 'BEGIN IMMEDIATE' : 'BEGIN');
             const result = await fn(tx);
             await tx.commit();
             return result;
@@ -1979,16 +1986,12 @@ class SyncStatus {
      *
      * This returns null when the database is currently being opened and we don't have reliable information about all
      * included streams yet.
-     *
-     * @experimental Sync streams are currently in alpha.
      */
     get syncStreams() {
         return this.options.dataFlow?.internalStreamSubscriptions?.map((core) => new SyncStreamStatusView(this, core));
     }
     /**
      * If the `stream` appears in {@link syncStreams}, returns the current status for that stream.
-     *
-     * @experimental Sync streams are currently in alpha.
      */
     forStream(stream) {
         const asJson = JSON.stringify(stream.parameters);
@@ -2571,7 +2574,7 @@ class SyncStreamSubscriptionHandle {
     constructor(subscription) {
         this.subscription = subscription;
         subscription.refcount++;
-        _finalizer?.register(this, subscription);
+        _finalizer?.register(this, subscription, this);
     }
     get name() {
         return this.subscription.name;
@@ -3160,6 +3163,10 @@ exports.PowerSyncControlCommand = void 0;
     PowerSyncControlCommand["NOTIFY_TOKEN_REFRESHED"] = "refreshed_token";
     PowerSyncControlCommand["NOTIFY_CRUD_UPLOAD_COMPLETED"] = "completed_upload";
     PowerSyncControlCommand["UPDATE_SUBSCRIPTIONS"] = "update_subscriptions";
+    /**
+     * An `established` or `end` event for response streams.
+     */
+    PowerSyncControlCommand["CONNECTION_STATE"] = "connection";
 })(exports.PowerSyncControlCommand || (exports.PowerSyncControlCommand = {}));
 
 /**
@@ -3341,103 +3348,6 @@ class AbortOperation extends Error {
     }
 }
 
-exports.OpTypeEnum = void 0;
-(function (OpTypeEnum) {
-    OpTypeEnum[OpTypeEnum["CLEAR"] = 1] = "CLEAR";
-    OpTypeEnum[OpTypeEnum["MOVE"] = 2] = "MOVE";
-    OpTypeEnum[OpTypeEnum["PUT"] = 3] = "PUT";
-    OpTypeEnum[OpTypeEnum["REMOVE"] = 4] = "REMOVE";
-})(exports.OpTypeEnum || (exports.OpTypeEnum = {}));
-/**
- * Used internally for sync buckets.
- */
-class OpType {
-    value;
-    static fromJSON(jsonValue) {
-        return new OpType(exports.OpTypeEnum[jsonValue]);
-    }
-    constructor(value) {
-        this.value = value;
-    }
-    toJSON() {
-        return Object.entries(exports.OpTypeEnum).find(([, value]) => value === this.value)[0];
-    }
-}
-
-class OplogEntry {
-    op_id;
-    op;
-    checksum;
-    subkey;
-    object_type;
-    object_id;
-    data;
-    static fromRow(row) {
-        return new OplogEntry(row.op_id, OpType.fromJSON(row.op), row.checksum, row.subkey, row.object_type, row.object_id, row.data);
-    }
-    constructor(op_id, op, checksum, subkey, object_type, object_id, data) {
-        this.op_id = op_id;
-        this.op = op;
-        this.checksum = checksum;
-        this.subkey = subkey;
-        this.object_type = object_type;
-        this.object_id = object_id;
-        this.data = data;
-    }
-    toJSON(fixedKeyEncoding = false) {
-        return {
-            op_id: this.op_id,
-            op: this.op.toJSON(),
-            object_type: this.object_type,
-            object_id: this.object_id,
-            checksum: this.checksum,
-            data: this.data,
-            // Older versions of the JS SDK used to always JSON.stringify here. That has always been wrong,
-            // but we need to migrate gradually to not break existing databases.
-            subkey: fixedKeyEncoding ? this.subkey : JSON.stringify(this.subkey)
-        };
-    }
-}
-
-class SyncDataBucket {
-    bucket;
-    data;
-    has_more;
-    after;
-    next_after;
-    static fromRow(row) {
-        return new SyncDataBucket(row.bucket, row.data.map((entry) => OplogEntry.fromRow(entry)), row.has_more ?? false, row.after, row.next_after);
-    }
-    constructor(bucket, data, 
-    /**
-     * True if the response does not contain all the data for this bucket, and another request must be made.
-     */
-    has_more, 
-    /**
-     * The `after` specified in the request.
-     */
-    after, 
-    /**
-     * Use this for the next request.
-     */
-    next_after) {
-        this.bucket = bucket;
-        this.data = data;
-        this.has_more = has_more;
-        this.after = after;
-        this.next_after = next_after;
-    }
-    toJSON(fixedKeyEncoding = false) {
-        return {
-            bucket: this.bucket,
-            has_more: this.has_more,
-            after: this.after,
-            next_after: this.next_after,
-            data: this.data.map((entry) => entry.toJSON(fixedKeyEncoding))
-        };
-    }
-}
-
 var dist = {};
 
 var Codecs = {};
@@ -8222,7 +8132,7 @@ function requireDist () {
 
 var distExports = requireDist();
 
-var version = "1.52.0";
+var version = "1.53.0";
 var PACKAGE = {
 	version: version};
 
@@ -8392,22 +8302,6 @@ const doneResult = { done: true, value: undefined };
 function valueResult(value) {
     return { done: false, value };
 }
-/**
- * A variant of {@link Array.map} for async iterators.
- */
-function map(source, map) {
-    return {
-        next: async () => {
-            const value = await source.next();
-            if (value.done) {
-                return value;
-            }
-            else {
-                return { value: map(value.value) };
-            }
-        }
-    };
-}
 /**
  * Expands a source async iterator by allowing to inject events asynchronously.
  *
@@ -8779,22 +8673,12 @@ class AbstractRemote {
      * Returns a data stream of sync line data, fetched via RSocket-over-WebSocket.
      *
      * The only mechanism to abort the returned stream is to use the abort signal in {@link SocketSyncStreamOptions}.
-     *
-     * @param bson A BSON encoder and decoder. When set, the data stream will be requested with a BSON payload
-     * (required for compatibility with older sync services).
      */
-    async socketStreamRaw(options, bson) {
+    async socketStreamRaw(options) {
         const { path, fetchStrategy = exports.FetchStrategy.Buffered } = options;
-        const mimeType = bson == null ? 'application/json' : 'application/bson';
+        const mimeType = 'application/json';
         function toBuffer(js) {
-            let contents;
-            if (bson != null) {
-                contents = bson.serialize(js);
-            }
-            else {
-                contents = JSON.stringify(js);
-            }
-            return node_buffer.Buffer.from(contents);
+            return node_buffer.Buffer.from(JSON.stringify(js));
         }
         const syncQueueRequestSize = fetchStrategy == exports.FetchStrategy.Buffered ? 10 : 1;
         const request = await this.buildRequest(path);
@@ -9095,31 +8979,8 @@ function coreStatusToJs(status) {
         priorityStatusEntries: status.priority_status.map(priorityToJs)
     };
 }
-
-function isStreamingSyncData(line) {
-    return line.data != null;
-}
-function isStreamingKeepalive(line) {
-    return line.token_expires_in != null;
-}
-function isStreamingSyncCheckpoint(line) {
-    return line.checkpoint != null;
-}
-function isStreamingSyncCheckpointComplete(line) {
-    return line.checkpoint_complete != null;
-}
-function isStreamingSyncCheckpointPartiallyComplete(line) {
-    return line.partial_checkpoint_complete != null;
-}
-function isStreamingSyncCheckpointDiff(line) {
-    return line.checkpoint_diff != null;
-}
-function isContinueCheckpointRequest(request) {
-    return (Array.isArray(request.buckets) &&
-        typeof request.checkpoint_token == 'string');
-}
-function isSyncNewCheckpointRequest(request) {
-    return typeof request.request_checkpoint == 'object';
+function isInterruptingInstruction(instruction) {
+    return 'EstablishSyncStream' in instruction || 'CloseSyncStream' in instruction;
 }
 
 exports.LockType = void 0;
@@ -9134,35 +8995,21 @@ exports.SyncStreamConnectionMethod = void 0;
 })(exports.SyncStreamConnectionMethod || (exports.SyncStreamConnectionMethod = {}));
 exports.SyncClientImplementation = void 0;
 (function (SyncClientImplementation) {
-    /**
-     * Decodes and handles sync lines received from the sync service in JavaScript.
-     *
-     * This is the default option.
-     *
-     * @deprecated We recommend the {@link RUST} client implementation for all apps. If you have issues with
-     * the Rust client, please file an issue or reach out to us. The JavaScript client will be removed in a future
-     * version of the PowerSync SDK.
-     */
-    SyncClientImplementation["JAVASCRIPT"] = "js";
     /**
      * This implementation offloads the sync line decoding and handling into the PowerSync
      * core extension.
      *
-     * This option is more performant than the {@link JAVASCRIPT} client, enabled by default and the
-     * recommended client implementation for all apps.
+     * This is the only option, as an older JavaScript client implementation has been removed from the SDK.
      *
      * ## Compatibility warning
      *
      * The Rust sync client stores sync data in a format that is slightly different than the one used
-     * by the old {@link JAVASCRIPT} implementation. When adopting the {@link RUST} client on existing
-     * databases, the PowerSync SDK will migrate the format automatically.
-     * Further, the {@link JAVASCRIPT} client in recent versions of the PowerSync JS SDK (starting from
-     * the version introducing {@link RUST} as an option) also supports the new format, so you can switch
-     * back to {@link JAVASCRIPT} later.
+     * by the old JavaScript client. When adopting the {@link RUST} client on existing databases, the PowerSync SDK will
+     * migrate the format automatically.
      *
-     * __However__: Upgrading the SDK version, then adopting {@link RUST} as a sync client and later
-     * downgrading the SDK to an older version (necessarily using the JavaScript-based implementation then)
-     * can lead to sync issues.
+     * SDK versions supporting both the JavaScript and the Rust client support both formats with the JavaScript client
+     * implementaiton. However, downgrading to an SDK version that only supports the JavaScript client would not be
+     * possible anymore. Problematic SDK versions have been released before 2025-06-09.
      */
     SyncClientImplementation["RUST"] = "rust";
 })(exports.SyncClientImplementation || (exports.SyncClientImplementation = {}));
@@ -9185,13 +9032,7 @@ const DEFAULT_STREAM_CONNECTION_OPTIONS = {
     serializedSchema: undefined,
     includeDefaultStreams: true
 };
-// The priority we assume when we receive checkpoint lines where no priority is set.
-// This is the default priority used by the sync service, but can be set to an arbitrary
-// value since sync services without priorities also won't send partial sync completion
-// messages.
-const FALLBACK_PRIORITY = 3;
 class AbstractStreamingSyncImplementation extends BaseObserver {
-    _lastSyncedAt;
     options;
     abortController;
     // In rare cases, mostly for tests, uploads can be triggered without being properly connected.
@@ -9201,6 +9042,7 @@ class AbstractStreamingSyncImplementation extends BaseObserver {
     streamingSyncPromise;
     logger;
     activeStreams;
+    connectionMayHaveChanged = false;
     isUploadingCrud = false;
     notifyCompletedUploads;
     handleActiveStreamsChange;
@@ -9280,9 +9122,6 @@ class AbstractStreamingSyncImplementation extends BaseObserver {
         this.crudUpdateListener = undefined;
         this.uploadAbortController?.abort();
     }
-    async hasCompletedSync() {
-        return this.options.adapter.hasCompletedSync();
-    }
     async getWriteCheckpoint() {
         const clientId = await this.options.adapter.getClientId();
         let path = `/write-checkpoint2.json?client_id=${clientId}`;
@@ -9364,7 +9203,7 @@ The next upload iteration will be delayed.`);
                         });
                     }
                 }
-                this.uploadAbortController = null;
+                this.uploadAbortController = undefined;
             }
         });
     }
@@ -9480,6 +9319,11 @@ The next upload iteration will be delayed.`);
                     shouldDelayRetry = false;
                     // A disconnect was requested, we should not delay since there is no explicit retry
                 }
+                else if (this.connectionMayHaveChanged && ex.message?.indexOf('No iteration is active') >= 0) {
+                    this.connectionMayHaveChanged = false;
+                    this.logger.info('Sync error after changed connection, retrying immediately');
+                    shouldDelayRetry = false;
+                }
                 else {
                     this.logger.error(ex);
                 }
@@ -9510,17 +9354,14 @@ The next upload iteration will be delayed.`);
         // Mark as disconnected if here
         this.updateSyncStatus({ connected: false, connecting: false });
     }
-    async collectLocalBucketState() {
-        const bucketEntries = await this.options.adapter.getBucketStates();
-        const req = bucketEntries.map((entry) => ({
-            name: entry.bucket,
-            after: entry.op_id
-        }));
-        const localDescriptions = new Map();
-        for (const entry of bucketEntries) {
-            localDescriptions.set(entry.bucket, null);
-        }
-        return [req, localDescriptions];
+    markConnectionMayHaveChanged() {
+        // By setting this field, we'll immediately retry if the next sync event causes an error triggered by us not having
+        // an active sync iteration on the connection in use.
+        this.connectionMayHaveChanged = true;
+        // This triggers a `powersync_control` invocation if a sync iteration is currently active. This is a cheap call to
+        // make when no subscriptions have actually changed, we're mainly interested in this immediately throwing if no
+        // iteration is active. That allows us to reconnect ASAP, instead of having to wait for the next sync line.
+        this.handleActiveStreamsChange?.();
     }
     /**
      * Older versions of the JS SDK used to encode subkeys as JSON in {@link OplogEntry.toJSON}.
@@ -9561,328 +9402,98 @@ The next upload iteration will be delayed.`);
                 if (invalidMetadata.length > 0) {
                     throw new Error(`Invalid appMetadata provided. Only string values are allowed. Invalid values: ${invalidMetadata.map(([key, value]) => `${key}: ${value}`).join(', ')}`);
                 }
-                const clientImplementation = resolvedOptions.clientImplementation;
-                this.updateSyncStatus({ clientImplementation });
-                if (clientImplementation == exports.SyncClientImplementation.JAVASCRIPT) {
-                    await this.legacyStreamingSyncIteration(signal, resolvedOptions);
-                    return null;
-                }
-                else {
-                    await this.requireKeyFormat(true);
-                    return await this.rustSyncIteration(signal, resolvedOptions);
-                }
+                await this.requireKeyFormat(true);
+                return await this.rustSyncIteration(signal, resolvedOptions);
             }
         });
     }
-    async receiveSyncLines(data) {
-        const { options, connection, bson } = data;
+    receiveSyncLines(data) {
+        const { options, connection } = data;
         const remote = this.options.remote;
-        if (connection.connectionMethod == exports.SyncStreamConnectionMethod.HTTP) {
-            return await remote.fetchStream(options);
-        }
-        else {
-            return await this.options.remote.socketStreamRaw({
-                ...options,
-                ...{ fetchStrategy: connection.fetchStrategy }
-            }, bson);
-        }
-    }
-    async legacyStreamingSyncIteration(signal, resolvedOptions) {
-        const rawTables = resolvedOptions.serializedSchema?.raw_tables;
-        if (rawTables != null && rawTables.length) {
-            this.logger.warn('Raw tables require the Rust-based sync client. The JS client will ignore them.');
-        }
-        if (this.activeStreams.length) {
-            this.logger.error('Sync streams require `clientImplementation: SyncClientImplementation.RUST` when connecting.');
-        }
-        this.logger.debug('Streaming sync iteration started');
-        this.options.adapter.startSession();
-        let [req, bucketMap] = await this.collectLocalBucketState();
-        let targetCheckpoint = null;
-        // A checkpoint that has been validated but not applied (e.g. due to pending local writes)
-        let pendingValidatedCheckpoint = null;
-        const clientId = await this.options.adapter.getClientId();
-        const usingFixedKeyFormat = await this.requireKeyFormat(false);
-        this.logger.debug('Requesting stream from server');
-        const syncOptions = {
-            path: '/sync/stream',
-            abortSignal: signal,
-            data: {
-                buckets: req,
-                include_checksum: true,
-                raw_data: true,
-                parameters: resolvedOptions.params,
-                app_metadata: resolvedOptions.appMetadata,
-                client_id: clientId
-            }
-        };
-        const bson = await this.options.remote.getBSON();
-        const source = await this.receiveSyncLines({
-            options: syncOptions,
-            connection: resolvedOptions,
-            bson
-        });
-        const stream = injectable(map(source, (line) => {
-            if (typeof line == 'string') {
-                return JSON.parse(line);
+        const openInner = async () => {
+            if (connection.connectionMethod == exports.SyncStreamConnectionMethod.HTTP) {
+                return await remote.fetchStream(options);
             }
             else {
-                return bson.deserialize(line);
+                return await this.options.remote.socketStreamRaw({
+                    ...options,
+                    ...{ fetchStrategy: connection.fetchStrategy }
+                });
             }
-        }));
-        this.logger.debug('Stream established. Processing events');
-        this.notifyCompletedUploads = () => {
-            stream.inject({ crud_upload_completed: null });
         };
-        while (true) {
-            const { value: line, done } = await stream.next();
-            if (done) {
-                // The stream has closed while waiting
-                return;
-            }
-            if ('crud_upload_completed' in line) {
-                if (pendingValidatedCheckpoint != null) {
-                    const { applied, endIteration } = await this.applyCheckpoint(pendingValidatedCheckpoint);
-                    if (applied) {
-                        pendingValidatedCheckpoint = null;
-                    }
-                    else if (endIteration) {
-                        break;
-                    }
+        let inner;
+        let done = false;
+        return {
+            async next() {
+                if (done) {
+                    return doneResult;
                 }
-                continue;
-            }
-            // A connection is active and messages are being received
-            if (!this.syncStatus.connected) {
-                // There is a connection now
-                Promise.resolve().then(() => this.triggerCrudUpload());
-                this.updateSyncStatus({
-                    connected: true
-                });
-            }
-            if (isStreamingSyncCheckpoint(line)) {
-                targetCheckpoint = line.checkpoint;
-                // New checkpoint - existing validated checkpoint is no longer valid
-                pendingValidatedCheckpoint = null;
-                const bucketsToDelete = new Set(bucketMap.keys());
-                const newBuckets = new Map();
-                for (const checksum of line.checkpoint.buckets) {
-                    newBuckets.set(checksum.bucket, {
-                        name: checksum.bucket,
-                        priority: checksum.priority ?? FALLBACK_PRIORITY
+                else if (inner == null) {
+                    inner = await openInner();
+                    // We're connected here, so we can tell the core extension about it.
+                    return valueResult({
+                        command: exports.PowerSyncControlCommand.CONNECTION_STATE,
+                        payload: 'established'
                     });
-                    bucketsToDelete.delete(checksum.bucket);
-                }
-                if (bucketsToDelete.size > 0) {
-                    this.logger.debug('Removing buckets', [...bucketsToDelete]);
-                }
-                bucketMap = newBuckets;
-                await this.options.adapter.removeBuckets([...bucketsToDelete]);
-                await this.options.adapter.setTargetCheckpoint(targetCheckpoint);
-                await this.updateSyncStatusForStartingCheckpoint(targetCheckpoint);
-            }
-            else if (isStreamingSyncCheckpointComplete(line)) {
-                const result = await this.applyCheckpoint(targetCheckpoint);
-                if (result.endIteration) {
-                    return;
-                }
-                else if (!result.applied) {
-                    // "Could not apply checkpoint due to local data". We need to retry after
-                    // finishing uploads.
-                    pendingValidatedCheckpoint = targetCheckpoint;
                 }
                 else {
-                    // Nothing to retry later. This would likely already be null from the last
-                    // checksum or checksum_diff operation, but we make sure.
-                    pendingValidatedCheckpoint = null;
-                }
-            }
-            else if (isStreamingSyncCheckpointPartiallyComplete(line)) {
-                const priority = line.partial_checkpoint_complete.priority;
-                this.logger.debug('Partial checkpoint complete', priority);
-                const result = await this.options.adapter.syncLocalDatabase(targetCheckpoint, priority);
-                if (!result.checkpointValid) {
-                    // This means checksums failed. Start again with a new checkpoint.
-                    // TODO: better back-off
-                    await new Promise((resolve) => setTimeout(resolve, 50));
-                    return;
-                }
-                else if (!result.ready) ;
-                else {
-                    // We'll keep on downloading, but can report that this priority is synced now.
-                    this.logger.debug('partial checkpoint validation succeeded');
-                    // All states with a higher priority can be deleted since this partial sync includes them.
-                    const priorityStates = this.syncStatus.priorityStatusEntries.filter((s) => s.priority <= priority);
-                    priorityStates.push({
-                        priority,
-                        lastSyncedAt: new Date(),
-                        hasSynced: true
-                    });
-                    this.updateSyncStatus({
-                        connected: true,
-                        priorityStatusEntries: priorityStates
-                    });
-                }
-            }
-            else if (isStreamingSyncCheckpointDiff(line)) {
-                // TODO: It may be faster to just keep track of the diff, instead of the entire checkpoint
-                if (targetCheckpoint == null) {
-                    throw new Error('Checkpoint diff without previous checkpoint');
-                }
-                // New checkpoint - existing validated checkpoint is no longer valid
-                pendingValidatedCheckpoint = null;
-                const diff = line.checkpoint_diff;
-                const newBuckets = new Map();
-                for (const checksum of targetCheckpoint.buckets) {
-                    newBuckets.set(checksum.bucket, checksum);
-                }
-                for (const checksum of diff.updated_buckets) {
-                    newBuckets.set(checksum.bucket, checksum);
-                }
-                for (const bucket of diff.removed_buckets) {
-                    newBuckets.delete(bucket);
-                }
-                const newCheckpoint = {
-                    last_op_id: diff.last_op_id,
-                    buckets: [...newBuckets.values()],
-                    write_checkpoint: diff.write_checkpoint
-                };
-                targetCheckpoint = newCheckpoint;
-                await this.updateSyncStatusForStartingCheckpoint(targetCheckpoint);
-                bucketMap = new Map();
-                newBuckets.forEach((checksum, name) => bucketMap.set(name, {
-                    name: checksum.bucket,
-                    priority: checksum.priority ?? FALLBACK_PRIORITY
-                }));
-                const bucketsToDelete = diff.removed_buckets;
-                if (bucketsToDelete.length > 0) {
-                    this.logger.debug('Remove buckets', bucketsToDelete);
-                }
-                await this.options.adapter.removeBuckets(bucketsToDelete);
-                await this.options.adapter.setTargetCheckpoint(targetCheckpoint);
-            }
-            else if (isStreamingSyncData(line)) {
-                const { data } = line;
-                const previousProgress = this.syncStatus.dataFlowStatus.downloadProgress;
-                let updatedProgress = null;
-                if (previousProgress) {
-                    updatedProgress = { ...previousProgress };
-                    const progressForBucket = updatedProgress[data.bucket];
-                    if (progressForBucket) {
-                        updatedProgress[data.bucket] = {
-                            ...progressForBucket,
-                            since_last: progressForBucket.since_last + data.data.length
-                        };
+                    const event = await inner.next();
+                    if (event.done) {
+                        done = true;
+                        return valueResult({ command: exports.PowerSyncControlCommand.CONNECTION_STATE, payload: 'end' });
                     }
-                }
-                this.updateSyncStatus({
-                    dataFlow: {
-                        downloading: true,
-                        downloadProgress: updatedProgress
+                    else {
+                        return valueResult({
+                            command: typeof event.value == 'string'
+                                ? exports.PowerSyncControlCommand.PROCESS_TEXT_LINE
+                                : exports.PowerSyncControlCommand.PROCESS_BSON_LINE,
+                            payload: event.value
+                        });
                     }
-                });
-                await this.options.adapter.saveSyncData({ buckets: [SyncDataBucket.fromRow(data)] }, usingFixedKeyFormat);
-            }
-            else if (isStreamingKeepalive(line)) {
-                const remaining_seconds = line.token_expires_in;
-                if (remaining_seconds == 0) {
-                    // Connection would be closed automatically right after this
-                    this.logger.debug('Token expiring; reconnect');
-                    /**
-                     * For a rare case where the backend connector does not update the token
-                     * (uses the same one), this should have some delay.
-                     */
-                    await this.delayRetry();
-                    return;
-                }
-                else if (remaining_seconds < 30) {
-                    this.logger.debug('Token will expire soon; reconnect');
-                    // Pre-emptively refresh the token
-                    this.options.remote.invalidateCredentials();
-                    return;
                 }
-                this.triggerCrudUpload();
-            }
-            else {
-                this.logger.debug('Received unknown sync line', line);
             }
-        }
-        this.logger.debug('Stream input empty');
-        // Connection closed. Likely due to auth issue.
-        return;
+        };
     }
     async rustSyncIteration(signal, resolvedOptions) {
         const syncImplementation = this;
         const adapter = this.options.adapter;
         const remote = this.options.remote;
-        const controller = new AbortController();
-        const abort = () => {
-            return controller.abort(signal.reason);
-        };
-        signal.addEventListener('abort', abort);
-        let receivingLines = null;
-        let hadSyncLine = false;
         let hideDisconnectOnRestart = false;
+        let notifyTokenRefreshed;
         if (signal.aborted) {
             throw new AbortOperation('Connection request has been aborted');
         }
-        // Pending sync lines received from the service, as well as local events that trigger a powersync_control
-        // invocation (local events include refreshed tokens and completed uploads).
-        // This is a single data stream so that we can handle all control calls from a single place.
-        let controlInvocations = null;
-        async function connect(instr) {
-            const syncOptions = {
-                path: '/sync/stream',
-                abortSignal: controller.signal,
-                data: instr.request
+        function startCommand() {
+            const options = {
+                parameters: resolvedOptions.params,
+                app_metadata: resolvedOptions.appMetadata,
+                active_streams: syncImplementation.activeStreams,
+                include_defaults: resolvedOptions.includeDefaultStreams
             };
-            controlInvocations = injectable(map(await syncImplementation.receiveSyncLines({
-                options: syncOptions,
-                connection: resolvedOptions
-            }), (line) => {
-                if (typeof line == 'string') {
-                    return {
-                        command: exports.PowerSyncControlCommand.PROCESS_TEXT_LINE,
-                        payload: line
-                    };
-                }
-                else {
-                    return {
-                        command: exports.PowerSyncControlCommand.PROCESS_BSON_LINE,
-                        payload: line
-                    };
-                }
-            }));
-            // The rust client will set connected: true after the first sync line because that's when it gets invoked, but
-            // we're already connected here and can report that.
-            syncImplementation.updateSyncStatus({ connected: true });
-            try {
-                while (true) {
-                    let event = await controlInvocations.next();
-                    if (event.done) {
-                        break;
-                    }
-                    const line = event.value;
-                    await control(line.command, line.payload);
-                    if (!hadSyncLine) {
-                        syncImplementation.triggerCrudUpload();
-                        hadSyncLine = true;
-                    }
-                }
-            }
-            finally {
-                abort();
-                signal.removeEventListener('abort', abort);
+            if (resolvedOptions.serializedSchema) {
+                options.schema = resolvedOptions.serializedSchema;
             }
+            return invokePowerSyncControl(exports.PowerSyncControlCommand.START, JSON.stringify(options));
         }
         async function stop() {
-            await control(exports.PowerSyncControlCommand.STOP);
+            const instructions = await invokePowerSyncControl(exports.PowerSyncControlCommand.STOP);
+            for (const instruction of instructions) {
+                // We don't need to handle interrupting instructions since we're unconditionally ending the sync iteration at
+                // this point.
+                if (isInterruptingInstruction(instruction))
+                    continue;
+                await handleInstruction(instruction);
+            }
         }
-        async function control(op, payload) {
+        async function invokePowerSyncControl(op, payload) {
             const rawResponse = await adapter.control(op, payload ?? null);
             const logger = syncImplementation.logger;
             logger.trace('powersync_control', op, payload == null || typeof payload == 'string' ? payload : '<bytes>', rawResponse);
-            await handleInstructions(JSON.parse(rawResponse));
+            if (op != exports.PowerSyncControlCommand.STOP) {
+                // Evidently we have a working connection here, otherwise powersync_control would have failed.
+                syncImplementation.connectionMayHaveChanged = false;
+            }
+            return JSON.parse(rawResponse);
         }
         async function handleInstruction(instruction) {
             if ('LogLine' in instruction) {
@@ -9901,13 +9512,6 @@ The next upload iteration will be delayed.`);
             else if ('UpdateSyncStatus' in instruction) {
                 syncImplementation.updateSyncStatus(coreStatusToJs(instruction.UpdateSyncStatus.status));
             }
-            else if ('EstablishSyncStream' in instruction) {
-                if (receivingLines != null) {
-                    // Already connected, this shouldn't happen during a single iteration.
-                    throw 'Unexpected request to establish sync stream, already connected';
-                }
-                receivingLines = connect(instruction.EstablishSyncStream);
-            }
             else if ('FetchCredentials' in instruction) {
                 if (instruction.FetchCredentials.did_expire) {
                     remote.invalidateCredentials();
@@ -9916,16 +9520,12 @@ The next upload iteration will be delayed.`);
                     remote.invalidateCredentials();
                     // Restart iteration after the credentials have been refreshed.
                     remote.fetchCredentials().then((_) => {
-                        controlInvocations?.inject({ command: exports.PowerSyncControlCommand.NOTIFY_TOKEN_REFRESHED });
+                        notifyTokenRefreshed?.();
                     }, (err) => {
                         syncImplementation.logger.warn('Could not prefetch credentials', err);
                     });
                 }
             }
-            else if ('CloseSyncStream' in instruction) {
-                controller.abort();
-                hideDisconnectOnRestart = instruction.CloseSyncStream.hide_disconnect;
-            }
             else if ('FlushFileSystem' in instruction) ;
             else if ('DidCompleteSync' in instruction) {
                 syncImplementation.updateSyncStatus({
@@ -9935,101 +9535,83 @@ The next upload iteration will be delayed.`);
                 });
             }
         }
-        async function handleInstructions(instructions) {
-            for (const instr of instructions) {
-                await handleInstruction(instr);
-            }
-        }
         try {
-            const options = {
-                parameters: resolvedOptions.params,
-                app_metadata: resolvedOptions.appMetadata,
-                active_streams: this.activeStreams,
-                include_defaults: resolvedOptions.includeDefaultStreams
-            };
-            if (resolvedOptions.serializedSchema) {
-                options.schema = resolvedOptions.serializedSchema;
+            const defaultResult = { immediateRestart: false };
+            // Pending sync lines received from the service, as well as local events that trigger a powersync_control
+            // invocation (local events include refreshed tokens and completed uploads).
+            // This is a single data stream so that we can handle all control calls from a single place.
+            let controlInvocations = null;
+            for (const startInstruction of await startCommand()) {
+                if ('EstablishSyncStream' in startInstruction) {
+                    const syncOptions = {
+                        path: '/sync/stream',
+                        abortSignal: signal,
+                        data: startInstruction.EstablishSyncStream.request
+                    };
+                    controlInvocations = injectable(syncImplementation.receiveSyncLines({
+                        options: syncOptions,
+                        connection: resolvedOptions
+                    }));
+                }
+                else if ('CloseSyncStream' in startInstruction) {
+                    return defaultResult;
+                }
+                else {
+                    await handleInstruction(startInstruction);
+                }
             }
-            await control(exports.PowerSyncControlCommand.START, JSON.stringify(options));
+            if (controlInvocations == null)
+                return defaultResult;
             this.notifyCompletedUploads = () => {
-                controlInvocations?.inject({ command: exports.PowerSyncControlCommand.NOTIFY_CRUD_UPLOAD_COMPLETED });
+                controlInvocations.inject({ command: exports.PowerSyncControlCommand.NOTIFY_CRUD_UPLOAD_COMPLETED });
             };
             this.handleActiveStreamsChange = () => {
-                controlInvocations?.inject({
+                controlInvocations.inject({
                     command: exports.PowerSyncControlCommand.UPDATE_SUBSCRIPTIONS,
                     payload: JSON.stringify(this.activeStreams)
                 });
             };
-            await receivingLines;
+            notifyTokenRefreshed = () => {
+                controlInvocations.inject({
+                    command: exports.PowerSyncControlCommand.NOTIFY_TOKEN_REFRESHED
+                });
+            };
+            let hadSyncLine = false;
+            loop: while (true) {
+                const { done, value } = await controlInvocations.next();
+                if (done)
+                    break;
+                if (!hadSyncLine) {
+                    // Trigger a local CRUD upload when the first sync line has been received, this allows uploading local changes
+                    // that have been made while offline or disconnected.
+                    if (value.command == exports.PowerSyncControlCommand.PROCESS_TEXT_LINE ||
+                        value.command == exports.PowerSyncControlCommand.PROCESS_BSON_LINE) {
+                        hadSyncLine = true;
+                        this.triggerCrudUpload?.();
+                    }
+                }
+                const instructions = await invokePowerSyncControl(value.command, value.payload);
+                for (const instruction of instructions) {
+                    if ('EstablishSyncStream' in instruction) {
+                        throw new Error('Received EstablishSyncStream while already connected.');
+                    }
+                    else if ('CloseSyncStream' in instruction) {
+                        hideDisconnectOnRestart = instruction.CloseSyncStream.hide_disconnect;
+                        break loop;
+                    }
+                    else {
+                        await handleInstruction(instruction);
+                    }
+                }
+            }
         }
         finally {
             this.notifyCompletedUploads = this.handleActiveStreamsChange = undefined;
+            notifyTokenRefreshed = undefined;
             await stop();
         }
         return { immediateRestart: hideDisconnectOnRestart };
     }
-    async updateSyncStatusForStartingCheckpoint(checkpoint) {
-        const localProgress = await this.options.adapter.getBucketOperationProgress();
-        const progress = {};
-        let invalidated = false;
-        for (const bucket of checkpoint.buckets) {
-            const savedProgress = localProgress[bucket.bucket];
-            const atLast = savedProgress?.atLast ?? 0;
-            const sinceLast = savedProgress?.sinceLast ?? 0;
-            progress[bucket.bucket] = {
-                // The fallback priority doesn't matter here, but 3 is the one newer versions of the sync service
-                // will use by default.
-                priority: bucket.priority ?? 3,
-                at_last: atLast,
-                since_last: sinceLast,
-                target_count: bucket.count ?? 0
-            };
-            if (bucket.count != null && bucket.count < atLast + sinceLast) {
-                // Either due to a defrag / sync rule deploy or a compaction operation, the size
-                // of the bucket shrank so much that the local ops exceed the ops in the updated
-                // bucket. We can't prossibly report progress in this case (it would overshoot 100%).
-                invalidated = true;
-            }
-        }
-        if (invalidated) {
-            for (const bucket in progress) {
-                const bucketProgress = progress[bucket];
-                bucketProgress.at_last = 0;
-                bucketProgress.since_last = 0;
-            }
-        }
-        this.updateSyncStatus({
-            dataFlow: {
-                downloading: true,
-                downloadProgress: progress
-            }
-        });
-    }
-    async applyCheckpoint(checkpoint) {
-        let result = await this.options.adapter.syncLocalDatabase(checkpoint);
-        if (!result.checkpointValid) {
-            this.logger.debug(`Checksum mismatch in checkpoint ${checkpoint.last_op_id}, will reconnect`);
-            // This means checksums failed. Start again with a new checkpoint.
-            // TODO: better back-off
-            await new Promise((resolve) => setTimeout(resolve, 50));
-            return { applied: false, endIteration: true };
-        }
-        else if (!result.ready) {
-            this.logger.debug(`Could not apply checkpoint ${checkpoint.last_op_id} due to local data. We will retry applying the checkpoint after that upload is completed.`);
-            return { applied: false, endIteration: false };
-        }
-        this.logger.debug(`Applied checkpoint ${checkpoint.last_op_id}`, checkpoint);
-        this.updateSyncStatus({
-            connected: true,
-            lastSyncedAt: new Date(),
-            dataFlow: {
-                downloading: false,
-                downloadProgress: null,
-                downloadError: undefined
-            }
-        });
-        return { applied: true, endIteration: false };
-    }
     updateSyncStatus(options) {
         const updatedStatus = new SyncStatus({
             connected: options.connected ?? this.syncStatus.connected,
@@ -11568,14 +11150,12 @@ class SqliteBucketStorage extends BaseObserver {
     db;
     logger;
     tableNames;
-    _hasCompletedSync;
     updateListener;
     _clientId;
     constructor(db, logger = Logger.get('SqliteBucketStorage')) {
         super();
         this.db = db;
         this.logger = logger;
-        this._hasCompletedSync = false;
         this.tableNames = new Set();
         this.updateListener = db.registerListener({
             tablesUpdated: (update) => {
@@ -11587,7 +11167,6 @@ class SqliteBucketStorage extends BaseObserver {
         });
     }
     async init() {
-        this._hasCompletedSync = false;
         const existingTableRows = await this.db.getAll(`SELECT name FROM sqlite_master WHERE type='table' AND name GLOB 'ps_data_*'`);
         for (const row of existingTableRows ?? []) {
             this.tableNames.add(row.name);
@@ -11609,156 +11188,6 @@ class SqliteBucketStorage extends BaseObserver {
     getMaxOpId() {
         return MAX_OP_ID;
     }
-    /**
-     * Reset any caches.
-     */
-    startSession() { }
-    async getBucketStates() {
-        const result = await this.db.getAll("SELECT name as bucket, cast(last_op as TEXT) as op_id FROM ps_buckets WHERE pending_delete = 0 AND name != '$local'");
-        return result;
-    }
-    async getBucketOperationProgress() {
-        const rows = await this.db.getAll('SELECT name, count_at_last, count_since_last FROM ps_buckets');
-        return Object.fromEntries(rows.map((r) => [r.name, { atLast: r.count_at_last, sinceLast: r.count_since_last }]));
-    }
-    async saveSyncData(batch, fixedKeyFormat = false) {
-        await this.writeTransaction(async (tx) => {
-            for (const b of batch.buckets) {
-                await tx.execute('INSERT INTO powersync_operations(op, data) VALUES(?, ?)', [
-                    'save',
-                    JSON.stringify({ buckets: [b.toJSON(fixedKeyFormat)] })
-                ]);
-                this.logger.debug(`Saved batch of data for  bucket: ${b.bucket}, operations: ${b.data.length}`);
-            }
-        });
-    }
-    async removeBuckets(buckets) {
-        for (const bucket of buckets) {
-            await this.deleteBucket(bucket);
-        }
-    }
-    /**
-     * Mark a bucket for deletion.
-     */
-    async deleteBucket(bucket) {
-        await this.writeTransaction(async (tx) => {
-            await tx.execute('INSERT INTO powersync_operations(op, data) VALUES(?, ?)', ['delete_bucket', bucket]);
-        });
-        this.logger.debug(`Done deleting bucket ${bucket}`);
-    }
-    async hasCompletedSync() {
-        if (this._hasCompletedSync) {
-            return true;
-        }
-        const r = await this.db.get(`SELECT powersync_last_synced_at() as synced_at`);
-        const completed = r.synced_at != null;
-        if (completed) {
-            this._hasCompletedSync = true;
-        }
-        return completed;
-    }
-    async syncLocalDatabase(checkpoint, priority) {
-        const r = await this.validateChecksums(checkpoint, priority);
-        if (!r.checkpointValid) {
-            this.logger.error('Checksums failed for', r.checkpointFailures);
-            for (const b of r.checkpointFailures ?? []) {
-                await this.deleteBucket(b);
-            }
-            return { ready: false, checkpointValid: false, checkpointFailures: r.checkpointFailures };
-        }
-        if (priority == null) {
-            this.logger.debug(`Validated checksums checkpoint ${checkpoint.last_op_id}`);
-        }
-        else {
-            this.logger.debug(`Validated checksums for partial checkpoint ${checkpoint.last_op_id}, priority ${priority}`);
-        }
-        let buckets = checkpoint.buckets;
-        if (priority !== undefined) {
-            buckets = buckets.filter((b) => hasMatchingPriority(priority, b));
-        }
-        const bucketNames = buckets.map((b) => b.bucket);
-        await this.writeTransaction(async (tx) => {
-            await tx.execute(`UPDATE ps_buckets SET last_op = ? WHERE name IN (SELECT json_each.value FROM json_each(?))`, [
-                checkpoint.last_op_id,
-                JSON.stringify(bucketNames)
-            ]);
-            if (priority == null && checkpoint.write_checkpoint) {
-                await tx.execute("UPDATE ps_buckets SET last_op = ? WHERE name = '$local'", [checkpoint.write_checkpoint]);
-            }
-        });
-        const valid = await this.updateObjectsFromBuckets(checkpoint, priority);
-        if (!valid) {
-            return { ready: false, checkpointValid: true };
-        }
-        return {
-            ready: true,
-            checkpointValid: true
-        };
-    }
-    /**
-     * Atomically update the local state to the current checkpoint.
-     *
-     * This includes creating new tables, dropping old tables, and copying data over from the oplog.
-     */
-    async updateObjectsFromBuckets(checkpoint, priority) {
-        let arg = '';
-        if (priority !== undefined) {
-            const affectedBuckets = [];
-            for (const desc of checkpoint.buckets) {
-                if (hasMatchingPriority(priority, desc)) {
-                    affectedBuckets.push(desc.bucket);
-                }
-            }
-            arg = JSON.stringify({ priority, buckets: affectedBuckets });
-        }
-        return this.writeTransaction(async (tx) => {
-            const { insertId: result } = await tx.execute('INSERT INTO powersync_operations(op, data) VALUES(?, ?)', [
-                'sync_local',
-                arg
-            ]);
-            if (result == 1) {
-                if (priority == null) {
-                    const bucketToCount = Object.fromEntries(checkpoint.buckets.map((b) => [b.bucket, b.count]));
-                    // The two parameters could be replaced with one, but: https://github.com/powersync-ja/better-sqlite3/pull/6
-                    const jsonBucketCount = JSON.stringify(bucketToCount);
-                    await tx.execute("UPDATE ps_buckets SET count_since_last = 0, count_at_last = ?->name WHERE name != '$local' AND ?->name IS NOT NULL", [jsonBucketCount, jsonBucketCount]);
-                }
-                return true;
-            }
-            else {
-                return false;
-            }
-        });
-    }
-    async validateChecksums(checkpoint, priority) {
-        if (priority !== undefined) {
-            // Only validate the buckets within the priority we care about
-            const newBuckets = checkpoint.buckets.filter((cs) => hasMatchingPriority(priority, cs));
-            checkpoint = { ...checkpoint, buckets: newBuckets };
-        }
-        const rs = await this.db.execute('SELECT powersync_validate_checkpoint(?) as result', [
-            JSON.stringify({ ...checkpoint })
-        ]);
-        const resultItem = rs.rows?.item(0);
-        if (!resultItem) {
-            return {
-                checkpointValid: false,
-                ready: false,
-                checkpointFailures: []
-            };
-        }
-        const result = JSON.parse(resultItem['result']);
-        if (result['valid']) {
-            return { ready: true, checkpointValid: true };
-        }
-        else {
-            return {
-                checkpointValid: false,
-                ready: false,
-                checkpointFailures: result['failed_buckets']
-            };
-        }
-    }
     async updateLocalTarget(cb) {
         const rs1 = await this.db.getAll("SELECT target_op FROM ps_buckets WHERE name = '$local' AND target_op = CAST(? as INTEGER)", [MAX_OP_ID]);
         if (!rs1.length) {
@@ -11849,12 +11278,6 @@ class SqliteBucketStorage extends BaseObserver {
     async writeTransaction(callback, options) {
         return this.db.writeTransaction(callback, options);
     }
-    /**
-     * Set a target checkpoint.
-     */
-    async setTargetCheckpoint(checkpoint) {
-        // No-op for now
-    }
     async control(op, payload) {
         return await this.writeTransaction(async (tx) => {
             const [[raw]] = await tx.executeRaw('SELECT powersync_control(?, ?)', [op, payload]);
@@ -11878,20 +11301,6 @@ class SqliteBucketStorage extends BaseObserver {
     }
     static _subkeyMigrationKey = 'powersync_js_migrated_subkeys';
 }
-function hasMatchingPriority(priority, bucket) {
-    return bucket.priority != null && bucket.priority <= priority;
-}
-
-// TODO JSON
-class SyncDataBatch {
-    buckets;
-    static fromJSON(json) {
-        return new SyncDataBatch(json.buckets.map((bucket) => SyncDataBucket.fromRow(bucket)));
-    }
-    constructor(buckets) {
-        this.buckets = buckets;
-    }
-}
 
 /**
  * Thrown when an underlying database connection is closed.
@@ -11951,10 +11360,8 @@ class Schema {
      * developer instead of automatically by PowerSync.
      * Since raw tables are not backed by JSON, running complex queries on them may be more efficient. Further, they allow
      * using client-side table and column constraints.
-     * Note that raw tables are only supported when using the new `SyncClientImplementation.rust` sync client.
      *
      * @param tables An object of (table name, raw table definition) entries.
-     * @experimental Note that the raw tables API is still experimental and may change in the future.
      */
     withRawTables(tables) {
         for (const [name, rawTableDefinition] of Object.entries(tables)) {
@@ -12204,13 +11611,9 @@ exports.MAX_OP_ID = MAX_OP_ID;
 exports.MEMORY_TRIGGER_CLAIM_MANAGER = MEMORY_TRIGGER_CLAIM_MANAGER;
 exports.Mutex = Mutex;
 exports.OnChangeQueryProcessor = OnChangeQueryProcessor;
-exports.OpType = OpType;
-exports.OplogEntry = OplogEntry;
 exports.Schema = Schema;
 exports.Semaphore = Semaphore;
 exports.SqliteBucketStorage = SqliteBucketStorage;
-exports.SyncDataBatch = SyncDataBatch;
-exports.SyncDataBucket = SyncDataBucket;
 exports.SyncProgress = SyncProgress;
 exports.SyncStatus = SyncStatus;
 exports.SyncingService = SyncingService;
@@ -12225,18 +11628,10 @@ exports.createBaseLogger = createBaseLogger;
 exports.createLogger = createLogger;
 exports.extractTableUpdates = extractTableUpdates;
 exports.isBatchedUpdateNotification = isBatchedUpdateNotification;
-exports.isContinueCheckpointRequest = isContinueCheckpointRequest;
 exports.isDBAdapter = isDBAdapter;
 exports.isPowerSyncDatabaseOptionsWithSettings = isPowerSyncDatabaseOptionsWithSettings;
 exports.isSQLOpenFactory = isSQLOpenFactory;
 exports.isSQLOpenOptions = isSQLOpenOptions;
-exports.isStreamingKeepalive = isStreamingKeepalive;
-exports.isStreamingSyncCheckpoint = isStreamingSyncCheckpoint;
-exports.isStreamingSyncCheckpointComplete = isStreamingSyncCheckpointComplete;
-exports.isStreamingSyncCheckpointDiff = isStreamingSyncCheckpointDiff;
-exports.isStreamingSyncCheckpointPartiallyComplete = isStreamingSyncCheckpointPartiallyComplete;
-exports.isStreamingSyncData = isStreamingSyncData;
-exports.isSyncNewCheckpointRequest = isSyncNewCheckpointRequest;
 exports.parseQuery = parseQuery;
 exports.runOnSchemaChange = runOnSchemaChange;
 exports.sanitizeSQL = sanitizeSQL;