Adding parameters to websocket error and close callbacks (#5)

BabylonJS · May 15, 2023 · f4bae60 · f4bae60
1 parent 6e4e2d0
commit f4bae60
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 39 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,7 +26,7 @@ if(ANDROID AND NOT TARGET AndroidExtensions)
     FetchContent_Declare(
         AndroidExtensions
         GIT_REPOSITORY https://github.com/BabylonJS/AndroidExtensions.git
-        GIT_TAG        82f22e834c4fb1eb2d08d560dcbdaac735e7ec30)
+        GIT_TAG        c7c8b44a9d021ee5e1159c4fec98d2ef0735401a)
 
     message(STATUS "Fetching AndroidExtensions")
     FetchContent_MakeAvailable(AndroidExtensions)

diff --git a/Include/UrlLib/UrlLib.h b/Include/UrlLib/UrlLib.h
@@ -77,7 +77,7 @@ namespace UrlLib
     class WebSocket final
     {
     public:
-        WebSocket(std::string url, std::function<void()> onOpen, std::function<void()> onClose, std::function<void(std::string)> onMessage, std::function<void()> onError);
+        WebSocket(const std::string& url, std::function<void()> onOpen, std::function<void(int, const std::string&)> onClose, std::function<void(const std::string&)> onMessage, std::function<void(const std::string&)> onError);
         ~WebSocket();
 
         // Copy semantics

diff --git a/Source/WebSocket_Android.cpp b/Source/WebSocket_Android.cpp
@@ -14,7 +14,7 @@ namespace UrlLib
     class WebSocket::Impl : public ImplBase
     {
     public:
-        Impl(std::string url, std::function<void()> onopen, std::function<void()> onclose, std::function<void(std::string)> onmessage, std::function<void()> onerror)
+        Impl(const std::string& url, std::function<void()> onopen, std::function<void(int, const std::string&)> onclose, std::function<void(const std::string&)> onmessage, std::function<void(const std::string&)> onerror)
             : ImplBase{url, onopen, onclose, onmessage, onerror}
             , m_webSocket{url, onopen, onclose, onmessage, onerror}
         {

diff --git a/Source/WebSocket_Apple.mm b/Source/WebSocket_Apple.mm
@@ -6,25 +6,27 @@
 class API_AVAILABLE(ios(13.0)) WebSocket::Impl : public ImplBase
     {
     public:
-        Impl(std::string url, std::function<void()> onOpen, std::function<void()> onClose, std::function<void(std::string)> onMessage, std::function<void()> onError)
+        Impl(const std::string& url, std::function<void()> onOpen, std::function<void(int, const std::string&)> onClose, std::function<void(const std::string&)> onMessage, std::function<void(const std::string&)> onError)
         : ImplBase{url, onOpen, onClose, onMessage, onError}
         {
             void (^openCallback)() =  [this]()
             {
                 m_onOpen();
             };
-            void (^closeCallback)() =  [this]()
+            void (^closeCallback)(int code, NSString* reason) =  [this](int code, NSString* reason)
             {
-                m_onClose();
+                std::string cppString( [reason UTF8String] );
+                m_onClose(code, cppString);
             };
             void (^messageCallback)(NSString* messageStr) =  [this](NSString* messageStr)
             {
                 std::string cppString( [messageStr UTF8String] );
                 m_onMessage(cppString);
             };
-            void (^errorCallback)() =  [this]()
+            void (^errorCallback)(NSString* errorStr) =  [this](NSString* errorStr)
             {
-                m_onError();
+                std::string cppString( [errorStr UTF8String] );
+                m_onError(cppString);
             };
 
             webSocket = [[WebSocket_ObjC alloc] initWithCallbacks:@(url.data()) onOpen:openCallback onClose:closeCallback onMessage:messageCallback onError:errorCallback];

diff --git a/Source/WebSocket_Apple_ObjC.h b/Source/WebSocket_Apple_ObjC.h
@@ -2,7 +2,7 @@
 
 API_AVAILABLE(ios(13.0))
 @interface WebSocket_ObjC : NSObject
-- (instancetype)initWithCallbacks:(NSString *)url onOpen:(void (^)(void))onOpen onClose:(void (^)(void))onClose onMessage:(void (^)(NSString *))onMessage onError:(void (^)(void))onError;
+- (instancetype)initWithCallbacks:(NSString *)url onOpen:(void (^)(void))onOpen onClose:(void (^)(int, NSString *))onClose onMessage:(void (^)(NSString *))onMessage onError:(void (^)(NSString *))onError;
 - (void)open API_AVAILABLE(ios(13.0));
 - (void)close API_AVAILABLE(ios(13.0));
 - (void)sendMessage:(NSString *)message  API_AVAILABLE(ios(13.0));

diff --git a/Source/WebSocket_Apple_ObjC.m b/Source/WebSocket_Apple_ObjC.m
@@ -7,15 +7,15 @@ @interface WebSocket_ObjC() <NSURLSessionWebSocketDelegate>
     NSString *websocketUrl;
     // store callbacks here
     void (^openCallback)();
-    void (^closeCallback)();
+    void (^closeCallback)(int, NSString *);
     void (^messageCallback)(NSString *);
-    void (^errorCallback)();
+    void (^errorCallback)(NSString *);
 }
 @end
 
 @implementation WebSocket_ObjC
 
-- (instancetype)initWithCallbacks:(NSString *)url onOpen:(void (^)(void))onOpen onClose:(void (^)(void))onClose onMessage:(void (^)(NSString *))onMessage onError:(void (^)(void))onError
+- (instancetype)initWithCallbacks:(NSString *)url onOpen:(void (^)(void))onOpen onClose:(void (^)(int, NSString *))onClose onMessage:(void (^)(NSString *))onMessage onError:(void (^)(NSString *))onError
 {
     self = [super init];
     websocketUrl = url;
@@ -37,7 +37,8 @@ -(void) open
 - (void) close 
 {
     [webSocketTask cancel];
-    [self invalidateAndCancel];
+    NSString *closeStr = [NSString stringWithUTF8String:"Normal close."];
+    [self invalidateAndCancelWithCloseCode:1000 reason:closeStr];
 }
 
 - (void) sendMessage:(NSString *)message
@@ -46,8 +47,9 @@ - (void) sendMessage:(NSString *)message
     {
         if (error) 
         {
-            errorCallback();
-        } 
+            NSString *errorMessage = [error localizedDescription];
+            errorCallback(errorMessage);
+        }
     }];
 }
 
@@ -57,7 +59,8 @@ - (void)receiveMessage
     {
         if (error) 
         {
-            errorCallback();
+            NSString *errorMessage = [error localizedDescription];
+            errorCallback(errorMessage);
         }
         else if (message.type == NSURLSessionWebSocketMessageTypeString)
         {
@@ -78,25 +81,28 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didComp
 {
     if (error)
     {
-        errorCallback();
+        NSString *errorMessage = [error localizedDescription];
+        errorCallback(errorMessage);
     }
 }
 
 - (void)URLSession:(NSURLSession *)session webSocketTask:(NSURLSessionWebSocketTask *)webSocketTask didCloseWithCloseCode:(NSInteger)code reason:(NSData *)reason  API_AVAILABLE(ios(13.0))
 {
+    NSString *reasonStr = [[NSString alloc] initWithData:reason encoding:NSUTF8StringEncoding];
     if (code != 1000)
     {
-        errorCallback();
+        errorCallback(reasonStr);
     }
-    [self invalidateAndCancel];
+
+    [self invalidateAndCancelWithCloseCode:(int)code reason:reasonStr];
 }
 
-- (void)invalidateAndCancel
+- (void)invalidateAndCancelWithCloseCode:(int)code reason:(NSString *) reason
 {
     webSocketTask = nil;
     [session invalidateAndCancel];
     session = nil;
-    closeCallback();
+    closeCallback(code, reason);
 }
 
 @end
diff --git a/Source/WebSocket_Base.h b/Source/WebSocket_Base.h
@@ -7,20 +7,20 @@ namespace UrlLib
     class WebSocket::ImplBase
     {
     public:
-    ImplBase(std::string url, std::function<void()> onOpen, std::function<void()> onClose, std::function<void(std::string)> onMessage, std::function<void()> onError)
+    ImplBase(const std::string& url, std::function<void()> onOpen, std::function<void(int, const std::string&)> onClose, std::function<void(const std::string&)> onMessage, std::function<void(const std::string&)> onError)
+        : m_url(url)
     {
-        m_url = url;
         m_onOpen = onOpen;
         m_onClose = onClose;
         m_onMessage = onMessage;
         m_onError = onError;
     }
 
     protected:
-        std::string m_url;
+        const std::string m_url;
         std::function<void()> m_onOpen;
-        std::function<void()> m_onClose;
-        std::function<void(std::string)> m_onMessage;
-        std::function<void()> m_onError;
+        std::function<void(int, const std::string&)> m_onClose;
+        std::function<void(const std::string&)> m_onMessage;
+        std::function<void(const std::string&)> m_onError;
     };
 }
diff --git a/Source/WebSocket_Shared.h b/Source/WebSocket_Shared.h
@@ -1,6 +1,6 @@
 namespace UrlLib
 {
-    WebSocket::WebSocket(std::string url, std::function<void()> onOpen, std::function<void()> onClose, std::function<void(std::string)> onMessage, std::function<void()> onError)
+    WebSocket::WebSocket(const std::string& url, std::function<void()> onOpen, std::function<void(int, const std::string&)> onClose, std::function<void(const std::string&)> onMessage, std::function<void(const std::string&)> onError)
     : m_impl{std::make_unique<WebSocket::Impl>(url, onOpen, onClose, onMessage, onError)}
     {
     }

diff --git a/Source/WebSocket_Windows.cpp b/Source/WebSocket_Windows.cpp
@@ -14,7 +14,7 @@ namespace UrlLib
     class WebSocket::Impl : public ImplBase
     {
     public:
-        Impl(std::string url, std::function<void()> onOpen, std::function<void()> onClose, std::function<void(std::string)> onMessage, std::function<void()> onError)
+        Impl(const std::string& url, std::function<void()> onOpen, std::function<void(int, const std::string&)> onClose, std::function<void(const std::string&)> onMessage, std::function<void(const std::string&)> onError)
         : ImplBase{url, onOpen, onClose, onMessage, onError}
         {
         }
@@ -40,13 +40,21 @@ namespace UrlLib
                     {
                         if (result.has_error())
                         {
-                            m_onError();
+                            try
+                            {
+                                std::rethrow_exception(result.error());
+                            }
+                            catch (const std::exception& ex)
+                            {
+                                m_onError(ex.what());
+                            }
                         }
                     });
             }
-            catch (winrt::hresult_error const&)
+            catch (winrt::hresult_error const& ex)
             {
-                m_onError();
+                std::string errorMessage = winrt::to_string(ex.message());
+                m_onError(errorMessage);
             }
         }
 
@@ -69,13 +77,21 @@ namespace UrlLib
                     {
                         if (result.has_error())
                         {
-                            m_onError();
+                            try
+                            {
+                                std::rethrow_exception(result.error());
+                            }
+                            catch (const std::exception& ex)
+                            {
+                                m_onError(ex.what());
+                            }
                         }
                     });
             }
-            catch (hresult_error const&)
+            catch (hresult_error const& ex)
             {
-                m_onError();
+                std::string errorMessage = winrt::to_string(ex.message());
+                m_onError(errorMessage);
             }
         }
 
@@ -89,9 +105,9 @@ namespace UrlLib
         {
             if (args.Code() != 1000)
             {
-                m_onError();
+                m_onError(winrt::to_string(args.Reason()));
             }
-            m_onClose();
+            m_onClose(args.Code(), winrt::to_string(args.Reason()));
         }
 
         void OnMessageReceived(Windows::Networking::Sockets::MessageWebSocket const& /* sender */, Windows::Networking::Sockets::MessageWebSocketMessageReceivedEventArgs const& args)
@@ -104,9 +120,10 @@ namespace UrlLib
 
                 m_onMessage(message);
             }
-            catch (winrt::hresult_error const& )
+            catch (winrt::hresult_error const& ex)
             {
-                m_onError();
+                std::string errorMessage = winrt::to_string(ex.message());
+                m_onError(errorMessage);
             }
         }