melperjs 16.1.0 → 17.0.0

package/docs/index.md

@@ -87,7 +87,7 @@ Calls `task` up to `maxAttempts` times, returning the first successful result. O
 - **Parameters:**
   - `task` (Function): Async function to attempt.
   - `maxAttempts` (Number): Total attempt count (1 = no retries). Default `1`.
-  - `onError` (Function): Called as `(attempt, error)` after each failed attempt.
+  - `onError` (Function): Called as `(error, attempt)` after each failed attempt.
   - `options.delayMs` (Number): Base delay between retries in ms. `0` disables delay.
   - `options.backoffFactor` (Number): Multiplier applied per attempt. `1` keeps delay constant; `2` doubles each retry.
 - **Returns:** The first non-throwing result of `task`.
@@ -288,7 +288,7 @@ Depth-first search through a nested object for the first node that owns `key`. I
   - `pair` (Any): Optional value constraint. `null` means "match any value".
 - **Returns:** The matching node, or `null` if not found.
 
-### waitForProperty(object, property, timeout = 5000, interval = 100)
+### waitForProperty(object, property, timeout, interval = 100)
 
 Polls `object` until it owns `property`, then resolves with the property's value. Rejects after `timeout` milliseconds.
 
@@ -361,3 +361,51 @@ Extracts a short error description from an HTTP error-like object. Prefers `erro
   - `error` (Error): Error from an HTTP client.
   - `limit` (Number): Maximum length of the returned string.
 - **Returns:** Trimmed error description.
+
+## Proxy Helpers
+
+### normalizeProxy(proxy, protocol = "http")
+
+Normalizes a wide range of proxy formats into a canonical `protocol://[user:pass@]host:port` URL. Supports:
+
+- `host:port`
+- `host:port:user:pass` (auth appended)
+- `user:pass:host:port` (auth prepended; auto-detected via numeric port pattern)
+- `host:portStart:portEnd:user:pass` (random port in range, inclusive)
+- `user:pass:host:portStart:portEnd` (auth prepended, random port in range)
+- `user:pass@host:port`
+- `user:pass@host:portStart:portEnd` (random port in range)
+- Any of the above prefixed with `scheme://` (`http`, `https`, `socks5`, `socks5h`, …)
+
+Returns `null` for empty or non-string input. Does not crash on unparseable input — returns it as-is wrapped with `protocol://`.
+
+- **Parameters:**
+  - `proxy` (String): Source proxy string.
+  - `protocol` (String): Default protocol when none is present in the input.
+- **Returns:** Canonical proxy URL, or `null` when input is empty/missing.
+
+### parseProxy(proxy, protocol = "http")
+
+Normalizes `proxy` via `normalizeProxy`, then decomposes it into structured fields. Returns `null` when normalization fails (empty input).
+
+- **Parameters:**
+  - `proxy` (String): Source proxy string.
+  - `protocol` (String): Default protocol when none is present in the input.
+- **Returns:** `{protocol, host, port, auth?: {username, password}}` or `null`.
+
+### proxyValue(rawProxy, replacements = {})
+
+Picks a random proxy from a newline-separated list, normalizes it, and applies placeholder substitution.
+
+`{SESSION}` is a built-in placeholder:
+
+- If `SESSION` is not provided, it is autofilled with a non-secure `randomHex(8)`.
+- If `SESSION` is a string, it is treated as a seed and replaced via `seedHex(seed, 8)` (deterministic).
+- If `SESSION` is a function, the function is called per invocation.
+
+Any other key in `replacements` is also substituted (`{KEY}` → value). For non-SESSION entries: functions are called, strings are used literally.
+
+- **Parameters:**
+  - `rawProxy` (String): Newline-separated proxy list.
+  - `replacements` (Object): Placeholder values keyed by placeholder name.
+- **Returns:** Final proxy URL string, or `null` if the list is empty.

package/docs/node.md

@@ -145,57 +145,6 @@ Verifies that `plainText` (with the same `key`) matches a previously generated b
     - `options.preHash` (Boolean): Must match the `preHash` used for `bcryptHash`. Default `true`.
 - **Returns:** `Boolean` indicating match.
 
