fix: call onGuiCreated callback after CARemoteLayerServer setup completes in showGui()

Source/Helper/HelperPluginHost.mm

@@ -30,51 +30,40 @@ HelperPluginHost::~HelperPluginHost()
 bool HelperPluginHost::loadPlugin(const juce::String& path, double sampleRate, int blockSize)
 {
     unloadPlugin();
-
     currentSampleRate = sampleRate;
     currentBlockSize = blockSize;
 
     juce::File pluginFile(path);
-    if (!pluginFile.exists())
-        return false;
+    if (!pluginFile.exists()) return false;
 
     juce::OwnedArray<juce::PluginDescription> typesFound;
-
     for (int i = 0; i < formatManager.getNumFormats(); ++i)
     {
         auto* format = formatManager.getFormat(i);
         bool isVST3 = pluginFile.getFileExtension() == ".vst3";
         bool isAU = pluginFile.getFileExtension() == ".component";
-
         if (isVST3 && format->getName() != "VST3") continue;
         if (isAU && format->getName() != "AudioUnit") continue;
-
         format->findAllTypesForFile(typesFound, pluginFile.getFullPathName());
-        if (typesFound.size() > 0)
-            break;
+        if (typesFound.size() > 0) break;
     }
 
-    if (typesFound.isEmpty())
-        return false;
+    if (typesFound.isEmpty()) return false;
 
     juce::String errorMessage;
     plugin = formatManager.createPluginInstance(*typesFound[0], sampleRate, blockSize, errorMessage);
-
     if (plugin == nullptr)
     {
-        DBG("HelperPluginHost: Failed to create plugin: " + errorMessage);
+        DBG("HelperPluginHost: Failed: " + errorMessage);
         return false;
     }
 
     plugin->enableAllBuses();
-
     auto layout = juce::AudioProcessor::BusesLayout();
     layout.inputBuses.add(juce::AudioChannelSet::stereo());
     layout.outputBuses.add(juce::AudioChannelSet::stereo());
-
     if (plugin->checkBusesLayoutSupported(layout))
         plugin->setBusesLayout(layout);
-
     plugin->prepareToPlay(sampleRate, blockSize);
 
     DBG("HelperPluginHost: Loaded " + getPluginName() + " (" + juce::String(getParameterCount()) + " params)");
@@ -84,31 +73,16 @@ bool HelperPluginHost::loadPlugin(const juce::String& path, double sampleRate, i
 void HelperPluginHost::unloadPlugin()
 {
     hideGui();
-    if (plugin)
-    {
-        plugin->releaseResources();
-        plugin.reset();
-    }
+    if (plugin) { plugin->releaseResources(); plugin.reset(); }
 }
 
-juce::String HelperPluginHost::getPluginName() const
-{
-    return plugin ? plugin->getName() : juce::String();
-}
-
-int HelperPluginHost::getParameterCount() const
-{
-    return plugin ? plugin->getParameters().size() : 0;
-}
+juce::String HelperPluginHost::getPluginName() const { return plugin ? plugin->getName() : juce::String(); }
+int HelperPluginHost::getParameterCount() const { return plugin ? plugin->getParameters().size() : 0; }
 
 // --- Audio ---
 
 void HelperPluginHost::setSharedAudio(SharedAudioBuffer* shm, SharedSemaphore* inSem, SharedSemaphore* outSem)
-{
-    sharedAudio = shm;
-    inputSem = inSem;
-    outputSem = outSem;
-}
+{ sharedAudio = shm; inputSem = inSem; outputSem = outSem; }
 
 void HelperPluginHost::startProcessing()
 {
@@ -121,8 +95,7 @@ void HelperPluginHost::stopProcessing()
 {
     processing.store(false);
     if (inputSem) inputSem->signal();
-    if (audioThread.joinable())
-        audioThread.join();
+    if (audioThread.joinable()) audioThread.join();
 }
 
 void HelperPluginHost::audioProcessingLoop()
@@ -133,9 +106,7 @@ void HelperPluginHost::audioProcessingLoop()
 
     while (processing.load())
     {
-        if (!inputSem->wait(100))
-            continue;
-
+        if (!inputSem->wait(100)) continue;
         if (!processing.load()) break;
         if (!plugin || !sharedAudio) continue;
 
@@ -166,34 +137,26 @@ std::vector<HelperPluginHost::ParamInfo> HelperPluginHost::searchParams(const ju
 {
     std::vector<ParamInfo> results;
     if (!plugin) return results;
-
     auto& params = plugin->getParameters();
     auto keywordLower = keyword.toLowerCase();
-
     for (int i = 0; i < params.size(); ++i)
     {
         auto* param = params[i];
         auto name = param->getName(128);
-
         if (keyword.isEmpty() || name.toLowerCase().contains(keywordLower))
         {
             ParamInfo info;
-            info.index = i;
-            info.name = name;
+            info.index = i; info.name = name;
             info.value = param->getValue();
             info.displayText = param->getText(param->getValue(), 64);
-
             if (auto* hosted = dynamic_cast<juce::AudioPluginInstance::HostedParameter*>(param))
                 info.id = hosted->getParameterID();
             else
                 info.id = juce::String(i);
-
             results.push_back(info);
-            if (results.size() >= PluginBridgeConstants::kMaxParamResults)
-                break;
+            if (results.size() >= PluginBridgeConstants::kMaxParamResults) break;
         }
     }
-
     return results;
 }
 
@@ -201,20 +164,16 @@ std::vector<std::pair<int, float>> HelperPluginHost::getParams(const std::vector
 {
     std::vector<std::pair<int, float>> results;
     if (!plugin) return results;
-
     auto& params = plugin->getParameters();
     for (int idx : ids)
-    {
         if (idx >= 0 && idx < params.size())
             results.push_back({idx, params[idx]->getValue()});
-    }
     return results;
 }
 
 bool HelperPluginHost::setParams(const std::map<int, float>& values)
 {
     if (!plugin) return false;
-
     auto& params = plugin->getParameters();
     for (auto& [idx, val] : values)
     {
@@ -235,7 +194,7 @@ void HelperPluginHost::showGui()
 {
 #if JUCE_MAC
     if (!plugin || !plugin->hasEditor()) return;
-    if (editor) return; // already showing
+    if (editor) return;
 
     juce::MessageManager::callAsync([this]()
     {
@@ -247,18 +206,16 @@ void HelperPluginHost::showGui()
         guiWidth = editor->getWidth();
         guiHeight = editor->getHeight();
 
-        // Create a hidden NSWindow to host the editor (needed for layer-backed rendering)
+        // Hidden NSWindow for layer-backed rendering
         NSWindow* window = [[NSWindow alloc]
             initWithContentRect:NSMakeRect(0, 0, guiWidth, guiHeight)
             styleMask:NSWindowStyleMaskBorderless
             backing:NSBackingStoreBuffered
             defer:NO];
         [window setReleasedWhenClosed:NO];
-
-        // Make the window layer-backed
         [[window contentView] setWantsLayer:YES];
 
-        // Add the JUCE editor as a child view
+        // Add JUCE editor view
         editor->addToDesktop(0, (void*)[window contentView]);
         if (auto* peer = editor->getPeer())
         {
@@ -267,24 +224,24 @@ void HelperPluginHost::showGui()
             [editorView setFrame:[[window contentView] bounds]];
         }
 
-        // Set up CARemoteLayerServer
+        // CARemoteLayerServer
         CARemoteLayerServer* server = [CARemoteLayerServer sharedServer];
         remoteLayerServer = (__bridge_retained void*)server;
 
-        // Register the server port via NSMachBootstrapServer
+        // Register port
         mach_port_t port = server.serverPort;
         NSMachPort* machPort = [NSMachPort portWithMachPort:port];
-        NSString* portName = [NSString stringWithUTF8String:
-            layerPortName.toRawUTF8()];
-        [[NSMachBootstrapServer sharedInstance] registerPort:machPort name:portName];
-
-        // The window's content layer IS the remote layer content
-        // CARemoteLayerServer automatically serves the process's layer tree
+        NSString* portNameNS = [NSString stringWithUTF8String:layerPortName.toRawUTF8()];
+        [[NSMachBootstrapServer sharedInstance] registerPort:machPort name:portNameNS];
 
         guiWindow = (__bridge_retained void*)window;
 
-        DBG("HelperPluginHost: GUI created, layer port: " + layerPortName +
+        DBG("HelperPluginHost: GUI ready, port: " + layerPortName +
             " size: " + juce::String(guiWidth) + "x" + juce::String(guiHeight));
+
+        // NOTIFY HOST that GUI is ready with port name and dimensions
+        if (onGuiCreated)
+            onGuiCreated(layerPortName, guiWidth, guiHeight);
     });
 #endif
 }
@@ -305,10 +262,8 @@ void HelperPluginHost::hideGui()
 
         if (remoteLayerServer)
         {
-            // Unregister port
-            NSString* portName = [NSString stringWithUTF8String:layerPortName.toRawUTF8()];
-            [[NSMachBootstrapServer sharedInstance] registerPort:nil name:portName];
-
+            NSString* portNameNS = [NSString stringWithUTF8String:layerPortName.toRawUTF8()];
+            [[NSMachBootstrapServer sharedInstance] registerPort:nil name:portNameNS];
             CFRelease(remoteLayerServer);
             remoteLayerServer = nullptr;
         }
@@ -324,11 +279,9 @@ void HelperPluginHost::injectMouseDown(float x, float y, int button)
     if (!guiWindow) return;
     NSWindow* window = (__bridge NSWindow*)guiWindow;
     NSEvent* event = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDown
-        location:NSMakePoint(x, guiHeight - y) // flip Y
-        modifierFlags:0
-        timestamp:[[NSProcessInfo processInfo] systemUptime]
-        windowNumber:[window windowNumber]
-        context:nil eventNumber:0 clickCount:1 pressure:1.0];
+        location:NSMakePoint(x, guiHeight - y)
+        modifierFlags:0 timestamp:[[NSProcessInfo processInfo] systemUptime]
+        windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1.0];
     [NSApp postEvent:event atStart:NO];
 #endif
 }
@@ -340,10 +293,8 @@ void HelperPluginHost::injectMouseUp(float x, float y, int button)
     NSWindow* window = (__bridge NSWindow*)guiWindow;
     NSEvent* event = [NSEvent mouseEventWithType:NSEventTypeLeftMouseUp
         location:NSMakePoint(x, guiHeight - y)
-        modifierFlags:0
-        timestamp:[[NSProcessInfo processInfo] systemUptime]
-        windowNumber:[window windowNumber]
-        context:nil eventNumber:0 clickCount:1 pressure:0.0];
+        modifierFlags:0 timestamp:[[NSProcessInfo processInfo] systemUptime]
+        windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:0.0];
     [NSApp postEvent:event atStart:NO];
 #endif
 }
@@ -355,10 +306,8 @@ void HelperPluginHost::injectMouseMove(float x, float y)
     NSWindow* window = (__bridge NSWindow*)guiWindow;
     NSEvent* event = [NSEvent mouseEventWithType:NSEventTypeMouseMoved
         location:NSMakePoint(x, guiHeight - y)
-        modifierFlags:0
-        timestamp:[[NSProcessInfo processInfo] systemUptime]
-        windowNumber:[window windowNumber]
-        context:nil eventNumber:0 clickCount:0 pressure:0.0];
+        modifierFlags:0 timestamp:[[NSProcessInfo processInfo] systemUptime]
+        windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:0 pressure:0.0];
     [NSApp postEvent:event atStart:NO];
 #endif
 }
@@ -370,10 +319,8 @@ void HelperPluginHost::injectMouseDrag(float x, float y, int button)
     NSWindow* window = (__bridge NSWindow*)guiWindow;
     NSEvent* event = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDragged
         location:NSMakePoint(x, guiHeight - y)
-        modifierFlags:0
-        timestamp:[[NSProcessInfo processInfo] systemUptime]
-        windowNumber:[window windowNumber]
-        context:nil eventNumber:0 clickCount:0 pressure:1.0];
+        modifierFlags:0 timestamp:[[NSProcessInfo processInfo] systemUptime]
+        windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:0 pressure:1.0];
     [NSApp postEvent:event atStart:NO];
 #endif
 }
