chore: tmp

Author: andycall

bridge/CMakeLists.txt

@@ -197,15 +197,28 @@ if ($ENV{KRAKEN_JS_ENGINE} MATCHES "quickjs")
     bindings/qjs/native_string_utils.h
     bindings/qjs/qjs_patch.cc
     bindings/qjs/qjs_patch.h
-    core/dart_methods.h
+    bindings/qjs/qjs_function.cc
+    bindings/qjs/qjs_function.h
+    bindings/qjs/script_value.cc
+    bindings/qjs/script_value.h
+    bindings/qjs/exception_state.cc
+    bindings/qjs/exception_state.h
+
+    bindings/qjs/timer.cc
+    bindings/qjs/timer.h
 
     # Core sources
     core/executing_context.cc
     core/executing_context.h
     core/executing_context_data.cc
     core/executing_context_data.h
+    core/dart_methods.h
+    core/frame/dom_timer.cc
+    core/frame/dom_timer.h
     core/frame/dom_timer_coordinator.cc
     core/frame/dom_timer_coordinator.h
+    core/frame/window_or_worker_global_scope.cc
+    core/frame/window_or_worker_global_scope.h
 #    core/dom/character_data.cc
 #    core/dom/character_data.h
 #    core/dom/comment.cc

bridge/bindings/qjs/binding_initializer.h

