X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=d6c9b5733668fe966c88d957568c9c9516720ad0;hb=778c7803f078b162199125a9e6e6baf92d74c409;hp=a38c4122567e1db7b61b23feaa08cf9032b2b107;hpb=6972be3456882f83dd05da98ce73beef3d7324fb;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index a38c4122..d6c9b573 100644
--- a/src/files.c
+++ b/src/files.c
@@ -9094,11 +9094,12 @@ static void FreeThreadData_ApiGetScore(void *data_raw)
   checked_free(data);
 }
 
-static void ApiGetScoreExt(struct HttpRequest *request,
-			   struct HttpResponse *response,
-			   int level_nr,
-			   char *score_cache_filename)
+static boolean SetRequest_ApiGetScore(struct HttpRequest *request,
+				      void *data_raw)
 {
+  struct ApiGetScoreThreadData *data = data_raw;
+  int level_nr = data->level_nr;
+
   request->hostname = setup.api_server_hostname;
   request->port     = API_SERVER_PORT;
   request->method   = API_SERVER_METHOD;
@@ -9115,25 +9116,18 @@ static void ApiGetScoreExt(struct HttpRequest *request,
 	   getPasswordJSON(setup.api_server_password),
 	   getProgramRealVersionString(),
 	   getProgramPlatformString(),
-	   levelset.identifier, level_nr);
+	   levelset.identifier,
+	   level_nr);
 
   ConvertHttpRequestBodyToServerEncoding(request);
 
-  if (!DoHttpRequest(request, response))
-  {
-    Error("HTTP request failed: %s", GetHttpError());
-
-    return;
-  }
-
-  if (!HTTP_SUCCESS(response->status_code))
-  {
-    Error("server failed to handle request: %d %s",
-	  response->status_code,
-	  response->status_text);
+  return TRUE;
+}
 
