kourou 1.4.0-dev.2 → 1.4.0-dev.4

package/lib/support/docker/checkPrerequisites.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkPrerequisites = void 0;
+exports.checkPrerequisites = checkPrerequisites;
 const tslib_1 = require("tslib");
-const listr_1 = (0, tslib_1.__importDefault)(require("listr"));
+const listr_1 = tslib_1.__importDefault(require("listr"));
 const execute_1 = require("../execute");
 async function checkPrerequisites(ctx) {
     const checks = new listr_1.default([
@@ -28,4 +28,3 @@ async function checkPrerequisites(ctx) {
         return false;
     }
 }
-exports.checkPrerequisites = checkPrerequisites;

package/lib/support/dump-collection.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dumpCollectionMappings = exports.dumpCollectionData = void 0;
+exports.dumpCollectionData = dumpCollectionData;
+exports.dumpCollectionMappings = dumpCollectionMappings;
 const tslib_1 = require("tslib");
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const cli_ux_1 = (0, tslib_1.__importDefault)(require("cli-ux"));
-const ndjson_1 = (0, tslib_1.__importDefault)(require("ndjson"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const cli_ux_1 = tslib_1.__importDefault(require("cli-ux"));
+const ndjson_1 = tslib_1.__importDefault(require("ndjson"));
 const common_1 = require("../common");
 /**
  * Flatten an object transform:
@@ -64,15 +65,12 @@ class AbstractDumper {
      *
      * @returns void
      */
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
     async setup() { }
     /**
      * One-shot call before iterating over the data. Can be
      * used to write the header of the dumped output.
      */
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
     async writeHeader() { }
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
     async tearDown() { }
     /**
      * The loop that iterates over the documents of the collection and
@@ -235,7 +233,6 @@ async function dumpCollectionData(sdk, index, collection, batchSize, destPath, q
             return dumper.dump();
     }
 }
-exports.dumpCollectionData = dumpCollectionData;
 async function dumpCollectionMappings(sdk, index, collection, destPath, format = "jsonl") {
     const collectionDir = path_1.default.join(destPath, collection);
     const filename = path_1.default.join(collectionDir, "mappings.json");
@@ -246,7 +243,7 @@ async function dumpCollectionMappings(sdk, index, collection, destPath, format =
         content: {
             [index]: {
                 [collection]: {
-                    mappings
+                    mappings,
                     // For later use, we could add the settings here
                     // eg: "settings": { "index.mapping.total_fields.limit": 10000 }
                     // This can be added after the dump and it will work with kourou:import command
@@ -256,4 +253,3 @@ async function dumpCollectionMappings(sdk, index, collection, destPath, format =
     };
     fs_1.default.writeFileSync(filename, JSON.stringify(format.toLowerCase() === "jsonl" ? dump : mappings, null, 2));
 }
-exports.dumpCollectionMappings = dumpCollectionMappings;

package/lib/support/editor.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Editor = void 0;
 const tslib_1 = require("tslib");
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
 const child_process_1 = require("child_process");
-const tmp_1 = (0, tslib_1.__importDefault)(require("tmp"));
+const tmp_1 = tslib_1.__importDefault(require("tmp"));
 class Editor {
     constructor(content = "", options = {}) {
         this._content = content;

package/lib/support/emoji.d.ts

@@ -0,0 +1,17 @@
+/**
+ * The glyphs kourou prints.
+ *
+ * These used to come from `node-emoji`, but every call site passed a string
+ * literal, so the lookup resolved to a constant anyway: the package shipped a
+ * full emoji database, and a `string | undefined` return type, for these seven
+ * characters.
+ */
+export declare const emoji: {
+    readonly boom: "💥";
+    readonly fire: "🔥";
+    readonly okHand: "👌";
+    readonly rocket: "🚀";
+    readonly shrug: "🤷";
+    readonly thumbsDown: "👎";
+    readonly thumbsUp: "👍";
+};

package/lib/support/emoji.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.emoji = void 0;
+/**
+ * The glyphs kourou prints.
+ *
+ * These used to come from `node-emoji`, but every call site passed a string
+ * literal, so the lookup resolved to a constant anyway: the package shipped a
+ * full emoji database, and a `string | undefined` return type, for these seven
+ * characters.
+ */
+exports.emoji = {
+    boom: "💥",
+    fire: "🔥",
+    okHand: "👌",
+    rocket: "🚀",
+    shrug: "🤷",
+    thumbsDown: "👎",
+    thumbsUp: "👍",
+};

package/lib/support/execute.d.ts

@@ -1,9 +1,8 @@
-/// <reference types="node" />
 import { ChildProcess } from "child_process";
 interface ProcessExecutor<T> extends Promise<T> {
     process: ChildProcess;
 }
-declare type ExecutionResult = {
+type ExecutionResult = {
     stdout: string;
     stderr: string;
     exitCode: number;

package/lib/support/execute.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.execute = exports.ExecutionError = void 0;
+exports.ExecutionError = void 0;
+exports.execute = execute;
 const child_process_1 = require("child_process");
 class ExecutionError extends Error {
     constructor(stderr, stdout, code, command) {
@@ -48,4 +49,3 @@ function execute(...args) {
     executor.process = process;
     return executor;
 }
-exports.execute = execute;

package/lib/support/kuzzle.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import http from "http";
 import { flags } from "@oclif/command";
 import { Kuzzle, JSONObject } from "kuzzle-sdk";

package/lib/support/kuzzle.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KuzzleSDK = exports.kuzzleFlags = void 0;
 const tslib_1 = require("tslib");
-const http_1 = (0, tslib_1.__importDefault)(require("http"));
-const https_1 = (0, tslib_1.__importDefault)(require("https"));
+const http_1 = tslib_1.__importDefault(require("http"));
+const https_1 = tslib_1.__importDefault(require("https"));
 const command_1 = require("@oclif/command");
 const kuzzle_sdk_1 = require("kuzzle-sdk");
 const SECOND = 1000;

package/lib/support/migrate/providers/bulk.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.throwOnBulkErrors = exports.chunkDocuments = void 0;
+exports.chunkDocuments = chunkDocuments;
+exports.throwOnBulkErrors = throwOnBulkErrors;
 const DEFAULT_CHUNK_SIZE = 1000;
 /**
  * Splits documents into chunks so a bulk request never exceeds the
@@ -12,7 +13,6 @@ function* chunkDocuments(docs, chunkSize = DEFAULT_CHUNK_SIZE) {
         yield docs.slice(i, i + size);
     }
 }
-exports.chunkDocuments = chunkDocuments;
 /**
  * A bulk request answers with a 200 even when some documents were rejected,
  * so the per-item errors have to be checked explicitly.
@@ -35,4 +35,3 @@ function throwOnBulkErrors(response) {
     }));
     throw error;
 }
-exports.throwOnBulkErrors = throwOnBulkErrors;

package/lib/support/migrate/providers/elasticsearch7.js

@@ -13,7 +13,7 @@ class Elasticsearch7 {
         this.options = options;
     }
     extractCredentials(url) {
-        let auth = undefined;
+        let auth;
         if (url.includes("@")) {
             const urlCleaned = url.replace(/https?:\/\//, "");
             const [credentials] = urlCleaned.split("@");
@@ -85,13 +85,11 @@ class Elasticsearch7 {
                 scrollId: body._scroll_id,
             };
         }
-        else {
-            const { body: { hits }, } = await this.client.scroll({
-                scroll_id: args.scrollId,
-                scroll: this.options.scrollDuration,
-            });
-            return hits.hits;
-        }
+        const { body: { hits }, } = await this.client.scroll({
+            scroll_id: args.scrollId,
+            scroll: this.options.scrollDuration,
+        });
+        return hits.hits;
     }
     async writeData(index, docs) {
         let count = 0;

package/lib/support/migrate/providers/elasticsearch8.js

@@ -13,7 +13,7 @@ class Elasticsearch8 {
         this.options = options;
     }
     extractCredentials(url) {
-        let auth = undefined;
+        let auth;
         if (url.includes("@")) {
             const urlCleaned = url.replace(/https?:\/\//, "");
             const [credentials] = urlCleaned.split("@");
@@ -87,13 +87,11 @@ class Elasticsearch8 {
                 scrollId: body._scroll_id,
             };
         }
-        else {
-            const { hits, } = await this.client.scroll({
-                scroll_id: args.scrollId,
-                scroll: this.options.scrollDuration,
-            });
-            return hits.hits;
-        }
+        const { hits } = await this.client.scroll({
+            scroll_id: args.scrollId,
+            scroll: this.options.scrollDuration,
+        });
+        return hits.hits;
     }
     async writeData(index, docs) {
         let count = 0;

package/lib/support/migrate/providers/elasticsearchTypes.d.ts

@@ -1,4 +1,4 @@
-export declare type ElasticsearchProviderOptions = {
+export type ElasticsearchProviderOptions = {
     scrollDuration: string;
     batchSize: number;
 };

package/lib/support/migrate/providers/file.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileExists = exports.File = void 0;
+exports.File = void 0;
+exports.fileExists = fileExists;
 const tslib_1 = require("tslib");
 const fs_1 = require("fs");
-const fs_2 = (0, tslib_1.__importDefault)(require("fs"));
+const fs_2 = tslib_1.__importDefault(require("fs"));
 class File {
     constructor(path) {
         this.path = path;
@@ -35,10 +36,9 @@ class File {
         const content = await fs_1.promises.readFile(this.getIndexDataFile(index));
         const data = content
             .toString()
-            .replace(/\r\n/g, '\n') // Normalize line endings Windows -> Unix
-            .split('\n')
-            .map((line) => line
-            .trim()) // Remove trailing spaces
+            .replace(/\r\n/g, "\n") // Normalize line endings Windows -> Unix
+            .split("\n")
+            .map((line) => line.trim()) // Remove trailing spaces
             .filter((line) => line.length > 0) // Remove empty lines
             .map((line) => JSON.parse(line));
         return {
@@ -67,8 +67,7 @@ function fileExists(filePath) {
         fs_2.default.accessSync(filePath, fs_1.constants.F_OK);
         return true;
     }
-    catch (error) {
+    catch (_a) {
         return false;
     }
 }
-exports.fileExists = fileExists;

package/lib/support/migrate/providers/index.js

@@ -1,18 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isURL = void 0;
+exports.isURL = isURL;
 const tslib_1 = require("tslib");
-(0, tslib_1.__exportStar)(require("./bulk"), exports);
-(0, tslib_1.__exportStar)(require("./elasticsearch7"), exports);
-(0, tslib_1.__exportStar)(require("./elasticsearch8"), exports);
-(0, tslib_1.__exportStar)(require("./file"), exports);
+tslib_1.__exportStar(require("./bulk"), exports);
+tslib_1.__exportStar(require("./elasticsearch7"), exports);
+tslib_1.__exportStar(require("./elasticsearch8"), exports);
+tslib_1.__exportStar(require("./file"), exports);
 function isURL(str) {
-    try {
-        new URL(str);
-        return true;
-    }
-    catch (error) {
-        return false;
-    }
+    return URL.canParse(str);
 }
-exports.isURL = isURL;

package/lib/support/migrate/types.d.ts

@@ -1,4 +1,4 @@
-export declare type IndexSpecification = {
+export type IndexSpecification = {
     name: string;
     aliases: {
         [key: string]: any;

package/lib/support/restore-collection.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.restoreCollectionMappings = exports.restoreCollectionData = void 0;
+exports.restoreCollectionData = restoreCollectionData;
+exports.restoreCollectionMappings = restoreCollectionMappings;
 const tslib_1 = require("tslib");
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const ndjson_1 = (0, tslib_1.__importDefault)(require("ndjson"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const ndjson_1 = tslib_1.__importDefault(require("ndjson"));
 function handleError(log, dumpFile, error) {
     if (error.errors) {
         const errorFile = `${dumpFile
@@ -13,7 +14,7 @@ function handleError(log, dumpFile, error) {
             .join(".")}-errors.jsonl`;
         const writeStream = fs_1.default.createWriteStream(errorFile, { flags: "a" });
         for (const partialError of error.errors) {
-            writeStream.write(JSON.stringify(partialError) + '\n');
+            writeStream.write(JSON.stringify(partialError) + "\n");
         }
         writeStream.end();
         log(chalk_1.default.red(`[X] Error importing ${dumpFile}. See errors in ${errorFile}`));
@@ -116,7 +117,6 @@ async function restoreCollectionData(sdk, log, batchSize, dumpFile, index, colle
         index: mWriteRequest.index,
     };
 }
-exports.restoreCollectionData = restoreCollectionData;
 /**
  * Imports mappings from a collection mappings dump
  * Expected format:
@@ -154,4 +154,3 @@ async function restoreCollectionMappings(sdk, dump, index, collection) {
         collection: dstCollection,
     };
 }
-exports.restoreCollectionMappings = restoreCollectionMappings;

package/lib/support/restore-securities.js

@@ -1,10 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.restoreUsers = exports.restoreProfiles = exports.restoreRoles = void 0;
+exports.restoreRoles = restoreRoles;
+exports.restoreProfiles = restoreProfiles;
+exports.restoreUsers = restoreUsers;
 const tslib_1 = require("tslib");
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
-const bluebird_1 = (0, tslib_1.__importDefault)(require("bluebird"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const sleep = (seconds) => new Promise((resolve) => setTimeout(resolve, seconds * 1000));
+/**
+ * Applies `fn` to every item, `concurrency` at a time, and returns the results
+ * in input order. Rejects on the first failure, like `Promise.all`, and stops
+ * feeding the workers once that happens.
+ */
+async function mapWithConcurrency(items, fn, concurrency) {
+    const results = new Array(items.length);
+    let next = 0;
+    const worker = async () => {
+        while (next < items.length) {
+            const index = next;
+            next += 1;
+            results[index] = await fn(items[index]);
+        }
+    };
+    await Promise.all(Array.from({ length: Math.min(concurrency, items.length) }, worker));
+    return results;
+}
 async function restoreRoles(kommand, dump, preserveAnonymous = false) {
     if (dump.type !== "roles") {
         throw new Error("Dump file does not contain roles definition");
@@ -27,30 +46,30 @@ async function restoreRoles(kommand, dump, preserveAnonymous = false) {
         kommand.logInfo("Anonymous user rights has been preserved.");
         delete dump.content.anonymous;
     }
-    const results = await bluebird_1.default.map(Object.entries(dump.content), ([roleId, role]) => kommand.sdk.security.createOrReplaceRole(roleId, role, { force: true }), { concurrency: 10 });
+    const results = await mapWithConcurrency(Object.entries(dump.content), ([roleId, role]) => kommand.sdk.security.createOrReplaceRole(roleId, role, { force: true }), 10);
     return results.length;
 }
-exports.restoreRoles = restoreRoles;
 async function restoreProfiles(kommand, dump) {
     if (dump.type !== "profiles") {
         throw new Error("Dump file does not contain profiles definition");
     }
-    const results = await bluebird_1.default.map(Object.entries(dump.content), ([profileId, profile]) => kommand.sdk.security.createOrReplaceProfile(profileId, profile, {
+    const results = await mapWithConcurrency(Object.entries(dump.content), ([profileId, profile]) => kommand.sdk.security.createOrReplaceProfile(profileId, profile, {
         force: true,
-    }), { concurrency: 10 });
+    }), 10);
     return results.length;
 }
-exports.restoreProfiles = restoreProfiles;
 async function restoreUsers(kommand, dump) {
     if (dump.type !== "users") {
         throw new Error("Dump file does not contain users definition");
     }
-    const results = await bluebird_1.default.map(Object.entries(dump.content), ([userId, userBody]) => {
+    const results = await mapWithConcurrency(Object.entries(dump.content), ([userId, userBody]) => {
         return kommand.sdk.security
             .createUser(userId, userBody)
             .then(() => true)
-            .catch((error) => kommand.logKo(`Error importing user ${userId}: ${error.message}`));
-    }, { concurrency: 10 });
+            .catch((error) => {
+            kommand.logKo(`Error importing user ${userId}: ${error.message}`);
+            return false;
+        });
+    }, 10);
     return results.filter((success) => success).length;
 }
-exports.restoreUsers = restoreUsers;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kourou",
   "description": "The CLI that helps you manage your Kuzzle instances",
-  "version": "1.4.0-dev.2",
+  "version": "1.4.0-dev.4",
   "author": "The Kuzzle Team <support@kuzzle.io>",
   "bin": {
     "kourou": "./bin/run"
@@ -12,8 +12,8 @@
     "dev": "./bin/run",
     "postpack": "rm -f oclif.manifest.json",
     "version": "oclif-dev readme && git add README.md",
-    "test:lint": "eslint src/ test/ --ext .ts",
-    "test:lint:fix": "eslint src/ test/ --ext .ts --fix",
+    "test:lint": "eslint src/ test/",
+    "test:lint:fix": "eslint src/ test/ --fix",
     "test:functional": "npm run build && npm run test:functional:stdout && npm run test:functional:cucumber",
     "test:functional:stdout": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
     "test:functional:cucumber": "./node_modules/.bin/cucumber-js --fail-fast"
@@ -25,7 +25,6 @@
     "@oclif/config": "1.18.*",
     "@oclif/plugin-autocomplete": "1.3.*",
     "@oclif/plugin-help": "3.2.2",
-    "bluebird": "3.7.2",
     "chalk": "4.1.2",
     "cli-ux": "5.5.1",
     "inquirer": "8.2.7",
@@ -35,47 +34,40 @@
     "listr": "0.14.3",
     "lodash": "4.18.1",
     "ndjson": "2.0.0",
-    "node-emoji": "1.11.0",
-    "node-fetch": "2.7.0",
     "strip-json-comments": "3.1.1",
     "tmp": "0.2.7",
     "tslib": "2.8.1",
-    "ws": "8.21.1",
-    "typescript": "4.4.*"
+    "ws": "8.21.3",
+    "typescript": "5.9.*"
   },
   "devDependencies": {
+    "@cucumber/cucumber": "13.2.1",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@oclif/dev-cli": "1.26.10",
     "@oclif/test": "1.2.8",
-    "@types/bluebird": "3.5.42",
     "@types/chai": "4.3.20",
     "@types/compare-version": "0.1.34",
     "@types/inquirer": "8.2.13",
     "@types/listr": "0.14.10",
-    "@types/mocha": "8.2.3",
+    "@types/mocha": "10.0.10",
     "@types/ndjson": "2.0.4",
-    "@types/node": "20.14.15",
-    "@types/node-emoji": "1.8.2",
-    "@types/node-fetch": "2.6.13",
+    "@types/node": "22.20.1",
     "@types/tmp": "0.2.6",
     "@types/ws": "8.18.1",
-    "@typescript-eslint/eslint-plugin": "4.33.0",
-    "@typescript-eslint/parser": "4.33.0",
     "chai": "4.5.0",
-    "cucumber": "6.0.7",
-    "eslint": "7.32.0",
+    "eslint": "9.32.0",
+    "eslint-plugin-kuzzle": "1.0.0",
     "globby": "11.1.0",
-    "mocha": "8.4.0",
+    "mocha": "12.0.0",
     "nyc": "15.1.0",
-    "prettier-eslint": "12.0.0",
+    "semantic-release": "25.0.8",
+    "semantic-release-config-kuzzle": "1.7.0",
     "should": "13.2.3",
     "source-map-support": "0.5.21",
-    "ts-node": "10.9.*",
-    "semantic-release": "25.0.8",
-    "semantic-release-config-kuzzle": "1.7.0"
+    "ts-node": "10.9.*"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.0.0"
   },
   "files": [
     "/bin",
@@ -140,7 +132,7 @@
   "repository": "kuzzleio/kourou",
   "types": "lib/index.d.ts",
   "overrides": {
-    "ws@8": "8.21.1",
+    "ws@8": "8.21.3",
     "cross-spawn@6": "6.0.6",
     "semver@5": "5.7.2",
     "picomatch@2": "2.3.2",