Fix #98 with lock approach, to keep ParserStream sync in cases then w…

…e don't have async scripts.

docs/07_version_history.md

@@ -1,5 +1,8 @@
 # Version history
 
+## 2.1.4
+ * Fixed: Keep ParserStream sync for the inline scripts (GH [#98](https://github.com/inikulin/parse5/issues/98) follow up).
+
 ## 2.1.3
  * Fixed: Synchronously calling resume() leads to crash (GH [#98](https://github.com/inikulin/parse5/issues/98)).
 

lib/parser/stream.js

@@ -34,6 +34,7 @@ var ParserStream = module.exports = function (options) {
 
     this.lastChunkWritten = false;
     this.writeCallback = null;
+    this.parserLoopLock = false;
 
     /**
      * The resulting document node.
@@ -57,7 +58,7 @@ inherits(ParserStream, WritableStream);
 ParserStream.prototype._write = function (chunk, encoding, callback) {
     this.writeCallback = callback;
     this.parser.tokenizer.write(chunk.toString('utf8'), this.lastChunkWritten);
-    this.parser._runParsingLoop(this.writeCallback);
+    this._runParsingLoop();
 };
 
 ParserStream.prototype.end = function (chunk, encoding, callback) {
@@ -66,6 +67,17 @@ ParserStream.prototype.end = function (chunk, encoding, callback) {
 };
 
 //Scriptable parser implementation
+ParserStream.prototype._runParsingLoop = function () {
+    // NOTE: This helps avoid reentrant invocation of parsing loop
+    // in cases then `resume` called synchronously
+    // (see: https://github.com/inikulin/parse5/issues/98).
+    if (!this.parserLoopLock) {
+        this.parserLoopLock = true;
+        this.parser._runParsingLoop(this.writeCallback);
+        this.parserLoopLock = false;
+    }
+};
+
 ParserStream.prototype._resume = function () {
     if (!this.parser.pausedByScript)
         throw new Error('Parser was already resumed');
@@ -80,7 +92,7 @@ ParserStream.prototype._resume = function () {
 
     //NOTE: keep parsing if we don't wait for the next input chunk
     if (this.parser.tokenizer.active)
-        this.parser._runParsingLoop(this.writeCallback);
+        this._runParsingLoop();
 };
 
 ParserStream.prototype._documentWrite = function (html) {
@@ -125,16 +137,8 @@ ParserStream.prototype.scriptHandler = function (scriptElement) {
          * parser.end('<script src="example.com/script.js"></script>');
          */
 
-        var parser = this;
 
-        // NOTE: emit `script` on next tick so we let parsing
-        // loop stop spinning due to `pausedByScript` flag.
-        // This helps avoid reentrant invocation of parsing loop
-        // in cases then `resume` called synchronously
-        // (see: https://github.com/inikulin/parse5/issues/98).
-        process.nextTick(function () {
-            parser.emit('script', scriptElement, parser._documentWrite, parser._resume);
-        });
+        this.emit('script', scriptElement, this._documentWrite, this._resume);
     }
 };
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "parse5",
   "description": "WHATWG HTML5 specification-compliant, fast and ready for production HTML parsing/serialization toolset for Node.js",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "author": "Ivan Nikulin <ifaaan@gmail.com> (https://github.com/inikulin)",
   "contributors": [
     "Alan Clarke (https://github.com/alanclarke)",