2019-12-26 14:45:42 -05:00
|
|
|
// Copyright Epic Games, Inc. All Rights Reserved.
|
2016-09-23 17:31:51 -04:00
|
|
|
|
2018-09-05 04:55:55 -04:00
|
|
|
#include "MobileJSScripting.h"
|
2018-06-26 08:42:47 -04:00
|
|
|
|
2018-09-05 04:55:55 -04:00
|
|
|
#if PLATFORM_ANDROID || PLATFORM_IOS
|
2018-06-26 08:42:47 -04:00
|
|
|
|
2018-09-05 04:55:55 -04:00
|
|
|
#include "IWebBrowserWindow.h"
|
|
|
|
|
#include "MobileJSStructSerializerBackend.h"
|
|
|
|
|
#include "MobileJSStructDeserializerBackend.h"
|
2016-09-23 17:31:51 -04:00
|
|
|
#include "StructSerializer.h"
|
|
|
|
|
#include "StructDeserializer.h"
|
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 3209340)
#lockdown Nick.Penwarden
#rb none
==========================
MAJOR FEATURES + CHANGES
==========================
Change 3209340 on 2016/11/23 by Ben.Marsh
Convert UE4 codebase to an "include what you use" model - where every header just includes the dependencies it needs, rather than every source file including large monolithic headers like Engine.h and UnrealEd.h.
Measured full rebuild times around 2x faster using XGE on Windows, and improvements of 25% or more for incremental builds and full rebuilds on most other platforms.
* Every header now includes everything it needs to compile.
* There's a CoreMinimal.h header that gets you a set of ubiquitous types from Core (eg. FString, FName, TArray, FVector, etc...). Most headers now include this first.
* There's a CoreTypes.h header that sets up primitive UE4 types and build macros (int32, PLATFORM_WIN64, etc...). All headers in Core include this first, as does CoreMinimal.h.
* Every .cpp file includes its matching .h file first.
* This helps validate that each header is including everything it needs to compile.
* No engine code includes a monolithic header such as Engine.h or UnrealEd.h any more.
* You will get a warning if you try to include one of these from the engine. They still exist for compatibility with game projects and do not produce warnings when included there.
* There have only been minor changes to our internal games down to accommodate these changes. The intent is for this to be as seamless as possible.
* No engine code explicitly includes a precompiled header any more.
* We still use PCHs, but they're force-included on the compiler command line by UnrealBuildTool instead. This lets us tune what they contain without breaking any existing include dependencies.
* PCHs are generated by a tool to get a statistical amount of coverage for the source files using it, and I've seeded the new shared PCHs to contain any header included by > 15% of source files.
Tool used to generate this transform is at Engine\Source\Programs\IncludeTool.
[CL 3209342 by Ben Marsh in Main branch]
2016-11-23 15:48:37 -05:00
|
|
|
#include "UObject/UnrealType.h"
|
2018-09-05 04:55:55 -04:00
|
|
|
#include "Async/Async.h"
|
2016-09-23 17:31:51 -04:00
|
|
|
|
|
|
|
|
// For UrlDecode/Encode
|
|
|
|
|
#include "Http.h"
|
|
|
|
|
|
|
|
|
|
// Inseterted as a part of an URL to send a message to the front end.
|
|
|
|
|
// Note, we can't use a custom protocol due to cross-domain issues.
|
2021-02-02 17:21:35 -04:00
|
|
|
const FString FMobileJSScripting::JSMessageTag = TEXT("/!!com.epicgames.unreal.message/");
|
|
|
|
|
const FString FMobileJSScripting::JSMessageHandler = TEXT("com_epicgames_unreal_message");
|
2016-09-23 17:31:51 -04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
namespace
|
|
|
|
|
{
|
|
|
|
|
const FString ExecuteMethodCommand = TEXT("ExecuteUObjectMethod");
|
|
|
|
|
const FString ScriptingInit =
|
|
|
|
|
TEXT("(function() {")
|
|
|
|
|
TEXT("var util = Object.create({")
|
|
|
|
|
|
|
|
|
|
// Simple random-based (RFC-4122 version 4) UUID generator.
|
|
|
|
|
// Version 4 UUIDs have the form xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx where x is any hexadecimal digit and y is one of 8, 9, a, or b
|
|
|
|
|
// This function returns the UUID as a hex string without the dashes
|
|
|
|
|
TEXT("uuid: function()")
|
|
|
|
|
TEXT("{")
|
|
|
|
|
TEXT(" var b = new Uint8Array(16); window.crypto.getRandomValues(b);")
|
|
|
|
|
TEXT(" b[6] = b[6]&0xf|0x40; b[8]=b[8]&0x3f|0x80;") // Set the reserved bits to the correct values
|
|
|
|
|
TEXT(" return Array.prototype.reduce.call(b, function(a,i){return a+((0x100|i).toString(16).substring(1))},'').toUpperCase();")
|
|
|
|
|
TEXT("}, ")
|
|
|
|
|
|
|
|
|
|
// save a callback function in the callback registry
|
|
|
|
|
// returns the uuid of the callback for passing to the host application
|
|
|
|
|
// ensures that each function object is only stored once.
|
|
|
|
|
// (Closures executed multiple times are considered separate objects.)
|
|
|
|
|
TEXT("registerCallback: function(callback)")
|
|
|
|
|
TEXT("{")
|
|
|
|
|
TEXT(" var key;")
|
|
|
|
|
TEXT(" for(key in this.callbacks)")
|
|
|
|
|
TEXT(" {")
|
|
|
|
|
TEXT(" if (!this.callbacks[key].isOneShot && this.callbacks[key].accept === callback)")
|
|
|
|
|
TEXT(" {")
|
|
|
|
|
TEXT(" return key;")
|
|
|
|
|
TEXT(" }")
|
|
|
|
|
TEXT(" }")
|
|
|
|
|
TEXT(" key = this.uuid();")
|
|
|
|
|
TEXT(" this.callbacks[key] = {accept:callback, reject:callback, bIsOneShot:false};")
|
|
|
|
|
TEXT(" return key;")
|
|
|
|
|
TEXT("}, ")
|
|
|
|
|
|
|
|
|
|
TEXT("registerPromise: function(accept, reject, name)")
|
|
|
|
|
TEXT("{")
|
|
|
|
|
TEXT(" var key = this.uuid();")
|
|
|
|
|
TEXT(" this.callbacks[key] = {accept:accept, reject:reject, bIsOneShot:true, name:name};")
|
|
|
|
|
TEXT(" return key;")
|
|
|
|
|
TEXT("}, ")
|
|
|
|
|
|
|
|
|
|
// invoke a callback method or promise by uuid
|
|
|
|
|
TEXT("invokeCallback: function(key, bIsError, args)")
|
|
|
|
|
TEXT("{")
|
|
|
|
|
TEXT(" var callback = this.callbacks[key];")
|
|
|
|
|
TEXT(" if (typeof callback === 'undefined')")
|
|
|
|
|
TEXT(" {")
|
|
|
|
|
TEXT(" console.error('Unknown callback id', key);")
|
|
|
|
|
TEXT(" return;")
|
|
|
|
|
TEXT(" }")
|
|
|
|
|
TEXT(" if (callback.bIsOneShot)")
|
|
|
|
|
TEXT(" {")
|
|
|
|
|
TEXT(" callback.iwanttodeletethis=true;")
|
|
|
|
|
TEXT(" delete this.callbacks[key];")
|
|
|
|
|
TEXT(" }")
|
|
|
|
|
TEXT(" callback[bIsError?'reject':'accept'].apply(window, args);")
|
|
|
|
|
TEXT("}, ")
|
|
|
|
|
|
|
|
|
|
// convert an argument list to a dictionary of arguments.
|
|
|
|
|
// The args argument must be an argument object as it uses the callee member to deduce the argument names
|
|
|
|
|
TEXT("argsToDict: function(args)")
|
|
|
|
|
TEXT("{")
|
|
|
|
|
TEXT(" var res = {};")
|
|
|
|
|
TEXT(" args.callee.toString().match(/\\((.+?)\\)/)[1].split(/\\s*,\\s*/).forEach(function(name, idx){res[name]=args[idx]});")
|
|
|
|
|
TEXT(" return res;")
|
|
|
|
|
TEXT("}, ")
|
|
|
|
|
|
|
|
|
|
// encodes and sends a message to the host application
|
|
|
|
|
TEXT("sendMessage: function()")
|
|
|
|
|
TEXT("{")
|
2018-09-05 04:55:55 -04:00
|
|
|
#if PLATFORM_IOS
|
|
|
|
|
TEXT(" window.webkit.messageHandlers.") + FMobileJSScripting::JSMessageHandler + TEXT(".postMessage(Array.prototype.map.call(arguments,function(e){return encodeURIComponent(e)}).join('/'));")
|
|
|
|
|
#else
|
2016-09-23 17:31:51 -04:00
|
|
|
TEXT(" var req=new XMLHttpRequest();")
|
2018-09-05 04:55:55 -04:00
|
|
|
TEXT(" req.open('GET', '") + FMobileJSScripting::JSMessageTag + TEXT("' + Array.prototype.map.call(arguments,function(e){return encodeURIComponent(e)}).join('/'), true);")
|
2016-09-23 17:31:51 -04:00
|
|
|
TEXT(" req.send(null);")
|
2018-09-05 04:55:55 -04:00
|
|
|
#endif
|
2016-09-23 17:31:51 -04:00
|
|
|
TEXT("}, ")
|
|
|
|
|
|
|
|
|
|
// uses the above helper methods to execute a method on a uobject instance.
|
|
|
|
|
// the method set as callee on args needs to be a named function, as the name of the method to invoke is taken from it
|
|
|
|
|
TEXT("executeMethod: function(id, args)")
|
|
|
|
|
TEXT("{")
|
|
|
|
|
TEXT(" var self = this;") // the closures need access to the outer this object
|
|
|
|
|
|
|
|
|
|
// In case there are function objects in the argument list, temporarily override Function.toJSON to be able to pass them as callbacks
|
|
|
|
|
TEXT(" var functionJSON = Function.prototype.toJSON;")
|
|
|
|
|
TEXT(" Function.prototype.toJSON = function(){ return self.registerCallback(this) };")
|
|
|
|
|
|
|
|
|
|
// Create a promise object to return back to the caller and create a callback function to handle the response
|
|
|
|
|
TEXT(" var promiseID;")
|
|
|
|
|
TEXT(" var promise = new Promise(function (accept, reject) ")
|
|
|
|
|
TEXT(" {")
|
|
|
|
|
TEXT(" promiseID = self.registerPromise(accept, reject, args.callee.name)")
|
|
|
|
|
TEXT(" });")
|
|
|
|
|
|
|
|
|
|
// Actually invoke the method by sending a message to the host app
|
|
|
|
|
TEXT(" this.sendMessage('") + ExecuteMethodCommand + TEXT("', id, promiseID, args.callee.name, JSON.stringify(this.argsToDict(args)));")
|
|
|
|
|
|
|
|
|
|
// Restore Function.toJSON back to its old value (usually undefined) and return the promise object to the caller
|
|
|
|
|
TEXT(" Function.prototype.toJSON = functionJSON;")
|
|
|
|
|
TEXT(" return promise;")
|
|
|
|
|
TEXT("}")
|
|
|
|
|
TEXT("},{callbacks: {value:{}}});")
|
|
|
|
|
|
|
|
|
|
// Create the global window.ue variable
|
|
|
|
|
TEXT("window.ue = Object.create({}, {'$': {writable: false, configurable:false, enumerable: false, value:util}});")
|
|
|
|
|
TEXT("})();")
|
|
|
|
|
;
|
|
|
|
|
const FString ScriptingPostInit =
|
|
|
|
|
TEXT("(function() {")
|
|
|
|
|
TEXT(" document.dispatchEvent(new CustomEvent('ue:ready', {details: window.ue}));")
|
|
|
|
|
TEXT("})();")
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
typedef TSharedRef<TJsonWriter<>> FJsonWriterRef;
|
|
|
|
|
|
|
|
|
|
template<typename ValueType> void WriteValue(FJsonWriterRef Writer, const FString& Key, const ValueType& Value)
|
|
|
|
|
{
|
|
|
|
|
Writer->WriteValue(Key, Value);
|
|
|
|
|
}
|
|
|
|
|
void WriteNull(FJsonWriterRef Writer, const FString& Key)
|
|
|
|
|
{
|
|
|
|
|
Writer->WriteNull(Key);
|
|
|
|
|
}
|
|
|
|
|
void WriteArrayStart(FJsonWriterRef Writer, const FString& Key)
|
|
|
|
|
{
|
|
|
|
|
Writer->WriteArrayStart(Key);
|
|
|
|
|
}
|
|
|
|
|
void WriteObjectStart(FJsonWriterRef Writer, const FString& Key)
|
|
|
|
|
{
|
|
|
|
|
Writer->WriteObjectStart(Key);
|
|
|
|
|
}
|
|
|
|
|
void WriteRaw(FJsonWriterRef Writer, const FString& Key, const FString& Value)
|
|
|
|
|
{
|
|
|
|
|
Writer->WriteRawJSONValue(Key, Value);
|
|
|
|
|
}
|
|
|
|
|
template<typename ValueType> void WriteValue(FJsonWriterRef Writer, const int, const ValueType& Value)
|
|
|
|
|
{
|
|
|
|
|
Writer->WriteValue(Value);
|
|
|
|
|
}
|
|
|
|
|
void WriteNull(FJsonWriterRef Writer, int)
|
|
|
|
|
{
|
|
|
|
|
Writer->WriteNull();
|
|
|
|
|
}
|
|
|
|
|
void WriteArrayStart(FJsonWriterRef Writer, int)
|
|
|
|
|
{
|
|
|
|
|
Writer->WriteArrayStart();
|
|
|
|
|
}
|
|
|
|
|
void WriteObjectStart(FJsonWriterRef Writer, int)
|
|
|
|
|
{
|
|
|
|
|
Writer->WriteObjectStart();
|
|
|
|
|
}
|
|
|
|
|
void WriteRaw(FJsonWriterRef Writer, int, const FString& Value)
|
|
|
|
|
{
|
|
|
|
|
Writer->WriteRawJSONValue(Value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template<typename KeyType>
|
2018-09-05 04:55:55 -04:00
|
|
|
bool WriteJsParam(FMobileJSScriptingRef Scripting, FJsonWriterRef Writer, const KeyType& Key, FWebJSParam& Param)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
|
|
|
|
switch (Param.Tag)
|
|
|
|
|
{
|
|
|
|
|
case FWebJSParam::PTYPE_NULL:
|
|
|
|
|
WriteNull(Writer, Key);
|
|
|
|
|
break;
|
|
|
|
|
case FWebJSParam::PTYPE_BOOL:
|
|
|
|
|
WriteValue(Writer, Key, Param.BoolValue);
|
|
|
|
|
break;
|
|
|
|
|
case FWebJSParam::PTYPE_DOUBLE:
|
|
|
|
|
WriteValue(Writer, Key, Param.DoubleValue);
|
|
|
|
|
break;
|
|
|
|
|
case FWebJSParam::PTYPE_INT:
|
|
|
|
|
WriteValue(Writer, Key, Param.IntValue);
|
|
|
|
|
break;
|
|
|
|
|
case FWebJSParam::PTYPE_STRING:
|
|
|
|
|
WriteValue(Writer, Key, Param.StringValue);
|
|
|
|
|
break;
|
|
|
|
|
case FWebJSParam::PTYPE_OBJECT:
|
|
|
|
|
{
|
|
|
|
|
if (Param.ObjectValue == nullptr)
|
|
|
|
|
{
|
|
|
|
|
WriteNull(Writer, Key);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
FString ConvertedObject = Scripting->ConvertObject(Param.ObjectValue);
|
|
|
|
|
WriteRaw(Writer, Key, ConvertedObject);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case FWebJSParam::PTYPE_STRUCT:
|
|
|
|
|
{
|
|
|
|
|
FString ConvertedStruct = Scripting->ConvertStruct(Param.StructValue->GetTypeInfo(), Param.StructValue->GetData());
|
|
|
|
|
WriteRaw(Writer, Key, ConvertedStruct);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case FWebJSParam::PTYPE_ARRAY:
|
|
|
|
|
{
|
|
|
|
|
WriteArrayStart(Writer, Key);
|
|
|
|
|
for(int i=0; i < Param.ArrayValue->Num(); ++i)
|
|
|
|
|
{
|
|
|
|
|
WriteJsParam(Scripting, Writer, i, (*Param.ArrayValue)[i]);
|
|
|
|
|
}
|
|
|
|
|
Writer->WriteArrayEnd();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case FWebJSParam::PTYPE_MAP:
|
|
|
|
|
{
|
|
|
|
|
WriteObjectStart(Writer, Key);
|
|
|
|
|
for(auto& Pair : *Param.MapValue)
|
|
|
|
|
{
|
|
|
|
|
WriteJsParam(Scripting, Writer, *Pair.Key, Pair.Value);
|
|
|
|
|
}
|
|
|
|
|
Writer->WriteObjectEnd();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
default:
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-25 10:11:35 -04:00
|
|
|
void FMobileJSScripting::AddPermanentBind(const FString& Name, UObject* Object)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
Copying //UE4/Portal-Staging to Dev-Main (//UE4/Dev-Main) (Source: //Portal/Main @ 3352026)
#lockdown Nick.Penwarden
==========================
MAJOR FEATURES + CHANGES
==========================
Change 3351920 on 2017/03/17 by Leigh.Swift
#jira OPP-6870: [Crash] Assertion failed: ctx->ReadOffset + length <= (uint32)ctx->CompressedData.Num() [File:D:\Build\++Portal+Release-Live+Compile\Sync\Engine\Source\Runtime\ImageWrapper\Private\PngImageWrapper.cpp] [Line: 420]
Instead of asserting for an incorrect data size for png image being loaded, set an error on the wrapper object.
This will result in the slate brush rendering as white box, and errors going to the log which include the png resource path.
Change 3350561 on 2017/03/16 by Justin.Sargent
Updated the Slate standalone D3D renderer to be more fault tolerant.
Added new HasLostDevice() function to SlateRenderer.
If the launcher detects that it has lost the device context it will attempt to perform a full rebuild of the UI and Presentation layers, but also a full reboot of slate application and the renderer.
The launcher will attempt to re-establish the device context for 5 minutes if not interrupted by the user. If the user interacts with the launcher while attempting to re-establish the device context it will instead pop up a system dialog explaining it is having issues with the video card and then will close the application.
Change 3341299 on 2017/03/10 by Richard.Fawcett
Validate JSON files as we're pushing to EMS
Added a flexible validation framework to the system files (EMS) sync operation.
Implemented a JSON validator which by default will validate .json files.
Adds a "ValidationRules" property to the EMS sync config file to allow each product to define its own regex patterns for filenames which should be validated with each validator.
Configured launcher's EMS to validate .product, .v?product, .layout, .sdmeta and .panel files as JSON.
The great news is that this validation actually discovered a minor syntactical issue with Wex.v2product during testing, which is also fixed with this submission. \o/
#epicfriday
Change 3336908 on 2017/03/08 by Leigh.Swift
#jira OPP-5126: All disk size checks for BPS installations should be handled internally to BPS, the Portal code should not need to check this and can only do so less accurately.
Removing disk space checks from portal code which block installers from running. NB: There is still a check in selective download code which provides tooltip information only.
Moving BuildPatchInstaller disk size check to the file constructor, which is the class that most accurately knows the required amount of space. The disk check now occurs after resume and just before we start to write data.
A secondary disk check is also made if a file fails to construct so that we can detect problems caused by change in available disk space.
Disk space error message extended to include useful information for the user.
Change 3323366 on 2017/02/27 by Richard.Fawcett
Fix reference to Newtonsoft in Publishing.Automation.
Change 3323205 on 2017/02/27 by Wes.Fudala
Adding language support to the windows installer.
Significantly expandes OneSky upload functionality.
OPP-5438 Launcher installer should support the same language set supported by the launcher.
Change 3316926 on 2017/02/22 by Richard.Fawcett
Prevent Amazon S3 download glitches from issuing warnings until half of the maximum retries have been attempted.
In practice, when we download thousands of files, we _do_ get failures which need to be retried. This means that pretty much all jobs result in warnings, which isn't appropriate. This should turn jobs green again, and only warn us when things look unusual.
#jira OPP-6607
Change 3315996 on 2017/02/21 by Justin.Sargent
Incrementing Portal version number
I'm incrementing this earlier than normal due to a need to depend on a new version number for EMS layout change versioning.
Change 3312760 on 2017/02/20 by Wes.Fudala
Users can now select desired environment/region from the UI.
New login screen.
Adds slid out settings menu to login screen.
Adds region and language selection to the settings menu.
Adds support for PortalRegions ini.
Adds DefaultPortalRegions ini.
Adds RegionRepository, RegionPublisher, RegionSelectService, and RegionIdentificationService.
Adds region select option in debugtools general section.
Adds RegionSelectService unit test with associated mocks.
Changes the way all backend connections are configured so that values are now pulled from config files.
Renames product region selector files to avoid some confusion with portal region files.
Updated EmsConfigUpdater and HotfixManager so they support optional overwrite and save of ini files.
Region publisher now restricts regions that require permissions in shipping builds.
Fixes a bug causing items to get stuck in the download queue UI after we failed to obtain a manifest when reaching out the the backend.
#jira OPP-6121, OPP-5809
Change 3311664 on 2017/02/20 by Andrew.Brown
Added GetTypeHash support for FDelegateHandle
Change 3311505 on 2017/02/20 by Richard.Fawcett
Rename/move file(s)
Change 3309004 on 2017/02/17 by Chad.Garyet
adding in additional platforms for the BuildPlugin commandline
Change 3299188 on 2017/02/13 by Leigh.Swift
#jira OPP-6711: [CRASH] Assertion failed: IsComplete()
Race condition in portal hack allowed an installer to attempt to execute complete delegate before being complete.
Change 3294197 on 2017/02/09 by Richard.Fawcett
Adding ValidPrereqIds.json
This is needed now because the script to enforce correct prereq ids reaches out to Perforce to access this file!
#jira OPP-6583
Change 3294059 on 2017/02/09 by Richard.Fawcett
Fix comment on PostBuild parameter to reference correct name of "Manifest" property.
Change 3293377 on 2017/02/08 by Richard.Fawcett
Remove need for a metadata file containing name of generated manifest when using randomized manifest filenames.
Change 3282865 on 2017/02/02 by Richard.Fawcett
Simplify params to BuildGraph's ChunkTask / PostBuildTask
Also, downgrade warnings to simple log messages when falling back to legacy manifest filename construction to ease transition into randomized manifest filenames for game teams.
#jira OPP-6435
Change 3282809 on 2017/02/02 by Leigh.Swift
#jira OPP-6564: BPT will crash if the FileIgnoreList input instructs the build streamer to ignore every build file.
A race condition for getting to the first scanner creation code, vs the build stream exiting with no data. If the former wins, a scanner will be created without enough data to scan.
Scanners are now no longer created if the buildstream provided no data.
Change 3280848 on 2017/02/01 by Leigh.Swift
#jira OPP-3864: BuildPatchServices will log a FATAL error on shutdown even if it's fine to be shutting down.
When BPS is shutdown, it will only set error states and cancellation logic if any installers are actually created.
Change 3280839 on 2017/02/01 by Leigh.Swift
Fixing whitespace damage incoming from Dev-Staging
Change 3280820 on 2017/02/01 by Andrew.Brown
Copying //Portal/Dev-Main-Staging to Main (//Portal/Main)
Change 3280797 on 2017/02/01 by Leigh.Swift
#jira OPP-6649: BPS sends undocumented analytics events.
Adding documentation for the following events:
Patcher.Error.Download
Patcher.Warning.ChunkAborted
Patcher.Error.Cache
Patcher.Error.Construction
Patcher.Error.Prerequisites
Change 3278887 on 2017/01/31 by Richard.Fawcett
Downgrade cleanup warnings to normal log output.
The conditions which used to trigger these warnings are now considered to be normal behavior, in a world in which we carry out cross-app game promotions.
This results in a perma-yellow state for cleanup, which is unhelpful.
#nojira
Change 3278738 on 2017/01/31 by Richard.Fawcett
Tweak Conan launch parameters
Change 3277066 on 2017/01/30 by Richard.Fawcett
Remove temporary code which cleans up P:\Builds\UnrealEngineLauncher\BuildGraph, as the location no longer exists.
Change 3274907 on 2017/01/27 by Leigh.Swift
#jira OPP-6615: Receiving a whisper while in game may minimize game client.
Refactoring SWindow ActivateOnFirstShown bool to be ActivationPolicy to give more accurate control.
This also allows fixing of misuses of previous ActivateOnFirstShown variables in the implementations, which appear to mostly be interpreting it as 'AlwaysActivate'.
The upgrade path is therefore ActivateOnFirstShown true/false becomes ActivationPolicy Always/Never.
Moving initial minimize and maximise logic for FWindowsWindow into the Show() call on first show to gain control of activation and respect the provided policy.
Refactoring existing uses to use the new variables/functions instead.
The refactor of existing code is focused on preserving current always activate behaviour as opposed to changing behaviour to actually only activate on first show.
Change 3273466 on 2017/01/26 by Alex.Fennell
New build of OpenSSL libraries #JIRA OPP-6408
PriceEngine configuration and fixes for bugs it introduced.
Change 3268045 on 2017/01/23 by Richard.Fawcett
Re-adding Funcom folk to Conan chunk notification emails
Change 3267709 on 2017/01/23 by Richard.Fawcett
Fix launch arguments for Conan Exiles editor.
Temporarily remove FunCom recipients from notification list to avoid spamming.
Change 3265774 on 2017/01/20 by Chad.Garyet
Merge of Engine/Build/Buildfarm over to //Portal from Dev-Build
Change 3264674 on 2017/01/19 by Alex.Fennell
On demand catalog requests
Change 3263654 on 2017/01/19 by Leigh.Swift
#jira OPP6562: Support looking up tagging and sdmeta info and using it in build diff output
Adding tag use understanding to the manifest diff tool of BPT.
Adding Selective Download feature support to PPT for it's diff tool, making use of portal's metadata for the feature.
Change 3263623 on 2017/01/19 by Richard.Fawcett
Fix issue where ManifestFilename is not always available at post build time.
#jira OPP-6606
Change 3262013 on 2017/01/18 by Richard.Fawcett
Remote potential for success email being sent on third party chunk failure
Change 3261914 on 2017/01/18 by Richard.Fawcett
Fix for user content generation job not specifying a manifest filename.
Change 3261800 on 2017/01/18 by Richard.Fawcett
Implement streaming S3 downloads to disk, rather than just to memory
This is needed because C# has a 2 billion maximum array dimension, so files > 2GB can't be downloaded using the existing code.
Change 3261675 on 2017/01/18 by Richard.Fawcett
Support for overriding, or generating randomized unique manifest filenames to avoid automated harvesting from CDN
BuildGraph's ChunkTask takes three new parameters ...
* ManifestFilename (string) - The filename of the manifest to produce. If omitted, the value of RandomizeManifestFilename will determine how the manifest filename is determined.
* RandomizeManifestFilename (bool) - If true, we'll generate a random, unique manifest filename. If false (default), we'll use legacy behavior of combining app name and build version.
* LocalManifestDir (string) - Required if RandomizedManifestFilename is true. This directory will receive local copies of any manifest file produced, and a metadata file containing the name of the most recently produced manifest
BuildGraph's PostBuildTask takes two new parameters ...
* ManifestFilename (string) - The filename of the manifest to post. If omitted, we'll use the value from the metadat file in LocalManifestDir is this is set, otherwise use legacy behavior.
* LocalManifestDir (string) - A directory containing local copies of manifest files, along with a metadata file containing the name of the manifest file produced by the most recent ChunkTask operation.
Support added to the launcher build script's to use the new parameters to randomize its manifest filename, and post the randomized filename to MCP.
Use of a contructor of BuildPatchToolStagingInfo which does not specify a manifest filename is now considered deprecated, and will output a warning.
Remove requirement of having a BuildPatchToolStagingInfo when performing a chunking operation, instead just passing in the specific values we need from it as parameters in their own right.
Remove support for non-chunk based manifests from C# wrapper, as these are no longer supported in BuildPatchTool itself.
#jira OPP-6432
Change 3261647 on 2017/01/18 by Leigh.Swift
Adding some cleanup to the end of some BPT functional tests so that they do not affect proceeding tests and cause red-herring warning output.
Change 3261639 on 2017/01/18 by Richard.Fawcett
Update app name of Conan to ConanExiles to match back-end catalog.
Fix Conan launch exe and args so that launcher can detect when product is running. Was previously using a batch file which terminates after launching editor.
Change 3258815 on 2017/01/16 by Wes.Fudala
UTM and product info will be parsed from installer name and passed to the launcher. UTM info will be passed along as part of all analytics events.
#jira OPP-6404: Add user funnel tracking
Change 3258809 on 2017/01/16 by Wes.Fudala
Back out changelist 3258800.
Backing out changes that were intended to be made in a different stream.
Change 3258800 on 2017/01/16 by Wes.Fudala
App version is now also appended to user agent string.
Change 3256999 on 2017/01/13 by Richard.Fawcett
Fix issue where JSON file included in Publishing csproj is not reliably copied to output folder on build farm.
Change 3256941 on 2017/01/13 by Richard.Fawcett
Move configuration for Third Party build pipeline out of code and into its own configuration file.
#epicfriday
Change 3255072 on 2017/01/12 by Richard.Fawcett
Add additional logging around multithreaded upload of files to S3.
Fix bug ensuring that the failure of any single part of multi-part upload results in the whole file being failed.
#jira OPP-6392
Change 3253672 on 2017/01/11 by Richard.Fawcett
Add support for third-party Conan editor.
Alter third party process so it doesn't crash if version.txt doesn't already exist in the third party S3 bucket, to allow us to setup in advance of third party publishing their first version.
Change 3251901 on 2017/01/10 by Barnabas.McManners
Compile fix on mac, fix for hidden method in AutomationTest define. Without this GoogleMock.spec.cpp wont compile on mac.
#nojira
#ReviewedBy Leigh.Swift
Change 3250907 on 2017/01/09 by Justin.Sargent
Changed the automation controller to uses a non-zero exit code when performing a 'quit' command if tests failed.
Change 3245328 on 2017/01/03 by Justin.Sargent
Enabling the logic to lowercase all C++ members exposed to javascript.
Added additional to-lowering behavior to UObject binding.
#jira OPP-6494
Change 3240667 on 2016/12/20 by Andrew.Brown
Copying //Tasks/Portal/Dev-OPP-6109-DedicatedServer to Dev-Main (//Portal/Dev-Main)
Change 3236972 on 2016/12/15 by Bob.Ferreira
Updating compliation changes for AutomationDriver
Change 3236567 on 2016/12/15 by Richard.Fawcett
Ensure that third party product chunking uses latest CL across our P4 depot in its version number.
Change 3236188 on 2016/12/15 by Richard.Fawcett
Combine all launcher purchases into single workflow using the new quickPurchase API call as the initial request.
#jira OPP-6257
Change 3231134 on 2016/12/12 by Alex.Fennell
Improving fail case handling for the waiting room service
#jira OPP-5648
Change 3228514 on 2016/12/09 by Richard.Fawcett
Change filetype
Change 3227080 on 2016/12/08 by Barnabas.McManners
Merging CL 3226840 from Dev Editor
Fixing a bug in FText formatting where it would ignore the rebuild and Rebuild as Source arguments for the format string itself
#jira OPP-6485
Change 3219810 on 2016/12/02 by Ben.Marsh
UAT: Fix unzip output being completely discarded. Switch it to just be verbose instead.
Change 3219602 on 2016/12/02 by Ben.Marsh
Add the -q (quiet) option to the Mac unzip command, since it's creating too much log output to be useful.
[CL 3355309 by Justin Sargent in Main branch]
2017-03-20 18:49:23 -04:00
|
|
|
const FString ExposedName = GetBindingName(Name, Object);
|
2016-09-23 17:31:51 -04:00
|
|
|
|
2018-09-25 10:11:35 -04:00
|
|
|
// Each object can only have one permanent binding
|
|
|
|
|
if (BoundObjects[Object].bIsPermanent)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// Existing permanent objects must be removed first
|
|
|
|
|
if (PermanentUObjectsByName.Contains(ExposedName))
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
BoundObjects[Object] = { true, -1 };
|
|
|
|
|
PermanentUObjectsByName.Add(ExposedName, Object);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMobileJSScripting::RemovePermanentBind(const FString& Name, UObject* Object)
|
|
|
|
|
{
|
|
|
|
|
const FString ExposedName = GetBindingName(Name, Object);
|
|
|
|
|
|
|
|
|
|
// If overriding an existing permanent object, make it non-permanent
|
|
|
|
|
if (PermanentUObjectsByName.Contains(ExposedName) && (Object == nullptr || PermanentUObjectsByName[ExposedName] == Object))
|
|
|
|
|
{
|
|
|
|
|
Object = PermanentUObjectsByName.FindAndRemoveChecked(ExposedName);
|
|
|
|
|
BoundObjects.Remove(Object);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMobileJSScripting::BindUObject(const FString& Name, UObject* Object, bool bIsPermanent)
|
|
|
|
|
{
|
2018-09-05 04:55:55 -04:00
|
|
|
TSharedPtr<IWebBrowserWindow> Window = WindowPtr.Pin();
|
2016-09-23 17:31:51 -04:00
|
|
|
if (Window.IsValid())
|
|
|
|
|
{
|
2018-09-25 10:11:35 -04:00
|
|
|
BindUObject(Window.ToSharedRef(), Name, Object, bIsPermanent);
|
|
|
|
|
}
|
|
|
|
|
else if (bIsPermanent)
|
|
|
|
|
{
|
|
|
|
|
AddPermanentBind(Name, Object);
|
2016-09-23 17:31:51 -04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-05 04:55:55 -04:00
|
|
|
void FMobileJSScripting::UnbindUObject(const FString& Name, UObject* Object, bool bIsPermanent)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
2018-09-05 04:55:55 -04:00
|
|
|
TSharedPtr<IWebBrowserWindow> Window = WindowPtr.Pin();
|
2016-09-23 17:31:51 -04:00
|
|
|
if (Window.IsValid())
|
|
|
|
|
{
|
2018-09-25 10:11:35 -04:00
|
|
|
UnbindUObject(Window.ToSharedRef(), Name, Object, bIsPermanent);
|
2016-09-23 17:31:51 -04:00
|
|
|
}
|
2018-09-25 10:11:35 -04:00
|
|
|
else if (bIsPermanent)
|
|
|
|
|
{
|
|
|
|
|
RemovePermanentBind(Name, Object);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMobileJSScripting::BindUObject(TSharedRef<class IWebBrowserWindow> InWindow, const FString& Name, UObject* Object, bool bIsPermanent)
|
|
|
|
|
{
|
|
|
|
|
WindowPtr = InWindow;
|
|
|
|
|
|
|
|
|
|
const FString ExposedName = GetBindingName(Name, Object);
|
|
|
|
|
FString Converted = ConvertObject(Object);
|
|
|
|
|
if (bIsPermanent)
|
|
|
|
|
{
|
|
|
|
|
AddPermanentBind(Name, Object);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
InitializeScript(InWindow);
|
|
|
|
|
FString SetValueScript = FString::Printf(TEXT("window.ue['%s'] = %s;"), *ExposedName.ReplaceCharWithEscapedChar(), *Converted);
|
|
|
|
|
InWindow->ExecuteJavascript(SetValueScript);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMobileJSScripting::UnbindUObject(TSharedRef<class IWebBrowserWindow> InWindow, const FString& Name, UObject* Object, bool bIsPermanent)
|
|
|
|
|
{
|
|
|
|
|
WindowPtr = InWindow;
|
|
|
|
|
|
|
|
|
|
const FString ExposedName = GetBindingName(Name, Object);
|
|
|
|
|
if (bIsPermanent)
|
|
|
|
|
{
|
|
|
|
|
RemovePermanentBind(Name, Object);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
FString DeleteValueScript = FString::Printf(TEXT("delete window.ue['%s'];"), *ExposedName.ReplaceCharWithEscapedChar());
|
|
|
|
|
InWindow->ExecuteJavascript(DeleteValueScript);
|
2016-09-23 17:31:51 -04:00
|
|
|
}
|
|
|
|
|
|
2018-09-05 04:55:55 -04:00
|
|
|
bool FMobileJSScripting::OnJsMessageReceived(const FString& Command, const TArray<FString>& Params, const FString& Origin)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
|
|
|
|
bool Result = false;
|
|
|
|
|
if (Command == ExecuteMethodCommand)
|
|
|
|
|
{
|
|
|
|
|
Result = HandleExecuteUObjectMethodMessage(Params);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return Result;
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-05 04:55:55 -04:00
|
|
|
FString FMobileJSScripting::ConvertStruct(UStruct* TypeInfo, const void* StructPtr)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
|
|
|
|
return TEXT("undefined");
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-05 04:55:55 -04:00
|
|
|
FString FMobileJSScripting::ConvertObject(UObject* Object)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
|
|
|
|
RetainBinding(Object);
|
|
|
|
|
UClass* Class = Object->GetClass();
|
|
|
|
|
|
|
|
|
|
bool first = true;
|
|
|
|
|
FString Result = TEXT("(function(){ return Object.create({");
|
|
|
|
|
for (TFieldIterator<UFunction> FunctionIt(Class, EFieldIteratorFlags::IncludeSuper); FunctionIt; ++FunctionIt)
|
|
|
|
|
{
|
|
|
|
|
UFunction* Function = *FunctionIt;
|
|
|
|
|
if(!first)
|
|
|
|
|
{
|
|
|
|
|
Result.Append(TEXT(","));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
first = false;
|
|
|
|
|
}
|
Copying //UE4/Portal-Staging to //UE4/Dev-Main (Source: //Portal/Main @ 3216504)
#lockdown Nick.Penwarden
#rb no one
==========================
MAJOR FEATURES + CHANGES
==========================
Change 3216141 on 2016/11/30 by Justin.Sargent
Completed first ready to use pass of the new AutomationDriver module and new Spec test type.
Change 3213288 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Removing deprecation of IWebBrowserSingleton::SetJSBindingToLoweringEnabled for now.
Change 3212796 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Added SetJSBindingToLoweringEnabled to IWebBrowserSingleton so that the to-lowering of binding names can be disabled.
Deprecated SetJSBindingToLoweringEnabled since 4.15. In future the to-lowering will always occurr.
Adding GetBindingName helper to FWebJSScripting, which returns a to-lowered name for a UField, unless disabled.
Updated all current binding code to use GetBindingName when building from UObjects/UStructs. This affects Windows, Mac, Linux, and Android.
Portal currently disables to-lowering unless a commandline -LowercaseJS is provided.
Change 3200370 on 2016/11/16 by Richard.Fawcett
Ensure we always get the latest version of the user content catalog when promoting marketplace items.
Change 3192974 on 2016/11/10 by Leigh.Swift
#jira OPP-6365: Crash during shutdown if a manifest is still being downloaded
This is because of the OnPreExit core delegate being used to null out the Data uobject member on a manifest, also being the only sensible way to ensure threads complete in a safe and clean manner.
Refactoring BuildPatchServices manifest class to not permanently hold any UObject and simply just use one while serialising.
This removes the reliance on the OnPreExit delegate from manifest class, making it generally safer behaviour for shutdown.
Change 3187028 on 2016/11/04 by Leigh.Swift
PortalPublishingTool: Adding UE_Main app to UnrealEngine project
Change 3186788 on 2016/11/04 by Richard.Fawcett
Change C# wrapper for BuildPatchTool patch generation to prevent clobbering manifest files by default, unless we specifically pass in an optional flag to allow this.
#jira OPP-6355
Change 3186779 on 2016/11/04 by Richard.Fawcett
Add support to automation tool testing framework for the following assertions:
Assert.AreNotEqual(a, b, optionalFailureMessage)
Assert.ThrowsError(actionToCarryOut, expectedExceptionType, optionalExceptionMessageContainsString)
Moved attribute-based expected exception declarations to their own attribute, TestThrowsExceptionAttribute, which can now accept an optional parameter for a string which should be contained within the exception message.
Fixed a bug where a test method with an attribute-based expected exception would not count towards the success total if the exception was encountered as expected.
Fixed a bug where NOT throwing an exception when we were expecting one would count as a success.
Added an internal property bDoNotLogTestFailsAsError which we can set to true to suppress logging of UAT errors when a test fails (but still count them in our failure results), to allow us to deliberately cause test failures to test the test framework!
Added a suite of unit tests for the test framework itself, in TestRunner.Automation.Tests.cs.
Change 3185411 on 2016/11/03 by Richard.Fawcett
Allow Rocket_PromoteBuild changelist to be overridden by a changelist read from a file.
Change 3184843 on 2016/11/03 by Richard.Fawcett
Ensure catalog file synced during user content generation is always the latest one.
Change 3184752 on 2016/11/03 by Richard.Fawcett
Ensure we log reading changelist from specified file.
Change 3184744 on 2016/11/03 by Richard.Fawcett
Ensure directory is created for Changelist file if it doesn't already exist.
Change 3184738 on 2016/11/03 by Richard.Fawcett
Ensure we use latest CL from all of Perforce when generating build versions for user content
Because of the nature of the build farm, where separate parts of the job are executed on different build agents at different times, this changelist is serialized to the filesystem during execution of a node dedicated to this task, and then made available to all future nodes, so that they're working with a consistent build version. In the case of an execution where we're updating Perforce with new content, this calculation of the changelist occurs AFTER we've updated Perforce with the new content.
Have also optimized the build graph scripts to enable Mac and Windows user generated content to execute simultaneously.
#jira OPP-6274
Change 3181456 on 2016/11/01 by Andrew.Brown
SExpandable area has been modified as the Portal settings mocks weren't able to be achieved with default functionality.
Added BodyBorderImage arguement and BodyBorderBackgroundColor attribute so we can specify a different brush/color to use for the expanded area compared with the title area. Additional care was made to ensure that rounded corners still appear correctly if the developer doesn't want to specify a different look to the body.
Added AreaTitlePadding attribute, to be able to specify padding between the expand/collapse icon and the header content.
Added MinWidth arguement, to ensure that the areas meet a minimum width requirement.
Change 3181285 on 2016/11/01 by Richard.Fawcett
Ensure user content generated using latest changelist submitted to Perforce, rather than using portal's latest changelist
#jira OPP-6274
Change 3177758 on 2016/10/28 by Leigh.Swift
#jira OPP-6247: Portal needs Social Plugin integration v1.2
Copying //Portal/Dev-Social to Dev-Main (//Portal/Dev-Main)
Change 3175889 on 2016/10/26 by Wes.Fudala
Web browser tooltips will no longer continue to appear when the mouse leaves the browser window.
#jira: OPP-5895 The Mouseover info in Recent Additions (Marketplace) anchors itself to the mouse pointer over other Browser windows
rb: Justin.Sargent
Change 3171388 on 2016/10/22 by Leigh.Swift
#jira OPP-6343: Launcher crashes patching from 2.12.13 Main to 2.12.13 Release-Live
BPS: FBuildPatchAppManifest needs to listen for FCoreDelegates::OnPreExit in order to clean up references to it's UObject which is about to be destroyed.
Change 3170373 on 2016/10/21 by Leigh.Swift
#jira: OPP-6340: Portal builds fail on audit nodes.
Reducing platform regex to only match pre-defined possibilities.
[CL 3219291 by Justin Sargent in Main branch]
2016-12-02 13:27:02 -05:00
|
|
|
Result.Append(*GetBindingName(Function));
|
2016-09-23 17:31:51 -04:00
|
|
|
Result.Append(TEXT(": function "));
|
Copying //UE4/Portal-Staging to //UE4/Dev-Main (Source: //Portal/Main @ 3216504)
#lockdown Nick.Penwarden
#rb no one
==========================
MAJOR FEATURES + CHANGES
==========================
Change 3216141 on 2016/11/30 by Justin.Sargent
Completed first ready to use pass of the new AutomationDriver module and new Spec test type.
Change 3213288 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Removing deprecation of IWebBrowserSingleton::SetJSBindingToLoweringEnabled for now.
Change 3212796 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Added SetJSBindingToLoweringEnabled to IWebBrowserSingleton so that the to-lowering of binding names can be disabled.
Deprecated SetJSBindingToLoweringEnabled since 4.15. In future the to-lowering will always occurr.
Adding GetBindingName helper to FWebJSScripting, which returns a to-lowered name for a UField, unless disabled.
Updated all current binding code to use GetBindingName when building from UObjects/UStructs. This affects Windows, Mac, Linux, and Android.
Portal currently disables to-lowering unless a commandline -LowercaseJS is provided.
Change 3200370 on 2016/11/16 by Richard.Fawcett
Ensure we always get the latest version of the user content catalog when promoting marketplace items.
Change 3192974 on 2016/11/10 by Leigh.Swift
#jira OPP-6365: Crash during shutdown if a manifest is still being downloaded
This is because of the OnPreExit core delegate being used to null out the Data uobject member on a manifest, also being the only sensible way to ensure threads complete in a safe and clean manner.
Refactoring BuildPatchServices manifest class to not permanently hold any UObject and simply just use one while serialising.
This removes the reliance on the OnPreExit delegate from manifest class, making it generally safer behaviour for shutdown.
Change 3187028 on 2016/11/04 by Leigh.Swift
PortalPublishingTool: Adding UE_Main app to UnrealEngine project
Change 3186788 on 2016/11/04 by Richard.Fawcett
Change C# wrapper for BuildPatchTool patch generation to prevent clobbering manifest files by default, unless we specifically pass in an optional flag to allow this.
#jira OPP-6355
Change 3186779 on 2016/11/04 by Richard.Fawcett
Add support to automation tool testing framework for the following assertions:
Assert.AreNotEqual(a, b, optionalFailureMessage)
Assert.ThrowsError(actionToCarryOut, expectedExceptionType, optionalExceptionMessageContainsString)
Moved attribute-based expected exception declarations to their own attribute, TestThrowsExceptionAttribute, which can now accept an optional parameter for a string which should be contained within the exception message.
Fixed a bug where a test method with an attribute-based expected exception would not count towards the success total if the exception was encountered as expected.
Fixed a bug where NOT throwing an exception when we were expecting one would count as a success.
Added an internal property bDoNotLogTestFailsAsError which we can set to true to suppress logging of UAT errors when a test fails (but still count them in our failure results), to allow us to deliberately cause test failures to test the test framework!
Added a suite of unit tests for the test framework itself, in TestRunner.Automation.Tests.cs.
Change 3185411 on 2016/11/03 by Richard.Fawcett
Allow Rocket_PromoteBuild changelist to be overridden by a changelist read from a file.
Change 3184843 on 2016/11/03 by Richard.Fawcett
Ensure catalog file synced during user content generation is always the latest one.
Change 3184752 on 2016/11/03 by Richard.Fawcett
Ensure we log reading changelist from specified file.
Change 3184744 on 2016/11/03 by Richard.Fawcett
Ensure directory is created for Changelist file if it doesn't already exist.
Change 3184738 on 2016/11/03 by Richard.Fawcett
Ensure we use latest CL from all of Perforce when generating build versions for user content
Because of the nature of the build farm, where separate parts of the job are executed on different build agents at different times, this changelist is serialized to the filesystem during execution of a node dedicated to this task, and then made available to all future nodes, so that they're working with a consistent build version. In the case of an execution where we're updating Perforce with new content, this calculation of the changelist occurs AFTER we've updated Perforce with the new content.
Have also optimized the build graph scripts to enable Mac and Windows user generated content to execute simultaneously.
#jira OPP-6274
Change 3181456 on 2016/11/01 by Andrew.Brown
SExpandable area has been modified as the Portal settings mocks weren't able to be achieved with default functionality.
Added BodyBorderImage arguement and BodyBorderBackgroundColor attribute so we can specify a different brush/color to use for the expanded area compared with the title area. Additional care was made to ensure that rounded corners still appear correctly if the developer doesn't want to specify a different look to the body.
Added AreaTitlePadding attribute, to be able to specify padding between the expand/collapse icon and the header content.
Added MinWidth arguement, to ensure that the areas meet a minimum width requirement.
Change 3181285 on 2016/11/01 by Richard.Fawcett
Ensure user content generated using latest changelist submitted to Perforce, rather than using portal's latest changelist
#jira OPP-6274
Change 3177758 on 2016/10/28 by Leigh.Swift
#jira OPP-6247: Portal needs Social Plugin integration v1.2
Copying //Portal/Dev-Social to Dev-Main (//Portal/Dev-Main)
Change 3175889 on 2016/10/26 by Wes.Fudala
Web browser tooltips will no longer continue to appear when the mouse leaves the browser window.
#jira: OPP-5895 The Mouseover info in Recent Additions (Marketplace) anchors itself to the mouse pointer over other Browser windows
rb: Justin.Sargent
Change 3171388 on 2016/10/22 by Leigh.Swift
#jira OPP-6343: Launcher crashes patching from 2.12.13 Main to 2.12.13 Release-Live
BPS: FBuildPatchAppManifest needs to listen for FCoreDelegates::OnPreExit in order to clean up references to it's UObject which is about to be destroyed.
Change 3170373 on 2016/10/21 by Leigh.Swift
#jira: OPP-6340: Portal builds fail on audit nodes.
Reducing platform regex to only match pre-defined possibilities.
[CL 3219291 by Justin Sargent in Main branch]
2016-12-02 13:27:02 -05:00
|
|
|
Result.Append(*GetBindingName(Function));
|
2016-09-23 17:31:51 -04:00
|
|
|
Result.Append(TEXT(" ("));
|
|
|
|
|
|
|
|
|
|
bool firstArg = true;
|
2019-12-13 11:07:03 -05:00
|
|
|
for ( TFieldIterator<FProperty> It(Function); It; ++It )
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
2019-12-13 11:07:03 -05:00
|
|
|
FProperty* Param = *It;
|
2016-09-23 17:31:51 -04:00
|
|
|
if (Param->PropertyFlags & CPF_Parm && ! (Param->PropertyFlags & CPF_ReturnParm) )
|
|
|
|
|
{
|
2019-12-13 11:07:03 -05:00
|
|
|
FStructProperty *StructProperty = CastField<FStructProperty>(Param);
|
2016-09-23 17:31:51 -04:00
|
|
|
if (!StructProperty || !StructProperty->Struct->IsChildOf(FWebJSResponse::StaticStruct()))
|
|
|
|
|
{
|
|
|
|
|
if(!firstArg)
|
|
|
|
|
{
|
|
|
|
|
Result.Append(TEXT(", "));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
firstArg = false;
|
|
|
|
|
}
|
Copying //UE4/Portal-Staging to //UE4/Dev-Main (Source: //Portal/Main @ 3216504)
#lockdown Nick.Penwarden
#rb no one
==========================
MAJOR FEATURES + CHANGES
==========================
Change 3216141 on 2016/11/30 by Justin.Sargent
Completed first ready to use pass of the new AutomationDriver module and new Spec test type.
Change 3213288 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Removing deprecation of IWebBrowserSingleton::SetJSBindingToLoweringEnabled for now.
Change 3212796 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Added SetJSBindingToLoweringEnabled to IWebBrowserSingleton so that the to-lowering of binding names can be disabled.
Deprecated SetJSBindingToLoweringEnabled since 4.15. In future the to-lowering will always occurr.
Adding GetBindingName helper to FWebJSScripting, which returns a to-lowered name for a UField, unless disabled.
Updated all current binding code to use GetBindingName when building from UObjects/UStructs. This affects Windows, Mac, Linux, and Android.
Portal currently disables to-lowering unless a commandline -LowercaseJS is provided.
Change 3200370 on 2016/11/16 by Richard.Fawcett
Ensure we always get the latest version of the user content catalog when promoting marketplace items.
Change 3192974 on 2016/11/10 by Leigh.Swift
#jira OPP-6365: Crash during shutdown if a manifest is still being downloaded
This is because of the OnPreExit core delegate being used to null out the Data uobject member on a manifest, also being the only sensible way to ensure threads complete in a safe and clean manner.
Refactoring BuildPatchServices manifest class to not permanently hold any UObject and simply just use one while serialising.
This removes the reliance on the OnPreExit delegate from manifest class, making it generally safer behaviour for shutdown.
Change 3187028 on 2016/11/04 by Leigh.Swift
PortalPublishingTool: Adding UE_Main app to UnrealEngine project
Change 3186788 on 2016/11/04 by Richard.Fawcett
Change C# wrapper for BuildPatchTool patch generation to prevent clobbering manifest files by default, unless we specifically pass in an optional flag to allow this.
#jira OPP-6355
Change 3186779 on 2016/11/04 by Richard.Fawcett
Add support to automation tool testing framework for the following assertions:
Assert.AreNotEqual(a, b, optionalFailureMessage)
Assert.ThrowsError(actionToCarryOut, expectedExceptionType, optionalExceptionMessageContainsString)
Moved attribute-based expected exception declarations to their own attribute, TestThrowsExceptionAttribute, which can now accept an optional parameter for a string which should be contained within the exception message.
Fixed a bug where a test method with an attribute-based expected exception would not count towards the success total if the exception was encountered as expected.
Fixed a bug where NOT throwing an exception when we were expecting one would count as a success.
Added an internal property bDoNotLogTestFailsAsError which we can set to true to suppress logging of UAT errors when a test fails (but still count them in our failure results), to allow us to deliberately cause test failures to test the test framework!
Added a suite of unit tests for the test framework itself, in TestRunner.Automation.Tests.cs.
Change 3185411 on 2016/11/03 by Richard.Fawcett
Allow Rocket_PromoteBuild changelist to be overridden by a changelist read from a file.
Change 3184843 on 2016/11/03 by Richard.Fawcett
Ensure catalog file synced during user content generation is always the latest one.
Change 3184752 on 2016/11/03 by Richard.Fawcett
Ensure we log reading changelist from specified file.
Change 3184744 on 2016/11/03 by Richard.Fawcett
Ensure directory is created for Changelist file if it doesn't already exist.
Change 3184738 on 2016/11/03 by Richard.Fawcett
Ensure we use latest CL from all of Perforce when generating build versions for user content
Because of the nature of the build farm, where separate parts of the job are executed on different build agents at different times, this changelist is serialized to the filesystem during execution of a node dedicated to this task, and then made available to all future nodes, so that they're working with a consistent build version. In the case of an execution where we're updating Perforce with new content, this calculation of the changelist occurs AFTER we've updated Perforce with the new content.
Have also optimized the build graph scripts to enable Mac and Windows user generated content to execute simultaneously.
#jira OPP-6274
Change 3181456 on 2016/11/01 by Andrew.Brown
SExpandable area has been modified as the Portal settings mocks weren't able to be achieved with default functionality.
Added BodyBorderImage arguement and BodyBorderBackgroundColor attribute so we can specify a different brush/color to use for the expanded area compared with the title area. Additional care was made to ensure that rounded corners still appear correctly if the developer doesn't want to specify a different look to the body.
Added AreaTitlePadding attribute, to be able to specify padding between the expand/collapse icon and the header content.
Added MinWidth arguement, to ensure that the areas meet a minimum width requirement.
Change 3181285 on 2016/11/01 by Richard.Fawcett
Ensure user content generated using latest changelist submitted to Perforce, rather than using portal's latest changelist
#jira OPP-6274
Change 3177758 on 2016/10/28 by Leigh.Swift
#jira OPP-6247: Portal needs Social Plugin integration v1.2
Copying //Portal/Dev-Social to Dev-Main (//Portal/Dev-Main)
Change 3175889 on 2016/10/26 by Wes.Fudala
Web browser tooltips will no longer continue to appear when the mouse leaves the browser window.
#jira: OPP-5895 The Mouseover info in Recent Additions (Marketplace) anchors itself to the mouse pointer over other Browser windows
rb: Justin.Sargent
Change 3171388 on 2016/10/22 by Leigh.Swift
#jira OPP-6343: Launcher crashes patching from 2.12.13 Main to 2.12.13 Release-Live
BPS: FBuildPatchAppManifest needs to listen for FCoreDelegates::OnPreExit in order to clean up references to it's UObject which is about to be destroyed.
Change 3170373 on 2016/10/21 by Leigh.Swift
#jira: OPP-6340: Portal builds fail on audit nodes.
Reducing platform regex to only match pre-defined possibilities.
[CL 3219291 by Justin Sargent in Main branch]
2016-12-02 13:27:02 -05:00
|
|
|
Result.Append(*GetBindingName(Param));
|
2016-09-23 17:31:51 -04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Result.Append(TEXT(")"));
|
|
|
|
|
Result.Append(TEXT(" {return window.ue.$.executeMethod(this.$id, arguments)}"));
|
|
|
|
|
}
|
|
|
|
|
Result.Append(TEXT("},{"));
|
|
|
|
|
Result.Append(TEXT("$id: {writable: false, configurable:false, enumerable: false, value: '"));
|
|
|
|
|
Result.Append(*PtrToGuid(Object).ToString(EGuidFormats::Digits));
|
|
|
|
|
Result.Append(TEXT("'}})})()"));
|
|
|
|
|
return Result;
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-05 04:55:55 -04:00
|
|
|
void FMobileJSScripting::InvokeJSFunction(FGuid FunctionId, int32 ArgCount, FWebJSParam Arguments[], bool bIsError)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
2018-09-05 04:55:55 -04:00
|
|
|
TSharedPtr<IWebBrowserWindow> Window = WindowPtr.Pin();
|
2016-09-23 17:31:51 -04:00
|
|
|
if (Window.IsValid())
|
|
|
|
|
{
|
|
|
|
|
FString CallbackScript = FString::Printf(TEXT("window.ue.$.invokeCallback('%s', %s, "), *FunctionId.ToString(EGuidFormats::Digits), (bIsError)?TEXT("true"):TEXT("false"));
|
|
|
|
|
{
|
|
|
|
|
TArray<uint8> Buffer;
|
|
|
|
|
FMemoryWriter MemoryWriter(Buffer);
|
|
|
|
|
FJsonWriterRef JsonWriter = TJsonWriter<>::Create(&MemoryWriter);
|
|
|
|
|
JsonWriter->WriteArrayStart();
|
|
|
|
|
for(int i=0; i<ArgCount; i++)
|
|
|
|
|
{
|
|
|
|
|
WriteJsParam(SharedThis(this), JsonWriter, i, Arguments[i]);
|
|
|
|
|
}
|
|
|
|
|
JsonWriter->WriteArrayEnd();
|
|
|
|
|
CallbackScript.Append((TCHAR*)Buffer.GetData(), Buffer.Num()/sizeof(TCHAR));
|
|
|
|
|
}
|
|
|
|
|
CallbackScript.Append(TEXT(")"));
|
|
|
|
|
Window->ExecuteJavascript(CallbackScript);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-05 04:55:55 -04:00
|
|
|
void FMobileJSScripting::InvokeJSFunctionRaw(FGuid FunctionId, const FString& RawJSValue, bool bIsError)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
2018-09-05 04:55:55 -04:00
|
|
|
TSharedPtr<IWebBrowserWindow> Window = WindowPtr.Pin();
|
2016-09-23 17:31:51 -04:00
|
|
|
if (Window.IsValid())
|
|
|
|
|
{
|
|
|
|
|
FString CallbackScript = FString::Printf(TEXT("window.ue.$.invokeCallback('%s', %s, [%s])"),
|
|
|
|
|
*FunctionId.ToString(EGuidFormats::Digits), (bIsError)?TEXT("true"):TEXT("false"), *RawJSValue);
|
|
|
|
|
Window->ExecuteJavascript(CallbackScript);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-05 04:55:55 -04:00
|
|
|
void FMobileJSScripting::InvokeJSErrorResult(FGuid FunctionId, const FString& Error)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
|
|
|
|
FWebJSParam Args[1] = {FWebJSParam(Error)};
|
|
|
|
|
InvokeJSFunction(FunctionId, 1, Args, true);
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-05 04:55:55 -04:00
|
|
|
bool FMobileJSScripting::HandleExecuteUObjectMethodMessage(const TArray<FString>& MessageArgs)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
|
|
|
|
if (MessageArgs.Num() != 4)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
FGuid ObjectKey;
|
|
|
|
|
if (!FGuid::Parse(MessageArgs[0], ObjectKey))
|
|
|
|
|
{
|
|
|
|
|
// Invalid GUID
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
// Get the promise callback and use that to report any results from executing this function.
|
|
|
|
|
FGuid ResultCallbackId;
|
|
|
|
|
if (!FGuid::Parse(MessageArgs[1], ResultCallbackId))
|
|
|
|
|
{
|
|
|
|
|
// Invalid GUID
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
UObject* Object = GuidToPtr(ObjectKey);
|
|
|
|
|
if (Object == nullptr)
|
|
|
|
|
{
|
|
|
|
|
// Unknown uobject id
|
|
|
|
|
InvokeJSErrorResult(ResultCallbackId, TEXT("Unknown UObject ID"));
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
FName MethodName = FName(*MessageArgs[2]);
|
|
|
|
|
UFunction* Function = Object->FindFunction(MethodName);
|
|
|
|
|
if (!Function)
|
|
|
|
|
{
|
|
|
|
|
InvokeJSErrorResult(ResultCallbackId, TEXT("Unknown UObject Function"));
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Coerce arguments to function arguments.
|
|
|
|
|
uint16 ParamsSize = Function->ParmsSize;
|
|
|
|
|
TArray<uint8> Params;
|
2019-12-13 11:07:03 -05:00
|
|
|
FProperty* ReturnParam = nullptr;
|
|
|
|
|
FProperty* PromiseParam = nullptr;
|
2016-09-23 17:31:51 -04:00
|
|
|
|
|
|
|
|
if (ParamsSize > 0)
|
|
|
|
|
{
|
|
|
|
|
// Find return parameter and a promise argument if present, as we need to handle them differently
|
2019-12-13 11:07:03 -05:00
|
|
|
for ( TFieldIterator<FProperty> It(Function); It; ++It )
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
2019-12-13 11:07:03 -05:00
|
|
|
FProperty* Param = *It;
|
2016-09-23 17:31:51 -04:00
|
|
|
if (Param->PropertyFlags & CPF_Parm)
|
|
|
|
|
{
|
|
|
|
|
if (Param->PropertyFlags & CPF_ReturnParm)
|
|
|
|
|
{
|
|
|
|
|
ReturnParam = Param;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2019-12-13 11:07:03 -05:00
|
|
|
FStructProperty *StructProperty = CastField<FStructProperty>(Param);
|
2016-09-23 17:31:51 -04:00
|
|
|
if (StructProperty && StructProperty->Struct->IsChildOf(FWebJSResponse::StaticStruct()))
|
|
|
|
|
{
|
|
|
|
|
PromiseParam = Param;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (ReturnParam && PromiseParam)
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// UFunction is a subclass of UStruct, so we can treat the arguments as a struct for deserialization
|
2019-09-10 11:35:20 -04:00
|
|
|
Params.AddUninitialized(Function->GetStructureSize());
|
2016-09-23 17:31:51 -04:00
|
|
|
Function->InitializeStruct(Params.GetData());
|
|
|
|
|
|
2018-09-05 04:55:55 -04:00
|
|
|
FMobileJSStructDeserializerBackend Backend = FMobileJSStructDeserializerBackend(SharedThis(this), MessageArgs[3]);
|
2016-09-23 17:31:51 -04:00
|
|
|
FStructDeserializer::Deserialize(Params.GetData(), *Function, Backend);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (PromiseParam)
|
|
|
|
|
{
|
|
|
|
|
FWebJSResponse* PromisePtr = PromiseParam->ContainerPtrToValuePtr<FWebJSResponse>(Params.GetData());
|
|
|
|
|
if (PromisePtr)
|
|
|
|
|
{
|
|
|
|
|
*PromisePtr = FWebJSResponse(SharedThis(this), ResultCallbackId);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Object->ProcessEvent(Function, Params.GetData());
|
|
|
|
|
if ( ! PromiseParam ) // If PromiseParam is set, we assume that the UFunction will ensure it is called with the result
|
|
|
|
|
{
|
|
|
|
|
if ( ReturnParam )
|
|
|
|
|
{
|
|
|
|
|
FStructSerializerPolicies ReturnPolicies;
|
2019-12-13 11:07:03 -05:00
|
|
|
ReturnPolicies.PropertyFilter = [&](const FProperty* CandidateProperty, const FProperty* ParentProperty)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
|
|
|
|
return ParentProperty != nullptr || CandidateProperty == ReturnParam;
|
|
|
|
|
};
|
2018-09-05 04:55:55 -04:00
|
|
|
FMobileJSStructSerializerBackend ReturnBackend = FMobileJSStructSerializerBackend(SharedThis(this));
|
2016-09-23 17:31:51 -04:00
|
|
|
FStructSerializer::Serialize(Params.GetData(), *Function, ReturnBackend, ReturnPolicies);
|
|
|
|
|
|
|
|
|
|
// Extract the result value from the serialized JSON object:
|
|
|
|
|
FString ResultJS = ReturnBackend.ToString();
|
2018-10-11 11:23:55 -04:00
|
|
|
/*
|
2016-09-23 17:31:51 -04:00
|
|
|
ResultJS.Append(TEXT("['"));
|
Copying //UE4/Portal-Staging to //UE4/Dev-Main (Source: //Portal/Main @ 3216504)
#lockdown Nick.Penwarden
#rb no one
==========================
MAJOR FEATURES + CHANGES
==========================
Change 3216141 on 2016/11/30 by Justin.Sargent
Completed first ready to use pass of the new AutomationDriver module and new Spec test type.
Change 3213288 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Removing deprecation of IWebBrowserSingleton::SetJSBindingToLoweringEnabled for now.
Change 3212796 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Added SetJSBindingToLoweringEnabled to IWebBrowserSingleton so that the to-lowering of binding names can be disabled.
Deprecated SetJSBindingToLoweringEnabled since 4.15. In future the to-lowering will always occurr.
Adding GetBindingName helper to FWebJSScripting, which returns a to-lowered name for a UField, unless disabled.
Updated all current binding code to use GetBindingName when building from UObjects/UStructs. This affects Windows, Mac, Linux, and Android.
Portal currently disables to-lowering unless a commandline -LowercaseJS is provided.
Change 3200370 on 2016/11/16 by Richard.Fawcett
Ensure we always get the latest version of the user content catalog when promoting marketplace items.
Change 3192974 on 2016/11/10 by Leigh.Swift
#jira OPP-6365: Crash during shutdown if a manifest is still being downloaded
This is because of the OnPreExit core delegate being used to null out the Data uobject member on a manifest, also being the only sensible way to ensure threads complete in a safe and clean manner.
Refactoring BuildPatchServices manifest class to not permanently hold any UObject and simply just use one while serialising.
This removes the reliance on the OnPreExit delegate from manifest class, making it generally safer behaviour for shutdown.
Change 3187028 on 2016/11/04 by Leigh.Swift
PortalPublishingTool: Adding UE_Main app to UnrealEngine project
Change 3186788 on 2016/11/04 by Richard.Fawcett
Change C# wrapper for BuildPatchTool patch generation to prevent clobbering manifest files by default, unless we specifically pass in an optional flag to allow this.
#jira OPP-6355
Change 3186779 on 2016/11/04 by Richard.Fawcett
Add support to automation tool testing framework for the following assertions:
Assert.AreNotEqual(a, b, optionalFailureMessage)
Assert.ThrowsError(actionToCarryOut, expectedExceptionType, optionalExceptionMessageContainsString)
Moved attribute-based expected exception declarations to their own attribute, TestThrowsExceptionAttribute, which can now accept an optional parameter for a string which should be contained within the exception message.
Fixed a bug where a test method with an attribute-based expected exception would not count towards the success total if the exception was encountered as expected.
Fixed a bug where NOT throwing an exception when we were expecting one would count as a success.
Added an internal property bDoNotLogTestFailsAsError which we can set to true to suppress logging of UAT errors when a test fails (but still count them in our failure results), to allow us to deliberately cause test failures to test the test framework!
Added a suite of unit tests for the test framework itself, in TestRunner.Automation.Tests.cs.
Change 3185411 on 2016/11/03 by Richard.Fawcett
Allow Rocket_PromoteBuild changelist to be overridden by a changelist read from a file.
Change 3184843 on 2016/11/03 by Richard.Fawcett
Ensure catalog file synced during user content generation is always the latest one.
Change 3184752 on 2016/11/03 by Richard.Fawcett
Ensure we log reading changelist from specified file.
Change 3184744 on 2016/11/03 by Richard.Fawcett
Ensure directory is created for Changelist file if it doesn't already exist.
Change 3184738 on 2016/11/03 by Richard.Fawcett
Ensure we use latest CL from all of Perforce when generating build versions for user content
Because of the nature of the build farm, where separate parts of the job are executed on different build agents at different times, this changelist is serialized to the filesystem during execution of a node dedicated to this task, and then made available to all future nodes, so that they're working with a consistent build version. In the case of an execution where we're updating Perforce with new content, this calculation of the changelist occurs AFTER we've updated Perforce with the new content.
Have also optimized the build graph scripts to enable Mac and Windows user generated content to execute simultaneously.
#jira OPP-6274
Change 3181456 on 2016/11/01 by Andrew.Brown
SExpandable area has been modified as the Portal settings mocks weren't able to be achieved with default functionality.
Added BodyBorderImage arguement and BodyBorderBackgroundColor attribute so we can specify a different brush/color to use for the expanded area compared with the title area. Additional care was made to ensure that rounded corners still appear correctly if the developer doesn't want to specify a different look to the body.
Added AreaTitlePadding attribute, to be able to specify padding between the expand/collapse icon and the header content.
Added MinWidth arguement, to ensure that the areas meet a minimum width requirement.
Change 3181285 on 2016/11/01 by Richard.Fawcett
Ensure user content generated using latest changelist submitted to Perforce, rather than using portal's latest changelist
#jira OPP-6274
Change 3177758 on 2016/10/28 by Leigh.Swift
#jira OPP-6247: Portal needs Social Plugin integration v1.2
Copying //Portal/Dev-Social to Dev-Main (//Portal/Dev-Main)
Change 3175889 on 2016/10/26 by Wes.Fudala
Web browser tooltips will no longer continue to appear when the mouse leaves the browser window.
#jira: OPP-5895 The Mouseover info in Recent Additions (Marketplace) anchors itself to the mouse pointer over other Browser windows
rb: Justin.Sargent
Change 3171388 on 2016/10/22 by Leigh.Swift
#jira OPP-6343: Launcher crashes patching from 2.12.13 Main to 2.12.13 Release-Live
BPS: FBuildPatchAppManifest needs to listen for FCoreDelegates::OnPreExit in order to clean up references to it's UObject which is about to be destroyed.
Change 3170373 on 2016/10/21 by Leigh.Swift
#jira: OPP-6340: Portal builds fail on audit nodes.
Reducing platform regex to only match pre-defined possibilities.
[CL 3219291 by Justin Sargent in Main branch]
2016-12-02 13:27:02 -05:00
|
|
|
ResultJS.Append(GetBindingName(ReturnParam).ReplaceCharWithEscapedChar());
|
2016-09-23 17:31:51 -04:00
|
|
|
ResultJS.Append(TEXT("']"));
|
2018-10-11 11:23:55 -04:00
|
|
|
*/
|
2016-09-23 17:31:51 -04:00
|
|
|
InvokeJSFunctionRaw(ResultCallbackId, ResultJS, false);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
InvokeJSFunction(ResultCallbackId, 0, nullptr, false);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-25 10:11:35 -04:00
|
|
|
void FMobileJSScripting::InitializeScript(TSharedRef<class IWebBrowserWindow> InWindow)
|
|
|
|
|
{
|
|
|
|
|
WindowPtr = InWindow;
|
|
|
|
|
|
|
|
|
|
FString Script = ScriptingInit;
|
|
|
|
|
|
|
|
|
|
FIntPoint Viewport = InWindow->GetViewportSize();
|
|
|
|
|
int32 ScreenWidth = Viewport.X;
|
|
|
|
|
int32 ScreenHeight = Viewport.Y;
|
|
|
|
|
#if PLATFORM_ANDROID
|
|
|
|
|
if (FString* ScreenWidthVar = FAndroidMisc::GetConfigRulesVariable(TEXT("ScreenWidth")))
|
|
|
|
|
{
|
|
|
|
|
ScreenWidth = FCString::Atoi(**ScreenWidthVar);
|
|
|
|
|
}
|
|
|
|
|
if (FString* ScreenHeightVar = FAndroidMisc::GetConfigRulesVariable(TEXT("ScreenHeight")))
|
|
|
|
|
{
|
|
|
|
|
ScreenHeight = FCString::Atoi(**ScreenHeightVar);
|
|
|
|
|
}
|
|
|
|
|
Script.Append(TEXT("window.uePlatform = \"Android\";\n"));
|
|
|
|
|
#endif
|
|
|
|
|
#if PLATFORM_IOS
|
|
|
|
|
Script.Append(TEXT("window.uePlatform = \"iOS\";\n"));
|
|
|
|
|
#endif
|
|
|
|
|
Script.Append(*FString::Printf(TEXT(
|
|
|
|
|
"window.ueDeviceWidth = %d;\n"
|
|
|
|
|
"window.ueDeviceHeight= %d;\n"
|
|
|
|
|
"window.ueWindowWidth = %d;\n"
|
|
|
|
|
"window.ueWindowHeight = %d;\n"),
|
|
|
|
|
ScreenWidth, ScreenHeight,
|
|
|
|
|
Viewport.X, Viewport.Y));
|
|
|
|
|
Script.Append(ScriptingPostInit);
|
|
|
|
|
InWindow->ExecuteJavascript(Script);
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-05 04:55:55 -04:00
|
|
|
void FMobileJSScripting::PageLoaded(TSharedRef<class IWebBrowserWindow> InWindow)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
|
|
|
|
WindowPtr = InWindow;
|
|
|
|
|
|
|
|
|
|
// Expunge temporary objects.
|
2023-05-16 10:52:49 -04:00
|
|
|
for (TMap<TObjectPtr<UObject>, ObjectBinding>::TIterator It(BoundObjects); It; ++It)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
|
|
|
|
if (!It->Value.bIsPermanent)
|
|
|
|
|
{
|
|
|
|
|
It.RemoveCurrent();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-25 10:11:35 -04:00
|
|
|
InitializeScript(InWindow);
|
|
|
|
|
FString Script;
|
|
|
|
|
for (auto& Item : PermanentUObjectsByName)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
|
|
|
|
Script.Append(*FString::Printf(TEXT("window.ue['%s'] = %s;"), *Item.Key.ReplaceCharWithEscapedChar(), *ConvertObject(Item.Value)));
|
|
|
|
|
}
|
|
|
|
|
InWindow->ExecuteJavascript(Script);
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-05 07:29:26 -04:00
|
|
|
FMobileJSScripting::FMobileJSScripting(bool bJSBindingToLoweringEnabled)
|
Copying //UE4/Portal-Staging to //UE4/Dev-Main (Source: //Portal/Main @ 3216504)
#lockdown Nick.Penwarden
#rb no one
==========================
MAJOR FEATURES + CHANGES
==========================
Change 3216141 on 2016/11/30 by Justin.Sargent
Completed first ready to use pass of the new AutomationDriver module and new Spec test type.
Change 3213288 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Removing deprecation of IWebBrowserSingleton::SetJSBindingToLoweringEnabled for now.
Change 3212796 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Added SetJSBindingToLoweringEnabled to IWebBrowserSingleton so that the to-lowering of binding names can be disabled.
Deprecated SetJSBindingToLoweringEnabled since 4.15. In future the to-lowering will always occurr.
Adding GetBindingName helper to FWebJSScripting, which returns a to-lowered name for a UField, unless disabled.
Updated all current binding code to use GetBindingName when building from UObjects/UStructs. This affects Windows, Mac, Linux, and Android.
Portal currently disables to-lowering unless a commandline -LowercaseJS is provided.
Change 3200370 on 2016/11/16 by Richard.Fawcett
Ensure we always get the latest version of the user content catalog when promoting marketplace items.
Change 3192974 on 2016/11/10 by Leigh.Swift
#jira OPP-6365: Crash during shutdown if a manifest is still being downloaded
This is because of the OnPreExit core delegate being used to null out the Data uobject member on a manifest, also being the only sensible way to ensure threads complete in a safe and clean manner.
Refactoring BuildPatchServices manifest class to not permanently hold any UObject and simply just use one while serialising.
This removes the reliance on the OnPreExit delegate from manifest class, making it generally safer behaviour for shutdown.
Change 3187028 on 2016/11/04 by Leigh.Swift
PortalPublishingTool: Adding UE_Main app to UnrealEngine project
Change 3186788 on 2016/11/04 by Richard.Fawcett
Change C# wrapper for BuildPatchTool patch generation to prevent clobbering manifest files by default, unless we specifically pass in an optional flag to allow this.
#jira OPP-6355
Change 3186779 on 2016/11/04 by Richard.Fawcett
Add support to automation tool testing framework for the following assertions:
Assert.AreNotEqual(a, b, optionalFailureMessage)
Assert.ThrowsError(actionToCarryOut, expectedExceptionType, optionalExceptionMessageContainsString)
Moved attribute-based expected exception declarations to their own attribute, TestThrowsExceptionAttribute, which can now accept an optional parameter for a string which should be contained within the exception message.
Fixed a bug where a test method with an attribute-based expected exception would not count towards the success total if the exception was encountered as expected.
Fixed a bug where NOT throwing an exception when we were expecting one would count as a success.
Added an internal property bDoNotLogTestFailsAsError which we can set to true to suppress logging of UAT errors when a test fails (but still count them in our failure results), to allow us to deliberately cause test failures to test the test framework!
Added a suite of unit tests for the test framework itself, in TestRunner.Automation.Tests.cs.
Change 3185411 on 2016/11/03 by Richard.Fawcett
Allow Rocket_PromoteBuild changelist to be overridden by a changelist read from a file.
Change 3184843 on 2016/11/03 by Richard.Fawcett
Ensure catalog file synced during user content generation is always the latest one.
Change 3184752 on 2016/11/03 by Richard.Fawcett
Ensure we log reading changelist from specified file.
Change 3184744 on 2016/11/03 by Richard.Fawcett
Ensure directory is created for Changelist file if it doesn't already exist.
Change 3184738 on 2016/11/03 by Richard.Fawcett
Ensure we use latest CL from all of Perforce when generating build versions for user content
Because of the nature of the build farm, where separate parts of the job are executed on different build agents at different times, this changelist is serialized to the filesystem during execution of a node dedicated to this task, and then made available to all future nodes, so that they're working with a consistent build version. In the case of an execution where we're updating Perforce with new content, this calculation of the changelist occurs AFTER we've updated Perforce with the new content.
Have also optimized the build graph scripts to enable Mac and Windows user generated content to execute simultaneously.
#jira OPP-6274
Change 3181456 on 2016/11/01 by Andrew.Brown
SExpandable area has been modified as the Portal settings mocks weren't able to be achieved with default functionality.
Added BodyBorderImage arguement and BodyBorderBackgroundColor attribute so we can specify a different brush/color to use for the expanded area compared with the title area. Additional care was made to ensure that rounded corners still appear correctly if the developer doesn't want to specify a different look to the body.
Added AreaTitlePadding attribute, to be able to specify padding between the expand/collapse icon and the header content.
Added MinWidth arguement, to ensure that the areas meet a minimum width requirement.
Change 3181285 on 2016/11/01 by Richard.Fawcett
Ensure user content generated using latest changelist submitted to Perforce, rather than using portal's latest changelist
#jira OPP-6274
Change 3177758 on 2016/10/28 by Leigh.Swift
#jira OPP-6247: Portal needs Social Plugin integration v1.2
Copying //Portal/Dev-Social to Dev-Main (//Portal/Dev-Main)
Change 3175889 on 2016/10/26 by Wes.Fudala
Web browser tooltips will no longer continue to appear when the mouse leaves the browser window.
#jira: OPP-5895 The Mouseover info in Recent Additions (Marketplace) anchors itself to the mouse pointer over other Browser windows
rb: Justin.Sargent
Change 3171388 on 2016/10/22 by Leigh.Swift
#jira OPP-6343: Launcher crashes patching from 2.12.13 Main to 2.12.13 Release-Live
BPS: FBuildPatchAppManifest needs to listen for FCoreDelegates::OnPreExit in order to clean up references to it's UObject which is about to be destroyed.
Change 3170373 on 2016/10/21 by Leigh.Swift
#jira: OPP-6340: Portal builds fail on audit nodes.
Reducing platform regex to only match pre-defined possibilities.
[CL 3219291 by Justin Sargent in Main branch]
2016-12-02 13:27:02 -05:00
|
|
|
: FWebJSScripting(bJSBindingToLoweringEnabled)
|
2018-10-05 07:29:26 -04:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMobileJSScripting::SetWindow(TSharedRef<class IWebBrowserWindow> InWindow)
|
2016-09-23 17:31:51 -04:00
|
|
|
{
|
2018-09-25 10:11:35 -04:00
|
|
|
WindowPtr = InWindow;
|
2016-09-23 17:31:51 -04:00
|
|
|
}
|
2018-06-26 08:42:47 -04:00
|
|
|
|
2023-05-16 10:52:49 -04:00
|
|
|
#endif // PLATFORM_ANDROID || PLATFORM_IOS
|