node:worker_threads: improve error messages, support environmentData, emit worker event (#18768)

Co-authored-by: 190n <[email protected]>
Co-authored-by: Jarred Sumner <[email protected]>

Author: 3 people

src/Global.zig

@@ -225,10 +225,6 @@ pub export fn Bun__onExit() void {
     std.mem.doNotOptimizeAway(&Bun__atexit);
 
     Output.Source.Stdio.restore();
-
-    if (Environment.isWindows) {
-        bun.windows.libuv.uv_library_shutdown();
-    }
 }
 
 comptime {

src/bun.js/api/bun/udp_socket.zig

@@ -43,7 +43,7 @@ fn onDrain(socket: *uws.udp.Socket) callconv(.C) void {
     event_loop.enter();
     defer event_loop.exit();
     _ = callback.call(this.globalThis, this.thisValue, &.{this.thisValue}) catch |err| {
-        _ = this.callErrorHandler(.zero, &.{this.globalThis.takeException(err)});
+        this.callErrorHandler(.zero, this.globalThis.takeException(err));
     };
 }
 
@@ -111,7 +111,7 @@ fn onData(socket: *uws.udp.Socket, buf: *uws.udp.PacketBuffer, packets: c_int) c
             JSC.jsNumber(port),
             hostname_string.transferToJS(globalThis),
         }) catch |err| {
-            _ = udpSocket.callErrorHandler(.zero, &.{udpSocket.globalThis.takeException(err)});
+            udpSocket.callErrorHandler(.zero, udpSocket.globalThis.takeException(err));
         };
     }
 }
