Merge pull request Zenda-Cross#118 from himanshu8443/feature

Provider fixes and bump version 2.4.4

android/app/build.gradle

@@ -86,8 +86,8 @@ android {
  applicationId "com.vega"
  minSdkVersion rootProject.ext.minSdkVersion
  targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 56
- versionName "2.4.3" 
+ versionCode 57
+ versionName "2.4.4" 
  }
  signingConfigs {
  release {

app.json

@@ -1,12 +1,33 @@
 {
+ "name": "Vega",
+ "displayName": "Vega",
  "expo": {
- "name": "vega",
+ "name": "Vega",
+ "displayName": "Vega",
+ "autolinking": {
+ "exclude": ["expo-splash-screen"]
+ },
+ "plugins": [
+ [
+ "expo-build-properties",
+ {
+ "android": {
+ "extraMavenRepos": [
+ "../../node_modules/@notifee/react-native/android/libs"
+ ]
+ },
+ "ios": {}
+ }
+ ]
+ ],
  "slug": "vega",
- "version": "2.0.2",
+ "version": "2.4.4",
  "sdkVersion": "51.0.0",
- "platforms": [
- "ios",
- "android"
- ]
+ "android": {
+ "minSdkVersion": 24,
+ "package": "com.vega",
+ "versionCode": 57
+ },
+ "platforms": ["ios", "android"]
  }
 }

index.js

@@ -4,6 +4,6 @@
 
 import {AppRegistry} from 'react-native';
 import App from './src/App';
-import {name as appName} from './src/app.json';
+import {name as appName} from './app.json';
 
 AppRegistry.registerComponent(appName, () => App);

package.json

@@ -1,6 +1,6 @@
 {
  "name": "vega",
- "version": "2.4.3",
+ "version": "2.4.4",
  "private": true,
  "scripts": {
  "android": "react-native run-android",
@@ -23,6 +23,7 @@
  "cheerio": "^1.0.0-rc.12",
  "expo": "^51.0.0",
  "expo-blur": "~13.0.2",
+ "expo-build-properties": "~0.12.5",
  "expo-intent-launcher": "~11.0.1",
  "expo-system-ui": "~3.0.4",
  "ffmpeg-kit-react-native": "^6.0.2",

src/lib/providers/autoEmbed/allGetStream.ts

@@ -153,7 +153,7 @@ export const allGetStream = async (
  }
 
  ///// rive
- // await getRiveStream(tmdbId, episode, season, type, streams);
+ await getRiveStream(tmdbId, episode, season, type, streams);
 
  ///// vidsrcrip
  await getVidSrcRip(tmdbId, season, episode, streams);

src/lib/providers/autoEmbed/getRiveStream.ts

@@ -10,7 +10,7 @@ export async function getRiveStream(
  type: string,
  Streams: Stream[],
 ) {
- const servers = ['vidcloud', 'upcloud', 'nova'];
+ const servers = ['hydrax', 'filmecho', 'upcloud', 'nova'];
  const baseUrl = await getBaseUrl('rive');
  const cors = 'aHR0cHM6Ly9jcnMuMXByb3h5LndvcmtlcnMuZGV2Lz91cmw9';
  const route =

src/lib/providers/cinemaLuxe/clGetSteam.ts

@@ -24,8 +24,11 @@ export const clGetStream = async (
  }
  const res2 = await axios.get(newLink, {signal});
  const data2 = res2.data;
- newLink = data2.match(/location\.replace\('([^']+)'/)?.[1] || newLink;
- const hubCloudLinks = await hubcloudExtracter(newLink, signal);
+ const hcLink = data2.match(/location\.replace\('([^']+)'/)?.[1] || newLink;
+ const hubCloudLinks = await hubcloudExtracter(
+ hcLink.includes('https://hubcloud') ? hcLink : newLink,
+ signal,
+ );
  return hubCloudLinks;
  } catch (err) {
  console.error(err);

src/lib/providers/dramacool/dcGetPosts.ts

@@ -10,8 +10,10 @@ export const dcGetPosts = async function (
  providerValue: string,
  signal: AbortSignal,
 ): Promise<Post[]> {
+ console.log('dcGetPosts', filter, page);
  const baseUrl = await getBaseUrl('dc');
  const url = `${baseUrl + filter}?page=${page}`;
+ console.log('dcUrl', url);
  return posts(url, signal);
 };
 

src/lib/providers/drive/driveGetStream.ts

@@ -30,7 +30,10 @@ export const driveGetStream = async (
  const hubcloudLink = $('.fa-file-download').parent().attr('href');
  console.log('hubcloudLink', hubcloudLink);
 
- return await hubcloudExtracter(hubcloudLink!, signal);
+ return await hubcloudExtracter(
+ hubcloudLink?.includes('https://hubcloud') ? hubcloudLink : redirectUrl,
+ signal,
+ );
  } catch (err) {
  console.error(err);
  return [];

src/lib/providers/hubcloudExtractor.ts

@@ -57,6 +57,9 @@ export async function hubcloudExtracter(link: string, signal: AbortSignal) {
  if (link?.includes('cloudflarestorage')) {
  streamLinks.push({server: 'CfStorage', link: link, type: 'mkv'});
  }
+ if (link?.includes('fastdl')) {
+ streamLinks.push({server: 'fastDl', link: link, type: 'mkv'});
+ }
  }
  return streamLinks;
  } catch (error) {

src/lib/providers/multi/multiGetStream.ts

@@ -42,8 +42,11 @@ export const multiGetStream = async (
  console.log('ifameUrl', ifameUrl);
  if (!ifameUrl.includes('multimovies')) {
  const iframeRes = await axios.get(ifameUrl, {headers});
+ // console.log('iframeRes', iframeRes.data);
  const $$ = cheerio.load(iframeRes.data);
- let newIframeUrl = $$('.linkserver').first().attr('data-video');
+ let newIframeUrl =
+ $$('.linkserver').first().attr('data-video') ||
+ $$('#videoLinks').children().first().attr('data-link');
  console.log('newIframeUrl', newIframeUrl);
  if (newIframeUrl) {
  ifameUrl = newIframeUrl;

src/lib/providers/uhd/uhdGetPosts.ts

@@ -11,7 +11,9 @@ export const uhdGetPosts = async (
  signal: AbortSignal,
 ): Promise<Post[]> => {
  const baseUrl = await getBaseUrl('UhdMovies');
- const url = `${baseUrl + filter}/page/${page}/`;
+ const url =
+ page === 1 ? `${baseUrl}/${filter}/` : `${baseUrl + filter}/page/${page}/`;
+ console.log('url', url);
 
  return posts(baseUrl, url, signal);
 };