cvitool 1.0.749 → 1.0.751

package/build/src/cutil.d.ts

@@ -1,8 +1,5 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import { Encoding } from 'crypto';
-import { ReadStream } from 'fs';
+import { Readable } from 'stream';
 interface randomStringOptions {
     special?: boolean;
     lowercase?: boolean;
@@ -67,19 +64,19 @@ declare function execCmdCommand(command: string, timeout?: number): Promise<unkn
  * @param value
  * @returns
  */
-declare function getValueType(value: any): "string" | "number" | "boolean" | "undefined" | "object" | "array" | "null" | "unkonw";
+declare function getValueType(value: any): "string" | "number" | "boolean" | "undefined" | "object" | "function" | "buffer" | "array" | "null" | "unkonw";
 /**
  * 获取媒体文件类型(此方法取文件前30个字节进行检查)
  * @param target
  * @returns
  */
-declare function getMediaFileType(target: string | Buffer | ReadStream): Promise<getMediaFileTypeRes>;
+declare function getMediaFileType(target: string | Buffer | Readable): Promise<getMediaFileTypeRes>;
 /**
- * 检查url资源是否可访问(此方法取文件首字节进行检查, 超时时(5s超时)会抛出异常而不是返回false)
+ * 检查url资源是否可访问(此方法取文件首字节进行检查, 超时时(默认5s超时)返回false)
  * @param url
  * @returns
  */
-declare function checkURLResource(url: string): Promise<boolean>;
+declare function checkURLResource(url: string, timeout?: number): Promise<boolean>;
 /**
  * 写入json文件
  * @param data 待写入json对象

package/build/src/cutil.js

@@ -9,7 +9,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uuid = exports.readJsonFileSync = exports.writeJsonFileSync = exports.checkURLResource = exports.getMediaFileType = exports.getValueType = exports.execCmdCommand = exports.md5 = exports.decryptCBC = exports.encryptCBC = exports.randomString = void 0;
+exports.randomString = randomString;
+exports.encryptCBC = encryptCBC;
+exports.decryptCBC = decryptCBC;
+exports.md5 = md5;
+exports.execCmdCommand = execCmdCommand;
+exports.getValueType = getValueType;
+exports.getMediaFileType = getMediaFileType;
+exports.checkURLResource = checkURLResource;
+exports.writeJsonFileSync = writeJsonFileSync;
+exports.readJsonFileSync = readJsonFileSync;
+exports.uuid = uuid;
 const crypto_1 = require("crypto");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
@@ -56,7 +66,6 @@ function randomString(length, options) {
     }
     return result;
 }
-exports.randomString = randomString;
 /**
  * 以CBC算法进行对称加密
  * @param data 待加密数据
@@ -73,7 +82,6 @@ function encryptCBC(data, length, key, iv, inputEncoding = 'utf-8') {
     crypted += cipher.final('hex');
     return crypted;
 }
-exports.encryptCBC = encryptCBC;
 ;
 /**
  * 以CBC算法进行对称解密
@@ -91,7 +99,6 @@ function decryptCBC(encryptData, length, key, iv, outputEncoding = 'utf-8') {
     decrypted += decipher.final(outputEncoding);
     return decrypted;
 }
-exports.decryptCBC = decryptCBC;
 ;
 /**
  * md5加密
@@ -102,15 +109,14 @@ exports.decryptCBC = decryptCBC;
 function md5(data, inputEncoding = 'utf-8') {
     return (0, crypto_1.createHash)('md5').update(data, inputEncoding).digest('hex');
 }
-exports.md5 = md5;
 /**
  * 调用终端执行命令
  * @param command 命令
  * @param timeout 执行超时时间，单位: ms, 默认: 60000
  * @returns
  */
-function execCmdCommand(command, timeout = 1 * 60 * 1000) {
-    return __awaiter(this, void 0, void 0, function* () {
+function execCmdCommand(command_1) {
+    return __awaiter(this, arguments, void 0, function* (command, timeout = 1 * 60 * 1000) {
         const commandList = command.split(' ');
         const commandName = commandList.splice(0, 1);
         return new Promise((resolve, reject) => {
@@ -142,7 +148,6 @@ function execCmdCommand(command, timeout = 1 * 60 * 1000) {
         });
     });
 }
-exports.execCmdCommand = execCmdCommand;
 /**
  * 获取给定值node类型
  * @param value
@@ -167,6 +172,13 @@ function getValueType(value) {
         case '[object Boolean]':
             type = 'boolean';
             break;
+        case '[object Uint8Array]':
+            type = 'buffer';
+            break;
+        case '[object AsyncFunction]':
+        case '[object Function]':
+            type = 'function';
+            break;
         case '[object Undefined]':
             type = 'undefined';
             break;
@@ -180,7 +192,6 @@ function getValueType(value) {
     ;
     return type;
 }
-exports.getValueType = getValueType;
 /**
  * 获取媒体文件类型(此方法取文件前30个字节进行检查)
  * @param target
@@ -191,7 +202,7 @@ function getMediaFileType(target) {
         const readStreamOnceBuffer = (stream) => __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
                 stream.once('data', chunk => {
-                    stream.close();
+                    stream.destroy();
                     resolve(chunk);
                 });
                 stream.on('error', e => {
@@ -200,11 +211,11 @@ function getMediaFileType(target) {
             });
         });
         const checkString = (waitMatchStr, byteStart, byteEnd, buffer) => {
-            return waitMatchStr === Buffer.from(buffer.slice(byteStart, byteEnd + 1)).toString();
+            return waitMatchStr === Buffer.from(buffer.subarray(byteStart, byteEnd + 1)).toString();
         };
         const checkBuffer = (waitMatchBuffer, byteStart, byteEnd, buffer) => {
             let equal = true;
-            const sliceBufferList = buffer.slice(byteStart, byteEnd + 1);
+            const sliceBufferList = buffer.subarray(byteStart, byteEnd + 1);
             for (const [index, item] of waitMatchBuffer.entries()) {
                 if (item !== sliceBufferList[index]) {
                     equal = false;
@@ -221,7 +232,7 @@ function getMediaFileType(target) {
             };
         };
         let buffer;
-        const targetType = this.getValueType(target);
+        const targetType = getValueType(target);
         if (targetType === 'string') {
             const res = yield hgo.get(target, {
                 resType: 'buffer',
@@ -231,13 +242,13 @@ function getMediaFileType(target) {
             });
             buffer = res.resBody;
         }
-        else if (targetType === 'array') {
+        else if (targetType === 'buffer') {
             buffer = target;
         }
         else {
             buffer = yield readStreamOnceBuffer(target);
         }
-        buffer = buffer.slice(0, 30);
+        buffer = buffer.subarray(0, 30);
         if (checkBuffer([0xff, 0xd8], 0, 1, buffer)) {
             return getResult('image|jpg');
         }
@@ -301,35 +312,33 @@ function getMediaFileType(target) {
         return getResult('unknow|unknow');
     });
 }
-exports.getMediaFileType = getMediaFileType;
 /**
- * 检查url资源是否可访问(此方法取文件首字节进行检查, 超时时(5s超时)会抛出异常而不是返回false)
+ * 检查url资源是否可访问(此方法取文件首字节进行检查, 超时时(默认5s超时)返回false)
  * @param url
  * @returns
  */
-function checkURLResource(url) {
+function checkURLResource(url, timeout) {
     return __awaiter(this, void 0, void 0, function* () {
         let isEffective = true;
         try {
-            yield hgo.get(url, { headers: { Range: 'bytes=0-0' }, resType: 'buffer' });
+            yield hgo.get(url, { headers: { Range: 'bytes=0-0' }, resType: 'buffer', timeout });
         }
         catch (e) {
-            if (e.name === 'timeoutError') {
-                throw e;
-            }
+            // if (e.name === 'timeoutError') {
+            //     throw e;
+            // }
             isEffective = false;
         }
         return isEffective;
     });
 }
-exports.checkURLResource = checkURLResource;
 /**
  * 写入json文件
  * @param data 待写入json对象
  * @param path 写入文件路径
  * @param space json缩进
  */
-function writeJsonFileSync(data, path, space = 3) {
+function writeJsonFileSync(data, path, space = 4) {
     let writeStr = '';
     if (getValueType(data) === 'string') {
         writeStr = data;
@@ -339,7 +348,6 @@ function writeJsonFileSync(data, path, space = 3) {
     }
     (0, fs_1.writeFileSync)(path, writeStr);
 }
-exports.writeJsonFileSync = writeJsonFileSync;
 /**
  * 读取json文件
  * @param path 读取文件路径
@@ -353,7 +361,6 @@ function readJsonFileSync(path, toObj = true) {
     }
     return str;
 }
-exports.readJsonFileSync = readJsonFileSync;
 /**
  * 生成去掉'-'形式的uuid
  * @returns
@@ -361,4 +368,3 @@ exports.readJsonFileSync = readJsonFileSync;
 function uuid() {
     return (0, crypto_1.randomUUID)().replace(/-/g, '');
 }
-exports.uuid = uuid;

package/build/src/hgo.d.ts

@@ -1,12 +1,7 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import * as querystring from 'querystring';
 import * as https from 'https';
 import * as http from 'http';
-import { ReadStream } from 'fs';
+import { Readable } from 'stream';
 type Method = 'get' | 'put' | 'post' | 'delete' | 'patch' | 'head';
 type ResType = 'json' | 'buffer' | 'stream' | 'text';
 interface CustomObject {
@@ -52,7 +47,7 @@ interface reqSendBufferOptions extends baseReqOptions {
 }
 interface reqSendStreamOptions extends baseReqOptions {
     method?: Method;
-    stream: ReadStream;
+    stream: Readable;
 }
 interface reqSendMultiPartOptions extends baseReqOptions {
     form: any;

package/build/src/hgo.js

@@ -9,7 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.del = exports.head = exports.put = exports.post = exports.get = exports.reqSendMultiPart = exports.reqSendStream = exports.reqSendBuffer = exports.request = void 0;
+exports.request = request;
+exports.reqSendBuffer = reqSendBuffer;
+exports.reqSendStream = reqSendStream;
+exports.reqSendMultiPart = reqSendMultiPart;
+exports.get = get;
+exports.post = post;
+exports.put = put;
+exports.head = head;
+exports.del = del;
 const querystring = require("querystring");
 const https = require("https");
 const http = require("http");
@@ -98,7 +106,6 @@ function request(url, options) {
         return res;
     });
 }
-exports.request = request;
 /**
  * 传送buffer请求
  * @param url
@@ -156,7 +163,6 @@ function reqSendBuffer(url, options) {
         return res;
     });
 }
-exports.reqSendBuffer = reqSendBuffer;
 /**
  * 传送stream请求
  * @param url
@@ -191,7 +197,7 @@ function reqSendStream(url, options) {
             stream.on('data', chunk => {
                 req.write(chunk, e => {
                     if (e) {
-                        stream.close();
+                        stream.destroy();
                         req.destroy();
                         reject(e);
                     }
@@ -202,14 +208,13 @@ function reqSendStream(url, options) {
             });
             stream.on('error', e => {
                 req.destroy();
-                stream.close();
+                stream.destroy();
                 reject(e);
             });
         });
         return res;
     });
 }
-exports.reqSendStream = reqSendStream;
 /**
  * 传送表单formData请求
  * @param url
@@ -251,7 +256,6 @@ function reqSendMultiPart(url, options) {
         return res;
     });
 }
-exports.reqSendMultiPart = reqSendMultiPart;
 function resHandld(res, resolve, reject, resType, method, readTimeOut, req, reqUrl) {
     const resHeaders = {};
     for (let i = 0; i < res.rawHeaders.length; i += 2) {
@@ -377,7 +381,6 @@ function get(url, options) {
         return request(url, Object.assign(Object.assign({}, options), { method: 'get' }));
     });
 }
-exports.get = get;
 /**
  * request-post
  * @param url
@@ -389,7 +392,6 @@ function post(url, options) {
         return request(url, Object.assign(Object.assign({}, options), { method: 'post' }));
     });
 }
-exports.post = post;
 /**
  * request-put
  * @param url
@@ -401,7 +403,6 @@ function put(url, options) {
         return request(url, Object.assign(Object.assign({}, options), { method: 'put' }));
     });
 }
-exports.put = put;
 /**
  * request-head
  * @param url
@@ -413,7 +414,6 @@ function head(url, options) {
         return request(url, Object.assign(Object.assign({}, options), { method: 'head' }));
     });
 }
-exports.head = head;
 /**
  * request-delete
  * @param url
@@ -425,7 +425,6 @@ function del(url, options) {
         return request(url, Object.assign(Object.assign({}, options), { method: 'delete' }));
     });
 }
-exports.del = del;
 function getReqProtocolAndOpt(url, baseHeaders, headers, timeout, method, agent, useEnvProxy, proxyHost) {
     let reqProtocol = getProtocol(url);
     const urlOpt = new URL(url);

package/build/src/streamhelper.d.ts

@@ -1,7 +1,4 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { ReadStream, WriteStream } from 'fs';
-import * as http from 'http';
+import { Readable, Writable } from 'stream';
 interface pipeOptions {
     timeout?: number;
     readBytesPreSec?: number;
@@ -13,11 +10,11 @@ interface pipeOptions {
  * @param options
  * @returns
  */
-declare function pipe(source: ReadStream | http.IncomingMessage, target: WriteStream, options?: pipeOptions): Promise<void>;
+declare function pipe(source: Readable, target: Writable, options?: pipeOptions): Promise<void>;
 /**
  * stream传输限流
  * @param stream 可读流
  * @param readBytesPreSec 每秒读取的字节数
  */
-declare function limitStreamFlowingRate(stream: ReadStream | http.IncomingMessage, readBytesPreSec: number): void;
+declare function limitStreamFlowingRate(stream: Readable, readBytesPreSec: number): void;
 export { pipeOptions, pipe, limitStreamFlowingRate };

package/build/src/streamhelper.js

@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.limitStreamFlowingRate = exports.pipe = void 0;
+exports.pipe = pipe;
+exports.limitStreamFlowingRate = limitStreamFlowingRate;
 /**
  * 实现一个promise流传输
  * @param source  原流
@@ -46,7 +47,6 @@ function pipe(source, target, options) {
         });
     });
 }
-exports.pipe = pipe;
 /**
  * stream传输限流
  * @param stream 可读流
@@ -85,4 +85,3 @@ function limitStreamFlowingRate(stream, readBytesPreSec) {
         clearInterval(checkInterval);
     });
 }
-exports.limitStreamFlowingRate = limitStreamFlowingRate;

package/package.json

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

package/src/cutil.ts

@@ -9,8 +9,9 @@ import {
 import {
     spawn
 } from 'child_process';
-import { ReadStream, writeFileSync, readFileSync } from 'fs';
+import { writeFileSync, readFileSync } from 'fs';
 import * as hgo from './hgo';
+import { Readable } from 'stream';
 
 interface randomStringOptions {
     special?: boolean,
@@ -160,7 +161,7 @@ async function execCmdCommand(command: string, timeout = 1 * 60 * 1000) {
  */
 function getValueType(value: any) {
     const typeStr = Object.prototype.toString.call(value);
-    let type: 'number' | 'string' | 'array' | 'object' | 'boolean' | 'undefined' | 'null' | 'unkonw';
+    let type: 'number' | 'string' | 'array' | 'object' | 'boolean' | 'buffer' | 'function' | 'undefined' | 'null' | 'unkonw';
     switch (typeStr) {
         case '[object Number]':
             type = 'number';
@@ -177,6 +178,13 @@ function getValueType(value: any) {
         case '[object Boolean]':
             type = 'boolean';
             break;
+        case '[object Uint8Array]':
+            type = 'buffer';
+            break;
+        case '[object AsyncFunction]':
+        case '[object Function]':
+            type = 'function';
+            break;
         case '[object Undefined]':
             type = 'undefined';
             break;
@@ -195,11 +203,11 @@ function getValueType(value: any) {
  * @param target
  * @returns
  */
-async function getMediaFileType(target: string | Buffer | ReadStream): Promise<getMediaFileTypeRes> {
-    const readStreamOnceBuffer = async (stream: ReadStream): Promise<Buffer> => {
+async function getMediaFileType(target: string | Buffer | Readable): Promise<getMediaFileTypeRes> {
+    const readStreamOnceBuffer = async (stream: Readable): Promise<Buffer> => {
         return new Promise((resolve, reject) => {
             stream.once('data', chunk => {
-                stream.close();
+                stream.destroy();
                 resolve(chunk as Buffer);
             });
             stream.on('error', e => {
@@ -208,11 +216,11 @@ async function getMediaFileType(target: string | Buffer | ReadStream): Promise<g
         });
     };
     const checkString = (waitMatchStr: string, byteStart: number, byteEnd: number, buffer: Buffer) => {
-        return waitMatchStr === Buffer.from(buffer.slice(byteStart, byteEnd + 1)).toString();
+        return waitMatchStr === Buffer.from(buffer.subarray(byteStart, byteEnd + 1)).toString();
     };
     const checkBuffer = (waitMatchBuffer: number[], byteStart: number, byteEnd: number, buffer: Buffer) => {
         let equal = true;
-        const sliceBufferList = buffer.slice(byteStart, byteEnd + 1);
+        const sliceBufferList = buffer.subarray(byteStart, byteEnd + 1);
         for (const [index, item] of waitMatchBuffer.entries()) {
             if (item !== sliceBufferList[index]) {
                 equal = false;
@@ -229,7 +237,7 @@ async function getMediaFileType(target: string | Buffer | ReadStream): Promise<g
         };
     };
     let buffer: Buffer;
-    const targetType = this.getValueType(target);
+    const targetType = getValueType(target);
     if (targetType === 'string') {
         const res = await hgo.get(
             target as string,
@@ -241,12 +249,12 @@ async function getMediaFileType(target: string | Buffer | ReadStream): Promise<g
             }
         );
         buffer = res.resBody as Buffer;
-    } else if (targetType === 'array') {
+    } else if (targetType === 'buffer') {
         buffer = target as Buffer;
     } else {
-        buffer = await readStreamOnceBuffer(target as ReadStream);
+        buffer = await readStreamOnceBuffer(target as Readable);
     }
-    buffer = buffer.slice(0, 30);
+    buffer = buffer.subarray(0, 30);
     if (checkBuffer([0xff, 0xd8], 0, 1, buffer)) {
         return getResult('image|jpg');
     }
@@ -311,18 +319,18 @@ async function getMediaFileType(target: string | Buffer | ReadStream): Promise<g
 }
 
 /**
- * 检查url资源是否可访问(此方法取文件首字节进行检查, 超时时(5s超时)会抛出异常而不是返回false)
+ * 检查url资源是否可访问(此方法取文件首字节进行检查, 超时时(默认5s超时)返回false)
  * @param url
  * @returns
  */
-async function checkURLResource(url: string) {
+async function checkURLResource(url: string, timeout?: number) {
     let isEffective = true;
     try {
-        await hgo.get(url, { headers: { Range: 'bytes=0-0' }, resType: 'buffer' });
+        await hgo.get(url, { headers: { Range: 'bytes=0-0' }, resType: 'buffer', timeout });
     } catch (e) {
-        if (e.name === 'timeoutError') {
-            throw e;
-        }
+        // if (e.name === 'timeoutError') {
+        //     throw e;
+        // }
         isEffective = false;
     }
     return isEffective;
@@ -334,7 +342,7 @@ async function checkURLResource(url: string) {
  * @param path 写入文件路径
  * @param space json缩进
  */
-function writeJsonFileSync(data: CustomObject | CustomObject[] | string, path: string, space = 3) {
+function writeJsonFileSync(data: CustomObject | CustomObject[] | string, path: string, space = 4) {
     let writeStr = '';
     if (getValueType(data) === 'string') {
         writeStr = data as string;

package/src/hgo.ts

@@ -1,7 +1,7 @@
 import * as querystring from 'querystring';
 import * as https from 'https';
 import * as http from 'http';
-import { ReadStream } from 'fs';
+import { Readable } from 'stream';
 
 type Method = 'get' | 'put' | 'post' | 'delete' | 'patch' | 'head';
 type ResType = 'json' | 'buffer' | 'stream' | 'text';
@@ -54,7 +54,7 @@ interface reqSendBufferOptions extends baseReqOptions {
 
 interface reqSendStreamOptions extends baseReqOptions {
     method?: Method,
-    stream: ReadStream
+    stream: Readable
 }
 
 interface reqSendMultiPartOptions extends baseReqOptions {
@@ -247,7 +247,7 @@ async function reqSendStream(url: string, options: reqSendStreamOptions): Promis
         stream.on('data', chunk => {
             req.write(chunk, e => {
                 if (e) {
-                    stream.close();
+                    stream.destroy();
                     req.destroy();
                     reject(e);
                 }
@@ -258,7 +258,7 @@ async function reqSendStream(url: string, options: reqSendStreamOptions): Promis
         });
         stream.on('error', e => {
             req.destroy();
-            stream.close();
+            stream.destroy();
             reject(e);
         });
     });

package/src/streamhelper.ts

@@ -1,5 +1,4 @@
-import { ReadStream, WriteStream } from 'fs';
-import * as http from 'http';
+import { Readable, Writable } from 'stream';
 
 interface pipeOptions {
     timeout?: number,
@@ -13,7 +12,7 @@ interface pipeOptions {
  * @param options
  * @returns
  */
-async function pipe(source: ReadStream | http.IncomingMessage, target: WriteStream, options?: pipeOptions): Promise<void> {
+async function pipe(source: Readable, target: Writable, options?: pipeOptions): Promise<void> {
     const { timeout, readBytesPreSec } = options || {};
     return new Promise((resolve, reject) => {
         if (readBytesPreSec) {
@@ -46,7 +45,7 @@ async function pipe(source: ReadStream | http.IncomingMessage, target: WriteStre
  * @param stream 可读流
  * @param readBytesPreSec 每秒读取的字节数
  */
-function limitStreamFlowingRate(stream: ReadStream | http.IncomingMessage, readBytesPreSec: number) {
+function limitStreamFlowingRate(stream: Readable, readBytesPreSec: number) {
     let start = 0;
     let checkInterval: any;
     let calReadBytesTotal = 0;