windows: make more windows tests pass

packages/bun-usockets/src/eventing/libuv.c

@@ -91,6 +91,10 @@ void us_poll_start(struct us_poll_t *p, struct us_loop_t *loop, int events) {
  ((events & LIBUS_SOCKET_WRITABLE) ? POLL_TYPE_POLLING_OUT : 0);
 
  uv_poll_init_socket(loop->uv_loop, p->uv_p, p->fd);
+ // This unref is okay in the context of Bun's event loop, because sockets have
+ // a `Async.KeepAlive` associated with them, which is used instead of the
+ // usockets internals. usockets doesnt have a notion of ref-counted handles.
+ uv_unref((uv_handle_t *)p->uv_p);
  uv_poll_start(p->uv_p, events, poll_cb);
 }
 
@@ -211,7 +215,7 @@ struct us_poll_t *us_create_poll(struct us_loop_t *loop, int fallthrough,
  return p;
 }
 
-/* If we update our block position we have to updarte the uv_poll data to point
+/* If we update our block position we have to update the uv_poll data to point
  * to us */
 struct us_poll_t *us_poll_resize(struct us_poll_t *p, struct us_loop_t *loop,
  unsigned int ext_size) {
@@ -225,8 +229,8 @@ struct us_poll_t *us_poll_resize(struct us_poll_t *p, struct us_loop_t *loop,
 // timer
 struct us_timer_t *us_create_timer(struct us_loop_t *loop, int fallthrough,
  unsigned int ext_size) {
- struct us_internal_callback_t *cb = us_calloc(1, 
- sizeof(struct us_internal_callback_t) + sizeof(uv_timer_t) + ext_size);
+ struct us_internal_callback_t *cb = us_calloc(
+ 1, sizeof(struct us_internal_callback_t) + sizeof(uv_timer_t) + ext_size);
 
  cb->loop = loop;
  cb->cb_expects_the_loop = 0; // never read?
@@ -288,8 +292,8 @@ struct us_loop_t *us_timer_loop(struct us_timer_t *t) {
 struct us_internal_async *us_internal_create_async(struct us_loop_t *loop,
  int fallthrough,
  unsigned int ext_size) {
- struct us_internal_callback_t *cb = us_calloc(1,
- sizeof(struct us_internal_callback_t) + sizeof(uv_async_t) + ext_size);
+ struct us_internal_callback_t *cb = us_calloc(
+ 1, sizeof(struct us_internal_callback_t) + sizeof(uv_async_t) + ext_size);
 
  cb->loop = loop;
  return (struct us_internal_async *)cb;

src/async/windows_event_loop.zig

@@ -259,12 +259,14 @@ pub const FilePoll = struct {
  pub fn deactivate(this: *FilePoll, loop: *Loop) void {
  std.debug.assert(this.flags.contains(.has_incremented_poll_count));
  loop.active_handles -= @as(u32, @intFromBool(this.flags.contains(.has_incremented_poll_count)));
+ log("deactivate - {d}", .{loop.active_handles});
  this.flags.remove(.has_incremented_poll_count);
  }
 
  /// Only intended to be used from EventLoop.Pollable
  pub fn activate(this: *FilePoll, loop: *Loop) void {
  loop.active_handles += @as(u32, @intFromBool(!this.flags.contains(.closed) and !this.flags.contains(.has_incremented_poll_count)));
+ log("activate - {d}", .{loop.active_handles});
  this.flags.insert(.has_incremented_poll_count);
  }
 

src/bun.js/RuntimeTranspilerCache.zig

@@ -543,8 +543,9 @@ pub const RuntimeTranspilerCache = struct {
 
  const cache_dir_fd = brk: {
  if (std.fs.path.dirname(cache_file_path)) |dirname| {
- const dir = try std.fs.cwd().makeOpenPath(dirname, .{ .access_sub_paths = true });
- break :brk bun.toLibUVOwnedFD(dir.fd);
+ var dir = try std.fs.cwd().makeOpenPath(dirname, .{ .access_sub_paths = true });
+ errdefer dir.close();
+ break :brk try bun.toLibUVOwnedFD(dir.fd);
  }
 
  break :brk bun.toFD(std.fs.cwd().fd);
@@ -597,7 +598,7 @@ pub const RuntimeTranspilerCache = struct {
  debug("get(\"{s}\") = {s}", .{ source.path.text, @errorName(err) });
  return false;
  };
- if (comptime bun.Environment.allow_assert) {
+ if (comptime bun.Environment.isDebug) {
  if (bun_debug_restore_from_cache) {
  debug("get(\"{s}\") = {d} bytes, restored", .{ source.path.text, this.entry.?.output_code.byteSlice().len });
  } else {
@@ -606,7 +607,7 @@ pub const RuntimeTranspilerCache = struct {
  }
  bun.Analytics.Features.transpiler_cache = true;
 
- if (comptime bun.Environment.allow_assert) {
+ if (comptime bun.Environment.isDebug) {
  if (!bun_debug_restore_from_cache) {
  if (this.entry) |*entry| {
  entry.deinit(this.sourcemap_allocator, this.output_code_allocator);

src/bun.js/module_loader.zig

@@ -2018,19 +2018,20 @@ pub const ModuleLoader = struct {
  else => {
  var stack_buf = std.heap.stackFallback(4096, jsc_vm.allocator);
  const allocator = stack_buf.get();
- var buf = MutableString.init2048(allocator) catch unreachable;
+ var buf = MutableString.init2048(allocator) catch bun.outOfMemory();
  defer buf.deinit();
  var writer = buf.writer();
  if (!jsc_vm.origin.isEmpty()) {
- writer.writeAll("export default `") catch unreachable;
+ writer.writeAll("export default `") catch bun.outOfMemory();
  // TODO: escape backtick char, though we might already do that
  JSC.API.Bun.getPublicPath(specifier, jsc_vm.origin, @TypeOf(&writer), &writer);
- writer.writeAll("`;\n") catch unreachable;
+ writer.writeAll("`;\n") catch bun.outOfMemory();
  } else {
- writer.writeAll("export default ") catch unreachable;
- buf = js_printer.quoteForJSON(specifier, buf, true) catch @panic("out of memory");
+ // search keywords: "export default \"{}\";"
+ writer.writeAll("export default ") catch bun.outOfMemory();
+ buf = js_printer.quoteForJSON(specifier, buf, true) catch bun.outOfMemory();
  writer = buf.writer();
- writer.writeAll(";\n") catch unreachable;
+ writer.writeAll(";\n") catch bun.outOfMemory();
  }
 
  const public_url = bun.String.createUTF8(buf.toOwnedSliceLeaky());

src/bun.js/node/node_fs.zig

@@ -3779,7 +3779,7 @@ pub const NodeFS = struct {
  .path => |path_| {
  const path = path_.sliceZ(&this.sync_error_buf);
 
- const fd = switch (Syscall.open(path, @intFromEnum(FileSystemFlags.a), 0o000666)) {
+ const fd = switch (Syscall.open(path, @intFromEnum(FileSystemFlags.a), 0o666)) {
  .result => |result| result,
  .err => |err| return .{ .err = err },
  };
@@ -5124,7 +5124,7 @@ pub const NodeFS = struct {
 
  pub fn readFileWithOptions(this: *NodeFS, args: Arguments.ReadFile, comptime _: Flavor, comptime string_type: StringType) Maybe(Return.ReadFileWithOptions) {
  var path: [:0]const u8 = undefined;
- const fd: FileDescriptor = bun.toLibUVOwnedFD(switch (args.path) {
+ const fd_maybe_windows: FileDescriptor = switch (args.path) {
  .path => brk: {
  path = args.path.path.sliceZ(&this.sync_error_buf);
  if (this.vm) |vm| {
@@ -5156,7 +5156,7 @@ pub const NodeFS = struct {
  }
  }
 
- break :brk switch (Syscall.open(
+ break :brk switch (bun.sys.open(
  path,
  os.O.RDONLY | os.O.NOCTTY,
  0,
@@ -5168,7 +5168,18 @@ pub const NodeFS = struct {
  };
  },
  .fd => |fd| fd,
- });
+ };
+ const fd = bun.toLibUVOwnedFD(fd_maybe_windows) catch {
+ if (args.path == .path)
+ _ = Syscall.close(fd_maybe_windows);
+
+ return .{
+ .err = .{
+ .errno = @intFromEnum(os.E.MFILE),
+ .syscall = .open,
+ },
+ };
+ };
 
  defer {
  if (args.path == .path)
@@ -5187,6 +5198,7 @@ pub const NodeFS = struct {
  _ = Syscall.setFileOffset(fd, args.offset);
  }
  // For certain files, the size might be 0 but the file might still have contents.
+ // https://github.com/oven-sh/bun/issues/1220
  const size = @as(
  u64,
  @max(
@@ -5224,7 +5236,6 @@ pub const NodeFS = struct {
  },
  }
  } else {
- // https://github.com/oven-sh/bun/issues/1220
  while (true) {
  switch (Syscall.read(fd, buf.items.ptr[total..buf.capacity])) {
  .err => |err| return .{
@@ -5533,7 +5544,7 @@ pub const NodeFS = struct {
  else
  std.os.O.RDONLY;
 
- const fd = switch (Syscall.open(path, flags, 0)) {
+ const fd = switch (bun.sys.open(path, flags, 0)) {
  .err => |err| return .{ .err = err.withPath(path) },
  .result => |fd_| fd_,
  };
@@ -5783,7 +5794,7 @@ pub const NodeFS = struct {
 
  fn _truncate(this: *NodeFS, path: PathLike, len: JSC.WebCore.Blob.SizeType, flags: i32, comptime _: Flavor) Maybe(Return.Truncate) {
  if (comptime Environment.isWindows) {
- const file = Syscall.open(
+ const file = bun.sys.open(
  path.sliceZ(&this.sync_error_buf),
  os.O.WRONLY | flags,
  0o644,

src/bun.js/webcore/blob.zig

@@ -2298,7 +2298,13 @@ pub const Blob = struct {
  open_source_flags,
  0,
  )) {
- .result => |result| bun.toLibUVOwnedFD(result),
+ .result => |result| switch (bun.sys.toLibUVOwnedFD(result, .open, .close_on_fail)) {
+ .result => |result_fd| result_fd,
+ .err => |errno| {
+ this.system_error = errno.toSystemError();
+ return bun.errnoToZigErr(errno.errno);
+ },
+ },
  .err => |errno| {
  this.system_error = errno.toSystemError();
  return bun.errnoToZigErr(errno.errno);
@@ -2314,7 +2320,13 @@ pub const Blob = struct {
  open_destination_flags,
  JSC.Node.default_permission,
  )) {
- .result => |result| bun.toLibUVOwnedFD(result),
+ .result => |result| switch (bun.sys.toLibUVOwnedFD(result, .open, .close_on_fail)) {
+ .result => |result_fd| result_fd,
+ .err => |errno| {
+ this.system_error = errno.toSystemError();
+ return bun.errnoToZigErr(errno.errno);
+ },
+ },
  .err => |errno| {
  switch (mkdirIfNotExists(this, errno, dest, dest)) {
  .@"continue" => continue,

src/bun.js/webcore/streams.zig

@@ -3384,29 +3384,38 @@ pub const FileReader = struct {
 
  break :brk 0;
  })) {
- .result => |_fd| if (Environment.isWindows) bun.toLibUVOwnedFD(_fd) else _fd,
+ .result => |fd| if (Environment.isWindows)
+ switch (bun.sys.toLibUVOwnedFD(fd, .dup, .close_on_fail)) {
+ .result => |converted_fd| converted_fd,
+ .err => |err| return .{ .err = err.withFd(file.pathlike.fd) },
+ }
+ else
+ fd,
  .err => |err| {
  return .{ .err = err.withFd(file.pathlike.fd) };
  },
  }
  else switch (Syscall.open(file.pathlike.path.sliceZ(&file_buf), std.os.O.RDONLY | std.os.O.NONBLOCK | std.os.O.CLOEXEC, 0)) {
- .result => |_fd| _fd,
+ .result => |fd| fd,
  .err => |err| {
  return .{ .err = err.withPath(file.pathlike.path.slice()) };
  },
  };
 
  if (comptime Environment.isPosix) {
- if ((file.is_atty orelse false) or (fd.int() < 3 and std.os.isatty(fd.cast())) or (file.pathlike == .fd and bun.FDTag.get(file.pathlike.fd) != .none and std.os.isatty(file.pathlike.fd.cast()))) {
+ if ((file.is_atty orelse false) or
+ (fd.int() < 3 and std.os.isatty(fd.cast())) or
+ (file.pathlike == .fd and
+ bun.FDTag.get(file.pathlike.fd) != .none and
+ std.os.isatty(file.pathlike.fd.cast())))
+ {
  // var termios = std.mem.zeroes(std.os.termios);
  // _ = std.c.tcgetattr(fd.cast(), &termios);
  // bun.C.cfmakeraw(&termios);
  // _ = std.c.tcsetattr(fd.cast(), std.os.TCSA.NOW, &termios);
  file.is_atty = true;
  }
- }
 
- if (comptime Environment.isPosix) {
  const stat: bun.Stat = switch (Syscall.fstat(fd)) {
  .result => |result| result,
  .err => |err| {
@@ -3421,7 +3430,12 @@ pub const FileReader = struct {
  }
 
  this.pollable = bun.sys.isPollable(stat.mode) or (file.is_atty orelse false);
- this.file_type = if (bun.S.ISFIFO(stat.mode)) .pipe else if (bun.S.ISSOCK(stat.mode)) .socket else .file;
+ this.file_type = if (bun.S.ISFIFO(stat.mode))
+ .pipe
+ else if (bun.S.ISSOCK(stat.mode))
+ .socket
+ else
+ .file;
  this.nonblocking = this.pollable and !(file.is_atty orelse false);
 
  if (this.nonblocking and this.file_type == .pipe) {
@@ -3475,6 +3489,7 @@ pub const FileReader = struct {
  return .{ .err = err };
  },
  .result => |opened| {
+ std.debug.assert(opened.fd.isValid());
  this.fd = opened.fd;
  pollable = opened.pollable;
  file_type = opened.file_type;

src/bun.zig

@@ -1880,13 +1880,13 @@ pub inline fn toFD(fd: anytype) FileDescriptor {
 /// Accepts either a UV descriptor (i32) or a windows handle (*anyopaque)
 ///
 /// On windows, this file descriptor will always be backed by libuv, so calling .close() is safe.
-pub inline fn toLibUVOwnedFD(fd: anytype) FileDescriptor {
+pub inline fn toLibUVOwnedFD(fd: anytype) !FileDescriptor {
  const T = @TypeOf(fd);
  if (Environment.isWindows) {
  return (switch (T) {
- FDImpl.System => FDImpl.fromSystem(fd).makeLibUVOwned(),
+ FDImpl.System => try FDImpl.fromSystem(fd).makeLibUVOwned(),
  FDImpl.UV => FDImpl.fromUV(fd),
- FileDescriptor => FDImpl.decode(fd).makeLibUVOwned(),
+ FileDescriptor => try FDImpl.decode(fd).makeLibUVOwned(),
  FDImpl => fd.makeLibUVOwned(),
  else => @compileError("toLibUVOwnedFD() does not support type \"" ++ @typeName(T) ++ "\""),
  }).encode();

src/cli.zig

@@ -1872,7 +1872,7 @@ pub const Command = struct {
  const file_pathZ = script_name_buf[0..file_path.len :0];
  break :brk bun.openFileZ(file_pathZ, .{ .mode = .read_only });
  }
- }) catch return false).handle);
+ }) catch return false).handle) catch return false;
  defer _ = bun.sys.close(file);
 
  switch (bun.sys.fstat(file)) {

src/cli/install.ps1

@@ -219,11 +219,11 @@ function Install-Bun {
 
  $env:IS_BUN_AUTO_UPDATE = "1"
  $null = "$(& "${BunBin}\bun.exe" completions)"
- # if ($LASTEXITCODE -ne 0) {
- #  Write-Output "Install Failed - could not finalize installation"
- #  Write-Output "The command '${BunBin}\bun.exe completions' exited with code ${LASTEXITCODE}`n"
- #  exit 1
- # }
+ if ($LASTEXITCODE -ne 0) {
+ Write-Output "Install Failed - could not finalize installation"
+ Write-Output "The command '${BunBin}\bun.exe completions' exited with code ${LASTEXITCODE}`n"
+ exit 1
+ }
  $env:IS_BUN_AUTO_UPDATE = $null
 
  $DisplayVersion = if ($BunRevision -like "*-canary.*") {