fix: fix module api binding.

Author: andycall

bridge/bindings/qjs/binding_initializer.cc

@@ -6,6 +6,7 @@
 #include "binding_initializer.h"
 
 #include "qjs_window.h"
+#include "qjs_module_manager.h"
 
 //#include "bindings/qjs/bom/blob.h"
 //#include "bindings/qjs/bom/console.h"
@@ -45,6 +46,8 @@ namespace kraken {
 
 void installBindings(JSContext* ctx) {
   QJSWindow::installGlobalFunctions(ctx);
+  QJSModuleManager::installGlobalFunctions(ctx);
+
 }
 
 }  // namespace kraken

bridge/bindings/qjs/qjs_module_manager.cc

@@ -10,7 +10,6 @@
 
 namespace kraken {
 
-
 JSValue krakenModuleListener(JSContext* ctx, JSValueConst this_val, int argc, JSValueConst* argv) {
   if (argc < 1) {
     return JS_ThrowTypeError(ctx, "Failed to execute '__kraken_module_listener__': 1 parameter required, but only 0 present.");
@@ -35,9 +34,6 @@ JSValue krakenModuleListener(JSContext* ctx, JSValueConst this_val, int argc, JS
     return exception.toQuickJS();
   }
 
-//  auto* link = new ModuleContext{JS_DupValue(ctx, callbackValue), context};
-//  list_add_tail(&link->link, &context->module_job_list);
-
   return JS_NULL;
 }
 
@@ -72,21 +68,10 @@ JSValue krakenInvokeModule(JSContext* ctx, JSValueConst this_val, int argc, JSVa
   return result.toQuickJS();
 }
 
-JSValue flushUICommand(JSContext* ctx, JSValueConst this_val, int argc, JSValueConst* argv) {
-  auto* context = static_cast<ExecutionContext*>(JS_GetContextOpaque(ctx));
-
-  if (context->dartMethodPtr()->flushUICommand == nullptr) {
-    return JS_ThrowTypeError(ctx, "Failed to execute '__kraken_flush_ui_command__': dart method (flushUICommand) is not registered.");
-  }
-  context->dartMethodPtr()->flushUICommand();
-  return JS_NULL;
-}
-
 void QJSModuleManager::installGlobalFunctions(JSContext* ctx) {
   std::initializer_list<MemberInstaller::FunctionConfig> functionConfig {
     {"__kraken_module_listener__", krakenModuleListener, 1, combinePropFlags(JSPropFlag::enumerable, JSPropFlag::writable, JSPropFlag::configurable)},
     {"__kraken_invoke_module__", krakenInvokeModule, 3, combinePropFlags(JSPropFlag::enumerable, JSPropFlag::writable, JSPropFlag::configurable)},
-    {"__kraken_flush_ui_command__", flushUICommand, 0, combinePropFlags(JSPropFlag::enumerable, JSPropFlag::writable, JSPropFlag::configurable)},
   };
 
   JSValue globalObject = JS_GetGlobalObject(ctx);

bridge/bindings/qjs/qjs_module_manager.h

@@ -17,8 +17,4 @@ class QJSModuleManager final {
 
 }
 
-//
-//void bindModuleManager(ExecutionContext* context);
-//void handleInvokeModuleUnexpectedCallback(void* callbackContext, int32_t contextId, NativeString* errmsg, NativeString* json);
-
 #endif  // KRAKENBRIDGE_QJS_MODULE_MANAGER_H

bridge/core/frame/module_callback.h

@@ -12,6 +12,15 @@
 
 namespace kraken {
 
+class ModuleCallback;
+
+// In C++ code, We can not use offsetof to access members of structures or classes that are not Plain Old Data Structures.
+// So we use struct which support offsetof.
+struct ModuleCallbackLinker {
+  ModuleCallback* ptr;
+  list_head link;
+};
+
 // ModuleCallback is an asynchronous callback function, usually from the 4th parameter of `kraken.invokeModule` function.
 // When the asynchronous operation on the Dart side ends, the callback is will called and to return to the JS executing environment.
 class ModuleCallback : public GarbageCollected<ModuleCallback> {
@@ -23,14 +32,13 @@ class ModuleCallback : public GarbageCollected<ModuleCallback> {
   void trace(GCVisitor*visitor) const override;
   void dispose() const override;
 
-  list_head link;
+  ModuleCallbackLinker linker{this};
 
 private:
   QJSFunction* m_function{nullptr};
 };
 
 
-
 }
 
 #endif  // KRAKENBRIDGE_MODULE_CALLBACK_H

bridge/core/frame/module_callback_coordinator.cc

@@ -8,11 +8,11 @@
 namespace kraken {
 
 void ModuleCallbackCoordinator::addModuleCallbacks(ModuleCallback* callback) {
-  list_add_tail(&m_listeners, &callback->link);
+  list_add_tail(&m_listeners, &callback->linker.link);
 }
 
 void ModuleCallbackCoordinator::removeModuleCallbacks(ModuleCallback* callback) {
-  list_del(&callback->link);
+  list_del(&callback->linker.link);
 }
 
 ModuleCallbackCoordinator::ModuleCallbackCoordinator() {
@@ -23,8 +23,8 @@ void ModuleCallbackCoordinator::trace(GCVisitor* visitor) {
   {
     struct list_head *el, *el1;
     list_for_each_safe(el, el1, &m_listeners) {
-      auto* callback = list_entry(el, ModuleCallback, link);
-      visitor->trace(callback->toQuickJS());
+      auto* linker = list_entry(el, ModuleCallbackLinker, link);
+      visitor->trace(linker->ptr->toQuickJS());
     }
   }
 }

bridge/foundation/native_value.cc

@@ -156,6 +156,7 @@ static JSValue anonymousFunction(JSContext* ctx, JSValueConst this_val, int argc
   //  JSValue returnValue = eventTarget->callNativeMethods(call_params.c_str(), argc, arguments);
   //  delete[] arguments;
   //  return returnValue;
+  return JS_NULL;
 }
 
 void anonymousAsyncCallback(void* callbackContext, NativeValue* nativeValue, int32_t contextId, const char* errmsg) {
@@ -215,6 +216,7 @@ static JSValue anonymousAsyncFunction(JSContext* ctx, JSValueConst this_val, int
   //  delete[] arguments;
   //
   //  return promise;
+  return JS_NULL;
 }
 
 JSValue nativeValueToJSValue(ExecutionContext* context, NativeValue& value) {