feat: Complete NAPICreateRuntime and NAPIFreeRuntime. (#25)

* fix(QuickJS): Fix bytecode function free twice error.

* feat(QuickJS): Add NAPICreateRuntime and NAPIFreeRuntime.

* feat(Hermes): Migrate hermes to new interface.

* feat(JavaScriptCore): Add NAPICreateRuntime and NAPIFreeRuntime

Author: ChasonTang

README.md

@@ -91,11 +91,11 @@ JavaScript 值，概念和操作通常映射到 ECMA-262 语言规范，API 具
 1. 建议使用 BUILDCONFIG.gn 中定义的 LTS NDK 版本
 2. Hermes 引擎需要先 `cd third_party/hermes && git apply ../hermes_patch.diff`
 3. Android 版本 libhermes.so 包括 fbjni 库，内含 OnLoad.cpp，需要使用 System.load("hermes") 显式加载，不能依赖 Linux 内核的动态库隐式加载
-4. Hermes 引擎 0.8.1 版本内置字节码，需要先编译主机 hermesc，后输入如下命令
+4. Hermes 引擎 0.8.1 版本内置字节码，需要先编译主机 hermesc，指令 `./utils/build/configure.py`，后输入如下命令
 ```
-> cd third_party/hermes/lib/InternalBytecode
+> cd lib/InternalBytecode
 > cat 00-header.js 01-Promise.js 02-AsyncFn.js 99-footer.js > InternalBytecode.js
-> hermesc -O -Wno-undefined-variable -fno-enable-tdz -emit-binary -out=./InternalBytecode.hbc ./InternalBytecode.js
+> ../../build/bin/hermesc -O -Wno-undefined-variable -fno-enable-tdz -emit-binary -out=./InternalBytecode.hbc ./InternalBytecode.js
 > ./xxd.py ./InternalBytecode.hbc > ./InternalBytecode.inc
 ```
 

include/napi/js_native_api.h

@@ -3,8 +3,6 @@
 
 #include <napi/js_native_api_types.h>
 
-#define NAPI_EXPORT __attribute__((visibility("default")))
-
 EXTERN_C_START
 
 #include <stdbool.h> // NOLINT(modernize-deprecated-headers)
@@ -119,20 +117,25 @@ NAPI_EXPORT NAPIExceptionStatus NAPIRunScript(NAPIEnv env, const char *script, c
 NAPI_EXPORT NAPIExceptionStatus NAPIDefineClass(NAPIEnv env, const char *utf8name, NAPICallback constructor, void *data,
                                                 NAPIValue *result);
 
-NAPI_EXPORT NAPIErrorStatus NAPICreateEnv(NAPIEnv *env);
+NAPI_EXPORT NAPIErrorStatus NAPICreateRuntime(NAPIRuntime *runtime);
 
+NAPI_EXPORT NAPIErrorStatus NAPICreateEnv(NAPIEnv *env, NAPIRuntime runtime);
 
 NAPI_EXPORT NAPICommonStatus NAPIFreeEnv(NAPIEnv env);
 
+NAPI_EXPORT NAPICommonStatus NAPIFreeRuntime(NAPIRuntime runtime);
+
 NAPI_EXPORT NAPIErrorStatus NAPIGetValueStringUTF8(NAPIEnv env, NAPIValue value, const char **result);
 
 NAPI_EXPORT NAPICommonStatus NAPIFreeUTF8String(NAPIEnv env, const char *cString);
 
-NAPI_EXPORT NAPIExceptionStatus NAPICompileToByteBuffer(NAPIEnv env, const char *script, const char *sourceUrl, const uint8_t **byteBuffer, size_t *bufferSize);
+NAPI_EXPORT NAPIExceptionStatus NAPICompileToByteBuffer(NAPIEnv env, const char *script, const char *sourceUrl,
+                                                        const uint8_t **byteBuffer, size_t *bufferSize);
 
 NAPI_EXPORT NAPICommonStatus NAPIFreeByteBuffer(NAPIEnv env, const uint8_t *byteBuffer);
 
-NAPI_EXPORT NAPIExceptionStatus NAPIRunByteBuffer(NAPIEnv env, const uint8_t *byteBuffer, size_t bufferSize, NAPIValue *result);
+NAPI_EXPORT NAPIExceptionStatus NAPIRunByteBuffer(NAPIEnv env, const uint8_t *byteBuffer, size_t bufferSize,
+                                                  NAPIValue *result);
 
 #pragma mark - 间接函数
 

include/napi/js_native_api_types.h

@@ -11,8 +11,11 @@
 #define EXTERN_C_END
 #endif
 
+#define NAPI_EXPORT __attribute__((visibility("default")))
+
 EXTERN_C_START
 
+typedef struct OpaqueNAPIRuntime *NAPIRuntime;
 typedef struct OpaqueNAPIEnv *NAPIEnv;
 typedef struct OpaqueNAPIValue *NAPIValue;
 typedef struct OpaqueNAPIRef *NAPIRef;

src/js_native_api_hermes.cpp

@@ -14,7 +14,6 @@
 #include <napi/js_native_api.h>
 #include <napi/js_native_api_debugger.h>
 #include <napi/js_native_api_debugger_hermes_types.h>
-#include <string>
 #include <sys/queue.h>
 #include <unordered_set>
 
@@ -24,7 +23,6 @@
 #ifdef HERMES_ENABLE_DEBUGGER
 #include <cxxreact/MessageQueueThread.h>
 #include <hermes/inspector/RuntimeAdapter.h>
-#include <hermes/inspector/chrome/Registration.h>
 #endif
 
 #ifndef LIST_FOREACH_SAFE
@@ -1430,7 +1428,17 @@ NAPIExceptionStatus NAPIDefineClass(NAPIEnv env, const char *utf8name, NAPICallb
     return NAPIExceptionOK;
 }
 
-NAPIErrorStatus NAPICreateEnv(NAPIEnv *env)
+NAPIErrorStatus NAPICreateRuntime(NAPIRuntime *runtime)
+{
+    return NAPIErrorOK;
+}
+
+NAPICommonStatus NAPIFreeRuntime(NAPIRuntime runtime)
+{
+    return NAPICommonOK;
+}
+
+NAPIErrorStatus NAPICreateEnv(NAPIEnv *env, NAPIRuntime runtime)
 {
     CHECK_ARG(env, Error)
 

src/js_native_api_jsc.c

@@ -1341,9 +1341,9 @@ NAPIExceptionStatus NAPIRunScript(NAPIEnv env, const char *utf8Script, const cha
     return NAPIExceptionOK;
 }
 
-static JSContextGroupRef virtualMachine = NULL;
+// static JSContextGroupRef virtualMachine = NULL;
 
-static uint8_t contextCount = 0;
+// static uint8_t contextCount = 0;
 
 NAPICommonStatus NAPIEnableDebugger(__attribute__((unused)) NAPIEnv env,
                                     __attribute__((unused)) const char *debuggerTitle,
@@ -1363,48 +1363,39 @@ NAPICommonStatus NAPISetMessageQueueThread(__attribute__((unused)) NAPIEnv env,
     return NAPICommonOK;
 }
 
-NAPIErrorStatus NAPICreateEnv(NAPIEnv *env)
+NAPIErrorStatus NAPICreateRuntime(NAPIRuntime *runtime)
 {
-    // *env 才是 NAPIEnv
-    if (!env)
-    {
-        return NAPIErrorInvalidArg;
-    }
+    CHECK_ARG(runtime, Error)
 
-    if ((virtualMachine && !contextCount) || (!virtualMachine && contextCount))
-    {
-        assert(false);
+    *runtime = (NAPIRuntime)JSContextGroupCreate();
+    RETURN_STATUS_IF_FALSE(*runtime, NAPIErrorMemoryError);
 
-        return NAPIErrorGenericFailure;
-    }
+    return NAPIErrorOK;
+}
 
-    *env = malloc(sizeof(struct OpaqueNAPIEnv));
-    if (!*env)
-    {
-        return NAPIErrorMemoryError;
-    }
+NAPICommonStatus NAPIFreeRuntime(NAPIRuntime runtime)
+{
+    CHECK_ARG(runtime, Common)
 
-    if (!virtualMachine)
-    {
-        virtualMachine = JSContextGroupCreate();
-        if (!virtualMachine)
-        {
-            free(*env);
+    JSContextGroupRelease((JSContextGroupRef)runtime);
 
-            return NAPIErrorMemoryError;
-        }
-    }
-    JSGlobalContextRef globalContext = JSGlobalContextCreateInGroup(virtualMachine, NULL);
-    if (!globalContext)
+    return NAPICommonOK;
+}
+
+NAPIErrorStatus NAPICreateEnv(NAPIEnv *env, NAPIRuntime runtime)
+{
+    CHECK_ARG(env, Error)
+
+    *env = malloc(sizeof(struct OpaqueNAPIEnv));
+    RETURN_STATUS_IF_FALSE(*env, NAPIErrorMemoryError)
+
+    (*env)->context = JSGlobalContextCreateInGroup((JSContextGroupRef)runtime, NULL);
+    if (!(*env)->context)
     {
         free(*env);
-        JSContextGroupRelease(virtualMachine);
-        virtualMachine = NULL;
 
         return NAPIErrorMemoryError;
     }
-    contextCount += 1;
-    (*env)->context = globalContext;
     (*env)->lastException = NULL;
     LIST_INIT(&(*env)->strongRefList);
     LIST_INIT(&(*env)->valueList);
@@ -1441,13 +1432,6 @@ NAPICommonStatus NAPIFreeEnv(NAPIEnv env)
         free(ref);
     }
     JSGlobalContextRelease(env->context);
-    if (--contextCount == 0 && virtualMachine)
-    {
-        // virtualMachine 不能为 NULL
-        JSContextGroupRelease(virtualMachine);
-        virtualMachine = NULL;
-    }
-
     free(env);
 
     return NAPICommonOK;