kuzzle 2.17.7 → 2.17.8

package/lib/util/didYouMean.js

@@ -2,7 +2,7 @@
  * Kuzzle, a backend software, self-hostable and ready to use
  * to power modern apps
  *
- * Copyright 2015-2020 Kuzzle
+ * Copyright 2015-2022 Kuzzle
  * mailto: support AT kuzzle.io
  * website: http://kuzzle.io
  *

package/lib/util/extractFields.js

@@ -2,7 +2,7 @@
  * Kuzzle, a backend software, self-hostable and ready to use
  * to power modern apps
  *
- * Copyright 2015-2020 Kuzzle
+ * Copyright 2015-2022 Kuzzle
  * mailto: support AT kuzzle.io
  * website: http://kuzzle.io
  *

package/lib/util/inflector.js

@@ -3,7 +3,7 @@
  * Kuzzle, a backend software, self-hostable and ready to use
  * to power modern apps
  *
- * Copyright 2015-2020 Kuzzle
+ * Copyright 2015-2022 Kuzzle
  * mailto: support AT kuzzle.io
  * website: http://kuzzle.io
  *

package/lib/util/koncordeCompat.js

@@ -3,7 +3,7 @@
  * Kuzzle, a backend software, self-hostable and ready to use
  * to power modern apps
  *
- * Copyright 2015-2020 Kuzzle
+ * Copyright 2015-2022 Kuzzle
  * mailto: support AT kuzzle.io
  * website: http://kuzzle.io
  *

package/lib/util/memoize.js

@@ -2,7 +2,7 @@
  * Kuzzle, a backend software, self-hostable and ready to use
  * to power modern apps
  *
- * Copyright 2015-2020 Kuzzle
+ * Copyright 2015-2022 Kuzzle
  * mailto: support AT kuzzle.io
  * website: http://kuzzle.io
  *

package/lib/util/mutex.js

@@ -3,7 +3,7 @@
  * Kuzzle, a backend software, self-hostable and ready to use
  * to power modern apps
  *
- * Copyright 2015-2020 Kuzzle
+ * Copyright 2015-2022 Kuzzle
  * mailto: support AT kuzzle.io
  * website: http://kuzzle.io
  *

package/lib/util/name-generator.js

@@ -2,7 +2,7 @@
  * Kuzzle, a backend software, self-hostable and ready to use
  * to power modern apps
  *
- * Copyright 2015-2020 Kuzzle
+ * Copyright 2015-2022 Kuzzle
  * mailto: support AT kuzzle.io
  * website: http://kuzzle.io
  *

package/lib/util/promback.js

@@ -2,7 +2,7 @@
  * Kuzzle, a backend software, self-hostable and ready to use
  * to power modern apps
  *
- * Copyright 2015-2020 Kuzzle
+ * Copyright 2015-2022 Kuzzle
  * mailto: support AT kuzzle.io
  * website: http://kuzzle.io
  *

package/lib/util/requestAssertions.js

@@ -2,7 +2,7 @@
  * Kuzzle, a backend software, self-hostable and ready to use
  * to power modern apps
  *
- * Copyright 2015-2020 Kuzzle
+ * Copyright 2015-2022 Kuzzle
  * mailto: support AT kuzzle.io
  * website: http://kuzzle.io
  *

package/lib/util/safeObject.js

@@ -2,7 +2,7 @@
  * Kuzzle, a backend software, self-hostable and ready to use
  * to power modern apps
  *
- * Copyright 2015-2020 Kuzzle
+ * Copyright 2015-2022 Kuzzle
  * mailto: support AT kuzzle.io
  * website: http://kuzzle.io
  *

package/lib/util/stackTrace.js

@@ -2,7 +2,7 @@
  * Kuzzle, a backend software, self-hostable and ready to use
  * to power modern apps
  *
- * Copyright 2015-2020 Kuzzle
+ * Copyright 2015-2022 Kuzzle
  * mailto: support AT kuzzle.io
  * website: http://kuzzle.io
  *
@@ -21,33 +21,72 @@
 
 'use strict';
 
