godprotocol 2.3.22 → 2.3.24

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) {
@@ -49,8 +52,12 @@ class GodProtocol {
 
   add_router = async (version, routes, opts = {}) => {
     if (opts?.prefix) {
-      version = `${opts.prefix}:${version}`;
-      if (!opts.db_name) opts.db_name = 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();
@@ -61,7 +68,10 @@ class GodProtocol {
       return;
     }
 
-    await this.route_table.init_version(version, {db_name: opts.db_name, db_prefix:opts.db_prefix});
+    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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "godprotocol",
-  "version": "2.3.22",
+  "version": "2.3.24",
   "description": "A distributed computing environment for Web 4.0 — integrating AI, decentralisation, and virtual computation.",
   "main": "Index.js",
   "type": "module",

package/server/Routable/Route_table.js

@@ -24,14 +24,14 @@ class Route_table extends Headers {
   get_version = async (version = this.active_version) => {
     let ver = this.versions[version];
 
-    if (!ver){
+    if (!ver) {
       let versions = Object.keys(this.versions);
-      let verr= versions.find(v=>v.startsWith(`${version}:`));
+      let verr = versions.find((v) => v.startsWith(`${version}:`));
 
-      if (verr){
+      if (verr) {
         let serv = await this.get_service(version);
-        if (serv){
-          version  = `${version}:${serv.api_version}`
+        if (serv) {
+          version = `${version}:${serv.api_version}`;
           ver = this.versions[version];
         }
       }
@@ -80,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/Utils_.js

@@ -0,0 +1,45 @@
+class Utils {
+  validateService = (names, services) => {
+    let hasErrors = false;
+
+    for (const name of names) {
+      const service = services[name];
+
+      if (!service) {
+        console.error(`Service "${name}" is missing.`);
+        hasErrors = true;
+        continue;
+      }
+
+      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.`,
+        );
+        hasErrors = true;
+      }
+    }
+
+    return !hasErrors;
+  };
+
+  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;