diff --git a/src/extractor/Uqload.ts b/src/extractor/Uqload.ts index f8b3413..5c65064 100644 --- a/src/extractor/Uqload.ts +++ b/src/extractor/Uqload.ts @@ -1,8 +1,7 @@ import * as cheerio from 'cheerio'; import { NotFoundError } from '../error'; import { Context, Format, Meta, UrlResult } from '../types'; -import { buildMediaFlowProxyExtractorRedirectUrl, MEDIAFLOW_DEFAULT_INIT, supportsMediaFlowProxy } from '../utils'; -import { guessSizeFromMp4 } from '../utils/size'; +import { buildMediaFlowProxyExtractorRedirectUrl, supportsMediaFlowProxy } from '../utils'; import { Extractor } from './Extractor'; export class Uqload extends Extractor { @@ -32,11 +31,9 @@ export class Uqload extends Extractor { const $ = cheerio.load(html); const title = $('h1').text().trim(); - const mp4Url = buildMediaFlowProxyExtractorRedirectUrl(ctx, 'Uqload', url); - return [ { - url: mp4Url, + url: buildMediaFlowProxyExtractorRedirectUrl(ctx, 'Uqload', url), format: Format.mp4, label: this.label, sourceId: `${this.id}_${meta.countryCodes?.join('_')}`, @@ -44,7 +41,6 @@ export class Uqload extends Extractor { meta: { ...meta, title, - bytes: await guessSizeFromMp4(ctx, this.fetcher, mp4Url, { ...MEDIAFLOW_DEFAULT_INIT, headers: { Referer: url.href } }), ...(heightMatch && { height: parseInt(heightMatch[1] as string), }), diff --git a/src/extractor/__fixtures__/Uqload/head-https:mediaflow.test.orgextractorvideohostUqloadandapi_passwordtestanddhttpspercent3Apercent2Fpercent2Fuqload.netpercent2Fz0xbr87oz637.htmlandredirect_streamtrue b/src/extractor/__fixtures__/Uqload/head-https:mediaflow.test.orgextractorvideohostUqloadandapi_passwordtestanddhttpspercent3Apercent2Fpercent2Fuqload.netpercent2Fz0xbr87oz637.htmlandredirect_streamtrue deleted file mode 100644 index 31842cc..0000000 --- a/src/extractor/__fixtures__/Uqload/head-https:mediaflow.test.orgextractorvideohostUqloadandapi_passwordtestanddhttpspercent3Apercent2Fpercent2Fuqload.netpercent2Fz0xbr87oz637.htmlandredirect_streamtrue +++ /dev/null @@ -1 +0,0 @@ -{"connection":"close","content-length":"431690639","content-range":"bytes 0-431690638/431690639","content-type":"video/mp4","date":"Thu, 28 Aug 2025 19:12:32 GMT","etag":"\"680029e2-19bb138f\"","last-modified":"Wed, 16 Apr 2025 22:06:26 GMT","server":"nginx/1.24.0 (Ubuntu)"} \ No newline at end of file diff --git a/src/extractor/__snapshots__/Uqload.test.ts.snap b/src/extractor/__snapshots__/Uqload.test.ts.snap index 7bb9e83..68dee9b 100644 --- a/src/extractor/__snapshots__/Uqload.test.ts.snap +++ b/src/extractor/__snapshots__/Uqload.test.ts.snap @@ -8,7 +8,6 @@ exports[`Uqload uqload.net /embed- 1`] = ` "format": "mp4", "label": "Uqload (via MediaFlow Proxy)", "meta": { - "bytes": 431690639, "countryCodes": [], "height": 360, "title": "Black Mirror S07E06 MULTI VFF 1080p WEBrip EAC3 5 1 x265-TyHD", diff --git a/src/utils/media-flow-proxy.ts b/src/utils/media-flow-proxy.ts index 6b8e3ed..88de639 100644 --- a/src/utils/media-flow-proxy.ts +++ b/src/utils/media-flow-proxy.ts @@ -8,7 +8,7 @@ interface ExtractResult { query_params: Record; } -export const MEDIAFLOW_DEFAULT_INIT: CustomRequestInit = { +const MEDIAFLOW_DEFAULT_INIT: CustomRequestInit = { queueLimit: 4, queueTimeout: 10000, }; diff --git a/src/utils/size.ts b/src/utils/size.ts deleted file mode 100644 index aec533e..0000000 --- a/src/utils/size.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Context } from '../types'; -import { CustomRequestInit, Fetcher } from './Fetcher'; - -export const guessSizeFromMp4 = async (ctx: Context, fetcher: Fetcher, url: URL, init?: CustomRequestInit): Promise => { - const mp4Head = await fetcher.head(ctx, url, init); - - return parseInt(mp4Head['content-length'] as string); -};