starpc 0.52.0 → 0.52.2

package/srpc/packet.rs

@@ -10,10 +10,8 @@ use bytes::Bytes;
 
 /// Creates a new CallStart packet.
 ///
-/// # Arguments
-/// * `service` - The service ID
-/// * `method` - The method ID
-/// * `data` - Optional initial data (None = no data, Some(empty) = empty data)
+/// `None` data sends no payload; `Some(empty)` sends empty data with the
+/// `data_is_zero` flag set.
 pub fn new_call_start(
     service: impl Into<String>,
     method: impl Into<String>,
@@ -31,10 +29,7 @@ pub fn new_call_start(
     }
 }
 
-/// Creates a new CallData packet with data.
-///
-/// # Arguments
-/// * `data` - The data to send (can be empty)
+/// Creates a new CallData packet carrying `data`, which may be empty.
 pub fn new_call_data(data: Vec<u8>) -> Packet {
     let data_is_zero = data.is_empty();
     Packet {
@@ -49,16 +44,9 @@ pub fn new_call_data(data: Vec<u8>) -> Packet {
 
 /// Creates a new CallData packet with optional data and flags.
 ///
-/// # Arguments
-/// * `data` - Optional data bytes
-/// * `data_is_zero` - True if empty data should be sent
-/// * `complete` - True if this completes the stream
-/// * `error` - Optional error message
-pub fn new_call_data_full(
-    data: Option<Bytes>,
-    complete: bool,
-    error: Option<String>,
-) -> Packet {
+/// Sets `complete` when either `complete` or `error` is set, so an error
+/// always ends the call.
+pub fn new_call_data_full(data: Option<Bytes>, complete: bool, error: Option<String>) -> Packet {
     let (data_bytes, data_is_zero) = encode_optional_data(data);
 
     Packet {
@@ -83,10 +71,7 @@ pub fn new_call_complete() -> Packet {
     }
 }
 
-/// Creates a new CallData packet with an error.
-///
-/// # Arguments
-/// * `error` - The error message
+/// Creates a new CallData packet carrying an error message.
 pub fn new_call_error(error: impl Into<String>) -> Packet {
     Packet {
         body: Some(Body::CallData(CallData {
@@ -154,11 +139,7 @@ impl Validate for CallData {
         // - data_is_zero flag set (indicating intentionally empty data)
         // - complete flag set
         // - error message
-        if self.data.is_empty()
-            && !self.data_is_zero
-            && !self.complete
-            && self.error.is_empty()
-        {
+        if self.data.is_empty() && !self.data_is_zero && !self.complete && self.error.is_empty() {
             return Err(Error::EmptyPacket);
         }
         Ok(())

package/srpc/packet.ts

@@ -7,6 +7,8 @@ import {
   buildEncodeMessageTransform,
 } from './message.js'
 
+const MAX_MESSAGE_SIZE = 10_000_000
+
 // decodePacketSource decodes packets from a binary data stream.
 export const decodePacketSource = buildDecodeMessageTransform<Packet>(Packet)
 
@@ -39,6 +41,9 @@ export async function* lengthPrefixEncode(
   for await (const chunk of source) {
     // Encode the length of the chunk.
     const length = chunk instanceof Uint8Array ? chunk.length : chunk.byteLength
+    if (length === 0 || length > MAX_MESSAGE_SIZE) {
+      throw RangeError(`invalid packet length: ${length}`)
+    }
     const lengthEncoded = lengthEncoder(length)
 
     // Concatenate the length prefix and the data.
@@ -50,7 +55,7 @@ export async function* lengthPrefixEncode(
 export async function* lengthPrefixDecode(
   source: Source<Uint8Array | Uint8ArrayList>,
   lengthDecoder: typeof uint32LEDecode,
-) {
+): AsyncGenerator<Uint8ArrayList> {
   const buffer = new Uint8ArrayList()
 
   for await (const chunk of source) {
@@ -59,18 +64,26 @@ export async function* lengthPrefixDecode(
     // Continue extracting messages while buffer contains enough data for decoding.
     while (buffer.length >= lengthDecoder.bytes) {
       const messageLength = lengthDecoder(buffer)
+      if (messageLength === 0 || messageLength > MAX_MESSAGE_SIZE) {
+        throw RangeError(`invalid packet length: ${messageLength}`)
+      }
       const totalLength = lengthDecoder.bytes + messageLength
 
       if (buffer.length < totalLength) break // Wait for more data if the full message hasn't arrived.
 
       // Extract the message excluding the length prefix.
-      const message = buffer.sublist(lengthDecoder.bytes, totalLength)
+      const message = new Uint8ArrayList(
+        buffer.slice(lengthDecoder.bytes, totalLength),
+      )
       yield message
 
       // Remove the processed message from the buffer.
       buffer.consume(totalLength)
     }
   }
+  if (buffer.length !== 0) {
+    throw new RangeError('truncated packet frame')
+  }
 }
 
 // prependLengthPrefixTransform adds a length prefix to a message source.