@pineliner/odb-client 1.5.1 → 1.5.3

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;AA8LnG,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/index.cjs

@@ -2258,6 +2258,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 +2273,7 @@ var __webpack_exports__ = {};
         pending = new Map();
         nextId = 1;
         nextStreamId = 1;
+        epoch = 0;
         ready;
         constructor(target){
             this.target = target;
@@ -2328,6 +2336,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;
@@ -2406,6 +2421,7 @@ var __webpack_exports__ = {};
         databaseHash;
         sql;
         beginPending = false;
+        openEpoch;
         constructor(client, tenant, streamId){
             this.client = client;
             this.tenant = tenant;
@@ -2428,6 +2444,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 +2464,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');

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;
@@ -2316,6 +2331,7 @@ class OdbliteSocketConnection {
     databaseHash;
     sql;
     beginPending = false;
+    openEpoch;
     constructor(client, tenant, streamId){
         this.client = client;
         this.tenant = tenant;
@@ -2338,6 +2354,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 +2374,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');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pineliner/odb-client",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "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,6 @@
 import type { BackendType, Connection, DatabaseAdapter, PreparedStatement, QueryResult } from '../types'
 import { ODBLiteAdapter } from './odblite'
-import { SocketClient, type SocketTarget } from './socket/client'
+import { SocketClient, InteractiveTxConnectionLostError, type SocketTarget } from './socket/client'
 import {
   toHrana,
   fromHrana,
@@ -47,6 +47,10 @@ class OdbliteSocketConnection implements Connection {
   /** A fresh stream tx whose BEGIN hasn't been flushed yet — it's folded into the first statement's
    *  frame to save a round-trip (and an empty tx that issues no statements sends nothing at all). */
   private beginPending = false
+  /** The socket connection generation this tx's BEGIN landed on. A pinned interactive tx lives on ONE
+   *  connection; if the socket resets, this stream's server connection (and its uncommitted writes) is
+   *  gone. Set when the opening frame commits; checked before every continuation frame. */
+  private openEpoch?: number
 
   constructor(
     private readonly client: SocketClient,
@@ -78,6 +82,14 @@ class OdbliteSocketConnection implements Connection {
   /** Run one statement on this connection's interactive STREAM — the server's pinned connection, so a
    *  read sees this tx's own uncommitted writes. Throws on error (incl. a poisoned COMMIT). */
   private async streamExec(sql: string, params: any[] = []): Promise<QueryResult> {
+    const opening = this.beginPending
+    // Continuation frame (BEGIN already sent): the server pins this tx to ONE connection. If the socket
+    // was reset since we opened, that connection — and this tx's uncommitted work — is gone. FAIL LOUD:
+    // do NOT fall through to pipeline(), which would reconnect and send this frame on a FRESH connection
+    // where the stream was never opened (→ the server's "stream N is not open", a confusing dead end).
+    // The opening frame is exempt: a tx that hasn't started yet may legitimately open on a reconnect.
+    if (!opening && !this.client.isConnectionLive(this.openEpoch)) throw new InteractiveTxConnectionLostError()
+
     const reqs: StreamRequest[] = []
     if (this.beginPending) {
       reqs.push({ type: 'execute', stmt: { sql: 'BEGIN' } }) // fold BEGIN into this first statement's frame
@@ -85,6 +97,9 @@ class OdbliteSocketConnection implements Connection {
     }
     reqs.push({ type: 'execute', stmt: { sql, args: params.map(toHrana) } })
     const results = await this.client.pipeline(this.tenant, reqs, this.streamId)
+    // Bind the tx to the connection generation that actually served its BEGIN (post-reconnect if the
+    // opening frame waited out a restart). Continuation frames above are validated against this.
+    if (opening) this.openEpoch = this.client.connectionEpoch
     if (reqs.length > 1 && results[0]?.type === 'error') throw new Error(results[0].error.message) // the folded BEGIN failed
     const res = results[results.length - 1]
     if (!res) throw new Error('odblite-socket: empty stream response')

package/src/database/adapters/socket/client.ts

@@ -38,6 +38,19 @@ interface Pending {
   timer: ReturnType<typeof setTimeout>
 }
 
+/** 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 class InteractiveTxConnectionLostError extends Error {
+  readonly code = 'ODB_TX_CONNECTION_LOST'
+  constructor() {
+    super('odblite: interactive transaction lost its connection (router restart / socket reset) — retry the transaction')
+    this.name = 'InteractiveTxConnectionLostError'
+  }
+}
+
 export class SocketClient {
   private socket: any
   private reader = new FrameReader()
@@ -45,6 +58,9 @@ export class SocketClient {
   private readonly pending = new Map<number, Pending>()
   private nextId = 1
   private nextStreamId = 1
+  // Monotonic connection generation — bumped on every successful (re)connect. An interactive tx records
+  // the epoch it opened on; a mismatch means its pinned server connection is gone (see streamExec).
+  private epoch = 0
   private ready: Promise<void>
 
   constructor(private readonly target: SocketTarget) {
@@ -116,6 +132,18 @@ export class SocketClient {
       },
     })
     this.writer = new FrameWriter(this.socket)
+    this.epoch++ // a new connection generation — any interactive tx from a prior epoch is now dead
+  }
+
+  /** Current connection generation — an interactive tx captures this when it opens (its BEGIN lands). */
+  get connectionEpoch(): number {
+    return this.epoch
+  }
+
+  /** 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 {
+    return !!this.socket && this.epoch === epoch
   }
 
   /** Reconnect with bounded backoff — bridges a router restart so a request landing in the down-window