@bufbuild/protobuf 2.12.1 → 2.13.0

package/dist/esm/wire/size-delimited.d.ts

@@ -12,6 +12,20 @@ import type { BinaryReadOptions } from "../from-binary.js";
  * For details, see https://github.com/protocolbuffers/protobuf/issues/10229
  */
 export declare function sizeDelimitedEncode<Desc extends DescMessage>(messageDesc: Desc, message: MessageShape<Desc>, options?: BinaryWriteOptions): Uint8Array;
+/**
+ * Options for parsing size-delimited messages from a stream.
+ */
+export interface SizeDelimitedDecodeOptions extends BinaryReadOptions {
+    /**
+     * Limit the size of a single message in the stream, in bytes.
+     *
+     * If a message in the stream declares a size exceeding this limit, an
+     * error is raised before the message is buffered.
+     *
+     * The default limit is 64 MiB.
+     */
+    readMaxBytes: number;
+}
 /**
  * Parse a stream of size-delimited messages.
  *
@@ -20,8 +34,12 @@ export declare function sizeDelimitedEncode<Desc extends DescMessage>(messageDes
  *
  * This size-delimited format is compatible with other implementations.
  * For details, see https://github.com/protocolbuffers/protobuf/issues/10229
+ *
+ * Messages exceeding the limit given with the option readMaxBytes raise an
+ * error. The limit is 64 MiB by default. All other options are the
+ * standard binary read options, passed through to decode each message.
  */
