Pass arguments through promise chain instead of attaching to generator (

#186)

* core

* misc

* tests

* code style

* Move token creation outside the request-specific code so we can collect for all subjects in parallel.

* handle non-collection errors outside the repeater chain

* code style

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/refocus-collector",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Collector system to automate feeding data in to the Refocus platform.",
   "main": "index.js",
   "directories": {

src/commands/start.js

@@ -23,7 +23,6 @@ const hbUtils = require('../heartbeat/utils');
 const doPost = require('../utils/httpUtils.js').doPost;
 const errors = require('../errors');
 const COLLECTOR_START_PATH = '/v1/collectors/start';
-const genAuth = require('../config/generatorAuth.js');
 
 logger.configure({
   transports: [
@@ -38,7 +37,6 @@ logger.configure({
  */
 function execute() {
   debug('Entered start.execute');
-  genAuth.initializeGeneratorAuth();
   const config = configModule.getConfig();
   const cr = config.refocus;
   const url = cr.url + COLLECTOR_START_PATH;

src/heartbeat/utils.js

@@ -102,27 +102,6 @@ function assignContext(ctx, def, collectorToken, res) {
   return ctx;
 } // assignContext
 
-/**
- * Creates a repeater based on the bulk attribute of the of the generator
- * object, passing in either the "collectBulk" function or the
- * "collectBySubject" function, and the appropriate handler for each collect
- * function.
- *
- * @param {Object} generator - Generator object from the heartbeat
- * @throws {ValidationError} - Thrown by repeater.createGeneratorRepeater
- */
-function setupRepeater(generator) {
-  const genIsBulk = commonUtils.isBulk(generator);
-  debug('setupRepeater (%s) for generator %O', genIsBulk ? 'bulk' : 'by subject',
-    sanitize(generator, ['token', 'context']));
-  const collFunc = genIsBulk ? collectBulk : collectBySubject;
-  const handlerFunc =
-    genIsBulk ? handleCollectResponseBulk : handleCollectResponseBySubject;
-
-  const func = (gen) => collFunc(gen).then(handlerFunc);
-  repeater.createGeneratorRepeater(generator, func);
-} // setupRepeater
-
 /**
  * Set up generator repeaters for each generator and add them to the collector
  * config.
@@ -153,7 +132,7 @@ function addGenerators(res) {
       config.generators[g.name] = g;
 
       try {
-        setupRepeater(g);
+        repeater.createGeneratorRepeater(g);
       } catch (err) {
         debug('addGenerators error for generator "%s":\n%s', g.name,
           err.message);
@@ -224,7 +203,7 @@ function updateGenerators(res) {
       // Repeaters cannot be updated--stop old ones and create new ones.
       try {
         repeater.stop(g.name);
-        setupRepeater(g);
+        repeater.createGeneratorRepeater(g);
       } catch (err) {
         debug('updateGenerators error for generator "%s":\n%s', g.name,
           err.message);