Merge pull request #2800 from sonic-pi-net/daemon-booter

Author: samaaron

app/CMakeLists.txt

@@ -11,6 +11,8 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})
+
 if(APPLE)
   set(CMAKE_OSX_DEPLOYMENT_TARGET '10.13')
 endif()

app/api/CMakeLists.txt

@@ -21,7 +21,7 @@ set(OSC_SRC
     ${API_ROOT}/src/osc/osc_server.cpp
     ${API_ROOT}/src/osc/tcp_osc_server.cpp
     ${API_ROOT}/src/osc/udp_osc_server.cpp
-    
+
     ${API_ROOT}/include/api/osc/osc_handler.h
     ${API_ROOT}/include/api/osc/osc_sender.h
     ${API_ROOT}/include/api/osc/osc_server.h
@@ -36,7 +36,7 @@ set(BUFFER_SRC
     ${API_ROOT}/include/api/audio/audio_processor.h
     ${API_ROOT}/include/api/audio/scope_buffer.hpp
     ${API_ROOT}/include/api/audio/server_shm.hpp)
-    
+
 add_library(${PROJECT_NAME} STATIC ${API_SRC} ${OSC_SRC} ${BUFFER_SRC})
 add_library(SonicPi::API ALIAS ${PROJECT_NAME})
 
@@ -53,10 +53,12 @@ target_include_directories(${PROJECT_NAME}
     PUBLIC
         ${API_ROOT}/include
         ${APP_ROOT}/external/ghc_filesystem/include
+        ${APP_ROOT}/external/kissnet-master-34b751b
     PRIVATE
         ${APP_ROOT}/external
         ${APP_ROOT}/external/scsynth-boost-1.74.0
         ${APP_ROOT}/external/TLSF-2.4.6/src
+
     )
 
 target_link_libraries(${PROJECT_NAME}
@@ -70,7 +72,7 @@ target_link_libraries(${PROJECT_NAME}
 # Windows
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
 find_package(crossguid CONFIG REQUIRED)
-target_link_libraries(${PROJECT_NAME} 
+target_link_libraries(${PROJECT_NAME}
     PRIVATE
         crossguid
     )
@@ -79,7 +81,7 @@ endif()
 # Linux
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 find_package(crossguid CONFIG REQUIRED)
-target_link_libraries(${PROJECT_NAME} 
+target_link_libraries(${PROJECT_NAME}
     PUBLIC
         stdc++fs
     PRIVATE
@@ -89,7 +91,7 @@ endif()
 
 # Mac
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-target_link_libraries(${PROJECT_NAME} 
+target_link_libraries(${PROJECT_NAME}
     PRIVATE
     )
 endif()

app/api/include/api/logger.h

@@ -57,11 +57,13 @@ class Log
     {
         if (opened)
         {
-            out << std::endl;
+          std::cout << out.str() << std::endl;
+
 #ifdef WIN32
+            out << std::endl;
             OutputDebugStringA(out.str().c_str());
 #endif
-            std::cout << out.str();
+
         }
         opened = false;
     }

app/api/include/api/sonicpi_api.h

@@ -5,9 +5,11 @@
 #include <map>
 #include <string>
 #include <thread>
-
+#include <kissnet.hpp>
+#include <mutex>
 #include <api/osc/osc_pkt.hh>
 
+
 #if 0
 #ifdef __unix__
 #include <experimental/filesystem>
@@ -38,38 +40,29 @@ class OscServer;
 
 enum class SonicPiPath
 {
-    RootPath, // Sonic Pi Application root
-    RubyPath, // Path to ruby executable
-    RubyServerPath, // Path to the ruby server script
-    PortDiscoveryPath, // Path to the port discovery script
-    FetchUrlPath, // Path to the fetch url script
-    SamplePath, // Path to the samples folder
-    UserPath,
-    ServerErrorLogPath,
-    ServerOutputLogPath,
-    ProcessLogPath,
-    SCSynthLogPath,
-    InitScriptPath,
-    ExitScriptPath,
-    GUILogPath,
-    TaskRegisterPath
+    RootPath,            // Sonic Pi Application root
+    UserPath,            // User-writable folder for config/saves etc.
+    RubyPath,            // Path to ruby executable
+    BootDaemonPath,      // Path to the Boot Daemon script
+    FetchUrlPath,        // Path to the fetch url script
+    SamplePath,          // Path to the samples folder
+    LogPath,             // Base log folder
+    SpiderServerLogPath, // Log file for Spider Server output
+    BootDaemonLogPath,   // Log file for Boot Daemon output
+    TauLogPath,          // Log file for Tau IO Server output
+    SCSynthLogPath,      // Log file for SuperCollider scsynth's output
+    GUILogPath,          // Log file for GUI
 };
 
 // NOTE: These port names returned by ruby; they match the symbols and cannot be changed.
 enum class SonicPiPortId
 {
     Invalid,
+    daemon,
     gui_listen_to_server,
     gui_send_to_server,
-    server_listen_to_gui,
-    server_send_to_gui,
     scsynth,
-    scsynth_send,
-    server_osc_cues,
-    erlang_router,
-    osc_midi_out,
-    osc_midi_in,
-    websocket
+    server_osc_cues
 };
 
 // Log output of the API to the log files or the console?
@@ -263,7 +256,8 @@ class SonicPiAPI
     virtual bool Init(const fs::path& rootPath);
 
     // Wait for the server to be in a good state
-    virtual bool WaitForServer();
+    virtual bool PingUntilServerCreated();
+    virtual bool WaitUntilReady();
 
     // Shut down the API, close the server, ports, osc, etc.
     virtual void Shutdown();
@@ -280,7 +274,7 @@ class SonicPiAPI
 
     // Enable audio processing
     virtual void AudioProcessor_Enable(bool enable);
-   
+
     // Enable FFT generation
     virtual void AudioProcessor_EnableFFT(bool enable);
 
@@ -294,6 +288,7 @@ class SonicPiAPI
 
     const std::string& GetGuid() const;
 
+
     virtual bool TestAudio();
 
     // Get a unique path
@@ -305,7 +300,7 @@ class SonicPiAPI
     virtual bool SendOSC(oscpkt::Message m);
 
     virtual void LoadWorkspaces();
-    
+
     virtual void SaveWorkspaces(const std::map<uint32_t, std::string>& workspaces);
 
     virtual uint32_t MaxWorkspaces() const;
@@ -318,28 +313,39 @@ class SonicPiAPI
 private:
     fs::path FindHomePath() const;
 
-    bool GetPorts();
-    bool StartRubyServer();
+    bool StartBootDaemon();
     bool StartOscServer();
+    void StopOscServer();
 
-    void StopServerAndOsc();
-    void RunCleanupScript();
+    bool InitializePaths(const fs::path& root);
+    void EnsurePathsAreCanonical();
 
     std::error_code RunProcess(const std::vector<std::string>& args, std::string* pOutput = nullptr);
-    std::shared_ptr<reproc::process> StartProcess(const std::vector<std::string>& args, const std::string& outPath = std::string(), const std::string& errPath = std::string());
+    std::shared_ptr<reproc::process> StartProcess(const std::vector<std::string>& args);
+
+
 
 private:
+
     std::map<SonicPiPath, fs::path> m_paths;
     std::map<SonicPiPortId, int> m_ports;
 
     bool m_homeDirWriteable = false;
     std::streambuf* m_coutbuf = nullptr;
     std::ofstream m_stdlog;
 
-    std::shared_ptr<reproc::process> m_spRubyServer;
+    std::shared_ptr<reproc::process> m_bootDaemonProcess;
+    std::shared_ptr<kissnet::tcp_socket> m_bootDaemonSock;
+
+    std::mutex m_osc_mtx;
+    bool m_shutdown_engaged = false;
+    std::atomic<bool> m_keep_alive = { true };
     LogOption m_logOption;
 
+
     std::thread m_oscServerThread;
+    std::thread m_pingerThread;
+    std::thread m_bootDaemonSockPingLoopThread;
 
     std::shared_ptr<OscServer> m_spOscServer;
     std::shared_ptr<OscSender> m_spOscSender;
@@ -351,12 +357,13 @@ class SonicPiAPI
 
     enum State
     {
-        Start,
+        Reset,
         Initializing,
         Invalid,
-        Created
+        Created,
+        Error
     };
-    State m_state = State::Start;
+    State m_state = State::Reset;
     uint64_t m_startServerTime;
     APISettings m_settings;
 };

app/api/src/osc/osc_sender.cpp

@@ -29,7 +29,7 @@ OscSender::OscSender(int port)
 
 bool OscSender::sendOSC(Message m)
 {
-    LOG(DBG, "SendOSC" << m.addressPattern()); 
+    LOG(DBG, "SendOSC " << m.addressPattern());
     UdpSocket sock;
     sock.connectTo("127.0.0.1", port);
     if (!sock.isOk())
@@ -57,4 +57,4 @@ void OscSender::bufferNewlineAndIndent(int point_line, int point_index, int firs
     sendOSC(msg);
 }
 
-} // namespace SonicPi 
+} // namespace SonicPi

app/api/src/osc/udp_osc_server.cpp

@@ -60,6 +60,8 @@ void OscServerUDP::start()
         {
             handler->oscMessage(sock.buffer);
             std::vector<char>().swap(sock.buffer);
+
+            // TODO what's this for???
             std::cout << std::flush;
         }
     }