@thadeu/ndb 1.0.0 → 1.1.2

package/README.md

@@ -4,7 +4,7 @@
 
 TypeScript client for [ndb](https://github.com/thadeu/ndb), an NDJSON query daemon. Typed collections, a chainable query builder, aggregate, watch and blobs. The client builds JSON. The daemon decides what every query means.
 
-Node 24 or newer. ESM and CJS. One runtime dependency (`undici`).
+Node 24 or newer, or Bun. ESM and CJS. One runtime dependency (`undici`, used on Node; Bun uses its `fetch`).
 
 Docs: [client guide](https://github.com/thadeu/ndb/blob/main/docs/dev/clients.md#typescript-package-thadeundb), [query language](https://github.com/thadeu/ndb/blob/main/docs/dev/query.md), [HTTP API](https://github.com/thadeu/ndb/blob/main/docs/dev/http.md).
 

package/dist/index.cjs

@@ -542,6 +542,7 @@ async function orNull(p) {
 }
 
 // src/transport.ts
+var import_node_stream = require("stream");
 var import_undici = require("undici");
 
 // src/ndjson.ts
@@ -577,8 +578,11 @@ var retryBaseMs = 50;
 var retryCapMs = 1e3;
 var defaultReadyTimeoutMs = 1e4;
 var readOps = /\/(_search|_count|_aggregate)$/;
+var onBun = typeof globalThis.Bun !== "undefined";
 var Transport = class {
   client;
+  base;
+  socketPath;
   token;
   readyTimeout;
   // addr: unix:///path or tcp://host:port. Default: env NDB_URL.
@@ -588,12 +592,16 @@ var Transport = class {
     this.token = opts.token || process.env.NDB_TOKEN || void 0;
     this.readyTimeout = opts.readyTimeout ?? defaultReadyTimeoutMs;
     if (url.protocol === "unix:" && url.pathname !== "") {
-      this.client = new import_undici.Pool("http://ndb", { socketPath: decodeURIComponent(url.pathname), connections: 16 });
+      this.base = "http://ndb";
+      this.socketPath = decodeURIComponent(url.pathname);
     } else if (url.protocol === "tcp:" && url.host !== "") {
-      this.client = new import_undici.Pool(`http://${url.host}`, { connections: 16 });
+      this.base = `http://${url.host}`;
     } else {
       throw new TypeError(`ndb: address "${target}" must be unix:///path or tcp://host:port`);
     }
+    if (!onBun) {
+      this.client = new import_undici.Pool(this.base, { socketPath: this.socketPath, connections: 16 });
+    }
   }
   async stream(method, path, body, signal, contentType) {
     const res = await this.withReadyRetry(method, path, signal, async () => {
@@ -618,7 +626,7 @@ var Transport = class {
     return text.length > 0 ? JSON.parse(text.join("")) : void 0;
   }
   close() {
-    return this.client.close();
+    return this.client?.close() ?? Promise.resolve();
   }
   // Runs fn again while the daemon is not ready, with exponential backoff and
   // jitter. It repeats only when the request certainly was not processed
@@ -658,16 +666,43 @@ var Transport = class {
       headers: this.headers(contentType),
       body: body === void 0 ? void 0 : raw ? body : JSON.stringify(body)
     };
+    const client = this.client;
+    if (!client) {
+      return this.fetchSend(opts);
+    }
     try {
-      return await this.client.request(opts);
+      return await client.request(opts);
     } catch (err) {
       if (!isIdempotent(method, path) || !staleSocket.has(err.code ?? "") || signal?.aborted) {
         throw err;
       }
-      return await this.client.request(opts);
+      return await client.request(opts);
     }
   }
+  // fetchSend is send with fetch (Bun). The answer has the shape of an undici
+  // answer: the rest of the SDK reads it the same way.
+  async fetchSend(opts) {
+    const init = { method: opts.method, headers: opts.headers, body: opts.body, signal: opts.signal, unix: this.socketPath };
+    const res = await fetch(this.base + opts.path, init);
+    const headers = {};
+    res.headers.forEach((value, name) => {
+      headers[name] = value;
+    });
+    return { statusCode: res.status, headers, body: readableOf(res) };
+  }
 };
+function readableOf(res) {
+  const stream = res.body ? import_node_stream.Readable.fromWeb(res.body) : import_node_stream.Readable.from([]);
+  return Object.assign(stream, {
+    arrayBuffer: async () => {
+      const bytes = Buffer.concat(await stream.toArray());
+      return bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
+    },
+    dump: async () => {
+      stream.resume();
+    }
+  });
+}
 function isIdempotent(method, path) {
   return method === "GET" || readOps.test(path.split("?")[0] ?? path);
 }

package/dist/index.d.cts

@@ -263,6 +263,8 @@ interface ConnectOptions {
 }
 declare class Transport {
     private readonly client;
+    private readonly base;
+    private readonly socketPath;
     private readonly token;
     private readonly readyTimeout;
     constructor(addr?: string, opts?: ConnectOptions);
@@ -272,6 +274,7 @@ declare class Transport {
     private withReadyRetry;
     private headers;
     private send;
+    private fetchSend;
 }
 
 declare class Ndb {

package/dist/index.d.ts

@@ -263,6 +263,8 @@ interface ConnectOptions {
 }
 declare class Transport {
     private readonly client;
+    private readonly base;
+    private readonly socketPath;
     private readonly token;
     private readonly readyTimeout;
     constructor(addr?: string, opts?: ConnectOptions);
@@ -272,6 +274,7 @@ declare class Transport {
     private withReadyRetry;
     private headers;
     private send;
+    private fetchSend;
 }
 
 declare class Ndb {

package/dist/index.js

@@ -500,6 +500,7 @@ async function orNull(p) {
 }
 
 // src/transport.ts
+import { Readable } from "stream";
 import { Pool } from "undici";
 
 // src/ndjson.ts
@@ -535,8 +536,11 @@ var retryBaseMs = 50;
 var retryCapMs = 1e3;
 var defaultReadyTimeoutMs = 1e4;
 var readOps = /\/(_search|_count|_aggregate)$/;
+var onBun = typeof globalThis.Bun !== "undefined";
 var Transport = class {
   client;
+  base;
+  socketPath;
   token;
   readyTimeout;
   // addr: unix:///path or tcp://host:port. Default: env NDB_URL.
@@ -546,12 +550,16 @@ var Transport = class {
     this.token = opts.token || process.env.NDB_TOKEN || void 0;
     this.readyTimeout = opts.readyTimeout ?? defaultReadyTimeoutMs;
     if (url.protocol === "unix:" && url.pathname !== "") {
-      this.client = new Pool("http://ndb", { socketPath: decodeURIComponent(url.pathname), connections: 16 });
+      this.base = "http://ndb";
+      this.socketPath = decodeURIComponent(url.pathname);
     } else if (url.protocol === "tcp:" && url.host !== "") {
-      this.client = new Pool(`http://${url.host}`, { connections: 16 });
+      this.base = `http://${url.host}`;
     } else {
       throw new TypeError(`ndb: address "${target}" must be unix:///path or tcp://host:port`);
     }
+    if (!onBun) {
+      this.client = new Pool(this.base, { socketPath: this.socketPath, connections: 16 });
+    }
   }
   async stream(method, path, body, signal, contentType) {
     const res = await this.withReadyRetry(method, path, signal, async () => {
@@ -576,7 +584,7 @@ var Transport = class {
     return text.length > 0 ? JSON.parse(text.join("")) : void 0;
   }
   close() {
-    return this.client.close();
+    return this.client?.close() ?? Promise.resolve();
   }
   // Runs fn again while the daemon is not ready, with exponential backoff and
   // jitter. It repeats only when the request certainly was not processed
@@ -616,16 +624,43 @@ var Transport = class {
       headers: this.headers(contentType),
       body: body === void 0 ? void 0 : raw ? body : JSON.stringify(body)
     };
+    const client = this.client;
+    if (!client) {
+      return this.fetchSend(opts);
+    }
     try {
-      return await this.client.request(opts);
+      return await client.request(opts);
     } catch (err) {
       if (!isIdempotent(method, path) || !staleSocket.has(err.code ?? "") || signal?.aborted) {
         throw err;
       }
-      return await this.client.request(opts);
+      return await client.request(opts);
     }
   }
+  // fetchSend is send with fetch (Bun). The answer has the shape of an undici
+  // answer: the rest of the SDK reads it the same way.
+  async fetchSend(opts) {
+    const init = { method: opts.method, headers: opts.headers, body: opts.body, signal: opts.signal, unix: this.socketPath };
+    const res = await fetch(this.base + opts.path, init);
+    const headers = {};
+    res.headers.forEach((value, name) => {
+      headers[name] = value;
+    });
+    return { statusCode: res.status, headers, body: readableOf(res) };
+  }
 };
+function readableOf(res) {
+  const stream = res.body ? Readable.fromWeb(res.body) : Readable.from([]);
+  return Object.assign(stream, {
+    arrayBuffer: async () => {
+      const bytes = Buffer.concat(await stream.toArray());
+      return bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
+    },
+    dump: async () => {
+      stream.resume();
+    }
+  });
+}
 function isIdempotent(method, path) {
   return method === "GET" || readOps.test(path.split("?")[0] ?? path);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thadeu/ndb",
-  "version": "1.0.0",
+  "version": "1.1.2",
   "description": "TypeScript client for the ndb daemon",
   "keywords": [
     "ndb",