kuzzle 2.27.0 → 2.27.2

package/lib/service/storage/elasticsearch.js

@@ -168,7 +168,7 @@ class ElasticSearch extends Service {
           "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.',
-        ].join("\n")
+        ].join("\n"),
       );
     }
 
@@ -325,7 +325,7 @@ class ElasticSearch extends Service {
 
     const stringifiedScrollInfo = await global.kuzzle.ask(
       "core:cache:internal:get",
-      cacheKey
+      cacheKey,
     );
 
     if (!stringifiedScrollInfo) {
@@ -350,7 +350,7 @@ class ElasticSearch extends Service {
           JSON.stringify(scrollInfo),
           {
             ttl: ms(_scrollTTL) || this.scrollTTL,
-          }
+          },
         );
       }
 
@@ -374,7 +374,7 @@ class ElasticSearch extends Service {
    */
   async search(
     { index, collection, searchBody, targets } = {},
-    { from, size, scroll } = {}
+    { from, size, scroll } = {},
   ) {
     let esIndexes;
 
@@ -429,7 +429,7 @@ class ElasticSearch extends Service {
             index,
             targets,
           }),
-          { ttl }
+          { ttl },
         );
 
         body.remaining = body.hits.total.value - body.hits.hits.length;
@@ -529,7 +529,7 @@ class ElasticSearch extends Service {
       for (const [name, innerHit] of Object.entries(innerHits)) {
         formattedInnerHits[name] = await Bluebird.map(
           innerHit.hits.hits,
-          formatHit
+          formatHit,
         );
       }
       return formattedInnerHits;
@@ -682,7 +682,7 @@ class ElasticSearch extends Service {
     index,
     collection,
     content,
-    { id, refresh, userId = null, injectKuzzleMeta = true } = {}
+    { id, refresh, userId = null, injectKuzzleMeta = true } = {},
   ) {
     assertIsObject(content);
 
@@ -738,7 +738,7 @@ class ElasticSearch extends Service {
     collection,
     id,
     content,
-    { refresh, userId = null, injectKuzzleMeta = true } = {}
+    { refresh, userId = null, injectKuzzleMeta = true } = {},
   ) {
     const esRequest = {
       body: content,
@@ -792,7 +792,7 @@ class ElasticSearch extends Service {
     collection,
     id,
     content,
-    { refresh, userId = null, retryOnConflict, injectKuzzleMeta = true } = {}
+    { refresh, userId = null, retryOnConflict, injectKuzzleMeta = true } = {},
   ) {
     const esRequest = {
       _source: true,
@@ -852,7 +852,7 @@ class ElasticSearch extends Service {
       userId = null,
       retryOnConflict,
       injectKuzzleMeta = true,
-    } = {}
+    } = {},
   ) {
     const esRequest = {
       _source: true,
@@ -917,7 +917,7 @@ class ElasticSearch extends Service {
     collection,
     id,
     content,
-    { refresh, userId = null, injectKuzzleMeta = true } = {}
+    { refresh, userId = null, injectKuzzleMeta = true } = {},
   ) {
     const alias = this._getAlias(index, collection);
     const esRequest = {
@@ -1010,7 +1010,7 @@ class ElasticSearch extends Service {
     index,
     collection,
     query,
-    { refresh, size = 1000, fetch = true } = {}
+    { refresh, size = 1000, fetch = true } = {},
   ) {
     const esRequest = {
       body: this._sanitizeSearchBody({ query }),
@@ -1066,7 +1066,7 @@ class ElasticSearch extends Service {
     collection,
     id,
     fields,
-    { refresh, userId = null } = {}
+    { refresh, userId = null } = {},
   ) {
     const alias = this._getAlias(index, collection);
     const esRequest = {
@@ -1128,7 +1128,7 @@ class ElasticSearch extends Service {
     collection,
     query,
     changes,
-    { refresh, size = 1000, userId = null } = {}
+    { refresh, size = 1000, userId = null } = {},
   ) {
     try {
       const esRequest = {
@@ -1153,7 +1153,7 @@ class ElasticSearch extends Service {
         index,
         collection,
         documents,
-        { refresh, userId }
+        { refresh, userId },
       );
 
       return {
@@ -1181,7 +1181,7 @@ class ElasticSearch extends Service {
     collection,
     query,
     changes,
-    { refresh = "false" } = {}
+    { refresh = "false" } = {},
   ) {
     const script = {
       params: {},
@@ -1244,7 +1244,7 @@ class ElasticSearch extends Service {
     collection,
     query,
     callback,
-    { size = 10, scrollTTl = "5s" } = {}
+    { size = 10, scrollTTl = "5s" } = {},
   ) {
     const esRequest = {
       body: this._sanitizeSearchBody({ query }),
@@ -1270,7 +1270,7 @@ class ElasticSearch extends Service {
           esRequest,
           async function getMoreUntilDone(
             error,
-            { body: { hits, _scroll_id } }
+            { body: { hits, _scroll_id } },
           ) {
             if (error) {
               reject(error);
@@ -1290,12 +1290,12 @@ class ElasticSearch extends Service {
                   scroll: esRequest.scroll,
                   scrollId: _scroll_id,
                 },
-                getMoreUntilDone
+                getMoreUntilDone,
               );
             } else {
               resolve(results);
             }
-          }
+          },
         );
       });
     } finally {
@@ -1360,7 +1360,7 @@ class ElasticSearch extends Service {
   async createCollection(
     index,
     collection,
-    { mappings = {}, settings = {} } = {}
+    { mappings = {}, settings = {} } = {},
   ) {
     this._assertValidIndexAndCollection(index, collection);
 
@@ -1407,7 +1407,7 @@ class ElasticSearch extends Service {
       dynamic: mappings.dynamic || this._config.commonMapping.dynamic,
       properties: _.merge(
         mappings.properties,
-        this._config.commonMapping.properties
+        this._config.commonMapping.properties,
       ),
     };
 
@@ -1508,7 +1508,7 @@ class ElasticSearch extends Service {
   async updateCollection(
     index,
     collection,
-    { mappings = {}, settings = {} } = {}
+    { mappings = {}, settings = {} } = {},
   ) {
     const esRequest = {
       index: await this._getIndice(index, collection),
@@ -1635,7 +1635,7 @@ class ElasticSearch extends Service {
 
     const fullProperties = _.merge(
       collectionMappings.properties,
-      mappings.properties
+      mappings.properties,
     );
 
     return {
@@ -1731,7 +1731,7 @@ class ElasticSearch extends Service {
     index,
     collection,
     documents,
-    { refresh, timeout, userId = null } = {}
+    { refresh, timeout, userId = null } = {},
   ) {
     const alias = this._getAlias(index, collection);
     const actionNames = ["index", "create", "update", "delete"];
@@ -2018,7 +2018,7 @@ class ElasticSearch extends Service {
 
           return request;
         },
-        { index: [] }
+        { index: [] },
       );
 
       if (esRequest.index.length === 0) {
@@ -2208,7 +2208,7 @@ class ElasticSearch extends Service {
     index,
     collection,
     documents,
-    { refresh, timeout, userId = null } = {}
+    { refresh, timeout, userId = null } = {},
   ) {
     const alias = this._getAlias(index, collection),
       kuzzleMeta = {
@@ -2261,8 +2261,6 @@ class ElasticSearch extends Service {
             reason: "document already exists",
             status: 400,
           });
-
-          idx++;
         } else {
           esRequest.body.push({
             index: {
@@ -2274,6 +2272,7 @@ class ElasticSearch extends Service {
 
           toImport.push(document);
         }
+        idx++;
       } else {
         esRequest.body.push({ index: { _index: alias } });
         esRequest.body.push(document._source);
@@ -2307,7 +2306,7 @@ class ElasticSearch extends Service {
       injectKuzzleMeta = true,
       limits = true,
       source = true,
-    } = {}
+    } = {},
   ) {
     let kuzzleMeta = {};
 
@@ -2331,7 +2330,7 @@ class ElasticSearch extends Service {
     };
     const { rejected, extractedDocuments } = this._extractMDocuments(
       documents,
-      kuzzleMeta
+      kuzzleMeta,
     );
 
     esRequest.body = [];
@@ -2374,7 +2373,7 @@ class ElasticSearch extends Service {
     index,
     collection,
     documents,
-    { refresh, retryOnConflict = 0, timeout, userId = null } = {}
+    { refresh, retryOnConflict = 0, timeout, userId = null } = {},
   ) {
     const alias = this._getAlias(index, collection),
       toImport = [],
@@ -2392,7 +2391,7 @@ class ElasticSearch extends Service {
       },
       { rejected, extractedDocuments } = this._extractMDocuments(
         documents,
-        kuzzleMeta
+        kuzzleMeta,
       );
 
     /**
@@ -2465,7 +2464,7 @@ class ElasticSearch extends Service {
     index,
     collection,
     documents,
-    { refresh, retryOnConflict = 0, timeout, userId = null } = {}
+    { refresh, retryOnConflict = 0, timeout, userId = null } = {},
   ) {
     const alias = this._getAlias(index, collection);
     const esRequest = {
@@ -2497,7 +2496,7 @@ class ElasticSearch extends Service {
       {
         prepareMUpsert: true,
         requireId: true,
-      }
+      },
     );
 
     /**
@@ -2519,7 +2518,7 @@ class ElasticSearch extends Service {
         {
           doc: extractedDocuments[i]._source.changes,
           upsert: extractedDocuments[i]._source.default,
-        }
+        },
       );
       // _source: true
       // Makes ES return the updated document source in the response.
@@ -2530,7 +2529,7 @@ class ElasticSearch extends Service {
     const response = await this._mExecute(
       esRequest,
       extractedDocuments,
-      rejected
+      rejected,
     );
 
     // with _source: true, ES returns the updated document in
@@ -2564,7 +2563,7 @@ class ElasticSearch extends Service {
     index,
     collection,
     documents,
-    { refresh, timeout, userId = null } = {}
+    { refresh, timeout, userId = null } = {},
   ) {
     const alias = this._getAlias(index, collection),
       kuzzleMeta = {
@@ -2723,7 +2722,7 @@ class ElasticSearch extends Service {
     esRequest,
     documents,
     partialErrors,
-    { limits = true, source = true } = {}
+    { limits = true, source = true } = {},
   ) {
     assertWellFormedRefresh(esRequest);
 
@@ -2808,7 +2807,7 @@ class ElasticSearch extends Service {
   _extractMDocuments(
     documents,
     metadata,
-    { prepareMGet = false, requireId = false, prepareMUpsert = false } = {}
+    { prepareMGet = false, requireId = false, prepareMUpsert = false } = {},
   ) {
     const rejected = [];
     const extractedDocuments = [];
@@ -2861,7 +2860,7 @@ class ElasticSearch extends Service {
                 {},
                 metadata.upsert,
                 document.changes,
-                document.default
+                document.default,
               ),
             },
           };
@@ -2911,7 +2910,7 @@ class ElasticSearch extends Service {
         throw kerror.get(
           "invalid_mapping",
           currentPath,
-          didYouMean(property, mappingProperties)
+          didYouMean(property, mappingProperties),
         );
       }
 
@@ -2971,7 +2970,7 @@ class ElasticSearch extends Service {
       throw kerror.get(
         "multiple_indice_alias",
         `"alias" starting with "${ALIAS_PREFIX}"`,
-        '"indices"'
+        '"indices"',
       );
     }
 
@@ -3001,7 +3000,7 @@ class ElasticSearch extends Service {
    */
   async _getAvailableIndice(index, collection) {
     let indice = this._getAlias(index, collection).substr(
-      INDEX_PREFIX_POSITION_IN_ALIAS
+      INDEX_PREFIX_POSITION_IN_ALIAS,
     );
 
     if (!(await this._client.indices.exists({ index: indice })).body) {
@@ -3040,7 +3039,7 @@ class ElasticSearch extends Service {
   async _getAliasFromIndice(indice) {
     const { body } = await this._client.indices.getAlias({ index: indice });
     const aliases = Object.keys(body[indice].aliases).filter((alias) =>
-      alias.startsWith(ALIAS_PREFIX)
+      alias.startsWith(ALIAS_PREFIX),
     );
 
     if (aliases.length < 1) {
@@ -3066,7 +3065,7 @@ class ElasticSearch extends Service {
       const indicesWithoutAlias = indices.filter(
         (indice) =>
           indice[INDEX_PREFIX_POSITION_IN_INDICE] === this._indexPrefix &&
-          !aliases.some((alias) => alias.indice === indice)
+          !aliases.some((alias) => alias.indice === indice),
       );
 
       const esRequest = { body: { actions: [] } };
@@ -3110,7 +3109,7 @@ class ElasticSearch extends Service {
   _extractIndex(alias) {
     return alias.substr(
       INDEX_PREFIX_POSITION_IN_ALIAS + 1,
-      alias.indexOf(NAME_SEPARATOR) - INDEX_PREFIX_POSITION_IN_ALIAS - 1
+      alias.indexOf(NAME_SEPARATOR) - INDEX_PREFIX_POSITION_IN_ALIAS - 1,
     );
   }
 
@@ -3250,7 +3249,7 @@ class ElasticSearch extends Service {
         hits.hits.map((h) => ({
           _id: h._id,
           _source: h._source,
-        }))
+        })),
       );
     }
 
@@ -3351,14 +3350,14 @@ class ElasticSearch extends Service {
 
     assert(
       typeof configValue === "string",
-      `services.storageEngine.${key} must be a string.`
+      `services.storageEngine.${key} must be a string.`,
     );
 
     const parsedValue = ms(configValue);
 
     assert(
       typeof parsedValue === "number",
-      `Invalid parsed value from ms() for services.storageEngine.${key} ("${typeof parsedValue}").`
+      `Invalid parsed value from ms() for services.storageEngine.${key} ("${typeof parsedValue}").`,
     );
 
     return parsedValue;
@@ -3411,7 +3410,7 @@ class ElasticSearch extends Service {
           esState = esStateEnum.OK;
         } else {
           global.kuzzle.log.info(
-            `[ℹ] Still waiting for Elasticsearch: ${health.body.number_of_pending_tasks} cluster tasks remaining`
+            `[ℹ] Still waiting for Elasticsearch: ${health.body.number_of_pending_tasks} cluster tasks remaining`,
           );
           await Bluebird.delay(1000);
         }
@@ -3434,7 +3433,7 @@ class ElasticSearch extends Service {
         throw kerror.get(
           "invalid_mapping",
           path,
-          "Dynamic property value should be a string."
+          "Dynamic property value should be a string.",
         );
       }
 
@@ -3443,8 +3442,8 @@ class ElasticSearch extends Service {
           "invalid_mapping",
           path,
           `Incorrect dynamic property value (${value}). Should be one of "${DYNAMIC_PROPERTY_VALUES.join(
-            '", "'
-          )}"`
+            '", "',
+          )}"`,
         );
       }
     }

package/lib/service/storage/esWrapper.js

@@ -197,7 +197,7 @@ class ESWrapper {
       if (matches) {
         return kerror.get(
           betterError.subcode,
-          ...betterError.getPlaceholders(error, matches)
+          ...betterError.getPlaceholders(error, matches),
         );
       }
     }
@@ -281,7 +281,7 @@ class ESWrapper {
 
     debug(
       'unhandled "BadRequest" elasticsearch error: %a',
-      _.get(error, "meta.body.error.reason", error.message)
+      _.get(error, "meta.body.error.reason", error.message),
     );
 
     return kerror.get("unexpected_bad_request", errorMessage);
@@ -291,7 +291,7 @@ class ESWrapper {
     debug(
       "unhandled elasticsearch error (unhandled type: %s): %o",
       _.get(error, "error.meta.statusCode", "<no status code>"),
-      error
+      error,
     );
 
     return kerror.get("unexpected_error", message);

package/lib/service/storage/queryTranslator.js

@@ -26,7 +26,7 @@ const kerror = require("../../kerror");
 class KeywordError extends Error {
   constructor(type, name) {
     super(
-      `The ${type} "${name}" of Koncorde DSL is not supported for search queries.`
+      `The ${type} "${name}" of Koncorde DSL is not supported for search queries.`,
     );
 
     this.keyword = { name, type };
@@ -58,7 +58,7 @@ function parseKoncordePath(path) {
       "services",
       "koncorde",
       "elastic_translation_error",
-      `Invalid exists path "${path}": missing closing bracket`
+      `Invalid exists path "${path}": missing closing bracket`,
     );
   }
 

package/lib/util/assertType.js

@@ -69,7 +69,7 @@ function assertArray(attr, data, type) {
     if (d !== undefined && d !== null) {
       if (typeof d !== type) {
         throw new BadRequestError(
-          `Attribute ${attr} must contain only values of type "${type}"`
+          `Attribute ${attr} must contain only values of type "${type}"`,
         );
       }
 

package/lib/util/deprecate.js

@@ -30,7 +30,7 @@ const deprecationWarning = (logger, ...args) => {
 
 const warnIfDeprecated = (logger, deprecations, member) => {
   const deprecatedProperty = Object.keys(deprecations).find(
-      (deprecated) => deprecated === member
+      (deprecated) => deprecated === member,
     ),
     alternative = deprecations[deprecatedProperty];
 
@@ -43,12 +43,12 @@ const warnIfDeprecated = (logger, deprecations, member) => {
   } else if (typeof alternative === "string") {
     deprecationWarning(
       logger,
-      `Use of '${deprecatedProperty}' property is deprecated. Please, use '${alternative}' instead.`
+      `Use of '${deprecatedProperty}' property is deprecated. Please, use '${alternative}' instead.`,
     );
   } else {
     deprecationWarning(
       logger,
-      `Use of '${deprecatedProperty}' property is deprecated.`
+      `Use of '${deprecatedProperty}' property is deprecated.`,
     );
   }
 };

package/lib/util/extractFields.js

@@ -35,7 +35,7 @@ const { isPlainObject } = require("./safeObject");
 function extractFields(
   document,
   { fieldsToIgnore = [], alsoExtractValues = false } = {},
-  { path = null, extractedFields = [] } = {}
+  { path = null, extractedFields = [] } = {},
 ) {
   for (const [key, value] of Object.entries(document)) {
     if (
@@ -51,7 +51,7 @@ function extractFields(
       extractFields(
         value,
         { alsoExtractValues, fieldsToIgnore },
-        { extractedFields, path: currentPath }
+        { extractedFields, path: currentPath },
       );
     } else if (alsoExtractValues) {
       extractedFields.push({ key: currentPath, value });

package/lib/util/wildcard.js

@@ -36,7 +36,7 @@ function match(pattern, list) {
     .split("*")
     .filter(
       (patternPart, index, array) =>
-        patternPart !== "" || index === 0 || index === array.length - 1
+        patternPart !== "" || index === 0 || index === array.length - 1,
     )
     .map((patternPart) => _.escapeRegExp(patternPart)) // escape special regex characters
     .join(".*");