@duyquangnvx/webnovel-downloader 0.4.0 → 0.4.2

package/dist/index.cjs

@@ -473,6 +473,9 @@ var silentLogger = createLogger({ level: "silent" });
 // src/index.ts
 init_errors();
 
+// src/core/downloader.ts
+var import_undici2 = require("undici");
+
 // src/core/registry.ts
 init_errors();
 var AdapterRegistry = class {
@@ -548,33 +551,46 @@ var EventBus = class {
 // src/http/client.ts
 var import_undici = require("undici");
 init_errors();
+init_primitives();
 var DEFAULT_TIMEOUT_MS = 3e4;
+var MAX_REDIRECTS = 5;
+var REDIRECT_STATUSES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
 var UndiciHttpClient = class {
   #logger;
+  #dispatcher;
+  #ownsDispatcher;
   constructor(opts) {
     this.#logger = opts.logger;
+    this.#ownsDispatcher = opts.dispatcher === void 0;
+    this.#dispatcher = opts.dispatcher ?? new import_undici.Agent();
   }
   async get(url, opts) {
     const timeoutMs = opts?.timeoutMs ?? DEFAULT_TIMEOUT_MS;
     const half = Math.max(1, Math.floor(timeoutMs / 2));
     let res;
     try {
-      res = await (0, import_undici.request)(url, {
-        method: "GET",
-        ...opts?.headers !== void 0 ? { headers: opts.headers } : {},
-        ...opts?.signal !== void 0 ? { signal: opts.signal } : {},
-        headersTimeout: half,
-        bodyTimeout: half,
-        maxRedirections: 5
-      });
+      let currentUrl = url;
+      for (let hop = 0; ; hop++) {
+        res = await (0, import_undici.request)(currentUrl, {
+          method: "GET",
+          dispatcher: this.#dispatcher,
+          ...opts?.headers !== void 0 ? { headers: opts.headers } : {},
+          ...opts?.signal !== void 0 ? { signal: opts.signal } : {},
+          headersTimeout: half,
+          bodyTimeout: half
+        });
+        const next = hop < MAX_REDIRECTS ? redirectTarget(res.statusCode, res.headers, currentUrl) : void 0;
+        if (next === void 0) break;
+        await res.body.dump();
+        currentUrl = next;
+      }
       const body = await res.body.text();
       const headers = normalizeHeaders(res.headers);
-      const finalUrl = url;
       return {
         status: res.statusCode,
         headers,
         body,
-        url: finalUrl
+        url: currentUrl
       };
     } catch (cause) {
       if (res !== void 0) await res.body.dump().catch(() => {
@@ -585,11 +601,27 @@ var UndiciHttpClient = class {
       if (cause instanceof import_undici.errors.HeadersTimeoutError || cause instanceof import_undici.errors.BodyTimeoutError) {
         throw new TimeoutError(url, { cause });
       }
-      this.#logger.debug({ url, cause }, "undici network error");
-      throw new HttpError(0, url, "Network error", { cause });
+      const detail = cause instanceof Error ? `${cause.name}: ${cause.message}` : String(cause);
+      this.#logger.warn({ url, cause }, "undici network error");
+      throw new HttpError(0, url, `Network error (${detail})`, { cause });
     }
   }
+  /** Closes the dispatcher this client created. A no-op when one was injected — the caller owns that. */
+  async dispose() {
+    if (this.#ownsDispatcher) await this.#dispatcher.close();
+  }
 };
+function redirectTarget(status, headers, currentUrl) {
+  if (!REDIRECT_STATUSES.has(status)) return void 0;
+  const raw = headers["location"];
+  const location = Array.isArray(raw) ? raw[0] : raw;
+  if (location === void 0 || location === "") return void 0;
+  try {
+    return unsafeBrandUrl(new URL(location, currentUrl).href);
+  } catch {
+    return void 0;
+  }
+}
 function normalizeHeaders(h) {
   const out = {};
   for (const [k, v] of Object.entries(h)) {
@@ -720,9 +752,13 @@ var RateLimiter = class {
   #buckets = /* @__PURE__ */ new Map();
   #pauses = /* @__PURE__ */ new Map();
   constructor(opts = DEFAULT_RATE_LIMIT) {
+    const burst = opts.burst ?? Math.max(1, opts.requestsPerSecond);
+    if (burst < 1) {
+      throw new RangeError(`RateLimiter: burst must be >= 1 (got ${burst})`);
+    }
     this.#opts = {
       requestsPerSecond: opts.requestsPerSecond,
-      burst: opts.burst ?? opts.requestsPerSecond
+      burst
     };
   }
   async acquire(host, signal) {
@@ -967,7 +1003,10 @@ function normalizeTransport(t) {
 function buildHttpClient(opts = {}) {
   const logger = opts.logger ?? silentLogger;
   const cookieJar = opts.cookieJar ?? new CookieJar();
-  const leaf = opts.undiciOverride ?? new UndiciHttpClient({ logger });
+  const leaf = opts.undiciOverride ?? new UndiciHttpClient({
+    logger,
+    ...opts.dispatcher !== void 0 ? { dispatcher: opts.dispatcher } : {}
+  });
   const limiter = opts.rateLimiter ?? new RateLimiter(opts.rateLimit ?? DEFAULT_RATE_LIMIT);
   const httpBranch = HttpStack.from(leaf).rotateUserAgent(opts.userAgents ?? new UserAgents(), opts.defaultHeaders, cookieJar).rateLimit(limiter, opts.onEvent).retry(normalizeRetry(opts.retry), logger, limiter, opts.onEvent).build();
   const { mode } = normalizeTransport(opts.transport);
@@ -2104,6 +2143,7 @@ var Downloader = class {
   #transport;
   #cookieJar;
   #browserPool;
+  #httpDispatcher;
   #transportListeners = /* @__PURE__ */ new Set();
   /**
    * Build a downloader from a set of adapters. `rateLimit`, `retry`, and
@@ -2138,10 +2178,12 @@ var Downloader = class {
         await handle.release();
       }
     } : void 0;
+    this.#httpDispatcher = opts.http === void 0 && opts.undiciOverride === void 0 ? new import_undici2.Agent() : void 0;
     this.#http = opts.http ?? buildHttpClient({
       logger: this.#logger,
       transport: this.#transport,
       cookieJar: this.#cookieJar,
+      ...this.#httpDispatcher !== void 0 ? { dispatcher: this.#httpDispatcher } : {},
       ...opts.rateLimit !== void 0 ? { rateLimit: opts.rateLimit } : {},
       ...opts.retry !== void 0 ? { retry: opts.retry } : {},
       onEvent: (e) => {
@@ -2172,10 +2214,11 @@ var Downloader = class {
       ...onCookieCapture !== void 0 ? { onCookieCapture } : {}
     });
   }
-  /** Release held resources (closes the browser pool, if any). Safe to call once when done. */
+  /** Release held resources (closes the browser pool and HTTP dispatcher, if any). Safe to call once when done. */
   async dispose() {
     const pool = this.#browserPool;
     if (pool) await pool.dispose();
+    if (this.#httpDispatcher) await this.#httpDispatcher.close();
   }
   /** True when a built-in/registered adapter can handle this URL. */
   canHandle(url) {