Fix watch flag (#48)

Author: itai-codefresh

lib/interface/cli/commands/root/get.cmd.js

@@ -34,9 +34,10 @@ const get = new Command({
             })
             .option('watch_interval', {
                 describe: 'Interval time at watching mode (in seconds)',
+                default: DEFAULTS.WATCH_INTERVAL_MS / 1000,
             })
             .coerce('watch_interval', (watchInterval) => {
-                return Math.max(watchInterval * 1000 , DEFAULTS.WATCH_INTERVAL);
+                return Math.max(watchInterval * 1000, DEFAULTS.WATCH_INTERVAL_MS);
             });
 
 

lib/interface/cli/defaults.js

@@ -5,7 +5,8 @@ const DEFAULTS = {
     GET_LIMIT_RESULTS: 25,
     GET_PAGINATED_PAGE: 1,
     CODEFRESH_REGISTRIES: ['r.cfcr.io'],
-    WATCH_INTERVAL: 3000,
+    WATCH_INTERVAL_MS: 3000,
+    MAX_CONSECUTIVE_ERRORS_LIMIT: 10,
 };
 
 module.exports = DEFAULTS;

lib/interface/cli/helpers/general.js

@@ -1,9 +1,10 @@
-const _        = require('lodash');
-const fs       = require('fs');
-const yaml     = require('js-yaml');
+const Promise = require('bluebird');
+const _ = require('lodash');
+const fs = require('fs');
+const yaml = require('js-yaml');
 const defaults = require('../defaults');
-const CFError  = require('cf-errors');
-const path     = require('path');
+const CFError = require('cf-errors');
+const path = require('path');
 
 
 const printError = (error) => {
@@ -17,7 +18,27 @@ const printError = (error) => {
 const wrapHandler = (handler) => {
     return async (argv) => {
         try {
-            argv.watch ? setInterval(async () => { await handler(argv)}, argv.watch_interval) : await handler(argv);
+            if (!argv.watch) {
+                return handler(argv);
+            }
+
+            let consecutiveErrors = 0;
+            let initial = true;
+            while (true) {
+                try {
+                    await handler(argv, initial);
+                    consecutiveErrors = 0;
+                    initial = false;
+                }
+                catch (err) {
+                    consecutiveErrors++;
+                    if (initial || consecutiveErrors > defaults.MAX_CONSECUTIVE_ERRORS_LIMIT) {
+                        throw err;
+                    }
+                }
+                await Promise.delay(argv.watch_interval);
+            }
+
         } catch (err) {
             printError(err);
             process.exit(1);
@@ -32,12 +53,12 @@ const wrapHandler = (handler) => {
  */
 const prepareKeyValueFromCLIEnvOption = (environmentVariables) => {
     let variables = {};
-    let envArray  = [];
+    let envArray = [];
     environmentVariables.constructor !== Array ? envArray.push(environmentVariables) : envArray = environmentVariables;
     envArray.forEach(function (vars) {
-        let fields = vars.split("=");
-        let key    = fields[0];
-        let val    = fields[1];
+        let fields = vars.split('=');
+        let key = fields[0];
+        let val = fields[1];
         if (_.isUndefined(key) || _.isUndefined(val)) {
             throw new CFError('Invalid environment variable format. please enter [key]=[value]');
         }
@@ -48,12 +69,12 @@ const prepareKeyValueFromCLIEnvOption = (environmentVariables) => {
 
 const prepareKeyValueCompostionFromCLIEnvOption = (environmentVariables) => {
     const variables = [];
-    let envArray    = [];
+    let envArray = [];
     environmentVariables.constructor !== Array ? envArray.push(environmentVariables) : envArray = environmentVariables;
     envArray.forEach(function (vars) {
-        let fields = vars.split("=");
-        let key    = fields[0];
-        let val    = fields[1];
+        let fields = vars.split('=');
+        let key = fields[0];
+        let val = fields[1];
         if (_.isUndefined(key) || _.isUndefined(val)) {
             throw new CFError('Invalid environment variable format. please enter [key]=[value]');
         }