fix(runtime,cli): fix build for macos

jwerle · jwerle · commit 7e6d7301c2f4 · 2025-01-08T23:38:38.000-05:00
diff --git a/bin/build-runtime-library.sh b/bin/build-runtime-library.sh
@@ -157,7 +157,7 @@ if [[ "$platform" = "android" ]]; then
   sources+=($(find "$root/src/platform/android"/*.cc))
   sources+=("$root/src/window/android.cc")
 elif [[ "$host" = "Darwin" ]]; then
-  sources+=("$root/src/runtime/app/delegate.mm")
+  sources+=("$root/src/runtime/app/apple.mm")
   sources+=("$root/src/runtime/window/apple.mm")
 
   if (( TARGET_OS_IPHONE)); then
diff --git a/src/cli/main.cc b/src/cli/main.cc
@@ -314,7 +314,7 @@ static Process::PID appPid = 0;
 static SharedPointer<Process> appProcess = nullptr;
 static std::atomic<int> appStatus = -1;
 static std::mutex appMutex;
-static uv_loop_t *loop = nullptr;
+static uv_loop_t *eventLoop = nullptr;
 
 static uv_udp_t logsocket;
 static int lastLogSequence = 0;
@@ -326,10 +326,10 @@ unsigned short createLogSocket() {
   std::future<int> future = p.get_future();
   int port = 0;
 
-  auto t = std::thread([](std::promise<int>&& p) {
-    loop = uv_default_loop();
+  auto t = Thread([](std::promise<int>&& p) {
+    eventLoop = uv_default_loop();
 
-    uv_udp_init(loop, &logsocket);
+    uv_udp_init(eventLoop, &logsocket);
     struct sockaddr_in addr;
     int port;
 
@@ -405,7 +405,7 @@ unsigned short createLogSocket() {
       p.set_value(port);
     }
 
-    uv_run(loop, UV_RUN_DEFAULT);
+    uv_run(eventLoop, UV_RUN_DEFAULT);
   }, std::move(p));
 
   port = future.get();
diff --git a/src/desktop/main.cc b/src/desktop/main.cc
@@ -904,9 +904,10 @@ MAIN {
     }
 
   #if SOCKET_RUNTIME_PLATFORM_APPLE
-    if (app.wasLaunchedFromCli) {
+    // launched from CLI
+    if (app.launchSource == App::LaunchSource::Tool) {
       debug("__EXIT_SIGNAL__=%d", 0);
-      CLI::notify();
+      ssc::cli::notify();
     }
   #endif
 
diff --git a/src/extension/extension.cc b/src/extension/extension.cc
@@ -586,7 +586,7 @@ void sapi_log (const sapi_context_t* ctx, const char* message) {
   #endif
 
   #if SOCKET_RUNTIME_PLATFORM_APPLE
-    static auto userConfig = ssc::runtime::getUserConfig();
+    static auto userConfig = ssc::runtime::config::getUserConfig();
     static auto bundleIdentifier = userConfig["meta_bundle_identifier"];
     static auto SOCKET_RUNTIME_OS_LOG_INFO = os_log_create(
       bundleIdentifier.c_str(),
diff --git a/src/extension/ipc.cc b/src/extension/ipc.cc
@@ -462,7 +462,7 @@ const char* sapi_ipc_message_get_seq (const sapi_ipc_message_t* message) {
 
 const char* sapi_ipc_message_get_uri (const sapi_ipc_message_t* message) {
   if (message->uri.size() == 0) return nullptr;
-  return message->uri.c_str();
+  return message->href.c_str();
 }
 
 const char* sapi_ipc_message_get (
diff --git a/src/runtime/app/apple.mm b/src/runtime/app/apple.mm
@@ -1,5 +1,10 @@
 #include "../app.hh"
 
+using namespace ssc::runtime;
+using ssc::runtime::config::getUserConfig;
+using ssc::runtime::string::parseStringList;
+using ssc::runtime::string::split;
+
 static dispatch_queue_attr_t qos = dispatch_queue_attr_make_with_qos_class(
   DISPATCH_QUEUE_CONCURRENT,
   QOS_CLASS_USER_INITIATED,
diff --git a/src/runtime/bluetooth/bluetooth.cc b/src/runtime/bluetooth/bluetooth.cc
@@ -12,7 +12,7 @@ using ssc::runtime::crypto::rand64;
 
 #if SOCKET_RUNTIME_PLATFORM_APPLE
 @interface SSCBluetoothController ()
-@property (nonatomic) Bluetooth* bluetooth;
+@property (nonatomic) ssc::runtime::bluetooth::Bluetooth* bluetooth;
 @end
 
 @implementation SSCBluetoothController
@@ -379,7 +379,7 @@ using ssc::runtime::crypto::rand64;
   queuedResponse.headers = headers;
 
   if (bytes != nullptr && length > 0) {
-    queuedResponse.body = std::make_shared<char[]>(length);
+    queuedResponse.body = std::make_shared<unsigned char[]>(length);
     queuedResponse.length = length;
     memcpy(queuedResponse.body.get(), bytes, length);
   }
diff --git a/src/runtime/core/services/geolocation.hh b/src/runtime/core/services/geolocation.hh
@@ -47,7 +47,7 @@ namespace ssc::runtime::core::services {
 @property (atomic, retain) NSMutableArray* activationCompletions;
 @property (atomic, retain) NSMutableArray* locationRequestCompletions;
 @property (atomic, retain) NSMutableArray* locationWatchers;
-W@property (nonatomic) ssc::runtime::core::services::Geolocation* geolocation;
+@property (nonatomic) ssc::runtime::core::services::Geolocation* geolocation;
 @property (atomic, assign) BOOL isAuthorized;
 - (BOOL) attemptActivation;
 - (BOOL) attemptActivationWithCompletion: (void (^)(BOOL)) completion;
diff --git a/src/runtime/core/services/notifications.cc b/src/runtime/core/services/notifications.cc
@@ -256,7 +256,7 @@ namespace ssc::runtime::core::services {
         const auto path = filesystem::Resource::getResourcePath(url.pathname);
         iconURL = [NSURL fileURLWithPath: @(path.string().c_str())];
       } else {
-        iconURL = [NSURL fileURLWithPath: @(url.href.c_str())];
+        iconURL = [NSURL fileURLWithPath: @(url.href().c_str())];
       }
 
       const auto types = [UTType
@@ -341,7 +341,7 @@ namespace ssc::runtime::core::services {
         const auto path = filesystem::Resource::getResourcePath(url.pathname);
         imageURL = [NSURL fileURLWithPath: @(path.string().c_str())];
       } else {
-        imageURL = [NSURL fileURLWithPath: @(url.href.c_str())];
+        imageURL = [NSURL fileURLWithPath: @(url.href().c_str())];
       }
 
       const auto types = [UTType
diff --git a/src/runtime/core/services/permissions.cc b/src/runtime/core/services/permissions.cc
@@ -6,9 +6,6 @@
 #include "../services.hh"
 #include "permissions.hh"
 
-using ssc::runtime::config::getUserConfig;
-using ssc::runtime::string::replace;
-
 namespace ssc::runtime::core::services {
   bool Permissions::hasRuntimePermission (const String& permission) const {
     return this->context.getRuntime()->hasPermission(permission);
@@ -263,16 +260,16 @@ namespace ssc::runtime::core::services {
       }
 
       if (name == "geolocation") {
-        JSON::Object json;
+        __block JSON::Object json;
 
       #if SOCKET_RUNTIME_PLATFORM_APPLE
-        const auto performedActivation = [this->core->geolocation.locationObserver attemptActivationWithCompletion: ^(BOOL isAuthorized) {
+        const auto performedActivation = [this->services.geolocation.locationObserver attemptActivationWithCompletion: ^(BOOL isAuthorized) {
           if (!isAuthorized) {
             auto reason = @("Location observer could not be activated");
 
-            if (!this->core->geolocation.locationObserver.locationManager) {
+            if (!this->services.geolocation.locationObserver.locationManager) {
               reason = @("Location observer manager is not initialized");
-            } else if (!this->core->geolocation.locationObserver.locationManager.location) {
+            } else if (!this->services.geolocation.locationObserver.locationManager.location) {
               reason = @("Location observer manager could not provide location");
             }
 
@@ -281,7 +278,7 @@ namespace ssc::runtime::core::services {
 
           if (isAuthorized) {
             json["data"] = JSON::Object::Entries {{"state", "granted"}};
-          } else if (this->core->geolocation.locationObserver.locationManager.authorizationStatus == kCLAuthorizationStatusNotDetermined) {
+          } else if (this->services.geolocation.locationObserver.locationManager.authorizationStatus == kCLAuthorizationStatusNotDetermined) {
             json["data"] = JSON::Object::Entries {{"state", "prompt"}};
           } else {
             json["data"] = JSON::Object::Entries {{"state", "denied"}};
diff --git a/src/runtime/debug.hh b/src/runtime/debug.hh
@@ -17,7 +17,7 @@ static os_log_t SOCKET_RUNTIME_OS_LOG_DEBUG = nullptr;
 // wrap `os_log*` functions for global debugger
 #define socket_runtime_os_log_debug(format, fmt, ...) ({                       \
   if (!SOCKET_RUNTIME_OS_LOG_DEBUG) {                                          \
-    static auto userConfig = ssc::getUserConfig();                             \
+    static auto userConfig = ssc::runtime::config::getUserConfig();            \
     static auto bundleIdentifier = userConfig["meta_bundle_identifier"];       \
     SOCKET_RUNTIME_OS_LOG_DEBUG = os_log_create(                               \
       bundleIdentifier.c_str(),                                                \
diff --git a/src/runtime/http.hh b/src/runtime/http.hh
@@ -38,6 +38,7 @@ namespace ssc::runtime::http {
           Value (int64_t);
           Value (uint64_t);
           Value (double_t);
+          Value (size_t value);
         #if SOCKET_RUNTIME_PLATFORM_APPLE
           Value (ssize_t value);
         #endif
diff --git a/src/runtime/http/headers.cc b/src/runtime/http/headers.cc
@@ -234,6 +234,10 @@ namespace ssc::runtime::http {
     this->string = std::to_string(value);
   }
 
+  Headers::Value::Value (size_t value) {
+    this->string = std::to_string(value);
+  }
+
 #if SOCKET_RUNTIME_PLATFORM_APPLE
   Headers::Value::Value (ssize_t value) {
     this->string = std::to_string(value);
diff --git a/src/runtime/io.hh b/src/runtime/io.hh
@@ -3,10 +3,13 @@
 
 #include <iostream>
 
-#include "../cli.hh"
 #include "platform.hh"
 #include "env.hh"
 
+namespace ssc::cli {
+  void notify ();
+}
+
 namespace ssc::runtime::io {
   inline void write (const String& input, bool isErrorOutput = false) {
     static const auto GITHUB_ACTIONS_CI = env::get("GITHUB_ACTIONS_CI");
@@ -17,15 +20,15 @@ namespace ssc::runtime::io {
 
   #if SOCKET_RUNTIME_PLATFORM_WINDOWS
     if (isGitHubActionsCI) {
-      CLI::notify();
+      ssc::cli::notify();
       // skip writing newline if running on Windows GHA CI
       return;
     }
 
   #endif
     stream << std::endl;
 
-    cli::notify();
+    ssc::cli::notify();
   }
 }
 #endif
diff --git a/src/runtime/ipc.hh b/src/runtime/ipc.hh
@@ -42,6 +42,7 @@ namespace ssc::runtime::ipc {
 
       String value = "";
       String name = "";
+      String href = "";
       int index = -1;
       Seq seq = "";
 
@@ -50,10 +51,10 @@ namespace ssc::runtime::ipc {
       SharedPointer<MessageCancellation> cancel = nullptr;
 
       Message () = default;
-      Message (const Message& message);
-      Message (Message&& message);
       Message (const String& source, bool decodeValues);
       Message (const String& source);
+      Message (const Message& message);
+      Message (Message&& message);
 
       Message& operator = (const Message&);
       Message& operator = (Message&&);
diff --git a/src/runtime/ipc/message.cc b/src/runtime/ipc/message.cc
@@ -6,28 +6,13 @@
 using ssc::runtime::url::decodeURIComponent;
 
 namespace ssc::runtime::ipc {
-  Message::Message (const Message& message)
-    : value(message.value),
-      index(message.index),
-      name(message.name),
-      seq(message.seq),
-      uri(message.uri),
-      isHTTP(message.isHTTP),
-      cancel(message.cancel),
-      buffer(message.buffer),
-      client(message.client)
-  {}
-
-  Message::Message (const String& source)
-    : Message(source, false)
-  {}
-
   Message::Message (const String& source, bool decodeValues)
     : uri(source, decodeValues)
   {
     this->seq = this->get("seq");
     this->name = this->uri.hostname;
     this->value = this->get("value");
+    this->href = this->uri.href();
 
     if (this->uri.searchParams.contains("index")) {
       try {
@@ -45,6 +30,26 @@ namespace ssc::runtime::ipc {
     }
   }
 
+  Message::Message (const String& source)
+    : Message(source, false)
+  {
+    this->href = this->uri.href();
+  }
+
+  Message::Message (const Message& message)
+    : value(message.value),
+      index(message.index),
+      name(message.name),
+      seq(message.seq),
+      uri(message.uri),
+      isHTTP(message.isHTTP),
+      cancel(message.cancel),
+      buffer(message.buffer),
+      client(message.client)
+  {
+    this->href = this->uri.href();
+  }
+
   Message::Message (Message&& msg) {
     this->buffer = std::move(msg.buffer);
     this->client = std::move(msg.client);
@@ -55,6 +60,7 @@ namespace ssc::runtime::ipc {
     this->seq = std::move(msg.seq);
     this->isHTTP = msg.isHTTP;
     this->cancel = std::move(msg.cancel);
+    this->href = this->uri.href();
 
     msg.name = "";
     msg.index = -1;
@@ -75,7 +81,8 @@ namespace ssc::runtime::ipc {
     this->uri = msg.uri;
     this->seq = msg.seq;
     this->isHTTP = msg.isHTTP;
-    this->cancel = std::move(msg.cancel);
+    this->cancel = msg.cancel;
+    this->href = this->uri.href();
     return *this;
   }
 
@@ -89,6 +96,7 @@ namespace ssc::runtime::ipc {
     this->seq = std::move(msg.seq);
     this->isHTTP = msg.isHTTP;
     this->cancel = std::move(msg.cancel);
+    this->href = this->uri.href();
 
     msg.name = "";
     msg.index = -1;
@@ -144,6 +152,7 @@ namespace ssc::runtime::ipc {
       {"name", this->name},
       {"value", this->value},
       {"index", this->index},
+      {"href", this->href},
       {"seq", this->seq},
       {"data", this->map()}
     };
diff --git a/src/runtime/ipc/routes.cc b/src/runtime/ipc/routes.cc
@@ -155,9 +155,10 @@ static void mapIPCRoutes (Router *router) {
     REQUIRE_AND_GET_MESSAGE_VALUE(exitCode, "value", std::stoi);
 
   #if SOCKET_RUNTIME_PLATFORM_APPLE
-    if (app->wasLaunchedFromCli) {
+    // from cli
+    if (app->launchSource == App::LaunchSource::Tool) {
       debug("__EXIT_SIGNAL__=%d", exitCode);
-      CLI::notify();
+      ssc::cli::notify();
     }
   #endif
 
@@ -2480,7 +2481,7 @@ static void mapIPCRoutes (Router *router) {
   router->map("stdout", [=](auto message, auto router, auto reply) {
     if (message.value.size() > 0) {
       #if SOCKET_RUNTIME_PLATFORM_APPLE
-        int seq = ++router->bridge.core->logSeq;
+        const auto seq = ++dynamic_cast<Bridge&>(router->bridge).getRuntime()->counters.logSeq;
         auto msg = String(std::to_string(seq) + "::::" + message.value.c_str());
         os_log_with_type(SOCKET_RUNTIME_OS_LOG_BUNDLE, OS_LOG_TYPE_INFO, "%{public}s", msg.c_str());
 
@@ -2491,7 +2492,7 @@ static void mapIPCRoutes (Router *router) {
           options.port = std::stoi(env::get("SSC_LOG_SOCKET"));
           options.ephemeral = true;
           options.bytes.reset(new unsigned char[3]{ '+', 'N', '\0' });
-          router->bridge.core->udp.send("-1", 0, options, [](auto seq, auto json, auto queuedResponse) {});
+          dynamic_cast<Bridge&>(router->bridge).getRuntime()->services.udp.send("-1", 0, options, [](auto seq, auto json, auto queuedResponse) {});
         }
       #endif
       io::write(message.value, false);
@@ -2513,7 +2514,7 @@ static void mapIPCRoutes (Router *router) {
       }
     } else if (message.value.size() > 0) {
       #if SOCKET_RUNTIME_PLATFORM_APPLE
-        int seq = ++router->bridge.core->logSeq;
+        const auto seq = ++dynamic_cast<Bridge&>(router->bridge).getRuntime()->counters.logSeq;
         auto msg = String(std::to_string(seq) + "::::" + message.value.c_str());
         os_log_with_type(SOCKET_RUNTIME_OS_LOG_BUNDLE, OS_LOG_TYPE_ERROR, "%{public}s", msg.c_str());
 
@@ -2524,7 +2525,7 @@ static void mapIPCRoutes (Router *router) {
           options.port = std::stoi(env::get("SSC_LOG_SOCKET"));
           options.ephemeral = true;
           options.bytes.reset(new unsigned char[3]{ '+', 'N', '\0' });
-          router->bridge.core->udp.send("-1", 0, options, [](auto seq, auto json, auto queuedResponse) {});
+          dynamic_cast<Bridge&>(router->bridge).getRuntime()->services.udp.send("-1", 0, options, [](auto seq, auto json, auto queuedResponse) {});
         }
       #endif
       io::write(message.value, true);
diff --git a/src/runtime/runtime.hh b/src/runtime/runtime.hh
diff --git a/src/runtime/webview.hh b/src/runtime/webview.hh
diff --git a/src/runtime/webview/navigator.cc b/src/runtime/webview/navigator.cc
diff --git a/src/runtime/webview/scheme_handlers.cc b/src/runtime/webview/scheme_handlers.cc
diff --git a/src/runtime/webview/webview.cc b/src/runtime/webview/webview.cc
diff --git a/src/runtime/webview/webview.hh b/src/runtime/webview/webview.hh
diff --git a/src/runtime/window/apple.mm b/src/runtime/window/apple.mm

Original file line number	Diff line number	Diff line change
`@@ -904,9 +904,10 @@ MAIN {`
`904`	`904`	`}`
`905`	`905`
`906`	`906`	`#if SOCKET_RUNTIME_PLATFORM_APPLE`
`907`		`- if (app.wasLaunchedFromCli) {`
	`907`	`+ // launched from CLI`
	`908`	`+ if (app.launchSource == App::LaunchSource::Tool) {`
`908`	`909`	`debug("__EXIT_SIGNAL__=%d", 0);`
`909`		`- CLI::notify();`
	`910`	`+ ssc::cli::notify();`
`910`	`911`	`}`
`911`	`912`	`#endif`
`912`	`913`
Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ const char* sapi_ipc_message_get_seq (const sapi_ipc_message_t* message) {`
`462`	`462`
`463`	`463`	`const char* sapi_ipc_message_get_uri (const sapi_ipc_message_t* message) {`
`464`	`464`	`if (message->uri.size() == 0) return nullptr;`
`465`		`- return message->uri.c_str();`
	`465`	`+ return message->href.c_str();`
`466`	`466`	`}`
`467`	`467`
`468`	`468`	`const char* sapi_ipc_message_get (`