cvitool 1.0.750 → 1.0.751

package/build/src/cutil.d.ts

@@ -1,5 +1,5 @@
 import { Encoding } from 'crypto';
-import { ReadStream } from 'fs';
+import { Readable } from 'stream';
 interface randomStringOptions {
     special?: boolean;
     lowercase?: boolean;
@@ -64,13 +64,13 @@ 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)
  * @param url

package/build/src/cutil.js

@@ -172,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;
@@ -195,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 => {
@@ -204,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;
@@ -225,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',
@@ -235,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');
         }
@@ -331,7 +338,7 @@ function checkURLResource(url, timeout) {
  * @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;

package/build/src/hgo.d.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';
 interface CustomObject {
@@ -47,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

@@ -197,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);
                     }
@@ -208,7 +208,7 @@ function reqSendStream(url, options) {
             });
             stream.on('error', e => {
                 req.destroy();
-                stream.close();
+                stream.destroy();
                 reject(e);
             });
         });

package/build/src/streamhelper.d.ts

@@ -1,5 +1,4 @@
-import { ReadStream, WriteStream } from 'fs';
-import * as http from 'http';
+import { Readable, Writable } from 'stream';
 interface pipeOptions {
     timeout?: number;
     readBytesPreSec?: number;
@@ -11,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvitool",
-  "version": "1.0.750",
+  "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');
     }
@@ -334,7 +342,7 @@ async function checkURLResource(url: string, timeout?: number) {
  * @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;