godprotocol 2.2.66 → 2.2.68

package/package.json

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

package/server/Routable/Services.js

@@ -136,11 +136,15 @@ class Services {
 
   handle_webhook_after = async (req, result) => {
     let { headers, body, route } = req;
-    let { xplatform, platform } = headers;
+    let { xplatform, third_party, platform } = headers;
 
     if (xplatform && xplatform.uri !== platform.uri) {
-      if (xplatform.webhook?.enabled) {
-        let { webhook } = xplatform;
+      let webhook = third_party?.webhook || xplatform.webhook;
+
+      if (webhook?.enabled) {
+        if (webhook?.routes?.length && !webhook?.routes?.includes(route))
+          return;
+
         await fetch(webhook?.url, {
           method: "POST",
           headers: {

package/server/version_control.js

@@ -69,64 +69,76 @@ const version_middleware = async (req, res, routers) => {
     const version = req.headers["x-api-version"] || "v1";
 
     const versionRouter = routers.get_version(version);
-    // ----------------------------
-    // BODY (STREAM PARSE)
-    // ----------------------------
-    const body = await getBody(req);
 
     if (!versionRouter) {
-      res.statusCode = 400;
-      res.setHeader("Content-Type", "application/json");
-      return res.end(
-        JSON.stringify({
+      return respond(
+        {
           ok: false,
           message: "Invalid API version",
-        }),
+          status: 400,
+        },
+        res,
       );
     }
 
+    // ----------------------------
+    // 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)) {
+      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);
     }
 
     const router = routers;
-    const name = req.url.replace(/^\//, "");
+
+    // remove query string from route
+    const name = url.pathname.replace(/^\//, "");
 
     const isWebhook = req.headers["is-webhook"];
 
-    // ----------------------------
     // SECURITY
-    // ----------------------------
     const securityResult = await router.handle_security(name, req);
 
     if (securityResult !== true) {
       return respond(securityResult, res);
     }
 
-    // ----------------------------
     // DB
-    // ----------------------------
     const db = await router.resolve_db(req);
 
-    // ----------------------------
     // WEBHOOK PRIOR
-    // ----------------------------
     if (!isWebhook) {
-      const webPrior = await router.handle_webhook_prior({ ...req, body });
+      const webPrior = await router.handle_webhook_prior({
+        ...req,
+        body,
+      });
 
       if (!webPrior?.ok) {
         return respond(webPrior, res);
       }
 
-      if (webPrior?.ok) {
-        req.headers.webhook_prior = webPrior;
-      }
+      req.headers.webhook_prior = webPrior;
     }
 
-    // ----------------------------
     // EXECUTE
-    // ----------------------------
     const result = await router.execute(name, {
       body,
       route: name,
@@ -134,11 +146,10 @@ const version_middleware = async (req, res, routers) => {
       db: db.db,
       gp: router.gp,
       services: router.get_service,
+      method: req.method,
     });
 
-    // ----------------------------
     // WEBHOOK AFTER
-    // ----------------------------
     if (!isWebhook) {
       await router.handle_webhook_after(req, result);
     }
@@ -147,13 +158,13 @@ const version_middleware = async (req, res, routers) => {
   } catch (err) {
     console.error("Version Middleware Error:", err);
 
-    res.statusCode = 500;
-    res.setHeader("Content-Type", "application/json");
-    res.end(
-      JSON.stringify({
+    return respond(
+      {
         ok: false,
         message: "Internal server error",
-      }),
+        status: 500,
+      },
+      res,
     );
   }
 };