@contentstack/cli 1.4.0 → 1.5.0

package/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli/1.4.0 linux-x64 node-v16.19.1
+@contentstack/cli/1.5.0 linux-x64 node-v16.20.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/help.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
-const figlet = require("figlet");
+const figlet = tslib_1.__importStar(require("figlet"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 class MyHelpClass extends core_1.Help {
     constructor(config, opts) {

package/lib/hooks/init/utils-init.js

@@ -5,8 +5,10 @@ const cli_utilities_1 = require("@contentstack/cli-utilities");
  * Initialize the utilities
  */
 function default_1(_opts) {
-    cli_utilities_1.logger.init(this.config.context);
-    cli_utilities_1.messageHandler.init(this.config.context);
-    cli_utilities_1.cliux.init(this.config.context);
+    const { context } = this.config;
+    cli_utilities_1.logger.init(context);
+    cli_utilities_1.messageHandler.init(context);
+    cli_utilities_1.cliux.init(context);
+    cli_utilities_1.managementSDKInitiator.init(context);
 }
 exports.default = default_1;

package/lib/hooks/prerun/auth-guard.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_utilities_1 = require("@contentstack/cli-utilities");
-const ContentstackManagementSDK = require("@contentstack/management");
 // TBD: run region command if region is not there
 async function default_1(opts) {
     const { context: { plugin: { config: { protectedCommands = {} } = {} } = {}, region = null } = {} } = this.config;
@@ -15,13 +14,12 @@ async function default_1(opts) {
     }
     // Auth guard
     if (protectedCommands[opts.Command.id]) {
-        const authToken = cli_utilities_1.configHandler.get('authtoken');
-        if (!authToken) {
+        if (!(0, cli_utilities_1.isAuthenticated)()) {
             cli_utilities_1.logger.error('No auth token found for command', opts.Command.id);
             cli_utilities_1.cliux.error('Please login to execute the command');
             this.exit();
         }
-        const client = ContentstackManagementSDK.client({ host: region.cma, authtoken: authToken });
+        const client = await (0, cli_utilities_1.managementSDKClient)({ host: region.cma });
         try {
             const result = await client.getUser();
             if (!result) {

package/lib/utils/context-handler.js

@@ -1,18 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const uuid_1 = require("uuid");
-const path = require("path");
+const tslib_1 = require("tslib");
+const shortUUID = tslib_1.__importStar(require("short-uuid"));
+const path = tslib_1.__importStar(require("path"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const node_machine_id_1 = require("node-machine-id");
 class CsdxContext {
     constructor(cliOpts, cliConfig) {
+        var _a, _b, _c;
+        const analyticsInfo = [];
         const command = cliConfig.findCommand(cliOpts.id) || {};
         const config = cli_utilities_1.configHandler;
-        let sessionId = cli_utilities_1.configHandler.get('sessionId');
-        if (!sessionId) {
-            sessionId = (0, uuid_1.v4)();
-            cli_utilities_1.configHandler.set('sessionId', sessionId);
+        const platform = cliConfig.platform && cliConfig.arch ? `${cliConfig.platform}-${cliConfig.arch}` : 'none';
+        analyticsInfo.push(platform);
+        const nodeVersion = process.versions.node ? `v${process.versions.node}` : process.version;
+        analyticsInfo.push(nodeVersion || 'none');
+        analyticsInfo.push(cliConfig.version || 'none');
+        this.clientId = cli_utilities_1.configHandler.get('clientId');
+        if (!this.clientId) {
+            this.clientId = (0, node_machine_id_1.machineIdSync)(true);
+            cli_utilities_1.configHandler.set('clientId', this.clientId);
         }
-        this.id = sessionId;
+        analyticsInfo.push(this.clientId);
+        const sessionId = shortUUID.generate();
+        cli_utilities_1.configHandler.set('sessionId', sessionId);
+        this.sessionId = sessionId;
+        analyticsInfo.push(this.sessionId);
         this.user = {
             authtoken: cli_utilities_1.configHandler.get('authtoken'),
             email: cli_utilities_1.configHandler.get('email'),
@@ -25,8 +38,11 @@ class CsdxContext {
             this.plugin.name = command.pluginName;
             this.plugin.config = Object.assign({}, ((this.plugin.pjson && this.plugin.pjson.csdxConfig) || {}));
             this.messageFilePath = path.resolve(this.plugin.root, this.plugin.config.messageFilePath || './messages/index.json');
+            this.info.shortCommandName = (_c = (_b = (_a = this.plugin) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.shortCommandName) === null || _c === void 0 ? void 0 : _c[cliOpts.id];
+            analyticsInfo.push(this.info.shortCommandName || cliOpts.id);
         }
         this.flagWarningPrintState = {};
+        this.analyticsInfo = analyticsInfo.join(';');
     }
     getToken(alias) {
         if (alias) {

package/lib/utils/index.js

@@ -1,5 +1,8 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CsdxContext = void 0;
 var context_handler_1 = require("./context-handler");
-Object.defineProperty(exports, "CsdxContext", { enumerable: true, get: function () { return context_handler_1.default; } });
+Object.defineProperty(exports, "CsdxContext", { enumerable: true, get: function () { return __importDefault(context_handler_1).default; } });

package/oclif.manifest.json

@@ -1,4 +1,4 @@
 {
-  "version": "1.4.0",
+  "version": "1.5.0",
   "commands": {}
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run"
@@ -21,20 +21,21 @@
     "prepack": "pnpm compile && oclif manifest && oclif readme"
   },
   "dependencies": {
-    "@contentstack/cli-auth": "^1.2.0",
-    "@contentstack/cli-cm-bootstrap": "^1.3.0",
-    "@contentstack/cli-cm-bulk-publish": "^1.2.0",
-    "@contentstack/cli-cm-clone": "^1.3.0",
-    "@contentstack/cli-cm-export": "^1.4.0",
-    "@contentstack/cli-cm-export-to-csv": "^1.2.0",
-    "@contentstack/cli-cm-import": "^1.4.0",
-    "@contentstack/cli-cm-migrate-rte": "^1.3.0",
-    "@contentstack/cli-cm-seed": "^1.3.0",
-    "@contentstack/cli-command": "^1.2.0",
-    "@contentstack/cli-config": "^1.2.0",
-    "@contentstack/cli-migration": "^1.2.0",
-    "@contentstack/cli-utilities": "^1.2.0",
+    "@contentstack/cli-auth": "^1.3.0",
+    "@contentstack/cli-cm-bootstrap": "^1.4.0",
+    "@contentstack/cli-cm-bulk-publish": "^1.3.0",
+    "@contentstack/cli-cm-clone": "^1.4.0",
+    "@contentstack/cli-cm-export": "^1.5.0",
+    "@contentstack/cli-cm-export-to-csv": "^1.3.0",
+    "@contentstack/cli-cm-import": "^1.5.0",
+    "@contentstack/cli-cm-migrate-rte": "^1.4.0",
+    "@contentstack/cli-cm-seed": "^1.4.0",
+    "@contentstack/cli-command": "^1.2.1",
+    "@contentstack/cli-config": "^1.3.0",
+    "@contentstack/cli-migration": "^1.3.0",
+    "@contentstack/cli-utilities": "^1.3.0",
     "@contentstack/management": "^1.6.1",
+    "@oclif/core": "^2.3.0",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-not-found": "^2.3.9",
     "@oclif/plugin-plugins": "^2.1.7",
@@ -43,7 +44,9 @@
     "figlet": "^1.5.2",
     "inquirer": "8.2.4",
     "uuid": "^9.0.0",
-    "winston": "^3.7.2"
+    "winston": "^3.7.2",
+    "node-machine-id": "^1.1.12",
+    "short-uuid": "^4.2.2"
   },
   "devDependencies": {
     "@oclif/test": "^2.2.10",
@@ -136,7 +139,6 @@
     ],
     "hooks": {
       "prerun": [
-        "./lib/hooks/prerun/auth-guard",
         "./lib/hooks/prerun/command-deprecation-check"
       ],
       "init": [
@@ -146,4 +148,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}