kourou 1.4.0-dev.1 → 1.4.0-dev.3

package/README.md

@@ -27,7 +27,7 @@ $ npm install -g kourou
 $ kourou COMMAND
 running command...
 $ kourou (-v|--version|version)
-kourou/1.4.0-dev.1 linux-x64 node-v24.18.0
+kourou/1.4.0-dev.3 linux-x64 node-v24.18.0
 $ kourou --help [COMMAND]
 USAGE
   $ kourou COMMAND
@@ -759,6 +759,9 @@ ARGUMENTS
 OPTIONS
   -n, --node=node  [default: http://localhost:9200] Elasticsearch server URL
   --help           show CLI help
+
+  --[no-]wait      Wait for the snapshot to complete before returning. Use --no-wait to return as soon as Elasticsearch
+                   has accepted the request
 ```
 
 _See code: [lib/commands/es/snapshot/create.js](lib/commands/es/snapshot/create.js)_
@@ -816,6 +819,9 @@ ARGUMENTS
 OPTIONS
   -n, --node=node  [default: http://localhost:9200] Elasticsearch server URL
   --help           show CLI help
+
+  --[no-]wait      Wait for the restore to complete before returning. Use --no-wait to return as soon as Elasticsearch
+                   has accepted the request
 ```
 
 _See code: [lib/commands/es/snapshot/restore.js](lib/commands/es/snapshot/restore.js)_

package/lib/commands/app/debug-proxy.js

@@ -4,8 +4,8 @@ const tslib_1 = require("tslib");
 const command_1 = require("@oclif/command");
 const common_1 = require("../../common");
 const kuzzle_1 = require("../../support/kuzzle");
-const http_1 = (0, tslib_1.__importDefault)(require("http"));
-const ws_1 = (0, tslib_1.__importDefault)(require("ws"));
+const http_1 = tslib_1.__importDefault(require("http"));
+const ws_1 = tslib_1.__importDefault(require("ws"));
 // Add the proper headers and send the body in the response
 function sendResponse(response, bodyObject) {
     response.setHeader("Content-Type", "application/json; charset=UTF-8");
@@ -159,7 +159,6 @@ class DebugProxy extends common_1.Kommand {
         await promise;
     }
 }
-exports.default = DebugProxy;
 DebugProxy.description = "Create a Proxy Server that allows Chrome to debug Kuzzle remotely using the DebugController";
 DebugProxy.flags = Object.assign({ help: command_1.flags.help(), forwardPort: command_1.flags.integer({
         description: "Port of the forwarding server",
@@ -184,3 +183,4 @@ DebugProxy.flags = Object.assign({ help: command_1.flags.help(), forwardPort: co
 DebugProxy.sdkOptions = {
     protocol: "ws",
 };
+exports.default = DebugProxy;

package/lib/commands/app/doctor.js

@@ -6,7 +6,7 @@ const common_1 = require("../../common");
 const kuzzle_1 = require("../../support/kuzzle");
 const sdk_es7_1 = require("sdk-es7");
 const execute_1 = require("../../support/execute");
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const checkPrerequisites_1 = require("../../support/docker/checkPrerequisites");
 class AppDoctor extends common_1.Kommand {
     constructor() {
@@ -36,9 +36,9 @@ class AppDoctor extends common_1.Kommand {
     async runSafe() {
         const suggestions = [];
         const [nodeVersion, adminExists, anonymous] = await Promise.all([
-            this.sdk.query({ controller: "debug", action: "nodeVersion", }),
+            this.sdk.query({ controller: "debug", action: "nodeVersion" }),
             this.sdk.server.adminExists({}),
-            this.sdk.security.getRole("anonymous")
+            this.sdk.security.getRole("anonymous"),
         ]);
         this.log(`----------------- DoKtor begin his job ! -----------------`);
         this.log(`General checks`);
@@ -96,7 +96,7 @@ class AppDoctor extends common_1.Kommand {
             this.logInfo("No config found for the server");
         }
         // Redis
-        if ("PONG" === (await this.sdk.ms.ping())) {
+        if ((await this.sdk.ms.ping()) === "PONG") {
             this.logOk("Redis Memory Storage is running");
         }
         else {
@@ -131,9 +131,12 @@ class AppDoctor extends common_1.Kommand {
             this.logOk(`ElasticSearch Status: ${info.meta.connection.status}`);
             const nodes = await client.cat.nodes({ format: "json" });
             this.log(`ElasticSearch nodes`);
+            // oclif has no tabular output helper, console.table is the only option
+            // eslint-disable-next-line no-console
             console.table(nodes.body.map((i) => ({ node_name: i.name, ip: i.ip })));
             const indices = await client.cat.indices({ format: "json" });
             this.log(`ElasticSearch indices`);
+            // eslint-disable-next-line no-console
             console.table(indices.body.map((i) => ({
                 indice_name: i.index,
                 health: i.health,
@@ -182,7 +185,6 @@ class AppDoctor extends common_1.Kommand {
         this.log(`-------------------------------------------------------------`);
     }
 }
-exports.default = AppDoctor;
 AppDoctor.description = "Analyze a Kuzzle application";
 AppDoctor.flags = Object.assign({ help: command_1.flags.help(), elasticsearch: command_1.flags.string({
         description: "Elasticsearch server URL",
@@ -190,3 +192,4 @@ AppDoctor.flags = Object.assign({ help: command_1.flags.help(), elasticsearch: c
     }) }, kuzzle_1.kuzzleFlags);
 AppDoctor.args = [];
 AppDoctor.readStdin = true;
+exports.default = AppDoctor;

package/lib/commands/app/scaffold.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const command_1 = require("@oclif/command");
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const listr_1 = (0, tslib_1.__importDefault)(require("listr"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const listr_1 = tslib_1.__importDefault(require("listr"));
 const common_1 = require("../../common");
 const execute_1 = require("../../support/execute");
 class AppScaffold extends common_1.Kommand {
@@ -152,7 +152,6 @@ class AppScaffold extends common_1.Kommand {
         await (0, execute_1.execute)("rm", "-rf", `${destination}/.git`);
     }
 }
-exports.default = AppScaffold;
 AppScaffold.initSdk = false;
 AppScaffold.description = "Scaffolds a new Kuzzle application";
 AppScaffold.flags = {
@@ -173,3 +172,4 @@ AppScaffold.args = [
         required: true,
     },
 ];
+exports.default = AppScaffold;

package/lib/commands/app/start-services.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const fs_1 = require("fs");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const command_1 = require("@oclif/command");
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const node_emoji_1 = (0, tslib_1.__importDefault)(require("node-emoji"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const node_emoji_1 = tslib_1.__importDefault(require("node-emoji"));
 const common_1 = require("../../common");
 const execute_1 = require("../../support/execute");
 const checkPrerequisites_1 = require("../../support/docker/checkPrerequisites");
@@ -55,7 +55,6 @@ class AppStartServices extends common_1.Kommand {
         }
     }
 }
-exports.default = AppStartServices;
 AppStartServices.initSdk = false;
 AppStartServices.description = "Starts Kuzzle services (Elasticsearch and Redis)";
 AppStartServices.flags = {
@@ -65,3 +64,4 @@ AppStartServices.flags = {
         default: false,
     }),
 };
+exports.default = AppStartServices;

package/lib/commands/collection/create.js

@@ -14,7 +14,6 @@ class CollectionCreate extends common_1.Kommand {
         this.logOk(`Collection "${this.args.index}":"${this.args.collection}" created`);
     }
 }
-exports.default = CollectionCreate;
 CollectionCreate.description = "Creates a collection";
 CollectionCreate.flags = Object.assign({ help: command_1.flags.help() }, kuzzle_1.kuzzleFlags);
 CollectionCreate.args = [
@@ -26,3 +25,4 @@ CollectionCreate.args = [
     },
 ];
 CollectionCreate.readStdin = true;
+exports.default = CollectionCreate;

package/lib/commands/collection/export.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const command_1 = require("@oclif/command");
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const common_1 = require("../../common");
 const kuzzle_1 = require("../../support/kuzzle");
 const dump_collection_1 = require("../../support/dump-collection");
@@ -35,7 +35,6 @@ class CollectionExport extends common_1.Kommand {
         this.logOk(`Collection ${this.args.index}:${this.args.collection} dumped`);
     }
 }
-exports.default = CollectionExport;
 CollectionExport.keepAuth = true;
 CollectionExport.description = "Exports a collection (JSONL format)";
 CollectionExport.flags = Object.assign(Object.assign({ help: command_1.flags.help({}), path: command_1.flags.string({
@@ -81,3 +80,4 @@ CollectionExport.examples = [
     "kourou collection:export nyc-open-data yellow-taxi",
     "kourou collection:export nyc-open-data yellow-taxi --query '{ term: { city: \"Saigon\" } }'",
 ];
+exports.default = CollectionExport;

package/lib/commands/collection/import.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
 const command_1 = require("@oclif/command");
 const common_1 = require("../../common");
 const kuzzle_1 = require("../../support/kuzzle");
@@ -19,7 +19,6 @@ class CollectionImport extends common_1.Kommand {
         this.logOk(`Successfully imported ${total} documents from "${this.args.path}" in "${index}:${collection}"`);
     }
 }
-exports.default = CollectionImport;
 CollectionImport.keepAuth = true;
 CollectionImport.description = "Imports a collection";
 CollectionImport.flags = Object.assign(Object.assign({ help: command_1.flags.help({}), "batch-size": command_1.flags.string({
@@ -38,3 +37,4 @@ CollectionImport.flags = Object.assign(Object.assign({ help: command_1.flags.hel
 CollectionImport.args = [
     { name: "path", description: "Dump directory path", required: true },
 ];
+exports.default = CollectionImport;

package/lib/commands/collection/migrate.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
 const command_1 = require("@oclif/command");
 const common_1 = require("../../common");
 const kuzzle_1 = require("../../support/kuzzle");
@@ -16,14 +16,12 @@ class CollectionMigrate extends common_1.Kommand {
     }
     getMigrationFunction() {
         const migrationScript = fs_1.default.readFileSync(this.args.script, "utf8");
-        let migrationFunction;
-        {
-            migrationFunction = eval(`var f = ${migrationScript}; f`);
-        }
-        return migrationFunction;
+        // Evaluating user-supplied code is the whole point of the command: the
+        // script argument is the migration function itself.
+        // eslint-disable-next-line no-eval
+        return eval(`var f = ${migrationScript}; f`);
     }
 }
-exports.default = CollectionMigrate;
 CollectionMigrate.keepAuth = true;
 CollectionMigrate.description = "Migrate a collection by transforming documents from a dump file and importing them into Kuzzle";
 CollectionMigrate.flags = Object.assign(Object.assign({ help: command_1.flags.help({}), "batch-size": command_1.flags.string({
@@ -41,3 +39,4 @@ CollectionMigrate.args = [
     { name: "script", description: "Migration script path", required: true },
     { name: "path", description: "Collection dump path", required: true },
 ];
+exports.default = CollectionMigrate;

package/lib/commands/config/diff.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigKeyDiff = void 0;
 const tslib_1 = require("tslib");
 const command_1 = require("@oclif/command");
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
-const strip_json_comments_1 = (0, tslib_1.__importDefault)(require("strip-json-comments"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const strip_json_comments_1 = tslib_1.__importDefault(require("strip-json-comments"));
 const common_1 = require("../../common");
 class ConfigKeyDiff extends common_1.Kommand {
     async runSafe() {
@@ -52,7 +52,8 @@ class ConfigKeyDiff extends common_1.Kommand {
                     walkObject(_base[key], _object[key], [...path, key]);
                 }
                 else if (this.flags.values && _base[key] !== _object[key]) {
-                    changes[[...path, key].join(".")] = `value is "${_object[key]}" and was "${_base[key]}"`;
+                    changes[[...path, key].join(".")] =
+                        `value is "${_object[key]}" and was "${_base[key]}"`;
                 }
             }
         };

package/lib/commands/document/search.js

@@ -31,7 +31,6 @@ class DocumentSearch extends common_1.Kommand {
         this.logOk(`${result === null || result === void 0 ? void 0 : result.hits.length} documents fetched on a total of ${result === null || result === void 0 ? void 0 : result.total}`);
     }
 }
-exports.default = DocumentSearch;
 DocumentSearch.description = "Searches for documents";
 DocumentSearch.examples = [
     "kourou document:search iot sensors '{ equals: { name: \"corona\" } }'",
@@ -58,3 +57,4 @@ DocumentSearch.args = [
     { name: "collection", description: "Collection name", required: true },
     { name: "query", description: "Search query in JS or JSON format." },
 ];
+exports.default = DocumentSearch;

package/lib/commands/es/aliases/cat.d.ts

@@ -1,5 +1,5 @@
-import { flags } from '@oclif/command';
-import { Kommand } from '../../../common';
+import { flags } from "@oclif/command";
+import { Kommand } from "../../../common";
 export default class EsListAliases extends Kommand {
     static initSdk: boolean;
     static description: string;

package/lib/commands/es/aliases/cat.js

@@ -7,30 +7,30 @@ class EsListAliases extends common_1.Kommand {
     async runSafe() {
         const esClient = new sdk_es7_1.Client({ node: this.flags.node });
         try {
-            const { body } = await esClient.cat.aliases({ format: 'json' });
+            const { body } = await esClient.cat.aliases({ format: "json" });
             const elements = body
                 .map((e) => ({ index: e.index, alias: e.alias }))
-                .filter((e) => (this.flags.grep ? e.alias.match(new RegExp(this.flags.grep)) : true))
+                .filter((e) => this.flags.grep ? e.alias.match(new RegExp(this.flags.grep)) : true)
                 .sort();
             this.log(JSON.stringify(elements, null, 2));
         }
         catch (error) {
-            console.log(error);
+            this.logKo(error.message);
         }
     }
 }
-exports.default = EsListAliases;
 EsListAliases.initSdk = false;
-EsListAliases.description = 'Lists available ES aliases';
+EsListAliases.description = "Lists available ES aliases";
 EsListAliases.flags = {
     help: command_1.flags.help(),
     node: command_1.flags.string({
-        char: 'n',
-        description: 'Elasticsearch server URL',
-        default: 'http://localhost:9200',
+        char: "n",
+        description: "Elasticsearch server URL",
+        default: "http://localhost:9200",
     }),
     grep: command_1.flags.string({
-        char: 'g',
-        description: 'Match output with pattern',
+        char: "g",
+        description: "Match output with pattern",
     }),
 };
+exports.default = EsListAliases;

package/lib/commands/es/indices/cat.js

@@ -16,11 +16,10 @@ class EsListIndex extends common_1.Kommand {
             this.log(JSON.stringify(indexes, null, 2));
         }
         catch (error) {
-            console.log(error);
+            this.logKo(error.message);
         }
     }
 }
-exports.default = EsListIndex;
 EsListIndex.initSdk = false;
 EsListIndex.description = "Lists available ES indexes";
 EsListIndex.flags = {
@@ -35,3 +34,4 @@ EsListIndex.flags = {
         description: "Match output with pattern",
     }),
 };
+exports.default = EsListIndex;

package/lib/commands/es/indices/get.js

@@ -14,7 +14,6 @@ class EsGet extends common_1.Kommand {
         this.log(JSON.stringify(body, null, 2));
     }
 }
-exports.default = EsGet;
 EsGet.initSdk = false;
 EsGet.description = "Gets a document from ES";
 EsGet.flags = {
@@ -29,3 +28,4 @@ EsGet.args = [
     { name: "index", description: "ES Index name", required: true },
     { name: "id", description: "Document ID", required: true },
 ];
+exports.default = EsGet;

package/lib/commands/es/indices/insert.js

@@ -15,7 +15,6 @@ class EsInsert extends common_1.Kommand {
         this.logOk("Document successfully inserted.");
     }
 }
-exports.default = EsInsert;
 EsInsert.initSdk = false;
 EsInsert.description = "Inserts a document directly into ES (will replace if exists)";
 EsInsert.flags = {
@@ -36,3 +35,4 @@ EsInsert.flags = {
 EsInsert.args = [
     { name: "index", description: "ES Index name", required: true },
 ];
+exports.default = EsInsert;

package/lib/commands/es/migrate.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const command_1 = require("@oclif/command");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const cli_ux_1 = (0, tslib_1.__importDefault)(require("cli-ux"));
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const node_emoji_1 = (0, tslib_1.__importDefault)(require("node-emoji"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const cli_ux_1 = tslib_1.__importDefault(require("cli-ux"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const node_emoji_1 = tslib_1.__importDefault(require("node-emoji"));
 const fs_1 = require("fs");
 const common_1 = require("../../common");
 const providers_1 = require("../../support/migrate/providers");
@@ -34,9 +34,7 @@ class EsMigrate extends common_1.Kommand {
             }
             return new providers_1.File(provider);
         }
-        else {
-            throw new Error(`Unknown provider type: ${provider}. You should provide either an Elasticsearch URL or a file path.`);
-        }
+        throw new Error(`Unknown provider type: ${provider}. You should provide either an Elasticsearch URL or a file path.`);
     }
     async migrateIndex(index) {
         const indexDefinition = await this.src.getIndex(index);
@@ -107,7 +105,6 @@ class EsMigrate extends common_1.Kommand {
         }
     }
 }
-exports.default = EsMigrate;
 EsMigrate.initSdk = false;
 EsMigrate.description = "Migrate all the index from an Elasticsearch (or a file) to another Elasticsearch";
 EsMigrate.flags = {
@@ -164,3 +161,4 @@ EsMigrate.examples = [
     "kourou es:migrate --src ./my-backup --dest http://elasticsearch:9200 --reset --batch-size 2000 --no-interactive",
     "kourou es:migrate --src ./my-backup --dest http://elasticsearch:9200 --reset --batch-size 2000 --no-interactive --esVersion 8",
 ];
+exports.default = EsMigrate;

package/lib/commands/es/snapshot/create-repository.js

@@ -21,7 +21,6 @@ class EsSnapshotsCreateRepository extends common_1.Kommand {
         this.logOk(`Success ${JSON.stringify(response.body)}`);
     }
 }
-exports.default = EsSnapshotsCreateRepository;
 EsSnapshotsCreateRepository.initSdk = false;
 EsSnapshotsCreateRepository.description = "Create a FS snapshot repository inside an ES instance";
 EsSnapshotsCreateRepository.flags = {
@@ -44,3 +43,4 @@ EsSnapshotsCreateRepository.args = [
         required: true,
     },
 ];
+exports.default = EsSnapshotsCreateRepository;

package/lib/commands/es/snapshot/create.d.ts

@@ -5,6 +5,7 @@ export default class EsSnapshotsCreate extends Kommand {
     static description: string;
     static flags: {
         node: flags.IOptionFlag<string>;
+        wait: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
         help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
     };
     static args: {

package/lib/commands/es/snapshot/create.js

@@ -3,12 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = require("@oclif/command");
 const sdk_es7_1 = require("sdk-es7");
 const common_1 = require("../../../common");
+const SNAPSHOT_TIMEOUT = 30 * 60 * 1000;
 class EsSnapshotsCreate extends common_1.Kommand {
     async runSafe() {
-        const esClient = new sdk_es7_1.Client({ node: this.flags.node });
+        const esClient = new sdk_es7_1.Client({
+            node: this.flags.node,
+            // Waiting holds the HTTP request open for as long as the snapshot takes,
+            // which the 30s default would cut short on any real dataset.
+            requestTimeout: this.flags.wait ? SNAPSHOT_TIMEOUT : undefined,
+        });
         const esRequest = {
             repository: this.args.repository,
             snapshot: this.args.name,
+            wait_for_completion: this.flags.wait,
             body: {
                 indices: "*",
                 include_global_state: false,
@@ -19,7 +26,6 @@ class EsSnapshotsCreate extends common_1.Kommand {
         this.logOk(`Success ${JSON.stringify(response.body)}`);
     }
 }
-exports.default = EsSnapshotsCreate;
 EsSnapshotsCreate.initSdk = false;
 EsSnapshotsCreate.description = "Create a snapshot repository inside an ES instance";
 EsSnapshotsCreate.flags = {
@@ -28,9 +34,15 @@ EsSnapshotsCreate.flags = {
         description: "Elasticsearch server URL",
         default: "http://localhost:9200",
     }),
+    wait: command_1.flags.boolean({
+        description: "Wait for the snapshot to complete before returning. Use --no-wait to return as soon as Elasticsearch has accepted the request",
+        default: true,
+        allowNo: true,
+    }),
     help: command_1.flags.help(),
 };
 EsSnapshotsCreate.args = [
     { name: "repository", description: "ES repository name", required: true },
     { name: "name", description: "ES snapshot name", required: true },
 ];
+exports.default = EsSnapshotsCreate;

package/lib/commands/es/snapshot/list.js

@@ -28,7 +28,6 @@ class EsSnapshotsList extends common_1.Kommand {
         this.logOk(`Success: ${JSON.stringify(result, null, 2)}`);
     }
 }
-exports.default = EsSnapshotsList;
 EsSnapshotsList.initSdk = false;
 EsSnapshotsList.description = "List all snapshot from a repository acknowledge by an ES instance";
 EsSnapshotsList.flags = {
@@ -46,3 +45,4 @@ EsSnapshotsList.args = [
         required: true,
     },
 ];
+exports.default = EsSnapshotsList;

package/lib/commands/es/snapshot/restore.d.ts

@@ -5,6 +5,7 @@ export default class EsSnapshotsRestore extends Kommand {
     static description: string;
     static flags: {
         node: flags.IOptionFlag<string>;
+        wait: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
         help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
     };
     static args: {

package/lib/commands/es/snapshot/restore.js

@@ -3,9 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = require("@oclif/command");
 const sdk_es7_1 = require("sdk-es7");
 const common_1 = require("../../../common");
+const RESTORE_TIMEOUT = 30 * 60 * 1000;
 class EsSnapshotsRestore extends common_1.Kommand {
     async runSafe() {
-        const esClient = new sdk_es7_1.Client({ node: this.flags.node });
+        const esClient = new sdk_es7_1.Client({
+            node: this.flags.node,
+            // Waiting holds the HTTP request open for as long as the restore takes,
+            // which the 30s default would cut short on any real dataset.
+            requestTimeout: this.flags.wait ? RESTORE_TIMEOUT : undefined,
+        });
         await esClient.indices.close({
             index: "*",
             expand_wildcards: "all",
@@ -13,6 +19,7 @@ class EsSnapshotsRestore extends common_1.Kommand {
         const esRequest = {
             repository: this.args.repository,
             snapshot: this.args.name,
+            wait_for_completion: this.flags.wait,
             body: {
                 feature_states: ["none"],
                 include_global_state: false,
@@ -23,7 +30,6 @@ class EsSnapshotsRestore extends common_1.Kommand {
         this.logOk(`Success ${JSON.stringify(response.body)}`);
     }
 }
-exports.default = EsSnapshotsRestore;
 EsSnapshotsRestore.initSdk = false;
 EsSnapshotsRestore.description = "Restore a snapshot repository inside an ES instance";
 EsSnapshotsRestore.flags = {
@@ -32,9 +38,15 @@ EsSnapshotsRestore.flags = {
         description: "Elasticsearch server URL",
         default: "http://localhost:9200",
     }),
+    wait: command_1.flags.boolean({
+        description: "Wait for the restore to complete before returning. Use --no-wait to return as soon as Elasticsearch has accepted the request",
+        default: true,
+        allowNo: true,
+    }),
     help: command_1.flags.help(),
 };
 EsSnapshotsRestore.args = [
     { name: "repository", description: "ES repository name", required: true },
     { name: "name", description: "ES snapshot name", required: true },
 ];
+exports.default = EsSnapshotsRestore;

package/lib/commands/file/decrypt.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileDecrypt = void 0;
 const tslib_1 = require("tslib");
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const command_1 = require("@oclif/command");
 const kuzzle_vault_1 = require("kuzzle-vault");
 const common_1 = require("../../common");

package/lib/commands/file/encrypt.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VaultEncrypt = void 0;
 const tslib_1 = require("tslib");
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const command_1 = require("@oclif/command");
 const kuzzle_vault_1 = require("kuzzle-vault");
 const common_1 = require("../../common");

package/lib/commands/file/test.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileTest = void 0;
 const tslib_1 = require("tslib");
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const command_1 = require("@oclif/command");
 const kuzzle_vault_1 = require("kuzzle-vault");
 const common_1 = require("../../common");

package/lib/commands/import.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const command_1 = require("@oclif/command");
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const common_1 = require("../common");
 const kuzzle_1 = require("../support/kuzzle");
 const restore_collection_1 = require("../support/restore-collection");
@@ -122,7 +122,6 @@ class Import extends common_1.Kommand {
         }
     }
 }
-exports.default = Import;
 Import.keepAuth = true;
 Import.description = "Recursively imports dump files from a root directory";
 Import.flags = Object.assign(Object.assign({ "preserve-anonymous": command_1.flags.boolean({
@@ -142,3 +141,4 @@ Import.args = [
         required: true,
     },
 ];
+exports.default = Import;