-export declare function sizeDelimitedDecodeStream<Desc extends DescMessage>(messageDesc: Desc, iterable: AsyncIterable<Uint8Array>, options?: Partial<BinaryReadOptions>): AsyncIterableIterator<MessageShape<Desc>>;
+export declare function sizeDelimitedDecodeStream<Desc extends DescMessage>(messageDesc: Desc, iterable: AsyncIterable<Uint8Array>, options?: Partial<SizeDelimitedDecodeOptions>): AsyncIterableIterator<MessageShape<Desc>>;
 /**
  * Decodes the size from the given size-delimited message, which may be
  * incomplete.

package/dist/esm/wire/size-delimited.js

@@ -48,6 +48,34 @@ export function sizeDelimitedEncode(messageDesc, message, options) {
     writer.bytes(toBinary(messageDesc, message, options));
     return writer.finish();
 }
+// Default for SizeDelimitedDecodeOptions.readMaxBytes.
+const defaultReadMaxBytes = 64 * 1024 * 1024; // 64 MiB
+/**
+ * A growable byte buffer. Used in place of a resizable ArrayBuffer, which is
+ * not widely available.
+ */
+class ByteBuffer {
+    constructor() {
+        this.buffer = new Uint8Array(0);
+        this.length = 0;
+    }
+    get byteLength() {
+        return this.length;
+    }
+    bytes() {
+        return this.buffer.subarray(0, this.length);
+    }
+    append(chunk) {
+        const newByteLength = this.length + chunk.byteLength;
+        if (newByteLength > this.buffer.byteLength) {
+            const grown = new Uint8Array(Math.max(this.buffer.byteLength * 2, newByteLength));
+            grown.set(this.buffer.subarray(0, this.length));
+            this.buffer = grown;
+        }
+        this.buffer.set(chunk, this.length);
+        this.length += chunk.byteLength;
+    }
+}
 /**
  * Parse a stream of size-delimited messages.
  *
@@ -56,43 +84,53 @@ export function sizeDelimitedEncode(messageDesc, message, options) {
  *
  * This size-delimited format is compatible with other implementations.
  * For details, see https://github.com/protocolbuffers/protobuf/issues/10229
+ *
+ * Messages exceeding the limit given with the option readMaxBytes raise an
+ * error. The limit is 64 MiB by default. All other options are the
+ * standard binary read options, passed through to decode each message.
  */
 export function sizeDelimitedDecodeStream(messageDesc, iterable, options) {
     return __asyncGenerator(this, arguments, function* sizeDelimitedDecodeStream_1() {
         var _a, e_1, _b, _c;
-        // append chunk to buffer, returning updated buffer
-        function append(buffer, chunk) {
-            const n = new Uint8Array(buffer.byteLength + chunk.byteLength);
-            n.set(buffer);
-            n.set(chunk, buffer.length);
-            return n;
-        }
-        let buffer = new Uint8Array(0);
+        var _d;
+        const readMaxBytes = (_d = options === null || options === void 0 ? void 0 : options.readMaxBytes) !== null && _d !== void 0 ? _d : defaultReadMaxBytes;
+        let buffer = new ByteBuffer();
         try {
-            for (var _d = true, iterable_1 = __asyncValues(iterable), iterable_1_1; iterable_1_1 = yield __await(iterable_1.next()), _a = iterable_1_1.done, !_a; _d = true) {
+            for (var _e = true, iterable_1 = __asyncValues(iterable), iterable_1_1; iterable_1_1 = yield __await(iterable_1.next()), _a = iterable_1_1.done, !_a; _e = true) {
                 _c = iterable_1_1.value;
-                _d = false;
+                _e = false;
                 const chunk = _c;
-                buffer = append(buffer, chunk);
+                buffer.append(chunk);
+                const bytes = buffer.bytes();
+                let offset = 0;
                 for (;;) {
-                    const size = sizeDelimitedPeek(buffer);
+                    const size = sizeDelimitedPeek(bytes.subarray(offset));
                     if (size.eof) {
                         // size is incomplete, buffer more data
                         break;
                     }
-                    if (size.offset + size.size > buffer.byteLength) {
+                    if (size.size > readMaxBytes) {
+                        throw new Error(`message size ${size.size} is larger than configured readMaxBytes ${readMaxBytes}`);
+                    }
+                    const messageStart = offset + size.offset;
+                    const messageEnd = messageStart + size.size;
+                    if (messageEnd > bytes.byteLength) {
                         // message is incomplete, buffer more data
                         break;
                     }
-                    yield yield __await(fromBinary(messageDesc, buffer.subarray(size.offset, size.offset + size.size), options));
-                    buffer = buffer.subarray(size.offset + size.size);
+                    yield yield __await(fromBinary(messageDesc, bytes.subarray(messageStart, messageEnd), options));
+                    offset = messageEnd;
+                }
+                if (offset > 0) {
+                    buffer = new ByteBuffer();
+                    buffer.append(bytes.subarray(offset));
                 }
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (!_d && !_a && (_b = iterable_1.return)) yield __await(_b.call(iterable_1));
+                if (!_e && !_a && (_b = iterable_1.return)) yield __await(_b.call(iterable_1));
             }
             finally { if (e_1) throw e_1.error; }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protobuf",
-  "version": "2.12.1",
+  "version": "2.13.0",
   "license": "(Apache-2.0 AND BSD-3-Clause)",
   "description": "Protocol Buffers for ECMAScript. The only JavaScript Protobuf library that is fully-compliant with Protobuf conformance tests.",
   "keywords": [
@@ -29,6 +29,7 @@
   "type": "module",
   "sideEffects": false,
   "tshy": {
+    "selfLink": false,
     "exports": {
       ".": "./src/index.ts",
       "./codegenv1": "./src/codegenv1/index.ts",
@@ -36,7 +37,7 @@
       "./reflect": "./src/reflect/index.ts",
       "./wkt": "./src/wkt/index.ts",
       "./wire": "./src/wire/index.ts",
-      "./package.json": "./package.json"
+      "./txtpb": "./src/txtpb/index.ts"
     }
   },
   "devDependencies": {
@@ -107,7 +108,16 @@
         "default": "./dist/commonjs/wire/index.js"
       }
     },
-    "./package.json": "./package.json"
+    "./txtpb": {
+      "import": {
+        "types": "./dist/esm/txtpb/index.d.ts",
+        "default": "./dist/esm/txtpb/index.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/txtpb/index.d.ts",
+        "default": "./dist/commonjs/txtpb/index.js"
+      }
+    }
   },
   "main": "./dist/commonjs/index.js",
   "types": "./dist/commonjs/index.d.ts",
@@ -128,6 +138,9 @@
       ],
       "wire": [
         "./dist/commonjs/wire/index.d.ts"
+      ],
+      "txtpb": [
+        "./dist/commonjs/txtpb/index.d.ts"
       ]
     }
   }