koa-files 4.0.5 → 4.0.7

package/cjs/ReadStream.cjs

@@ -1,7 +1,7 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 4.0.5
+ * @version 4.0.7
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme
@@ -70,20 +70,19 @@ class ReadStream extends stream.Readable {
   }
   /**
    * @private
-   * @method readFilePadding
+   * @method readPadding
    * @param fd The file descriptor.
    * @param range The current range.
    * @param size The number of bytes to read.
    */
-  readFilePadding(fd, range, size) {
+  readPadding(fd, range, size) {
     let bytesRead = 0;
     const padding = this.getPadding(range);
-    const hasRangePadding = padding != null;
     // If padding exists.
-    if (hasRangePadding) {
+    if (padding != null) {
       const { length } = padding;
       const begin = this.bytesRead;
-      if (length > 0 && begin < length) {
+      if (begin < length) {
         bytesRead = Math.min(size, length - begin);
         const end = begin + bytesRead;
         this.push(padding.subarray(begin, end));
@@ -91,14 +90,13 @@ class ReadStream extends stream.Readable {
       }
     }
     // If no padding or read completed.
-    if (bytesRead <= 0) {
+    if (bytesRead < size) {
       this.bytesRead = 0;
-      const { readState } = this;
       // Change read state.
-      switch (readState) {
+      switch (this.readState) {
         case 0 /* ReadState.PREFIX */:
           this.readState = 1 /* ReadState.RANGE */;
-          this.readFileRange(fd, range, size);
+          this.readFileRange(fd, range, size - bytesRead);
           break;
         case 2 /* ReadState.SUFFIX */:
           this.currentRangeIndex++;
@@ -107,7 +105,7 @@ class ReadStream extends stream.Readable {
           if (nextRange == null) {
             this.push(null);
           } else {
-            this.readFilePadding(fd, nextRange, size);
+            this.readPadding(fd, nextRange, size - bytesRead);
           }
           break;
       }
@@ -121,39 +119,40 @@ class ReadStream extends stream.Readable {
    * @param size The number of bytes to read.
    */
   readFileRange(fd, range, size) {
-    this.reading = true;
+    const { length } = range;
     const { bytesRead } = this;
-    const position = range.offset + bytesRead;
-    const buffer$1 = buffer.Buffer.allocUnsafeSlow(Math.min(size, range.length - bytesRead));
-    // Read file range.
-    this.fs.read(fd, buffer$1, 0, buffer$1.length, position, (readError, bytesRead, buffer$1) => {
-      this.reading = false;
-      // Tell ._destroy() that it's safe to close the fd now.
-      if (this.destroyed) {
-        this.emit(DISPOSE_EVENT, readError);
-      } else {
-        if (readError != null) {
-          this.destroy(readError);
+    // File range not finished.
+    if (bytesRead < length) {
+      this.reading = true;
+      const bytesToRead = Math.min(size, length - bytesRead);
+      const buffer$1 = buffer.Buffer.allocUnsafeSlow(bytesToRead);
+      const position = range.offset + bytesRead;
+      // Read file range.
+      this.fs.read(fd, buffer$1, 0, bytesToRead, position, (error, bytesRead, buffer) => {
+        this.reading = false;
+        // Tell ._destroy() that it's safe to close the fd now.
+        if (this.destroyed) {
+          this.emit(DISPOSE_EVENT, error);
+        } else if (error != null) {
+          this.destroy(error);
+        } else if (bytesRead !== bytesToRead) {
+          this.destroy(new RangeError('invalid read operation'));
         } else {
-          if (bytesRead > 0) {
-            if (bytesRead !== buffer$1.length) {
-              // Slow path. Shrink to fit.
-              // Copy instead of slice so that we don't retain
-              // large backing buffer for small reads.
-              const chunk = buffer.Buffer.allocUnsafeSlow(bytesRead);
-              buffer$1.copy(chunk, 0, 0, bytesRead);
-              buffer$1 = chunk;
-            }
-            this.push(buffer$1);
-            this.bytesRead += bytesRead;
-          } else {
+          this.push(buffer);
+          this.bytesRead += bytesRead;
+          // file range read completed.
+          if (bytesRead < size) {
             this.bytesRead = 0;
             this.readState = 2 /* ReadState.SUFFIX */;
-            this.readFilePadding(fd, range, size);
+            this.readPadding(fd, range, size - bytesRead);
           }
         }
-      }
-    });
+      });
+    } else {
+      this.bytesRead = 0;
+      this.readState = 2 /* ReadState.SUFFIX */;
+      this.readPadding(fd, range, size);
+    }
   }
   /**
    * @override
@@ -168,12 +167,11 @@ class ReadStream extends stream.Readable {
       if (fd == null || range == null) {
         this.push(null);
       } else {
-        const { readState } = this;
         // Read bytes from range.
-        switch (readState) {
+        switch (this.readState) {
           case 0 /* ReadState.PREFIX */:
           case 2 /* ReadState.SUFFIX */:
-            this.readFilePadding(fd, range, size);
+            this.readPadding(fd, range, size);
             break;
           case 1 /* ReadState.RANGE */:
             this.readFileRange(fd, range, size);

package/cjs/ReadStream.d.cts

@@ -46,12 +46,12 @@ export declare class ReadStream extends Readable {
   private getPadding;
   /**
    * @private
-   * @method readFilePadding
+   * @method readPadding
    * @param fd The file descriptor.
    * @param range The current range.
    * @param size The number of bytes to read.
    */
-  private readFilePadding;
+  private readPadding;
   /**
    * @private
    * @method readFileRange

package/cjs/Service.cjs

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

package/cjs/index.cjs

@@ -1,7 +1,7 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 4.0.5
+ * @version 4.0.7
  * @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 4.0.5
+ * @version 4.0.7
  * @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 4.0.5
+ * @version 4.0.7
  * @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 4.0.5
+ * @version 4.0.7
  * @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.d.cts

@@ -34,4 +34,4 @@ export declare function isPreconditionFailed({ request, response }: Context): bo
  * @param context The koa context.
  * @param stats The file stats.
  */
-export declare function parseRanges(context: Context, stats: Stats): Range[] | -1 | -2;
+export declare function parseRanges(context: Context, stats: Stats): -1 | -2 | Range[];

package/cjs/utils/path.cjs

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

package/cjs/utils/type.cjs

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

package/esm/ReadStream.d.ts

@@ -46,12 +46,12 @@ export declare class ReadStream extends Readable {
   private getPadding;
   /**
    * @private
-   * @method readFilePadding
+   * @method readPadding
    * @param fd The file descriptor.
    * @param range The current range.
    * @param size The number of bytes to read.
    */
-  private readFilePadding;
+  private readPadding;
   /**
    * @private
    * @method readFileRange

package/esm/ReadStream.js

@@ -1,7 +1,7 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 4.0.5
+ * @version 4.0.7
  * @author nuintun <nuintun@qq.com>
  * @description A static files serving middleware for koa.
  * @see https://github.com/nuintun/koa-files#readme
@@ -68,20 +68,19 @@ class ReadStream extends Readable {
   }
   /**
    * @private
-   * @method readFilePadding
+   * @method readPadding
    * @param fd The file descriptor.
    * @param range The current range.
    * @param size The number of bytes to read.
    */
-  readFilePadding(fd, range, size) {
+  readPadding(fd, range, size) {
     let bytesRead = 0;
     const padding = this.getPadding(range);
-    const hasRangePadding = padding != null;
     // If padding exists.
-    if (hasRangePadding) {
+    if (padding != null) {
       const { length } = padding;
       const begin = this.bytesRead;
-      if (length > 0 && begin < length) {
+      if (begin < length) {
         bytesRead = Math.min(size, length - begin);
         const end = begin + bytesRead;
         this.push(padding.subarray(begin, end));
@@ -89,14 +88,13 @@ class ReadStream extends Readable {
       }
     }
     // If no padding or read completed.
-    if (bytesRead <= 0) {
+    if (bytesRead < size) {
       this.bytesRead = 0;
-      const { readState } = this;
       // Change read state.
-      switch (readState) {
+      switch (this.readState) {
         case 0 /* ReadState.PREFIX */:
           this.readState = 1 /* ReadState.RANGE */;
-          this.readFileRange(fd, range, size);
+          this.readFileRange(fd, range, size - bytesRead);
           break;
         case 2 /* ReadState.SUFFIX */:
           this.currentRangeIndex++;
@@ -105,7 +103,7 @@ class ReadStream extends Readable {
           if (nextRange == null) {
             this.push(null);
           } else {
-            this.readFilePadding(fd, nextRange, size);
+            this.readPadding(fd, nextRange, size - bytesRead);
           }
           break;
       }
@@ -119,39 +117,40 @@ class ReadStream extends Readable {
    * @param size The number of bytes to read.
    */
   readFileRange(fd, range, size) {
-    this.reading = true;
+    const { length } = range;
     const { bytesRead } = this;
-    const position = range.offset + bytesRead;
-    const buffer = Buffer.allocUnsafeSlow(Math.min(size, range.length - bytesRead));
-    // Read file range.
-    this.fs.read(fd, buffer, 0, buffer.length, 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);
-      } else {
-        if (readError != null) {
-          this.destroy(readError);
+    // File range not finished.
+    if (bytesRead < length) {
+      this.reading = true;
+      const bytesToRead = Math.min(size, length - bytesRead);
+      const buffer = Buffer.allocUnsafeSlow(bytesToRead);
+      const position = range.offset + bytesRead;
+      // Read file range.
+      this.fs.read(fd, buffer, 0, bytesToRead, position, (error, bytesRead, buffer) => {
+        this.reading = false;
+        // Tell ._destroy() that it's safe to close the fd now.
+        if (this.destroyed) {
+          this.emit(DISPOSE_EVENT, error);
+        } else if (error != null) {
+          this.destroy(error);
+        } else if (bytesRead !== bytesToRead) {
+          this.destroy(new RangeError('invalid read operation'));
         } else {
-          if (bytesRead > 0) {
-            if (bytesRead !== buffer.length) {
-              // Slow path. Shrink to fit.
-              // Copy instead of slice so that we don't retain
-              // large backing buffer for small reads.
-              const chunk = Buffer.allocUnsafeSlow(bytesRead);
-              buffer.copy(chunk, 0, 0, bytesRead);
-              buffer = chunk;
-            }
-            this.push(buffer);
-            this.bytesRead += bytesRead;
-          } else {
+          this.push(buffer);
+          this.bytesRead += bytesRead;
+          // file range read completed.
+          if (bytesRead < size) {
             this.bytesRead = 0;
             this.readState = 2 /* ReadState.SUFFIX */;
-            this.readFilePadding(fd, range, size);
+            this.readPadding(fd, range, size - bytesRead);
           }
         }
-      }
-    });
+      });
+    } else {
+      this.bytesRead = 0;
+      this.readState = 2 /* ReadState.SUFFIX */;
+      this.readPadding(fd, range, size);
+    }
   }
   /**
    * @override
@@ -166,12 +165,11 @@ class ReadStream extends Readable {
       if (fd == null || range == null) {
         this.push(null);
       } else {
-        const { readState } = this;
         // Read bytes from range.
-        switch (readState) {
+        switch (this.readState) {
           case 0 /* ReadState.PREFIX */:
           case 2 /* ReadState.SUFFIX */:
-            this.readFilePadding(fd, range, size);
+            this.readPadding(fd, range, size);
             break;
           case 1 /* ReadState.RANGE */:
             this.readFileRange(fd, range, size);

package/esm/Service.js

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

package/esm/index.js

@@ -1,7 +1,7 @@
 /**
  * @package koa-files
  * @license MIT
- * @version 4.0.5
+ * @version 4.0.7
  * @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 4.0.5
+ * @version 4.0.7
  * @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 4.0.5
+ * @version 4.0.7
  * @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.d.ts

@@ -34,4 +34,4 @@ export declare function isPreconditionFailed({ request, response }: Context): bo
  * @param context The koa context.
  * @param stats The file stats.
  */
-export declare function parseRanges(context: Context, stats: Stats): Range[] | -1 | -2;
+export declare function parseRanges(context: Context, stats: Stats): -1 | -2 | Range[];

package/esm/utils/http.js

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

package/esm/utils/path.js

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

package/esm/utils/type.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koa-files",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "description": "A static files serving middleware for koa.",
   "type": "module",
   "main": "cjs/index.cjs",
@@ -42,38 +42,37 @@
     "url": "https://github.com/nuintun/koa-files/issues"
   },
   "homepage": "https://github.com/nuintun/koa-files#readme",
-  "scripts": {
-    "lint": "tsc --noEmit",
-    "test": "node tests/index.js",
-    "clean": "node tools/clean.js",
-    "prepublishOnly": "npm run build",
-    "build:cjs": "rollup -c tools/rollup.cjs.js",
-    "build:esm": "rollup -c tools/rollup.esm.js",
-    "build:fix-types": "node tools/fix-types.js",
-    "format": "prettier --write . --ignore-path .prettierignore",
-    "build": "npm run clean && npm run build:main && npm run format",
-    "build:main": "npm run build:cjs && npm run build:esm && npm run build:fix-types"
-  },
   "dependencies": {
     "etag": "^1.8.1",
     "range-parser": "^1.2.1",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@rollup/plugin-typescript": "^12.1.2",
-    "@types/etag": "^1.8.3",
+    "@rollup/plugin-typescript": "^12.1.4",
+    "@types/etag": "^1.8.4",
     "@types/koa": "^2.15.0",
-    "@types/node": "^22.15.3",
+    "@types/node": "^24.1.0",
     "@types/range-parser": "^1.2.7",
-    "dts-paths": "^1.1.6",
+    "dts-paths": "^1.1.10",
     "koa": "^3.0.0",
     "magic-string": "^0.30.17",
-    "prettier": "^3.5.3",
+    "prettier": "^3.6.2",
     "rimraf": "^6.0.1",
-    "rollup": "^4.40.1",
+    "rollup": "^4.45.1",
     "typescript": "^5.8.3"
   },
   "peerDependencies": {
     "koa": ">=2.0.0"
+  },
+  "scripts": {
+    "lint": "tsc --noEmit",
+    "test": "node tests/index.js",
+    "clean": "node tools/clean.js",
+    "build:cjs": "rollup -c tools/rollup.cjs.js",
+    "build:esm": "rollup -c tools/rollup.esm.js",
+    "build:fix-types": "node tools/fix-types.js",
+    "build": "pnpm clean && pnpm build:main && pnpm format",
+    "format": "prettier --write . --ignore-path .prettierignore",
+    "build:main": "pnpm build:cjs && pnpm build:esm && pnpm build:fix-types"
   }
-}
+}