windows wrapper

test/CMakeLists.txt

@@ -1,9 +1,11 @@
 cmake_minimum_required(VERSION 3.7 FATAL_ERROR)
 project(ffi_library LANGUAGES CXX)
-add_library(ffi_library SHARED ${CMAKE_CURRENT_SOURCE_DIR}/../../cxx/ffi.cpp)
+set(CXX_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../cxx)
+
+add_library(flutter_qjs SHARED ${CXX_LIB_DIR}/ffi.cpp)
 
 # 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 STATIC
     ${QUICK_JS_LIB_DIR}/cutils.c
@@ -16,4 +18,4 @@ project(libquickjs LANGUAGES C)
 target_compile_options(libquickjs PRIVATE "-DCONFIG_VERSION=\"${QUICKJS_VERSION}\"")
 target_compile_options(libquickjs PRIVATE "-DDUMP_LEAKS")
 
-target_link_libraries(ffi_library PRIVATE libquickjs)
+target_link_libraries(flutter_qjs PRIVATE libquickjs)

test/flutter_qjs_test.dart

@@ -3,16 +3,14 @@
  * @Author: ekibun
  * @Date: 2020-09-06 13:02:46
  * @LastEditors: ekibun
- * @LastEditTime: 2020-09-20 15:55:50
+ * @LastEditTime: 2020-09-21 01:39:49
  */
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:flutter_qjs/flutter_qjs.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:flutter_qjs/ffi.dart';
-import 'package:flutter_qjs/wrapper.dart';
-
 void main() async {
   test('make', () async {
     final utf8Encoding = Encoding.getByName('utf-8');
@@ -22,7 +20,7 @@ void main() async {
     var result = Process.runSync(
       cmakePath,
       ['-S', './', '-B', buildDir],
-      workingDirectory: 'test/lib',
+      workingDirectory: 'test',
       stdoutEncoding: utf8Encoding,
       stderrEncoding: utf8Encoding,
     );
@@ -33,7 +31,7 @@ void main() async {
     result = Process.runSync(
       cmakePath,
       ['--build', buildDir, '--verbose'],
-      workingDirectory: 'test/lib',
+      workingDirectory: 'test',
       stdoutEncoding: utf8Encoding,
       stderrEncoding: utf8Encoding,
     );
@@ -42,36 +40,28 @@ void main() async {
     expect(result.exitCode, 0);
   });
   test('jsToDart', () async {
-    final rt = jsNewRuntime((ctx, method, argv) {
-      var argvs = jsToDart(ctx, argv);
-      print([method, argvs]);
-      return dartToJs(ctx, [
-        argvs,
-        {
-          [233, 2]: {}
-        }
-      ]);
+    final qjs = FlutterQjs();
+    qjs.setMethodHandler((method, args) {
+      print([method, args]);
+      return args;
     });
-    final ctx = jsNewContext(rt);
-    final jsval = jsEval(
-      ctx,
-      """
+    qjs.setModuleHandler((name) {
+      print(name);
+      return "export default '${new DateTime.now()}'";
+    });
+    qjs.evaluate("""
       const a = {};
       a.a = a;
-      channel('channel', [
-          0.1, true, false, 1, "world", 
-          new ArrayBuffer(2),
-          ()=>'hello',
-          a
-        ]);
-      """,
-      "<eval>",
-      JSEvalType.GLOBAL,
-    );
-    print(jsToDart(ctx, jsval));
-    jsFreeValue(ctx, jsval);
-    deleteJSValue(jsval);
-    jsFreeContext(ctx);
-    jsFreeRuntime(rt);
+      import("test").then((module) => channel('channel', [
+          (...a)=>`hello \${a}`,
+          0.1, true, false, 1, "world", module
+        ]));
+      """, "<eval>").then((value) {
+        print(value);
+      });
+    Future.delayed(Duration(seconds: 5)).then((v) {
+      qjs.close();
+    });
+    await qjs.dispatch();
   });
 }

test/lib/make.bat

@@ -1,5 +0,0 @@
-cd %~dp0
-set CMAKE="C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe"
-set BUILD_DIR="./build"
-%CMAKE% -S ./ -B %BUILD_DIR%
-%CMAKE% --build %BUILD_DIR% --verbose