part 37

Author: ammarahm-ed

.gitignore

@@ -14,3 +14,7 @@
 .cxx
 local.properties
 dist
+dist_v8
+dist_quickjs
+dist_hermes
+dist_jsc

README.md

@@ -1,4 +1,4 @@
-# Android Runtime for NativeScript
+# Node-API Android Runtime for NativeScript
 [![Build Status](https://travis-ci.org/NativeScript/android-runtime.svg?branch=master)](https://travis-ci.org/NativeScript/android-runtime)
 
 Contains the source code for the NativeScript's Android Runtime. [NativeScript](https://www.nativescript.org/) is a framework which enables developers to write truly native mobile applications for Android and iOS using JavaScript and CSS. Each mobile platform has its own ecosystem and offers completely different development tools and language(s) - Java for Android and Objective C (Swift) for iOS. In order to translate JavaScript code to the corresponding native APIs some kind of proxy mechanism is needed. This is exactly what the "Runtime" parts of NativeScript are responsible for. The Android Runtime may be thought of as "The Bridge" between the JavaScript and Android worlds. A NativeScript application for Android is a standard native package (apk) which besides the JavaScript files embed the runtime as well.
@@ -77,14 +77,15 @@ Note: You might need to run the Android Studio from the command line in order to
   Windows: 
 
   ```Shell
-  gradlew
+  gradlew -Pengine=V8
   ```
 
   Mac/Linux:
 
   ```Shell
-  ./gradlew
+  ./gradlew -Pengine=V8
   ```
+You can pass in `QUICKJS`, `HERMES`, `JSC` or `V8` to compile the runtime with the respective JS engine.
 
 * The build process includes building of the runtime package (both optimized and with unstripped v8 symbol table), as well as all supplementary tools used for the android builds: metadata-generator, binding-generator, metadata-generator, static-binding-generator
 * The result of the build will be in the dist folder.

build.gradle

@@ -22,12 +22,16 @@ if (hasNdkVersion) {
     println "Using NDK version " + ndkVersion
 }
 
+def hasEngine = project.hasProperty("engine");
+
 def isWinOs = System.properties['os.name'].toLowerCase().contains('windows')
 def pVersion = "no package version was provided by build.gradle build"
 def arVersion = "no commit sha was provided by build.gradle build"
 def generateRegularRuntimePackage = !project.hasProperty("skipUnoptimized")
 
-def DIST_PATH = "$rootDir/dist"
+def jsEngine = engine ?: 'v8'
+
+def DIST_PATH = "$rootDir/dist_${jsEngine.toLowerCase()}"
 def TEST_APP_PATH = "$rootDir/test-app"
 def BUILD_TOOLS_PATH = "$TEST_APP_PATH/build-tools"
 def DIST_FRAMEWORK_PATH = "$DIST_PATH/framework"
@@ -198,7 +202,13 @@ def getAssembleReleaseBuildArguments = { ->
     if (hasNdkVersion) {
         arguments.add("-PndkVersion="+ndkVersion)
     }
+
+    if (hasEngine) {
+        arguments.add("-Pengine=${engine}")
+    }
+
     arguments += ["--warning-mode", "all"]
+
     return arguments
 }
 

test-app/app/src/main/assets/app/Infrastructure/Jasmine/jasmine-2.0.1/boot.js

@@ -40,17 +40,18 @@ var TerminalReporter = require('../jasmine-reporters/terminal_reporter').Termina
     },
 
     it: function(desc, func) {
-      if (func.length > 0) {
-        return env.it(desc, func);
-      } else {
-        return env.it(desc, function(done) {
-            func();
-            __ns__setTimeout(() => {
-                done();
-            }, 1)
-
-        })
-      }
+       return env.it(desc, func);
+//      if (func.length > 0) {
+//        return env.it(desc, func);
+//      } else {
+//        return env.it(desc, function(done) {
+//            func();
+//            __ns__setTimeout(() => {
+//                done();
+//            }, 1)
+//
+//        })
+//      }
     },
 
     xit: function(desc, func) {

test-app/app/src/main/assets/app/MyActivity.js

@@ -27,9 +27,8 @@ var MyActivity = (function (_super) {
     _super.apply(this, arguments);
   }
   MyActivity.prototype.onCreate = function (bundle) {
-    console.log("BUNDLE", typeof bundle);
     _super.prototype.onCreate.call(this, bundle);
-    // require('./tests/testsWithContext').run(this);
+//    require('./tests/testsWithContext').run(this);
     //run jasmine
 
 //    execute();
@@ -59,9 +58,7 @@ var MyActivity = (function (_super) {
     button.setOnClickListener(
       new android.view.View.OnClickListener("AppClickListener", {
         onClick: function () {
-          const now = performance.now();
           button.setBackgroundColor(colors[taps % colors.length]);
-          console.log(performance.now() - now);
           taps++;
         },
       })

test-app/app/src/main/assets/app/mainpage.js

@@ -17,7 +17,7 @@ __approot = __dirname.substr(0, __dirname.length - 4);
 
 
 // PASSING TESTS
-//require("./tests/testMetadata")
+//require("./tests/testMetadata");
 //require("./tests/testWeakRef");
 //require("./tests/testMethodResolution");
 //require("./tests/testMethodResolutionWithNulls");
@@ -53,16 +53,25 @@ __approot = __dirname.substr(0, __dirname.length - 4);
 //require("./tests/discardedExceptionsTest");
 //require("./tests/requireExceptionTests");
 //require("./tests/exceptionHandlingTests");
+
 //require("./tests/tests");
+
 //require("./tests/testsForTypescript");
+
 //require("./tests/testGC");
+
 //require("./tests/testReleaseNativeCounterpart");
+
 //require("./tests/testArrays");
+
 //require("./tests/testJniReferenceLeak");
+
 //var shared = require("./shared");
 //shared.runRequireTests();
 //shared.runRuntimeTests();
+
 //shared.runWorkerTests();
+
 //require("./tests/dispatchCallbacksOnUiThreadTests");
 //require("./tests/testsMemoryManagement");
 
@@ -74,5 +83,5 @@ __approot = __dirname.substr(0, __dirname.length - 4);
 //require('./tests/testURLImpl.js');
 //require('./tests/testURLSearchParamsImpl.js');
 
-//require("./tests/testMultithreadedJavascript"); //FAILS
+require("./tests/testMultithreadedJavascript"); //FAILS
 

test-app/app/src/main/assets/app/tests/testMultithreadedJavascript.js

@@ -2,15 +2,14 @@ describe("Test multithreaded javascript ", () => {
     it("Should execute callbacks on specified native thread", done => {
 
         const currentThreadId = java.lang.Thread.currentThread().getId();
-         console.log("TEST BEGIN!!",currentThreadId);
         new java.lang.Thread(new java.lang.Runnable({
             run() {
                 const threadId = java.lang.Thread.currentThread().getId();
                 expect(threadId).not.toEqual(currentThreadId);
 
                 const mainHandler = new android.os.Handler(android.os.Looper.getMainLooper());
-                // done() must called on the main thread to ensure that jasmine tests
-                // continue executing there
+//                // done() must called on the main thread to ensure that jasmine tests
+//                // continue executing there
                 mainHandler.post(new java.lang.Runnable({
                     run: done
                 }));

test-app/app/src/main/java/com/tns/LogcatLogger.java

@@ -6,7 +6,7 @@
 public final class LogcatLogger implements Logger {
     private final static String DEFAULT_LOG_TAG = "TNS.Java";
 
-    private boolean enabled = true;
+    private boolean enabled = false;
 
     public LogcatLogger(Context context) {
         this.initLogging(context);
@@ -33,11 +33,9 @@ public final void write(String tag, String msg) {
     }
 
     private void initLogging(Context context) {
-        // setEnabled(true);
        boolean isDebuggableApp = Util.isDebuggableApp(context);
        if (isDebuggableApp) {
            String verboseLoggingProp = Util.readSystemProperty("nativescript.verbose.logging");
-
            if (Util.isPositive(verboseLoggingProp)) {
                setEnabled(true);
            }

test-app/app/src/main/java/com/tns/RuntimeHelper.java

@@ -74,8 +74,6 @@ public static Runtime initRuntime(Context context) {
 
             Logger logger = new LogcatLogger(context);
 
-            logger.setEnabled(true);
-
             Runtime.nativeLibraryLoaded = true;
             Runtime runtime = null;
             boolean showErrorIntent = hasErrorIntent(context);

test-app/runtime/build.gradle

@@ -1,11 +1,14 @@
 apply plugin: 'com.android.library'
 
 // can be: "V8", "JSC", "HERMES", "QUICKJS"
-def jsEngine = "V8"
-if (project.hasProperty("engine")) {
-    jsEngine = engine;
+def jsEngine = "HERMES"
+def hasEngine = project.hasProperty("engine")
+if (hasEngine) {
+    jsEngine = engine
 }
 
+printf("Compiling NativeScript with %s.\n", jsEngine)
+
 def optimized = project.hasProperty("optimized")
 if (optimized) {
     println "Optimized build triggered."
@@ -171,24 +174,21 @@ android {
         packagingOptions {
             exclude "**/libjsc.so"
             exclude "**/libv8.so"
-            exclude "**/libjsi.so"
             exclude '**/libc++_shared.so'
-            exclude "**/libfbjni.so"
+            exclude '**/libfbjni.so'
         }
     } else if (jsEngine == "JSC") {
         packagingOptions {
             exclude "**/libv8android.so"
             exclude "**/libhermes.so"
             exclude "**/libjsi.so"
-            exclude "**/libfbjni.so"
         }
     } else if (jsEngine == "QUICKJS") {
         packagingOptions {
             exclude "**/libv8.so"
             exclude "**/libhermes.so"
             exclude "**/libjsc.so"
             exclude "**/libjsi.so"
-            exclude "**/libfbjni.so"
         }
     }
 }

test-app/runtime/src/main/cpp/napi/common/jsr_common.h

@@ -0,0 +1,29 @@
+//
+// Created by Ammar Ahmed on 17/01/2025.
+//
+
+#ifndef TEST_APP_JSR_COMMON_H
+#define TEST_APP_JSR_COMMON_H
+
+#include "js_native_api.h"
+
+napi_status js_create_runtime(napi_runtime* runtime);
+napi_status js_create_napi_env(napi_env* env, napi_runtime runtime);
+napi_status js_set_runtime_flags(const char* flags);
+napi_status js_lock_env(napi_env env);
+napi_status js_unlock_env(napi_env env);
+napi_status js_free_napi_env(napi_env env);
+napi_status js_free_runtime(napi_runtime runtime);
+napi_status js_execute_script(napi_env env,
+                              napi_value script,
+                              const char *file,
+                              napi_value *result);
+
+napi_status js_execute_pending_jobs(napi_env env);
+
+napi_status js_get_engine_ptr(napi_env env, int64_t *engine_ptr);
+napi_status js_adjust_external_memory(napi_env env, int64_t changeInBytes, int64_t* externalMemory);
+napi_status js_cache_script(napi_env env, const char *source, const char *file);
+napi_status js_run_cached_script(napi_env env, const char * file, napi_value script, void* cache, napi_value *result);
+
+#endif //TEST_APP_JSR_COMMON_H

test-app/runtime/src/main/cpp/napi/hermes/include/node-api/js_native_api_types.h

@@ -22,6 +22,7 @@ typedef uint16_t char16_t;
 // JSVM API types are all opaque pointers for ABI stability
 // typedef undefined structs instead of void* for compile time type safety
 typedef struct napi_env__* napi_env;
+typedef struct NapiRuntime *napi_runtime;
 typedef struct napi_value__* napi_value;
 typedef struct napi_ref__* napi_ref;
 typedef struct napi_handle_scope__* napi_handle_scope;

test-app/runtime/src/main/cpp/napi/hermes/jsr.cpp

@@ -28,7 +28,6 @@ napi_status js_lock_env(napi_env env) {
     if (itFound == JSR::env_to_jsr_cache.end()) {
         return napi_invalid_arg;
     }
-
     itFound->second->lock();
 
     return napi_ok;
@@ -39,7 +38,6 @@ napi_status js_unlock_env(napi_env env) {
     if (itFound == JSR::env_to_jsr_cache.end()) {
         return napi_invalid_arg;
     }
-
     itFound->second->unlock();
 
     return napi_ok;
@@ -51,6 +49,10 @@ napi_status js_create_napi_env(napi_env* env, napi_runtime runtime) {
     return runtime->hermes->rt->createNapiEnv( env);
 }
 
+napi_status js_set_runtime_flags(const char* flags) {
+    return napi_ok;
+}
+
 napi_status js_free_napi_env(napi_env env) {
       return napi_ok;
 }

test-app/runtime/src/main/cpp/napi/hermes/jsr.h

@@ -8,8 +8,7 @@
 #include "hermes/hermes.h"
 #include "hermes/hermes_api.h"
 #include "jsi/threadsafe.h"
-
-typedef struct NapiRuntime *napi_runtime;
+#include "jsr_common.h"
 
 class JSR {
 public:
@@ -27,23 +26,6 @@ class JSR {
     static std::unordered_map<napi_env, JSR *> env_to_jsr_cache;
 };
 
-napi_status js_create_runtime(napi_runtime* runtime);
-napi_status js_lock_env(napi_env env);
-napi_status js_unlock_env(napi_env env);
-napi_status js_create_napi_env(napi_env* env, napi_runtime runtime);
-napi_status js_free_napi_env(napi_env env);
-napi_status js_free_runtime(napi_runtime runtime);
-napi_status js_execute_script(napi_env env,
-                              napi_value script,
-                              const char *file,
-                              napi_value *result);
-
-napi_status js_execute_pending_jobs(napi_env env);
-napi_status js_get_engine_ptr(napi_env env, int64_t *engine_ptr);
-napi_status js_adjust_external_memory(napi_env env, int64_t changeInBytes, int64_t* externalMemory);
-napi_status js_cache_script(napi_env env, const char *source, const char *file);
-napi_status js_run_cached_script(napi_env env, const char * file, napi_value script, void* cache, napi_value *result);
-
 class NapiScope {
 public:
     explicit NapiScope(napi_env env)
@@ -64,7 +46,5 @@ class NapiScope {
 };
 
 #define JSEnterScope
-#define JSEnter
-#define JSLeave
 
 #endif //TEST_APP_JSR_H

test-app/runtime/src/main/cpp/napi/jsc/jsr.cpp

@@ -28,6 +28,10 @@ napi_status js_create_napi_env(napi_env* env, napi_runtime runtime) {
 
 }
 
+napi_status js_set_runtime_flags(const char* flags) {
+    return napi_ok;
+}
+
 napi_status js_lock_env(napi_env env) {
     return napi_ok;
 }

test-app/runtime/src/main/cpp/napi/jsc/jsr.h

@@ -5,27 +5,11 @@
 #ifndef TEST_APP_JSR_H
 #define TEST_APP_JSR_H
 
+#include "jsr_common.h"
 #include "jsc-api.h"
 
 typedef struct NapiRuntime *napi_runtime;
 
-napi_status js_create_runtime(napi_runtime* runtime);
-napi_status js_create_napi_env(napi_env* env, napi_runtime runtime);
-napi_status js_lock_env(napi_env env);
-napi_status js_unlock_env(napi_env env);
-napi_status js_free_napi_env(napi_env env);
-napi_status js_free_runtime(napi_runtime runtime);
-napi_status js_execute_script(napi_env env,
-                              napi_value script,
-                              const char *file,
-                              napi_value *result);
-
-napi_status js_execute_pending_jobs(napi_env env);
-napi_status js_get_engine_ptr(napi_env env, int64_t *engine_ptr);
-napi_status js_adjust_external_memory(napi_env env, int64_t changeInBytes, int64_t* externalMemory);
-napi_status js_cache_script(napi_env env, const char *source, const char *file);
-napi_status js_run_cached_script(napi_env env, const char * file, napi_value script, void* cache, napi_value *result);
-
 class NapiScope {
 public:
     explicit NapiScope(napi_env env)