kuzzle 2.16.2 → 2.16.6

package/lib/api/controllers/serverController.js

@@ -47,7 +47,11 @@ class ServerController extends NativeController {
       'publicApi',
       'openapi',
     ]);
-    this._docOpenapi = generateOpenApi();
+
+    this._openApiDefinition = {
+      json: null,
+      yaml: null,
+    };
   }
 
   /**
@@ -55,7 +59,7 @@ class ServerController extends NativeController {
    *
    * @param {Request} request
    * @returns {Promise<Object>}
-   * 
+   *
    * @deprecated
    */
   getStats (request) {
@@ -66,7 +70,7 @@ class ServerController extends NativeController {
    * Returns the last statistics frame
    *
    * @returns {Promise<Object>}
-   * 
+   *
    * @deprecated
    */
   getLastStats () {
@@ -77,7 +81,7 @@ class ServerController extends NativeController {
    * Returns all stored statistics frames
    *
    * @returns {Promise<Object>}
-   * 
+   *
    * @deprecated
    */
   getAllStats () {
@@ -242,25 +246,34 @@ class ServerController extends NativeController {
   }
 
   async openapi (request) {
-    const format = request.input.args.format
-      ? request.input.args.format
-      : 'json';
-    const contentType = format === 'yaml'
-      ? 'application/yaml'
-      : 'application/json';
-    const specifications = format === 'yaml'
-      ? jsonToYaml.stringify(this._docOpenapi)
-      : this._docOpenapi;
+    const format = request.getString('format', 'json');
+    const specifications = this.getOpenApiDefinition(format);
 
     request.response.configure({
       format: 'raw',
-      headers: { 'Content-Type': contentType },
+      headers: { 'Content-Type': `application/${format}` },
       status: 200,
     });
 
     return specifications;
   }
 
+  /**
+   * Lazy loading of OpenAPI definition.
+   *
+   * Mainly because we need to wait all plugin to be loaded
+   * to generate the definition.
+   */
+  getOpenApiDefinition (format) {
+    if (! this._openApiDefinition[format]) {
+      this._openApiDefinition[format] = format === 'json'
+        ? generateOpenApi()
+        : jsonToYaml.stringify(generateOpenApi());
+    }
+
+    return this._openApiDefinition[format];
+  }
+
   /**
    * Fetches and returns Kuzzle core metrics
    * @returns {Promise<Object>}

package/lib/api/openApiGenerator.d.ts

@@ -1,6 +1,7 @@
+import { JSONObject } from '../../index';
 /**
  * Generates JSON OpenApi object
  *
  * @returns {object} openApi object
  */
-export declare function generateOpenApi(): any;
+export declare function generateOpenApi(): JSONObject;

package/lib/api/openApiGenerator.js

@@ -1,9 +1,4 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateOpenApi = void 0;
 /*
  * Kuzzle, a backend software, self-hostable and ready to use
  * to power modern apps
@@ -24,13 +19,18 @@ exports.generateOpenApi = void 0;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateOpenApi = void 0;
 const lodash_1 = __importDefault(require("lodash"));
-const package_json_1 = require("./../../package.json");
+const package_json_1 = require("../../package.json");
 const openapi_1 = require("./openapi");
-const inflector_1 = require("./../util/inflector");
+const inflector_1 = require("../util/inflector");
 const routeUrlMatch = /:([^/]*)/g;
 /**
- * Genrate basic openApi Controller
+ * Generate basic openApi Controller
  */
 function generateController(route, response) {
     if (route.controller !== undefined) {
@@ -47,7 +47,7 @@ function generateController(route, response) {
     }
 }
 /**
- * Genrate basic openApi Summary
+ * Generate basic openApi Summary
  */
 function generateSummary(route) {
     if (route.openapi.description === undefined) {
@@ -58,7 +58,7 @@ function generateSummary(route) {
     }
 }
 /**
- * Genrate basic openApi Parameters
+ * Generate basic openApi Parameters
  */
 function generateParameters(route) {
     if (route.openapi.parameters === undefined) {
@@ -80,7 +80,7 @@ function generateParameters(route) {
     }
 }
 /**
- * Genrate basic openApi Response
+ * Generate basic openApi Response
  */
 function generateResponse(route) {
     if (route.openapi.responses === undefined) {
@@ -96,22 +96,20 @@ function generateResponse(route) {
  *
  * @returns {object} openApi object
  */
-/* eslint-disable @typescript-eslint/no-unused-vars */
 function generateOpenApi() {
-    /* eslint-enable @typescript-eslint/no-unused-vars */
     const routes = [];
-    global.kuzzle.config.http.routes.forEach(_route => routes.push({ ..._route }));
-    global.kuzzle.pluginsManager.routes.forEach(_route => routes.push({ ..._route }));
+    global.kuzzle.config.http.routes.forEach(route => routes.push({ ...route }));
+    global.kuzzle.pluginsManager.routes.forEach(route => routes.push({ ...route }));
     /* eslint-disable sort-keys */
     const response = {
         swagger: '2.0',
         info: {
             title: 'Kuzzle API',
-            description: 'The Kuzzle HTTP API',
+            description: 'Kuzzle HTTP API definition',
             contact: {
                 name: 'Kuzzle team',
-                url: 'http://kuzzle.io',
-                email: 'hello@kuzzle.io',
+                url: 'https://kuzzle.io',
+                email: 'support@kuzzle.io',
                 discord: 'http://join.discord.kuzzle.io'
             },
             license: {

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

@@ -1,5 +1,6 @@
 import { JSONObject } from 'kuzzle-sdk';
 import { RequestInput } from './requestInput';
+import { RequestResponse } from './requestResponse';
 import { RequestContext } from './requestContext';
 import { KuzzleError } from '../../kerror/errors';
 import { Deprecation, User } from '../../types';
@@ -12,46 +13,47 @@ import { Deprecation, User } from '../../types';
  */
 export declare class KuzzleRequest {
     /**
-     * Deprecation warnings for the API action
+     * Request external ID (specified by "requestId" or random uuid)
      */
-    deprecations: Deprecation[] | undefined;
+    id: string;
+    constructor(data: any, options: any);
     /**
-    * Request timestamp (in Epoch-Micro)
-    */
-    timestamp: number;
+     * Request internal ID
+     */
+    get internalId(): string;
     /**
-    * Request HTTP status
-    */
-    status: any;
+     * Deprecation warnings for the API action
+     */
+    get deprecations(): Deprecation[] | void;
     /**
-    * Request input
-    */
-    input: RequestInput;
+     * Request timestamp (in Epoch-micro)
+     */
+    get timestamp(): number;
     /**
-   * Request context
-   */
-    context: RequestContext;
+     * Request HTTP status
+     */
+    get status(): number;
+    set status(i: number);
     /**
-    * Request error
-    */
-    error: KuzzleError;
+     * Request input
+     */
+    get input(): RequestInput;
     /**
-    * Request result
-    */
-    result: any;
+     * Request context
+     */
+    get context(): RequestContext;
     /**
-    * Request response
-    */
-    response: any;
+     * Request error
+     */
+    get error(): KuzzleError | null;
     /**
-    * Request internal ID
-    */
-    internalId: any;
+     * Request result
+     */
+    get result(): any | null;
     /**
-    * Request external ID (specified by "requestId" or random uuid)
-    */
-    id: string;
-    constructor(data: any, options: any);
+     * Request response
+     */
+    get response(): RequestResponse;
     /**
      * Adds an error to the request, and sets the request's status to the error one.
      */
@@ -101,6 +103,38 @@ export declare class KuzzleRequest {
         data: JSONObject;
         options: JSONObject;
     };
+    /**
+     * Return a POJO representing the request.
+     *
+     * This can be used to match Koncorde filter rather than the Request object
+     * because it has properties defined with invisible unicode characters.
+     */
+    pojo(): {
+        context: {
+            connection: import("./requestContext").Connection;
+            token: import("../../types").Token;
+            user: User;
+        };
+        deprecations: void | Deprecation[];
+        error: KuzzleError;
+        id: string;
+        input: {
+            action: string;
+            args: JSONObject;
+            body: JSONObject;
+            controller: string;
+            jwt: string;
+            volatile: JSONObject;
+        };
+        internalId: string;
+        response: {
+            headers: JSONObject;
+            raw: boolean;
+        };
+        result: any;
+        status: number;
+        timestamp: number;
+    };
     /**
      * Returns the `lang` param of the request.
      *

package/lib/api/request/kuzzleRequest.js

@@ -53,6 +53,17 @@ const kerror_1 = __importDefault(require("../../kerror"));
 const assert = __importStar(require("../../util/assertType"));
 const safeObject_1 = require("../../util/safeObject");
 const assertionError = kerror_1.default.wrap('api', 'assert');
+// private properties
+// \u200b is a zero width space, used to masquerade console.log output
+const _internalId = 'internalId\u200b';
+const _status = 'status\u200b';
+const _input = 'input\u200b';
+const _error = 'error\u200b';
+const _result = 'result\u200b';
+const _context = 'context\u200b';
+const _timestamp = 'timestamp\u200b';
+const _response = 'response\u200b';
+const _deprecations = 'deprecations\u200b';
 /**
  * The `KuzzleRequest` class represents a request being processed by Kuzzle.
  *
@@ -62,21 +73,21 @@ const assertionError = kerror_1.default.wrap('api', 'assert');
  */
 class KuzzleRequest {
     constructor(data, options) {
-        this.internalId = (0, nanoid_1.nanoid)();
-        this.status = 102;
-        this.input = new requestInput_1.RequestInput(data);
-        this.context = new requestContext_1.RequestContext(options);
-        this.error = null;
-        this.result = null;
-        this.response = new requestResponse_1.RequestResponse(this);
-        this.deprecations = undefined;
+        this[_internalId] = (0, nanoid_1.nanoid)();
+        this[_status] = 102;
+        this[_input] = new requestInput_1.RequestInput(data);
+        this[_context] = new requestContext_1.RequestContext(options);
+        this[_error] = null;
+        this[_result] = null;
+        this[_response] = null;
+        this[_deprecations] = undefined;
         // @deprecated - Backward compatibility with the RequestInput.headers
         // property
-        this.input.headers = this.context.connection.misc.headers;
+        this[_input].headers = this[_context].connection.misc.headers;
         this.id = data.requestId
             ? assert.assertString('requestId', data.requestId)
             : (0, nanoid_1.nanoid)();
-        this.timestamp = data.timestamp || Date.now();
+        this[_timestamp] = data.timestamp || Date.now();
         // handling provided options
         if (options !== undefined && options !== null) {
             if (typeof options !== 'object' || Array.isArray(options)) {
@@ -111,6 +122,67 @@ class KuzzleRequest {
                 this.status = options.status;
             }
         }
+        Object.seal(this);
+    }
+    /**
+     * Request internal ID
+     */
+    get internalId() {
+        return this[_internalId];
+    }
+    /**
+     * Deprecation warnings for the API action
+     */
+    get deprecations() {
+        return this[_deprecations];
+    }
+    /**
+     * Request timestamp (in Epoch-micro)
+     */
+    get timestamp() {
+        return this[_timestamp];
+    }
+    /**
+     * Request HTTP status
+     */
+    get status() {
+        return this[_status];
+    }
+    set status(i) {
+        this[_status] = assert.assertInteger('status', i);
+    }
+    /**
+     * Request input
+     */
+    get input() {
+        return this[_input];
+    }
+    /**
+     * Request context
+     */
+    get context() {
+        return this[_context];
+    }
+    /**
+     * Request error
+     */
+    get error() {
+        return this[_error];
+    }
+    /**
+     * Request result
+     */
+    get result() {
+        return this[_result];
+    }
+    /**
+     * Request response
+     */
+    get response() {
+        if (this[_response] === null) {
+            this[_response] = new requestResponse_1.RequestResponse(this);
+        }
+        return this[_response];
     }
     /**
      * Adds an error to the request, and sets the request's status to the error one.
@@ -119,14 +191,14 @@ class KuzzleRequest {
         if (!error || !(error instanceof Error)) {
             throw new errors_1.InternalError('Cannot set non-error object as a request\'s error');
         }
-        this.error = error instanceof errors_1.KuzzleError ? error : new errors_1.InternalError(error);
-        this.status = this.error.status;
+        this[_error] = error instanceof errors_1.KuzzleError ? error : new errors_1.InternalError(error);
+        this.status = this[_error].status;
     }
     /**
      * Sets the request error to null and status to 200
      */
     clearError() {
-        this.error = null;
+        this[_error] = null;
         this.status = 200;
     }
     /**
@@ -151,7 +223,7 @@ class KuzzleRequest {
         if (options.raw !== undefined) {
             this.response.raw = options.raw;
         }
-        this.result = result;
+        this[_result] = result;
     }
     /**
      * Add a deprecation for a used component, this can be action/controller/parameters...
@@ -168,7 +240,7 @@ class KuzzleRequest {
             version,
         };
         if (!this.deprecations) {
-            this.deprecations = [deprecation];
+            this[_deprecations] = [deprecation];
         }
         else {
             this.deprecations.push(deprecation);
@@ -182,28 +254,62 @@ class KuzzleRequest {
     serialize() {
         const serialized = {
             data: {
-                _id: this.input.args._id,
+                _id: this[_input].args._id,
+                action: this[_input].action,
+                body: this[_input].body,
+                collection: this[_input].args.collection,
+                controller: this[_input].controller,
+                index: this[_input].args.index,
+                jwt: this[_input].jwt,
+                requestId: this.id,
+                timestamp: this[_timestamp],
+                volatile: this[_input].volatile,
+            },
+            // @deprecated - duplicate of options.connection.misc.headers
+            headers: this[_input].headers,
+            options: {
+                error: this[_error],
+                result: this[_result],
+                status: this[_status],
+            },
+        };
+        Object.assign(serialized.data, this[_input].args);
+        Object.assign(serialized.options, this[_context].toJSON());
+        return serialized;
+    }
+    /**
+     * Return a POJO representing the request.
+     *
+     * This can be used to match Koncorde filter rather than the Request object
+     * because it has properties defined with invisible unicode characters.
+     */
+    pojo() {
+        return {
+            context: {
+                connection: this.context.connection,
+                token: this.context.token,
+                user: this.context.user,
+            },
+            deprecations: this.deprecations,
+            error: this.error,
+            id: this.id,
+            input: {
                 action: this.input.action,
+                args: this.input.args,
                 body: this.input.body,
-                collection: this.input.args.collection,
                 controller: this.input.controller,
-                index: this.input.args.index,
                 jwt: this.input.jwt,
-                requestId: this.id,
-                timestamp: this.timestamp,
                 volatile: this.input.volatile,
             },
-            // @deprecated - duplicate of options.connection.misc.headers
-            headers: this.input.headers,
-            options: {
-                error: this.error,
-                result: this.result,
-                status: this.status,
+            internalId: this.internalId,
+            response: {
+                headers: this.response.headers,
+                raw: this.response.raw,
             },
+            result: this.result,
+            status: this.status,
+            timestamp: this.timestamp,
         };
-        Object.assign(serialized.data, this.input.args);
-        Object.assign(serialized.options, this.context.toJSON());
-        return serialized;
     }
     /**
      * Returns the `lang` param of the request.

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

@@ -24,23 +24,26 @@ export declare type ContextMisc = {
  * Information about the connection at the origin of the request.
  */
 export declare class Connection {
+    constructor(connection: any);
     /**
      * Unique identifier of the user connection
      */
-    id: string;
+    set id(str: string);
+    get id(): string | null;
     /**
      * Network protocol name
      */
-    protocol: string;
+    set protocol(str: string);
+    get protocol(): string | null;
     /**
      * Chain of IP addresses, starting from the client
      */
-    ips: string[];
+    set ips(arr: string[]);
+    get ips(): string[];
     /**
      * Additional informations about the connection
      */
-    misc: ContextMisc;
-    constructor(connection: any);
+    get misc(): ContextMisc;
     /**
      * Serializes the Connection object
      */
@@ -53,18 +56,6 @@ export declare class Connection {
  * and origin (connection, protocol).
  */
 export declare class RequestContext {
-    /**
-     * Connection that initiated the request
-     */
-    connection: Connection;
-    /**
-     * Authentication token
-     */
-    token: Token | null;
-    /**
-     * Associated user
-     */
-    user: User | null;
     constructor(options?: any);
     /**
      * Serializes the RequestContext object
@@ -81,4 +72,18 @@ export declare class RequestContext {
      */
     get protocol(): string | null;
     set protocol(str: string);
+    /**
+     * Connection that initiated the request
+     */
+    get connection(): Connection;
+    /**
+     * Authentication token
+     */
+    get token(): Token | null;
+    set token(obj: Token | null);
+    /**
+     * Associated user
+     */
+    get user(): User | null;
+    set user(obj: User | null);
 }