koa-files 3.0.7 → 3.1.0

package/README.md

@@ -89,6 +89,11 @@ export default function server(root: string, options?: Options): Middleware;
 - Use the file system's last modified value.
 - Can be overridden by the `headers`.
 
+##### `highWaterMark`
+
+- Defaults to `node:stream.Readable.highWaterMark`.
+- Set the high water mark for the read stream.
+
 ##### `ignore`
 
 - Defaults to `undefined`.

package/cjs/Service.cjs

@@ -1,7 +1,7 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 3.0.7
+ * @version 3.1.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme
@@ -10,10 +10,9 @@
 'use strict';
 
 const createETag = require('etag');
-const destroy = require('destroy');
-const stream = require('stream');
 const fs = require('./utils/fs.cjs');
 const path$1 = require('path');
+const stream = require('./utils/stream.cjs');
 const path = require('./utils/path.cjs');
 const http = require('./utils/http.cjs');
 
@@ -22,7 +21,6 @@ function _interopDefault(e) {
 }
 
 const createETag__default = /*#__PURE__*/ _interopDefault(createETag);
-const destroy__default = /*#__PURE__*/ _interopDefault(destroy);
 
 /**
  * @module Service
@@ -46,6 +44,18 @@ class Service {
    * @param options The file service options.
    */
   constructor(root, options) {
+    Object.defineProperty(this, 'root', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, 'options', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
     this.options = options;
     this.root = path.unixify(path$1.resolve(root));
   }
@@ -109,81 +119,6 @@ class Service {
       }
     }
   }
