@contentstack/cli-cm-export 0.1.1-beta.12 → 0.1.1-beta.15

package/README.md

@@ -10,6 +10,25 @@ It is Contentstack’s CLI plugin to export content from the stack. To learn how
 * [Commands](#commands)
 <!-- tocstop -->
 
+For switching to EU region update the hosts at config/default.js
+
+```js
+{
+  host:'https://eu-api.contentstack.com/v3',
+  cdn: 'https://eu-cdn.contentstack.com/v3',
+ ...
+}
+```
+
+For switching to AZURE-NA region update the hosts at config/default.js
+
+```js
+{
+  host:'https://azure-na-api.contentstack.com/v3',
+  cdn: 'https://azure-na-cdn.contentstack.com/v3',
+ ...
+}
+```
 # Usage
 
 <!-- usage -->
@@ -18,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-export
 $ csdx COMMAND
 running command...
 $ csdx (-v|--version|version)
-@contentstack/cli-cm-export/0.1.1-beta.12 linux-x64 node-v16.14.2
+@contentstack/cli-cm-export/0.1.1-beta.15 linux-x64 node-v16.14.2
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -68,5 +87,5 @@ EXAMPLES
   csdx cm:export -A -B [optional] branch name
 ```
 
-_See code: [src/commands/cm/export.js](https://github.com/contentstack/cli/blob/v0.1.1-beta.12/packages/contentstack-export/src/commands/cm/export.js)_
+_See code: [src/commands/cm/export.js](https://github.com/contentstack/cli/blob/v0.1.1-beta.15/packages/contentstack-export/src/commands/cm/export.js)_
 <!-- commandsstop -->

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.1.1-beta.12","commands":{"cm:export":{"id":"cm:export","description":"Export content from a stack\n...\nExport content from one stack to another\n","pluginName":"@contentstack/cli-cm-export","pluginType":"core","aliases":[],"examples":["csdx cm:export -A","csdx cm:export -A -s <stack_ApiKey> -d <path/of/export/destination/dir>","csdx cm:export -A -c <path/to/config/dir>","csdx cm:export -A -m <single module name>","csdx cm:export -A --secured-assets","csdx cm:export -a <management_token_alias>","csdx cm:export -a <management_token_alias> -d <path/to/export/destination/dir>","csdx cm:export -a <management_token_alias> -c <path/to/config/file>","csdx cm:export -A -m <single module name>","csdx cm:export -A -m <single module name> -t <content type>","csdx cm:export -A -B [optional] branch name"],"flags":{"config":{"name":"config","type":"option","char":"c","description":"[optional] path of the config"},"stack-uid":{"name":"stack-uid","type":"option","char":"s","description":"API key of the source stack"},"data":{"name":"data","type":"option","char":"d","description":"path or location to store the data"},"management-token-alias":{"name":"management-token-alias","type":"option","char":"a","description":"alias of the management token"},"auth-token":{"name":"auth-token","type":"boolean","char":"A","description":"to use auth token","allowNo":false},"module":{"name":"module","type":"option","char":"m","description":"[optional] specific module name"},"content-type":{"name":"content-type","type":"option","char":"t","description":"[optional] content type"},"branch":{"name":"branch","type":"option","char":"B","description":"[optional] branch name"},"secured-assets":{"name":"secured-assets","type":"boolean","description":"[optional] use when assets are secured","allowNo":false}},"args":[]}}}
+{"version":"0.1.1-beta.15","commands":{"cm:export":{"id":"cm:export","description":"Export content from a stack\n...\nExport content from one stack to another\n","pluginName":"@contentstack/cli-cm-export","pluginType":"core","aliases":[],"examples":["csdx cm:export -A","csdx cm:export -A -s <stack_ApiKey> -d <path/of/export/destination/dir>","csdx cm:export -A -c <path/to/config/dir>","csdx cm:export -A -m <single module name>","csdx cm:export -A --secured-assets","csdx cm:export -a <management_token_alias>","csdx cm:export -a <management_token_alias> -d <path/to/export/destination/dir>","csdx cm:export -a <management_token_alias> -c <path/to/config/file>","csdx cm:export -A -m <single module name>","csdx cm:export -A -m <single module name> -t <content type>","csdx cm:export -A -B [optional] branch name"],"flags":{"config":{"name":"config","type":"option","char":"c","description":"[optional] path of the config"},"stack-uid":{"name":"stack-uid","type":"option","char":"s","description":"API key of the source stack"},"data":{"name":"data","type":"option","char":"d","description":"path or location to store the data"},"management-token-alias":{"name":"management-token-alias","type":"option","char":"a","description":"alias of the management token"},"auth-token":{"name":"auth-token","type":"boolean","char":"A","description":"to use auth token","allowNo":false},"module":{"name":"module","type":"option","char":"m","description":"[optional] specific module name"},"content-type":{"name":"content-type","type":"option","char":"t","description":"[optional] content type"},"branch":{"name":"branch","type":"option","char":"B","description":"[optional] branch name"},"secured-assets":{"name":"secured-assets","type":"boolean","description":"[optional] use when assets are secured","allowNo":false}},"args":[]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@contentstack/cli-cm-export",
 	"description": "Contentstack CLI plugin to export content from stack",
-	"version": "0.1.1-beta.12",
+	"version": "0.1.1-beta.15",
 	"author": "Contentstack",
 	"bugs": "https://github.com/contentstack/cli/issues",
 	"dependencies": {
@@ -18,6 +18,7 @@
 		"is-valid-path": "^0.1.1",
 		"lodash": "^4.17.20",
 		"path": "^0.12.7",
+		"progress-stream": "^2.0.0",
 		"proxyquire": "^2.1.3",
 		"request": "^2.88.2",
 		"winston": "^2.2.0"

package/src/app.js

@@ -90,7 +90,7 @@ var singleExport = async (moduleName, types, config, branchName) => {
         const result = await exportedModule.start(config, branchName);
         if (result && iterateList[i] === "stack") {
           let master_locale = {
-            master_locale: { code: result.master_locale },
+            master_locale: { code: result.code },
           };
           config = _.merge(config, master_locale);
         }

package/src/config/default.js

@@ -1,5 +1,10 @@
 module.exports = {
   versioning: false,
+  host: 'https://api.contentstack.io/v3',
+  // use below hosts for eu region
+  // host:'https://eu-api.contentstack.com/v3',
+  // use below hosts for azure-na region
+  // host:'https://azure-na-api.contentstack.com/v3',
   modules: {
     types: [
       'stack',
@@ -98,6 +103,7 @@ module.exports = {
       ],
       // no of asset version files (of a single asset) that'll be downloaded parallelly
       downloadLimit: 5,
+      enableDownloadStatus: false
     },
     content_types: {
       dirName: 'content_types',

package/src/lib/export/assets.js

@@ -11,6 +11,7 @@ const fs = require('fs')
 const Promise = require('bluebird')
 const _ = require('lodash')
 const chalk = require('chalk')
+const progress = require('progress-stream')
 
 const helper = require('../util/helper')
 const {addlogs} = require('../util/log')
@@ -269,10 +270,26 @@ ExportAssets.prototype = {
 
       self.assetStream.url = encodeURI(self.assetStream.url);
       const assetStreamRequest = nativeRequest(self.assetStream)
-      assetStreamRequest.on('response', function () {
+      assetStreamRequest.on('response', function (response) {
+
         helper.makeDirectory(assetFolderPath)
         const assetFileStream = fs.createWriteStream(assetFilePath)
-        assetStreamRequest.pipe(assetFileStream)
+        
+        if(assetConfig.enableDownloadStatus) {
+          const str = progress({
+            length: response.headers['content-length'],
+            time: 5000,
+          })
+
+          str.on('progress', function (progressData) {
+            console.log(`${asset.filename}: ${Math.round(progressData.percentage)}%`)
+          })
+          
+          assetStreamRequest.pipe(str).pipe(assetFileStream)
+        } else {
+          assetStreamRequest.pipe(assetFileStream)
+        }
+
         assetFileStream.on('close', function () {
           addlogs(config, 'Downloaded ' + asset.filename + ': ' + asset.uid + ' successfully!', 'success')
           return resolve()

package/src/lib/util/contentstack-management-sdk.js

@@ -1,11 +1,31 @@
 const contentstacksdk = require('@contentstack/management')
+const https = require('https');
+
+const { addlogs } = require('./log');
 
 exports.Client = function (config) {
   const option = {
     host: config.host,
     authtoken: config.auth_token,
     api_key: config.source_stack,
-    logHandler: (level, data) => {},
+    maxRequests: 10,
+    retryLimit: 5,
+    timeout: 60000,
+    httpsAgent: new https.Agent({
+      maxSockets: 100,
+      maxFreeSockets: 10,
+      keepAlive: true,
+      timeout: 60000, // active socket keepalive for 60 seconds
+      freeSocketTimeout: 30000, // free socket keepalive for 30 seconds
+    }),
+    retryDelay: Math.floor(Math.random() * (8000 - 3000 + 1) + 3000),
+    logHandler: (level, data) => { },
+    retryCondition: (error) => {
+      if (error.response.status === 408) {
+        addlogs({ data: error.response }, 'Timeout error', 'error'); 
+      }
+      return false
+    }
   }
 
   if (typeof config.branchName === 'string') {