cvitool 1.0.751 → 1.0.753

package/build/src/cutil.d.ts

@@ -11,8 +11,8 @@ interface CustomObject {
     [key: string]: any;
 }
 interface getMediaFileTypeRes {
-    type: string;
-    extname: string;
+    type: 'image' | 'video' | 'audio' | 'unknow';
+    extname: 'jpg' | 'png' | 'webp' | 'bmp' | 'heic' | 'gif' | 'mp3' | 'wav' | 'pcm' | 'flac' | 'm4a' | 'aac' | 'mp4' | 'mov' | 'flv' | 'mkv' | 'avi' | 'webm' | 'ogg' | 'm4v' | 'wmv' | 'unknow';
 }
 /**
  * 获取一个随机字符串
@@ -76,7 +76,12 @@ declare function getMediaFileType(target: string | Buffer | Readable): Promise<g
  * @param url
  * @returns
  */
-declare function checkURLResource(url: string, timeout?: number): Promise<boolean>;
+declare function checkURLResource(url: string, timeout?: number): Promise<{
+    isEffective: boolean;
+    message?: string;
+    resHeaders?: CustomObject;
+    resBody?: CustomObject | string;
+}>;
 /**
  * 写入json文件
  * @param data 待写入json对象

package/build/src/cutil.js

@@ -261,14 +261,17 @@ function getMediaFileType(target) {
         if (checkString('WAV', 8, 10, buffer)) {
             return getResult('audio|wav');
         }
-        if (checkString('M4A', 8, 10, buffer)) {
-            return getResult('audio|m4a');
-        }
-        if (checkString('heic', 8, 11, buffer) || checkString('mif1', 8, 11, buffer)) {
-            return getResult('image|heic');
-        }
         if (checkString('ftyp', 4, 7, buffer)) {
-            if (checkString('ftypqt', 4, 9, buffer)) {
+            if (checkString('M4A', 8, 10, buffer)) {
+                return getResult('audio|m4a');
+            }
+            if (checkString('M4V', 8, 10, buffer)) {
+                return getResult('video|m4v');
+            }
+            if (checkString('heic', 8, 11, buffer) || checkString('mif1', 8, 11, buffer)) {
+                return getResult('image|heic');
+            }
+            if (checkString('qt', 8, 9, buffer)) {
                 return getResult('video|mov');
             }
             return getResult('video|mp4');
@@ -319,17 +322,19 @@ function getMediaFileType(target) {
  */
 function checkURLResource(url, timeout) {
     return __awaiter(this, void 0, void 0, function* () {
-        let isEffective = true;
+        const obj = {
+            isEffective: true
+        };
         try {
             yield hgo.get(url, { headers: { Range: 'bytes=0-0' }, resType: 'buffer', timeout });
         }
         catch (e) {
-            // if (e.name === 'timeoutError') {
-            //     throw e;
-            // }
-            isEffective = false;
+            obj.isEffective = false;
+            obj.message = e.message;
+            obj.resHeaders = e.resHeaders;
+            obj.resBody = e.resBody;
         }
-        return isEffective;
+        return obj;
     });
 }
 /**

package/package.json

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

package/src/cutil.ts

@@ -26,8 +26,8 @@ interface CustomObject {
 }
 
 interface getMediaFileTypeRes {
-    type: string,
-    extname: string
+    type: 'image' | 'video' | 'audio' | 'unknow',
+    extname: 'jpg' | 'png' | 'webp' | 'bmp' | 'heic' | 'gif' | 'mp3' | 'wav' | 'pcm' | 'flac' | 'm4a' | 'aac' | 'mp4' | 'mov' | 'flv' | 'mkv' | 'avi' | 'webm' | 'ogg' | 'm4v' | 'wmv' | 'unknow'
 }
 
 /**
@@ -229,12 +229,12 @@ async function getMediaFileType(target: string | Buffer | Readable): Promise<get
         }
         return equal;
     };
-    const getResult = (typeStr: string) => {
+    const getResult = (typeStr: string): getMediaFileTypeRes => {
         const arr = typeStr.split('|');
         return {
             type: arr[0],
             extname: arr[1]
-        };
+        } as getMediaFileTypeRes;
     };
     let buffer: Buffer;
     const targetType = getValueType(target);
@@ -267,14 +267,17 @@ async function getMediaFileType(target: string | Buffer | Readable): Promise<get
     if (checkString('WAV', 8, 10, buffer)) {
         return getResult('audio|wav');
     }
-    if (checkString('M4A', 8, 10, buffer)) {
-        return getResult('audio|m4a');
-    }
-    if (checkString('heic', 8, 11, buffer) || checkString('mif1', 8, 11, buffer)) {
-        return getResult('image|heic');
-    }
     if (checkString('ftyp', 4, 7, buffer)) {
-        if (checkString('ftypqt', 4, 9, buffer)) {
+        if (checkString('M4A', 8, 10, buffer)) {
+            return getResult('audio|m4a');
+        }
+        if (checkString('M4V', 8, 10, buffer)) {
+            return getResult('video|m4v');
+        }
+        if (checkString('heic', 8, 11, buffer) || checkString('mif1', 8, 11, buffer)) {
+            return getResult('image|heic');
+        }
+        if (checkString('qt', 8, 9, buffer)) {
             return getResult('video|mov');
         }
         return getResult('video|mp4');
@@ -324,16 +327,18 @@ async function getMediaFileType(target: string | Buffer | Readable): Promise<get
  * @returns
  */
 async function checkURLResource(url: string, timeout?: number) {
-    let isEffective = true;
+    const obj: { isEffective: boolean, message?: string, resHeaders?: CustomObject, resBody?: CustomObject | string } = {
+        isEffective: true
+    };
     try {
         await hgo.get(url, { headers: { Range: 'bytes=0-0' }, resType: 'buffer', timeout });
     } catch (e) {
-        // if (e.name === 'timeoutError') {
-        //     throw e;
-        // }
-        isEffective = false;
+        obj.isEffective = false;
+        obj.message = e.message;
+        obj.resHeaders = e.resHeaders;
+        obj.resBody = e.resBody;
     }
-    return isEffective;
+    return obj;
 }
 
 /**