diff --git a/app/build.gradle b/app/build.gradle index 81c83430..73bdb54f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 22 targetSdk 34 versionCode 524 - versionName "5.2.7-Nightly" + versionName "5.2.8-Nightly" // Automatic Build Version diff --git a/app/src/main/assets/inject/view_player.html b/app/src/main/assets/inject/view_player.html index c2c7b41e..342363a5 100644 --- a/app/src/main/assets/inject/view_player.html +++ b/app/src/main/assets/inject/view_player.html @@ -91,6 +91,37 @@ }catch(e){ } }); +function jwgetdata(){ + // console.log("ATVLOG jwpget data"); + var med=null; + try{ + med=__JWP.getConfig().playlist[0]; + }catch(ee){} + if (med){ + // console.log("ATVLOG jwpget has data"); + var dat={ + result:{ + sources:[ + {file:med.sources[0].file} + ], + tracks:[] + } + }; + for (var i=0;i \ No newline at end of file diff --git a/app/src/main/assets/view/m.js b/app/src/main/assets/view/m.js index bfdd5c47..2f57e529 100644 --- a/app/src/main/assets/view/m.js +++ b/app/src/main/assets/view/m.js @@ -1862,10 +1862,10 @@ const wave={ wave.filemoonGetData(u,cb); return; } - // else{ - // cb(null); - // return; - // } + else{ + cb(null); + return; + } wave.vidplayGetMedia(u,function(url){ if (url){ @@ -2362,6 +2362,7 @@ window.addEventListener('message',function(e) { // }; window.__M3U8CB=function(d){ + window.__MDATA=(d); if(_API.m3u8cb) _API.m3u8cb(d); }; @@ -2443,6 +2444,11 @@ const _API={ var pd=JSON.parse(e.data); if (pd){ if ('vcmd' in pd){ + if (pd.vcmd=='mediainfo'){ + // _API.showToast("Got MediaInfo Event 2"); + window.__M3U8CB(pd.val); + return; + } if (pd.vcmd!='time'){ console.log("PLAYER-MSG = "+e.data); } @@ -6357,7 +6363,11 @@ const pb={ } }, vid_event:function(c,v){ - if (c=='complete'){ + if (c=='mediainfo'){ + // _API.showToast("Got MediaInfo Event"); + window.__M3U8CB(v); + } + else if (c=='complete'){ if (pb.pb_track_ctl.innerHTML!='replay'){ vtt.playback.buffering_set(false); pb.vid_stat.play=false; @@ -6923,6 +6933,24 @@ const pb={ var mp3utrycount=0; + if (!_ISELECTRON){ + _API.setMessage(function(e){ + if (e){ + // _API.showToast("Got Win Message "+e.data); + // console.log("ATVLOG WinMSG = "+e.data); + try{ + var pd=JSON.parse(e.data); + if (pd){ + if ('vcmd' in pd){ + pb.vid_event(pd.vcmd,pd.val); + } + } + }catch(x){ + } + } + }); + } + _API.setVizPageCb(function(d){ if (d==0) pb.pb_track_pos.innerHTML='INITIALIZING'; @@ -7394,7 +7422,7 @@ const pb={ } } _API.setVizCb(preloadVidCb); - $n('iframe','',{src:d.stream_vurl+(__SD5?"":"#NOPLAY"),frameborder:'0'},pb.pb_vid,''); + $n('iframe','',{src:d.stream_vurl+(__SD5?"":""),frameborder:'0'},pb.pb_vid,''); }); // $n('iframe','',{src:d.stream_vurl+(__SD5?"":"#NOPLAY"),frameborder:'0'},pb.pb_vid,''); } diff --git a/app/src/main/java/com/amarullz/androidtv/animetvjmto/AnimeView.java b/app/src/main/java/com/amarullz/androidtv/animetvjmto/AnimeView.java index b4a1e036..cb8f52e8 100644 --- a/app/src/main/java/com/amarullz/androidtv/animetvjmto/AnimeView.java +++ b/app/src/main/java/com/amarullz/androidtv/animetvjmto/AnimeView.java @@ -1074,11 +1074,11 @@ else if (host.equals(Conf.SOURCE_DOMAIN5_API)){ else if (host.contains(Conf.STREAM_DOMAIN) ||host.contains(Conf.STREAM_DOMAIN1) ||host.contains(Conf.STREAM_DOMAIN2)){ - if (accept.startsWith("text/html")|| - url.startsWith("https://"+host+"/mediainfo")) { + if (accept.startsWith("text/html")/*|| + url.startsWith("https://"+host+"/mediainfo")*/) { Log.d(_TAG,"VIEW PLAYER REQ = "+url); - if (!accept.startsWith("text/html")) - sendVidpageLoaded(1); +// if (!accept.startsWith("text/html")) +// sendVidpageLoaded(1); try { AnimeApi.Http http=new AnimeApi.Http(url); for (Map.Entry entry : @@ -1091,26 +1091,28 @@ else if (host.contains(Conf.STREAM_DOMAIN) if (accept.startsWith("text/html")) { try { aApi.injectString(http.body, playerInjectString); + sendVidpageLoaded(1); }catch(Exception ignored){} - sendVidpageLoaded(0); - } else { - Log.d(_TAG, "sendM3U8Req = " + http.body.toString("UTF-8")); - sendM3U8Req(http.body.toString("UTF-8")); - try { - Thread.sleep(200); - }catch(Exception ignored){} - Log.d(_TAG, "sendM3U8Req Wait = " + http.body.toString("UTF-8")); +// sendVidpageLoaded(0); } +// else { +// Log.d(_TAG, "sendM3U8Req = " + http.body.toString("UTF-8")); +// sendM3U8Req(http.body.toString("UTF-8")); +// try { +// Thread.sleep(200); +// }catch(Exception ignored){} +// Log.d(_TAG, "sendM3U8Req Wait = " + http.body.toString("UTF-8")); +// } InputStream stream = new ByteArrayInputStream(http.body.toByteArray()); return new WebResourceResponse(http.ctype[0], http.ctype[1], stream); } } catch (Exception ignored) {} - if (!accept.startsWith("text/html")) - sendVidpageLoaded(2); - else { - sendVidpageLoaded(3); - return null; - } +// if (!accept.startsWith("text/html")) +// sendVidpageLoaded(2); +// else { +// sendVidpageLoaded(3); +// return null; +// } return aApi.badRequest; }else if (accept.startsWith("text/css")||accept.startsWith("image/")){ Log.d(_TAG,"BLOCK CSS/IMG = "+url); diff --git a/app/src/main/java/com/amarullz/androidtv/animetvjmto/Conf.java b/app/src/main/java/com/amarullz/androidtv/animetvjmto/Conf.java index a6039437..7da10f8e 100644 --- a/app/src/main/java/com/amarullz/androidtv/animetvjmto/Conf.java +++ b/app/src/main/java/com/amarullz/androidtv/animetvjmto/Conf.java @@ -72,7 +72,9 @@ public static String getDomain(){ // " (KHTML, like Gecko) Chrome/119.0.0.0 " + // "Safari/537.36 Edg/116.0.1938.69"; - "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 Edg/125.0.0.0"; +// "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 Edg/125.0.0.0"; + + "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 Edg/127.0.0.0"; // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like " + // "Gecko) Chrome/122.0.0.0 Safari/537.36"; diff --git a/electron/src/libs/common.js b/electron/src/libs/common.js index 679f9c09..16edce1c 100644 --- a/electron/src/libs/common.js +++ b/electron/src/libs/common.js @@ -24,7 +24,8 @@ const { pathToFileURL } = require('url') const fs = require("fs"); const common={ - UAG:"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 Edg/125.0.0.0", + UAG: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 Edg/127.0.0.0", + // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 Edg/125.0.0.0", dns:[ "aniwave.to", /* default */ "aniwave.to", diff --git a/electron/src/libs/intercept.js b/electron/src/libs/intercept.js index f5d908e3..6b1daea3 100644 --- a/electron/src/libs/intercept.js +++ b/electron/src/libs/intercept.js @@ -387,11 +387,11 @@ const intercept={ req.headers.set('Origin','https://'+url.hostname); req.headers.set('Referer','https://'+url.hostname+'/'); let f=intercept.fetchStream(req); - if (url.pathname.startsWith("/mediainfo")){ - let body=await (await f).text(); - common.execJs("__M3U8CB("+body+");"); - return intercept.fetchError(); - } + // if (url.pathname.startsWith("/mediainfo")){ + // let body=await (await f).text(); + // common.execJs("__M3U8CB("+body+");"); + // return intercept.fetchError(); + // } return f; } } diff --git a/package-lock.json b/package-lock.json index c62a21e8..08db7299 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "animetv", - "version": "5.2.7", + "version": "5.2.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "animetv", - "version": "5.2.7", + "version": "5.2.8", "license": "Apache-2.0", "dependencies": { "axios": "^1.7.2", @@ -323,9 +323,9 @@ "optional": true }, "node_modules/@types/node": { - "version": "20.14.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", - "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==", + "version": "20.14.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz", + "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==", "devOptional": true, "dependencies": { "undici-types": "~5.26.4" @@ -909,9 +909,9 @@ } }, "node_modules/electron": { - "version": "30.1.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-30.1.2.tgz", - "integrity": "sha512-A5CFGwbA+HSXnzwjc8fP2GIezBcAb0uN/VbNGLOW8DHOYn07rvJ/1bAJECHUUzt5zbfohveG3hpMQiYpbktuDw==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-30.2.0.tgz", + "integrity": "sha512-x4/pUsOyWReAAo3/ZfvL7AvNbfS5dE8HqMC1mjFM/mL847KE/LpRFfOe5DjKqI2OQMTNvSth1mH0LJageHB0Zg==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -1404,9 +1404,9 @@ } }, "node_modules/electron-packager/node_modules/@electron/get": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@electron/get/-/get-3.0.0.tgz", - "integrity": "sha512-hLv4BYFiyrNRI+U0Mm2X7RxCCdJLkDUn8GCEp9QJzbLpZRko+UaLlCjOMkj6TEtirNLPyBA7y1SeGfnpOB21aQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@electron/get/-/get-3.1.0.tgz", + "integrity": "sha512-F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ==", "dev": true, "dependencies": { "debug": "^4.1.1", diff --git a/package.json b/package.json index 56d4648b..6371a396 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "animetv", - "version": "5.2.7", + "version": "5.2.8", "description": "AnimeTV for Desktop", "main": "electron/src/animetv.js", "scripts": {