zmp-cli 3.13.0 → 3.14.0-rc.0

package/deploy/utils/request-upload.js

@@ -1,4 +1,4 @@
-const axios = require('axios').default;
+const { axiosClient } = require('../../utils/axios');
 const config = require('../../config');
 
 const requestUpload = async (url, appData, versionStatus, token) => {
@@ -15,7 +15,7 @@ const requestUpload = async (url, appData, versionStatus, token) => {
     Authorization: `Bearer ${token}`,
     'cache-control': 'no-cache',
   };
-  const res = await axios.get(url, {
+  const res = await axiosClient.get(url, {
     params,
     headers,
     withCredentials: true,

package/login/index.js

@@ -3,15 +3,13 @@
 const chalk = require('chalk');
 const ora = require('ora');
 const jwt = require('jsonwebtoken');
-const axios = require('axios');
 const qrcode = require('qrcode-terminal');
 const logSymbols = require('log-symbols');
 const config = require('../config');
 const envUtils = require('../utils/env');
 const log = require('../utils/log');
 const zaloLogin = require('./utils/zalo-login');
-
-const env = envUtils.getEnv('NODE_ENV') || 'production';
+const { axiosClient } = require('../utils/axios');
 
 const waitText = chalk.gray('Login...');
 const spinner = ora(waitText);
@@ -34,7 +32,6 @@ module.exports = async (options = {}, logger, { exitOnError = true } = {}) => {
   }
   logger.statusStart(waitText);
   spinner.start();
-  const cwd = options.cwd || process.cwd();
   const loginMethod = options.loginMethod;
   const appId = options.appId || envUtils.getEnv(config.env.appId);
   const token = options.token;
@@ -125,7 +122,7 @@ module.exports = async (options = {}, logger, { exitOnError = true } = {}) => {
       });
     } else {
       await new Promise((resolve, reject) => {
-        axios({
+        axiosClient({
           method: 'get',
           url: `${apiLogin}?accessToken=${token}&appId=${appId}`,
           headers: {

package/login/utils/zalo-login.js

@@ -1,15 +1,12 @@
-const axios = require('axios');
-const envUtils = require('../../utils/env');
 const config = require('../../config');
-
-const env = envUtils.getEnv('NODE_ENV') || 'production';
+const { axiosClient } = require('../../utils/axios');
 
 module.exports = (function () {
   const apiRequestLogin = `${config.api_domain}${config.path.requestLogin}`;
 
   const apiCheckStatusLogin = `${config.api_domain}${config.path.checkLoginStatus}`;
   const getQRCode = (appId) => {
-    return axios({
+    return axiosClient({
       method: 'get',
       url: `${apiRequestLogin}?appId=${appId}`,
       headers: {
@@ -19,7 +16,7 @@ module.exports = (function () {
     });
   };
   const checkStatus = (zmpsk) => {
-    return axios({
+    return axiosClient({
       method: 'get',
       url: `${apiCheckStatusLogin}?zmpsk=${zmpsk}`,
       headers: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmp-cli",
-  "version": "3.13.0",
+  "version": "3.14.0-rc.0",
   "description": "ZMP command line utility (CLI)",
   "main": "index.js",
   "bin": {
@@ -77,6 +77,7 @@
     "opn": "^6.0.0",
     "ora": "^3.4.0",
     "prettier": "^2.2.1",
+    "proxy-agent": "^6.2.1",
     "qrcode": "^1.4.4",
     "qrcode-terminal": "^0.12.0",
     "react-refresh": "^0.9.0",

package/sync/index-to-app-config.js

@@ -1,8 +1,11 @@
 const DomParser = require('dom-parser');
 const fs = require('fs');
-const axios = require('axios');
+const { axiosClient } = require('../utils/axios');
 
-async function generateListResourcesFromIndex(html, { outputDir, rootElement }) {
+async function generateListResourcesFromIndex(
+  html,
+  { outputDir, rootElement }
+) {
   const listCSS = [];
   const listSyncJS = [];
   const listAsyncJS = [];
@@ -27,7 +30,7 @@ async function generateListResourcesFromIndex(html, { outputDir, rootElement })
           if (src.includes('://')) {
             let filename = src.substring(src.lastIndexOf('/') + 1);
             filename = `cdn.` + filename;
-            const response = await axios({
+            const response = await axiosClient({
               method: 'get',
               url: src,
               responseType: 'stream',
@@ -75,7 +78,7 @@ async function generateListResourcesFromIndex(html, { outputDir, rootElement })
           if (href.includes('://')) {
             filename = href.substring(href.lastIndexOf('/') + 1);
             filename = `cdn.` + filename;
-            const response = await axios({
+            const response = await axiosClient({
               method: 'get',
               url: href,
               responseType: 'stream',

package/utils/axios.js

@@ -0,0 +1,15 @@
+const { ProxyAgent } = require('proxy-agent');
+const axios = require('axios');
+
+const agent = new ProxyAgent();
+
+const axiosClient = axios.create({
+  proxy: false,
+  httpsAgent: agent,
+  httpAgent: agent,
+});
+
+module.exports = {
+  agent,
+  axiosClient,
+};

package/utils/get-app-info.js

@@ -1,11 +1,11 @@
-const axios = require('axios').default;
 const config = require('../config');
 const envUtils = require('../utils/env');
+const { axiosClient } = require('./axios');
 
-module.exports = async function (appId, options) {
+module.exports = async function (appId) {
   const url = `${config.api_domain}${config.path.getAppInfo}?appId=${appId}`;
   const token = envUtils.getEnv(config.env.token);
-  const response = await axios.get(url, {
+  const response = await axiosClient.get(url, {
     headers: {
       'cache-control': 'no-cache',
       Authorization: `Bearer ${token}`,

package/utils/resumable.js

@@ -1,6 +1,12 @@
 const FileAPI = require('file-api');
 const Blob = require('./node-blob');
 const XMLHttpRequest = require('xhr2');
+const { agent } = require('./axios');
+
+XMLHttpRequest.nodejsSet({
+  httpAgent: agent,
+  httpsAgent: agent,
+});
 
 const File = FileAPI.File;
 const FileList = FileAPI.FileList;