godprotocol 2.3.21 → 2.3.23

package/Godprotocol.js

@@ -1,5 +1,6 @@
 import Resource from "./server/Resource.js";
 import Route_table from "./server/Routable/Route_table.js";
+import Utils from "./server/Utils_.js";
 import version_middleware from "./server/version_control.js";
 
 class GodProtocol {
@@ -15,6 +16,8 @@ class GodProtocol {
     this.route_table = new Route_table(this);
 
     this.memory = new Map();
+
+    this.utils = new Utils();
   }
 
   on_start(fn) {
@@ -48,7 +51,14 @@ class GodProtocol {
   };
 
   add_router = async (version, routes, opts = {}) => {
-    if (opts?.prefix) version = `${opts.prefix}:${version}`;
+    if (opts?.prefix) {
+      if (opts.prefix === "..") {
+        opts.prefix = "";
+      } else {
+        version = `${opts.prefix}:${version}`;
+        if (!opts.db_name) opts.db_name = opts.prefix;
+      }
+    }
 
     if (typeof routes === "function" && !opts.is_old) routes = await routes();
 
@@ -58,7 +68,10 @@ class GodProtocol {
       return;
     }
 
-    await this.route_table.init_version(version);
+    await this.route_table.init_version(version, {
+      db_name: opts.db_name,
+      db_prefix: opts.db_prefix,
+    });
 
     await this.route_table.load_routes(routes, opts);
   };

package/Index.js

@@ -1,13 +1,3 @@
 import GodProtocol from "./Godprotocol.js";
 
-// let gp = new GodProtocol({
-//   platform_uri: "profile.savvyaisolution.com",
-//   api_key: process.env.API_KEY,
-//   db_config: {},
-// });
-
-// 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.3.21",
+  "version": "2.3.23",
   "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

@@ -4,12 +4,15 @@ import Services, { gp_services } from "./Services.js";
 class DB {
   constructor(config, router) {
     this.router = router;
+    
+    this.db_name=config.db_name;
 
     let conf = {
       db_url: config.db_url,
       db_name: config.db_name || router?.gp?.platform_uri.replace(/\./g, "-"),
     };
 
+
     this.db = new Mongo(conf);
 
     this.folders = {};
@@ -132,29 +135,13 @@ class Headers extends Services {
       }
     }
 
-    // 🔹 2. Call remote
-    const headers = {
-      "x-api-version": "v3",
-      "x-api-key": api_key,
-    };
-
-    if (authorization) {
-      headers["authorization"] = `Bearer ${authorization}`;
-    }
-
-    let gp_profile = gp_services().identity;
-    let res = await fetch(`${gp_profile.url}/validate`, {
-      method: "post",
-      headers: {
-        "Content-Type": "application/json",
-        Accept: "application/json",
-        "x-api-version": gp_profile.api_version,
-        ...headers,
-      },
-      body: JSON.stringify({}),
-    });
+    let gp_profile = await this.get_service('identity');
+    let res =  await gp_profile.call('validate', {}, {
+      api_key,
+      token: authorization,
+      api_version:'v3'
+    })
 
-    res = await res.json();
     // 🔹 3. Save cache if valid
     if (res.ok && res.data) {
       await db.save_cache(query, res.data, "auth");
@@ -204,30 +191,19 @@ class Headers extends Services {
       hst = hst.replace("10.0.2.2", "localhost");
     }
 
-    let gp_profile = gp_services().identity;
+    let gp_profile = await this.get_service("identity")
 
     let third_party =
-      xplatform !== this.platform_uri && !gp_profile.url.endsWith(hst);
+      xplatform !== this.platform_uri //&& !gp_profile.url.endsWith(hst);
 
-    if (gp_profile.url.endsWith(hst)) {
-      headers["x-platform"] = xplatform;
-    }
-
-    let res = await fetch(
-      `${gp_profile.url}/${third_party ? "third_party_me" : "me"}`,
-      {
-        method: "post",
-        headers: {
-          "Content-Type": "application/json",
-          Accept: "application/json",
-          "x-api-version": gp_profile.api_version,
-          ...headers,
-        },
-        body: JSON.stringify(third_party ? { from: xplatform } : {}),
-      },
-    );
-    res = await res.json();
+    // if (gp_profile.url.endsWith(hst)) {
+    //   headers["x-platform"] = xplatform;
+    // }
 
+    let res = await gp_profile.call(`${third_party ? "third_party_me" : "me"}`, (third_party ? { from: xplatform } : {}), {
+      token: authorization, xplatform
+    })
+    
     // 🔹 3. Save cache
     if (res.ok && res.data) {
       await db.save_cache(query, res.data, "auth");
@@ -296,7 +272,6 @@ class Headers extends Services {
       val = await this.validate_api_key(api_key, authorisation);
     }
 
-    // debug(val);
     if (!val?.ok) {
       return val;
     } else {

package/server/Routable/Route_table.js

@@ -21,8 +21,21 @@ class Route_table extends Headers {
     this.validators = {};
   }
 
-  get_version = (version = this.active_version) => {
+  get_version = async (version = this.active_version) => {
     let ver = this.versions[version];
+
+    if (!ver) {
+      let versions = Object.keys(this.versions);
+      let verr = versions.find((v) => v.startsWith(`${version}:`));
+
+      if (verr) {
+        let serv = await this.get_service(version);
+        if (serv) {
+          version = `${version}:${serv.api_version}`;
+          ver = this.versions[version];
+        }
+      }
+    }
     if (!ver) return;
 
     this.active_version = version;
@@ -67,7 +80,7 @@ class Route_table extends Headers {
     }
 
     if (opts?.services) {
-      let services = await opts.services(opts.services_config);
+      let services = await opts.services(opts.services_config, this.gp);
       await this.load_services(services, this.active_version);
     }
   };

package/server/Routable/Services.js

@@ -85,34 +85,38 @@ class Services {
     if (!servic) return;
 
     return {
+      api_version: servic.api_version,
       uri: servic.uri,
       call: async (path, body, header) => {
         let headers = {
           "Content-Type": "application/json",
           Accept: "application/json",
           "x-api-version": servic.local
-            ? `${servic.local}:${servic.api_version}`
-            : servic.api_version || "v1",
+            ? `${servic.local}:${servic.api_version || header.api_version}`
+            : servic.api_version || header.api_version || "v1",
         };
-        let token;
-        if (servic.profile_key) {
+        
+        if (header?.api_key){
+          headers['x-api-key'] = header.api_key;
+        } else if (servic.api_key) {
+          headers["x-api-key"] = servic.api_key;
+        }
+
+        if (header?.token){
+          headers['Authorization'] = `Bearer ${header.token}`
+          headers["x-platform"] = this.platform_uri;
+        } else if (servic.profile_key) {
           headers["Authorization"] = `${servic.profile_key}`;
-        } else if (header?.token || header?.profile) {
-          if (header.token) {
-            token = header.token;
-          } else if (header.profile) {
-            token = await this.get_token(servic, header);
-
-            if (typeof token !== "string") {
-              if (token?.ok === false) return token;
-            }
-          }
+        } else if (header?.profile) {
+          let token = await this.get_token(servic, header);
 
+          if (typeof token !== "string") {
+            if (token?.ok === false) return token;
+          }
+          
           if (token) headers["Authorization"] = `Bearer ${token}`;
           headers["x-platform"] = this.platform_uri;
-        } else if (servic.api_key) {
-          headers["x-api-key"] = servic.api_key;
-        }
+        } 
 
         if (
           !headers["x-api-key"] &&
@@ -125,7 +129,10 @@ class Services {
             meesage: "Service unauthorised",
           };
         }
+
         try {
+            let prev_version = this.active_version;
+
           let response = await fetch(
             `${servic.local ? this.gp.server.domain : servic.url}/${path}`,
             {
@@ -135,6 +142,8 @@ class Services {
             },
           );
 
+          this.get_version(prev_version)
+
           return await response.json();
         } catch (e) {
           return {
@@ -165,7 +174,11 @@ class Services {
 
     let db = this.dbs[name];
     if (!db) {
-      db = new DB({ ...this.db_config, name }, this);
+      let conf = {...this.db_config};
+      if (name){
+        conf = {...this.db_config, db_name: name}
+      }
+      db = new DB(conf, this);
 
       this.dbs[name] = db;
     }
@@ -181,7 +194,7 @@ class Services {
       return res && Object.keys(res).hasOwnProperty("ok") ? res : { ok: false };
     }
     return {
-      ok: true,
+      ok: true, 
     };
   };
 

package/server/Utils_.js

@@ -0,0 +1,35 @@
+class Utils {
+  validateService = (name, service) => {
+    if (!service) {
+      console.error(`Service "${name}" is missing.`);
+      return;
+    }
+
+    const hasUrlOrLocal = Boolean(service.url || service.local);
+    const hasUri = Boolean(service.uri);
+
+    if (!hasUrlOrLocal || !hasUri) {
+      console.error(
+        `Service "${name}" must provide both (url or local) and uri properties.`,
+      );
+    }
+  };
+
+  validateRouter = (name, services_config) => {
+    if (!services_config?.[name]) {
+      console.info(
+        `Missing required "${name}" service configuration in services_config`,
+      );
+      return false;
+    }
+
+    const prefix = services_config?.[name].local;
+    if (!prefix) {
+      return false;
+    }
+
+    return prefix;
+  };
+}
+
+export default Utils;