elasticio-sailor-nodejs 3.0.0-sailor-proxy-dev12 → 3.0.0-sailor-proxy-dev14

package/lib/proxy-client.js

@@ -495,27 +495,30 @@ class ProxyClient {
         this.listeningForMessages = false;
     }
 
-    _prepareData(data, metadata, type) {
+    _prepareData(data, metadata, type, forceProtocolVersion) {
         let protocolVersion;
-        if (type === 'data') {
+        if (forceProtocolVersion) {
+            protocolVersion = forceProtocolVersion;
+        } else if (type === 'data') {
             protocolVersion = this.settings.PROTOCOL_VERSION;
         } else if (type === 'http-reply') {
             protocolVersion = 1;
         }
-        let preparedData = data;
-        if (protocolVersion) {
-            preparedData = this.encryptMessageContent(data, protocolVersion);
-        }
         const preparedMetadata = {
             ...metadata,
             messageId: metadata.messageId || uuid.v4()
         };
+        let preparedData = data;
+        if (protocolVersion) {
+            preparedData = this.encryptMessageContent(data, protocolVersion);
+            preparedMetadata.protocolVersion = protocolVersion;
+        }
         return {
-            preparedData,
             preparedMetadata: _.omitBy(
                 preparedMetadata,
                 (value, key) => key.toLowerCase() === HEADER_ROUTING_KEY
-            )
+            ),
+            preparedData
         };
     }
 
@@ -523,7 +526,8 @@ class ProxyClient {
         incomingMessageId,
         type,
         data,
-        metadata
+        metadata,
+        forceProtocolVersion
     }) {
         await this._ensureConnection();
 
@@ -536,9 +540,15 @@ class ProxyClient {
         const messageHeaders = _.mapKeys(data.headers || {}, (value, key) => key.toLowerCase());
         const customRoutingKey = messageHeaders[HEADER_ROUTING_KEY];
 
-        log.debug({ incomingMessageId, type, metadata, customRoutingKey }, 'Sending message to proxy');
+        log.debug({
+            incomingMessageId,
+            type,
+            metadata,
+            customRoutingKey,
+            forceProtocolVersion
+        }, 'Sending message to proxy');
         log.trace({ data }, 'Message data to send to proxy');
-        const { preparedMetadata, preparedData } = this._prepareData(data, metadata, type);
+        const { preparedMetadata, preparedData } = this._prepareData(data, metadata, type, forceProtocolVersion);
         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}.`);

package/lib/sailor.js

@@ -236,6 +236,7 @@ class Sailor {
                 .on('updateSnapshot', onUpdateSnapshot)
                 .on('updateKeys', onUpdateKeys)
                 .on('httpReply', onHttpReply)
+                .on('customType', onCustomType)
                 .on('end', onEnd);
 
             taskExec.process(module, payload, cfg, snapshot);
@@ -468,6 +469,21 @@ class Sailor {
                 }, 'processMessage emit end');
                 resolve();
             }
+
+            async function onCustomType({ type, payload, protocolVersion = 2 }) {
+                const metadataToSend = _.clone(outgoingMetadata);
+                logger.trace({
+                    type,
+                    messageProcessingTime: Date.now() - timeStart
+                }, 'processMessage emit customType');
+                return that.proxyClient.sendMessage({
+                    incomingMessageId: metadata.messageId,
+                    data: payload,
+                    metadata: metadataToSend,
+                    type,
+                    forceProtocolVersion: protocolVersion
+                });
+            }
         });
 
         function formatError(err) {

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