@zwa73/utils 1.0.24 → 1.0.26

package/dist/UtilCom.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.shttpPost = exports.shttpsPost = void 0;
+const UtilInterfaces_1 = require("./UtilInterfaces");
 const https = require("https");
 const http = require("http");
 /**发送一个POST请求并接受数据
@@ -16,7 +17,7 @@ function shttpsPost(json, options, timeLimit = -1) {
     let hasTimeLimit = (timeLimit >= 10);
     if (hasTimeLimit)
         timeLimit *= 1000;
-    let jsonStr = JSON.stringify(json);
+    let jsonStr = (0, UtilInterfaces_1.stringifyJToken)(json);
     return new Promise(function (resolve, rejecte) {
         let req = https.request(options, function (res) {
             //请求超时
@@ -41,7 +42,7 @@ function shttpsPost(json, options, timeLimit = -1) {
                 if (resdata != "") {
                     try {
                         let obj = JSON.parse(resdata);
-                        console.log("shttpsPost 接受信息:\r\n" + JSON.stringify(obj));
+                        console.log("shttpsPost 接受信息:\r\n" + (0, UtilInterfaces_1.stringifyJToken)(obj));
                         //console.log(obj);
                         resolve(obj);
                         return;
@@ -87,7 +88,7 @@ function shttpPost(json, options, timeLimit = -1) {
     let hasTimeLimit = (timeLimit >= 10);
     if (hasTimeLimit)
         timeLimit *= 1000;
-    let jsonStr = JSON.stringify(json);
+    let jsonStr = (0, UtilInterfaces_1.stringifyJToken)(json);
     return new Promise(function (resolve, rejecte) {
         let req = http.request(options, function (res) {
             try {
@@ -112,7 +113,7 @@ function shttpPost(json, options, timeLimit = -1) {
                         throw "shttpPost 接收反馈错误: resdata 为空";
                     try {
                         let obj = JSON.parse(resdata);
-                        console.log("shttpPost 接受信息:\r\n" + JSON.stringify(obj));
+                        console.log("shttpPost 接受信息:\r\n" + (0, UtilInterfaces_1.stringifyJToken)(obj));
                         //console.log(obj);
                         resolve(obj);
                         return;

package/dist/UtilFunctions.d.ts

@@ -89,18 +89,25 @@ export declare function writeJSONFile(filePath: string, token: JToken): Promise<
  * @returns {string} uuid
  */
 export declare function genUUID(): string;
+/**计算Hash
+ * string ()
+ * @param {string} str - 待计算的字符串
+ * @returns {string} hash
+ */
+export declare function calcHash(str: string): string;
 /**深克隆 序列化并反序列化
- * @template {T}
+ * @template {T} T - JToken类型的泛型
  * @param {T} obj - 克隆目标
  * @returns {T}   克隆结果
  */
-export declare function deepClone<T>(obj: T): T;
+export declare function deepClone<T extends JToken>(obj: T): T;
 /**是否为安全的数字
  * @param {number} num - 所要检测的数字
  * @returns {boolean} 是否安全
  */
 export declare function isSafeNumber(num: number): boolean;
 /**等待 timeMs 毫秒
+ * @async
  * @param {number} timeMs - 等待的毫秒数
  * @returns {Promise<boolean>}
  */

package/dist/UtilFunctions.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileSearch = exports.sleep = exports.isSafeNumber = exports.deepClone = exports.genUUID = exports.writeJSONFile = exports.loadJSONFile = exports.loadJSONFileSync = exports.ensurePathExistsSync = exports.ensurePathExists = exports.createPathSync = exports.createPath = exports.pathExistsSync = exports.pathExists = exports.initField = exports.getTime = void 0;
+exports.fileSearch = exports.sleep = exports.isSafeNumber = exports.deepClone = exports.calcHash = exports.genUUID = exports.writeJSONFile = exports.loadJSONFile = exports.loadJSONFileSync = exports.ensurePathExistsSync = exports.ensurePathExists = exports.createPathSync = exports.createPath = exports.pathExistsSync = exports.pathExists = exports.initField = exports.getTime = void 0;
 const fs = require("fs");
 const crypto = require("crypto");
 const path = require("path");
