godprotocol 2.3.24 → 2.3.26

package/Godprotocol.js

@@ -3,6 +3,23 @@ import Route_table from "./server/Routable/Route_table.js";
 import Utils from "./server/Utils_.js";
 import version_middleware from "./server/version_control.js";
 
+let gp_services = async (services_, gp) => {
+  if (!gp.utils.validateService(["identity"], services_)) return;
+
+  let { identity } = services_;
+
+  return {
+    identity: {
+      api_version: "v3",
+      uri: identity.uri,
+      local: identity.local,
+      url: identity.url,
+      profile_key: identity.profile_key,
+      api_key: identity.api_key,
+    },
+  };
+};
+
 class GodProtocol {
   constructor(config) {
     this.db_config = config.db_config;
@@ -17,9 +34,23 @@ class GodProtocol {
 
     this.memory = new Map();
 
+    this.capabilities = config.capabilities;
+
     this.utils = new Utils();
+    this.load_gp_services();
   }
 
+  __gp_version = "__GP__";
+
+  load_gp_services = async () => {
+    if (!this.capabilities) return;
+
+    await this.route_table.load_services(
+      await gp_services(this.capabilities, this),
+      this.__gp_version,
+    );
+  };
+
   on_start(fn) {
     this.startup_fn = fn;
   }
@@ -51,12 +82,22 @@ class GodProtocol {
   };
 
   add_router = async (version, routes, opts = {}) => {
+    if (opts.alias) {
+      for (let o of opts.alias) {
+        await this.add_router(version, routes, {
+          ...opts,
+          alias: null,
+          prefix: o,
+          is_alias: true,
+        });
+      }
+    }
     if (opts?.prefix) {
       if (opts.prefix === "..") {
         opts.prefix = "";
       } else {
         version = `${opts.prefix}:${version}`;
-        if (!opts.db_name) opts.db_name = opts.prefix;
+        if (!opts.is_alias && !opts.db_name) opts.db_name = opts.prefix;
       }
     }
 

package/package.json

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

@@ -1,18 +1,17 @@
 import { Mongo } from "@godprotocol/repositories";
-import Services, { gp_services } from "./Services.js";
+import Services from "./Services.js";
 
 class DB {
   constructor(config, router) {
     this.router = router;
-    
-    this.db_name=config.db_name;
+
+    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 = {};
@@ -135,12 +134,19 @@ class Headers extends Services {
       }
     }
 
-    let gp_profile = await this.get_service('identity');
-    let res =  await gp_profile.call('validate', {}, {
-      api_key,
-      token: authorization,
-      api_version:'v3'
-    })
+    let gp_profile = await this.get_service("identity", {
+      version: this.gp.__gp_version,
+    });
+
+    let res = await gp_profile.call(
+      "validate",
+      {},
+      {
+        api_key,
+        token: authorization,
+        api_version: "identity:v3",
+      },
+    );
 
     // 🔹 3. Save cache if valid
     if (res.ok && res.data) {
@@ -191,19 +197,26 @@ class Headers extends Services {
       hst = hst.replace("10.0.2.2", "localhost");
     }
 
-    let gp_profile = await this.get_service("identity")
+    let gp_profile = await this.get_service("identity", {
+      version: this.gp.__gp_version,
+    });
 
-    let third_party =
-      xplatform !== this.platform_uri //&& !gp_profile.url.endsWith(hst);
+    let third_party = xplatform !== this.platform_uri; //&& !gp_profile.url.endsWith(hst);
 
     // 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
-    })
-    
+    let res = await gp_profile.call(
+      `${third_party ? "third_party_me" : "me"}`,
+      third_party ? { from: xplatform } : {},
+      {
+        token: authorization,
+        xplatform,
+        api_version: "identity:v3",
+      },
+    );
+
     // 🔹 3. Save cache
     if (res.ok && res.data) {
       await db.save_cache(query, res.data, "auth");

package/server/Routable/Services.js

@@ -1,17 +1,10 @@
 import { DB } from "./Header.js";
 
-let gp_services = () => {
-  return {};
-};
-
-export { gp_services };
-
 class Services {
   constructor() {
     this.services = new Object();
 
     this.dbs = new Object();
-    this.load_services(gp_services);
     this.version_services = {};
   }
 
@@ -42,16 +35,13 @@ class Services {
 
     if (token) return token.token;
     try {
-      let gp_profile = gp_services().identity;
-      let ftch = await fetch(`${gp_profile.url}/get_token`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Accept: "application/json",
-          "x-api-version": gp_profile.api_version,
-          "x-api-key": this.api_key,
-        },
-        body: JSON.stringify({ platform_uri: service.uri, ...id }),
+      let gp_profile = await this.get_service("identity", {
+        version: this.gp.__gp_version,
+      });
+
+      let ftch = await gp_profile.call(`get_token`, {
+        platform_uri: service.uri,
+        ...id,
       });
 
       token = await ftch.json();
@@ -77,10 +67,10 @@ class Services {
     return token;
   };
 
-  get_service = async (service) => {
+  get_service = async (service, opts = {}) => {
+    let ver = opts?.version || this.active_version;
     let servic =
-      this.version_services[this.active_version]?.[service] ||
-      this.services[service];
+      this.version_services[ver]?.[service] || this.services[service];
 
     if (!servic) return;
 
@@ -92,18 +82,18 @@ class Services {
           "Content-Type": "application/json",
           Accept: "application/json",
           "x-api-version": servic.local
-            ? `${servic.local}:${servic.api_version || header.api_version}`
-            : servic.api_version || header.api_version || "v1",
+            ? `${servic.local}:${header.api_version || servic.api_version}`
+            : header.api_version || servic.api_version || "v1",
         };
-        
-        if (header?.api_key){
-          headers['x-api-key'] = header.api_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}`
+        if (header?.token) {
+          headers["Authorization"] = `Bearer ${header.token}`;
           headers["x-platform"] = this.platform_uri;
         } else if (servic.profile_key) {
           headers["Authorization"] = `${servic.profile_key}`;
@@ -113,10 +103,10 @@ class Services {
           if (typeof token !== "string") {
             if (token?.ok === false) return token;
           }
-          
+
           if (token) headers["Authorization"] = `Bearer ${token}`;
           headers["x-platform"] = this.platform_uri;
-        } 
+        }
 
         if (
           !headers["x-api-key"] &&
@@ -131,7 +121,7 @@ class Services {
         }
 
         try {
-            let prev_version = this.active_version;
+          let prev_version = this.active_version;
 
           let response = await fetch(
             `${servic.local ? this.gp.server.domain : servic.url}/${path}`,
@@ -142,9 +132,11 @@ class Services {
             },
           );
 
-          this.get_version(prev_version)
+          let reply = await response.json();
 
-          return await response.json();
+          this.get_version(prev_version);
+
+          return reply;
         } catch (e) {
           return {
             ok: false,
@@ -174,9 +166,9 @@ class Services {
 
     let db = this.dbs[name];
     if (!db) {
-      let conf = {...this.db_config};
-      if (name){
-        conf = {...this.db_config, db_name: name}
+      let conf = { ...this.db_config };
+      if (name) {
+        conf = { ...this.db_config, db_name: name };
       }
       db = new DB(conf, this);
 
@@ -194,7 +186,7 @@ class Services {
       return res && Object.keys(res).hasOwnProperty("ok") ? res : { ok: false };
     }
     return {
-      ok: true, 
+      ok: true,
     };
   };