fiftyone.pipeline.cloudrequestengine 4.4.84 → 4.4.86

package/cloudRequestEngine.js

@@ -1,23 +1,23 @@
-/* *********************************************************************
- * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
- * Copyright 2023 51 Degrees Mobile Experts Limited, Davidson House,
- * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
- *
- * This Original Work is licensed under the European Union Public Licence
- * (EUPL) v.1.2 and is subject to its terms as set out below.
- *
- * If a copy of the EUPL was not distributed with this file, You can obtain
- * one at https://opensource.org/licenses/EUPL-1.2.
- *
- * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
- * amended by the European Commission) shall be deemed incompatible for
- * the purposes of the Work and the provisions of the compatibility
- * clause in Article 5 of the EUPL shall not apply.
- *
- * If using the Work as, or as part of, a network application, by
- * including the attribution notice(s) required under Article 5 of the EUPL
- * in the end user terms of the application under an appropriate heading,
- * such notice(s) shall fulfill the requirements of that article.
+/* *********************************************************************
+ * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
+ * Copyright 2023 51 Degrees Mobile Experts Limited, Davidson House,
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
+ *
+ * This Original Work is licensed under the European Union Public Licence
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
+ *
+ * If a copy of the EUPL was not distributed with this file, You can obtain
+ * one at https://opensource.org/licenses/EUPL-1.2.
+ *
+ * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
+ * amended by the European Commission) shall be deemed incompatible for
+ * the purposes of the Work and the provisions of the compatibility
+ * clause in Article 5 of the EUPL shall not apply.
+ *
+ * If using the Work as, or as part of, a network application, by
+ * including the attribution notice(s) required under Article 5 of the EUPL
+ * in the end user terms of the application under an appropriate heading,
+ * such notice(s) shall fulfill the requirements of that article.
  * ********************************************************************* */
 
 const util = require('util');
