Skip to content

Create a clean stream using fs.createReadStream #764

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Create a clean stream using fs.createReadStream #764

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
298c87e
[fix] transform to string
Its-Just-Nans Nov 14, 2021
fc97638
[fix] delete toString()
Its-Just-Nans Nov 14, 2021
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
9 changes: 2 additions & 7 deletions lib/core/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
const path = require('path');
const fs = require('fs');
const url = require('url');
const { Readable } = require('stream');
const buffer = require('buffer');
const mime = require('mime');
const urlJoin = require('url-join');
Expand Down Expand Up @@ -235,15 +234,13 @@ module.exports = function createMiddleware(_dir, _options) {
const lastModified = (new Date(stat.mtime)).toUTCString();
const etag = generateEtag(stat, weakEtags);
let cacheControl = cache;
let stream = null;
if (contentType && isTextFile(contentType)) {
if (stat.size < buffer.constants.MAX_LENGTH) {
const bytes = fs.readFileSync(file);
const sniffedEncoding = htmlEncodingSniffer(bytes, {
defaultEncoding: 'UTF-8'
});
contentType += `; charset=${sniffedEncoding}`;
stream = Readable.from(bytes)
} else {
// Assume text types are utf8
contentType += '; charset=UTF-8';
Expand Down Expand Up @@ -329,10 +326,8 @@ module.exports = function createMiddleware(_dir, _options) {
return;
}

// stream may already have been assigned during encoding sniffing.
if (stream === null) {
stream = fs.createReadStream(file);
}
// create a clean stream using 'createReadStream'
const stream = fs.createReadStream(file);

stream.pipe(res);
stream.on('error', (err) => {
Expand Down