kuzzle 2.48.0 → 2.49.0-beta.1

package/lib/api/controllers/documentController.js

@@ -593,10 +593,12 @@ class DocumentController extends NativeController {
     if (source) {
       return updatedDocument;
     }
-
     return {
       _id: updatedDocument._id,
-      _source: content,
+      _source: {
+        ...content,
+        _kuzzle_info: updatedDocument._source._kuzzle_info,
+      },
       _version: updatedDocument._version,
     };
   }
@@ -988,7 +990,7 @@ class DocumentController extends NativeController {
     if (lang === "koncorde") {
       query = await this.translateKoncorde(query);
     }
-
+    delete changes._kuzzle_info;
     const result = await this.ask(
       "core:storage:public:document:updateByQuery",
       index,
@@ -1082,6 +1084,9 @@ class DocumentController extends NativeController {
           `documents[${i}].body`,
         );
       }
+      if (documents[i].body?._kuzzle_info !== undefined) {
+        delete documents[i].body._kuzzle_info;
+      }
     }
 
     const response = await this.ask(

package/lib/core/network/accessLogger.js

@@ -30,9 +30,7 @@ const {
   workerData,
 } = require("worker_threads");
 
-const winston = require("winston");
-const WinstonElasticsearch = require("winston-elasticsearch");
-const WinstonSyslog = require("winston-syslog");
+const pino = require("pino");
 const moment = require("moment");
 
 const { KuzzleRequest } = require("../../api/request");
@@ -66,12 +64,11 @@ class AccessLogger {
     const anonymous = await global.kuzzle.ask(
       "core:security:user:anonymous:get",
     );
-
     this.worker = new Worker(__filename, {
       workerData: {
         anonymousUserId: anonymous._id,
         config,
-        kuzzleId: global.kuzzle.id,
+        kuzzleId: global.nodeId,
       },
     });
   }
@@ -131,91 +128,58 @@ class AccessLoggerWorker {
   }
 
   initTransport() {
-    const transports = [];
+    const transports = { targets: [] };
 
     for (const conf of this.config.logs.transports) {
-      const opts = {
-        colorize: conf.colorize === true ? winston.format.colorize() : false,
-        depth: conf.depth || false,
-        format: conf.format
-          ? winston.format[conf.format]()
-          : winston.format.json(),
-        level: conf.level || "info",
-        prettyPrint:
-          conf.prettyPrint === true ? winston.format.prettyPrint() : false,
-        silent: conf.silent || false,
-        timestamp: conf.timestamp === true ? winston.format.timestamp() : false,
-      };
-
-      switch (conf.transport || "console") {
+      if (conf.silent === true) {
+        continue;
+      }
+
+      // Guarantee default transport is 'console' and retro compatibility with winston options
+      switch (conf.transport || conf.preset || "console") {
         case "console":
-          transports.push(
-            new winston.transports.Console(
-              Object.assign(opts, {
-                humanReadableUnhandledException:
-                  conf.humanReadableUnhandledException || true,
-                stderrLevels: conf.stderrLevels || ["error", "debug"],
-              }),
-            ),
-          );
+          transports.targets.push({
+            level: conf.level || "info",
+            options: {
+              destination: 1,
+            },
+            target: "pino/file",
+          });
           break;
         case "elasticsearch":
-          transports.push(
-            new WinstonElasticsearch(
-              Object.assign(opts, {
-                clientOpts: conf.clientOpts || {},
-                ensureMappingTemplate: conf.ensureMappingTemplate !== false,
-                flushInterval: conf.flushInterval || 2000,
-                index: conf.index,
-                indexPrefix: conf.indexPrefix || "kuzzle-access",
-                indexSuffixPattern: conf.indexSuffixPattern || "YYYY.MM",
-                mappingTemplate:
-                  conf.mappingTemplate || "access.log.mapping.json",
-                messageType: conf.messageType || "access",
-              }),
-            ),
-          );
+          transports.targets.push({
+            level: conf.level || "info",
+            options: Object.assign({}, conf.options),
+            target: "pino-elasticsearch",
+          });
           break;
         case "file":
-          transports.push(
-            new winston.transports.File(
-              Object.assign(opts, {
-                eol: conf.eol || "\n",
-                filename: conf.filename || "kuzzle.access.log",
-                logstash: conf.logstash || false,
-                maxFiles: conf.maxFiles,
-                maxRetries: conf.maxRetries || 2,
-                maxSize: conf.maxSize,
-                tailable: conf.tailable,
-                zippedArchive: conf.zippedArchive || false,
-              }),
-            ),
-          );
-          break;
-        case "syslog":
-          transports.push(
-            new WinstonSyslog(
-              Object.assign(opts, {
-                app_name: conf.app_name || process.title,
-                eol: conf.eol,
-                facility: conf.facility || "local0",
-                host: conf.host || "localhost",
-                localhost: conf.localhost || "localhost",
-                path: conf.path || "/dev/log",
-                pid: conf.pid || process.pid,
-                port: conf.port || 514,
-                protocol: conf.protocol || "udp4",
-                type: conf.type || "BSD",
-              }),
-            ),
-          );
+          transports.targets.push({
+            level: conf.level || "info",
+            options: {
+              append: conf.options.append ?? true,
+              destination: conf.options.destination ?? "./kuzzle.access.log",
+              mkdir: conf.options.mkdir ?? true,
+            },
+            target: "pino/file",
+          });
           break;
         default:
         // do nothing
       }
+
+      // If a pino transport configuration is used, we'll try to use it as-is and
+      // assume the user installed the necessary dependencies in his Kuzzle application
+      if (typeof conf.target === "string" && conf.target !== "") {
+        transports.targets.push({
+          level: conf.level || "info",
+          options: conf.options || {},
+          target: conf.target,
+        });
+      }
     }
 
-    this.logger = winston.createLogger({ transports });
+    this.logger = pino.pino(pino.transport(transports));
   }
 
   /**
@@ -231,6 +195,8 @@ class AccessLoggerWorker {
         connection,
         error: request.error,
         extra,
+        namespace: "kuzzle:accessLogs",
+        nodeId: global.kuzzle.id,
         request: request.input,
         status: request.status,
       });
@@ -313,6 +279,7 @@ class AccessLoggerWorker {
       : "-";
 
     this.logger.info(
+      { namespace: "kuzzle:accessLogs", nodeId: global.kuzzle.id },
       `${ip} - ${user} [${when}] "${verb} ${url} ${protocol}" ${status} ${size} ${referer} ${agent}`,
     );
   }

package/lib/core/plugin/pluginContext.js

@@ -141,7 +141,7 @@ class PluginContext {
         this.accessors = {
             cluster: new backend_1.BackendCluster(),
             execute: (request, callback) => execute(request, callback),
-            nodeId: global.kuzzle.id,
+            nodeId: global.nodeId,
             sdk: new embeddedSdk_1.EmbeddedSDK(),
             storage: {
                 bootstrap: (collections) => pluginStore.init(collections),

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

@@ -2341,9 +2341,6 @@ 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),

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

@@ -765,7 +765,7 @@ export declare class ES8 {
      * Extracts, injects metadata and validates documents contained
      * in a Request
      *
-     * Used by mCreate, mUpdate, mUpsert, mReplace and mCreateOrReplace
+     * Used by mCreate, mUpdate, mUpsert, mReplace, mCreateOrReplace and mWrite
      *
      * @param  {Object[]} documents - Documents
      * @param  {Object} metadata - Kuzzle metadata

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

@@ -2259,7 +2259,7 @@ class ES8 {
      * Extracts, injects metadata and validates documents contained
      * in a Request
      *
-     * Used by mCreate, mUpdate, mUpsert, mReplace and mCreateOrReplace
+     * Used by mCreate, mUpdate, mUpsert, mReplace, mCreateOrReplace and mWrite
      *
      * @param  {Object[]} documents - Documents
      * @param  {Object} metadata - Kuzzle metadata
@@ -2334,9 +2334,6 @@ 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),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kuzzle",
   "author": "The Kuzzle Team <support@kuzzle.io>",
-  "version": "2.48.0",
+  "version": "2.49.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": {
@@ -70,10 +70,6 @@
     "uuid": "11.1.0",
     "uWebSockets.js": "https://github.com/uNetworking/uWebSockets.js/archive/refs/tags/v20.51.0.tar.gz",
     "validator": "13.15.15",
-    "winston": "3.17.0",
-    "winston-elasticsearch": "0.19.0",
-    "winston-syslog": "2.7.1",
-    "winston-transport": "4.9.0",
     "yargs": "18.0.0",
     "zeromq": "6.5.0"
   },