@s2-dev/streamstore 0.16.11 → 0.17.0

package/dist/cjs/utils.d.ts

@@ -1,6 +1,9 @@
-import type { AppendRecord as AppendRecordType } from "./stream.js";
-type Headers = Record<string, string> | Array<[string | Uint8Array, string | Uint8Array]>;
+import type { AppendHeaders, AppendRecord as AppendRecordType } from "./lib/stream/types.js";
 export type AppendRecord = AppendRecordType;
+declare function appendRecordMake(body?: string, headers?: AppendHeaders<"string">, timestamp?: number): AppendRecord;
+declare function appendRecordMake(body?: Uint8Array, headers?: AppendHeaders<"bytes">, timestamp?: number): AppendRecord;
+declare function appendRecordCommand(command: string, body?: string, timestamp?: number): AppendRecord;
+declare function appendRecordCommand(command: Uint8Array, body?: Uint8Array, timestamp?: number): AppendRecord;
 /**
  * Helpers to construct appendable records.
  *
@@ -11,10 +14,33 @@ export type AppendRecord = AppendRecordType;
  * - `trim` is a command record that encodes a sequence number for trimming
  */
 export declare const AppendRecord: {
-    readonly make: (body?: string | Uint8Array, headers?: Headers, timestamp?: AppendRecordType["timestamp"]) => AppendRecordType;
-    readonly command: (command: string, body?: string | Uint8Array, additionalHeaders?: Headers, timestamp?: AppendRecordType["timestamp"]) => AppendRecordType;
-    readonly fence: (fencing_token: string, additionalHeaders?: Headers, timestamp?: AppendRecordType["timestamp"]) => AppendRecordType;
-    readonly trim: (seqNum: number | bigint, additionalHeaders?: Headers, timestamp?: AppendRecordType["timestamp"]) => AppendRecordType;
+    readonly make: typeof appendRecordMake;
+    readonly command: typeof appendRecordCommand;
+    readonly fence: (fencing_token: string, timestamp?: number) => AppendRecord;
+    readonly trim: (seqNum: number | bigint, timestamp?: number) => AppendRecord;
 };
+/**
+ * Calculate the UTF-8 byte length of a string.
+ * Handles all Unicode characters including surrogate pairs correctly.
+ *
+ * @param str The string to measure
+ * @returns The byte length when encoded as UTF-8
+ */
+export declare function utf8ByteLength(str: string): number;
+/**
+ * Calculate the metered size in bytes of an AppendRecord.
+ * This includes the body and headers, but not metadata like timestamp.
+ *
+ * This function calculates how many bytes the record will occupy
+ * after being received and deserialized as raw bytes on the S2 side.
+ * For strings, it calculates UTF-8 byte length. For Uint8Array, it uses
+ * the array length directly (same value as would be used when encoding
+ * to base64 for transmission).
+ *
+ * @param record The record to measure
+ * @returns The size in bytes
+ */
+export declare function meteredSizeBytes(record: AppendRecord): number;
+export declare function computeAppendRecordFormat(record: AppendRecord): "string" | "bytes";
 export {};
 //# sourceMappingURL=utils.d.ts.map

