cvitool 1.0.764 → 1.0.766

package/build/src/cutil.d.ts

@@ -32,7 +32,10 @@ interface validateParams {
     subValidate?: {
         [key: string]: validateParams;
     };
-    func?: (value: any) => boolean;
+    func?: (value: any) => {
+        pass: boolean;
+        message?: string;
+    };
 }
 declare const RegStr: {
     zzs: string;
@@ -149,7 +152,10 @@ declare function validate(value: {
     [key: string]: any;
 }, rule: {
     [key: string]: validateParams;
-}, finalFunc?: (value: any) => boolean): {
+}, finalFunc?: (value: any) => {
+    pass: boolean;
+    message?: string;
+}): {
     message: string;
     field: string;
     pass: boolean;

package/build/src/cutil.js

@@ -553,8 +553,9 @@ function validate(value, rule, finalFunc) {
     if (funcs.length) {
         for (const funcReg of funcs) {
             const { fieldName, fieldValue, func } = funcReg;
-            if (!func(fieldValue)) {
-                result.message = 'field value not pass validate';
+            const execFuncRes = func(fieldValue);
+            if (!execFuncRes.pass) {
+                result.message = execFuncRes.message || 'field value not pass validate';
                 result.field = fieldName;
                 result.pass = false;
                 return result;
@@ -562,8 +563,9 @@ function validate(value, rule, finalFunc) {
         }
     }
     if (finalFunc) {
-        if (!finalFunc(value)) {
-            result.message = 'params not pass validate';
+        const execFuncRes = finalFunc(value);
+        if (!execFuncRes.pass) {
+            result.message = execFuncRes.message || 'params not pass validate';
             result.field = '';
             result.pass = false;
             return result;

package/build/src/hgo.d.ts

@@ -18,6 +18,7 @@ interface baseReqOptions {
     readTimeOut?: number;
     useEnvProxy?: boolean;
     proxyHost?: string;
+    originUrl?: string;
 }
 interface reqOptions extends baseReqOptions {
     method?: Method;

package/build/src/hgo.js

@@ -39,7 +39,7 @@ function getProtocol(url) {
  */
 function request(url, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        let { query = {}, body = {}, headers = {}, timeout = 5000, method = 'get', agent, resType = 'json', connectTimeOut, readTimeOut, retries, retryInterval, retrieds, useEnvProxy = true, proxyHost } = options || {};
+        let { query = {}, body = {}, headers = {}, timeout = 5000, method = 'get', agent, resType = 'json', connectTimeOut, readTimeOut, retries, retryInterval, retrieds, useEnvProxy = true, proxyHost, originUrl } = options || {};
         if (timeout && !(connectTimeOut && readTimeOut)) {
             connectTimeOut = timeout;
             readTimeOut = timeout;
@@ -67,11 +67,15 @@ function request(url, options) {
         try {
             res = yield new Promise((resolve, reject) => {
                 const req = reqProtocol.request(reqOpt, res => {
-                    resHandld(res, resolve, reject, resType, method, readTimeOut, req, url);
+                    // 需要重定向的情况
+                    if ([301, 302, 303, 307, 308].includes(res.statusCode) && res.headers.location) {
+                        resolve(request(res.headers.location, Object.assign(Object.assign({}, options), { originUrl: url })));
+                    }
+                    resHandld(res, resolve, reject, resType, method, readTimeOut, req, originUrl || url);
                 });
                 req.on('timeout', () => {
                     req.destroy();
-                    reject(buildTimeOutErr('connectTimeOut', connectTimeOut, url));
+                    reject(buildTimeOutErr('connectTimeOut', connectTimeOut, originUrl || url));
                 });
                 req.on('error', e => {
                     req.destroy();
@@ -116,7 +120,7 @@ function request(url, options) {
  */
 function reqSendBuffer(url, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        let { timeout = 5000, headers = {}, buffer, method = 'post', agent, resType = 'json', connectTimeOut, readTimeOut, retries, retryInterval, retrieds, useEnvProxy = true, proxyHost } = options;
+        let { timeout = 5000, headers = {}, buffer, method = 'post', agent, resType = 'json', connectTimeOut, readTimeOut, retries, retryInterval, retrieds, useEnvProxy = true, proxyHost, originUrl } = options;
         if (timeout && !(connectTimeOut && readTimeOut)) {
             connectTimeOut = timeout;
             readTimeOut = timeout;
@@ -129,11 +133,15 @@ function reqSendBuffer(url, options) {
         try {
             res = yield new Promise((resolve, reject) => {
                 const req = reqProtocol.request(reqOpt, res => {
-                    resHandld(res, resolve, reject, resType, method, readTimeOut, req, url);
+                    // 需要重定向的情况
+                    if ([301, 302, 303, 307, 308].includes(res.statusCode) && res.headers.location) {
+                        resolve(request(res.headers.location, Object.assign(Object.assign({}, options), { originUrl: url })));
+                    }
+                    resHandld(res, resolve, reject, resType, method, readTimeOut, req, originUrl || url);
                 });
                 req.on('timeout', () => {
                     req.destroy();
-                    reject(buildTimeOutErr('connectTimeOut', connectTimeOut, url));
+                    reject(buildTimeOutErr('connectTimeOut', connectTimeOut, originUrl || url));
                 });
                 req.on('error', e => {
                     req.destroy();
@@ -173,7 +181,7 @@ function reqSendBuffer(url, options) {
  */
 function reqSendStream(url, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        let { timeout = 5000, method = 'post', stream, headers = {}, agent, resType = 'json', connectTimeOut, readTimeOut, useEnvProxy = true, proxyHost } = options;
+        let { timeout = 5000, method = 'post', stream, headers = {}, agent, resType = 'json', connectTimeOut, readTimeOut, useEnvProxy = true, proxyHost, originUrl } = options;
         if (timeout && !(connectTimeOut && readTimeOut)) {
             connectTimeOut = timeout;
             readTimeOut = timeout;
@@ -186,11 +194,15 @@ function reqSendStream(url, options) {
         const { reqProtocol, reqOpt } = getReqProtocolAndOpt(url, baseHeaders, headers, connectTimeOut, method, agent, useEnvProxy, proxyHost);
         const res = yield new Promise((resolve, reject) => {
             const req = reqProtocol.request(reqOpt, res => {
-                resHandld(res, resolve, reject, resType, method, readTimeOut, req, url);
+                // 需要重定向的情况
+                if ([301, 302, 303, 307, 308].includes(res.statusCode) && res.headers.location) {
+                    resolve(request(res.headers.location, Object.assign(Object.assign({}, options), { originUrl: url })));
+                }
+                resHandld(res, resolve, reject, resType, method, readTimeOut, req, originUrl || url);
             });
             req.on('timeout', () => {
                 req.destroy();
-                reject(buildTimeOutErr('connectTimeOut', connectTimeOut, url));
+                reject(buildTimeOutErr('connectTimeOut', connectTimeOut, originUrl || url));
             });
             req.on('error', e => {
                 req.destroy();
@@ -225,7 +237,7 @@ function reqSendStream(url, options) {
  */
 function reqSendMultiPart(url, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        let { timeout = 60000, headers = {}, form, agent, resType = 'json', connectTimeOut, readTimeOut, useEnvProxy = true, proxyHost } = options;
+        let { timeout = 60000, headers = {}, form, agent, resType = 'json', connectTimeOut, readTimeOut, useEnvProxy = true, proxyHost, originUrl } = options;
         if (timeout && !(connectTimeOut && readTimeOut)) {
             connectTimeOut = timeout;
             readTimeOut = timeout;
@@ -234,11 +246,15 @@ function reqSendMultiPart(url, options) {
         const { reqProtocol, reqOpt } = getReqProtocolAndOpt(url, baseHeaders, headers, connectTimeOut, 'post', agent, useEnvProxy, proxyHost);
         const res = yield new Promise((resolve, reject) => {
             const req = reqProtocol.request(reqOpt, res => {
-                resHandld(res, resolve, reject, resType, 'post', readTimeOut, req, url);
+                // 需要重定向的情况
+                if ([301, 302, 303, 307, 308].includes(res.statusCode) && res.headers.location) {
+                    resolve(request(res.headers.location, Object.assign(Object.assign({}, options), { originUrl: url })));
+                }
+                resHandld(res, resolve, reject, resType, 'post', readTimeOut, req, originUrl || url);
             });
             req.on('timeout', () => {
                 req.destroy();
-                reject(buildTimeOutErr('connectTimeOut', connectTimeOut, url));
+                reject(buildTimeOutErr('connectTimeOut', connectTimeOut, originUrl || url));
             });
             req.on('error', e => {
                 req.destroy();
@@ -259,13 +275,7 @@ function reqSendMultiPart(url, options) {
     });
 }
 function resHandld(res, resolve, reject, resType, method, readTimeOut, req, reqUrl) {
-    const resHeaders = {};
-    for (let i = 0; i < res.rawHeaders.length; i += 2) {
-        resHeaders[res.rawHeaders[i]] = res.rawHeaders[i + 1];
-        if (i === res.rawHeaders.length - 2) {
-            break;
-        }
-    }
+    const resHeaders = res.headers;
     if (res.statusCode >= 400) {
         errHandle(reject, res, reqUrl, resHeaders, readTimeOut, req);
         return;

package/package.json

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

package/src/cutil.ts

@@ -47,7 +47,7 @@ interface validateParams {
     subRange?: [number, number],
     subLength?: number,
     subValidate?: { [key: string]: validateParams },
-    func?: (value: any) => boolean
+    func?: (value: any) => { pass: boolean, message?: string }
 }
 
 const RegStr = {
@@ -428,13 +428,13 @@ function uuid() {
  * @param rule
  * @returns
  */
-function validate(value: { [key: string]: any }, rule: { [key: string]: validateParams }, finalFunc?: (value: any) => boolean): { message: string, field: string, pass: boolean } {
+function validate(value: { [key: string]: any }, rule: { [key: string]: validateParams }, finalFunc?: (value: any) => { pass: boolean, message?: string }): { message: string, field: string, pass: boolean } {
     const result = {
         message: '',
         field: '',
         pass: true
     };
-    const funcs: { fieldName: string, fieldValue: any, func: (value: any) => boolean }[] = [];
+    const funcs: { fieldName: string, fieldValue: any, func: (value: any) => { pass: boolean, message?: string } }[] = [];
     for (const fieldName in rule) {
         const fieldValidate = rule[fieldName];
         const fieldValue = value[fieldName];
@@ -579,8 +579,9 @@ function validate(value: { [key: string]: any }, rule: { [key: string]: validate
     if (funcs.length) {
         for (const funcReg of funcs) {
             const { fieldName, fieldValue, func } = funcReg;
-            if (!func(fieldValue)) {
-                result.message = 'field value not pass validate';
+            const execFuncRes = func(fieldValue);
+            if (!execFuncRes.pass) {
+                result.message = execFuncRes.message || 'field value not pass validate';
                 result.field = fieldName;
                 result.pass = false;
                 return result;
@@ -588,8 +589,9 @@ function validate(value: { [key: string]: any }, rule: { [key: string]: validate
         }
     }
     if (finalFunc) {
-        if (!finalFunc(value)) {
-            result.message = 'params not pass validate';
+        const execFuncRes = finalFunc(value);
+        if (!execFuncRes.pass) {
+            result.message = execFuncRes.message || 'params not pass validate';
             result.field = '';
             result.pass = false;
             return result;

package/src/hgo.ts

@@ -21,7 +21,8 @@ interface baseReqOptions {
     connectTimeOut?: number,
     readTimeOut?: number,
     useEnvProxy?: boolean,
-    proxyHost?: string
+    proxyHost?: string,
+    originUrl?: string
 }
 
 interface reqOptions extends baseReqOptions {
@@ -88,7 +89,7 @@ function getProtocol(url: string) {
 async function request(url: string, options?: reqOptions): Promise<ResData> {
     let {
         query = {}, body = {}, headers = {}, timeout = 5000, method = 'get', agent, resType = 'json', connectTimeOut,
-        readTimeOut, retries, retryInterval, retrieds, useEnvProxy = true, proxyHost
+        readTimeOut, retries, retryInterval, retrieds, useEnvProxy = true, proxyHost, originUrl
     } = options || {};
     if (timeout && !(connectTimeOut && readTimeOut)) {
         connectTimeOut = timeout;
@@ -116,11 +117,15 @@ async function request(url: string, options?: reqOptions): Promise<ResData> {
     try {
         res = await new Promise((resolve, reject) => {
             const req = reqProtocol.request(reqOpt, res => {
-                resHandld(res, resolve, reject, resType, method, readTimeOut, req, url);
+                // 需要重定向的情况
+                if ([301, 302, 303, 307, 308].includes(res.statusCode) && res.headers.location) {
+                    resolve(request(res.headers.location, { ...options, originUrl: url }));
+                }
+                resHandld(res, resolve, reject, resType, method, readTimeOut, req, originUrl || url);
             });
             req.on('timeout', () => {
                 req.destroy();
-                reject(buildTimeOutErr('connectTimeOut', connectTimeOut, url));
+                reject(buildTimeOutErr('connectTimeOut', connectTimeOut, originUrl || url));
             });
             req.on('error', e => {
                 req.destroy();
@@ -164,7 +169,7 @@ async function request(url: string, options?: reqOptions): Promise<ResData> {
 async function reqSendBuffer(url: string, options: reqSendBufferOptions): Promise<ResData> {
     let {
         timeout = 5000, headers = {}, buffer, method = 'post', agent, resType = 'json', connectTimeOut, readTimeOut,
-        retries, retryInterval, retrieds, useEnvProxy = true, proxyHost
+        retries, retryInterval, retrieds, useEnvProxy = true, proxyHost, originUrl
     } = options;
     if (timeout && !(connectTimeOut && readTimeOut)) {
         connectTimeOut = timeout;
@@ -178,11 +183,15 @@ async function reqSendBuffer(url: string, options: reqSendBufferOptions): Promis
     try {
         res = await new Promise((resolve, reject) => {
             const req = reqProtocol.request(reqOpt, res => {
-                resHandld(res, resolve, reject, resType, method, readTimeOut, req, url);
+                // 需要重定向的情况
+                if ([301, 302, 303, 307, 308].includes(res.statusCode) && res.headers.location) {
+                    resolve(request(res.headers.location, { ...options, originUrl: url }));
+                }
+                resHandld(res, resolve, reject, resType, method, readTimeOut, req, originUrl || url);
             });
             req.on('timeout', () => {
                 req.destroy();
-                reject(buildTimeOutErr('connectTimeOut', connectTimeOut, url));
+                reject(buildTimeOutErr('connectTimeOut', connectTimeOut, originUrl || url));
             });
             req.on('error', e => {
                 req.destroy();
@@ -222,7 +231,7 @@ async function reqSendBuffer(url: string, options: reqSendBufferOptions): Promis
 async function reqSendStream(url: string, options: reqSendStreamOptions): Promise<ResData> {
     let {
         timeout = 5000, method = 'post', stream, headers = {}, agent, resType = 'json', connectTimeOut, readTimeOut,
-        useEnvProxy = true, proxyHost
+        useEnvProxy = true, proxyHost, originUrl
     } = options;
     if (timeout && !(connectTimeOut && readTimeOut)) {
         connectTimeOut = timeout;
@@ -236,11 +245,15 @@ async function reqSendStream(url: string, options: reqSendStreamOptions): Promis
     const { reqProtocol, reqOpt } = getReqProtocolAndOpt(url, baseHeaders, headers, connectTimeOut, method, agent, useEnvProxy, proxyHost);
     const res: ResData = await new Promise((resolve, reject) => {
         const req = reqProtocol.request(reqOpt, res => {
-            resHandld(res, resolve, reject, resType, method, readTimeOut, req, url);
+            // 需要重定向的情况
+            if ([301, 302, 303, 307, 308].includes(res.statusCode) && res.headers.location) {
+                resolve(request(res.headers.location, { ...options, originUrl: url }));
+            }
+            resHandld(res, resolve, reject, resType, method, readTimeOut, req, originUrl || url);
         });
         req.on('timeout', () => {
             req.destroy();
-            reject(buildTimeOutErr('connectTimeOut', connectTimeOut, url));
+            reject(buildTimeOutErr('connectTimeOut', connectTimeOut, originUrl || url));
         });
         req.on('error', e => {
             req.destroy();
@@ -276,7 +289,7 @@ async function reqSendStream(url: string, options: reqSendStreamOptions): Promis
 async function reqSendMultiPart(url: string, options: reqSendMultiPartOptions): Promise<ResData> {
     let {
         timeout = 60000, headers = {}, form, agent, resType = 'json', connectTimeOut, readTimeOut,
-        useEnvProxy = true, proxyHost
+        useEnvProxy = true, proxyHost, originUrl
     } = options;
     if (timeout && !(connectTimeOut && readTimeOut)) {
         connectTimeOut = timeout;
@@ -288,11 +301,15 @@ async function reqSendMultiPart(url: string, options: reqSendMultiPartOptions):
     const { reqProtocol, reqOpt } = getReqProtocolAndOpt(url, baseHeaders, headers, connectTimeOut, 'post', agent, useEnvProxy, proxyHost);
     const res: ResData = await new Promise((resolve, reject) => {
         const req = reqProtocol.request(reqOpt, res => {
-            resHandld(res, resolve, reject, resType, 'post', readTimeOut, req, url);
+            // 需要重定向的情况
+            if ([301, 302, 303, 307, 308].includes(res.statusCode) && res.headers.location) {
+                resolve(request(res.headers.location, { ...options, originUrl: url }));
+            }
+            resHandld(res, resolve, reject, resType, 'post', readTimeOut, req, originUrl || url);
         });
         req.on('timeout', () => {
             req.destroy();
-            reject(buildTimeOutErr('connectTimeOut', connectTimeOut, url));
+            reject(buildTimeOutErr('connectTimeOut', connectTimeOut, originUrl || url));
         });
         req.on('error', e => {
             req.destroy();
@@ -313,13 +330,7 @@ async function reqSendMultiPart(url: string, options: reqSendMultiPartOptions):
 }
 
 function resHandld(res: http.IncomingMessage, resolve: any, reject: any, resType: ResType, method: Method, readTimeOut: number, req: http.ClientRequest, reqUrl: string) {
-    const resHeaders: CustomObject = {};
-    for (let i = 0; i < res.rawHeaders.length; i += 2) {
-        resHeaders[res.rawHeaders[i]] = res.rawHeaders[i + 1];
-        if (i === res.rawHeaders.length - 2) {
-            break;
-        }
-    }
+    const resHeaders: CustomObject = res.headers;
     if (res.statusCode >= 400) {
         errHandle(reject, res, reqUrl, resHeaders, readTimeOut, req);
         return;