webpack-dev-service 0.12.0 → 0.12.2

package/cjs/server/dev/utils/setupWriteToDisk.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,8 +9,8 @@
 
 'use strict';
 
-const path = require('path');
-const fs = require('fs');
+const node_path = require('node:path');
+const node_fs = require('node:fs');
 const utils = require('../../utils.cjs');
 
 /**
@@ -31,14 +31,14 @@ function setupWriteToDisk(context) {
       if (!isAllowWrite(targetPath, filter)) {
         return callback();
       }
-      const dir = path.dirname(targetPath);
+      const dir = node_path.dirname(targetPath);
       const name = getCompilerName(compiler);
-      return fs.mkdir(dir, { recursive: true }, error => {
+      return node_fs.mkdir(dir, { recursive: true }, error => {
         if (error) {
           logger.error(`${name}unable to write "${dir}" directory to disk:\n${error}`);
           return callback(error);
         }
-        fs.writeFile(targetPath, content, error => {
+        node_fs.writeFile(targetPath, content, error => {
           if (error) {
             logger.error(`${name}unable to write "${targetPath}" asset to disk:\n${error}`);
             return callback(error);

package/cjs/server/dev/utils/stream.cjs

@@ -0,0 +1,189 @@
+/**
+ * @package webpack-dev-service
+ * @license MIT
+ * @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
+ */
+
+'use strict';
+
+const node_buffer = require('node:buffer');
+const node_stream = require('node:stream');
+
+/**
+ * @module stream
+ */
+class FileReadStream extends node_stream.Readable {
+  fd;
+  fs;
+  path;
+  ranges;
+  bytesRead = 0;
+  reading = false;
+  currentRangeIndex = 0;
+  readState = 0 /* ReadState.PREFIX */;
+  /**
+   * @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 });
+    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 = node_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 ?? closeError);
+      });
+    } else {
+      callback(error);
+    }
+  }
+}
+
+exports.FileReadStream = FileReadStream;

package/cjs/server/hot/Socket.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,8 +10,9 @@
 'use strict';
 
 const webpack = require('webpack');
-const url = require('url');
-const path = require('path');
+const node_buffer = require('node:buffer');
+const node_url = require('node:url');
+const node_path = require('node:path');
 const WebSocket = require('ws');
 const utils$1 = require('../utils.cjs');
 const utils = require('./utils.cjs');
@@ -29,12 +30,12 @@ const WebSocket__default = /*#__PURE__*/ _interopDefault(WebSocket);
 function entrypoint() {
   const filename = require.main.filename;
   try {
-    return path.dirname(url.fileURLToPath(filename));
+    return node_path.dirname(node_url.fileURLToPath(filename));
   } catch {
-    return path.dirname(filename);
+    return node_path.dirname(filename);
   }
 }
-const client = path.resolve(entrypoint(), '../../client/main.cjs');
+const client = node_path.resolve(entrypoint(), '../../client/main.cjs');
 class Socket {
   logger;
   compiler;
@@ -144,7 +145,7 @@ class Socket {
     if (utils.isUpgradable(context) && server.shouldHandle(request)) {
       context.respond = false;
       const { socket } = context;
-      const head = Buffer.alloc(0);
+      const head = node_buffer.Buffer.alloc(0);
       server.handleUpgrade(request, socket, head, client => {
         server.emit('connection', client, request);
       });

package/cjs/server/hot/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/hot/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/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/schema.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/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/esm/client/client.js

@@ -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/esm/client/events.js

@@ -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/esm/client/hot.js

@@ -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/esm/client/index.js

@@ -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/esm/client/main.js

@@ -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/esm/client/ui/Overlay.js

@@ -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/esm/client/ui/Progress.js

@@ -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/esm/client/ui/utils.js

@@ -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/esm/server/compose.js

@@ -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/esm/server/dev/Service.js

@@ -1,18 +1,17 @@
 /**
  * @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
  */
 
-import createEtag from 'etag';
-import destroy from 'destroy';
-import { PassThrough } from 'stream';
+import createETag from 'etag';
 import { isFunction } from '../utils.js';
 import { stat } from './utils/fs.js';
-import { resolve, extname, join } from 'path';
+import { FileReadStream } from './utils/stream.js';
+import { resolve, extname, join } from 'node:path';
 import { unixify, isOutRoot, hasTrailingSlash } from './utils/path.js';
 import { isConditionalGET, isPreconditionFailure, parseRanges } from './utils/http.js';
 
@@ -28,8 +27,8 @@ 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;
@@ -39,7 +38,7 @@ class Service {
    * @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;
@@ -48,10 +47,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;
@@ -74,7 +73,7 @@ class Service {
       context.remove('ETag');
     } else {
       // Set ETag.
-      context.set('ETag', createEtag(stats));
+      context.set('ETag', createETag(stats));
     }
     // Last-Modified.
     if (options.lastModified === false) {
@@ -96,97 +95,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(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.
-   * @param context Koa context.
-   * @param path File path.
-   * @param ranges Read ranges.
-   */
-  async send(context, path, ranges) {
-    // Set stream body, highWaterMark 64kb.
-    const stream = new PassThrough({
-      highWaterMark: 65536
-    });
-    // Set response body.
-    context.body = stream;
-    // Ranges length.
-    let { length } = ranges;
-    // Write ranges to stream.
-    for (const range of ranges) {
-      // Write range.
-      const passed = await this.write(stream, 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;
@@ -260,8 +177,10 @@ class Service {
     if (ranges === -2) {
       return context.throw(400);
     }
-    // Send file.
-    this.send(context, path, ranges);
+    // Ranges length.
+    const { fs, highWaterMark } = this.options;
+    // Set response body.
+    context.body = new FileReadStream(path, ranges, { fs, highWaterMark });
     // File found.
     return true;
   }

package/esm/server/dev/index.js

@@ -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/esm/server/dev/middleware.js

@@ -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
@@ -44,7 +44,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.
@@ -52,7 +52,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(context, stats => {
         resolve(getFileServices(context, stats));
@@ -63,18 +63,18 @@ function getFileServicesAsync(context, path) {
 function middleware(context) {
   // Middleware.
   return async (ctx, next) => {
-    const path = decodeURI(ctx.path);
-    // Path -1 or null byte(s).
-    if (path === -1 || path.includes('\0')) {
+    const pathname = 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/esm/server/dev/utils/fs.js

@@ -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/esm/server/dev/utils/hash.js

@@ -1,13 +1,13 @@
 /**
  * @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
  */
 
-import { getRandomValues } from 'crypto';
+import { getRandomValues } from 'node:crypto';
 
 /**
  * @module hash