godprotocol 2.2.41 → 2.2.45

package/Godprotocol.js

@@ -5,6 +5,7 @@ class GodProtocol {
   constructor(config) {
     this.db_config = config.db_config;
 
+    console.log(config, "uhh");
     this.api_key = config.api_key;
     this.platform_uri = config.platform_uri;
     this.route_table = new Route_table(this);
@@ -18,6 +19,7 @@ class GodProtocol {
     if (opts.is_old) {
       await this.route_table.init_version("v1", { is_old: true });
       this.route_table.versions[version].routes = routes;
+      return;
     }
 
     await this.route_table.init_version(version);

package/Index.js

@@ -7,6 +7,7 @@ import GodProtocol from "./Godprotocol.js";
 // });
 
 // gp.add_router("v2", {});
+// gp.load_services(services);
 
 // app.use((req, res) => gp.on_request(req, res));
 export default GodProtocol;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "godprotocol",
-  "version": "2.2.41",
+  "version": "2.2.45",
   "description": "A distributed computing environment for Web 4.0 — integrating AI, decentralisation, and virtual computation.",
   "main": "Index.js",
   "type": "module",
@@ -33,7 +33,8 @@
   "homepage": "https://github.com/immanuel-savvy/GodProtocol#readme",
   "dependencies": {
     "aircode4": "latest",
-    "generalised-datastore": "latest"
+    "generalised-datastore": "latest",
+    "@godprotocol/repositories": "^1.1.27"
   },
   "engines": {
     "node": ">=18"

package/server/Routable/Header.js

@@ -4,16 +4,21 @@ import Services, { gp_services } from "./Services.js";
 class DB {
   constructor(config, router) {
     this.router = router;
-    this.db = new Mongo({
+
+    let conf = {
       db_url: config.db_url,
       db_name: router?.gp?.platform_uri.replace(/\./g, "-"),
-    });
+    };
+    console.log(conf);
+    this.db = new Mongo(conf);
 
     this.folders = {};
   }
 
   read_cache = async (query, category) => {
-    let coll = this.db.collection(`$CACHE-${category}`);
+    let coll = await this.folder(`$CACHE-${category}`);
+
+    // await coll.deleteMany()
     const doc = await coll.findOne(query);
     if (!doc) return null;
 
@@ -22,7 +27,7 @@ class DB {
       return null;
     }
 
-    return { ...doc };
+    return JSON.parse(doc?.payload);
   };
 
   save_cache = async (
@@ -31,7 +36,7 @@ class DB {
     category,
     ttlMs = 7 * 24 * 60 * 60 * 1000,
   ) => {
-    let coll = this.db.collection(`$CACHE-${category}`);
+    let coll = await this.folder(`$CACHE-${category}`);
     const now = new Date();
 
     const toSet = {
@@ -68,7 +73,7 @@ class DB {
 
     if (folder) return folder;
 
-    folder = this.db.collection(name);
+    folder = await this.db.collection(name);
     this.folders[name] = folder;
 
     return folder;
@@ -114,7 +119,7 @@ class Headers extends Services {
       headers["authorization"] = `Bearer ${authorization}`;
     }
 
-    const res = await fetch(`${gp_services.profile}/validate`, {
+    let res = await fetch(`${gp_services.profile}/validate`, {
       method: "post",
       headers: {
         "Content-Type": "application/json",
@@ -168,7 +173,7 @@ class Headers extends Services {
       headers["authorization"] = `Bearer ${authorization}`;
     }
 
-    const res = await fetch(`${gp_services.profile}/validate_third_party`, {
+    let res = await fetch(`${gp_services.profile}/validate_third_party`, {
       method: "post",
       headers: {
         "Content-Type": "application/json",
@@ -205,7 +210,7 @@ class Headers extends Services {
   handle_security = async (name, request) => {
     let route = await this.get_route(name);
 
-    if (!route.config.security?.length) return true;
+    if (!route?.config?.security?.length) return true;
 
     if (!this.check_security(route.config.security, request)) {
       console.log("Unauthorized access attempt to route:", name);

package/server/Routable/Route_table.js

@@ -14,6 +14,7 @@ class Route_table extends Headers {
 
     this.gp = gp;
     this.db_config = gp.db_config;
+    this.api_key = gp.api_key;
     this.versions = {};
     this.validators = {};
   }
@@ -52,7 +53,13 @@ class Route_table extends Headers {
     this.versions[this.active_version].routes[name] = { handler, config };
   };
 
-  get_route = async (name) => this.versions[this.active_version].routes[name];
+  get_route = async (name) => {
+    let version = this.versions[this.active_version];
+
+    let route = version.routes[name];
+
+    return route;
+  };
 
   check_validation = async (rule, data) => {
     let { prop, type, required, default: is_default } = rule;

package/server/Routable/Services.js

@@ -1,8 +1,13 @@
 import { DB } from "./Header.js";
 
+let DEV = true;
 let gp_services = {
-  profile: "https://profile-api.savvyaisolution.com",
-  settings: "https://settings-api.savvyaisolution.com",
+  profile: DEV
+    ? "http://localhost:4000"
+    : "https://profile-api.savvyaisolution.com",
+  settings: DEV
+    ? "http://localhost:4005"
+    : "https://settings-api.savvyaisolution.com",
 };
 
 export { gp_services };
@@ -19,37 +24,50 @@ class Services {
   get_token = async (service, id) => {
     let token;
 
+    console.log(service, id, "gettok");
     let db = await this.platform_db();
     token = await db.read_cache(
       { platform_uri: service.uri, id: id.profile || id.platform },
       "token",
     );
 
-    if (token) return token;
+    console.log(token, "in-cache");
+    if (token) return token.token;
+    try {
+      console.log(this.api_key, gp_services.profile);
 
-    let ftch = await fetch(`${gp_services.profile}/get_token`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Accept: "application/json",
-        "x-api-version": "v2",
-        "x-api-key": this.api_key,
-      },
-      body: JSON.stringify({ platform_uri: service.uri, ...id }),
-    });
-
-    token = await ftch.json();
+      let ftch = await fetch(`${gp_services.profile}/get_token`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Accept: "application/json",
+          "x-api-version": "v2",
+          "x-api-key": this.api_key,
+        },
+        body: JSON.stringify({ platform_uri: service.uri, ...id }),
+      });
 
-    if (token?.ok) {
-      await db.save_cache(
-        { id: id.profile || id.platform, platform_uri: service.uri },
-        token.data,
-        "token",
-      );
-      return token.data;
+      console.log("whats it like??");
+      token = await ftch.json();
+      console.log(token, "HOOWWW");
+
+      if (token?.ok) {
+        await db.save_cache(
+          { id: id.profile || id.platform, platform_uri: service.uri },
+          { token: token.token },
+          "token",
+        );
+        return token.token;
+      }
+    } catch (e) {
+      return {
+        ok: false,
+        status: 500,
+        message: e.message,
+      };
     }
 
-    return null;
+    return token;
   };
 
   get_service = async (service) => {
@@ -69,18 +87,30 @@ class Services {
             token = header.token;
           } else if (header.profile) {
             token = await this.get_token(servic, header);
+
+            if (typeof token !== "string") {
+              if (token?.ok === false) return token;
+            }
           }
         }
-        headers["Authorization"] = `Bearer ${token}`;
+        if (!token) headers["Authorization"] = `Bearer ${token}`;
         headers["x-platform"] = this.platform_uri;
 
-        let response = await fetch(`${servic.url}/${path}`, {
-          method: "POST",
-          headers,
-          body: JSON.stringify(body || {}),
-        });
-
-        return await response.json();
+        try {
+          let response = await fetch(`${servic.url}/${path}`, {
+            method: "POST",
+            headers,
+            body: JSON.stringify(body || {}),
+          });
+
+          return await response.json();
+        } catch (e) {
+          return {
+            ok: false,
+            message: e.message,
+            status: 500,
+          };
+        }
       },
     };
   };
@@ -92,11 +122,12 @@ class Services {
   resolve_db = async (req) => {
     const { platform } = req.headers;
 
+    console.log(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 db;
+      return { ok: true, db };
     }
 
     if (!platform?.uri || !platform?._id) {
@@ -187,7 +218,7 @@ class Services {
 
     req.db = db;
 
-    return db;
+    return { ok: true, db };
   };
 }