sparkbun 0.1.5 → 0.1.7

package/src/native/macos/nativeWrapper.mm

@@ -20,7 +20,7 @@
 static bool wgpuDebugEnabled() {
     static int cached = -1;
     if (cached >= 0) return cached == 1;
-    const char* val = getenv("ELECTROBUN_WGPU_DEBUG");
+    const char* val = getenv("SPARKBUN_WGPU_DEBUG");
     cached = (val && strcmp(val, "1") == 0) ? 1 : 0;
     return cached == 1;
 }
@@ -81,7 +81,7 @@ static bool wgpuDebugEnabled() {
 #include "../shared/chromium_flags.h"
 #include "../shared/cache_migration.h"
 
-using namespace electrobun;
+using namespace sparkbun;
 
 /*
  * =============================================================================
@@ -96,8 +96,8 @@ static std::once_flag g_asarArchiveInitFlag;
 
 CGFloat OFFSCREEN_OFFSET = -20000;
 BOOL useCEF = false;
-std::string g_electrobunChannel = "";
-std::string g_electrobunIdentifier = "";
+std::string g_sparkbunChannel = "";
+std::string g_sparkbunIdentifier = "";
 
 static BOOL isMovingWindow = NO;
 static NSWindow *targetWindow = nil;
@@ -109,7 +109,7 @@ static id mouseUpMonitor = nil;
 static int g_remoteDebugPort = 9222;
 
 // Menu role to selector mapping
-// This maps Electrobun role strings to their corresponding Objective-C selectors.
+// This maps SparkBun role strings to their corresponding Objective-C selectors.
 // Roles are grouped by category for easier maintenance.
 static NSDictionary<NSString*, NSString*>* getMenuRoleToSelectorMap() {
     static NSDictionary<NSString*, NSString*>* map = nil;
@@ -317,9 +317,9 @@ class CefApp;
 class CefClient;
 class CefLifeSpanHandler;
 class CefBrowser;
-class ElectrobunSchemeHandler;
-class ElectrobunSchemeHandlerFactory;
-class ElectrobunClient;
+class SparkBunSchemeHandler;
+class SparkBunSchemeHandlerFactory;
+class SparkBunClient;
 
 typedef void (*RemoteDevToolsClosedCallback)(void* ctx, int target_id);
 void RemoteDevToolsClosed(void* ctx, int target_id);
@@ -976,7 +976,7 @@ static NSMutableDictionary<NSNumber *, AbstractView *> *globalAbstractViews = ni
                 eventBridgeHandler:(HandlePostMessage)eventBridgeHandler
                 bunBridgeHandler:(HandlePostMessage)bunBridgeHandler
                 internalBridgeHandler:(HandlePostMessage)internalBridgeHandler
-                electrobunPreloadScript:(const char *)electrobunPreloadScript
+                sparkbunPreloadScript:(const char *)sparkbunPreloadScript
                 customPreloadScript:(const char *)customPreloadScript
                 viewsRoot:(const char *)viewsRoot
                 transparent:(bool)transparent
@@ -994,7 +994,7 @@ static NSMutableDictionary<NSNumber *, AbstractView *> *globalAbstractViews = ni
 
 // ----------------------- Application & Window Delegates -----------------------
 
-@interface ElectrobunNSApplication : NSApplication <CefAppProtocol> {
+@interface SparkBunNSApplication : NSApplication <CefAppProtocol> {
     @private
     BOOL handlingSendEvent_;
     }
@@ -1084,7 +1084,7 @@ static NSString *keyEquivalentFromString(NSString *key) {
 
 // Convert shared AcceleratorParts to macOS NSEventModifierFlags.
 // On macOS, CommandOrControl and Command both map to the Command key.
-static NSEventModifierFlags modifierFlagsFromAccelerator(const electrobun::AcceleratorParts& parts) {
+static NSEventModifierFlags modifierFlagsFromAccelerator(const sparkbun::AcceleratorParts& parts) {
     NSEventModifierFlags flags = 0;
     if (parts.commandOrControl || parts.command) flags |= NSEventModifierFlagCommand;
     if (parts.control)                           flags |= NSEventModifierFlagControl;
@@ -1099,7 +1099,7 @@ static NSEventModifierFlags modifierFlagsFromAccelerator(const electrobun::Accel
 static void parseMenuAccelerator(NSString *accelerator,
                                  NSString **outKeyEquivalent,
                                  NSEventModifierFlags *outModifiers) {
-    auto parts = electrobun::parseAccelerator([accelerator UTF8String]);
+    auto parts = sparkbun::parseAccelerator([accelerator UTF8String]);
 
     *outModifiers = modifierFlagsFromAccelerator(parts);
 
@@ -1271,7 +1271,7 @@ NSArray<NSValue *> *addOverlapRects(NSArray<NSDictionary *> *rectsArray, CGFloat
 
     - (void)evaluateJavaScriptWithNoCompletion:(const char*)jsString { [self doesNotRecognizeSelector:_cmd]; }
     - (void)callAsyncJavascript:(const char*)messageId jsString:(const char*)jsString webviewId:(uint32_t)webviewId hostWebviewId:(uint32_t)hostWebviewId completionHandler:(callAsyncJavascriptCompletionHandler)completionHandler { [self doesNotRecognizeSelector:_cmd]; }
-    // todo: we don't need this to be public since it's only used to set the internal electrobun preview script
+    // todo: we don't need this to be public since it's only used to set the internal sparkbun preview script
     - (void)addPreloadScriptToWebView:(const char*)jsString { [self doesNotRecognizeSelector:_cmd]; }
     - (void)updateCustomPreloadScript:(const char*)jsString { [self doesNotRecognizeSelector:_cmd]; }
 
@@ -1442,7 +1442,7 @@ NSArray<NSValue *> *addOverlapRects(NSArray<NSDictionary *> *rectsArray, CGFloat
             NSString *pattern = isBlockRule ? [rule substringFromIndex:1] : rule;
             std::string patternStr = [pattern UTF8String] ?: "";
 
-            if (electrobun::globMatch(patternStr, urlStr)) {
+            if (sparkbun::globMatch(patternStr, urlStr)) {
                 allowed = !isBlockRule; // Last match wins
             }
         }
@@ -2548,7 +2548,7 @@ runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters
                 eventBridgeHandler:(HandlePostMessage)eventBridgeHandler
                 bunBridgeHandler:(HandlePostMessage)bunBridgeHandler
                 internalBridgeHandler:(HandlePostMessage)internalBridgeHandler
-                electrobunPreloadScript:(const char *)electrobunPreloadScript
+                sparkbunPreloadScript:(const char *)sparkbunPreloadScript
                 customPreloadScript:(const char *)customPreloadScript
                 viewsRoot:(const char *)viewsRoot
                 transparent:(bool)transparent
@@ -2691,7 +2691,7 @@ runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters
                     [self setPassthrough:YES];
                 }
 
-                [self addPreloadScriptToWebView:electrobunPreloadScript];
+                [self addPreloadScriptToWebView:sparkbunPreloadScript];
                 
                 // Note: For custom preload scripts we support either inline js or a views:// style
                 // url to a js file in the bundled views folder.
@@ -2908,7 +2908,7 @@ runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters
 
     - (void)updateCustomPreloadScript:(const char*)jsString {    
         WKUserContentController *contentController = self.webView.configuration.userContentController;
-        NSString *identifierComment = [NSString stringWithFormat:@"// %@\n", [NSString stringWithUTF8String:"electrobun_custom_preload_script"]];
+        NSString *identifierComment = [NSString stringWithFormat:@"// %@\n", [NSString stringWithUTF8String:"sparkbun_custom_preload_script"]];
         NSString *newScriptSource = [identifierComment stringByAppendingString:[NSString stringWithUTF8String:jsString ?: ""]];
         NSMutableArray *newScripts = [NSMutableArray array];
         for (WKUserScript *userScript in contentController.userScripts) {
@@ -4247,7 +4247,7 @@ static void requestDeviceCallback(WGPURequestDeviceStatus status, WGPUDevice dev
     }
     state->device = device;
     if (p_wgpuDeviceSetLabel) {
-        WGPUStringView label = { "Electrobun WGPU Device", WGPU_STRLEN };
+        WGPUStringView label = { "SparkBun WGPU Device", WGPU_STRLEN };
         p_wgpuDeviceSetLabel(device, label);
     }
     state->queue = p_wgpuDeviceGetQueue(device);
@@ -4319,7 +4319,7 @@ extern "C" void wgpuToggleGPUTestShader(AbstractView* abstractView) {
 
 // ----------------------- CEF and NSApplication Setup (C++ and ObjC) -----------------------
 
-@implementation ElectrobunNSApplication
+@implementation SparkBunNSApplication
     - (BOOL)isHandlingSendEvent {
         return handlingSendEvent_;
     }
@@ -4359,19 +4359,19 @@ extern "C" void wgpuToggleGPUTestShader(AbstractView* abstractView) {
 // C++ classes for CEF:
 
 
-class ElectrobunHandler : public CefClient,
+class SparkBunHandler : public CefClient,
                          public CefDisplayHandler,
                          public CefLifeSpanHandler,
                          public CefLoadHandler {
 public:
-    static ElectrobunHandler* GetInstance() {
+    static SparkBunHandler* GetInstance() {
         return g_instance;
     }
-    ElectrobunHandler() {
+    SparkBunHandler() {
         DCHECK(!g_instance);
         g_instance = this;
     }
-    ~ElectrobunHandler() {
+    ~SparkBunHandler() {
         g_instance = nullptr;
     }
 
@@ -4404,41 +4404,41 @@ public:
     }
 
 private:
-    static ElectrobunHandler* g_instance;
+    static SparkBunHandler* g_instance;
     typedef std::list<CefRefPtr<CefBrowser>> BrowserList;
     BrowserList browser_list_;
     bool is_closing_ = false;
 
-    IMPLEMENT_REFCOUNTING(ElectrobunHandler);
-    DISALLOW_COPY_AND_ASSIGN(ElectrobunHandler);
+    IMPLEMENT_REFCOUNTING(SparkBunHandler);
+    DISALLOW_COPY_AND_ASSIGN(SparkBunHandler);
 };
 
-ElectrobunHandler* ElectrobunHandler::g_instance = nullptr;
+SparkBunHandler* SparkBunHandler::g_instance = nullptr;
 
-electrobun::ChromiumFlagConfig g_userChromiumFlags;
+sparkbun::ChromiumFlagConfig g_userChromiumFlags;
 
-class ElectrobunApp : public CefApp,
+class SparkBunApp : public CefApp,
                      public CefBrowserProcessHandler,
                      public CefRenderProcessHandler {
 public:
-    ElectrobunApp() {
+    SparkBunApp() {
         
     }
     void OnBeforeCommandLineProcessing(const CefString& process_type, CefRefPtr<CefCommandLine> command_line) override {
         command_line->AppendSwitchWithValue("custom-scheme", "views");
 
         // macOS default flags — can be overridden via chromiumFlags in config
-        static const std::vector<electrobun::DefaultFlag> defaults = {
+        static const std::vector<sparkbun::DefaultFlag> defaults = {
             {"use-mock-keychain", ""},
             {"enable-features=PictureInPicture", ""},
             {"enable-fullscreen", ""},
             {"remote-allow-origins", "*"},
             {"allow-insecure-localhost", ""},
         };
-        electrobun::applyDefaultFlags(defaults, g_userChromiumFlags.skip, command_line);
+        sparkbun::applyDefaultFlags(defaults, g_userChromiumFlags.skip, command_line);
 
         // Apply user-defined chromium flags from build.json
-        electrobun::applyChromiumFlags(g_userChromiumFlags, command_line);
+        sparkbun::applyChromiumFlags(g_userChromiumFlags, command_line);
     }
     void OnRegisterCustomSchemes(CefRawPtr<CefSchemeRegistrar> registrar) override {        
         registrar->AddCustomScheme("views", 
@@ -4479,30 +4479,30 @@ public:
         // CefRegisterSchemeHandlerFactory("views", "", nullptr);
     }
     CefRefPtr<CefClient> GetDefaultClient() override {
-        return ElectrobunHandler::GetInstance();
+        return SparkBunHandler::GetInstance();
     }
 
 private:
-    IMPLEMENT_REFCOUNTING(ElectrobunApp);
-    DISALLOW_COPY_AND_ASSIGN(ElectrobunApp);
+    IMPLEMENT_REFCOUNTING(SparkBunApp);
+    DISALLOW_COPY_AND_ASSIGN(SparkBunApp);
 };
 
 // PreloadScript struct is now defined in shared/preload_script.h
 
-class ElectrobunResponseFilter : public CefResponseFilter {
+class SparkBunResponseFilter : public CefResponseFilter {
 private:
     std::string buffer_;
     bool has_head_;
     bool injected_;
-    PreloadScript electrobun_script_;
+    PreloadScript sparkbun_script_;
     PreloadScript custom_script_;
 
 public:
-    ElectrobunResponseFilter(const PreloadScript& electrobunScript, 
+    SparkBunResponseFilter(const PreloadScript& sparkbunScript, 
                            const PreloadScript& customScript)
         : has_head_(false), 
           injected_(false),
-          electrobun_script_(electrobunScript),
+          sparkbun_script_(sparkbunScript),
           custom_script_(customScript) {}
     
     virtual FilterStatus Filter(void* data_in,
@@ -4513,7 +4513,7 @@ public:
                                size_t& data_out_written) override {
 
         // Check if we have scripts to inject
-        if (electrobun_script_.code.empty() && custom_script_.code.empty()) {
+        if (sparkbun_script_.code.empty() && custom_script_.code.empty()) {
             // Nothing to inject, just copy the data
             size_t copy_size = std::min(data_in_size, data_out_size);
             memcpy(data_out, data_in, copy_size);
@@ -4550,7 +4550,7 @@ public:
                 
                 // Inject our scripts after the <head> tag
                 std::string scripts = "<script>\n";
-                scripts += electrobun_script_.code;
+                scripts += sparkbun_script_.code;
                 scripts += "\n</script>\n";
                 
                 if (!custom_script_.code.empty()) {
@@ -4571,7 +4571,7 @@ public:
             if (html_pos != std::string::npos) {
                 // Inject after <html> tag
                 std::string scripts = "<head>\n<script>\n";
-                scripts += electrobun_script_.code;
+                scripts += sparkbun_script_.code;
                 scripts += "\n</script>\n";
                 
                 if (!custom_script_.code.empty() ) {
@@ -4586,7 +4586,7 @@ public:
             } else {
                 // As a last resort, inject at the beginning
                 std::string scripts = "<script>\n";
-                scripts += electrobun_script_.code;
+                scripts += sparkbun_script_.code;
                 scripts += "\n</script>\n";
                 
                 if (!custom_script_.code.empty() ) {
@@ -4618,12 +4618,12 @@ public:
         return true;
     }
     
-    IMPLEMENT_REFCOUNTING(ElectrobunResponseFilter);
+    IMPLEMENT_REFCOUNTING(SparkBunResponseFilter);
 };
 
-CefRefPtr<ElectrobunApp> g_app;
+CefRefPtr<SparkBunApp> g_app;
 
-class ElectrobunClient : public CefClient,
+class SparkBunClient : public CefClient,
                         public CefRenderHandler,
                         public CefLoadHandler,
                         public CefRequestHandler,
@@ -4649,7 +4649,7 @@ private:
     int view_height_ = 600;
     bool osr_enabled_ = false;
 
-    PreloadScript electrobun_script_;
+    PreloadScript sparkbun_script_;
     PreloadScript custom_script_;
     static const int MENU_ID_DEV_TOOLS = 1;
 
@@ -4901,7 +4901,7 @@ public:
         }
     }
 
-    ElectrobunClient(uint32_t webviewId,
+    SparkBunClient(uint32_t webviewId,
                      HandlePostMessage eventBridgeHandler,
                      HandlePostMessage bunBridgeHandler,
                      HandlePostMessage internalBridgeHandler,
@@ -4917,7 +4917,7 @@ public:
         , is_sandboxed_(sandbox) {}    
 
     void AddPreloadScript(const std::string& script, bool mainFrameOnly = false) {
-        electrobun_script_ = {script, false};
+        sparkbun_script_ = {script, false};
     }
 
     void UpdateCustomPreloadScript(const std::string& script) {
@@ -5213,7 +5213,7 @@ public:
         if (frame->IsMain() && 
             response->GetMimeType().ToString().find("html") != std::string::npos) {
             NSLog(@"Creating response filter for HTML content");
-            return new ElectrobunResponseFilter(electrobun_script_, custom_script_);
+            return new SparkBunResponseFilter(sparkbun_script_, custom_script_);
         }
         
         return nullptr;
@@ -5226,7 +5226,7 @@ public:
         std::string frameUrl = frame->GetURL().ToString();
         std::string scriptUrl = GetScriptExecutionUrl(frameUrl);
 
-        // NSLog(@"OnLoadStart %s", frameUrl.c_str());//, electrobun_script_.code.c_str());           
+        // NSLog(@"OnLoadStart %s", frameUrl.c_str());//, sparkbun_script_.code.c_str());           
     }   
 
     void OnLoadEnd(CefRefPtr<CefBrowser> browser,
@@ -5312,7 +5312,7 @@ public:
             OpenRemoteDevToolsFrontend(browser);
 
             CefPoint inspect_at(params->GetXCoord(), params->GetYCoord());
-            CefRefPtr<ElectrobunClient> self(this);
+            CefRefPtr<SparkBunClient> self(this);
             CefRefPtr<CefBrowser> browser_ref(browser);
             dispatch_async(dispatch_get_main_queue(), ^{
                 // Disabled for now due to crash in CEF 144 on macOS.
@@ -5389,7 +5389,7 @@ public:
                 (event.modifiers & EVENTFLAG_COMMAND_DOWN) &&
                 (event.modifiers & EVENTFLAG_ALT_DOWN)) {
                 CefPoint inspect_at(0, 0);
-                CefRefPtr<ElectrobunClient> self(this);
+                CefRefPtr<SparkBunClient> self(this);
                 CefRefPtr<CefBrowser> browser_ref(browser);
                 dispatch_async(dispatch_get_main_queue(), ^{
                     self->ShowDevToolsWindow(browser_ref, inspect_at);
@@ -5506,7 +5506,7 @@ public:
         } else {
             // Unrecognized permission type — name what's being requested instead of
             // a generic "additional permissions" dialog so the user can decide.
-            std::string names = electrobun::describeCefPermissions(requested_permissions);
+            std::string names = sparkbun::describeCefPermissions(requested_permissions);
             message = [NSString stringWithFormat:
                 @"This page is requesting permission for: %s.\n\nDo you want to allow this?",
                 names.c_str()];
@@ -5765,25 +5765,25 @@ public:
         }
     }
 
-    IMPLEMENT_REFCOUNTING(ElectrobunClient);
-    DISALLOW_COPY_AND_ASSIGN(ElectrobunClient);
+    IMPLEMENT_REFCOUNTING(SparkBunClient);
+    DISALLOW_COPY_AND_ASSIGN(SparkBunClient);
 };
 
 // Initialize static debounce timestamp for cmd+click handling
-NSTimeInterval ElectrobunClient::lastCmdClickTime = 0;
+NSTimeInterval SparkBunClient::lastCmdClickTime = 0;
 
 void RemoteDevToolsClosed(void* ctx, int target_id) {
     if (!ctx) {
         return;
     }
-    static_cast<ElectrobunClient*>(ctx)->OnRemoteDevToolsClosed(target_id);
+    static_cast<SparkBunClient*>(ctx)->OnRemoteDevToolsClosed(target_id);
 }
 
 @interface CEFWebViewImpl : AbstractView
     // @property (nonatomic, strong) WKWebView *webView;
 
     @property (nonatomic, assign) CefRefPtr<CefBrowser> browser;
-    @property (nonatomic, assign) CefRefPtr<ElectrobunClient> client;
+    @property (nonatomic, assign) CefRefPtr<SparkBunClient> client;
     @property (nonatomic, strong) CEFOSRView *osrView;  // For transparent/OSR mode
     @property (nonatomic, assign) BOOL isOSRMode;
     @property (nonatomic, copy) NSString *pendingURLString;
@@ -5804,7 +5804,7 @@ void RemoteDevToolsClosed(void* ctx, int target_id) {
                 eventBridgeHandler:(HandlePostMessage)eventBridgeHandler
                 bunBridgeHandler:(HandlePostMessage)bunBridgeHandler
                 internalBridgeHandler:(HandlePostMessage)internalBridgeHandler
-                electrobunPreloadScript:(const char *)electrobunPreloadScript
+                sparkbunPreloadScript:(const char *)sparkbunPreloadScript
                 customPreloadScript:(const char *)customPreloadScript
                 viewsRoot:(const char *)viewsRoot
                 transparent:(bool)transparent
@@ -5816,8 +5816,8 @@ bool initializeCEF() {
     static bool initialized = false;
     if (initialized) return true;
     
-    [ElectrobunNSApplication sharedApplication];
-    if (![NSApp isKindOfClass:[ElectrobunNSApplication class]]) {        
+    [SparkBunNSApplication sharedApplication];
+    if (![NSApp isKindOfClass:[SparkBunNSApplication class]]) {        
         return false;
     }
 
@@ -5830,13 +5830,13 @@ bool initializeCEF() {
     }
     
     CefMainArgs main_args(argc, argv);
-    g_app = new ElectrobunApp();
+    g_app = new SparkBunApp();
 
     // Read user-defined chromium flags from build.json
     NSString* buildJsonPath = [[NSBundle mainBundle] pathForResource:@"build" ofType:@"json"];
     if (buildJsonPath) {
-        std::string buildJsonContent = electrobun::readFileToString([buildJsonPath UTF8String]);
-        g_userChromiumFlags = electrobun::parseChromiumFlags(buildJsonContent);
+        std::string buildJsonContent = sparkbun::readFileToString([buildJsonPath UTF8String]);
+        g_userChromiumFlags = sparkbun::parseChromiumFlags(buildJsonContent);
     }
 
     CefSettings settings;
@@ -5888,22 +5888,22 @@ bool initializeCEF() {
     }
     
     // Add cache path to prevent warnings and potential issues
-     // Use app-specific cache directory to allow multiple Electrobun apps to run simultaneously
+     // Use app-specific cache directory to allow multiple SparkBun apps to run simultaneously
     NSString* appSupportPath = [NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) firstObject];
 
     // Build path with identifier/channel structure (consistent with CLI and updater)
     std::string cachePathStr = buildAppDataPath(
         [appSupportPath UTF8String],
-        g_electrobunIdentifier,
-        g_electrobunChannel,
+        g_sparkbunIdentifier,
+        g_sparkbunChannel,
         "CEF"
     );
     NSString* cachePath = [NSString stringWithUTF8String:cachePathStr.c_str()];
     NSLog(@"[CEF] Using path: %s", cachePathStr.c_str());
 
-    // One-shot wipe if Electrobun's cache format version has been bumped
+    // One-shot wipe if SparkBun's cache format version has been bumped
     // since the user's last launch. See cache_migration.h.
-    electrobun::migrateCacheFolderIfNeeded(cachePathStr);
+    sparkbun::migrateCacheFolderIfNeeded(cachePathStr);
 
     CefString(&settings.root_cache_path) = [cachePath UTF8String];
 
@@ -5918,7 +5918,7 @@ bool initializeCEF() {
     CefString(&settings.accept_language_list) = "en-US,en";
     
     // Register custom scheme
-    // CefRegisterSchemeHandlerFactory("views", "", new ElectrobunSchemeHandlerFactory(assetFileLoader, 0));
+    // CefRegisterSchemeHandlerFactory("views", "", new SparkBunSchemeHandlerFactory(assetFileLoader, 0));
     
     // Make CEF aware of the custom scheme
     // CefCommandLine::GetGlobalCommandLine()->AppendSwitch("register-scheme-handler");
@@ -5948,9 +5948,9 @@ bool initializeCEF() {
 
 
 // The main scheme handler class
-class ElectrobunSchemeHandler : public CefResourceHandler {
+class SparkBunSchemeHandler : public CefResourceHandler {
 public:
-     ElectrobunSchemeHandler(uint32_t webviewId)
+     SparkBunSchemeHandler(uint32_t webviewId)
     : webviewId_(webviewId), hasResponse_(false), offset_(0) {}
 
   bool Open(CefRefPtr<CefRequest> request,
@@ -6089,8 +6089,8 @@ public:
     bool hasResponse_;
     size_t offset_;
 
-    IMPLEMENT_REFCOUNTING(ElectrobunSchemeHandler);
-    DISALLOW_COPY_AND_ASSIGN(ElectrobunSchemeHandler);
+    IMPLEMENT_REFCOUNTING(SparkBunSchemeHandler);
+    DISALLOW_COPY_AND_ASSIGN(SparkBunSchemeHandler);
 };
 
 
@@ -6099,9 +6099,9 @@ static std::map<int, uint32_t> browserToWebviewMap;
 static std::mutex browserMapMutex;
 
 // The factory class that creates scheme handlers
-class ElectrobunSchemeHandlerFactory : public CefSchemeHandlerFactory {
+class SparkBunSchemeHandlerFactory : public CefSchemeHandlerFactory {
 public:
-  ElectrobunSchemeHandlerFactory() {}
+  SparkBunSchemeHandlerFactory() {}
 
   CefRefPtr<CefResourceHandler> Create(CefRefPtr<CefBrowser> browser,
                                          CefRefPtr<CefFrame> frame,
@@ -6124,11 +6124,11 @@ public:
         NSLog(@"  Browser %d -> Webview %u", pair.first, pair.second);
     }
     
-    return new ElectrobunSchemeHandler(webviewId);
+    return new SparkBunSchemeHandler(webviewId);
   }
   
-  IMPLEMENT_REFCOUNTING(ElectrobunSchemeHandlerFactory);
-  DISALLOW_COPY_AND_ASSIGN(ElectrobunSchemeHandlerFactory);
+  IMPLEMENT_REFCOUNTING(SparkBunSchemeHandlerFactory);
+  DISALLOW_COPY_AND_ASSIGN(SparkBunSchemeHandlerFactory);
 };
 
 
@@ -6142,7 +6142,7 @@ public:
 // Platform implementation for partition_context.h — builds the on-disk
 // cache_path for a persistent partition under the macOS Application Support
 // directory, ensuring the directory exists.
-namespace electrobun {
+namespace sparkbun {
 std::string buildAndEnsurePartitionCachePath(const std::string& partitionName) {
     NSString* appSupportPath = [NSSearchPathForDirectoriesInDomains(
         NSApplicationSupportDirectory, NSUserDomainMask, YES) firstObject];
@@ -6150,8 +6150,8 @@ std::string buildAndEnsurePartitionCachePath(const std::string& partitionName) {
 
     std::string cachePathStr = buildCEFPartitionPath(
         [appSupportPath UTF8String],
-        g_electrobunIdentifier,
-        g_electrobunChannel,
+        g_sparkbunIdentifier,
+        g_sparkbunChannel,
         "CEF",
         partitionName);
 
@@ -6165,13 +6165,13 @@ std::string buildAndEnsurePartitionCachePath(const std::string& partitionName) {
     }
     return cachePathStr;
 }
-} // namespace electrobun
+} // namespace sparkbun
 
 CefRefPtr<CefRequestContext> CreateRequestContextForPartition(const char* partitionIdentifier,
                                                                uint32_t webviewId) {
-    static CefRefPtr<ElectrobunSchemeHandlerFactory> schemeFactory =
-        new ElectrobunSchemeHandlerFactory();
-    return electrobun::getOrCreateRequestContextForPartition(
+    static CefRefPtr<SparkBunSchemeHandlerFactory> schemeFactory =
+        new SparkBunSchemeHandlerFactory();
+    return sparkbun::getOrCreateRequestContextForPartition(
         partitionIdentifier, webviewId, schemeFactory);
 }
 
@@ -6191,7 +6191,7 @@ CefRefPtr<CefRequestContext> CreateRequestContextForPartition(const char* partit
                 eventBridgeHandler:(HandlePostMessage)eventBridgeHandler
                 bunBridgeHandler:(HandlePostMessage)bunBridgeHandler
             internalBridgeHandler:(HandlePostMessage)internalBridgeHandler
-            electrobunPreloadScript:(const char *)electrobunPreloadScript
+            sparkbunPreloadScript:(const char *)sparkbunPreloadScript
             customPreloadScript:(const char *)customPreloadScript
             viewsRoot:(const char *)viewsRoot
             transparent:(bool)transparent
@@ -6254,7 +6254,7 @@ CefRefPtr<CefRequestContext> CreateRequestContextForPartition(const char* partit
 
                 // Global scheme handler is already registered in getOrCreateRequestContext()
 
-                self.client = new ElectrobunClient(
+                self.client = new SparkBunClient(
                     webviewId,
                     eventBridgeHandler,
                     bunBridgeHandler,
@@ -6271,7 +6271,7 @@ CefRefPtr<CefRequestContext> CreateRequestContextForPartition(const char* partit
                 }                
 
                 // store the script values
-                [self addPreloadScriptToWebView:electrobunPreloadScript];
+                [self addPreloadScriptToWebView:sparkbunPreloadScript];
                 
                 // Note: For custom preload scripts we support either inline js or a views:// style
                 // url to a js file in the bundled views folder.
@@ -6796,10 +6796,10 @@ extern "C" void startEventLoop(const char* identifier, const char* name, const c
 
     // Store identifier and channel globally for use in CEF initialization
     if (identifier && identifier[0]) {
-        g_electrobunIdentifier = std::string(identifier);
+        g_sparkbunIdentifier = std::string(identifier);
     }
     if (channel && channel[0]) {
-        g_electrobunChannel = std::string(channel);
+        g_sparkbunChannel = std::string(channel);
     }
 
     useCEF = isCEFAvailable();    
@@ -6970,7 +6970,7 @@ extern "C" AbstractView* initWebview(uint32_t webviewId,
                         HandlePostMessage eventBridgeHandler,
                         HandlePostMessage bunBridgeHandler,
                         HandlePostMessage internalBridgeHandler,
-                        const char *electrobunPreloadScript,
+                        const char *sparkbunPreloadScript,
                         const char *customPreloadScript,
                         const char *viewsRoot,
                         bool transparent,
@@ -7017,7 +7017,7 @@ extern "C" AbstractView* initWebview(uint32_t webviewId,
                                                   eventBridgeHandler:eventBridgeHandler
                                                     bunBridgeHandler:bunBridgeHandler
                                                internalBridgeHandler:internalBridgeHandler
-                                            electrobunPreloadScript:strdup(electrobunPreloadScript)
+                                            sparkbunPreloadScript:strdup(sparkbunPreloadScript)
                                                customPreloadScript:strdup(customPreloadScript)
                                                            viewsRoot:strdup(viewsRoot)
                                                         transparent:transparent
@@ -7429,10 +7429,10 @@ extern "C" NSRect createNSRectWrapper(double x, double y, double width, double h
 }
 
 
-@interface ElectrobunWindow : NSWindow
+@interface SparkBunWindow : NSWindow
 @end
 
-@implementation ElectrobunWindow
+@implementation SparkBunWindow
 - (BOOL)canBecomeKeyWindow { return YES; }
 - (BOOL)canBecomeMainWindow { return YES; }
 @end
@@ -7450,7 +7450,7 @@ NSWindow *createNSWindowWithFrameAndStyle(uint32_t windowId,
     NSRect screenFrame = [primaryScreen frame];
     config.frame.origin.y = screenFrame.size.height - config.frame.origin.y;
     
-    NSWindow *window = [[ElectrobunWindow alloc] initWithContentRect:config.frame
+    NSWindow *window = [[SparkBunWindow alloc] initWithContentRect:config.frame
                                                           styleMask:config.styleMask
                                                             backing:NSBackingStoreBuffered
                                                               defer:YES
@@ -8471,7 +8471,7 @@ extern "C" void setJSUtils(GetMimeType getMimeType, GetHTMLForWebviewSync getHTM
     // create a dispatch queue on the current thread (worker thread) that
     // can later be called from main
     dispatch_queue_attr_t attr = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_DEFAULT, 0);
-    jsWorkerQueue = dispatch_queue_create("com.electrobun.jsworker", attr);    
+    jsWorkerQueue = dispatch_queue_create("com.sparkbun.jsworker", attr);    
 
 }
 
@@ -8532,7 +8532,7 @@ static NSLock *g_globalShortcutsLock = nil;
 // Helper to parse modifier flags from accelerator string using the shared
 // cross-platform parser from accelerator_parser.h.
 static NSEventModifierFlags parseModifiers(NSString *accelerator, NSString **outKey) {
-    auto parts = electrobun::parseAccelerator([accelerator UTF8String]);
+    auto parts = sparkbun::parseAccelerator([accelerator UTF8String]);
     *outKey = [NSString stringWithUTF8String:parts.key.c_str()];
     return modifierFlagsFromAccelerator(parts);
 }