Merge from dev

Author: Nako Sung

Plugins/UnrealJS/Source/JavascriptEditor/JavascriptEditorGlobalDelegates.cpp

@@ -1,5 +1,6 @@
 #include "JavascriptEditor.h"
 #include "AssetRegistryModule.h"
+#include "EditorSupportDelegates.h"
 #include "JavascriptEditorGlobalDelegates.h"
 
 void UJavascriptEditorGlobalDelegates::BeginDestroy()
@@ -70,7 +71,12 @@ OP_REFLECT_EDITORENGINE(OnBlueprintPreCompile)\
 OP_REFLECT_EDITORENGINE(OnBlueprintCompiled)\
 OP_REFLECT_EDITORENGINE(OnBlueprintReinstanced)\
 OP_REFLECT_EDITORENGINE(OnClassPackageLoadedOrUnloaded)\
-OP_REFLECT_EDITORENGINE(OnObjectReimported);
+OP_REFLECT_EDITORENGINE(OnObjectReimported)
+
+#define DO_REFLECT_SUPPORT() \
+OP_REFLECT_SUPPORT(RedrawAllViewports)\
+OP_REFLECT_SUPPORT(CleanseEditor)\
+OP_REFLECT_SUPPORT(WorldChange)
 
 #if WITH_EDITOR
 FJavascriptAssetData::FJavascriptAssetData(const FAssetData& Source)
@@ -88,10 +94,13 @@ void UJavascriptEditorGlobalDelegates::Bind(FString Key)
 #define OP_REFLECT(x) else if (Key == #x) { Handle = FEditorDelegates::x.AddUObject(this, &UJavascriptEditorGlobalDelegates::x); }
 #define OP_REFLECT_ASSETREGISTRY(x) else if (Key == #x) { Handle = AssetRegistry.x().AddUObject(this, &UJavascriptEditorGlobalDelegates::x); }
 #define OP_REFLECT_EDITORENGINE(x) else if (Key == #x) { Handle = Cast<UEditorEngine>(GEngine)->x().AddUObject(this, &UJavascriptEditorGlobalDelegates::x); }
+#define OP_REFLECT_SUPPORT(x) else if (Key == #x) { Handle = FEditorSupportDelegates::x.AddUObject(this, &UJavascriptEditorGlobalDelegates::x); }
 	if (false) {}
-	DO_REFLECT()
-	DO_REFLECT_ASSETREGISTRY()
-	DO_REFLECT_EDITORENGINE()
+		DO_REFLECT()
+		DO_REFLECT_ASSETREGISTRY()
+		DO_REFLECT_EDITORENGINE()
+		DO_REFLECT_SUPPORT()
+		;
 #endif
 
 	if (Handle.IsValid())
@@ -117,10 +126,13 @@ void UJavascriptEditorGlobalDelegates::Unbind(FString Key)
 #define OP_REFLECT(x) else if (Key == #x) { FEditorDelegates::x.Remove(Handle); }
 #define OP_REFLECT_ASSETREGISTRY(x) else if (Key == #x) { AssetRegistry.x().Remove(Handle); }
 #define OP_REFLECT_EDITORENGINE(x) else if (Key == #x) { Cast<UEditorEngine>(GEngine)->x().Remove(Handle); }
+#define OP_REFLECT_SUPPORT(x) else if (Key == #x) { FEditorSupportDelegates::x.Remove(Handle); }
 	if (false) {}
-	DO_REFLECT()	
-	DO_REFLECT_ASSETREGISTRY()
-	DO_REFLECT_EDITORENGINE()
+		DO_REFLECT()
+		DO_REFLECT_ASSETREGISTRY()
+		DO_REFLECT_EDITORENGINE()
+		DO_REFLECT_SUPPORT()
+		;
 #endif
 
 	Handles.Remove(Key);

Plugins/UnrealJS/Source/JavascriptEditor/JavascriptEditorGlobalDelegates.h

@@ -267,6 +267,17 @@ class JAVASCRIPTEDITOR_API UJavascriptEditorGlobalDelegates : public UObject
 	void OnObjectReimported(UObject* Object);
 
 		//GetActorRecordingState
