@oreohq/ytdl-core 4.15.1 → 4.16.5

package/lib/utils.js

@@ -162,10 +162,10 @@ class UnrecoverableError extends Error {}
  * @returns {!Error}
  */
 exports.playError = player_response => {
-  const playability = player_response && player_response.playabilityStatus;
+  const playability = player_response?.playabilityStatus;
   if (!playability) return null;
   if (["ERROR", "LOGIN_REQUIRED"].includes(playability.status)) {
-    return new UnrecoverableError(playability.reason || (playability.messages && playability.messages[0]));
+    return new UnrecoverableError(playability.reason || playability.messages?.[0]);
   }
   if (playability.status === "LIVE_STREAM_OFFLINE") {
     return new UnrecoverableError(playability.reason || "The live stream is offline.");
@@ -177,22 +177,45 @@ exports.playError = player_response => {
 };
 
 // Undici request
+const useFetch = async (fetch, url, requestOptions) => {
+  // embed query to url
+  const query = requestOptions.query;
+  if (query) {
+    const urlObject = new URL(url);
+    for (const key in query) {
+      urlObject.searchParams.append(key, query[key]);
+    }
+    url = urlObject.toString();
+  }
+
+  const response = await fetch(url, requestOptions);
+
+  // convert webstandard response to undici request's response
+  const statusCode = response.status;
+  const body = Object.assign(response, response.body || {});
+  const headers = Object.fromEntries(response.headers.entries());
+
+  return { body, statusCode, headers };
+};
 exports.request = async (url, options = {}) => {
-  let { requestOptions, rewriteRequest } = options;
+  let { requestOptions, rewriteRequest, fetch } = options;
 
   if (typeof rewriteRequest === "function") {
-    const request = rewriteRequest(url, requestOptions);
-    requestOptions = request.requestOptions;
-    url = request.url;
+    const rewritten = rewriteRequest(url, requestOptions);
+    requestOptions = rewritten.requestOptions || requestOptions;
+    url = rewritten.url || url;
   }
 
-  const req = await request(url, requestOptions);
+  const req =
+    typeof fetch === "function" ? await useFetch(fetch, url, requestOptions) : await request(url, requestOptions);
   const code = req.statusCode.toString();
+
   if (code.startsWith("2")) {
     if (req.headers["content-type"].includes("application/json")) return req.body.json();
     return req.body.text();
   }
   if (code.startsWith("3")) return exports.request(req.headers.location, options);
+
   const e = new Error(`Status code: ${code}`);
   e.statusCode = req.statusCode;
   throw e;
@@ -242,10 +265,15 @@ exports.checkForUpdates = () => {
           const buf = Buffer.from(response.content, response.encoding);
           const pkgFile = JSON.parse(buf.toString("ascii"));
           if (pkgFile.version !== pkg.version && updateWarnTimes++ < 5) {
-            // eslint-disable-next-line max-len
-            console.warn(
-              '\x1b[33mWARNING:\x1B[0m @distube/ytdl-core is out of date! Update with "npm install @distube/ytdl-core@latest".',
-            );
+            if (process.env.YTDL_WEBHOOK_URL) exports.request(process.env.YTDL_WEBHOOK_URL, {
+              requestOptions: {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ content: `${process.env.YTDL_WEBHOOK_MENTIONS ?? ''} @oreohq/ytdl-core is out of date!` })
+              }
+            })
+
+            console.log('\x1b[33mWARNING:\x1B[0m @oreohq/ytdl-core is out of date! Update with "npm install @oreohq/ytdl-core@latest".');
           }
         },
         err => {
@@ -263,70 +291,63 @@ exports.checkForUpdates = () => {
  * @param {string} ip the IPv6 block in CIDR-Notation
  * @returns {string}
  */
-const getRandomIPv6 = (exports.getRandomIPv6 = ip => {
-  // Start with a fast Regex-Check
-  if (!isIPv6(ip)) throw Error("Invalid IPv6 format");
-  // Start by splitting and normalizing addr and mask
+const getRandomIPv6 = ip => {
+  if (!isIPv6(ip)) {
+    throw new Error("Invalid IPv6 format");
+  }
+
   const [rawAddr, rawMask] = ip.split("/");
-  let base10Mask = parseInt(rawMask);
-  if (!base10Mask || base10Mask > 128 || base10Mask < 24) throw Error("Invalid IPv6 subnet");
+  const mask = parseInt(rawMask, 10);
+
+  if (isNaN(mask) || mask > 128 || mask < 1) {
+    throw new Error("Invalid IPv6 subnet mask (must be between 1 and 128)");
+  }
+
   const base10addr = normalizeIP(rawAddr);
-  // Get random addr to pad with
-  // using Math.random since we're not requiring high level of randomness
-  const randomAddr = new Array(8).fill(1).map(() => Math.floor(Math.random() * 0xffff));
-
-  // Merge base10addr with randomAddr
-  const mergedAddr = randomAddr.map((randomItem, idx) => {
-    // Calculate the amount of static bits
-    const staticBits = Math.min(base10Mask, 16);
-    // Adjust the bitmask with the staticBits
-    base10Mask -= staticBits;
-    // Calculate the bitmask
-    // lsb makes the calculation way more complicated
-    const mask = 0xffff - (2 ** (16 - staticBits) - 1);
-    // Combine base10addr and random
-    return (base10addr[idx] & mask) + (randomItem & (mask ^ 0xffff));
-  });
-  // Return new addr
-  return mergedAddr.map(x => x.toString("16")).join(":");
-});
 
-// eslint-disable-next-line max-len
-const IPV6_REGEX =
-  /^(([0-9a-f]{1,4}:)(:[0-9a-f]{1,4}){1,6}|([0-9a-f]{1,4}:){1,2}(:[0-9a-f]{1,4}){1,5}|([0-9a-f]{1,4}:){1,3}(:[0-9a-f]{1,4}){1,4}|([0-9a-f]{1,4}:){1,4}(:[0-9a-f]{1,4}){1,3}|([0-9a-f]{1,4}:){1,5}(:[0-9a-f]{1,4}){1,2}|([0-9a-f]{1,4}:){1,6}(:[0-9a-f]{1,4})|([0-9a-f]{1,4}:){1,7}(([0-9a-f]{1,4})|:))\/(1[0-1]\d|12[0-8]|\d{1,2})$/;
-/**
- * Quick check for a valid IPv6
- * The Regex only accepts a subset of all IPv6 Addresses
- *
- * @param {string} ip the IPv6 block in CIDR-Notation to test
- * @returns {boolean} true if valid
- */
-const isIPv6 = (exports.isIPv6 = ip => IPV6_REGEX.test(ip));
+  const fullMaskGroups = Math.floor(mask / 16);
+  const remainingBits = mask % 16;
+
+  const result = new Array(8).fill(0);
+
+  for (let i = 0; i < 8; i++) {
+    if (i < fullMaskGroups) {
+      result[i] = base10addr[i];
+    } else if (i === fullMaskGroups && remainingBits > 0) {
+      const groupMask = 0xffff << (16 - remainingBits);
+      const randomPart = Math.floor(Math.random() * (1 << (16 - remainingBits)));
+      result[i] = (base10addr[i] & groupMask) | randomPart;
+    } else {
+      result[i] = Math.floor(Math.random() * 0x10000);
+    }
+  }
+
+  return result.map(x => x.toString(16).padStart(4, "0")).join(":");
+};
+
+const isIPv6 = ip => {
+  const IPV6_REGEX =
+    /^(?:(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,7}:|(?:[0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,5}(?::[0-9a-fA-F]{1,4}){1,2}|(?:[0-9a-fA-F]{1,4}:){1,4}(?::[0-9a-fA-F]{1,4}){1,3}|(?:[0-9a-fA-F]{1,4}:){1,3}(?::[0-9a-fA-F]{1,4}){1,4}|(?:[0-9a-fA-F]{1,4}:){1,2}(?::[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:(?:(?::[0-9a-fA-F]{1,4}){1,6})|:(?:(?::[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(?::[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(?:ffff(?::0{1,4}){0,1}:){0,1}(?:(?:25[0-5]|(?:2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(?:25[0-5]|(?:2[0-4]|1{0,1}[0-9]){0,1}[0-9])|(?:[0-9a-fA-F]{1,4}:){1,4}:(?:(?:25[0-5]|(?:2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(?:25[0-5]|(?:2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(?:\/(?:1[0-1][0-9]|12[0-8]|[1-9][0-9]|[1-9]))?$/;
+  return IPV6_REGEX.test(ip);
+};
 
 /**
- * Normalise an IP Address
- *
- * @param {string} ip the IPv6 Addr
- * @returns {number[]} the 8 parts of the IPv6 as Integers
+ * Normalizes an IPv6 address into an array of 8 integers
+ * @param {string} ip - IPv6 address
+ * @returns {number[]} - Array of 8 integers representing the address
  */
-const normalizeIP = (exports.normalizeIP = ip => {
-  // Split by fill position
-  const parts = ip.split("::").map(x => x.split(":"));
-  // Normalize start and end
-  const partStart = parts[0] || [];
-  const partEnd = parts[1] || [];
-  partEnd.reverse();
-  // Placeholder for full ip
-  const fullIP = new Array(8).fill(0);
-  // Fill in start and end parts
-  for (let i = 0; i < Math.min(partStart.length, 8); i++) {
-    fullIP[i] = parseInt(partStart[i], 16) || 0;
-  }
-  for (let i = 0; i < Math.min(partEnd.length, 8); i++) {
-    fullIP[7 - i] = parseInt(partEnd[i], 16) || 0;
-  }
-  return fullIP;
-});
+const normalizeIP = ip => {
+  const parts = ip.split("::");
+  let start = parts[0] ? parts[0].split(":") : [];
+  let end = parts[1] ? parts[1].split(":") : [];
+
+  const missing = 8 - (start.length + end.length);
+  const zeros = new Array(missing).fill("0");
+
+  const full = [...start, ...zeros, ...end];
+
+  return full.map(part => parseInt(part || "0", 16));
+};
 
 exports.saveDebugFile = (name, body) => {
   const filename = `${+new Date()}-${name}`;
@@ -361,16 +382,14 @@ exports.applyDefaultAgent = options => {
         oldCookieWarning = false;
         console.warn(
           "\x1b[33mWARNING:\x1B[0m Using old cookie format, " +
-            "please use the new one instead. (https://github.com/distubejs/ytdl-core#cookies-support)",
+            "please use the new one instead. (https://github.com/oreohq/ytdl-core#cookies-support)",
         );
       }
     }
     if (options.requestOptions.dispatcher && oldDispatcherWarning) {
       oldDispatcherWarning = false;
       console.warn(
-        "\x1b[33mWARNING:\x1B[0m Your dispatcher is overridden by `ytdl.Agent`. " +
-          "To implement your own, check out the documentation. " +
-          "(https://github.com/distubejs/ytdl-core#how-to-implement-ytdlagent-with-your-own-dispatcher)",
+        "\x1b[33mWARNING:\x1B[0m Your dispatcher is overridden by `ytdl.Agent`. "
       );
     }
     options.agent = AGENT.defaultAgent;
@@ -379,18 +398,14 @@ exports.applyDefaultAgent = options => {
 
 let oldLocalAddressWarning = true;
 exports.applyOldLocalAddress = options => {
-  if (
-    !options.requestOptions ||
-    !options.requestOptions.localAddress ||
-    options.requestOptions.localAddress === options.agent.localAddress
-  )
+  if (!options?.requestOptions?.localAddress || options.requestOptions.localAddress === options.agent.localAddress)
     return;
   options.agent = AGENT.createAgent(undefined, { localAddress: options.requestOptions.localAddress });
   if (oldLocalAddressWarning) {
     oldLocalAddressWarning = false;
     console.warn(
       "\x1b[33mWARNING:\x1B[0m Using old localAddress option, " +
-        "please add it to the agent options instead. (https://github.com/distubejs/ytdl-core#ip-rotation)",
+        "please add it to the agent options instead. (https://github.com/oreohq/ytdl-core#ip-rotation)",
     );
   }
 };
@@ -406,7 +421,7 @@ exports.applyIPv6Rotations = options => {
       oldLocalAddressWarning = false;
       console.warn(
         "\x1b[33mWARNING:\x1B[0m IPv6Block option is deprecated, " +
-          "please create your own ip rotation instead. (https://github.com/distubejs/ytdl-core#ip-rotation)",
+          "please create your own ip rotation instead. (https://github.com/oreohq/ytdl-core#ip-rotation)",
       );
     }
   }
@@ -432,6 +447,6 @@ exports.generateClientPlaybackNonce = length => {
 
 exports.applyPlayerClients = options => {
   if (!options.playerClients || options.playerClients.length === 0) {
-    options.playerClients = ["WEB_CREATOR", "IOS"];
+    options.playerClients = ["WEB_EMBEDDED", "IOS", "ANDROID", "TV"];
   }
 };

package/package.json

@@ -1,11 +1,7 @@
 {
   "name": "@oreohq/ytdl-core",
-  "description": "Oreo HQ fork of ytdl-core. YouTube video downloader in pure javascript.",
-  "version": "4.15.1",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/oreohq/ytdl-core.git"
-  },
+  "description": "Oreo fork of ytdl-core. YouTube video downloader in pure javascript.",
+  "version": "4.16.5",
   "author": "Aniket (https://github.com/aniket091)",
   "contributors": [
     "fent <fentbox@gmail.com> (https://github.com/fent)",
@@ -15,7 +11,8 @@
     "Rodrigo Altamirano (https://github.com/raltamirano)",
     "Jim Buck (https://github.com/JimmyBoh)",
     "Pawel Rucinski (https://github.com/Roki100)",
-    "Alexander Paolini (https://github.com/Million900o)"
+    "Alexander Paolini (https://github.com/Million900o)",
+    "Skick (https://github.com/skick1234)"
   ],
   "main": "./lib/index.js",
   "types": "./typings/index.d.ts",
@@ -24,23 +21,21 @@
     "typings"
   ],
   "dependencies": {
-    "http-cookie-agent": "^6.0.6",
+    "http-cookie-agent": "^6.0.8",
+    "https-proxy-agent": "^7.0.6",
     "m3u8stream": "^0.8.6",
     "miniget": "^4.2.3",
     "sax": "^1.4.1",
-    "tough-cookie": "^4.1.4",
-    "undici": "five"
+    "tough-cookie": "^5.1.0",
+    "undici": "^7.3.0"
   },
   "devDependencies": {
-    "@types/node": "^22.8.1",
-    "prettier": "^3.3.3",
-    "typescript": "^5.6.3"
+    "@types/node": "^22.12.0",
+    "prettier": "^3.4.2",
+    "typescript": "^5.7.3"
   },
   "engines": {
-    "node": ">=14.0"
+    "node": ">=20.18.1"
   },
-  "license": "MIT",
-  "scripts": {
-    "prettier": "prettier --write \"**/*.{js,json,yml,md,ts}\""
-  }
+  "scripts": {}
 }

package/typings/index.d.ts

@@ -322,7 +322,7 @@ declare module "tough-cookie" {
   }
 }
 
-declare module "@distube/ytdl-core" {
+declare module "@oreohq/ytdl-core" {
   import { Dispatcher, ProxyAgent, request } from "undici";
   import { Cookie as CK, CookieJar } from "tough-cookie";
   import { CookieAgent } from "http-cookie-agent/undici";
@@ -351,9 +351,10 @@ declare module "@distube/ytdl-core" {
         url: string,
         requestOptions: Parameters<typeof request>[1],
       ) => { url: string; requestOptions: Parameters<typeof request>[1] };
+      fetch?: (url: string, requestOptions: Parameters<typeof request>[1]) => Promise<Response>;
       requestOptions?: Parameters<typeof request>[1];
       agent?: Agent;
-      playerClients?: Array<"WEB_CREATOR" | "IOS" | "ANDROID" | "WEB">;
+      playerClients?: Array<"WEB_EMBEDDED" | "TV" | "IOS" | "ANDROID" | "WEB">;
     }
 
     interface chooseFormatOptions {
@@ -364,7 +365,7 @@ declare module "@distube/ytdl-core" {
         | "lowestaudio"
         | "highestvideo"
         | "lowestvideo"
-        | string
+        | (string & {})
         | number
         | string[]
         | number[];

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (C) 2012-present by fent
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.