Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add timeout handling to dcc GetParts #3680

Merged
merged 1 commit into from
Nov 25, 2023
+29 −25
Merged

add timeout handling to dcc GetParts #3680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions nekoyume/Assets/_Scripts/Game/Character/CharacterAppearance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,8 @@ States.Instance.CurrentAvatarState is not null &&
isDcc = isVisible;
}

if (isDcc)
if (isDcc && await Dcc.instance.GetParts(id) is {} dccParts)
{
var dccParts = await Dcc.instance.GetParts(id);
// ignore full costume
SpineController.UnequipFullCostume(false);
UpdateArmor(armor, dccParts[DccPartsType.skin], true);
Expand Down
35 changes: 19 additions & 16 deletions nekoyume/Assets/_Scripts/Game/Dcc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ namespace Nekoyume.Game
public class Dcc : MonoSingleton<Dcc>
{
public static string DccVisible = "dcc_visible";
public const int TimeOut = 10;

public Dictionary<string, int> Avatars { get; private set; } = new();
public bool IsConnected { get; set; }
Expand Down Expand Up @@ -55,9 +56,9 @@ public void SetVisible(int value)

public async Task<Dictionary<DccPartsType, int>> GetParts(int dccId)
{
if (_parts.ContainsKey(dccId))
if (_parts.TryGetValue(dccId, out var parts))
{
return _parts[dccId];
return parts;
}

await StartCoroutine(RequestParts(dccId));
Expand All @@ -75,21 +76,23 @@ IEnumerator RequestParts(int dccId)
headerName,
headerValue,
(json) =>
{
var result = JsonSerializer.Deserialize<DccMetadata>(json);
dccParts.Add(DccPartsType.background, result.traits[0]);
dccParts.Add(DccPartsType.skin, result.traits[1]);
dccParts.Add(DccPartsType.face, result.traits[2]);
dccParts.Add(DccPartsType.ear_tail, result.traits[3]);
dccParts.Add(DccPartsType.ac_face, result.traits[4]);
dccParts.Add(DccPartsType.hair, result.traits[5]);
dccParts.Add(DccPartsType.ac_eye, result.traits[6]);
dccParts.Add(DccPartsType.ac_head, result.traits[7]);
if (!_parts.ContainsKey(dccId))
{
_parts.Add(dccId, dccParts);
}
}));
var result = JsonSerializer.Deserialize<DccMetadata>(json);
dccParts.Add(DccPartsType.background, result.traits[0]);
dccParts.Add(DccPartsType.skin, result.traits[1]);
dccParts.Add(DccPartsType.face, result.traits[2]);
dccParts.Add(DccPartsType.ear_tail, result.traits[3]);
dccParts.Add(DccPartsType.ac_face, result.traits[4]);
dccParts.Add(DccPartsType.hair, result.traits[5]);
dccParts.Add(DccPartsType.ac_eye, result.traits[6]);
dccParts.Add(DccPartsType.ac_head, result.traits[7]);
_parts.TryAdd(dccId, dccParts);
},
_ =>
{
_parts.TryAdd(dccId, null);
},
TimeOut));
}
}
}
7 changes: 4 additions & 3 deletions nekoyume/Assets/_Scripts/Game/Game.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1668,7 +1668,7 @@ private IEnumerator CoLogin(PlanetContext planetContext, Action<bool> callback)
Debug.Log("[Game] CoLogin()... WaitUntil introScreen.OnSocialSignedIn.");
yield return new WaitUntil(() => idToken is not null);
Debug.Log("[Game] CoLogin()... WaitUntil introScreen.OnSocialSignedIn. Done.");

// NOTE: Portal login flow.
dimmedLoadingScreen.Show(DimmedLoadingScreen.ContentType.WaitingForPortalAuthenticating);
Debug.Log("[Game] CoLogin()... WaitUntil PortalConnect.Send{Apple|Google}IdTokenAsync.");
Expand All @@ -1682,7 +1682,7 @@ private IEnumerator CoLogin(PlanetContext planetContext, Action<bool> callback)
Debug.Log($"[Game] CoLogin()... Portal signed in in {sw.ElapsedMilliseconds}ms.(elapsed)");
Debug.Log("[Game] CoLogin()... WaitUntil PortalConnect.Send{Apple|Google}IdTokenAsync. Done.");
dimmedLoadingScreen.Close();

agentAddrInPortal = portalSigninTask.Result;
}

Expand Down Expand Up @@ -1982,7 +1982,8 @@ private IEnumerator CoInitDccAvatar()
{
var responseData = DccAvatars.FromJson(json);
Dcc.instance.Init(responseData.Avatars);
});
},
timeOut: Dcc.TimeOut);
sw.Stop();
Debug.Log($"[Game] CoInitDccAvatar()... DCC Avatar initialized in {sw.ElapsedMilliseconds}ms.(elapsed)");
}
Expand Down
9 changes: 5 additions & 4 deletions nekoyume/Assets/_Scripts/UI/RequestManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ public IEnumerator GetJson(
string headerName,
string headerValue,
Action<string> onSuccess,
Action<UnityWebRequest> onFailed = null)
Action<UnityWebRequest> onFailed = null,
int timeOut = 0)
{
Debug.Log($"[RequestManager] GetJson: {url}, {headerName}, {headerValue}");
using var request = MakeRequestWithTimeout(url);
using var request = MakeRequestWithTimeout(url, timeOut);
request.SetRequestHeader(headerName, headerValue);
yield return request.SendWebRequest();
if (request.result == UnityWebRequest.Result.Success)
Expand All @@ -57,10 +58,10 @@ public IEnumerator GetJson(
}
}

private static UnityWebRequest MakeRequestWithTimeout(string url)
private static UnityWebRequest MakeRequestWithTimeout(string url, int timeOut = 0)
{
var request = UnityWebRequest.Get(url);
request.timeout = Timeout;
request.timeout = timeOut == 0 ? Timeout : timeOut;
return request;
}
}
Expand Down