@pineliner/odb-client 1.5.0 → 1.5.2

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;AA0KjE,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,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"}

package/dist/index.cjs

@@ -2452,13 +2452,15 @@ var __webpack_exports__ = {};
             return toQueryResult(res);
         }
         async query(sql, params = []) {
-            if (null != this.streamId) return await this.streamExec(sql, params);
+            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);
             return toQueryResult(await this.one([
                 {
                     type: 'execute',
                     stmt: {
-                        sql,
-                        args: params.map(toHrana)
+                        sql: s,
+                        args: p.map(toHrana)
                     }
                 }
             ]));

package/dist/index.js

@@ -2362,13 +2362,15 @@ class OdbliteSocketConnection {
         return toQueryResult(res);
     }
     async query(sql, params = []) {
-        if (null != this.streamId) return await this.streamExec(sql, params);
+        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);
         return toQueryResult(await this.one([
             {
                 type: 'execute',
                 stmt: {
-                    sql,
-                    args: params.map(toHrana)
+                    sql: s,
+                    args: p.map(toHrana)
                 }
             }
         ]));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pineliner/odb-client",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "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,15 +97,23 @@ 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')
     return toQueryResult(res)
   }
 
-  async query<T = any>(sql: string, params: any[] = []): Promise<QueryResult<T>> {
-    if (this.streamId != null) return (await this.streamExec(sql, params)) as QueryResult<T>
-    return toQueryResult(await this.one([{ type: 'execute', stmt: { sql, args: params.map(toHrana) } }])) as QueryResult<T>
+  async query<T = any>(sql: string | { sql: string; args?: any[] }, params: any[] = []): Promise<QueryResult<T>> {
+    // Accept both query(sql, params) and query({ sql, args }) — symmetric with
+    // execute() and the other adapters. Without this, object-form calls sent the
+    // object itself as the SQL string ("Expected 'query' to be a string, got 'object'").
+    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>
+    return toQueryResult(await this.one([{ type: 'execute', stmt: { sql: s, args: p.map(toHrana) } }])) as QueryResult<T>
   }
 
   async execute(sql: string | { sql: string; args?: any[] }, params: any[] = []): Promise<QueryResult> {

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