verify action IDs

lib/agent/actions.js

@@ -3,7 +3,8 @@ var join    = require('path').join,
     hooks   = require('./hooks');
 
 var actions = {},
-    running = {};
+    running = {},
+    running_trigger = {};
 
 var actions_path = __dirname + '/actions';
 
@@ -17,15 +18,41 @@ var load_action = function(type, name) {
 }
 
 // type can be 'action' or 'trigger'
-var action_running = function(type, action, name, opts, emitter) {
-  logger.info('Running: ' + name)
+var action_running = function(type, id, action, name, opts, emitter) {
+  logger.info('Running: ' + name + ' ' + id);
+  running[id] = {name: name, action: action};
+
   running[name] = action;
 
+  emitter.once('end', function(id, err, out) {
+    if (err) hooks.trigger('error', err);
+
+    logger.info('Stopped: ' + name);
+    action_stopped(id);
+
+    setTimeout(function() {
+      hooks.trigger(type, 'stopped', id, name, opts, err, out);
+    }, 1000);
+
+    if (action.events)
+      emitter.removeAllListeners();
+  })
+
+  if (!action.events) return;
+  watch_action_events(action.events, emitter);
+}
+
+var trigger_running = function(type, action, name, opts, emitter) {
+  logger.info('Running: ' + name);
+  running_trigger[name] = {name: name, action: action};
+
+  running_trigger[name] = action;
+
   emitter.once('end', function(err, out) {
     if (err) hooks.trigger('error', err);
 
     logger.info('Stopped: ' + name);
-    action_stopped(name);
+    trigger_stopped(name);
 
     setTimeout(function() {
       hooks.trigger(type, 'stopped', name, opts, err, out);
@@ -39,6 +66,7 @@ var action_running = function(type, action, name, opts, emitter) {
   watch_action_events(action.events, emitter);
 }
 
+// revisar q hace esta funcion!
 var watch_action_events = function(events, emitter) {
   events.forEach(function(event_name) {
     emitter.on(event_name, function(data){
@@ -48,25 +76,40 @@ var watch_action_events = function(events, emitter) {
   })
 }
 
-var action_stopped = function(name) {
-  delete running[name];
+var action_stopped = function(id) {
+  console.log("DELETE ID!!", id)
+  delete running[id];
 }
 
-var start = function(type, name, opts, cb){
-  if (running[name]) {
-    var err = new Error('Already running: ' + name);
+var trigger_stopped = function(name) {
+  delete running_trigger[name];
+}
+
+var start = function(type, id, name, opts, cb){
+
+  console.log("START!!", type, id, name, opts)
+
+  // mismo id.. error!
+  if (running[id]) {
+    // var err = new Error('Already running: ' + name);
+    var err = new Error(`Already running: ${running[id].name} with id: ${id}`);
     hooks.emit('error', err);
+
+    // cb necesario???
     return cb && cb(err);
   }
 
   logger.info('Starting ' + type + ': '+ name);
+  console.log('Starting ' + type + ': '+ name);
   var action = load_action(type, name);
   if (!action) return; // load_action will emit trigger
 
   action.type    = type;
   action.options = typeof opts == 'function' ? {} : opts;
 
-  action.start(opts, function(err, emitter) {
+  // ver cuando el type es un trigger
+
+  action.start(id, opts, function(err, emitter) {
     cb && cb(err);
 
     if (err) {
@@ -81,10 +124,10 @@ var start = function(type, name, opts, cb){
     if (!opts) opts = {};
 
     if (type == 'action')
-      hooks.trigger(type, 'started', name, opts);
+      hooks.trigger(type, 'started', id, name, opts);
 
     if (emitter) {
-      action_running(type, action, name, opts, emitter);
+      action_running(type, id, action, name, opts, emitter);
     } else {
 
       // no emitter was returned, so we have no way of knowing when
@@ -93,42 +136,95 @@ var start = function(type, name, opts, cb){
       // trigger this event after 10 seconds.
 
       setTimeout(function() {
-        hooks.trigger(type, 'stopped', name, opts);
+        hooks.trigger(type, 'stopped', id, name, opts);
       }, 10000);
 
     }
   })
 
+  // IMPLEMENTAR DETENER UNA ACCION ACTUAL DEL MISMO NOMBRE QUE SE ESTË EJECUTANDO
+  // O IGNORAR COMO LO HACE ACTUALMENTE (?)
+
 };
 
-actions.start = function(name, opts) {
-  start('action', name, opts);
+var start_trigger = function(type, name, opts, cb){
+  if (running_trigger[name]) {
+    var err = new Error('Already running: ' + name);
+    hooks.emit('error', err);
+
+    // cb necesario???
+    return cb && cb(err);
+  }
+
+  logger.info('Starting ' + type + ': '+ name);
+  var trigger = load_action(type, name);
+
+  trigger.start(opts, function(err, emitter) {
+    cb && cb(err);
+
+    if (err) {
+      logger.info('Failed: ' + name + ' -> ' + err.message)
+      return hooks.trigger('error', err);
+    }
+
+    if (!opts) opts = {};
+
+    if (emitter) {
+      trigger_running(type, trigger, name, opts, emitter);
+    } else {
+
+      // no emitter was returned, so we have no way of knowing when
+      // this action will stop. given that the command watcher needs to know
+      // when an action finished in order to update the list, we'll manually
+      // trigger this event after 10 seconds.
+
+      setTimeout(function() {
+        hooks.trigger('trigger', 'stopped', name, opts);
+      }, 10000);
+
+    }
+  });
+}
+
+actions.start = function(id, name, opts) {
+  start('action', id, name, opts);
 }
 
 actions.start_trigger = function(name, opts, cb) {
-  start('trigger', name, opts, cb);
+  start_trigger('trigger', name, opts, cb);
 }
 
-actions.stop = function(name, opts) {
-  logger.info('Stopping: ' + name);
-  var action = running[name];
+// agregar lo del opts para el response
+actions.stop = function(id) {
+  console.log("STOP ID!!", id, running)
+
+  if (!running[id]) {
+    hooks.trigger('action', 'stopped', id);
+  }
+
+  var action = running[id].action;
 
   if (!action) {
     logger.warn('Action not running!');
-    hooks.trigger('action', 'stopped', name, opts);
+    hooks.trigger('action', 'stopped', id);   // name por id
   } else if (!action.stop) {
     logger.warn('Action not stoppable!');
   } else {
+    logger.info(`Stopping: ${running[id].name}, with id: ${id}`);
     action.stop();
   }
 }
 
+// revisar q esto siga funcionando!
 actions.stop_all = function() {
+  console.log("STOP ALL!!!")
   for (var name in running)
     this.stop(name);
 }
 
+// esta tb
 actions.running = function() {
+  console.log("RUNNING")
   var list = [];
   for (var key in running) {
     if (running[key].type == 'action') {

lib/agent/actions/alarm/index.js

@@ -19,7 +19,7 @@ var child,
     emitter,
     raise_interval;
 
-exports.start = function(options, cb) {
+exports.start = function(id, options, cb) {
 
   var error,
       self     = this,
@@ -30,10 +30,10 @@ exports.start = function(options, cb) {
       file    = type + '.mp3',
       loops   = options.loops ? parseInt(options.loops) : 1;
 
-  var done = function(err) {
+  var done = function(id, err) {
     clearInterval(raise_interval);
     if (returned++) returned;
-    if (emitter) emitter.emit('end', err);
+    if (emitter) emitter.emit('end', id, err);
     emitter = null;
   }
 
@@ -45,15 +45,17 @@ exports.start = function(options, cb) {
     loops--;
 
     system.spawn_as_logged_user(commands.play, [ file ], function(err, alarm) {
-      if (err) return done(err);
+      if (err) return done(id, err);
 
-      alarm.on('error', done);
+      alarm.done(id, err)('error', (err) => {
+
+      });
 
       alarm.once('exit', function(code) {
         child = null;
 
         if (loops === 0)
-          return done();
+          return done(id);
 
         play_queue();
       })

lib/agent/actions/alert/index.js

@@ -17,7 +17,7 @@ var child,
     binary,
     user_input_str = 'User input: ';
 
-exports.start = function(opts, cb) {
+exports.start = function(id, opts, cb) {
   var opts    = opts || {},
       message = opts.message || opts.alert_message,
       title   = opts.title,
@@ -68,7 +68,7 @@ exports.start = function(opts, cb) {
     if (returned++) return;
 
     if (emitter)
-      emitter.emit('end', err, reply);
+      emitter.emit('end', id, err, reply);
 
     emitter = null;
   }

lib/agent/actions/diskencryption/index.js

@@ -54,7 +54,7 @@ var process_options = (options) => {
   return opts;
 }
 
-exports.start = function(opts, cb) {
+exports.start = function(id, opts, cb) {
   var os_name = os.platform().replace('darwin', 'mac').replace('win32', 'windows');
 
   if (os_name != 'windows')
@@ -85,7 +85,7 @@ exports.start = function(opts, cb) {
       commands.perform({command: 'get', target: 'encryption_keys'})
 
       output = {}
-      if (!out) return emitter.emit('end');
+      if (!out) return emitter.emit('end', id);
 
       out.forEach(disk => {
         var data = disk.disk.slice(0, -1);
@@ -99,7 +99,7 @@ exports.start = function(opts, cb) {
     }
 
     if (!emitter) return;
-    return emitter.emit('end', err, output);
+    return emitter.emit('end', id, err, output);
   }
 
   emitter = new Emitter;

lib/agent/actions/fileretrieval/index.js

@@ -77,7 +77,7 @@ exports.check_pending_files = function() {
   files.run_stored(host);
 }
 
-exports.start = function(options, cb) {
+exports.start = function(id, options, cb) {
 
   var url = UPLOAD_SERVER + '?uploadID=' + options.file_id;
   // Make a call to get the last byte processed by the upload server
@@ -129,7 +129,7 @@ exports.start = function(options, cb) {
   em = em || new Emitter();
 
   if (cb) cb(null, em);
-  em.emit('end');
+  em.emit('end', id);
 }
 
 exports.stop = function() {