Improvements for httpRequest (aoijs#639)

Pandinhaa11 · Aug 15, 2024 · a6e9244 · a6e9244
1 parent 18b3598
commit a6e9244
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/src/functions/httpRequest.js b/src/functions/httpRequest.js
@@ -4,10 +4,17 @@ module.exports = async (d) => {
     const data = d.util.aoiFunc(d);
     if (data.err) return d.error(data.err);
 
-    let [url, method = 'get', body = '', property, error = 'default', ...header] =
-        data.inside.splits;
+    let [
+        url,
+        method = 'get',
+        body = '',
+        property,
+        error = 'default',
+        ...header
+    ] = data.inside.splits;
 
-    body = body?.trim() === '' ? undefined : body
+    body = body?.trim() === '' ? undefined : body;
+
     let headers = {};
     if (header.length === 1) {
         try {
@@ -34,9 +41,15 @@ module.exports = async (d) => {
         });
 
         const responseBody = await response.text();
-        data.result = property
-            ? eval(`JSON.parse(responseBody)?.${property}`)
-            : responseBody;
+        const contentType = response.headers.get("content-type")?.split(/;/)[0];
+
+        if (property && /content(-|\s)?type/gi.test(property)) {
+            data.result = contentType;
+        } else if (property && contentType.includes("json")) {
+            data.result = eval(`JSON.parse(responseBody)?.${property}`)
+        } else {
+            data.result = responseBody;
+        }
     } catch (err) {
         console.error(err);
         if (error === 'default') {