add back cli build, add URL module, refactor runtime modules

Author: DjDeveloperr

NativeScript/CMakeLists.txt

@@ -21,6 +21,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
 set(TARGET_PLATFORM "macos" CACHE STRING "Target platform for the Objective-C bridge")
 set(TARGET_ENGINE "v8" CACHE STRING "Target JS engine for the NativeScript runtime")
 set(METADATA_SIZE 0 CACHE STRING "Size of embedded metadata in bytes")
+set(BUILD_CLI_BINARY OFF CACHE BOOL "Build the NativeScript CLI binary")
 
 if(TARGET_PLATFORM STREQUAL "ios")
   set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "13.0")
@@ -70,8 +71,8 @@ elseif(TARGET_ENGINE STREQUAL "hermes")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++20 -DTARGET_ENGINE_HERMES")
 elseif(TARGET_ENGINE STREQUAL "v8")
   set(TARGET_ENGINE_V8 TRUE)
-  add_link_options("-fuse-ld=/opt/homebrew/opt/llvm/bin/ld64.lld")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -stdlib=libc++ -std=c++20 -DTARGET_ENGINE_V8")
+  add_link_options("-fuse-ld=lld")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -stdlib=libc++ -std=c++20 -DTARGET_ENGINE_V8 -DV8_COMPRESS_POINTERS -DV8_ENABLE_SANDBOX")
 elseif(TARGET_ENGINE STREQUAL "quickjs")
   set(TARGET_ENGINE_QUICKJS TRUE)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++20 -DTARGET_ENGINE_QUICKJS")
@@ -100,7 +101,6 @@ message(STATUS "ENABLE_JS_RUNTIME = ${ENABLE_JS_RUNTIME}")
 include_directories(
   ./
   ../metadata-generator/include
-  ada
   napi/common
   libffi/${LIBFFI_BUILD}/include
 )
@@ -126,20 +126,24 @@ set(SOURCE_FILES
   ffi/Interop.mm
   ffi/InlineFunctions.mm
   ffi/ClassBuilder.mm
+  ffi/NativeScriptException.mm
 )
 
 if(ENABLE_JS_RUNTIME)
   set(SOURCE_FILES
     ${SOURCE_FILES}
-    runtime/Console.cpp
+    runtime/modules/console/Console.cpp
     runtime/Runtime.cpp
-    runtime/Require.cpp
-    runtime/Performance.cpp
+    runtime/modules/module/ModuleInternal.cpp
+    runtime/modules/performance/Performance.cpp
     runtime/Bundle.mm
-    runtime/Timers.mm
-    runtime/App.mm
+    runtime/modules/timers/Timers.mm
+    runtime/modules/app/App.mm
     runtime/NativeScript.mm
     runtime/RuntimeConfig.cpp
+    runtime/modules/url/ada/ada.cpp
+    runtime/modules/url/URL.cpp
+    runtime/modules/url/URLSearchParams.cpp
   )
 
   if(TARGET_ENGINE_V8)
@@ -157,8 +161,6 @@ if(ENABLE_JS_RUNTIME)
     )
 
   elseif(TARGET_ENGINE_HERMES)
-    message(STATUS "Hermes engine detected")
-
     include_directories(
       napi/hermes
       napi/hermes/include/hermes
@@ -219,6 +221,13 @@ else()
   )
 endif()
 
+if(BUILD_CLI_BINARY)
+  set(SOURCE_FILES ${SOURCE_FILES}
+    cli/main.cpp
+    cli/segappend.cpp
+  )
+endif()
+
 # Find SDK
 
 find_program(XCODEBUILD_EXECUTABLE xcodebuild)
@@ -247,11 +256,15 @@ message(STATUS "SDK = ${CMAKE_OSX_SYSROOT}")
 
 # Build targets
 
