From afd343528d8c86d2f570bd0ce073645c0b389eda Mon Sep 17 00:00:00 2001 From: Kevin Viglucci Date: Sat, 16 Apr 2022 23:22:19 -0500 Subject: [PATCH] fix: include original code and message in stream errors for requestResponse + requestStream --- .../UnityRSocket/Runtime/RSocketRequester.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketRequester.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketRequester.cs index 73b37ad..5758a44 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketRequester.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketRequester.cs @@ -140,8 +140,10 @@ private void HandleErrorFrame(RSocketFrame.ErrorFrame abstractFrame) { _done = true; - // TODO: get actual error code and message from frame - _receiver.OnError(new RSocketError(RSocketErrorCodes.REJECTED, "An unexpected error occurred")); + RSocketError rSocketError = new RSocketError( + (RSocketErrorCodes) abstractFrame.Code, + abstractFrame.Message ?? "An unexpected error occurred"); + _receiver.OnError(rSocketError); } private void HandlePayloadFrame(RSocketFrame.AbstractRequestFrame abstractFrame) @@ -308,8 +310,10 @@ private void HandleErrorFrame(RSocketFrame.ErrorFrame abstractFrame) { _done = true; - // TODO: get actual error code and message from frame - _receiver.OnError(new RSocketError(abstractFrame.Code, abstractFrame.Message)); + RSocketError rSocketError = new RSocketError( + (RSocketErrorCodes) abstractFrame.Code, + abstractFrame.Message ?? "An unexpected error occurred"); + _receiver.OnError(rSocketError); } private void HandlePayloadFrame(RSocketFrame.AbstractRequestFrame abstractFrame)