+const util = require('util');
+
+const MARKER = '>';
+const PADDING = '  ';
+
 /**
-  * Hilight user code
-  *
-  * e.g.
-  *     at BackendController._add (/home/kuzzle/lib/core/application/backend.ts:261:28)
-  *     at BackendController.register (/home/kuzzle/lib/core/application/backend.ts:187:10)
-  * >  at registerFoo (/home/aschen/projets/app/test.ts:12:18)
-  * >  at init (/home/aschen/projets/app/test.ts:8:3)
-  *     at Module._compile (internal/modules/cjs/loader.js:1133:30)
-  */
+ * Hilight user code
+ *
+ * e.g.
+ *       at BackendController._add (/home/kuzzle/lib/core/application/backend.ts:261:28)
+ *       at BackendController.register (/home/kuzzle/lib/core/application/backend.ts:187:10)
+ * >>>>  at registerFoo (/home/aschen/projets/app/test.ts:12:18)
+ * >>>>  at init (/home/aschen/projets/app/test.ts:8:3)
+ *       at Module._compile (internal/modules/cjs/loader.js:1133:30)
+ */
 function hilightUserCode (line) {
   // ignore first line (error message) or already enhanced
-  if (! line.includes(' at ') || line.startsWith('>')) {
+  if (! line.includes(' at ') || line.startsWith(MARKER)) {
     return line;
   }
 
-  if ( line.includes('kuzzle/lib/') // ignore kuzzle code
-    || (line.indexOf('at /') === -1 && line.charAt(line.indexOf('(') + 1) !== '/') // ignore node internal
-    || line.includes('node_modules') // ignore dependencies
-  ) {
-    return '   ' + line;
+  const isKuzzleCode = line.includes('kuzzle/lib/');
+  const isNodeCode = ! line.includes('at /')
+                  && ! line.includes('at async /')
+                  && line.charAt(line.indexOf('(') + 1) !== '/';
+  const isModuleCode = line.includes('node_modules');
+  if (isKuzzleCode || isNodeCode || isModuleCode) {
+    return PADDING + line;
   }
 
   // hilight user code
-  return '>' + line;
+  return MARKER + line;
+}
+
+/**
+ * utility method: must be invoked by all protocols to remove stack traces
+ * from payloads before sending them
+ * @param  {Error|Object} data - expected: plain error object or serialized
+ *                               request response
+ * @returns {*} return the data minus the stack trace
+ */
+function removeStacktrace (data) {
+  if (util.types.isNativeError(data)) {
+    if (global.NODE_ENV !== 'development') {
+      data.stack = undefined;
+    }
+    else {
+      data.stack = data.stack.split('\n').map(hilightUserCode).join('\n');
+    }
+  }
+  else if (data && data.content && data.content.error) {
+    // @todo v3: stack should be removed only for "production" env
+    if (global.NODE_ENV !== 'development') {
+      data.content.error.stack = undefined;
+    }
+    else {
+      data.content.error.stack = data.content.error.stack
+        ? data.content.error.stack.split('\n').map(hilightUserCode).join('\n')
+        : undefined;
+    }
+  }
+
+  return data;
 }
 
 module.exports = {
   hilightUserCode,
+  removeStacktrace,
 };

package/lib/util/wildcard.js

@@ -2,7 +2,7 @@
  * Kuzzle, a backend software, self-hostable and ready to use
  * to power modern apps
  *
- * Copyright 2015-2020 Kuzzle
+ * Copyright 2015-2022 Kuzzle
  * mailto: support AT kuzzle.io
  * website: http://kuzzle.io
  *

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle",
-  "version": "2.17.7",
+  "version": "2.17.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kuzzle",
   "author": "The Kuzzle Team <support@kuzzle.io>",
-  "version": "2.17.7",
+  "version": "2.17.8",
   "description": "Kuzzle is an open-source solution that handles all the data management through a secured API, with a large choice of protocols.",
   "bin": {
     "kuzzle": "bin/start-kuzzle-server"
@@ -35,7 +35,8 @@
     "test:lint:js:fix": "eslint --max-warnings=0 --fix ./lib ./test ./features-legacy ./bin ./features ./doc/build-error-codes.js",
     "doc-error-codes": "node -r ts-node/register doc/build-error-codes",
     "docker:install": "docker-compose run kuzzle_node_1 npm install",
-    "docker:test:unit": "docker-compose run kuzzle_node_1 npm run test:unit"
+    "docker:test:unit": "docker-compose run kuzzle_node_1 npm run test:unit",
+    "docker:npm": "docker-compose run kuzzle_node_1 npm run --"
   },
   "directories": {
     "lib": "lib"
@@ -62,7 +63,7 @@
     "koncorde": "^4.0.2",
     "kuzzle-plugin-auth-passport-local": "^6.3.6",
     "kuzzle-plugin-logger": "^3.0.3",
-    "kuzzle-sdk": "7.9.1",
+    "kuzzle-sdk": "^7.9.1",
     "kuzzle-vault": "^2.0.4",
     "lodash": "4.17.21",
     "long": "^5.2.0",

package/lib/core/network/removeErrorStack.js

@@ -1,56 +0,0 @@
-/*
- * Kuzzle, a backend software, self-hostable and ready to use
- * to power modern apps
- *
- * Copyright 2015-2020 Kuzzle
- * mailto: support AT kuzzle.io
- * website: http://kuzzle.io
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-'use strict';
-
-const util = require('util');
-
-const { hilightUserCode } = require('../../util/stackTrace');
-
-/**
- * utility method: must be invoked by all protocols to remove stack traces
- * from payloads before sending them
- * @param  {Error|Object} data - expected: plain error object or serialized
- *                               request response
- * @returns {*} return the data minus the stack trace
- */
-module.exports = data => {
-  if (util.isError(data)) {
-    if (global.NODE_ENV !== 'development') {
-      data.stack = undefined;
-    }
-    else {
-      data.stack = data.stack.split('\n').map(hilightUserCode).join('\n');
-    }
-  }
-  else if (data && data.content && data.content.error) {
-    if (global.NODE_ENV !== 'development') {
-      data.content.error.stack = undefined;
-    }
-    else {
-      data.content.error.stack = data.content.error.stack
-        ? data.content.error.stack.split('\n').map(hilightUserCode).join('\n')
-        : undefined;
-    }
-  }
-
-  return data;
-};