apipost-cli 1.0.18 → 1.0.19

package/dist/index.js

@@ -777,7 +777,7 @@ const RENDER_TEST_REPORT_HTML_STR = (data = {}) => {
 const downloadTestReport = async (data, options, request) => {
   const homedir = os.homedir();
   const now = dayjs();
-  const formattedTime = now.format('YYYY-MM-DD HH:mm:ss');
+  const formattedTime = now.format('YYYY-MM-DD_HH-mm-ss');
 
   //检查options.outDir 是否存在，是否是目录
   if (!fs.existsSync(options.outDir)) {
@@ -801,6 +801,7 @@ const downloadTestReport = async (data, options, request) => {
       let retries = 0;
 
       for (let i = 0; i < 2; i++) {
+        console.log(finalFilePath);
         try {
           fs.writeFileSync(finalFilePath, reportContent);
           break;
@@ -127305,6 +127306,121 @@ var setObjValByPath = function (obj, val, path) {
     }, obj);
 };
 
+/**
+ * 雪花算法生成唯一ID
+ */
+/**
+ * 生成 Snowflake ID
+ * @param seed - 用于生成 Snowflake ID 的种子字符串,如果为空，自动生成。建议使用项目id
+ * @param base - hash范围，2或16，2进制或16进制
+ * @returns 以2进制或16进制表示的64位ID
+ */
+var snowflakeId = function (seed, base) {
+    if (seed === void 0) { seed = ""; }
+    if (base === void 0) { base = 16; }
+    //base 支持2,16 需要验证
+    base = (base === 2 || base === 16) ? base : 16;
+    seed = seed || genSeed();
+    if (typeof seed !== 'string') {
+        seed = seed + ""; //强制转字符串
+    }
+    var sequence = next_id(); //一直自增id
+    var timestamp = new Date().getTime() - 1671537188000; //和后端约定时间戳起始时间,2022-12-20
+    if (sequence > 4095) {
+        sequence = sequence % 4095; //12位序列号
+    }
+    // 64位ID的划分
+    // 0 - 41位时间戳 - 12位序列号 - 10位机器标识 - 12位序号
+    var binstring = '0' + leftpad(dec2bin(timestamp), 41) + "1" + simpleHash(seed) + leftpad(dec2bin(sequence), 12);
+    if (base === 2) {
+        return binstring;
+    }
+    else {
+        var chunks = splitN(binstring, 4);
+        var binHexMap_1 = { "0000": "0", "0001": "1", "0010": "2", "0011": "3", "0100": "4", "0101": "5", "0110": "6", "0111": "7", "1000": "8", "1001": "9", "1010": "a", "1011": "b", "1100": "c", "1101": "d", "1110": "e", "1111": "f" };
+        //用map转换chunks
+        var hexChunks = chunks.map(function (item) {
+            return binHexMap_1[item];
+        });
+        //返回16进制
+        return hexChunks.join("").replace(/^0+/, '');
+    }
+    //10进制转2进制
+    function dec2bin(dec) {
+        return (dec >>> 0).toString(2);
+    }
+    //左边补0
+    function leftpad(str, len) {
+        str = str + '';
+        len = len - str.length;
+        if (len <= 0) {
+            return str;
+        }
+        return Array(len + 1).join('0') + str;
+    }
+    //右边补0
+    function rightpad(str, len) {
+        str = str + '';
+        len = len - str.length;
+        if (len <= 0) {
+            return str;
+        }
+        return str + Array(len + 1).join('0');
+    }
+    //9位hash
+    function simpleHash(str) {
+        var hash = 0;
+        for (var i = 0; i < str.length; i++) {
+            hash = (hash << 5) - hash + str.charCodeAt(i);
+        }
+        var strhash = rightpad(dec2bin(hash), 9);
+        if (strhash.length > 9) {
+            strhash = strhash.substring(0, 9);
+        }
+        return strhash;
+    }
+    //gen seed
+    function genSeed() {
+        var seed = "";
+        try {
+            //默认使用进程id
+            //@ts-ignore
+            if (typeof process === 'object' && process + '' === '[object process]') {
+                //@ts-ignore
+                seed = process.pid + "";
+            }
+            else if (typeof window === 'object' && window.navigator && window.navigator.userAgent) {
+                seed = window.navigator.userAgent + window.navigator.language + window.screen.colorDepth + window.screen.width + window.screen.height;
+            }
+        }
+        catch (e) { }
+        //如果为空，生成32位随机字符串
+        if (!seed) {
+            var str = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+            for (var i = 0; i < 32; i++) {
+                seed += str.charAt(Math.floor(Math.random() * str.length));
+            }
+        }
+        return seed;
+    }
+    //切分字符串
+    function splitN(inputString, chunkSize) {
+        var chunks = [];
+        for (var i = 0; i < inputString.length; i += chunkSize) {
+            chunks.push(inputString.substring(i, i + chunkSize));
+        }
+        return chunks;
+    }
+};
+var generateIncrementalFunction = function () {
+    var counter = 0;
+    return function () {
+        return counter++;
+    };
+};
+//生成唯一id
+var next_id = generateIncrementalFunction();
+
 var index = {
     isJson: isJson,
     isJsonp: isJsonp,
@@ -127326,6 +127442,7 @@ var index = {
     completionHttpProtocol: completionHttpProtocol,
     NewURL: NewURL,
     setObjValByPath: setObjValByPath,
+    snowflakeId: snowflakeId,
 };
 
 exports.NewURL = NewURL;
@@ -127348,6 +127465,7 @@ exports.isXml = isXml;
 exports.jsonp2Obj = jsonp2Obj;
 exports.ms2second = ms2second;
 exports.setObjValByPath = setObjValByPath;
+exports.snowflakeId = snowflakeId;
 exports.successResult = successResult;
 
 
@@ -549500,7 +549618,6 @@ const path = __nccwpck_require__(71017);
 const program = new Command();
 const homedir = os.homedir();
 const request = __nccwpck_require__(48699);
-const JSON5 = __nccwpck_require__(86904);
 let now = dayjs();
 let formattedTime = now.format('YYYY-MM-DD HH:mm:ss');
 
@@ -549526,7 +549643,7 @@ let last_msg = "";
 const currentWorkingDirectory = process.cwd();
 const cliOption = {
   reporters: 'cli',
-  outDir: path.join(currentWorkingDirectory, "apipost-reports"),
+  outDir: __nccwpck_require__.ab + "apipost-reports",
   outFile: '',
   iterationData: '',
   iterationCount: 1,
@@ -549720,11 +549837,9 @@ const parseCommandString = async (url, options) => {
         const data = fs.readFileSync(url, 'utf8');
         runData = JSON.parse(data);
       } catch (err) {
-        //尝试修复一次
-
-          console.log(`读取本地文件失败, 原因 [${err.message}]`);
-          fs.appendFileSync(path.join(homedir, 'apipost-cli-error.log'), `${formattedTime}\t读取本地文件失败, 原因 [${err.message}]\n`);
-          return;
+        console.log(`读取本地文件失败, 原因 [${err.message}]`);
+        fs.appendFileSync(path.join(homedir, 'apipost-cli-error.log'), `${formattedTime}\t读取本地文件失败, 原因 [${err.message}]\n`);
+        return;
       }
     }else{
       //增加https 证书忽略
@@ -549734,7 +549849,7 @@ const parseCommandString = async (url, options) => {
     }
 
     if (_.has(runData, 'code')) {
-      if (runData.code == 10000 && _.isObject(_.get(runData, 'data'))) {
+      if (runData.code === 10000 && _.isObject(_.get(runData, 'data'))) {
         runData = _.get(runData, 'data');
       } else {
         console.log(`执行失败,  原因 [${runData.msg}]`);
@@ -549786,15 +549901,6 @@ const bindEvent = (program) => {
   program.parse();
 }
 
-function fixJsonString(jsonString) {
-  // 正则: 匹配冒号后不是空白符或双引号的任何字符序列
-  const regex = /":([\w|@|\.]+),/g;
-  // 将匹配到的值用双引号括起来
-  const fixedString = jsonString.replace(regex, '":"$1",');
-  
-  return fixedString;
-}
-
 const init = () => {
   bindEvent(program);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apipost-cli",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "Apipost 命令行运行工具",
   "main": "./dist/index.js",
   "files": [
@@ -19,7 +19,6 @@
   "author": "Apipost Team",
   "license": "UNLICENSED",
   "dependencies": {
-    "json5": "^2.2.3"
   },
   "devDependencies": {
     "@vercel/ncc": "^0.38.1",