fiftyone.pipeline.cloudrequestengine 4.3.3 → 4.3.7

package/cloudEngine.js

@@ -99,29 +99,30 @@ class CloudEngine extends Engine {
     const engine = this;
 
     return engine.ready().then(function () {
+
       let cloudData = flowData.get('cloud').get('cloud');
 
       cloudData = JSON.parse(cloudData);
+      const result = {};
 
-      if (cloudData.device && cloudData.device[engine.dataKey] === null) {
-        flowData.pipeline.log('warn', engine.dataKey + " not populated. " +
-        cloudData.device[engine.dataKey + 'nullreason'] !== null ? cloudData.device[engine.dataKey + 'nullreason'] : "" +
+      if (cloudData && cloudData[engine.dataKey] === null) {
+        flowData.pipeline.log('error', engine.dataKey + " not populated. " +
+        cloudData[engine.dataKey + 'nullreason'] !== null ? cloudData[engine.dataKey + 'nullreason'] : "" +
         "\n" + "This may be because the provided API key is not authorised for " + engine.dataKey + " queries.");
-      }
+      } 
+      else {
 
       // Loop over cloudData.device properties to check if they have a value
-
-      const result = {};
-
-      Object.entries(cloudData[engine.dataKey]).forEach(function ([key, value]) {
-        result[key] = new AspectPropertyValue();
-
-        if (cloudData[engine.dataKey][key + 'nullreason']) {
-          result[key].noValueMessage = cloudData[engine.dataKey][key + 'nullreason'];
-        } else {
-          result[key].value = value;
-        }
-      });
+        Object.entries(cloudData[engine.dataKey]).forEach(function ([key, value]) {
+          result[key] = new AspectPropertyValue();
+  
+          if (cloudData[engine.dataKey][key + 'nullreason']) {
+            result[key].noValueMessage = cloudData[engine.dataKey][key + 'nullreason'];
+          } else {
+            result[key].value = value;
+          }
+        });
+      }
 
       const data = new AspectDataDictionary(
         {

package/cloudRequestError.js

@@ -24,6 +24,7 @@ class CloudRequestError extends Error {
   constructor(message, responseHeaders, httpStatusCode){
       super(message);
       this.name = this.constructor.name
+	  this.errorMessage = message;
       this.responseHeaders = responseHeaders;
       this.httpStatusCode = httpStatusCode;
       // This clips the constructor invocation from the stack trace.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fiftyone.pipeline.cloudrequestengine",
-  "version": "4.3.3",
+  "version": "4.3.7",
   "description": "Cloud request engine for the 51Degrees Pipeline API",
   "main": "index.js",
   "directories": {
@@ -17,11 +17,11 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
-    "jest": "^24.9.0"
+    "jest": "^27.0.6"
   },
   "dependencies": {
-    "fiftyone.pipeline.core": "^4.3.3",
-    "fiftyone.pipeline.engines": "^4.3.3"
+    "fiftyone.pipeline.core": "^4.3.7",
+    "fiftyone.pipeline.engines": "^4.3.7"
   },
   "contributors": [
     "Filip Hnízdo <filip@octophin.com> (https://octophindigital.com/)",

package/requestClient.js

@@ -36,40 +36,65 @@ class RequestClient {
      * content = The content of the response or an error message
      */
     post(url, data, origin) {
-    
-        return new Promise(function (resolve, reject) {
-            const request = require('request');
+        let httpModule;
+
+        if (url.indexOf('https') !== -1) {
+            httpModule = require('https');
+        } else {
+            httpModule = require('http');
+        }
 
+        if (data) {
+            var requestData = "";
+            var keys = Object.keys(data);
+            for (var i = 0; i < keys.length; i++) {
+                requestData += encodeURIComponent(keys[i]) + "=" + encodeURIComponent(data[keys[i]]);
+                if (i < (keys.length-1)) requestData += "&";
+            }
+        }
+            
+        return new Promise(function (resolve, reject) {
             var httpOptions = {
-                url: url,
+                method: 'POST',
                 headers: {
-                },
-                form: data
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                }
             };
-
-            if(origin) {        
-                httpOptions.headers['Origin']= origin;
+            if (origin) {        
+                httpOptions.headers['Origin'] = origin
+            }
+            if (requestData) {
+                httpOptions.headers['Content-Length'] = requestData.length
             }
 
-            request.post(httpOptions, function (err, httpResponse, body) { 
+            const req = httpModule.request(url, httpOptions, function (resp) { 
+                let data = '';
                 let result = { 
-                    headers: httpResponse ? httpResponse.headers : undefined, 
-                    statusCode: httpResponse ? httpResponse.statusCode : undefined,
-                    content: body
+                    headers: resp ? resp.headers : undefined, 
+                    statusCode: resp ? resp.statusCode : undefined
                 }
+    
+                resp.on('data', (chunk) => {
+                    data += chunk;
+                });
 
-                if (err) {              
-                    result.content = err;      
-                    reject(result); // todo message?
-                }
-                if (httpResponse.statusCode > 399) {
-                    // If response from cloud is not 2**, reject with error
-                    reject(result);
-                }
-                else {
-                    resolve(body);
-                }
+                resp.on('end', () => {
+                    result.content = data;
+                    // If response from cloud is not 2** / 3**, reject with error
+                    if (resp.statusCode > 399) {
+                        reject(result);
+                    } else {
+                        resolve(data);
+                    }
+                });
             });
+            
+            req.on('error', (err) => {
+                reject({ content: err.message });
+            });
+
+            req.write(requestData)
+            req.end();
         });
     }
 
@@ -117,7 +142,7 @@ class RequestClient {
     
                 resp.on('end', () => {
                     result.content = data;
-                    // If response from cloud is not 2**, reject with error
+                    // If response from cloud is not 2** / 3**, reject with error
                     if (resp.statusCode > 399) {
                         reject(result);
                     } else {

package/tests/cloudEngine.test.js

@@ -59,15 +59,12 @@ const flowData = pipeline.createFlowData();
 // Check that if an invalid resource key is used, a correct error
 // message will be returned and stored in flowData.errors
 test('missing property service - invalid resource key', done => {
+  pipeline.suppressProcessExceptions = true;
   flowData.process().then(function () {
     var errorFound = false;
-    flowData.errors.CloudEngineBase.forEach(function (errors) {
-      errors.forEach(function (error) {
-        errorFound = errorFound ||
-        (error.message.includes(testResourceKey) &&
-        error.message.includes('not a valid resource key'));
-      });
-    });
+    error = flowData.errors.CloudEngineBase[0];
+    errorFound = error.message.includes(testResourceKey) &&
+    error.message.includes('is not a valid Resource Key');
     expect(errorFound).toBe(true);
 
     done();

package/tests/cloudRequestEngine.test.js

@@ -81,7 +81,6 @@ test('custom end point - default value', done => {
 // Check that values from the http response are populated in the 
 // error object.
 test('HTTP data set in error', done => {
-  let errorThrown = false;
 
   let engine = new CloudRequestEngine({
     resourceKey: testResourceKey
@@ -90,24 +89,22 @@ test('HTTP data set in error', done => {
   const builder = new PipelineBuilder();
   const pipeline = builder.add(engine).build();
   const flowData = pipeline.createFlowData();
-  
-  // When an error occurs, check that the expected values are populated.
+  let expectedError = '\'' + testResourceKey + '\' is not a valid Resource Key.';      
+ 
+  // When an error occurs, check that the message is logged.
   pipeline.on('error', (e) => {
-    expect(e).toBeDefined();
-    expect(e.message).toBeDefined();
-    let expectedError = '\'' + testResourceKey + '\' is not a valid resource key.';
-    expect(e.message[0].message).toEqual(expectedError); 
-    expect(e.message[0].httpStatusCode).toEqual(400); 
-    expect(e.message[0].responseHeaders.etag).toBeDefined();
-    errorThrown = true;
+    expect(e).toBeDefined();  
+    done();
   });
 
-  // Make sure that the expected error was thrown.
   flowData.process().then(function () {
-    expect(errorThrown).toBe(true);
     done();
+  }).catch((e) => {
+    // When an error occurs, check that the expected values are populated.
+    expect(e[0].errorMessage.indexOf(expectedError) !== -1).toBe(true);     
+    expect(e[0].httpStatusCode).toEqual(400); 
+    expect(e[0].responseHeaders.etag).toBeDefined(); 
   });
-
 });
 
 /**

package/tests/cloudResponse.test.js

@@ -56,7 +56,7 @@ test("process", done => {
 
     var data = pipeline.createFlowData();
 
-    return data.process().then((processedData) => {
+    data.process().then((processedData) => {
         var result = processedData.getFromElement(engine)["cloud"];
 
         expect(result).toBe(JSON.stringify(jsonResponse));