@@ -382,8 +329,7 @@ void HelperPluginHost::injectMouseScroll(float x, float y, float dx, float dy)
 {
 #if JUCE_MAC
     if (!guiWindow) return;
-    CGEventRef scrollEvent = CGEventCreateScrollWheelEvent(NULL,
-        kCGScrollEventUnitPixel, 2, (int32_t)dy, (int32_t)dx);
+    CGEventRef scrollEvent = CGEventCreateScrollWheelEvent(NULL, kCGScrollEventUnitPixel, 2, (int32_t)dy, (int32_t)dx);
     NSEvent* event = [NSEvent eventWithCGEvent:scrollEvent];
     CFRelease(scrollEvent);
     [NSApp postEvent:event atStart:NO];
@@ -396,16 +342,10 @@ void HelperPluginHost::injectKeyDown(int keyCode, const juce::String& chars, int
     if (!guiWindow) return;
     NSWindow* window = (__bridge NSWindow*)guiWindow;
     NSString* nsChars = [NSString stringWithUTF8String:chars.toRawUTF8()];
-    NSEvent* event = [NSEvent keyEventWithType:NSEventTypeKeyDown
-        location:NSZeroPoint
-        modifierFlags:(NSEventModifierFlags)modifiers
-        timestamp:[[NSProcessInfo processInfo] systemUptime]
-        windowNumber:[window windowNumber]
-        context:nil
-        characters:nsChars
-        charactersIgnoringModifiers:nsChars
-        isARepeat:NO
-        keyCode:(unsigned short)keyCode];
+    NSEvent* event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSZeroPoint
+        modifierFlags:(NSEventModifierFlags)modifiers timestamp:[[NSProcessInfo processInfo] systemUptime]
+        windowNumber:[window windowNumber] context:nil characters:nsChars
+        charactersIgnoringModifiers:nsChars isARepeat:NO keyCode:(unsigned short)keyCode];
     [NSApp postEvent:event atStart:NO];
 #endif
 }
