elasticio-sailor-nodejs 3.0.0-sailor-proxy-dev7 → 3.0.0-sailor-proxy-dev9

package/.editorconfig

@@ -0,0 +1,11 @@
+[*.{js,json}]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+

package/.eslintrc

@@ -0,0 +1,73 @@
+{
+    "root": true,
+    "parserOptions": {
+        "ecmaVersion": 2018,
+        "sourceType": "script",
+        "ecmaFeatures": {
+            "impliedStrict": true
+        }
+    },
+    "plugins": [
+        "eslint-plugin-mocha",
+        "security",
+        "node"
+    ],
+    "extends": [
+        "standard",
+        "plugin:security/recommended"
+    ],
+    "globals": {
+        "BigInt": true
+    },
+    "rules": {
+        "array-bracket-spacing": ["warn", "never"],
+        "no-prototype-builtins": "warn",
+        "object-curly-newline": ["warn", { "multiline": true, "consistent": true }],
+        "quote-props": ["warn", "as-needed"],
+        "lines-between-class-members": 0,
+        "dot-notation": ["warn", { "allowKeywords": true }],
+        "quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
+        "mocha/no-exclusive-tests": "error",
+        "mocha/no-skipped-tests": "error",
+        "mocha/no-identical-title": "error",
+        "node/no-deprecated-api": "warn",
+        "semi": [
+            "error",
+            "always"
+        ],
+        "indent": [
+            "error",
+            4,
+            { "SwitchCase": 1 }
+        ],
+        "max-len": [
+            "warn",
+            120,
+            4,
+            {
+                "ignoreUrls": true,
+                "ignoreTemplateLiterals": true
+            }
+        ],
+        "space-before-function-paren": [
+            "warn",
+            {
+                "anonymous": "always",
+                "named": "never",
+                "asyncArrow": "always"
+            }
+        ],
+        "curly": [
+            2,
+            "all"
+        ],
+        "brace-style": [
+            "error",
+            "1tbs",
+            {
+                "allowSingleLine": false
+            }
+        ]
+    }
+}
+

package/lib/component_reader.js

@@ -82,8 +82,8 @@ ComponentReader.prototype.loadTriggerOrAction = async function loadTriggerOrActi
             message = 'Failed to load file \'%s\': %s';
             err.message = util.format(message, filename, err.message);
         } else {
-            message = 'Trigger or action \'%s\' is found, but can not be loaded. '
-                + 'Please check if the file \'%s\' is correct.';
+            message = 'Trigger or action \'%s\' is found, but can not be loaded. ' +
+                'Please check if the file \'%s\' is correct.';
             err.message = util.format(message, name, filename);
         }
 

package/lib/emitter.js

@@ -1,6 +1,5 @@
 'use strict';
 
-
 /**
  * Object#toString reference.
  */
@@ -65,7 +64,7 @@ EventEmitter.prototype.once = function once(name, fn) {
 
     function on() {
         that.removeListener(name, on);
-        //eslint-disable-next-line no-invalid-this
+        // eslint-disable-next-line no-invalid-this
         fn.apply(this, arguments);
     }
 

package/lib/encryptor.js

@@ -37,7 +37,6 @@ class Encryptor {
         );
     }
 
