kuzzle 2.19.10 → 2.19.12

package/lib/core/network/protocols/httpwsProtocol.js

@@ -324,7 +324,7 @@ class HttpWsProtocol extends Protocol {
     this.socketByConnectionId.delete(connection.id);
   }
 
-  wsOnMessageHandler(socket, data) {
+  async wsOnMessageHandler(socket, data) {
     if (!data || data.byteLength === 0) {
       return;
     }
@@ -347,12 +347,20 @@ class HttpWsProtocol extends Protocol {
     }
 
     let parsed;
-    const message = Buffer.from(data).toString();
+    let message = Buffer.from(data).toString();
 
     debugWS("[%s] client message: %s", connection.id, message);
 
+    ({ payload: message } = await global.kuzzle.pipe(
+      "protocol:websocket:beforeParsingPayload",
+      { connection, payload: message }
+    ));
+
     try {
-      parsed = JSON.parse(message);
+      ({ payload: parsed } = await global.kuzzle.pipe(
+        "protocol:websocket:afterParsingPayload",
+        { connection, payload: JSON.parse(message) }
+      ));
     } catch (e) {
       /*
        we cannot add a "room" information since we need to extract
@@ -552,14 +560,25 @@ class HttpWsProtocol extends Protocol {
         return;
       }
 
-      this.httpUncompress(message, payload, (err, inflated) => {
+      let resolve;
+      let promise = new Promise((res) => (resolve = res));
+
+      this.httpUncompress(message, payload, async (err, inflated) => {
         if (err) {
           cb(err);
+          resolve();
           return;
         }
 
-        this.httpParseContent(message, inflated, cb);
+        const { payload: newPayload } = await global.kuzzle.pipe(
+          "protocol:http:beforeParsingPayload",
+          { message, payload: inflated }
+        );
+        await this.httpParseContent(message, newPayload, cb);
+        resolve();
       });
+
+      return promise;
     });
 
     // Beware: the "response" object might be invalidated at any point of time,
@@ -569,7 +588,7 @@ class HttpWsProtocol extends Protocol {
     });
   }
 
-  httpParseContent(message, content, cb) {
+  async httpParseContent(message, content, cb) {
     const type = message.headers["content-type"] || "";
 
     if (type.includes("multipart/form-data")) {
@@ -601,7 +620,11 @@ class HttpWsProtocol extends Protocol {
       message.content = querystring.parse(content.toString());
     } else {
       try {
-        message.content = JSON.parse(content.toString());
+        const { payload } = await global.kuzzle.pipe(
+          "protocol:http:afterParsingPayload",
+          { message, payload: JSON.parse(content.toString()) }
+        );
+        message.content = payload;
       } catch (e) {
         cb(
           kerrorHTTP.get("body_parse_failed", content.toString().slice(0, 50))

package/lib/service/storage/elasticsearch.js

@@ -1961,6 +1961,12 @@ class ElasticSearch extends Service {
     try {
       await this._client.indices.delete(esRequest);
 
+      if (await this._checkIfAliasExists(this._getAlias(index, collection))) {
+        await this._client.indices.deleteAlias({
+          name: this._getAlias(index, collection),
+        });
+      }
+
       await this._createHiddenCollection(index);
     } catch (e) {
       throw this._esWrapper.formatESError(e);
@@ -2917,6 +2923,16 @@ class ElasticSearch extends Service {
     return `${ALIAS_PREFIX}${this._indexPrefix}${index}${NAME_SEPARATOR}${collection}`;
   }
 
+  /**
+   * Given an alias name, returns the associated index name.
+   */
+  async _checkIfAliasExists(aliasName) {
+    const { body } = await this._client.indices.existsAlias({
+      name: aliasName,
+    });
+    return body;
+  }
+
   /**
    * Given index + collection, returns the associated indice name.
    * Use this function if ES does not accept aliases in the request. Otherwise use `_getAlias`.

package/lib/types/ClientConnection.d.ts

@@ -0,0 +1,7 @@
+import { JSONObject } from "../..";
+export interface ClientConnection {
+    id: string;
+    protocol: string;
+    ips: string[];
+    headers: JSONObject;
+}

package/lib/types/ClientConnection.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ClientConnection.js.map

package/lib/types/HttpMessage.d.ts

@@ -0,0 +1,12 @@
+import { JSONObject } from "../..";
+import { ClientConnection } from "./ClientConnection";
+export interface HttpMessage {
+    connection: ClientConnection;
+    content: JSONObject;
+    ips: string[];
+    query: string;
+    path: string;
+    method: string;
+    headers: JSONObject;
+    requestId: string;
+}

package/lib/types/HttpMessage.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=HttpMessage.js.map

package/lib/types/ProfileDefinition.d.ts

@@ -42,7 +42,7 @@ export type ProfileDefinition = {
             /**
              * Collection names.
              */
-            collections: string[];
+            collections?: string[];
         }>;
     }>;
 };

package/lib/types/events/EventProtocol.d.ts

@@ -0,0 +1,32 @@
+/// <reference types="node" />
+import { JSONObject, PipeEventHandler } from "../../../";
+import { ClientConnection } from "../ClientConnection";
+import { HttpMessage } from "../HttpMessage";
+export type EventHTTPBeforeParsingPayload = {
+    name: `protocol:http:beforeParsingPayload`;
+    args: [{
+        message: HttpMessage;
+        payload: Buffer;
+    }];
+} & PipeEventHandler;
+export type EventHTTPAfterParsingPayload = {
+    name: `protocol:http:afterParsingPayload`;
+    args: [{
+        message: HttpMessage;
+        payload: JSONObject;
+    }];
+} & PipeEventHandler;
+export type EventWebsocketBeforeParsingPayload = {
+    name: `protocol:websocket:beforeParsingPayload`;
+    args: [{
+        connection: ClientConnection;
+        payload: Buffer;
+    }];
+} & PipeEventHandler;
+export type EventWebsocketAfterParsingPayload = {
+    name: `protocol:websocket:afterParsingPayload`;
+    args: [{
+        connection: ClientConnection;
+        payload: JSONObject;
+    }];
+} & PipeEventHandler;

package/lib/types/events/EventProtocol.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=EventProtocol.js.map

package/lib/types/index.d.ts

@@ -36,3 +36,4 @@ export * from "./OpenApiDefinition";
 export * from "./errors/ErrorDefinition";
 export * from "./errors/ErrorDomains";
 export * from "./events/EventGenericDocument";
+export * from "./events/EventProtocol";

package/lib/types/index.js

@@ -72,4 +72,5 @@ __exportStar(require("./OpenApiDefinition"), exports);
 __exportStar(require("./errors/ErrorDefinition"), exports);
 __exportStar(require("./errors/ErrorDomains"), exports);
 __exportStar(require("./events/EventGenericDocument"), exports);
+__exportStar(require("./events/EventProtocol"), exports);
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kuzzle",
   "author": "The Kuzzle Team <support@kuzzle.io>",
-  "version": "2.19.10",
+  "version": "2.19.12",
   "description": "Kuzzle is an open-source solution that handles all the data management through a secured API, with a large choice of protocols.",
   "bin": "bin/start-kuzzle-server",
   "scripts": {