@@ -10,7 +10,6 @@ namespace kraken {
 
 void initBinding();
 
-
 //  bindConsole(m_context);
 //  bindTimer(m_context);
 //  bindScreen(m_context);

bridge/bindings/qjs/dom/elements/.gitignore

@@ -0,0 +1,6 @@
+/*
+* Copyright (C) 2021 Alibaba Inc. All rights reserved.
+* Author: Kraken Team.
+*/
+
+#include "exception_state.h"

bridge/bindings/qjs/exception_state.cc

@@ -0,0 +1,21 @@
+/*
+* Copyright (C) 2021 Alibaba Inc. All rights reserved.
+* Author: Kraken Team.
+*/
+
+#ifndef KRAKENBRIDGE_EXCEPTION_STATE_H
+#define KRAKENBRIDGE_EXCEPTION_STATE_H
+
+namespace kraken {
+
+// ExceptionState is a scope-like class and provides a way to throw an exception.
+class ExceptionState {
+ public:
+
+ private:
+
+};
+
+}
+
+#endif  // KRAKENBRIDGE_EXCEPTION_STATE_H

bridge/bindings/qjs/exception_state.h

@@ -7,6 +7,7 @@
 #define KRAKENBRIDGE_GARBAGE_COLLECTED_H
 
 #include <quickjs/quickjs.h>
+#include <memory>
 
 #include "foundation/macros.h"
 #include "qjs_patch.h"

bridge/bindings/qjs/garbage_collected.h

@@ -0,0 +1,6 @@
+/*
+* Copyright (C) 2021 Alibaba Inc. All rights reserved.
+* Author: Kraken Team.
+*/
+
+#include "qjs_function.h"

bridge/bindings/qjs/qjs_function.cc

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2021 Alibaba Inc. All rights reserved.
+ * Author: Kraken Team.
+ */
+
+#ifndef KRAKENBRIDGE_QJS_FUNCTION_H
+#define KRAKENBRIDGE_QJS_FUNCTION_H
+
+#include "garbage_collected.h"
+
+namespace kraken {
+
+// https://webidl.spec.whatwg.org/#dfn-callback-interface
+class QJSFunction : public GarbageCollected<QJSFunction> {
+ public:
+  static QJSFunction* create(JSContext* ctx, JSValue function) { return makeGarbageCollected<QJSFunction>(ctx, function); }
+
+  explicit QJSFunction(JSContext* ctx, JSValue function) : m_function(JS_DupValue(ctx, function)){};
+
+  const char* getHumanReadableName() const override;
+
+  [[nodiscard]]
+
+  void trace(JSRuntime* rt, JSValue val, JS_MarkFunc* mark_func) const override;
+  void dispose() const override;
+
+ private:
+  JSValue m_function{JS_NULL};
+};
+
+}  // namespace kraken
+
+#endif  // KRAKENBRIDGE_QJS_FUNCTION_H

bridge/bindings/qjs/qjs_function.h

@@ -0,0 +1,11 @@
+/*
+* Copyright (C) 2021 Alibaba Inc. All rights reserved.
+* Author: Kraken Team.
+*/
+
+
+#include "script_value.h"
+
+namespace kraken {
+
+}

bridge/bindings/qjs/script_value.cc

@@ -0,0 +1,28 @@
+/*
+* Copyright (C) 2021 Alibaba Inc. All rights reserved.
+* Author: Kraken Team.
+*/
+
+#ifndef KRAKENBRIDGE_SCRIPT_VALUE_H
+#define KRAKENBRIDGE_SCRIPT_VALUE_H
+
+#include <quickjs/quickjs.h>
+#include "foundation/macros.h"
+
+namespace kraken {
+
+// ScriptValue is a QuickJS JSValue wrapper which hold all information to hide out QuickJS running details.
+class ScriptValue final {
+  KRAKEN_DISALLOW_NEW();
+
+ public:
+  explicit ScriptValue(JSContext* ctx, JSValue value): m_ctx(ctx), m_value(value) {};
+
+ private:
+  JSContext* m_ctx{nullptr};
+  JSValue m_value{JS_NULL};
+};
+
+}
+
+#endif  // KRAKENBRIDGE_SCRIPT_VALUE_H

bridge/bindings/qjs/script_value.h

@@ -1,101 +1,12 @@
 /*
- * Copyright (C) 2021 Alibaba Inc. All rights reserved.
- * Author: Kraken Team.
- */
+* Copyright (C) 2021 Alibaba Inc. All rights reserved.
+* Author: Kraken Team.
+*/
 
 #include "timer.h"
-#include "bindings/qjs/garbage_collected.h"
-#include "bindings/qjs/qjs_patch.h"
-#include "dart_methods.h"
-
-#if UNIT_TEST
-#include "kraken_test_env.h"
-#endif
 
 namespace kraken {
 
-DOMTimer::DOMTimer(JSValue callback) : m_callback(callback) {}
-
-JSClassID DOMTimer::classId{0};
-
-void DOMTimer::fire() {
-  // 'callback' might be destroyed when calling itself (if it frees the handler), so must take extra care.
-  auto* context = static_cast<ExecutionContext*>(JS_GetContextOpaque(m_ctx));
-  if (!JS_IsFunction(m_ctx, m_callback))
-    return;
-
-  JS_DupValue(m_ctx, m_callback);
-  JSValue returnValue = JS_Call(m_ctx, m_callback, JS_UNDEFINED, 0, nullptr);
-  JS_FreeValue(m_ctx, m_callback);
-
-  if (JS_IsException(returnValue)) {
-    context->handleException(&returnValue);
-  }
-
-  JS_FreeValue(m_ctx, returnValue);
-}
-
-void DOMTimer::trace(JSRuntime* rt, JSValue val, JS_MarkFunc* mark_func) const {
-  JS_MarkValue(rt, m_callback, mark_func);
-}
-
-void DOMTimer::dispose() const {
-  JS_FreeValueRT(m_runtime, m_callback);
-}
-
-int32_t DOMTimer::timerId() {
-  return m_timerId;
-}
-
-void DOMTimer::setTimerId(int32_t timerId) {
-  m_timerId = timerId;
-}
-
-static void handleTimerCallback(DOMTimer* timer, const char* errmsg) {
-  auto* context = static_cast<ExecutionContext*>(JS_GetContextOpaque(timer->ctx()));
-
-  if (errmsg != nullptr) {
-    JSValue exception = JS_ThrowTypeError(timer->ctx(), "%s", errmsg);
-    context->handleException(&exception);
-    return;
-  }
-
-  if (context->timers()->getTimerById(timer->timerId()) == nullptr)
-    return;
-
-  // Trigger timer callbacks.
-  timer->fire();
-
-  // Executing pending async jobs.
-  context->drainPendingPromiseJobs();
-}
-
-static void handleTransientCallback(void* ptr, int32_t contextId, const char* errmsg) {
-  auto* timer = static_cast<DOMTimer*>(ptr);
-  auto* context = static_cast<ExecutionContext*>(JS_GetContextOpaque(timer->ctx()));
-
-  if (!checkPage(contextId, context))
-    return;
-  if (!context->isValid())
-    return;
-
-  handleTimerCallback(timer, errmsg);
-
-  context->timers()->removeTimeoutById(timer->timerId());
-}
-
-static void handlePersistentCallback(void* ptr, int32_t contextId, const char* errmsg) {
-  auto* timer = static_cast<DOMTimer*>(ptr);
-  auto* context = static_cast<ExecutionContext*>(JS_GetContextOpaque(timer->ctx()));
-
-  if (!checkPage(contextId, context))
-    return;
-  if (!context->isValid())
-    return;
-
-  handleTimerCallback(timer, errmsg);
-}
-
 static JSValue setTimeout(JSContext* ctx, JSValueConst this_val, int argc, JSValueConst* argv) {
   if (argc < 1) {
     return JS_ThrowTypeError(ctx, "Failed to execute 'setTimeout': 1 argument required, but only 0 present.");
@@ -130,9 +41,9 @@ static JSValue setTimeout(JSContext* ctx, JSValueConst this_val, int argc, JSVal
 #endif
 
   // Create a timer object to keep track timer callback.
-  auto* timer = makeGarbageCollected<DOMTimer>(JS_DupValue(ctx, callbackValue))->initialize(context->ctx(), &DOMTimer::classId);
+  auto* timer = makeGarbageCollected<DOMTimer>(JS_DupValue(ctx, callbackValue))->initialize<DOMTimer>(context->ctx(), &DOMTimer::classId);
 
-  auto timerId = getDartMethod()->setTimeout(timer, context->getContextId(), handleTransientCallback, timeout);
+  auto timerId = context->dartMethodPtr()->setTimeout(timer, context->getContextId(), handleTransientCallback, timeout);
 
   // Register timerId.
   timer->setTimerId(timerId);
@@ -174,14 +85,14 @@ static JSValue setInterval(JSContext* ctx, JSValueConst this_val, int argc, JSVa
     return JS_ThrowTypeError(ctx, "Failed to execute 'setTimeout': parameter 2 (timeout) only can be a number or undefined.");
   }
 
-  if (getDartMethod()->setInterval == nullptr) {
+  if (context->dartMethodPtr()->setInterval == nullptr) {
     return JS_ThrowTypeError(ctx, "Failed to execute 'setInterval': dart method (setInterval) is not registered.");
   }
 
   // Create a timer object to keep track timer callback.
-  auto* timer = makeGarbageCollected<DOMTimer>(JS_DupValue(ctx, callbackValue))->initialize(context->ctx(), &DOMTimer::classId);
+  auto* timer = makeGarbageCollected<DOMTimer>(JS_DupValue(ctx, callbackValue))->initialize<DOMTimer>(context->ctx(), &DOMTimer::classId);
 
-  uint32_t timerId = getDartMethod()->setInterval(timer, context->getContextId(), handlePersistentCallback, timeout);
+  uint32_t timerId = context->dartMethodPtr()->setInterval(timer, context->getContextId(), handlePersistentCallback, timeout);
 
   // Register timerId.
   timer->setTimerId(timerId);
@@ -209,20 +120,21 @@ static JSValue clearTimeout(JSContext* ctx, JSValueConst this_val, int argc, JSV
   int32_t id;
   JS_ToInt32(ctx, &id, timeIdValue);
 
-  if (getDartMethod()->clearTimeout == nullptr) {
+  if (context->dartMethodPtr()->clearTimeout == nullptr) {
     return JS_ThrowTypeError(ctx, "Failed to execute 'clearTimeout': dart method (clearTimeout) is not registered.");
   }
 
-  getDartMethod()->clearTimeout(context->getContextId(), id);
+  context->dartMethodPtr()->clearTimeout(context->getContextId(), id);
 
   context->timers()->removeTimeoutById(id);
   return JS_NULL;
 }
 
 void bindTimer(ExecutionContext* context) {
-  QJS_GLOBAL_BINDING_FUNCTION(context, setTimeout, "setTimeout", 2);
-  QJS_GLOBAL_BINDING_FUNCTION(context, setInterval, "setInterval", 2);
-  QJS_GLOBAL_BINDING_FUNCTION(context, clearTimeout, "clearTimeout", 1);
-  QJS_GLOBAL_BINDING_FUNCTION(context, clearTimeout, "clearInterval", 1);
+  //  QJS_GLOBAL_BINDING_FUNCTION(context, setTimeout, "setTimeout", 2);
+  //  QJS_GLOBAL_BINDING_FUNCTION(context, setInterval, "setInterval", 2);
+  //  QJS_GLOBAL_BINDING_FUNCTION(context, clearTimeout, "clearTimeout", 1);
+  //  QJS_GLOBAL_BINDING_FUNCTION(context, clearTimeout, "clearInterval", 1);
+}
+
 }
-}  // namespace kraken

bridge/core/frame/timer.cc renamed to bridge/bindings/qjs/timer.cc

@@ -0,0 +1,17 @@
+/*
+* Copyright (C) 2021 Alibaba Inc. All rights reserved.
+* Author: Kraken Team.
+*/
+
+#ifndef KRAKENBRIDGE_DOM_TIMER_H
+#define KRAKENBRIDGE_TIMER_H
+
+#include "core/executing_context.h"
+
+namespace kraken {
+
+void bindTimer(ExecutionContext* context);
+
+}
+
+#endif  // KRAKENBRIDGE_DOM_TIMER_H

bridge/bindings/qjs/timer.h

@@ -6,7 +6,7 @@
 #ifndef KRAKENBRIDGE_BINDINGS_QJS_BOM_FRAME_REQUEST_CALLBACK_COLLECTION_H_
 #define KRAKENBRIDGE_BINDINGS_QJS_BOM_FRAME_REQUEST_CALLBACK_COLLECTION_H_
 
-#include "bindings/qjs/executing_context.h"
+#include "core/executing_context.h"
 
 namespace kraken {
 

bridge/core/dom/frame_request_callback_collection.h

@@ -90,7 +90,7 @@ TEST(Context, accessGetUICommandItemsAfterDisposed) {
 
 TEST(Context, disposeContext) {
   initJSPagePool(1024 * 1024);
-  TEST_mockDartMethods(nullptr);
+  TEST_mockDartMethods(0, nullptr);
   uint32_t contextId = 0;
   auto bridge = static_cast<kraken::KrakenPage*>(getPage(contextId));
   static bool disposed = false;
@@ -159,7 +159,7 @@ TEST(Context, evaluateByteCode) {
 TEST(jsValueToNativeString, utf8String) {
   auto bridge = TEST_init([](int32_t contextId, const char* errmsg) {});
   JSValue str = JS_NewString(bridge->getContext()->ctx(), "helloworld");
-  std::unique_ptr<NativeString> nativeString = kraken::binding::qjs::jsValueToNativeString(bridge->getContext()->ctx(), str);
+  std::unique_ptr<kraken::NativeString> nativeString = kraken::jsValueToNativeString(bridge->getContext()->ctx(), str);
   EXPECT_EQ(nativeString->length, 10);
   uint8_t expectedString[10] = {104, 101, 108, 108, 111, 119, 111, 114, 108, 100};
   for (int i = 0; i < 10; i++) {
@@ -171,7 +171,7 @@ TEST(jsValueToNativeString, utf8String) {
 TEST(jsValueToNativeString, unicodeChinese) {
   auto bridge = TEST_init([](int32_t contextId, const char* errmsg) {});
   JSValue str = JS_NewString(bridge->getContext()->ctx(), "这是你的优乐美");
-  std::unique_ptr<NativeString> nativeString = kraken::binding::qjs::jsValueToNativeString(bridge->getContext()->ctx(), str);
+  std::unique_ptr<kraken::NativeString> nativeString = kraken::jsValueToNativeString(bridge->getContext()->ctx(), str);
   std::u16string expectedString = u"这是你的优乐美";
   EXPECT_EQ(nativeString->length, expectedString.size());
   for (int i = 0; i < nativeString->length; i++) {
@@ -183,7 +183,7 @@ TEST(jsValueToNativeString, unicodeChinese) {
 TEST(jsValueToNativeString, emoji) {
   auto bridge = TEST_init([](int32_t contextId, const char* errmsg) {});
   JSValue str = JS_NewString(bridge->getContext()->ctx(), "……🤪");
-  std::unique_ptr<NativeString> nativeString = kraken::binding::qjs::jsValueToNativeString(bridge->getContext()->ctx(), str);
+  std::unique_ptr<kraken::NativeString> nativeString = kraken::jsValueToNativeString(bridge->getContext()->ctx(), str);
   std::u16string expectedString = u"……🤪";
   EXPECT_EQ(nativeString->length, expectedString.length());
   for (int i = 0; i < nativeString->length; i++) {