cvitool 1.0.766 → 1.0.768

package/build/src/cutil.js

@@ -496,7 +496,7 @@ function validate(value, rule, finalFunc) {
                 if (type === 'array' && subType) {
                     for (const subValue of fieldValue) {
                         if (getValueType(subValue) !== subType) {
-                            result.message = `field type must be: ${type}`;
+                            result.message = `field subValue type must be: ${subType}`;
                             result.pass = false;
                             return result;
                         }

package/build/src/hgo.js

@@ -55,12 +55,9 @@ function request(url, options) {
         const isStrBodyType = (0, cutil_1.getValueType)(body) === 'string';
         const data = (isStrBodyType ? body : JSON.stringify(body));
         const isBodyEmpty = data.length === 0 || data === '{}';
-        let baseHeaders = {};
+        let baseHeaders = { 'User-Agent': 'Node-HttpClient' };
         if (!isBodyEmpty) {
-            baseHeaders = {
-                'Content-Type': isStrBodyType ? 'text/plain; charset=utf-8' : 'application/json; charset=utf-8',
-                'Content-Length': Buffer.byteLength(data)
-            };
+            baseHeaders = Object.assign(Object.assign({}, baseHeaders), { 'Content-Type': isStrBodyType ? 'text/plain; charset=utf-8' : 'application/json; charset=utf-8', 'Content-Length': Buffer.byteLength(data) });
         }
         let res;
         const { reqProtocol, reqOpt } = getReqProtocolAndOpt(url, baseHeaders, headers, connectTimeOut, method, agent, useEnvProxy, proxyHost);
@@ -126,6 +123,7 @@ function reqSendBuffer(url, options) {
             readTimeOut = timeout;
         }
         const baseHeaders = {
+            'User-Agent': 'Node-HttpClient',
             'Content-Length': buffer.byteLength
         };
         const { reqProtocol, reqOpt } = getReqProtocolAndOpt(url, baseHeaders, headers, connectTimeOut, method, agent, useEnvProxy, proxyHost);
@@ -187,6 +185,7 @@ function reqSendStream(url, options) {
             readTimeOut = timeout;
         }
         const baseHeaders = {
+            'User-Agent': 'Node-HttpClient',
             'Content-Type': 'application/octet-stream',
             'Transfer-Encoding': 'chunked',
             Connection: 'keep-alive'
@@ -242,7 +241,7 @@ function reqSendMultiPart(url, options) {
             connectTimeOut = timeout;
             readTimeOut = timeout;
         }
-        const baseHeaders = Object.assign({}, form.getHeaders());
+        const baseHeaders = Object.assign({ 'User-Agent': 'Node-HttpClient' }, form.getHeaders());
         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 => {

package/package.json

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

package/src/cutil.ts

@@ -522,7 +522,7 @@ function validate(value: { [key: string]: any }, rule: { [key: string]: validate
                 if (type === 'array' && subType) {
                     for (const subValue of fieldValue) {
                         if (getValueType(subValue) !== subType) {
-                            result.message = `field type must be: ${type}`;
+                            result.message = `field subValue type must be: ${subType}`;
                             result.pass = false;
                             return result;
                         }

package/src/hgo.ts

@@ -105,9 +105,10 @@ async function request(url: string, options?: reqOptions): Promise<ResData> {
     const isStrBodyType = getValueType(body) === 'string';
     const data = (isStrBodyType ? body : JSON.stringify(body)) as string;
     const isBodyEmpty = data.length === 0 || data === '{}';
-    let baseHeaders: CustomObject = {};
+    let baseHeaders: CustomObject = { 'User-Agent': 'Node-HttpClient' };
     if (!isBodyEmpty) {
         baseHeaders = {
+            ...baseHeaders,
             'Content-Type': isStrBodyType ? 'text/plain; charset=utf-8' : 'application/json; charset=utf-8',
             'Content-Length': Buffer.byteLength(data)
         };
@@ -176,6 +177,7 @@ async function reqSendBuffer(url: string, options: reqSendBufferOptions): Promis
         readTimeOut = timeout;
     }
     const baseHeaders = {
+        'User-Agent': 'Node-HttpClient',
         'Content-Length': buffer.byteLength
     };
     const { reqProtocol, reqOpt } = getReqProtocolAndOpt(url, baseHeaders, headers, connectTimeOut, method, agent, useEnvProxy, proxyHost);
@@ -238,6 +240,7 @@ async function reqSendStream(url: string, options: reqSendStreamOptions): Promis
         readTimeOut = timeout;
     }
     const baseHeaders = {
+        'User-Agent': 'Node-HttpClient',
         'Content-Type': 'application/octet-stream',
         'Transfer-Encoding': 'chunked',
         Connection: 'keep-alive'
@@ -296,6 +299,7 @@ async function reqSendMultiPart(url: string, options: reqSendMultiPartOptions):
         readTimeOut = timeout;
     }
     const baseHeaders = {
+        'User-Agent': 'Node-HttpClient',
         ...form.getHeaders()
     };
     const { reqProtocol, reqOpt } = getReqProtocolAndOpt(url, baseHeaders, headers, connectTimeOut, 'post', agent, useEnvProxy, proxyHost);