aboutsummaryrefslogtreecommitdiff
path: root/src/javascript/jsc/bindings/ScriptExecutionContext.cpp
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> 2022-06-17 20:29:56 -0700
committerGravatar Jarred Sumner <jarred@jarredsumner.com> 2022-06-22 06:56:47 -0700
commit71025c8bcc68929cea2260d92de03e20a3c898d2 (patch)
tree8dd26d232c82e986a2e775abfb89178b02359596 /src/javascript/jsc/bindings/ScriptExecutionContext.cpp
parent89f08aae2736182bc681446cab631014f51978a7 (diff)
downloadbun-71025c8bcc68929cea2260d92de03e20a3c898d2.tar.gz
bun-71025c8bcc68929cea2260d92de03e20a3c898d2.tar.zst
bun-71025c8bcc68929cea2260d92de03e20a3c898d2.zip
Fix most of the errors
Diffstat (limited to 'src/javascript/jsc/bindings/ScriptExecutionContext.cpp')
-rw-r--r--src/javascript/jsc/bindings/ScriptExecutionContext.cpp30
1 files changed, 16 insertions, 14 deletions
diff --git a/src/javascript/jsc/bindings/ScriptExecutionContext.cpp b/src/javascript/jsc/bindings/ScriptExecutionContext.cpp
index 4a3b07132..17bc266dc 100644
--- a/src/javascript/jsc/bindings/ScriptExecutionContext.cpp
+++ b/src/javascript/jsc/bindings/ScriptExecutionContext.cpp
@@ -1,23 +1,24 @@
#include "ScriptExecutionContext.h"
-#include <uws/uSockets/src/libusockets.h>
-#include <uws/src/Loop.h>
+#include <uws/src/App.h>
+#include "WebSocketStream.h"
extern "C" void Bun__startLoop(us_loop_t* loop);
namespace WebCore {
template<bool isSSL>
-us_socket_context_t* webSocketContext()
+us_socket_context_t* ScriptExecutionContext::webSocketContext()
{
if constexpr (isSSL) {
if (!m_ssl_client_websockets_ctx) {
us_loop_t* loop = (us_loop_t*)uWS::Loop::get();
us_socket_context_options_t opts;
- memset(&opts, 0, sizeof(us_socket_context_t));
- this->m_ssl_client_websockets_ctx = us_create_socket_context(1, loop, sizeof(*ScriptExecutionContext), opts);
- *us_socket_context_ext(m_ssl_client_websockets_ctx) = this;
- WebSocketStream::registerHTTPContext(this, m_ssl_client_websockets_ctx, loop);
+ memset(&opts, 0, sizeof(us_socket_context_options_t));
+ this->m_ssl_client_websockets_ctx = us_create_socket_context(1, loop, sizeof(size_t), opts);
+ void** ptr = reinterpret_cast<void**>(us_socket_context_ext(1, m_ssl_client_websockets_ctx));
+ *ptr = this;
+ registerHTTPContextForWebSocket<isSSL, false>(this, m_ssl_client_websockets_ctx);
}
return m_ssl_client_websockets_ctx;
@@ -25,10 +26,11 @@ us_socket_context_t* webSocketContext()
if (!m_client_websockets_ctx) {
us_loop_t* loop = (us_loop_t*)uWS::Loop::get();
us_socket_context_options_t opts;
- memset(&opts, 0, sizeof(us_socket_context_t));
- this->m_client_websockets_ctx = us_create_socket_context(0, loop, sizeof(*ScriptExecutionContext), opts);
- *us_socket_context_ext(m_client_websockets_ctx) = this;
- SecureWebSocketStream::registerHTTPContext(this, m_client_websockets_ctx, loop);
+ memset(&opts, 0, sizeof(us_socket_context_options_t));
+ this->m_client_websockets_ctx = us_create_socket_context(0, loop, sizeof(size_t), opts);
+ void** ptr = reinterpret_cast<void**>(us_socket_context_ext(0, m_client_websockets_ctx));
+ *ptr = this;
+ registerHTTPContextForWebSocket<isSSL, false>(this, m_client_websockets_ctx);
}
return m_client_websockets_ctx;
@@ -36,13 +38,13 @@ us_socket_context_t* webSocketContext()
}
template<bool isSSL, bool isServer>
-uWS::WebSocketContext<isSSL, isServer, ScriptExecutionContext*>*
+uWS::WebSocketContext<isSSL, isServer, ScriptExecutionContext*>* ScriptExecutionContext::connnectedWebSocketContext()
{
if constexpr (isSSL) {
if (!m_connected_ssl_client_websockets_ctx) {
// should be the parent
RELEASE_ASSERT(m_ssl_client_websockets_ctx);
- m_connected_client_websockets_ctx = SecureWebSocketStream::registerClientContext(this, webSocketContext<isSSL>(), loop);
+ m_connected_client_websockets_ctx = registerWebSocketClientContext(this, webSocketContext<isSSL>());
}
return m_connected_ssl_client_websockets_ctx;
@@ -50,7 +52,7 @@ uWS::WebSocketContext<isSSL, isServer, ScriptExecutionContext*>*
if (!m_connected_client_websockets_ctx) {
// should be the parent
RELEASE_ASSERT(m_client_websockets_ctx);
- m_connected_client_websockets_ctx = WebSocketStream::registerClientContext(this, webSocketContext<isSSL>(), loop);
+ m_connected_client_websockets_ctx = registerWebSocketClientContext(this, webSocketContext<isSSL>());
}
return m_connected_client_websockets_ctx;