diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/install/install.zig | 7 | ||||
| -rw-r--r-- | src/javascript/jsc/javascript.zig | 7 | ||||
| -rw-r--r-- | src/javascript/jsc/webcore/response.zig | 29 |
3 files changed, 38 insertions, 5 deletions
diff --git a/src/install/install.zig b/src/install/install.zig index b970e90fe..34159bb2f 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -1680,6 +1680,8 @@ pub const Lockfile = struct { } pub fn clamp(this: *StringBuilder) void { + std.debug.assert(this.cap >= this.len); + const excess = this.cap - this.len; if (excess > 0) @@ -4192,11 +4194,12 @@ pub const PackageManager = struct { } } } else if (!dependency.behavior.isPeer()) { - const task_id = Task.Id.forManifest(Task.Tag.package_manifest, this.lockfile.str(name)); + const name_str = this.lockfile.str(name); + const task_id = Task.Id.forManifest(Task.Tag.package_manifest, name_str); var network_entry = try this.network_dedupe_map.getOrPutContext(this.allocator, task_id, .{}); if (!network_entry.found_existing) { if (this.options.enable.manifest_cache) { - if (Npm.PackageManifest.Serializer.load(this.allocator, this.cache_directory, this.lockfile.str(name)) catch null) |manifest_| { + if (Npm.PackageManifest.Serializer.load(this.allocator, this.cache_directory, name_str) catch null) |manifest_| { const manifest: Npm.PackageManifest = manifest_; loaded_manifest = manifest; diff --git a/src/javascript/jsc/javascript.zig b/src/javascript/jsc/javascript.zig index 03ef373f7..e05153366 100644 --- a/src/javascript/jsc/javascript.zig +++ b/src/javascript/jsc/javascript.zig @@ -727,6 +727,11 @@ pub const Module = struct { reload_pending: bool = false, }; +const FetchTasklet = Fetch.FetchTasklet; +pub const Task = TaggedPointerUnion(.{ + FetchTasklet, +}); + // If you read JavascriptCore/API/JSVirtualMachine.mm - https://github.com/WebKit/WebKit/blob/acff93fb303baa670c055cb24c2bad08691a01a0/Source/JavaScriptCore/API/JSVirtualMachine.mm#L101 // We can see that it's sort of like std.mem.Allocator but for JSGlobalContextRef, to support Automatic Reference Counting // Its unavailable on Linux @@ -762,6 +767,8 @@ pub const VirtualMachine = struct { origin_timer: std.time.Timer = undefined, + ready_tasks_count: std.atomic.Atomic(u32) = std.atomic.Atomic(u32).init(0), + pub const MacroMap = std.AutoArrayHashMap(i32, js.JSObjectRef); pub threadlocal var vm_loaded = false; diff --git a/src/javascript/jsc/webcore/response.zig b/src/javascript/jsc/webcore/response.zig index 8a5a0c1c1..d4c5f5936 100644 --- a/src/javascript/jsc/webcore/response.zig +++ b/src/javascript/jsc/webcore/response.zig @@ -5,7 +5,8 @@ const http = @import("../../../http.zig"); usingnamespace @import("../javascript.zig"); usingnamespace @import("../bindings/bindings.zig"); const ZigURL = @import("../../../query_string_map.zig").URL; -const HTTPClient = @import("../../../http_client.zig"); +const HTTPClient = @import("http"); +const NetworkThread = @import("network_thread"); const Method = @import("../../../http/method.zig").Method; const picohttp = @import("picohttp"); @@ -411,6 +412,27 @@ pub const Fetch = struct { ); const fetch_error_cant_fetch_same_origin = "fetch to same-origin on the server is not supported yet - sorry! (it would just hang forever)"; + + pub const FetchTasklet = struct { + promise: *JSPromise = undefined, + http: HTTPClient.AsyncHTTP = undefined, + status: Status = Status.pending, + javascript_vm: *VirtualMachine = undefined, + + pub const Status = enum(u8) { + pending, + running, + done, + }; + + pub fn callback(http_: *HTTPClient.AsyncHTTP, sender: *HTTPClient.AsyncHTTP.HTTPSender) void { + var task: *FetchTasklet = @fieldParentPtr(FetchTasklet, "http", http_); + @atomicStore(Status.done, &task.status, Status.done, .Monotonic); + task.javascript_vm.pending_tasks.fetchAdd(.Monotonic, 1); + sender.release(); + } + }; + pub fn call( this: void, ctx: js.JSContextRef, @@ -446,9 +468,10 @@ pub const Fetch = struct { defer getAllocator(ctx).free(url_str); - var http_client = HTTPClient.init(getAllocator(ctx), .GET, ZigURL.parse(url_str), .{}, ""); + NetworkThread.init() catch @panic("Failed to start network thread"); + const url = ZigURL.parse(url_str); - if (http_client.url.origin.len > 0 and strings.eql(http_client.url.origin, VirtualMachine.vm.bundler.options.origin.origin)) { + if (url.origin.len > 0 and strings.eql(url.origin, VirtualMachine.vm.bundler.options.origin.origin)) { const fetch_error = fetch_error_cant_fetch_same_origin; return JSPromise.rejectedPromiseValue(VirtualMachine.vm.global, ZigString.init(fetch_error).toErrorInstance(VirtualMachine.vm.global)).asRef(); } |