Merge branch 'main' into claude/add-bun-archive

Author: dylan-conway

cmake/targets/BuildBun.cmake

@@ -419,12 +419,9 @@ execute_process(
     --command=list-outputs
     --sources=${BUN_BINDGENV2_SOURCES_COMMA_SEPARATED}
     --codegen-path=${CODEGEN_PATH}
-  RESULT_VARIABLE bindgen_result
   OUTPUT_VARIABLE bindgen_outputs
+  COMMAND_ERROR_IS_FATAL ANY
 )
-if(${bindgen_result})
-  message(FATAL_ERROR "bindgenv2/script.ts exited with non-zero status")
-endif()
 foreach(output IN LISTS bindgen_outputs)
   if(output MATCHES "\.cpp$")
     list(APPEND BUN_BINDGENV2_CPP_OUTPUTS ${output})

cmake/tools/SetupWebKit.cmake

@@ -28,6 +28,7 @@ if(WEBKIT_LOCAL)
     # make jsc-compile-debug jsc-copy-headers
     include_directories(
       ${WEBKIT_PATH}
+      ${WEBKIT_PATH}/JavaScriptCore/Headers
       ${WEBKIT_PATH}/JavaScriptCore/Headers/JavaScriptCore
       ${WEBKIT_PATH}/JavaScriptCore/PrivateHeaders
       ${WEBKIT_PATH}/bmalloc/Headers
@@ -90,7 +91,14 @@ if(EXISTS ${WEBKIT_PATH}/package.json)
   endif()
 endif()
 
-file(DOWNLOAD ${WEBKIT_DOWNLOAD_URL} ${CACHE_PATH}/${WEBKIT_FILENAME} SHOW_PROGRESS)
+file(
+  DOWNLOAD ${WEBKIT_DOWNLOAD_URL} ${CACHE_PATH}/${WEBKIT_FILENAME} SHOW_PROGRESS
+  STATUS WEBKIT_DOWNLOAD_STATUS
+)
+if(NOT "${WEBKIT_DOWNLOAD_STATUS}" MATCHES "^0;")
+  message(FATAL_ERROR "Failed to download WebKit: ${WEBKIT_DOWNLOAD_STATUS}")
+endif()
+
 file(ARCHIVE_EXTRACT INPUT ${CACHE_PATH}/${WEBKIT_FILENAME} DESTINATION ${CACHE_PATH} TOUCH)
 file(REMOVE ${CACHE_PATH}/${WEBKIT_FILENAME})
 file(REMOVE_RECURSE ${WEBKIT_PATH})

docs/guides/ecosystem/pm2.mdx

@@ -33,7 +33,7 @@ Alternatively, you can create a PM2 configuration file. Create a file named `pm2
 
 ```js pm2.config.js icon="file-code"
 module.exports = {
-  title: "app", // Name of your application
+  name: "app", // Name of your application
   script: "index.ts", // Entry point of your application
   interpreter: "bun", // Bun interpreter
   env: {

packages/bun-types/s3.d.ts

@@ -321,6 +321,30 @@ declare module "bun" {
       | "SNOW"
       | "STANDARD_IA";
 
+    /**
+     * When set to `true`, confirms that the requester knows they will be charged
+     * for the request and data transfer costs. Required for accessing objects
+     * in Requester Pays buckets.
+     *
+     * @see https://docs.aws.amazon.com/AmazonS3/latest/userguide/RequesterPaysBuckets.html
+     *
+     * @example
+     *    // Accessing a file in a Requester Pays bucket
+     *     const file = s3.file("data.csv", {
+     *       bucket: "requester-pays-bucket",
+     *       requestPayer: true
+     *     });
+     *     const content = await file.text();
+     *
+     * @example
+     *    // Uploading to a Requester Pays bucket
+     *     await s3.write("output.json", data, {
+     *       bucket: "requester-pays-bucket",
+     *       requestPayer: true
+     *     });
+     */
+    requestPayer?: boolean;
+
     /**
      * @deprecated The size of the internal buffer in bytes. Defaults to 5 MiB. use `partSize` and `queueSize` instead.
      */

scripts/create-link-metadata.mjs

@@ -28,6 +28,7 @@ console.log("Reading linker files...");
 const linkerLds = await Bun.file(join(repoRoot, "src", "linker.lds")).text();
 const symbolsDyn = await Bun.file(join(repoRoot, "src", "symbols.dyn")).text();
 const symbolsTxt = await Bun.file(join(repoRoot, "src", "symbols.txt")).text();
+const symbolsDef = await Bun.file(join(repoRoot, "src", "symbols.def")).text();
 
 // Create metadata JSON with link command included
 const metadata = {
@@ -41,6 +42,7 @@ const metadata = {
   linker_lds: linkerLds,
   symbols_dyn: symbolsDyn,
   symbols_txt: symbolsTxt,
+  symbols_def: symbolsDef,
 };
 
 const metadataPath = join(buildPath, "link-metadata.json");

scripts/runner.node.mjs

@@ -1128,6 +1128,7 @@ async function spawnBun(execPath, { args, cwd, timeout, env, stdout, stderr }) {
     ...process.env,
     PATH: path,
     TMPDIR: tmpdirPath,
+    BUN_TMPDIR: tmpdirPath,
     USER: username,
     HOME: homedir,
     SHELL: shellPath,

src/CLAUDE.md

@@ -8,4 +8,5 @@ Syntax reminders:
 Conventions:
 
 - Prefer `@import` at the **bottom** of the file, but the auto formatter will move them so you don't need to worry about it.
+- **Never** use `@import()` inline inside of functions. **Always** put them at the bottom of the file or containing struct. Imports in Zig are free of side-effects, so there's no such thing as a "dynamic" import.
 - You must be patient with the build.

src/OutputFile.zig

@@ -74,7 +74,7 @@ pub const FileOperation = struct {
 
     pub fn getPathname(file: *const FileOperation) string {
         if (file.is_tmpdir) {
-            return resolve_path.joinAbs(@TypeOf(Fs.FileSystem.instance.fs).tmpdir_path, .auto, file.pathname);
+            return resolve_path.joinAbs(Fs.FileSystem.RealFS.tmpdirPath(), .auto, file.pathname);
         } else {
             return file.pathname;
         }

src/StandaloneModuleGraph.zig

@@ -670,7 +670,7 @@ pub const StandaloneModuleGraph = struct {
                                 if (!tried_changing_abs_dir) {
                                     tried_changing_abs_dir = true;
                                     const zname_z = bun.strings.concat(bun.default_allocator, &.{
-                                        bun.fs.FileSystem.instance.fs.tmpdirPath(),
+                                        bun.fs.FileSystem.RealFS.tmpdirPath(),
                                         std.fs.path.sep_str,
                                         zname,
                                         &.{0},
@@ -1213,7 +1213,7 @@ pub const StandaloneModuleGraph = struct {
             }
         }
 
-        if (read_amount < trailer.len + @sizeOf(usize) + 32)
+        if (read_amount < trailer.len + @sizeOf(usize) + @sizeOf(Offsets))
             // definitely missing data
             return null;
 

src/boringssl.zig

@@ -167,16 +167,30 @@ pub fn checkX509ServerIdentity(
                                 if (dnsNameSlice.len > 0) {
                                     if (X509.isSafeAltName(dnsNameSlice, false)) {
                                         if (dnsNameSlice[0] == '*') {
-                                            dnsNameSlice = dnsNameSlice[1..dnsNameSlice.len];
-                                            var host = hostname;
-                                            if (hostname.len > dnsNameSlice.len) {
-                                                host = hostname[hostname.len - dnsNameSlice.len .. hostname.len];
-                                            }
-                                            if (strings.eql(dnsNameSlice, host)) {
-                                                return true;
+                                            // RFC 6125 Section 6.4.3: Wildcard must match exactly one label
+                                            // Enforce "*." prefix (wildcards must be leftmost and followed by a dot)
+                                            if (dnsNameSlice.len >= 2 and dnsNameSlice[1] == '.') {
+                                                const suffix = dnsNameSlice[2..];
+                                                // Disallow "*.tld" (suffix must contain at least one dot for proper domain hierarchy)
+                                                if (std.mem.indexOfScalar(u8, suffix, '.') != null) {
+                                                    // Host must be at least "label.suffix" (suffix_len + 1 for dot + at least 1 char for label)
+                                                    if (hostname.len > suffix.len + 1) {
+                                                        const dot_index = hostname.len - suffix.len - 1;
+                                                        // The character before suffix must be a dot, and there must be no other dots
+                                                        // in the prefix (single-label wildcard only)
+                                                        if (hostname[dot_index] == '.' and std.mem.indexOfScalar(u8, hostname[0..dot_index], '.') == null) {
+                                                            const host_suffix = hostname[dot_index + 1 ..];
+                                                            // RFC 4343: DNS names are case-insensitive
+                                                            if (strings.eqlCaseInsensitiveASCII(suffix, host_suffix, true)) {
+                                                                return true;
+                                                            }
+                                                        }
+                                                    }
+                                                }
                                             }
                                         }
-                                        if (strings.eql(dnsNameSlice, hostname)) {
+                                        // RFC 4343: DNS names are case-insensitive
+                                        if (strings.eqlCaseInsensitiveASCII(dnsNameSlice, hostname, true)) {
                                             return true;
                                         }
                                     }