fiftyone.pipeline.core 4.3.7 → 4.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fiftyone.pipeline.core",
-  "version": "4.3.7",
+  "version": "4.3.8",
   "description": "Core library for the 51Degrees Pipeline API",
   "directories": {
     "test": "tests"

package/pipelineBuilder.js

@@ -122,11 +122,17 @@ class PipelineBuilder {
       flowElements.push(new FlowElement(element.elementParameters));
     });
 
-    flowElements = flowElements.concat(this.getJavaScriptElements());
+    flowElements = this.addRequiredElements(flowElements);
 
     return new Pipeline(flowElements);
   }
 
+  addRequiredElements(flowElements) {
+    return flowElements
+      .concat(this.getJavaScriptElements())
+      .concat(this.getHttpElements());
+  }
+
   /**
    * Internal function used to first check if the
    * JavaScript elements should be added to the pipeline
@@ -214,10 +220,7 @@ class PipelineBuilder {
    * @returns {Pipeline} The constructed Pipeline
    */
   build () {
-    this.flowElements = this.flowElements
-      .concat(this.getJavaScriptElements())
-      .concat(this.getHttpElements());
-
+    this.flowElements = this.addRequiredElements(this.flowElements);
     return new Pipeline(this.flowElements);
   }
 }

package/setHeadersElement.js

@@ -23,6 +23,8 @@
 const FlowElement = require('./flowElement.js');
 const ElementDataDictionary = require('./elementDataDictionary.js');
 const AspectPropertyValue = require('./aspectPropertyValue');
+// SetHeader source headers separator
+const SOURCE_HEADER_SEPARATOR = ',';
 
 /**
  * @typedef {import('./pipeline')} Pipeline
@@ -130,19 +132,19 @@ const AspectPropertyValue = require('./aspectPropertyValue');
 	getResponseHeaders(flowData) {
 		const result = {};
 		for (const [key, header] of Object.entries(this.headers)) {
-			var headerValue = '';
+			var headerValue = new Set();
 			header.properties.forEach(property => {
 				var keys = property.split('.');
 				var value = this.tryGetValue(flowData, keys[0], keys[1]);
 				if (value !== undefined && value !== '') {
-					if (headerValue.length > 0) {
-						headerValue += ',';
-					}
-					headerValue += value;
+					value.split(SOURCE_HEADER_SEPARATOR).forEach((v) => {
+						headerValue.add(v);
+					});
 				}
 			});
-			if (headerValue !== '') {
-				result[header.name] = headerValue;
+			if (headerValue.size > 0) {
+				result[header.name] =
+				    Array.from(headerValue).join(SOURCE_HEADER_SEPARATOR);
 			}
 		}
 		return result;

package/tests/core.test.js

@@ -229,6 +229,10 @@ test('build from config', done => {
   configPipelineFlowData.process().then(function () {
     expect(configPipelineFlowData.get('configTest')
       .get('built')).toBe('hello_world');
+    expect(configPipeline.getElement('sequence')).not.toBe(undefined);
+    expect(configPipeline.getElement('jsonbundler')).not.toBe(undefined);
+    expect(configPipeline.getElement('javascriptbuilder')).not.toBe(undefined);
+    expect(configPipeline.getElement('set-headers')).not.toBe(undefined);
 
     done();
   });

package/tests/setHeadersElement.test.js

@@ -33,6 +33,8 @@ const testValue = new AspectPropertyValue(null, 'test')
 const browserValue = new AspectPropertyValue(null, 'SEC-CH-UA,SEC-CH-UA-Full-Version')
 const platformValue = new AspectPropertyValue(null, 'SEC-CH-UA-Platform,SEC-CH-UA-Platform-Version')
 const hardwareValue = new AspectPropertyValue(null, 'SEC-CH-UA-Model,SEC-CH-UA-Mobile,SEC-CH-UA-Arch')
+// Value which contains at least one duplicate value from each of other SetHeader values. 
+const duplicateValue = new AspectPropertyValue(null, 'SEC-CH-UA,SEC-CH-UA-Platform,SEC-CH-UA-Model')
 
 // Set up the properties in the element.
 setup.device.properties["SetHeaderBrowserAccept-CH"] = {
@@ -81,6 +83,9 @@ each([
   ["Set multiple headers.",
     { "SetHeaderBrowserAccept-CH": browserValue, "SetHeaderHardwareSomeOtherHeader": platformValue},
     { "Accept-CH": browserValue.value, "SomeOtherHeader": platformValue.value}],
+  ["Properties with duplicate values.",
+    { "SetHeaderPlatformAccept-CH": platformValue, "SetHeaderHardwareAccept-CH": duplicateValue},
+    { "Accept-CH": "SEC-CH-UA-Platform,SEC-CH-UA-Platform-Version,SEC-CH-UA,SEC-CH-UA-Model"}],
 ])
 .test('testGetResponseHeaderValue - %s', async (name, device, expectedHeaders) => {
   // Set up a mock repsonse object to collect the headers which are