webpack-dev-service 0.12.0 → 0.12.2

package/cjs/client/client.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.12.0
+ * @version 0.12.2
  * @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.12.0
+ * @version 0.12.2
  * @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.12.0
+ * @version 0.12.2
  * @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.12.0
+ * @version 0.12.2
  * @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.12.0
+ * @version 0.12.2
  * @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.12.0
+ * @version 0.12.2
  * @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.12.0
+ * @version 0.12.2
  * @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.12.0
+ * @version 0.12.2
  * @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.12.0
+ * @version 0.12.2
  * @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/Service.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.12.0
+ * @version 0.12.2
  * @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
@@ -9,12 +9,11 @@
 
 'use strict';
 
-const createEtag = require('etag');
-const destroy = require('destroy');
-const stream = require('stream');
+const createETag = require('etag');
 const utils = require('../utils.cjs');
 const fs = require('./utils/fs.cjs');
-const path$1 = require('path');
+const stream = require('./utils/stream.cjs');
+const node_path = require('node:path');
 const path = require('./utils/path.cjs');
 const http = require('./utils/http.cjs');
 
@@ -22,8 +21,7 @@ function _interopDefault(e) {
   return e && e.__esModule ? e : { default: e };
 }
 
-const createEtag__default = /*#__PURE__*/ _interopDefault(createEtag);
-const destroy__default = /*#__PURE__*/ _interopDefault(destroy);
+const createETag__default = /*#__PURE__*/ _interopDefault(createETag);
 
 /**
  * @module Service
@@ -37,18 +35,18 @@ class Service {
   /**
    * @constructor
    * @description Create file service.
-   * @param root File service root.
-   * @param options File service options.
+   * @param root The file service root.
+   * @param options The file service options.
    */
   constructor(root, options) {
     this.options = options;
-    this.root = path.unixify(path$1.resolve(root));
+    this.root = path.unixify(node_path.resolve(root));
   }
   /**
    * @private
    * @method isIgnore
    * @description Check if path is ignore.
-   * @param path File path.
+   * @param path The path to check.
    */
   isIgnore(path) {
     const { ignore } = this.options;
@@ -57,10 +55,10 @@ class Service {
   /**
    * @private
    * @method setupHeaders
-   * @description Setup headers
-   * @param context Koa context
-   * @param path File path
-   * @param stats File stats
+   * @description Setup headers.
+   * @param context The koa context.
+   * @param path The file path.
+   * @param stats The file stats.
    */
   setupHeaders(context, path, stats) {
     const { options } = this;
@@ -68,7 +66,7 @@ class Service {
     // Set status.
     context.status = 200;
     // Set Content-Type.
-    context.type = path$1.extname(path);
+    context.type = node_path.extname(path);
     // Accept-Ranges.
     if (options.acceptRanges === false) {
       // Set Accept-Ranges to none tell client not support.
@@ -83,7 +81,7 @@ class Service {
       context.remove('ETag');
     } else {
       // Set ETag.
-      context.set('ETag', createEtag__default.default(stats));
+      context.set('ETag', createETag__default.default(stats));
     }
     // Last-Modified.
     if (options.lastModified === false) {
@@ -105,97 +103,15 @@ class Service {
       }
     }
   }
-  /**
-   * @private
-   * @method write
-   * @description Write file to stream.
-   * @param stream Destination stream.
-   * @param path The file path to read.
-   * @param range The range to read.
-   * @param end Is destory destination stream after read complete.
-   */
-  write(stream, path, range, 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.
-   * @param context Koa context.
-   * @param path File path.
-   * @param ranges Read ranges.
-   */
-  async send(context, path, ranges) {
-    // Set stream body, highWaterMark 64kb.
-    const stream$1 = new stream.PassThrough({
-      highWaterMark: 65536
-    });
-    // Set response body.
-    context.body = stream$1;
-    // Ranges length.
-    let { length } = ranges;
-    // Write ranges to stream.
-    for (const range of ranges) {
-      // Write range.
-      const passed = await this.write(stream$1, path, range, --length === 0);
-      // If not passed, break.
-      if (!passed) {
-        break;
-      }
-    }
-  }
   /**
    * @public
-   * @method response
-   * @description Response to koa context.
-   * @param context Koa context.
-   * @param publicPath Public path.
+   * @method respond
+   * @description Respond file.
+   * @param pathname The pathname.
+   * @param context The koa context.
+   * @param publicPath The public path.
    */
-  async response(context, publicPath) {
-    // Get request pathname.
-    const pathname = context.path || '/';
+  async respond(pathname, context, publicPath) {
     // Check public path.
     if (!pathname.startsWith(publicPath)) {
       return false;
@@ -207,17 +123,17 @@ class Service {
     // Real pathname.
     const realpath = pathname.slice(length);
     // Get path of file.
-    const path$2 = path.unixify(path$1.join(root, realpath));
+    const path$1 = path.unixify(node_path.join(root, realpath));
     // Malicious path (403).
-    if (path.isOutRoot(path$2, root)) {
+    if (path.isOutRoot(path$1, root)) {
       return false;
     }
     // Is ignore path or file (403).
-    if (this.isIgnore(path$2)) {
+    if (this.isIgnore(path$1)) {
       return false;
     }
     // File stats.
-    const stats = await fs.stat(this.options.fs, path$2);
+    const stats = await fs.stat(this.options.fs, path$1);
     // Check file stats.
     if (
       // File not exist (404 | 500).
@@ -225,12 +141,12 @@ 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;
     }
     // Setup headers.
-    this.setupHeaders(context, path$2, stats);
+    this.setupHeaders(context, path$1, stats);
     // Conditional get support.
     if (http.isConditionalGET(context)) {
       // Request precondition failure.
@@ -269,8 +185,10 @@ class Service {
     if (ranges === -2) {
       return context.throw(400);
     }
-    // Send file.
-    this.send(context, path$2, ranges);
+    // Ranges length.
+    const { fs: fs$1, highWaterMark } = this.options;
+    // Set response body.
+    context.body = new stream.FileReadStream(path$1, ranges, { fs: fs$1, highWaterMark });
     // File found.
     return true;
   }

package/cjs/server/dev/index.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.12.0
+ * @version 0.12.2
  * @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/middleware.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.12.0
+ * @version 0.12.2
  * @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
@@ -46,7 +46,7 @@ function getFileServices(context, stats) {
   // Return services.
   return services;
 }
-function getFileServicesAsync(context, path) {
+function getFileServicesAsync(context, pathname) {
   return new Promise(resolve => {
     const { stats } = context;
     // If stats exists, resolve immediately.
@@ -54,7 +54,7 @@ function getFileServicesAsync(context, path) {
       resolve(getFileServices(context, stats));
     } else {
       // Log waiting info.
-      context.logger.info(`wait until bundle finished: ${path}`);
+      context.logger.info(`wait until bundle finished: ${pathname}`);
       // Otherwise, wait until bundle finished.
       ready.ready(context, stats => {
         resolve(getFileServices(context, stats));
@@ -65,18 +65,18 @@ function getFileServicesAsync(context, path) {
 function middleware(context) {
   // Middleware.
   return async (ctx, next) => {
-    const path = http.decodeURI(ctx.path);
-    // Path -1 or null byte(s).
-    if (path === -1 || path.includes('\0')) {
+    const pathname = http.decodeURI(ctx.path);
+    // Pathname decode failed or includes null byte(s).
+    if (pathname === -1 || pathname.includes('\0')) {
       return ctx.throw(400);
     }
     // Only support GET and HEAD (405).
     if (ctx.method === 'GET' || ctx.method === 'HEAD') {
       // Get the file services.
-      const services = await getFileServicesAsync(context, path);
+      const services = await getFileServicesAsync(context, pathname);
       // Try to respond.
       for (const [publicPath, service] of services) {
-        if (await service.response(ctx, publicPath)) {
+        if (await service.respond(pathname, ctx, publicPath)) {
           return;
         }
       }

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

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.12.0
+ * @version 0.12.2
  * @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.12.0
+ * @version 0.12.2
  * @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
@@ -9,7 +9,7 @@
 
 'use strict';
 
-const crypto = require('crypto');
+const node_crypto = require('node:crypto');
 
 /**
  * @module hash
@@ -34,7 +34,7 @@ const CHARS = [
  */
 function generate(length = 32) {
   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/server/dev/utils/http.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.12.0
+ * @version 0.12.2
  * @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
@@ -10,6 +10,7 @@
 'use strict';
 
 const hash = require('./hash.cjs');
+const node_buffer = require('node:buffer');
 const parseRange = require('range-parser');
 
 function _interopDefault(e) {
@@ -108,7 +109,7 @@ function decodeURI(URI) {
 /**
  * @function isConditionalGET
  * @description Check if request is conditional GET.
- * @param context Koa context.
+ * @param context The koa context.
  */
 function isConditionalGET(context) {
   const { request } = context;
@@ -122,7 +123,7 @@ function isConditionalGET(context) {
 /**
  * @function isPreconditionFailure
  * @description Check if request precondition failure.
- * @param context Koa context.
+ * @param context The koa context.
  */
 function isPreconditionFailure({ request, response }) {
   // If-Match.
@@ -147,8 +148,8 @@ function isPreconditionFailure({ request, response }) {
 /**
  * @function parseRanges
  * @description Parse ranges.
- * @param context Koa context.
- * @param stats File stats.
+ * @param context The koa context.
+ * @param stats The file stats.
  */
 function parseRanges(context, stats) {
   const { size } = stats;
@@ -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 = node_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 = node_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/server/dev/utils/path.cjs

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.12.0
+ * @version 0.12.2
  * @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
@@ -9,7 +9,7 @@
 
 'use strict';
 
-const path = require('path');
+const node_path = require('node:path');
 
 /**
  * @module path
@@ -36,9 +36,9 @@ function hasTrailingSlash(path) {
  * @param path The path to check.
  * @param root The root path.
  */
-function isOutRoot(path$1, root) {
-  path$1 = path.relative(root, path$1);
-  return /\.\.(?:[\\/]|$)/.test(path$1) || path.isAbsolute(path$1);
+function isOutRoot(path, root) {
+  path = node_path.relative(root, path);
+  return /\.\.(?:[\\/]|$)/.test(path) || node_path.isAbsolute(path);
 }
 
 exports.hasTrailingSlash = hasTrailingSlash;

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

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.12.0
+ * @version 0.12.2
  * @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
@@ -9,7 +9,7 @@
 
 'use strict';
 
-const url = require('url');
+const node_url = require('node:url');
 const path = require('./path.cjs');
 
 /**
@@ -39,7 +39,7 @@ function getPublicPath(compilation) {
   const path = compilation.getPath(publicPath ?? '');
   // Get public path without protocol.
   try {
-    return new url.URL(path).pathname;
+    return new node_url.URL(path).pathname;
   } catch {
     return normalize(path);
   }

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

@@ -1,7 +1,7 @@
 /**
  * @package webpack-dev-service
  * @license MIT
- * @version 0.12.0
+ * @version 0.12.2
  * @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.12.0
+ * @version 0.12.2
  * @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.12.0
+ * @version 0.12.2
  * @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.12.0
+ * @version 0.12.2
  * @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