@nativescript/android 8.9.0-dev.0 → 8.9.0-napi-hermes.0

package/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.

package/framework/app/build.gradle

@@ -239,7 +239,7 @@ android {
     }
 
     sourceSets.main {
-        jniLibs.srcDirs = ["$projectDir/libs/jni", "$projectDir/snapshot-build/build/ndk-build/libs"]
+        jniLibs.srcDirs = ["$projectDir/libs/jni", "$projectDir/snapshot-build/build/ndk-build/libs", "$projectDir/src/main/jniLibs"]
     }
 
     signingConfigs {
@@ -260,7 +260,7 @@ android {
     }
     buildTypes {
         release {
-            signingConfig signingConfigs.release
+            signingConfig signingConfigs.debug
         }
     }
 
@@ -333,6 +333,10 @@ dependencies {
         outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.appcompat:appcompat:$androidXAppCompatVersion"
     }
 
+    if (ns_engine == "HERMES") {
+        implementation 'com.facebook.fbjni:fbjni:0.3.0'
+    }
+
     def androidXMaterialVersion = "${ns_default_androidx_material_version}"
     if (project.hasProperty("androidXMaterial")) {
         androidXMaterialVersion = androidXMaterial

package/framework/app/src/main/assets/internal/ts_helpers.js

@@ -1,5 +1,4 @@
 (function () {
-
 	var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
 		var c = arguments.length;
 		var r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -27,24 +26,24 @@
 		// this way we now support both implementations in typescript generated constructors:
 		// 1: super(); return __native(this);
 		// 2: return super() || this;
-		if (thiz.__container__) {
-			var result = thiz.__proto__;
-
-			for (var prop in thiz) {
-				if (thiz.hasOwnProperty(prop)) {
-					thiz.__proto__[prop] = thiz[prop];
-					delete thiz[prop];
-				}
-			}
-
-			thiz.constructor = undefined;
-			thiz.__proto__ = undefined;
-			Object.freeze(thiz);
-			Object.preventExtensions(thiz);
-			return result;
-		} else {
+//		if (thiz.__container__) {
+//			var result = thiz.__proto__;
+//
+//			for (var prop in thiz) {
+//				if (thiz.hasOwnProperty(prop)) {
+//					thiz.__proto__[prop] = thiz[prop];
+//					delete thiz[prop];
+//				}
+//			}
+//
+//			thiz.constructor = undefined;
+//			thiz.__proto__ = undefined;
+//			Object.freeze(thiz);
+//			Object.preventExtensions(thiz);
+//			return result;
+//		} else {
 			return thiz;
-		}
+//		}
 	};
 
 	var __extends = function (Child, Parent) {
@@ -79,12 +78,16 @@
 			var Extended = extend(thiz);
 			thiz.__container__ = true;
 			if (arguments.length > 1) {
-				thiz.__proto__ = new (Function.prototype.bind.apply(Extended, [null].concat(Array.prototype.slice.call(arguments, 1))));
+			    if (typeof Extended !== "function") {
+                    thiz.__proto__ = Reflect.construct(Extended, Array.prototype.slice.call(arguments, 1));
+			    } else {
+			        thiz.__proto__ = new (Function.prototype.bind.apply(Extended, [null].concat(Array.prototype.slice.call(arguments, 1))));
+			    }
 			}
 			else {
 				thiz.__proto__ = new Extended()
 			}
-			return thiz.__proto__;
+			return thiz;
 		};
 
 		Parent.apply = function (thiz, args) {
@@ -96,7 +99,7 @@
 			else {
 				thiz.__proto__ = new Extended();
 			}
-			return thiz.__proto__;
+			return thiz;
 		};
 		__extends_ns(Child, Parent);
 		Child.__isPrototypeImplementationObject = true;
@@ -174,4 +177,17 @@
 		global.JavaProxy = JavaProxy;
 	}
 	global.Interfaces = Interfaces;
-})()
+
+	if (global.WeakRef && !global.WeakRef.prototype.get) {
+		global.WeakRef.prototype.get = global.WeakRef.prototype.deref;
+	}
+	
+})();
+globalThis.getErrorStack = (err) => {
+    if (err) return err.stack;
+    const stack = new Error("").stack;
+	const lines = stack.split("\n");
+	// Line 2 results in invalid stack if not replaced when doing typescript extend.
+	lines[2] = "  at extend(native)";
+    return lines.join("\n");
+}

package/framework/app/src/main/java/com/tns/AndroidJsV8Inspector.java

@@ -291,7 +291,7 @@ class AndroidJsV8Inspector {
         @Override
         protected void onMessage(final NanoWSD.WebSocketFrame message) {
             if (currentRuntimeLogger.isEnabled()) {
-                Log.d("V8Inspector", "To dbg backend: " + message.getTextPayload() + " ThreadId:" + Thread.currentThread().getId());
+                Log.d("Inspector", "To dbg backend: " + message.getTextPayload() + " ThreadId:" + Thread.currentThread().getId());
             }
 
             inspectorMessages.offer(message.getTextPayload());

package/framework/app/src/main/java/com/tns/LogcatLogger.java

@@ -6,7 +6,7 @@ import android.util.Log;
 public final class LogcatLogger implements Logger {
     private final static String DEFAULT_LOG_TAG = "TNS.Java";
 
-    private boolean enabled;
+    private boolean enabled = false;
 
     public LogcatLogger(Context context) {
         this.initLogging(context);
@@ -33,13 +33,12 @@ public final class LogcatLogger implements Logger {
     }
 
     private void initLogging(Context context) {
-        boolean isDebuggableApp = Util.isDebuggableApp(context);
-        if (isDebuggableApp) {
-            String verboseLoggingProp = Util.readSystemProperty("nativescript.verbose.logging");
-
-            if (Util.isPositive(verboseLoggingProp)) {
-                setEnabled(true);
-            }
-        }
+       boolean isDebuggableApp = Util.isDebuggableApp(context);
+       if (isDebuggableApp) {
+           String verboseLoggingProp = Util.readSystemProperty("nativescript.verbose.logging");
+           if (Util.isPositive(verboseLoggingProp)) {
+               setEnabled(true);
+           }
+       }
     }
 }

package/framework/app/src/main/java/com/tns/RuntimeHelper.java

@@ -23,7 +23,7 @@ public final class RuntimeHelper {
     private RuntimeHelper() {
     }
 
-    private static AndroidJsV8Inspector v8Inspector;
+    // private static AndroidJsV8Inspector v8Inspector;
 
     // hasErrorIntent tells you if there was an event (with an uncaught
     // exception) raised from ErrorReport
@@ -151,8 +151,8 @@ public final class RuntimeHelper {
                 runtime = Runtime.initializeRuntimeWithConfiguration(config);
                 if (isDebuggable) {
                     try {
-                        v8Inspector = new AndroidJsV8Inspector(context.getFilesDir().getAbsolutePath(), context.getPackageName());
-                        v8Inspector.start();
+                        // v8Inspector = new AndroidJsV8Inspector(context.getFilesDir().getAbsolutePath(), context.getPackageName());
+                        // v8Inspector.start();
 
                         // the following snippet is used as means to notify the VSCode extension
                         // debugger that the debugger agent has started
@@ -176,7 +176,7 @@ public final class RuntimeHelper {
                             shouldBreak = true;
                         }
 
-                        v8Inspector.waitForDebugger(shouldBreak);
+                        // v8Inspector.waitForDebugger(shouldBreak);
                     } catch (IOException e) {
                         if (Util.isDebuggableApp(context)) {
                             e.printStackTrace();