package/dist/cjs/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,IAAI,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpE,KAAK,OAAO,GACT,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtB,KAAK,CAAC,CAAC,MAAM,GAAG,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC;AAErD,MAAM,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAE5C;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY;2BAEhB,MAAM,GAAG,UAAU,YAChB,OAAO,cACL,gBAAgB,CAAC,WAAW,CAAC,KACvC,gBAAgB;gCAST,MAAM,SACR,MAAM,GAAG,UAAU,sBACN,OAAO,cACf,gBAAgB,CAAC,WAAW,CAAC,KACvC,gBAAgB;oCAsBH,MAAM,sBACD,OAAO,cACf,gBAAgB,CAAC,WAAW,CAAC;4BAUjC,MAAM,GAAG,MAAM,sBACH,OAAO,cACf,gBAAgB,CAAC,WAAW,CAAC,KACvC,gBAAgB;CAOV,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,aAAa,EACb,YAAY,IAAI,gBAAgB,EAChC,MAAM,uBAAuB,CAAC;AAE/B,MAAM,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAE5C,iBAAS,gBAAgB,CACxB,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,EACjC,SAAS,CAAC,EAAE,MAAM,GAChB,YAAY,CAAC;AAChB,iBAAS,gBAAgB,CACxB,IAAI,CAAC,EAAE,UAAU,EACjB,OAAO,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,EAChC,SAAS,CAAC,EAAE,MAAM,GAChB,YAAY,CAAC;AAahB,iBAAS,mBAAmB,CAC3B,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,MAAM,GAChB,YAAY,CAAC;AAChB,iBAAS,mBAAmB,CAC3B,OAAO,EAAE,UAAU,EACnB,IAAI,CAAC,EAAE,UAAU,EACjB,SAAS,CAAC,EAAE,MAAM,GAChB,YAAY,CAAC;AAgBhB;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY;;;oCAID,MAAM,cAAc,MAAM,KAAG,YAAY;4BAGjD,MAAM,GAAG,MAAM,cAAc,MAAM,KAAG,YAAY;CAWxD,CAAC;AAEX;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAiClD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAgC7D;AAED,wBAAgB,yBAAyB,CACxC,MAAM,EAAE,YAAY,GAClB,QAAQ,GAAG,OAAO,CAiBpB"}

package/dist/cjs/utils.js

