Skip to content

Commit 5d3270b

Browse files
Updated from pipeline, Version : 23.5.1
1 parent a8cc11c commit 5d3270b

File tree

11 files changed

+40
-98
lines changed

11 files changed

+40
-98
lines changed

.variables

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
export LEVEL=CRITICAL
22
export REPO_NAME=justice-unreal-sdk-plugin
3-
export WORKDIR=/tmp/pipelines/4674800454/934782948/
4-
export COMMIT_HASH=0a02b07641c8d8ef8d81c1de001e3a40ee481f05
5-
export GIT_HASH=0a02b07641c8d8ef8d81c1de001e3a40ee481f05
6-
export VERSION=23.5.0
7-
export REVISION_ID=23.5.0
3+
export WORKDIR=/tmp/pipelines/4694888083/937992268/
4+
export COMMIT_HASH=c70bcde039015a4603ca597ae2617a9dffec6c0d
5+
export GIT_HASH=c70bcde039015a4603ca597ae2617a9dffec6c0d
6+
export VERSION=23.5.1
7+
export REVISION_ID=23.5.1
88
9-
export COMMIT_MESSAGE_BASE64='Y2hvcmUocmVsZWFzZSk6IDIzLjUuMCAtIGNvbW1pdGVkIGFuZCB0YWdnZWQgYnkgSmVua2lucwo='
9+
export COMMIT_MESSAGE_BASE64='Y2hvcmUocmVsZWFzZSk6IDIzLjUuMSAtIGNvbW1pdGVkIGFuZCB0YWdnZWQgYnkgSmVua2lucwo='

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
### [23.5.1](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/branches/compare/23.5.1%0D23.5.0) (2023-07-20)
6+
7+
8+
### Bug Fixes
9+
10+
* **AMS:** launch param cannot be read properly ([786170e](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/786170e5e05e64512c92d8b39f130a3b7aff5393))
11+
* **chatV2:** update websocket chat session id after connected ([c83f2c2](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/c83f2c2eb4e822bd54a3db5bff8c2f4f781c6933))
12+
* removed oculus iap sync API function due to incompatibility with AB service. ([10e5529](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/10e5529100166be7e62c24b7b69227a9fe477e07))
13+
514
## [23.5.0](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/branches/compare/23.5.0%0D23.4.2) (2023-07-17)
615

716

Source/AccelByteUe4Sdk/Private/AccelByteUe4SdkModule.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ void FAccelByteUe4SdkModule::StartupModule()
9090
AccelByte::FRegistry::ServerCredentials.Startup();
9191

9292
#if UE_SERVER
93-
if (!FParse::Param(FCommandLine::Get(), TEXT("dsid")))
93+
FString ServerID;
94+
FParse::Value(FCommandLine::Get(), TEXT("dsid="), ServerID);
95+
if (ServerID.IsEmpty())
9496
{
9597
UE_LOG(LogAccelByte, Warning, TEXT("dsid not provided, not connecting to AMS"));
9698
}

Source/AccelByteUe4Sdk/Private/Api/AccelByteChatApi.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,9 @@ namespace AccelByte
426426
}
427427

428428
TMap<FString, FString> Headers;
429-
Headers.Add("X-Ab-ChatSessionID", ChatSessionId.SessionID);
430-
Headers.Add("X-Ab-RpcEnvelopeStart", WsEnvelopeStart);
431-
Headers.Add("X-Ab-RpcEnvelopeEnd", WsEnvelopeEnd);
429+
Headers.Add(ChatSessionHeaderName, ChatSessionId.SessionID);
430+
Headers.Add(TEXT("X-Ab-RpcEnvelopeStart"), WsEnvelopeStart);
431+
Headers.Add(TEXT("X-Ab-RpcEnvelopeEnd"), WsEnvelopeEnd);
432432
FModuleManager::Get().LoadModuleChecked(FName(TEXT("WebSockets")));
433433
WebSocket = AccelByteWebSocket::Create(*SettingsRef.ChatServerWsUrl, TEXT("wss"), CredentialsRef, Headers, TSharedRef<IWebSocketFactory>(new FUnrealWebSocketFactory()), PingDelay, InitialBackoffDelay, MaxBackoffDelay, TotalTimeout);
434434

