orez 0.5.8 → 0.5.11

package/dist/browser.js

@@ -103,7 +103,7 @@ export async function startOrezBrowser(config) {
         },
         async stop() {
             await zc.stop();
-            proxy.close();
+            await proxy.close();
             resetReplicationState();
             await Promise.all([pgPostgres.close(), pgCvr.close(), pgCdb.close()]);
         },

package/dist/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"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"}

package/dist/pg-proxy-browser.d.ts

@@ -20,7 +20,7 @@ import type { PGlite } from '@electric-sql/pglite';
 export type BrowserProxyDbName = 'postgres' | 'zero_cvr' | 'zero_cdb';
 export interface BrowserProxy {
     handleConnection(port: MessagePort): void;
-    close(): void;
+    close(): Promise<void>;
     createExternalSession(dbName?: BrowserProxyDbName): BrowserProxyExternalSession;
     /**
      * mutex-coordinated query for out-of-band JSON callers (e.g. soot's

package/dist/pg-proxy-browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pg-proxy-browser.d.ts","sourceRoot":"","sources":["../src/pg-proxy-browser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAaH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AA+sBlD;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,CAAA;AAErE,MAAM,WAAW,YAAY;IAC3B,gBAAgB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,CAAA;IACzC,KAAK,IAAI,IAAI,CAAA;IACb,qBAAqB,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,2BAA2B,CAAA;IAC/E;;;;;;;;OAQG;IACH,KAAK,CACH,MAAM,EAAE,kBAAkB,EAC1B,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC;QAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACtD,IAAI,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAA;CACxF;AAED,MAAM,WAAW,2BAA2B;IAC1C,KAAK,CACH,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC;QAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACtD,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAA;IAC3D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACvB;AA4CD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,GAAG,eAAe,EACjC,MAAM,EAAE;IACN,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GACA,OAAO,CAAC,YAAY,CAAC,CA2uCvB"}
+{"version":3,"file":"pg-proxy-browser.d.ts","sourceRoot":"","sources":["../src/pg-proxy-browser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAaH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AA+sBlD;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,CAAA;AAErE,MAAM,WAAW,YAAY;IAC3B,gBAAgB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,CAAA;IACzC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACtB,qBAAqB,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,2BAA2B,CAAA;IAC/E;;;;;;;;OAQG;IACH,KAAK,CACH,MAAM,EAAE,kBAAkB,EAC1B,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC;QAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACtD,IAAI,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAA;CACxF;AAED,MAAM,WAAW,2BAA2B;IAC1C,KAAK,CACH,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC;QAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACtD,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAA;IAC3D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACvB;AA4CD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,GAAG,eAAe,EACjC,MAAM,EAAE;IACN,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GACA,OAAO,CAAC,YAAY,CAAC,CA20CvB"}

package/dist/pg-proxy-browser.js

@@ -771,12 +771,18 @@ export async function createBrowserProxy(dbInput, config) {
         });
     }
     let closed = false;
+    let closePromise = null;
     const activeConnectionClosers = new Set();
+    const unreportedConnectionCleanupErrors = new Set();
     function handleConnection(port) {
         if (closed) {
             port.close();
             return;
         }
+        const closePendingConnection = async () => {
+            port.close();
+        };
+        activeConnectionClosers.add(closePendingConnection);
         port.start();
         // peek at the first message to detect replication connections.
         // replication connections bypass pg-gateway entirely and are handled
@@ -786,6 +792,10 @@ export async function createBrowserProxy(dbInput, config) {
         const buffered = [];
         let handlerInstalled = false;
         port.onmessage = (ev) => {
+            if (closed) {
+                port.close();
+                return;
+            }
             if (handlerInstalled)
                 return; // shouldn't happen — handler replaced port.onmessage
             buffered.push(ev);
@@ -795,6 +805,7 @@ export async function createBrowserProxy(dbInput, config) {
             if (!(data instanceof Uint8Array) || data.length < 8) {
                 handlerInstalled = true;
                 handleRegularConnection(port, ev);
+                activeConnectionClosers.delete(closePendingConnection);
                 // flush buffered messages to the new handler
                 for (let i = 1; i < buffered.length; i++) {
                     port.onmessage?.(buffered[i]);
@@ -813,6 +824,7 @@ export async function createBrowserProxy(dbInput, config) {
                 // in browser Web Workers (same root cause as patches #9, #18, #20).
                 handleRawConnection(port, data, params, getDbContext(dbName), isRepl);
                 handlerInstalled = true;
+                activeConnectionClosers.delete(closePendingConnection);
                 // flush any messages that arrived while we were processing the startup
                 for (let i = 1; i < buffered.length; i++) {
                     if (port.onmessage) {
@@ -855,43 +867,53 @@ export async function createBrowserProxy(dbInput, config) {
         const connId = {};
         const dbName = params.database || 'postgres';
         let connClosed = false;
-        let sessionClosed = false;
-        const closeSession = async () => {
-            if (sessionClosed)
-                return;
-            sessionClosed = true;
-            activeConnectionClosers.delete(closeSession);
-            // a connection torn down mid-pipeline still OWNS the db mutex. a dead
-            // pipeline can never send its Sync, so without this release the mutex
-            // is leaked forever and every later connection on this db (including
-            // the next embed generation after an idle-hibernation teardown) blocks
-            // in mutex.acquire() before its first statement. when a statement is
-            // still executing, the pipeline continuation performs this cleanup
-            // after it settles instead (pipelineExecInFlight).
-            if (pipelineMutexHeld && !pipelineExecInFlight) {
-                pipelineMutexHeld = false;
-                try {
-                    await rollbackOwnTransaction();
+        let closeSessionPromise = null;
+        const closeSession = () => {
+            if (closeSessionPromise)
+                return closeSessionPromise;
+            connClosed = true;
+            closeSessionPromise = (async () => {
+                port.close();
+                // a connection torn down mid-pipeline still OWNS the db mutex. a dead
+                // pipeline can never send its Sync, so without this release the mutex
+                // is leaked forever and every later connection on this db (including
+                // the next embed generation after an idle-hibernation teardown) blocks
+                // in mutex.acquire() before its first statement. when a statement is
+                // still executing, the pipeline continuation performs this cleanup
+                // after it settles instead (pipelineExecInFlight).
+                if (pipelineExecInFlight)
+                    await pipelineIdlePromise;
+                if (pipelineMutexHeld) {
+                    pipelineMutexHeld = false;
+                    try {
+                        await rollbackOwnTransaction();
+                    }
+                    finally {
+                        mutex.release();
+                    }
                 }
-                finally {
-                    mutex.release();
+                else {
+                    await mutex.acquire();
+                    try {
+                        await rollbackOwnTransaction();
+                    }
+                    finally {
+                        mutex.release();
+                    }
                 }
-            }
-            try {
                 await scopedContext.close();
-            }
-            catch { }
+            })();
+            void closeSessionPromise.then(() => activeConnectionClosers.delete(closeSession), (error) => {
+                activeConnectionClosers.delete(closeSession);
+                unreportedConnectionCleanupErrors.add(error);
+            });
+            return closeSessionPromise;
         };
         activeConnectionClosers.add(closeSession);
         // roll back this connection's open transaction. caller must hold the mutex.
         const rollbackOwnTransaction = async () => {
             if (txState.owner === connId && txState.status !== 0x49) {
-                try {
-                    await db.exec('ROLLBACK');
-                }
-                catch {
-                    // db is closed or rollback failed — ignore
-                }
+                await db.exec('ROLLBACK');
                 txState.status = 0x49;
                 txState.owner = null;
             }
@@ -959,6 +981,18 @@ export async function createBrowserProxy(dbInput, config) {
         // statement currently executing inside the held pipeline — closeSession
         // must not release the mutex under it (see closeSession above)
         let pipelineExecInFlight = false;
+        let resolvePipelineIdle = () => { };
+        let pipelineIdlePromise = Promise.resolve();
+        const beginPipelineExec = () => {
+            pipelineExecInFlight = true;
+            pipelineIdlePromise = new Promise((resolve) => {
+                resolvePipelineIdle = resolve;
+            });
+        };
+        const endPipelineExec = () => {
+            pipelineExecInFlight = false;
+            resolvePipelineIdle();
+        };
         let extWritePending = false;
         let pipelineBuffer = [];
         // remember the most recent Parse / SimpleQuery for diagnostic logging when
@@ -1163,7 +1197,7 @@ export async function createBrowserProxy(dbInput, config) {
                             const combined = concatUint8Arrays(pipelineBuffer);
                             pipelineBuffer = [];
                             let flushResult;
-                            pipelineExecInFlight = true;
+                            beginPipelineExec();
                             try {
                                 flushResult = await db.execProtocolRaw(combined, { syncToFs: false });
                             }
@@ -1174,19 +1208,7 @@ export async function createBrowserProxy(dbInput, config) {
                                 return;
                             }
                             finally {
-                                pipelineExecInFlight = false;
-                            }
-                            if (sessionClosed && pipelineMutexHeld) {
-                                // session torn down while this statement was executing —
-                                // closeSession skipped its cleanup, finish it here
-                                pipelineMutexHeld = false;
-                                try {
-                                    await rollbackOwnTransaction();
-                                }
-                                finally {
-                                    mutex.release();
-                                }
-                                return;
+                                endPipelineExec();
                             }
                             flushResult = stripResponseMessages(flushResult, true);
                             write(flushResult);
@@ -1199,7 +1221,7 @@ export async function createBrowserProxy(dbInput, config) {
                     pipelineBuffer = [];
                     let result;
                     const t0 = performance.now();
-                    pipelineExecInFlight = true;
+                    beginPipelineExec();
                     try {
                         result = await db.execProtocolRaw(combined, { syncToFs: false });
                     }
@@ -1210,7 +1232,7 @@ export async function createBrowserProxy(dbInput, config) {
                         return;
                     }
                     finally {
-                        pipelineExecInFlight = false;
+                        endPipelineExec();
                     }
                     const dt = performance.now() - t0;
                     if (isDebugWire() && dt > 100)
@@ -1327,17 +1349,25 @@ export async function createBrowserProxy(dbInput, config) {
         // not release the mutex under it; the pipeline continuation finishes the
         // cleanup after the statement settles.
         let pipelineExecInFlight = false;
+        let resolvePipelineIdle = () => { };
+        let pipelineIdlePromise = Promise.resolve();
+        const beginPipelineExec = () => {
+            pipelineExecInFlight = true;
+            pipelineIdlePromise = new Promise((resolve) => {
+                resolvePipelineIdle = resolve;
+            });
+        };
+        const endPipelineExec = () => {
+            pipelineExecInFlight = false;
+            resolvePipelineIdle();
+        };
         // connection closed flag
         let connClosed = false;
+        let cleanupPromise = null;
         // roll back this connection's open transaction. caller must hold the mutex.
         const rollbackOwnTransaction = async (db, txState) => {
             if (txState.owner === connId && txState.status !== 0x49) {
-                try {
-                    await db.exec('ROLLBACK');
-                }
-                catch {
-                    // db is closed or rollback failed — ignore
-                }
+                await db.exec('ROLLBACK');
                 txState.status = 0x49;
                 txState.owner = null;
             }
@@ -1350,32 +1380,30 @@ export async function createBrowserProxy(dbInput, config) {
         // pollution that 2eb1873 fixed on the node side. browser cleanup was
         // missed and showed up as "current transaction is aborted, commands
         // ignored" when a foreign connection closed mid-someone-else's-txn.
-        const cleanup = async () => {
-            if (connClosed)
-                return;
+        const cleanup = () => {
+            if (cleanupPromise)
+                return cleanupPromise;
             connClosed = true;
-            activeConnectionClosers.delete(cleanup);
-            // replication connections don't own a transaction — skip ROLLBACK
-            if (isReplicationConnection)
-                return;
-            try {
+            cleanupPromise = (async () => {
+                port.close();
+                // replication connections don't own a transaction — skip ROLLBACK
+                if (isReplicationConnection)
+                    return;
                 const { db, mutex, txState } = getDbContext(dbName);
+                if (pipelineExecInFlight)
+                    await pipelineIdlePromise;
                 if (pipelineMutexHeld) {
                     // this connection died mid-pipeline and still OWNS the mutex. a
                     // dead pipeline can never send its Sync, so without this release
                     // the mutex is leaked forever and every later connection on this
                     // db (including the next embed generation after idle-hibernation
                     // teardown) blocks in mutex.acquire() before its first statement.
-                    // when a statement is in flight, the pipeline continuation does
-                    // this exact cleanup after it settles.
-                    if (!pipelineExecInFlight) {
-                        pipelineMutexHeld = false;
-                        try {
-                            await rollbackOwnTransaction(db, txState);
-                        }
-                        finally {
-                            mutex.release();
-                        }
+                    pipelineMutexHeld = false;
+                    try {
+                        await rollbackOwnTransaction(db, txState);
+                    }
+                    finally {
+                        mutex.release();
                     }
                     return;
                 }
@@ -1386,10 +1414,12 @@ export async function createBrowserProxy(dbInput, config) {
                 finally {
                     mutex.release();
                 }
-            }
-            catch {
-                // instance may have been replaced during reset, ignore
-            }
+            })();
+            void cleanupPromise.then(() => activeConnectionClosers.delete(cleanup), (error) => {
+                activeConnectionClosers.delete(cleanup);
+                unreportedConnectionCleanupErrors.add(error);
+            });
+            return cleanupPromise;
         };
         activeConnectionClosers.add(cleanup);
         try {
@@ -1486,7 +1516,7 @@ export async function createBrowserProxy(dbInput, config) {
                         data = interceptQuery(data);
                         const t1 = performance.now();
                         let result;
-                        pipelineExecInFlight = true;
+                        beginPipelineExec();
                         try {
                             result = await db.execProtocolRaw(data, { syncToFs: false });
                         }
@@ -1496,7 +1526,7 @@ export async function createBrowserProxy(dbInput, config) {
                             throw err;
                         }
                         finally {
-                            pipelineExecInFlight = false;
+                            endPipelineExec();
                         }
                         const t2 = performance.now();
                         proxyStats.totalExecMs += t2 - t1;
@@ -1518,18 +1548,6 @@ export async function createBrowserProxy(dbInput, config) {
                                 signalWrite();
                             }
                         }
-                        else if (connClosed) {
-                            // the connection died while this statement was executing, so
-                            // cleanup skipped its release (pipelineExecInFlight). no Sync
-                            // can ever arrive — roll back and release here instead.
-                            pipelineMutexHeld = false;
-                            try {
-                                await rollbackOwnTransaction(db, txState);
-                            }
-                            finally {
-                                mutex.release();
-                            }
-                        }
                         else {
                             // strip ReadyForQuery from non-Sync pipeline messages
                             // result = stripResponseMessages(result, true) // disabled for debugging
@@ -1707,11 +1725,59 @@ export async function createBrowserProxy(dbInput, config) {
         txState.owner = owner;
     }
     const defaultExternalOwner = {};
+    const closedExternalOwners = new WeakSet();
+    function createExternalOwnerCloser(owner, dbNames) {
+        let closing = null;
+        const closeOwner = () => {
+            if (closing)
+                return closing;
+            closedExternalOwners.add(owner);
+            closing = (async () => {
+                const contexts = new Map();
+                for (const dbName of dbNames) {
+                    const context = getDbContext(dbName);
+                    contexts.set(context.txState, context);
+                }
+                const results = await Promise.allSettled([...contexts.values()].map(async ({ db, mutex, txState }) => {
+                    await mutex.acquire();
+                    try {
+                        if (txState.owner === owner && txState.status !== 0x49) {
+                            await db.exec('ROLLBACK');
+                            txState.status = 0x49;
+                            txState.owner = null;
+                        }
+                    }
+                    finally {
+                        mutex.release();
+                    }
+                }));
+                const errors = results.flatMap((result) => result.status === 'rejected' ? [result.reason] : []);
+                if (errors.length === 1)
+                    throw errors[0];
+                if (errors.length > 1) {
+                    throw new AggregateError(errors, 'browser proxy external cleanup failed');
+                }
+            })();
+            void closing.then(() => activeConnectionClosers.delete(closeOwner), (error) => {
+                activeConnectionClosers.delete(closeOwner);
+                unreportedConnectionCleanupErrors.add(error);
+            });
+            return closing;
+        };
+        activeConnectionClosers.add(closeOwner);
+        return closeOwner;
+    }
+    createExternalOwnerCloser(defaultExternalOwner, ['postgres', 'zero_cvr', 'zero_cdb']);
     async function externalQuery(dbName, sql, params, owner = defaultExternalOwner) {
-        if (closed)
+        if (closed || closedExternalOwners.has(owner)) {
             throw new Error('pg-proxy is closed');
+        }
         const { db, mutex, txState } = getDbContext(dbName);
         await acquireForOwner(db, mutex, txState, owner);
+        if (closed || closedExternalOwners.has(owner)) {
+            mutex.release();
+            throw new Error('pg-proxy is closed');
+        }
         try {
             const result = await db.query(sql, params);
             updateExternalTxStateAfterSuccess(txState, owner, sql);
@@ -1730,10 +1796,15 @@ export async function createBrowserProxy(dbInput, config) {
         }
     }
     async function externalExec(dbName, sql, owner = defaultExternalOwner) {
-        if (closed)
+        if (closed || closedExternalOwners.has(owner)) {
             throw new Error('pg-proxy is closed');
+        }
         const { db, mutex, txState } = getDbContext(dbName);
         await acquireForOwner(db, mutex, txState, owner);
+        if (closed || closedExternalOwners.has(owner)) {
+            mutex.release();
+            throw new Error('pg-proxy is closed');
+        }
         try {
             const result = await db.exec(sql);
             updateExternalTxStateAfterSuccess(txState, owner, sql);
@@ -1752,40 +1823,45 @@ export async function createBrowserProxy(dbInput, config) {
     }
     function createExternalSession(dbName = 'postgres') {
         const owner = {};
+        let sessionClosed = false;
+        const closeOwner = createExternalOwnerCloser(owner, [dbName]);
         return {
             query(sql, params) {
+                if (sessionClosed)
+                    return Promise.reject(new Error('pg-proxy session is closed'));
                 return externalQuery(dbName, sql, params, owner);
             },
             exec(sql) {
+                if (sessionClosed)
+                    return Promise.reject(new Error('pg-proxy session is closed'));
                 return externalExec(dbName, sql, owner);
             },
-            async close() {
-                const { db, mutex, txState } = getDbContext(dbName);
-                await mutex.acquire();
-                try {
-                    if (txState.owner === owner && txState.status !== 0x49) {
-                        try {
-                            await db.exec('ROLLBACK');
-                        }
-                        catch { }
-                        txState.status = 0x49;
-                        txState.owner = null;
-                    }
-                }
-                finally {
-                    mutex.release();
-                }
+            close() {
+                sessionClosed = true;
+                return closeOwner();
             },
         };
     }
     return {
         handleConnection,
         close() {
+            if (closePromise)
+                return closePromise;
             closed = true;
             signalPending = false;
-            for (const closeConnection of activeConnectionClosers) {
-                void closeConnection();
-            }
+            closePromise = (async () => {
+                const results = await Promise.allSettled([...activeConnectionClosers].map((closeConnection) => Promise.resolve().then(() => closeConnection())));
+                const errors = new Set(unreportedConnectionCleanupErrors);
+                for (const result of results) {
+                    if (result.status === 'rejected')
+                        errors.add(result.reason);
+                }
+                unreportedConnectionCleanupErrors.clear();
+                if (errors.size > 0) {
+                    throw new AggregateError([...errors], 'browser proxy connection cleanup failed');
+                }
+            })();
+            return closePromise;
         },
         createExternalSession,
         query: externalQuery,