合入Dev

.github/workflows/build.yml

@@ -22,7 +22,8 @@ jobs:
       run: |
         cd $GITHUB_WORKSPACE
         chmod +x make_osx.sh
-        sh ./make_osx.sh
+        sh ./make_osx.sh Debug
+        ./build/Debug/papi_qjs_test
 
   build_ios:
     name: iOS
@@ -84,7 +85,8 @@ jobs:
       run: |
         cd $GITHUB_WORKSPACE
         chmod +x make_linux64.sh
-        ./make_linux64.sh
+        ./make_linux64.sh Debug
+        ./build_linux64/papi_qjs_test
 
   build_wasm:
     name: wasm 
@@ -113,6 +115,7 @@ jobs:
       uses: microsoft/[email protected]
     - name: Build
       run: |
-        .\make_win64.bat
+        .\make_win64.bat Debug
+        .\build\Debug\papi_qjs_test.exe
 
 

CMakeLists.txt

@@ -27,11 +27,11 @@ macro(xcheck_add_c_compiler_flag FLAG)
     endif()
 endmacro()
 
-xcheck_add_c_compiler_flag(-Wall)
-if(NOT MSVC AND NOT IOS)
-    xcheck_add_c_compiler_flag(-Werror)
-    xcheck_add_c_compiler_flag(-Wextra)
-endif()
+#xcheck_add_c_compiler_flag(-Wall)
+#if(NOT MSVC AND NOT IOS)
+#    xcheck_add_c_compiler_flag(-Werror)
+#    xcheck_add_c_compiler_flag(-Wextra)
+#endif()
 xcheck_add_c_compiler_flag(-Wno-implicit-fallthrough)
 xcheck_add_c_compiler_flag(-Wno-sign-compare)
 xcheck_add_c_compiler_flag(-Wno-missing-field-initializers)
