godprotocol 1.2.32 → 1.2.34

package/Objects/Oracle.js

@@ -5,13 +5,33 @@ class Oracle_client {
     this.server = server;
 
     this.repo_cache = new Object();
+    this.repos = [];
   }
 
   add_repo = async (repo) => {
+    let repo_ = await this.Repos.cloth_repo(repo.repo);
+    this.repos.push(repo_);
+
     await this.fetch({
       method: "add_repo",
       args: repo,
     });
+
+    return repo_;
+  };
+
+  write_local = async (path, content) => {
+    if (this.local) {
+      await this.local.write(path, content);
+    }
+  };
+
+  read_local = async (path) => {
+    if (this.local) {
+      let content = await this.local.read(path);
+      return content;
+    }
+    return null;
   };
 
   write = async (path, content) => {
@@ -58,12 +78,13 @@ class Oracle_client {
   };
 
   fetch = async (payload) => {
+    let auth_token = await this.get_auth_token();
     let headers;
-    if (payload.method !== "authenticate" && !this.auth_token) {
+    if (payload.method !== "authenticate" && !auth_token) {
       await this.sync(this.client);
     } else if (payload.method !== "authenticate") {
       headers = {
-        authorisation: this.auth_token,
+        authorisation: auth_token,
       };
     }
 
@@ -77,6 +98,12 @@ class Oracle_client {
         data: JSON.stringify(payload.args),
       });
 
+      if (resp.error === "Token expired") {
+        await this.set_auth_token(null);
+        await this.sync(this.client);
+        resp = await this.fetch(payload);
+      }
+
       return resp || null;
     } catch (e) {
       console.warn("fetch error:", e.message || e);
@@ -84,20 +111,63 @@ class Oracle_client {
     }
   };
 
-  sync = async (client, Repos) => {
+  sync = async (client, Repos, local) => {
     this.client = client;
     if (Repos) this.Repos = new Repos();
 
+    if (local) this.local = await this.Repos.cloth_repo(local.repo);
+
+    await this.get_auth_token();
+    if (this.auth_token) {
+      if (local) {
+        this.local = await this.add_repo(local);
+        return;
+      }
+    }
     let auth = await this.fetch({
       method: "authenticate",
       args: {
         client: this.client,
       },
     });
+    console.log("Oracle authenticated:", auth);
 
     if (auth.token) {
-      this.auth_token = auth.token;
+      if (local) {
+        this.auth_token = auth.token;
+        this.local = await this.add_repo(local);
+      }
+
+      await this.set_auth_token(auth.token);
+    }
+  };
+
+  get_auth_token = async () => {
+    let token = this.auth_token;
+    if (!token) {
+      token = await this.read_local(this.token_addr);
+      if (token && token.expired) token = null;
+      console.log("read token:", token);
+      if (token) {
+        token = JSON.parse(token);
+        this.auth_token = token.token;
+        this.client = token.client;
+      }
+    }
+    console.log("Oracle auth token:", this.auth_token);
+    return this.auth_token;
+  };
+
+  token_addr = `.accounts/sign`;
+
+  set_auth_token = async (token) => {
+    let obj = { client: this.client, token };
+    if (!token) {
+      this.auth_token = null;
+
+      obj.expired = true;
     }
+    await this.write_local(this.token_addr, JSON.stringify(obj));
   };
 
   cloth_repo = async (repo) => {

package/html/index.js

@@ -1,29 +1,29 @@
-import create from './create.js'
-import run from './run.js'
-import load from './load.js'
-import parse from './parse.js'
-
-let routes = ['create_account', 'load', 'run', 'parse']
-
-const forms = (route, manager)=>{
-    let pair = {
-        create_account: create,
-        load,
-        run,
-        parse,
-    }
-    let rt = pair[route]
-    if (rt) return rt(manager)
-
-    return ''
-}
-
-const header_script = (manager)=>{
-    let domain = manager.options.server_domain
-    if (domain.startsWith('127')) domain = `http://${domain}`
-    else domain = `https://${domain}`
-
-    return ` let ftch = async(path, body)=>{
+import create from "./create.js";
+import run from "./run.js";
+import load from "./load.js";
+import parse from "./parse.js";
+
+let routes = ["create_account", "load", "run", "parse"];
+
+const forms = (route, manager) => {
+  let pair = {
+    create_account: create,
+    load,
+    run,
+    parse,
+  };
+  let rt = pair[route];
+  if (rt) return rt(manager);
+
+  return "";
+};
+
+const header_script = (manager) => {
+  let domain = manager.options.server_domain;
+  if (domain.startsWith("127")) domain = `http://${domain}`;
+  else domain = `https://${domain}`;
+
+  return ` let ftch = async(path, body)=>{
       try{
         let fch = await fetch("${domain}".concat(path), {
           method: 'POST',
@@ -39,11 +39,11 @@ const header_script = (manager)=>{
         console.log(e)
         return {message: e.message}
       }
-    }`
-}
+    }`;
+};
 
 const header = (route) => {
-    let tml = `<nav class="navbar navbar-expand-lg navbar-light bg-light shadow-sm">
+  let tml = `<nav class="navbar navbar-expand-lg navbar-light bg-light shadow-sm">
     <div class="container">
       <a class="navbar-brand fw-bold" href="/">GODPROTOCOL</a>
       <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
@@ -53,23 +53,25 @@ const header = (route) => {
 
       <div class="collapse navbar-collapse justify-content-center" id="navbarNav">
       <ul class="navbar-nav" id="nav-list">
-        `
+        `;
 
-    routes.map(r=>{
-        tml = `${tml}<li class='nav-item'><a href='/${r}' class="nav-link text-capitalize ${route === r ? 'active text-danger fw-bold' : ''}">${r.replace(/_/g, ' ')}</a></li>`
-    })
+  routes.map((r) => {
+    tml = `${tml}<li class='nav-item'><a href='/${r}' class="nav-link text-capitalize ${
+      route === r ? "active text-danger fw-bold" : ""
+    }">${r.replace(/_/g, " ")}</a></li>`;
+  });
 