-  /**
-   * @private
-   * @method read
-   * @description Read file with range.
-   * @param path The file path to read.
-   * @param range The range to read.
-   * @param stream The destination stream.
-   * @param end The end flag after pipe to stream.
-   */
-  read(path, range, stream, end) {
-    const { fs } = this.options;
-    return new Promise(resolve => {
-      // Range prefix and suffix.
-      const { prefix, suffix } = range;
-      // Create file stream reader.
-      const reader = fs.createReadStream(path, range);
-      // File read stream open.
-      if (prefix) {
-        reader.once('open', () => {
-          // Write prefix boundary.
-          stream.write(prefix);
-        });
-      }
-      // File read stream end.
-      if (suffix) {
-        reader.once('end', () => {
-          // Push suffix boundary.
-          stream.write(suffix);
-        });
-      }
-      // File read stream error.
-      reader.once('error', () => {
-        // End stream.
-        stream.end();
-        // Unpipe.
-        reader.unpipe();
-        // Destroy.
-        destroy__default.default(reader);
-        // Resolve.
-        resolve(false);
-      });
-      // File read stream close.
-      reader.once('close', () => {
-        // Unpipe.
-        reader.unpipe();
-        // Destroy.
-        destroy__default.default(reader);
-        // Resolve.
-        resolve(true);
-      });
-      // Write data to buffer.
-      reader.pipe(stream, { end });
-    });
-  }
-  /**
-   * @private
-   * @method send
-   * @description Send file with ranges.
-   * @param path The file path to send.
-   * @param ranges The ranges to send.
-   * @param stream The destination stream.
-   */
-  async send(path, ranges, stream) {
-    // Ranges length.
-    let { length } = ranges;
-    // Write ranges to stream.
-    for (const range of ranges) {
-      // Write range.
-      const passed = await this.read(path, range, stream, --length === 0);
-      // If not passed, break.
-      if (!passed) {
-        break;
-      }
-    }
-  }
   /**
    * @public
    * @method respond
@@ -264,14 +199,10 @@ class Service {
     if (ranges === -2) {
       return context.throw(400);
     }
-    // Set stream body, highWaterMark 64kb.
-    const stream$1 = new stream.PassThrough({
-      highWaterMark: 65536
-    });
-    // Send file with ranges.
-    this.send(path$2, ranges, stream$1);
+    // Ranges length.
+    const { fs: fs$1, highWaterMark } = this.options;
     // Set response body.
-    context.body = stream$1;
+    context.body = new stream.FileReadStream(path$2, ranges, { fs: fs$1, highWaterMark });
     // File found.
     return true;
   }

package/cjs/index.cjs

@@ -1,7 +1,7 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 3.0.7
+ * @version 3.1.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme

package/cjs/utils/fs.cjs

@@ -1,7 +1,7 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 3.0.7
+ * @version 3.1.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme

package/cjs/utils/hash.cjs

@@ -1,7 +1,7 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 3.0.7
+ * @version 3.1.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme

package/cjs/utils/http.cjs

@@ -1,7 +1,7 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 3.0.7
+ * @version 3.1.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme
@@ -9,6 +9,7 @@
 
 'use strict';
 
+const buffer = require('buffer');
 const hash = require('./hash.cjs');
 const parseRange = require('range-parser');
 
@@ -175,42 +176,44 @@ function parseRanges(context, stats) {
           let contentLength = 0;
           // Ranges.
           const ranges = [];
+          // Parsed entries.
+          const entries = parsed.entries();
           // Range boundary.
           const boundary = `<${hash.generate()}>`;
-          // Range suffix.
-          const suffix = `\r\n--${boundary}--\r\n`;
           // Multipart Content-Type.
           const contentType = `Content-Type: ${context.type}`;
+          // Range suffix.
+          const suffix = buffer.Buffer.from(`\r\n--${boundary}--\r\n`);
           // Override Content-Type.
           context.type = `multipart/byteranges; boundary=${boundary}`;
           // Map ranges.
-          for (let index = 0; index < length; index++) {
-            const { start, end } = parsed[index];
-            // The first prefix boundary no \r\n.
+          for (const [index, { start, end }] of entries) {
+            const length = end - start + 1;
             const head = index > 0 ? '\r\n' : '';
             const contentRange = `Content-Range: bytes ${start}-${end}/${size}`;
-            const prefix = `${head}--${boundary}\r\n${contentType}\r\n${contentRange}\r\n\r\n`;
+            const prefix = buffer.Buffer.from(`${head}--${boundary}\r\n${contentType}\r\n${contentRange}\r\n\r\n`);
             // Compute Content-Length
-            contentLength += end - start + 1 + Buffer.byteLength(prefix);
+            contentLength += length + prefix.length;
             // Cache range.
-            ranges.push({ start, end, prefix });
+            ranges.push({ offset: start, length, prefix });
           }
-          // The last add suffix boundary.
-          ranges[length - 1].suffix = suffix;
           // Compute Content-Length.
-          contentLength += Buffer.byteLength(suffix);
+          contentLength += suffix.length;
           // Set Content-Length.
           context.length = contentLength;
+          // The last add suffix boundary.
+          ranges[length - 1].suffix = suffix;
           // Return ranges.
           return ranges;
         } else {
           const [{ start, end }] = parsed;
+          const length = end - start + 1;
           // Set Content-Length.
-          context.length = end - start + 1;
+          context.length = length;
           // Set Content-Range.
           context.set('Content-Range', `bytes ${start}-${end}/${size}`);
           // Return ranges.
-          return parsed;
+          return [{ offset: start, length }];
         }
       }
     }
@@ -218,7 +221,7 @@ function parseRanges(context, stats) {
   // Set Content-Length.
   context.length = size;
   // Return ranges.
-  return [{ start: 0, end: Math.max(size - 1) }];
+  return [{ offset: 0, length: size }];
 }
 
 exports.decodeURI = decodeURI;

package/cjs/utils/path.cjs

@@ -1,7 +1,7 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 3.0.7
+ * @version 3.1.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme

package/cjs/utils/stream.cjs

@@ -0,0 +1,229 @@
+/**
+ * @package koa-files
+ * @license MIT
+ * @version 3.1.0
+ * @author nuintun <nuintun@qq.com>
+ * @description A static files serving middleware for koa.
+ * @see https://github.com/nuintun/koa-files#readme
+ */
+
+'use strict';
+
+const buffer = require('buffer');
+const stream = require('stream');
+
+/**
+ * @module stream
+ */
+class FileReadStream extends stream.Readable {
+  /**
+   * @constructor
+   * @param path The file path.
+   * @param ranges The ranges to read.
+   * @param options The stream options.
+   */
+  constructor(path, ranges, options) {
+    const { fs, encoding, highWaterMark } = options;
+    super({ encoding, highWaterMark });
+    Object.defineProperty(this, 'fd', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, 'fs', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, 'path', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, 'ranges', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, 'bytesRead', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: 0
+    });
+    Object.defineProperty(this, 'reading', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: false
+    });
+    Object.defineProperty(this, 'currentRangeIndex', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: 0
+    });
+    Object.defineProperty(this, 'readState', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: 0 /* ReadState.PREFIX */
+    });
+    this.fs = fs;
+    this.path = path;
+    this.ranges = ranges;
+  }
+  /**
+   * @override
+   * @method _construct
+   * @param callback The callback.
+   */
+  _construct(callback) {
+    this.fs.open(this.path, 'r', (openError, fd) => {
+      if (openError === null) {
+        this.fd = fd;
+      }
+      callback(openError);
+    });
+  }
+  /**
+   * @private
+   * @method getRange
+   */
+  getRange() {
+    return this.ranges[this.currentRangeIndex];
+  }
+  /**
+   * @private
+   * @method getPadding
+   * @param range The current range.
+   */
+  getPadding(range) {
+    switch (this.readState) {
+      case 0 /* ReadState.PREFIX */:
+        return range.prefix;
+      case 2 /* ReadState.SUFFIX */:
+        return range.suffix;
+    }
+  }
+  /**
+   * @private
+   * @method readFilePadding
+   * @param fd The file descriptor.
+   * @param range The current range.
+   * @param size The number of bytes to read.
+   */
+  readFilePadding(fd, range, size) {
+    let bytesRead = 0;
+    const padding = this.getPadding(range);
+    const hasRangePadding = padding != null;
+    const length = hasRangePadding ? padding.length : 0;
+    if (hasRangePadding && length > 0) {
+      const begin = this.bytesRead;
+      bytesRead = Math.min(size, length - begin);
+      const end = begin + bytesRead;
+      this.push(padding.subarray(begin, end));
+      this.bytesRead = end;
+    }
+    if (!hasRangePadding || this.bytesRead >= length) {
+      this.bytesRead = 0;
+      const hasBytesRead = bytesRead > 0;
+      switch (this.readState) {
+        case 0 /* ReadState.PREFIX */:
+          this.readState = 1 /* ReadState.RANGE */;
+          if (!hasBytesRead) {
+            this.readFileRange(fd, range, size);
+          }
+          break;
+        case 2 /* ReadState.SUFFIX */:
+          this.currentRangeIndex++;
+          this.readState = 0 /* ReadState.PREFIX */;
+          if (!hasBytesRead) {
+            const range = this.getRange();
+            if (range == null) {
+              this.push(null);
+            } else {
+              this.readFilePadding(fd, range, size);
+            }
+          }
+          break;
+      }
+    }
+  }
+  /**
+   * @private
+   * @method readFileRange
+   * @param fd The file descriptor.
+   * @param range The current range.
+   * @param size The number of bytes to read.
+   */
+  readFileRange(fd, range, size) {
+    this.reading = true;
+    const { bytesRead } = this;
+    const position = range.offset + bytesRead;
+    const buffer$1 = buffer.Buffer.alloc(Math.min(size, range.length - bytesRead));
+    this.fs.read(fd, buffer$1, 0, buffer$1.length, position, (readError, bytesRead, buffer) => {
+      if (readError === null) {
+        if (bytesRead > 0) {
+          this.push(buffer.subarray(0, bytesRead));
+          this.bytesRead += bytesRead;
+        } else {
+          this.bytesRead = 0;
+          this.readState = 2 /* ReadState.SUFFIX */;
+          this.readFilePadding(fd, range, size);
+        }
+      } else {
+        this.destroy(readError);
+      }
+      this.reading = false;
+    });
+  }
+  /**
+   * @override
+   * @method _read
+   * @param size The number of bytes to read.
+   */
+  _read(size) {
+    if (!this.reading) {
+      const { fd } = this;
+      const range = this.getRange();
+      if (fd != null && range != null) {
+        switch (this.readState) {
+          case 0 /* ReadState.PREFIX */:
+          case 2 /* ReadState.SUFFIX */:
+            this.readFilePadding(fd, range, size);
+            break;
+          case 1 /* ReadState.RANGE */:
+            this.readFileRange(fd, range, size);
+            break;
+          default:
+            throw new Error(`invalid read state: ${this.readState}`);
+        }
+      } else {
+        this.push(null);
+      }
+    }
+  }
+  /**
+   * @override
+   * @method _destroy
+   * @param error The error.
+   * @param callback The callback.
+   */
+  _destroy(error, callback) {
+    const { fd } = this;
+    if (fd != null) {
+      this.fs.close(fd, closeError => {
+        callback(error !== null && error !== void 0 ? error : closeError);
+      });
+    } else {
+      callback(error);
+    }
+  }
+}
+
+exports.FileReadStream = FileReadStream;