@@ -1,6 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppendRecord = void 0;
+exports.utf8ByteLength = utf8ByteLength;
+exports.meteredSizeBytes = meteredSizeBytes;
+exports.computeAppendRecordFormat = computeAppendRecordFormat;
+function appendRecordMake(body, headers, timestamp) {
+    return {
+        body,
+        headers,
+        timestamp,
+    };
+}
+function appendRecordCommand(command, body, timestamp) {
+    const headers = (() => {
+        if (typeof command === "string") {
+            return [["", command]];
+        }
+        return [[new TextEncoder().encode(""), command]];
+    })();
+    // safety: we know the types are correct because of the overloads
+    return exports.AppendRecord.make(body, headers, timestamp);
+}
 /**
  * Helpers to construct appendable records.
  *
@@ -11,45 +31,120 @@ exports.AppendRecord = void 0;
  * - `trim` is a command record that encodes a sequence number for trimming
  */
 exports.AppendRecord = {
-    make: (body, headers, timestamp) => {
-        return {
-            body,
-            headers,
-            timestamp,
-        };
+    // overloads for only string or only bytes
+    make: appendRecordMake,
+    command: appendRecordCommand,
+    fence: (fencing_token, timestamp) => {
+        return exports.AppendRecord.command("fence", fencing_token, timestamp);
     },
-    command: (
-    /** Command name (e.g. "fence" or "trim"). */
-    command, body, additionalHeaders, timestamp) => {
-        const headers = (() => {
-            if (!additionalHeaders) {
-                return [["", command]];
-            }
-            else if (Array.isArray(additionalHeaders)) {
-                return [["", command], ...additionalHeaders];
-            }
-            else {
-                return [
-                    ["", command],
-                    ...Object.entries(additionalHeaders).map(([key, value]) => [key, value]),
-                ];
-            }
-        })();
-        return {
-            body,
-            headers,
-            timestamp,
-        };
-    },
-    fence: (fencing_token, additionalHeaders, timestamp) => {
-        return exports.AppendRecord.command("fence", fencing_token, additionalHeaders, timestamp);
-    },
-    trim: (seqNum, additionalHeaders, timestamp) => {
+    trim: (seqNum, timestamp) => {
         // Encode sequence number as 8 big-endian bytes
         const buffer = new Uint8Array(8);
         const view = new DataView(buffer.buffer);
         view.setBigUint64(0, BigInt(seqNum), false); // false = big-endian
-        return exports.AppendRecord.command("trim", buffer, additionalHeaders, timestamp);
+        return exports.AppendRecord.command(new TextEncoder().encode("trim"), buffer, timestamp);
     },
 };
+/**
+ * Calculate the UTF-8 byte length of a string.
+ * Handles all Unicode characters including surrogate pairs correctly.
+ *
+ * @param str The string to measure
+ * @returns The byte length when encoded as UTF-8
+ */
+function utf8ByteLength(str) {
+    let bytes = 0;
+    for (let i = 0; i < str.length; i++) {
+        const code = str.charCodeAt(i);
+        if (code <= 0x7f) {
+            bytes += 1;
+        }
+        else if (code <= 0x7ff) {
+            bytes += 2;
+        }
+        else if (code >= 0xd800 && code <= 0xdbff) {
+            // high surrogate
+            if (i + 1 < str.length) {
+                const next = str.charCodeAt(i + 1);
+                if (next >= 0xdc00 && next <= 0xdfff) {
+                    // valid surrogate pair → 4 bytes in UTF-8
+                    bytes += 4;
+                    i++; // skip low surrogate
+                }
+                else {
+                    // unpaired high surrogate → treat as 3 bytes (replacement-style)
+                    bytes += 3;
+                }
+            }
+            else {
+                // unpaired high surrogate at end of string
+                bytes += 3;
+            }
+        }
+        else if (code >= 0xdc00 && code <= 0xdfff) {
+            // lone low surrogate — treat as 3 bytes
+            bytes += 3;
+        }
+        else {
+            bytes += 3;
+        }
+    }
+    return bytes;
+}
+/**
+ * Calculate the metered size in bytes of an AppendRecord.
+ * This includes the body and headers, but not metadata like timestamp.
+ *
+ * This function calculates how many bytes the record will occupy
+ * after being received and deserialized as raw bytes on the S2 side.
+ * For strings, it calculates UTF-8 byte length. For Uint8Array, it uses
+ * the array length directly (same value as would be used when encoding
+ * to base64 for transmission).
+ *
+ * @param record The record to measure
+ * @returns The size in bytes
+ */
+function meteredSizeBytes(record) {
+    // Calculate header size based on actual data types
+    let numHeaders = 0;
+    let headersSize = 0;
+    if (record.headers) {
+        if (Array.isArray(record.headers)) {
+            numHeaders = record.headers.length;
+            headersSize = record.headers.reduce((sum, [k, v]) => {
+                // Infer format from key type: string = UTF-8 bytes, Uint8Array = byte length
+                const keySize = typeof k === "string" ? utf8ByteLength(k) : k.length;
+                const valueSize = typeof v === "string" ? utf8ByteLength(v) : v.length;
+                return sum + keySize + valueSize;
+            }, 0);
+        }
+        else {
+            // Record<string, string> format (only for string format)
+            const entries = Object.entries(record.headers);
+            numHeaders = entries.length;
+            headersSize = entries.reduce((sum, [k, v]) => {
+                return sum + utf8ByteLength(k) + utf8ByteLength(v);
+            }, 0);
+        }
+    }
+    // Calculate body size based on actual data type
+    const bodySize = record.body
+        ? typeof record.body === "string"
+            ? utf8ByteLength(record.body)
+            : record.body.length
+        : 0;
+    return 8 + 2 * numHeaders + headersSize + bodySize;
+}
+function computeAppendRecordFormat(record) {
+    let result = "string";
+    if (record.body && typeof record.body !== "string") {
+        result = "bytes";
+    }
+    if (record.headers &&
+        Array.isArray(record.headers) &&
+        record.headers.some(([k, v]) => typeof k !== "string" || typeof v !== "string")) {
+        result = "bytes";
+    }
+    return result;
+}
 //# sourceMappingURL=utils.js.map

package/dist/cjs/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;AAQA;;;;;;;;GAQG;AACU,QAAA,YAAY,GAAG;IAC3B,IAAI,EAAE,CACL,IAA0B,EAC1B,OAAiB,EACjB,SAAyC,EACtB,EAAE;QACrB,OAAO;YACN,IAAI;YACJ,OAAO;YACP,SAAS;SACT,CAAC;IACH,CAAC;IACD,OAAO,EAAE;IACR,6CAA6C;IAC7C,OAAe,EACf,IAA0B,EAC1B,iBAA2B,EAC3B,SAAyC,EACtB,EAAE;QACrB,MAAM,OAAO,GAAgC,CAAC,GAAG,EAAE;YAClD,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACxB,OAAO,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;YACxB,CAAC;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC7C,OAAO,CAAC,CAAC,EAAE,EAAE,OAAO,CAAqB,EAAE,GAAG,iBAAiB,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACP,OAAO;oBACN,CAAC,EAAE,EAAE,OAAO,CAAqB;oBACjC,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,GAAG,CACvC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAqB,CAClD;iBACD,CAAC;YACH,CAAC;QACF,CAAC,CAAC,EAAE,CAAC;QACL,OAAO;YACN,IAAI;YACJ,OAAO;YACP,SAAS;SACT,CAAC;IACH,CAAC;IACD,KAAK,EAAE,CACN,aAAqB,EACrB,iBAA2B,EAC3B,SAAyC,EACxC,EAAE;QACH,OAAO,oBAAY,CAAC,OAAO,CAC1B,OAAO,EACP,aAAa,EACb,iBAAiB,EACjB,SAAS,CACT,CAAC;IACH,CAAC;IACD,IAAI,EAAE,CACL,MAAuB,EACvB,iBAA2B,EAC3B,SAAyC,EACtB,EAAE;QACrB,+CAA+C;QAC/C,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;QACjC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,qBAAqB;QAClE,OAAO,oBAAY,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAC;IAC3E,CAAC;CACQ,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}

package/dist/esm/basin.d.ts

@@ -1,9 +1,10 @@
 import * as Redacted from "./lib/redacted.js";
+import type { SessionTransports } from "./lib/stream/types.js";
 import { S2Stream } from "./stream.js";
 import { S2Streams } from "./streams.js";
 export declare class S2Basin {
     private readonly client;
-    private readonly accessToken;
+    private readonly transportConfig;
     readonly name: string;
     readonly streams: S2Streams;
     /**
@@ -12,15 +13,21 @@ export declare class S2Basin {
      * Use this to work with streams inside a single basin.
      * @param name Basin name
      * @param accessToken Redacted access token from the parent `S2` client
+     * @param baseUrl Base URL for the basin (e.g. `https://my-basin.b.aws.s2.dev/v1`)
+     * @param includeBasinHeader Include the `S2-Basin` header with the request
      */
     constructor(name: string, options: {
         accessToken: Redacted.Redacted;
         baseUrl: string;
+        includeBasinHeader: boolean;
     });
     /**
      * Create a stream-scoped helper bound to `this` basin.
      * @param name Stream name
      */
-    stream(name: string): S2Stream;
+    stream(name: string, options?: StreamOptions): S2Stream;
+}
+export interface StreamOptions {
+    forceTransport?: SessionTransports;
 }
 //# sourceMappingURL=basin.d.ts.map

package/dist/esm/basin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basin.d.ts","sourceRoot":"","sources":["../../src/basin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,qBAAa,OAAO;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAEhD,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,OAAO,EAAE,SAAS,CAAC;IAEnC;;;;;;OAMG;gBAEF,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;QAAE,WAAW,EAAE,QAAQ,CAAC,QAAQ,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE;IAa7D;;;OAGG;IACI,MAAM,CAAC,IAAI,EAAE,MAAM;CAG1B"}
+{"version":3,"file":"basin.d.ts","sourceRoot":"","sources":["../../src/basin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAmB,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,qBAAa,OAAO;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,OAAO,EAAE,SAAS,CAAC;IAEnC;;;;;;;;OAQG;gBAEF,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;QACR,WAAW,EAAE,QAAQ,CAAC,QAAQ,CAAC;QAC/B,OAAO,EAAE,MAAM,CAAC;QAChB,kBAAkB,EAAE,OAAO,CAAC;KAC5B;IAiBF;;;OAGG;IACI,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa;CAMnD;AAED,MAAM,WAAW,aAAa;IAC7B,cAAc,CAAC,EAAE,iBAAiB,CAAC;CACnC"}

package/dist/esm/basin.js

@@ -4,7 +4,7 @@ import { S2Stream } from "./stream.js";
 import { S2Streams } from "./streams.js";
 export class S2Basin {
     client;
-    accessToken;
+    transportConfig;
     name;
     streams;
     /**
@@ -13,13 +13,19 @@ export class S2Basin {
      * Use this to work with streams inside a single basin.
      * @param name Basin name
      * @param accessToken Redacted access token from the parent `S2` client
+     * @param baseUrl Base URL for the basin (e.g. `https://my-basin.b.aws.s2.dev/v1`)
+     * @param includeBasinHeader Include the `S2-Basin` header with the request
      */
     constructor(name, options) {
         this.name = name;
-        this.accessToken = options.accessToken;
+        this.transportConfig = {
+            baseUrl: options.baseUrl,
+            accessToken: options.accessToken,
+        };
         this.client = createClient(createConfig({
             baseUrl: options.baseUrl,
-            auth: () => Redacted.value(this.accessToken),
+            auth: () => Redacted.value(this.transportConfig.accessToken),
+            headers: options.includeBasinHeader ? { "s2-basin": name } : {},
         }));
         this.streams = new S2Streams(this.client);
     }
@@ -27,8 +33,11 @@ export class S2Basin {
      * Create a stream-scoped helper bound to `this` basin.
      * @param name Stream name
      */
-    stream(name) {
-        return new S2Stream(name, this.client);
+    stream(name, options) {
+        return new S2Stream(name, this.client, {
+            ...this.transportConfig,
+            forceTransport: options?.forceTransport,
+        });
     }
 }
 //# sourceMappingURL=basin.js.map

package/dist/esm/basin.js.map

@@ -1 +1 @@
-{"version":3,"file":"basin.js","sourceRoot":"","sources":["../../src/basin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEzE,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,OAAO,OAAO;IACF,MAAM,CAAS;IACf,WAAW,CAAoB;IAEhC,IAAI,CAAS;IACb,OAAO,CAAY;IAEnC;;;;;;OAMG;IACH,YACC,IAAY,EACZ,OAA4D;QAE5D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,MAAM,GAAG,YAAY,CACzB,YAAY,CAAC;YACZ,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC;SAC5C,CAAC,CACF,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,IAAY;QACzB,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;CACD"}
+{"version":3,"file":"basin.js","sourceRoot":"","sources":["../../src/basin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEzE,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,OAAO,OAAO;IACF,MAAM,CAAS;IACf,eAAe,CAAkB;IAClC,IAAI,CAAS;IACb,OAAO,CAAY;IAEnC;;;;;;;;OAQG;IACH,YACC,IAAY,EACZ,OAIC;QAED,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,eAAe,GAAG;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;SAChC,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,YAAY,CACzB,YAAY,CAAC;YACZ,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;YAC5D,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;SAC/D,CAAC,CACF,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,IAAY,EAAE,OAAuB;QAClD,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;YACtC,GAAG,IAAI,CAAC,eAAe;YACvB,cAAc,EAAE,OAAO,EAAE,cAAc;SACvC,CAAC,CAAC;IACJ,CAAC;CACD"}

package/dist/esm/batch-transform.d.ts

@@ -0,0 +1,64 @@
+import { AppendRecord } from "./utils.js";
+export interface BatchTransformArgs {
+    /** Duration in milliseconds to wait before flushing a batch (default: 5ms) */
+    lingerDuration?: number;
+    /** Maximum number of records in a batch (default: 1000, max: 1000) */
+    maxBatchRecords?: number;
+    /** Maximum batch size in bytes (default: 1 MiB, max: 1 MiB) */
+    maxBatchBytes?: number;
+    /** Optional fencing token to enforce (remains static across batches) */
+    fencing_token?: string;
+    /** Optional sequence number to match for first batch (auto-increments for subsequent batches) */
+    match_seq_num?: number;
+}
+/** Batch output type with optional fencing token and match_seq_num */
+export type BatchOutput = {
+    records: AppendRecord[];
+    fencing_token?: string;
+    match_seq_num?: number;
+};
+/**
+ * A TransformStream that batches AppendRecords based on time, record count, and byte size.
+ *
+ * Input: AppendRecord (individual records)
+ * Output: { records: AppendRecord[], fencing_token?: string, match_seq_num?: number }
+ *
+ * @example
+ * ```typescript
+ * const batcher = new BatchTransform<"string">({
+ *   lingerDuration: 20,
+ *   maxBatchRecords: 100,
+ *   maxBatchBytes: 256 * 1024,
+ *   match_seq_num: 0  // Optional: auto-increments per batch
+ * });
+ *
+ * // Pipe through the batcher and session to get acks
+ * readable.pipeThrough(batcher).pipeThrough(session).pipeTo(writable);
+ *
+ * // Or use manually
+ * const writer = batcher.writable.getWriter();
+ * writer.write(AppendRecord.make("foo"));
+ * await writer.close();
+ *
+ * for await (const batch of batcher.readable) {
+ *   console.log(`Got batch of ${batch.records.length} records`);
+ * }
+ * ```
+ */
+export declare class BatchTransform extends TransformStream<AppendRecord, BatchOutput> {
+    private currentBatch;
+    private currentBatchSize;
+    private lingerTimer;
+    private controller;
+    private readonly maxBatchRecords;
+    private readonly maxBatchBytes;
+    private readonly lingerDuration;
+    private readonly fencing_token?;
+    private next_match_seq_num?;
+    constructor(args?: BatchTransformArgs);
+    private handleRecord;
+    private flush;
+    private startLingerTimer;
+    private cancelLingerTimer;
+}
+//# sourceMappingURL=batch-transform.d.ts.map

package/dist/esm/batch-transform.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"batch-transform.d.ts","sourceRoot":"","sources":["../../src/batch-transform.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAoB,MAAM,YAAY,CAAC;AAE5D,MAAM,WAAW,kBAAkB;IAClC,8EAA8E;IAC9E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,sEAAsE;IACtE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,+DAA+D;IAC/D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,wEAAwE;IACxE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iGAAiG;IACjG,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,sEAAsE;AACtE,MAAM,MAAM,WAAW,GAAG;IACzB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBAAa,cAAe,SAAQ,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC;IAC7E,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,gBAAgB,CAAa;IACrC,OAAO,CAAC,WAAW,CAA8C;IACjE,OAAO,CAAC,UAAU,CACZ;IACN,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAS;IACxC,OAAO,CAAC,kBAAkB,CAAC,CAAS;gBAExB,IAAI,CAAC,EAAE,kBAAkB;IA8BrC,OAAO,CAAC,YAAY;IA0CpB,OAAO,CAAC,KAAK;IAgCb,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,iBAAiB;CAMzB"}

package/dist/esm/batch-transform.js

@@ -0,0 +1,140 @@
+import { S2Error } from "./error.js";
+import { AppendRecord, meteredSizeBytes } from "./utils.js";
+/**
+ * A TransformStream that batches AppendRecords based on time, record count, and byte size.
+ *
+ * Input: AppendRecord (individual records)
+ * Output: { records: AppendRecord[], fencing_token?: string, match_seq_num?: number }
+ *
+ * @example
+ * ```typescript
+ * const batcher = new BatchTransform<"string">({
+ *   lingerDuration: 20,
+ *   maxBatchRecords: 100,
+ *   maxBatchBytes: 256 * 1024,
+ *   match_seq_num: 0  // Optional: auto-increments per batch
+ * });
+ *
+ * // Pipe through the batcher and session to get acks
+ * readable.pipeThrough(batcher).pipeThrough(session).pipeTo(writable);
+ *
+ * // Or use manually
+ * const writer = batcher.writable.getWriter();
+ * writer.write(AppendRecord.make("foo"));
+ * await writer.close();
+ *
+ * for await (const batch of batcher.readable) {
+ *   console.log(`Got batch of ${batch.records.length} records`);
+ * }
+ * ```
+ */
+export class BatchTransform extends TransformStream {
+    currentBatch = [];
+    currentBatchSize = 0;
+    lingerTimer = null;
+    controller = null;
+    maxBatchRecords;
+    maxBatchBytes;
+    lingerDuration;
+    fencing_token;
+    next_match_seq_num;
+    constructor(args) {
+        let controller;
+        super({
+            start: (c) => {
+                controller = c;
+            },
+            transform: (chunk, c) => {
+                // Store controller reference on first transform
+                if (!this.controller) {
+                    this.controller = c;
+                }
+                this.handleRecord(chunk);
+            },
+            flush: () => {
+                this.flush();
+            },
+        });
+        // Cap at maximum allowed values
+        this.maxBatchRecords = Math.min(args?.maxBatchRecords ?? 1000, 1000);
+        this.maxBatchBytes = Math.min(args?.maxBatchBytes ?? 1024 * 1024, 1024 * 1024);
+        this.lingerDuration = args?.lingerDuration ?? 5;
+        this.fencing_token = args?.fencing_token;
+        this.next_match_seq_num = args?.match_seq_num;
+    }
+    handleRecord(record) {
+        const recordSize = meteredSizeBytes(record);
+        // Reject individual records that exceed the max batch size
+        if (recordSize > this.maxBatchBytes) {
+            throw new S2Error({
+                message: `Record size ${recordSize} bytes exceeds maximum batch size of ${this.maxBatchBytes} bytes`,
+            });
+        }
+        // Start linger timer on first record added to an empty batch
+        if (this.currentBatch.length === 0 && this.lingerDuration > 0) {
+            this.startLingerTimer();
+        }
+        // Check if adding this record would exceed limits
+        const wouldExceedRecords = this.currentBatch.length + 1 > this.maxBatchRecords;
+        const wouldExceedBytes = this.currentBatchSize + recordSize > this.maxBatchBytes;
+        if (wouldExceedRecords || wouldExceedBytes) {
+            this.flush();
+            // Restart linger timer for new batch
+            if (this.lingerDuration > 0) {
+                this.startLingerTimer();
+            }
+        }
+        // Add record to current batch
+        this.currentBatch.push(record);
+        this.currentBatchSize += recordSize;
+        // Check if we've now reached the limits
+        const nowExceedsRecords = this.currentBatch.length >= this.maxBatchRecords;
+        const nowExceedsBytes = this.currentBatchSize >= this.maxBatchBytes;
+        if (nowExceedsRecords || nowExceedsBytes) {
+            this.flush();
+        }
+    }
+    flush() {
+        this.cancelLingerTimer();
+        if (this.currentBatch.length === 0) {
+            return;
+        }
+        // Auto-increment match_seq_num for next batch
+        const match_seq_num = this.next_match_seq_num;
+        if (this.next_match_seq_num !== undefined) {
+            this.next_match_seq_num += this.currentBatch.length;
+        }
+        // Emit the batch downstream with optional fencing token and match_seq_num
+        if (this.controller) {
+            const batch = {
+                records: [...this.currentBatch],
+            };
+            if (this.fencing_token !== undefined) {
+                batch.fencing_token = this.fencing_token;
+            }
+            if (match_seq_num !== undefined) {
+                batch.match_seq_num = match_seq_num;
+            }
+            this.controller.enqueue(batch);
+        }
+        // Reset batch
+        this.currentBatch = [];
+        this.currentBatchSize = 0;
+    }
+    startLingerTimer() {
+        this.cancelLingerTimer();
+        this.lingerTimer = setTimeout(() => {
+            this.lingerTimer = null;
+            if (this.currentBatch.length > 0) {
+                this.flush();
+            }
+        }, this.lingerDuration);
+    }
+    cancelLingerTimer() {
+        if (this.lingerTimer) {
+            clearTimeout(this.lingerTimer);
+            this.lingerTimer = null;
+        }
+    }
+}
+//# sourceMappingURL=batch-transform.js.map

package/dist/esm/batch-transform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"batch-transform.js","sourceRoot":"","sources":["../../src/batch-transform.ts"],"names":[],"mappings":"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"}

package/dist/esm/generated/client/utils.gen.d.ts

@@ -1,6 +1,6 @@
 import type { QuerySerializerOptions } from '../core/bodySerializer.gen.js';
 import type { Client, ClientOptions, Config, RequestOptions } from './types.gen.js';
-export declare const createQuerySerializer: <T = unknown>({ allowReserved, array, object, }?: QuerySerializerOptions) => (queryParams: T) => string;
+export declare const createQuerySerializer: <T = unknown>({ parameters, ...args }?: QuerySerializerOptions) => (queryParams: T) => string;
 /**
  * Infers parseAs value from provided Content-Type header.
  */

package/dist/esm/generated/client/utils.gen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.gen.d.ts","sourceRoot":"","sources":["../../../../src/generated/client/utils.gen.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAQ5E,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEpF,eAAO,MAAM,qBAAqB,GAAI,CAAC,gDAIpC,sBAAsB,mBACe,CAAC,WA2CxC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,gBACR,MAAM,GAAG,IAAI,KACzB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,CAqCnC,CAAC;AAqBF,eAAO,MAAM,aAAa,6BAGvB,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,GAC3C,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG;IACvC,OAAO,EAAE,OAAO,CAAC;CAClB,kBA8BF,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,UAAU,CAUpC,CAAC;AAEL,eAAO,MAAM,YAAY,MAAO,MAAM,KAAK,MAAM,KAAG,MAOnD,CAAC;AAUF,eAAO,MAAM,YAAY,eACX,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC,KACzD,OA8BF,CAAC;AAEF,KAAK,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,IAAI,CAC5C,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,GAAG,EACb,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,OAAO,KACb,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;AAExB,KAAK,cAAc,CAAC,GAAG,EAAE,OAAO,IAAI,CAClC,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,OAAO,KACb,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;AAExB,KAAK,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,IAAI,CACvC,QAAQ,EAAE,GAAG,EACb,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,OAAO,KACb,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;AAExB,cAAM,YAAY,CAAC,WAAW;IAC5B,GAAG,EAAE,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,CAAM;IAEpC,KAAK,IAAI,IAAI;IAIb,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAOrC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO;IAKzC,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM;IAOrD,MAAM,CACJ,EAAE,EAAE,MAAM,GAAG,WAAW,EACxB,EAAE,EAAE,WAAW,GACd,MAAM,GAAG,WAAW,GAAG,KAAK;IAS/B,GAAG,CAAC,EAAE,EAAE,WAAW,GAAG,MAAM;CAI7B;AAED,MAAM,WAAW,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO;IAChD,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5D,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IACpD,QAAQ,EAAE,YAAY,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;CAC3D;AAED,eAAO,MAAM,kBAAkB,GAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,OAAK,UAAU,CACtE,GAAG,EACH,GAAG,EACH,GAAG,EACH,OAAO,CAKP,CAAC;AAkBH,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,aAAa,6BACxC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,KACjD,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAMxC,CAAC"}
+{"version":3,"file":"utils.gen.d.ts","sourceRoot":"","sources":["../../../../src/generated/client/utils.gen.ts"],"names":[],"mappings":"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"}

package/dist/esm/generated/client/utils.gen.js

@@ -3,7 +3,7 @@ import { getAuthToken } from '../core/auth.gen.js';
 import { jsonBodySerializer } from '../core/bodySerializer.gen.js';
 import { serializeArrayParam, serializeObjectParam, serializePrimitiveParam, } from '../core/pathSerializer.gen.js';
 import { getUrl } from '../core/utils.gen.js';
-export const createQuerySerializer = ({ allowReserved, array, object, } = {}) => {
+export const createQuerySerializer = ({ parameters = {}, ...args } = {}) => {
     const querySerializer = (queryParams) => {
         const search = [];
         if (queryParams && typeof queryParams === 'object') {
@@ -12,33 +12,34 @@ export const createQuerySerializer = ({ allowReserved, array, object, } = {}) =>
                 if (value === undefined || value === null) {
                     continue;
                 }
+                const options = parameters[name] || args;
                 if (Array.isArray(value)) {
                     const serializedArray = serializeArrayParam({
-                        allowReserved,
+                        allowReserved: options.allowReserved,
                         explode: true,
                         name,
                         style: 'form',
                         value,
-                        ...array,
+                        ...options.array,
                     });
                     if (serializedArray)
                         search.push(serializedArray);
                 }
                 else if (typeof value === 'object') {
                     const serializedObject = serializeObjectParam({
-                        allowReserved,
+                        allowReserved: options.allowReserved,
                         explode: true,
                         name,
                         style: 'deepObject',
                         value: value,
-                        ...object,
+                        ...options.object,
                     });
                     if (serializedObject)
                         search.push(serializedObject);
                 }
                 else {
                     const serializedPrimitive = serializePrimitiveParam({
-                        allowReserved,
+                        allowReserved: options.allowReserved,
                         name,
                         value: value,
                     });