elasticio-sailor-nodejs 3.0.0-sailor-proxy-dev8 → 3.0.0-sailor-proxy-dev10

package/lib/encryptor.js

@@ -84,6 +84,7 @@ class Encryptor {
      */
     _encryptToBuffer(message) {
         if (!this._encryptionKey) {
+            log.warn('Encryption key is not set, message will be stored in plain text');
             return Buffer.from(message);
         }
         const cipher = this.createCipher();

package/lib/proxy-client.js

@@ -457,7 +457,7 @@ class ProxyClient {
                     });
 
                     const proxyHeaders = this._extractProxyHeaders(headers);
-                    const message = this._decodeMessage(body, headers);
+                    const message = this._decodeMessage(body, proxyHeaders);
                     log.debug({ proxyHeaders, message }, 'Processing received message');
                     await messageHandler(proxyHeaders, message);
                 }));
@@ -595,7 +595,9 @@ class ProxyClient {
     }
 
     _decodeDefaultMessage(originalMessage, headers) {
+        log.debug({ headers }, 'Decoding default message format');
         const protocolVersion = Number(headers.protocolVersion || 1);
+        log.debug({ protocolVersion }, 'Decoding message with protocol version');
         return this._encryptor.decryptMessageContent(
             originalMessage,
             protocolVersion < 2 ? 'base64' : undefined
@@ -603,6 +605,7 @@ class ProxyClient {
     }
 
     _decodeErrorMessage(originalMessage, headers) {
+        log.debug({ headers }, 'Decoding error message format');
         const errorBody = JSON.parse(originalMessage.toString());
         // NOTICE both error and errorInput are transferred as base64 encoded.
         // this does not depend on protocolVersion header of message (see _decodeDefaultMessage)
@@ -661,6 +664,7 @@ class ProxyClient {
     }
 
     encryptMessageContent(body, protocolVersion = 1) {
+        log.debug({ protocolVersion }, 'Encrypting message content with protocol version');
         return this._encryptor.encryptMessageContent(
             body,
             protocolVersion < 2
@@ -689,6 +693,7 @@ class ProxyClient {
                     'base64'
                 ).toString();
             } else {
+                // TODO: encrypt errorInput
                 payload.errorInput = originalMessage;
             }
         }
@@ -758,7 +763,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/package.json

@@ -1,7 +1,7 @@
 {
     "name": "elasticio-sailor-nodejs",
     "description": "The official elastic.io library for bootstrapping and executing for Node.js connectors",
-    "version": "3.0.0-sailor-proxy-dev8",
+    "version": "3.0.0-sailor-proxy-dev10",
     "main": "run.js",
     "scripts": {
         "build": "tsc",

package/postpublish.js

@@ -7,6 +7,9 @@ var version = require('./package.json').version;
 if (!version) {
     console.error('Can not determine current version');
     process.exit(0);
+} else if (version.indexOf('dev') > -1) {
+    console.info('Current version is a development version, skipping tag creation');
+    process.exit(0);
 }
 
 var tag = 'v' + version;