package/esm/Service.js

@@ -1,17 +1,16 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 3.0.7
+ * @version 3.1.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme
  */
 
 import createETag from 'etag';
-import destroy from 'destroy';
-import { PassThrough } from 'stream';
 import { stat } from './utils/fs.js';
 import { resolve, extname, join } from 'path';
+import { FileReadStream } from './utils/stream.js';
 import { unixify, isOutRoot, hasTrailingSlash } from './utils/path.js';
 import { decodeURI, isConditionalGET, isPreconditionFailure, parseRanges } from './utils/http.js';
 
@@ -37,6 +36,18 @@ class Service {
    * @param options The file service options.
    */
   constructor(root, options) {
+    Object.defineProperty(this, 'root', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, 'options', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
     this.options = options;
     this.root = unixify(resolve(root));
   }
@@ -100,81 +111,6 @@ class Service {
       }
     }
   }
-  /**
-   * @private
-   * @method read
-   * @description Read file with range.
-   * @param path The file path to read.
-   * @param range The range to read.
-   * @param stream The destination stream.
-   * @param end The end flag after pipe to stream.
-   */
-  read(path, range, stream, end) {
-    const { fs } = this.options;
-    return new Promise(resolve => {
-      // Range prefix and suffix.
-      const { prefix, suffix } = range;
-      // Create file stream reader.
-      const reader = fs.createReadStream(path, range);
-      // File read stream open.
-      if (prefix) {
-        reader.once('open', () => {
-          // Write prefix boundary.
-          stream.write(prefix);
-        });
-      }
-      // File read stream end.
-      if (suffix) {
-        reader.once('end', () => {
-          // Push suffix boundary.
-          stream.write(suffix);
-        });
-      }
-      // File read stream error.
-      reader.once('error', () => {
-        // End stream.
-        stream.end();
-        // Unpipe.
-        reader.unpipe();
-        // Destroy.
-        destroy(reader);
-        // Resolve.
-        resolve(false);
-      });
-      // File read stream close.
-      reader.once('close', () => {
-        // Unpipe.
-        reader.unpipe();
-        // Destroy.
-        destroy(reader);
-        // Resolve.
-        resolve(true);
-      });
-      // Write data to buffer.
-      reader.pipe(stream, { end });
-    });
-  }
-  /**
-   * @private
-   * @method send
-   * @description Send file with ranges.
-   * @param path The file path to send.
-   * @param ranges The ranges to send.
-   * @param stream The destination stream.
-   */
-  async send(path, ranges, stream) {
-    // Ranges length.
-    let { length } = ranges;
-    // Write ranges to stream.
-    for (const range of ranges) {
-      // Write range.
-      const passed = await this.read(path, range, stream, --length === 0);
-      // If not passed, break.
-      if (!passed) {
-        break;
-      }
-    }
-  }
   /**
    * @public
    * @method respond
@@ -255,14 +191,10 @@ class Service {
     if (ranges === -2) {
       return context.throw(400);
     }
-    // Set stream body, highWaterMark 64kb.
-    const stream = new PassThrough({
-      highWaterMark: 65536
-    });
-    // Send file with ranges.
-    this.send(path, ranges, stream);
+    // Ranges length.
+    const { fs, highWaterMark } = this.options;
     // Set response body.
-    context.body = stream;
+    context.body = new FileReadStream(path, ranges, { fs, highWaterMark });
     // File found.
     return true;
   }

package/esm/index.js

@@ -1,7 +1,7 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 3.0.7
+ * @version 3.1.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme

package/esm/utils/fs.js

@@ -1,7 +1,7 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 3.0.7
+ * @version 3.1.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme

package/esm/utils/hash.js

@@ -1,7 +1,7 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 3.0.7
+ * @version 3.1.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme

package/esm/utils/http.js

@@ -1,12 +1,13 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 3.0.7
+ * @version 3.1.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme
  */
 
