godprotocol 2.2.63 → 2.2.65

package/Godprotocol.js

@@ -11,6 +11,10 @@ class GodProtocol {
     this.route_table = new Route_table(this);
   }
 
+  prior_callback = (prior) => {
+    this.webhook_prior = prior;
+  };
+
   platform_db = async () => {
     return await this.route_table.platform_db();
   };

package/package.json

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

package/server/Routable/Header.js

@@ -174,8 +174,9 @@ class Headers extends Services {
       headers["authorization"] = `Bearer ${authorization}`;
     }
 
+    let third_party = xplatform === this.platform_uri;
     let res = await fetch(
-      `${gp_services.profile}/${xplatform === this.platform_uri ? "me" : "third_party_me"}`,
+      `${gp_services.profile}/${third_party ? "me" : "third_party_me"}`,
       {
         method: "post",
         headers: {
@@ -184,7 +185,7 @@ class Headers extends Services {
           "x-api-version": "v3",
           ...headers,
         },
-        body: JSON.stringify({ from: xplatform }),
+        body: JSON.stringify(third_party ? { from: xplatform } : {}),
       },
     );
     res = await res.json();
@@ -214,7 +215,6 @@ class Headers extends Services {
   handle_security = async (name, request) => {
     let route = await this.get_route(name);
 
-    console.log(route?.config?.security, "SECURITY FOR ROUTE");
     if (!route?.config?.security?.length) return true;
 
     if (!this.check_security(route.config.security, request)) {

package/server/Routable/Route_table.js

@@ -44,7 +44,7 @@ class Route_table extends Headers {
     for (let name in routes) {
       let { handler, ...config } = routes[name];
 
-      config.security = securities[config.security || "none"];
+      config.security = securities[config.security || "auth_token"];
 
       await this.add_route(name, handler, config);
     }

package/server/Routable/Services.js

@@ -123,11 +123,44 @@ class Services {
   };
 
   handle_webhook_prior = async (req) => {
-    let { platform } = req.headers;
-    if (!platform) return false;
+    let fn = this.gp.webhook_prior;
+
+    if (typeof fn === "function") {
+      let res = await fn(req);
+      return res && Object.keys(res).hasOwnProperty("ok") ? res : { ok: false };
+    }
+    return {
+      ok: true,
+    };
   };
 
-  handle_webhook_after = async (req, result) => {};
+  handle_webhook_after = async (req, result) => {
+    let { headers, body, route } = req;
+    let { xplatform, platform } = headers;
+
+    if (xplatform && xplatform.uri !== platform.uri) {
+      if (xplatform.webhook?.enabled) {
+        let { webhook } = xplatform;
+        await fetch(webhook?.url, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Accept: "application/json",
+            "x-api-version": webhook?.api_version || "v1",
+          },
+          body: JSON.stringify({
+            me: xplatform,
+            profile,
+            platform,
+            body,
+            result,
+            route,
+          }),
+        });
+      }
+    } else {
+    }
+  };
 
   resolve_db = async (req) => {
     let db = await this.platform_db();

package/server/version_control.js

@@ -80,8 +80,7 @@ const version_middleware = async (req, res, routers) => {
       return res.end(
         JSON.stringify({
           ok: false,
-          error: "Invalid API version",
-          version,
+          message: "Invalid API version",
         }),
       );
     }
@@ -114,9 +113,9 @@ const version_middleware = async (req, res, routers) => {
     // WEBHOOK PRIOR
     // ----------------------------
     if (!isWebhook) {
-      const webPrior = await router.handle_webhook_prior(req);
+      const webPrior = await router.handle_webhook_prior({ ...req, body });
 
-      if (webPrior && webPrior.ok === false) {
+      if (!webPrior?.ok) {
         return respond(webPrior, res);
       }
 
@@ -130,6 +129,7 @@ const version_middleware = async (req, res, routers) => {
     // ----------------------------
     const result = await router.execute(name, {
       body,
+      route: name,
       headers: req.headers,
       db: db.db,
       gp: router.gp,