Skip to content

Fix issue #1753 Reject promise when workbook reader is writing to temporary file stream and error occurs #1756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 14, 2023
Merged

Fix issue #1753 Reject promise when workbook reader is writing to temporary file stream and error occurs #1756

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
798347c
Fix issue #1753 Reject promise when workbook reader is writing to tem…
Jun 28, 2021
c4d2b02
Merge branch 'master' into fix/issue-1753
Siemienik Nov 18, 2021
61d57bf
Merge branch 'master' into fix/issue-1753
Siemienik Apr 14, 2023
809872c
Merge branch 'master' into fix/issue-1753
Siemienik Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions lib/stream/xlsx/workbook-reader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ class WorkbookReader extends EventEmitter {
waitingWorkSheets.push({sheetNo, path, tempFileCleanupCallback});

const tempStream = fs.createWriteStream(path);
tempStream.on('error', reject);
entry.pipe(tempStream);
return tempStream.on('finish', () => {
return resolve();
Expand Down Expand Up @@ -298,11 +299,8 @@ class WorkbookReader extends EventEmitter {
options: this.options,
});

const matchingRel = (this.workbookRels || []).find(
rel => rel.Target === `worksheets/sheet${sheetNo}.xml`
);
const matchingSheet =
matchingRel && (this.model.sheets || []).find(sheet => sheet.rId === matchingRel.Id);
const matchingRel = (this.workbookRels || []).find(rel => rel.Target === `worksheets/sheet${sheetNo}.xml`);
const matchingSheet = matchingRel && (this.model.sheets || []).find(sheet => sheet.rId === matchingRel.Id);
if (matchingSheet) {
worksheetReader.id = matchingSheet.id;
worksheetReader.name = matchingSheet.name;
Expand Down