+import { Buffer } from 'buffer';
 import { generate } from './hash.js';
 import parseRange from 'range-parser';
 
@@ -167,42 +168,44 @@ function parseRanges(context, stats) {
           let contentLength = 0;
           // Ranges.
           const ranges = [];
+          // Parsed entries.
+          const entries = parsed.entries();
           // Range boundary.
           const boundary = `<${generate()}>`;
-          // Range suffix.
-          const suffix = `\r\n--${boundary}--\r\n`;
           // Multipart Content-Type.
           const contentType = `Content-Type: ${context.type}`;
+          // Range suffix.
+          const suffix = Buffer.from(`\r\n--${boundary}--\r\n`);
           // Override Content-Type.
           context.type = `multipart/byteranges; boundary=${boundary}`;
           // Map ranges.
-          for (let index = 0; index < length; index++) {
-            const { start, end } = parsed[index];
-            // The first prefix boundary no \r\n.
+          for (const [index, { start, end }] of entries) {
+            const length = end - start + 1;
             const head = index > 0 ? '\r\n' : '';
             const contentRange = `Content-Range: bytes ${start}-${end}/${size}`;
-            const prefix = `${head}--${boundary}\r\n${contentType}\r\n${contentRange}\r\n\r\n`;
+            const prefix = Buffer.from(`${head}--${boundary}\r\n${contentType}\r\n${contentRange}\r\n\r\n`);
             // Compute Content-Length
-            contentLength += end - start + 1 + Buffer.byteLength(prefix);
+            contentLength += length + prefix.length;
             // Cache range.
-            ranges.push({ start, end, prefix });
+            ranges.push({ offset: start, length, prefix });
           }
-          // The last add suffix boundary.
-          ranges[length - 1].suffix = suffix;
           // Compute Content-Length.
-          contentLength += Buffer.byteLength(suffix);
+          contentLength += suffix.length;
           // Set Content-Length.
           context.length = contentLength;
+          // The last add suffix boundary.
+          ranges[length - 1].suffix = suffix;
           // Return ranges.
           return ranges;
         } else {
           const [{ start, end }] = parsed;
+          const length = end - start + 1;
           // Set Content-Length.
-          context.length = end - start + 1;
+          context.length = length;
           // Set Content-Range.
           context.set('Content-Range', `bytes ${start}-${end}/${size}`);
           // Return ranges.
-          return parsed;
+          return [{ offset: start, length }];
         }
       }
     }
