godprotocol 2.3.19 → 2.3.21

package/Godprotocol.js

@@ -28,10 +28,6 @@ class GodProtocol {
   }
 
   uri_default_domain = (uri) => {
-    if (!uri.includes(".")) {
-      uri = `${uri}.savvyaisolution.com`;
-    }
-
     return uri;
   };
 
@@ -52,6 +48,8 @@ class GodProtocol {
   };
 
   add_router = async (version, routes, opts = {}) => {
+    if (opts?.prefix) version = `${opts.prefix}:${version}`;
+
     if (typeof routes === "function" && !opts.is_old) routes = await routes();
 
     if (opts.is_old) {
@@ -62,7 +60,7 @@ class GodProtocol {
 
     await this.route_table.init_version(version);
 
-    await this.route_table.load_routes(routes);
+    await this.route_table.load_routes(routes, opts);
   };
 
   call = async (route, { headers, body }) => {

package/package.json

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

@@ -142,7 +142,7 @@ class Headers extends Services {
       headers["authorization"] = `Bearer ${authorization}`;
     }
 
-    let gp_profile = gp_services().profile;
+    let gp_profile = gp_services().identity;
     let res = await fetch(`${gp_profile.url}/validate`, {
       method: "post",
       headers: {
@@ -204,7 +204,7 @@ class Headers extends Services {
       hst = hst.replace("10.0.2.2", "localhost");
     }
 
-    let gp_profile = gp_services().profile;
+    let gp_profile = gp_services().identity;
 
     let third_party =
       xplatform !== this.platform_uri && !gp_profile.url.endsWith(hst);

package/server/Routable/Route_table.js

@@ -46,12 +46,12 @@ class Route_table extends Headers {
     this.validators[name] = fn;
   };
 
-  load_routes = async (routes) => {
+  load_routes = async (routes, opts) => {
     if (this.active_version === "*") {
       this.versions[this.active_version] = {
         handler: routes.handler,
         config: {
-          security: securities[config.security || "none"],
+          security: securities[config.security || "auth_token"],
           schema: routes.schema,
         },
       };
@@ -65,6 +65,11 @@ class Route_table extends Headers {
 
       await this.add_route(name, handler, config);
     }
+
+    if (opts?.services) {
+      let services = await opts.services(opts.services_config);
+      await this.load_services(services, this.active_version);
+    }
   };
 
   add_route = async (name, handler, config) => {

package/server/Routable/Services.js

@@ -1,31 +1,7 @@
 import { DB } from "./Header.js";
 
 let gp_services = () => {
-  let DEV = process.env.DEV;
-
-  return {
-    profile: {
-      url: DEV
-        ? "http://localhost:4000"
-        : "https://profile-api.savvyaisolution.com",
-      api_version: "v3",
-      uri: "profiles.savvyaisolution.com",
-    },
-    settings: {
-      url: DEV
-        ? "http://localhost:4005"
-        : "https://settings-api.savvyaisolution.com",
-      api_version: "v1",
-      uri: "settings.savvyaisolution.com",
-    },
-    godprotocol: {
-      url: DEV
-        ? "http://localhost:4001"
-        : "https://godprotocol-api.savvyaisolution.com",
-      api_version: "v1",
-      uri: "godprotocol.savvyaisolution.com",
-    },
-  };
+  return {};
 };
 
 export { gp_services };
@@ -36,10 +12,21 @@ class Services {
 
     this.dbs = new Object();
     this.load_services(gp_services);
+    this.version_services = {};
   }
 
-  load_services = async (services) => {
-    if (typeof services === "function") services = await services();
+  load_services = async (services, version) => {
+    if (typeof services === "function")
+      services = await services(this.gp, version);
+
+    if (version) {
+      let servs = this.version_services[version];
+      if (!servs) servs = {};
+      servs = { ...servs, ...services };
+
+      this.version_services[version] = servs;
+      return;
+    }
 
     this.services = { ...this.services, ...services };
   };
@@ -55,7 +42,7 @@ class Services {
 
     if (token) return token.token;
     try {
-      let gp_profile = gp_services().profile;
+      let gp_profile = gp_services().identity;
       let ftch = await fetch(`${gp_profile.url}/get_token`, {
         method: "POST",
         headers: {
@@ -91,7 +78,10 @@ class Services {
   };
 
   get_service = async (service) => {
-    let servic = this.services[service];
+    let servic =
+      this.version_services[this.active_version]?.[service] ||
+      this.services[service];
+
     if (!servic) return;
 
     return {
@@ -100,7 +90,9 @@ class Services {
         let headers = {
           "Content-Type": "application/json",
           Accept: "application/json",
-          "x-api-version": servic.api_version || "v1",
+          "x-api-version": servic.local
+            ? `${servic.local}:${servic.api_version}`
+            : servic.api_version || "v1",
         };
         let token;
         if (servic.profile_key) {
@@ -134,11 +126,14 @@ class Services {
           };
         }
         try {
-          let response = await fetch(`${servic.url}/${path}`, {
-            method: "POST",
-            headers,
-            body: JSON.stringify(body || {}),
-          });
+          let response = await fetch(
+            `${servic.local ? this.gp.server.domain : servic.url}/${path}`,
+            {
+              method: "POST",
+              headers,
+              body: JSON.stringify(body || {}),
+            },
+          );
 
           return await response.json();
         } catch (e) {