-## Proxy Helpers
-
-### normalizeProxy(proxy, protocol = "http")
-
-Normalizes a wide range of proxy formats into a canonical `protocol://[user:pass@]host:port` URL. Supports:
-
-- `host:port`
-- `host:port:user:pass` (auth appended)
-- `user:pass:host:port` (auth prepended; auto-detected via numeric port pattern)
-- `host:portStart:portEnd:user:pass` (random port in range, inclusive)
-- `user:pass:host:portStart:portEnd` (auth prepended, random port in range)
-- `user:pass@host:port`
-- `user:pass@host:portStart:portEnd` (random port in range)
-- Any of the above prefixed with `scheme://` (`http`, `https`, `socks5`, `socks5h`, …)
-
-Returns `null` for empty or non-string input. Does not crash on unparseable input — returns it as-is wrapped with
-`protocol://`.
-
-- **Parameters:**
-    - `proxy` (String): Source proxy string.
-    - `protocol` (String): Default protocol when none is present in the input.
-- **Returns:** Canonical proxy URL, or `null` when input is empty/missing.
-
-### parseProxy(proxy, protocol = "http")
-
-Normalizes `proxy` via `normalizeProxy`, then decomposes it into structured fields. Returns `null` when normalization
-fails (empty input).
-
-- **Parameters:**
-    - `proxy` (String): Source proxy string.
-    - `protocol` (String): Default protocol when none is present in the input.
-- **Returns:** `{protocol, host, port, auth?: {username, password}}` or `null`.
-
-### proxyValue(rawProxy, replacements = {})
-
-Picks a random proxy from a newline-separated list, normalizes it, and applies placeholder substitution.
-
-`{SESSION}` is a built-in placeholder:
-
-- If `SESSION` is not provided, it is autofilled with a non-secure `randomHex(8)`.
-- If `SESSION` is a string, it is treated as a seed and replaced via `seedHex(seed, 8)` (deterministic).
-- If `SESSION` is a function, the function is called per invocation.
-
-Any other key in `replacements` is also substituted (`{KEY}` → value). For non-SESSION entries: functions are called,
-strings are used literally.
-
-- **Parameters:**
-    - `rawProxy` (String): Newline-separated proxy list.
-    - `replacements` (Object): Placeholder values keyed by placeholder name.
-- **Returns:** Final proxy URL string, or `null` if the list is empty.
-
 ## File I/O (JSON)
 
 ### readJsonFile(filePath, defaultValue = {})

package/lib/cjs/index.cjs

@@ -20,10 +20,13 @@ exports.isTransientHttpCode = isTransientHttpCode;
 exports.isValidURL = isValidURL;
 exports.limitString = limitString;
 exports.mulberry32 = mulberry32;
+exports.normalizeProxy = normalizeProxy;
 exports.objectStringify = objectStringify;
+exports.parseProxy = parseProxy;
 exports.pascalCase = pascalCase;
 exports.promiseSilent = promiseSilent;
 exports.promiseTimeout = promiseTimeout;
+exports.proxyValue = proxyValue;
 exports.randomBoolean = randomBoolean;
 exports.randomElement = randomElement;
 exports.randomHex = randomHex;