-    return;
-  }
+static void HandleResponse_ApiGetScore(struct HttpResponse *response,
+				       void *data_raw)
+{
+  struct ApiGetScoreThreadData *data = data_raw;
 
   if (response->body_size == 0)
   {
@@ -9144,7 +9138,7 @@ static void ApiGetScoreExt(struct HttpRequest *request,
 
   ConvertHttpResponseBodyToClientEncoding(response);
 
-  char *filename = score_cache_filename;
+  char *filename = data->score_cache_filename;
   FILE *file;
   int i;
 
@@ -9168,26 +9162,111 @@ static void ApiGetScoreExt(struct HttpRequest *request,
   server_scores.updated = TRUE;
 }
 
-static void ApiGetScore(int level_nr, char *score_cache_filename)
+#if defined(PLATFORM_EMSCRIPTEN)
+static void Emscripten_ApiGetScore_Loaded(unsigned handle, void *data_raw,
+					  void *buffer, unsigned int size)
 {
-  struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
-  struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
+  struct HttpResponse *response = GetHttpResponseFromBuffer(buffer, size);
 
-  ApiGetScoreExt(request, response,
-		 level_nr, score_cache_filename);
+  if (response != NULL)
+  {
+    HandleResponse_ApiGetScore(response, data_raw);
 
-  checked_free(request);
-  checked_free(response);
+    checked_free(response);
+  }
+  else
+  {
+    Error("server response too large to handle (%d bytes)", size);
+  }
+
+  FreeThreadData_ApiGetScore(data_raw);
 }
 
-static int ApiGetScoreThread(void *data_raw)
+static void Emscripten_ApiGetScore_Failed(unsigned handle, void *data_raw,
+					  int code, const char *status)
 {
-  struct ApiGetScoreThreadData *data = data_raw;
+  Error("server failed to handle request: %d %s", code, status);
 
-  ApiGetScore(data->level_nr,
-	      data->score_cache_filename);
+  FreeThreadData_ApiGetScore(data_raw);
+}
+
+static void Emscripten_ApiGetScore_Progress(unsigned handle, void *data_raw,
+					    int bytes, int size)
+{
+  // nothing to do here
+}
+
+static void Emscripten_ApiGetScore_HttpRequest(struct HttpRequest *request,
+					       void *data_raw)
+{
+  if (!SetRequest_ApiGetScore(request, data_raw))
+  {
+    FreeThreadData_ApiGetScore(data_raw);
+
+    return;
+  }
+
+  emscripten_async_wget2_data(request->uri,
+			      request->method,
+			      request->body,
+			      data_raw,
+			      TRUE,
+			      Emscripten_ApiGetScore_Loaded,
+			      Emscripten_ApiGetScore_Failed,
+			      Emscripten_ApiGetScore_Progress);
+}
+
+#else
+
+static void ApiGetScore_HttpRequestExt(struct HttpRequest *request,
+				       struct HttpResponse *response,
+				       void *data_raw)
+{
+  if (!SetRequest_ApiGetScore(request, data_raw))
+    return;
+
+  if (!DoHttpRequest(request, response))
+  {
+    Error("HTTP request failed: %s", GetHttpError());
+
+    return;
+  }
+
+  if (!HTTP_SUCCESS(response->status_code))
+  {
+    Error("server failed to handle request: %d %s",
+	  response->status_code,
+	  response->status_text);
+
+    return;
+  }
+
+  HandleResponse_ApiGetScore(response, data_raw);
+}
+
+static void ApiGetScore_HttpRequest(struct HttpRequest *request,
+				    struct HttpResponse *response,
+				    void *data_raw)
+{
+  ApiGetScore_HttpRequestExt(request, response, data_raw);
 
   FreeThreadData_ApiGetScore(data_raw);
+}
+#endif
+
+static int ApiGetScoreThread(void *data_raw)
+{
+  struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
+  struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
+
+#if defined(PLATFORM_EMSCRIPTEN)
+  Emscripten_ApiGetScore_HttpRequest(request, data_raw);
+#else
+  ApiGetScore_HttpRequest(request, response, data_raw);
+#endif
+
+  checked_free(request);
+  checked_free(response);
 
   return 0;
 }
@@ -9372,12 +9451,14 @@ static void FreeThreadData_ApiAddScore(void *data_raw)
   checked_free(data);
 }
 
-static void ApiAddScoreExt(struct HttpRequest *request,
-			   struct HttpResponse *response,
-			   int level_nr,
-			   char *score_tape_filename,
-			   struct ScoreEntry *score_entry)
+static boolean SetRequest_ApiAddScore(struct HttpRequest *request,
+				      void *data_raw)
 {
+  struct ApiAddScoreThreadData *data = data_raw;
+  struct ScoreEntry *score_entry = &data->score_entry;
+  char *score_tape_filename = data->score_tape_filename;
+  int level_nr = data->level_nr;
+
   request->hostname = setup.api_server_hostname;
   request->port     = API_SERVER_PORT;
   request->method   = API_SERVER_METHOD;
@@ -9389,7 +9470,7 @@ static void ApiAddScoreExt(struct HttpRequest *request,
   {
     Error("loading and base64 encoding score tape file failed");
 
-    return;
+    return FALSE;
   }
 
   char *player_name_raw = score_entry->name;
@@ -9463,6 +9544,78 @@ static void ApiAddScoreExt(struct HttpRequest *request,
 
   ConvertHttpRequestBodyToServerEncoding(request);
 
+  return TRUE;
+}
+
+static void HandleResponse_ApiAddScore(struct HttpResponse *response,
+				       void *data_raw)
+{
+  server_scores.uploaded = TRUE;
+}
+
+#if defined(PLATFORM_EMSCRIPTEN)
+static void Emscripten_ApiAddScore_Loaded(unsigned handle, void *data_raw,
+					  void *buffer, unsigned int size)
+{
+  struct HttpResponse *response = GetHttpResponseFromBuffer(buffer, size);
+
+  if (response != NULL)
+  {
+    HandleResponse_ApiAddScore(response, data_raw);
+
+    checked_free(response);
+  }
+  else
+  {
+    Error("server response too large to handle (%d bytes)", size);
+  }
+
+  FreeThreadData_ApiAddScore(data_raw);
+}
+
+static void Emscripten_ApiAddScore_Failed(unsigned handle, void *data_raw,
+					  int code, const char *status)
+{
+  Error("server failed to handle request: %d %s", code, status);
+
+  FreeThreadData_ApiAddScore(data_raw);
+}
+
+static void Emscripten_ApiAddScore_Progress(unsigned handle, void *data_raw,
+					    int bytes, int size)
+{
+  // nothing to do here
+}
+
+static void Emscripten_ApiAddScore_HttpRequest(struct HttpRequest *request,
+					       void *data_raw)
+{
+  if (!SetRequest_ApiAddScore(request, data_raw))
+  {
+    FreeThreadData_ApiAddScore(data_raw);
+
+    return;
+  }
+
+  emscripten_async_wget2_data(request->uri,
+			      request->method,
+			      request->body,
+			      data_raw,
+			      TRUE,
+			      Emscripten_ApiAddScore_Loaded,
+			      Emscripten_ApiAddScore_Failed,
+			      Emscripten_ApiAddScore_Progress);
+}
+
+#else
+
+static void ApiAddScore_HttpRequestExt(struct HttpRequest *request,
+				       struct HttpResponse *response,
+				       void *data_raw)
+{
+  if (!SetRequest_ApiAddScore(request, data_raw))
+    return;
+
   if (!DoHttpRequest(request, response))
   {
     Error("HTTP request failed: %s", GetHttpError());
@@ -9479,31 +9632,32 @@ static void ApiAddScoreExt(struct HttpRequest *request,
     return;
   }
 
-  server_scores.uploaded = TRUE;
+  HandleResponse_ApiAddScore(response, data_raw);
 }
 
-static void ApiAddScore(int level_nr, char *score_tape_filename,
-			struct ScoreEntry *score_entry)
+static void ApiAddScore_HttpRequest(struct HttpRequest *request,
+				    struct HttpResponse *response,
+				    void *data_raw)
 {
-  struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
-  struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
-
-  ApiAddScoreExt(request, response,
-		 level_nr, score_tape_filename, score_entry);
+  ApiAddScore_HttpRequestExt(request, response, data_raw);
 
-  checked_free(request);
-  checked_free(response);
+  FreeThreadData_ApiAddScore(data_raw);
 }
+#endif
 
 static int ApiAddScoreThread(void *data_raw)
 {
-  struct ApiAddScoreThreadData *data = data_raw;
+  struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
+  struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
 
-  ApiAddScore(data->level_nr,
-	      data->score_tape_filename,
-	      &data->score_entry);
+#if defined(PLATFORM_EMSCRIPTEN)
+  Emscripten_ApiAddScore_HttpRequest(request, data_raw);
+#else
+  ApiAddScore_HttpRequest(request, response, data_raw);
+#endif
 
-  FreeThreadData_ApiAddScore(data_raw);
+  checked_free(request);
+  checked_free(response);
 
   return 0;
 }