AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-13 09:35:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Webclient: Fix saying '0 error when downloading texture pack

Browse Source
This commit is contained in:
UnknownShadow200 2020-12-15 00:12:19 +11:00
parent 0bd713b666
commit 8aeff27f5a
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Http.c
View File

@ -306,6 +306,7 @@ static void Http_SetRequestHeaders(struct HttpRequest* req) {
*#########################################################################################################################*/ *#########################################################################################################################*/
#ifdef CC_BUILD_WEB #ifdef CC_BUILD_WEB
#include <emscripten/emscripten.h> #include <emscripten/emscripten.h>
#include "Errors.h"
cc_bool Http_DescribeError(cc_result res, cc_string* dst) { return false; } cc_bool Http_DescribeError(cc_result res, cc_string* dst) { return false; }
/* web browsers do caching already, so don't need last modified/etags */ /* web browsers do caching already, so don't need last modified/etags */
@ -323,6 +324,9 @@ static void OnFinishedAsync(void* data, int len, int status) {
req->statusCode = status; req->statusCode = status;
req->contentLength = len; req->contentLength = len;
/* Usually because of denied by CORS */
if (!status) req->result = ERR_INVALID_ARGUMENT;
if (req->data) Platform_Log1("HTTP returned data: %i bytes", &req->size); if (req->data) Platform_Log1("HTTP returned data: %i bytes", &req->size);
Http_FinishRequest(req); Http_FinishRequest(req);
Http_WorkerSignal(); Http_WorkerSignal();
@ -331,7 +335,6 @@ static void OnFinishedAsync(void* data, int len, int status) {
static void Http_DownloadAsync(struct HttpRequest* req) { static void Http_DownloadAsync(struct HttpRequest* req) {
char urlBuffer[URL_MAX_SIZE]; cc_string url; char urlBuffer[URL_MAX_SIZE]; cc_string url;
char urlStr[NATIVE_STR_LEN]; char urlStr[NATIVE_STR_LEN];
const char* method = req->requestType == REQUEST_TYPE_HEAD ? "HEAD" : "GET";
String_InitArray(url, urlBuffer); String_InitArray(url, urlBuffer);
Http_BeginRequest(req, &url); Http_BeginRequest(req, &url);
@ -339,8 +342,8 @@ static void Http_DownloadAsync(struct HttpRequest* req) {
EM_ASM_({ EM_ASM_({
var url = UTF8ToString($0); var url = UTF8ToString($0);
var reqMethod = UTF8ToString($1); var reqMethod = $1 == 1 ? 'HEAD' : 'GET';
var onFinished = function(data, len, status) { var onFinished = function(data, len, status) {
Module['dynCall_viii']($2, data, len, status); Module['dynCall_viii']($2, data, len, status);
}; };
@ -356,15 +359,15 @@ static void Http_DownloadAsync(struct HttpRequest* req) {
var src = new Uint8Array(xhr.response); var src = new Uint8Array(xhr.response);
var len = src.byteLength; var len = src.byteLength;
var data = _malloc(len); var data = _malloc(len);
HEAPU8.set(src, _malloc(len)); HEAPU8.set(src, data);
onFinished(data, len || e.total, xhr.status); onFinished(data, len || e.total, xhr.status);
}; };
xhr.onerror = function(e) { onFinished(NULL, 0, xhr.status); }; xhr.onerror = function(e) { onFinished(0, 0, xhr.status); };
xhr.ontimeout = function(e) { onFinished(NULL, 0, xhr.status); }; xhr.ontimeout = function(e) { onFinished(0, 0, xhr.status); };
xhr.onprogress = function(e) { onProgress(e.loaded, e.total); }; xhr.onprogress = function(e) { onProgress(e.loaded, e.total); };
try { xhr.send(); } catch (e) { onFinished(NULL, 0, 0); } try { xhr.send(); } catch (e) { onFinished(0, 0, 0); }
}, urlStr, method, OnFinishedAsync, OnUpdateProgress); }, urlStr, req->requestType, OnFinishedAsync, OnUpdateProgress);
} }
static void Http_WorkerInit(void) { static void Http_WorkerInit(void) {