@@ -115,7 +118,7 @@ async function retry(task, maxAttempts = 1, onError = null, {
     try {
       return await task();
     } catch (error) {
-      if (onError) await onError(attempt, error);
+      if (onError) await onError(error, attempt);
       if (attempt >= maxAttempts) throw error;
       if (delayMs > 0) await sleepMs(delayMs * backoffFactor ** (attempt - 1));
     }
@@ -178,7 +181,7 @@ function findNodeByKey(key, node, pair = null) {
   }
   return null;
 }
-function waitForProperty(object, property, timeout = 5000, interval = 100) {
+function waitForProperty(object, property, timeout, interval = 100) {
   return new Promise((resolve, reject) => {
     if (Object.hasOwn(object, property)) {
       resolve(object[property]);
@@ -349,4 +352,123 @@ function getResponseError(error, limit = 200) {
     response = error.response.data;
   }
   return limitString(response || error.message, limit).trim();
+}
+function normalizeProxy(proxy, protocol = "http") {
+  proxy = proxy?.trim();
+  if (!proxy) return null;
+  const schemeMatch = proxy.match(/^([a-z][a-z0-9+.-]*):\/\/(.+)$/i);
+  if (schemeMatch) {
+    protocol = schemeMatch[1];
+    proxy = schemeMatch[2];
+  }
+  let auth = "";
+  let body = proxy;
+  const atIdx = body.lastIndexOf("@");
+  if (atIdx !== -1) {
+    auth = body.slice(0, atIdx) + "@";
+    body = body.slice(atIdx + 1);
+  }
+  if (!auth) {
+    /* Note: when host is single-token (e.g. "localhost") AND password is all-digit port-shaped,
+     the heuristic stays ambiguous; prefer `user:pass@host:port` for those cases. */
+    const parts = body.split(":");
+    const isPort = s => /^\d+$/.test(s) && +s >= 1 && +s <= 65535;
+    const isHost = s => s.includes(".") || /[a-z]/i.test(s);
+    if (parts.length === 4) {
+      if (isPort(parts[3]) && !isPort(parts[1])) {
+        // user:pass:host:port
+        auth = `${parts[0]}:${parts[1]}@`;
+        body = `${parts[2]}:${parts[3]}`;
+      } else if (isPort(parts[1]) && !isPort(parts[3])) {
+        // host:port:user:pass
+        auth = `${parts[2]}:${parts[3]}@`;
+        body = `${parts[0]}:${parts[1]}`;
+      } else if (isHost(parts[2]) && !isHost(parts[0])) {
+        // user:pass:host:port (ambiguous; host detected at parts[2])
+        auth = `${parts[0]}:${parts[1]}@`;
+        body = `${parts[2]}:${parts[3]}`;
+      } else {
+        // host:port:user:pass (ambiguous fallback)
+        auth = `${parts[2]}:${parts[3]}@`;
+        body = `${parts[0]}:${parts[1]}`;
+      }
+    } else if (parts.length === 5) {
+      if (isPort(parts[3]) && isPort(parts[4]) && !isPort(parts[1])) {
+        // user:pass:host:portStart:portEnd
+        auth = `${parts[0]}:${parts[1]}@`;
+        body = `${parts[2]}:${parts[3]}:${parts[4]}`;
+      } else if (isPort(parts[1]) && isPort(parts[2]) && !isPort(parts[3])) {
+        // host:portStart:portEnd:user:pass
+        auth = `${parts[3]}:${parts[4]}@`;
+        body = `${parts[0]}:${parts[1]}:${parts[2]}`;
+      } else if (isHost(parts[2]) && !isHost(parts[0])) {
+        // user:pass:host:portStart:portEnd (ambiguous; host detected at parts[2])
+        auth = `${parts[0]}:${parts[1]}@`;
+        body = `${parts[2]}:${parts[3]}:${parts[4]}`;
+      } else {
+        // host:portStart:portEnd:user:pass (ambiguous fallback)
+        auth = `${parts[3]}:${parts[4]}@`;
+        body = `${parts[0]}:${parts[1]}:${parts[2]}`;
+      }
+    }
+  }
+  const parts = body.split(":");
+  if (parts.length === 3) {
+    const start = Number(parts[1]);
+    const end = Number(parts[2]);
+    if (Number.isInteger(start) && Number.isInteger(end) && start >= 0 && start <= end) {
+      body = `${parts[0]}:${randomInteger(start, end + 1)}`;
+    }
+  }
+  return `${protocol}://${auth}${body}`;
+}
+function parseProxy(proxy, protocol = "http") {
+  const normalized = normalizeProxy(proxy, protocol);
+  if (!normalized) return null;
+  const [scheme, rest] = normalized.split("://");
+  const atIdx = rest.lastIndexOf("@");
+  const authPart = atIdx === -1 ? null : rest.slice(0, atIdx);
+  const hostPart = atIdx === -1 ? rest : rest.slice(atIdx + 1);
+  const [host, port] = hostPart.split(":");
+  const result = {
+    protocol: scheme,
+    host,
+    port: parseInt(port, 10)
+  };
+  if (authPart !== null) {
+    const colonIdx = authPart.indexOf(":");
+    const [username, password] = colonIdx === -1 ? [authPart, ""] : [authPart.slice(0, colonIdx), authPart.slice(colonIdx + 1)];
+    result.auth = {
+      username,
+      password
+    };
+  }
+  return result;
+}
+function proxyValue(rawProxy, replacements = {}) {
+  const list = splitTrim(rawProxy || "");
+  if (list.length === 0) return null;
+  const picked = list[randomInteger(0, list.length)];
+  let result = normalizeProxy(picked);
+  if (!result) return null;
+  if (result.includes("{")) {
+    const {
+      SESSION,
+      ...rest
+    } = replacements;
+    let sessionValue;
+    if (SESSION === undefined) {
+      sessionValue = randomHex(8);
+    } else if (typeof SESSION === "function") {
+      sessionValue = SESSION();
+    } else {
+      sessionValue = seedHex(String(SESSION), 8);
+    }
+    result = result.replace("{SESSION}", sessionValue);
+    for (const [key, value] of Object.entries(rest)) {
+      const v = typeof value === "function" ? value() : String(value);
+      result = result.replace(`{${key}}`, v);
+    }
+  }
+  return result;
 }

package/lib/cjs/node.cjs

@@ -14,9 +14,6 @@ exports.gitVersion = gitVersion;
 exports.hash = hash;
 exports.hostIp = hostIp;
 exports.md5 = md5;
-exports.normalizeProxy = normalizeProxy;
-exports.parseProxy = parseProxy;
-exports.proxyValue = proxyValue;
 exports.readJsonFile = readJsonFile;
 exports.readJsonFileSync = readJsonFileSync;
 exports.secureRandomBoolean = secureRandomBoolean;
@@ -128,106 +125,6 @@ function bcryptVerify(plainText, hash, {
   }
   return _bcryptjs.default.compareSync(input, hash);
 }
-function normalizeProxy(proxy, protocol = "http") {
-  proxy = proxy?.trim();
-  if (!proxy) return null;
-  const schemeMatch = proxy.match(/^([a-z][a-z0-9+.-]*):\/\/(.+)$/i);
-  if (schemeMatch) {
-    protocol = schemeMatch[1];
-    proxy = schemeMatch[2];
-  }
-  let auth = "";
-  let body = proxy;
-  const atIdx = body.lastIndexOf("@");
-  if (atIdx !== -1) {
-    auth = body.slice(0, atIdx) + "@";
-    body = body.slice(atIdx + 1);
-  }
-  if (!auth) {
-    // Note: when the password itself is all-digit and port-shaped (e.g. "admin:1234:host:port"),
-    // the heuristic cannot distinguish auth-first from host-first ordering and may pick the wrong branch.
-    const parts = body.split(":");
-    const isPort = s => /^\d+$/.test(s) && +s >= 1 && +s <= 65535;
-    if (parts.length === 4) {
-      if (isPort(parts[3]) && !isPort(parts[1])) {
-        // user:pass:host:port
-        auth = `${parts[0]}:${parts[1]}@`;
-        body = `${parts[2]}:${parts[3]}`;
-      } else {
-        // host:port:user:pass (default)
-        auth = `${parts[2]}:${parts[3]}@`;
-        body = `${parts[0]}:${parts[1]}`;
-      }
-    } else if (parts.length === 5) {
-      if (isPort(parts[3]) && isPort(parts[4]) && !isPort(parts[1])) {
-        // user:pass:host:portStart:portEnd
-        auth = `${parts[0]}:${parts[1]}@`;
-        body = `${parts[2]}:${parts[3]}:${parts[4]}`;
-      } else {
-        // host:portStart:portEnd:user:pass (default)
-        auth = `${parts[3]}:${parts[4]}@`;
-        body = `${parts[0]}:${parts[1]}:${parts[2]}`;
-      }
-    }
-  }
-  const parts = body.split(":");
-  if (parts.length === 3) {
-    const start = Number(parts[1]);
-    const end = Number(parts[2]);
-    if (Number.isInteger(start) && Number.isInteger(end) && start >= 0 && start <= end) {
-      body = `${parts[0]}:${(0, _index.randomInteger)(start, end + 1)}`;
-    }
-  }
-  return `${protocol}://${auth}${body}`;
-}
-function parseProxy(proxy, protocol = "http") {
-  const normalized = normalizeProxy(proxy, protocol);
-  if (!normalized) return null;
-  const [scheme, rest] = normalized.split("://");
-  const atIdx = rest.lastIndexOf("@");
-  const authPart = atIdx === -1 ? null : rest.slice(0, atIdx);
-  const hostPart = atIdx === -1 ? rest : rest.slice(atIdx + 1);
-  const [host, port] = hostPart.split(":");
-  const result = {
-    protocol: scheme,
-    host,
-    port: parseInt(port, 10)
-  };
-  if (authPart !== null) {
-    const colonIdx = authPart.indexOf(":");
-    const [username, password] = colonIdx === -1 ? [authPart, ""] : [authPart.slice(0, colonIdx), authPart.slice(colonIdx + 1)];
-    result.auth = {
-      username,
-      password
-    };
-  }
-  return result;
-}
-function proxyValue(rawProxy, replacements = {}) {
-  const list = (0, _index.splitTrim)(rawProxy || "");
-  if (list.length === 0) return null;
-  const picked = list[(0, _index.randomInteger)(0, list.length)];
-  const {
-    SESSION,
-    ...rest
-  } = replacements;
-  let sessionValue;
-  if (SESSION === undefined) {
-    sessionValue = (0, _index.randomHex)(8);
-  } else if (typeof SESSION === "function") {
-    sessionValue = SESSION();
-  } else {
-    sessionValue = (0, _index.seedHex)(String(SESSION), 8);
-  }
-  let result = normalizeProxy(picked);
-  if (!result) return null;
-  result = result.replace("{SESSION}", sessionValue);
-  for (const [key, value] of Object.entries(rest)) {
-    const v = typeof value === "function" ? value() : String(value);
-    result = result.replace(`{${key}}`, v);
-  }
-  return result;
-}
 async function readJsonFile(filePath, defaultValue = {}) {
   try {
     const data = await _fs.promises.readFile(filePath, 'utf8');

package/lib/esm/index.mjs

@@ -70,7 +70,7 @@ export async function retry(task, maxAttempts = 1, onError = null, {
     try {
       return await task();
     } catch (error) {
-      if (onError) await onError(attempt, error);
+      if (onError) await onError(error, attempt);
       if (attempt >= maxAttempts) throw error;
       if (delayMs > 0) await sleepMs(delayMs * backoffFactor ** (attempt - 1));
     }
@@ -133,7 +133,7 @@ export function findNodeByKey(key, node, pair = null) {
   }
   return null;
 }
-export function waitForProperty(object, property, timeout = 5000, interval = 100) {
+export function waitForProperty(object, property, timeout, interval = 100) {
   return new Promise((resolve, reject) => {
     if (Object.hasOwn(object, property)) {
       resolve(object[property]);
@@ -304,4 +304,123 @@ export function getResponseError(error, limit = 200) {
     response = error.response.data;
   }
   return limitString(response || error.message, limit).trim();
+}
+export function normalizeProxy(proxy, protocol = "http") {
+  proxy = proxy?.trim();
+  if (!proxy) return null;
+  const schemeMatch = proxy.match(/^([a-z][a-z0-9+.-]*):\/\/(.+)$/i);
+  if (schemeMatch) {
+    protocol = schemeMatch[1];
+    proxy = schemeMatch[2];
+  }
+  let auth = "";
+  let body = proxy;
+  const atIdx = body.lastIndexOf("@");
+  if (atIdx !== -1) {
+    auth = body.slice(0, atIdx) + "@";
+    body = body.slice(atIdx + 1);
+  }
+  if (!auth) {
+    /* Note: when host is single-token (e.g. "localhost") AND password is all-digit port-shaped,
+     the heuristic stays ambiguous; prefer `user:pass@host:port` for those cases. */
+    const parts = body.split(":");
+    const isPort = s => /^\d+$/.test(s) && +s >= 1 && +s <= 65535;
+    const isHost = s => s.includes(".") || /[a-z]/i.test(s);
+    if (parts.length === 4) {
+      if (isPort(parts[3]) && !isPort(parts[1])) {
+        // user:pass:host:port
+        auth = `${parts[0]}:${parts[1]}@`;
+        body = `${parts[2]}:${parts[3]}`;
+      } else if (isPort(parts[1]) && !isPort(parts[3])) {
+        // host:port:user:pass
+        auth = `${parts[2]}:${parts[3]}@`;
+        body = `${parts[0]}:${parts[1]}`;
+      } else if (isHost(parts[2]) && !isHost(parts[0])) {
+        // user:pass:host:port (ambiguous; host detected at parts[2])
+        auth = `${parts[0]}:${parts[1]}@`;
+        body = `${parts[2]}:${parts[3]}`;
+      } else {
+        // host:port:user:pass (ambiguous fallback)
+        auth = `${parts[2]}:${parts[3]}@`;
+        body = `${parts[0]}:${parts[1]}`;
+      }
+    } else if (parts.length === 5) {
+      if (isPort(parts[3]) && isPort(parts[4]) && !isPort(parts[1])) {
+        // user:pass:host:portStart:portEnd
+        auth = `${parts[0]}:${parts[1]}@`;
+        body = `${parts[2]}:${parts[3]}:${parts[4]}`;
+      } else if (isPort(parts[1]) && isPort(parts[2]) && !isPort(parts[3])) {
+        // host:portStart:portEnd:user:pass
+        auth = `${parts[3]}:${parts[4]}@`;
+        body = `${parts[0]}:${parts[1]}:${parts[2]}`;
+      } else if (isHost(parts[2]) && !isHost(parts[0])) {
+        // user:pass:host:portStart:portEnd (ambiguous; host detected at parts[2])
+        auth = `${parts[0]}:${parts[1]}@`;
+        body = `${parts[2]}:${parts[3]}:${parts[4]}`;
+      } else {
+        // host:portStart:portEnd:user:pass (ambiguous fallback)
+        auth = `${parts[3]}:${parts[4]}@`;
+        body = `${parts[0]}:${parts[1]}:${parts[2]}`;
+      }
+    }
+  }
+  const parts = body.split(":");
+  if (parts.length === 3) {
+    const start = Number(parts[1]);
+    const end = Number(parts[2]);
+    if (Number.isInteger(start) && Number.isInteger(end) && start >= 0 && start <= end) {
+      body = `${parts[0]}:${randomInteger(start, end + 1)}`;
+    }
+  }
+  return `${protocol}://${auth}${body}`;
+}
+export function parseProxy(proxy, protocol = "http") {
+  const normalized = normalizeProxy(proxy, protocol);
+  if (!normalized) return null;
+  const [scheme, rest] = normalized.split("://");
+  const atIdx = rest.lastIndexOf("@");
+  const authPart = atIdx === -1 ? null : rest.slice(0, atIdx);
+  const hostPart = atIdx === -1 ? rest : rest.slice(atIdx + 1);
+  const [host, port] = hostPart.split(":");
+  const result = {
+    protocol: scheme,
+    host,
+    port: parseInt(port, 10)
+  };
+  if (authPart !== null) {
+    const colonIdx = authPart.indexOf(":");
+    const [username, password] = colonIdx === -1 ? [authPart, ""] : [authPart.slice(0, colonIdx), authPart.slice(colonIdx + 1)];
+    result.auth = {
+      username,
+      password
+    };
+  }
+  return result;
+}
+export function proxyValue(rawProxy, replacements = {}) {
+  const list = splitTrim(rawProxy || "");
+  if (list.length === 0) return null;
+  const picked = list[randomInteger(0, list.length)];
+  let result = normalizeProxy(picked);
+  if (!result) return null;
+  if (result.includes("{")) {
+    const {
+      SESSION,
+      ...rest
+    } = replacements;
+    let sessionValue;
+    if (SESSION === undefined) {
+      sessionValue = randomHex(8);
+    } else if (typeof SESSION === "function") {
+      sessionValue = SESSION();
+    } else {
+      sessionValue = seedHex(String(SESSION), 8);
+    }
+    result = result.replace("{SESSION}", sessionValue);
+    for (const [key, value] of Object.entries(rest)) {
+      const v = typeof value === "function" ? value() : String(value);
+      result = result.replace(`{${key}}`, v);
+    }
+  }
+  return result;
 }

package/lib/esm/node.mjs

@@ -6,7 +6,7 @@ import { networkInterfaces } from "os";
 import { exec, execFileSync } from "child_process";
 import { promisify } from "util";
 import bcrypt from "bcryptjs";
-import { CONSTANTS, splitTrim, randomInteger, randomHex, seedHex, checkEmpty } from "./index.mjs";
+import { CONSTANTS, checkEmpty } from "./index.mjs";
 const execAsync = promisify(exec);
 export function secureRandomBoolean() {
   return secureRandomInteger(2) === 1;
@@ -95,106 +95,6 @@ export function bcryptVerify(plainText, hash, {
   }
   return bcrypt.compareSync(input, hash);
 }
-export function normalizeProxy(proxy, protocol = "http") {
-  proxy = proxy?.trim();
-  if (!proxy) return null;
-  const schemeMatch = proxy.match(/^([a-z][a-z0-9+.-]*):\/\/(.+)$/i);
-  if (schemeMatch) {
-    protocol = schemeMatch[1];
-    proxy = schemeMatch[2];
-  }
-  let auth = "";
-  let body = proxy;
-  const atIdx = body.lastIndexOf("@");
-  if (atIdx !== -1) {
-    auth = body.slice(0, atIdx) + "@";
-    body = body.slice(atIdx + 1);
-  }
-  if (!auth) {
-    // Note: when the password itself is all-digit and port-shaped (e.g. "admin:1234:host:port"),
-    // the heuristic cannot distinguish auth-first from host-first ordering and may pick the wrong branch.
-    const parts = body.split(":");
-    const isPort = s => /^\d+$/.test(s) && +s >= 1 && +s <= 65535;
-    if (parts.length === 4) {
-      if (isPort(parts[3]) && !isPort(parts[1])) {
-        // user:pass:host:port
-        auth = `${parts[0]}:${parts[1]}@`;
-        body = `${parts[2]}:${parts[3]}`;
-      } else {
-        // host:port:user:pass (default)
-        auth = `${parts[2]}:${parts[3]}@`;
-        body = `${parts[0]}:${parts[1]}`;
-      }
-    } else if (parts.length === 5) {
-      if (isPort(parts[3]) && isPort(parts[4]) && !isPort(parts[1])) {
-        // user:pass:host:portStart:portEnd
-        auth = `${parts[0]}:${parts[1]}@`;
-        body = `${parts[2]}:${parts[3]}:${parts[4]}`;
-      } else {
-        // host:portStart:portEnd:user:pass (default)
-        auth = `${parts[3]}:${parts[4]}@`;
-        body = `${parts[0]}:${parts[1]}:${parts[2]}`;
-      }
-    }
-  }
-  const parts = body.split(":");
-  if (parts.length === 3) {
-    const start = Number(parts[1]);
-    const end = Number(parts[2]);
-    if (Number.isInteger(start) && Number.isInteger(end) && start >= 0 && start <= end) {
-      body = `${parts[0]}:${randomInteger(start, end + 1)}`;
-    }
-  }
-  return `${protocol}://${auth}${body}`;
-}
-export function parseProxy(proxy, protocol = "http") {
-  const normalized = normalizeProxy(proxy, protocol);
-  if (!normalized) return null;
-  const [scheme, rest] = normalized.split("://");
-  const atIdx = rest.lastIndexOf("@");
-  const authPart = atIdx === -1 ? null : rest.slice(0, atIdx);
-  const hostPart = atIdx === -1 ? rest : rest.slice(atIdx + 1);
-  const [host, port] = hostPart.split(":");
-  const result = {
-    protocol: scheme,
-    host,
-    port: parseInt(port, 10)
-  };
-  if (authPart !== null) {
-    const colonIdx = authPart.indexOf(":");
-    const [username, password] = colonIdx === -1 ? [authPart, ""] : [authPart.slice(0, colonIdx), authPart.slice(colonIdx + 1)];
-    result.auth = {
-      username,
-      password
-    };
-  }
-  return result;
-}
-export function proxyValue(rawProxy, replacements = {}) {
-  const list = splitTrim(rawProxy || "");
-  if (list.length === 0) return null;
-  const picked = list[randomInteger(0, list.length)];
-  const {
-    SESSION,
-    ...rest
-  } = replacements;
-  let sessionValue;
-  if (SESSION === undefined) {
-    sessionValue = randomHex(8);
-  } else if (typeof SESSION === "function") {
-    sessionValue = SESSION();
-  } else {
-    sessionValue = seedHex(String(SESSION), 8);
-  }
-  let result = normalizeProxy(picked);
-  if (!result) return null;
-  result = result.replace("{SESSION}", sessionValue);
-  for (const [key, value] of Object.entries(rest)) {
-    const v = typeof value === "function" ? value() : String(value);
-    result = result.replace(`{${key}}`, v);
-  }
-  return result;
-}
 export async function readJsonFile(filePath, defaultValue = {}) {
   try {
     const data = await fsp.readFile(filePath, 'utf8');

package/package.json

@@ -70,5 +70,5 @@
     "babel-plugin-transform-import-meta": "^2.3.3",
     "cross-env": "^10.1.0"
   },
-  "version": "16.1.0"
+  "version": "17.0.0"
 }