godprotocol 2.2.68 → 2.2.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "godprotocol",
-  "version": "2.2.68",
+  "version": "2.2.70",
   "description": "A distributed computing environment for Web 4.0 — integrating AI, decentralisation, and virtual computation.",
   "main": "Index.js",
   "type": "module",

package/server/version_control.js

@@ -39,25 +39,52 @@ const applyCors = (req, res) => {
 };
 
 const respond = (result, res) => {
+  // ----------------------------
+  // REDIRECT
+  // ----------------------------
+
+  if (result?.redirect) {
+    const status = result?.status || 302;
+
+    res.statusCode = status;
+    res.setHeader("Location", result.redirect);
+
+    res.end();
+
+    return result;
+  }
+
+  // ----------------------------
+  // NORMAL JSON RESPONSE
+  // ----------------------------
+
   const response = {
     ok: result?.ok ?? false,
     message: result?.message ?? "",
     data: result?.data,
   };
 
-  if (result?.pagination) response.pagination = result.pagination;
-  if (result?.token) response.token = result.token;
+  if (result?.pagination) {
+    response.pagination = result.pagination;
+  }
+
+  if (result?.token) {
+    response.token = result.token;
+  }
 
   const status = result?.status || (result?.ok ? 200 : 403);
 
   res.statusCode = status;
+
   res.setHeader("Content-Type", "application/json");
+
   res.end(JSON.stringify(response));
 
   return response;
 };
 
 const version_middleware = async (req, res, routers) => {
+  let error_stage = "Version Middleware";
   try {
     applyCors(req, res);
 
@@ -66,9 +93,15 @@ const version_middleware = async (req, res, routers) => {
       return res.end();
     }
 
-    const version = req.headers["x-api-version"] || "v1";
+    let version;
 
-    const versionRouter = routers.get_version(version);
+    if (req.method === "GET") {
+      version = "__GET__";
+    } else {
+      version = req.headers["x-api-version"] || "v1";
+    }
+
+    const versionRouter = await routers.get_version(version);
 
     if (!versionRouter) {
       return respond(
@@ -81,27 +114,17 @@ const version_middleware = async (req, res, routers) => {
       );
     }
 
-    // ----------------------------
-    // PARSE URL + QUERY
-    // ----------------------------
-
-    const url = new URL(req.url, `http://${req.headers.host}`);
-
-    const query = Object.fromEntries(url.searchParams.entries());
-
-    // ----------------------------
-    // PARSE BODY
-    // ----------------------------
-
     let body = {};
 
-    if (!["GET", "HEAD"].includes(req.method)) {
+    if (req.method === "GET") {
+      const url = new URL(req.url, `http://${req.headers.host}`);
+
+      body = Object.fromEntries(url.searchParams.entries());
+    } else {
+      error_stage = "Body Parser";
       body = await getBody(req);
     }
 
-    // unified payload
-    body = req.method === "GET" ? query : body;
-
     if (versionRouter.config?.is_old) {
       req.body = body;
       return versionRouter.routes(req, res);
@@ -110,11 +133,14 @@ const version_middleware = async (req, res, routers) => {
     const router = routers;
 
     // remove query string from route
-    const name = url.pathname.replace(/^\//, "");
+    const parsedUrl = new URL(req.url, `http://${req.headers.host}`);
+    req.url = parsedUrl.pathname;
+    const name = req.url.replace(/^\//, "");
 
     const isWebhook = req.headers["is-webhook"];
 
     // SECURITY
+    error_stage = "Header";
     const securityResult = await router.handle_security(name, req);
 
     if (securityResult !== true) {
@@ -126,6 +152,7 @@ const version_middleware = async (req, res, routers) => {
 
     // WEBHOOK PRIOR
     if (!isWebhook) {
+      error_stage = "Callback";
       const webPrior = await router.handle_webhook_prior({
         ...req,
         body,
@@ -139,6 +166,7 @@ const version_middleware = async (req, res, routers) => {
     }
 
     // EXECUTE
+    error_stage = "Handler";
     const result = await router.execute(name, {
       body,
       route: name,
@@ -151,12 +179,13 @@ const version_middleware = async (req, res, routers) => {
 
     // WEBHOOK AFTER
     if (!isWebhook) {
+      error_stage = "Webhook";
       await router.handle_webhook_after(req, result);
     }
 
     return respond(result, res);
   } catch (err) {
-    console.error("Version Middleware Error:", err);
+    console.error(`${error_stage} Error:`, err);
 
     return respond(
       {