aboutsummaryrefslogtreecommitdiff
path: root/src/javascript
diff options
context:
space:
mode:
Diffstat (limited to 'src/javascript')
-rw-r--r--src/javascript/jsc/api/bun.zig56
-rw-r--r--src/javascript/jsc/api/server.zig12
-rw-r--r--src/javascript/jsc/bindings/ScriptExecutionContext.h5
-rw-r--r--src/javascript/jsc/bindings/headers-cpp.h2
-rw-r--r--src/javascript/jsc/bindings/headers.h2
-rw-r--r--src/javascript/jsc/bindings/webcore/JSAbortAlgorithm.cpp3
-rw-r--r--src/javascript/jsc/bindings/webcore/JSCallbackData.h3
-rw-r--r--src/javascript/jsc/bindings/webcore/JSErrorCallback.cpp2
-rw-r--r--src/javascript/jsc/bindings/webcore/WebSocket.cpp4
-rw-r--r--src/javascript/jsc/event_loop.zig7
-rw-r--r--src/javascript/jsc/javascript.zig13
11 files changed, 74 insertions, 35 deletions
diff --git a/src/javascript/jsc/api/bun.zig b/src/javascript/jsc/api/bun.zig
index b18ecf034..f062a5130 100644
--- a/src/javascript/jsc/api/bun.zig
+++ b/src/javascript/jsc/api/bun.zig
@@ -173,30 +173,40 @@ pub fn inspect(
false,
false,
);
+ buffered_writer.flush() catch {
+ return JSC.C.JSValueMakeUndefined(ctx);
+ };
- // when it's a small thing, rely on GC to manage the memory
- if (writer.context.pos < 2048 and array.list.items.len == 0) {
- var slice = writer.context.buffer[0..writer.context.pos];
- if (slice.len == 0) {
- return ZigString.Empty.toValue(ctx.ptr()).asObjectRef();
- }
-
- var zig_str = ZigString.init(slice).withEncoding();
- return zig_str.toValueGC(ctx.ptr()).asObjectRef();
- }
-
- // when it's a big thing, we will manage it
- {
- writer.context.flush() catch {};
- var slice = writer.context.context.toOwnedSlice();
-
- var zig_str = ZigString.init(slice).withEncoding();
- if (!zig_str.isUTF8()) {
- return zig_str.toExternalValue(ctx.ptr()).asObjectRef();
- } else {
- return zig_str.toValueGC(ctx.ptr()).asObjectRef();
- }
- }
+ // we are going to always clone to keep things simple for now
+ // the common case here will be stack-allocated, so it should be fine
+ var out = ZigString.init(array.toOwnedSliceLeaky()).withEncoding();
+ const ret = out.toValueGC(ctx);
+ array.deinit();
+ return ret.asObjectRef();
+
+ // // when it's a small thing, rely on GC to manage the memory
+ // if (writer.context.pos < 2048 and array.list.items.len == 0) {
+ // var slice = writer.context.buffer[0..writer.context.pos];
+ // if (slice.len == 0) {
+ // return ZigString.Empty.toValue(ctx.ptr()).asObjectRef();
+ // }
+
+ // var zig_str =
+ // return zig_str.toValueGC(ctx.ptr()).asObjectRef();
+ // }
+
+ // // when it's a big thing, we will manage it
+ // {
+ // writer.context.flush() catch {};
+ // var slice = writer.context.context.toOwnedSlice();
+
+ // var zig_str = ZigString.init(slice).withEncoding();
+ // if (!zig_str.isUTF8()) {
+ // return zig_str.toExternalValue(ctx.ptr()).asObjectRef();
+ // } else {
+ // return zig_str.toValueGC(ctx.ptr()).asObjectRef();
+ // }
+ // }
}
pub fn registerMacro(
diff --git a/src/javascript/jsc/api/server.zig b/src/javascript/jsc/api/server.zig
index 9a9628094..711329a95 100644
--- a/src/javascript/jsc/api/server.zig
+++ b/src/javascript/jsc/api/server.zig
@@ -1523,6 +1523,7 @@ pub fn NewServer(comptime ssl_enabled_: bool, comptime debug_mode_: bool) type {
if (this.listener) |listener| {
listener.close();
this.listener = null;
+ this.vm.disable_run_us_loop = false;
}
this.deinitIfWeCan();
@@ -1535,11 +1536,6 @@ pub fn NewServer(comptime ssl_enabled_: bool, comptime debug_mode_: bool) type {
}
}
- // if you run multiple servers simultaneously, this could break it
- if (this.vm.uws_event_loop != null and uws.Loop.get().? == this.vm.uws_event_loop.?) {
- this.vm.uws_event_loop = null;
- }
-
this.app.destroy();
const allocator = this.allocator;
allocator.destroy(this);
@@ -1646,6 +1642,12 @@ pub fn NewServer(comptime ssl_enabled_: bool, comptime debug_mode_: bool) type {
pub fn run(this: *ThisServer) void {
// this.app.addServerName(hostname_pattern: [*:0]const u8)
+
+ // we do not increment the reference count here
+ // uWS manages running the loop, so it is unnecessary
+ // this.vm.us_loop_reference_count +|= 1;
+ this.vm.disable_run_us_loop = true;
+
this.app.run();
}
diff --git a/src/javascript/jsc/bindings/ScriptExecutionContext.h b/src/javascript/jsc/bindings/ScriptExecutionContext.h
index 72837368e..227c57e6a 100644
--- a/src/javascript/jsc/bindings/ScriptExecutionContext.h
+++ b/src/javascript/jsc/bindings/ScriptExecutionContext.h
@@ -112,6 +112,11 @@ public:
reinterpret_cast<Zig::GlobalObject*>(m_globalObject)->queueTask(task);
} // Executes the task on context's thread asynchronously.
+ void postTask(EventLoopTask* task)
+ {
+ reinterpret_cast<Zig::GlobalObject*>(m_globalObject)->queueTask(task);
+ } // Executes the task on context's thread asynchronously.
+
template<typename... Arguments>
void postCrossThreadTask(Arguments&&... arguments)
{
diff --git a/src/javascript/jsc/bindings/headers-cpp.h b/src/javascript/jsc/bindings/headers-cpp.h
index ebf00db91..fa20f0d7d 100644
--- a/src/javascript/jsc/bindings/headers-cpp.h
+++ b/src/javascript/jsc/bindings/headers-cpp.h
@@ -1,4 +1,4 @@
-//-- AUTOGENERATED FILE -- 1655637924
+//-- AUTOGENERATED FILE -- 1655942279
// clang-format off
#pragma once
diff --git a/src/javascript/jsc/bindings/headers.h b/src/javascript/jsc/bindings/headers.h
index 925291a7d..69fd9698a 100644
--- a/src/javascript/jsc/bindings/headers.h
+++ b/src/javascript/jsc/bindings/headers.h
@@ -1,5 +1,5 @@
// clang-format off
-//-- AUTOGENERATED FILE -- 1655893003
+//-- AUTOGENERATED FILE -- 1655942279
#pragma once
#include <stddef.h>
diff --git a/src/javascript/jsc/bindings/webcore/JSAbortAlgorithm.cpp b/src/javascript/jsc/bindings/webcore/JSAbortAlgorithm.cpp
index 920b05ee5..81310bbd5 100644
--- a/src/javascript/jsc/bindings/webcore/JSAbortAlgorithm.cpp
+++ b/src/javascript/jsc/bindings/webcore/JSAbortAlgorithm.cpp
@@ -42,7 +42,8 @@ JSAbortAlgorithm::~JSAbortAlgorithm()
if (!context || context->isContextThread())
delete m_data;
else
- context->postTask(DeleteCallbackDataTask(m_data));
+
+ context->postTask(new DeleteCallbackDataTask(m_data));
#ifndef NDEBUG
m_data = nullptr;
#endif
diff --git a/src/javascript/jsc/bindings/webcore/JSCallbackData.h b/src/javascript/jsc/bindings/webcore/JSCallbackData.h
index 7ddd70ba7..ddfaf6e39 100644
--- a/src/javascript/jsc/bindings/webcore/JSCallbackData.h
+++ b/src/javascript/jsc/bindings/webcore/JSCallbackData.h
@@ -113,7 +113,8 @@ class DeleteCallbackDataTask : public EventLoopTask {
public:
template<typename CallbackDataType>
explicit DeleteCallbackDataTask(CallbackDataType* data)
- : EventLoopTask(EventLoopTask::CleanupTask, [data = std::unique_ptr<CallbackDataType>(data)](ScriptExecutionContext&) {
+ : EventLoopTask(EventLoopTask::CleanupTask, [data](ScriptExecutionContext&) mutable {
+ delete data;
})
{
}
diff --git a/src/javascript/jsc/bindings/webcore/JSErrorCallback.cpp b/src/javascript/jsc/bindings/webcore/JSErrorCallback.cpp
index 987d4d74a..de924d857 100644
--- a/src/javascript/jsc/bindings/webcore/JSErrorCallback.cpp
+++ b/src/javascript/jsc/bindings/webcore/JSErrorCallback.cpp
@@ -45,7 +45,7 @@ JSErrorCallback::~JSErrorCallback()
if (!context || context->isContextThread())
delete m_data;
else
- context->postTask(DeleteCallbackDataTask(m_data));
+ context->postTask(new DeleteCallbackDataTask(m_data));
#ifndef NDEBUG
m_data = nullptr;
#endif
diff --git a/src/javascript/jsc/bindings/webcore/WebSocket.cpp b/src/javascript/jsc/bindings/webcore/WebSocket.cpp
index 3fe881192..763668056 100644
--- a/src/javascript/jsc/bindings/webcore/WebSocket.cpp
+++ b/src/javascript/jsc/bindings/webcore/WebSocket.cpp
@@ -280,9 +280,9 @@ ExceptionOr<void> WebSocket::connect(const String& url, const Vector<String>& pr
return Exception { SyntaxError, makeString("Invalid url for WebSocket "_s, m_url.stringCenterEllipsizedToLength()) };
}
- bool is_secure = m_url.protocolIs("wss");
+ bool is_secure = m_url.protocolIs("wss"_s);
- if (!m_url.protocolIs("ws") && !is_secure) {
+ if (!m_url.protocolIs("ws"_s) && !is_secure) {
// context.addConsoleMessage(MessageSource::JS, MessageLevel::Error, );
m_state = CLOSED;
return Exception { SyntaxError, makeString("Wrong url scheme for WebSocket "_s, m_url.stringCenterEllipsizedToLength()) };
diff --git a/src/javascript/jsc/event_loop.zig b/src/javascript/jsc/event_loop.zig
index 2623551f6..0a32732d0 100644
--- a/src/javascript/jsc/event_loop.zig
+++ b/src/javascript/jsc/event_loop.zig
@@ -407,6 +407,7 @@ pub const EventLoop = struct {
// TODO: fix this technical debt
pub fn tick(this: *EventLoop) void {
var poller = &this.virtual_machine.poller;
+ var ctx = this.virtual_machine;
while (true) {
this.tickConcurrent();
@@ -421,6 +422,12 @@ pub const EventLoop = struct {
}
this.global.vm().releaseWeakRefs();
+
+ if (!ctx.disable_run_us_loop and ctx.us_loop_reference_count > 0 and !ctx.is_us_loop_entered) {
+ ctx.is_us_loop_entered = true;
+ ctx.enterUWSLoop();
+ ctx.is_us_loop_entered = false;
+ }
}
// TODO: fix this technical debt
diff --git a/src/javascript/jsc/javascript.zig b/src/javascript/jsc/javascript.zig
index f775863e0..a5c9f1e01 100644
--- a/src/javascript/jsc/javascript.zig
+++ b/src/javascript/jsc/javascript.zig
@@ -332,6 +332,9 @@ pub const VirtualMachine = struct {
rare_data: ?*JSC.RareData = null,
poller: JSC.Poller = JSC.Poller{},
+ us_loop_reference_count: usize = 0,
+ disable_run_us_loop: bool = false,
+ is_us_loop_entered: bool = false,
pub fn io(this: *VirtualMachine) *IO {
if (this.io_ == null) {
@@ -361,6 +364,16 @@ pub const VirtualMachine = struct {
return this.event_loop;
}
+ pub fn prepareLoop(this: *VirtualMachine) void {
+ var loop = this.uws_event_loop.?;
+ _ = loop.addPostHandler(*JSC.EventLoop, this.eventLoop(), JSC.EventLoop.tick);
+ }
+
+ pub fn enterUWSLoop(this: *VirtualMachine) void {
+ var loop = this.uws_event_loop.?;
+ loop.run();
+ }
+
pub fn onExit(this: *VirtualMachine) void {
var rare_data = this.rare_data orelse return;
var hook = rare_data.cleanup_hook orelse return;
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-28 16:24:10 +0000