godprotocol 2.2.98 → 2.3.0

package/Godprotocol.js

@@ -47,6 +47,8 @@ class GodProtocol {
   };
 
   add_router = async (version, routes, opts = {}) => {
+    if (typeof routes === "function") routes = await routes();
+
     if (opts.is_old) {
       await this.route_table.init_version(version, { is_old: true });
       this.route_table.versions[version].routes = routes;

package/package.json

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

@@ -16,18 +16,28 @@ class DB {
   }
 
   read_cache = async (query, category) => {
-    let coll = await this.folder(`$CACHE-${category}`);
+    let folder_name = `$CACHE-${category}`;
 
-    // await coll.deleteMany()
-    const doc = await coll.findOne(query);
-    if (!doc) return null;
+    let Cache = await this.gp.route_table.get_services("cache");
+    let res = await Cache.call("get", {
+      key: `${folder_name}:${JSON.stringify(query)}`,
+    });
 
-    if (doc.expiry && new Date(doc.expiry) < new Date()) {
-      await coll.deleteOne({ _id: doc._id });
-      return null;
-    }
+    if (!res?.ok && res.status_code === "service_unauthorised") {
+      let coll = await this.folder(folder_name);
+
+      const doc = await coll.findOne(query);
+      if (!doc) return null;
 
-    return JSON.parse(doc?.payload);
+      if (doc.expiry && new Date(doc.expiry) < new Date()) {
+        await coll.deleteOne({ _id: doc._id });
+        return null;
+      }
+
+      return JSON.parse(doc?.payload);
+    } else {
+      return res?.ok ? JSON.parse(res.data) : null;
+    }
   };
 
   save_cache = async (
@@ -36,36 +46,49 @@ class DB {
     category,
     ttlMs = 7 * 24 * 60 * 60 * 1000,
   ) => {
-    let coll = await this.folder(`$CACHE-${category}`);
-    const now = new Date();
+    let folder_name = `$CACHE-${category}`;
+    let Cache = await this.gp.route_table.get_service("cache");
 
-    const toSet = {
-      payload: JSON.stringify(payload),
-    };
+    let res = await Cache.call("get", {
+      key: folder_name,
+      value: JSON.stringify(payload),
+      no_db: true,
+    });
 
-    // 🔥 set expiry if TTL provided
-    if (ttlMs) {
-      toSet.expiry = new Date(now.getTime() + ttlMs);
-    }
+    if (!res?.ok && res.status_code === "service_unauthorised") {
+      let coll = await this.folder(folder_name);
+      const now = new Date();
 
-    // OR use payload expiry if present
-    else if (payload?.expiry) {
-      toSet.expiry = new Date(payload.expiry);
-    }
+      const toSet = {
+        payload: JSON.stringify(payload),
+      };
 
-    const res = await coll.updateOne(
-      query,
-      {
-        $set: toSet,
-        $setOnInsert: {
-          _id: crypto.randomUUID(),
-          created: now,
+      // 🔥 set expiry if TTL provided
+      if (ttlMs) {
+        toSet.expiry = new Date(now.getTime() + ttlMs);
+      }
+
+      // OR use payload expiry if present
+      else if (payload?.expiry) {
+        toSet.expiry = new Date(payload.expiry);
+      }
+
+      res = await coll.updateOne(
+        query,
+        {
+          $set: toSet,
+          $setOnInsert: {
+            _id: crypto.randomUUID(),
+            created: now,
+          },
         },
-      },
-      { upsert: true },
-    );
+        { upsert: true },
+      );
 
-    return res;
+      return res;
+    } else {
+      return res;
+    }
   };
 
   folder = async (name) => {

package/server/Routable/Services.js

@@ -131,7 +131,8 @@ class Services {
         ) {
           return {
             ok: false,
-            meesage: "Service unauthorized",
+            status_code: "service_unauthorised",
+            meesage: "Service unauthorised",
           };
         }
         try {