@@ -210,7 +213,7 @@ function parseRanges(context, stats) {
   // Set Content-Length.
   context.length = size;
   // Return ranges.
-  return [{ start: 0, end: Math.max(size - 1) }];
+  return [{ offset: 0, length: size }];
 }
 
 export { decodeURI, isConditionalGET, isPreconditionFailure, parseRanges };

package/esm/utils/path.js

@@ -1,7 +1,7 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 3.0.7
+ * @version 3.1.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme

package/esm/utils/stream.js

@@ -0,0 +1,227 @@
+/**
+ * @package koa-files
+ * @license MIT
+ * @version 3.1.0
+ * @author nuintun <nuintun@qq.com>
+ * @description A static files serving middleware for koa.
+ * @see https://github.com/nuintun/koa-files#readme
+ */
+
+import { Buffer } from 'buffer';
+import { Readable } from 'stream';
+
+/**
+ * @module stream
+ */
+class FileReadStream extends Readable {
+  /**
+   * @constructor
+   * @param path The file path.
+   * @param ranges The ranges to read.
+   * @param options The stream options.
+   */
+  constructor(path, ranges, options) {
+    const { fs, encoding, highWaterMark } = options;
+    super({ encoding, highWaterMark });
+    Object.defineProperty(this, 'fd', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, 'fs', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, 'path', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, 'ranges', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, 'bytesRead', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: 0
+    });
+    Object.defineProperty(this, 'reading', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: false
+    });
+    Object.defineProperty(this, 'currentRangeIndex', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: 0
+    });
+    Object.defineProperty(this, 'readState', {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: 0 /* ReadState.PREFIX */
+    });
+    this.fs = fs;
+    this.path = path;
+    this.ranges = ranges;
+  }
+  /**
+   * @override
+   * @method _construct
+   * @param callback The callback.
+   */
+  _construct(callback) {
+    this.fs.open(this.path, 'r', (openError, fd) => {
+      if (openError === null) {
+        this.fd = fd;
+      }
+      callback(openError);
+    });
+  }
+  /**
+   * @private
+   * @method getRange
+   */
+  getRange() {
+    return this.ranges[this.currentRangeIndex];
+  }
+  /**
+   * @private
+   * @method getPadding
+   * @param range The current range.
+   */
+  getPadding(range) {
+    switch (this.readState) {
+      case 0 /* ReadState.PREFIX */:
+        return range.prefix;
+      case 2 /* ReadState.SUFFIX */:
+        return range.suffix;
+    }
+  }
+  /**
+   * @private
+   * @method readFilePadding
+   * @param fd The file descriptor.
+   * @param range The current range.
+   * @param size The number of bytes to read.
+   */
+  readFilePadding(fd, range, size) {
+    let bytesRead = 0;
+    const padding = this.getPadding(range);
+    const hasRangePadding = padding != null;
+    const length = hasRangePadding ? padding.length : 0;
+    if (hasRangePadding && length > 0) {
+      const begin = this.bytesRead;
+      bytesRead = Math.min(size, length - begin);
+      const end = begin + bytesRead;
+      this.push(padding.subarray(begin, end));
+      this.bytesRead = end;
+    }
+    if (!hasRangePadding || this.bytesRead >= length) {
+      this.bytesRead = 0;
+      const hasBytesRead = bytesRead > 0;
+      switch (this.readState) {
+        case 0 /* ReadState.PREFIX */:
+          this.readState = 1 /* ReadState.RANGE */;
+          if (!hasBytesRead) {
+            this.readFileRange(fd, range, size);
+          }
+          break;
+        case 2 /* ReadState.SUFFIX */:
+          this.currentRangeIndex++;
+          this.readState = 0 /* ReadState.PREFIX */;
+          if (!hasBytesRead) {
+            const range = this.getRange();
+            if (range == null) {
+              this.push(null);
+            } else {
+              this.readFilePadding(fd, range, size);
+            }
+          }
+          break;
+      }
+    }
+  }
+  /**
+   * @private
+   * @method readFileRange
+   * @param fd The file descriptor.
+   * @param range The current range.
+   * @param size The number of bytes to read.
+   */
+  readFileRange(fd, range, size) {
+    this.reading = true;
+    const { bytesRead } = this;
+    const position = range.offset + bytesRead;
+    const buffer = Buffer.alloc(Math.min(size, range.length - bytesRead));
+    this.fs.read(fd, buffer, 0, buffer.length, position, (readError, bytesRead, buffer) => {
+      if (readError === null) {
+        if (bytesRead > 0) {
+          this.push(buffer.subarray(0, bytesRead));
+          this.bytesRead += bytesRead;
+        } else {
+          this.bytesRead = 0;
+          this.readState = 2 /* ReadState.SUFFIX */;
+          this.readFilePadding(fd, range, size);
+        }
+      } else {
+        this.destroy(readError);
+      }
+      this.reading = false;
+    });
+  }
+  /**
+   * @override
+   * @method _read
+   * @param size The number of bytes to read.
+   */
+  _read(size) {
+    if (!this.reading) {
+      const { fd } = this;
+      const range = this.getRange();
+      if (fd != null && range != null) {
+        switch (this.readState) {
+          case 0 /* ReadState.PREFIX */:
+          case 2 /* ReadState.SUFFIX */:
+            this.readFilePadding(fd, range, size);
+            break;
+          case 1 /* ReadState.RANGE */:
+            this.readFileRange(fd, range, size);
+            break;
+          default:
+            throw new Error(`invalid read state: ${this.readState}`);
+        }
+      } else {
+        this.push(null);
+      }
+    }
+  }
+  /**
+   * @override
+   * @method _destroy
+   * @param error The error.
+   * @param callback The callback.
+   */
+  _destroy(error, callback) {
+    const { fd } = this;
+    if (fd != null) {
+      this.fs.close(fd, closeError => {
+        callback(error !== null && error !== void 0 ? error : closeError);
+      });
+    } else {
+      callback(error);
+    }
+  }
+}
+
+export { FileReadStream };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koa-files",
-  "version": "3.0.7",
+  "version": "3.1.0",
   "description": "A static files serving middleware for koa.",
   "type": "module",
   "main": "cjs/index.cjs",
