godprotocol 2.2.51 → 2.2.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "godprotocol",
-  "version": "2.2.51",
+  "version": "2.2.55",
   "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

@@ -146,7 +146,7 @@ class Headers extends Services {
       type: "third_party",
       xplatform,
       authorization: authorization || null,
-      platform: process.env.PLATFORM_URI,
+      platform: this.platform_uri,
     };
 
     // 🔹 1. Try cache
@@ -165,24 +165,28 @@ class Headers extends Services {
 
     // 🔹 2. Call remote
     const headers = {
-      "x-api-version": "v2",
-      "x-api-key": process.env.API_KEY,
+      "x-api-version": "v3",
+      "x-platform": this.platform_uri,
+      "x-api-key": this.api_key,
     };
 
     if (authorization) {
       headers["authorization"] = `Bearer ${authorization}`;
     }
 
-    let res = await fetch(`${gp_services.profile}/validate_third_party`, {
-      method: "post",
-      headers: {
-        "Content-Type": "application/json",
-        Accept: "application/json",
-        "x-api-version": "v2",
-        ...headers,
+    let res = await fetch(
+      `${gp_services.profile}/${xplatform === this.platform_uri ? "me" : "third_party_me"}`,
+      {
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
+          Accept: "application/json",
+          "x-api-version": "v3",
+          ...headers,
+        },
+        body: JSON.stringify({ from: xplatform }),
       },
-      body: JSON.stringify({ platform_uri: xplatform }),
-    });
+    );
     res = await res.json();
 
     // 🔹 3. Save cache
@@ -231,9 +235,7 @@ class Headers extends Services {
     if (xplatform) {
       val = await this.validate_third_party(xplatform, authorisation);
     } else {
-      // debug(api_key, authorisation);
       val = await this.validate_api_key(api_key, authorisation);
-      // debug(val, "Uhh");
     }
 
     // debug(val);
@@ -249,8 +251,9 @@ class Headers extends Services {
         };
       }
       request.headers.profile = val.profile;
-      request.headers.xplatform = val.xplatform;
       request.headers.platform = val.platform;
+      if (val.xplatform) request.headers.xplatform = val.xplatform;
+      if (val.third_party) request.headers.third_party = val.third_party;
     }
 
     return true;

package/server/Routable/Services.js

@@ -27,7 +27,7 @@ class Services {
     // debug(service, id, "gettok");
     let db = await this.platform_db();
     token = await db.read_cache(
-      { platform_uri: service.uri, id: id.profile || id.platform },
+      { platform_uri: service.uri, id: id.profile },
       "token",
     );
 
@@ -53,7 +53,7 @@ class Services {
 
       if (token?.ok) {
         await db.save_cache(
-          { id: id.profile || id.platform, platform_uri: service.uri },
+          { id: id.profile, platform_uri: service.uri },
           { token: token.token },
           "token",
         );
@@ -93,7 +93,7 @@ class Services {
             }
           }
         }
-        if (!token) headers["Authorization"] = `Bearer ${token}`;
+        if (token) headers["Authorization"] = `Bearer ${token}`;
         headers["x-platform"] = this.platform_uri;
 
         try {
@@ -122,201 +122,17 @@ class Services {
   handle_webhook_prior = async (req) => {
     let { platform } = req.headers;
     if (!platform) return false;
-
-    let conf = await this.get_setting(
-      platform,
-      {
-        category: "webhooks",
-        key: ["general", this.platform_uri],
-      },
-      {
-        type: "webhooks",
-        key: platform.uri,
-        platform: this.platform_uri,
-      },
-    );
-
-    if (conf.ok === false) return null;
-
-    let response = await fetch(conf?.data?.url, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Accept: "application/json",
-        "x-platform": req.headers["x-platform"],
-        "is-webhook": true,
-        authorization: req.headers["authorization"],
-        "x-api-version": conf?.data?.api_version || "v1",
-      },
-      body: JSON.stringify({
-        body: req.body,
-        from_platform: this.platform_uri,
-        endpoint: req.path,
-        server: this.gp.server,
-      }),
-    });
-
-    let res = await response.json();
-
-    return res;
-  };
-
-  handle_webhook_after = async (req, result) => {
-    let { platform } = req.headers;
-    if (!platform) return false;
-
-    let conf = await this.get_setting(
-      platform,
-      {
-        category: "webhooks",
-        key: ["general", this.platform_uri],
-      },
-      {
-        type: "webhooks",
-        key: platform.uri,
-        platform: this.platform_uri,
-      },
-    );
-
-    if (conf.ok === false) return null;
-
-    let response = await fetch(conf?.data?.url, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Accept: "application/json",
-        "x-platform": req.headers["x-platform"],
-        "is-webhook": true,
-        authorization: req.headers["authorization"],
-        "x-api-version": conf?.data?.api_version || "v1",
-      },
-      body: JSON.stringify({
-        response: result,
-        body: req.body,
-        from_platform: this.platform_uri,
-        endpoint: req.path,
-        server: this.gp.server,
-      }),
-    });
-
-    let res = await response.json();
-
-    return res;
   };
 
