Update Sailor to 2.6.7 (#34)

Author: kirill-levitskiy

.eslintrc.js

@@ -1,160 +1,7 @@
-'use strict';
-
-const ERROR = 'error';
-const WARN = 'warn';
-const ALWAYS = 'always';
-const NEVER = 'never';
-const OFF = 'off';
-
 module.exports = {
+    'extends': 'airbnb-base',
     'env': {
-        es6: true,
-        node: true,
-        mocha: true
-    },
-    'parserOptions': {
-        ecmaVersion: 2017
-    },
-    'extends': 'eslint:recommended',
-    'plugins': [
-        'mocha'
-    ],
-    'rules': {
-        'indent': [
-            ERROR,
-            4,
-            {
-                SwitchCase: 1
-            }
-        ],
-        'linebreak-style': ERROR,
-        'quotes': [
-            WARN,
-            'single',
-            {
-                avoidEscape: true,
-                allowTemplateLiterals: true
-            }
-        ],
-        'semi': [
-            ERROR,
-            ALWAYS
-        ],
-        'func-names': WARN,
-        'no-empty': ERROR,
-        'no-empty-function': ERROR,
-        'brace-style': [
-            ERROR,
-            '1tbs',
-            { allowSingleLine: true }
-        ],
-        'no-multiple-empty-lines': ERROR,
-        'no-multi-spaces': ERROR,
-        'one-var': [
-            ERROR,
-            NEVER
-        ],
-        'quote-props': [
-            WARN,
-            'consistent-as-needed'
-        ],
-        'key-spacing': ERROR,
-        'space-unary-ops': [
-            ERROR,
-            {
-                words: true,
-                nonwords: false
-            }
-        ],
-        'no-spaced-func': ERROR,
-        'space-before-function-paren': [
-            ERROR,
-            {
-                anonymous: ALWAYS,
-                named: NEVER
-            }
-        ],
-        'arrow-body-style': [
-            WARN,
-            'as-needed'
-        ],
-        'array-bracket-spacing': ERROR,
-        'space-in-parens': ERROR,
-        'comma-dangle': WARN,
-        'no-trailing-spaces': ERROR,
-        'yoda': ERROR,
-        'max-len': [
-            ERROR,
-            120
-        ],
-        'camelcase': [
-            ERROR,
-            {
-                properties: 'never'
-            }
-        ],
-        'new-cap': [
-            WARN,
-            {
-                capIsNewExceptions: ['Q']
-            }
-        ],
-        'comma-style': ERROR,
-        'curly': ERROR,
-        'object-curly-spacing': [
-            WARN,
-            ALWAYS
-        ],
-        'object-curly-newline': [
-            OFF
-        ],
-        'object-property-newline': OFF,
-        'template-curly-spacing': ERROR,
-        'dot-notation': ERROR,
-        'dot-location': [
-            ERROR,
-            'property'
-        ],
-        'func-style': [
-            ERROR,
-            'declaration',
-            {
-                allowArrowFunctions: true
-            }
-        ],
-        'eol-last': ERROR,
-        'space-infix-ops': ERROR,
-        'keyword-spacing': ERROR,
-        'space-before-blocks': ERROR,
-        'no-invalid-this': ERROR,
-        'consistent-this': ERROR,
-        'no-this-before-super': ERROR,
-        'no-unreachable': ERROR,
-        'no-sparse-arrays': ERROR,
-        'array-callback-return': ERROR,
-        'strict': [
-            OFF,
-            'global'
-        ],
-        'eqeqeq': ERROR,
-        'no-use-before-define': WARN,
-        'no-undef': ERROR,
-        'no-unused-vars': WARN,
-        'no-mixed-spaces-and-tabs': ERROR,
-        'operator-linebreak': [
-            ERROR,
-            'before'
-        ],
-        'no-console': [
-            WARN,
-            {
-                'allow': [
-                    'warn',
-                    'error'
-                ]
-            }
-        ],
-        'mocha/no-exclusive-tests': ERROR,
-        'mocha/no-skipped-tests': ERROR
+        'mocha': true,
+        'node': true,
     }
 };

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.2 (May 19, 2020)
+
+* Update sailor version to 2.6.7
+* "Send data" Action become deprecated
+
 ## 1.2.1 (March 26, 2020)
 * Add help messages to the trigger and action
 

component.json

@@ -34,6 +34,7 @@
                 "link": "/components/webhook/index.html#send-data"
             },
             "main": "./lib/actions/send.js",