@@ -770,7 +770,10 @@ namespace AccelByte
770770
{
771771
TSharedPtr<FJsonObject> Result = MessageAsJsonObj->GetObjectField(ChatToken::Json::Field::Params);
772772
const bool bSuccess = FJsonObjectConverter::JsonObjectToUStruct(Result.ToSharedRef(), &ChatSessionId, 0, 0);
773-
773+
if (bSuccess)
774+
{
775+
WebSocket->UpdateUpgradeHeaders(ChatSessionHeaderName, ChatSessionId.SessionID);
776+
}
774777
break;
775778
}
776779
case(HandleType::Disconnect):

Source/AccelByteUe4Sdk/Private/Api/AccelByteEntitlementApi.cpp

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -841,31 +841,7 @@ void Entitlement::SellUserEntitlement(FString const& EntitlementId
841841
FJsonSerializer::Serialize(Json.ToSharedRef(), Writer);
842842

843843
HttpClient.ApiRequest(TEXT("PUT"), Url, {}, Content, OnSuccess, OnError);
844-
}
845-
846-
void Entitlement::SyncOculusConsumableEntitlements(THandler<TArray<FAccelByteModelsSyncOculusConsumableEntitlementInfo>> const& OnSuccess
847-
, FErrorHandler const& OnError)
848-
{
849-
FReport::Log(FString(__FUNCTION__));
850-
const FString Url = FString::Printf(TEXT("%s/public/namespaces/%s/users/%s/iap/oculus/sync")
851-
, *SettingsRef.PlatformServerUrl
852-
, *CredentialsRef.GetNamespace()
853-
, *CredentialsRef.GetUserId());
854-
855-
HttpClient.ApiRequest(TEXT("PUT"), Url, {}, OnSuccess, OnError);
856-
}
857-
858-
void Entitlement::SyncOculusDLC(FVoidHandler const& OnSuccess
859-
, FErrorHandler const& OnError)
860-
{
861-
FReport::Log(FString(__FUNCTION__));
862-
const FString Url = FString::Printf(TEXT("%s/public/namespaces/%s/users/%s/dlc/oculus/sync")
863-
, *SettingsRef.PlatformServerUrl
864-
, *CredentialsRef.GetNamespace()
865-
, *CredentialsRef.GetUserId());
866-
867-
HttpClient.ApiRequest(TEXT("PUT"), Url, {}, OnSuccess, OnError);
868-
}
844+
}
869845

870846
} // Namespace Api
871847
}

Source/AccelByteUe4Sdk/Private/Core/AccelByteServerSettings.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,13 @@ void ServerSettings::LoadSettings(const FString& SectionPath)
9393
QosPingTimeout = .6;
9494
}
9595

96-
FParse::Value(FCommandLine::Get(), TEXT("dsid"), DSId);
97-
98-
if (!FParse::Value(FCommandLine::Get(), TEXT("watchdog_url"), AMSServerWatchdogUrl))
96+
FParse::Value(FCommandLine::Get(), TEXT("dsid="), DSId);
97+
if (!FParse::Value(FCommandLine::Get(), TEXT("watchdog_url="), AMSServerWatchdogUrl))
9998
{
10099
GConfig->GetString(*DefaultServerSection, TEXT("WatchdogUrl"), AMSServerWatchdogUrl, GEngineIni);
101100
}
102101

103-
if (!FParse::Value(FCommandLine::Get(), TEXT("heartbeat"), AMSHeartbeatInterval))
102+
if (!FParse::Value(FCommandLine::Get(), TEXT("heartbeat="), AMSHeartbeatInterval))
104103
{
105104
GConfig->GetInt(*DefaultServerSection, TEXT("AMSHeartbeatInterval"), AMSHeartbeatInterval, GEngineIni);
106105
}

