@contentstack/cli-cm-import 1.2.4 → 1.3.0

package/src/lib/util/upload.js

@@ -6,13 +6,13 @@
 
 'use strict';
 
-var debug = require('debug')('util:requests');
-var MAX_RETRY_LIMIT = 5;
-var Bluebird = require('bluebird');
+const debug = require('debug')('util:requests');
+const MAX_RETRY_LIMIT = 5;
+const Bluebird = require('bluebird');
 
-var util = require('./index');
-var config = util.getConfig();
-const client = require('../util/contentstack-management-sdk').Client(config);
+const util = require('./index');
+const config = util.getConfig();
+const { managementSDKClient } = require('@contentstack/cli-utilities');
 
 function validate(req) {
   if (typeof req !== 'object') {
@@ -20,27 +20,34 @@ function validate(req) {
   }
 }
 
-var upload = (module.exports = function (req, fsPath, RETRY) {
+const upload = (module.exports = function (req, fsPath, RETRY) {
   return new Bluebird(function (resolve, reject) {
     try {
-      validate(req);
-      if (typeof RETRY !== 'number') {
-        RETRY = 1;
-      } else if (RETRY > MAX_RETRY_LIMIT) {
-        return reject(new Error('Max retry limit exceeded!'));
-      }
+      managementSDKClient(config)
+        .then((APIClient) => {
+          validate(req);
+          if (typeof RETRY !== 'number') {
+            RETRY = 1;
+          } else if (RETRY > MAX_RETRY_LIMIT) {
+            return reject(new Error('Max retry limit exceeded!'));
+          }
 
-      req.upload = fsPath;
-      client
-        .stack({ api_key: config.target_stack, management_token: config.management_token })
-        .asset()
-        .create(req)
-        .then((response) => {
-          return resolve(response);
+          req.upload = fsPath;
+          const stackAPIClient = APIClient.stack({
+            api_key: config.target_stack,
+            management_token: config.management_token,
+          });
+          stackAPIClient
+            .asset()
+            .create(req)
+            .then((response) => {
+              return resolve(response);
+            })
+            .catch((error) => {
+              return reject(error);
+            });
         })
-        .catch((error) => {
-          return reject(error);
-        });
+        .catch(reject);
     } catch (error) {
       debug(error);
       return reject(error);

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

@@ -1,41 +0,0 @@
-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,
-    management_token: config.management_token,
-    api_key: config.target_stack,
-    maxContentLength: 100000000,
-    maxBodyLength: 1000000000,
-    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) => {
-      // no async function should be used here
-      return error.response && (error.response.status === 429 || error.response.status === 408);
-    },
-    retryDelayOptions: {
-      base: 1000,
-    },
-  };
-  if (typeof config.branchName === 'string') {
-    option.headers = {
-      branch: config.branchName,
-    };
-  }
-  const client = contentstacksdk.client(option);
-  return client;
-};