cvitool 1.0.773 → 1.0.774

package/build/src/cutil.d.ts

@@ -42,6 +42,17 @@ interface getFileTypeRes {
     extname: string;
     mime: string;
 }
+interface validateRes {
+    message: string;
+    field: string;
+    pass: boolean;
+}
+interface checkURLResourceRes {
+    isEffective: boolean;
+    message?: string;
+    resHeaders?: CustomObject;
+    resBody?: CustomObject | string;
+}
 declare const RegStr: {
     zzs: string;
     zxs: (digit: number) => string;
@@ -123,12 +134,7 @@ declare function getMediaFileType(target: string | Buffer | Readable): Promise<g
  * @param url
  * @returns
  */
-declare function checkURLResource(url: string, timeout?: number): Promise<{
-    isEffective: boolean;
-    message?: string;
-    resHeaders?: CustomObject;
-    resBody?: CustomObject | string;
-}>;
+declare function checkURLResource(url: string, timeout?: number): Promise<checkURLResourceRes>;
 /**
  * 写入json文件
  * @param data 待写入json对象
@@ -161,11 +167,7 @@ declare function validate(value: {
 }, finalFunc?: (value: any) => {
     pass: boolean;
     message?: string;
-}): {
-    message: string;
-    field: string;
-    pass: boolean;
-};
+}): validateRes;
 /**
  * 提取对象中的路径path及值映射
  * @param obj
@@ -185,4 +187,4 @@ declare function getURLExtname(url: string): string;
  * @returns
  */
 declare function getFileType(input: string | Buffer | Readable, reqUrlTimeout?: number): Promise<getFileTypeRes>;
-export { randomStringOptions, getMediaFileTypeRes, CustomObject, getFileTypeRes, randomString, encryptCBC, decryptCBC, md5, execCmdCommand, getValueType, getMediaFileType, checkURLResource, writeJsonFileSync, readJsonFileSync, uuid, validate, RegStr, getObjPathMapValue, getURLExtname, getFileType };
+export { randomStringOptions, getMediaFileTypeRes, CustomObject, getFileTypeRes, validateRes, checkURLResourceRes, randomString, encryptCBC, decryptCBC, md5, execCmdCommand, getValueType, getMediaFileType, checkURLResource, writeJsonFileSync, readJsonFileSync, uuid, validate, RegStr, getObjPathMapValue, getURLExtname, getFileType };

package/build/src/cutil.js

@@ -354,10 +354,9 @@ function getMediaFileType(target) {
  */
 function checkURLResource(url, timeout) {
     return __awaiter(this, void 0, void 0, function* () {
-        let obj = {
+        const obj = {
             isEffective: true
         };
-        obj = { isEffective: true };
         try {
             const res = yield hgo.get(url, { resType: 'stream', timeout });
             res.resBody.destroy();
@@ -637,7 +636,7 @@ function getFileType(input_1) {
     return __awaiter(this, arguments, void 0, function* (input, reqUrlTimeout = 10 * 1000) {
         let stream = input;
         if (getValueType(input) === 'string') {
-            if (input.startsWith('http') || input.startsWith('https')) {
+            if (input.startsWith('http')) {
                 const res = yield hgo.get(input, { resType: 'stream', timeout: reqUrlTimeout });
                 stream = res.resBody;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvitool",
-  "version": "1.0.773",
+  "version": "1.0.774",
   "description": "cvitool",
   "main": "index.js",
   "scripts": {

package/src/cutil.ts

@@ -57,6 +57,19 @@ interface getFileTypeRes {
     mime: string
 }
 
+interface validateRes {
+    message: string,
+    field: string,
+    pass: boolean
+}
+
+interface checkURLResourceRes {
+    isEffective: boolean,
+    message?: string,
+    resHeaders?: CustomObject,
+    resBody?: CustomObject | string
+}
+
 const RegStr = {
     zzs: '^[1-9]\\d*$',
     zxs: (digit: number) => `^(0|[1-9]\\d*)(\\.\\d{1,${digit}})$`,
@@ -378,10 +391,9 @@ async function getMediaFileType(target: string | Buffer | Readable): Promise<get
  * @returns
  */
 async function checkURLResource(url: string, timeout?: number) {
-    let obj: { isEffective: boolean, message?: string, resHeaders?: CustomObject, resBody?: CustomObject | string } = {
+    const obj: checkURLResourceRes = {
         isEffective: true
     };
-    obj = { isEffective: true };
     try {
         const res = await hgo.get(url, { resType: 'stream', timeout });
         (res.resBody as Readable).destroy();
@@ -441,8 +453,8 @@ function uuid() {
  * @param rule
  * @returns
  */
-function validate(value: { [key: string]: any }, rule: { [key: string]: validateParams }, finalFunc?: (value: any) => { pass: boolean, message?: string }): { message: string, field: string, pass: boolean } {
-    const result = {
+function validate(value: { [key: string]: any }, rule: { [key: string]: validateParams }, finalFunc?: (value: any) => { pass: boolean, message?: string }): validateRes {
+    const result: validateRes = {
         message: '',
         field: '',
         pass: true
@@ -668,7 +680,7 @@ function getURLExtname(url: string) {
 async function getFileType(input: string | Buffer | Readable, reqUrlTimeout = 10 * 1000): Promise<getFileTypeRes> {
     let stream: Readable = input as Readable;
     if (getValueType(input) === 'string') {
-        if ((input as string).startsWith('http') || (input as string).startsWith('https')) {
+        if ((input as string).startsWith('http')) {
             const res = await hgo.get(input as string, { resType: 'stream', timeout: reqUrlTimeout });
             stream = res.resBody as Readable;
         } else {
@@ -698,6 +710,8 @@ export {
     getMediaFileTypeRes,
     CustomObject,
     getFileTypeRes,
+    validateRes,
+    checkURLResourceRes,
     randomString,
     encryptCBC,
     decryptCBC,