cloudcc-cli 1.8.7 → 1.8.9

package/utils/checkVersion.js

@@ -1,107 +1,107 @@
-const config = require("../package.json")
-const inquirer = require("inquirer")
-const exec = require('child_process').execSync;
-const chalk = require("chalk")
-const { readCache, writeCache } = require("./cache")
-
-function checkNpmVersion() {
-    let currentVersion = Number(config.version.replace(/\./g, ""));
-    let onlineVersionNum
-    let onlineVersion = '0.0.1'
-
-    // 获取在线版本
-    onlineVersion = exec(`npm view cloudcc-cli version --registry http://registry.npmmirror.com`)
-    onlineVersion = onlineVersion.toString("utf8").trim();
-
-    // 获取发布时间信息
-    const timeInfo = exec(`npm view cloudcc-cli time --json --registry http://registry.npmmirror.com`)
-    const timeData = JSON.parse(timeInfo.toString().trim());
-    const formattedTime = new Date(timeData[onlineVersion]).toLocaleString('zh-CN', {
-        year: 'numeric',
-        month: '2-digit',
-        day: '2-digit'
-    });
-
-    onlineVersionNum = Number(onlineVersion.replace(/\./g, ""));
-
-    console.log('\n');
-    console.log(chalk.bold.cyan('  CloudCC CLI Version\n'));
-    console.log('  ' + chalk.gray('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
-    console.log('  ' + chalk.green('★') + ' Current Version : ' + chalk.bold.green('v' + config.version));
-    console.log('  ' + chalk.blue('★') + ' Latest Version  : ' + chalk.bold.blue('v' + onlineVersion));
-    console.log('  ' + chalk.yellow('★') + ' Published At    : ' + chalk.gray(formattedTime));
-    console.log('  ' + chalk.gray('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n'));
-
-    if (onlineVersionNum - currentVersion > 0) {
-        return onlineVersion;
-    }
-    return null;
-}
-
-
-function askUpdate() {
-    console.log();
-    const prompt = [{
-        type: 'list',
-        message: 'Do you want to perform automatic upgrade?',
-        name: 'update',
-        choices: [
-            "Yes", 'No'
-        ],
-    }];
-    return inquirer.prompt(prompt)
-}
-
-
-function update(onlineVersion) {
-    console.log()
-    console.log(chalk.green("Upgrading, estimated to be completed in 3 minutes, please wait..."));
-    console.log()
-    let os = process.platform
-    console.log(chalk.yellow(`If it fails to update automatically, please use the command to update：${'darwin' == os ? 'sudo' : ''} npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`));
-    exec(`${'darwin' == os ? 'sudo' : ''} npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`)
-    console.log()
-    console.log(chalk.green("Upgrade completed! Please re-run"));
-}
-
-
-async function checkUpdate(path = process.cwd()) {
-    // 检查缓存
-    const cache = readCache(path);
-    const cacheKey = 'version_check';
-    const now = Date.now();
-    const oneHour = 60 * 60 * 1000;
-
-    // 如果缓存有效，跳过版本检查
-    if (cache[cacheKey] &&
-        cache[cacheKey].timestamp &&
-        (now - cache[cacheKey].timestamp) < oneHour) {
-        return false;
-    }
-
-    let onlineVersion;
-    try {
-        onlineVersion = checkNpmVersion();
-        // 更新缓存
-        cache[cacheKey] = {
-            timestamp: now
-        };
-        writeCache(path, cache);
-    } catch (error) {
-        console.log("error", error)
-        onlineVersion = false;
-    }
-
-    if (onlineVersion) {
-        let res = await askUpdate()
-        if ("Yes" == res.update) {
-            update(onlineVersion)
-            return true;
-        } else {
-            return false
-        }
-    }
-    return false
-}
-
-module.exports = { checkUpdate }
+const config = require("../package.json")
+const inquirer = require("inquirer")
+const exec = require('child_process').execSync;
+const chalk = require("chalk")
+const { readCache, writeCache } = require("./cache")
+
+function checkNpmVersion() {
+    let currentVersion = Number(config.version.replace(/\./g, ""));
+    let onlineVersionNum
+    let onlineVersion = '0.0.1'
+
+    // 获取在线版本
+    onlineVersion = exec(`npm view cloudcc-cli version --registry http://registry.npmmirror.com`)
+    onlineVersion = onlineVersion.toString("utf8").trim();
+
+    // 获取发布时间信息
+    const timeInfo = exec(`npm view cloudcc-cli time --json --registry http://registry.npmmirror.com`)
+    const timeData = JSON.parse(timeInfo.toString().trim());
+    const formattedTime = new Date(timeData[onlineVersion]).toLocaleString('zh-CN', {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit'
+    });
+
+    onlineVersionNum = Number(onlineVersion.replace(/\./g, ""));
+
+    console.log('\n');
+    console.log(chalk.bold.cyan('  CloudCC CLI Version\n'));
+    console.log('  ' + chalk.gray('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
+    console.log('  ' + chalk.green('★') + ' Current Version : ' + chalk.bold.green('v' + config.version));
+    console.log('  ' + chalk.blue('★') + ' Latest Version  : ' + chalk.bold.blue('v' + onlineVersion));
+    console.log('  ' + chalk.yellow('★') + ' Published At    : ' + chalk.gray(formattedTime));
+    console.log('  ' + chalk.gray('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n'));
+
+    if (onlineVersionNum - currentVersion > 0) {
+        return onlineVersion;
+    }
+    return null;
+}
+
+
+function askUpdate() {
+    console.log();
+    const prompt = [{
+        type: 'list',
+        message: 'Do you want to perform automatic upgrade?',
+        name: 'update',
+        choices: [
+            "Yes", 'No'
+        ],
+    }];
+    return inquirer.prompt(prompt)
+}
+
+
+function update(onlineVersion) {
+    console.log()
+    console.log(chalk.green("Upgrading, estimated to be completed in 3 minutes, please wait..."));
+    console.log()
+    let os = process.platform
+    console.log(chalk.yellow(`If it fails to update automatically, please use the command to update：${'darwin' == os ? 'sudo' : ''} npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`));
+    exec(`${'darwin' == os ? 'sudo' : ''} npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`)
+    console.log()
+    console.log(chalk.green("Upgrade completed! Please re-run"));
+}
+
+
+async function checkUpdate(path = process.cwd()) {
+    // 检查缓存
+    const cache = readCache(path);
+    const cacheKey = 'version_check';
+    const now = Date.now();
+    const oneHour = 60 * 60 * 1000;
+
+    // 如果缓存有效，跳过版本检查
+    if (cache[cacheKey] &&
+        cache[cacheKey].timestamp &&
+        (now - cache[cacheKey].timestamp) < oneHour) {
+        return false;
+    }
+
+    let onlineVersion;
+    try {
+        onlineVersion = checkNpmVersion();
+        // 更新缓存
+        cache[cacheKey] = {
+            timestamp: now
+        };
+        writeCache(path, cache);
+    } catch (error) {
+        console.log("error", error)
+        onlineVersion = false;
+    }
+
+    if (onlineVersion) {
+        let res = await askUpdate()
+        if ("Yes" == res.update) {
+            update(onlineVersion)
+            return true;
+        } else {
+            return false
+        }
+    }
+    return false
+}
+
+module.exports = { checkUpdate }

package/utils/config.js

@@ -1,18 +1,18 @@
-const fs = require("fs");
-const path = require("path");
-
-function getPackageJson_old(projectPath = process.cwd()) {
-    const packageJson = JSON.parse(fs.readFileSync(path.join(projectPath, "package.json")), 'utf8');
-    return packageJson.devConsoleConfig;
-}
-
-function getPackageJson(projectPath = process.cwd()) {
-    let config = getPackageJson_old(projectPath);
-    if (!config) {
-        config = require(path.join(projectPath, "cloudcc-cli.config.js"))
-        config = config[config.use]
-    }
-    return config
-}
-
-module.exports = { getPackageJson }
+const fs = require("fs");
+const path = require("path");
+
+function getPackageJson_old(projectPath = process.cwd()) {
+    const packageJson = JSON.parse(fs.readFileSync(path.join(projectPath, "package.json")), 'utf8');
+    return packageJson.devConsoleConfig;
+}
+
+function getPackageJson(projectPath = process.cwd()) {
+    let config = getPackageJson_old(projectPath);
+    if (!config) {
+        config = require(path.join(projectPath, "cloudcc-cli.config.js"))
+        config = config[config.use]
+    }
+    return config
+}
+
+module.exports = { getPackageJson }

package/utils/http.js

@@ -1,123 +1,123 @@
-const https = require("https")
-const http = require("http")
-const axios = require("axios")
-const { getPackageJson } = require("./config")
-
-const httpsAgent = new https.Agent({
-  rejectUnauthorized: false,
-})
-const httpAgent = new http.Agent({
-  rejectUnauthorized: false,
-})
-axios.defaults.httpsAgent = httpsAgent
-axios.defaults.httpAgent = httpAgent
-
-const service = axios.create({
-  timeout: 60000,
-  headers: {
-    'Content-Type': 'application/json; charset=utf-8',
-  },
-})
-
-
-service.interceptors.request.use(
-  config => {
-    if (global.accessToken) {
-      config.headers.accessToken = global.accessToken
-    }
-    return config
-  },
-  error => {
-
-    Promise.reject(error)
-  }
-)
-
-
-service.interceptors.response.use(
-  response => {
-    const code = response.data.code || 200
-    if (code !== 200) {
-      return Promise.reject(null == response.data.msg ? "Unknown exception" : response.data.msg)
-    } else {
-      return response.data;
-    }
-  },
-  error => {
-    return Promise.reject(error)
-  }
-)
-const formateData = (data, header) => {
-  if (header) {
-    Object.assign(header, { source: getPackageJson().source || "cloudcc_cli" })
-  }
-  return {
-    head: {
-      ...header
-    },
-    body: {
-      ...data
-    }
-  }
-}
-module.exports = {
-  get: (url, data = {}, responseType = '') => {
-    return service({
-      url: url,
-      method: 'get',
-      params: formateData(data),
-      responseType: responseType
-    })
-  },
-  getParams: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'get',
-      params: data,
-    })
-  },
-  post: (url, data = {}, header = { appVersion: "1.0.0" }, responseType = '') => {
-    return service({
-      url: url,
-      method: 'post',
-      data: formateData(data, header),
-      responseType: responseType
-    })
-  },
-  postParams: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'post',
-      params: data,
-    })
-  },
-  postNormal: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'post',
-      data: data
-    })
-  },
-  patch: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'patch',
-      data: formateData(data)
-    })
-  },
-  delete: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'delete',
-      data: formateData(data)
-    })
-  },
-  put: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'put',
-      data: formateData(data)
-    })
-  }
-
-}
+const https = require("https")
+const http = require("http")
+const axios = require("axios")
+const { getPackageJson } = require("./config")
+
+const httpsAgent = new https.Agent({
+  rejectUnauthorized: false,
+})
+const httpAgent = new http.Agent({
+  rejectUnauthorized: false,
+})
+axios.defaults.httpsAgent = httpsAgent
+axios.defaults.httpAgent = httpAgent
+
+const service = axios.create({
+  timeout: 60000,
+  headers: {
+    'Content-Type': 'application/json; charset=utf-8',
+  },
+})
+
+
+service.interceptors.request.use(
+  config => {
+    if (global.accessToken) {
+      config.headers.accessToken = global.accessToken
+    }
+    return config
+  },
+  error => {
+
+    Promise.reject(error)
+  }
+)
+
+
+service.interceptors.response.use(
+  response => {
+    const code = response.data.code || 200
+    if (code !== 200) {
+      return Promise.reject(null == response.data.msg ? "Unknown exception" : response.data.msg)
+    } else {
+      return response.data;
+    }
+  },
+  error => {
+    return Promise.reject(error)
+  }
+)
+const formateData = (data, header) => {
+  if (header) {
+    Object.assign(header, { source: getPackageJson().source || "cloudcc_cli" })
+  }
+  return {
+    head: {
+      ...header
+    },
+    body: {
+      ...data
+    }
+  }
+}
+module.exports = {
+  get: (url, data = {}, responseType = '') => {
+    return service({
+      url: url,
+      method: 'get',
+      params: formateData(data),
+      responseType: responseType
+    })
+  },
+  getParams: (url, data = {}) => {
+    return service({
+      url: url,
+      method: 'get',
+      params: data,
+    })
+  },
+  post: (url, data = {}, header = { appVersion: "1.0.0" }, responseType = '') => {
+    return service({
+      url: url,
+      method: 'post',
+      data: formateData(data, header),
+      responseType: responseType
+    })
+  },
+  postParams: (url, data = {}) => {
+    return service({
+      url: url,
+      method: 'post',
+      params: data,
+    })
+  },
+  postNormal: (url, data = {}) => {
+    return service({
+      url: url,
+      method: 'post',
+      data: data
+    })
+  },
+  patch: (url, data = {}) => {
+    return service({
+      url: url,
+      method: 'patch',
+      data: formateData(data)
+    })
+  },
+  delete: (url, data = {}) => {
+    return service({
+      url: url,
+      method: 'delete',
+      data: formateData(data)
+    })
+  },
+  put: (url, data = {}) => {
+    return service({
+      url: url,
+      method: 'put',
+      data: formateData(data)
+    })
+  }
+
+}