@@ -131,7 +131,7 @@ class CloudRequestEngine extends Engine {
       self.errors = errors;
       if (self.pipelines) {
         // Log error on all pipelines engine is attached to
-        self.pipelines.map(function (pipeline) {
+        self.pipelines.forEach(function (pipeline) {
           pipeline.log('error', {
             source: 'CloudRequestEngine',
             message: self.errors

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fiftyone.pipeline.cloudrequestengine",
-  "version": "4.4.84",
+  "version": "4.4.86",
   "description": "Cloud request engine for the 51Degrees Pipeline API",
   "keywords": [
     "51degrees",
@@ -18,12 +18,6 @@
   },
   "author": "51Degrees Engineering <engineering@51degrees.com>",
   "devDependencies": {
-    "eslint": "^6.8.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.3.1",
-    "eslint-plugin-standard": "^4.1.0",
     "jest": "^27.5.1"
   },
   "dependencies": {

package/tests/cloudEngine.test.js

@@ -1,23 +1,23 @@
-/* *********************************************************************
- * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
- * Copyright 2023 51 Degrees Mobile Experts Limited, Davidson House,
- * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
- *
- * This Original Work is licensed under the European Union Public Licence
- * (EUPL) v.1.2 and is subject to its terms as set out below.
- *
- * If a copy of the EUPL was not distributed with this file, You can obtain
- * one at https://opensource.org/licenses/EUPL-1.2.
- *
- * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
- * amended by the European Commission) shall be deemed incompatible for
- * the purposes of the Work and the provisions of the compatibility
- * clause in Article 5 of the EUPL shall not apply.
- *
- * If using the Work as, or as part of, a network application, by
- * including the attribution notice(s) required under Article 5 of the EUPL
- * in the end user terms of the application under an appropriate heading,
- * such notice(s) shall fulfill the requirements of that article.
+/* *********************************************************************
+ * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
+ * Copyright 2023 51 Degrees Mobile Experts Limited, Davidson House,
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
+ *
+ * This Original Work is licensed under the European Union Public Licence
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
+ *
+ * If a copy of the EUPL was not distributed with this file, You can obtain
+ * one at https://opensource.org/licenses/EUPL-1.2.
+ *
+ * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
+ * amended by the European Commission) shall be deemed incompatible for
+ * the purposes of the Work and the provisions of the compatibility
+ * clause in Article 5 of the EUPL shall not apply.
+ *
+ * If using the Work as, or as part of, a network application, by
+ * including the attribution notice(s) required under Article 5 of the EUPL
+ * in the end user terms of the application under an appropriate heading,
+ * such notice(s) shall fulfill the requirements of that article.
  * ********************************************************************* */
 
 const path = require('path');
@@ -25,13 +25,15 @@ const CloudRequestEngine = require('../cloudRequestEngine');
 
 // CloudEngine does not use relative path to import module so update the module
 // lookups path here via setting of NODE_PATH environment variable.
-process.env.NODE_PATH = __dirname + '/../..' + path.delimiter + process.env.NODE_PATH;
+const parentDir = path.resolve(__dirname, '../..');
+process.env.NODE_PATH = parentDir + path.delimiter + process.env.NODE_PATH;
 require('module').Module._initPaths();
 
-const CloudEngine = require(__dirname + '/../cloudEngine');
-const PipelineBuilder = require(
-  __dirname + '/../../fiftyone.pipeline.core/pipelineBuilder'
-);
+const cloudEnginePath = path.resolve(__dirname, '../cloudEngine');
+const pipelineBuilderPath = path.resolve(__dirname, '../../fiftyone.pipeline.core/pipelineBuilder');
+
+const CloudEngine = require(cloudEnginePath);
+const PipelineBuilder = require(pipelineBuilderPath);
 
 // Invalid resource key
 const testResourceKey = 'AAAAAAAAA';

package/tests/cloudEngineErrorMessages.test.js

@@ -1,23 +1,23 @@
-/* *********************************************************************
- * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
- * Copyright 2023 51 Degrees Mobile Experts Limited, Davidson House,
- * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
- *
- * This Original Work is licensed under the European Union Public Licence
- * (EUPL) v.1.2 and is subject to its terms as set out below.
- *
- * If a copy of the EUPL was not distributed with this file, You can obtain
- * one at https://opensource.org/licenses/EUPL-1.2.
- *
- * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
- * amended by the European Commission) shall be deemed incompatible for
- * the purposes of the Work and the provisions of the compatibility
- * clause in Article 5 of the EUPL shall not apply.
- *
- * If using the Work as, or as part of, a network application, by
- * including the attribution notice(s) required under Article 5 of the EUPL
- * in the end user terms of the application under an appropriate heading,
- * such notice(s) shall fulfill the requirements of that article.
+/* *********************************************************************
+ * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
+ * Copyright 2023 51 Degrees Mobile Experts Limited, Davidson House,
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
+ *
+ * This Original Work is licensed under the European Union Public Licence
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
+ *
+ * If a copy of the EUPL was not distributed with this file, You can obtain
+ * one at https://opensource.org/licenses/EUPL-1.2.
+ *
+ * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
+ * amended by the European Commission) shall be deemed incompatible for
+ * the purposes of the Work and the provisions of the compatibility
+ * clause in Article 5 of the EUPL shall not apply.
+ *
+ * If using the Work as, or as part of, a network application, by
+ * including the attribution notice(s) required under Article 5 of the EUPL
+ * in the end user terms of the application under an appropriate heading,
+ * such notice(s) shall fulfill the requirements of that article.
  * ********************************************************************* */
 
 const util = require('util');
@@ -25,22 +25,21 @@ const path = require('path');
 
 // CloudEngine does not use relative path to import module so update the module
 // lookups path here via setting of NODE_PATH environment variable.
-process.env.NODE_PATH = __dirname + '/../..' + path.delimiter + process.env.NODE_PATH;
+const parentDir = path.resolve(__dirname, '../..');
+process.env.NODE_PATH = parentDir + path.delimiter + process.env.NODE_PATH;
 require('module').Module._initPaths();
 
-const CloudEngine = require(__dirname + '/../cloudEngine');
-const PipelineBuilder = require(
-  __dirname + '/../../fiftyone.pipeline.core/pipelineBuilder'
-);
-const AspectDataDictionary = require(
-  __dirname + '/../../fiftyone.pipeline.engines/aspectDataDictionary'
-);
-const coreErrorMessages = require(
-  __dirname + '/../../fiftyone.pipeline.core/errorMessages'
-);
-const engineErrorMessages = require(
-  __dirname + '/../../fiftyone.pipeline.engines/errorMessages'
-);
+const cloudEnginePath = path.resolve(__dirname, '../cloudEngine');
+const pipelineBuilderPath = path.resolve(__dirname, '../../fiftyone.pipeline.core/pipelineBuilder');
+const aspectDataDictionaryPath = path.resolve(__dirname, '../../fiftyone.pipeline.engines/aspectDataDictionary');
+const coreErrorMessagesPath = path.resolve(__dirname, '../../fiftyone.pipeline.core/errorMessages');
+const engineErrorMessagesPath = path.resolve(__dirname, '../../fiftyone.pipeline.engines/errorMessages');
+
+const CloudEngine = require(cloudEnginePath);
+const PipelineBuilder = require(pipelineBuilderPath);
+const AspectDataDictionary = require(aspectDataDictionaryPath);
+const coreErrorMessages = require(coreErrorMessagesPath);
+const engineErrorMessages = require(engineErrorMessagesPath);
 
 // Test cloud engine class
 class TestCloudEngine extends CloudEngine {

package/tests/cloudResponse.test.js

@@ -28,12 +28,12 @@ const CloudRequestError = require('../cloudRequestError');
 
 // CloudEngine does not use relative path to import module so update the module
 // lookups path here via setting of NODE_PATH environment variable.
-process.env.NODE_PATH = __dirname + '/../..' + path.delimiter + process.env.NODE_PATH;
+const parentDir = path.resolve(__dirname, '../..');
+process.env.NODE_PATH = parentDir + path.delimiter + process.env.NODE_PATH;
 require('module').Module._initPaths();
 
-const PipelineBuilder = require(
-  __dirname + '/../../fiftyone.pipeline.core/pipelineBuilder'
-);
+const pipelineBuilderPath = path.resolve(__dirname, '../../fiftyone.pipeline.core/pipelineBuilder');
+const PipelineBuilder = require(pipelineBuilderPath);
 
 // Invalid resource key
 const testResourceKey = 'AAAAAAAAAAAA';

package/tests/integration.test.js

@@ -26,13 +26,16 @@ const { fail } = require('assert');
 
 // CloudEngine does not use relative path to import module so update the module
 // lookups path here via setting of NODE_PATH environment variable.
-process.env.NODE_PATH = __dirname + '/../..' + path.delimiter + process.env.NODE_PATH;
+const parentDir = path.resolve(__dirname, '../..');
+process.env.NODE_PATH = parentDir + path.delimiter + process.env.NODE_PATH;
 require('module').Module._initPaths();
 
-const CloudEngine = require(__dirname + '/../cloudEngine');
-const PipelineBuilder = require(
-  __dirname + '/../../fiftyone.pipeline.core/pipelineBuilder'
-);
+const cloudEnginePath = path.resolve(__dirname, '..', 'cloudEngine');
+const pipelineBuilderPath = path.resolve(__dirname, '..', '..', 'fiftyone.pipeline.core', 'pipelineBuilder');
+
+const CloudEngine = require(cloudEnginePath);
+const PipelineBuilder = require(pipelineBuilderPath);
+
 const myResourceKey = process.env.RESOURCE_KEY || '!!YOUR_RESOURCE_KEY!!';
 
 /**

package/tests/requestClient.test.js

@@ -27,7 +27,8 @@ const { default: each } = require('jest-each');
 
 // CloudEngine does not use relative path to import module so update the module
 // lookups path here via setting of NODE_PATH environment variable.
-process.env.NODE_PATH = __dirname + '/../..' + path.delimiter + process.env.NODE_PATH;
+const parentDir = path.resolve(__dirname, '../..');
+process.env.NODE_PATH = parentDir + path.delimiter + process.env.NODE_PATH;
 require('module').Module._initPaths();
 
 const noCheck = function () {};

package/.eslintrc

@@ -1,51 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "commonjs": true,
-        "es6": true
-    },
-    "plugins": [
-        "jsdoc"
-    ],
-    "extends": [
-        "standard"
-    ],
-    "globals": {
-        "Atomics": "readonly",
-        "SharedArrayBuffer": "readonly",
-        "test": true,
-        "jest": true,
-        "expect": true
-    },
-    "parserOptions": {
-        "ecmaVersion": 2018
-    },
-    "rules": {
-        "node/no-deprecated-api": "off",
-        "no-throw-literal": "off",
-        "no-path-concat": "off",
-        "no-prototype-builtins": "off",
-        "no-eval": "off",
-        "semi": [
-            2,
-            "always"
-        ],
-        "jsdoc/check-alignment": 1,
-        "jsdoc/check-param-names": 1,
-        "jsdoc/check-tag-names": 1,
-        "jsdoc/check-types": 1,
-        "jsdoc/implements-on-classes": 1,
-        "jsdoc/newline-after-description": 1,
-        "jsdoc/require-description": 1,
-        "jsdoc/require-jsdoc": 1,
-        "jsdoc/require-param": 1,
-        "jsdoc/require-param-description": 1,
-        "jsdoc/require-param-name": 1,
-        "jsdoc/require-param-type": 1,
-        "jsdoc/require-returns": 1,
-        "jsdoc/require-returns-check": 1,
-        "jsdoc/require-returns-description": 1,
-        "jsdoc/require-returns-type": 1,
-        "jsdoc/valid-types": 1
-    }
-}