@@ -114,14 +114,17 @@ set(qjs_sources
 
 set(papi_sources
     source/PapiQuickjsImpl.cpp
+    source/CppObjectMapper.cpp
 )
 
 add_definitions(-D_CHAR16T)
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 add_definitions(-DEASTL_OPENSOURCE=1)
 
+include_directories(include quickjs)
 include_directories(EASTL/include)
+include_directories(papi-register/include)
 
 file(GLOB eastl_sources "EASTL/source/*.cpp")
 file(GLOB_RECURSE eastl_headers "EASTL/include/EASTL/**.h")
@@ -139,21 +142,120 @@ if(NOT MSVC)
     list(APPEND qjs_libs m)
 endif()
 
+set(papi_register_sources
+    papi-register/source/JSClassRegister.cpp
+    papi-register/source/RapiImpl.cpp
+)
+
 if ( APPLE AND IOS )
     add_library(PapiQjs STATIC ${qjs_sources} ${eastl_sources} ${papi_sources})
+    add_library(PapiRegister STATIC ${papi_register_sources})
 else ()
+    # 在Windows上需要显式生成导入库
     add_library(PapiQjs SHARED ${qjs_sources} ${eastl_sources} ${papi_sources}) # if add eastl_headers will undefined symbol: __udivti3 __udivmodti4 
+    # 设置导出符号
+    #set_target_properties(PapiQjs PROPERTIES
+    #    WINDOWS_EXPORT_ALL_SYMBOLS TRUE
+    #    CXX_VISIBILITY_PRESET hidden
+    #    VISIBILITY_INLINES_HIDDEN TRUE
+    #)
+    # 确保生成导入库路径正确
+    #set_target_properties(PapiQjs PROPERTIES
+    #    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+    #    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+    #    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+    #)
+    add_library(PapiRegister SHARED ${eastl_sources} ${papi_register_sources})
+    #set_target_properties(PapiRegister PROPERTIES
+    #    WINDOWS_EXPORT_ALL_SYMBOLS TRUE
+    #    CXX_VISIBILITY_PRESET hidden
+    #    VISIBILITY_INLINES_HIDDEN TRUE
+    #)
 endif()
 target_compile_definitions(PapiQjs PRIVATE ${qjs_defines})
 target_include_directories(PapiQjs PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
-target_link_libraries(PapiQjs PUBLIC ${qjs_libs})
+target_link_libraries(PapiQjs PUBLIC ${qjs_libs} PapiRegister)
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib")
 
 target_compile_definitions(PapiQjs PUBLIC EA_DEPRECATIONS_FOR_2024_APRIL=EA_DISABLED)
 target_compile_definitions(PapiQjs PUBLIC EA_DEPRECATIONS_FOR_2024_SEPT=EA_DISABLED)
 target_compile_definitions(PapiQjs PUBLIC EA_DEPRECATIONS_FOR_2025_APRIL=EA_DISABLED)
-target_compile_definitions(PapiQjs PUBLIC EASTL_DLL)
+#target_compile_definitions(PapiQjs PUBLIC EASTL_DLL)
+target_compile_definitions(PapiQjs PUBLIC USING_REGISTER_API_SHARED)
+target_compile_options(PapiQjs PRIVATE
+    $<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>>:
+        -fno-exceptions
+        -fno-unwind-tables
+        -fno-asynchronous-unwind-tables
+        -fno-rtti
+    >
+    $<$<CXX_COMPILER_ID:MSVC>:
+        /EHa-
+        /EHsc
+        /EHsc-
+        /GR-  # 禁用RTTI
+    >
+)
+#if(MSVC)
+#target_compile_options(PapiQjs PRIVATE /EHsc)
+#endif()
+
+target_compile_definitions(PapiRegister PUBLIC BUILDING_REGISTER_API_SHARED)
+target_compile_options(PapiRegister PRIVATE
+    $<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>>:
+        -fno-exceptions
+        -fno-unwind-tables
+        -fno-asynchronous-unwind-tables
+        -fno-rtti
+    >
+    $<$<CXX_COMPILER_ID:MSVC>:
+        /EHa-
+        /EHsc-
+        /GR-  # 禁用RTTI
+    >
+)
+
+if ( APPLE AND NOT IOS OR MSVC OR LINUX )
+
+# 配置GTest
+set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
+set(BUILD_GTEST ON CACHE BOOL "" FORCE)
+set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
+include(FetchContent)
+FetchContent_Declare(
+    googletest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG release-1.8.0
+)
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+FetchContent_MakeAvailable(googletest)
+
+enable_testing()
+include(GoogleTest)
 
+
+add_executable(papi_qjs_test 
+    test/papi_qjs_base_test.cpp
+)
+
+target_link_libraries(papi_qjs_test
+    PRIVATE
+    PapiQjs
+    PapiRegister
+    gtest
+    gtest_main
+)
+
+target_include_directories(papi_qjs_test PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/source
+    ${CMAKE_CURRENT_SOURCE_DIR}/quickjs
+    ${googletest_SOURCE_DIR}/googletest/include
+)
+
+gtest_discover_tests(papi_qjs_test)
+
+endif()

EASTL/include/EASTL/shared_ptr.h

@@ -125,7 +125,7 @@ namespace eastl
 
 	public:
 		ref_count_sp(int32_t refCount = 1, int32_t weakRefCount = 1) EA_NOEXCEPT;
-		virtual ~ref_count_sp() EA_NOEXCEPT {}
+		//virtual ~ref_count_sp() EA_NOEXCEPT {}
 
 		int32_t       use_count() const EA_NOEXCEPT;
 		void          addref() EA_NOEXCEPT;

include/CppObjectMapper.h

@@ -0,0 +1,148 @@
+#pragma once
+
+#include "pesapi.h"
+#include "quickjs.h"
+#include <EASTL/unordered_map.h>
+#include <EASTL/allocator_malloc.h>
+#include <EASTL/shared_ptr.h>
+#include "ObjectCacheNode.h"
+#include "JSClassRegister.h"
+
+#define JS_TAG_EXTERNAL (JS_TAG_FLOAT64 + 1)
+
+namespace pesapi
+{
+namespace qjsimpl
+{
+
+struct ObjectUserData
+{
+    const puerts::JSClassDefinition* typeInfo;
+    const void* ptr;
+    bool callFinalize;
+};
+
+struct CppObjectMapper
+{
+    inline static CppObjectMapper* Get(JSContext* ctx)
+    {
+        return reinterpret_cast<CppObjectMapper*>(JS_GetRuntimeOpaque(JS_GetRuntime(ctx)));
+    }
+
+    void Initialize(JSContext* ctx_);
+
+    void Cleanup();
+
+    CppObjectMapper(const CppObjectMapper&) = delete;
+    CppObjectMapper& operator=(const CppObjectMapper&) = delete;
+
+    //void* operator new(size_t) = delete;
+    void operator delete(void*) = delete;
+
+    CppObjectMapper() = default;
+    ~CppObjectMapper() = default;
+
+    eastl::unordered_map<const void*, FObjectCacheNode, eastl::hash<const void*>, eastl::equal_to<const void*>, eastl::allocator_malloc> CDataCache;
+    eastl::unordered_map<const void*, JSValue, eastl::hash<const void*>, eastl::equal_to<const void*>, eastl::allocator_malloc> TypeIdToFunctionMap;
+
+    JSRuntime* rt;
+    JSContext* ctx;
+    JSClassID classId;
+    JSClassID funcTracerClassId;
+    const void* envPrivate = nullptr;
+    eastl::shared_ptr<int> ref = eastl::allocate_shared<int>(eastl::allocator_malloc("shared_ptr"), 0);
+
+    puerts::JSClassDefinition PtrClassDef = JSClassEmptyDefinition;
+
+    JSAtom privateDataKey;
+
+    inline static eastl::weak_ptr<int> GetEnvLifeCycleTracker(JSContext* ctx)
+    {
+        JSRuntime* rt = JS_GetRuntime(ctx);
+        CppObjectMapper* mapper = reinterpret_cast<CppObjectMapper*>(JS_GetRuntimeOpaque(rt));
+        return mapper->GetEnvLifeCycleTracker();
+    }
+
+    inline eastl::weak_ptr<int> GetEnvLifeCycleTracker()
+    {
+        return eastl::weak_ptr<int>(ref);
+    }
+
+    inline const void* GetEnvPrivate() const
+    {
+        return envPrivate;
+    }
+
+    inline void SetEnvPrivate(const void* envPrivate_)
+    {
+        envPrivate = envPrivate_;
+    }
+
+    inline const void* GetNativeObjectPtr(JSValue val)
+    {
+        ObjectUserData* object_udata = (ObjectUserData*)JS_GetOpaque(val, classId);
+        return object_udata ? object_udata->ptr : nullptr;
+    }
+
+    inline const void* GetNativeObjectTypeId(JSValue val)
+    {
+        ObjectUserData* object_udata = (ObjectUserData*)JS_GetOpaque(val, classId);
+        return object_udata ? object_udata->typeInfo->TypeId : nullptr;
+    }
+
+    inline bool GetPrivate(JSValue val, void** outPrr) const
+    {
+        if (!JS_IsObject(val))
+        {
+            return false;
+        }
+
+        JSValue data = JS_GetProperty(ctx, val, privateDataKey);
+        if (JS_VALUE_GET_TAG(data) == JS_TAG_EXTERNAL)
+        {
+            *outPrr = JS_VALUE_GET_PTR(data);
+        }
+        else
+        {
+            JS_FreeValue(ctx, data);
+        }
+        return true;
+    }
+
+    inline bool SetPrivate(JSValue val, void* ptr)
+    {
+        if (!JS_IsObject(val))
+        {
+            return false;
+        }
+        JS_SetProperty(ctx, val, privateDataKey, JS_MKPTR(JS_TAG_EXTERNAL, ptr));
+        return true;
+    }
+
+    JSValue CreateFunction(pesapi_callback Callback, void* Data, pesapi_function_finalize Finalize);
+
+    JSValue CreateClassByID(const void* typeId);
+
+    static JSValue CreateError(JSContext* ctx, const char* message);
+
+    JSValue MakeMethod(pesapi_callback Callback, void* Data);
+    void InitMethod(puerts::JSFunctionInfo* FuncInfo, JSValue Obj);
+    void InitProperty(puerts::JSPropertyInfo* PropInfo, JSValue Obj);
+
+    JSValue CreateClass(const puerts::JSClassDefinition* ClassDefinition);
+
+    void BindAndAddToCache(const puerts::JSClassDefinition* typeInfo, const void* ptr, JSValue value, bool callFinalize);
+
+    void RemoveFromCache(const puerts::JSClassDefinition* typeInfo, const void* ptr);
+
+    JSValue PushNativeObject(const void* TypeId, void* ObjectPtr, bool callFinalize);
+};
+
+}  // namespace qjsimpl
+}  // namespace pesapi
+
+// ----------------begin test interface----------------
+PESAPI_MODULE_EXPORT pesapi_env_ref create_qjs_env();
+PESAPI_MODULE_EXPORT void destroy_qjs_env(pesapi_env_ref env_ref);
+PESAPI_MODULE_EXPORT struct pesapi_ffi* get_papi_ffi();
+// ----------------end test interface----------------