elasticio-sailor-nodejs 3.0.0-sailor-proxy-dev4 → 3.0.0-sailor-proxy-dev6

package/lib/proxy-client.js

@@ -495,14 +495,23 @@ class ProxyClient {
         this.listeningForMessages = false;
     }
 
-    getProtocolVersion(headers, type) {
-        let protocolVersion = Number(headers.protocolVersion || 1);
+    _prepareData(data, headers, type) {
+        let protocolVersion;
         if (type === 'data') {
             protocolVersion = this.settings.PROTOCOL_VERSION;
         } else if (type === 'http-reply') {
             protocolVersion = 1;
         }
-        return protocolVersion;
+        let preparedData;
+        if (protocolVersion) {
+            preparedData = this.encryptMessageContent(data, protocolVersion);
+            proxyHeaders.protocolVersion = protocolVersion;
+        }
+        const proxyHeaders = this._createProxyHeaders({ ...headers, protocolVersion });
+        return {
+            preparedData,
+            proxyHeaders
+        };
     }
 
     async sendMessage({
@@ -521,14 +530,9 @@ class ProxyClient {
 
         log.debug({ incomingMessageId, type, headers }, 'Sending message to proxy');
         log.trace({ data }, 'Message data to send to proxy');
-        const proxyHeaders = this._createProxyHeaders(headers);
-        const protocolVersion = this.getProtocolVersion(headers, type);
-        // For error messages we send object with encrypted error details, so we don't want to encrypt the whole
-        // payload again (see `sendError` method) - we just stringify it. For other message types, we encrypt
-        // the content before sending.
-        const encryptedData = type === 'error' ? data : this.encryptMessageContent(data, protocolVersion);
-        if (encryptedData.length > this.settings.OUTGOING_MESSAGE_SIZE_LIMIT) {
-            const error = new Error(`Outgoing message size ${encryptedData.length}`
+        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}.`);
             log.error(error);
             throw error;
@@ -550,7 +554,7 @@ class ProxyClient {
                 [HTTP2_HEADER_METHOD]: 'POST',
                 [HTTP2_HEADER_AUTHORIZATION]: this.authHeader
             });
-            postMessageStream.write(encryptedData);
+            postMessageStream.write(preparedData);
             postMessageStream.end();
 
             postMessageStream.on('response', (headers) => {
@@ -600,7 +604,7 @@ class ProxyClient {
     _decodeErrorMessage(originalMessage, headers) {
         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 _decodeDefault message)
+        // this does not depend on protocolVersion header of message (see _decodeDefaultMessage)
         // this should be fixed in future, but it's OK at this moment
         if (errorBody.error) {
             errorBody.error = this._encryptor.decryptMessageContent(Buffer.from(errorBody.error), 'base64');
@@ -667,8 +671,6 @@ class ProxyClient {
     async sendError(err, headers, originalMessage, incomingHeaders) {
         await this._ensureConnection();
 
-        const settings = this.settings;
-
         const encryptedError = this._encryptor.encryptMessageContent({
             name: err.name,
             message: err.message,

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-dev4",
+  "version": "3.0.0-sailor-proxy-dev6",
   "main": "run.js",
   "scripts": {
     "build": "tsc",