godprotocol 1.2.15 → 1.2.16

package/package.json

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

package/utils/create_server.js

@@ -3,11 +3,9 @@ import { generate_random_string } from 'generalised-datastore/utils/functions.js
 
 let PORT = Number(process.env.PORT) || 1408, account_uids = {};
 
-export const handle_routes =  async (req, res, manager, app) => {
-  let body = '';
-
+export const handle_routes = async (req, res, manager, app) => {
   try {
-    // Handle CORS preflight
+    // CORS
     res.setHeader('Access-Control-Allow-Origin', '*');
     res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
     res.setHeader('Access-Control-Allow-Methods', 'POST, GET, OPTIONS');
@@ -17,7 +15,7 @@ export const handle_routes =  async (req, res, manager, app) => {
       return res.end();
     }
 
-    // GET requests for pages
+    // GET pages
     if (req.method === 'GET') {
       if (req.url === '/') {
         res.writeHead(200, { 'Content-Type': 'text/html' });
@@ -29,70 +27,74 @@ export const handle_routes =  async (req, res, manager, app) => {
         return res.end(set_page(req.url.slice(1), manager));
       }
 
-      return app ? app(req,res) : res.writeHead(404).end('Not Found');
+      // hand over untouched
+      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;
+    // Only custom POST endpoints handled here
+    if (['/create_account', '/load', '/run', '/parse', '/oracle'].includes(req.url)) {
+      let body = '';
+      req.on('data', chunk => { body += chunk; });
+      await new Promise(resolve => req.on('end', resolve));
 
-    if (!data) {
-      res.writeHead(400, { 'Content-Type': 'application/json' });
-      return res.end(JSON.stringify({ error: 'Request body cannot be empty' }));
-    }
+      if (!body) {
+        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 {
-            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.' };
+      const data = JSON.parse(body);
+      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 {
+              const uid = generate_random_string(16, 'alnum');
+              account_uids[uid] = data.name;
+              result = { uid, message: 'Account signed-in successfully.' };
+            }
           } else {
-            result = { message: 'Account creation failed.' };
+            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.' };
+            }
           }
+          break;
         }
-        break;
-
-      case '/oracle':
-        result = await manager.oracle.call(data);
-        break;
-      default:
-        let account_name = account_uids[data.account], account_obj;
-        if (!account_name){
-          if (['load', 'run', 'parse'].includes(req.url.slice(1))){
-            return res.end(JSON.stringify({ message: `Account ${data.account} not found` }));
+
+        case '/oracle':
+          result = await manager.oracle.call(data);
+          break;
+
+        case '/load':
+        case '/run':
+        case '/parse': {
+          const accountName = account_uids[data.account];
+          if (!accountName) {
+            result = { 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);
           }
-        }else account_obj = await manager.get_account(account_name);
-
-        if (req.url === '/load'){
-          result = await account_obj.load(data);
-        }else if (req.url === '/run'){
-          result = await account_obj.run(data);
-        }else if (req.url === '/parse'){
-          result = await account_obj.parse(data);
-        }else {
-          return app? app(req,res): res.writeHead(404).end('Not Found');
+          break;
         }
-        break;
+      }
+
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      return res.end(JSON.stringify(result));
     }
 
-    res.writeHead(200, { 'Content-Type': 'application/json' });
-    return res.end(JSON.stringify(result));
+    // Everything else → forward to express app
+    return app ? app(req, res) : res.writeHead(404).end('Not Found');
 
   } catch (err) {
     console.error('Handler error:', err);
@@ -108,10 +110,10 @@ const create_server = (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;
 };
 
 export default create_server;
-export { PORT };
+export { PORT };