Merge remote-tracking branch 'origin/main' into georgijs/cpwin

.vscode/c_cpp_properties.json

@@ -3,6 +3,7 @@
     {
       "name": "Debug",
       "forcedInclude": ["${workspaceFolder}/src/bun.js/bindings/root.h"],
+      "compileCommands": "${workspaceFolder}/build/compile_commands.json",
       "includePath": [
         "${workspaceFolder}/build/bun-webkit/include",
         "${workspaceFolder}/build/codegen",

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.22)
 cmake_policy(SET CMP0091 NEW)
 cmake_policy(SET CMP0067 NEW)
 
-set(Bun_VERSION "1.1.0")
+set(Bun_VERSION "1.0.26")
 set(WEBKIT_TAG c3712c13dcdc091cfe4c7cb8f2c1fd16472e6f92)
 
 set(BUN_WORKDIR "${CMAKE_CURRENT_BINARY_DIR}")
@@ -26,6 +26,9 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(DEBUG ON)
     set(DEFAULT_ZIG_OPTIMIZE "Debug")
     set(bun "bun-debug")
+
+    # COMPILE_COMMANDS
+    set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
     set(DEBUG OFF)
     set(DEFAULT_ZIG_OPTIMIZE "ReleaseFast")

src/bun.js/api/BunObject.zig

@@ -1042,14 +1042,30 @@ pub fn openInEditor(
 }
 
 pub fn getPublicPath(to: string, origin: URL, comptime Writer: type, writer: Writer) void {
-    return getPublicPathWithAssetPrefix(to, VirtualMachine.get().bundler.fs.top_level_dir, origin, VirtualMachine.get().bundler.options.routes.asset_prefix_path, comptime Writer, writer);
+    return getPublicPathWithAssetPrefix(
+        to,
+        VirtualMachine.get().bundler.fs.top_level_dir,
+        origin,
+        VirtualMachine.get().bundler.options.routes.asset_prefix_path,
+        comptime Writer,
+        writer,
+        .loose,
+    );
 }
 
-pub fn getPublicPathWithAssetPrefix(to: string, dir: string, origin: URL, asset_prefix: string, comptime Writer: type, writer: Writer) void {
+pub fn getPublicPathWithAssetPrefix(
+    to: string,
+    dir: string,
+    origin: URL,
+    asset_prefix: string,
+    comptime Writer: type,
+    writer: Writer,
+    comptime platform: bun.path.Platform,
+) void {
     const relative_path = if (strings.hasPrefix(to, dir))
         strings.withoutTrailingSlash(to[dir.len..])
     else
-        VirtualMachine.get().bundler.fs.relative(dir, to);
+        VirtualMachine.get().bundler.fs.relativePlatform(dir, to, platform);
     if (origin.isAbsolute()) {
         if (strings.hasPrefix(relative_path, "..") or strings.hasPrefix(relative_path, "./")) {
             writer.writeAll(origin.origin) catch return;

src/bun.js/api/bun/dns_resolver.zig

@@ -1935,8 +1935,8 @@ pub const DNSResolver = struct {
         poll: *Async.FilePoll,
     ) void {
         var vm = this.vm;
-        defer vm.drainMicrotasks();
-
+        vm.eventLoop().enter();
+        defer vm.eventLoop().exit();
         var channel = this.channel orelse {
             _ = this.polls.orderedRemove(poll.fd.int());
             poll.deinit();

src/bun.js/api/bun/h2_frame_parser.zig

@@ -433,27 +433,7 @@ const Handlers = struct {
             return false;
         }
 
-        const result = callback.callWithThis(this.globalObject, thisValue, data);
-        if (result.isAnyError()) {
-            this.vm.onUnhandledError(this.globalObject, result);
-        }
-
-        return true;
-    }
-
-    pub fn callErrorHandler(this: *Handlers, thisValue: JSValue, err: []const JSValue) bool {
-        const onError = this.onError;
-        if (onError == .zero) {
-            if (err.len > 0)
-                this.vm.onUnhandledError(this.globalObject, err[0]);
-
-            return false;
-        }
-
-        const result = onError.callWithThis(this.globalObject, thisValue, err);
-        if (result.isAnyError()) {
-            this.vm.onUnhandledError(this.globalObject, result);
-        }
+        this.vm.eventLoop().runCallback(callback, this.globalObject, thisValue, data);
 
         return true;
     }

src/bun.js/api/bun/lshpack.translated.zig

@@ -154,7 +154,7 @@ pub const enum_lsxpack_flag = c_uint;
 // /// limitation: we currently does not support total header size > 64KB.
 pub const struct_lsxpack_header = extern struct {
     /// the buffer for headers
-    buf: [*]u8 = undefined,
+    buf: ?[*]u8 = null,
     /// hash value for name
     name_hash: __uint32_t = 0,
     /// hash value for name + value
@@ -205,11 +205,11 @@ pub fn lsxpack_header_prepare_decode(arg_hdr: *lsxpack_header_t, arg_out: [*c]u8
 }
 
 pub fn lsxpack_header_get_name(hdr: *lsxpack_header_t) []const u8 {
-    if (hdr.name_len != 0) return hdr.buf[@as(usize, @intCast(hdr.name_offset)) .. @as(usize, @intCast(hdr.name_offset)) + hdr.name_len];
+    if (hdr.name_len != 0) return hdr.buf.?[@as(usize, @intCast(hdr.name_offset)) .. @as(usize, @intCast(hdr.name_offset)) + hdr.name_len];
     return "";
 }
 pub fn lsxpack_header_get_value(hdr: *lsxpack_header_t) []const u8 {
-    if (hdr.val_len != 0) return hdr.buf[@as(usize, @intCast(hdr.val_offset)) .. @as(usize, @intCast(hdr.val_offset)) + hdr.val_len];
+    if (hdr.val_len != 0) return hdr.buf.?[@as(usize, @intCast(hdr.val_offset)) .. @as(usize, @intCast(hdr.val_offset)) + hdr.val_len];
     return "";
 }
 pub fn lsxpack_header_get_dec_size(hdr: ?*const lsxpack_header_t) callconv(.C) usize {

src/bun.js/api/bun/socket.zig

@@ -175,13 +175,14 @@ const Handlers = struct {
 
         pub fn exit(this: *Scope, ssl: bool, wrapped: WrappedType) void {
             var vm = this.handlers.vm;
-            defer vm.drainMicrotasks();
+            defer vm.eventLoop().exit();
             this.handlers.markInactive(ssl, this.socket_context, wrapped);
         }
     };
 
     pub fn enter(this: *Handlers, context: ?*uws.SocketContext) Scope {
         this.markActive();
+        this.vm.eventLoop().enter();
         return .{
             .handlers = this,
             .socket_context = context,
@@ -1202,7 +1203,8 @@ fn NewSocket(comptime ssl: bool) type {
             const callback = handlers.onWritable;
             if (callback == .zero) return;
             var vm = handlers.vm;
-            defer vm.drainMicrotasks();
+            vm.eventLoop().enter();
+            defer vm.eventLoop().exit();
 
             const globalObject = handlers.globalObject;
             const this_value = this.getThisValue(globalObject);
@@ -1249,12 +1251,11 @@ fn NewSocket(comptime ssl: bool) type {
             defer this.markInactive();
 
             const handlers = this.handlers;
-            var vm = handlers.vm;
+            const vm = handlers.vm;
             this.poll_ref.unrefOnNextTick(vm);
 
             const callback = handlers.onConnectError;
             const globalObject = handlers.globalObject;
-            defer vm.drainMicrotasks();
             const err = JSC.SystemError{
                 .errno = errno,
                 .message = bun.String.static("Failed to connect"),
@@ -1266,6 +1267,10 @@ fn NewSocket(comptime ssl: bool) type {
                 // .code = bun.String.static(@tagName(bun.sys.getErrno(errno))),
                 // .code = bun.String.static(@tagName(@as(bun.C.E, @enumFromInt(errno)))),
             };
+            vm.eventLoop().enter();
+            defer {
+                vm.eventLoop().exit();
+            }
 
             if (callback == .zero) {
                 if (handlers.promise.trySwap()) |promise| {
@@ -1388,6 +1393,9 @@ fn NewSocket(comptime ssl: bool) type {
             } else {
                 if (callback == .zero) return;
             }
+            const vm = handlers.vm;
+            vm.eventLoop().enter();
+            defer vm.eventLoop().exit();
             const result = callback.callWithThis(globalObject, this_value, &[_]JSValue{
                 this_value,
             });

src/bun.js/api/bun/subprocess.zig

@@ -2796,10 +2796,9 @@ pub const Subprocess = struct {
         var vm = this.globalThis.bunVM();
         const is_sync = this.flags.is_sync;
 
-        defer {
-            if (!is_sync)
-                vm.drainMicrotasks();
-        }
+        if (!is_sync) vm.eventLoop().enter();
+        defer if (!is_sync) vm.eventLoop().exit();
+
         this.wait(false);
     }
 
@@ -2965,15 +2964,12 @@ pub const Subprocess = struct {
                 waitpid_value,
             };
 
-            const result = callback.callWithThis(
+            globalThis.bunVM().eventLoop().runCallback(
+                callback,
                 globalThis,
                 this_value,
                 &args,
             );
-
-            if (result.isAnyError()) {
-                globalThis.bunVM().onUnhandledError(globalThis, result);
-            }
         }
     }
 
@@ -3386,15 +3382,12 @@ pub const Subprocess = struct {
             .data => |data| {
                 IPC.log("Received IPC message from child", .{});
                 if (this.ipc_callback.get()) |cb| {
-                    const result = cb.callWithThis(
+                    this.globalThis.bunVM().eventLoop().runCallback(
+                        cb,
                         this.globalThis,
                         this.this_jsvalue,
                         &[_]JSValue{ data, this.this_jsvalue },
                     );
-                    data.ensureStillAlive();
-                    if (result.isAnyError()) {
-                        this.globalThis.bunVM().onUnhandledError(this.globalThis, result);
-                    }
                 }
             },
         }

src/bun.js/api/filesystem_router.zig

@@ -249,6 +249,7 @@ pub const FileSystemRouter = struct {
         };
 
         this.arena.deinit();
+        this.router.deinit();
         globalThis.allocator().destroy(this.arena);
 
         this.arena = arena;
@@ -380,6 +381,7 @@ pub const FileSystemRouter = struct {
             dir.deref();
         }
 
+        this.router.deinit();
         this.arena.deinit();
     }
 };
@@ -586,6 +588,7 @@ pub const MatchedRoute = struct {
             if (this.asset_prefix) |prefix| prefix.slice() else "",
             @TypeOf(&writer),
             &writer,
+            .posix,
         );
         return ZigString.init(buf[0..writer.context.pos])
             .withEncoding()

src/bun.js/api/server.zig

@@ -3205,7 +3205,8 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                         if (readable.ptr == .Bytes) {
                             std.debug.assert(this.request_body_buf.items.len == 0);
                             var vm = this.server.vm;
-                            defer vm.drainMicrotasks();
+                            vm.eventLoop().enter();
+                            defer vm.eventLoop().exit();
 
                             if (!last) {
                                 readable.ptr.Bytes.onData(
@@ -3750,6 +3751,9 @@ pub const ServerWebSocket = struct {
         if (onOpenHandler.isEmptyOrUndefinedOrNull()) return;
         const this_value = this.getThisValue();
         var args = [_]JSValue{this_value};
+        const loop = globalObject.bunVM().eventLoop();
+        loop.enter();
+        defer loop.exit();
 
         var corker = Corker{
             .args = &args,
@@ -3810,7 +3814,9 @@ pub const ServerWebSocket = struct {
         if (onMessageHandler.isEmptyOrUndefinedOrNull()) return;
         var globalObject = this.handler.globalObject;
         // This is the start of a task.
-        defer globalObject.bunVM().drainMicrotasks();
+        const loop = globalObject.bunVM().eventLoop();
+        loop.enter();
+        defer loop.exit();
 
         const arguments = [_]JSValue{
             this.getThisValue(),
@@ -3893,7 +3899,9 @@ pub const ServerWebSocket = struct {
                 .globalObject = globalObject,
                 .callback = handler.onDrain,
             };
-
+            const loop = globalObject.bunVM().eventLoop();
+            loop.enter();
+            defer loop.exit();
             this.websocket.cork(&corker, Corker.run);
             const result = corker.result;
 
@@ -3921,7 +3929,9 @@ pub const ServerWebSocket = struct {
         var globalThis = handler.globalObject;
 
         // This is the start of a task.
-        defer globalThis.bunVM().drainMicrotasks();
+        const loop = globalThis.bunVM().eventLoop();
+        loop.enter();
+        defer loop.exit();
 
         const result = cb.call(
             globalThis,
@@ -3961,7 +3971,9 @@ pub const ServerWebSocket = struct {
         var globalThis = handler.globalObject;
 
         // This is the start of a task.
-        defer globalThis.bunVM().drainMicrotasks();
+        const loop = globalThis.bunVM().eventLoop();
+        loop.enter();
+        defer loop.exit();
 
         const result = cb.call(
             globalThis,
@@ -4004,15 +4016,19 @@ pub const ServerWebSocket = struct {
 
         if (!handler.onClose.isEmptyOrUndefinedOrNull()) {
             var str = ZigString.init(message);
+            const globalObject = handler.globalObject;
+            const loop = globalObject.bunVM().eventLoop();
+            loop.enter();
+            defer loop.exit();
             str.markUTF8();
             const result = handler.onClose.call(
-                handler.globalObject,
-                &[_]JSC.JSValue{ this.this_value, JSValue.jsNumber(code), str.toValueGC(handler.globalObject) },
+                globalObject,
+                &[_]JSC.JSValue{ this.this_value, JSValue.jsNumber(code), str.toValueGC(globalObject) },
             );
 
             if (result.toError()) |err| {
                 log("onClose error", .{});
-                handler.globalObject.bunVM().runErrorHandler(err, null);
+                globalObject.bunVM().runErrorHandler(err, null);
             }
         }
 
@@ -5813,6 +5829,14 @@ pub fn NewServer(comptime NamespaceType: type, comptime ssl_enabled_: bool, comp
         ) void {
             JSC.markBinding(@src());
             this.pending_requests += 1;
+            if (comptime Environment.isDebug) {
+                this.vm.eventLoop().debug.enter();
+            }
+            defer {
+                if (comptime Environment.isDebug) {
+                    this.vm.eventLoop().debug.exit();
+                }
+            }
 
             req.setYield(false);
             var ctx = this.request_pool_allocator.tryGet() catch @panic("ran out of memory");

src/bun.js/bindings/CallSite.cpp

@@ -60,8 +60,8 @@ void CallSite::finishCreation(VM& vm, JSC::JSGlobalObject* globalObject, JSCStac
 
     const auto* sourcePositions = stackFrame.getSourcePositions();
     if (sourcePositions) {
-        m_lineNumber = JSC::jsNumber(sourcePositions->line.oneBasedInt());
-        m_columnNumber = JSC::jsNumber(sourcePositions->startColumn.oneBasedInt());
+        m_lineNumber = sourcePositions->line.oneBasedInt();
+        m_columnNumber = sourcePositions->startColumn.oneBasedInt();
     }
 
     if (stackFrame.isEval()) {
@@ -93,8 +93,8 @@ void CallSite::formatAsString(JSC::VM& vm, JSC::JSGlobalObject* globalObject, WT
     JSString* myFunctionName = functionName().toString(globalObject);
     JSString* mySourceURL = sourceURL().toString(globalObject);
 
-    JSString* myColumnNumber = columnNumber().toInt32(globalObject) != -1 ? columnNumber().toString(globalObject) : jsEmptyString(vm);
-    JSString* myLineNumber = lineNumber().toInt32(globalObject) != -1 ? lineNumber().toString(globalObject) : jsEmptyString(vm);
+    JSString* myColumnNumber = columnNumber() >= 0 ? JSValue(columnNumber()).toString(globalObject) : jsEmptyString(vm);
+    JSString* myLineNumber = lineNumber() >= 0 ? JSValue(lineNumber()).toString(globalObject) : jsEmptyString(vm);
 
     bool myIsConstructor = isConstructor();