[npm install] starting to look good!

anonrig · Dec 17, 2021 · 809c1e4 · 809c1e4
1 parent c056093
commit 809c1e4
Show file tree

Hide file tree

Showing 17 changed files with 1,072 additions and 372 deletions.
diff --git a/.gitignore b/.gitignore
@@ -77,4 +77,5 @@ misctools/fetch
 src/deps/libiconv
 src/deps/openssl
 src/tests.zig
-*.blob
+*.blob
+src/deps/s2n-tls
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -24,7 +24,16 @@
       "request": "launch",
       "name": "fetch debug #2",
       "program": "${workspaceFolder}/misctools/fetch",
-      "args": ["https://youtube.com/", "--verbose"],
+      "args": ["https://registry.npmjs.org/react", "--verbose"],
+      "cwd": "${workspaceFolder}",
+      "console": "internalConsole"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "fetch debug #3",
+      "program": "${workspaceFolder}/misctools/fetch",
+      "args": ["http://example.com/", "--verbose"],
       "cwd": "${workspaceFolder}",
       "console": "internalConsole"
     },
@@ -340,7 +349,17 @@
       "args": ["install"],
       "cwd": "/tmp/wow-such-npm",
       "env": {
-        "GOMAXPROCS": "1"
+      },
+      "console": "internalConsole"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Install #2",
+      "program": "bun-debug",
+      "args": ["install"],
+      "cwd": "/tmp/wow-such-npm2",
+      "env": {
       },
       "console": "internalConsole"
     },

diff --git a/Makefile b/Makefile
@@ -318,8 +318,7 @@ fetch:
 		src/deps/libarchive.a \
 		src/deps/libcrypto.a \
 		src/deps/libssl.a \
-		src/deps/picohttpparser.o \
-		$(LIBCRYPTO_STATIC_LIB)
+		src/deps/picohttpparser.o
 
 fetch-debug:
 	cd misctools; $(ZIG) build-obj ./fetch.zig -fcompiler-rt -lc --main-pkg-path ../ $(BORINGSSL_PACKAGE)  --pkg-begin io ../$(IO_FILE) --pkg-end
@@ -329,8 +328,8 @@ fetch-debug:
 		src/deps/libarchive.a \
 		src/deps/libcrypto.a \
 		src/deps/libssl.a \
-		src/deps/picohttpparser.o \
-		$(LIBCRYPTO_STATIC_LIB)
+		src/deps/picohttpparser.o
+
 
 
 httpbench-debug:

diff --git a/misctools/fetch.zig b/misctools/fetch.zig
@@ -179,22 +179,25 @@ pub fn main() anyerror!void {
 
     try NetworkThread.init();
 
-    var async_http = try default_allocator.create(HTTP.AsyncHTTP);
-    async_http.* = try HTTP.AsyncHTTP.init(
-        default_allocator,
-        args.method,
-        args.url,
-        args.headers,
-        args.headers_buf,
-        response_body_string,
-        request_body_string,
-
-        0,
-    );
-    async_http.client.verbose = args.verbose;
-    async_http.verbose = args.verbose;
-    async_http.channel = channel;
-    async_http.schedule(default_allocator);
+    var ctx = try default_allocator.create(HTTP.HTTPChannelContext);
+    ctx.* = .{
+        .channel = channel,
+        .http = try HTTP.AsyncHTTP.init(
+            default_allocator,
+            args.method,
+            args.url,
+            args.headers,
+            args.headers_buf,
+            response_body_string,
+            request_body_string,
+
+            0,
+        ),
+    };
+    ctx.http.callback = HTTP.HTTPChannelContext.callback;
+    ctx.http.schedule(default_allocator);
+    ctx.http.client.verbose = args.verbose;
+    ctx.http.verbose = args.verbose;
 
     while (true) {
         while (channel.tryReadItem() catch null) |http| {

diff --git a/misctools/http_bench.zig b/misctools/http_bench.zig
@@ -190,26 +190,36 @@ pub fn main() anyerror!void {
 
     try NetworkThread.init();
 
+    const Group = struct {
+        response_body: MutableString = undefined,
+        request_body: MutableString = undefined,
+        context: HTTP.HTTPChannelContext = undefined,
+    };
+    var groups = try default_allocator.alloc(Group, args.count);
     var i: usize = 0;
     while (i < args.count) : (i += 1) {
-        var response_body = try default_allocator.create(MutableString);
+        groups[i] = Group{};
+        var response_body = &groups[i].response_body;
         response_body.* = try MutableString.init(default_allocator, 1024);
-        var request_body = try default_allocator.create(MutableString);
+        var request_body = &groups[i].request_body;
         request_body.* = try MutableString.init(default_allocator, 0);
 
-        var async_http = try default_allocator.create(HTTP.AsyncHTTP);
-        async_http.* = try HTTP.AsyncHTTP.init(
-            default_allocator,
-            args.method,
-            args.url,
-            args.headers,
-            args.headers_buf,
-            request_body,
-            response_body,
-            args.timeout,
-        );
-        async_http.channel = channel;
-        async_http.schedule(default_allocator);
+        var ctx = &groups[i].context;
+        ctx.* = .{
+            .channel = channel,
+            .http = try HTTP.AsyncHTTP.init(
+                default_allocator,
+                args.method,
+                args.url,
+                args.headers,
+                args.headers_buf,
+                request_body,
+                response_body,
+                args.timeout,
+            ),
+        };
+        ctx.http.callback = HTTP.HTTPChannelContext.callback;
+        ctx.http.schedule(default_allocator);
     }
 
     var read_count: usize = 0;
@@ -242,11 +252,21 @@ pub fn main() anyerror!void {
                     },
                 }
 
-                Output.prettyError(" <d>{s}<r><d> - {s}<r> <d>({d} bytes)<r>\n", .{
-                    @tagName(http.client.method),
-                    http.client.url.href,
-                    http.response_buffer.list.items.len,
-                });
+                if (http.gzip_elapsed > 0) {
+                    Output.prettyError(" <d>{s}<r><d> - {s}<r> <d>({d} bytes, ", .{
+                        @tagName(http.client.method),
+                        http.client.url.href,
+                        http.response_buffer.list.items.len,
+                    });
+                    Output.printElapsed(@floatCast(f64, @intToFloat(f128, http.gzip_elapsed) / std.time.ns_per_ms));
+                    Output.prettyError("<d> gzip)<r>\n", .{});
+                } else {
+                    Output.prettyError(" <d>{s}<r><d> - {s}<r> <d>({d} bytes)<r>\n", .{
+                        @tagName(http.client.method),
+                        http.client.url.href,
+                        http.response_buffer.list.items.len,
+                    });
+                }
             } else if (http.err) |err| {
                 fail_count += 1;
                 Output.printError(" err: {s}\n", .{@errorName(err)});

diff --git a/src/deps/boringssl.translated.zig b/src/deps/boringssl.translated.zig
@@ -18825,8 +18825,8 @@ pub const SSL_CTX = opaque {
 
     pub inline fn setCustomVerify(this: *SSL_CTX, cb: ?VerifyCallback) void {
         SSL_CTX_set_custom_verify(this, 0, cb);
-        SSL_CTX_set_custom_verify(this, 1, cb);
-        SSL_CTX_set_custom_verify(this, 2, cb);
+        // SSL_CTX_set_custom_verify(this, 1, cb);
+        // SSL_CTX_set_custom_verify(this, 2, cb);
     }
 };
 

diff --git a/src/fallback.version b/src/fallback.version
@@ -1 +1 @@
-2bbe5942da63d2ba
+796022f759787f0a