From afa0d5ba123fe29b377f029f34f6350c378b1595 Mon Sep 17 00:00:00 2001
From: Karl Seguin <k@openmymind.io>
Date: Wed, 17 Sep 2025 20:14:13 +0800
Subject: [PATCH] Try fixing segfault by not being as aggressive with freeing
 Persisted Resolvers

---
 src/browser/fetch/fetch.zig                         |  4 +---
 src/browser/streams/ReadableStream.zig              |  7 ++-----
 src/browser/streams/ReadableStreamDefaultReader.zig |  2 +-
 src/runtime/js.zig                                  | 13 +++++++++++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/browser/fetch/fetch.zig b/src/browser/fetch/fetch.zig
index ee76578f..1feab0e0 100644
--- a/src/browser/fetch/fetch.zig
+++ b/src/browser/fetch/fetch.zig
@@ -101,7 +101,7 @@ pub fn fetch(input: RequestInput, options: ?RequestInit, page: *Page) !Env.Promi
 
     try page.requestCookie(.{}).headersForRequest(arena, req.url, &headers);
 
-    const resolver = page.main_context.createPersistentPromiseResolver();
+    const resolver = try page.main_context.createPersistentPromiseResolver();
 
     const fetch_ctx = try arena.create(FetchContext);
     fetch_ctx.* = .{
@@ -170,7 +170,6 @@ pub fn fetch(input: RequestInput, options: ?RequestInit, page: *Page) !Env.Promi
         .done_callback = struct {
             fn doneCallback(ctx: *anyopaque) !void {
                 const self: *FetchContext = @ptrCast(@alignCast(ctx));
-                defer self.promise_resolver.deinit();
                 self.transfer = null;
 
                 log.info(.fetch, "request complete", .{
@@ -187,7 +186,6 @@ pub fn fetch(input: RequestInput, options: ?RequestInit, page: *Page) !Env.Promi
         .error_callback = struct {
             fn errorCallback(ctx: *anyopaque, err: anyerror) void {
                 const self: *FetchContext = @ptrCast(@alignCast(ctx));
-                defer self.promise_resolver.deinit();
                 self.transfer = null;
 
                 log.err(.fetch, "error", .{
diff --git a/src/browser/streams/ReadableStream.zig b/src/browser/streams/ReadableStream.zig
index 216152da..8857c7b3 100644
--- a/src/browser/streams/ReadableStream.zig
+++ b/src/browser/streams/ReadableStream.zig
@@ -78,8 +78,8 @@ const QueueingStrategy = struct {
 pub fn constructor(underlying: ?UnderlyingSource, _strategy: ?QueueingStrategy, page: *Page) !*ReadableStream {
     const strategy: QueueingStrategy = _strategy orelse .{};
 
-    const cancel_resolver = page.main_context.createPersistentPromiseResolver();
-    const closed_resolver = page.main_context.createPersistentPromiseResolver();
+    const cancel_resolver = try page.main_context.createPersistentPromiseResolver();
+    const closed_resolver = try page.main_context.createPersistentPromiseResolver();
 
     const stream = try page.arena.create(ReadableStream);
     stream.* = ReadableStream{ .cancel_resolver = cancel_resolver, .closed_resolver = closed_resolver, .strategy = strategy };
@@ -106,9 +106,6 @@ pub fn constructor(underlying: ?UnderlyingSource, _strategy: ?QueueingStrategy,
 }
 
 pub fn destructor(self: *ReadableStream) void {
-    self.cancel_resolver.deinit();
-    self.closed_resolver.deinit();
-
     if (self.reader_resolver) |*rr| {
         rr.deinit();
     }
diff --git a/src/browser/streams/ReadableStreamDefaultReader.zig b/src/browser/streams/ReadableStreamDefaultReader.zig
index 0708eff2..bf40e4df 100644
--- a/src/browser/streams/ReadableStreamDefaultReader.zig
+++ b/src/browser/streams/ReadableStreamDefaultReader.zig
@@ -56,7 +56,7 @@ pub fn _read(self: *const ReadableStreamDefaultReader, page: *Page) !Env.Promise
                 if (self.stream.reader_resolver) |rr| {
                     return rr.promise();
                 } else {
-                    const persistent_resolver = page.main_context.createPersistentPromiseResolver();
+                    const persistent_resolver = try page.main_context.createPersistentPromiseResolver();
                     self.stream.reader_resolver = persistent_resolver;
                     return persistent_resolver.promise();
                 }
diff --git a/src/runtime/js.zig b/src/runtime/js.zig
index e18e73d6..a486fc35 100644
--- a/src/runtime/js.zig
+++ b/src/runtime/js.zig
@@ -677,6 +677,9 @@ pub fn Env(comptime State: type, comptime WebApis: type) type {
             // we now simply persist every time persist() is called.
             js_object_list: std.ArrayListUnmanaged(PersistentObject) = .empty,
 
+
+            persisted_promise_resolvers: std.ArrayListUnmanaged(v8.Persistent(v8.PromiseResolver)) = .empty,
+
             // When we need to load a resource (i.e. an external script), we call
             // this function to get the source. This is always a reference to the
             // Page's fetchModuleSource, but we use a function pointer
@@ -733,6 +736,10 @@ pub fn Env(comptime State: type, comptime WebApis: type) type {
                     p.deinit();
                 }
 
+                for (self.persisted_promise_resolvers.items) |*p| {
+                    p.deinit();
+                }
+
                 {
                     var it = self.module_cache.valueIterator();
                     while (it.next()) |p| {
@@ -1261,10 +1268,12 @@ pub fn Env(comptime State: type, comptime WebApis: type) type {
                 };
             }
 
-            pub fn createPersistentPromiseResolver(self: *JsContext) PersistentPromiseResolver {
+            pub fn createPersistentPromiseResolver(self: *JsContext) !PersistentPromiseResolver {
+                const resolver = v8.Persistent(v8.PromiseResolver).init(self.isolate, v8.PromiseResolver.init(self.v8_context));
+                try self.persisted_promise_resolvers.append(self.context_arena, resolver);
                 return .{
                     .js_context = self,
-                    .resolver = v8.Persistent(v8.PromiseResolver).init(self.isolate, v8.PromiseResolver.init(self.v8_context)),
+                    .resolver = resolver,
                 };
             }