bare-ui-kit 0.0.0 → 0.1.0

package/lib/runtime.m

@@ -5,6 +5,7 @@
 #import <path.h>
 #import <rlimit.h>
 #import <signal.h>
+#import <unistd.h>
 #import <uv.h>
 
 #import <UIKit/UIKit.h>
@@ -14,9 +15,6 @@ static uv_async_t bare__platform_shutdown;
 static uv_thread_t bare__platform_thread;
 static js_platform_t *bare__platform;
 
-static int bare__argc;
-static char **bare__argv;
-
 static uv_loop_t *bare__loop;
 static uv_async_t bare__shutdown;
 static bare_t *bare;
@@ -89,24 +87,6 @@ static void
 bare__launch(void) {
   int err;
 
-  err = uv_barrier_init(&bare__platform_ready, 2);
-  assert(err == 0);
-
-  err = uv_thread_create(&bare__platform_thread, bare__on_platform_thread, NULL);
-  assert(err == 0);
-
-  uv_barrier_wait(&bare__platform_ready);
-
-  uv_barrier_destroy(&bare__platform_ready);
-
-  bare__loop = uv_default_loop();
-
-  err = uv_async_init(bare__loop, &bare__shutdown, bare__on_shutdown);
-  assert(err == 0);
-
-  err = bare_setup(bare__loop, bare__platform, NULL, bare__argc, (const char **) bare__argv, NULL, &bare);
-  assert(err == 0);
-
   size_t len;
 
   char bin[4096];
@@ -115,22 +95,18 @@ bare__launch(void) {
   err = uv_exepath(bin, &len);
   assert(err == 0);
 
-  size_t dir;
-  err = path_dirname(bin, &dir, path_behavior_system);
-  assert(err == 0);
-
-  char bundle[4096];
+  char entry[4096];
   len = 4096;
 
   err = path_join(
     (const char *[]) {bin, "..", "app.bundle", NULL},
-    bundle,
+    entry,
     &len,
     path_behavior_system
   );
   assert(err == 0);
 
-  err = bare_load(bare, bundle, NULL, NULL);
+  err = bare_load(bare, entry, NULL, NULL);
   (void) err;
 
   dispatch_queue_t queue = dispatch_get_main_queue();
@@ -223,8 +199,62 @@ main(int argc, char *argv[]) {
 
   argv = uv_setup_args(argc, argv);
 
-  bare__argc = argc;
-  bare__argv = argv;
+  err = uv_barrier_init(&bare__platform_ready, 2);
+  assert(err == 0);
+
+  err = uv_thread_create(&bare__platform_thread, bare__on_platform_thread, NULL);
+  assert(err == 0);
+
+  uv_barrier_wait(&bare__platform_ready);
+
+  uv_barrier_destroy(&bare__platform_ready);
+
+  bare__loop = uv_default_loop();
+
+  size_t len;
+
+  char bin[4096];
+  len = sizeof(bin);
+
+  err = uv_exepath(bin, &len);
+  assert(err == 0);
+
+  char preflight[4096];
+  len = 4096;
+
+  err = path_join(
+    (const char *[]) {bin, "..", "preflight.bundle", NULL},
+    preflight,
+    &len,
+    path_behavior_system
+  );
+  assert(err == 0);
+
+  uv_fs_t fs;
+  err = uv_fs_access(bare__loop, &fs, preflight, R_OK, NULL);
+
+  if (err == 0) {
+    err = bare_setup(bare__loop, bare__platform, NULL, argc, (const char **) argv, NULL, &bare);
+    assert(err == 0);
+
+    err = bare_load(bare, preflight, NULL, NULL);
+    (void) err;
+
+    err = bare_run(bare, UV_RUN_DEFAULT);
+    assert(err == 0);
+
+    int exit_code;
+    err = bare_teardown(bare, UV_RUN_DEFAULT, &exit_code);
+    assert(err == 0);
+
+    if (exit_code != 0) _exit(exit_code);
+  }
+
+  err = uv_async_init(bare__loop, &bare__shutdown, bare__on_shutdown);
+  assert(err == 0);
+
+  err = bare_setup(bare__loop, bare__platform, NULL, argc, (const char **) argv, NULL, &bare);
+  assert(err == 0);
 
   @autoreleasepool {
     return UIApplicationMain(argc, argv, @"BareApp", @"BareApp");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-ui-kit",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "description": "UIKit runtime for Bare",
   "exports": {
     "./package": "./package.json",