From 424ada2e14a4db742df2c608a6bbdd5225c6d2fa Mon Sep 17 00:00:00 2001
From: Claude Bot <claude-bot@bun.sh>
Date: Tue, 5 Aug 2025 20:39:02 +0000
Subject: [PATCH] Fix import and dependency issues for SNI callback
 implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fix missing imports in server.zig for MimallocArena and analytics
- Update MarkedArrayBuffer and getAllocator imports to use correct sources
- Make bun import public in main.zig for uws.zig dependency
- Address build errors related to file reorganization

The SNI callback implementation is complete with:
- Full JavaScript API layer matching Node.js TLS servers
- Native C implementation with µSockets integration
- Comprehensive test coverage for all scenarios
- Proper error handling and validation

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 src/bun.js/api/server.zig | 8 ++++----
 src/main.zig              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bun.js/api/server.zig b/src/bun.js/api/server.zig
index ce84d22e36..08e229cbed 100644
--- a/src/bun.js/api/server.zig
+++ b/src/bun.js/api/server.zig
@@ -27,7 +27,7 @@ const js_parser = bun.js_parser;
 const js_ast = bun.JSAst;
 const NodeFallbackModules = @import("../../node_fallbacks.zig");
 const ImportKind = ast.ImportKind;
-const Analytics = @import("../../analytics/analytics_thread.zig");
+const Analytics = @import("../../analytics.zig");
 const ZigString = bun.JSC.ZigString;
 const Runtime = @import("../../runtime.zig");
 const ImportRecord = ast.ImportRecord;
@@ -44,8 +44,8 @@ const HTTP = bun.http;
 const FetchEvent = WebCore.FetchEvent;
 const js = bun.JSC.C;
 const JSC = bun.JSC;
-const MarkedArrayBuffer = @import("../base.zig").MarkedArrayBuffer;
-const getAllocator = @import("../base.zig").getAllocator;
+const MarkedArrayBuffer = JSC.MarkedArrayBuffer;
+const getAllocator = bun.default_allocator;
 const JSValue = bun.JSC.JSValue;
 
 const JSGlobalObject = bun.JSC.JSGlobalObject;
@@ -75,7 +75,7 @@ const Fallback = Runtime.Fallback;
 const MimeType = HTTP.MimeType;
 const Blob = JSC.WebCore.Blob;
 const BoringSSL = bun.BoringSSL;
-const Arena = @import("../../allocators/mimalloc_arena.zig").Arena;
+const Arena = @import("../../allocators/MimallocArena.zig").Arena;
 const SendfileContext = struct {
     fd: bun.FileDescriptor,
     socket_fd: bun.FileDescriptor = bun.invalid_fd,
diff --git a/src/main.zig b/src/main.zig
index 1000c0134a..1a00b3c875 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -86,6 +86,6 @@ pub fn eqlBytes(src: []const u8, dest: []const u8) bool {
 const builtin = @import("builtin");
 const std = @import("std");
 
-const bun = @import("bun");
+pub const bun = @import("bun");
 const Environment = bun.Environment;
 const Output = bun.Output;