From b1da857e6d8cf5c285dbe755b4ec232087628fe1 Mon Sep 17 00:00:00 2001
From: jr-kenny <dalvidjr2022@gmail.com>
Date: Fri, 14 Aug 2026 22:52:03 +0100
Subject: [PATCH] fix(node): forward streamAllMessages errors to callbacks

---
 bindings/node/src/conversations/streams.rs | 84 +++++++++++++---------
 sdks/js/node-sdk/test/streams.test.ts      | 36 ++++++++++
 2 files changed, 85 insertions(+), 35 deletions(-)

diff --git a/bindings/node/src/conversations/streams.rs b/bindings/node/src/conversations/streams.rs
index 5d0988118b..14ff2792af 100644
--- a/bindings/node/src/conversations/streams.rs
+++ b/bindings/node/src/conversations/streams.rs
@@ -8,9 +8,34 @@ use crate::{client::RustXmtpClient, streams::StreamCloser};
 use napi::bindgen_prelude::{Error, Result, Uint8Array};
 use napi::threadsafe_function::{ThreadsafeFunction, ThreadsafeFunctionCallMode};
 use napi_derive::napi;
-use xmtp_db::consent_record::ConsentState as XmtpConsentState;
+use xmtp_db::{
+  consent_record::ConsentState as XmtpConsentState, group_message::StoredGroupMessage,
+};
 use xmtp_mls::worker::device_sync::preference_sync::PreferenceUpdate as XmtpUserPreferenceUpdate;
 
+fn forward_message<F>(
+  inbox_id: &str,
+  message: std::result::Result<StoredGroupMessage, xmtp_mls::subscriptions::SubscribeError>,
+  mut callback: F,
+) where
+  F: FnMut(Result<Message>),
+{
+  if let Err(error) = &message {
+    tracing::warn!(
+      inbox_id,
+      error = ?error,
+      "[received] forwarding message error to callback"
+    );
+  }
+
+  callback(
+    message
+      .map(Message::from)
+      .map_err(ErrorWrapper::from)
+      .map_err(Error::from),
+  );
+}
+
 #[napi(discriminant = "type")]
 pub enum UserPreferenceUpdate {
   ConsentUpdate { consent: Consent },
@@ -93,40 +118,10 @@ impl Conversations {
             "[received] message result"
         );
 
-        // Skip any messages that are errors
-        if let Err(err) = &message {
-          tracing::warn!(
-            inbox_id,
-            error = ?err,
-            "[received] message error, swallowing to continue stream"
-          );
-          return; // Skip this message entirely
-        }
-
-        // For successful messages, try to transform and pass to JS
-        // otherwise log error and continue stream
-        match message
-          .map(Into::into)
-          .map_err(ErrorWrapper::from)
-          .map_err(Error::from)
-        {
-          Ok(transformed_msg) => {
-            tracing::trace!(
-              inbox_id,
-              "[received] calling tsfn callback with successful message"
-            );
-            let status = callback.call(Ok(transformed_msg), ThreadsafeFunctionCallMode::Blocking);
-            tracing::info!("Stream status: {:?}", status);
-          }
-          Err(err) => {
-            // Just in case the transformation itself fails
-            tracing::error!(
-              inbox_id,
-              error = ?err,
-              "[received] error during message transformation, swallowing to continue stream"
-            );
-          }
-        }
+        forward_message(inbox_id.as_str(), message, |result| {
+          let status = callback.call(result, ThreadsafeFunctionCallMode::Blocking);
+          tracing::info!("Stream status: {:?}", status);
+        });
       };
     let on_close = move || {
       on_close.call(Ok(()), ThreadsafeFunctionCallMode::Blocking);
@@ -249,3 +244,22 @@ impl Conversations {
     Ok(StreamCloser::new(stream_closer))
   }
 }
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+
+  #[test]
+  fn forwards_item_errors_to_callback() {
+    let mut callbacks = Vec::new();
+
+    forward_message(
+      "test-inbox",
+      Err(xmtp_mls::subscriptions::SubscribeError::GroupMessageNotFound),
+      |result| callbacks.push(result),
+    );
+
+    assert_eq!(callbacks.len(), 1);
+    assert!(callbacks.pop().unwrap().is_err());
+  }
+}
diff --git a/sdks/js/node-sdk/test/streams.test.ts b/sdks/js/node-sdk/test/streams.test.ts
index ee77427b59..78dfed106f 100644
--- a/sdks/js/node-sdk/test/streams.test.ts
+++ b/sdks/js/node-sdk/test/streams.test.ts
@@ -447,4 +447,40 @@ describe("createStream", () => {
 
     expect(onErrorSpy).toHaveBeenCalledWith(expect.any(StreamFailedError));
   });
+
+  it("should report item errors without ending the stream", async () => {
+    const itemError = new Error("message processing failed");
+    const onErrorSpy = vi.fn();
+    const onFailSpy = vi.fn();
+    const onValueSpy = vi.fn();
+    let emit!: StreamCallback<number>;
+
+    const mockStreamFunction = vi.fn(
+      async (callback: StreamCallback<number>) => {
+        emit = callback;
+        return {
+          end: vi.fn(),
+          endAndWait: vi.fn().mockResolvedValue(undefined),
+          isClosed: vi.fn().mockReturnValue(false),
+          waitForReady: vi.fn().mockResolvedValue(undefined),
+        };
+      },
+    );
+
+    const stream = await createStream<number>(mockStreamFunction, undefined, {
+      onError: onErrorSpy,
+      onFail: onFailSpy,
+      onValue: onValueSpy,
+    });
+
+    emit(itemError, undefined);
+    emit(null, 42);
+
+    expect(onErrorSpy).toHaveBeenCalledOnce();
+    expect(onErrorSpy).toHaveBeenCalledWith(itemError);
+    expect(onValueSpy).toHaveBeenCalledWith(42);
+    expect(onFailSpy).not.toHaveBeenCalled();
+
+    await stream.end();
+  });
 });