kuzzle 2.44.0 → 2.46.0-beta.1

package/lib/kuzzle/dumpGenerator.js

@@ -36,6 +36,7 @@ const kerror = require("../kerror");
 class DumpGenerator {
   constructor() {
     this._dump = false;
+    this.logger = global.kuzzle.log.child("dump:dumpGenerator");
   }
 
   /**
@@ -59,8 +60,8 @@ class DumpGenerator {
         .substring(0, 200),
     );
 
-    global.kuzzle.log.info("=".repeat(79));
-    global.kuzzle.log.info(`Generating dump in ${dumpPath}`);
+    this.logger.info("=".repeat(79));
+    this.logger.info(`Generating dump in ${dumpPath}`);
     this._cleanUpHistory();
     try {
       fs.mkdirSync(dumpPath, { recursive: true });
@@ -69,12 +70,12 @@ class DumpGenerator {
         ? "Dump directory already exists. Skipping.."
         : `Unable to create dump folder: ${e.message}`;
 
-      global.kuzzle.log.error(message);
+      this.logger.error(message);
       throw new Error(message);
     }
 
     // dump kuzzle information
-    global.kuzzle.log.info("> dumping kuzzle configuration");
+    this.logger.info("> dumping kuzzle configuration");
     fs.writeFileSync(
       path.join(dumpPath, "kuzzle.json"),
       JSON.stringify(
@@ -88,7 +89,7 @@ class DumpGenerator {
     );
 
     // dump plugins configuration
-    global.kuzzle.log.info("> dumping plugins configuration");
+    this.logger.info("> dumping plugins configuration");
     fs.writeFileSync(
       path.join(dumpPath, "plugins.json"),
       JSON.stringify(
@@ -99,7 +100,7 @@ class DumpGenerator {
     );
 
     // dump Node.js configuration
-    global.kuzzle.log.info("> dumping Node.js configuration");
+    this.logger.info("> dumping Node.js configuration");
     fs.writeFileSync(
       path.join(dumpPath, "nodejs.json"),
       JSON.stringify(
@@ -117,7 +118,7 @@ class DumpGenerator {
     );
 
     // dump os configuration
-    global.kuzzle.log.info("> dumping os configuration");
+    this.logger.info("> dumping os configuration");
     fs.writeFileSync(
       path.join(dumpPath, "os.json"),
       JSON.stringify(
@@ -138,7 +139,7 @@ class DumpGenerator {
     );
 
     // core-dump
-    global.kuzzle.log.info("> generating core-dump");
+    this.logger.info("> generating core-dump");
     dumpme(global.kuzzle.config.dump.gcore || "gcore", `${dumpPath}/core`);
 
     // Gzip the core
@@ -158,7 +159,7 @@ class DumpGenerator {
               try {
                 fs.unlinkSync(corefiles[0]);
               } catch (e) {
-                global.kuzzle.log.warn(
+                this.logger.warn(
                   `> unable to clean up core file ${corefiles[0]}`,
                 );
               }
@@ -166,18 +167,18 @@ class DumpGenerator {
             }),
         );
       } else {
-        global.kuzzle.log.warn("> could not generate dump");
+        this.logger.warn("> could not generate dump");
       }
     } catch (error) {
-      global.kuzzle.log.error(error);
+      this.logger.error(error);
     }
 
     // copy node binary
-    global.kuzzle.log.info("> copy node binary");
+    this.logger.info("> copy node binary");
     fs.copyFileSync(process.execPath, path.join(dumpPath, "node"));
 
     // dumping Kuzzle's stats
-    global.kuzzle.log.info("> dumping kuzzle's stats");
+    this.logger.info("> dumping kuzzle's stats");
     const statistics = await global.kuzzle.statistics.getAllStats(
       new Request({ action: "getAllStats", controller: "statistics" }),
     );
@@ -187,11 +188,11 @@ class DumpGenerator {
       JSON.stringify(statistics.hits, null, " ").concat("\n"),
     );
 
-    global.kuzzle.log.info("Done.");
-    global.kuzzle.log.info(
+    this.logger.info("Done.");
+    this.logger.info(
       "[ℹ] You can send the folder to the kuzzle core team at support@kuzzle.io",
     );
-    global.kuzzle.log.info("=".repeat(79));
+    this.logger.info("=".repeat(79));
 
     this._dump = false;
     return dumpPath;

package/lib/kuzzle/internalIndexHandler.js

@@ -92,6 +92,8 @@ class InternalIndexHandler extends Store {
     this._BOOTSTRAP_DONE_ID = `${this.index}.done`;
     this._DATAMODEL_VERSION_ID = "internalIndex.dataModelVersion";
     this._JWT_SECRET_ID = "security.jwt.secret";
+
+    this.logger = global.kuzzle.log.child("internalIndexHandler");
   }
 
   /**
@@ -219,7 +221,7 @@ class InternalIndexHandler extends Store {
         );
       }
 
-      global.kuzzle.log.warn(
+      this.logger.warn(
         "[!] Kuzzle is using a generated seed for authentication. This is suitable for development but should NEVER be used in production. See https://docs.kuzzle.io/core/2/guides/getting-started/deploy-your-application/",
       );
     }

package/lib/kuzzle/kuzzle.js

@@ -73,7 +73,6 @@ const kerror = __importStar(require("../kerror"));
 const asyncStore_1 = __importDefault(require("../util/asyncStore"));
 const crypto_1 = require("../util/crypto");
 const mutex_1 = require("../util/mutex");
-const name_generator_1 = require("../util/name-generator");
 const dumpGenerator_1 = __importDefault(require("./dumpGenerator"));
 const KuzzleEventEmitter_1 = __importDefault(require("./event/KuzzleEventEmitter"));
 const internalIndexHandler_1 = __importDefault(require("./internalIndexHandler"));
@@ -152,7 +151,7 @@ class Kuzzle extends KuzzleEventEmitter_1.default {
             await this.internalIndex.init();
             await new security_1.default().init();
             // This will init the cluster module if enabled
-            this.id = await this.initKuzzleNode();
+            await this.initKuzzleNode();
             this.vault = vault_1.default.load(options.vaultKey, options.secretsFile);
             await this.validation.init();
             await this.tokenManager.init();
@@ -165,7 +164,6 @@ class Kuzzle extends KuzzleEventEmitter_1.default {
             await this.debugger.init();
             this.pluginsManager.application = application;
             const pluginImports = await this.pluginsManager.init(options.plugins);
-            this.log.info(`[✔] Successfully loaded ${this.pluginsManager.loadedPlugins.length} plugins: ${this.pluginsManager.loadedPlugins.join(", ")}`);
             const imports = lodash_1.default.merge({}, pluginImports, options.import);
             // Authentification plugins must be loaded before users import to avoid
             // credentials related error which would prevent Kuzzle from starting
@@ -181,7 +179,7 @@ class Kuzzle extends KuzzleEventEmitter_1.default {
             await this.pipe("kuzzle:state:live");
             await this.entryPoint.startListening();
             await this.pipe("kuzzle:state:ready");
-            this.log.info(`[✔] Kuzzle ${this.version} is ready (node name: ${this.id})`);
+            this.log.info(`[✔] Kuzzle ${this.version} is ready (node name: ${global.nodeId})`);
             // @deprecated
             this.emit("core:kuzzleStart", "Kuzzle is ready to accept requests");
             this._state = kuzzleStateEnum_1.default.RUNNING;
@@ -197,16 +195,13 @@ class Kuzzle extends KuzzleEventEmitter_1.default {
      * This will init the cluster if it's enabled.
      */
     async initKuzzleNode() {
-        let id;
         if (this.config.cluster.enabled) {
-            id = await new cluster_1.default().init();
+            await new cluster_1.default().init();
             this.log.info("[✔] Cluster initialized");
         }
         else {
-            id = name_generator_1.NameGenerator.generateRandomName({ prefix: "knode" });
             this.log.info("[X] Cluster disabled: single node mode.");
         }
-        return id;
     }
     /**
      * Gracefully exits after processing remaining requests
@@ -226,6 +221,9 @@ class Kuzzle extends KuzzleEventEmitter_1.default {
             await bluebird_1.default.delay(1000);
         }
         this.log.info("Halted.");
+        // flush both application and Kuzzle core loggers before leaving (Could happen even if some core/application components are not initialized)
+        await this?.log?.flush?.();
+        await this?.pluginsManager?.application?.log?.flush?.();
         process.exit(0);
     }
     /**

package/lib/service/cache/redis.js

@@ -43,6 +43,10 @@ class Redis extends Service {
     this.commands = {};
     this.adapterName = name;
     this.pingIntervalID = null;
+
+    this.logger = global.kuzzle.log.child // It means we're in the main Kuzzle process
+      ? global.kuzzle.log.child("services:cache:redis")
+      : global.kuzzle.log;
   }
 
   /**

package/lib/service/storage/7/elasticsearch.d.ts

@@ -24,6 +24,7 @@ export declare class ES7 {
     maxScrollDuration: number;
     scrollTTL: number;
     _config: any;
+    private readonly logger;
     constructor(config: any, scope?: storeScopeEnum);
     get scope(): storeScopeEnum;
     /**

package/lib/service/storage/7/elasticsearch.js

@@ -99,6 +99,7 @@ let esState = esStateEnum.NONE;
  */
 class ES7 {
     constructor(config, scope = storeScopeEnum_1.storeScopeEnum.PUBLIC) {
+        this.logger = global.kuzzle.log.child("service:storage:elasticsearch:7");
         this._config = config;
         this._scope = scope;
         this._indexPrefix =
@@ -151,7 +152,7 @@ class ES7 {
         }
         if (global.NODE_ENV !== "development" &&
             this._config.commonMapping.dynamic === "true") {
-            global.kuzzle.log.warn([
+            this.logger.warn([
                 "Your dynamic mapping policy is set to 'true' for new fields.",
                 "Elasticsearch will try to automatically infer mapping for new fields, and those cannot be changed afterward.",
                 'See the "services.storageEngine.commonMapping.dynamic" option in the kuzzlerc configuration file to change this value.',
@@ -2328,6 +2329,9 @@ class ES7 {
     _processExtract(prepareMUpsert, prepareMGet, metadata, document, extractedDocuments, documentsToGet) {
         let extractedDocument;
         if (prepareMUpsert) {
+            if (document.changes !== undefined && document.changes !== null) {
+                delete document.changes._kuzzle_info;
+            }
             extractedDocument = {
                 _source: {
                     // Do not use destructuring, it's 10x slower
@@ -2337,6 +2341,9 @@ class ES7 {
             };
         }
         else {
+            if (document.body !== undefined && document.body !== null) {
+                delete document.body._kuzzle_info;
+            }
             extractedDocument = {
                 // Do not use destructuring, it's 10x slower
                 _source: Object.assign({}, metadata, document.body),
@@ -2768,7 +2775,7 @@ class ES7 {
             return;
         }
         esState = esStateEnum.AWAITING;
-        global.kuzzle.log.info("[ℹ] Trying to connect to Elasticsearch...");
+        this.logger.info("[ℹ] Trying to connect to Elasticsearch...");
         while (esState !== esStateEnum.OK) {
             try {
                 // Wait for at least 1 shard to be initialized
@@ -2776,11 +2783,11 @@ class ES7 {
                     wait_for_no_initializing_shards: true,
                 });
                 if (health.body.number_of_pending_tasks === 0) {
-                    global.kuzzle.log.info("[✔] Elasticsearch is ready");
+                    this.logger.info("[✔] Elasticsearch is ready");
                     esState = esStateEnum.OK;
                 }
                 else {
-                    global.kuzzle.log.info(`[ℹ] Still waiting for Elasticsearch: ${health.body.number_of_pending_tasks} cluster tasks remaining`);
+                    this.logger.info(`[ℹ] Still waiting for Elasticsearch: ${health.body.number_of_pending_tasks} cluster tasks remaining`);
                     await bluebird_1.default.delay(1000);
                 }
             }

package/lib/service/storage/8/elasticsearch.d.ts

@@ -23,6 +23,7 @@ export declare class ES8 {
     maxScrollDuration: number;
     scrollTTL: number;
     _config: any;
+    private readonly logger;
     constructor(config: any, scope?: storeScopeEnum);
     get scope(): storeScopeEnum;
     /**

package/lib/service/storage/8/elasticsearch.js

@@ -99,6 +99,7 @@ let esState = esStateEnum.NONE;
  */
 class ES8 {
     constructor(config, scope = storeScopeEnum_1.storeScopeEnum.PUBLIC) {
+        this.logger = global.kuzzle.log.child("service:storage:elasticsearch:8");
         this._config = config;
         this._scope = scope;
         this._indexPrefix =
@@ -151,7 +152,7 @@ class ES8 {
         }
         if (global.NODE_ENV !== "development" &&
             this._config.commonMapping.dynamic === "true") {
-            global.kuzzle.log.warn([
+            this.logger.warn([
                 "Your dynamic mapping policy is set to 'true' for new fields.",
                 "Elasticsearch will try to automatically infer mapping for new fields, and those cannot be changed afterward.",
                 'See the "services.storageEngine.commonMapping.dynamic" option in the kuzzlerc configuration file to change this value.',
@@ -2321,6 +2322,9 @@ class ES8 {
     _processExtract(prepareMUpsert, prepareMGet, metadata, document, extractedDocuments, documentsToGet) {
         let extractedDocument;
         if (prepareMUpsert) {
+            if (document.changes !== undefined && document.changes !== null) {
+                delete document.changes._kuzzle_info;
+            }
             extractedDocument = {
                 _source: {
                     // Do not use destructuring, it's 10x slower
@@ -2330,6 +2334,9 @@ class ES8 {
             };
         }
         else {
+            if (document.body !== undefined && document.body !== null) {
+                delete document.body._kuzzle_info;
+            }
             extractedDocument = {
                 // Do not use destructuring, it's 10x slower
                 _source: Object.assign({}, metadata, document.body),
@@ -2758,7 +2765,7 @@ class ES8 {
             return;
         }
         esState = esStateEnum.AWAITING;
-        global.kuzzle.log.info("[ℹ] Trying to connect to Elasticsearch...");
+        this.logger.info("[ℹ] Trying to connect to Elasticsearch...");
         while (esState !== esStateEnum.OK) {
             try {
                 // Wait for at least 1 shard to be initialized
@@ -2766,11 +2773,11 @@ class ES8 {
                     wait_for_no_initializing_shards: true,
                 });
                 if (health.number_of_pending_tasks === 0) {
-                    global.kuzzle.log.info("[✔] Elasticsearch is ready");
+                    this.logger.info("[✔] Elasticsearch is ready");
                     esState = esStateEnum.OK;
                 }
                 else {
-                    global.kuzzle.log.info(`[ℹ] Still waiting for Elasticsearch: ${health.number_of_pending_tasks} cluster tasks remaining`);
+                    this.logger.info(`[ℹ] Still waiting for Elasticsearch: ${health.number_of_pending_tasks} cluster tasks remaining`);
                     await bluebird_1.default.delay(1000);
                 }
             }

package/lib/service/storage/Elasticsearch.d.ts

@@ -2,6 +2,7 @@ import Service from "../service";
 import { storeScopeEnum } from "../../core/storage/storeScopeEnum";
 export declare class Elasticsearch extends Service {
     client: any;
+    private readonly logger;
     constructor(config: any, scope?: storeScopeEnum);
     static buildClient(config: any, version?: "7" | "8"): any;
     _initSequence(): Promise<void>;

package/lib/service/storage/Elasticsearch.js

@@ -13,7 +13,7 @@ const storeScopeEnum_1 = require("../../core/storage/storeScopeEnum");
 class Elasticsearch extends service_1.default {
     constructor(config, scope = storeScopeEnum_1.storeScopeEnum.PUBLIC) {
         super("elasticsearch", config);
-        global.kuzzle.log.info(`[ℹ] Elasticsearch configuration is set to major version : ${config.majorVersion}`);
+        this.logger = global.kuzzle.log.child("service:storage:elasticsearch");
         if (config.majorVersion === "7") {
             this.client = new elasticsearch_1.ES7(config, scope);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kuzzle",
   "author": "The Kuzzle Team <support@kuzzle.io>",
-  "version": "2.44.0",
+  "version": "2.46.0-beta.1",
   "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": {
@@ -33,21 +33,21 @@
     "bluebird": "3.7.2",
     "cli-color": "2.0.4",
     "cookie": "1.0.2",
-    "debug": "4.4.1",
+    "debug": "4.4.3",
     "denque": "2.1.0",
     "didyoumean": "1.2.2",
     "dumpme": "2.0.0",
     "eventemitter3": "5.0.1",
-    "inquirer": "12.8.2",
-    "ioredis": "5.6.1",
+    "inquirer": "12.9.6",
+    "ioredis": "5.8.0",
     "js-yaml": "4.1.0",
     "json-stable-stringify": "1.3.0",
     "json2yaml": "1.1.0",
     "jsonwebtoken": "9.0.2",
     "koncorde": "4.6.0",
-    "kuzzle-logger": "1.3.0",
+    "kuzzle-logger": "1.4.0",
     "kuzzle-plugin-auth-passport-local": "6.4.1",
-    "kuzzle-sdk": ">=7.15.0",
+    "kuzzle-sdk": ">=7.15.1",
     "kuzzle-vault": "2.1.0",
     "lodash": "4.17.21",
     "long": "5.3.2",
@@ -59,9 +59,9 @@
     "pino-caller": "4.0.0",
     "pino-elasticsearch": "8.1.0",
     "pino-loki": "2.6.0",
-    "pino-pretty": "13.0.0",
+    "pino-pretty": "13.1.1",
     "pino-transport-ecs": "1.1.0",
-    "protobufjs": "7.5.3",
+    "protobufjs": "7.5.4",
     "rc": "1.2.8",
     "sdk-es7": "npm:@elastic/elasticsearch@7.13.0",
     "sdk-es8": "npm:@elastic/elasticsearch@8.17.1",
@@ -82,9 +82,9 @@
     "url": "git://github.com/kuzzleio/kuzzle.git"
   },
   "devDependencies": {
-    "@commitlint/cli": "19.8.1",
-    "@commitlint/config-conventional": "19.8.1",
-    "@jest/globals": "30.0.5",
+    "@commitlint/cli": "20.0.0",
+    "@commitlint/config-conventional": "20.0.0",
+    "@jest/globals": "30.1.2",
     "@types/bluebird": "3.5.42",
     "@types/cookie": "1.0.0",
     "@types/jest": "30.0.0",
@@ -96,10 +96,10 @@
     "cucumber": "6.0.7",
     "cz-conventional-changelog": "3.3.0",
     "eslint-plugin-kuzzle": "0.0.14",
-    "jest": "30.0.5",
-    "mocha": "11.7.1",
+    "jest": "30.1.3",
+    "mocha": "11.7.2",
     "mock-require": "3.0.3",
-    "mqtt": "5.13.3",
+    "mqtt": "5.14.1",
     "nyc": "17.1.0",
     "request": "2.88.2",
     "request-promise": "4.2.6",
@@ -109,16 +109,16 @@
     "should-sinon": "0.0.6",
     "sinon": "21.0.0",
     "strip-json-comments": "https://github.com/sindresorhus/strip-json-comments/archive/refs/tags/v3.1.1.tar.gz",
-    "ts-jest": "29.4.0",
+    "ts-jest": "29.4.4",
     "ts-node": "10.9.2",
-    "tsx": "4.20.3",
-    "typescript": "5.3.2",
-    "yaml": "2.8.0"
+    "tsx": "4.20.6",
+    "typescript": "5.4.5",
+    "yaml": "2.8.1"
   },
   "engines": {
     "node": ">=18.0.0 <23.0.0"
   },
-  "packageManager": "npm@11.4.2",
+  "packageManager": "npm@11.6.1",
   "engineStrict": true,
   "license": "Apache-2.0",
   "files": [