-  get_setting = async (platform, setting, query) => {
-    const baseDB = await this.platform_db();
-
-    // 🔹 1. Try cache
-    const cached = await baseDB.read_cache(query, "config");
-
-    let config;
-
-    if (cached?.payload) {
-      try {
-        config = JSON.parse(cached.payload);
-      } catch {
-        config = null; // corrupted cache → ignore
-      }
-    }
-
-    if (config) return config;
-
-    const tokenRes = await this.get_token(
-      { uri: "settings.savvyaisolution.com" },
-      { platform: platform._id },
-    );
-
-    if (!tokenRes.token) {
-      return {
-        ok: false,
-        message: "Failed to retrieve platform token",
-        status: 403,
-      };
-    }
-
-    let ftch = await fetch(`${gp_services.settings}/get_settings`, {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${tokenRes.token}`,
-        "x-platform": this.platform_uri,
-        "x-api-version": "v1",
-        Accept: "application/json",
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(setting),
-    });
-    let Res = await ftch.json();
-
-    if (!Res.ok) {
-      return {
-        ok: false,
-        message: "Failed to retrieve setting",
-        status: 500,
-      };
-    }
-
-    config =
-      Res.data?.[setting.category]?.[`${this.platform_uri}`] ||
-      Res.data?.[setting.category]?.["general"];
-
-    if (!config) {
-      return {
-        ok: false,
-        message: "setting not found",
-        status: 404,
-      };
-    }
-
-    // 🔹 3. Save cache
-    await baseDB.save_cache(query, config, "config");
-
-    return config;
-  };
+  handle_webhook_after = async (req, result) => {};
 
   resolve_db = async (req) => {
-    const { platform } = req.headers;
-
-    // debug(req.headers["x-api-key"], process.env.API_KEY);
-    // 🔹 Internal system call → use base DB
-    if (req.headers["x-api-key"] === process.env.API_KEY) {
-      const db = await this.platform_db();
-      req.db = db;
-      return { ok: true, db };
-    }
-
-    if (!platform?.uri || !platform?._id) {
-      return {
-        ok: false,
-        message: "Platform context missing",
-        status: 400,
-      };
-    }
+    let db = await this.platform_db();
 
-    const query = {
-      type: "db_config",
-      key: platform.uri,
-      platform: this.platform_uri,
+    return {
+      ok: true,
+      db,
     };
-
-    // 🔹 2. Fetch remote if no valid cache
-
-    let config = await this.get_setting(
-      platform,
-      {
-        category: "db",
-        key: ["general", this.platform_uri],
-      },
-      query,
-    );
-
-    if (config?.ok === false) return config;
-    // 🔹 4. Instantiate scoped DB
-    const db = new DB(config, this);
-
-    req.db = db;
-
-    return { ok: true, db };
   };
 }