mirrors/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-01-22 17:12:25 -05:00
Code Issues Projects Releases Packages Wiki Activity

Webclient: Add query parameter based on current time when downloading your own skin

Browse source 
This ensures that you'll always get a non-cached skin the first time the skin is downloaded in the session (although subsequent downloads in the same session may be cached). This should mostly address issues about changing your own skin not showing up in webclient - now instead of having to wait a few hours for non-cached skin to eventually get downloaded, just have to quit and open the webclient again
This commit is contained in:
UnknownShadow200 2021-11-29 22:10:49 +11:00
parent 5912f487c2
commit 2e4098c07b
4 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Entity.c
View file

@ -468,6 +468,7 @@ static void Entity_CheckSkin(struct Entity* e) {
struct Stream mem;
struct Bitmap bmp;
cc_string skin;
cc_uint8 flags;
cc_result res;
/* Don't check skin if don't have to */
@ -477,8 +478,10 @@ static void Entity_CheckSkin(struct Entity* e) {
if (!e->SkinFetchState) {
first = Entity_FirstOtherWithSameSkinAndFetchedSkin(e);
flags = e == &LocalPlayer_Instance ? HTTP_FLAG_NOCACHE : 0;
if (!first) {
e->_skinReqID = Http_AsyncGetSkin(&skin);
e->_skinReqID = Http_AsyncGetSkin(&skin, flags);
e->SkinFetchState = SKIN_FETCH_DOWNLOADING;
} else {
Entity_CopySkin(e, first);

3
src/Http.h
View file

@ -12,6 +12,7 @@ struct StringsBuffer;
#define URL_MAX_SIZE (STRING_SIZE * 2)
#define HTTP_FLAG_PRIORITY 0x01
#define HTTP_FLAG_NOCACHE 0x02
extern struct IGameComponent Http_Component;
@ -45,7 +46,7 @@ struct HttpRequest {
/* Aschronously performs a http GET request to download a skin. */
/* If url is a skin, downloads from there. (if not, downloads from SKIN_SERVER/[skinName].png) */
int Http_AsyncGetSkin(const cc_string* skinName);
int Http_AsyncGetSkin(const cc_string* skinName, cc_uint8 flags);
/* Asynchronously performs a http GET request. (e.g. to download data) */
int Http_AsyncGetData(const cc_string* url, cc_uint8 flags);
/* Asynchronously performs a http HEAD request. (e.g. to get Content-Length header) */

9
src/Http_Web.c
View file

@ -6,6 +6,7 @@
extern int interop_DownloadAsync(const char* url, int method, int reqID);
extern int interop_IsHttpsOnly(void);
static struct RequestList workingReqs, queuedReqs;
static cc_uint64 startTime;
/*########################################################################################################################*
@ -117,6 +118,13 @@ EMSCRIPTEN_KEEPALIVE void Http_OnFinishedAsync(int reqID, void* data, int len, i
/* Adds a req to the list of pending requests, waking up worker thread if needed */
static void HttpBackend_Add(struct HttpRequest* req, cc_uint8 flags) {
/* Add time based query string parameter to bypass browser cache */
if (flags & HTTP_FLAG_NOCACHE) {
cc_string url = String_FromRawArray(req->url);
int lo = (int)(startTime), hi = (int)(startTime >> 32);
String_Format2(&url, "?t=%i%i", &hi, &lo);
}
RequestList_Append(&queuedReqs, req, flags);
Http_StartNextDownload();
}
@ -129,6 +137,7 @@ static void Http_Init(void) {
Http_InitCommon();
/* If this webpage is https://, browsers deny any http:// downloading */
httpsOnly = interop_IsHttpsOnly();
startTime = DateTime_CurrentUTC_MS();
RequestList_Init(&queuedReqs);
RequestList_Init(&workingReqs);

4
src/_HttpBase.h
View file

@ -208,7 +208,7 @@ static void Http_CleanCacheTask(struct ScheduledTask* task) {
/*########################################################################################################################*
*----------------------------------------------------Http public api------------------------------------------------------*
*#########################################################################################################################*/
int Http_AsyncGetSkin(const cc_string* skinName) {
int Http_AsyncGetSkin(const cc_string* skinName, cc_uint8 flags) {
cc_string url; char urlBuffer[URL_MAX_SIZE];
String_InitArray(url, urlBuffer);
@ -217,7 +217,7 @@ int Http_AsyncGetSkin(const cc_string* skinName) {
} else {
String_Format2(&url, "%s/%s.png", &skinServer, skinName);
}
return Http_AsyncGetData(&url, 0);
return Http_AsyncGetData(&url, flags);
}
int Http_AsyncGetData(const cc_string* url, cc_uint8 flags) {