@powersync/web 1.37.0 → 1.37.2

package/dist/worker/SharedSyncImplementation.umd.js

@@ -1698,7 +1698,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   DEFAULT_LOCK_TIMEOUT_MS: () => (/* binding */ DEFAULT_LOCK_TIMEOUT_MS),
 /* harmony export */   DEFAULT_POWERSYNC_CLOSE_OPTIONS: () => (/* binding */ DEFAULT_POWERSYNC_CLOSE_OPTIONS),
 /* harmony export */   DEFAULT_POWERSYNC_DB_OPTIONS: () => (/* binding */ DEFAULT_POWERSYNC_DB_OPTIONS),
-/* harmony export */   DEFAULT_PRESSURE_LIMITS: () => (/* binding */ DEFAULT_PRESSURE_LIMITS),
 /* harmony export */   DEFAULT_REMOTE_LOGGER: () => (/* binding */ DEFAULT_REMOTE_LOGGER),
 /* harmony export */   DEFAULT_REMOTE_OPTIONS: () => (/* binding */ DEFAULT_REMOTE_OPTIONS),
 /* harmony export */   DEFAULT_RETRY_DELAY_MS: () => (/* binding */ DEFAULT_RETRY_DELAY_MS),
@@ -1709,7 +1708,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   DEFAULT_TABLE_OPTIONS: () => (/* binding */ DEFAULT_TABLE_OPTIONS),
 /* harmony export */   DEFAULT_WATCH_QUERY_OPTIONS: () => (/* binding */ DEFAULT_WATCH_QUERY_OPTIONS),
 /* harmony export */   DEFAULT_WATCH_THROTTLE_MS: () => (/* binding */ DEFAULT_WATCH_THROTTLE_MS),
-/* harmony export */   DataStream: () => (/* binding */ DataStream),
 /* harmony export */   DiffTriggerOperation: () => (/* binding */ DiffTriggerOperation),
 /* harmony export */   DifferentialQueryProcessor: () => (/* binding */ DifferentialQueryProcessor),
 /* harmony export */   EMPTY_DIFFERENTIAL: () => (/* binding */ EMPTY_DIFFERENTIAL),
@@ -1735,6 +1733,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   PowerSyncControlCommand: () => (/* binding */ PowerSyncControlCommand),
 /* harmony export */   RowUpdateType: () => (/* binding */ RowUpdateType),
 /* harmony export */   Schema: () => (/* binding */ Schema),
+/* harmony export */   Semaphore: () => (/* binding */ Semaphore),
 /* harmony export */   SqliteBucketStorage: () => (/* binding */ SqliteBucketStorage),
 /* harmony export */   SyncClientImplementation: () => (/* binding */ SyncClientImplementation),
 /* harmony export */   SyncDataBatch: () => (/* binding */ SyncDataBatch),
@@ -2556,19 +2555,69 @@ class SyncingService {
 }
 
 /**
- * An asynchronous mutex implementation.
+ * A simple fixed-capacity queue implementation.
+ *
+ * Unlike a naive queue implemented by `array.push()` and `array.shift()`, this avoids moving array elements around
+ * and is `O(1)` for {@link addLast} and {@link removeFirst}.
+ */
+class Queue {
+    table;
+    // Index of the first element in the table.
+    head;
+    // Amount of items currently in the queue.
+    _length;
+    constructor(initialItems) {
+        this.table = [...initialItems];
+        this.head = 0;
+        this._length = this.table.length;
+    }
+    get isEmpty() {
+        return this.length == 0;
+    }
+    get length() {
+        return this._length;
+    }
+    removeFirst() {
+        if (this.isEmpty) {
+            throw new Error('Queue is empty');
+        }
+        const result = this.table[this.head];
+        this._length--;
+        this.table[this.head] = undefined;
+        this.head = (this.head + 1) % this.table.length;
+        return result;
+    }
+    addLast(element) {
+        if (this.length == this.table.length) {
+            throw new Error('Queue is full');
+        }
+        this.table[(this.head + this._length) % this.table.length] = element;
+        this._length++;
+    }
+}
+
+/**
+ * An asynchronous semaphore implementation with associated items per lease.
  *
  * @internal This class is meant to be used in PowerSync SDKs only, and is not part of the public API.
  */