+            "deprecated": true,
             "fields": {
                 "method": {
                     "viewClass": "SelectView",

lib/actions/send.js

@@ -1,7 +1,8 @@
 const request = require('../helper/request.js');
+
 const DEFAULT_METHOD = 'POST';
 
 // eslint-disable-next-line func-names
 exports.process = function (msg, conf) {
-    request.putOrPost.call(this, conf.method || DEFAULT_METHOD, msg, conf);
+  request.putOrPost.call(this, conf.method || DEFAULT_METHOD, msg, conf);
 };

lib/helper/get.js

@@ -2,5 +2,5 @@ const request = require('./request.js');
 
 // eslint-disable-next-line func-names
 exports.process = function (msg, conf) {
-    request.get.call(this, msg, conf);
+  request.get.call(this, msg, conf);
 };

lib/helper/request.js

@@ -1,82 +1,83 @@
+/* eslint-disable no-use-before-define */
 const request = require('request');
 const qs = require('querystring');
-const messages = require('elasticio-node').messages;
+const { messages } = require('elasticio-node');
 
 exports.putOrPost = function putOrPost(method, msg, conf) {
-    const uri = conf.uri;
-    const body = msg.body;
+  const { uri } = conf;
+  const { body } = msg;
 
-    this.logger.info('Request body: %j', body);
+  this.logger.info('Request body: %j', body);
 
-    const requestSettings = buildRequestSettings(method, uri, conf.secret);
-    requestSettings.body = JSON.stringify(body);
-    requestSettings.headers['Content-Type'] = 'application/json;charset=UTF-8';
+  const requestSettings = buildRequestSettings(method, uri, conf.secret);
+  requestSettings.body = JSON.stringify(body);
+  requestSettings.headers['Content-Type'] = 'application/json;charset=UTF-8';
 
-    request(requestSettings, callback.bind(this));
+  request(requestSettings, callback.bind(this));
 };
 
 exports.get = function get(msg, conf) {
-    let uri = conf.uri;
+  let { uri } = conf;
 
-    // Check if URI ends in ?  If it doesn't add one.
-    if (uri.charAt(uri.length - 1) !== '?') {
-        uri += '?';
-    }
+  // Check if URI ends in ?  If it doesn't add one.
+  if (uri.charAt(uri.length - 1) !== '?') {
+    uri += '?';
+  }
 
-    uri += qs.stringify(msg.body);
+  uri += qs.stringify(msg.body);
 
-    const requestSettings = buildRequestSettings('GET', uri, conf.secret);
-    request(requestSettings, callback.bind(this));
+  const requestSettings = buildRequestSettings('GET', uri, conf.secret);
+  request(requestSettings, callback.bind(this));
 };
 
 function buildRequestSettings(method, uri, secret) {
-    const requestSettings = {
-        uri: uri,
-        method: method,
-        headers: {}
-    };
+  const requestSettings = {
+    uri,
+    method,
+    headers: {},
+  };
 
-    if (secret) {
-        requestSettings.headers['X-Api-Secret'] = secret;
-    }
+  if (secret) {
+    requestSettings.headers['X-Api-Secret'] = secret;
+  }
 
-    return requestSettings;
+  return requestSettings;
 }
 
 
 function callback(err, response, body) {
-    if (err) {
-        this.emit('error', err);
-        this.emit('end');
-        return;
-    }
-
-    const sc = response.statusCode;
-
-    if (sc >= 200 && sc <= 206) {
-        this.emit('data', newMessage(response, body));
-    } else {
-        this.emit('error', new Error('Endpoint responds with ' + sc));
-    }
+  if (err) {
+    this.emit('error', err);
     this.emit('end');
+    return;
+  }
+
+  const sc = response.statusCode;
+
+  if (sc >= 200 && sc <= 206) {
+    this.emit('data', newMessage(response, body));
+  } else {
+    this.emit('error', new Error(`Endpoint responds with ${sc}`));
+  }
+  this.emit('end');
 }
 
 function newMessage(response, body) {
-    const headers = response.headers;
-    const contentType = headers['content-type'];
-    const msgBody = getJSONBody(contentType, body);
-    const msg = messages.newMessageWithBody(msgBody);
-    msg.headers = headers;
+  const { headers } = response;
+  const contentType = headers['content-type'];
+  const msgBody = getJSONBody(contentType, body);
+  const msg = messages.newMessageWithBody(msgBody);
+  msg.headers = headers;
 
-    return msg;
+  return msg;
 }
 
 function getJSONBody(contentType, body) {
-    if (contentType && contentType.indexOf('application/json') === 0) {
-        return JSON.parse(body);
-    }
+  if (contentType && contentType.indexOf('application/json') === 0) {
+    return JSON.parse(body);
+  }
 
-    return {
-        responseBody: body
-    };
+  return {
+    responseBody: body,
+  };
 }

lib/triggers/receive.js

@@ -1,32 +1,32 @@
+/* eslint-disable no-underscore-dangle,no-param-reassign */
 exports.process = async function receive(msg) {
-    const msgId = msg.id;
-    this.logger.info('Received new message:\n', JSON.stringify(msg));
+  const msgId = msg.id;
+  this.logger.info('Received new message:\n', JSON.stringify(msg));
 
-    if (msg.body) {
-        if (msg.query) {
-            msg.body._query = msg.query;
-        }
-
-        if (msg.headers) {
-            msg.body._headers = msg.headers;
-        }
-        if (msg.method) {
-            msg.body._method = msg.method;
-        }
+  if (msg.body) {
+    if (msg.query) {
+      msg.body._query = msg.query;
+    }
 
-        if (msg.url) {
-            msg.body._url = msg.url;
-        }
+    if (msg.headers) {
+      msg.body._headers = msg.headers;
+    }
+    if (msg.method) {
+      msg.body._method = msg.method;
+    }
 
-        if (msg.additionalUrlPath) {
-            msg.body._additionalUrlPath = msg.additionalUrlPath;
-        }
+    if (msg.url) {
+      msg.body._url = msg.url;
+    }
 
-        this.logger.info('Updated body: \n', JSON.stringify(msg.body));
+    if (msg.additionalUrlPath) {
+      msg.body._additionalUrlPath = msg.additionalUrlPath;
     }
 
-    this.logger.info('Emitting data of message: ', msgId);
-    await this.emit('data', msg);
-    this.logger.info('Data emitted');
-};
+    this.logger.info('Updated body: \n', JSON.stringify(msg.body));
+  }
 
+  this.logger.info('Emitting data of message: ', msgId);
+  await this.emit('data', msg);
+  this.logger.info('Data emitted');
+};