fiftyone.pipeline.core 4.3.3 → 4.3.7

package/examples/examples.test.js

@@ -48,7 +48,7 @@ const testExample = function ({ file, portNumber }) {
 
   code += serverClose;
 
-  jest.fn(eval(code));
+  () => jest.fn(eval(code));
 };
 
 test('pipeline functionality example', () => {

package/flowData.js

@@ -140,13 +140,16 @@ class FlowData {
       errorKey = 'other';
     }
 
-    if (!this.errors[errorKey]) {
-      this.errors[errorKey] = [];
+    this.errors[errorKey] = error;
+
+    let logMessage = "Error occurred during processing";
+
+    if (errorKey !== undefined) {
+        logMessage = logMessage + " of " + errorKey + ". '" + error + "'";
     }
 
-    this.pipeline.log('error', { message: error, source: errorKey });
+    this.pipeline.log('error', logMessage);
 
-    this.errors[errorKey].push(error);
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fiftyone.pipeline.core",
-  "version": "4.3.3",
+  "version": "4.3.7",
   "description": "Core library for the 51Degrees Pipeline API",
   "directories": {
     "test": "tests"
@@ -24,8 +24,8 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
-    "jest": "^24.9.0",
-    "jest-each": "^26.6.2",
+    "jest": "^27.0.6",
+    "jest-each": "^27.0.6",
     "node-mocks-http": "^1.10.1"
   },
   "contributors": [

package/pipeline.js

@@ -38,13 +38,18 @@ class Pipeline {
    *
    * @param {FlowElement[]} flowElements list of FlowElements to
    * add to the Pipeline
+   * @param {Boolean} suppressProcessExceptions If true then pipeline 
+   * will suppress exceptions added to FlowData.
    */
-  constructor (flowElements = []) {
+  constructor (flowElements = [], suppressProcessExceptions = false) {
     const pipeline = this;
 
     // The chain of flowElements to run, including arrays of parallel elements
     this.flowElementsChain = flowElements;
 
+    // If true then pipeline will suppress exceptions added to FlowData.
+    this.suppressProcessExceptions = suppressProcessExceptions;
+
     // A logger for emitting messages
     this.eventEmitter = new EventEmitter();
 
@@ -126,7 +131,11 @@ class Pipeline {
                 resolve(flowData);
               })
               .catch(setError);
-          });
+
+            if (flowData.errors !== undefined && Object.entries(flowData.errors).length !== 0  && !pipeline.suppressProcessExceptions) {              
+              throw Object.values(flowData.errors)[0];    
+            }
+          });         
         };
       };
 

package/setHeadersElement.js

@@ -141,7 +141,9 @@ const AspectPropertyValue = require('./aspectPropertyValue');
 					headerValue += value;
 				}
 			});
-			result[header.name] = headerValue;
+			if (headerValue !== '') {
+				result[header.name] = headerValue;
+			}
 		}
 		return result;
 	}

package/tests/logs-errors-and-stops.test.js

@@ -35,8 +35,9 @@ const syncPipeline = new PipelineBuilder()
 
 const syncFlowData = syncPipeline.createFlowData();
 test('error data is populated', done => {
+  syncPipeline.suppressProcessExceptions = true;
   syncFlowData.process().then(function () {
-    expect(syncFlowData.errors.error[0]).toBe('Something went wrong');
+    expect(syncFlowData.errors.error).toBe('Something went wrong');
 
     done();
   });
@@ -45,17 +46,28 @@ test('error data is populated', done => {
 let log;
 
 syncPipeline.on('error', function (error) {
-  log = error.message;
+  console.log(error);
+  log = error;
 });
 
 test('logging', done => {
+  syncPipeline.suppressProcessExceptions = true;
   syncFlowData.process().then(function () {
-    expect(log).toBe('Something went wrong');
+    expect(log).toBe("Error occurred during processing of error. 'Something went wrong'");
 
     done();
   });
 });
 
+test("Don't Suppress Exception", done => {
+  syncFlowData.process().then(function () {
+    done();
+  }).catch((e) => {
+    // When an error occurs, check that the expected values are populated.
+    expect(e.indexOf('Something went wrong') !== -1).toBe(true);
+  });
+});
+
 test('stop flag works', done => {
   syncFlowData.process().then(function () {
     try {

package/tests/setHeadersElement.test.js

@@ -57,6 +57,9 @@ const pipeline = new PipelineBuilder()
  * 
  */
 each([
+  ["Ignore all unknown values.",
+    { "SetHeaderBrowserAccept-CH": unknownValue, "SetHeaderPlatformAccept-CH": unknownValue, "SetHeaderHardwareAccept-CH": unknownValue},
+    { "Accept-CH": "nil"}],
   ["Ignore unknown values.",
     { "SetHeaderBrowserAccept-CH": unknownValue, "SetHeaderPlatformAccept-CH": unknownValue, "SetHeaderHardwareAccept-CH": testValue},
     { "Accept-CH": "test"}],
@@ -74,7 +77,7 @@ each([
     { "Accept-CH": browserValue.value}],
   ["Undefined value.",
     { "SetHeaderBrowserAccept-CH": undefined},
-    { "Accept-CH": ""}],
+    { "Accept-CH": "nil"}],
   ["Set multiple headers.",
     { "SetHeaderBrowserAccept-CH": browserValue, "SetHeaderHardwareSomeOtherHeader": platformValue},
     { "Accept-CH": browserValue.value, "SomeOtherHeader": platformValue.value}],
@@ -90,7 +93,12 @@ each([
   Helpers.setResponseHeaders(response, result);
   // Check the correct headers were added to the response.
   for (const [key, value] of Object.entries(expectedHeaders)) {
-    expect(response.getHeader(key)).toBe(value); 
+    if (value === "nil") {
+      expect(response.getHeader("Accept-CH")).toBe(undefined)
+    }
+    else {
+      expect(response.getHeader(key)).toBe(value); 
+    }
   }
   
 });