+
+	// FEditorSupportDelegates
+
+	UFUNCTION(BlueprintImplementableEvent, Category = "Scripting | Javascript")
+	void RedrawAllViewports();
+	
+	UFUNCTION(BlueprintImplementableEvent, Category = "Scripting | Javascript")
+	void CleanseEditor();
+	
+	UFUNCTION(BlueprintImplementableEvent, Category = "Scripting | Javascript")
+	void WorldChange();
 
 #endif
 

Plugins/UnrealJS/Source/JavascriptUMG/JavascriptRichTextBlockHyperlinkDecorator.cpp

@@ -0,0 +1,25 @@
+#include "JavascriptUMG.h"
+#include "JavascriptRichTextBlockHyperlinkDecorator.h"
+
+TSharedRef<ITextDecorator> UJavascriptRichTextBlockHyperlinkDecorator::CreateDecorator(const FSlateFontInfo& DefaultFont, const FLinearColor& DefaultColor)
+{
+	return SRichTextBlock::HyperlinkDecorator(HyperlinkId, FSlateHyperlinkRun::FOnClick::CreateLambda([this](const FSlateHyperlinkRun::FMetadata& metadata) {
+		Current = &metadata;
+		this->OnClick.Broadcast(this);
+		Current = nullptr;
+	}));
+}
+
+FString UJavascriptRichTextBlockHyperlinkDecorator::GetMetadata(const FString& Key)
+{
+	if (Current)
+	{
+		auto Value = Current->Find(Key);
+		if (Value)
+		{
+			return *Value;
+		}
+	}
+	
+	return TEXT("");
+}

Plugins/UnrealJS/Source/JavascriptUMG/JavascriptRichTextBlockHyperlinkDecorator.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include "RichTextBlockDecorator.h"
+#include "JavascriptRichTextBlockHyperlinkDecorator.generated.h"
+
+class UJavascriptContext;
+
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FJavascriptHyperlinkSignature, UJavascriptRichTextBlockHyperlinkDecorator*, Self);
+
+/**
+* Allows thousands of items to be displayed in a Tile.  Generates widgets dynamically for each item.
+*/
+UCLASS(Experimental)
+class JAVASCRIPTUMG_API UJavascriptRichTextBlockHyperlinkDecorator : public URichTextBlockDecorator
+{
+	GENERATED_BODY()
+
+public:	
+	UPROPERTY(EditAnywhere, Category = "Scripting | Javascript")	
+	FString HyperlinkId;
+
+	UPROPERTY(BlueprintAssignable, Category = "Scripting | Javascript")
+	FJavascriptHyperlinkSignature OnClick;
+
+	virtual TSharedRef<ITextDecorator> CreateDecorator(const FSlateFontInfo& DefaultFont, const FLinearColor& DefaultColor) override;
+
+	void HandleClick(const FSlateHyperlinkRun::FMetadata& Metadata);
+
+	UFUNCTION(BlueprintCallable, Category = "Scripting | Javascript")
+	FString GetMetadata(const FString& Key);
+
+	const FSlateHyperlinkRun::FMetadata* Current{ nullptr };
+};

Plugins/UnrealJS/Source/JavascriptWebSocket/JSWebSocketServer.cpp

@@ -42,7 +42,7 @@ static int unreal_networking_server(
 );
 
 #if !UE_BUILD_SHIPPING
-	void libwebsocket_debugLog(int level, const char *line)
+	void libwebsocket_debugLog_JS(int level, const char *line)
 	{ 
 		UE_LOG(LogWebsocket, Log, TEXT("websocket server: %s"), ANSI_TO_TCHAR(line));
 	}