Source/AccelByteUe4Sdk/Private/GameServerApi/AccelByteServerAMSApi.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,11 @@ void ServerAMS::SetOnConnectionClosed(const FConnectionClosed& OnConnectionClose
152152

153153
void ServerAMS::OnMessage(const FString& Message)
154154
{
155+
if (Message.IsEmpty())
156+
{
157+
return;
158+
}
159+
155160
UE_LOG(LogAccelByteAMS, Log, TEXT("New message received from AMS:\n%s"), *Message);
156161

157162
TSharedPtr<FJsonObject> MessageObject;
@@ -193,6 +198,8 @@ void ServerAMS::SendReadyMessage()
193198
}
194199

195200
FString ReadyMessage = FString::Format(TEXT("{\"ready\":{\"dsid\":\"{0}\"}}"), { ServerSettingsRef.DSId });
201+
202+
UE_LOG(LogAccelByteAMS, Log, TEXT("Send ready message to AMS\n%s"), *ReadyMessage);
196203
WebSocket->Send(ReadyMessage);
197204

198205
if (bHeartbeatJobStarted == false)

Source/AccelByteUe4Sdk/Public/Api/AccelByteChatApi.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ class ACCELBYTEUE4SDK_API Chat : public FApiBase
5050

5151
~Chat();
5252
private:
53+
const FString ChatSessionHeaderName = TEXT("X-Ab-ChatSessionID");
54+
5355
Credentials& ChatCredentialsRef;
5456
bool bBanNotifReceived = false;
5557

Source/AccelByteUe4Sdk/Public/Api/AccelByteEntitlementApi.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -431,24 +431,6 @@ class ACCELBYTEUE4SDK_API Entitlement : public FApiBase
431431
, THandler<FAccelByteModelsSellItemEntitlementInfo> const& OnSuccess
432432
, FErrorHandler const& OnError);
433433

434-
/**
435-
* @brief Synchronize Oculus Consumable Entitlement/IAP.
436-
*
437-
* @param OnSuccess This will be called when the operation succeeded.
438-
* @param OnError This will be called when the operation failed.
439-
*/
440-
void SyncOculusConsumableEntitlements(THandler<TArray<FAccelByteModelsSyncOculusConsumableEntitlementInfo>> const& OnSuccess
441-
, FErrorHandler const& OnError);
442-
443-
/**
444-
* @brief Synchronize Oculus Downloadable Content/DLC.
445-
*
446-
* @param OnSuccess This will be called when the operation succeeded.
447-
* @param OnError This will be called when the operation failed.
448-
*/
449-
void SyncOculusDLC(FVoidHandler const& OnSuccess
450-
, FErrorHandler const& OnError);
451-
452434
private:
453435
Entitlement() = delete;
454436
Entitlement(Entitlement const&) = delete;

Source/AccelByteUe4Sdk/Public/Models/AccelByteEcommerceModels.h

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -264,23 +264,6 @@ enum class EAccelByteSubscriptionSummarySubscribedBy : uint8
264264
PLATFORM
265265
};
266266

267-
UENUM(BlueprintType)
268-
enum class EAccelByteEntitlementItemIdentityType : uint8
269-
{
270-
NONE = 0,
271-
ITEM_ID,
272-
ITEM_SKU
273-
};
274-
275-
UENUM(BlueprintType)
276-
enum class EAccelByteEntitlementIAPOrderStatus : uint8
277-
{
278-
NONE = 0,
279-
VERIFIED,
280-
FULFILLED,
281-
FAILED
282-
};
283-
284267
#pragma endregion EnumField
285268

286269
#pragma region ItemModelsField
@@ -2534,25 +2517,4 @@ struct ACCELBYTEUE4SDK_API FAccelByteModelsSellItemEntitlementInfo
25342517

25352518
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Accelbyte | Entitlement | Models | SellItemEntitlementInfo ")
25362519
FAccelByteModelsEntitlementInfo EntitlementInfo{};
2537-
};
2538-
2539-
USTRUCT(BlueprintType)
2540-
struct ACCELBYTEUE4SDK_API FAccelByteModelsSyncOculusConsumableEntitlementInfo
2541-
{
2542-
GENERATED_BODY()
2543-
2544-
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Accelbyte | Entitlement | Models | SyncOculusConsumableEntitlementInfo ")
2545-
FString TransactionId{};
2546-
2547-
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Accelbyte | Entitlement | Models | SyncOculusConsumableEntitlementInfo ")
2548-
FString OculusItemSku{};
2549-
2550-
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Accelbyte | Entitlement | Models | SyncOculusConsumableEntitlementInfo ")
2551-
EAccelByteEntitlementItemIdentityType ItemIdentityType{EAccelByteEntitlementItemIdentityType::NONE};
2552-
2553-
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Accelbyte | Entitlement | Models | SyncOculusConsumableEntitlementInfo ")
2554-
FString ItemIdentity{};
2555-
2556-
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Accelbyte | Entitlement | Models | SyncOculusConsumableEntitlementInfo ")
2557-
EAccelByteEntitlementIAPOrderStatus IAPOrderStatus{EAccelByteEntitlementIAPOrderStatus::NONE};
2558-
};
2520+
};

0 commit comments

Comments
 (0)