cvitool 1.0.749 → 1.0.750

package/build/src/cutil.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import { Encoding } from 'crypto';
 import { ReadStream } from 'fs';
 interface randomStringOptions {
@@ -75,11 +72,11 @@ declare function getValueType(value: any): "string" | "number" | "boolean" | "un
  */
 declare function getMediaFileType(target: string | Buffer | ReadStream): 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
@@ -180,7 +185,6 @@ function getValueType(value) {
     ;
     return type;
 }
-exports.getValueType = getValueType;
 /**
  * 获取媒体文件类型(此方法取文件前30个字节进行检查)
  * @param target
@@ -301,28 +305,26 @@ 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对象
@@ -339,7 +341,6 @@ function writeJsonFileSync(data, path, space = 3) {
     }
     (0, fs_1.writeFileSync)(path, writeStr);
 }
-exports.writeJsonFileSync = writeJsonFileSync;
 /**
  * 读取json文件
  * @param path 读取文件路径
@@ -353,7 +354,6 @@ function readJsonFileSync(path, toObj = true) {
     }
     return str;
 }
-exports.readJsonFileSync = readJsonFileSync;
 /**
  * 生成去掉'-'形式的uuid
  * @returns
@@ -361,4 +361,3 @@ exports.readJsonFileSync = readJsonFileSync;
 function uuid() {
     return (0, crypto_1.randomUUID)().replace(/-/g, '');
 }
-exports.uuid = uuid;

package/build/src/hgo.d.ts

@@ -1,8 +1,3 @@
-/// <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';

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
@@ -209,7 +215,6 @@ function reqSendStream(url, options) {
         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,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { ReadStream, WriteStream } from 'fs';
 import * as http from 'http';
 interface pipeOptions {

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.750",
   "description": "cvitool",
   "main": "index.js",
   "scripts": {

package/src/cutil.ts

@@ -311,18 +311,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;