Merge branch 'Tencent:master' into fix/libnode

Author: realybin

unity/native/puerts/source/Puerts.cpp

@@ -41,8 +41,8 @@ PESAPI_MODULE_EXPORT pesapi_registry_api* GetRegisterApi()
 PESAPI_MODULE_EXPORT void SetLogCallback(LogCallback Log, LogCallback LogWarning, LogCallback LogError)
 {
     GLogCallback = Log;
-    GLogWarningCallback = LogError;
-    GLogErrorCallback = LogWarning;
+    GLogWarningCallback = LogWarning;
+    GLogErrorCallback = LogError;
 }
 
 #ifdef __cplusplus

unity/nuget/Directory.Build.props

@@ -4,7 +4,7 @@
 
     <NoWarn>NU5128</NoWarn>
 
-    <BuildPackageVersion>3.0.0-alpha3</BuildPackageVersion>
+    <BuildPackageVersion>3.0.0-alpha4</BuildPackageVersion>
 
     <PackageProjectUrl>https://github.com/Tencent/puerts</PackageProjectUrl>
 

unreal/Puerts/Source/JsEnv/Private/JsEnvImpl.cpp

@@ -2832,15 +2832,16 @@ v8::Local<v8::Value> FJsEnvImpl::FindOrAddContainer(
     check(Ptr);    // must not null
 
     auto PersistentValuePtr = ContainerCache.Find(Ptr);
-    if (PersistentValuePtr)
+    if (PersistentValuePtr && PersistentValuePtr->Type == EArray && PersistentValuePtr->KeyProperty == Property &&
+        PersistentValuePtr->ValueProperty == nullptr)
     {
         return PersistentValuePtr->Container.Get(Isolate);
     }
 
     auto Result = ArrayTemplate.Get(Isolate)->InstanceTemplate()->NewInstance(Context).ToLocalChecked();
     BindContainer(Ptr, Result,
         PassByPointer ? FScriptArrayWrapper::OnGarbageCollected : FScriptArrayWrapper::OnGarbageCollectedWithFree, PassByPointer,
-        EArray);
+        EArray, Property, nullptr);
     DataTransfer::SetPointer(Isolate, Result, GetContainerPropertyTranslator(Property), 1);
     return Result;
 }
@@ -2851,14 +2852,16 @@ v8::Local<v8::Value> FJsEnvImpl::FindOrAddContainer(
     check(Ptr);    // must not null
 
     auto PersistentValuePtr = ContainerCache.Find(Ptr);
-    if (PersistentValuePtr)
+    if (PersistentValuePtr && PersistentValuePtr->Type == ESet && PersistentValuePtr->KeyProperty == Property &&
+        PersistentValuePtr->ValueProperty == nullptr)
     {
         return PersistentValuePtr->Container.Get(Isolate);
     }
 
     auto Result = SetTemplate.Get(Isolate)->InstanceTemplate()->NewInstance(Context).ToLocalChecked();
     BindContainer(Ptr, Result,
-        PassByPointer ? FScriptSetWrapper::OnGarbageCollected : FScriptSetWrapper::OnGarbageCollectedWithFree, PassByPointer, ESet);
+        PassByPointer ? FScriptSetWrapper::OnGarbageCollected : FScriptSetWrapper::OnGarbageCollectedWithFree, PassByPointer, ESet,
+        Property, nullptr);
     DataTransfer::SetPointer(Isolate, Result, GetContainerPropertyTranslator(Property), 1);
     return Result;
 }
@@ -2869,14 +2872,16 @@ v8::Local<v8::Value> FJsEnvImpl::FindOrAddContainer(v8::Isolate* Isolate, v8::Lo
     check(Ptr);    // must not null
 
     auto PersistentValuePtr = ContainerCache.Find(Ptr);
-    if (PersistentValuePtr)
+    if (PersistentValuePtr && PersistentValuePtr->Type == EMap && PersistentValuePtr->KeyProperty == KeyProperty &&
+        PersistentValuePtr->ValueProperty == ValueProperty)
     {
         return PersistentValuePtr->Container.Get(Isolate);
     }
 
     auto Result = MapTemplate.Get(Isolate)->InstanceTemplate()->NewInstance(Context).ToLocalChecked();
     BindContainer(Ptr, Result,
-        PassByPointer ? FScriptMapWrapper::OnGarbageCollected : FScriptMapWrapper::OnGarbageCollectedWithFree, PassByPointer, EMap);
+        PassByPointer ? FScriptMapWrapper::OnGarbageCollected : FScriptMapWrapper::OnGarbageCollectedWithFree, PassByPointer, EMap,
+        KeyProperty, ValueProperty);
     DataTransfer::SetPointer(Isolate, Result, GetContainerPropertyTranslator(KeyProperty), 1);
     DataTransfer::SetPointer(Isolate, Result, GetContainerPropertyTranslator(ValueProperty), 2);
     return Result;
@@ -3003,11 +3008,11 @@ void FJsEnvImpl::UnBindCppObject(v8::Isolate* Isolate, JSClassDefinition* ClassD
 }
 
 void FJsEnvImpl::BindContainer(void* Ptr, v8::Local<v8::Object> JSObject, void (*Callback)(const v8::WeakCallbackInfo<void>& data),
-    bool PassByPointer, ContainerType Type)
+    bool PassByPointer, ContainerType Type, PropertyMacro* KeyProperty, PropertyMacro* ValueProperty)
 {
     DataTransfer::SetPointer(MainIsolate, JSObject, Ptr, 0);
-    ContainerCacheItem& Val =
-        ContainerCache.Add(Ptr, {v8::UniquePersistent<v8::Value>(MainIsolate, JSObject), !PassByPointer, Type});
+    ContainerCacheItem& Val = ContainerCache.Add(
+        Ptr, {v8::UniquePersistent<v8::Value>(MainIsolate, JSObject), !PassByPointer, Type, KeyProperty, ValueProperty});
     Val.Container.SetWeak<void>(nullptr, Callback, v8::WeakCallbackType::kInternalFields);
 }
 

unreal/Puerts/Source/JsEnv/Private/JsEnvImpl.h

@@ -185,7 +185,7 @@ class FJsEnvImpl : public IJsEnv, IObjectMapper, public FUObjectArray::FUObjectD
     };
 
     void BindContainer(void* Ptr, v8::Local<v8::Object> JSObject, void (*Callback)(const v8::WeakCallbackInfo<void>& data),
-        bool PassByPointer, ContainerType Type);
+        bool PassByPointer, ContainerType Type, PropertyMacro* KeyProperty, PropertyMacro* ValueProperty);
 
     virtual void UnBindContainer(void* Ptr) override;
 
@@ -580,6 +580,8 @@ class FJsEnvImpl : public IJsEnv, IObjectMapper, public FUObjectArray::FUObjectD
         v8::UniquePersistent<v8::Value> Container;
         bool NeedRelease;
         ContainerType Type;
+        PropertyMacro* KeyProperty;
+        PropertyMacro* ValueProperty;
     };
 
     TMap<void*, ContainerCacheItem> ContainerCache;