godprotocol 1.2.9 → 1.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "godprotocol",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "description": "A distributed computing environment",
   "main": "Index.js",
   "scripts": {

package/utils/__create_server.js

@@ -0,0 +1,121 @@
+// 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, account_uids = new Object();
+
+const handle_routes = async(req, res, manager, app) => {
+  let data = "";
+
+    
+  if (req.method === "OPTIONS") {
+    res.writeHead(204, {
+      "Access-Control-Allow-Origin": "*",
+      "Access-Control-Allow-Headers": "Content-Type",
+      "Access-Control-Allow-Methods": "POST, GET, OPTIONS",
+    });
+    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 (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'){
+        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 === '/oracle') {
+        // console.log(data)
+        let reslt = await manager.oracle.call(data)
+        res.end(JSON.stringify(reslt))
+      } else {
+        let account = account_uids[data.account]
+        
+        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(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) => {
+      res.writeHead(500, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({ status: "error", error_message: e.message }));
+    });
+  }else if (app){
+    return app(req, res);
+  }
+  
+};
+
+const create_server = (settings) => {
+  settings = settings || {};
+  let { port, manager } = settings;
+
+  port = port || PORT;
+  
+  let handler =  async(req, res) => await handle_routes(req, res, manager, manager.options.app)
+
+  return handler;
+};
+
+export default create_server;
+export { PORT };

package/utils/create_server.js

@@ -1,118 +1,112 @@
-// 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, account_uids = new Object();
-
-const handle_routes = async(req, res, manager, app) => {
-  let data = "";
-
-    
-  if (req.method === "OPTIONS") {
-    res.writeHead(204, {
-      "Access-Control-Allow-Origin": "*",
-      "Access-Control-Allow-Headers": "Content-Type",
-      "Access-Control-Allow-Methods": "POST, GET, OPTIONS",
-    });
-    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");
+import { set_page } from '../html/index.js';
+import { generate_random_string } from 'generalised-datastore/utils/functions.js';
+
+let PORT = Number(process.env.PORT) || 1408, account_uids = {};
 
-    if (req.method === 'GET'){
-      let tml = set_page(req.url.slice(1), manager)
+export const handle_routes =  async (req, res, manager, app) => {
+  let body = '';
 
-      res.writeHead(200, {'Content-Type': 'text/html'})
-      res.end(tml)
-      return;
+  try {
+    // Handle CORS preflight
+    res.setHeader('Access-Control-Allow-Origin', '*');
+    res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
+    res.setHeader('Access-Control-Allow-Methods', 'POST, GET, OPTIONS');
+
+    if (req.method === 'OPTIONS') {
+      res.writeHead(204);
+      return res.end();
     }
-  
-    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;
+    // GET requests for pages
+    if (req.method === 'GET') {
+      if (req.url === '/') {
+        res.writeHead(200, { 'Content-Type': 'text/html' });
+        return res.end(set_page(req.url, manager));
+      }
+
+      if (['/create_account', '/load', '/run', '/parse', '/oracle'].includes(req.url)) {
+        res.writeHead(200, { 'Content-Type': 'text/html' });
+        return res.end(set_page(req.url.slice(1), manager));
       }
-      data = JSON.parse(data)
-      let result;
-
-      if (req.url === '/create_account'){
-        let acc = await manager.get_account(data.name)
-        if (acc){
-          if(!await acc.verify(data.password)){
-            result = {message: "Incorrect password."}
+
+      return app ? app(req,res) : res.writeHead(404).end('Not Found');
+    }
+
+    // Accumulate POST body
+    req.on('data', chunk => { body += chunk; });
+    await new Promise(resolve => req.on('end', resolve));
+
+    let data = body ? JSON.parse(body) : null;
+
+    if (!data) {
+      res.writeHead(400, { 'Content-Type': 'application/json' });
+      return res.end(JSON.stringify({ error: 'Request body cannot be empty' }));
+    }
+
+    // POST route handling
+    let result;
+    switch (req.url) {
+      case '/create_account':
+        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."}
+            const uid = generate_random_string(16, 'alnum');
+            account_uids[uid] = data.name;
+            result = { uid, message: 'Account signed-in successfully.' };
+          }
+        } else {
+          let newAcc = await manager.add_account(data.name, { password: data.password });
+          if (newAcc) {
+            const uid = generate_random_string(16, 'alnum');
+            account_uids[uid] = data.name;
+            result = { uid, message: 'Account created successfully.' };
+          } else {
+            result = { message: 'Account creation failed.' };
           }
-        }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
         }
+        break;
 
-        res.end(JSON.stringify(result))
-      } 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]
-        
-        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(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))
+      case '/oracle':
+        result = await manager.oracle.call(data);
+        break;
+      default:
+        let accountName = account_uids[data.account];
+        if (!accountName) return res.end(JSON.stringify({ message: `Account ${data.account} not found` }));
+
+        let accountObj = await manager.get_account(accountName);
+
+        if (req.url === '/load'){
+          result = await accountObj.load(data);
+        }else if (req.url === '/run'){
+          result = await accountObj.run(data);
+        }else if (req.url === '/parse'){
+          result = await accountObj.parse(data);
+        }else {
+          return app? app(req,res): res.writeHead(404).end('Not Found');
         }
-      }
-     
-    });
-  
-    req.on("error", (e) => {
-      res.writeHead(500, { "Content-Type": "application/json" });
-      res.end(JSON.stringify({ status: "error", error_message: e.message }));
-    });
-  }else if (app){
-    return app(req, res);
+        break;
+    }
+
+    res.writeHead(200, { 'Content-Type': 'application/json' });
+    return res.end(JSON.stringify(result));
+
+  } catch (err) {
+    console.error('Handler error:', err);
+    res.writeHead(500, { 'Content-Type': 'application/json' });
+    return res.end(JSON.stringify({ error: err.message }));
   }
-  
 };
 
+
 const create_server = (settings) => {
   settings = settings || {};
   let { port, manager } = settings;
 
   port = port || PORT;
   
-  let handler =  async(req, res) => await handle_routes(req, res, manager, manager.options.app)
+  let handler = async (req, res) => await handle_routes(req, res, manager, manager.options.app)
 
   return handler;
 };