From 61c3b4acf0884d1848b0f35a8852680e53adf365 Mon Sep 17 00:00:00 2001 From: Pas <74743263+Pasithea0@users.noreply.github.com> Date: Tue, 15 Jul 2025 20:13:36 -0600 Subject: [PATCH] change movie-web/providers to p-stream/providers and update --- package.json | 4 ++-- pnpm-lock.yaml | 20 ++++++++++++------- src/backend/extension/streams.ts | 2 +- src/backend/helpers/providerApi.ts | 2 +- src/backend/helpers/report.ts | 2 +- src/backend/providers/fetchers.ts | 2 +- src/backend/providers/providers.ts | 2 +- .../player/hooks/useSourceSelection.ts | 2 +- src/components/player/utils/captions.ts | 2 +- .../player/utils/convertRunoutputToSource.ts | 2 +- src/hooks/useProviderScrape.tsx | 6 +----- src/pages/PlayerView.tsx | 2 +- src/pages/parts/player/ScrapingPart.tsx | 2 +- src/stores/player/slices/source.ts | 2 +- src/stores/player/utils/qualities.ts | 2 +- 15 files changed, 28 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 538c5ec0..aab9fd20 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "dev": "vite", "build": "vite build", "build:pwa": "cross-env VITE_PWA_ENABLED=true vite build", - "update-and-build": "pnpm update @movie-web/providers && pnpm run build", + "update-and-build": "pnpm remove @p-stream/providers && pnpm add github:p-stream/providers#production && pnpm run build", "test": "vitest run", "preview": "vite preview", "lint": "eslint --ext .tsx,.ts src", @@ -36,8 +36,8 @@ "@headlessui/react": "^1.7.19", "@ladjs/country-language": "^1.0.3", "@marsidev/react-turnstile": "^0.7.2", - "@movie-web/providers": "github:p-stream/providers#production", "@noble/hashes": "^1.8.0", + "@p-stream/providers": "github:p-stream/providers#production", "@plasmohq/messaging": "^0.6.2", "@react-spring/web": "^9.7.5", "@scure/bip39": "^1.6.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 63ac421a..4411a8c9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,12 +39,12 @@ importers: '@marsidev/react-turnstile': specifier: ^0.7.2 version: 0.7.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@movie-web/providers': - specifier: github:p-stream/providers#production - version: '@p-stream/providers@https://codeload.github.com/p-stream/providers/tar.gz/9a2ab1bcd409b78c49fa01ec5d82ff91179bfb95' '@noble/hashes': specifier: ^1.8.0 version: 1.8.0 + '@p-stream/providers': + specifier: github:p-stream/providers#production + version: https://codeload.github.com/p-stream/providers/tar.gz/062d8bfda6688cf0812c5edd9d3e03e7e69e2bab '@plasmohq/messaging': specifier: ^0.6.2 version: 0.6.2(react@18.3.1) @@ -1186,8 +1186,8 @@ packages: resolution: {integrity: sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==} engines: {node: '>=12.4.0'} - '@p-stream/providers@https://codeload.github.com/p-stream/providers/tar.gz/9a2ab1bcd409b78c49fa01ec5d82ff91179bfb95': - resolution: {tarball: https://codeload.github.com/p-stream/providers/tar.gz/9a2ab1bcd409b78c49fa01ec5d82ff91179bfb95} + '@p-stream/providers@https://codeload.github.com/p-stream/providers/tar.gz/062d8bfda6688cf0812c5edd9d3e03e7e69e2bab': + resolution: {tarball: https://codeload.github.com/p-stream/providers/tar.gz/062d8bfda6688cf0812c5edd9d3e03e7e69e2bab} version: 2.3.0 '@pkgjs/parseargs@0.11.0': @@ -3324,6 +3324,10 @@ packages: resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} engines: {node: '>=12'} + picomatch@4.0.3: + resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==} + engines: {node: '>=12'} + pify@2.3.0: resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==} engines: {node: '>=0.10.0'} @@ -5455,7 +5459,7 @@ snapshots: '@nolyfill/is-core-module@1.0.39': {} - '@p-stream/providers@https://codeload.github.com/p-stream/providers/tar.gz/9a2ab1bcd409b78c49fa01ec5d82ff91179bfb95': + '@p-stream/providers@https://codeload.github.com/p-stream/providers/tar.gz/062d8bfda6688cf0812c5edd9d3e03e7e69e2bab': dependencies: abort-controller: 3.0.0 cheerio: 1.0.0-rc.12 @@ -5564,7 +5568,7 @@ snapshots: dependencies: '@types/estree': 1.0.8 estree-walker: 2.0.2 - picomatch: 4.0.2 + picomatch: 4.0.3 optionalDependencies: rollup: 4.43.0 @@ -7782,6 +7786,8 @@ snapshots: picomatch@4.0.2: {} + picomatch@4.0.3: {} + pify@2.3.0: {} pirates@4.0.7: {} diff --git a/src/backend/extension/streams.ts b/src/backend/extension/streams.ts index af535f38..a91f32fa 100644 --- a/src/backend/extension/streams.ts +++ b/src/backend/extension/streams.ts @@ -1,4 +1,4 @@ -import { Stream } from "@movie-web/providers"; +import { Stream } from "@p-stream/providers"; import { RULE_IDS, setDomainRule } from "@/backend/extension/messaging"; diff --git a/src/backend/helpers/providerApi.ts b/src/backend/helpers/providerApi.ts index 528e392c..93eac9d9 100644 --- a/src/backend/helpers/providerApi.ts +++ b/src/backend/helpers/providerApi.ts @@ -1,4 +1,4 @@ -import { MetaOutput, NotFoundError, ScrapeMedia } from "@movie-web/providers"; +import { MetaOutput, NotFoundError, ScrapeMedia } from "@p-stream/providers"; import { jwtDecode } from "jwt-decode"; import { mwFetch } from "@/backend/helpers/fetch"; diff --git a/src/backend/helpers/report.ts b/src/backend/helpers/report.ts index 4aa19f0e..b4bdb5bf 100644 --- a/src/backend/helpers/report.ts +++ b/src/backend/helpers/report.ts @@ -1,4 +1,4 @@ -import { ScrapeMedia } from "@movie-web/providers"; +import { ScrapeMedia } from "@p-stream/providers"; import { nanoid } from "nanoid"; import { ofetch } from "ofetch"; import { useCallback } from "react"; diff --git a/src/backend/providers/fetchers.ts b/src/backend/providers/fetchers.ts index 9eaea425..cd345577 100644 --- a/src/backend/providers/fetchers.ts +++ b/src/backend/providers/fetchers.ts @@ -2,7 +2,7 @@ import { Fetcher, makeSimpleProxyFetcher, setM3U8ProxyUrl, -} from "@movie-web/providers"; +} from "@p-stream/providers"; import { sendExtensionRequest } from "@/backend/extension/messaging"; import { getApiToken, setApiToken } from "@/backend/helpers/providerApi"; diff --git a/src/backend/providers/providers.ts b/src/backend/providers/providers.ts index c54d7f6b..7c4cf181 100644 --- a/src/backend/providers/providers.ts +++ b/src/backend/providers/providers.ts @@ -2,7 +2,7 @@ import { makeProviders, makeStandardFetcher, targets, -} from "@movie-web/providers"; +} from "@p-stream/providers"; import { isExtensionActiveCached } from "@/backend/extension/messaging"; import { diff --git a/src/components/player/hooks/useSourceSelection.ts b/src/components/player/hooks/useSourceSelection.ts index a7f06b4d..5875de4d 100644 --- a/src/components/player/hooks/useSourceSelection.ts +++ b/src/components/player/hooks/useSourceSelection.ts @@ -2,7 +2,7 @@ import { EmbedOutput, NotFoundError, SourcererOutput, -} from "@movie-web/providers"; +} from "@p-stream/providers"; import { useAsyncFn } from "react-use"; import { isExtensionActiveCached } from "@/backend/extension/messaging"; diff --git a/src/components/player/utils/captions.ts b/src/components/player/utils/captions.ts index d144340e..dec07f56 100644 --- a/src/components/player/utils/captions.ts +++ b/src/components/player/utils/captions.ts @@ -1,4 +1,4 @@ -import { RunOutput } from "@movie-web/providers"; +import { RunOutput } from "@p-stream/providers"; import DOMPurify from "dompurify"; import { convert, detect, parse } from "subsrt-ts"; import { ContentCaption } from "subsrt-ts/dist/types/handler"; diff --git a/src/components/player/utils/convertRunoutputToSource.ts b/src/components/player/utils/convertRunoutputToSource.ts index 3fd07232..05f66fb0 100644 --- a/src/components/player/utils/convertRunoutputToSource.ts +++ b/src/components/player/utils/convertRunoutputToSource.ts @@ -1,4 +1,4 @@ -import { Stream } from "@movie-web/providers"; +import { Stream } from "@p-stream/providers"; import { SourceFileStream, diff --git a/src/hooks/useProviderScrape.tsx b/src/hooks/useProviderScrape.tsx index b18d6d57..e6382d78 100644 --- a/src/hooks/useProviderScrape.tsx +++ b/src/hooks/useProviderScrape.tsx @@ -1,8 +1,4 @@ -import { - FullScraperEvents, - RunOutput, - ScrapeMedia, -} from "@movie-web/providers"; +import { FullScraperEvents, RunOutput, ScrapeMedia } from "@p-stream/providers"; import { RefObject, useCallback, useEffect, useRef, useState } from "react"; import { isExtensionActiveCached } from "@/backend/extension/messaging"; diff --git a/src/pages/PlayerView.tsx b/src/pages/PlayerView.tsx index 61df9f6a..5c574b95 100644 --- a/src/pages/PlayerView.tsx +++ b/src/pages/PlayerView.tsx @@ -1,4 +1,4 @@ -import { RunOutput } from "@movie-web/providers"; +import { RunOutput } from "@p-stream/providers"; import { useCallback, useEffect, useRef, useState } from "react"; import { Navigate, diff --git a/src/pages/parts/player/ScrapingPart.tsx b/src/pages/parts/player/ScrapingPart.tsx index e2aa120d..10e37e45 100644 --- a/src/pages/parts/player/ScrapingPart.tsx +++ b/src/pages/parts/player/ScrapingPart.tsx @@ -1,4 +1,4 @@ -import { ProviderControls, ScrapeMedia } from "@movie-web/providers"; +import { ProviderControls, ScrapeMedia } from "@p-stream/providers"; import classNames from "classnames"; import { useEffect, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/src/stores/player/slices/source.ts b/src/stores/player/slices/source.ts index aba8d3df..a7231709 100644 --- a/src/stores/player/slices/source.ts +++ b/src/stores/player/slices/source.ts @@ -1,4 +1,4 @@ -import { ScrapeMedia } from "@movie-web/providers"; +import { ScrapeMedia } from "@p-stream/providers"; import { MakeSlice } from "@/stores/player/slices/types"; import { diff --git a/src/stores/player/utils/qualities.ts b/src/stores/player/utils/qualities.ts index 24824027..c9df244c 100644 --- a/src/stores/player/utils/qualities.ts +++ b/src/stores/player/utils/qualities.ts @@ -1,4 +1,4 @@ -import { Qualities, Stream } from "@movie-web/providers"; +import { Qualities, Stream } from "@p-stream/providers"; import { QualityStore } from "@/stores/quality";