webpack-dev-service 0.15.7 → 0.15.9

package/cjs/client/client.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/client/events.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/client/hot.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/client/index.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/client/main.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/client/ui/Overlay.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/client/ui/Progress.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/client/ui/images/webpack-logo.svg.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/client/ui/utils.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/compose.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/dev/ReadStream.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme
@@ -73,20 +73,19 @@ class ReadStream extends node_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));
@@ -94,14 +93,13 @@ class ReadStream extends node_stream.Readable {
       }
     }
     // If no padding or read completed.
-    if (bytesRead <= 0) {
+    if (bytesRead < size) {
       this.#bytesRead = 0;
-      const readState = this.#readState;
       // 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++;
@@ -110,7 +108,7 @@ class ReadStream extends node_stream.Readable {
           if (nextRange == null) {
             this.push(null);
           } else {
-            this.#readFilePadding(fd, nextRange, size);
+            this.#readPadding(fd, nextRange, size - bytesRead);
           }
           break;
       }
@@ -124,39 +122,40 @@ class ReadStream extends node_stream.Readable {
    * @param size The number of bytes to read.
    */
   #readFileRange(fd, range, size) {
-    this.#reading = true;
+    const { length } = range;
     const bytesRead = this.#bytesRead;
-    const position = range.offset + bytesRead;
-    const buffer = node_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) {
+    // File range not finished.
+    if (bytesRead < length) {
+      this.#reading = true;
+      const bytesToRead = Math.min(size, length - bytesRead);
+      const buffer = node_buffer.Buffer.allocUnsafeSlow(bytesToRead);
+      const position = range.offset + bytesRead;
+      // Read file range.
+      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);
+        } else if (readError != null) {
           this.destroy(readError);
+        } 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 = node_buffer.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
@@ -171,12 +170,11 @@ class ReadStream extends node_stream.Readable {
       if (fd == null || range == null) {
         this.push(null);
       } else {
-        const readState = this.#readState;
         // 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/server/dev/Service.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme
@@ -39,18 +39,14 @@ class Service {
    * @param options The file service options.
    */
   constructor(root, options) {
-    this.#options = options;
     this.#root = path.unixify(node_path.resolve(root));
-  }
-  /**
-   * @private
-   * @method #isIgnore
-   * @description Check if path is ignore.
-   * @param path The path to check.
-   */
-  #isIgnore(path) {
-    const { ignore } = this.#options;
-    return (utils.isFunction(ignore) ? ignore(path) : false) === true;
+    const { ignore, headers, highWaterMark = 65536 } = options;
+    this.#options = {
+      ...options,
+      ignore: utils.isFunction(ignore) ? ignore : () => false,
+      headers: utils.isFunction(headers) ? headers : () => headers,
+      highWaterMark: utils.isFunction(highWaterMark) ? highWaterMark : () => highWaterMark
+    };
   }
   /**
    * @private
@@ -62,21 +58,15 @@ class Service {
    */
   async #setupHeaders({ response }, path, stats) {
     const options = this.#options;
-    const { headers } = options;
     // Set status.
     response.status = 200;
     // Set Content-Type.
     response.type = node_path.extname(path);
-    // Set headers.
+    // Get headers.
+    const headers = await options.headers(path, stats);
+    // If headers not empty, set headers.
     if (headers) {
-      if (utils.isFunction(headers)) {
-        const fields = await headers(path, stats);
-        if (fields) {
-          response.set(fields);
-        }
-      } else {
-        response.set(headers);
-      }
+      response.set(headers);
     }
     // Accept-Ranges.
     if (options.acceptRanges === false) {
@@ -128,12 +118,12 @@ class Service {
     if (path.isOutRoot(path$1, root)) {
       return false;
     }
+    // Get options.
+    const options = this.#options;
     // Is ignore path or file (403).
-    if (this.#isIgnore(path$1)) {
+    if (await options.ignore(path$1)) {
       return false;
     }
-    // Get options.
-    const options = this.#options;
     // File stats.
     const stats = await fs.stat(options.fs, path$1);
     // Check file stats.
@@ -190,7 +180,10 @@ class Service {
       return context.throw(400);
     }
     // Set response body.
-    response.body = new ReadStream.ReadStream(path$1, ranges, options);
+    response.body = new ReadStream.ReadStream(path$1, ranges, {
+      fs: options.fs,
+      highWaterMark: await options.highWaterMark(path$1, stats)
+    });
     // File found.
     return true;
   }

package/cjs/server/dev/Service.d.cts

@@ -4,24 +4,26 @@
 import { Context } from 'koa';
 import { Stats } from 'node:fs';
 import { FileSystem } from './utils/fs.cjs';
-interface IgnoreFunction {
-  (path: string): boolean;
-}
 interface Headers {
   [key: string]: string | string[];
 }
-type FileStats = Stats | null | undefined;
+interface IgnoreFunction {
+  (path: string): Promise<boolean> | boolean;
+}
+interface HighWaterMarkFunction {
+  (path: string, stats: Stats): Promise<number> | number;
+}
 interface HeadersFunction {
-  (path: string, stats: FileStats): Promise<Headers | void> | Headers | void;
+  (path: string, stats: Stats): Promise<Headers | void> | Headers | void;
 }
 export interface Options {
-  fs: FileSystem;
   etag?: boolean;
+  fs: FileSystem;
   acceptRanges?: boolean;
   lastModified?: boolean;
-  highWaterMark?: number;
   ignore?: IgnoreFunction;
   headers?: Headers | HeadersFunction;
+  highWaterMark?: number | HighWaterMarkFunction;
 }
 /**
  * @class Service

package/cjs/server/dev/index.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme
@@ -12,16 +12,17 @@
 const ready = require('./utils/ready.cjs');
 const fs = require('./utils/fs.cjs');
 const middleware = require('./middleware.cjs');
-const utils = require('../utils.cjs');
 const setupHooks = require('./utils/setupHooks.cjs');
 const setupWatching = require('./utils/setupWatching.cjs');
 const setupWriteToDisk = require('./utils/setupWriteToDisk.cjs');
+const utils = require('../utils.cjs');
 const setupOutputFileSystem = require('./utils/setupOutputFileSystem.cjs');
 
 /**
  * @module index
  */
 function setup(compiler, options) {
+  utils.assertPublicPath(compiler);
   const context = {
     compiler,
     stats: null,

package/cjs/server/dev/middleware.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/dev/utils/fs.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/dev/utils/hash.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/dev/utils/http.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/dev/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/server/dev/utils/path.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/dev/utils/paths.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme
@@ -22,13 +22,13 @@ function getStats(stats) {
   return [stats];
 }
 function getPublicPath(compilation) {
-  const { publicPath } = compilation.outputOptions;
+  const { publicPath = '' } = compilation.outputOptions;
   // @see https://webpack.js.org/guides/public-path/#automatic-publicpath
   if (publicPath === 'auto') {
     return '/';
   }
   // Get public path.
-  const path = compilation.getPath(publicPath ?? '');
+  const path = compilation.getPath(publicPath);
   // Get public path without protocol.
   return new node_url.URL(path, 'https://127.0.0.1').pathname;
 }

package/cjs/server/dev/utils/ready.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/dev/utils/setupHooks.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/dev/utils/setupOutputFileSystem.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/dev/utils/setupWatching.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/dev/utils/setupWriteToDisk.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/hot/Socket.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/hot/index.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/hot/utils.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/index.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/schema.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/cjs/server/utils.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme
@@ -23,6 +23,14 @@ function isBoolean(value) {
 function isFunction(value) {
   return typeof value === 'function';
 }
+function assertPublicPath(compiler) {
+  const compilers = getCompilers(compiler);
+  for (const { options } of compilers) {
+    if (isFunction(options.output.publicPath)) {
+      throw new TypeError('function type public path is not supported');
+    }
+  }
+}
 function getCompilers(compiler) {
   if (isMultiCompiler(compiler)) {
     return compiler.compilers;
@@ -34,6 +42,7 @@ function isMultiCompiler(compiler) {
 }
 
 exports.PLUGIN_NAME = PLUGIN_NAME;
+exports.assertPublicPath = assertPublicPath;
 exports.getCompilers = getCompilers;
 exports.isBoolean = isBoolean;
 exports.isFunction = isFunction;

package/cjs/server/utils.d.cts

@@ -7,5 +7,6 @@ export declare const PLUGIN_NAME: string;
 export declare function isString(value: unknown): value is string;
 export declare function isBoolean(value: unknown): value is boolean;
 export declare function isFunction(value: unknown): value is Function;
+export declare function assertPublicPath(compiler: UnionCompiler): never | void;
 export declare function getCompilers(compiler: UnionCompiler): webpack.Compiler[];
 export declare function isMultiCompiler(compiler: UnionCompiler): compiler is webpack.MultiCompiler;

package/esm/client/client.js

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/esm/client/events.js

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme

package/esm/client/hot.js

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.15.7
+ * @version 0.15.9
  * @author nuintun <nuintun@qq.com>
  * @description A koa 2 middleware for webpack development and hot reloading.
  * @see https://github.com/nuintun/webpack-dev-service#readme