@@ -54,7 +54,7 @@ bool FJavascriptWebSocketServer::Init(uint32 Port, FJavascriptWebSocketClientCon
 #if !PLATFORM_HTML5
 	// setup log level.
 #if !UE_BUILD_SHIPPING
-	lws_set_log_level(LLL_ERR | LLL_WARN | LLL_NOTICE | LLL_DEBUG | LLL_INFO, libwebsocket_debugLog);
+	lws_set_log_level(LLL_ERR | LLL_WARN | LLL_NOTICE | LLL_DEBUG | LLL_INFO, libwebsocket_debugLog_JS);
 #endif 
 
 	Protocols = new libwebsocket_protocols[3];

Plugins/UnrealJS/Source/V8/Private/JavascriptContext_Private.cpp

@@ -1199,11 +1199,11 @@ class FJavascriptContextImplementation : public FJavascriptContext
 				FString Text;
 				if (FFileHelper::LoadFileToString(Text, *script_path))
 				{
-					Text = FString::Printf(TEXT("(function (__dirname) {\nvar module = { exports : {}, filename : __dirname }, exports = module.exports;\n%s\n;return module.exports;}('%s'));"), *Text, *script_path);					
+					Text = FString::Printf(TEXT("(function (global,__dirname) {\nvar module = { exports : {}, filename : __dirname }, exports = module.exports;\n(function () { \n%s\n })()\n;return module.exports;}(this,'%s'));"), *Text, *script_path);					
 #if PLATFORM_WINDOWS
 					full_path = full_path.Replace(TEXT("/"), TEXT("\\"));
 #endif
-					auto exports = Self->RunScript(full_path, Text, 2);
+					auto exports = Self->RunScript(full_path, Text, 3);
 					if (exports.IsEmpty())
 					{
 						UE_LOG(Javascript, Log, TEXT("Invalid script for require"));
@@ -1397,7 +1397,11 @@ class FJavascriptContextImplementation : public FJavascriptContext
 
 		auto Script = ReadScriptFile(Filename);
 
-		return RunScript(GetScriptFileFullPath(Filename), Script);
+		auto ScriptPath = GetScriptFileFullPath(Filename);
+
+		auto Text = FString::Printf(TEXT("(function (global,__dirname) {\n%s\n;}(this,'%s'));"), *Script, *ScriptPath);
+
+		return RunScript(ScriptPath, Text, 1);
 	}
 
 	void Public_RunFile(const FString& Filename)
@@ -1433,7 +1437,7 @@ class FJavascriptContextImplementation : public FJavascriptContext
 		auto Path = Filename;
 #if PLATFORM_WINDOWS
 		// HACK for Visual Studio Code
-		if (Path[1] == ':')
+		if (Path.Len() && Path[1] == ':')
 		{
 			Path = Path.Mid(0, 1).ToLower() + Path.Mid(1);
 		}
@@ -1681,6 +1685,7 @@ inline void FJavascriptContextImplementation::AddReferencedObjects(UObject * InT
 	// All objects
 	for (auto It = ObjectToObjectMap.CreateIterator(); It; ++It)
 	{
+//		UE_LOG(Javascript, Log, TEXT("JavascriptContext referencing %s %s"), *(It.Key()->GetClass()->GetName()), *(It.Key()->GetName()));
 		Collector.AddReferencedObject(It.Key(), InThis);
 	}
 

Plugins/UnrealJS/Source/V8/Private/JavascriptIsolate_Private.cpp

@@ -413,7 +413,9 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate
 		// All classes
 		for (auto It = ClassToFunctionTemplateMap.CreateIterator(); It; ++It)
 		{
-			Collector.AddReferencedObject(It.Key(), InThis);
+			UClass* Class = It.Key();
+			//UE_LOG(Javascript, Log, TEXT("JavascriptIsolate referencing %s / %s %s (gen by %s %s)"), *(Class->GetOuter()->GetName()), *(Class->GetClass()->GetName()), *(Class->GetName()), Class->ClassGeneratedBy ? *(Class->ClassGeneratedBy->GetClass()->GetName()) : TEXT("none"), Class->ClassGeneratedBy ? *(Class->ClassGeneratedBy->GetName()) : TEXT("none"));
+			Collector.AddReferencedObject(Class, InThis);
 		}
 
 		// All structs
@@ -1918,7 +1920,13 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate
 			}
 			else
 			{
-				auto v8_class = ExportClass(Object->GetClass());
+				auto Class = Object->GetClass();
+				if (Class->ClassGeneratedBy && Cast<ULevel>(Class->ClassGeneratedBy->GetOuter()))
+				{
+					return Undefined(isolate_);
+				}
+
+				auto v8_class = ExportClass(Class);
 				auto arg = I.External(Object);
 				Handle<Value> args[] = { arg };