godprotocol 2.2.59 → 2.2.60

package/package.json

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

@@ -98,11 +98,11 @@ class Headers extends Services {
     // 🔹 1. Try cache
     const cached = await db.read_cache(query, "auth");
 
-    if (cached?.payload) {
+    if (cached) {
       try {
         return {
           ok: true,
-          data: JSON.parse(cached.payload),
+          data: cached,
         };
       } catch {
         // corrupted cache → ignore
@@ -111,7 +111,7 @@ class Headers extends Services {
 
     // 🔹 2. Call remote
     const headers = {
-      "x-api-version": "v2",
+      "x-api-version": "v3",
       "x-api-key": api_key,
     };
 
@@ -124,7 +124,7 @@ class Headers extends Services {
       headers: {
         "Content-Type": "application/json",
         Accept: "application/json",
-        "x-api-version": "v2",
+        "x-api-version": "v3",
         ...headers,
       },
       body: JSON.stringify({}),
@@ -152,11 +152,11 @@ class Headers extends Services {
     // 🔹 1. Try cache
     const cached = await db.read_cache(query, "auth");
 
-    if (cached?.payload) {
+    if (cached) {
       try {
         return {
           ok: true,
-          data: JSON.parse(cached.payload),
+          data: cached,
         };
       } catch {
         // corrupted cache → ignore
@@ -222,7 +222,9 @@ class Headers extends Services {
       return {
         ok: false,
         status: 401,
-        message: "Unauthorized",
+        message:
+          "Unauthorized: Missing required authentication headers of type(s): " +
+          route.config.security.join(", "),
       };
     }
 
@@ -232,10 +234,13 @@ class Headers extends Services {
     if (authorisation) authorisation = authorisation.replace("Bearer ", "");
 
     let val;
-    if (xplatform) {
-      val = await this.validate_third_party(xplatform, authorisation);
-    } else {
+    if (api_key) {
       val = await this.validate_api_key(api_key, authorisation);
+    } else if (authorisation) {
+      val = await this.validate_third_party(
+        xplatform || this.platform_uri,
+        authorisation,
+      );
     }
 
     // debug(val);
@@ -246,7 +251,8 @@ class Headers extends Services {
       if (!val) {
         return {
           ok: false,
-          message: "malformed header validation",
+          message:
+            "Unauthorized: Invalid credentials provided in authentication headers",
           status: 403,
         };
       }

package/server/Routable/Route_table.js

@@ -63,18 +63,24 @@ class Route_table extends Headers {
   };
 
   check_validation = async (rule, data) => {
-    let { prop, type, required, default: is_default } = rule;
+    let { prop, type, required } = rule;
 
     let data_value = data[prop];
 
-    data_value =
-      data_value == null || data_value == undefined ? is_default : data_value;
-
-    if (required && (data_value == null || data_value == is_default))
-      return { ok: false, message: `Field '${prop}' is required` };
+    if (data_value === undefined && rule.hasOwnProperty("default_value")) {
+      data_value = rule.default_value;
+      data[prop] = data_value;
+    }
 
-    if (data_value == null) {
-      return { ok: true };
+    if (data_value === undefined || data_value === null) {
+      if (required) {
+        return {
+          ok: false,
+          message: `Field '${prop}' is required`,
+        };
+      } else {
+        return { ok: true };
+      }
     }
 
     if (type) {

package/server/Routable/Services.js

@@ -41,7 +41,7 @@ class Services {
         headers: {
           "Content-Type": "application/json",
           Accept: "application/json",
-          "x-api-version": "v2",
+          "x-api-version": "v3",
           "x-api-key": this.api_key,
         },
         body: JSON.stringify({ platform_uri: service.uri, ...id }),
@@ -63,7 +63,9 @@ class Services {
       return {
         ok: false,
         status: 500,
-        message: e.message,
+        message:
+          e.message ||
+          `Error fetching ${service.uri} service token for profile`,
       };
     }
 
@@ -107,7 +109,8 @@ class Services {
         } catch (e) {
           return {
             ok: false,
-            message: e.message,
+            message:
+              e.message || `Error calling ${service} service at path ${path}`,
             status: 500,
           };
         }