-add_library(
-  ${NAME}
-  SHARED
-  ${SOURCE_FILES}
-)
+if(BUILD_CLI_BINARY)
+  add_executable(${NAME} ${SOURCE_FILES})
+else()
+  add_library(
+    ${NAME}
+    SHARED
+    ${SOURCE_FILES}
+  )
+endif()
 
 target_sources(
   ${NAME}

NativeScript/NativeScript.h

@@ -8,7 +8,7 @@ extern "C"
 #endif  // __cplusplus
 
     void
-    objc_bridge_init(void* env, const char* metadata_path, const void* metadata_ptr);
+    nativescript_init(void* env, const char* metadata_path, const void* metadata_ptr);
 
 #ifdef __OBJC__
 

NativeScript/runtime/main.cpp NativeScript/cli/main.cppNativeScript/runtime/main.cpp renamed to NativeScript/cli/main.cpp

@@ -1,12 +1,13 @@
+#include "ffi/NativeScriptException.h"
 #ifdef ENABLE_JS_RUNTIME
 
 #include <filesystem>
 #include <fstream>
 #include <iostream>
 
-#include "Bundle.h"
-#include "Runtime.h"
-#include "RuntimeConfig.h"
+#include "runtime/Bundle.h"
+#include "runtime/Runtime.h"
+#include "runtime/RuntimeConfig.h"
 #include "segappend.h"
 
 using namespace nativescript;
@@ -27,12 +28,19 @@ void bootFromModuleSpec(std::string baseDir, std::string spec) {
 
   auto runtime = Runtime();
 
-  runtime.RunModule(spec);
+  try {
+    runtime.RunModule(spec);
+  } catch (const nativescript::NativeScriptException& e) {
+    std::cerr << "Error running module: " << e.Description() << std::endl;
+    return;
+  }
 
   runtime.RunLoop();
 }
 
 int main(int argc, char** argv) {
+  RuntimeConfig.LogToSystemConsole = true;
+
 #ifdef __APPLE__
   std::string bytecodePath = getBytecodePathFromBundle();
   if (!bytecodePath.empty()) {

NativeScript/runtime/segappend.cpp NativeScript/cli/segappend.cppNativeScript/runtime/segappend.cpp renamed to NativeScript/cli/segappend.cpp

@@ -4,14 +4,14 @@
 #include "node_api_util.h"
 
 extern "C" {
-void *objc_autoreleasePoolPush(void);
-void objc_autoreleasePoolPop(void *pool);
+void* objc_autoreleasePoolPush(void);
+void objc_autoreleasePoolPop(void* pool);
 }
 
-namespace objc_bridge {
+namespace nativescript {
 
 NAPI_FUNCTION(autoreleasepool);
 
-} // namespace objc_bridge
+}  // namespace nativescript
 
-#endif // AUTORELEASEPOOL_H
+#endif  // AUTORELEASEPOOL_H

NativeScript/runtime/segappend.h NativeScript/cli/segappend.hNativeScript/runtime/segappend.h renamed to NativeScript/cli/segappend.h

@@ -1,6 +1,6 @@
 #include "AutoreleasePool.h"
 
-namespace objc_bridge {
+namespace nativescript {
 
 napi_value JS_autoreleasepool(napi_env env, napi_callback_info info) {
   napi_value callback;
@@ -15,4 +15,4 @@ napi_value JS_autoreleasepool(napi_env env, napi_callback_info info) {
   return result;
 }
 
-} // namespace objc_bridge
+}  // namespace nativescript

NativeScript/ffi/AutoreleasePool.h

@@ -1,30 +1,32 @@
 #ifndef BLOCK_H
 #define BLOCK_H
 
+#include <cstdlib>
+
 #include "Cif.h"
 #include "Closure.h"
 #include "node_api_util.h"
-#include <cstdlib>
 
-namespace objc_bridge {
+namespace nativescript {
 
 class FunctionPointer {
-public:
-  void *function;
+ public:
+  void* function;
   metagen::MDSectionOffset offset;
-  Cif *cif;
+  Cif* cif;
 
-  static napi_value wrap(napi_env env, void *function, metagen::MDSectionOffset offset, bool isBlock);
-  static void finalize(napi_env env, void *finalize_data, void *finalize_hint);
+  static napi_value wrap(napi_env env, void* function,
+                         metagen::MDSectionOffset offset, bool isBlock);
+  static void finalize(napi_env env, void* finalize_data, void* finalize_hint);
 
   static napi_value jsCallAsCFunction(napi_env env, napi_callback_info cbinfo);
   static napi_value jsCallAsBlock(napi_env env, napi_callback_info cbinfo);
 };
 
-id registerBlock(napi_env env, Closure *closure, napi_value callback);
+id registerBlock(napi_env env, Closure* closure, napi_value callback);
 
 NAPI_FUNCTION(registerBlock);
 
-} // namespace objc_bridge
+}  // namespace nativescript
 
 #endif /* BLOCK_H */

NativeScript/ffi/AutoreleasePool.mm

@@ -1,9 +1,9 @@
 #include "Block.h"
 #import <Foundation/Foundation.h>
-#include "js_native_api_types.h"
 #include "Interop.h"
 #include "ObjCBridge.h"
 #include "js_native_api.h"
+#include "js_native_api_types.h"
 #include "node_api_util.h"
 #include "objc/runtime.h"
 
@@ -24,7 +24,7 @@
   void* invoke;
   Block_descriptor_1* descriptor;
   // imported variables
-  objc_bridge::Closure* closure;
+  nativescript::Closure* closure;
 };
 
 void block_copy(void* dest, void* src) {}
@@ -36,7 +36,7 @@ void block_finalize(napi_env env, void* data, void* hint) {
   delete block;
 }
 
-namespace objc_bridge {
+namespace nativescript {
 
 void* stackBlockISA = nullptr;
 
@@ -63,22 +63,25 @@ id registerBlock(napi_env env, Closure* closure, napi_value callback) {
   // TODO: fix memory management of objc blocks here
   // napi_wrap(env, callback, block, block_finalize, nullptr, &ref);
   // if (ref == nullptr) {
-    // Deno doesn't handle napi_wrap properly.
-    ref = make_ref(env, callback, 1);
+  // Deno doesn't handle napi_wrap properly.
+  ref = make_ref(env, callback, 1);
   // } else {
   //   uint32_t refCount;
   //   napi_reference_ref(env, ref, &refCount);
   // }
   closure->func = ref;
 
   auto bridgeState = ObjCBridgeState::InstanceData(env);
+
+#ifndef ENABLE_JS_RUNTIME
   if (napiSupportsThreadsafeFunctions(bridgeState->self_dl)) {
     napi_value workName;
     napi_create_string_utf8(env, "Block", NAPI_AUTO_LENGTH, &workName);
     napi_create_threadsafe_function(env, callback, nullptr, workName, 0, 1, nullptr, nullptr,
                                     closure, Closure::callBlockFromMainThread, &closure->tsfn);
     if (closure->tsfn) napi_unref_threadsafe_function(env, closure->tsfn);
   }
+#endif  // ENABLE_JS_RUNTIME
 
   return (id)block;
 }
@@ -207,4 +210,4 @@ id registerBlock(napi_env env, Closure* closure, napi_value callback) {
   return cif->returnType->toJS(env, rvalue);
 }
 
-}  // namespace objc_bridge
+}  // namespace nativescript

NativeScript/ffi/Block.h

@@ -3,19 +3,19 @@
 
 #include "Cif.h"
 
-namespace objc_bridge {
+namespace nativescript {
 
 class CFunction {
-public:
+ public:
   static napi_value jsCall(napi_env env, napi_callback_info cbinfo);
 
-  CFunction(void *fnptr) : fnptr(fnptr) {}
+  CFunction(void* fnptr) : fnptr(fnptr) {}
   ~CFunction();
 
-  void *fnptr;
-  Cif *cif = nullptr;
+  void* fnptr;
+  Cif* cif = nullptr;
 };
 
-} // namespace objc_bridge
+}  // namespace nativescript
 
 #endif /* C_FUNCTION_H */