mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

more

Browse Source
This commit is contained in:
Ciro Spaciari
2025-09-10 21:29:22 -07:00
parent 019ccc338d
commit 324c72c537
5 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bun.js/api/server.zig
View File

@@ -1426,7 +1426,7 @@ pub fn NewServer(protocol_enum: enum { http, https }, development_kind: enum { d
pub fn finalize(this: *ThisServer) void {
httplog("finalize", .{});
this.js_value.deinit();
this.js_value.finalize();
this.flags.has_js_deinited = true;
this.deinitIfWeCan();
}

5
src/bun.js/bindings/JSRef.zig
View File

@@ -100,6 +100,11 @@ pub const JSRef = union(enum) {
.finalized => {},
}
}
pub fn finalize(this: *@This()) void {
this.deinit();
this.* = .{ .finalized = {} };
}
};
const bun = @import("bun");

2
src/sql/mysql/MySQLConnection.zig
View File

@@ -269,7 +269,7 @@ pub fn finalize(this: *MySQLConnection) void {
this.stopTimers();
debug("MySQLConnection finalize", .{});
this.js_value.deinit();
this.js_value.finalize();
this.deref();
}

29
src/sql/mysql/MySQLQuery.zig
View File

@@ -43,7 +43,6 @@ pub const Status = enum(u8) {
};
pub fn deinit(this: *@This()) void {
this.thisValue.deinit();
if (this.statement) |statement| {
statement.deref();
}
@@ -62,7 +61,7 @@ pub fn finalize(this: *@This()) void {
this.statement = null;
}
this.thisValue.deinit();
this.thisValue.finalize();
this.deref();
}
@@ -74,18 +73,23 @@ pub fn onWriteFail(
) void {
this.status = .fail;
const thisValue = this.thisValue.tryGet() orelse return;
defer this.thisValue.deinit();
defer this.thisValue.downgrade();
const targetValue = this.getTarget(globalObject, true) orelse return;
const instance = AnyMySQLError.mysqlErrorToJS(globalObject, "Failed to bind query", err);
const js_err = instance.toError() orelse instance;
bun.assertf(js_err != .zero, "js_err is zero", .{});
js_err.ensureStillAlive();
const vm = jsc.VirtualMachine.get();
const function = vm.rareData().mysql_context.onQueryRejectFn.get().?;
const function = vm.rareData().mysql_context.onQueryRejectFn.get() orelse return;
bun.assertf(function.isCallable(), "onQueryRejectFn is not callable");
const event_loop = vm.eventLoop();
const js_array = if (queries_array == .zero) .js_undefined else queries_array;
js_array.ensureStillAlive();
event_loop.runCallback(function, globalObject, thisValue, &.{
targetValue,
instance.toError() orelse instance,
queries_array,
js_err,
js_array,
});
}
@@ -155,11 +159,12 @@ pub fn onJSError(this: *@This(), err: jsc.JSValue, globalObject: *jsc.JSGlobalOb
defer this.deref();
this.status = .fail;
const thisValue = this.thisValue.tryGet() orelse return;
defer this.thisValue.deinit();
defer this.thisValue.downgrade();
const targetValue = this.getTarget(globalObject, true) orelse return;
var vm = jsc.VirtualMachine.get();
const function = vm.rareData().mysql_context.onQueryRejectFn.get().?;
const function = vm.rareData().mysql_context.onQueryRejectFn.get() orelse return;
bun.assertf(function.isCallable(), "onQueryRejectFn is not callable", .{});
const event_loop = vm.eventLoop();
var js_error = err.toError() orelse err;
if (js_error == .zero) {
@@ -217,12 +222,14 @@ pub fn onResult(this: *@This(), result_count: u64, globalObject: *jsc.JSGlobalOb
defer if (is_last) {
allowGC(thisValue, globalObject);
this.thisValue.deinit();
this.thisValue.downgrade();
};
const targetValue = this.getTarget(globalObject, is_last) orelse return;
const vm = jsc.VirtualMachine.get();
const function = vm.rareData().mysql_context.onQueryResolveFn.get().?;
const function = vm.rareData().mysql_context.onQueryResolveFn.get() orelse return;
bun.assertf(function.isCallable(), "onQueryResolveFn is not callable", .{});
const event_loop = vm.eventLoop();
const tag: CommandTag = .{ .SELECT = result_count };
var queries_array = if (connection == .zero) .js_undefined else MySQLConnection.js.queriesGetCached(connection) orelse .js_undefined;

13
src/sql/postgres/PostgresSQLQuery.zig
View File

@@ -52,7 +52,6 @@ pub const Status = enum(u8) {
};
pub fn deinit(this: *@This()) void {
this.thisValue.deinit();
if (this.statement) |statement| {
statement.deref();
}
@@ -63,11 +62,7 @@ pub fn deinit(this: *@This()) void {
pub fn finalize(this: *@This()) void {
debug("PostgresSQLQuery finalize", .{});
if (this.thisValue == .weak) {
// clean up if is a weak reference, if is a strong reference we need to wait until the query is done
// if we are a strong reference, here is probably a bug because GC'd should not happen
this.thisValue.weak = .zero;
}
this.finalize();
this.deref();
}
@@ -81,7 +76,7 @@ pub fn onWriteFail(
defer this.deref();
this.status = .fail;
const thisValue = this.thisValue.tryGet() orelse return;
defer this.thisValue.deinit();
defer this.thisValue.downgrade();
const targetValue = this.getTarget(globalObject, true) orelse return;
const vm = jsc.VirtualMachine.get();
@@ -99,7 +94,7 @@ pub fn onJSError(this: *@This(), err: jsc.JSValue, globalObject: *jsc.JSGlobalOb
defer this.deref();
this.status = .fail;
const thisValue = this.thisValue.tryGet() orelse return;
defer this.thisValue.deinit();
defer this.thisValue.downgrade();
const targetValue = this.getTarget(globalObject, true) orelse return;
var vm = jsc.VirtualMachine.get();
@@ -143,7 +138,7 @@ pub fn onResult(this: *@This(), command_tag_str: []const u8, globalObject: *jsc.
const thisValue = this.thisValue.tryGet() orelse return;
defer if (is_last) {
allowGC(thisValue, globalObject);
this.thisValue.deinit();
this.thisValue.downgrade();
};
const targetValue = this.getTarget(globalObject, is_last) orelse return;