@nativescript/android 8.9.0-napi-v8.9 → 8.9.0-next.2025-02-20-13440184782

package/README.md

@@ -1,4 +1,4 @@
-# Node-API Android Runtime for NativeScript
+# 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,15 +77,14 @@ Note: You might need to run the Android Studio from the command line in order to
   Windows: 
 
   ```Shell
-  gradlew -Pengine=V8
+  gradlew
   ```
 
   Mac/Linux:
 
   ```Shell
-  ./gradlew -Pengine=V8
+  ./gradlew
   ```
-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

@@ -77,8 +77,8 @@ def METADATA_JAVA_OUT = "mdg-java-out.txt"
 def pluginsJarLibraries = new LinkedList<String>()
 def allJarLibraries = new LinkedList<String>()
 
-def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int }
-def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int }
+def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk as int : NS_DEFAULT_COMPILE_SDK_VERSION as int }
+def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk as int : NS_DEFAULT_COMPILE_SDK_VERSION as int }
 def computeMinSdkVersion = { -> project.hasProperty("minSdk") ? minSdk : NS_DEFAULT_MIN_SDK_VERSION as int }
 def computeBuildToolsVersion = { ->
     project.hasProperty("buildToolsVersion") ? buildToolsVersion : NS_DEFAULT_BUILD_TOOLS_VERSION as String
@@ -239,7 +239,7 @@ android {
     }
 
     sourceSets.main {
-        jniLibs.srcDirs = ["$projectDir/libs/jni", "$projectDir/snapshot-build/build/ndk-build/libs", "$projectDir/src/main/jniLibs"]
+        jniLibs.srcDirs = ["$projectDir/libs/jni", "$projectDir/snapshot-build/build/ndk-build/libs"]
     }
 
     signingConfigs {
@@ -260,7 +260,7 @@ android {
     }
     buildTypes {
         release {
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
         }
     }
 
@@ -333,10 +333,6 @@ 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,327 +1,177 @@
 (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;
 
-      if (
-        typeof global.Reflect === "object" &&
-        typeof global.Reflect.decorate === "function"
-      ) {
-        r = global.Reflect.decorate(decorators, target, key, desc);
-      } else {
-        for (var i = decorators.length - 1; i >= 0; i--) {
-          if ((d = decorators[i])) {
-            r =
-              (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-          }
-        }
-      }
-      return c > 3 && r && Object.defineProperty(target, key, r), r;
-    };
-
-  // For backward compatibility.
-  var __native = function (thiz) {
-    // we are setting the __container__ property to the base class when the super method is called
-    // if the constructor returns the __native(this) call we will use the old implementation
-    // copying all the properties to the result
-    // otherwise if we are using the result from the super() method call we won't need such logic
-    // as thiz already contains the parent properties
-    // this way we now support both implementations in typescript generated constructors:
-    // 1: super(); return __native(this);
-    // 2: return super() || this;
-    //    if (thiz.__container__) {
-    //    if (__useHostObjects) {
-    //    for (var prop in thiz) {
-    //            if (thiz.hasOwnProperty(prop)) {
-    //              thiz.__proto__[prop] = thiz[prop];
-    //              delete thiz[prop];
-    //            }
-    //       }
-    //    }
-
-    return thiz;
-    //    } else {
-    //      return thiz;
-    //    }
-  };
-
-  var __extends = function (Child, Parent) {
-    var extendNativeClass =
-      !!Parent.extend && Parent.extend.toString().indexOf("[native code]") > -1;
-    if (!extendNativeClass) {
-      __extends_ts(Child, Parent);
-      return;
-    }
-    if (Parent.__isPrototypeImplementationObject) {
-      throw new Error("Can not extend an already extended native object.");
-    }
-
-    function extend(thiz) {
-      var child = thiz.__proto__.__child;
-      if (!child.__extended) {
-        var parent = thiz.__proto__.__parent;
-        child.__extended = parent.extend(child.name, child.prototype, true);
-        // This will deal with "i instanceof child"
-        child[Symbol.hasInstance] = function (instance) {
-          return instance instanceof this.__extended;
-        };
-      }
-      return child.__extended;
-    }
-
-    Parent.__activityExtend = function (parent, name, implementationObject) {
-      __log("__activityExtend called");
-      return parent.extend(name, implementationObject);
-    };
-
-    Parent.call = function (thiz) {
-      var Extended = extend(thiz);
-      thiz.__container__ = true;
-      if (arguments.length > 1) {
-        if (typeof Extended !== "function") {
-          thiz = Reflect.construct(
-            Extended,
-            Array.prototype.slice.call(arguments, 1)
-          );
-        } else {
-          thiz = new (Function.prototype.bind.apply(
-            Extended,
-            [null].concat(Array.prototype.slice.call(arguments, 1))
-          ))();
-        }
-      } else {
-        thiz = new Extended();
-      }
-      return thiz;
-    };
-
-    Parent.apply = function (thiz, args) {
-      var Extended = extend(thiz);
-      thiz.__container__ = true;
-      if (args && args.length > 0) {
-        thiz = new (Function.prototype.bind.apply(
-          Extended,
-          [null].concat(args)
-        ))();
-      } else {
-        thiz = new Extended();
-      }
-      return thiz;
-    };
-    __extends_ns(Child, Parent);
-    Child.__isPrototypeImplementationObject = true;
-    Child.__proto__ = Parent;
-    Child.prototype.__parent = Parent;
-    Child.prototype.__child = Child;
-  };
-
-  var __extends_ts = function (child, parent) {
-    extendStaticFunctions(child, parent);
-    assignPrototypeFromParentToChild(parent, child);
-  };
-
-  var __extends_ns = function (child, parent) {
-    if (!parent.extend) {
-      assignPropertiesFromParentToChild(parent, child);
-    }
-
-    assignPrototypeFromParentToChild(parent, child);
-  };
-
-  var extendStaticFunctions =
-    Object.setPrototypeOf ||
-    (hasInternalProtoProperty() &&
-      function (child, parent) {
-        child.__proto__ = parent;
-      }) ||
-    assignPropertiesFromParentToChild;
-
-  function hasInternalProtoProperty() {
-    return { __proto__: [] } instanceof Array;
-  }
-
-  function assignPropertiesFromParentToChild(parent, child) {
-    for (var property in parent) {
-      if (parent.hasOwnProperty(property)) {
-        child[property] = parent[property];
-      }
-    }
-  }
-
-  function assignPrototypeFromParentToChild(parent, child) {
-    function __() {
-      this.constructor = child;
-    }
-
-    if (parent === null) {
-      child.prototype = Object.create(null);
-    } else {
-      __.prototype = parent.prototype;
-      child.prototype = new __();
-    }
-  }
-
-  function JavaProxy(className) {
-    return function (target) {
-      var extended = target.extend(className, target.prototype);
-      extended.name = className;
-      return extended;
-    };
-  }
-
-  function Interfaces(interfacesArr) {
-    return function (target) {
-      if (interfacesArr instanceof Array) {
-        // attach interfaces: [] to the object
-        target.prototype.interfaces = interfacesArr;
-      }
-    };
-  }
-
-  Object.defineProperty(global, "__native", { value: __native });
-  Object.defineProperty(global, "__extends", { value: __extends });
-  Object.defineProperty(global, "__decorate", { value: __decorate });
-
-  if (!global.__ns__worker) {
-    global.JavaProxy = JavaProxy;
-  }
-  global.Interfaces = Interfaces;
-
-  if (global.WeakRef && !global.WeakRef.prototype.get) {
-    global.WeakRef.prototype.get = global.WeakRef.prototype.deref;
-  }
-
-  global.setNativeArrayProp = (target, prop, value, receiver) => {
-    if (!isNaN(prop)) {
-      receiver.setValueAtIndex(parseInt(prop), value);
-      return true;
-    }
-    target[prop] = value;
-    return true;
-  };
-
-  global.getNativeArrayProp = (target, prop, receiver) => {
-    if (!isNaN(prop)) {
-      return receiver.getValueAtIndex(parseInt(prop));
-    }
-
-    if (prop === Symbol.iterator) {
-      let index = 0;
-      const l = target.length;
-      return function () {
-        return {
-          next: function () {
-            if (index < l) {
-              return {
-                value: receiver.getValueAtIndex(index++),
-                done: false,
-              };
-            } else {
-              return { done: true };
-            }
-          },
-        };
-      };
-    }
-    if (prop === "map") {
-      return function (callback) {
-        const values = receiver.getAllValues();
-        const result = [];
-        const l = target.length;
-        for (let i = 0; i < l; i++) {
-          result.push(callback(values[i], i, target));
-        }
-        return result;
-      };
-    }
-
-    if (prop === "toString") {
-      return function () {
-        const result = receiver.getAllValues();
-        return result.join(",");
-      };
-    }
-
-    if (prop === "forEach") {
-      return function (callback) {
-        const values = receiver.getAllValues();
-        const l = values.length;
-        for (let i = 0; i < l; i++) {
-          callback(values[i], i, target);
-        }
-      };
-    }
-    return target[prop];
-  };
-
-  function findInPrototypeChain(obj, prop) {
-    while (obj) {
-      if (obj.hasOwnProperty(prop)) {
-        return Object.getOwnPropertyDescriptor(obj, prop);
-      }
-      obj = Object.getPrototypeOf(obj);
-    }
-    return undefined;
-  }
-
-globalThis.__prepareHostObject = function (hostObject, jsThis) {
-//    const prototype = Object.getPrototypeOf(jsThis);
-//    Object.setPrototypeOf(hostObject, prototype);
-     Object.defineProperty(hostObject, "super", {
-              get: () => jsThis["super"],
-    });
-};
- 
-  const EXTERNAL_PROP = "[[external]]";
-  const REFERENCE_PROP_JSC = "[[jsc_reference_info]]";
-
-  function __createNativeProxy(object, objectId) {
-    const proxy = new Proxy(object, {
-      get: function (target, prop) {
-        if (prop === EXTERNAL_PROP) return this[EXTERNAL_PROP];
-        if (prop === REFERENCE_PROP_JSC) return this[REFERENCE_PROP_JSC];
-        if (target.__is__javaArray) {
-          return global.getNativeArrayProp(target, prop, target);
-        }
-        return target[prop];
-      },
-      set: function (target, prop, value) {
-        if (prop === EXTERNAL_PROP) {
-          this[EXTERNAL_PROP] = value;
-          return true;
-        }
-
-        if (prop === REFERENCE_PROP_JSC) {
-          this[REFERENCE_PROP_JSC] = value;
-        }
-
-        if (target.__is__javaArray && !isNaN(prop)) {
-          target.setValueAtIndex(parseInt(prop), value);
-          return true;
-        }
-
-        target[prop] = value;
-        return true;
-      },
-    });
-    return proxy;
-  }
-  globalThis.__createNativeProxy = __createNativeProxy;
-
-  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");
-  };
-})();
+	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;
+
+		if (typeof global.Reflect === "object" && typeof global.Reflect.decorate === "function") {
+			r = global.Reflect.decorate(decorators, target, key, desc);
+		}
+		else {
+			for (var i = decorators.length - 1; i >= 0; i--) {
+				if (d = decorators[i]) {
+					r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+				}
+			}
+		}
+		return c > 3 && r && Object.defineProperty(target, key, r), r;
+	};
+
+	// For backward compatibility.
+	var __native = function (thiz) {
+		// we are setting the __container__ property to the base class when the super method is called
+		// if the constructor returns the __native(this) call we will use the old implementation
+		// copying all the properties to the result
+		// otherwise if we are using the result from the super() method call we won't need such logic
+		// as thiz already contains the parent properties
+		// 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 {
+			return thiz;
+		}
+	};
+
+	var __extends = function (Child, Parent) {
+		var extendNativeClass = !!Parent.extend && (Parent.extend.toString().indexOf("[native code]") > -1);
+		if (!extendNativeClass) {
+			__extends_ts(Child, Parent);
+			return;
+		}
+		if (Parent.__isPrototypeImplementationObject) {
+			throw new Error("Can not extend an already extended native object.");
+		}
+
+		function extend(thiz) {
+			var child = thiz.__proto__.__child;
+			if (!child.__extended) {
+				var parent = thiz.__proto__.__parent;
+				child.__extended = parent.extend(child.name, child.prototype, true);
+				// This will deal with "i instanceof child"
+				child[Symbol.hasInstance] = function (instance) {
+					return instance instanceof this.__extended;
+				}
+			}
+			return child.__extended;
+		};
+
+		Parent.__activityExtend = function (parent, name, implementationObject) {
+			__log("__activityExtend called");
+			return parent.extend(name, implementationObject);
+		};
+
+		Parent.call = function (thiz) {
+			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))));
+			}
+			else {
+				thiz.__proto__ = new Extended()
+			}
+			return thiz.__proto__;
+		};
+
+		Parent.apply = function (thiz, args) {
+			var Extended = extend(thiz);
+			thiz.__container__ = true;
+			if (args && args.length > 0) {
+				thiz.__proto__ = new (Function.prototype.bind.apply(Extended, [null].concat(args)));
+			}
+			else {
+				thiz.__proto__ = new Extended();
+			}
+			return thiz.__proto__;
+		};
+		__extends_ns(Child, Parent);
+		Child.__isPrototypeImplementationObject = true;
+		Child.__proto__ = Parent;
+		Child.prototype.__parent = Parent;
+		Child.prototype.__child = Child;
+	}
+
+	var __extends_ts = function (child, parent) {
+		extendStaticFunctions(child, parent);
+		assignPrototypeFromParentToChild(parent, child);
+	};
+
+	var __extends_ns = function (child, parent) {
+		if (!parent.extend) {
+			assignPropertiesFromParentToChild(parent, child);
+		}
+
+		assignPrototypeFromParentToChild(parent, child);
+	};
+
+	var extendStaticFunctions =
+		Object.setPrototypeOf
+		|| (hasInternalProtoProperty() && function (child, parent) { child.__proto__ = parent; })
+		|| assignPropertiesFromParentToChild;
+
+	function hasInternalProtoProperty() {
+		return { __proto__: [] } instanceof Array;
+	}
+
+	function assignPropertiesFromParentToChild(parent, child) {
+		for (var property in parent) {
+			if (parent.hasOwnProperty(property)) {
+				child[property] = parent[property];
+			}
+		}
+	}
+
+	function assignPrototypeFromParentToChild(parent, child) {
+		function __() {
+			this.constructor = child;
+		}
+
+		if (parent === null) {
+			child.prototype = Object.create(null);
+		} else {
+			__.prototype = parent.prototype;
+			child.prototype = new __();
+		}
+	}
+
+
+	function JavaProxy(className) {
+		return function (target) {
+			var extended = target.extend(className, target.prototype)
+			extended.name = className;
+			return extended;
+		};
+	}
+
+	function Interfaces(interfacesArr) {
+		return function (target) {
+			if (interfacesArr instanceof Array) {
+				// attach interfaces: [] to the object
+				target.prototype.interfaces = interfacesArr;
+			}
+		}
+	}
+
+	Object.defineProperty(global, "__native", { value: __native });
+	Object.defineProperty(global, "__extends", { value: __extends });
+	Object.defineProperty(global, "__decorate", { value: __decorate });
+
+	if (!global.__ns__worker) {
+		global.JavaProxy = JavaProxy;
+	}
+	global.Interfaces = Interfaces;
+})()

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("Inspector", "To dbg backend: " + message.getTextPayload() + " ThreadId:" + Thread.currentThread().getId());
+                Log.d("V8Inspector", "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 = false;
+    private boolean enabled;
 
     public LogcatLogger(Context context) {
         this.initLogging(context);
@@ -33,12 +33,13 @@ 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();