@@ -54,7 +54,6 @@
     "build:types": "tsc --declaration --emitDeclarationOnly --declarationDir types && node tools/fix-types.js"
   },
   "dependencies": {
-    "destroy": "^1.2.0",
     "etag": "^1.8.1",
     "range-parser": "^1.2.1",
     "tslib": "^2.7.0"

package/types/Service.d.ts

@@ -18,6 +18,7 @@ export interface Options {
   etag?: boolean;
   acceptRanges?: boolean;
   lastModified?: boolean;
+  highWaterMark?: number;
   ignore?: IgnoreFunction;
   headers?: Headers | HeaderFunction;
 }
@@ -50,25 +51,6 @@ export default class Service {
    * @param stats The file stats.
    */
   private setupHeaders;
-  /**
-   * @private
-   * @method read
-   * @description Read file with range.
-   * @param path The file path to read.
-   * @param range The range to read.
-   * @param stream The destination stream.
-   * @param end The end flag after pipe to stream.
-   */
-  private read;
-  /**
-   * @private
-   * @method send
-   * @description Send file with ranges.
-   * @param path The file path to send.
-   * @param ranges The ranges to send.
-   * @param stream The destination stream.
-   */
-  private send;
   /**
    * @public
    * @method respond

package/types/utils/fs.d.ts

@@ -1,8 +1,13 @@
 /**
  * @module fs
  */
-import { ReadStream, Stats } from 'fs';
-type PathLike = string | Buffer | URL;
+import fs, { Stats } from 'fs';
+export interface FileSystem {
+  stat: typeof fs.stat;
+  open: typeof fs.open;
+  read: typeof fs.read;
+  close: typeof fs.close;
+}
 /**
  * @function stat
  * @description Get file stats.
@@ -10,14 +15,3 @@ type PathLike = string | Buffer | URL;
  * @param path The file path.
  */
 export declare function stat(fs: FileSystem, path: string): Promise<Stats | null>;
-export interface FileSystem {
-  stat(path: PathLike, callback: (error: Error | null, stats: Stats) => void): void;
-  createReadStream(
-    path: PathLike,
-    options?: {
-      start?: number;
-      end?: number;
-    }
-  ): ReadStream;
-}
-export {};

package/types/utils/http.d.ts

@@ -3,12 +3,7 @@
  */
 import { Stats } from 'fs';
 import { Context } from 'koa';
-export interface Range {
-  start: number;
-  end?: number;
-  prefix?: string;
-  suffix?: string;
-}
+import { Range } from './stream';
 type Ranges = Range[] | -1 | -2;
 /**
  * @function decodeURI

package/types/utils/stream.d.ts

@@ -0,0 +1,83 @@
+/**
+ * @module stream
+ */
+import { PathLike } from 'fs';
+import { Buffer } from 'buffer';
+import { FileSystem } from './fs';
+import { Readable, ReadableOptions } from 'stream';
+export interface Options extends Pick<ReadableOptions, 'encoding' | 'highWaterMark'> {
+  fs: FileSystem;
+}
+export interface Range {
+  offset: number;
+  length: number;
+  prefix?: Buffer;
+  suffix?: Buffer;
+}
+interface Callback {
+  (error?: Error | null): void;
+}
+export declare class FileReadStream extends Readable {
+  private fd?;
+  private fs;
+  private path;
+  private ranges;
+  private bytesRead;
+  private reading;
+  private currentRangeIndex;
+  private readState;
+  /**
+   * @constructor
+   * @param path The file path.
+   * @param ranges The ranges to read.
+   * @param options The stream options.
+   */
+  constructor(path: PathLike, ranges: Range[], options: Options);
+  /**
+   * @override
+   * @method _construct
+   * @param callback The callback.
+   */
+  _construct(callback: Callback): void;
+  /**
+   * @private
+   * @method getRange
+   */
+  private getRange;
+  /**
+   * @private
+   * @method getPadding
+   * @param range The current range.
+   */
+  private getPadding;
+  /**
+   * @private
+   * @method readFilePadding
+   * @param fd The file descriptor.
+   * @param range The current range.
+   * @param size The number of bytes to read.
+   */
+  private readFilePadding;
+  /**
+   * @private
+   * @method readFileRange
+   * @param fd The file descriptor.
+   * @param range The current range.
+   * @param size The number of bytes to read.
+   */
+  private readFileRange;
+  /**
+   * @override
+   * @method _read
+   * @param size The number of bytes to read.
+   */
+  _read(size: number): void;
+  /**
+   * @override
+   * @method _destroy
+   * @param error The error.
+   * @param callback The callback.
+   */
+  _destroy(error: Error | null, callback: Callback): void;
+}
+export {};