ffi linux

cxx/ffi.cpp

@@ -3,11 +3,12 @@
  * @Author: ekibun
  * @Date: 2020-09-06 18:32:45
  * @LastEditors: ekibun
- * @LastEditTime: 2020-09-21 14:09:25
+ * @LastEditTime: 2020-09-21 18:34:04
  */
 #include "quickjs/quickjs.h"
 #include <functional>
 #include <future>
+#include <string.h>
 
 #ifdef _MSC_VER
 #define DLLEXPORT __declspec(dllexport)

lib/ffi.dart

@@ -3,7 +3,7 @@
  * @Author: ekibun
  * @Date: 2020-09-19 10:29:04
  * @LastEditors: ekibun
- * @LastEditTime: 2020-09-21 14:25:47
+ * @LastEditTime: 2020-09-21 18:36:56
  */
 import 'dart:ffi';
 import 'dart:io';

linux/CMakeLists.txt

@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.10)
+
+set(CXX_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../cxx)
+
 # quickjs
-set(QUICK_JS_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../cxx/quickjs)
+set(QUICK_JS_LIB_DIR ${CXX_LIB_DIR}/quickjs)
 file (STRINGS "${QUICK_JS_LIB_DIR}/VERSION" QUICKJS_VERSION)
 add_library(libquickjs SHARED
     ${QUICK_JS_LIB_DIR}/cutils.c
@@ -19,6 +22,7 @@ set(PLUGIN_NAME "${PROJECT_NAME}_plugin")
 
 add_library(${PLUGIN_NAME} SHARED
   "${PLUGIN_NAME}.cc"
+  "${CXX_LIB_DIR}/ffi.cpp"
 )
 
 apply_standard_settings(${PLUGIN_NAME})

linux/dart_js_wrapper.hpp

@@ -1,147 +0,0 @@
-/*
- * @Description: 
- * @Author: ekibun
- * @Date: 2020-08-14 21:45:02
- * @LastEditors: ekibun
- * @LastEditTime: 2020-08-25 18:11:19
- */
-#include "../cxx/js_engine.hpp"
-#include <flutter_linux/flutter_linux.h>
-
-namespace qjs
-{
-  JSValue dartToJs(JSContext *ctx, FlValue *val)
-  {
-    if (val == nullptr)
-      return JS_UNDEFINED;
-    FlValueType valType = fl_value_get_type(val);
-    switch (valType)
-    {
-    case FL_VALUE_TYPE_BOOL:
-      return JS_NewBool(ctx, fl_value_get_bool(val));
-    case FL_VALUE_TYPE_INT:
-      return JS_NewInt64(ctx, fl_value_get_int(val));
-    case FL_VALUE_TYPE_FLOAT:
-      return JS_NewFloat64(ctx, fl_value_get_float(val));
-    case FL_VALUE_TYPE_STRING:
-      return JS_NewString(ctx, fl_value_get_string(val));
-    case FL_VALUE_TYPE_UINT8_LIST:
-      return JS_NewArrayBufferCopy(ctx, fl_value_get_uint8_list(val), fl_value_get_length(val));
-    case FL_VALUE_TYPE_INT32_LIST:
-      return JS_NewArrayBufferCopy(ctx, (uint8_t *)fl_value_get_int32_list(val), fl_value_get_length(val) * 4);
-    case FL_VALUE_TYPE_INT64_LIST:
-      return JS_NewArrayBufferCopy(ctx, (uint8_t *)fl_value_get_int64_list(val), fl_value_get_length(val) * 8);
-    case FL_VALUE_TYPE_FLOAT_LIST:
-    {
-      auto buf = fl_value_get_float_list(val);
-      auto size = (uint32_t)fl_value_get_length(val);
-      JSValue array = JS_NewArray(ctx);
-      for (uint32_t i = 0; i < size; ++i)
-      {
-        auto atom = JS_NewAtomUInt32(ctx, i);
-        JS_DefinePropertyValue(
-            ctx, array, atom, JS_NewFloat64(ctx, buf[i]),
-            JS_PROP_C_W_E);
-        JS_FreeAtom(ctx, atom);
-      }
-        
-      return array;
-    }
-    case FL_VALUE_TYPE_LIST:
-    {
-      auto size = (uint32_t)fl_value_get_length(val);
-      JSValue array = JS_NewArray(ctx);
-      for (uint32_t i = 0; i < size; ++i)
-      {
-        auto atom = JS_NewAtomUInt32(ctx, i);
-        JS_DefinePropertyValue(
-            ctx, array, atom,
-            dartToJs(ctx, fl_value_get_list_value(val, i)),
-            JS_PROP_C_W_E);
-        JS_FreeAtom(ctx, atom);
-      }
-      return array;
-    }
-    case FL_VALUE_TYPE_MAP:
-    {
-      auto size = (uint32_t)fl_value_get_length(val);
-      JSValue obj = JS_NewObject(ctx);
-      for (uint32_t i = 0; i < size; ++i)
-      {
-        auto atomvalue = dartToJs(ctx, fl_value_get_map_key(val, i));
-        auto atom = JS_ValueToAtom(ctx, atomvalue);
-        JS_DefinePropertyValue(
-            ctx, obj, atom,
-            dartToJs(ctx, fl_value_get_map_value(val, i)),
-            JS_PROP_C_W_E);
-        JS_FreeAtom(ctx, atom);
-        JS_FreeValue(ctx, atomvalue);
-      }
-      return obj;
-    }
-    default:
-      return JS_UNDEFINED;
-    }
-  }
-
-  FlValue *jsToDart(Value val, std::unordered_map<Value, FlValue *> cache = std::unordered_map<Value, FlValue *>())
-  {
-    int tag = JS_VALUE_GET_TAG(val.v);
-    if (JS_TAG_IS_FLOAT64(tag))
-      return fl_value_new_float((double)val);
-    switch (tag)
-    {
-    case JS_TAG_BOOL:
-      return fl_value_new_bool((bool)val);
-    case JS_TAG_INT:
-      return fl_value_new_int((int64_t)val);
-    case JS_TAG_STRING:
-      return fl_value_new_string(((std::string)val).c_str());
-    case JS_TAG_OBJECT:
-    { // ArrayBuffer
-      size_t size;
-      uint8_t *buf = JS_GetArrayBuffer(val.ctx, &size, val.v);
-      if (buf)
-        return fl_value_new_uint8_list(buf, size);
-    }
-      if (JS_IsFunction(val.ctx, val.v))
-      {
-        FlValue *retMap = fl_value_new_map();
-        fl_value_set_string_take(retMap, "__js_function__", fl_value_new_int((int64_t) new JSValue{js_add_ref(val)}));
-        return retMap;
-      }
-      else if (JS_IsArray(val.ctx, val.v) > 0)
-      {
-        FlValue *retList = fl_value_new_list();
-        cache[val] = retList;
-        uint32_t arrlen = (uint32_t)val["length"];
-        for (uint32_t i = 0; i < arrlen; i++)
-        {
-          fl_value_append_take(retList, jsToDart(val[i], cache));
-        }
-        return retList;
-      }
-      else
-      {
-        qjs::JSPropertyEnum *ptab;
-        uint32_t plen;
-        if (JS_GetOwnPropertyNames(val.ctx, &ptab, &plen, val.v, -1))
-          return fl_value_new_null();
-        FlValue *retMap = fl_value_new_map();
-        cache[val] = retMap;
-        for (uint32_t i = 0; i < plen; i++)
-        {
-          fl_value_set_take(
-              retMap,
-              jsToDart({val.ctx, JS_AtomToValue(val.ctx, ptab[i].atom)}, cache),
-              jsToDart({val.ctx, JS_GetProperty(val.ctx, val.v, ptab[i].atom)}, cache));
-          JS_FreeAtom(val.ctx, ptab[i].atom);
-        }
-        js_free(val.ctx, ptab);
-        return retMap;
-      }
-    default:
-      return fl_value_new_null();
-    }
-  }
-} // namespace qjs

linux/flutter_qjs_plugin.cc

@@ -3,13 +3,12 @@
  * @Author: ekibun
  * @Date: 2020-08-17 21:37:11
  * @LastEditors: ekibun
- * @LastEditTime: 2020-08-25 16:07:02
+ * @LastEditTime: 2020-09-21 18:28:35
  */
 #include "include/flutter_qjs/flutter_qjs_plugin.h"
 
 #include <flutter_linux/flutter_linux.h>
 #include <gtk/gtk.h>
-#include "dart_js_wrapper.hpp"
 
 #define FLUTTER_QJS_PLUGIN(obj)                                     \
   (G_TYPE_CHECK_INSTANCE_CAST((obj), flutter_qjs_plugin_get_type(), \
@@ -22,126 +21,6 @@ struct _FlutterQjsPlugin
 
 G_DEFINE_TYPE(FlutterQjsPlugin, flutter_qjs_plugin, g_object_get_type())
 
-FlMethodChannel *channel = nullptr;
-
-void methodChannelInvokeCallback(GObject *object, GAsyncResult *result, gpointer user_data)
-{
-  auto promise = (std::promise<qjs::JSFutureReturn> *)user_data;
-  g_autoptr(FlMethodResponse) response = fl_method_channel_invoke_method_finish(
-      FL_METHOD_CHANNEL(object), result, nullptr);
-  g_autoptr(GError) error = nullptr;
-  g_autoptr(FlValue) res = fl_method_response_get_result(FL_METHOD_RESPONSE(response), &error);
-  fl_value_ref(res);
-  if (error)
-  {
-    promise->set_value((qjs::JSFutureReturn)[error_message = std::string(error->message)](qjs::JSContext * ctx) {
-      qjs::JSValue *ret = new qjs::JSValue{JS_NewString(ctx, error_message.c_str())};
-      return qjs::JSOSFutureArgv{-1, ret};
-    });
-  }
-  else
-  {
-    auto pres = fl_value_ref(res);
-    promise->set_value((qjs::JSFutureReturn)[pres](qjs::JSContext * ctx) {
-      qjs::JSValue *ret = new qjs::JSValue{qjs::dartToJs(ctx, pres)};
-      fl_value_unref(pres);
-      return qjs::JSOSFutureArgv{1, ret};
-    });
-  }
-}
-
-std::promise<qjs::JSFutureReturn> *invokeChannelMethod(std::string name, qjs::Value args, qjs::Engine *engine)
-{
-  auto promise = new std::promise<qjs::JSFutureReturn>();
-  auto map = fl_value_new_map();
-  fl_value_set_string_take(map, "engine", fl_value_new_int((int64_t)engine));
-  fl_value_set_string_take(map, "args", qjs::jsToDart(args));
-  fl_method_channel_invoke_method(
-      channel, name.c_str(), map, nullptr,
-      methodChannelInvokeCallback,
-      promise);
-  return promise;
-}
-
-// Called when a method call is received from Flutter.
-static void flutter_qjs_plugin_handle_method_call(
-    FlutterQjsPlugin *self,
-    FlMethodCall *method_call)
-{
-  const gchar *method = fl_method_call_get_name(method_call);
-
-  if (strcmp(method, "createEngine") == 0)
-  {
-    qjs::Engine *engine = new qjs::Engine(invokeChannelMethod);
-    g_autoptr(FlMethodResponse) response = FL_METHOD_RESPONSE(fl_method_success_response_new(fl_value_new_int((int64_t)engine)));
-    fl_method_call_respond(method_call, response, nullptr);
-  }
-  else if (strcmp(method, "evaluate") == 0)
-  {
-    FlValue *args = fl_method_call_get_args(method_call);
-    qjs::Engine *engine = (qjs::Engine *)fl_value_get_int(fl_value_lookup_string(args, "engine"));
-    std::string script(fl_value_get_string(fl_value_lookup_string(args, "script")));
-    std::string name(fl_value_get_string(fl_value_lookup_string(args, "name")));
-    auto pmethod_call = (FlMethodCall *)g_object_ref(method_call);
-    engine->commit(qjs::EngineTask{
-        [script, name](qjs::Context &ctx) {
-          return ctx.eval(script, name.c_str(), JS_EVAL_TYPE_GLOBAL);
-        },
-        [pmethod_call](qjs::Value resolve) {
-          g_autoptr(FlMethodResponse) response = FL_METHOD_RESPONSE(fl_method_success_response_new(qjs::jsToDart(resolve)));
-          fl_method_call_respond(pmethod_call, response, nullptr);
-          g_object_unref(pmethod_call);
-        },
-        [pmethod_call](qjs::Value reject) {
-          fl_method_call_respond_error(pmethod_call, "FlutterJSException", qjs::getStackTrack(reject).c_str(), nullptr, nullptr);
-          g_object_unref(pmethod_call);
-        }});
-  }
-  else if (strcmp(method, "call") == 0)
-  {
-    FlValue *args = fl_method_call_get_args(method_call);
-    qjs::Engine *engine = (qjs::Engine *)fl_value_get_int(fl_value_lookup_string(args, "engine"));
-    qjs::JSValue *function = (qjs::JSValue *)fl_value_get_int(fl_value_lookup_string(args, "function"));
-    FlValue *arguments = fl_value_lookup_string(args, "arguments");
-    auto pmethod_call = (FlMethodCall *)g_object_ref(method_call);
-    engine->commit(qjs::EngineTask{
-        [function, arguments](qjs::Context &ctx) {
-          size_t argscount = fl_value_get_length(arguments);
-          qjs::JSValue *callargs = new qjs::JSValue[argscount];
-          for (size_t i = 0; i < argscount; i++)
-          {
-            callargs[i] = qjs::dartToJs(ctx.ctx, fl_value_get_list_value(arguments, i));
-          }
-          qjs::JSValue ret = qjs::call_handler(ctx.ctx, *function, (int)argscount, callargs);
-          delete[] callargs;
-          if (qjs::JS_IsException(ret))
-            throw qjs::exception{};
-          return qjs::Value{ctx.ctx, ret};
-        },
-        [pmethod_call](qjs::Value resolve) {
-          g_autoptr(FlMethodResponse) response = FL_METHOD_RESPONSE(fl_method_success_response_new(qjs::jsToDart(resolve)));
-          fl_method_call_respond(pmethod_call, response, nullptr);
-          g_object_unref(pmethod_call);
-        },
-        [pmethod_call](qjs::Value reject) {
-          fl_method_call_respond_error(pmethod_call, "FlutterJSException", qjs::getStackTrack(reject).c_str(), nullptr, nullptr);
-          g_object_unref(pmethod_call);
-        }});
-  }
-  else if (strcmp(method, "close") == 0)
-  {
-    qjs::Engine *engine = (qjs::Engine *)fl_value_get_int(fl_method_call_get_args(method_call));
-    delete engine;
-    g_autoptr(FlMethodResponse) response = FL_METHOD_RESPONSE(fl_method_success_response_new(fl_value_new_null()));
-    fl_method_call_respond(method_call, response, nullptr);
-  }
-  else
-  {
-    g_autoptr(FlMethodResponse) response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new());
-    fl_method_call_respond(method_call, response, nullptr);
-  }
-}
-
 static void flutter_qjs_plugin_dispose(GObject *object)
 {
   G_OBJECT_CLASS(flutter_qjs_plugin_parent_class)->dispose(object);
@@ -154,26 +33,6 @@ static void flutter_qjs_plugin_class_init(FlutterQjsPluginClass *klass)
 
 static void flutter_qjs_plugin_init(FlutterQjsPlugin *self) {}
 
-static void method_call_cb(FlMethodChannel *channel, FlMethodCall *method_call,
-                           gpointer user_data)
-{
-  FlutterQjsPlugin *plugin = FLUTTER_QJS_PLUGIN(user_data);
-  flutter_qjs_plugin_handle_method_call(plugin, method_call);
-}
-
 void flutter_qjs_plugin_register_with_registrar(FlPluginRegistrar *registrar)
 {
-  FlutterQjsPlugin *plugin = FLUTTER_QJS_PLUGIN(
-      g_object_new(flutter_qjs_plugin_get_type(), nullptr));
-
-  g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
-  channel =
-      fl_method_channel_new(fl_plugin_registrar_get_messenger(registrar),
-                            "soko.ekibun.flutter_qjs",
-                            FL_METHOD_CODEC(codec));
-  fl_method_channel_set_method_call_handler(channel, method_call_cb,
-                                            g_object_ref(plugin),
-                                            g_object_unref);
-
-  g_object_unref(plugin);
 }