@pineliner/odb-client 1.1.5 → 1.4.0

package/dist/index.cjs

@@ -2138,6 +2138,514 @@ var __webpack_exports__ = {};
             return this.client.httpClient.getNamespaces();
         }
     }
+    function toHrana(v) {
+        if (null == v) return {
+            type: 'null'
+        };
+        if ('bigint' == typeof v) return {
+            type: 'integer',
+            value: v.toString()
+        };
+        if ('number' == typeof v) return Number.isInteger(v) ? {
+            type: 'integer',
+            value: String(v)
+        } : {
+            type: 'float',
+            value: v
+        };
+        if ('string' == typeof v) return {
+            type: 'text',
+            value: v
+        };
+        if (v instanceof Uint8Array) return {
+            type: 'blob',
+            base64: Buffer.from(v).toString('base64')
+        };
+        if ('boolean' == typeof v) return {
+            type: 'integer',
+            value: v ? '1' : '0'
+        };
+        return {
+            type: 'text',
+            value: String(v)
+        };
+    }
+    function fromHrana(v) {
+        switch(v.type){
+            case 'null':
+                return null;
+            case 'integer':
+                {
+                    const n = Number(v.value);
+                    return Number.isSafeInteger(n) ? n : BigInt(v.value);
+                }
+            case 'float':
+                return v.value;
+            case 'text':
+                return v.value;
+            case 'blob':
+                return new Uint8Array(Buffer.from(v.base64, 'base64'));
+        }
+    }
+    function toBatch(steps) {
+        return {
+            steps: steps.map((s, i)=>({
+                    condition: 0 === i ? void 0 : {
+                        type: 'ok',
+                        step: i - 1
+                    },
+                    stmt: {
+                        sql: s.sql,
+                        args: (s.params ?? []).map(toHrana)
+                    },
+                    expect: s.expect ? {
+                        affected: s.expect
+                    } : void 0
+                }))
+        };
+    }
+    const READ_ONLY_RE = /^\s*(?:SELECT|EXPLAIN|VALUES)\b/i;
+    function mightReturnRows(sql) {
+        return READ_ONLY_RE.test(sql) || /\bRETURNING\b/i.test(sql);
+    }
+    class FrameWriter {
+        socket;
+        pending = Buffer.alloc(0);
+        constructor(socket){
+            this.socket = socket;
+        }
+        send(payload) {
+            const header = Buffer.allocUnsafe(4);
+            header.writeUInt32LE(payload.length, 0);
+            const frame = Buffer.concat([
+                header,
+                payload
+            ]);
+            this.pending = this.pending.length ? Buffer.concat([
+                this.pending,
+                frame
+            ]) : frame;
+            this.flush();
+        }
+        flush() {
+            while(this.pending.length > 0){
+                const n = this.socket.write(this.pending);
+                if (n <= 0) return;
+                this.pending = n < this.pending.length ? this.pending.subarray(n) : Buffer.alloc(0);
+            }
+        }
+    }
+    class FrameReader {
+        buf = Buffer.alloc(0);
+        push(chunk) {
+            this.buf = this.buf.length ? Buffer.concat([
+                this.buf,
+                chunk
+            ]) : chunk;
+            const out = [];
+            while(this.buf.length >= 4){
+                const len = this.buf.readUInt32LE(0);
+                if (this.buf.length < 4 + len) break;
+                out.push(this.buf.subarray(4, 4 + len));
+                this.buf = this.buf.subarray(4 + len);
+            }
+            return out;
+        }
+    }
+    const REQUEST_TIMEOUT_MS = Number(globalThis.process?.env?.ODB_SOCKET_REQUEST_TIMEOUT_MS) || 30000;
+    class SocketClient {
+        target;
+        socket;
+        reader = new FrameReader();
+        writer;
+        pending = new Map();
+        nextId = 1;
+        nextStreamId = 1;
+        ready;
+        constructor(target){
+            this.target = target;
+            this.ready = this.connect();
+            this.ready.catch(()=>{});
+        }
+        failPending(err) {
+            for (const p of this.pending.values()){
+                clearTimeout(p.timer);
+                p.reject(err);
+            }
+            this.pending.clear();
+        }
+        async connect() {
+            const Bun = globalThis.Bun;
+            if (!Bun?.connect) throw new Error('odblite-socket backend requires Bun (Bun.connect)');
+            const opts = this.target.unix ? {
+                unix: this.target.unix
+            } : {
+                hostname: this.target.hostname ?? '127.0.0.1',
+                port: this.target.port ?? 8787
+            };
+            this.socket = await Bun.connect({
+                ...opts,
+                socket: {
+                    data: (_s, chunk)=>{
+                        for (const frame of this.reader.push(chunk)){
+                            const msg = JSON.parse(frame.toString('utf8'));
+                            const p = this.pending.get(msg.id);
+                            if (p) {
+                                this.pending.delete(msg.id);
+                                clearTimeout(p.timer);
+                                p.resolve(msg.results);
+                            }
+                        }
+                    },
+                    drain: (_s)=>this.writer.flush(),
+                    close: ()=>{
+                        this.socket = void 0;
+                        this.reader = new FrameReader();
+                        this.failPending(new Error('odblite socket disconnected — request not completed'));
+                    },
+                    error: (_s, err)=>{
+                        this.socket = void 0;
+                        this.reader = new FrameReader();
+                        this.failPending(err instanceof Error ? err : new Error(`odblite socket error: ${err}`));
+                    }
+                }
+            });
+            this.writer = new FrameWriter(this.socket);
+        }
+        allocStream() {
+            return this.nextStreamId++;
+        }
+        async pipeline(tenant, requests, stream) {
+            await this.ready;
+            if (!this.socket) {
+                this.ready = this.connect();
+                this.ready.catch(()=>{});
+                await this.ready;
+            }
+            const id = this.nextId++;
+            return new Promise((resolve, reject)=>{
+                const timer = setTimeout(()=>{
+                    if (this.pending.delete(id)) reject(new Error(`odblite socket request ${id} timed out after ${REQUEST_TIMEOUT_MS}ms`));
+                }, REQUEST_TIMEOUT_MS);
+                timer.unref?.();
+                this.pending.set(id, {
+                    resolve,
+                    reject,
+                    timer
+                });
+                const payload = null != stream ? {
+                    id,
+                    tenant,
+                    stream,
+                    requests
+                } : {
+                    id,
+                    tenant,
+                    requests
+                };
+                this.writer.send(Buffer.from(JSON.stringify(payload), 'utf8'));
+            });
+        }
+        close() {
+            this.socket?.end?.();
+            this.socket = void 0;
+            this.failPending(new Error('odblite socket closed'));
+        }
+    }
+    function toQueryResult(res) {
+        if ('error' === res.type) throw new Error(res.error.message);
+        const r = res.response.result;
+        const rows = r.rows.map((row)=>{
+            const obj = {};
+            r.cols.forEach((c, i)=>{
+                obj[c.name ?? `c${i}`] = fromHrana(row[i] ?? {
+                    type: 'null'
+                });
+            });
+            return obj;
+        });
+        return {
+            rows,
+            rowsAffected: r.affected_row_count,
+            lastInsertRowid: r.last_insert_rowid ? Number(r.last_insert_rowid) : void 0
+        };
+    }
+    class OdbliteSocketConnection {
+        client;
+        tenant;
+        streamId;
+        databaseName;
+        databaseHash;
+        sql;
+        beginPending = false;
+        constructor(client, tenant, streamId){
+            this.client = client;
+            this.tenant = tenant;
+            this.streamId = streamId;
+            this.databaseName = tenant;
+            this.databaseHash = tenant;
+            const self = this;
+            this.sql = function(strings, ...values) {
+                if (strings && 'object' == typeof strings && 'raw' in strings) {
+                    const text = strings.reduce((a, s, i)=>a + s + (i < values.length ? '?' : ''), '');
+                    const returns = mightReturnRows(text);
+                    return (returns ? self.query(text, values) : self.execute(text, values)).then((r)=>r.rows);
+                }
+                throw new Error('sql() fragment helper not implemented in odblite-socket');
+            };
+        }
+        async one(requests) {
+            const [res] = await this.client.pipeline(this.tenant, requests);
+            if (!res) throw new Error('odblite-socket: empty pipeline response');
+            return res;
+        }
+        async streamExec(sql, params = []) {
+            const reqs = [];
+            if (this.beginPending) {
+                reqs.push({
+                    type: 'execute',
+                    stmt: {
+                        sql: 'BEGIN'
+                    }
+                });
+                this.beginPending = false;
+            }
+            reqs.push({
+                type: 'execute',
+                stmt: {
+                    sql,
+                    args: params.map(toHrana)
+                }
+            });
+            const results = await this.client.pipeline(this.tenant, reqs, this.streamId);
+            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');
+            return toQueryResult(res);
+        }
+        async query(sql, params = []) {
+            if (null != this.streamId) return await this.streamExec(sql, params);
+            return toQueryResult(await this.one([
+                {
+                    type: 'execute',
+                    stmt: {
+                        sql,
+                        args: params.map(toHrana)
+                    }
+                }
+            ]));
+        }
+        async execute(sql, params = []) {
+            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);
+            return toQueryResult(await this.one([
+                {
+                    type: 'execute',
+                    stmt: {
+                        sql: s,
+                        args: p.map(toHrana)
+                    }
+                }
+            ]));
+        }
+        async atomic(steps) {
+            const res = await this.one([
+                {
+                    type: 'batch',
+                    batch: toBatch(steps)
+                }
+            ]);
+            if ('error' === res.type) throw new Error(res.error.message);
+            return res.response.result;
+        }
+        prepare(sql) {
+            return {
+                execute: async (params = [])=>this.execute(sql, params),
+                all: async (params = [])=>(await this.query(sql, params)).rows,
+                get: async (params = [])=>(await this.query(sql, params)).rows[0] ?? null
+            };
+        }
+        async transaction(fn) {
+            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;
+            }
+        }
+        begin(fn) {
+            return this.transaction(fn);
+        }
+        async savepoint(fn) {
+            if (null == this.streamId) return this.transaction(fn);
+            const name = `sp_${this.client.allocStream()}`;
+            await this.streamExec(`SAVEPOINT ${name}`);
+            try {
+                const out = await fn(this);
+                await this.streamExec(`RELEASE SAVEPOINT ${name}`);
+                return out;
+            } catch (e) {
+                await this.streamExec(`ROLLBACK TO SAVEPOINT ${name}`).catch(()=>{});
+                throw e;
+            }
+        }
+        async ensureNamespaces(namespaces) {
+            return {
+                success: true,
+                databaseName: this.tenant,
+                namespaces
+            };
+        }
+        async getNamespaces() {
+            const ns = (await this.query("SELECT name FROM pragma_database_list WHERE name != 'main'")).rows.map((r)=>r.name);
+            return {
+                success: true,
+                databaseName: this.tenant,
+                exists: true,
+                namespaces: ns,
+                registered: true,
+                registeredNamespaces: ns
+            };
+        }
+        async close() {}
+    }
+    class OdbliteSocketAdapter {
+        type = 'odblite-socket';
+        client;
+        constructor(config){
+            this.client = new SocketClient(config);
+        }
+        async connect(config) {
+            const tenant = config?.databaseHash ?? config?.databaseName;
+            if (!tenant) throw new Error('odblite-socket: databaseHash (or databaseName) required');
+            return new OdbliteSocketConnection(this.client, String(tenant));
+        }
+        async disconnect() {
+            this.client.close();
+        }
+        async isHealthy() {
+            try {
+                const res = await Promise.race([
+                    this.client.pipeline('_health', [
+                        {
+                            type: 'get_version'
+                        }
+                    ]),
+                    new Promise((_, rej)=>setTimeout(()=>rej(new Error('probe timeout')), 1500))
+                ]);
+                const proto = res?.[0]?.response?.protocol;
+                if (proto !== CLIENT_SOCKET_PROTOCOL) {
+                    console.warn(`[odb-client] socket protocol mismatch (server=${proto ?? 'none'}, client=${CLIENT_SOCKET_PROTOCOL}) → using HTTP`);
+                    return false;
+                }
+                return true;
+            } catch  {
+                return false;
+            }
+        }
+    }
+    const CLIENT_SOCKET_PROTOCOL = 2;
+    const DEFAULT_UNIX_SOCKET = '/tmp/odblite.sock';
+    function parseSocketTarget(s) {
+        const v = (s ?? '').trim();
+        if (!v) return {
+            unix: DEFAULT_UNIX_SOCKET
+        };
+        if (v.includes('/')) return {
+            unix: v
+        };
+        const m = v.match(/^(?:([^:]+):)?(\d+)$/);
+        if (m) return {
+            hostname: m[1] || '127.0.0.1',
+            port: Number(m[2])
+        };
+        return {
+            unix: v
+        };
+    }
+    class OdbliteAutoAdapter {
+        type = 'odblite';
+        opts;
+        chosen;
+        onHttp = false;
+        nextRetryAt = 0;
+        constructor(opts){
+            this.opts = opts;
+            this.chosen = this.pick();
+        }
+        async pick() {
+            const hasBun = void 0 !== globalThis.Bun && !!globalThis.Bun.connect;
+            if (hasBun) {
+                const socket = await this.trySocket();
+                if (socket) return socket;
+            }
+            this.onHttp = true;
+            console.log('[odb-client] transport → HTTP (no router_v2 socket reachable)');
+            return new ODBLiteAdapter(this.opts.http);
+        }
+        async trySocket() {
+            for (const target of this.candidates())try {
+                const socket = new OdbliteSocketAdapter(target);
+                if (await socket.isHealthy()) {
+                    console.log(`[odb-client] transport → SOCKET (router_v2 @ ${target.unix ?? `${target.hostname}:${target.port}`})`);
+                    return socket;
+                }
+                await socket.disconnect();
+            } catch  {}
+            return null;
+        }
+        async maybeUpgrade() {
+            if (!this.onHttp) return;
+            const now = Date.now();
+            if (now < this.nextRetryAt) return;
+            this.nextRetryAt = now + 15000;
+            const socket = await this.trySocket();
+            if (socket) {
+                this.chosen = Promise.resolve(socket);
+                this.onHttp = false;
+            }
+        }
+        candidates() {
+            const { socket, http } = this.opts;
+            if (socket?.unix || socket?.port) return [
+                socket
+            ];
+            const env = globalThis.process?.env?.ODB_SOCKET;
+            if (env) return [
+                parseSocketTarget(env)
+            ];
+            const out = [
+                {
+                    unix: DEFAULT_UNIX_SOCKET
+                }
+            ];
+            try {
+                const host = new URL(http?.serviceUrl).hostname;
+                const port = Number(globalThis.process?.env?.ODB_SOCKET_PORT ?? 8787);
+                if (host) out.push({
+                    hostname: host,
+                    port
+                });
+            } catch  {}
+            return out;
+        }
+        async connect(config) {
+            await this.maybeUpgrade();
+            return (await this.chosen).connect(config);
+        }
+        async disconnect(tenantId) {
+            return (await this.chosen).disconnect(tenantId);
+        }
+        async isHealthy() {
+            return (await this.chosen).isHealthy();
+        }
+    }
     function parseSQL(sqlContent, options = {}) {
         const separatePragma = options.separatePragma ?? true;
         const statements = splitStatements(sqlContent);
@@ -2249,7 +2757,14 @@ var __webpack_exports__ = {};
                     break;
                 case 'odblite':
                     if (!config.odblite) throw new Error('odblite config required for odblite backend');
-                    this.adapter = new ODBLiteAdapter(config.odblite);
+                    this.adapter = new OdbliteAutoAdapter({
+                        socket: config.odbliteSocket,
+                        http: config.odblite
+                    });
+                    break;
+                case 'odblite-socket':
+                    if (!config.odbliteSocket) throw new Error('odbliteSocket config required for odblite-socket backend');
+                    this.adapter = new OdbliteSocketAdapter(config.odbliteSocket);
                     break;
                 default:
                     throw new Error(`Unknown backend type: ${config.backend}`);
@@ -2367,6 +2882,12 @@ var __webpack_exports__ = {};
                         databaseName: `${this.config.databasePath}_${name}`,
                         ...this.config.odblite
                     };
+                case 'odblite-socket':
+                    return {
+                        databaseName: name,
+                        databaseHash: name,
+                        ...this.config.odbliteSocket
+                    };
                 default:
                     throw new Error(`Unknown backend: ${this.config.backend}`);
             }