@@ -416,16 +356,10 @@ void HelperPluginHost::injectKeyUp(int keyCode, const juce::String& chars, int m
     if (!guiWindow) return;
     NSWindow* window = (__bridge NSWindow*)guiWindow;
     NSString* nsChars = [NSString stringWithUTF8String:chars.toRawUTF8()];
-    NSEvent* event = [NSEvent keyEventWithType:NSEventTypeKeyUp
-        location:NSZeroPoint
-        modifierFlags:(NSEventModifierFlags)modifiers
-        timestamp:[[NSProcessInfo processInfo] systemUptime]
-        windowNumber:[window windowNumber]
-        context:nil
-        characters:nsChars
-        charactersIgnoringModifiers:nsChars
-        isARepeat:NO
-        keyCode:(unsigned short)keyCode];
+    NSEvent* event = [NSEvent keyEventWithType:NSEventTypeKeyUp location:NSZeroPoint
+        modifierFlags:(NSEventModifierFlags)modifiers timestamp:[[NSProcessInfo processInfo] systemUptime]
+        windowNumber:[window windowNumber] context:nil characters:nsChars
+        charactersIgnoringModifiers:nsChars isARepeat:NO keyCode:(unsigned short)keyCode];
     [NSApp postEvent:event atStart:NO];
 #endif
 }
@@ -444,21 +378,13 @@ bool HelperPluginHost::setStateBase64(const juce::String& base64State)
 {
     if (!plugin) return false;
     juce::MemoryBlock stateData;
-    if (!stateData.fromBase64Encoding(base64State))
-        return false;
+    if (!stateData.fromBase64Encoding(base64State)) return false;
     plugin->setStateInformation(stateData.getData(), (int)stateData.getSize());
     return true;
 }
 
 void HelperPluginHost::configure(double sampleRate, int blockSize, int channels)
 {
-    currentSampleRate = sampleRate;
-    currentBlockSize = blockSize;
-    currentChannels = channels;
-
-    if (plugin)
-    {
-        plugin->releaseResources();
-        plugin->prepareToPlay(sampleRate, blockSize);
-    }
+    currentSampleRate = sampleRate; currentBlockSize = blockSize; currentChannels = channels;
+    if (plugin) { plugin->releaseResources(); plugin->prepareToPlay(sampleRate, blockSize); }
 }