+const UtilInterfaces_1 = require("./UtilInterfaces");
 /**获取当前时间戳
  * number ()
  * @returns {number} 时间戳
@@ -166,7 +167,7 @@ exports.loadJSONFile = loadJSONFile;
  * @returns {Promise<void>}
  */
 async function writeJSONFile(filePath, token) {
-    let str = JSON.stringify(token, null, "\t");
+    let str = (0, UtilInterfaces_1.stringifyJToken)(token);
     if (path.extname(filePath) !== '.json')
         filePath += '.json';
     // 判断文件路径是否存在 不存在则创建
@@ -191,8 +192,17 @@ function genUUID() {
     return crypto.randomBytes(16).toString("hex");
 }
 exports.genUUID = genUUID;
+/**计算Hash
+ * string ()
+ * @param {string} str - 待计算的字符串
+ * @returns {string} hash
+ */
+function calcHash(str) {
+    return crypto.createHash('md5').update(str).digest('hex');
+}
+exports.calcHash = calcHash;
 /**深克隆 序列化并反序列化
- * @template {T}
+ * @template {T} T - JToken类型的泛型
  * @param {T} obj - 克隆目标
  * @returns {T}   克隆结果
  */
@@ -213,10 +223,11 @@ function isSafeNumber(num) {
 }
 exports.isSafeNumber = isSafeNumber;
 /**等待 timeMs 毫秒
+ * @async
  * @param {number} timeMs - 等待的毫秒数
  * @returns {Promise<boolean>}
  */
-function sleep(timeMs) {
+async function sleep(timeMs) {
     return new Promise(function (resolve, rejecte) {
         let timer = setTimeout(function () {
             resolve(true);

package/dist/UtilInterfaces.d.ts

@@ -1,10 +1,23 @@
-export type JToken = JObject | JArray | JValue;
+export type JToken = JObject | JArray | JValue | IJData;
 export type JValue = number | string | boolean | null;
 export type JArray = Array<JToken>;
 /**可以序列化为JSON文件的Object*/
 export type JObject = {
     [key: string]: JToken;
 };
+/**可以保存为JToken的类
+ */
+export interface IJData {
+    /**保存为JToken
+     */
+    toJSON(): JToken;
+}
+/**将JToken转换为字符串
+ * @param {JToken} token - 待转换的Token
+ * @param {string|number|null} space - 插入的空格 数字为空格数量 默认为制表符\t
+ * @returns 转换完成的字符串
+ */
+export declare function stringifyJToken(token: JToken, space?: string | number | null | undefined): string;
 /**未知格式的Object*/
 export type AnyObject = {
     [key: string]: any;
@@ -17,21 +30,3 @@ export type MessageEntity = {
     role: string;
     content: string;
 };
-/**可以保存为JObject的类
- */
-export interface IJData {
-    /**保存为JObject
-     */
-    saveToJObject(): JObject;
-}
-export type JDToken = JToken | IJData | JDArray | JDObject;
-export type JDArray = Array<JDToken>;
-/**可以转换为JObject的Object*/
-export type JDObject = {
-    [key: string]: JDToken;
-};
-/**将JDToken转换为JToken
- * @param {JDToken} token - 待转换的JDToken
- * @returns {JToken} - 转换完成的JToken
- */
-export declare function parseJOData(token: JDToken): JToken;

package/dist/UtilInterfaces.js

@@ -1,29 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseJOData = void 0;
-/**将JDToken转换为JToken
- * @param {JDToken} token - 待转换的JDToken
- * @returns {JToken} - 转换完成的JToken
+exports.stringifyJToken = void 0;
+/**将JToken转换为字符串
+ * @param {JToken} token - 待转换的Token
+ * @param {string|number|null} space - 插入的空格 数字为空格数量 默认为制表符\t
+ * @returns 转换完成的字符串
  */
-function parseJOData(token) {
-    if (token && typeof token.saveToJObject === 'function')
-        return token.saveToJObject();
-    if (token && (typeof token === 'number' ||
-        typeof token === 'boolean' ||
-        typeof token === 'string' ||
-        token === null))
-        return token;
-    if (token && Array.isArray(token)) {
-        let outArr = [];
-        for (let item of token)
-            outArr.push(parseJOData(item));
-        return outArr;
-    }
-    let nobj = {};
-    for (let key in token) {
-        let value = token[key];
-        nobj[key] = parseJOData(value);
-    }
-    return nobj;
+function stringifyJToken(token, space = "\t") {
+    if (space == null)
+        space = undefined;
+    return JSON.stringify(token, null, space);
 }
-exports.parseJOData = parseJOData;
+exports.stringifyJToken = stringifyJToken;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zwa73/utils",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "my utils",
   "main": "index.js",
   "scripts": {

package/src/UtilCom.ts

@@ -1,4 +1,4 @@
-import { JObject } from "./UtilInterfaces";
+import { JObject, stringifyJToken } from "./UtilInterfaces";
 import * as https from 'https';
 import * as http from 'http';
 
@@ -17,7 +17,7 @@ export function shttpsPost(json:JObject,options:Object,timeLimit:number=-1):Prom
     if(hasTimeLimit)
         timeLimit*=1000
 
-    let jsonStr = JSON.stringify(json);
+    let jsonStr = stringifyJToken(json);
 
     return new Promise(function(resolve, rejecte){
         let req = https.request(options, function(res){
@@ -46,7 +46,7 @@ export function shttpsPost(json:JObject,options:Object,timeLimit:number=-1):Prom
                 if(resdata!=""){
                     try{
                         let obj = JSON.parse(resdata);
-                        console.log("shttpsPost 接受信息:\r\n"+JSON.stringify(obj));
+                        console.log("shttpsPost 接受信息:\r\n"+stringifyJToken(obj));
                         //console.log(obj);
                         resolve(obj);
                         return;
@@ -97,7 +97,7 @@ export function shttpPost(json:JObject,options:Object,timeLimit:number=-1):Promi
     if(hasTimeLimit)
         timeLimit*=1000
 
-    let jsonStr = JSON.stringify(json);
+    let jsonStr = stringifyJToken(json);
 
     return new Promise(function(resolve, rejecte){
         let req = http.request(options, function(res){
@@ -126,7 +126,7 @@ export function shttpPost(json:JObject,options:Object,timeLimit:number=-1):Promi
                         throw "shttpPost 接收反馈错误: resdata 为空";
                     try{
                         let obj = JSON.parse(resdata);
-                        console.log("shttpPost 接受信息:\r\n"+JSON.stringify(obj));
+                        console.log("shttpPost 接受信息:\r\n"+stringifyJToken(obj));
                         //console.log(obj);
                         resolve(obj);
                         return;

package/src/UtilFunctions.ts

@@ -1,7 +1,7 @@
 import * as fs from "fs";
 import * as crypto from "crypto";
 import * as path from "path";
-import { JArray, JObject, JToken } from "./UtilInterfaces";
+import { JArray, JObject, JToken, stringifyJToken } from "./UtilInterfaces";
 
 /**获取当前时间戳
  * number ()
@@ -203,7 +203,7 @@ export async function writeJSONFile(
     filePath: string,
     token: JToken
 ): Promise<void> {
-    let str = JSON.stringify(token, null, "\t");
+    let str = stringifyJToken(token);
     if (path.extname(filePath) !== '.json') filePath += '.json';
 
     // 判断文件路径是否存在 不存在则创建
@@ -226,13 +226,21 @@ export async function writeJSONFile(
 export function genUUID() {
     return crypto.randomBytes(16).toString("hex");
 }
+/**计算Hash
+ * string ()
+ * @param {string} str - 待计算的字符串
+ * @returns {string} hash
+ */
+export function calcHash(str:string) {
+    return crypto.createHash('md5').update(str).digest('hex');
+}
 
 /**深克隆 序列化并反序列化
- * @template {T}
+ * @template {T} T - JToken类型的泛型
  * @param {T} obj - 克隆目标
  * @returns {T}   克隆结果
  */
-export function deepClone<T>(obj: T): T {
+export function deepClone<T extends JToken>(obj: T): T {
     return JSON.parse(JSON.stringify(obj));
 }
 
@@ -247,10 +255,11 @@ export function isSafeNumber(num: number): boolean {
 }
 
 /**等待 timeMs 毫秒
+ * @async
  * @param {number} timeMs - 等待的毫秒数
  * @returns {Promise<boolean>}
  */
-export function sleep(timeMs: number): Promise<boolean> {
+export async function sleep(timeMs: number): Promise<boolean> {
     return new Promise(function (resolve, rejecte) {
         let timer = setTimeout(function () {
             resolve(true);

package/src/UtilInterfaces.ts

@@ -1,11 +1,29 @@
 
-export type JToken = JObject|JArray|JValue;
+export type JToken = JObject|JArray|JValue|IJData;
 export type JValue = number|string|boolean|null;
 export type JArray = Array<JToken>;
 /**可以序列化为JSON文件的Object*/
 export type JObject = {
     [key:string]:JToken;
 }
+/**可以保存为JToken的类
+ */
+export interface IJData{
+	/**保存为JToken
+	 */
+	toJSON():JToken;
+}
+/**将JToken转换为字符串
+ * @param {JToken} token - 待转换的Token
+ * @param {string|number|null} space - 插入的空格 数字为空格数量 默认为制表符\t
+ * @returns 转换完成的字符串
+ */
+export function stringifyJToken(token:JToken,space:string|number|null|undefined="\t"){
+	if(space==null)
+		space=undefined;
+	return JSON.stringify(token,null,space);
+}
+
 
 /**未知格式的Object*/
 export type AnyObject={
@@ -20,46 +38,3 @@ export type MessageEntity={
 	role: string;
 	content:string;
 }
-
-/**可以保存为JObject的类
- */
-export interface IJData{
-	/**保存为JObject
-	 */
-	saveToJObject():JObject;
-}
-export type JDToken = JToken|IJData|JDArray|JDObject;
-export type JDArray = Array<JDToken>;
-/**可以转换为JObject的Object*/
-export type JDObject = {
-    [key:string]:JDToken;
-}
-
-/**将JDToken转换为JToken
- * @param {JDToken} token - 待转换的JDToken
- * @returns {JToken} - 转换完成的JToken
- */
-export function parseJOData(token:JDToken):JToken{
-	if(token && typeof (token as any as IJData).saveToJObject === 'function')
-		return (token as any as IJData).saveToJObject();
-
-	if(token && (typeof token === 'number' ||
-		typeof token === 'boolean' ||
-		typeof token === 'string' ||
-		token === null)
-	)return token;
-
-	if(token && Array.isArray(token)){
-		let outArr = [];
-		for(let item of token)
-			outArr.push(parseJOData(item));
-		return outArr;
-	}
-
-	let nobj = {} as JObject;
-	for(let key in (token as any as JDObject)){
-		let value = (token as any as JDObject)[key];
-		nobj[key] = parseJOData(value);
-	}
-	return nobj;
-}