-    tml = `${tml}</ul>
+  tml = `${tml}</ul>
       </div>
     </div>
-  </nav>`
+  </nav>`;
 
-    return tml
-}
+  return tml;
+};
 
 const footer = (route) => {
-    let yr = new Date().getFullYear()
-    let tml = `<footer class="mt-auto py-3 bg-light text-center">
+  let yr = new Date().getFullYear();
+  let tml = `<footer class="mt-auto py-3 bg-light text-center">
     <div class="container">
       <p class="mb-1">
         Made with <i class="bi bi-heart-fill text-danger"></i> by 
@@ -80,18 +82,18 @@ const footer = (route) => {
         <span id="year">${2025 - yr !== 0 ? `${2025} - ${yr}` : yr}</span>
       </small>
     </div>
-  </footer>`
-
-    return tml
-}
-
-const set_page = (route, manager)=>{
-    let title = `GODPROTOCOL`
-    let init_acc = manager.init_account
-    if (init_acc){
-        title = `${init_acc.name} - ${title}`
-    }
-    let tml = `
+  </footer>`;
+
+  return tml;
+};
+
+const set_page = (route, manager) => {
+  let title = `GODPROTOCOL`;
+  let init_acc = manager.options.init_account;
+  if (init_acc) {
+    title = `${init_acc.name} - ${title}`;
+  }
+  let tml = `
     <html>
     <head>
         <meta charset="UTF-8">
@@ -103,21 +105,21 @@ const set_page = (route, manager)=>{
 
     </head>
 
-    <body class="d-flex flex-column min-vh-100"><div class="container text-center my-5"><h1 id='page-title' class='mb-4'>${title}</h1>`
+    <body class="d-flex flex-column min-vh-100"><div class="container text-center my-5"><h1 id='page-title' class='mb-4'>${title}</h1>`;
 
-    tml = `${tml}${header(route)}`
+  tml = `${tml}${header(route)}`;
 
-    tml = `${tml}<script>${header_script(manager)}</script>`
+  tml = `${tml}<script>${header_script(manager)}</script>`;
 
-    if (route !== ''){
-        tml = `${tml}${forms(route, manager)}`
-    }
+  if (route !== "") {
+    tml = `${tml}${forms(route, manager)}`;
+  }
 
-    tml = `${tml}${footer(route)}`
-    tml = `${tml}<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script></div></body> </html>
-`
+  tml = `${tml}${footer(route)}`;
+  tml = `${tml}<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script></div></body> </html>
+`;
 
-    return tml
-}
+  return tml;
+};
 
-export {set_page}
+export { set_page };

package/html/load.js

@@ -1,5 +1,5 @@
-const script = (manager)=> {
-    return `
+const script = (manager) => {
+  return `
 const account_selection_el = document.getElementById('account_selection'), address_el = document.getElementById('address'),
  sequence_el = document.getElementById('sequence'),
 id_el = document.getElementById('ID'),
@@ -96,14 +96,15 @@ load.addEventListener('click', e=>{
 
     ftch('/load', data)
     .then(res=>{
+      console.log(res)
       message_box.textContent = res.done ? 'Sequence loaded successfully! - ' + res.datapath : res.message
       return;
       }).catch(err=>console.log(err))
     
- }) `
-}
+ }) `;
+};
 
-const load = (manager)=>{
+const load = (manager) => {
   let tml = `<!-- Container for the Load form -->
 <div class="container my-5">
   <div class="row justify-content-center">
@@ -155,11 +156,11 @@ const load = (manager)=>{
       <div id="message-box" class="mt-3"></div>
     </div>
   </div>
-</div>`
+</div>`;
 
-    tml = `${tml} <script>${script(manager)}</script>`
+  tml = `${tml} <script>${script(manager)}</script>`;
 
-    return tml
-}
+  return tml;
+};
 
-export default load
+export default load;

package/package.json

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

package/utils/create_server.js

@@ -4,6 +4,36 @@ import { generate_random_string } from "generalised-datastore/utils/functions.js
 let PORT = Number(process.env.PORT) || 1408,
   account_uids = {};
 
+const set_account_uid = async (uid, account_name, manager) => {
+  account_uids[uid] = account_name;
+  manager.oracle.write_local(
+    `.account_uids/${uid}`,
+    JSON.stringify({
+      account_name,
+      timestamp: Date.now(),
+    })
+  );
+};
+
+const get_account = async (uid, manager) => {
+  if (account_uids[uid]) return account_uids[uid];
+  let account_name = await manager.oracle.read_local(`.account_uids/${uid}`);
+
+  if (account_name) account_name = JSON.parse(account_name);
+
+  if (account_name && account_name.timestamp) {
+    // UID valid for a day
+    if (Date.now() - account_name.timestamp > 86400000) {
+      delete account_uids[uid];
+      return null;
+    } else {
+      account_name = account_name.account_name;
+      account_uids[uid] = account_name;
+    }
+  }
+  return account_name;
+};
+
 export const handle_routes = async (req, res, manager, app) => {
   try {
     // CORS
@@ -69,7 +99,7 @@ export const handle_routes = async (req, res, manager, app) => {
               result = { message: "Incorrect password." };
             } else {
               const uid = generate_random_string(16, "alnum");
-              account_uids[uid] = data.name;
+              await set_account_uid(uid, data.name, manager);
               result = { uid, message: "Account signed-in successfully." };
             }
           } else {
@@ -78,7 +108,7 @@ export const handle_routes = async (req, res, manager, app) => {
             });
             if (new_acc) {
               const uid = generate_random_string(16, "alnum");
-              account_uids[uid] = data.name;
+              await set_account_uid(uid, data.name, manager);
               result = { uid, message: "Account created successfully." };
             } else {
               result = { message: "Account creation failed." };
@@ -94,14 +124,21 @@ export const handle_routes = async (req, res, manager, app) => {
         case "/load":
         case "/run":
         case "/parse": {
-          const accountName = account_uids[data.account];
-          if (!accountName) {
-            result = { message: `Account ${data.account} not found` };
+          let account_name = await get_account(data.account, manager),
+            message;
+          if (account_name && typeof account_name === "object") {
+            message = `Session expired. Please sign in again.`;
+            account_name = null;
+          }
+          if (!account_name) {
+            result = {
+              message: message || `Account ${data.account} not found`,
+            };
           } else {
-            const accountObj = await manager.get_account(accountName);
-            if (req.url === "/load") result = await accountObj.load(data);
-            if (req.url === "/run") result = await accountObj.run(data);
-            if (req.url === "/parse") result = await accountObj.parse(data);
+            let account_obj = await manager.get_account(account_name);
+            if (req.url === "/load") result = await account_obj.load(data);
+            if (req.url === "/run") result = await account_obj.run(data);
+            if (req.url === "/parse") result = await account_obj.parse(data);
           }
           break;
         }