-
     /**
      * Encrypt message to proper format
      * @param {*} messagePayload anything json-stringifiable

package/lib/executor.js

@@ -14,7 +14,7 @@ class TaskExec extends EventEmitter {
         this._services = services;
         assert(this._services, 'TaskExec should be created with services');
         assert(this._services.apiClient, 'TaskExec should be created with api client');
-        assert(this._services.config , 'TaskExec should be created with config');
+        assert(this._services.config, 'TaskExec should be created with config');
     }
 
     process(triggerOrAction, payload, cfg, snapshot) {
@@ -61,5 +61,4 @@ class TaskExec extends EventEmitter {
     }
 }
 
-
 exports.TaskExec = TaskExec;

package/lib/hooksData.js

@@ -3,7 +3,6 @@
 const { axiosReqWithRetryOnServerError } = require('elasticio-rest-node');
 
 class HooksData {
-
     constructor({
         FLOW_ID: taskId,
         API_USERNAME: user,
@@ -58,7 +57,6 @@ class HooksData {
     delete() {
         return this.request('DELETE');
     }
-
 }
 
 module.exports.startup = function startup(settings) {

package/lib/logging.js

@@ -69,7 +69,7 @@ function ComponentLogger(options) {
         .child(options);
 
     function decorateLogger(destination, logger) {
-        for (let type of ['trace', 'debug', 'info', 'warn', 'error', 'fatal']) {
+        for (const type of ['trace', 'debug', 'info', 'warn', 'error', 'fatal']) {
             const originalMethod = logger[type];
             destination[type] = function log() {
                 const args = Array.prototype.slice.call(arguments);
@@ -91,7 +91,6 @@ function ComponentLogger(options) {
     decorateLogger(this, logger);
 }
 
-
 module.exports = log;
 module.exports.ComponentLogger = ComponentLogger;
 module.exports.criticalErrorAndExit = criticalErrorAndExit;

package/lib/proxy-client.js

@@ -91,7 +91,9 @@ class ProxyClient {
     }
 
     _setupConnectionListeners() {
-        if (!this.clientSession) return;
+        if (!this.clientSession) {
+            return;
+        }
 
         // Handle connection errors
         this.clientSession.on('error', (err) => {
@@ -380,7 +382,7 @@ class ProxyClient {
 
             postMessageStream.on('end', () => {
                 if (!responseData) {
-                    return
+                    return;
                 }
                 try {
                     const responseJson = JSON.parse(responseData);
@@ -482,7 +484,7 @@ class ProxyClient {
         log.info('Stopping listening for messages');
         await Promise.all(Array.from(this.getMessageStreams).map(stream => {
             if (stream.closed || stream.destroyed) {
-                log.debug({ closed: stream.closed, destroyed: stream.destroyed  }, 'Message stream is already closed or destroyed');
+                log.debug({ closed: stream.closed, destroyed: stream.destroyed }, 'Message stream is already closed or destroyed');
                 return Promise.resolve();
             }
             return new Promise((resolve) => {
@@ -505,7 +507,6 @@ class ProxyClient {
         let preparedData = data;
         if (protocolVersion) {
             preparedData = this.encryptMessageContent(data, protocolVersion);
-            proxyHeaders.protocolVersion = protocolVersion;
         }
         const proxyHeaders = this._createProxyHeaders({ ...headers, protocolVersion });
         return {
@@ -530,10 +531,10 @@ class ProxyClient {
 
         log.debug({ incomingMessageId, type, headers }, 'Sending message to proxy');
         log.trace({ data }, 'Message data to send to proxy');
-        const { proxyHeaders, preparedData }  = this._prepareData(data, headers, type);
+        const { proxyHeaders, preparedData } = this._prepareData(data, headers, type);
         if (preparedData.length > this.settings.OUTGOING_MESSAGE_SIZE_LIMIT) {
-            const error = new Error(`Outgoing message size ${preparedData.length}`
-                + ` exceeds limit of ${this.settings.OUTGOING_MESSAGE_SIZE_LIMIT}.`);
+            const error = new Error(`Outgoing message size ${preparedData.length}` +
+                ` exceeds limit of ${this.settings.OUTGOING_MESSAGE_SIZE_LIMIT}.`);
             log.error(error);
             throw error;
         }
@@ -693,7 +694,7 @@ class ProxyClient {
         }
         const errorPayload = JSON.stringify(payload);
 
-        let result = await this.sendMessage({
+        const result = await this.sendMessage({
             incomingMessageId: incomingHeaders ? incomingHeaders.messageId : undefined,
             type: 'error',
             data: errorPayload,
@@ -757,7 +758,8 @@ class ProxyClient {
             ...metaHeadersLowerCased,
             threadId: headers.threadId || metaHeadersLowerCased['x-eio-meta-trace-id'],
             messageId: headers.messageId,
-            parentMessageId: headers.parentMessageId
+            parentMessageId: headers.parentMessageId,
+            protocolVersion: headers.protocolVersion
         };
         if (!result.threadId) {
             const threadId = uuid.v4();

package/lib/sailor.js

@@ -32,7 +32,7 @@ class Sailor {
         this.stepData = {};
         this.shutdownCallback = null;
         // TODO move endpoint to proxy
-        //eslint-disable-next-line new-cap
+        // eslint-disable-next-line new-cap
         this.apiClient = RestApiClient(
             settings.API_USERNAME,
             settings.API_KEY,
@@ -97,7 +97,7 @@ class Sailor {
     }
 
     startup() {
-        return co(function* doStartup() {
+        return co(function * doStartup() {
             log.debug('Starting up component');
             const result = yield this.invokeModuleFunction('startup');
             log.trace('Startup data received');
@@ -121,7 +121,7 @@ class Sailor {
     }
 
     runHookShutdown() {
-        return co(function* doShutdown() {
+        return co(function * doShutdown() {
             log.debug('About to shut down');
             const handle = hooksData.startup(this.settings);
             const state = yield handle.retrieve();
@@ -132,7 +132,7 @@ class Sailor {
     }
 
     runHookInit() {
-        return co(function* doInit() {
+        return co(function * doInit() {
             log.debug('About to initialize component for execution');
             const res = yield this.invokeModuleFunction('init');
             log.debug('Component execution initialized successfully');
@@ -143,7 +143,7 @@ class Sailor {
     invokeModuleFunction(moduleFunction, data) {
         const settings = this.settings;
         const stepData = this.stepData;
-        return co(function* gen() {
+        return co(function * gen() {
             const module = yield this.componentReader.loadTriggerOrAction(settings.FUNCTION);
             if (!module[moduleFunction]) {
                 log.warn(`invokeModuleFunction – ${moduleFunction} is not found`);
@@ -318,7 +318,6 @@ class Sailor {
                                 [OBJECT_ID_HEADER]: bodyId
                             };
                         }
-
                     } else {
                         logger.trace(
                             'Message size is below threshold.',
@@ -410,7 +409,7 @@ class Sailor {
             async function onSnapshot(data) {
                 const headers = _.clone(outgoingMessageHeaders);
                 headers.snapshotEvent = 'snapshot';
-                that.snapshot = data; //replacing `local` snapshot
+                that.snapshot = data; // replacing `local` snapshot
                 return that.proxyClient.sendSnapshot(data, headers);
             }
 
@@ -422,7 +421,7 @@ class Sailor {
                     if (data.$set) {
                         return log.warn('ERROR: $set is not supported any more in `updateSnapshot` event');
                     }
-                    _.extend(that.snapshot, data); //updating `local` snapshot
+                    _.extend(that.snapshot, data); // updating `local` snapshot
                     return that.proxyClient.sendSnapshot(data, headers);
                 } else {
                     log.error('You should pass an object to the `updateSnapshot` event');
@@ -471,7 +470,6 @@ class Sailor {
             }
         });
 
-
         function formatError(err) {
             if (err instanceof Error || (_.isObject(err) && _.has(err, 'message'))) {
                 return {
@@ -490,7 +488,7 @@ class Sailor {
     }
 
     async processMessage(headers, payload) {
-        //eslint-disable-next-line consistent-this
+        // eslint-disable-next-line consistent-this
         const self = this;
         const settings = this.settings;
 

package/lib/service.js

@@ -36,7 +36,6 @@ class ServiceExec extends EventEmitter {
 }
 
 function processService(serviceMethod, env) {
-
     var ALLOWED_METHODS = {
         verifyCredentials: verifyCredentials,
         getMetaModel: getMetaModel,
@@ -95,7 +94,7 @@ function processService(serviceMethod, env) {
             triggerOrAction: ACTION_OR_TRIGGER,
             getModelMethod: GET_MODEL_METHOD
         };
-        //eslint-disable-next-line new-cap
+        // eslint-disable-next-line new-cap
         apiClient = RestApiClient(API_USERNAME, API_KEY, {
             retryCount: parseInt(env.ELASTICIO_API_REQUEST_RETRY_ATTEMPTS),
             retryDelay: parseInt(env.ELASTICIO_API_REQUEST_RETRY_DELAY)
@@ -162,9 +161,8 @@ function processService(serviceMethod, env) {
             .then(() => responseBody);
 
         function checkStatusCode(response) {
-            //eslint-disable-next-line eqeqeq
+            // eslint-disable-next-line eqeqeq
             if (response.statusCode != '200') {
-
                 debug('Unable to reach API :(');
 
                 var error = new Error(util.format(

package/lib/settings.js

@@ -36,7 +36,7 @@ function getOptionalEnvVars(envVars) {
         NO_SELF_PASSTRHOUGH: false,
         PROTOCOL_VERSION: 1,
         INPUT_FORMAT: 'default',
-        EMIT_LIGHTWEIGHT_MESSAGE: false,
+        EMIT_LIGHTWEIGHT_MESSAGE: false
     };
 
     const result = {};
@@ -48,7 +48,7 @@ function getOptionalEnvVars(envVars) {
             if (envVars[envVarName] === undefined) {
                 result[key] = defaultValue;
             } else {
-                result[key] = (!envVars[envVarName] || envVars[envVarName] === 'false') ? false : true;
+                result[key] = !((!envVars[envVarName] || envVars[envVarName] === 'false'));
             }
         } else {
             result[key] = envVars[envVarName] || defaultValue;

package/package.json

@@ -1,54 +1,61 @@
 {
-  "name": "elasticio-sailor-nodejs",
-  "description": "The official elastic.io library for bootstrapping and executing for Node.js connectors",
-  "version": "3.0.0-sailor-proxy-dev7",
-  "main": "run.js",
-  "scripts": {
-    "build": "tsc",
-    "audit": "better-npm-audit audit --level high --production",
-    "pretest": "npm run lint",
-    "lint": "eslint --ext .ts .",
-    "test": "npm run test:jasmine && npm run test:mocha",
-    "test:jasmine": "NODE_ENV=test jasmine-node spec",
-    "test:mocha": "NODE_ENV=test node_modules/.bin/mocha --recursive mocha_spec",
-    "postpublish": "./postpublish.js",
-    "dev:local": "node run.local.js | bunyan"
-  },
-  "engines": {
-    "node": ">=12.13.0"
-  },
-  "dependencies": {
-    "bunyan": "1.8.10",
-    "co": "4.6.0",
-    "debug": "3.1.0",
-    "elasticio-rest-node": "2.0.0",
-    "event-to-promise": "0.8.0",
-    "lodash": "4.17.21",
-    "p-throttle": "2.1.0",
-    "q": "1.5.1",
-    "uuid": "3.0.1"
-  },
-  "devDependencies": {
-    "better-npm-audit": "3.7.3",
-    "chai": "4.2.0",
-    "del": "2.2.2",
-    "eslint": "4.19.1",
-    "eslint-plugin-mocha": "4.12.1",
-    "express": "4.16.4",
-    "gulp": "3.9.1",
-    "gulp-istanbul": "1.1.3",
-    "gulp-jasmine": "0.2.0",
-    "jasmine-node": "3.0.0",
-    "mocha": "7.1.2",
-    "nock": "12.0.3",
-    "rabbitmq-stats": "1.2.4",
-    "request": "2.88.0",
-    "request-promise-native": "1.0.5",
-    "sinon": "9.0.2",
-    "sinon-chai": "3.5.0",
-    "ts-node": "10.4.0",
-    "typescript": "4.4.4"
-  },
-  "repository": "elasticio/sailor-nodejs",
-  "license": "Apache-2.0"
+    "name": "elasticio-sailor-nodejs",
+    "description": "The official elastic.io library for bootstrapping and executing for Node.js connectors",
+    "version": "3.0.0-sailor-proxy-dev9",
+    "main": "run.js",
+    "scripts": {
+        "build": "tsc",
+        "audit": "better-npm-audit audit --level high --production",
+        "pretest": "npm run lint",
+        "lint": "eslint --ext ts,js .",
+        "test": "npm run test:jasmine && npm run test:mocha",
+        "test:jasmine": "NODE_ENV=test jasmine-node spec",
+        "test:mocha": "NODE_ENV=test node_modules/.bin/mocha --recursive mocha_spec",
+        "postpublish": "./postpublish.js",
+        "dev:local": "node run.local.js | bunyan"
+    },
+    "engines": {
+        "node": ">=12.13.0"
+    },
+    "dependencies": {
+        "bunyan": "1.8.10",
+        "co": "4.6.0",
+        "debug": "3.1.0",
+        "elasticio-rest-node": "2.0.0",
+        "event-to-promise": "0.8.0",
+        "lodash": "4.17.21",
+        "p-throttle": "2.1.0",
+        "q": "1.5.1",
+        "uuid": "3.0.1"
+    },
+    "devDependencies": {
+        "better-npm-audit": "3.7.3",
+        "chai": "4.2.0",
+        "del": "2.2.2",
+        "eslint": "6.2.2",
+        "eslint-plugin-mocha": "4.12.1",
+        "eslint-config-standard": "14.1.0",
+        "eslint-plugin-import": "2.20.1",
+        "eslint-plugin-mocha": "6.3.0",
+        "eslint-plugin-node": "11.0.0",
+        "eslint-plugin-promise": "4.2.1",
+        "eslint-plugin-security": "1.4.0",
+        "eslint-plugin-standard": "4.0.1",
+        "express": "4.16.4",
+        "gulp": "3.9.1",
+        "gulp-istanbul": "1.1.3",
+        "gulp-jasmine": "0.2.0",
+        "jasmine-node": "3.0.0",
+        "mocha": "7.1.2",
+        "nock": "12.0.3",
+        "rabbitmq-stats": "1.2.4",
+        "request": "2.88.0",
+        "request-promise-native": "1.0.5",
+        "sinon": "9.0.2",
+        "sinon-chai": "3.5.0",
+        "ts-node": "10.4.0",
+        "typescript": "4.4.4"
+    },
+    "repository": "elasticio/sailor-nodejs",
+    "license": "Apache-2.0"
 }

package/run.js

@@ -30,11 +30,11 @@ async function putOutToSea(settings, ipc) {
     sailorInit = deferred.promise;
     sailor = new Sailor(settings);
 
-    //eslint-disable-next-line no-extra-boolean-cast
+    // eslint-disable-next-line no-extra-boolean-cast
     if (!!settings.HOOK_SHUTDOWN) {
         logger.trace('Running hook shutdown');
         disconnectRequired = false;
-        //eslint-disable-next-line no-empty-function
+        // eslint-disable-next-line no-empty-function
         sailor.reportError = () => {
         };
         await sailor.prepare();
@@ -46,7 +46,7 @@ async function putOutToSea(settings, ipc) {
     await sailor.connect();
     await sailor.prepare();
 
-    //eslint-disable-next-line no-extra-boolean-cast
+    // eslint-disable-next-line no-extra-boolean-cast
     if (!!settings.STARTUP_REQUIRED) {
         await sailor.startup();
     }

package/run.local.js

@@ -1,9 +1,9 @@
 const config = require('./config/local.json');
 
 function setEnvVars() {
-  for (const [key, value] of Object.entries(config)) {
-    process.env[key] = value;
-  }
+    for (const [key, value] of Object.entries(config)) {
+        process.env[key] = value;
+    }
 }
 setEnvVars();
 

package/.eslintrc.js

@@ -1,16 +0,0 @@
-module.exports = {
-    globals: {
-        NodeJS: 'readonly',
-        BufferEncoding: 'readonly',
-    },
-    parser: '@typescript-eslint/parser',
-    extends: [
-        'plugin:@typescript-eslint/recommended',
-    ],
-    plugins: ['@typescript-eslint'],
-    parserOptions: {
-        ecmaVersion: 2018,
-        sourceType: 'module'
-    },
-};
-