koa-files 4.1.6 → 5.0.0

package/README.md

@@ -9,7 +9,7 @@
 > ![Node Version][node-image]
 > [![License][license-image]][license-url]
 
-## Installation
+## Install
 
 ```bash
 $ npm install koa-files

package/cjs/ReadStream.cjs

@@ -1,7 +1,8 @@
 /**
+ * @module koa-files
  * @package koa-files
  * @license MIT
- * @version 4.1.6
+ * @version 5.0.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme
@@ -9,14 +10,22 @@
 
 'use strict';
 
-const buffer = require('buffer');
-const stream = require('stream');
+const node_buffer = require('node:buffer');
+const node_stream = require('node:stream');
 
 /**
  * @module ReadStream
  */
 const DISPOSE_EVENT = Symbol('dispose');
-class ReadStream extends stream.Readable {
+class ReadStream extends node_stream.Readable {
+  #path;
+  #fs;
+  #ranges;
+  #bytesRead = 0;
+  #fd = null;
+  #reading = false;
+  #currentRangeIndex = 0;
+  #readState = 0 /* ReadState.PREFIX */;
   /**
    * @constructor
    * @param path The file path.
@@ -26,14 +35,9 @@ class ReadStream extends stream.Readable {
   constructor(path, ranges, options) {
     const { fs, highWaterMark } = options;
     super({ highWaterMark });
-    this.bytesRead = 0;
-    this.fd = null;
-    this.reading = false;
-    this.currentRangeIndex = 0;
-    this.readState = 0 /* ReadState.PREFIX */;
-    this.fs = fs;
-    this.path = path;
-    this.ranges = ranges;
+    this.#fs = fs;
+    this.#path = path;
+    this.#ranges = ranges;
   }
   /**
    * @override
@@ -41,27 +45,27 @@ class ReadStream extends stream.Readable {
    * @param callback The callback.
    */
   _construct(callback) {
-    this.fs.open(this.path, 'r', (openError, fd) => {
+    this.#fs.open(this.#path, 'r', (openError, fd) => {
       if (openError == null) {
-        this.fd = fd;
+        this.#fd = fd;
       }
       callback(openError);
     });
   }
   /**
    * @private
-   * @method getRange
+   * @method #getRange
    */
-  getRange() {
-    return this.ranges[this.currentRangeIndex];
+  #getRange() {
+    return this.#ranges[this.#currentRangeIndex];
   }
   /**
    * @private
-   * @method getPadding
+   * @method #getPadding
    * @param range The current range.
    */
-  getPadding(range) {
-    switch (this.readState) {
+  #getPadding(range) {
+    switch (this.#readState) {
       case 0 /* ReadState.PREFIX */:
         return range.prefix;
       case 2 /* ReadState.SUFFIX */:
@@ -70,42 +74,42 @@ class ReadStream extends stream.Readable {
   }
   /**
    * @private
-   * @method readPadding
+   * @method #readPadding
    * @param fd The file descriptor.
    * @param range The current range.
    * @param size The number of bytes to read.
    */
-  readPadding(fd, range, size) {
+  #readPadding(fd, range, size) {
     let bytesRead = 0;
-    const padding = this.getPadding(range);
+    const padding = this.#getPadding(range);
     // If padding exists.
     if (padding != null) {
       const { length } = padding;
-      const begin = this.bytesRead;
+      const begin = this.#bytesRead;
       if (begin < length) {
         bytesRead = Math.min(size, length - begin);
         const end = begin + bytesRead;
         this.push(padding.subarray(begin, end));
-        this.bytesRead = end;
+        this.#bytesRead = end;
       }
     }
     // If no padding or read completed.
     if (bytesRead < size) {
-      this.bytesRead = 0;
+      this.#bytesRead = 0;
       // Change read state.
-      switch (this.readState) {
+      switch (this.#readState) {
         case 0 /* ReadState.PREFIX */:
-          this.readState = 1 /* ReadState.RANGE */;
-          this.readFileRange(fd, range, size - bytesRead);
+          this.#readState = 1 /* ReadState.RANGE */;
+          this.#readFileRange(fd, range, size - bytesRead);
           break;
         case 2 /* ReadState.SUFFIX */:
-          this.currentRangeIndex++;
-          this.readState = 0 /* ReadState.PREFIX */;
-          const nextRange = this.getRange();
+          this.#currentRangeIndex++;
+          this.#readState = 0 /* ReadState.PREFIX */;
+          const nextRange = this.#getRange();
           if (nextRange == null) {
             this.push(null);
           } else {
-            this.readPadding(fd, nextRange, size - bytesRead);
+            this.#readPadding(fd, nextRange, size - bytesRead);
           }
           break;
       }
@@ -113,23 +117,23 @@ class ReadStream extends stream.Readable {
   }
   /**
    * @private
-   * @method readFileRange
+   * @method #readFileRange
    * @param fd The file descriptor.
    * @param range The current range.
    * @param size The number of bytes to read.
    */
-  readFileRange(fd, range, size) {
+  #readFileRange(fd, range, size) {
     const { length } = range;
-    const { bytesRead } = this;
+    const bytesRead = this.#bytesRead;
     // File range not finished.
     if (bytesRead < length) {
-      this.reading = true;
+      this.#reading = true;
       const bytesToRead = Math.min(size, length - bytesRead);
-      const buffer$1 = buffer.Buffer.allocUnsafeSlow(bytesToRead);
+      const buffer = node_buffer.Buffer.allocUnsafeSlow(bytesToRead);
       const position = range.offset + bytesRead;
       // Read file range.
-      this.fs.read(fd, buffer$1, 0, bytesToRead, position, (readError, bytesRead, buffer) => {
-        this.reading = false;
+      this.#fs.read(fd, buffer, 0, bytesToRead, position, (readError, bytesRead, buffer) => {
+        this.#reading = false;
         // Tell ._destroy() that it's safe to close the fd now.
         if (this.destroyed) {
           this.emit(DISPOSE_EVENT, readError);
@@ -139,19 +143,19 @@ class ReadStream extends stream.Readable {
           this.destroy(new RangeError('invalid read operation'));
         } else {
           this.push(buffer);
-          this.bytesRead += bytesRead;
+          this.#bytesRead += bytesRead;
           // file range read completed.
           if (bytesRead < size) {
-            this.bytesRead = 0;
-            this.readState = 2 /* ReadState.SUFFIX */;
-            this.readPadding(fd, range, size - bytesRead);
+            this.#bytesRead = 0;
+            this.#readState = 2 /* ReadState.SUFFIX */;
+            this.#readPadding(fd, range, size - bytesRead);
           }
         }
       });
     } else {
-      this.bytesRead = 0;
-      this.readState = 2 /* ReadState.SUFFIX */;
-      this.readPadding(fd, range, size);
+      this.#bytesRead = 0;
+      this.#readState = 2 /* ReadState.SUFFIX */;
+      this.#readPadding(fd, range, size);
     }
   }
   /**
@@ -160,21 +164,21 @@ class ReadStream extends stream.Readable {
    * @param size The number of bytes to read.
    */
   _read(size) {
-    if (!this.reading) {
-      const { fd } = this;
-      const range = this.getRange();
+    if (!this.#reading) {
+      const fd = this.#fd;
+      const range = this.#getRange();
       // If fd or range is null, finish stream.
       if (fd == null || range == null) {
         this.push(null);
       } else {
         // Read bytes from range.
-        switch (this.readState) {
+        switch (this.#readState) {
           case 0 /* ReadState.PREFIX */:
           case 2 /* ReadState.SUFFIX */:
-            this.readPadding(fd, range, size);
+            this.#readPadding(fd, range, size);
             break;
           case 1 /* ReadState.RANGE */:
-            this.readFileRange(fd, range, size);
+            this.#readFileRange(fd, range, size);
             break;
         }
       }
@@ -182,17 +186,17 @@ class ReadStream extends stream.Readable {
   }
   /**
    * @private
-   * @method dispose
+   * @method #dispose
    * @param error The error.
    * @param callback The callback.
    */
-  dispose(error, callback) {
-    const { fd } = this;
+  #dispose(error, callback) {
+    const fd = this.#fd;
     if (fd != null) {
-      this.fd = null;
+      this.#fd = null;
       // Close the fd.
-      this.fs.close(fd, closeError => {
-        callback(error !== null && error !== void 0 ? error : closeError);
+      this.#fs.close(fd, closeError => {
+        callback(error ?? closeError);
       });
     } else {
       callback(error);
@@ -206,12 +210,12 @@ class ReadStream extends stream.Readable {
    */
   _destroy(error, callback) {
     // Wait I/O completion.
-    if (this.reading) {
+    if (this.#reading) {
       this.once(DISPOSE_EVENT, disposeError => {
-        this.dispose(error !== null && error !== void 0 ? error : disposeError, callback);
+        this.#dispose(error ?? disposeError, callback);
       });
     } else {
-      this.dispose(error, callback);
+      this.#dispose(error, callback);
     }
   }
 }

package/cjs/ReadStream.d.cts

@@ -1,9 +1,8 @@
 /**
  * @module ReadStream
  */
-import { PathLike } from 'fs';
-import { Readable } from 'stream';
 import { Range } from './utils/http.cjs';
+import { Readable } from 'node:stream';
 import { FileSystem } from './utils/fs.cjs';
 export interface Options {
   fs: FileSystem;
@@ -13,67 +12,26 @@ interface Callback {
   (error?: Error | null): void;
 }
 export declare class ReadStream extends Readable {
-  private readonly fs;
-  private readonly path;
-  private readonly ranges;
-  private bytesRead;
-  private fd;
-  private reading;
-  private currentRangeIndex;
-  private readState;
+  #private;
   /**
    * @constructor
    * @param path The file path.
    * @param ranges The ranges to read.
    * @param options The stream options.
    */
-  constructor(path: PathLike, ranges: Range[], options: Options);
+  constructor(path: string, 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 readPadding
-   * @param fd The file descriptor.
-   * @param range The current range.
-   * @param size The number of bytes to read.
-   */
-  private readPadding;
-  /**
-   * @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;
-  /**
-   * @private
-   * @method dispose
-   * @param error The error.
-   * @param callback The callback.
-   */
-  private dispose;
   /**
    * @override
    * @method _destroy

package/cjs/Service.cjs

@@ -1,7 +1,8 @@
 /**
+ * @module koa-files
  * @package koa-files
  * @license MIT
- * @version 4.1.6
+ * @version 5.0.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme
@@ -10,11 +11,11 @@
 'use strict';
 
 const createETag = require('etag');
-const fs = require('fs');
+const fs = require('node:fs');
 const ReadStream = require('./ReadStream.cjs');
 const type = require('./utils/type.cjs');
 const fs$1 = require('./utils/fs.cjs');
-const path$1 = require('path');
+const node_path = require('node:path');
 const path = require('./utils/path.cjs');
 const http = require('./utils/http.cjs');
 
@@ -32,6 +33,8 @@ const fs__default = /*#__PURE__*/ _interopDefault(fs);
  * @class Service
  */
 class Service {
+  #root;
+  #options;
   /**
    * @constructor
    * @description Create file service.
@@ -39,30 +42,30 @@ class Service {
    * @param options The file service options.
    */
   constructor(root, options = {}) {
-    var _a;
-    this.root = path.unixify(path$1.resolve(root));
+    this.#root = path.unixify(node_path.resolve(root));
     const { ignore, headers, highWaterMark = 65536 } = options;
-    this.options = Object.assign(Object.assign({}, options), {
-      fs: (_a = options.fs) !== null && _a !== void 0 ? _a : fs__default.default,
+    this.#options = {
+      ...options,
+      fs: options.fs ?? fs__default.default,
       ignore: type.isFunction(ignore) ? ignore : () => false,
       headers: type.isFunction(headers) ? headers : () => headers,
       highWaterMark: type.isFunction(highWaterMark) ? highWaterMark : () => highWaterMark
-    });
+    };
   }
   /**
    * @private
-   * @method setupHeaders
+   * @method #setupHeaders
    * @description Setup headers.
    * @param context The koa context.
    * @param path The file path.
    * @param stats The file stats.
    */
-  async setupHeaders({ response }, path, stats) {
-    const { options } = this;
+  async #setupHeaders({ response }, path, stats) {
+    const options = this.#options;
     // Set status.
     response.status = 200;
     // Set Content-Type.
-    response.type = path$1.extname(path);
+    response.type = node_path.extname(path);
     // Get headers.
     const headers = await options.headers(path, stats);
     // If headers not empty, set headers.
@@ -114,21 +117,21 @@ class Service {
       return context.throw(400);
     }
     // Get service root.
-    const { root } = this;
+    const root = this.#root;
     // Get file path.
-    const path$2 = path.unixify(path$1.join(root, pathname));
+    const path$1 = path.unixify(node_path.join(root, pathname));
     // Malicious path (403).
-    if (path.isOutRoot(path$2, root)) {
+    if (path.isOutRoot(path$1, root)) {
       return false;
     }
     // Get options.
-    const { options } = this;
+    const options = this.#options;
     // Is ignore path or file (403).
-    if (await options.ignore(path$2)) {
+    if (await options.ignore(path$1)) {
       return false;
     }
     // File stats.
-    const stats = await fs$1.stat(options.fs, path$2);
+    const stats = await fs$1.stat(options.fs, path$1);
     // Check file stats.
     if (
       // File not exist (404 | 500).
@@ -136,14 +139,14 @@ class Service {
       // Is directory (403).
       stats.isDirectory() ||
       // Not a directory but has trailing slash (404).
-      path.hasTrailingSlash(path$2)
+      path.hasTrailingSlash(path$1)
     ) {
       return false;
     }
     // Koa response.
     const { response } = context;
     // Setup headers.
-    await this.setupHeaders(context, path$2, stats);
+    await this.#setupHeaders(context, path$1, stats);
     // Conditional get support.
     if (http.isConditionalGET(context)) {
       // Request precondition failed.
@@ -183,9 +186,9 @@ class Service {
       return context.throw(400);
     }
     // Set response body.
-    response.body = new ReadStream.ReadStream(path$2, ranges, {
+    response.body = new ReadStream.ReadStream(path$1, ranges, {
       fs: options.fs,
-      highWaterMark: await options.highWaterMark(path$2, stats)
+      highWaterMark: await options.highWaterMark(path$1, stats)
     });
     // File found.
     return true;

package/cjs/Service.d.cts

@@ -2,7 +2,7 @@
  * @module Service
  */
 import { Context } from 'koa';
-import { Stats } from 'fs';
+import { Stats } from 'node:fs';
 import { FileSystem } from './utils/fs.cjs';
 interface Headers {
   [key: string]: string | string[];
@@ -29,8 +29,7 @@ export interface Options {
  * @class Service
  */
 export declare class Service {
-  private readonly root;
-  private readonly options;
+  #private;
   /**
    * @constructor
    * @description Create file service.
@@ -38,15 +37,6 @@ export declare class Service {
    * @param options The file service options.
    */
   constructor(root: string, options?: Options);
-  /**
-   * @private
-   * @method setupHeaders
-   * @description Setup headers.
-   * @param context The koa context.
-   * @param path The file path.
-   * @param stats The file stats.
-   */
-  private setupHeaders;
   /**
    * @public
    * @method respond

package/cjs/index.cjs

@@ -1,7 +1,8 @@
 /**
+ * @module koa-files
  * @package koa-files
  * @license MIT
- * @version 4.1.6
+ * @version 5.0.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme
@@ -22,7 +23,7 @@ const Service = require('./Service.cjs');
  */
 function server(root, options) {
   const service = new Service.Service(root, options);
-  if (options === null || options === void 0 ? void 0 : options.defer) {
+  if (options?.defer) {
     return async (context, next) => {
       await next();
       await service.respond(context);

package/cjs/utils/fs.cjs

@@ -1,7 +1,8 @@
 /**
+ * @module koa-files
  * @package koa-files
  * @license MIT
- * @version 4.1.6
+ * @version 5.0.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.d.cts

@@ -1,12 +1,24 @@
 /**
  * @module fs
  */
-import fs, { Stats } from 'fs';
+import { PathLike, Stats } from 'node:fs';
+type Position = number | bigint | null;
+type OpenMode = string | number | undefined;
+interface Callback<T extends unknown[] = []> {
+  (error?: Error | null, ...rest: T): void;
+}
 export interface FileSystem {
-  stat: typeof fs.stat;
-  open: typeof fs.open;
-  read: typeof fs.read;
-  close: typeof fs.close;
+  close(fd: number, callback?: Callback): void;
+  read<T extends ArrayBufferView>(
+    fd: number,
+    buffer: T,
+    offset: number,
+    length: number,
+    position: Position,
+    callback: Callback<[bytesRead: number, buffer: T]>
+  ): void;
+  stat(path: PathLike, callback: Callback<[stats: Stats]>): void;
+  open(path: PathLike, flags: OpenMode, callback: Callback<[fd: number]>): void;
 }
 /**
  * @function stat
@@ -15,3 +27,4 @@ export interface FileSystem {
  * @param path The file path.
  */
 export declare function stat(fs: FileSystem, path: string): Promise<Stats | null>;
+export {};

package/cjs/utils/hash.cjs

@@ -1,7 +1,8 @@
 /**
+ * @module koa-files
  * @package koa-files
  * @license MIT
- * @version 4.1.6
+ * @version 5.0.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme
@@ -9,7 +10,7 @@
 
 'use strict';
 
-const crypto = require('crypto');
+const node_crypto = require('node:crypto');
 
 /**
  * @module hash
@@ -34,7 +35,7 @@ const CHARS = [
  */
 function generate(length) {
   let hash = '';
-  const randomValues = crypto.getRandomValues(new Uint8Array(length));
+  const randomValues = node_crypto.getRandomValues(new Uint8Array(length));
   // Create hash.
   for (const value of randomValues) {
     hash += CHARS[value % 62];

package/cjs/utils/http.cjs

@@ -1,7 +1,8 @@
 /**
+ * @module koa-files
  * @package koa-files
  * @license MIT
- * @version 4.1.6
+ * @version 5.0.0
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme
@@ -9,8 +10,8 @@
 
 'use strict';
 
-const buffer = require('buffer');
 const hash = require('./hash.cjs');
+const node_buffer = require('node:buffer');
 const parseRange = require('range-parser');
 
 function _interopDefault(e) {
@@ -32,7 +33,7 @@ const SINGLE_ETAG_RE = /^(?:W\/)?"[ !#-\x7E\x80-\xFF]+"$/;
 function decodeURI(URI) {
   try {
     return decodeURIComponent(URI);
-  } catch (_a) {
+  } catch {
     return -1;
   }
 }
@@ -155,7 +156,7 @@ function parseRanges(context, stats) {
           // Multipart Content-Type.
           const contentType = `Content-Type: ${response.type}`;
           // Range suffix.
-          const suffix = buffer.Buffer.from(`\r\n--${boundary}--\r\n`);
+          const suffix = node_buffer.Buffer.from(`\r\n--${boundary}--\r\n`);
           // Override Content-Type.
           // https://httpwg.org/specs/rfc9110.html#multipart.byteranges
           response.type = `multipart/byteranges; boundary=${boundary}`;
@@ -164,7 +165,9 @@ function parseRanges(context, stats) {
             const length = end - start + 1;
             const head = index > 0 ? '\r\n' : '';
             const contentRange = `Content-Range: bytes ${start}-${end}/${size}`;
-            const prefix = buffer.Buffer.from(`${head}--${boundary}\r\n${contentType}\r\n${contentRange}\r\n\r\n`);
+            const prefix = node_buffer.Buffer.from(
+              `${head}--${boundary}\r\n${contentType}\r\n${contentRange}\r\n\r\n`
+            );
             // Compute Content-Length
             contentLength += prefix.length + length;
             // Cache range.

package/cjs/utils/http.d.cts

@@ -1,9 +1,9 @@
 /**
  * @module http
  */
-import { Stats } from 'fs';
 import { Context } from 'koa';
-import { Buffer } from 'buffer';
+import { Stats } from 'node:fs';
+import { Buffer } from 'node:buffer';
 export interface Range {
   offset: number;
   length: number;