Release: Nightly 5.3.6

amarullz · Aug 16, 2024 · 45f9fbc · 45f9fbc
1 parent cdeb725
commit 45f9fbc
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 49 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdk 22
         targetSdk 34
         versionCode 532
-        versionName "5.3.5-Nightly"
+        versionName "5.3.6-Nightly"
 
 
         // Automatic Build Version

diff --git a/app/src/main/assets/view/m.js b/app/src/main/assets/view/m.js
@@ -1010,11 +1010,7 @@ if (__SD<=2){
       }catch(e){}
     }
   });
-  // Load VRF Function Online
-  // $n('script','',{
-  //   src:'/__proxy/https://raw.githubusercontent.com/amarullz/AnimeTV/master/tools/utils/vrf.js?'+$time()
-  // },
-  // document.body,'');
+
 }
 const wave={
   ns:'https://'+__DNS,
@@ -1856,42 +1852,20 @@ const wave={
   /* Vidstream data scrapper */
   vidstream:{
     keys:null,
-    defkeys:[
-      // "NeBk5CElH19ucfBU", "Z7YMUOoLEjfNqPAt", "eO74cTKZayUWH8x5"
-      '8Qy3mlM2kod80XIK', 'BgKVSrzpH2Enosgm', '9jXDYBZUcTcTZveM'
-    ],
     get:function(u,cb){
       var vidLoc=u.substring(0,u.indexOf("?"));
       var vidSearch=u.substring(u.indexOf("?"));
       var vidHost=vidLoc.split('/')[2];
       var vidId=vidLoc.substring(vidLoc.lastIndexOf("/")+1);
-      /* No Keys Yet */
-      if (!wave.vidstream.keys){
-        if ('vidstream_keys' in VRF){
-          wave.vidstream.keys=JSON.parse(JSON.stringify(VRF.vidstream_keys));
-        }
-        else{
-          cb(null);
-          return;
-        }
-      }
-      if (wave.vidstream.keys.length<3){
-        cb(null);
-        return;
-      }
-      var k1=VRF.safeBtoa(VRF.rc4(wave.vidstream.keys[0],vidId));
-      var k2=VRF.safeBtoa(VRF.rc4(wave.vidstream.keys[1],vidId));
-      var mediaUrl='https://'+vidHost+'/mediainfo/'+k1+vidSearch+'&h='+k2;
+      var mediaUrl = VRF.vidstreamMakeUrl(vidHost,vidSearch,vidId);
+
       console.log("[VIDSTREAM] VideoID: "+vidId+" -> Mediainfo = "+mediaUrl);
       $ap(mediaUrl,function(r){
         if (r.ok){
           try{
             var d=JSON.parse(r.responseText);
             try{
-              var de=decodeURIComponent(
-                VRF.rc4(wave.vidstream.keys[2],
-                  VRF.safeAtob(d.result))
-              );
+              var de=VRF.vidstreamDecode(d.result);
               d.result=JSON.parse(de);
               cb(d);
               console.log("[VIDSTREAM] Got Mediainfo Data: "+JSON.stringify(d)+"");

diff --git a/electron/src/libs/intercept.js b/electron/src/libs/intercept.js
@@ -380,7 +380,7 @@ const intercept={
       else if (intercept.domains.vidplays.indexOf(url.host)>-1){
         var accept=req.headers.get("accept");
         /* Injector */
-        if (accept && accept.startsWith("text/html") && !url.pathname.startsWith("/assets/mcloud/min/embed.js")){
+        if (accept && accept.startsWith("text/html") && !url.pathname.startsWith("/assets/megaf/min/all.js")){
           return intercept.fetchInject(req.url, req, intercept.playerInjectString);
         }
         else{
@@ -389,19 +389,26 @@ const intercept={
           let f=intercept.fetchStream(req);
 
           /* Modify embed.js to get rc4 keys */
-          if (url.pathname.startsWith("/assets/mcloud/min/embed.js")){
+          if (url.pathname.startsWith("/assets/megaf/min/all.js")){
             console.log("IS VIDSTREAM EMBED: "+url);
 
             let body=await (await f).text();
-            body=body.replace(
-              'function _(){',
-              'function _()  {'
-            );
+            // body=body.replace(
+            //   'function _(){',
+            //   'function _()  {'
+            // );
+            // body=body.replace(
+            //   'function _(){',
+            //   'function _(){ try{console.log(arguments);if (!("__QKEYS" in window)) window.__QKEYS=[]; window.__QKEYS.push(arguments[0]);}catch(e){} '
+            // );
 
             body=body.replace(
-              'function _(){',
-              'function _(){ try{console.log(arguments);if (!("__QKEYS" in window)) window.__QKEYS=[]; window.__QKEYS.push(arguments[0]);}catch(e){} '
+              "function _0x64802e(_0x5cf48e,_0x2c4055){",
+              "function _0x64802e(_0x5cf48e,_0x2c4055){"+
+                'try{console.warn(_0x5cf48e);if (!("__QKEYS" in window)) window.__QKEYS=[]; window.__QKEYS.push(_0x5cf48e);}catch(e){}'
             );
+
+            // console.log(body);
 
             return new Response(body, {
               status: f.status,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "animetv",
-    "version": "5.3.5",
+    "version": "5.3.6",
     "description": "AnimeTV for Desktop",
     "main": "electron/src/animetv.js",
     "scripts": {