Make status code available on connect failures (#865)

* Status codes from websocket connect

* Add null check

* Add websocketpp loggers (#864)

* websocketpp logging

* kick builds

---------

Co-authored-by: Jason Sandlin <[email protected]>

Author: dawesten-msft

Build/libHttpClient.Android/src/main/java/com/xbox/httpclient/HttpClientWebSocket.java

@@ -55,7 +55,7 @@ public void onOpen(WebSocket webSocket, Response response) {
 
     @Override
     public void onFailure(WebSocket webSocket, Throwable t, Response response) {
-        onFailure();
+        onFailure(response != null ? response.code() : -1);
     }
 
     @Override
@@ -84,7 +84,7 @@ public void onMessage(WebSocket webSocket, okio.ByteString bytes) {
     }
 
     public native void onOpen();
-    public native void onFailure();
+    public native void onFailure(int statusCode);
     public native void onClose(int code);
     public native void onMessage(String text);
     public native void onBinaryMessage(ByteBuffer data);

Source/HTTP/WinHttp/winhttp_connection.cpp

@@ -1604,17 +1604,30 @@ void WinHttpConnection::callback_websocket_status_headers_available(
     auto winHttpConnection = winHttpContext->winHttpConnection;
     winHttpConnection->m_lock.lock();
 
-    HC_TRACE_INFORMATION(HTTPCLIENT, "HCHttpCallPerform [ID %llu] [TID %ul] Websocket WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE", TO_ULL(HCHttpCallGetId(winHttpConnection->m_call)), GetCurrentThreadId());
+    HC_TRACE_INFORMATION(WEBSOCKET, "HCHttpCallPerform [ID %llu] [TID %ul] Websocket WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE", TO_ULL(HCHttpCallGetId(winHttpConnection->m_call)), GetCurrentThreadId());
+
+    // Check HTTP status code returned by the server and behave accordingly.
+    const uint32_t statusCode = parse_status_code(winHttpConnection->m_call, hRequestHandle, winHttpConnection.get());
+
+    if (statusCode == 0) // parse_statusCode failed and already called WinHttpConnection::complete_task, simply return
+    {
+        return;
+    }
+    else if (statusCode != HTTP_STATUS_SWITCH_PROTOCOLS)
+    {
+        HC_TRACE_ERROR(WEBSOCKET, "HCHttpCallPerform [ID %llu] [TID %ul] Upgrade request status code %ul", TO_ULL(HCHttpCallGetId(winHttpConnection->m_call)), GetCurrentThreadId(), statusCode);
+        winHttpConnection->m_lock.unlock();
+        winHttpConnection->complete_task(MAKE_HRESULT(SEVERITY_ERROR, FACILITY_HTTP, statusCode), S_OK);
+        return;
+    }
 
     assert(winHttpConnection->m_winHttpWebSocketExports.completeUpgrade);
 
-    // Application should check what is the HTTP status code returned by the server and behave accordingly.
-    // WinHttpWebSocketCompleteUpgrade will fail if the HTTP status code is different than 101.
     winHttpConnection->m_hRequest = winHttpConnection->m_winHttpWebSocketExports.completeUpgrade(hRequestHandle, (DWORD_PTR)(winHttpContext));
     if (winHttpConnection->m_hRequest == NULL)
     {
         DWORD dwError = GetLastError();
-        HC_TRACE_ERROR(HTTPCLIENT, "HCHttpCallPerform [ID %llu] [TID %ul] WinHttpWebSocketCompleteUpgrade errorcode %d", TO_ULL(HCHttpCallGetId(winHttpConnection->m_call)), GetCurrentThreadId(), dwError);
+        HC_TRACE_ERROR(WEBSOCKET, "HCHttpCallPerform [ID %llu] [TID %ul] WinHttpWebSocketCompleteUpgrade errorcode %d", TO_ULL(HCHttpCallGetId(winHttpConnection->m_call)), GetCurrentThreadId(), dwError);
         winHttpConnection->m_lock.unlock();
         winHttpConnection->complete_task(E_FAIL, HRESULT_FROM_WIN32(dwError));
         return;
@@ -1625,7 +1638,7 @@ void WinHttpConnection::callback_websocket_status_headers_available(
     if (!status)
     {
         DWORD dwError = GetLastError();
-        HC_TRACE_ERROR(HTTPCLIENT, "WinHttpConnection [ID %llu] [TID %ul] WinHttpSetOption errorcode %d", TO_ULL(HCHttpCallGetId(winHttpConnection->m_call)), GetCurrentThreadId(), dwError);
+        HC_TRACE_ERROR(WEBSOCKET, "WinHttpConnection [ID %llu] [TID %ul] WinHttpSetOption errorcode %d", TO_ULL(HCHttpCallGetId(winHttpConnection->m_call)), GetCurrentThreadId(), dwError);
     }
 
     winHttpConnection->m_state = ConnectionState::WebSocketConnected;

Source/WebSocket/Android/AndroidWebSocketProvider.cpp

@@ -11,7 +11,7 @@
 extern "C"
 {
     void JNICALL Java_com_xbox_httpclient_HttpClientWebSocket_onOpen(JNIEnv*, jobject);
-    void JNICALL Java_com_xbox_httpclient_HttpClientWebSocket_onFailure(JNIEnv*, jobject);
+    void JNICALL Java_com_xbox_httpclient_HttpClientWebSocket_onFailure(JNIEnv*, jobject, jint);
     void JNICALL Java_com_xbox_httpclient_HttpClientWebSocket_onClose(JNIEnv*, jobject, jint);
     void JNICALL Java_com_xbox_httpclient_HttpClientWebSocket_onMessage(JNIEnv*, jobject, jstring);
     void JNICALL Java_com_xbox_httpclient_HttpClientWebSocket_onBinaryMessage(JNIEnv*, jobject, jobject);
@@ -369,7 +369,7 @@ struct HttpClientWebSocket
 struct okhttp_websocket_impl : hc_websocket_impl, std::enable_shared_from_this<okhttp_websocket_impl>
 {
     friend void JNICALL ::Java_com_xbox_httpclient_HttpClientWebSocket_onOpen(JNIEnv*, jobject);
-    friend void JNICALL ::Java_com_xbox_httpclient_HttpClientWebSocket_onFailure(JNIEnv*, jobject);
+    friend void JNICALL ::Java_com_xbox_httpclient_HttpClientWebSocket_onFailure(JNIEnv*, jobject, jint);
     friend void JNICALL ::Java_com_xbox_httpclient_HttpClientWebSocket_onClose(JNIEnv*, jobject, jint);
     friend void JNICALL ::Java_com_xbox_httpclient_HttpClientWebSocket_onMessage(JNIEnv*, jobject, jstring);
     friend void JNICALL ::Java_com_xbox_httpclient_HttpClientWebSocket_onBinaryMessage(JNIEnv*, jobject, jobject);
@@ -451,7 +451,14 @@ struct okhttp_websocket_impl : hc_websocket_impl, std::enable_shared_from_this<o
 
                             WebSocketCompletionResult& result = context->completionResult;
                             result.websocket = sharedThis->GetHandle();
-                            result.errorCode = E_FAIL;
+                            if (sharedThis->m_connectStatusCode != -1)
+                            {
+                                result.errorCode = MAKE_HRESULT(1, FACILITY_HTTP, sharedThis->m_connectStatusCode);
+                            }
+                            else
+                            {
+                                result.errorCode = E_FAIL;
+                            }
                             XAsyncComplete(data->async, S_OK, sizeof(WebSocketCompletionResult));
                             return S_OK;
                         }
@@ -746,15 +753,17 @@ struct okhttp_websocket_impl : hc_websocket_impl, std::enable_shared_from_this<o
         if (m_socketState == State::Connecting)
         {
             m_socketState = State::ConnectSucceeded;
+            m_connectStatusCode = 101;
         }
     }
 
-    void OnFailure(UniqueLock lock)
+    void OnFailure(UniqueLock lock, jint statusCode)
     {
         switch (m_socketState)
         {
             case State::Connecting:
                 m_socketState = State::ConnectFailed;
+                m_connectStatusCode = statusCode;
                 break;
             case State::Connected:
                 OnClose(std::move(lock), HCWebSocketCloseStatus::AbnormalClose);
@@ -830,6 +839,7 @@ struct okhttp_websocket_impl : hc_websocket_impl, std::enable_shared_from_this<o
     }
 private:
     State m_socketState = State::Disconnected;
+    int m_connectStatusCode = -1;
     mutable std::mutex m_socketMutex;
 
     const HCWebsocketHandle m_handle;
@@ -945,7 +955,7 @@ Java_com_xbox_httpclient_HttpClientWebSocket_onOpen(JNIEnv *env, jobject thiz)
 }
 
 JNIEXPORT void JNICALL
-Java_com_xbox_httpclient_HttpClientWebSocket_onFailure(JNIEnv *env, jobject thiz)
+Java_com_xbox_httpclient_HttpClientWebSocket_onFailure(JNIEnv *env, jobject thiz, jint statusCode)
 {
     using namespace xbox::httpclient;
 
@@ -955,7 +965,7 @@ Java_com_xbox_httpclient_HttpClientWebSocket_onFailure(JNIEnv *env, jobject thiz
         return;
     }
 
-    owner->OnFailure(owner->Lock());
+    owner->OnFailure(owner->Lock(), statusCode);
 }
 
 JNIEXPORT void JNICALL