kuzzle 2.31.0-elasticsearch-8.1 → 2.31.0

package/lib/service/storage/{7/elasticsearch.js → elasticsearch.js}

@@ -46,24 +46,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ES7 = void 0;
 const lodash_1 = __importDefault(require("lodash"));
-const sdk_es7_1 = require("sdk-es7");
+const elasticsearch_1 = require("@elastic/elasticsearch");
 const assert_1 = __importDefault(require("assert"));
 const bluebird_1 = __importDefault(require("bluebird"));
 const ms_1 = __importDefault(require("ms"));
 const semver_1 = __importDefault(require("semver"));
-const debug_1 = __importDefault(require("../../../util/debug"));
+const debug_1 = __importDefault(require("../../util/debug"));
+const storeScopeEnum_1 = require("../../core/storage/storeScopeEnum");
+const kerror = __importStar(require("../../kerror"));
+const didYouMean_1 = __importDefault(require("../../util/didYouMean"));
+const extractFields_1 = __importDefault(require("../../util/extractFields"));
+const mutex_1 = require("../../util/mutex");
+const name_generator_1 = require("../../util/name-generator");
+const requestAssertions_1 = require("../../util/requestAssertions");
+const safeObject_1 = require("../../util/safeObject");
+const service_1 = __importDefault(require("../service"));
 const esWrapper_1 = __importDefault(require("./esWrapper"));
