all async paths working

1 files changed, 38 insertions, 33 deletions

diff --git a/lib/bridge/index.js b/lib/bridge/index.js
index 353ed46..a1bac0a 100644
--- a/lib/bridge/index.js
+++ b/lib/bridge/index.js
@@ -1,9 +1,10 @@
 import { execFile, spawn } from 'child_process'
+const ipc = require('node-ipc')
 
 class Bridge {
   constructor() {
     this.cpus = []
-    this.getDevices()
+    // this.getDevices()
   }
   getDevices() {
     this.run(['python/devices.py']).then( (stdout, stderr) => {
@@ -32,43 +33,47 @@ class Bridge {
   monitor(args) {
     return new Monitor(args)
   }
-  process(file) {
+  processFiles() {
+    console.log('>> sending process files')
     ipc.server.sockets.forEach( (socket) => {
-      console.log('>> sending process')
-      ipc.server.emit(socket, 'process', true)
+      ipc.server.emit(socket, 'processFiles', true)
     })
   }
+  processTasks() {
+    console.log('>> sending process tasks')
+    ipc.server.sockets.forEach( (socket) => {
+      ipc.server.emit(socket, 'processTasks', true)
+    })
+  }
+  serve() {
+    ipc.config.id = 'cortex'
+    ipc.config.retry = 1500
+    ipc.serve( () => {
+      ipc.server.on('connect', (socket) => {
+        console.log('>>> worker connected')
+        ipc.server.emit(socket, 'message', true)
+        bridge.broadcast('worker', {connected: true})
+      })
+      ipc.server.on('message', (data, socket) => {
+        ipc.log('got a message : '.debug, data)
+        // ipc.server.emit(socket, 'message', 'hello world!')
+      })
+      ipc.server.on('updateFile', (data, socket) => {
+        console.log('updateFile')
+        bridge.broadcast('updateFile', data)
+      })
+      ipc.server.on('updateTask', (data, socket) => {
+        console.log('updateTask')
+        bridge.broadcast('updateTask', data)
+      })
+      ipc.server.on( 'socket.disconnected', (socket, destroyedSocketID) => {
+        ipc.log('client ' + destroyedSocketID + ' has disconnected!')
+      })
+    })
+    ipc.server.start()
+  }
 }
 
 const bridge = new Bridge
 
 export default bridge
-
-var ipc = require('node-ipc')
-
-ipc.config.id = 'cortex'
-ipc.config.retry = 1500;
-
-ipc.serve( () => {
-  ipc.server.on('connect', (socket) => {
-    console.log('>>> worker connected')
-    ipc.server.emit(socket, 'message', true)
-    bridge.broadcast('worker', {connected: true})
-  })
-  ipc.server.on('message', (data, socket) => {
-    ipc.log('got a message : '.debug, data);
-//     ipc.server.emit(
-//       socket,
-//       'message',
-//       data+' world!'
-//     )
-  })
-  ipc.server.on('processed', (data, socket) => {
-    console.log('processed job')
-    bridge.broadcast('processed', data)
-  })
-  ipc.server.on( 'socket.disconnected', (socket, destroyedSocketID) => {
-    ipc.log('client ' + destroyedSocketID + ' has disconnected!');
-  })
-})
-ipc.server.start()