cvitool 1.0.771 → 1.0.772

package/build/src/cutil.d.ts

@@ -107,6 +107,7 @@ declare function execCmdCommand(command: string, timeout?: number): Promise<unkn
  */
 declare function getValueType(value: any): "string" | "number" | "boolean" | "undefined" | "object" | "function" | "buffer" | "array" | "null" | "unkonw";
 /**
+ * ### 废弃 ###
  * 获取媒体文件类型(此方法取文件前30个字节进行检查)
  * @param target
  * @returns
@@ -172,4 +173,15 @@ declare function getObjPathMapValue(obj: CustomObject): CustomObject;
  * @returns
  */
 declare function getURLExtname(url: string): string;
-export { randomStringOptions, getMediaFileTypeRes, CustomObject, randomString, encryptCBC, decryptCBC, md5, execCmdCommand, getValueType, getMediaFileType, checkURLResource, writeJsonFileSync, readJsonFileSync, uuid, validate, RegStr, getObjPathMapValue, getURLExtname };
+/**
+ * 通过file-type库获取文件类型
+ * @param input
+ * @param reqUrlTimeout
+ * @returns
+ */
+declare function getFileType(input: string | Buffer | Readable, reqUrlTimeout?: number): Promise<{
+    type: string;
+    extname: string;
+    mime: string;
+}>;
+export { randomStringOptions, getMediaFileTypeRes, CustomObject, randomString, encryptCBC, decryptCBC, md5, execCmdCommand, getValueType, getMediaFileType, checkURLResource, writeJsonFileSync, readJsonFileSync, uuid, validate, RegStr, getObjPathMapValue, getURLExtname, getFileType };

package/build/src/cutil.js

@@ -24,11 +24,14 @@ exports.uuid = uuid;
 exports.validate = validate;
 exports.getObjPathMapValue = getObjPathMapValue;
 exports.getURLExtname = getURLExtname;
+exports.getFileType = getFileType;
 const crypto_1 = require("crypto");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const hgo = require("./hgo");
+const stream_1 = require("stream");
 const path = require("path");
+const file_type_1 = require("file-type");
 const RegStr = {
     zzs: '^[1-9]\\d*$',
     zxs: (digit) => `^(0|[1-9]\\d*)(\\.\\d{1,${digit}})$`,
@@ -217,6 +220,7 @@ function getValueType(value) {
     return type;
 }
 /**
+ * ### 废弃 ###
  * 获取媒体文件类型(此方法取文件前30个字节进行检查)
  * @param target
  * @returns
@@ -623,3 +627,39 @@ function pickObjPathMapValue(obj, path, pathMapValue) {
 function getURLExtname(url) {
     return path.extname(new URL(url).pathname).substring(1);
 }
+/**
+ * 通过file-type库获取文件类型
+ * @param input
+ * @param reqUrlTimeout
+ * @returns
+ */
+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')) {
+                const res = yield hgo.get(input, { resType: 'stream', timeout: reqUrlTimeout });
+                stream = res.resBody;
+            }
+            else {
+                stream = (0, fs_1.createReadStream)(input);
+            }
+        }
+        if (getValueType(input) === 'buffer') {
+            stream = stream_1.Readable.from([input]);
+        }
+        const { ext = '', mime = '' } = yield (0, file_type_1.fromStream)(stream);
+        if (!ext || !mime) {
+            return {
+                type: 'unknow',
+                extname: 'unknow',
+                mime: 'unknow'
+            };
+        }
+        return {
+            type: mime.split('/')[0],
+            extname: ext,
+            mime
+        };
+    });
+}

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "cvitool",
-  "version": "1.0.771",
+  "version": "1.0.772",
   "description": "cvitool",
   "main": "index.js",
   "scripts": {
     "test": "npm run build && node ./build/test/index.test.js",
     "build": "rm -rf build && tsc"
   },
-  "dependencies": {},
+  "dependencies": {
+    "file-type": "16.5.4"
+  },
   "devDependencies": {
     "@types/node": "20.10.4",
     "@typescript-eslint/eslint-plugin": "5.54.0",

package/src/cutil.ts

@@ -9,10 +9,11 @@ import {
 import {
     spawn
 } from 'child_process';
-import { writeFileSync, readFileSync } from 'fs';
+import { writeFileSync, readFileSync, createReadStream } from 'fs';
 import * as hgo from './hgo';
 import { Readable } from 'stream';
 import * as path from 'path';
+import { fromStream } from 'file-type';
 
 interface randomStringOptions {
     special?: boolean,
@@ -238,6 +239,7 @@ function getValueType(value: any) {
 }
 
 /**
+ * ### 废弃 ###
  * 获取媒体文件类型(此方法取文件前30个字节进行检查)
  * @param target
  * @returns
@@ -651,6 +653,40 @@ function getURLExtname(url: string) {
     return path.extname(new URL(url).pathname).substring(1);
 }
 
+/**
+ * 通过file-type库获取文件类型
+ * @param input
+ * @param reqUrlTimeout
+ * @returns
+ */
+async function getFileType(input: string | Buffer | Readable, reqUrlTimeout = 10 * 1000) {
+    let stream: Readable = input as Readable;
+    if (getValueType(input) === 'string') {
+        if ((input as string).startsWith('http') || (input as string).startsWith('https')) {
+            const res = await hgo.get(input as string, { resType: 'stream', timeout: reqUrlTimeout });
+            stream = res.resBody as Readable;
+        } else {
+            stream = createReadStream(input as string);
+        }
+    }
+    if (getValueType(input) === 'buffer') {
+        stream = Readable.from([input as Buffer]);
+    }
+    const { ext = '', mime = '' } = await fromStream(stream);
+    if (!ext || !mime) {
+        return {
+            type: 'unknow',
+            extname: 'unknow',
+            mime: 'unknow'
+        };
+    }
+    return {
+        type: mime.split('/')[0],
+        extname: ext,
+        mime
+    };
+}
+
 export {
     randomStringOptions,
     getMediaFileTypeRes,
@@ -669,5 +705,6 @@ export {
     validate,
     RegStr,
     getObjPathMapValue,
-    getURLExtname
+    getURLExtname,
+    getFileType
 };