godprotocol 1.2.1 → 1.2.3

package/Objects/Manager.js

@@ -323,17 +323,25 @@ class Manager {
 
     this.ds = new GDS(this)
     await this.ds.sync()
+    let create_serv;
     if (this.options.server){
       this.server = this.options.server
       if (this.options.server.port)
         this.options.server_domain = `${this.options.server.hostname}:${this.options.server.port}`
       else this.options.server_domain = this.options.hostname
-      await create_server({manager: this, ...this.options.server, app: this.options.app })
-    }
-    if (this.options.oracle){
-      this.oracle = this.options.oracle;
-      this.oracle.set_manager(this)
+      this.handler = (req, res)=>{
+        let handle = create_server({manager: this, ...this.options.server, app: this.options.app })
+
+        handle(req,res)
+
+        if (this.options.oracle){
+          this.oracle = this.options.oracle;
+          this.oracle.set_manager(this)
+        }
+      }
     }
+
+    return create_serv;
   }
 
   get_account = async(name) => {

package/html/create.js

@@ -13,7 +13,7 @@ const account_id_el = document.getElementById('account_id'), account_password_el
 
  create_account.addEventListener('click', e=>{
     e.preventDefault();
-    console.log('click click', "http://${manager.options.server_domain}")
+    console.log('click click', "${manager.options.server_domain}")
 
     let name = account_id_el.value.trim(), password = account_password_el.value.trim();
 
@@ -26,7 +26,7 @@ const account_id_el = document.getElementById('account_id'), account_password_el
         return;
     }
 
-    fetch("http://${manager.options.server_domain.concat('/create_account')}", {
+    fetch("${manager.options.server_domain.concat('/create_account')}", {
     method: 'POST',
     header: {
         'Content-Type': 'application/json',

package/html/index.js

@@ -20,7 +20,7 @@ const forms = (route, manager)=>{
 
 const header_script = (manager)=>{
     return ` let ftch = async(path, body)=>{
-      let fch = await fetch("http://${manager.options.server_domain}".concat(path), {
+      let fch = await fetch("${manager.options.server_domain}".concat(path), {
         method: 'POST',
         header: {
           'Content-Type': 'application/json',

package/html/load.js

@@ -22,7 +22,7 @@ id_el = document.getElementById('ID'),
     console.log(account)
 
     if (!account){
-      message_box.innerHTML = 'Provide an account, or <a href="http://${manager.options.server_domain}/create_account">create one here</a>'
+      message_box.innerHTML = 'Provide an account, or <a href="${manager.options.server_domain}/create_account">create one here</a>'
 
       setTimeout(() => {
         message_box.textContent = ''
@@ -72,7 +72,7 @@ load.addEventListener('click', e=>{
     let id = id_el.value.trim(), address = address_el.value.trim(), sequence = sequence_el.value.trim(), account = account_selection_el.selectedIndex, compiler = should_compile.checked;
 
     if (!account){
-      message_box.innerHTML = 'Provide an account, or <a href="http://${manager.options.server_domain}/create_account">create one here</a>'
+      message_box.innerHTML = 'Provide an account, or <a href="${manager.options.server_domain}/create_account">create one here</a>'
 
       setTimeout(() => {
         message_box.textContent = ''

package/html/run.js

@@ -42,7 +42,7 @@ run.addEventListener('click', e=>{
     let id = id_el.value.trim(), address = address_el.value.trim(), config = config_el.value.trim(), account = account_selection_el.selectedIndex, callback = callback_el.value.trim();
 
     if (!account){
-      message_box.innerHTML = 'Provide an account, or <a href="http://${manager.options.server_domain}/create_account">create one here</a>'
+      message_box.innerHTML = 'Provide an account, or <a href="${manager.options.server_domain}/create_account">create one here</a>'
 
       setTimeout(() => {
         message_box.textContent = ''

package/package.json

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

package/utils/create_server.js

@@ -106,27 +106,16 @@ const handle_routes = async(req, res, manager, app) => {
   
 };
 
-const create_server = async (settings) => {
-  return new Promise((resolve, reject) => {
-    settings = settings || {};
-    let { port, manager } = settings;
+const create_server = (settings) => {
+  settings = settings || {};
+  let { port, manager } = settings;
 
-    port = port || PORT;
-    
-    let server = http.createServer(
-      // {
-      //   key: fs.readFileSync(`${__dirname}/server.key`),
-      //   cert: fs.readFileSync(`${__dirname}/server.cert`),
-      // },
-      async(req, res) => await handle_routes(req, res, manager, manager.options.app)
-    );
+  port = port || PORT;
+  
+  let handler =  async(req, res) => await handle_routes(req, res, manager, manager.options.app)
 
-    server.listen(port, () => {
-      console.log(`\n...GOD PROTOCOL RUNNING :${port}`);
-      resolve(server);
-    });
-  });
+  return handler;
 };
 
 export default create_server;
-export { PORT };
+export { PORT };