elasticio-sailor-nodejs 2.6.26 → 2.6.28-dev2

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.6.27 (March 10, 2022)
+
+* Added npm audit to CI and fixed all dependencies
+
 ## 2.6.26 (June 24, 2021)
 
 * Replaced exit on "unhandledRejection" with error logging

package/lib/sailor.js

@@ -280,7 +280,10 @@ class Sailor {
         logger.info('Going to fetch message body.', { objectId });
 
         try {
-            object = await this.objectStorage.getAsJSON(objectId, this.settings.OBJECT_STORAGE_TOKEN);
+            object = await this.objectStorage.getAsJSON(
+                objectId,
+                { jwtPayloadOrToken: this.settings.OBJECT_STORAGE_TOKEN }
+            );
         } catch (e) {
             log.error(e);
             throw new Error(`Failed to get message body with id=${objectId}`);
@@ -292,17 +295,12 @@ class Sailor {
         return object;
     }
 
-    async uploadMessageBody(bodyBuf) {
-        let id;
-
-        try {
-            const stream = () => Readable.from(bodyBuf);
-            id = await this.objectStorage.addAsStream(stream, this.settings.OBJECT_STORAGE_TOKEN);
-        } catch (e) {
-            log.error(e);
-        }
-
-        return id;
+    uploadMessageBody(bodyBuf) {
+        const stream = () => Readable.from(bodyBuf);
+        return this.objectStorage.addAsStream(
+            stream,
+            { jwtPayloadOrToken: this.settings.OBJECT_STORAGE_TOKEN }
+        );
     }
 
     async runExec(module, payload, message, outgoingMessageHeaders, stepData, timeStart, logger) {
@@ -386,38 +384,38 @@ class Sailor {
                                 OBJECT_STORAGE_SIZE_THRESHOLD: settings.OBJECT_STORAGE_SIZE_THRESHOLD
                             }
                         );
-                        const [bodyId, ...passthroughIds] = await Promise.all([
-                            that.uploadMessageBody(bodyBuf),
-                            ...passthroughBufs.map(async ({ stepId, body, id }) => {
-                                const bodyId = id || await that.uploadMessageBody(body);
-                                return { stepId, bodyId };
-                            })
-                        ]);
-
-                        if (bodyId) {
-                            logger.info('Message body uploaded', { id: bodyId });
-                            const { headers } = data;
-                            data.body = {};
-                            data.headers = {
-                                ...(headers || {}),
-                                [OBJECT_ID_HEADER]: bodyId
-                            };
-                        } else {
-                            logger.info('Message body not uploaded');
+
+                        let bodyId;
+                        let passthroughIds;
+                        try {
+                            [bodyId, ...passthroughIds] = await Promise.all([
+                                that.uploadMessageBody(bodyBuf),
+                                ...passthroughBufs.map(async ({ stepId, body, id }) => {
+                                    const bodyId = id || await that.uploadMessageBody(body);
+                                    return { stepId, bodyId };
+                                })
+                            ]);
+                        } catch (e) {
+                            logger.error(e, 'Error during message/passthrough body upload');
+                            return onError(new Error('Lightweight message/passthrough body upload error'));
                         }
 
+                        logger.info('Message body uploaded', { id: bodyId });
+                        const { headers } = data;
+                        data.body = {};
+                        data.headers = {
+                            ...(headers || {}),
+                            [OBJECT_ID_HEADER]: bodyId
+                        };
+
                         for (const { stepId, bodyId } of passthroughIds) {
-                            if (bodyId) {
-                                logger.info('Passthrough Message body uploaded', { stepId, id: bodyId });
-                                const { [stepId]: { headers } } = passthrough;
-                                data.passthrough[stepId].body = {};
-                                data.passthrough[stepId].headers = {
-                                    ...(headers || {}),
-                                    [OBJECT_ID_HEADER]: bodyId
-                                };
-                            } else {
-                                logger.info('Passtrough Message body not uploaded', { stepId, id: bodyId });
-                            }
+                            logger.info('Passthrough Message body uploaded', { stepId, id: bodyId });
+                            const { [stepId]: { headers } } = passthrough;
+                            data.passthrough[stepId].body = {};
+                            data.passthrough[stepId].headers = {
+                                ...(headers || {}),
+                                [OBJECT_ID_HEADER]: bodyId
+                            };
                         }
 
                     } else {

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "elasticio-sailor-nodejs",
   "description": "The official elastic.io library for bootstrapping and executing for Node.js connectors",
-  "version": "2.6.26",
+  "version": "2.6.28-dev2",
   "main": "run.js",
   "scripts": {
+    "audit": "better-npm-audit audit --level high --production",
     "lint": "./node_modules/.bin/eslint lib spec mocha_spec lib run.js runService.js",
     "pretest": "npm run lint",
     "test": "npm run test:jasmine && npm run test:mocha",
@@ -15,33 +16,34 @@
     "node": ">=12.13.0"
   },
   "dependencies": {
-    "@elastic.io/object-storage-client": "1.0.0",
+    "@elastic.io/object-storage-client": "2.1.0",
     "amqplib": "0.8.0",
     "bunyan": "1.8.10",
     "co": "4.6.0",
     "debug": "3.1.0",
-    "elasticio-rest-node": "1.2.5",
+    "elasticio-rest-node": "1.2.7",
     "event-to-promise": "0.8.0",
-    "lodash": "4.17.15",
+    "lodash": "4.17.21",
     "p-throttle": "2.1.0",
     "q": "1.5.1",
     "request-promise-native": "1.0.5",
-    "requestretry": "3.1.0",
+    "requestretry": "7.0.2",
     "uuid": "3.0.1"
   },
   "devDependencies": {
-    "rabbitmq-stats": "1.2.3",
+    "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.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",
     "sinon": "9.0.2",
     "sinon-chai": "3.5.0"

package/.vscode/settings.json

@@ -1,7 +0,0 @@
-{
-    "editor.rulers": [
-    {
-        "column": 120
-    }
-    ]
-}