refactor: logic

Author: alexander-akait

src/middleware.js

@@ -6,6 +6,7 @@ const onFinishedStream = require("on-finished");
 
 const {
   createReadStreamOrReadFile,
+  destroyStream,
   escapeHtml,
   etag,
   finish,
@@ -17,8 +18,10 @@ const {
   getResponseHeader,
   getResponseHeaders,
   getStatusCode,
+  getValueContentRangeHeader,
   initState,
   memorize,
+  parseHttpDate,
   parseTokenList,
   pipe,
   removeResponseHeader,
@@ -309,48 +312,8 @@ async function getFilenameFromUrl(context, url) {
   }
 }
 
-/**
- * @param {"bytes"} type type
- * @param {number} size size
- * @param {import("range-parser").Range=} range range
- * @returns {string} value of content range header
- */
-function getValueContentRangeHeader(type, size, range) {
-  return `${type} ${range ? `${range.start}-${range.end}` : "*"}/${size}`;
-}
-
-/**
- * Parse an HTTP Date into a number.
- * @param {string} date date
- * @returns {number} timestamp
- */
-function parseHttpDate(date) {
-  const timestamp = date && Date.parse(date);
-
-  // istanbul ignore next: guard against date.js Date.parse patching
-  return typeof timestamp === "number" ? timestamp : Number.NaN;
-}
-
 const CACHE_CONTROL_NO_CACHE_REGEXP = /(?:^|,)\s*?no-cache\s*?(?:,|$)/;
 
-/**
- * @param {import("fs").ReadStream} stream stream
- * @param {boolean} suppress do need suppress?
- * @returns {void}
- */
-function destroyStream(stream, suppress) {
-  if (stream.destroyed) {
-    return;
-  }
-
-  stream.destroy();
-
-  if (typeof stream.addListener === "function" && suppress) {
-    stream.removeAllListeners("error");
-    stream.addListener("error", () => {});
-  }
-}
-
 /** @type {Record<number, string>} */
 const statuses = {
   400: "Bad Request",
@@ -943,7 +906,7 @@ function wrapper(context) {
           [start, end] = calcStartAndEnd(offset, len);
 
           try {
-            const result = await createReadStreamOrReadFile(
+            const result = createReadStreamOrReadFile(
               filename,
               extra.outputFileSystem,
               start,
@@ -1088,7 +1051,7 @@ function wrapper(context) {
         [start, end] = calcStartAndEnd(offset, len);
 
         try {
-          ({ bufferOrStream, byteLength } = await createReadStreamOrReadFile(
+          ({ bufferOrStream, byteLength } = createReadStreamOrReadFile(
             filename,
             extra.outputFileSystem,
             start,

src/utils.js

@@ -66,6 +66,28 @@ function escapeHtml(string) {
 /** @typedef {import("fs").Stats} Stats */
 /** @typedef {import("fs").ReadStream} ReadStream */
 
+/**
+ * Parse an HTTP Date into a number.
+ * @param {string} date date
+ * @returns {number} timestamp
+ */
+function parseHttpDate(date) {
+  const timestamp = date && Date.parse(date);
+
+  // istanbul ignore next: guard against date.js Date.parse patching
+  return typeof timestamp === "number" ? timestamp : Number.NaN;
+}
+
+/**
+ * @param {"bytes"} type type
+ * @param {number} size size
+ * @param {import("range-parser").Range=} range range
+ * @returns {string} value of content range header
+ */
+function getValueContentRangeHeader(type, size, range) {
+  return `${type} ${range ? `${range.start}-${range.end}` : "*"}/${size}`;
+}
+
 /**
  * Generate a tag for a stat.
  * @param {Stats} stats stats
@@ -447,14 +469,9 @@ function finish(res, data) {
  * @param {OutputFileSystem} outputFileSystem output file system
  * @param {number} start start
  * @param {number} end end
- * @returns {Promise<{ bufferOrStream: (Buffer | import("fs").ReadStream), byteLength: number }>} result with buffer or stream and byte length
+ * @returns {{ bufferOrStream: (Buffer | import("fs").ReadStream), byteLength: number }} result with buffer or stream and byte length
  */
-async function createReadStreamOrReadFile(
-  filename,
-  outputFileSystem,
-  start,
-  end,
-) {
+function createReadStreamOrReadFile(filename, outputFileSystem, start, end) {
   /** @type {string | Buffer | import("fs").ReadStream} */
   let bufferOrStream;
   /** @type {number} */
@@ -474,29 +491,33 @@ async function createReadStreamOrReadFile(
 
     byteLength = end === 0 ? 0 : end - start + 1;
   } else {
-    bufferOrStream = await new Promise(
-      /**
-       * @param {(value: Buffer) => void} resolve resolve
-       * @param {(reason: Error) => void} reject reject
-       */
-      (resolve, reject) => {
-        outputFileSystem.readFile(filename, (err, data) => {
-          if (err) {
-            reject(err);
-            return;
-          }
-
-          resolve(/** @type {Buffer} */ (data));
-        });
-      },
-    );
+    bufferOrStream = outputFileSystem.readFileSync(filename);
+    ({ byteLength } = bufferOrStream);
 
     byteLength = bufferOrStream.byteLength;
   }
 
   return { bufferOrStream, byteLength };
 }
 
+/**
+ * @param {import("fs").ReadStream} stream stream
+ * @param {boolean} suppress do need suppress?
+ * @returns {void}
+ */
+function destroyStream(stream, suppress) {
+  if (stream.destroyed) {
+    return;
+  }
+
+  stream.destroy();
+
+  if (typeof stream.addListener === "function" && suppress) {
+    stream.removeAllListeners("error");
+    stream.addListener("error", () => {});
+  }
+}
+
 /**
  * @template {ServerResponse & ExpectedServerResponse} Response
  * @param {Response} res res
@@ -544,6 +565,7 @@ function setState(res, name, value) {
 
 module.exports = {
   createReadStreamOrReadFile,
+  destroyStream,
   escapeHtml,
   etag,
   finish,
@@ -555,8 +577,10 @@ module.exports = {
   getResponseHeader,
   getResponseHeaders,
   getStatusCode,
+  getValueContentRangeHeader,
   initState,
   memorize,
+  parseHttpDate,
   parseTokenList,
   pipe,
   removeResponseHeader,