godprotocol 1.1.32 → 1.2.1

package/utils/create_server.js

@@ -1,13 +1,14 @@
-import https from "https";
+// import https from "https";
 import http from "http";
+import {set_page} from '../html/index.js'
+import { generate_random_string } from "generalised-datastore/utils/functions.js";
 
-let PORT = Number(process.env.PORT) || 1408;
+let PORT = Number(process.env.PORT) || 1408, account_uids = new Object();
 
-const handle_routes = (req, res, manager, app) => {
+const handle_routes = async(req, res, manager, app) => {
   let data = "";
-  res.setHeader("Access-Control-Allow-Origin", "*");
-  res.setHeader("Access-Control-Allow-Headers", "Content-Type");
 
+    
   if (req.method === "OPTIONS") {
     res.writeHead(204, {
       "Access-Control-Allow-Origin": "*",
@@ -17,42 +18,82 @@ const handle_routes = (req, res, manager, app) => {
     res.end();
     return;
   }
+  if (req.url === '/'){
+    res.writeHead(200, {'Content-Type': 'text/html'})
+      res.end(set_page(req.url, manager))
+      return;
+  }
+  
+  if (['/create_account', '/load', '/run', '/parse', '/oracle'].includes(req.url)){
+    res.setHeader("Access-Control-Allow-Origin", "*");
+    res.setHeader("Access-Control-Allow-Headers", "Content-Type");
 
-  if (['/create_account', '/load', '/run', '/parse'].includes(req.url)){
+    if (req.method === 'GET'){
+      let tml = set_page(req.url.slice(1), manager)
+
+      res.writeHead(200, {'Content-Type': 'text/html'})
+      res.end(tml)
+      return;
+    }
+  
     req.on("data", (chunk) => {
       data += chunk;
     });
   
+    res.writeHead(200, { "Content-type": "application/json" });
+
     req.on("end", async () => {
       if (!data) {
         res.writeHead(400, { "Content-Type": "application/json" });
         res.end(JSON.stringify({ error: "Request body cannot be empty" }));
         return;
       }
-
       data = JSON.parse(data)
       let result;
 
       if (req.url === '/create_account'){
-        result = await manager.add_account(data.name, data.options)
-        res.end(JSON.stringify(result.stringify()))
-      }else if(req.url === '/load'){
-        let account = await manager.get_account(data.account);
-        result = await account.load(data)
+        let acc = await manager.get_account(data.name)
+        if (acc){
+          if(!await acc.verify(data.password)){
+            result = {message: "Incorrect password."}
+          } else {
+            let uid = generate_random_string(16, 'alnum')
+            account_uids[uid] = data.name
+            result = {uid, message: "Account signed-in successfully."}
+          }
+        }else {
+          result = await manager.add_account(data.name, {password: data.password})
+          result = result ? {uid: generate_random_string(16, 'alnum'), message: 'Account created successfully.'} : {message: 'Incorrect password.'}
+          account_uids[result.uid] = data.name
+        }
+
         res.end(JSON.stringify(result))
-      }else if(req.url === '/run'){
-        let account = await manager.get_account(data.account);
-        result = await account.run(data)
+      } else if (req.url === '/oracle') {
+        // console.log(data)
+        let reslt = await manager.oracle.call(data)
+        res.end(JSON.stringify(reslt))
+      } else {
+        let account = account_uids[data.account]
         
-        res.writeHead(200, { "Content-type": "application/json" });
+        if (!account){
+          return res.end(JSON.stringify({message: `Account:${data.account} is not found.`}))
+        }
+        account = await manager.get_account(account)
+        if(req.url === '/load'){
+          result =  await account.load(data)
+  
+          res.end(JSON.stringify({datapath: result, done: true}))
+        }else if(req.url === '/run'){
+          result = await account.run(data)
 
-        res.end(result? JSON.stringify(result): JSON.stringify({done: true}))
-      }else if(req.url === '/parse'){
-        let account = await manager.get_account(data.account);
-        result = await account.parse(data)
-        
-        res.end(result? JSON.stringify(result): JSON.stringify({done: true}))
+          res.end(JSON.stringify({thread_id: result.thread_id, callback: result.callback}))
+        }else if(req.url === '/parse'){
+          result = await account.parse(data)
+          
+          res.end(result? JSON.stringify(result): JSON.stringify(null))
+        }
       }
+     
     });
   
     req.on("error", (e) => {
@@ -60,7 +101,7 @@ const handle_routes = (req, res, manager, app) => {
       res.end(JSON.stringify({ status: "error", error_message: e.message }));
     });
   }else if (app){
-    app(req, res);
+    return app(req, res);
   }
   
 };
@@ -68,17 +109,16 @@ const handle_routes = (req, res, manager, app) => {
 const create_server = async (settings) => {
   return new Promise((resolve, reject) => {
     settings = settings || {};
-    let { port, app, manager } = settings;
+    let { port, manager } = settings;
 
     port = port || PORT;
     
-    // console.log(__dirname)
     let server = http.createServer(
       // {
       //   key: fs.readFileSync(`${__dirname}/server.key`),
       //   cert: fs.readFileSync(`${__dirname}/server.cert`),
       // },
-      (req, res) => handle_routes(req, res, manager, app)
+      async(req, res) => await handle_routes(req, res, manager, manager.options.app)
     );
 
     server.listen(port, () => {

package/utils/hash.js

@@ -1,7 +1,8 @@
-const crypto = require("crypto");
+import crypto from 'crypto'
 
 const hash = (data, alg) => {
-  let hash = crypto.createHash(alg || "sha256");
+  alg = (alg || "sha256").replace(/-/g, '').toLowerCase()
+  let hash = crypto.createHash(alg);
 
   hash.update(data);
 

package/utils/ops.js

@@ -8,6 +8,8 @@ let ops = [
   { name: "exp", sign: "**" },
   { name: "eq", sign: "==" },
   { name: "ne", sign: "!=" },
+  { name: "or", sign: "||" },
+  { name: "and", sign: "&&" },
   { name: "gt", sign: ">" },
   { name: "lt", sign: "<" },
   { name: "lte", sign: "<=" },

package/utils/oracle_handlers.js

@@ -0,0 +1,7 @@
+class Handlers{
+  constructor(){}
+
+  
+}
+
+export default Handlers

package/utils/services.js

@@ -1,36 +1,4 @@
-const http = require("https");
-
-const get_request = async (payload, cb) => {
-  let req = http.request(
-    {
-      ...payload.options,
-      method: "GET",
-      headers: {
-        "Content-Type": "application/json",
-      },
-    },
-    (res) => {
-      let data = "";
-
-      res.on("data", (chunk) => {
-        data += chunk;
-        // cb && cb(chunk);
-      });
-
-      res.on("end", () => {
-        cb && cb(data);
-        // console.log("Response:", data);
-      });
-    }
-  );
-
-  req.on("error", (e) => {
-    cb && cb(e.message);
-    console.error(`Problem with request: ${e.message}`);
-  });
-
-  req.end();
-};
+import http from 'http'
 
 const post_request = (payload, cb) => {
   // let options = {
@@ -43,27 +11,26 @@ const post_request = (payload, cb) => {
   //     'Content-Length': Buffer.byteLength(postData),
   //   },
   // };
-  console.log(payload);
 
+  // console.log(payload)
   return new Promise((resolve, reject) => {
-    let data =
-      typeof payload.data !== "string"
-        ? JSON.stringify(payload.data)
-        : payload.data;
-        console.log('uh')
-
-    let req = http.request(
-      {
+    let data = payload.data
+    
+    let header = {
         ...payload.options,
-        method: "POST",
+        method: payload.options.method || "POST",
         headers: {
-          ...payload.headers,
+          ...payload.options.headers,
           "Content-Type": "application/json",
-          "Content-Length": Buffer.byteLength(data),
         },
         rejectUnauthorized: false,
-        minVersion: "TLSv1.2",
-      },
+        // minVersion: "TLSv1.2",
+      }
+      if(payload.data){
+        header["Content-Length"] = Buffer.byteLength(data)
+      }
+    let req = http.request(
+      header,
       (res) => {
         let data = "";
 
@@ -72,8 +39,8 @@ const post_request = (payload, cb) => {
         });
 
         res.on("end", () => {
-          console.log('hey')
-          resolve(JSON.parse(data));
+          // console.log('hey')
+          resolve(data && JSON.parse(data));
           // console.log("Response:", data);
         });
       }
@@ -84,10 +51,10 @@ const post_request = (payload, cb) => {
       console.error(`Problem with request: ${e.message}`);
     });
 
-    req.write(data);
+    data && req.write(data);
 
     req.end();
   });
 };
 
-export { get_request, post_request };
+export { post_request };

package/utils/socket_server.js

@@ -0,0 +1,36 @@
+import net from "net";
+
+const socket_server = (PORT)=>{
+  // Create a TCP server
+  const server = net.createServer((socket) => {
+    console.log("Client connected");
+
+    // Handle incoming data
+    socket.on("data", (data) => {
+      console.log(`Received: ${data.toString()}`);
+      // Echo the data back to the client
+      socket.write(`Echo: ${data}`);
+    });
+
+    // Handle client disconnection
+    socket.on("end", () => {
+      console.log("Client disconnected");
+    });
+
+    // Handle errors
+    socket.on("error", (err) => {
+      console.error(`Socket error: ${err.message}`);
+    });
+  });
+
+  // Start the server
+  server.listen(PORT, () => {
+    console.log(`...GOD Socket server running on port ${PORT}`);
+  });
+
+  return server
+}
+
+
+
+export default socket_server