Replace request and xhr with axios

woodser · Aug 20, 2024 · f8cb5c6 · f8cb5c6
1 parent 536ee4a
commit f8cb5c6
Show file tree

Hide file tree

Showing 9 changed files with 311 additions and 1,012 deletions.
diff --git a/dist/src/main/ts/common/HttpClient.js b/dist/src/main/ts/common/HttpClient.js
diff --git a/dist/src/main/ts/common/MoneroRpcConnection.js b/dist/src/main/ts/common/MoneroRpcConnection.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,12 +33,11 @@
     "@types/node": "^20.6.0",
     "ajv": "^6.12.6",
     "async": "2.6.4",
+    "axios": "^1.7.4",
     "crypto-js": "^4.0.0",
     "memfs": "^4.11.1",
     "net": "^1.0.2",
     "promise-throttle": "^1.1.2",
-    "request": "^2.88.0",
-    "request-promise": "^4.2.6",
     "serialize-javascript": "^3.1.0",
     "text-encoding": "^0.7.0",
     "tls": "0.0.1",

diff --git a/src/main/cpp/http_client_wasm.cpp b/src/main/cpp/http_client_wasm.cpp
@@ -30,7 +30,6 @@ EM_JS(const char*, js_send_json_request, (const char* uri, const char* username,
       body: UTF8ToString(body),
       resolveWithFullResponse: true,
       rejectUnauthorized: LibraryUtils.isRejectUnauthorized(UTF8ToString(reject_unauthorized_fn_id)),
-      requestApi: GenUtils.isFirefox() ? "xhr" : "fetch"  // firefox issue: https://bugzilla.mozilla.org/show_bug.cgi?id=1491010
     }).then(resp => {
 
       // build response container
@@ -96,7 +95,6 @@ EM_JS(const char*, js_send_binary_request, (const char* uri, const char* usernam
         body: view,
         resolveWithFullResponse: true,
         rejectUnauthorized: LibraryUtils.isRejectUnauthorized(UTF8ToString(reject_unauthorized_fn_id)),
-        requestApi: GenUtils.isFirefox() ? "xhr" : "fetch"  // firefox issue: https://bugzilla.mozilla.org/show_bug.cgi?id=1491010
       }).then(resp => {
 
         // write binary body to heap to pass back pointer