feat: run app from NativeScript initializer instead of static method (#…

…137) Co-authored-by: Dermendzhiev, Teodor (external - Project) <tdermendjievft@gmail.com>
NativeScript · Mar 7, 2022 · a676ecf · a676ecf
1 parent 7c881f5
commit a676ecf
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 42 deletions.
diff --git a/AppWithModules/Source Files/main.m b/AppWithModules/Source Files/main.m
@@ -23,7 +23,7 @@ int main(int argc, char *argv[]) {
         config.ArgumentsCount = argc;
         config.Arguments = argv;
 
-        [NativeScript start:config];
+        [[NativeScript alloc] initWithConfig: config];
 
         return 0;
     }

diff --git a/NativeScript/NativeScript.h b/NativeScript/NativeScript.h
@@ -14,7 +14,7 @@
 
 @interface NativeScript : NSObject
 
-+ (void)start:(Config*)config;
-+ (bool)liveSync;
+- (instancetype)initWithConfig:(Config*)config;
+- (bool)liveSync;
 
 @end
diff --git a/NativeScript/NativeScript.mm b/NativeScript/NativeScript.mm
@@ -20,48 +20,54 @@ @implementation Config
 
 @implementation NativeScript
 
-static std::shared_ptr<Runtime> runtime_;
-
-+ (void)start:(Config*)config {
-    RuntimeConfig.BaseDir = [config.BaseDir UTF8String];
-    if (config.ApplicationPath != nil) {
-        RuntimeConfig.ApplicationPath = [[config.BaseDir stringByAppendingPathComponent:config.ApplicationPath] UTF8String];
-    } else {
-        RuntimeConfig.ApplicationPath = [[config.BaseDir stringByAppendingPathComponent:@"app"] UTF8String];
+std::unique_ptr<Runtime> runtime_;
+
+- (instancetype)initWithConfig:(Config*)config {
+
+    if (self = [super init]) {
+        RuntimeConfig.BaseDir = [config.BaseDir UTF8String];
+        if (config.ApplicationPath != nil) {
+            RuntimeConfig.ApplicationPath = [[config.BaseDir stringByAppendingPathComponent:config.ApplicationPath] UTF8String];
+        } else {
+            RuntimeConfig.ApplicationPath = [[config.BaseDir stringByAppendingPathComponent:@"app"] UTF8String];
+        }
+        RuntimeConfig.MetadataPtr = [config MetadataPtr];
+        RuntimeConfig.IsDebug = [config IsDebug];
+        RuntimeConfig.LogToSystemConsole = [config LogToSystemConsole];
+
+        Runtime::Initialize();
+        runtime_ = std::make_unique<Runtime>();
+
+        std::chrono::high_resolution_clock::time_point t1 = std::chrono::high_resolution_clock::now();
+        Isolate* isolate = runtime_->CreateIsolate();
+        runtime_->Init(isolate);
+        std::chrono::high_resolution_clock::time_point t2 = std::chrono::high_resolution_clock::now();
+        auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1).count();
+        printf("Runtime initialization took %llims\n", duration);
+
+        if (config.IsDebug) {
+            Isolate::Scope isolate_scope(isolate);
+            HandleScope handle_scope(isolate);
+            v8_inspector::JsV8InspectorClient* inspectorClient = new v8_inspector::JsV8InspectorClient(runtime_.get());
+            inspectorClient->init();
+            inspectorClient->registerModules();
+            inspectorClient->connect([config ArgumentsCount], [config Arguments]);
+        }
+
+        runtime_->RunMainScript();
+
+        CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true);
+
+        tns::Tasks::Drain();
+
+        runtime_.reset();
     }
-    RuntimeConfig.MetadataPtr = [config MetadataPtr];
-    RuntimeConfig.IsDebug = [config IsDebug];
-    RuntimeConfig.LogToSystemConsole = [config LogToSystemConsole];
-
-    Runtime::Initialize();
-    runtime_ = std::make_shared<Runtime>();
-
-    std::chrono::high_resolution_clock::time_point t1 = std::chrono::high_resolution_clock::now();
-    Isolate* isolate = runtime_->CreateIsolate();
-    runtime_->Init(isolate);
-    std::chrono::high_resolution_clock::time_point t2 = std::chrono::high_resolution_clock::now();
-    auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1).count();
-    printf("Runtime initialization took %llims\n", duration);
-
-    if (config.IsDebug) {
-        Isolate::Scope isolate_scope(isolate);
-        HandleScope handle_scope(isolate);
-        v8_inspector::JsV8InspectorClient* inspectorClient = new v8_inspector::JsV8InspectorClient(runtime_.get());
-        inspectorClient->init();
-        inspectorClient->registerModules();
-        inspectorClient->connect([config ArgumentsCount], [config Arguments]);
-    }
-
-    runtime_->RunMainScript();
-
-    CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true);
-
-    tns::Tasks::Drain();
-
-    runtime_.reset();
+
+    return self;
+
 }
 
-+ (bool)liveSync {
+- (bool)liveSync {
     if (runtime_ == nullptr) {
         return false;
     }