Upload Source/Plugin/HelperConnection.cpp

Source/Plugin/HelperConnection.cpp

@@ -17,7 +17,6 @@ using json = nlohmann::json;
 HelperConnection::HelperConnection()
 {
     myPid = getpid();
-    // Ignore SIGPIPE globally (macOS doesn't have MSG_NOSIGNAL)
     signal(SIGPIPE, SIG_IGN);
 }
 
@@ -30,7 +29,6 @@ bool HelperConnection::spawnHelper()
 {
     killHelper();
 
-    // 1. Create shared memory
     auto shmName = IPC::getShmName(myPid);
     if (!sharedAudio.create(shmName))
     {
@@ -38,7 +36,6 @@ bool HelperConnection::spawnHelper()
         return false;
     }
 
-    // 2. Create semaphores
     if (!inputSem.create(IPC::getInputSemName(myPid)) ||
         !outputSem.create(IPC::getOutputSemName(myPid)))
     {
@@ -46,7 +43,6 @@ bool HelperConnection::spawnHelper()
         return false;
     }
 
-    // 3. Create Unix domain socket (server side)
     auto socketPath = IPC::getSocketPath(myPid);
     unlink(socketPath.c_str());
 
@@ -65,37 +61,42 @@ bool HelperConnection::spawnHelper()
     if (bind(serverSocketFd, (struct sockaddr*)&addr, sizeof(addr)) < 0 ||
         listen(serverSocketFd, 1) < 0)
     {
-        DBG("HelperConnection: Failed to bind/listen socket");
+        DBG("HelperConnection: Failed to bind/listen");
         close(serverSocketFd);
         serverSocketFd = -1;
         return false;
     }
 
-    // 4. Find helper binary
-    auto helperPath = juce::File::getSpecialLocation(juce::File::currentExecutableFile)
-                          .getParentDirectory()  // MacOS/
-                          .getParentDirectory()  // Contents/
-                          .getChildFile("Resources")
-                          .getChildFile(PluginBridgeConstants::kHelperBinaryName);
+    // Find helper .app bundle inside .vst3/Contents/Resources/
+    auto helperApp = juce::File::getSpecialLocation(juce::File::currentExecutableFile)
+                         .getParentDirectory()   // MacOS/
+                         .getParentDirectory()   // Contents/
+                         .getChildFile("Resources")
+                         .getChildFile("PluginBridgeHelper.app")
+                         .getChildFile("Contents")
+                         .getChildFile("MacOS")
+                         .getChildFile(PluginBridgeConstants::kHelperBinaryName);
 
-    if (!helperPath.exists())
+    if (!helperApp.exists())
     {
-        helperPath = juce::File::getSpecialLocation(juce::File::currentExecutableFile)
-                         .getParentDirectory()
-                         .getChildFile(PluginBridgeConstants::kHelperBinaryName);
+        // Fallback: bare binary
+        helperApp = juce::File::getSpecialLocation(juce::File::currentExecutableFile)
+                        .getParentDirectory()
+                        .getParentDirectory()
+                        .getChildFile("Resources")
+                        .getChildFile(PluginBridgeConstants::kHelperBinaryName);
     }
 
-    if (!helperPath.exists())
+    if (!helperApp.exists())
     {
-        DBG("HelperConnection: Helper binary not found at: " + helperPath.getFullPathName());
+        DBG("HelperConnection: Helper not found at: " + helperApp.getFullPathName());
         return false;
     }
 
-    // 5. Spawn helper process
     state.store(State::Starting);
 
     auto pidStr = juce::String(myPid).toStdString();
-    auto helperPathStr = helperPath.getFullPathName().toStdString();
+    auto helperPathStr = helperApp.getFullPathName().toStdString();
 
     pid_t pid;
     char* argv[] = {
@@ -108,7 +109,7 @@ bool HelperConnection::spawnHelper()
     int spawnResult = posix_spawn(&pid, helperPathStr.c_str(), nullptr, nullptr, argv, environ);
     if (spawnResult != 0)
     {
-        DBG("HelperConnection: Failed to spawn helper: " + juce::String(strerror(spawnResult)));
+        DBG("HelperConnection: Failed to spawn: " + juce::String(strerror(spawnResult)));
         state.store(State::Disconnected);
         return false;
     }
@@ -116,7 +117,6 @@ bool HelperConnection::spawnHelper()
     helperPid = pid;
     helperRunning.store(true);
 
-    // 6. Accept connection from helper (with timeout)
     struct pollfd pfd;
     pfd.fd = serverSocketFd;
     pfd.events = POLLIN;
@@ -131,23 +131,19 @@ bool HelperConnection::spawnHelper()
     clientSocketFd = accept(serverSocketFd, nullptr, nullptr);
     if (clientSocketFd < 0)
     {
-        DBG("HelperConnection: Failed to accept helper connection");
+        DBG("HelperConnection: Failed to accept connection");
         killHelper();
         return false;
     }
 
-    // Set SO_NOSIGPIPE on the accepted socket (macOS)
     int nosigpipe = 1;
     setsockopt(clientSocketFd, SOL_SOCKET, SO_NOSIGPIPE, &nosigpipe, sizeof(nosigpipe));
 
-    // 7. Start IPC listen thread
     ipcRunning.store(true);
     ipcThread = std::thread([this]() { ipcListenLoop(); });
 
-    // 8. Start crash detection timer
     startTimerHz(4);
 
-    // Wait for "ready" notification
     int waitMs = 0;
     while (state.load() == State::Starting && waitMs < IPC::kHelperTimeoutMs)
     {
@@ -161,8 +157,8 @@ bool HelperConnection::spawnHelper()
 void HelperConnection::killHelper()
 {
     stopTimer();
-
     ipcRunning.store(false);
+
     if (clientSocketFd >= 0) { close(clientSocketFd); clientSocketFd = -1; }
     if (serverSocketFd >= 0) { close(serverSocketFd); serverSocketFd = -1; }
     if (ipcThread.joinable()) ipcThread.join();
@@ -224,7 +220,7 @@ void HelperConnection::timerCallback()
         helperRunning.store(false);
         state.store(State::Crashed);
         stopTimer();
-        DBG("HelperConnection: Helper process died");
+        DBG("HelperConnection: Helper died");
         if (onHelperCrashed)
             onHelperCrashed();
     }
@@ -297,6 +293,23 @@ void HelperConnection::handleNotification(const std::string& jsonStr)
             if (onHelperReady)
                 juce::MessageManager::callAsync([this]() { if (onHelperReady) onHelperReady(); });
         }
+        else if (notify == "gui_ready")
+        {
+            auto portName = juce::String(j.value("layerPortName", ""));
+            int width = j.value("width", 0);
+            int height = j.value("height", 0);
+            if (onGuiReady)
+                juce::MessageManager::callAsync([this, portName, width, height]()
+                    { if (onGuiReady) onGuiReady(portName, width, height); });
+        }
+        else if (notify == "resized")
+        {
+            int width = j.value("width", 0);
+            int height = j.value("height", 0);
+            if (onGuiResized)
+                juce::MessageManager::callAsync([this, width, height]()
+                    { if (onGuiResized) onGuiResized(width, height); });
+        }
         else if (notify == "param_changed")
         {
             int index = j.value("index", -1);