worker UID changed to IP address

UID of worker nodes has been changed to IP, streamlined DM code base

dispatch_module/constants.json

 {
-    "mqtt_url": "10.129.6.5",
     "registry_url" :"10.129.6.5:5000/",
     "master_port": 8080,
-    "master_address": "localhost"
+    "master_address": "localhost",
+    "kafka_host": "10.129.6.5:9092"
 }
\ No newline at end of file

dispatch_module/dispatch_daemon/config.json

-{
-    "id": "tpt8hqn7ok"
-}
\ No newline at end of file
+{"id":"192.168.31.51","master_node":"10.129.6.5"}
\ No newline at end of file

dispatch_module/dispatch_daemon/index.js

-const mqtt = require('mqtt')
+'use strict';
 const constants = require(".././constants.json")
-const node_id = require("./config.json").id
+const config = require('./config.json')
 const libSupport = require('./lib')
+libSupport.updateConfig()
+const node_id = config.id
 const execute = require('./execute')
 const fs = require('fs')
-
+const kafka = require('kafka-node')
 const local_repository = __dirname + "/local_repository/"
 const host_url = "http://" + constants.master_address + ":" + constants.master_port
 
-let kafka = require('kafka-node'),
-    Producer = kafka.Producer,
+let Producer = kafka.Producer,
     KeyedMessage = kafka.KeyedMessage,
     client = new kafka.KafkaClient({ 
-        kafkaHost: '10.129.6.5:9092',
+        kafkaHost: constants.kafka_host,
         autoConnect: true
     }),
     producer = new Producer(client),
-    Consumer = kafka.Consumer,
-    consumer = new Consumer(client,
+    Consumer = kafka.Consumer
+
+libSupport.makeTopic(node_id).then(() => {
+    console.log("node topic created")
+    let consumer = new Consumer(client,
         [
-            { topic: node_id, partition: 0, offset: 0}
+            { topic: node_id, partition: 0, offset: 0 }
         ],
         [
             { autoCommit: true }
         ])
-
-consumer.on('message', function (message) {
+    consumer.on('message', function (message) {
         console.log(message);
         let topic = message.topic
         message = message.value
@@ -37,63 +40,28 @@ consumer.on('message', function (message) {
 
             if (message.type === "execute") {
                 console.log("function_id", function_id);
-            if (!fs.existsSync(local_repository + functionHash)) {
                 libSupport.download(host_url + "/repository/" + functionHash, local_repository + functionHash).then(() => {
-                    
-                    if (runtime === "isolate")
-                        execute.runIsolate(local_repository + functionHash).then(result => {
-                                producer.send([{
-                                    topic: "response", 
-                                    messages: JSON.stringify({
-                                        status: "success",
-                                        result,
-                                        function_id})
-                                }], () =>{})
+                    startWorker(local_repository, functionHash, producer, runtime)
                 })
-                    else if (runtime === "process")
-                        execute.runProcess(local_repository + functionHash).then(result => {
-                                producer.send(
-                                [{
-                                    topic: "response", 
-                                    messages: JSON.stringify({
-                                        status: "success",
-                                        result,
-                                        function_id})
-                                }], () =>{})
-                        })
-                    else if (runtime === "container")
-                        execute.runContainer(functionHash).then(result => {
-                                producer.send(
-                                [{
-                                    topic: "response", 
-                                    messages: JSON.stringify({
-                                        status: "success",
-                                        result,
-                                        function_id})
-                                }], () =>{})
-                        })
-                    else {
-                            producer.send(
-                            [{
-                                topic: "response", 
-                                messages: JSON.stringify({ status: "unknown runtime" })
-                            }], () =>{})
 
-                        return
             }
+        }
+
     })
-            } else {
+})
+    
 
+function startWorker(local_repository, functionHash, producer, runtime) {
     if (runtime === "isolate")
         execute.runIsolate(local_repository + functionHash).then(result => {
-                            producer.send(
-                            [{
+            producer.send([{
                 topic: "response",
                 messages: JSON.stringify({
                     status: "success",
                     result,
-                                    function_id})
-                            }], () =>{})
+                    function_id
+                })
+            }], () => { })
         })
     else if (runtime === "process")
         execute.runProcess(local_repository + functionHash).then(result => {
@@ -103,8 +71,9 @@ consumer.on('message', function (message) {
                     messages: JSON.stringify({
                         status: "success",
                         result,
-                                    function_id})
-                            }], () =>{})
+                        function_id
+                    })
+                }], () => { })
         })
     else if (runtime === "container")
         execute.runContainer(functionHash).then(result => {
@@ -114,23 +83,20 @@ consumer.on('message', function (message) {
                     messages: JSON.stringify({
                         status: "success",
                         result,
-                                    function_id})
-                            }], () =>{})
+                        function_id
+                    })
+                }], () => { })
         })
     else {
         producer.send(
             [{
                 topic: "response",
                 messages: JSON.stringify({ status: "unknown runtime" })
-                        }], () =>{})
-                    return
-                }
-            }
+            }], () => { })
 
+        return
     }
-    }
-        
-})
+}
 
 function heartbeat() {
     let payload = [{

dispatch_module/dispatch_daemon/lib.js

-var http = require('http');
-var fs = require('fs');
+const http = require('http');
+const fs = require('fs');
+const process = require('process')
+const { spawnSync } = require('child_process');
+const constants = require(".././constants.json")
+const kafka = require('kafka-node')
+function updateConfig() {
+    console.log("Retrieving primary IP");
+    let file = JSON.parse(fs.readFileSync('./config.json', { encoding: 'utf-8' }))
+    const getIP = spawnSync("ip", ["route", "get", file.master_node]);
+    let err = getIP.stderr.toString().trim()
+    if (err !== '') {
+        console.log(err);
+        process.exit(1);
+    }
+    let data = getIP.stdout.toString().trim().split(' ')
+    
+    file.id = data[6]
+    fs.writeFileSync('./config.json', JSON.stringify(file));
+    console.log("Updated Config file");   
+}
+
+function makeTopic(id) {
+    console.log("Using Primary IP", id, "as topic");
     
+    let client = new kafka.KafkaClient({
+        kafkaHost: constants.kafka_host,
+        autoConnect: true
+    }),
+    Producer = kafka.Producer,
+    producer = new Producer(client)
+    return new Promise((resolve, reject) => {
+        producer.send([{
+            topic: id,
+            messages: JSON.stringify({
+                status: "success",
+            })
+        }], (err, data) => { 
+            if (err)
+                reject();
+            else
+                resolve(); 
+        })
+    })
+}
 var download = function (url, dest, cb) {
     return new Promise((resolve, reject) => {
         console.log(url);
-        
+        if (!fs.existsSync(local_repository + functionHash)) {
             var file = fs.createWriteStream(dest);
             var request = http.get(url, function (response) {
                 response.pipe(file);
@@ -17,6 +59,9 @@ var download = function (url, dest, cb) {
                 if (cb) cb(err.message);
                 reject(err);
             });
+        } else {
+            resolve();
+        }
     })
     
 };
@@ -31,6 +76,6 @@ function makeid(length) {
     return result;
 }
 
-
-module.exports.download = download
-module.exports.makeid = makeid;
\ No newline at end of file
+module.exports = {
+    download, makeid, updateConfig, makeTopic
+}
\ No newline at end of file