kourou 0.25.0 → 0.25.1

package/README.md

@@ -26,7 +26,7 @@ $ npm install -g kourou
 $ kourou COMMAND
 running command...
 $ kourou (-v|--version|version)
-kourou/0.25.0 linux-x64 node-v16.15.0
+kourou/0.25.1 linux-x64 node-v16.15.0
 $ kourou --help [COMMAND]
 USAGE
   $ kourou COMMAND
@@ -365,7 +365,7 @@ ARGUMENTS
   DESTINATION  Directory to scaffold the app
 
 OPTIONS
-  --flavor=flavor  [default: generic] Template flavor ("generic", "iot-platform", "iot-console", "iot-platform").
+  --flavor=flavor  [default: generic] Template flavor ("generic", "iot-backend", "iot-console").
                    Those can be found here: https://github.com/kuzzleio/project-templates
 
   --help           show CLI help
@@ -547,7 +547,7 @@ _See code: [src/commands/collection/import.ts](src/commands/collection/import.ts
 
 ## `kourou collection:migrate SCRIPT PATH`
 
-Migrate a collection
+Migrate a collection by transforming documents from a dump file and importing them into Kuzzle
 
 ```
 USAGE

package/lib/commands/app/scaffold.js

@@ -35,7 +35,7 @@ AppScaffold.flags = {
     help: command_1.flags.help(),
     flavor: command_1.flags.string({
         default: "generic",
-        description: `Template flavor ("generic", "iot-platform", "iot-console", "iot-platform").
+        description: `Template flavor ("generic", "iot-backend", "iot-console").
     Those can be found here: https://github.com/kuzzleio/project-templates`,
     }),
 };

package/lib/commands/collection/migrate.js

@@ -25,7 +25,7 @@ class CollectionMigrate extends common_1.Kommand {
 }
 exports.default = CollectionMigrate;
 CollectionMigrate.keepAuth = true;
-CollectionMigrate.description = "Migrate a collection";
+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({
         description: "Maximum batch size (see limits.documentsWriteCount config)",
         default: "200",

package/lib/commands/paas/login.js

@@ -20,10 +20,6 @@ class PaasLogin extends PaasKommand_1.PaasKommand {
             await this.authenticateNPM(username, password);
             return;
         }
-        if (this.flags.only_npm) {
-            await this.authenticateNPM(username, password);
-            return;
-        }
         await this.initPaasClient({ username, password });
         const apiKey = await this.paas.auth.createApiKey("Kourou PaaS API Key");
         this.createProjectCredentials(apiKey);
@@ -53,15 +49,19 @@ class PaasLogin extends PaasKommand_1.PaasKommand {
                 password,
             }),
         };
-        const response = await (0, node_fetch_1.default)(`https://packages.paas.kuzzle.io/-/user/org.couchdb.user:${username}`, options);
-        const { token } = await response.json();
+        const response = await (0, node_fetch_1.default)(`https://${this.packagesHost}/-/user/org.couchdb.user:${username}`, options);
+        const json = await response.json();
+        if (response.status !== 201) {
+            throw new Error(json.error);
+        }
+        const { token } = json;
         (0, child_process_1.spawnSync)("npm", [
             "config",
             "set",
             "@kuzzleio:registry",
-            "https://packages.paas.kuzzle.io",
+            `https://${this.packagesHost}`,
         ], { stdio: "inherit" });
-        (0, child_process_1.spawnSync)("npm", ["set", "//packages.paas.kuzzle.io/:_authToken", token], {
+        (0, child_process_1.spawnSync)("npm", ["set", `//${this.packagesHost}/:_authToken`, token], {
             stdio: "inherit",
         });
     }

package/lib/commands/paas/logs.js

@@ -59,18 +59,23 @@ class PaasLogs extends PaasKommand_1.PaasKommand {
             // Display the response
             for (var lineStream_1 = (0, tslib_1.__asyncValues)(lineStream), lineStream_1_1; lineStream_1_1 = await lineStream_1.next(), !lineStream_1_1.done;) {
                 const line = lineStream_1_1.value;
-                // Parse the data
-                const data = JSON.parse(line);
-                // Exclude logs that are empty or that are not from a pod
-                if (!data.content || !data.podName) {
-                    continue;
+                try {
+                    const data = JSON.parse(line);
+                    // Exclude logs that are empty or that are not from a pod
+                    if (!data.content || !data.podName) {
+                        this.logKo(line);
+                        continue;
+                    }
+                    // Get the pod color
+                    const podColor = this.getPodColor(data.podName);
+                    // Display the log
+                    const timestamp = this.flags.timestamp ? `[${new Date(data.timeStamp).toLocaleString()}] ` : "";
+                    const name = podColor(`${data.podName}${separator}`);
+                    this.log(`${timestamp}${name}| ${data.content}`);
+                }
+                catch (error) {
+                    this.logKo(`Unable to parse the following line: ${line}`);
                 }
-                // Get the pod color
-                const podColor = this.getPodColor(data.podName);
-                // Display the log
-                const timestamp = this.flags.timestamp ? `[${new Date(data.timeStamp).toLocaleString()}] ` : "";
-                const name = podColor(`${data.podName}${separator}`);
-                this.log(`${timestamp}${name}| ${data.content}`);
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }

package/lib/support/PaasKommand.d.ts

@@ -11,6 +11,7 @@ export declare class PaasKommand extends Kommand {
     protected host: string;
     protected port: number;
     protected ssl: any;
+    protected packagesHost: string;
     protected paas: KuzzleSDK;
     initPaasClient(credentials: PaaSClientCredentials): Promise<void>;
     fileProjectCredentials(project: string): string;

package/lib/support/PaasKommand.js

@@ -18,6 +18,9 @@ class PaasKommand extends common_1.Kommand {
         this.ssl = process.env.KUZZLE_PAAS_SSL
             ? JSON.parse(process.env.KUZZLE_PAAS_SSL)
             : true;
+        this.packagesHost = process.env.KUZZLE_PAAS_PACKAGES_HOST
+            ? process.env.KUZZLE_PAAS_PACKAGES_HOST
+            : "packages.paas.kuzzle.io";
         // Instantiate a dummy SDK to avoid the this.paas? notation everywhere -_-
         this.paas = new kuzzle_1.KuzzleSDK({});
     }

package/lib/support/kuzzle.js

@@ -3,6 +3,7 @@ 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 command_1 = require("@oclif/command");
 const kuzzle_sdk_1 = require("kuzzle-sdk");
 const SECOND = 1000;
@@ -170,7 +171,8 @@ class KuzzleSDK {
         };
         // Send the request
         return new Promise((resolve, reject) => {
-            const req = http_1.default.request(url, options, (res) => {
+            const httpModule = this.ssl ? https_1.default : http_1.default;
+            const req = httpModule.request(url, options, (res) => {
                 resolve(res);
             });
             req.on("error", reject);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kourou",
   "description": "The CLI that helps you manage your Kuzzle instances",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "author": "The Kuzzle Team <support@kuzzle.io>",
   "bin": {
     "kourou": "./bin/run"