godprotocol 1.2.36 → 1.2.50

package/Objects/Account.js

@@ -166,6 +166,7 @@ class Account extends Utils {
       account: this.physical_address,
     });
 
+    passes.secrecy = true;
     let pass = await passes.readone(),
       passed = false;
 

package/Objects/Manager.js

@@ -379,10 +379,14 @@ class Manager {
           this.served = true;
           this.oracle = this.options.oracle;
           if (this.options.init_account) {
-            await this.add_account(this.options.init_account.name, {
-              password: this.options.init_account.password,
-              init: true,
-            });
+            console.log(
+              "Initiate manager account...",
+              this.options.init_account.name
+            );
+            // await this.add_account(this.options.init_account.name, {
+            //   password: this.options.init_account.password,
+            //   init: true,
+            // });
 
             cb && cb();
           }
@@ -406,18 +410,6 @@ class Manager {
     return acc;
   };
 
-  get_from_repo = async (address, options = {}) => {
-    let acc = this.get_acc(options);
-
-    address = `.storage/${acc}/${address}/__literal__`;
-    let content = await this.oracle.get_from_repos(address, {
-      count: 1,
-      args: options,
-    });
-
-    return content && JSON.parse(content);
-  };
-
   get_acc = (options) => {
     let acc = options.account;
     if (!acc) {
@@ -429,19 +421,6 @@ class Manager {
     return acc;
   };
 
-  set_to_repo = async (address, content, options = {}) => {
-    let acc = this.get_acc(options);
-
-    address = `.storage/${acc}/${address}/__literal__`;
-    let response = await this.oracle.set_to_repos(
-      address,
-      JSON.stringify(content),
-      { count: 1, args: options }
-    );
-
-    return response;
-  };
-
   get_account = async (name) => {
     let acc = this.accounts[name];
     if (!acc) {

package/Objects/Oracle.js

@@ -1,8 +1,9 @@
 import { post_request } from "../utils/services.js";
 
 class Oracle_client {
-  constructor(server) {
+  constructor(server, options = {}) {
     this.server = server;
+    this.manager_key = options.manager_key;
 
     this.repo_cache = new Object();
     this.repos = [];
@@ -20,38 +21,40 @@ class Oracle_client {
     return repo_;
   };
 
-  write_local = async (path, content) => {
+  write_local = async (path, content, options) => {
     if (this.local) {
-      await this.local.write(path, content);
+      await this.local.write(path, content, options);
     }
   };
 
-  read_local = async (path) => {
+  read_local = async (path, options) => {
     if (this.local) {
-      let content = await this.local.read(path);
+      let content = await this.local.read(path, options);
       return content;
     }
     return null;
   };
 
-  write = async (path, content) => {
+  write = async (path, content, options) => {
     await this.fetch({
       method: Array.isArray(content) ? "write_bulk" : "write",
-      args: { path, content },
+      args: { path, content, options },
     });
   };
 
-  read = async (path) => {
+  read = async (path, options = {}) => {
     let repo = this.repo_cache[path],
       content;
 
     if (repo) {
-      content = await repo.read(path);
+      if (options.decrypt === true) options.decrypt = this.manager_key;
+
+      content = await repo.read(path, { decrypt: options.decrypt });
     }
     if (!content) {
       let response = await this.fetch({
         method: "read",
-        args: { path },
+        args: { path, options },
       });
       content = response && response.content;
       if (content) {
@@ -131,7 +134,6 @@ class Oracle_client {
       },
     });
     if (!auth) return;
-    console.log("Oracle authenticated:", auth);
 
     if (auth.token) {
       if (local) {
@@ -146,20 +148,20 @@ class Oracle_client {
   get_auth_token = async () => {
     let token = this.auth_token;
     if (!token) {
-      token = await this.read_local(this.token_addr);
+      token = await this.read_local(this.token_addr, {
+        decrypt: this.manager_key,
+      });
       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`;
+  token_addr = `.clients/sign`;
 
   set_auth_token = async (token) => {
     let obj = { client: this.client, token };
@@ -168,7 +170,9 @@ class Oracle_client {
 
       obj.expired = true;
     }
-    await this.write_local(this.token_addr, JSON.stringify(obj));
+    await this.write_local(this.token_addr, JSON.stringify(obj), {
+      encrypt: this.manager_key,
+    });
   };
 
   cloth_repo = async (repo) => {

package/package.json

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

package/utils/services.js

@@ -1,5 +1,5 @@
-import http from 'http'
-import https from 'https'
+import http from "http";
+import https from "https";
 
 const post_request = (payload, cb) => {
   // let options = {
@@ -13,41 +13,35 @@ const post_request = (payload, cb) => {
   //   },
   // };
 
-  // console.log(payload)
   return new Promise((resolve, reject) => {
-    let data = payload.data
-    
+    let data = payload.data;
+
     let header = {
-        ...payload.options,
-        method: payload.options.method || "POST",
-        headers: {
-          ...payload.options.headers,
-          "Content-Type": "application/json",
-        },
-        rejectUnauthorized: false,
-        // minVersion: "TLSv1.2",
-      }
-      if(payload.data){
-        header["Content-Length"] = Buffer.byteLength(data)
-      }
-
-      let mod = process.env.VERCEL ? https : http
-    let req = mod.request(
-      header,
-      (res) => {
-        let data = "";
-
-        res.on("data", (chunk) => {
-          data += chunk;
-        });
-
-        res.on("end", () => {
-          // console.log('hey')
-          resolve(data && JSON.parse(data));
-          // console.log("Response:", data);
-        });
-      }
-    );
+      ...payload.options,
+      method: payload.options.method || "POST",
+      headers: {
+        ...payload.options.headers,
+        "Content-Type": "application/json",
+      },
+      rejectUnauthorized: false,
+      // minVersion: "TLSv1.2",
+    };
+    if (payload.data) {
+      header["Content-Length"] = Buffer.byteLength(data);
+    }
+
+    let mod = process.env.LOCALHOST ? http : https;
+    let req = mod.request(header, (res) => {
+      let data = "";
+
+      res.on("data", (chunk) => {
+        data += chunk;
+      });
+
+      res.on("end", () => {
+        resolve(data && JSON.parse(data));
+      });
+    });
 
     req.on("error", (e) => {
       reject(e);