-const queryTranslator_1 = __importDefault(require("../commons/queryTranslator"));
-const didYouMean_1 = __importDefault(require("../../../util/didYouMean"));
-const kerror = __importStar(require("../../../kerror"));
-const requestAssertions_1 = require("../../../util/requestAssertions");
-const safeObject_1 = require("../../../util/safeObject");
-const extractFields_1 = __importDefault(require("../../../util/extractFields"));
-const mutex_1 = require("../../../util/mutex");
-const name_generator_1 = require("../../../util/name-generator");
-const storeScopeEnum_1 = require("../../../core/storage/storeScopeEnum");
+const queryTranslator_1 = __importDefault(require("./queryTranslator"));
 (0, debug_1.default)("kuzzle:services:elasticsearch");
 const SCROLL_CACHE_PREFIX = "_docscroll_";
 const ROOT_MAPPING_PROPERTIES = [
@@ -97,9 +97,28 @@ let esState = esStateEnum.NONE;
  * @param {storeScopeEnum} scope
  * @constructor
  */
-class ES7 {
+class ElasticSearch extends service_1.default {
+    /**
+     * Returns a new elasticsearch client instance
+     *
+     * @returns {Object}
+     */
+    static buildClient(config) {
+        // Passed to Elasticsearch's client to make it use
+        // Bluebird instead of ES6 promises
+        const defer = function defer() {
+            let resolve;
+            let reject;
+            const promise = new bluebird_1.default((res, rej) => {
+                resolve = res;
+                reject = rej;
+            });
+            return { promise, reject, resolve };
+        };
+        return new elasticsearch_1.Client({ defer, ...config });
+    }
     constructor(config, scope = storeScopeEnum_1.storeScopeEnum.PUBLIC) {
-        this._config = config;
+        super("elasticsearch", config);
         this._scope = scope;
         this._indexPrefix =
             scope === storeScopeEnum_1.storeScopeEnum.PRIVATE ? PRIVATE_PREFIX : PUBLIC_PREFIX;
@@ -156,7 +175,7 @@ class ES7 {
                 'See the "services.storageEngine.commonMapping.dynamic" option in the kuzzlerc configuration file to change this value.',
             ].join("\n"));
         }
-        this._client = new sdk_es7_1.Client(this._config.client);
+        this._client = ElasticSearch.buildClient(this._config.client);
         await this.waitForElasticsearch();
         this._esWrapper = new esWrapper_1.default(this._client);
         const { body: { version }, } = await this._client.info();
@@ -600,7 +619,7 @@ class ES7 {
         }
     }
     /**
-     * Creates a new document to Elasticsearch, or replace it if it already exist
+     * Creates a new document to ElasticSearch, or replace it if it already exist
      *
      * @param {String} index - Index name
      * @param {String} collection - Collection name
@@ -738,7 +757,7 @@ class ES7 {
         }
     }
     /**
-     * Replaces a document to Elasticsearch
+     * Replaces a document to ElasticSearch
      *
      * @param {String} index - Index name
      * @param {String} collection - Collection name
@@ -2449,7 +2468,7 @@ class ES7 {
         let notAvailable;
         let suffix;
         do {
-            suffix = `.${this._getRandomNumber(100000)}`;
+            suffix = `.${(0, name_generator_1.randomNumber)(100000)}`;
             const overflow = Buffer.from(indice + suffix).length - 255;
             if (overflow > 0) {
                 const indiceBuffer = Buffer.from(indice);
@@ -2555,7 +2574,7 @@ class ES7 {
         const schema = {};
         for (const alias of aliases) {
             const [indexName, collectionName] = alias
-                .slice(INDEX_PREFIX_POSITION_IN_ALIAS + 1)
+                .substr(INDEX_PREFIX_POSITION_IN_ALIAS + 1, alias.length)
                 .split(NAME_SEPARATOR);
             if (alias[INDEX_PREFIX_POSITION_IN_ALIAS] === this._indexPrefix &&
                 (collectionName !== HIDDEN_COLLECTION || includeHidden)) {
@@ -2837,11 +2856,8 @@ class ES7 {
             }
         }
     }
-    _getRandomNumber(number) {
-        return (0, name_generator_1.randomNumber)(number);
-    }
 }
-exports.ES7 = ES7;
+exports.default = ElasticSearch;
 /**
  * Finds paths and values of mappings dynamic properties
  *
@@ -2926,4 +2942,7 @@ function _isObjectNameValid(name) {
     }
     return valid;
 }
+// TODO: Remove this function when we move to Jest
+// This is kept because we use an old ReRequire that use require() instead of import
+module.exports = ElasticSearch;
 //# sourceMappingURL=elasticsearch.js.map

package/lib/service/storage/{7/esWrapper.js → esWrapper.js}

@@ -25,13 +25,11 @@
 
 const Bluebird = require("bluebird");
 const _ = require("lodash");
-const es = require("sdk-es7");
+const es = require("@elastic/elasticsearch");
 
-const { KuzzleError } = require("../../../kerror/errors");
-const debug = require("../../../util/debug")(
-  "kuzzle:services:storage:ESCommon",
-);
-const kerror = require("../../../kerror").wrap("services", "storage");
+const { KuzzleError } = require("../../kerror/errors");
+const debug = require("../../util/debug")("kuzzle:services:storage:ESCommon");
+const kerror = require("../../kerror").wrap("services", "storage");
 
 const errorMessagesMapping = [
   {

package/lib/service/storage/{commons/queryTranslator.js → queryTranslator.js}

@@ -21,7 +21,7 @@
 
 "use strict";
 
-const kerror = require("../../../kerror");
+const kerror = require("../../kerror");
 
 class KeywordError extends Error {
   constructor(type, name) {

package/lib/types/config/storageEngine/StorageEngineElasticsearchConfiguration.d.ts

@@ -1,9 +1,5 @@
+import { ClientOptions } from "@elastic/elasticsearch";
 export type StorageEngineElasticsearch = {
-    /**
-     * Elasticsearch major version
-     * @default "7"
-     */
-    majorVersion: "7" | "8";
     /**
      * @default ['storageEngine']
      */
@@ -26,7 +22,7 @@ export type StorageEngineElasticsearch = {
      * }
      *
      */
-    client: any;
+    client: ClientOptions;
     /**
      * Default policy against new fields that are not referenced in the
      * collection mapping.

package/lib/types/storage/{7/Elasticsearch.d.ts → Elasticsearch.d.ts}

@@ -1,4 +1,4 @@
-import { ByteSize, ClusterNodesStats } from "sdk-es7/api/types";
+import { ByteSize, ClusterNodesStats } from "@elastic/elasticsearch/api/types";
 export type InfoResult = {
     type: string;
     version: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kuzzle",
   "author": "The Kuzzle Team <support@kuzzle.io>",
-  "version": "2.31.0-elasticsearch-8.1",
+  "version": "2.31.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": {
@@ -12,7 +12,7 @@
     "dev": "ergol docker/scripts/start-kuzzle-dev.ts -c ./config/ergol.config.json",
     "doc-error-codes": "node -r ts-node/register doc/build-error-codes",
     "prepublishOnly": "npm run build",
-    "prettier": "prettier ./lib ./test ./features ./plugins/available/functional-test-plugin --write",
+    "prettier": "prettier ./lib ./test ./bin ./features ./plugins/available/functional-test-plugin --write",
     "test:functional:http": "KUZZLE_PROTOCOL=http cucumber-js --profile http",
     "test:functional:jest": "jest",
     "test:functional:legacy:http": "cucumber-js --format progress-bar --profile http ./features-legacy",
@@ -29,6 +29,7 @@
     "lib": "lib"
   },
   "dependencies": {
+    "@elastic/elasticsearch": "https://github.com/elastic/elasticsearch-js/archive/refs/tags/v7.13.0.tar.gz",
     "aedes": "0.46.3",
     "bluebird": "3.7.2",
     "cli-color": "2.0.3",
@@ -47,7 +48,7 @@
     "koncorde": "4.3.0",
     "kuzzle-plugin-auth-passport-local": "6.4.0",
     "kuzzle-plugin-logger": "3.0.3",
-    "kuzzle-sdk": "7.11.1",
+    "kuzzle-sdk": "^7.11.3",
     "kuzzle-vault": "2.0.4",
     "lodash": "4.17.21",
     "long": "5.2.3",
@@ -59,9 +60,7 @@
     "passport": "0.7.0",
     "protobufjs": "7.2.5",
     "rc": "1.2.8",
-    "sdk-es7": "https://github.com/elastic/elasticsearch-js/archive/refs/tags/v7.13.0.tar.gz",
-    "sdk-es8": "npm:@elastic/elasticsearch@8.12.1",
-    "semver": "7.6.0",
+    "semver": "7.5.4",
     "sorted-array": "2.0.4",
     "uuid": "9.0.1",
     "uWebSockets.js": "https://github.com/uNetworking/uWebSockets.js/archive/refs/tags/v20.34.0.tar.gz",
@@ -85,7 +84,6 @@
     "@semantic-release/commit-analyzer": "^10.0.1",
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/release-notes-generator": "^11.0.4",
-    "@types/bluebird": "^3.5.42",
     "@types/jest": "29.5.10",
     "@types/js-yaml": "4.0.9",
     "@types/lodash": "4.14.202",