diff --git a/.vscode/settings.json b/.vscode/settings.json index ecd48a1..75b5ad2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -99,7 +99,8 @@ "cfenv": "cpp", "cinttypes": "cpp", "typeindex": "cpp", - "__functional_03": "cpp" + "__functional_03": "cpp", + "random": "cpp" }, "java.configuration.updateBuildConfiguration": "interactive" } \ No newline at end of file diff --git a/cxx/libquickjs.so b/cxx/libquickjs.so new file mode 100755 index 0000000..fb8ae9c Binary files /dev/null and b/cxx/libquickjs.so differ diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index d896b87..2aafd98 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -7,18 +7,6 @@ set(PLUGIN_NAME "${PROJECT_NAME}_plugin") add_library(${PLUGIN_NAME} SHARED "${PLUGIN_NAME}.cc" ) - -set(QUICK_JS_LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../cxx/quickjspp") -# quickjs -file (STRINGS "${QUICK_JS_LIB_DIR}/quickjs/VERSION" QUICKJS_VERSION) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCONFIG_VERSION=\\\"${QUICKJS_VERSION}\\\"") -target_sources(${PLUGIN_NAME} PUBLIC - "${QUICK_JS_LIB_DIR}/quickjs/cutils.c" - "${QUICK_JS_LIB_DIR}/quickjs/libregexp.c" - "${QUICK_JS_LIB_DIR}/quickjs/libunicode.c" - "${QUICK_JS_LIB_DIR}/quickjs/quickjs.c" -) - apply_standard_settings(${PLUGIN_NAME}) set_target_properties(${PLUGIN_NAME} PROPERTIES CXX_VISIBILITY_PRESET hidden) @@ -26,6 +14,7 @@ target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL) target_include_directories(${PLUGIN_NAME} INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include") target_link_libraries(${PLUGIN_NAME} PRIVATE flutter) +target_link_libraries(${PLUGIN_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../cxx/libquickjs.so") target_link_libraries(${PLUGIN_NAME} PRIVATE PkgConfig::GTK) # List of absolute paths to libraries that should be bundled with the plugin diff --git a/linux/dart_js_wrapper.hpp b/linux/dart_js_wrapper.hpp new file mode 100644 index 0000000..921e954 --- /dev/null +++ b/linux/dart_js_wrapper.hpp @@ -0,0 +1,169 @@ +/* + * @Description: + * @Author: ekibun + * @Date: 2020-08-14 21:45:02 + * @LastEditors: ekibun + * @LastEditTime: 2020-08-15 15:42:55 + */ +#include "../cxx/js_engine.hpp" +// #include +#include +#include + +namespace std +{ + template <> + struct hash + { + std::size_t operator()(const qjs::Value &key) const + { + return std::hash()((std::string)key); + } + }; + + template <> + struct hash + { + std::size_t operator()(const FlValue *&key) const + { + return 0; + } + }; +} // namespace std + +namespace qjs +{ + JSValue dartToJsAtom(JSContext *ctx, FlValue *val) + { + 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)); + case FL_VALUE_TYPE_INT64_LIST: + return JS_NewArrayBufferCopy(ctx, (uint8_t *)fl_value_get_int64_list(val), fl_value_get_length(val)); + // case FL_VALUE_TYPE_FLOAT_LIST: + // auto buf = fl_value_get_float_list(val); + // auto size = fl_value_get_length(val); + // JSValue array = JS_NewArray(ctx); + // for (size_t i = 0; i < size; i++) + // JS_DefinePropertyValue( + // ctx, array, JS_NewAtomUInt32(ctx, i), JS_NewFloat64(ctx, buf[i]), + // JS_PROP_C_W_E); + // return array; + default: + return JS_UNDEFINED; + } + } + + JSValue dartToJs(JSContext *ctx, FlValue *val, std::unordered_map cache = std::unordered_map()) + { + if (fl_value_get_type(val) == FL_VALUE_TYPE_NULL) + return JS_UNDEFINED; + if (cache.find(val) != cache.end()) + return cache[val]; + { + JSValue atomValue = dartToJsAtom(ctx, val); + if (!JS_IsUndefined(atomValue)) + return atomValue; + } + // if (std::holds_alternative(val)) + // { + // auto list = std::get(val); + // JSValue array = JS_NewArray(ctx); + // cache[val] = array; + // auto size = (uint32_t)list.size(); + // for (uint32_t i = 0; i < size; i++) + // JS_DefinePropertyValue( + // ctx, array, JS_NewAtomUInt32(ctx, i), dartToJs(ctx, list[i], cache), + // JS_PROP_C_W_E); + // return array; + // } + // if (std::holds_alternative(val)) + // { + // auto map = std::get(val); + // JSValue obj = JS_NewObject(ctx); + // cache[val] = obj; + // for (auto iter = map.begin(); iter != map.end(); ++iter) + // JS_DefinePropertyValue( + // ctx, obj, JS_ValueToAtom(ctx, dartToJs(ctx, iter->first, cache)), dartToJs(ctx, iter->second, cache), + // JS_PROP_C_W_E); + // return obj; + // } + return JS_UNDEFINED; + } + + FlValue *jsToDart(Value val, std::unordered_map cache = std::unordered_map()) + { + if (cache.find(val) != cache.end()) + return cache[val]; + if (JS_IsBool(val.v)) + return fl_value_new_bool((bool)val); + if (JS_IsNumber(val.v)) + return fl_value_new_float((double)val); + if (JS_IsString(val.v)) + return fl_value_new_string(((std::string)val).c_str()); + { // ArrayBuffer + size_t size; + uint8_t *buf = JS_GetArrayBuffer(val.ctx, &size, val.v); + if (buf) + // return (std::vector(buf, buf + size)); + return fl_value_new_uint8_list(buf, size); + } + FlValue *ret; + if (JS_IsUndefined(val.v) || JS_IsNull(val.v) || JS_IsUninitialized(val.v)) + goto exception; + // if (JS_IsObject(val.v)) + // { + // if (JS_IsFunction(val.ctx, val.v)) + // { + // flutter::EncodableMap retMap; + // retMap[std::string("__js_function__")] = (int64_t) new JSValue{JS_DupValue(val.ctx, val.v)}; + // ret = retMap; + // } + // else if (JS_IsArray(val.ctx, val.v) > 0) + // { + // flutter::EncodableList retList; + // cache[val] = retList; + // uint32_t arrlen = (uint32_t)val["length"]; + // for (uint32_t i = 0; i < arrlen; i++) + // { + // retList.push_back(jsToDart(val[i], cache)); + // } + // ret = retList; + // } + // else + // { + // qjs::JSPropertyEnum *ptab; + // uint32_t plen; + // if (JS_GetOwnPropertyNames(val.ctx, &ptab, &plen, val.v, -1)) + // goto exception; + // flutter::EncodableMap retMap; + // cache[val] = retMap; + // for (uint32_t i = 0; i < plen; i++) + // { + // 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); + // ret = retMap; + // } + // goto done; + // } + exception: + ret = fl_value_new_null(); + done: + return ret; + } +} // namespace qjs diff --git a/linux/flutter_qjs_plugin.cc b/linux/flutter_qjs_plugin.cc index 9d28fc3..3fb4ed1 100644 --- a/linux/flutter_qjs_plugin.cc +++ b/linux/flutter_qjs_plugin.cc @@ -3,7 +3,7 @@ #include #include #include -#include "../cxx/js_engine.hpp" +#include "dart_js_wrapper.hpp" #define FLUTTER_QJS_PLUGIN(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), flutter_qjs_plugin_get_type(), \ @@ -33,6 +33,7 @@ static void flutter_qjs_plugin_handle_method_call( g_autoptr(FlValue) result = fl_value_new_string(version); response = FL_METHOD_RESPONSE(fl_method_success_response_new(result)); } + else { response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new());