Upgrade elasticsearch support to 6.2

Author: SlapBassist

package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "async": "2.0.0-rc.2",
     "cheerio": "^0.19.0",
-    "elasticsearch": "^9.0.2",
+    "elasticsearch": "^14.1.0",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^3.8.0",
     "mongodb": "2.0.27",

src/storage/connection.js

@@ -116,7 +116,7 @@ function elasticInit (callback) {
 
   const client = new elasticsearch.Client({
     host: config.elasticsearchHost(),
-    apiVersion: '1.7',
+    apiVersion: '6.2',
     ssl: { rejectUnauthorized: true }, // Plz no trivial MITM attacks
     log: ElasticLogs,
     maxRetries: Infinity

src/storage/remote.js

@@ -301,10 +301,10 @@ RemoteStorage.prototype.createNewIndex = function (indexName, callback) {
 
   let envelopeMapping = {
     properties: {
-      title: { type: 'string', index: 'analyzed' },
-      body: { type: 'string', index: 'analyzed' },
-      keywords: { type: 'string', index: 'analyzed' },
-      categories: { type: 'string', index: 'not_analyzed' }
+      title: { type: 'text', index: true, copy_to: 'all' },
+      body: { type: 'text', index: true, copy_to: 'all' },
+      keywords: { type: 'text', index: true, copy_to: 'all' },
+      categories: { type: 'text', index: false, copy_to: 'all' }
     }
   };
 
@@ -347,8 +347,7 @@ RemoteStorage.prototype.makeIndexActive = function (indexName, callback) {
 
     connection.elastic.indices.get({
       index: 'envelopes*',
-      ignoreUnavailable: true,
-      feature: '_settings'
+      ignoreUnavailable: true
     }, (err, response, status) => {
       if (err) return callback(err);
 
@@ -374,11 +373,13 @@ RemoteStorage.prototype.queryEnvelopes = function (query, categories, pageNumber
   const q = {};
 
   if (!categories) {
-    q.match = { _all: query };
+    q.match = { all: query };
   } else {
-    q.filtered = {
-      query: { match: { _all: query } },
-      filter: { terms: { categories: categories } }
+    q.bool = {
+      must: {
+        match: { all : query },
+        filter: { terms: { categories: categories } }
+      }
     };
   }