@pineliner/odb-client 1.5.2 → 1.5.4

package/dist/database/adapters/odblite-socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"odblite-socket.d.ts","sourceRoot":"","sources":["../../../src/database/adapters/odblite-socket.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,eAAe,EAAkC,MAAM,UAAU,CAAA;AAExG,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAA;AA+KjE,MAAM,WAAW,mBAAoB,SAAQ,YAAY;CAAG;AAE5D,qBAAa,oBAAqB,YAAW,eAAe;IAC1D,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAmB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;gBAEzB,MAAM,EAAE,mBAAmB;IAIjC,OAAO,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAMzC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;CAmBpC;AAED;;mCAEmC;AACnC,eAAO,MAAM,sBAAsB,IAAI,CAAA;AAEvC,sFAAsF;AACtF,eAAO,MAAM,mBAAmB,sBAAsB,CAAA;AAEtD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,CAO1D;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,kBAAmB,YAAW,eAAe;IACxD,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA6C;IAClE,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,WAAW,CAAI;gBAEX,IAAI,EAAE;QAAE,MAAM,CAAC,EAAE,mBAAmB,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAE;YAK/C,IAAI;IAWlB,oEAAoE;YACtD,SAAS;IAgBvB;;8CAE0C;YAC5B,YAAY;IAY1B;uFACmF;IACnF,OAAO,CAAC,UAAU;IAgBZ,OAAO,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAIzC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAG5C,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;CAGpC"}
+{"version":3,"file":"odblite-socket.d.ts","sourceRoot":"","sources":["../../../src/database/adapters/odblite-socket.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,eAAe,EAAkC,MAAM,UAAU,CAAA;AAExG,OAAO,EAAkD,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAA;AA8MnG,MAAM,WAAW,mBAAoB,SAAQ,YAAY;CAAG;AAE5D,qBAAa,oBAAqB,YAAW,eAAe;IAC1D,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAmB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;gBAEzB,MAAM,EAAE,mBAAmB;IAIjC,OAAO,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAMzC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;CAmBpC;AAED;;mCAEmC;AACnC,eAAO,MAAM,sBAAsB,IAAI,CAAA;AAEvC,sFAAsF;AACtF,eAAO,MAAM,mBAAmB,sBAAsB,CAAA;AAEtD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,CAO1D;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,kBAAmB,YAAW,eAAe;IACxD,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA6C;IAClE,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,WAAW,CAAI;gBAEX,IAAI,EAAE;QAAE,MAAM,CAAC,EAAE,mBAAmB,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAE;YAK/C,IAAI;IAWlB,oEAAoE;YACtD,SAAS;IAgBvB;;8CAE0C;YAC5B,YAAY;IAY1B;uFACmF;IACnF,OAAO,CAAC,UAAU;IAgBZ,OAAO,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAIzC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAG5C,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;CAGpC"}

package/dist/database/adapters/socket/client.d.ts

@@ -17,6 +17,15 @@ export interface SocketTarget {
     hostname?: string;
     port?: number;
 }
+/** An interactive transaction was pinned to a socket connection that has since been reset (router
+ *  restart / socket drop). The tx's server-side connection — and its uncommitted writes — are gone, so
+ *  it CANNOT be resumed on a fresh connection; the caller must retry the whole transaction. Thrown
+ *  instead of silently reconnecting and sending a continuation frame on the new connection (which the
+ *  server rejects as "stream N is not open" — a confusing, non-actionable error). */
+export declare class InteractiveTxConnectionLostError extends Error {
+    readonly code = "ODB_TX_CONNECTION_LOST";
+    constructor();
+}
 export declare class SocketClient {
     private readonly target;
     private socket;
@@ -25,12 +34,18 @@ export declare class SocketClient {
     private readonly pending;
     private nextId;
     private nextStreamId;
+    private epoch;
     private ready;
     constructor(target: SocketTarget);
     /** Reject + clear every in-flight request — called on disconnect/error/close so a
      *  dropped connection FAILS its requests (the caller retries) instead of hanging. */
     private failPending;
     private connect;
+    /** Current connection generation — an interactive tx captures this when it opens (its BEGIN lands). */
+    get connectionEpoch(): number;
+    /** True only if the live socket is the SAME generation the tx opened on. False after any drop (socket
+     *  cleared) or reconnect (epoch bumped) — the tx's pinned server connection is gone either way. */
+    isConnectionLive(epoch: number | undefined): boolean;
     /** Reconnect with bounded backoff — bridges a router restart so a request landing in the down-window
      *  waits it out instead of failing. After the last attempt the error propagates (caller retries / the
      *  auto-adapter can fall back to HTTP). Backoff: 50·100·200·400·800·1600ms ≈ 3s total by default. */

package/dist/database/adapters/socket/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../src/database/adapters/socket/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAA;AAE5F;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAqBD,qBAAa,YAAY;IASX,OAAO,CAAC,QAAQ,CAAC,MAAM;IARnC,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6B;IACrD,OAAO,CAAC,MAAM,CAAI;IAClB,OAAO,CAAC,YAAY,CAAI;IACxB,OAAO,CAAC,KAAK,CAAe;gBAEC,MAAM,EAAE,YAAY;IAOjD;yFACqF;IACrF,OAAO,CAAC,WAAW;YAQL,OAAO;IAsDrB;;yGAEqG;YACvF,gBAAgB;IAc9B;;8FAE0F;IAC1F,WAAW,IAAI,MAAM;IAIf,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IA0BnG,KAAK,IAAI,IAAI;CAKd"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../src/database/adapters/socket/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAA;AAE5F;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAqBD;;;;qFAIqF;AACrF,qBAAa,gCAAiC,SAAQ,KAAK;IACzD,QAAQ,CAAC,IAAI,4BAA2B;;CAKzC;AAED,qBAAa,YAAY;IAYX,OAAO,CAAC,QAAQ,CAAC,MAAM;IAXnC,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6B;IACrD,OAAO,CAAC,MAAM,CAAI;IAClB,OAAO,CAAC,YAAY,CAAI;IAGxB,OAAO,CAAC,KAAK,CAAI;IACjB,OAAO,CAAC,KAAK,CAAe;gBAEC,MAAM,EAAE,YAAY;IAOjD;yFACqF;IACrF,OAAO,CAAC,WAAW;YAQL,OAAO;IAuDrB,uGAAuG;IACvG,IAAI,eAAe,IAAI,MAAM,CAE5B;IAED;uGACmG;IACnG,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;IAIpD;;yGAEqG;YACvF,gBAAgB;IAc9B;;8FAE0F;IAC1F,WAAW,IAAI,MAAM;IAIf,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IA0BnG,KAAK,IAAI,IAAI;CAKd"}

package/dist/database/adapters/tx-context.d.ts

@@ -0,0 +1,30 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+import type { Connection } from '../types';
+/**
+ * Ambient transaction context — the "smart underneath" that lets an `await`-a-write-inside-a-transaction
+ * pattern work on a single-writer engine WITHOUT deadlocking, and without touching business code.
+ *
+ * The deadlock: a transaction holds the tenant's one writer slot; a nested write (e.g. an event subscriber
+ * running during an awaited `eventBus.publish`) that grabs a FRESH connection queues behind the tx on that
+ * same slot, while the tx waits for it → cycle. The fix is not to change the subscriber — it's to make the
+ * nested write REUSE the transaction's own connection (its pinned stream) so it runs sequentially on the
+ * one writer instead of contending for it.
+ *
+ * `AsyncLocalStorage` propagates through `await`, so any code running inside `transaction(fn)`'s async flow
+ * — including subscribers invoked during an awaited publish — can look up the open tx connection and JOIN
+ * it. Same technique as Prisma interactive transactions / TypeORM / .NET `TransactionScope` / Spring
+ * `@Transactional` propagation. Semantics: a joined write is PART of the transaction (commits/rolls back
+ * with it) — which is exactly what "a write issued inside a transaction" should mean. Writes that must be
+ * independent stay independent by running AFTER commit (fire-and-forget / post-commit), where the context
+ * has already exited and `ambientTx` returns undefined.
+ */
+export declare const txContext: AsyncLocalStorage<{
+    tenant: string;
+    conn: Connection;
+}>;
+/** The open transaction's connection for `tenant`, if the current async flow is inside one — else
+ *  undefined. Connection accessors (e.g. the app's getConnectionByTenantHash) return this to join the tx. */
+export declare function ambientTx(tenant: string): Connection | undefined;
+/** Run `fn` with `conn` bound as the ambient transaction for `tenant`. Used by transaction() wrappers. */
+export declare function runInTransactionContext<T>(tenant: string, conn: Connection, fn: () => Promise<T>): Promise<T>;
+//# sourceMappingURL=tx-context.d.ts.map

package/dist/database/adapters/tx-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tx-context.d.ts","sourceRoot":"","sources":["../../../src/database/adapters/tx-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAE1C;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,SAAS;YAAmC,MAAM;UAAQ,UAAU;EAAK,CAAA;AAEtF;6GAC6G;AAC7G,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAGhE;AAED,0GAA0G;AAC1G,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAE7G"}

package/dist/index.cjs

@@ -464,18 +464,22 @@ var __webpack_exports__ = {};
 (()=>{
     __webpack_require__.r(__webpack_exports__);
     __webpack_require__.d(__webpack_exports__, {
+        txContext: ()=>txContext,
         gte: ()=>orm.gte,
         ODBLiteTransaction: ()=>ODBLiteTransaction,
         updateSet: ()=>src_updateSet,
         sql: ()=>sql_parser_sql,
         isNotNull: ()=>orm.isNotNull,
+        ambientTx: ()=>ambientTx,
         LibSQLAdapter: ()=>LibSQLAdapter,
         ORM: ()=>orm.ORM,
         join: ()=>src_join,
         lte: ()=>orm.lte,
         default: ()=>odblite,
-        splitSQLStatements: ()=>splitSQLStatements,
+        runInTransactionContext: ()=>runInTransactionContext,
         ne: ()=>orm.ne,
+        splitSQLStatements: ()=>splitSQLStatements,
+        InteractiveTxConnectionLostError: ()=>InteractiveTxConnectionLostError,
         gt: ()=>orm.gt,
         eq: ()=>orm.eq,
         fragment: ()=>fragment,
@@ -2258,6 +2262,13 @@ var __webpack_exports__ = {};
     const RECONNECT_ATTEMPTS = Number(globalThis.process?.env?.ODB_SOCKET_RECONNECT_ATTEMPTS) || 6;
     const RECONNECT_BASE_MS = Number(globalThis.process?.env?.ODB_SOCKET_RECONNECT_BASE_MS) || 50;
     const sleep = (ms)=>new Promise((r)=>setTimeout(r, ms));
+    class InteractiveTxConnectionLostError extends Error {
+        code = 'ODB_TX_CONNECTION_LOST';
+        constructor(){
+            super('odblite: interactive transaction lost its connection (router restart / socket reset) — retry the transaction');
+            this.name = 'InteractiveTxConnectionLostError';
+        }
+    }
     class SocketClient {
         target;
         socket;
@@ -2266,6 +2277,7 @@ var __webpack_exports__ = {};
         pending = new Map();
         nextId = 1;
         nextStreamId = 1;
+        epoch = 0;
         ready;
         constructor(target){
             this.target = target;
@@ -2328,6 +2340,13 @@ var __webpack_exports__ = {};
                 }
             });
             this.writer = new FrameWriter(this.socket);
+            this.epoch++;
+        }
+        get connectionEpoch() {
+            return this.epoch;
+        }
+        isConnectionLive(epoch) {
+            return !!this.socket && this.epoch === epoch;
         }
         async connectWithRetry() {
             let lastErr;
@@ -2380,6 +2399,18 @@ var __webpack_exports__ = {};
             this.failPending(new Error('odblite socket closed'));
         }
     }
+    var external_node_async_hooks_ = __webpack_require__("node:async_hooks");
+    const txContext = new external_node_async_hooks_.AsyncLocalStorage();
+    function ambientTx(tenant) {
+        const store = txContext.getStore();
+        return store && store.tenant === tenant ? store.conn : void 0;
+    }
+    function runInTransactionContext(tenant, conn, fn) {
+        return txContext.run({
+            tenant,
+            conn
+        }, fn);
+    }
     function toQueryResult(res) {
         if ('error' === res.type) throw new Error(res.error.message);
         const r = res.response.result;
@@ -2406,6 +2437,7 @@ var __webpack_exports__ = {};
         databaseHash;
         sql;
         beginPending = false;
+        openEpoch;
         constructor(client, tenant, streamId){
             this.client = client;
             this.tenant = tenant;
@@ -2428,6 +2460,8 @@ var __webpack_exports__ = {};
             return res;
         }
         async streamExec(sql, params = []) {
+            const opening = this.beginPending;
+            if (!opening && !this.client.isConnectionLive(this.openEpoch)) throw new InteractiveTxConnectionLostError();
             const reqs = [];
             if (this.beginPending) {
                 reqs.push({
@@ -2446,6 +2480,7 @@ var __webpack_exports__ = {};
                 }
             });
             const results = await this.client.pipeline(this.tenant, reqs, this.streamId);
+            if (opening) this.openEpoch = this.client.connectionEpoch;
             if (reqs.length > 1 && results[0]?.type === 'error') throw new Error(results[0].error.message);
             const res = results[results.length - 1];
             if (!res) throw new Error('odblite-socket: empty stream response');
@@ -2455,6 +2490,8 @@ var __webpack_exports__ = {};
             const s = 'string' == typeof sql ? sql : sql.sql;
             const p = 'string' == typeof sql ? params : sql.args ?? [];
             if (null != this.streamId) return await this.streamExec(s, p);
+            const amb = ambientTx(this.tenant);
+            if (amb && amb !== this) return amb.query(s, p);
             return toQueryResult(await this.one([
                 {
                     type: 'execute',
@@ -2469,6 +2506,8 @@ var __webpack_exports__ = {};
             const s = 'string' == typeof sql ? sql : sql.sql;
             const p = 'string' == typeof sql ? params : sql.args ?? [];
             if (null != this.streamId) return this.streamExec(s, p);
+            const amb = ambientTx(this.tenant);
+            if (amb && amb !== this) return amb.execute(s, p);
             return toQueryResult(await this.one([
                 {
                     type: 'execute',
@@ -2500,14 +2539,16 @@ var __webpack_exports__ = {};
             if (null != this.streamId) return fn(this);
             const tx = new OdbliteSocketConnection(this.client, this.tenant, this.client.allocStream());
             tx.beginPending = true;
-            try {
-                const out = await fn(tx);
-                if (!tx.beginPending) await tx.streamExec('COMMIT');
-                return out;
-            } catch (e) {
-                if (!tx.beginPending) await tx.streamExec('ROLLBACK').catch(()=>{});
-                throw e;
-            }
+            return runInTransactionContext(this.tenant, tx, async ()=>{
+                try {
+                    const out = await fn(tx);
+                    if (!tx.beginPending) await tx.streamExec('COMMIT');
+                    return out;
+                } catch (e) {
+                    if (!tx.beginPending) await tx.streamExec('ROLLBACK').catch(()=>{});
+                    throw e;
+                }
+            });
         }
         begin(fn) {
             return this.transaction(fn);
@@ -2945,6 +2986,7 @@ exports.BunSQLiteAdapter = __webpack_exports__.BunSQLiteAdapter;
 exports.ConnectionError = __webpack_exports__.ConnectionError;
 exports.DatabaseManager = __webpack_exports__.DatabaseManager;
 exports.HTTPClient = __webpack_exports__.HTTPClient;
+exports.InteractiveTxConnectionLostError = __webpack_exports__.InteractiveTxConnectionLostError;
 exports.LibSQLAdapter = __webpack_exports__.LibSQLAdapter;
 exports.ODBLiteAdapter = __webpack_exports__.ODBLiteAdapter;
 exports.ODBLiteClient = __webpack_exports__.ODBLiteClient;
@@ -2956,6 +2998,7 @@ exports.QueryError = __webpack_exports__.QueryError;
 exports.SQLParser = __webpack_exports__.SQLParser;
 exports.ServiceClient = __webpack_exports__.ServiceClient;
 exports.SimpleTransaction = __webpack_exports__.SimpleTransaction;
+exports.ambientTx = __webpack_exports__.ambientTx;
 exports.and = __webpack_exports__.and;
 exports.convertTemplateToQuery = __webpack_exports__.convertTemplateToQuery;
 exports.createORM = __webpack_exports__.createORM;
@@ -2980,6 +3023,7 @@ exports.or = __webpack_exports__.or;
 exports.parseSQL = __webpack_exports__.parseSQL;
 exports.raw = __webpack_exports__.raw;
 exports.rawSQL = __webpack_exports__.rawSQL;
+exports.runInTransactionContext = __webpack_exports__.runInTransactionContext;
 exports.set = __webpack_exports__.set;
 exports.splitSQLStatements = __webpack_exports__.splitSQLStatements;
 exports.sql = __webpack_exports__.sql;
@@ -2987,6 +3031,7 @@ exports.sqlFragment = __webpack_exports__.sqlFragment;
 exports.sqlJoin = __webpack_exports__.sqlJoin;
 exports.sqlTemplate = __webpack_exports__.sqlTemplate;
 exports.sqlWhere = __webpack_exports__.sqlWhere;
+exports.txContext = __webpack_exports__.txContext;
 exports.updateSet = __webpack_exports__.updateSet;
 exports.where = __webpack_exports__.where;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
@@ -2994,6 +3039,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "ConnectionError",
     "DatabaseManager",
     "HTTPClient",
+    "InteractiveTxConnectionLostError",
     "LibSQLAdapter",
     "ODBLiteAdapter",
     "ODBLiteClient",
@@ -3005,6 +3051,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "SQLParser",
     "ServiceClient",
     "SimpleTransaction",
+    "ambientTx",
     "and",
     "convertTemplateToQuery",
     "createORM",
@@ -3029,6 +3076,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "parseSQL",
     "raw",
     "rawSQL",
+    "runInTransactionContext",
     "set",
     "splitSQLStatements",
     "sql",
@@ -3036,6 +3084,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "sqlJoin",
     "sqlTemplate",
     "sqlWhere",
+    "txContext",
     "updateSet",
     "where"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];

package/dist/index.d.ts

@@ -9,6 +9,8 @@ export { ORM, Transaction as ORMTransaction, createORM, eq, ne, gt, gte, lt, lte
 export type { ODBLiteConfig, ODBLiteConnection, QueryResult, Transaction, SQLFragment, PreparedQuery, QueryParameter, PrimitiveType, Row } from './types.ts';
 export type { ServiceClientConfig, ODBLiteDatabase, ODBLiteNode } from './service/service-client.ts';
 export type { TenancyMode, BackendType, QueryResult as DatabaseQueryResult, Connection, DatabaseAdapter, PreparedStatement as DatabasePreparedStatement, DatabaseManagerConfig, MigrationConfig, BunSQLiteConfig, LibSQLConfig, ODBLiteConfig as DatabaseODBLiteConfig, TenantInfo, ParsedStatements, SQLParserOptions, SqlQuery, SqlFragment, } from './database/index.ts';
+export { ambientTx, txContext, runInTransactionContext } from './database/adapters/tx-context.ts';
+export { InteractiveTxConnectionLostError } from './database/adapters/socket/client.ts';
 export { ODBLiteError, ConnectionError, QueryError } from './types.ts';
 export declare const raw: typeof ODBLiteClient.raw, identifier: typeof ODBLiteClient.identifier, where: typeof ODBLiteClient.where, insertValues: typeof ODBLiteClient.insertValues, updateSet: typeof ODBLiteClient.updateSet, join: typeof ODBLiteClient.join;
 export { odblite as default } from './core/client.ts';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGhE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,OAAO,EACL,eAAe,EACf,QAAQ,EACR,kBAAkB,EAClB,gBAAgB,EAChB,aAAa,EACb,cAAc,EAEd,GAAG,IAAI,WAAW,EAClB,GAAG,IAAI,MAAM,EACb,KAAK,EACL,QAAQ,IAAI,WAAW,EACvB,IAAI,IAAI,OAAO,EACf,GAAG,EACH,KAAK,IAAI,QAAQ,EACjB,sBAAsB,GACvB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,GAAG,EACH,WAAW,IAAI,cAAc,EAC7B,SAAS,EACT,EAAE,EACF,EAAE,EACF,EAAE,EACF,GAAG,EACH,EAAE,EACF,GAAG,EACH,IAAI,EACJ,OAAO,EACP,MAAM,EACN,SAAS,EACT,GAAG,EACH,EAAE,EACF,KAAK,cAAc,EACnB,KAAK,gBAAgB,GACtB,MAAM,gBAAgB,CAAC;AAGxB,YAAY,EACV,aAAa,EACb,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,WAAW,EACX,aAAa,EACb,cAAc,EACd,aAAa,EACb,GAAG,EACJ,MAAM,YAAY,CAAC;AAGpB,YAAY,EACV,mBAAmB,EACnB,eAAe,EACf,WAAW,EACZ,MAAM,6BAA6B,CAAC;AAGrC,YAAY,EACV,WAAW,EACX,WAAW,EACX,WAAW,IAAI,mBAAmB,EAClC,UAAU,EACV,eAAe,EACf,iBAAiB,IAAI,yBAAyB,EAC9C,qBAAqB,EACrB,eAAe,EACf,eAAe,EACf,YAAY,EACZ,aAAa,IAAI,qBAAqB,EACtC,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EAChB,QAAQ,EACR,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,YAAY,EACZ,eAAe,EACf,UAAU,EACX,MAAM,YAAY,CAAC;AAGpB,eAAO,MACL,GAAG,4BACH,UAAU,mCACV,KAAK,8BACL,YAAY,qCACZ,SAAS,kCACT,IAAI,2BACW,CAAC;AAGlB,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGhE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,OAAO,EACL,eAAe,EACf,QAAQ,EACR,kBAAkB,EAClB,gBAAgB,EAChB,aAAa,EACb,cAAc,EAEd,GAAG,IAAI,WAAW,EAClB,GAAG,IAAI,MAAM,EACb,KAAK,EACL,QAAQ,IAAI,WAAW,EACvB,IAAI,IAAI,OAAO,EACf,GAAG,EACH,KAAK,IAAI,QAAQ,EACjB,sBAAsB,GACvB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,GAAG,EACH,WAAW,IAAI,cAAc,EAC7B,SAAS,EACT,EAAE,EACF,EAAE,EACF,EAAE,EACF,GAAG,EACH,EAAE,EACF,GAAG,EACH,IAAI,EACJ,OAAO,EACP,MAAM,EACN,SAAS,EACT,GAAG,EACH,EAAE,EACF,KAAK,cAAc,EACnB,KAAK,gBAAgB,GACtB,MAAM,gBAAgB,CAAC;AAGxB,YAAY,EACV,aAAa,EACb,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,WAAW,EACX,aAAa,EACb,cAAc,EACd,aAAa,EACb,GAAG,EACJ,MAAM,YAAY,CAAC;AAGpB,YAAY,EACV,mBAAmB,EACnB,eAAe,EACf,WAAW,EACZ,MAAM,6BAA6B,CAAC;AAGrC,YAAY,EACV,WAAW,EACX,WAAW,EACX,WAAW,IAAI,mBAAmB,EAClC,UAAU,EACV,eAAe,EACf,iBAAiB,IAAI,yBAAyB,EAC9C,qBAAqB,EACrB,eAAe,EACf,eAAe,EACf,YAAY,EACZ,aAAa,IAAI,qBAAqB,EACtC,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EAChB,QAAQ,EACR,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAClG,OAAO,EAAE,gCAAgC,EAAE,MAAM,sCAAsC,CAAC;AAGxF,OAAO,EACL,YAAY,EACZ,eAAe,EACf,UAAU,EACX,MAAM,YAAY,CAAC;AAGpB,eAAO,MACL,GAAG,4BACH,UAAU,mCACV,KAAK,8BACL,YAAY,qCACZ,SAAS,kCACT,IAAI,2BACW,CAAC;AAGlB,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/index.js

@@ -2168,6 +2168,13 @@ const REQUEST_TIMEOUT_MS = Number(globalThis.process?.env?.ODB_SOCKET_REQUEST_TI
 const RECONNECT_ATTEMPTS = Number(globalThis.process?.env?.ODB_SOCKET_RECONNECT_ATTEMPTS) || 6;
 const RECONNECT_BASE_MS = Number(globalThis.process?.env?.ODB_SOCKET_RECONNECT_BASE_MS) || 50;
 const sleep = (ms)=>new Promise((r)=>setTimeout(r, ms));
+class InteractiveTxConnectionLostError extends Error {
+    code = 'ODB_TX_CONNECTION_LOST';
+    constructor(){
+        super('odblite: interactive transaction lost its connection (router restart / socket reset) — retry the transaction');
+        this.name = 'InteractiveTxConnectionLostError';
+    }
+}
 class SocketClient {
     target;
     socket;
@@ -2176,6 +2183,7 @@ class SocketClient {
     pending = new Map();
     nextId = 1;
     nextStreamId = 1;
+    epoch = 0;
     ready;
     constructor(target){
         this.target = target;
@@ -2238,6 +2246,13 @@ class SocketClient {
             }
         });
         this.writer = new FrameWriter(this.socket);
+        this.epoch++;
+    }
+    get connectionEpoch() {
+        return this.epoch;
+    }
+    isConnectionLive(epoch) {
+        return !!this.socket && this.epoch === epoch;
     }
     async connectWithRetry() {
         let lastErr;
@@ -2290,6 +2305,18 @@ class SocketClient {
         this.failPending(new Error('odblite socket closed'));
     }
 }
+const external_node_async_hooks_ = __webpack_require__("node:async_hooks");
+const txContext = new external_node_async_hooks_.AsyncLocalStorage();
+function ambientTx(tenant) {
+    const store = txContext.getStore();
+    return store && store.tenant === tenant ? store.conn : void 0;
+}
+function runInTransactionContext(tenant, conn, fn) {
+    return txContext.run({
+        tenant,
+        conn
+    }, fn);
+}
 function toQueryResult(res) {
     if ('error' === res.type) throw new Error(res.error.message);
     const r = res.response.result;
@@ -2316,6 +2343,7 @@ class OdbliteSocketConnection {
     databaseHash;
     sql;
     beginPending = false;
+    openEpoch;
     constructor(client, tenant, streamId){
         this.client = client;
         this.tenant = tenant;
@@ -2338,6 +2366,8 @@ class OdbliteSocketConnection {
         return res;
     }
     async streamExec(sql, params = []) {
+        const opening = this.beginPending;
+        if (!opening && !this.client.isConnectionLive(this.openEpoch)) throw new InteractiveTxConnectionLostError();
         const reqs = [];
         if (this.beginPending) {
             reqs.push({
@@ -2356,6 +2386,7 @@ class OdbliteSocketConnection {
             }
         });
         const results = await this.client.pipeline(this.tenant, reqs, this.streamId);
+        if (opening) this.openEpoch = this.client.connectionEpoch;
         if (reqs.length > 1 && results[0]?.type === 'error') throw new Error(results[0].error.message);
         const res = results[results.length - 1];
         if (!res) throw new Error('odblite-socket: empty stream response');
@@ -2365,6 +2396,8 @@ class OdbliteSocketConnection {
         const s = 'string' == typeof sql ? sql : sql.sql;
         const p = 'string' == typeof sql ? params : sql.args ?? [];
         if (null != this.streamId) return await this.streamExec(s, p);
+        const amb = ambientTx(this.tenant);
+        if (amb && amb !== this) return amb.query(s, p);
         return toQueryResult(await this.one([
             {
                 type: 'execute',
@@ -2379,6 +2412,8 @@ class OdbliteSocketConnection {
         const s = 'string' == typeof sql ? sql : sql.sql;
         const p = 'string' == typeof sql ? params : sql.args ?? [];
         if (null != this.streamId) return this.streamExec(s, p);
+        const amb = ambientTx(this.tenant);
+        if (amb && amb !== this) return amb.execute(s, p);
         return toQueryResult(await this.one([
             {
                 type: 'execute',
@@ -2410,14 +2445,16 @@ class OdbliteSocketConnection {
         if (null != this.streamId) return fn(this);
         const tx = new OdbliteSocketConnection(this.client, this.tenant, this.client.allocStream());
         tx.beginPending = true;
-        try {
-            const out = await fn(tx);
-            if (!tx.beginPending) await tx.streamExec('COMMIT');
-            return out;
-        } catch (e) {
-            if (!tx.beginPending) await tx.streamExec('ROLLBACK').catch(()=>{});
-            throw e;
-        }
+        return runInTransactionContext(this.tenant, tx, async ()=>{
+            try {
+                const out = await fn(tx);
+                if (!tx.beginPending) await tx.streamExec('COMMIT');
+                return out;
+            } catch (e) {
+                if (!tx.beginPending) await tx.streamExec('ROLLBACK').catch(()=>{});
+                throw e;
+            }
+        });
     }
     begin(fn) {
         return this.transaction(fn);
@@ -2864,4 +2901,4 @@ var lte = orm.lte;
 var ne = orm.ne;
 var or = orm.or;
 export default odblite;
-export { BunSQLiteAdapter, ConnectionError, DatabaseManager, HTTPClient, LibSQLAdapter, ODBLiteAdapter, ODBLiteClient, ODBLiteError, ODBLiteTransaction, ORM, ServiceClient, SimpleTransaction, Transaction as ORMTransaction, and, convertTemplateToQuery, createORM_0 as createORM, empty, eq, fragment, gt, gte, inArray, isNotNull, isNull, like, lt, lte, ne, odblite, or, parseSQL, set, splitSQLStatements, sql_parser_SQLParser as SQLParser, sql_parser_sql as sql, sql_template_fragment as sqlFragment, sql_template_join as sqlJoin, sql_template_raw as rawSQL, sql_template_sql as sqlTemplate, sql_template_where as sqlWhere, src_identifier as identifier, src_insertValues as insertValues, src_join as join, src_raw as raw, src_updateSet as updateSet, src_where as where, types_QueryError as QueryError };
+export { BunSQLiteAdapter, ConnectionError, DatabaseManager, HTTPClient, InteractiveTxConnectionLostError, LibSQLAdapter, ODBLiteAdapter, ODBLiteClient, ODBLiteError, ODBLiteTransaction, ORM, ServiceClient, SimpleTransaction, Transaction as ORMTransaction, ambientTx, and, convertTemplateToQuery, createORM_0 as createORM, empty, eq, fragment, gt, gte, inArray, isNotNull, isNull, like, lt, lte, ne, odblite, or, parseSQL, runInTransactionContext, set, splitSQLStatements, sql_parser_SQLParser as SQLParser, sql_parser_sql as sql, sql_template_fragment as sqlFragment, sql_template_join as sqlJoin, sql_template_raw as rawSQL, sql_template_sql as sqlTemplate, sql_template_where as sqlWhere, src_identifier as identifier, src_insertValues as insertValues, src_join as join, src_raw as raw, src_updateSet as updateSet, src_where as where, txContext, types_QueryError as QueryError };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pineliner/odb-client",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "Isomorphic client for ODB-Lite with postgres.js-like template string SQL support",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

package/src/database/adapters/odblite-socket.ts

@@ -1,6 +1,7 @@
 import type { BackendType, Connection, DatabaseAdapter, PreparedStatement, QueryResult } from '../types'
 import { ODBLiteAdapter } from './odblite'
 import { SocketClient, InteractiveTxConnectionLostError, type SocketTarget } from './socket/client'
+import { runInTransactionContext, ambientTx } from './tx-context'
 import {
   toHrana,
   fromHrana,
@@ -113,6 +114,8 @@ class OdbliteSocketConnection implements Connection {
     const s = typeof sql === 'string' ? sql : sql.sql
     const p = typeof sql === 'string' ? params : (sql.args ?? [])
     if (this.streamId != null) return (await this.streamExec(s, p)) as QueryResult<T>
+    const amb = ambientTx(this.tenant) // autocommit conn, but inside a tx for my tenant? → join it (see execute)
+    if (amb && amb !== this) return amb.query<T>(s, p)
     return toQueryResult(await this.one([{ type: 'execute', stmt: { sql: s, args: p.map(toHrana) } }])) as QueryResult<T>
   }
 
@@ -120,6 +123,14 @@ class OdbliteSocketConnection implements Connection {
     const s = typeof sql === 'string' ? sql : sql.sql
     const p = typeof sql === 'string' ? params : (sql.args ?? [])
     if (this.streamId != null) return this.streamExec(s, p) // on the pinned stream — runs immediately, NOT buffered
+    // AMBIENT-TX ROUTING (odb-client owns this — the app stays oblivious): this is an autocommit connection
+    // (streamId == null), but if the current async flow is INSIDE an open transaction for the SAME tenant
+    // (e.g. an event subscriber writing during an awaited publish), route the statement onto that
+    // transaction's pinned stream so it JOINS the tx — sequential on the single writer — instead of taking a
+    // fresh autocommit write that would deadlock behind the tx on the writer slot. Same tenant key on both
+    // sides (this.tenant), so no auth/database-hash translation for a caller to get wrong.
+    const amb = ambientTx(this.tenant)
+    if (amb && amb !== this) return amb.execute(s, p)
     return toQueryResult(await this.one([{ type: 'execute', stmt: { sql: s, args: p.map(toHrana) } }]))
   }
 
@@ -148,14 +159,19 @@ class OdbliteSocketConnection implements Connection {
     if (this.streamId != null) return fn(this) // nested → join the already-open stream
     const tx = new OdbliteSocketConnection(this.client, this.tenant, this.client.allocStream())
     tx.beginPending = true // BEGIN folds into the first statement's frame (one fewer round-trip)
-    try {
-      const out = await fn(tx)
-      if (!tx.beginPending) await tx.streamExec('COMMIT') // a statement ran → BEGIN was sent → COMMIT it
-      return out // else fn issued no statements → empty tx, BEGIN never sent, zero round-trips
-    } catch (e) {
-      if (!tx.beginPending) await tx.streamExec('ROLLBACK').catch(() => {}) // best-effort; server also reaps
-      throw e
-    }
+    // Bind `tx` as the AMBIENT transaction for this tenant while fn runs, so a nested write (e.g. an event
+    // subscriber during an awaited publish) that fetches a connection JOINS this stream instead of grabbing
+    // a fresh one that would deadlock on the single writer slot. AsyncLocalStorage follows the awaits in fn.
+    return runInTransactionContext(this.tenant, tx, async () => {
+      try {
+        const out = await fn(tx)
+        if (!tx.beginPending) await tx.streamExec('COMMIT') // a statement ran → BEGIN was sent → COMMIT it
+        return out // else fn issued no statements → empty tx, BEGIN never sent, zero round-trips
+      } catch (e) {
+        if (!tx.beginPending) await tx.streamExec('ROLLBACK').catch(() => {}) // best-effort; server also reaps
+        throw e
+      }
+    })
   }
   begin<T>(fn: (tx: Connection) => Promise<T>): Promise<T> {
     return this.transaction(fn)

package/src/database/adapters/tx-context.ts

@@ -0,0 +1,34 @@
+import { AsyncLocalStorage } from 'node:async_hooks'
+import type { Connection } from '../types'
+
+/**
+ * Ambient transaction context — the "smart underneath" that lets an `await`-a-write-inside-a-transaction
+ * pattern work on a single-writer engine WITHOUT deadlocking, and without touching business code.
+ *
+ * The deadlock: a transaction holds the tenant's one writer slot; a nested write (e.g. an event subscriber
+ * running during an awaited `eventBus.publish`) that grabs a FRESH connection queues behind the tx on that
+ * same slot, while the tx waits for it → cycle. The fix is not to change the subscriber — it's to make the
+ * nested write REUSE the transaction's own connection (its pinned stream) so it runs sequentially on the
+ * one writer instead of contending for it.
+ *
+ * `AsyncLocalStorage` propagates through `await`, so any code running inside `transaction(fn)`'s async flow
+ * — including subscribers invoked during an awaited publish — can look up the open tx connection and JOIN
+ * it. Same technique as Prisma interactive transactions / TypeORM / .NET `TransactionScope` / Spring
+ * `@Transactional` propagation. Semantics: a joined write is PART of the transaction (commits/rolls back
+ * with it) — which is exactly what "a write issued inside a transaction" should mean. Writes that must be
+ * independent stay independent by running AFTER commit (fire-and-forget / post-commit), where the context
+ * has already exited and `ambientTx` returns undefined.
+ */
+export const txContext = new AsyncLocalStorage<{ tenant: string; conn: Connection }>()
+
+/** The open transaction's connection for `tenant`, if the current async flow is inside one — else
+ *  undefined. Connection accessors (e.g. the app's getConnectionByTenantHash) return this to join the tx. */
+export function ambientTx(tenant: string): Connection | undefined {
+  const store = txContext.getStore()
+  return store && store.tenant === tenant ? store.conn : undefined
+}
+
+/** Run `fn` with `conn` bound as the ambient transaction for `tenant`. Used by transaction() wrappers. */
+export function runInTransactionContext<T>(tenant: string, conn: Connection, fn: () => Promise<T>): Promise<T> {
+  return txContext.run({ tenant, conn }, fn)
+}

package/src/index.ts

@@ -90,6 +90,11 @@ export type {
   SqlFragment,
 } from './database/index.ts';
 
+// Ambient transaction context — connection accessors call ambientTx(tenant) to JOIN an open transaction
+// (so a write issued inside a tx reuses its connection instead of deadlocking on the single writer slot).
+export { ambientTx, txContext, runInTransactionContext } from './database/adapters/tx-context.ts';
+export { InteractiveTxConnectionLostError } from './database/adapters/socket/client.ts';
+
 // Export error classes
 export {
   ODBLiteError,