@@ -375,22 +375,21 @@ pub const UDPSocket = struct {
     pub fn callErrorHandler(
         this: *This,
         thisValue: JSValue,
-        err: []const JSValue,
-    ) bool {
+        err: JSValue,
+    ) void {
         const callback = this.config.on_error;
         const globalThis = this.globalThis;
         const vm = globalThis.bunVM();
 
+        if (err.isTerminationException(vm.jsc)) {
+            return;
+        }
         if (callback == .zero) {
-            if (err.len > 0)
-                _ = vm.uncaughtException(globalThis, err[0], false);
-
-            return false;
+            _ = vm.uncaughtException(globalThis, err, false);
+            return;
         }
 
-        _ = callback.call(globalThis, thisValue, err) catch |e| globalThis.reportActiveExceptionAsUnhandled(e);
-
-        return true;
+        _ = callback.call(globalThis, thisValue, &.{err}) catch |e| globalThis.reportActiveExceptionAsUnhandled(e);
     }
 
     pub fn setBroadcast(this: *This, globalThis: *JSGlobalObject, callframe: *CallFrame) bun.JSError!JSValue {

src/bun.js/bindings/BunInjectedScriptHost.cpp

@@ -54,12 +54,14 @@ static JSObject* objectForEventTargetListeners(VM& vm, JSGlobalObject* exec, Eve
     auto* scriptExecutionContext = eventTarget->scriptExecutionContext();
     if (!scriptExecutionContext)
         return nullptr;
+    auto scope = DECLARE_THROW_SCOPE(vm);
 
     JSObject* listeners = nullptr;
 
     for (auto& eventType : eventTarget->eventTypes()) {
         unsigned listenersForEventIndex = 0;
         auto* listenersForEvent = constructEmptyArray(exec, nullptr);
+        RETURN_IF_EXCEPTION(scope, {});
 
         for (auto& eventListener : eventTarget->eventListeners(eventType)) {
             if (!is<JSEventListener>(eventListener->callback()))
@@ -74,6 +76,7 @@ static JSObject* objectForEventTargetListeners(VM& vm, JSGlobalObject* exec, Eve
                 continue;
 
             auto* propertiesForListener = constructEmptyObject(exec);
+            RETURN_IF_EXCEPTION(scope, {});
             propertiesForListener->putDirect(vm, Identifier::fromString(vm, "callback"_s), jsFunction);
             propertiesForListener->putDirect(vm, Identifier::fromString(vm, "capture"_s), jsBoolean(eventListener->useCapture()));
             propertiesForListener->putDirect(vm, Identifier::fromString(vm, "passive"_s), jsBoolean(eventListener->isPassive()));
@@ -82,8 +85,10 @@ static JSObject* objectForEventTargetListeners(VM& vm, JSGlobalObject* exec, Eve
         }
 
         if (listenersForEventIndex) {
-            if (!listeners)
+            if (!listeners) {
                 listeners = constructEmptyObject(exec);
+                RETURN_IF_EXCEPTION(scope, {});
+            }
             listeners->putDirect(vm, Identifier::fromString(vm, eventType), listenersForEvent);
         }
     }
@@ -121,6 +126,7 @@ JSValue BunInjectedScriptHost::getInternalProperties(VM& vm, JSGlobalObject* exe
     if (auto* worker = JSWorker::toWrapped(vm, value)) {
         unsigned index = 0;
         auto* array = constructEmptyArray(exec, nullptr);
+        RETURN_IF_EXCEPTION(scope, {});
 
         String name = worker->name();
         if (!name.isEmpty())
@@ -142,13 +148,15 @@ JSValue BunInjectedScriptHost::getInternalProperties(VM& vm, JSGlobalObject* exe
         if (type == JSDOMWrapperType) {
             if (auto* headers = jsDynamicCast<JSFetchHeaders*>(value)) {
                 auto* array = constructEmptyArray(exec, nullptr);
+                RETURN_IF_EXCEPTION(scope, {});
                 constructDataProperties(vm, exec, array, WebCore::getInternalProperties(vm, exec, headers));
                 RETURN_IF_EXCEPTION(scope, {});
                 return array;
             }
 
             if (auto* formData = jsDynamicCast<JSDOMFormData*>(value)) {
                 auto* array = constructEmptyArray(exec, nullptr);
+                RETURN_IF_EXCEPTION(scope, {});
                 constructDataProperties(vm, exec, array, WebCore::getInternalProperties(vm, exec, formData));
                 RETURN_IF_EXCEPTION(scope, {});
                 return array;
@@ -157,20 +165,23 @@ JSValue BunInjectedScriptHost::getInternalProperties(VM& vm, JSGlobalObject* exe
         } else if (type == JSAsJSONType) {
             if (auto* params = jsDynamicCast<JSURLSearchParams*>(value)) {
                 auto* array = constructEmptyArray(exec, nullptr);
+                RETURN_IF_EXCEPTION(scope, {});
                 constructDataProperties(vm, exec, array, WebCore::getInternalProperties(vm, exec, params));
                 RETURN_IF_EXCEPTION(scope, {});
                 return array;
             }
 
             if (auto* cookie = jsDynamicCast<JSCookie*>(value)) {
                 auto* array = constructEmptyArray(exec, nullptr);
+                RETURN_IF_EXCEPTION(scope, {});
                 constructDataProperties(vm, exec, array, WebCore::getInternalProperties(vm, exec, cookie));
                 RETURN_IF_EXCEPTION(scope, {});
                 return array;
             }
 
             if (auto* cookieMap = jsDynamicCast<JSCookieMap*>(value)) {
                 auto* array = constructEmptyArray(exec, nullptr);
+                RETURN_IF_EXCEPTION(scope, {});
                 constructDataProperties(vm, exec, array, WebCore::getInternalProperties(vm, exec, cookieMap));
                 RETURN_IF_EXCEPTION(scope, {});
                 return array;
@@ -181,11 +192,13 @@ JSValue BunInjectedScriptHost::getInternalProperties(VM& vm, JSGlobalObject* exe
     if (auto* eventTarget = JSEventTarget::toWrapped(vm, value)) {
         unsigned index = 0;
         auto* array = constructEmptyArray(exec, nullptr);
+        RETURN_IF_EXCEPTION(scope, {});
 
-        if (auto* listeners = objectForEventTargetListeners(vm, exec, eventTarget))
+        if (auto* listeners = objectForEventTargetListeners(vm, exec, eventTarget)) {
             array->putDirectIndex(exec, index++, constructInternalProperty(vm, exec, "listeners"_s, listeners));
+            RETURN_IF_EXCEPTION(scope, {});
+        }
 
-        RETURN_IF_EXCEPTION(scope, {});
         return array;
     }