cvitool 1.0.6 → 1.0.7

package/build/src/hgo.js

@@ -192,7 +192,7 @@ function resHandld(res, resolve, reject, resType, method) {
             break;
         }
     }
-    if (res.statusCode !== 200) {
+    if (res.statusCode >= 400) {
         errHandle(reject, res, reqUrl, resHeaders);
         return;
     }
@@ -230,7 +230,7 @@ function resHandld(res, resolve, reject, resType, method) {
                     resBody = JSON.parse(responseStr);
                 }
                 catch (e) {
-                    resBody = resData;
+                    resBody = responseStr;
                 }
             }
         }

package/build/src/streamhelper.d.ts

@@ -1,9 +1,11 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { ReadStream, WriteStream } from 'fs';
+import * as http from 'http';
 interface pipeOptions {
     timeout?: number;
     readBytesPreSec?: number;
 }
-declare function pipe(source: ReadStream, target: WriteStream, options?: pipeOptions): Promise<void>;
-declare function limitStreamFlowingRate(stream: ReadStream, readBytesPreSec: number): void;
+declare function pipe(source: ReadStream | http.IncomingMessage, target: WriteStream, options?: pipeOptions): Promise<void>;
+declare function limitStreamFlowingRate(stream: ReadStream | http.IncomingMessage, readBytesPreSec: number): void;
 export { pipeOptions, pipe, limitStreamFlowingRate };

package/build/src/streamhelper.js

@@ -26,9 +26,11 @@ function pipe(source, target, options) {
             });
             if (timeout) {
                 setTimeout(() => {
-                    if (!target.closed) {
+                    if (!target.destroyed) {
                         target.destroy();
-                        source.destroy();
+                        if (!source.destroyed) {
+                            source.destroy();
+                        }
                         const downloadErr = new Error(`文件下载超时|${(timeout / 1000).toFixed(3)}s`);
                         reject(downloadErr);
                     }
@@ -40,22 +42,35 @@ function pipe(source, target, options) {
 exports.pipe = pipe;
 function limitStreamFlowingRate(stream, readBytesPreSec) {
     let start = 0;
+    let checkInterval;
     let calReadBytesTotal = 0;
+    let isClosed = false;
     stream.on('data', (chunk) => {
-        if (!start) {
-            start = Date.now();
-        }
         calReadBytesTotal += chunk.length;
-        const fromStartSecs = Math.ceil((Date.now() - start) / 1000);
-        if (calReadBytesTotal > fromStartSecs * readBytesPreSec && fromStartSecs > 0) {
-            const stopTime = Math.ceil((fromStartSecs - ((Date.now() - start) / 1000)) * 1000);
-            if (stopTime > 0) {
-                stream.pause();
-                setTimeout(() => {
-                    stream.resume();
-                }, stopTime);
+    });
+    stream.once('data', () => {
+        start = Date.now();
+        checkInterval = setInterval(() => {
+            const requireReadBytesFromNow = Math.ceil(readBytesPreSec * ((Date.now() - start) / 1000));
+            if (calReadBytesTotal > requireReadBytesFromNow) {
+                const waitMs = Math.ceil((calReadBytesTotal - requireReadBytesFromNow) / readBytesPreSec * 1000);
+                if (waitMs > 50 && !isClosed && !stream.isPaused()) {
+                    stream.pause();
+                    setTimeout(() => {
+                        if (!isClosed && stream.isPaused()) {
+                            stream.resume();
+                        }
+                    }, waitMs);
+                }
             }
-        }
+        }, 500);
+    });
+    stream.on('close', () => {
+        isClosed = true;
+        clearInterval(checkInterval);
+    });
+    stream.on('error', () => {
+        clearInterval(checkInterval);
     });
 }
 exports.limitStreamFlowingRate = limitStreamFlowingRate;

package/package.json

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

package/src/hgo.ts

@@ -218,7 +218,7 @@ function resHandld(res: http.IncomingMessage, resolve: any, reject: any, resType
             break;
         }
     }
-    if (res.statusCode !== 200) {
+    if (res.statusCode >= 400) {
         errHandle(reject, res, reqUrl, resHeaders);
         return;
     }
@@ -253,7 +253,7 @@ function resHandld(res: http.IncomingMessage, resolve: any, reject: any, resType
                 try {
                     resBody = JSON.parse(responseStr);
                 } catch (e) {
-                    resBody = resData;
+                    resBody = responseStr;
                 }
             }
         }

package/src/streamhelper.ts

@@ -1,11 +1,12 @@
 import { ReadStream, WriteStream } from 'fs';
+import * as http from 'http';
 
 interface pipeOptions {
     timeout?: number,
     readBytesPreSec?: number
 }
 
-async function pipe(source: ReadStream, target: WriteStream, options?: pipeOptions): Promise<void> {
+async function pipe(source: ReadStream | http.IncomingMessage, target: WriteStream, options?: pipeOptions): Promise<void> {
     const { timeout, readBytesPreSec } = options || {};
     return new Promise((resolve, reject) => {
         if (readBytesPreSec) {
@@ -20,9 +21,11 @@ async function pipe(source: ReadStream, target: WriteStream, options?: pipeOptio
         });
         if (timeout) {
             setTimeout(() => {
-                if (!target.closed) {
+                if (!target.destroyed) {
                     target.destroy();
-                    source.destroy();
+                    if (!source.destroyed) {
+                        source.destroy();
+                    }
                     const downloadErr = new Error(`文件下载超时|${(timeout / 1000).toFixed(3)}s`);
                     reject(downloadErr);
                 }
@@ -31,24 +34,37 @@ async function pipe(source: ReadStream, target: WriteStream, options?: pipeOptio
     });
 }
 
-function limitStreamFlowingRate(stream: ReadStream, readBytesPreSec: number) {
+function limitStreamFlowingRate(stream: ReadStream | http.IncomingMessage, readBytesPreSec: number) {
     let start = 0;
+    let checkInterval: any;
     let calReadBytesTotal = 0;
+    let isClosed = false;
     stream.on('data', (chunk) => {
-        if (!start) {
-            start = Date.now();
-        }
         calReadBytesTotal += chunk.length;
-        const fromStartSecs = Math.ceil((Date.now() - start) / 1000);
-        if (calReadBytesTotal > fromStartSecs * readBytesPreSec && fromStartSecs > 0) {
-            const stopTime = Math.ceil((fromStartSecs - ((Date.now() - start) / 1000)) * 1000);
-            if (stopTime > 0) {
-                stream.pause();
-                setTimeout(() => {
-                    stream.resume();
-                }, stopTime);
+    });
+    stream.once('data', () => {
+        start = Date.now();
+        checkInterval = setInterval(() => {
+            const requireReadBytesFromNow = Math.ceil(readBytesPreSec * ((Date.now() - start) / 1000));
+            if (calReadBytesTotal > requireReadBytesFromNow) {
+                const waitMs = Math.ceil((calReadBytesTotal - requireReadBytesFromNow) / readBytesPreSec * 1000);
+                if (waitMs > 50 && !isClosed && !stream.isPaused()) {
+                    stream.pause();
+                    setTimeout(() => {
+                        if (!isClosed && stream.isPaused()) {
+                            stream.resume();
+                        }
+                    }, waitMs);
+                }
             }
-        }
+        }, 500);
+    });
+    stream.on('close', () => {
+        isClosed = true;
+        clearInterval(checkInterval);
+    });
+    stream.on('error', () => {
+        clearInterval(checkInterval);
     });
 }