Merge pull request #578 from KMethod/master

guyonroche · web-flow · commit 890c97dfb5e8 · 2018-11-07T13:59:53.000Z
Fix some xlsx stream read xlsx not in guaranteed order problem
diff --git a/lib/stream/xlsx/workbook-reader.js b/lib/stream/xlsx/workbook-reader.js
@@ -21,6 +21,8 @@ var WorkbookPropertiesManager = require('../../xlsx/xform/book/workbook-properti
 var WorksheetReader = require('./worksheet-reader');
 var HyperlinkReader = require('./hyperlink-reader');
 
+var Temp = require('temp');
+
 var WorkbookReader = module.exports = function(options) {
   this.options = options = options || {};
 
@@ -40,6 +42,9 @@ var WorkbookReader = module.exports = function(options) {
 
   // end of stream check
   this.atEnd = false;
+
+  Temp.track();
+  this.waitingWorkSheets = [];
 };
 
 utils.inherits(WorkbookReader, events.EventEmitter, {
@@ -73,6 +78,7 @@ utils.inherits(WorkbookReader, events.EventEmitter, {
 
     zip.on('entry', entry => {
       var match, sheetNo;
+      // console.log(entry.path);
       switch (entry.path) {
         case '_rels/.rels':
         case 'xl/_rels/workbook.xml.rels':
@@ -91,7 +97,13 @@ utils.inherits(WorkbookReader, events.EventEmitter, {
           if (entry.path.match(/xl\/worksheets\/sheet\d+[.]xml/)) {
             match = entry.path.match(/xl\/worksheets\/sheet(\d+)[.]xml/);
             sheetNo = match[1];
-            this._parseWorksheet(entry, sheetNo, options);
+            if (this.sharedStrings) {
+              this._parseWorksheet(entry, sheetNo, options);
+            } else {
+              var stream = Temp.createWriteStream();
+              this.waitingWorkSheets.push({sheetNo: sheetNo, options: options, path: stream.path});
+              entry.pipe(stream);
+            }
           } else if (entry.path.match(/xl\/worksheets\/_rels\/sheet\d+[.]xml.rels/)) {
             match = entry.path.match(/xl\/worksheets\/_rels\/sheet(\d+)[.]xml.rels/);
             sheetNo = match[1];
@@ -104,11 +116,44 @@ utils.inherits(WorkbookReader, events.EventEmitter, {
     });
 
     zip.on('close', () => {
-      this.emit('end');
-      this.atEnd = true;
-      if (!this.readers) {
-        this.emit('finished');
+      var self = this;
+      if (this.waitingWorkSheets.length) {
+          var currentBook = 0;
+
+          var processBooks = function () {
+              var worksheetInfo = self.waitingWorkSheets[currentBook];
+              var entry = fs.createReadStream(worksheetInfo.path);
+
+              var sheetNo = worksheetInfo.sheetNo;
+              var options = worksheetInfo.options;
+              var worksheet = self._parseWorksheet(entry, sheetNo, options);
+
+              worksheet.on('finished', function (node) {
+                  ++currentBook;
+                  if (currentBook == self.waitingWorkSheets.length) {
+                      Temp.cleanupSync();
+                      // setImmediate(this.emit.bind(this), 'finished');
+
+                      self.emit('end');
+                      self.atEnd = true;
+                      if (!self.readers) {
+                          self.emit('finished');
+                      }
+                  } else {
+                      setImmediate(processBooks);
+                  }
+              })
+          }
+          setImmediate(processBooks);
+      } else {
+          this.emit('end');
+          this.atEnd = true;
+          if (!this.readers) {
+              this.emit('finished');
+          }
       }
+
+      
     });
 
     zip.on('error', err => {
@@ -204,6 +249,7 @@ utils.inherits(WorkbookReader, events.EventEmitter, {
       this.emit('worksheet', worksheetReader);
     }
     worksheetReader.read(entry, options, this.hyperlinkReaders[sheetNo]);
+    return worksheetReader;
   },
   _parseHyperlinks: function(entry, sheetNo, options) {
     this._emitEntry(options, {type: 'hyerlinks', id: sheetNo});
diff --git a/package.json b/package.json
@@ -65,7 +65,8 @@
     "moment": ">=2.19.3",
     "node-unzip-2": "^0.2.7",
     "promish": ">=5.0.2",
-    "sax": "^1.2.2"
+    "sax": "^1.2.2",
+    "temp": "0.8.3"
   },
   "devDependencies": {
     "@types/node": "*",
