@s2-dev/streamstore 0.19.5 → 0.21.0

package/dist/cjs/lib/stream/transport/fetch/shared.js

@@ -4,10 +4,12 @@ exports.streamRead = streamRead;
 exports.streamAppend = streamAppend;
 const error_js_1 = require("../../../../error.js");
 const index_js_1 = require("../../../../generated/index.js");
+const mappers_js_1 = require("../../../../internal/mappers.js");
 const utils_js_1 = require("../../../../utils.js");
-const base64_js_1 = require("../../../base64.js");
+const proto_js_1 = require("../proto.js");
 async function streamRead(stream, client, args, options) {
     const { as, ...queryParams } = args ?? {};
+    const wantsBytes = (as ?? "string") === "bytes";
     let response;
     try {
         response = await (0, index_js_1.read)({
@@ -15,10 +17,9 @@ async function streamRead(stream, client, args, options) {
             path: {
                 stream,
             },
-            headers: {
-                ...(as === "bytes" ? { "s2-format": "base64" } : {}),
-            },
+            headers: wantsBytes ? { Accept: "application/protobuf" } : undefined,
             query: queryParams,
+            parseAs: wantsBytes ? "arrayBuffer" : undefined,
             ...options,
         });
     }
@@ -32,111 +33,59 @@ async function streamRead(stream, client, args, options) {
         }
         throw (0, error_js_1.makeServerError)({ status, statusText: response.response.statusText }, response.error);
     }
-    if (args?.as === "bytes") {
-        const res = {
-            ...response.data,
-            records: response.data.records?.map((record) => ({
-                ...record,
-                body: record.body ? (0, base64_js_1.decodeFromBase64)(record.body) : undefined,
-                headers: record.headers?.map((header) => header.map((h) => (0, base64_js_1.decodeFromBase64)(h))),
-            })) ?? [],
-        };
-        return res;
-    }
-    else {
-        const res = {
-            ...response.data,
-            records: response.data.records?.map((record) => ({
-                ...record,
-                headers: record.headers
-                    ? Object.fromEntries(record.headers)
-                    : undefined,
-            })) ?? [],
-        };
-        return res;
+    if (wantsBytes) {
+        const batch = (0, proto_js_1.decodeProtoReadBatch)(response.data);
+        return batch;
     }
+    const res = {
+        ...response.data,
+        records: response.data.records?.map((record) => ({
+            ...record,
+            headers: record.headers
+                ? Object.fromEntries(record.headers)
+                : undefined,
+        })) ?? [],
+    };
+    return res;
 }
-async function streamAppend(stream, client, records, args, options) {
-    const recordsArray = Array.isArray(records) ? records : [records];
-    if (recordsArray.length === 0) {
-        throw new error_js_1.S2Error({ message: "Cannot append empty array of records" });
-    }
-    let batchMeteredSize = 0;
-    for (const record of recordsArray) {
-        batchMeteredSize += (0, utils_js_1.meteredBytes)(record);
-    }
-    if (batchMeteredSize > 1024 * 1024) {
-        throw new error_js_1.S2Error({
-            message: `Batch size ${batchMeteredSize} bytes exceeds maximum of 1 MiB (1048576 bytes)`,
-        });
-    }
-    if (recordsArray.length > 1000) {
-        throw new error_js_1.S2Error({
-            message: `Batch of ${recordsArray.length} exceeds maximum batch size of 1000 records`,
-        });
-    }
-    let encodedRecords = [];
-    let hasAnyBytesRecords = false;
-    // First pass: determine if any records are bytes format
-    for (const record of recordsArray) {
-        const format = (0, utils_js_1.computeAppendRecordFormat)(record);
-        if (format === "bytes") {
-            hasAnyBytesRecords = true;
-            break;
+async function streamAppend(stream, client, input, options) {
+    const { preferProtobuf, ...requestOptions } = options ?? {};
+    const hasAnyBytesRecords = input.records.some((record) => (0, utils_js_1.computeAppendRecordFormat)(record) === "bytes");
+    const useProtobuf = hasAnyBytesRecords || preferProtobuf === true;
+    let response;
+    if (useProtobuf) {
+        const protoBody = (0, proto_js_1.encodeProtoAppendInput)(input);
+        const headers = {
+            Accept: "application/protobuf",
+            "Content-Type": "application/protobuf",
+        };
+        try {
+            response = await (0, index_js_1.append)({
+                client,
+                path: {
+                    stream,
+                },
+                body: protoBody,
+                bodySerializer: null,
+                parseAs: "arrayBuffer",
+                headers,
+                ...requestOptions,
+            });
         }
-    }
-    const textEncoder = new TextEncoder();
-    // Second pass: encode all records appropriately
-    for (const record of recordsArray) {
-        const format = (0, utils_js_1.computeAppendRecordFormat)(record);
-        if (format === "bytes") {
-            const formattedRecord = record;
-            const encodedRecord = {
-                ...formattedRecord,
-                body: formattedRecord.body
-                    ? (0, base64_js_1.encodeToBase64)(formattedRecord.body)
-                    : undefined,
-                headers: formattedRecord.headers?.map((header) => header.map((h) => (0, base64_js_1.encodeToBase64)(h))),
-            };
-            encodedRecords.push(encodedRecord);
+        catch (error) {
+            throw (0, error_js_1.s2Error)(error);
         }
-        else {
-            // Normalize headers to array format
-            const normalizeHeaders = (headers) => {
-                if (headers === undefined) {
-                    return undefined;
-                }
-                else if (Array.isArray(headers)) {
-                    return headers;
-                }
-                else {
-                    return Object.entries(headers);
-                }
-            };
-            const formattedRecord = record;
-            const normalizedHeaders = formattedRecord.headers
-                ? normalizeHeaders(formattedRecord.headers)
-                : undefined;
-            const encodedHeaders = normalizedHeaders
-                ? hasAnyBytesRecords
-                    ? normalizedHeaders.map(([name, value]) => [
-                        (0, base64_js_1.encodeToBase64)(textEncoder.encode(name)),
-                        (0, base64_js_1.encodeToBase64)(textEncoder.encode(value)),
-                    ])
-                    : normalizedHeaders
-                : undefined;
-            // If batch has bytes records, encode string bodies as base64 too
-            const encodedRecord = {
-                ...formattedRecord,
-                body: hasAnyBytesRecords && formattedRecord.body
-                    ? (0, base64_js_1.encodeToBase64)(textEncoder.encode(formattedRecord.body))
-                    : formattedRecord.body,
-                headers: encodedHeaders,
-            };
-            encodedRecords.push(encodedRecord);
+        if (response.error) {
+            const status = response.response.status;
+            if (status === 412) {
+                throw (0, error_js_1.makeAppendPreconditionError)(status, response.error);
+            }
+            throw (0, error_js_1.makeServerError)({ status, statusText: response.response.statusText }, response.error);
         }
+        const ack = (0, proto_js_1.decodeProtoAppendAck)(response.data);
+        return (0, proto_js_1.protoAppendAckToJson)(ack);
     }
-    let response;
+    const encodedRecords = [...input.records].map(mappers_js_1.toAPIAppendRecord);
     try {
         response = await (0, index_js_1.append)({
             client,
@@ -144,14 +93,11 @@ async function streamAppend(stream, client, records, args, options) {
                 stream,
             },
             body: {
-                fencing_token: args?.fencing_token,
-                match_seq_num: args?.match_seq_num,
+                fencing_token: input.fencingToken,
+                match_seq_num: input.matchSeqNum,
                 records: encodedRecords,
             },
-            headers: {
-                ...(hasAnyBytesRecords ? { "s2-format": "base64" } : {}),
-            },
-            ...options,
+            ...requestOptions,
         });
     }
     catch (error) {
@@ -164,6 +110,6 @@ async function streamAppend(stream, client, records, args, options) {
         }
         throw (0, error_js_1.makeServerError)({ status, statusText: response.response.statusText }, response.error);
     }
-    return response.data;
+    return (0, mappers_js_1.fromAPIAppendAck)(response.data);
 }
 //# sourceMappingURL=shared.js.map

package/dist/cjs/lib/stream/transport/fetch/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../../src/lib/stream/transport/fetch/shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../../src/lib/stream/transport/fetch/shared.ts"],"names":[],"mappings":"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"}

package/dist/cjs/lib/stream/transport/proto.d.ts

@@ -0,0 +1,9 @@
+import * as Proto from "../../../generated/proto/s2.js";
+import type * as Types from "../../../types.js";
+import type { ReadBatch } from "../types.js";
+export declare const buildProtoAppendInput: (input: Types.AppendInput) => Proto.AppendInput;
+export declare const encodeProtoAppendInput: (input: Types.AppendInput) => Uint8Array;
+export declare const decodeProtoAppendAck: (data: ArrayBuffer | Uint8Array) => Proto.AppendAck;
+export declare const protoAppendAckToJson: (ack: Proto.AppendAck) => Types.AppendAck;
+export declare const decodeProtoReadBatch: (data: ArrayBuffer | Uint8Array) => ReadBatch<"bytes">;
+//# sourceMappingURL=proto.d.ts.map

package/dist/cjs/lib/stream/transport/proto.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proto.d.ts","sourceRoot":"","sources":["../../../../../src/lib/stream/transport/proto.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,gCAAgC,CAAC;AACxD,OAAO,KAAK,KAAK,KAAK,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAgB,SAAS,EAAE,MAAM,aAAa,CAAC;AAwF3D,eAAO,MAAM,qBAAqB,UAC1B,KAAK,CAAC,WAAW,KACtB,KAAK,CAAC,WAUR,CAAC;AAMF,eAAO,MAAM,sBAAsB,UAC3B,KAAK,CAAC,WAAW,KACtB,UAEF,CAAC;AAEF,eAAO,MAAM,oBAAoB,SAC1B,WAAW,GAAG,UAAU,KAC5B,KAAK,CAAC,SAER,CAAC;AAEF,eAAO,MAAM,oBAAoB,QAAS,KAAK,CAAC,SAAS,KAAG,KAAK,CAAC,SAkBjE,CAAC;AAEF,eAAO,MAAM,oBAAoB,SAC1B,WAAW,GAAG,UAAU,KAC5B,SAAS,CAAC,OAAO,CAUnB,CAAC"}

package/dist/cjs/lib/stream/transport/proto.js

@@ -0,0 +1,118 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeProtoReadBatch = exports.protoAppendAckToJson = exports.decodeProtoAppendAck = exports.encodeProtoAppendInput = exports.buildProtoAppendInput = void 0;
+const error_js_1 = require("../../../error.js");
+const Proto = require("../../../generated/proto/s2.js");
+const textEncoder = new TextEncoder();
+const MAX_SAFE_BIGINT = BigInt(Number.MAX_SAFE_INTEGER);
+function bigintToSafeNumber(value, field) {
+    if (value > MAX_SAFE_BIGINT) {
+        throw new error_js_1.S2Error({
+            message: `${field} exceeds JavaScript Number.MAX_SAFE_INTEGER (${Number.MAX_SAFE_INTEGER}); use protobuf transport with bigint support or ensure values stay within 53-bit range`,
+            code: "UNSAFE_INTEGER",
+            status: 0,
+            origin: "sdk",
+        });
+    }
+    return Number(value);
+}
+const toBytes = (value) => {
+    if (value === undefined || value === null) {
+        return new Uint8Array();
+    }
+    return typeof value === "string" ? textEncoder.encode(value) : value;
+};
+const toProtoHeaders = (headers) => {
+    if (!headers) {
+        return [];
+    }
+    return headers.map(([name, value]) => ({
+        name: toBytes(name),
+        value: toBytes(value),
+    }));
+};
+const toProtoAppendRecord = (record) => {
+    let timestamp;
+    if (record.timestamp !== undefined) {
+        const ms = typeof record.timestamp === "number"
+            ? record.timestamp
+            : record.timestamp.getTime();
+        timestamp = BigInt(ms);
+    }
+    return {
+        timestamp,
+        headers: toProtoHeaders(record.headers),
+        body: toBytes(record.body),
+    };
+};
+const fromProtoPosition = (position) => {
+    if (!position) {
+        return undefined;
+    }
+    return {
+        seq_num: bigintToSafeNumber(position.seqNum, "StreamPosition.seqNum"),
+        timestamp: Number(position.timestamp),
+    };
+};
+const toSDKStreamPosition = (pos) => {
+    return {
+        seqNum: pos.seq_num,
+        timestamp: new Date(pos.timestamp),
+    };
+};
+const fromProtoSequencedRecord = (record) => {
+    return {
+        seq_num: bigintToSafeNumber(record.seqNum, "SequencedRecord.seqNum"),
+        timestamp: Number(record.timestamp),
+        headers: record.headers?.map((header) => [header.name, header.value]) ?? [],
+        body: record.body,
+    };
+};
+const buildProtoAppendInput = (input) => {
+    return Proto.AppendInput.create({
+        records: [...input.records].map((record) => toProtoAppendRecord(record)),
+        fencingToken: input.fencingToken === null
+            ? undefined
+            : (input.fencingToken ?? undefined),
+        matchSeqNum: input.matchSeqNum !== undefined ? BigInt(input.matchSeqNum) : undefined,
+    });
+};
+exports.buildProtoAppendInput = buildProtoAppendInput;
+const ensureUint8Array = (data) => {
+    return data instanceof Uint8Array ? data : new Uint8Array(data);
+};
+const encodeProtoAppendInput = (input) => {
+    return Proto.AppendInput.toBinary((0, exports.buildProtoAppendInput)(input));
+};
+exports.encodeProtoAppendInput = encodeProtoAppendInput;
+const decodeProtoAppendAck = (data) => {
+    return Proto.AppendAck.fromBinary(ensureUint8Array(data));
+};
+exports.decodeProtoAppendAck = decodeProtoAppendAck;
+const protoAppendAckToJson = (ack) => {
+    const start = fromProtoPosition(ack.start);
+    const end = fromProtoPosition(ack.end);
+    if (!start || !end) {
+        throw new error_js_1.S2Error({
+            message: "AppendAck missing start or end positions",
+            status: 500,
+            origin: "sdk",
+        });
+    }
+    const tail = fromProtoPosition(ack.tail) ?? end;
+    return {
+        start: toSDKStreamPosition(start),
+        end: toSDKStreamPosition(end),
+        tail: toSDKStreamPosition(tail),
+    };
+};
+exports.protoAppendAckToJson = protoAppendAckToJson;
+const decodeProtoReadBatch = (data) => {
+    const protoBatch = Proto.ReadBatch.fromBinary(ensureUint8Array(data));
+    return {
+        records: protoBatch.records.map((record) => fromProtoSequencedRecord(record)),
+        tail: fromProtoPosition(protoBatch.tail),
+    };
+};
+exports.decodeProtoReadBatch = decodeProtoReadBatch;
+//# sourceMappingURL=proto.js.map

package/dist/cjs/lib/stream/transport/proto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"proto.js","sourceRoot":"","sources":["../../../../../src/lib/stream/transport/proto.ts"],"names":[],"mappings":";;;AAAA,gDAA4C;AAE5C,wDAAwD;AAIxD,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AAEtC,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAExD,SAAS,kBAAkB,CAAC,KAAa,EAAE,KAAa;IACvD,IAAI,KAAK,GAAG,eAAe,EAAE,CAAC;QAC7B,MAAM,IAAI,kBAAO,CAAC;YACjB,OAAO,EAAE,GAAG,KAAK,gDAAgD,MAAM,CAAC,gBAAgB,yFAAyF;YACjL,IAAI,EAAE,gBAAgB;YACtB,MAAM,EAAE,CAAC;YACT,MAAM,EAAE,KAAK;SACb,CAAC,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,MAAM,OAAO,GAAG,CAAC,KAAkC,EAAc,EAAE;IAClE,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAC3C,OAAO,IAAI,UAAU,EAAE,CAAC;IACzB,CAAC;IACD,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AACtE,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CACtB,OAAgC,EACA,EAAE;IAClC,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,OAAO,EAAE,CAAC;IACX,CAAC;IACD,OAAQ,OAA6D,CAAC,GAAG,CACxE,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC;QACnB,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC;KACrB,CAAC,CACF,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,MAAoB,EAAsB,EAAE;IACxE,IAAI,SAA6B,CAAC;IAClC,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,EAAE,GACP,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ;YACnC,CAAC,CAAC,MAAM,CAAC,SAAS;YAClB,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QAC/B,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IACD,OAAO;QACN,SAAS;QACT,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC;QACvC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;KAC1B,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CACzB,QAA0C,EACT,EAAE;IACnC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,OAAO;QACN,OAAO,EAAE,kBAAkB,CAAC,QAAQ,CAAC,MAAM,EAAE,uBAAuB,CAAC;QACrE,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC;KACrC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,GAAuB,EAAwB,EAAE;IAC7E,OAAO;QACN,MAAM,EAAE,GAAG,CAAC,OAAO;QACnB,SAAS,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC;KAClC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAChC,MAA6B,EACW,EAAE;IAC1C,OAAO;QACN,OAAO,EAAE,kBAAkB,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC;QACpE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;QACnC,OAAO,EACN,MAAM,CAAC,OAAO,EAAE,GAAG,CAClB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAA6B,CACnE,IAAI,EAAE;QACR,IAAI,EAAE,MAAM,CAAC,IAAI;KACjB,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,CACpC,KAAwB,EACJ,EAAE;IACtB,OAAO,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC;QAC/B,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACxE,YAAY,EACX,KAAK,CAAC,YAAY,KAAK,IAAI;YAC1B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,IAAI,SAAS,CAAC;QACrC,WAAW,EACV,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;KACxE,CAAC,CAAC;AACJ,CAAC,CAAC;AAZW,QAAA,qBAAqB,yBAYhC;AAEF,MAAM,gBAAgB,GAAG,CAAC,IAA8B,EAAc,EAAE;IACvE,OAAO,IAAI,YAAY,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;AACjE,CAAC,CAAC;AAEK,MAAM,sBAAsB,GAAG,CACrC,KAAwB,EACX,EAAE;IACf,OAAO,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAA,6BAAqB,EAAC,KAAK,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC;AAJW,QAAA,sBAAsB,0BAIjC;AAEK,MAAM,oBAAoB,GAAG,CACnC,IAA8B,EACZ,EAAE;IACpB,OAAO,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;AAC3D,CAAC,CAAC;AAJW,QAAA,oBAAoB,wBAI/B;AAEK,MAAM,oBAAoB,GAAG,CAAC,GAAoB,EAAmB,EAAE;IAC7E,MAAM,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAG,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEvC,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;QACpB,MAAM,IAAI,kBAAO,CAAC;YACjB,OAAO,EAAE,0CAA0C;YACnD,MAAM,EAAE,GAAG;YACX,MAAM,EAAE,KAAK;SACb,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;IAChD,OAAO;QACN,KAAK,EAAE,mBAAmB,CAAC,KAAK,CAAC;QACjC,GAAG,EAAE,mBAAmB,CAAC,GAAG,CAAC;QAC7B,IAAI,EAAE,mBAAmB,CAAC,IAAI,CAAC;KAC/B,CAAC;AACH,CAAC,CAAC;AAlBW,QAAA,oBAAoB,wBAkB/B;AAEK,MAAM,oBAAoB,GAAG,CACnC,IAA8B,EACT,EAAE;IACvB,MAAM,UAAU,GAAoB,KAAK,CAAC,SAAS,CAAC,UAAU,CAC7D,gBAAgB,CAAC,IAAI,CAAC,CACtB,CAAC;IACF,OAAO;QACN,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC1C,wBAAwB,CAAC,MAAM,CAAC,CAChC;QACD,IAAI,EAAE,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC;KACxC,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,oBAAoB,wBAY/B"}

package/dist/cjs/lib/stream/transport/s2s/index.d.ts

@@ -5,13 +5,12 @@
  * This file should only be imported in Node.js environments
  */
 import type { S2RequestOptions } from "../../../../common.js";
-import { AppendInput as ProtoAppendInput } from "../../../../generated/proto/s2.js";
-import type { AppendArgs, AppendRecord, AppendSession, AppendSessionOptions, ReadArgs, ReadSession, SessionTransport, TransportConfig } from "../../types.js";
-export declare function buildProtoAppendInput(records: AppendRecord[], args: AppendArgs): ProtoAppendInput;
+import type { AppendSession, AppendSessionOptions, ReadArgs, ReadSession, SessionTransport, TransportConfig } from "../../types.js";
 export declare class S2STransport implements SessionTransport {
     private readonly transportConfig;
     private connection?;
     private connectionPromise?;
+    private closingPromise?;
     constructor(config: TransportConfig);
     makeAppendSession(stream: string, sessionOptions?: AppendSessionOptions, requestOptions?: S2RequestOptions): Promise<AppendSession>;
     makeReadSession<Format extends "string" | "bytes" = "string">(stream: string, args?: ReadArgs<Format>, options?: S2RequestOptions): Promise<ReadSession<Format>>;
@@ -20,5 +19,6 @@ export declare class S2STransport implements SessionTransport {
      */
     private getConnection;
     private createConnection;
+    close(): Promise<void>;
 }
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/lib/stream/transport/s2s/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/stream/transport/s2s/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAQ9D,OAAO,EAEN,WAAW,IAAI,gBAAgB,EAG/B,MAAM,mCAAmC,CAAC;AAU3C,OAAO,KAAK,EACX,UAAU,EACV,YAAY,EACZ,aAAa,EACb,oBAAoB,EACpB,QAAQ,EAGR,WAAW,EACX,gBAAgB,EAEhB,eAAe,EAEf,MAAM,gBAAgB,CAAC;AAoBxB,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,YAAY,EAAE,EACvB,IAAI,EAAE,UAAU,GACd,gBAAgB,CAgClB;AAED,qBAAa,YAAa,YAAW,gBAAgB;IACpD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,UAAU,CAAC,CAAqB;IACxC,OAAO,CAAC,iBAAiB,CAAC,CAA8B;gBAE5C,MAAM,EAAE,eAAe;IAI7B,iBAAiB,CACtB,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,oBAAoB,EACrC,cAAc,CAAC,EAAE,gBAAgB,GAC/B,OAAO,CAAC,aAAa,CAAC;IAkBnB,eAAe,CAAC,MAAM,SAAS,QAAQ,GAAG,OAAO,GAAG,QAAQ,EACjE,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,EACvB,OAAO,CAAC,EAAE,gBAAgB,GACxB,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAkB/B;;OAEG;YACW,aAAa;YAyBb,gBAAgB;CAiC9B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/stream/transport/s2s/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAmB9D,OAAO,KAAK,EAEX,aAAa,EACb,oBAAoB,EACpB,QAAQ,EAGR,WAAW,EACX,gBAAgB,EAEhB,eAAe,EAEf,MAAM,gBAAgB,CAAC;AAqBxB,qBAAa,YAAa,YAAW,gBAAgB;IACpD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,UAAU,CAAC,CAAqB;IACxC,OAAO,CAAC,iBAAiB,CAAC,CAA8B;IACxD,OAAO,CAAC,cAAc,CAAC,CAAgB;gBAE3B,MAAM,EAAE,eAAe;IAI7B,iBAAiB,CACtB,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,oBAAoB,EACrC,cAAc,CAAC,EAAE,gBAAgB,GAC/B,OAAO,CAAC,aAAa,CAAC;IAmBnB,eAAe,CAAC,MAAM,SAAS,QAAQ,GAAG,OAAO,GAAG,QAAQ,EACjE,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,EACvB,OAAO,CAAC,EAAE,gBAAgB,GACxB,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAkB/B;;OAEG;YACW,aAAa;YAyBb,gBAAgB;IAoExB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAuB5B"}