kuzzle 2.16.2 → 2.16.6

package/lib/api/request/requestResponse.d.ts

@@ -1,19 +1,17 @@
 import { JSONObject } from 'kuzzle-sdk';
-import '../../../lib/types/Global';
 import { Deprecation } from '../../types';
 import { KuzzleError } from '../../kerror/errors/kuzzleError';
-import { KuzzleRequest } from './kuzzleRequest';
 export declare class Headers {
     headers: JSONObject;
     private namesMap;
-    proxy: any;
+    private proxy;
     constructor();
     /**
      * Gets a header value
      *
      * @param name Header name. Could be a string (case-insensitive) or a symbol
      */
-    getHeader(name: any): string;
+    getHeader(name: any): string | void;
     removeHeader(name: string): boolean;
     setHeader(name: string, value: string): boolean;
 }
@@ -21,22 +19,20 @@ export declare class Headers {
  * Kuzzle normalized API response
  */
 export declare class RequestResponse {
-    private request;
-    private _headers;
     /**
      * If sets to true, "result" content will not be wrapped in a Kuzzle response
      */
     raw: boolean;
-    constructor(request: KuzzleRequest);
+    constructor(request: any);
     /**
      * Get the parent request deprecations
      */
-    get deprecations(): Array<Deprecation>;
+    get deprecations(): Array<Deprecation> | void;
     /**
      * Set the parent request deprecations
      * @param {Object[]} deprecations
      */
-    set deprecations(deprecations: Array<Deprecation>);
+    set deprecations(deprecations: Array<Deprecation> | void);
     /**
      * Get the parent request status
      * @returns {number}
@@ -103,16 +99,16 @@ export declare class RequestResponse {
     /**
      * Gets a header value (case-insensitive)
      */
-    getHeader(name: string): string;
+    getHeader(name: string): string | null;
     /**
      * Deletes a header (case-insensitive)
      */
-    removeHeader(name: string): boolean;
+    removeHeader(name: string): any;
     /**
      * Sets a new array. Behaves the same as Node.js' HTTP response.setHeader
      * method (@see https://nodejs.org/api/http.html#http_response_setheader_name_value)
      */
-    setHeader(name: string, value: string): boolean;
+    setHeader(name: string, value: string): any;
     /**
      * Adds new multiple headers.
      */

package/lib/api/request/requestResponse.js

@@ -40,8 +40,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestResponse = exports.Headers = void 0;
-require("../../../lib/types/Global");
 const assert = __importStar(require("../../util/assertType"));
+// private properties
+// \u200b is a zero width space, used to masquerade console.log output
+const _request = 'request\u200b';
+const _headers = 'headers\u200b';
 class Headers {
     constructor() {
         this.namesMap = new Map();
@@ -51,10 +54,7 @@ class Headers {
             get: (target, name) => this.getHeader(name),
             set: (target, name, value) => this.setHeader(name, value),
         });
-        // eslint-disable-next-line dot-notation
-        if (global['_kuzzle'] && global.kuzzle) {
-            this.setHeader('X-Kuzzle-Node', global.kuzzle.id);
-        }
+        this.setHeader('X-Kuzzle-Node', global.kuzzle.id);
     }
     /**
      * Gets a header value
@@ -144,104 +144,98 @@ exports.Headers = Headers;
 class RequestResponse {
     constructor(request) {
         this.raw = false;
-        // Make a private property otherwise the tests are ending in recursive loop
-        Reflect.defineProperty(this, 'request', {
-            value: request,
-        });
-        this._headers = new Headers();
+        this[_request] = request;
+        this[_headers] = new Headers();
+        Object.seal(this);
     }
     /**
      * Get the parent request deprecations
      */
     get deprecations() {
-        return this.request.deprecations;
+        return this[_request].deprecations;
     }
     /**
      * Set the parent request deprecations
      * @param {Object[]} deprecations
      */
     set deprecations(deprecations) {
-        this.request.deprecations = deprecations;
+        this[_request].deprecations = deprecations;
     }
     /**
      * Get the parent request status
      * @returns {number}
      */
     get status() {
-        return this.request.status;
+        return this[_request].status;
     }
     set status(s) {
-        this.request.status = s;
+        this[_request].status = s;
     }
     /**
      * Request error
      */
     get error() {
-        return this.request.error;
+        return this[_request].error;
     }
     set error(e) {
-        this.request.setError(e);
+        this[_request].setError(e);
     }
     /**
      * Request external ID
      */
     get requestId() {
-        return this.request.id;
+        return this[_request].id;
     }
     /**
      * API controller name
      */
     get controller() {
-        return this.request.input.controller;
+        return this[_request].input.controller;
     }
     /**
      * API action name
      */
     get action() {
-        return this.request.input.action;
+        return this[_request].input.action;
     }
     /**
      * Collection name
      */
     get collection() {
-        return this.request.input.resource.collection;
+        return this[_request].input.resource.collection;
     }
     /**
      * Index name
      */
     get index() {
-        return this.request.input.resource.index;
+        return this[_request].input.resource.index;
     }
     /**
      * Volatile object
      */
     get volatile() {
-        return this.request.input.volatile;
+        return this[_request].input.volatile;
     }
     /**
      * Response headers
      */
     get headers() {
-        return this._headers.proxy;
+        return this[_headers].proxy;
     }
     /**
      * Request result
      */
     get result() {
-        return this.request.result;
+        return this[_request].result;
     }
     set result(r) {
-        this.request.setResult(r);
+        this[_request].setResult(r);
     }
     /**
      * Node identifier
      */
     get node() {
-        // eslint-disable-next-line dot-notation
-        if (global['_kuzzle'] && global.kuzzle) {
-            return global.kuzzle.id;
-        }
-        return null;
+        return global.kuzzle.id;
     }
     /**
      * Configure the response
@@ -271,20 +265,20 @@ class RequestResponse {
      * Gets a header value (case-insensitive)
      */
     getHeader(name) {
-        return this._headers.getHeader(name);
+        return this[_headers].getHeader(name);
     }
     /**
      * Deletes a header (case-insensitive)
      */
     removeHeader(name) {
-        return this._headers.removeHeader(name);
+        return this[_headers].removeHeader(name);
     }
     /**
      * Sets a new array. Behaves the same as Node.js' HTTP response.setHeader
      * method (@see https://nodejs.org/api/http.html#http_response_setheader_name_value)
      */
     setHeader(name, value) {
-        return this._headers.setHeader(name, value);
+        return this[_headers].setHeader(name, value);
     }
     /**
      * Adds new multiple headers.
@@ -307,7 +301,7 @@ class RequestResponse {
         if (this.raw === true) {
             return {
                 content: this.result,
-                headers: this._headers.headers,
+                headers: this.headers,
                 raw: true,
                 requestId: this.requestId,
                 status: this.status,
@@ -327,7 +321,7 @@ class RequestResponse {
                 status: this.status,
                 volatile: this.volatile,
             },
-            headers: this._headers.headers,
+            headers: this.headers,
             raw: false,
             requestId: this.requestId,
             status: this.status,

package/lib/core/backend/backendController.js

@@ -141,9 +141,6 @@ class BackendController extends index_1.ApplicationManager {
         this._add(controller.name, controller.definition);
     }
     _add(name, definition) {
-        // Check definition here to throw error early
-        // with the corresponding line number
-        this._application.PluginObject.checkControllerDefinition(name, definition, { application: true });
         if (this._application._controllers[name]) {
             throw assertionError.get('invalid_controller_definition', name, 'A controller with this name already exists');
         }

package/lib/core/plugin/plugin.js

@@ -264,7 +264,7 @@ class Plugin {
     return PLUGIN_NAME_REGEX.test(name);
   }
 
-  static checkControllerDefinition (name, definition, { application=false } = {}) {
+  static async checkControllerDefinition (name, definition, { application=false } = {}) {
     if (typeof name !== 'string') {
       throw assertionError.get(
         'invalid_controller_definition',
@@ -344,7 +344,7 @@ class Plugin {
           }
 
           if (route.openapi) {
-            checkOpenAPISpecification(name, action, route);
+            await checkOpenAPISpecification(name, action, route);
           }
         }
       }
@@ -365,20 +365,24 @@ function checkHttpRouteProperties (route, action, name, application) {
   }
 }
 
-function checkOpenAPISpecification (controller, action, route) {
+async function checkOpenAPISpecification (controller, action, route) {
   if (! isPlainObject(route.openapi)) {
     throw assertionError.get(
       'invalid_controller_definition',
       controller,
-      'The "openapi" property must be an object');
+      'The "openapi" property of the route definition must be an object');
   }
 
+  const routePath = route.path.charAt(0) === '/'
+    ? route.path
+    : `/_/${route.path}`;
+
   // Set :param notation to {param}
-  const formattedPath = route.path.replace(/\/:([^/]*)/g,'/{$1}');
+  const formattedPath = routePath.replace(/\/:([^/]*)/g,'/{$1}');
 
-  const { error, warning } = enforcer({
+  const { error, warning } = await enforcer({
     /* eslint-disable sort-keys */
-    openapi: '3.0.1',
+    openapi: '3.0.0',
     info: {
       title: 'Kuzzle API',
       version: require('../../../package').version
@@ -394,8 +398,14 @@ function checkOpenAPISpecification (controller, action, route) {
   if (warning) {
     global.kuzzle.log.warn(`Warning for OpenAPI specification in "${controller}:${action}", ${route.openapi} : ${warning}`);
   }
+
   if (error) {
-    throw controllerError.get('invalid_openapi_schema', controller, action, route.openapi, error);
+    throw controllerError.get(
+      'invalid_openapi_schema',
+      controller,
+      action,
+      route.openapi,
+      error);
   }
 }
 

package/lib/core/plugin/pluginsManager.js

@@ -265,9 +265,7 @@ class PluginsManager {
 
           debug('[%s] plugin started', plugin.name);
 
-          if (! plugin.application) {
-            this.loadedPlugins.push(plugin.name);
-          }
+          this.loadedPlugins.push(plugin.name);
 
           return null;
         });
@@ -680,7 +678,7 @@ class PluginsManager {
           'Native controllers cannot be overriden');
       }
 
-      Plugin.checkControllerDefinition(controller, definition);
+      await Plugin.checkControllerDefinition(controller, definition);
 
       for (const [action, actionDefinition ] of Object.entries(definition.actions)) {
         let apiController = this.controllers.get(controller);

package/lib/kuzzle/kuzzle.js

@@ -54,25 +54,21 @@ const realtime_1 = __importDefault(require("../core/realtime"));
 const cluster_1 = __importDefault(require("../cluster"));
 const package_json_1 = require("../../package.json");
 const BACKEND_IMPORT_KEY = 'backend:init:import';
-Reflect.defineProperty(global, '_kuzzle', {
-    value: null,
-    writable: true,
-});
-/* eslint-disable dot-notation */
+let _kuzzle = null;
 Reflect.defineProperty(global, 'kuzzle', {
     configurable: true,
     enumerable: false,
     get() {
-        if (global['_kuzzle'] === null) {
+        if (_kuzzle === null) {
             throw new Error('Kuzzle instance not found. Did you try to use a live-only feature before starting your application?');
         }
-        return global['_kuzzle'];
+        return _kuzzle;
     },
     set(value) {
-        if (global['_kuzzle'] !== null) {
+        if (_kuzzle !== null) {
             throw new Error('Cannot build a Kuzzle instance: another one already exists');
         }
-        global['_kuzzle'] = value;
+        _kuzzle = value;
     },
 });
 class Kuzzle extends kuzzleEventEmitter_1.default {

package/lib/service/storage/elasticsearch.js

@@ -237,6 +237,12 @@ class ElasticSearch extends Service {
     let size = 0;
 
     for (const [indice, indiceInfo] of Object.entries(body.indices)) {
+      // Ignore non-Kuzzle indices
+      if ( indice[INDEX_PREFIX_POSITION_IN_INDICE] !== PRIVATE_PREFIX
+        && indice[INDEX_PREFIX_POSITION_IN_INDICE] !== PUBLIC_PREFIX ) {
+        continue;
+      }
+
       const alias = await this._getAliasFromIndice(indice);
       const indexName = this._extractIndex(alias);
       const collectionName = this._extractCollection(alias);

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle",
-  "version": "2.16.2",
+  "version": "2.16.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -730,9 +730,9 @@
       "dev": true
     },
     "@types/lodash": {
-      "version": "4.14.177",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
-      "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==",
+      "version": "4.14.178",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz",
+      "integrity": "sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==",
       "dev": true
     },
     "@types/long": {
@@ -883,9 +883,9 @@
       "dev": true
     },
     "aedes": {
-      "version": "0.46.1",
-      "resolved": "https://registry.npmjs.org/aedes/-/aedes-0.46.1.tgz",
-      "integrity": "sha512-ZTSpKmtUwzaIX+JzigT8Y1vinh64MAEIUb88bAUW+Xwubtuivmj42H3tOgXNSHdpaPebAq83ZHo0AxihXb2HBw==",
+      "version": "0.46.2",
+      "resolved": "https://registry.npmjs.org/aedes/-/aedes-0.46.2.tgz",
+      "integrity": "sha512-bzDY5ZC1zEduKHBuAZW8Ccr46+42TB9lynP+Fw4Bl41kQYxUZBA8hQwp4Eba3gUM2EZHgj22Q83ib2UuvAWnkw==",
       "requires": {
         "aedes-packet": "^2.3.1",
         "aedes-persistence": "^8.1.3",
@@ -904,9 +904,9 @@
       },
       "dependencies": {
         "mqtt-packet": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-7.1.0.tgz",
-          "integrity": "sha512-ireFY+9xK0JgiLWIBkskTK5B6uPz6kN2JvyBK+TUhxCWaEhpFeG/7O4734Pac3imeZ6ZtU6QQABAvMz4z7pfUg==",
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-7.1.1.tgz",
+          "integrity": "sha512-xNNDZG169D2c96NJmkkoDdj3tj5z0jsZ1yv/vGBY9chg4JellV9wJwawKPXv4fyLetmXp50LtPNwL2u8qvLssw==",
           "requires": {
             "bl": "^4.0.2",
             "debug": "^4.1.1",
@@ -2902,9 +2902,9 @@
       "optional": true
     },
     "fastparallel": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/fastparallel/-/fastparallel-2.4.0.tgz",
-      "integrity": "sha512-sacwQ7wwKlQXsa7TN24UvMBLZNLmVcPhmxccC9riFqb3N+fSczJL8eWdnZodZ/KijGVgNBBfvF/NeXER08uXnQ==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/fastparallel/-/fastparallel-2.4.1.tgz",
+      "integrity": "sha512-qUmhxPgNHmvRjZKBFUNI0oZuuH9OlSIOXmJ98lhKPxMZZ7zS/Fi0wRHOihDSz0R1YiIOjxzOY4bq65YTcdBi2Q==",
       "requires": {
         "reusify": "^1.0.4",
         "xtend": "^4.0.2"
@@ -4802,9 +4802,9 @@
       "optional": true
     },
     "mqemitter": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/mqemitter/-/mqemitter-4.4.1.tgz",
-      "integrity": "sha512-tXSsyzhsD70Jc7WFz1tjbfczGOAyObMhJ8O15ZFkpDI+g9ENmWFUo5BseAuS9HCxNnFtnMWo4lHh7yDi5CjVTQ==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/mqemitter/-/mqemitter-4.5.0.tgz",
+      "integrity": "sha512-Mp/zytFeIv6piJQkEKnncHcP4R/ErJc5C7dfonkhkNUT2LA/nTayrfNxbipp3M5iCJUTQSUtzfQAQA3XVcKz6w==",
       "requires": {
         "fastparallel": "^2.3.0",
         "qlobber": "^5.0.0"
@@ -5424,9 +5424,9 @@
       }
     },
     "openapi-enforcer": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/openapi-enforcer/-/openapi-enforcer-1.16.0.tgz",
-      "integrity": "sha512-7wwvOGehsF65UHj1kPBZ+UovgJUvdK8ztWaeqRnwskXd2qlt+YZcOILwmCyxdqHt59B57u46LT28klLgXJOKjQ==",
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/openapi-enforcer/-/openapi-enforcer-1.16.1.tgz",
+      "integrity": "sha512-MG3lwulSdL9Qo1p0r8QMLjX+jTcvEN+YgMIGDNjyOxe2sYuk4Iu1wWN/3rVtkudrU/AQXIAZZP31NcqTIWcE7Q==",
       "requires": {
         "js-yaml": "^4.1.0",
         "randexp": "^0.5.3"
@@ -7653,9 +7653,9 @@
       }
     },
     "typescript": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
-      "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.3.tgz",
+      "integrity": "sha512-eVYaEHALSt+s9LbvgEv4Ef+Tdq7hBiIZgii12xXJnukryt3pMgJf6aKhoCZ3FWQsu6sydEnkg11fYXLzhLBjeQ==",
       "dev": true
     },
     "uWebSockets.js": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kuzzle",
   "author": "The Kuzzle Team <support@kuzzle.io>",
-  "version": "2.16.2",
+  "version": "2.16.6",
   "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"
@@ -41,7 +41,7 @@
   "dependencies": {
     "@elastic/elasticsearch": "https://github.com/elastic/elasticsearch-js/archive/refs/tags/v7.13.0.tar.gz",
     "@types/js-yaml": "^4.0.5",
-    "aedes": "^0.46.1",
+    "aedes": "^0.46.2",
     "bluebird": "^3.7.2",
     "cli-color": "^2.0.1",
     "cookie": "^0.4.1",
@@ -68,7 +68,7 @@
     "murmurhash-native": "^3.5.0",
     "nanoid": "^3.1.30",
     "node-segfault-handler": "^1.0.4",
-    "openapi-enforcer": "^1.16.0",
+    "openapi-enforcer": "^1.16.1",
     "passport": "^0.5.0",
     "protobufjs": "~6.11.2",
     "rc": "1.2.8",
@@ -89,7 +89,7 @@
     "url": "git://github.com/kuzzleio/kuzzle.git"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.177",
+    "@types/lodash": "^4.14.178",
     "@typescript-eslint/eslint-plugin": "^5.6.0",
     "@typescript-eslint/parser": "^5.6.0",
     "async": "^3.2.2",
@@ -110,7 +110,7 @@
     "sinon": "^12.0.1",
     "strip-json-comments": "https://github.com/sindresorhus/strip-json-comments/archive/refs/tags/v3.1.1.tar.gz",
     "ts-node": "^10.4.0",
-    "typescript": "^4.5.2",
+    "typescript": "^4.5.3",
     "yaml": "^1.10.2"
   },
   "engines": {