use sreaing api

end does not return errors, use 'error' event instead write does not return length anymore
node-formidable · Dec 17, 2019 · 214708a · 214708a
1 parent 2f9191d
commit 214708a
Showing 1 changed file with 11 additions and 37 deletions.
diff --git a/lib/multipart_parser.js b/lib/multipart_parser.js
@@ -40,10 +40,6 @@ for (s in S) {
   exports[s] = S[s];
 }
 
-function capital(string) {
-  return `${string.substr(0, 1).toUpperCase()}${string.substr(1)}`;
-}
-
 class MultipartParser extends Transform {
   constructor() {
     super({ readableObjectMode: true });
@@ -56,11 +52,15 @@ class MultipartParser extends Transform {
     this.flags = 0;
   }
 
-  _flush(callback) {
-    if (this.state !== S.END) {
-      callback(new Error(this.explain()));
-    }
-    callback();
+  _final(callback) {
+      if ((this.state == S.HEADER_FIELD_START && this.index === 0) ||
+          (this.state == S.PART_DATA && this.index == this.boundary.length)) {
+          this.callback('partEnd');
+          this.callback('end');
+          callback();
+      } else if (this.state != S.END) {
+          callback(new Error(`MultipartParser.end(): stream ended unexpectedly: ${this.explain()}`));
+      }
   }
 
   initWithBoundary (str) {
@@ -100,11 +100,7 @@ class MultipartParser extends Transform {
           if (start !== undefined && start === end) {
             return;
           }
-
-          var callbackSymbol = `on${capital(name)}`;
-          if (callbackSymbol in this) {
-            this[callbackSymbol](buffer, start, end);
-          }
+          this.push({name, buffer, start, end});
         },
         dataCallback = (name, clear) => {
           var markSymbol = `${name}Mark`;
@@ -314,24 +310,8 @@ class MultipartParser extends Transform {
 
     return len;
   }
-
-  end () {
-    var callback = function(multipartParser, name) {
-      var callbackSymbol = `on${capital(name)}`;
-      if (callbackSymbol in multipartParser) {
-        multipartParser[callbackSymbol]();
-      }
-    };
-    if ((this.state == S.HEADER_FIELD_START && this.index === 0) ||
-        (this.state == S.PART_DATA && this.index == this.boundary.length)) {
-      callback(this, 'partEnd');
-      callback(this, 'end');
-    } else if (this.state != S.END) {
-      return new Error(`MultipartParser.end(): stream ended unexpectedly: ${this.explain()}`);
-    }
-  }
 
-  explain = function() {
+  explain () {
     return `state = ${MultipartParser.stateToString(this.state)}`;
   }
 }
@@ -343,9 +323,3 @@ MultipartParser.stateToString = function(stateNumber) {
   }
 };
 exports.MultipartParser = MultipartParser;
-
-
-
-
-
-