-class Mutex {
-    inCriticalSection = false;
+class Semaphore {
+    // Available items that are not currently assigned to a waiter.
+    available;
+    size;
     // Linked list of waiters. We don't expect the wait list to become particularly large, and this allows removing
     // aborted waiters from the middle of the list efficiently.
     firstWaiter;
     lastWaiter;
-    addWaiter(onAcquire) {
+    constructor(elements) {
+        this.available = new Queue(elements);
+        this.size = this.available.length;
+    }
+    addWaiter(requestedItems, onAcquire) {
         const node = {
             isActive: true,
+            acquiredItems: [],
+            remainingItems: requestedItems,
             onAcquire,
             prev: this.lastWaiter
         };
@@ -2594,52 +2643,92 @@ class Mutex {
         if (waiter == this.lastWaiter)
             this.lastWaiter = prev;
     }
-    acquire(abort) {
+    requestPermits(amount, abort) {
+        if (amount <= 0 || amount > this.size) {
+            throw new Error(`Invalid amount of items requested (${amount}), must be between 1 and ${this.size}`);
+        }
         return new Promise((resolve, reject) => {
             function rejectAborted() {
-                reject(abort?.reason ?? new Error('Mutex acquire aborted'));
+                reject(abort?.reason ?? new Error('Semaphore acquire aborted'));
             }
             if (abort?.aborted) {
                 return rejectAborted();
             }
-            let holdsMutex = false;
+            let waiter;
             const markCompleted = () => {
-                if (!holdsMutex)
-                    return;
-                holdsMutex = false;
-                const waiter = this.firstWaiter;
-                if (waiter) {
-                    this.deactivateWaiter(waiter);
-                    // Still in critical section, but owned by next waiter now.
-                    waiter.onAcquire();
+                const items = waiter.acquiredItems;
+                waiter.acquiredItems = []; // Avoid releasing items twice.
+                for (const element of items) {
+                    // Give to next waiter, if possible.
+                    const nextWaiter = this.firstWaiter;
+                    if (nextWaiter) {
+                        nextWaiter.acquiredItems.push(element);
+                        nextWaiter.remainingItems--;
+                        if (nextWaiter.remainingItems == 0) {
+                            nextWaiter.onAcquire();
+                        }
+                    }
+                    else {
+                        // No pending waiter, return lease into pool.
+                        this.available.addLast(element);
+                    }
                 }
-                else {
-                    this.inCriticalSection = false;
+            };
+            const onAbort = () => {
+                abort?.removeEventListener('abort', onAbort);
+                if (waiter.isActive) {
+                    this.deactivateWaiter(waiter);
+                    rejectAborted();
                 }
             };
-            if (!this.inCriticalSection) {
-                this.inCriticalSection = true;
-                holdsMutex = true;
-                return resolve(markCompleted);
+            const resolvePromise = () => {
+                this.deactivateWaiter(waiter);
+                abort?.removeEventListener('abort', onAbort);
+                const items = waiter.acquiredItems;
+                resolve({ items, release: markCompleted });
+            };
+            waiter = this.addWaiter(amount, resolvePromise);
+            // If there are items in the pool that haven't been assigned, we can pull them into this waiter. Note that this is
+            // only the case if we're the first waiter (otherwise, items would have been assigned to an earlier waiter).
+            while (!this.available.isEmpty && waiter.remainingItems > 0) {
+                waiter.acquiredItems.push(this.available.removeFirst());
+                waiter.remainingItems--;
             }
-            else {
-                let node;
-                const onAbort = () => {
-                    abort?.removeEventListener('abort', onAbort);
-                    if (node.isActive) {
-                        this.deactivateWaiter(node);
-                        rejectAborted();
-                    }
-                };
-                node = this.addWaiter(() => {
-                    abort?.removeEventListener('abort', onAbort);
-                    holdsMutex = true;
-                    resolve(markCompleted);
-                });
-                abort?.addEventListener('abort', onAbort);
+            if (waiter.remainingItems == 0) {
+                return resolvePromise();
             }
+            abort?.addEventListener('abort', onAbort);
         });
     }
+    /**
+     * Requests a single item from the pool.
+     *
+     * The returned `release` callback must be invoked to return the item into the pool.
+     */
+    async requestOne(abort) {
+        const { items, release } = await this.requestPermits(1, abort);
+        return { release, item: items[0] };
+    }
+    /**
+     * Requests access to all items from the pool.
+     *
+     * The returned `release` callback must be invoked to return items into the pool.
+     */
+    requestAll(abort) {
+        return this.requestPermits(this.size, abort);
+    }
+}
+/**
+ * An asynchronous mutex implementation.
+ *
+ * @internal This class is meant to be used in PowerSync SDKs only, and is not part of the public API.
+ */
+class Mutex {
+    inner = new Semaphore([null]);
+    async acquire(abort) {
+        const { release } = await this.inner.requestOne(abort);
+        return release;
+    }
     async runExclusive(fn, abort) {
         const returnMutex = await this.acquire(abort);
         try {
@@ -3082,6 +3171,8 @@ var EncodingType;
     EncodingType["Base64"] = "base64";
 })(EncodingType || (EncodingType = {}));
 
+const symbolAsyncIterator = Symbol.asyncIterator ?? Symbol.for('Symbol.asyncIterator');
+
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
@@ -3162,7 +3253,7 @@ function requireEventIterator () {
 	                this.removeCallback();
 	        });
 	    }
-	    [Symbol.asyncIterator]() {
+	    [symbolAsyncIterator]() {
 	        return {
 	            next: (value) => {
 	                const result = this.pushQueue.shift();
@@ -3209,7 +3300,7 @@ function requireEventIterator () {
 	                    queue.eventHandlers[event] = fn;
 	                },
 	            }) || (() => { });
-	        this[Symbol.asyncIterator] = () => queue[Symbol.asyncIterator]();
+	        this[symbolAsyncIterator] = () => queue[symbolAsyncIterator]();
 	        Object.freeze(this);
 	    }
 	}
@@ -4091,15 +4182,6 @@ class ControlledExecutor {
     }
 }
 
-/**
- * A ponyfill for `Symbol.asyncIterator` that is compatible with the
- * [recommended polyfill](https://github.com/Azure/azure-sdk-for-js/blob/%40azure/core-asynciterator-polyfill_1.0.2/sdk/core/core-asynciterator-polyfill/src/index.ts#L4-L6)
- * we recommend for React Native.
- *
- * As long as we use this symbol (instead of `for await` and `async *`) in this package, we can be compatible with async
- * iterators without requiring them.
- */
-const symbolAsyncIterator = Symbol.asyncIterator ?? Symbol.for('Symbol.asyncIterator');
 /**
  * Throttle a function to be called at most once every "wait" milliseconds,
  * on the trailing edge.
@@ -12436,177 +12518,10 @@ function requireDist () {
 
 var distExports = requireDist();
 
-var version = "1.50.0";
+var version = "1.52.0";
 var PACKAGE = {
 	version: version};
 
-const DEFAULT_PRESSURE_LIMITS = {
-    highWater: 10,
-    lowWater: 0
-};
-/**
- * A very basic implementation of a data stream with backpressure support which does not use
- * native JS streams or async iterators.
- * This is handy for environments such as React Native which need polyfills for the above.
- */
-class DataStream extends BaseObserver {
-    options;
-    dataQueue;
-    isClosed;
-    processingPromise;
-    notifyDataAdded;
-    logger;
-    mapLine;
-    constructor(options) {
-        super();
-        this.options = options;
-        this.processingPromise = null;
-        this.isClosed = false;
-        this.dataQueue = [];
-        this.mapLine = options?.mapLine ?? ((line) => line);
-        this.logger = options?.logger ?? Logger.get('DataStream');
-        if (options?.closeOnError) {
-            const l = this.registerListener({
-                error: (ex) => {
-                    l?.();
-                    this.close();
-                }
-            });
-        }
-    }
-    get highWatermark() {
-        return this.options?.pressure?.highWaterMark ?? DEFAULT_PRESSURE_LIMITS.highWater;
-    }
-    get lowWatermark() {
-        return this.options?.pressure?.lowWaterMark ?? DEFAULT_PRESSURE_LIMITS.lowWater;
-    }
-    get closed() {
-        return this.isClosed;
-    }
-    async close() {
-        this.isClosed = true;
-        await this.processingPromise;
-        this.iterateListeners((l) => l.closed?.());
-        // Discard any data in the queue
-        this.dataQueue = [];
-        this.listeners.clear();
-    }
-    /**
-     * Enqueues data for the consumers to read
-     */
-    enqueueData(data) {
-        if (this.isClosed) {
-            throw new Error('Cannot enqueue data into closed stream.');
-        }
-        this.dataQueue.push(data);
-        this.notifyDataAdded?.();
-        this.processQueue();
-    }
-    /**
-     * Reads data once from the data stream
-     * @returns a Data payload or Null if the stream closed.
-     */
-    async read() {
-        if (this.closed) {
-            return null;
-        }
-        // Wait for any pending processing to complete first.
-        // This ensures we register our listener before calling processQueue(),
-        // avoiding a race where processQueue() sees no reader and returns early.
-        if (this.processingPromise) {
-            await this.processingPromise;
-        }
-        // Re-check after await - stream may have closed while we were waiting
-        if (this.closed) {
-            return null;
-        }
-        return new Promise((resolve, reject) => {
-            const l = this.registerListener({
-                data: async (data) => {
-                    resolve(data);
-                    // Remove the listener
-                    l?.();
-                },
-                closed: () => {
-                    resolve(null);
-                    l?.();
-                },
-                error: (ex) => {
-                    reject(ex);
-                    l?.();
-                }
-            });
-            this.processQueue();
-        });
-    }
-    /**
-     * Executes a callback for each data item in the stream
-     */
-    forEach(callback) {
-        if (this.dataQueue.length <= this.lowWatermark) {
-            this.iterateAsyncErrored(async (l) => l.lowWater?.());
-        }
-        return this.registerListener({
-            data: callback
-        });
-    }
-    processQueue() {
-        if (this.processingPromise) {
-            return;
-        }
-        const promise = (this.processingPromise = this._processQueue());
-        promise.finally(() => {
-            this.processingPromise = null;
-        });
-        return promise;
-    }
-    hasDataReader() {
-        return Array.from(this.listeners.values()).some((l) => !!l.data);
-    }
-    async _processQueue() {
-        /**
-         * Allow listeners to mutate the queue before processing.
-         * This allows for operations such as dropping or compressing data
-         * on high water or requesting more data on low water.
-         */
-        if (this.dataQueue.length >= this.highWatermark) {
-            await this.iterateAsyncErrored(async (l) => l.highWater?.());
-        }
-        if (this.isClosed || !this.hasDataReader()) {
-            return;
-        }
-        if (this.dataQueue.length) {
-            const data = this.dataQueue.shift();
-            const mapped = this.mapLine(data);
-            await this.iterateAsyncErrored(async (l) => l.data?.(mapped));
-        }
-        if (this.dataQueue.length <= this.lowWatermark) {
-            const dataAdded = new Promise((resolve) => {
-                this.notifyDataAdded = resolve;
-            });
-            await Promise.race([this.iterateAsyncErrored(async (l) => l.lowWater?.()), dataAdded]);
-            this.notifyDataAdded = null;
-        }
-        if (this.dataQueue.length > 0) {
-            setTimeout(() => this.processQueue());
-        }
-    }
-    async iterateAsyncErrored(cb) {
-        // Important: We need to copy the listeners, as calling a listener could result in adding another
-        // listener, resulting in infinite loops.
-        const listeners = Array.from(this.listeners.values());
-        for (let i of listeners) {
-            try {
-                await cb(i);
-            }
-            catch (ex) {
-                this.logger.error(ex);
-                this.iterateListeners((l) => l.error?.(ex));
-            }
-        }
-    }
-}
-
 var WebsocketDuplexConnection = {};
 
 var hasRequiredWebsocketDuplexConnection;
@@ -12769,8 +12684,215 @@ class WebsocketClientTransport {
     }
 }
 
+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.
+ *
+ * The resulting iterator will emit all events from its source. Additionally though, events can be injected. These
+ * events are dropped once the main iterator completes, but are otherwise forwarded.
+ *
+ * The iterator completes when its source completes, and it supports backpressure by only calling `next()` on the source
+ * in response to a `next()` call from downstream if no pending injected events can be dispatched.
+ */
+function injectable(source) {
+    let sourceIsDone = false;
+    let waiter = undefined; // An active, waiting next() call.
+    // A pending upstream event that couldn't be dispatched because inject() has been called before it was resolved.
+    let pendingSourceEvent = null;
+    let pendingInjectedEvents = [];
+    const consumeWaiter = () => {
+        const pending = waiter;
+        waiter = undefined;
+        return pending;
+    };
+    const fetchFromSource = () => {
+        const resolveWaiter = (propagate) => {
+            const active = consumeWaiter();
+            if (active) {
+                propagate(active);
+            }
+            else {
+                pendingSourceEvent = propagate;
+            }
+        };
+        const nextFromSource = source.next();
+        nextFromSource.then((value) => {
+            sourceIsDone = value.done == true;
+            resolveWaiter((w) => w.resolve(value));
+        }, (error) => {
+            resolveWaiter((w) => w.reject(error));
+        });
+    };
+    return {
+        next: () => {
+            return new Promise((resolve, reject) => {
+                // First priority: Dispatch ready upstream events.
+                if (sourceIsDone) {
+                    return resolve(doneResult);
+                }
+                if (pendingSourceEvent) {
+                    pendingSourceEvent({ resolve, reject });
+                    pendingSourceEvent = null;
+                    return;
+                }
+                // Second priority: Dispatch injected events
+                if (pendingInjectedEvents.length) {
+                    return resolve(valueResult(pendingInjectedEvents.shift()));
+                }
+                // Nothing pending? Fetch from source
+                waiter = { resolve, reject };
+                return fetchFromSource();
+            });
+        },
+        inject: (event) => {
+            const pending = consumeWaiter();
+            if (pending != null) {
+                pending.resolve(valueResult(event));
+            }
+            else {
+                pendingInjectedEvents.push(event);
+            }
+        }
+    };
+}
+/**
+ * Splits a byte stream at line endings, emitting each line as a string.
+ */
+function extractJsonLines(source, decoder) {
+    let buffer = '';
+    const pendingLines = [];
+    let isFinalEvent = false;
+    return {
+        next: async () => {
+            while (true) {
+                if (isFinalEvent) {
+                    return doneResult;
+                }
+                {
+                    const first = pendingLines.shift();
+                    if (first) {
+                        return { done: false, value: first };
+                    }
+                }
+                const { done, value } = await source.next();
+                if (done) {
+                    const remaining = buffer.trim();
+                    if (remaining.length != 0) {
+                        isFinalEvent = true;
+                        return { done: false, value: remaining };
+                    }
+                    return doneResult;
+                }
+                const data = decoder.decode(value, { stream: true });
+                buffer += data;
+                const lines = buffer.split('\n');
+                for (let i = 0; i < lines.length - 1; i++) {
+                    const l = lines[i].trim();
+                    if (l.length > 0) {
+                        pendingLines.push(l);
+                    }
+                }
+                buffer = lines[lines.length - 1];
+            }
+        }
+    };
+}
+/**
+ * Splits a concatenated stream of BSON objects by emitting individual objects.
+ */
+function extractBsonObjects(source) {
+    // Fully read but not emitted yet.
+    const completedObjects = [];
+    // Whether source has returned { done: true }. We do the same once completed objects have been emitted.
+    let isDone = false;
+    const lengthBuffer = new DataView(new ArrayBuffer(4));
+    let objectBody = null;
+    // If we're parsing the length field, a number between 1 and 4 (inclusive) describing remaining bytes in the header.
+    // If we're consuming a document, the bytes remaining.
+    let remainingLength = 4;
+    return {
+        async next() {
+            while (true) {
+                // Before fetching new data from upstream, return completed objects.
+                if (completedObjects.length) {
+                    return valueResult(completedObjects.shift());
+                }
+                if (isDone) {
+                    return doneResult;
+                }
+                const upstreamEvent = await source.next();
+                if (upstreamEvent.done) {
+                    isDone = true;
+                    if (objectBody || remainingLength != 4) {
+                        throw new Error('illegal end of stream in BSON object');
+                    }
+                    return doneResult;
+                }
+                const chunk = upstreamEvent.value;
+                for (let i = 0; i < chunk.length;) {
+                    const availableInData = chunk.length - i;
+                    if (objectBody) {
+                        // We're in the middle of reading a BSON document.
+                        const bytesToRead = Math.min(availableInData, remainingLength);
+                        const copySource = new Uint8Array(chunk.buffer, chunk.byteOffset + i, bytesToRead);
+                        objectBody.set(copySource, objectBody.length - remainingLength);
+                        i += bytesToRead;
+                        remainingLength -= bytesToRead;
+                        if (remainingLength == 0) {
+                            completedObjects.push(objectBody);
+                            // Prepare to read another document, starting with its length
+                            objectBody = null;
+                            remainingLength = 4;
+                        }
+                    }
+                    else {
+                        // Copy up to 4 bytes into lengthBuffer, depending on how many we still need.
+                        const bytesToRead = Math.min(availableInData, remainingLength);
+                        for (let j = 0; j < bytesToRead; j++) {
+                            lengthBuffer.setUint8(4 - remainingLength + j, chunk[i + j]);
+                        }
+                        i += bytesToRead;
+                        remainingLength -= bytesToRead;
+                        if (remainingLength == 0) {
+                            // Transition from reading length header to reading document. Subtracting 4 because the length of the
+                            // header is included in length.
+                            const length = lengthBuffer.getInt32(0, true /* little endian */);
+                            remainingLength = length - 4;
+                            if (remainingLength < 1) {
+                                throw new Error(`invalid length for bson: ${length}`);
+                            }
+                            objectBody = new Uint8Array(length);
+                            new DataView(objectBody.buffer).setInt32(0, length, true);
+                        }
+                    }
+                }
+            }
+        }
+    };
+}
+
 const POWERSYNC_TRAILING_SLASH_MATCH = /\/+$/;
 const POWERSYNC_JS_VERSION = PACKAGE.version;
+const SYNC_QUEUE_REQUEST_HIGH_WATER = 10;
 const SYNC_QUEUE_REQUEST_LOW_WATER = 5;
 // Keep alive message is sent every period
 const KEEP_ALIVE_MS = 20_000;
@@ -12950,13 +13072,14 @@ class AbstractRemote {
         return new WebSocket(url);
     }
     /**
-     * Returns a data stream of sync line data.
+     * 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 map Maps received payload frames to the typed event value.
      * @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, map, bson) {
+    async socketStreamRaw(options, bson) {
         const { path, fetchStrategy = FetchStrategy.Buffered } = options;
         const mimeType = bson == null ? 'application/json' : 'application/bson';
         function toBuffer(js) {
@@ -12971,52 +13094,55 @@ class AbstractRemote {
         }
         const syncQueueRequestSize = fetchStrategy == FetchStrategy.Buffered ? 10 : 1;
         const request = await this.buildRequest(path);
+        const url = this.options.socketUrlTransformer(request.url);
         // Add the user agent in the setup payload - we can't set custom
         // headers with websockets on web. The browser userAgent is however added
         // automatically as a header.
         const userAgent = this.getUserAgent();
-        const stream = new DataStream({
-            logger: this.logger,
-            pressure: {
-                lowWaterMark: SYNC_QUEUE_REQUEST_LOW_WATER
-            },
-            mapLine: map
-        });
+        // While we're connecting (a process that can't be aborted in RSocket), the WebSocket instance to close if we wanted
+        // to abort the connection.
+        let pendingSocket = null;
+        let keepAliveTimeout;
+        let rsocket = null;
+        let queue = null;
+        let didClose = false;
+        const abortRequest = () => {
+            if (didClose) {
+                return;
+            }
+            didClose = true;
+            clearTimeout(keepAliveTimeout);
+            if (pendingSocket) {
+                pendingSocket.close();
+            }
+            if (rsocket) {
+                rsocket.close();
+            }
+            if (queue) {
+                queue.stop();
+            }
+        };
         // Handle upstream abort
-        if (options.abortSignal?.aborted) {
+        if (options.abortSignal.aborted) {
             throw new AbortOperation('Connection request aborted');
         }
         else {
-            options.abortSignal?.addEventListener('abort', () => {
-                stream.close();
-            }, { once: true });
+            options.abortSignal.addEventListener('abort', abortRequest);
         }
-        let keepAliveTimeout;
         const resetTimeout = () => {
             clearTimeout(keepAliveTimeout);
             keepAliveTimeout = setTimeout(() => {
                 this.logger.error(`No data received on WebSocket in ${SOCKET_TIMEOUT_MS}ms, closing connection.`);
-                stream.close();
+                abortRequest();
             }, SOCKET_TIMEOUT_MS);
         };
         resetTimeout();
-        // Typescript complains about this being `never` if it's not assigned here.
-        // This is assigned in `wsCreator`.
-        let disposeSocketConnectionTimeout = () => { };
-        const url = this.options.socketUrlTransformer(request.url);
         const connector = new distExports.RSocketConnector({
             transport: new WebsocketClientTransport({
                 url,
                 wsCreator: (url) => {
-                    const socket = this.createSocket(url);
-                    disposeSocketConnectionTimeout = stream.registerListener({
-                        closed: () => {
-                            // Allow closing the underlying WebSocket if the stream was closed before the
-                            // RSocket connect completed. This should effectively abort the request.
-                            socket.close();
-                        }
-                    });
-                    socket.addEventListener('message', (event) => {
+                    const socket = (pendingSocket = this.createSocket(url));
+                    socket.addEventListener('message', () => {
                         resetTimeout();
                     });
                     return socket;
@@ -13036,43 +13162,40 @@ class AbstractRemote {
                 }
             }
         });
-        let rsocket;
         try {
             rsocket = await connector.connect();
             // The connection is established, we no longer need to monitor the initial timeout
-            disposeSocketConnectionTimeout();
+            pendingSocket = null;
         }
         catch (ex) {
             this.logger.error(`Failed to connect WebSocket`, ex);
-            clearTimeout(keepAliveTimeout);
-            if (!stream.closed) {
-                await stream.close();
-            }
+            abortRequest();
             throw ex;
         }
         resetTimeout();
-        let socketIsClosed = false;
-        const closeSocket = () => {
-            clearTimeout(keepAliveTimeout);
-            if (socketIsClosed) {
-                return;
-            }
-            socketIsClosed = true;
-            rsocket.close();
-        };
         // Helps to prevent double close scenarios
-        rsocket.onClose(() => (socketIsClosed = true));
-        // We initially request this amount and expect these to arrive eventually
-        let pendingEventsCount = syncQueueRequestSize;
-        const disposeClosedListener = stream.registerListener({
-            closed: () => {
-                closeSocket();
-                disposeClosedListener();
-            }
-        });
-        const socket = await new Promise((resolve, reject) => {
+        rsocket.onClose(() => (rsocket = null));
+        return await new Promise((resolve, reject) => {
             let connectionEstablished = false;
-            const res = rsocket.requestStream({
+            let pendingEventsCount = syncQueueRequestSize;
+            let paused = false;
+            let res = null;
+            function requestMore() {
+                const delta = syncQueueRequestSize - pendingEventsCount;
+                if (!paused && delta > 0) {
+                    res?.request(delta);
+                    pendingEventsCount = syncQueueRequestSize;
+                }
+            }
+            const events = new domExports.EventIterator((q) => {
+                queue = q;
+                q.on('highWater', () => (paused = true));
+                q.on('lowWater', () => {
+                    paused = false;
+                    requestMore();
+                });
+            }, { highWaterMark: SYNC_QUEUE_REQUEST_HIGH_WATER, lowWaterMark: SYNC_QUEUE_REQUEST_LOW_WATER })[symbolAsyncIterator]();
+            res = rsocket.requestStream({
                 data: toBuffer(options.data),
                 metadata: toBuffer({
                     path
@@ -13097,7 +13220,7 @@ class AbstractRemote {
                     }
                     // RSocket will close the RSocket stream automatically
                     // Close the downstream stream as well - this will close the RSocket connection and WebSocket
-                    stream.close();
+                    abortRequest();
                     // Handles cases where the connection failed e.g. auth error or connection error
                     if (!connectionEstablished) {
                         reject(e);
@@ -13107,41 +13230,40 @@ class AbstractRemote {
                     // The connection is active
                     if (!connectionEstablished) {
                         connectionEstablished = true;
-                        resolve(res);
+                        resolve(events);
                     }
                     const { data } = payload;
+                    if (data) {
+                        queue.push(data);
+                    }
                     // Less events are now pending
                     pendingEventsCount--;
-                    if (!data) {
-                        return;
-                    }
-                    stream.enqueueData(data);
+                    // Request another event (unless the downstream consumer is paused).
+                    requestMore();
                 },
                 onComplete: () => {
-                    stream.close();
+                    abortRequest(); // this will also emit a done event
                 },
                 onExtension: () => { }
             });
         });
-        const l = stream.registerListener({
-            lowWater: async () => {
-                // Request to fill up the queue
-                const required = syncQueueRequestSize - pendingEventsCount;
-                if (required > 0) {
-                    socket.request(syncQueueRequestSize - pendingEventsCount);
-                    pendingEventsCount = syncQueueRequestSize;
-                }
-            },
-            closed: () => {
-                l();
-            }
-        });
-        return stream;
     }
     /**
-     * Connects to the sync/stream http endpoint, mapping and emitting each received string line.
+     * @returns Whether the HTTP implementation on this platform can receive streamed binary responses. This is true on
+     * all platforms except React Native (who would have guessed...), where we must not request BSON responses.
+     *
+     * @see https://github.com/react-native-community/fetch?tab=readme-ov-file#motivation
      */
-    async postStreamRaw(options, mapLine) {
+    get supportsStreamingBinaryResponses() {
+        return true;
+    }
+    /**
+     * Posts a `/sync/stream` request, asserts that it completes successfully and returns the streaming response as an
+     * async iterator of byte blobs.
+     *
+     * To cancel the async iterator, use the abort signal from {@link SyncStreamOptions} passed to this method.
+     */
+    async fetchStreamRaw(options) {
         const { data, path, headers, abortSignal } = options;
         const request = await this.buildRequest(path);
         /**
@@ -13153,119 +13275,94 @@ class AbstractRemote {
          *  Aborting the active fetch request while it is being consumed seems to throw
          *  an unhandled exception on the window level.
          */
-        if (abortSignal?.aborted) {
-            throw new AbortOperation('Abort request received before making postStreamRaw request');
+        if (abortSignal.aborted) {
+            throw new AbortOperation('Abort request received before making fetchStreamRaw request');
         }
         const controller = new AbortController();
-        let requestResolved = false;
-        abortSignal?.addEventListener('abort', () => {
-            if (!requestResolved) {
+        let reader = null;
+        abortSignal.addEventListener('abort', () => {
+            const reason = abortSignal.reason ??
+                new AbortOperation('Cancelling network request before it resolves. Abort signal has been received.');
+            if (reader == null) {
                 // Only abort via the abort controller if the request has not resolved yet
-                controller.abort(abortSignal.reason ??
-                    new AbortOperation('Cancelling network request before it resolves. Abort signal has been received.'));
+                controller.abort(reason);
+            }
+            else {
+                reader.cancel(reason).catch(() => {
+                    // Cancelling the reader might rethrow an exception we would have handled by throwing in next(). So we can
+                    // ignore it here.
+                });
             }
         });
-        const res = await this.fetch(request.url, {
-            method: 'POST',
-            headers: { ...headers, ...request.headers },
-            body: JSON.stringify(data),
-            signal: controller.signal,
-            cache: 'no-store',
-            ...(this.options.fetchOptions ?? {}),
-            ...options.fetchOptions
-        }).catch((ex) => {
+        let res;
+        let responseIsBson = false;
+        try {
+            const ndJson = 'application/x-ndjson';
+            const bson = 'application/vnd.powersync.bson-stream';
+            res = await this.fetch(request.url, {
+                method: 'POST',
+                headers: {
+                    ...headers,
+                    ...request.headers,
+                    accept: this.supportsStreamingBinaryResponses ? `${bson};q=0.9,${ndJson};q=0.8` : ndJson
+                },
+                body: JSON.stringify(data),
+                signal: controller.signal,
+                cache: 'no-store',
+                ...(this.options.fetchOptions ?? {}),
+                ...options.fetchOptions
+            });
+            if (!res.ok || !res.body) {
+                const text = await res.text();
+                this.logger.error(`Could not POST streaming to ${path} - ${res.status} - ${res.statusText}: ${text}`);
+                const error = new Error(`HTTP ${res.statusText}: ${text}`);
+                error.status = res.status;
+                throw error;
+            }
+            const contentType = res.headers.get('content-type');
+            responseIsBson = contentType == bson;
+        }
+        catch (ex) {
             if (ex.name == 'AbortError') {
                 throw new AbortOperation(`Pending fetch request to ${request.url} has been aborted.`);
             }
             throw ex;
-        });
-        if (!res) {
-            throw new Error('Fetch request was aborted');
-        }
-        requestResolved = true;
-        if (!res.ok || !res.body) {
-            const text = await res.text();
-            this.logger.error(`Could not POST streaming to ${path} - ${res.status} - ${res.statusText}: ${text}`);
-            const error = new Error(`HTTP ${res.statusText}: ${text}`);
-            error.status = res.status;
-            throw error;
         }
-        // Create a new stream splitting the response at line endings while also handling cancellations
-        // by closing the reader.
-        const reader = res.body.getReader();
-        let readerReleased = false;
-        // This will close the network request and read stream
-        const closeReader = async () => {
-            try {
-                readerReleased = true;
-                await reader.cancel();
-            }
-            catch (ex) {
-                // an error will throw if the reader hasn't been used yet
-            }
-            reader.releaseLock();
-        };
-        const stream = new DataStream({
-            logger: this.logger,
-            mapLine: mapLine,
-            pressure: {
-                highWaterMark: 20,
-                lowWaterMark: 10
-            }
-        });
-        abortSignal?.addEventListener('abort', () => {
-            closeReader();
-            stream.close();
-        });
-        const decoder = this.createTextDecoder();
-        let buffer = '';
-        const consumeStream = async () => {
-            while (!stream.closed && !abortSignal?.aborted && !readerReleased) {
-                const { done, value } = await reader.read();
-                if (done) {
-                    const remaining = buffer.trim();
-                    if (remaining.length != 0) {
-                        stream.enqueueData(remaining);
-                    }
-                    stream.close();
-                    await closeReader();
-                    return;
+        reader = res.body.getReader();
+        const stream = {
+            next: async () => {
+                if (controller.signal.aborted) {
+                    return doneResult;
                 }
-                const data = decoder.decode(value, { stream: true });
-                buffer += data;
-                const lines = buffer.split('\n');
-                for (var i = 0; i < lines.length - 1; i++) {
-                    var l = lines[i].trim();
-                    if (l.length > 0) {
-                        stream.enqueueData(l);
-                    }
+                try {
+                    return await reader.read();
                 }
-                buffer = lines[lines.length - 1];
-                // Implement backpressure by waiting for the low water mark to be reached
-                if (stream.dataQueue.length > stream.highWatermark) {
-                    await new Promise((resolve) => {
-                        const dispose = stream.registerListener({
-                            lowWater: async () => {
-                                resolve();
-                                dispose();
-                            },
-                            closed: () => {
-                                resolve();
-                                dispose();
-                            }
-                        });
-                    });
+                catch (ex) {
+                    if (controller.signal.aborted) {
+                        // .read() completes with an error if we cancel the reader, which we do to disconnect. So this is just
+                        // things working as intended, we can return a done event and consider the exception handled.
+                        return doneResult;
+                    }
+                    throw ex;
                 }
             }
         };
-        consumeStream().catch(ex => this.logger.error('Error consuming stream', ex));
-        const l = stream.registerListener({
-            closed: () => {
-                closeReader();
-                l?.();
-            }
-        });
-        return stream;
+        return { isBson: responseIsBson, stream };
+    }
+    /**
+     * Posts a `/sync/stream` request.
+     *
+     * Depending on the `Content-Type` of the response, this returns strings for sync lines or encoded BSON documents as
+     * {@link Uint8Array}s.
+     */
+    async fetchStream(options) {
+        const { isBson, stream } = await this.fetchStreamRaw(options);
+        if (isBson) {
+            return extractBsonObjects(stream);
+        }
+        else {
+            return extractJsonLines(stream, this.createTextDecoder());
+        }
     }
 }
 
@@ -13773,6 +13870,19 @@ The next upload iteration will be delayed.`);
             }
         });
     }
+    async receiveSyncLines(data) {
+        const { options, connection, bson } = data;
+        const remote = this.options.remote;
+        if (connection.connectionMethod == 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) {
@@ -13802,42 +13912,27 @@ The next upload iteration will be delayed.`);
                 client_id: clientId
             }
         };
-        let stream;
-        if (resolvedOptions?.connectionMethod == SyncStreamConnectionMethod.HTTP) {
-            stream = await this.options.remote.postStreamRaw(syncOptions, (line) => {
-                if (typeof line == 'string') {
-                    return JSON.parse(line);
-                }
-                else {
-                    // Directly enqueued by us
-                    return line;
-                }
-            });
-        }
-        else {
-            const bson = await this.options.remote.getBSON();
-            stream = await this.options.remote.socketStreamRaw({
-                ...syncOptions,
-                ...{ fetchStrategy: resolvedOptions.fetchStrategy }
-            }, (payload) => {
-                if (payload instanceof Uint8Array) {
-                    return bson.deserialize(payload);
-                }
-                else {
-                    // Directly enqueued by us
-                    return payload;
-                }
-            }, bson);
-        }
+        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);
+            }
+            else {
+                return bson.deserialize(line);
+            }
+        }));
         this.logger.debug('Stream established. Processing events');
         this.notifyCompletedUploads = () => {
-            if (!stream.closed) {
-                stream.enqueueData({ crud_upload_completed: null });
-            }
+            stream.inject({ crud_upload_completed: null });
         };
-        while (!stream.closed) {
-            const line = await stream.read();
-            if (!line) {
+        while (true) {
+            const { value: line, done } = await stream.next();
+            if (done) {
                 // The stream has closed while waiting
                 return;
             }
@@ -14016,14 +14111,17 @@ The next upload iteration will be delayed.`);
         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;
         if (signal.aborted) {
             throw new AbortOperation('Connection request has been aborted');
         }
-        const abortController = new AbortController();
-        signal.addEventListener('abort', () => abortController.abort());
         // 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.
@@ -14031,49 +14129,36 @@ The next upload iteration will be delayed.`);
         async function connect(instr) {
             const syncOptions = {
                 path: '/sync/stream',
-                abortSignal: abortController.signal,
+                abortSignal: controller.signal,
                 data: instr.request
             };
-            if (resolvedOptions.connectionMethod == SyncStreamConnectionMethod.HTTP) {
-                controlInvocations = await remote.postStreamRaw(syncOptions, (line) => {
-                    if (typeof line == 'string') {
-                        return {
-                            command: PowerSyncControlCommand.PROCESS_TEXT_LINE,
-                            payload: line
-                        };
-                    }
-                    else {
-                        // Directly enqueued by us
-                        return line;
-                    }
-                });
-            }
-            else {
-                controlInvocations = await remote.socketStreamRaw({
-                    ...syncOptions,
-                    fetchStrategy: resolvedOptions.fetchStrategy
-                }, (payload) => {
-                    if (payload instanceof Uint8Array) {
-                        return {
-                            command: PowerSyncControlCommand.PROCESS_BSON_LINE,
-                            payload: payload
-                        };
-                    }
-                    else {
-                        // Directly enqueued by us
-                        return payload;
-                    }
-                });
-            }
+            controlInvocations = injectable(map(await syncImplementation.receiveSyncLines({
+                options: syncOptions,
+                connection: resolvedOptions
+            }), (line) => {
+                if (typeof line == 'string') {
+                    return {
+                        command: PowerSyncControlCommand.PROCESS_TEXT_LINE,
+                        payload: line
+                    };
+                }
+                else {
+                    return {
+                        command: 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 (!controlInvocations.closed) {
-                    const line = await controlInvocations.read();
-                    if (line == null) {
-                        return;
+                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();
@@ -14082,12 +14167,8 @@ The next upload iteration will be delayed.`);
                 }
             }
             finally {
-                const activeInstructions = controlInvocations;
-                // We concurrently add events to the active data stream when e.g. a CRUD upload is completed or a token is
-                // refreshed. That would throw after closing (and we can't handle those events either way), so set this back
-                // to null.
-                controlInvocations = null;
-                await activeInstructions.close();
+                abort();
+                signal.removeEventListener('abort', abort);
             }
         }
         async function stop() {
@@ -14131,14 +14212,14 @@ The next upload iteration will be delayed.`);
                     remote.invalidateCredentials();
                     // Restart iteration after the credentials have been refreshed.
                     remote.fetchCredentials().then((_) => {
-                        controlInvocations?.enqueueData({ command: PowerSyncControlCommand.NOTIFY_TOKEN_REFRESHED });
+                        controlInvocations?.inject({ command: PowerSyncControlCommand.NOTIFY_TOKEN_REFRESHED });
                     }, (err) => {
                         syncImplementation.logger.warn('Could not prefetch credentials', err);
                     });
                 }
             }
             else if ('CloseSyncStream' in instruction) {
-                abortController.abort();
+                controller.abort();
                 hideDisconnectOnRestart = instruction.CloseSyncStream.hide_disconnect;
             }
             else if ('FlushFileSystem' in instruction) ;
@@ -14167,17 +14248,13 @@ The next upload iteration will be delayed.`);
             }
             await control(PowerSyncControlCommand.START, JSON.stringify(options));
             this.notifyCompletedUploads = () => {
-                if (controlInvocations && !controlInvocations?.closed) {
-                    controlInvocations.enqueueData({ command: PowerSyncControlCommand.NOTIFY_CRUD_UPLOAD_COMPLETED });
-                }
+                controlInvocations?.inject({ command: PowerSyncControlCommand.NOTIFY_CRUD_UPLOAD_COMPLETED });
             };
             this.handleActiveStreamsChange = () => {
-                if (controlInvocations && !controlInvocations?.closed) {
-                    controlInvocations.enqueueData({
-                        command: PowerSyncControlCommand.UPDATE_SUBSCRIPTIONS,
-                        payload: JSON.stringify(this.activeStreams)
-                    });
-                }
+                controlInvocations?.inject({
+                    command: PowerSyncControlCommand.UPDATE_SUBSCRIPTIONS,
+                    payload: JSON.stringify(this.activeStreams)
+                });
             };
             await receivingLines;
         }