HTTP Function Refactor

src/functions/httpAddHeader.js

@@ -0,0 +1,13 @@
+module.exports = async (d) => {
+    const data = d.util.aoiFunc(d);
+    if (data.err) return d.error(data.err);
+
+    let [name, value] = data.inside.splits;
+
+    ((d.data.http ??= {})["headers"] ??= {})[name] = value;
+
+    return {
+        code: d.util.setCode(data),
+        data: d.data
+    }
+}

src/functions/httpClearOptions.js

@@ -0,0 +1,10 @@
+module.exports = async (d) => {
+    const data = d.util.aoiFunc(d);
+
+    d.data.http = {};
+
+    return {
+        code: d.util.setCode(data),
+        data: d.data
+    }
+}

src/functions/httpGetContentType.js

@@ -0,0 +1,10 @@
+module.exports = async (d) => {
+    const data = d.util.aoiFunc(d);
+
+    data.result = d.data.http?.contentType;
+
+    return {
+        code: d.util.setCode(data),
+        data: d.data
+    }
+}

src/functions/httpGetHeader.js

@@ -0,0 +1,13 @@
+module.exports = async (d) => {
+    const data = d.util.aoiFunc(d);
+    if (data.err) return d.error(data.err);
+
+    let [name] = data.inside.splits;
+
+    data.result = d.data.http?.headers[name.addBrackets()]
+
+    return {
+        code: d.util.setCode(data),
+        data: d.data
+    }
+}

src/functions/httpOk.js

@@ -0,0 +1,10 @@
+module.exports = async (d) => {
+    const data = d.util.aoiFunc(d);
+
+    data.result = d.data.http?.ok;
+
+    return {
+        code: d.util.setCode(data),
+        data: d.data
+    }
+}

src/functions/httpRemoveHeader.js

@@ -0,0 +1,16 @@
+module.exports = async (d) => {
+    const data = d.util.aoiFunc(d);
+    if (data.err) return d.error(data.err);
+
+    let [name] = data.inside.splits;
+    if (!name) return d.aoiError.fnError(d, "custom", {
+        inside: data.inside
+    }, "Missing header name!");
+
+    delete d.data.http?.headers[name];
+
+    return {
+        code: d.util.setCode(data),
+        data: d.data
+    }
+}

src/functions/httpRequest.js

@@ -1,78 +1,62 @@
-const { Agent, fetch } = require('undici');
-
 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
+        body = ''
     ] = data.inside.splits;
 
-    body = body?.trim() === '' ? undefined : body;
-
-    let headers = {};
-    if (header.length === 1) {
-        try {
-            headers = JSON.parse(header);
-        } catch (e) {
-            header.forEach((x) => {
-                const split = x.split(':');
-                headers[split[0]] = split[1];
-            });
-        }
-    } else if (header.length > 1) {
-        header.forEach((x) => {
-            const split = x.split(':');
-            headers[split[0]] = split[1];
-        });
-    }
+    body = body !== '' ? body.trim() : body;
 
-    try {
-        const response = await fetch(url.addBrackets(), {
-            method,
-            headers,
-            body,
-            agent: new Agent(),
+    // Getting the user-defined headers and content type.
+    const headers = {};
+    if (d.data.http?.contentType) {
+        Object.assign(headers, {
+            ['Content-Type']: d.data.http.contentType
         });
+    }
+    if (d.data.http?.headers) {
+        Object.assign(headers, d.data.http.headers);
+    }
 
-        const responseBody = await response.text();
-        const contentType = response.headers.get("content-type")?.split(/;/)[0];
+    // Making the request.
+    const response = await fetch(url.addBrackets(), {
+        body: body === '' ? undefined : body.addBrackets(),
+        headers,
+        method
+    });
 
-        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') {
-            return d.aoiError.makeMessageError(
-                d.client,
-                d.channel,
-                { content: err },
-                {},
-                d
-            );
-        } else {
-            const parsedError = await d.util.errorParser(error, d);
-            return d.aoiError.makeMessageError(
-                d.client,
-                d.channel,
-                parsedError.data ?? parsedError,
-                parsedError.options,
-                d
-            );
-        }
+    // Defining response headers.
+    (d.data.http??={})["headers"] = {};
+    for (const [name, value] of response.headers.entries()) {
+        if (/content-type/.test(name)) continue;
+        d.data.http.headers[name] = value;
     }
 
+    // Get the response content type.
+    const contentType = response.headers.get("content-type")?.split(/;/)[0];
+
+    // Defining response content type.
+    (d.data.http ??= {})['contentType'] = contentType;
+    d.data.http.statusCode = response.status;
+
+    // Additional response data.
+    d.data.http.redirected = response.redirected;
+    d.data.http.ok = response.ok;
+
+    // Saving the result.
+    if (contentType.match(/application\/json/)) {
+        d.data.http.result = await response.json()
+    } else if (contentType.match(/image\//)) {
+        d.data.http.result = await response.arrayBuffer()
+        .then(a => Buffer.from(a).toString("base64"));
+    } else {
+        d.data.http.result = await response.text()
+    }
+
     return {
         code: d.util.setCode(data),
-    };
-};
+        data: d.data
+    }
+}

src/functions/httpResult.js

@@ -0,0 +1,32 @@
+module.exports = async (d) => {
+    const data = d.util.aoiFunc(d);
+
+    let properties = data.inside.splits;
+    let isObject = (d.data.http?.contentType.includes("json") && properties.length) ?? false;
+
+    if (isObject) {
+        let response = d.data.http.result;
+        for (const property of properties) {
+            if (!Object.prototype.hasOwnProperty.call(response, property)) {
+                return d.aoiError.fnError(d, "custom", {
+                    inside: data.inside
+                }, `Invalid property "${property}" in HTTP result!`)
+            }
+
+            response = response?.[property];
+        }
+
+        data.result = typeof response !== "string"
+            ? JSON.stringify(response)
+            : String(response);
+    } else {
+        data.result = typeof d.data.http?.result === "object"
+            ? JSON.stringify(d.data.http?.result)
+            : d.data.http?.result;
+    }
+
+    return {
+        code: d.util.setCode(data),
+        data: d.data
+    }
+}

src/functions/httpStatus.js

@@ -0,0 +1,10 @@
+module.exports = async (d) => {
+    const data = d.util.aoiFunc(d);
+
+    data.result = d.data.http?.statusCode ?? Infinity;
+
+    return {
+        code: d.util.setCode(data),
+        data: d.data
+    }
+}

src/functions/httpWasRedirected.js

@@ -0,0 +1,10 @@
+module.exports = async (d) => {
+    const data = d.util.aoiFunc(d);
+
+    data.result = d.data.http?.redirected;
+
+    return {
+        code: d.util.setCode(data),
+        data: d.data
+    }
+}