kuzzle 2.45.0 → 2.46.0

package/lib/core/backend/backend.d.ts

@@ -133,6 +133,7 @@ export declare class Backend {
      *
      */
     _support: JSONObject;
+    private readonly nodeId;
     /**
      * Instantiates a new Kuzzle application
      *
@@ -170,10 +171,6 @@ export declare class Backend {
      * EmbeddedSDK instance
      */
     get sdk(): EmbeddedSDK;
-    /**
-     * Cluster node ID
-     */
-    get nodeId(): string;
     private get _instanceProxy();
     get started(): boolean;
     protected set started(started: boolean);

package/lib/core/backend/backend.js

@@ -51,7 +51,9 @@ const fs_1 = __importDefault(require("fs"));
 const kuzzle_1 = __importDefault(require("../../kuzzle"));
 const embeddedSdk_1 = require("../shared/sdk/embeddedSdk");
 const kerror = __importStar(require("../../kerror"));
-const index_1 = require("./index");
+const index_1 = require("../../../index");
+const index_2 = require("./index");
+const Logger_1 = require("../../kuzzle/Logger");
 const assertionError = kerror.wrap("plugin", "assert");
 const runtimeError = kerror.wrap("plugin", "runtime");
 let _app = null;
@@ -115,12 +117,21 @@ class Backend {
             throw assertionError.get("invalid_application_name", name);
         }
         this._name = name;
+        this.nodeId = index_1.NameGenerator.generateRandomName({ prefix: "knode" });
         Reflect.defineProperty(this, "_kuzzle", {
             writable: true,
         });
         Reflect.defineProperty(this, "_sdk", {
             writable: true,
         });
+        Reflect.defineProperty(global, "nodeId", {
+            get: () => {
+                return this.nodeId;
+            },
+            set: () => {
+                throw new Error("nodeId is read-only");
+            },
+        });
         /**
          * Set the "started" property in this event so developers can use runtime
          * features in pipes/hooks attached to this event.
@@ -138,18 +149,19 @@ class Backend {
             // Silent if no version can be found
         }
         global.app = this;
-        this.pipe = new index_1.BackendPipe(this);
-        this.hook = new index_1.BackendHook(this);
-        this.config = new index_1.BackendConfig(this);
-        this.vault = new index_1.BackendVault(this);
-        this.controller = new index_1.BackendController(this);
-        this.plugin = new index_1.BackendPlugin(this);
-        this.storage = new index_1.BackendStorage(this);
-        this.import = new index_1.BackendImport(this);
-        this.cluster = new index_1.BackendCluster();
-        this.openApi = new index_1.BackendOpenApi(this);
-        this.errors = new index_1.BackendErrors(this);
-        this.subscription = new index_1.BackendSubscription(this);
+        this.pipe = new index_2.BackendPipe(this);
+        this.hook = new index_2.BackendHook(this);
+        this.config = new index_2.BackendConfig(this);
+        this.vault = new index_2.BackendVault(this);
+        this.controller = new index_2.BackendController(this);
+        this.plugin = new index_2.BackendPlugin(this);
+        this.storage = new index_2.BackendStorage(this);
+        this.import = new index_2.BackendImport(this);
+        this.cluster = new index_2.BackendCluster();
+        this.openApi = new index_2.BackendOpenApi(this);
+        this.errors = new index_2.BackendErrors(this);
+        this.subscription = new index_2.BackendSubscription(this);
+        this.log = new Logger_1.Logger(this.config.content, "kuzzle:app");
         this.kerror = kerror;
         try {
             this.commit = this._readCommit();
@@ -166,7 +178,6 @@ class Backend {
             throw runtimeError.get("already_started", "start");
         }
         this._kuzzle = new kuzzle_1.default(this.config.content);
-        this.log = this._kuzzle.log.child(`app`);
         for (const plugin of this.config.content.plugins.common.include) {
             const { default: PluginClass } = await Promise.resolve(`${plugin}`).then(s => __importStar(require(s)));
             this.plugin.use(new PluginClass(), {
@@ -246,15 +257,6 @@ class Backend {
         }
         return this._sdk;
     }
-    /**
-     * Cluster node ID
-     */
-    get nodeId() {
-        if (!this.started) {
-            throw runtimeError.get("unavailable_before_start", "nodeId");
-        }
-        return this._kuzzle.id;
-    }
     get _instanceProxy() {
         return {
             api: this._controllers,

package/lib/kuzzle/Logger.d.ts

@@ -6,7 +6,7 @@ import { KuzzleConfiguration } from "../../";
 export declare class Logger extends KuzzleLogger {
     private warnedForSillyDeprecation;
     private warnedForVerboseDeprecation;
-    constructor(kuzzleConfig: KuzzleConfiguration);
+    constructor(kuzzleConfig: KuzzleConfiguration, namespace?: string);
     /**
      * Logs a message with the "silly" level.
      *

package/lib/kuzzle/Logger.js

@@ -26,15 +26,18 @@ const kuzzle_logger_1 = require("kuzzle-logger");
  * The Logger class provides logging functionality for Kuzzle.
  */
 class Logger extends kuzzle_logger_1.KuzzleLogger {
-    constructor(kuzzleConfig) {
+    constructor(kuzzleConfig, namespace = "kuzzle") {
         const config = kuzzleConfig.server.appLogs;
         const deprecatedConfig = kuzzleConfig.plugins["kuzzle-plugin-logger"];
         const getMergingObject = () => {
             const mergingObject = {};
-            mergingObject.namespace = "kuzzle";
+            mergingObject.namespace = namespace;
             mergingObject.failsafeMode = Boolean(kuzzleConfig.plugins.common.failsafeMode);
-            if (global.kuzzle.id) {
-                mergingObject.nodeId = global.kuzzle.id;
+            if (global.nodeId) {
+                mergingObject.nodeId = global.nodeId;
+            }
+            if (namespace !== "kuzzle") {
+                return mergingObject;
             }
             if (global.kuzzle.asyncStore?.exists() &&
                 global.kuzzle.asyncStore?.has("REQUEST")) {
@@ -74,9 +77,6 @@ class Logger extends kuzzle_logger_1.KuzzleLogger {
         if (deprecatedConfig) {
             this.warn("[DEPRECATED] The plugins.kuzzle-plugin-logger configuration is deprecated, use server.logs instead.");
         }
-        global.kuzzle.onPipe("kuzzle:shutdown", async () => {
-            await this.flush();
-        });
     }
     /**
      * Logs a message with the "silly" level.

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();
@@ -196,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
@@ -225,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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kuzzle",
   "author": "The Kuzzle Team <support@kuzzle.io>",
-  "version": "2.45.0",
+  "version": "2.46.0",
   "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": {