@powersync/common 0.0.0-dev-20260112083235 → 0.0.0-dev-20260120150240

package/dist/bundle.node.cjs

@@ -6793,6 +6793,16 @@ class DataStream extends BaseObserver {
      * @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;
         }
@@ -6832,7 +6842,7 @@ class DataStream extends BaseObserver {
         }
         const promise = (this.processingPromise = this._processQueue());
         promise.finally(() => {
-            return (this.processingPromise = null);
+            this.processingPromise = null;
         });
         return promise;
     }
@@ -6864,7 +6874,6 @@ class DataStream extends BaseObserver {
             this.notifyDataAdded = null;
         }
         if (this.dataQueue.length > 0) {
-            // Next tick
             setTimeout(() => this.processQueue());
         }
     }
@@ -7484,7 +7493,11 @@ class AbstractRemote {
         };
         const stream = new DataStream({
             logger: this.logger,
-            mapLine: mapLine
+            mapLine: mapLine,
+            pressure: {
+                highWaterMark: 20,
+                lowWaterMark: 10
+            }
         });
         abortSignal?.addEventListener('abort', () => {
             closeReader();
@@ -7492,42 +7505,47 @@ class AbstractRemote {
         });
         const decoder = this.createTextDecoder();
         let buffer = '';
-        const l = stream.registerListener({
-            lowWater: async () => {
-                if (stream.closed || abortSignal?.aborted || readerReleased) {
+        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;
                 }
-                try {
-                    let didCompleteLine = false;
-                    while (!didCompleteLine) {
-                        const { done, value } = await reader.read();
-                        if (done) {
-                            const remaining = buffer.trim();
-                            if (remaining.length != 0) {
-                                stream.enqueueData(remaining);
-                            }
-                            stream.close();
-                            await closeReader();
-                            return;
-                        }
-                        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);
-                                didCompleteLine = true;
-                            }
-                        }
-                        buffer = lines[lines.length - 1];
+                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);
                     }
                 }
-                catch (ex) {
-                    stream.close();
-                    throw ex;
+                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();
+                            }
+                        });
+                    });
                 }
-            },
+            }
+        };
+        consumeStream().catch(ex => this.logger.error('Error consuming stream', ex));
+        const l = stream.registerListener({
             closed: () => {
                 closeReader();
                 l?.();
@@ -10834,6 +10852,7 @@ exports.MAX_OP_ID = MAX_OP_ID;
 exports.OnChangeQueryProcessor = OnChangeQueryProcessor;
 exports.OpType = OpType;
 exports.OplogEntry = OplogEntry;
+exports.RawTable = RawTable;
 exports.Schema = Schema;
 exports.SqliteBucketStorage = SqliteBucketStorage;
 exports.SyncDataBatch = SyncDataBatch;