lrkmusic-ytpro 1.0.1 → 1.1.0

package/bgplay.js

@@ -1,17 +1,17 @@
 /***** lrkmusic-ytpro bgplay *****
 Author: Satya Prakash
-Version: 1.0.0
+Version: 1.1.0
 */
 
 if (typeof MediaMetadata === 'undefined') {
-window.MediaMetadata = class {
-constructor(data = {}) {
-this.title = data.title || '';
-this.artist = data.artist || '';
-this.album = data.album || '';
-this.artwork = data.artwork || [];
-}
-};
+  window.MediaMetadata = class {
+    constructor(data = {}) {
+      this.title = data.title || '';
+      this.artist = data.artist || '';
+      this.album = data.album || '';
+      this.artwork = data.artwork || [];
+    }
+  };
 
 }
 
@@ -19,79 +19,78 @@ this.artwork = data.artwork || [];
 
 if (!('mediaSession' in navigator)) {
 
-window.handlers = {};
-window.serviceRunning=false;
-
+  window.handlers = {};
+  window.serviceRunning = false;
 
 
 
-let _state = 'none';
-let _metadata = null;
 
-Object.defineProperty(navigator, 'mediaSession', {
-value: {},
-configurable: true
-});
+  let _state = 'none';
+  let _metadata = null;
 
-Object.defineProperty(navigator.mediaSession, 'metadata', {
-get() {
-return _metadata;
-},
-set(value) {
-//console.log("metadata set:", value); 
-bgPlay(value);
-_metadata = value;
-},
-configurable: true
-});
+  Object.defineProperty(navigator, 'mediaSession', {
+    value: {},
+    configurable: true
+  });
 
+  Object.defineProperty(navigator.mediaSession, 'metadata', {
+    get() {
+      return _metadata;
+    },
+    set(value) {
+      //console.log("metadata set:", value); 
+      bgPlay(value);
+      _metadata = value;
+    },
+    configurable: true
+  });
 
 
 
-navigator.mediaSession.setActionHandler = (action, handler) => {
 
-if (typeof handler === 'function') {
-handlers[action] = handler;
-}
+  navigator.mediaSession.setActionHandler = (action, handler) => {
 
-//console.log(action,handler)
+    if (typeof handler === 'function') {
+      handlers[action] = handler;
+    }
 
+    //console.log(action,handler)
 
-};
 
+  };
 
 
 
 
 
-Object.defineProperty(navigator.mediaSession, 'playbackState', {
-get() {
-return _state;
-},
-set(value) {
+  Object.defineProperty(navigator.mediaSession, 'playbackState', {
+    get() {
+      return _state;
+    },
+    set(value) {
 
-//console.log("Custom playbackState set to:", value);
+      //console.log("Custom playbackState set to:", value);
 
 
-_state = value;
+      _state = value;
 
 
-var ytproAud = getMediaElement();
+      var ytproAud = getMediaElement();
 
-if (value === 'playing' && ytproAud) {
-setTimeout(()=>{Android.bgPlay(ytproAud.currentTime*1000);},100);
-} else if (value === 'paused' && (pauseAllowed || PIPause) && ytproAud) {
-setTimeout(()=>{Android.bgPause(ytproAud.currentTime*1000);},100);
-}
-// Do NOT call bgStop() when user goes back to home – keep video running like YouTube app.
-// Service stops only when YouTube screen is closed (app onDestroy) or user stops from notification.
-// Removed: else if(value === "none" && !on watch/shorts){ Android.bgStop(); serviceRunning=false; }
+      if (value === 'playing' && ytproAud) {
+        setTimeout(() => { Android.bgPlay(ytproAud.currentTime * 1000); }, 100);
+      } else if (value === 'paused' && (pauseAllowed || PIPause) && ytproAud) {
+        setTimeout(() => { Android.bgPause(ytproAud.currentTime * 1000); }, 100);
+      }
+      // Do NOT call bgStop() when user goes back to home – keep video running like YouTube app.
+      // Service stops only when YouTube screen is closed (app onDestroy) or user stops from notification.
+      // Removed: else if(value === "none" && !on watch/shorts){ Android.bgStop(); serviceRunning=false; }
 
 
 
-},
-configurable: true
-});
+    },
+    configurable: true
+  });
 
 
 
@@ -101,7 +100,7 @@ configurable: true
   try {
     var origSet = navigator.mediaSession.setActionHandler;
     if (origSet) {
-      navigator.mediaSession.setActionHandler = function(action, handler) {
+      navigator.mediaSession.setActionHandler = function (action, handler) {
         if (typeof handler === 'function') window.handlers[action] = handler;
         return origSet.call(navigator.mediaSession, action, handler);
       };
@@ -111,14 +110,93 @@ configurable: true
       var origMetaSet = desc.set;
       Object.defineProperty(navigator.mediaSession, 'metadata', {
         get: desc.get,
-        set: function(v) { origMetaSet.call(navigator.mediaSession, v); bgPlay(v); },
+        set: function (v) { origMetaSet.call(navigator.mediaSession, v); bgPlay(v); },
         configurable: true, enumerable: desc.enumerable
       });
     }
-  } catch (e) {}
+  } catch (e) { }
 }
 
 
+/*=========================================================
+  FIX 1: Visibilitychange auto-resume guard
+  When screen locks / app goes to background, YouTube's
+  player pauses. We detect this and force-resume playback.
+=========================================================*/
+document.addEventListener('visibilitychange', function () {
+  if (document.hidden && window.serviceRunning) {
+    // Set pauseAllowed false so pause override blocks YouTube's auto-pause
+    window.pauseAllowed = false;
+    var el = getMediaElement();
+    if (el && !el.ended) {
+      // Multiple retries because YouTube tries to pause at different timings
+      setTimeout(function () { try { el.play().catch(function () { }); } catch (e) { } }, 300);
+      setTimeout(function () { try { el.play().catch(function () { }); } catch (e) { } }, 800);
+      setTimeout(function () { try { el.play().catch(function () { }); } catch (e) { } }, 1500);
+      setTimeout(function () { try { el.play().catch(function () { }); } catch (e) { } }, 3000);
+    }
+  } else if (!document.hidden) {
+    // Page visible again — allow normal pause behavior
+    window.pauseAllowed = true;
+  }
+});
+
+
+/*=========================================================
+  FIX 2: Background auto-play-next on video ended
+  Uses JS-level handlers.nexttrack() instead of DOM clicks
+  so it works reliably when screen is locked / bg.
+=========================================================*/
+function setupBgAutoPlayNext() {
+  var el = getMediaElement();
+  if (el && !el._bgAutoNextSetup) {
+    el._bgAutoNextSetup = true;
+    el.addEventListener('ended', function () {
+      // Only auto-next if we're on a watch/shorts/music page
+      var href = window.location.href;
+      if (!(href.indexOf("youtube.com/watch") > -1 || href.indexOf("youtube.com/shorts") > -1 || href.indexOf("music.youtube.com") > -1)) return;
+
+      if (handlers && typeof handlers.nexttrack === 'function') {
+        setTimeout(function () { handlers.nexttrack(); }, 500);
+      } else {
+        // Fallback: try clicking next button via DOM
+        setTimeout(function () {
+          try {
+            var nextBtn = document.querySelector('[aria-label*="Next"]') ||
+              document.querySelector('button[aria-label*="Next"]') ||
+              document.querySelector('.ytp-next-button');
+            if (nextBtn) nextBtn.click();
+          } catch (e) { }
+        }, 500);
+      }
+    });
+  }
+}
+
+// Re-setup on mutations (new video element created)
+if (typeof MutationObserver !== 'undefined') {
+  var _bgNextObserver = new MutationObserver(function () { setupBgAutoPlayNext(); });
+  _bgNextObserver.observe(document.documentElement, { childList: true, subtree: true });
+}
+// Also try immediately
+setTimeout(setupBgAutoPlayNext, 2000);
+setTimeout(setupBgAutoPlayNext, 5000);
+
+
+/*=========================================================
+  FIX 3: Watchdog timer — re-play if unexpectedly paused
+  Catches edge cases where notifications, SMS, or other
+  audio focus events cause the WebView media to pause.
+  Only active when bg service is running.
+=========================================================*/
+setInterval(function () {
+  if (window.serviceRunning && !window.pauseAllowed && !window.PIPause) {
+    var el = getMediaElement();
+    if (el && el.paused && !el.ended && el.readyState >= 2) {
+      try { el.play().catch(function () { }); } catch (e) { }
+    }
+  }
+}, 3000);
 
 
 
@@ -129,50 +207,50 @@ function getMediaElement() {
   return el || null;
 }
 
-async function bgPlay(info){
+async function bgPlay(info) {
 
 
-if(!(window.location.href.indexOf("youtube.com/watch") > -1 || window.location.href.indexOf("youtube.com/shorts") > -1 || window.location.href.indexOf("music.youtube.com") > -1 )) return;
+  if (!(window.location.href.indexOf("youtube.com/watch") > -1 || window.location.href.indexOf("youtube.com/shorts") > -1 || window.location.href.indexOf("music.youtube.com") > -1)) return;
 
 
-if(!info) return;
+  if (!info) return;
 
 
-var ytproAud = getMediaElement();
+  var ytproAud = getMediaElement();
 
 
-if(!ytproAud) return;
+  if (!ytproAud) return;
 
 
-var iconBase64="iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=";
+  var iconBase64 = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=";
 
 
-var img = new Image();
-img.crossOrigin="anonymous";
-img.src=info?.artwork?.[0]?.src;
+  var img = new Image();
+  img.crossOrigin = "anonymous";
+  img.src = info?.artwork?.[0]?.src;
 
 
-var canvas = document.createElement('canvas');
-canvas.style.width = "1600px"; 
-canvas.style.height = "900px";
-canvas.style.background="black";
-var context = canvas.getContext('2d');
+  var canvas = document.createElement('canvas');
+  canvas.style.width = "1600px";
+  canvas.style.height = "900px";
+  canvas.style.background = "black";
+  var context = canvas.getContext('2d');
 
-canvas.width = 160;
-canvas.height  = 90;
+  canvas.width = 160;
+  canvas.height = 90;
 
-//var z=performance.now();
+  //var z=performance.now();
 
 
-await new Promise((res,rej)=>{
-img.onload=()=>res();
-});
+  await new Promise((res, rej) => {
+    img.onload = () => res();
+  });
 
 
-try{
-context.drawImage(img, 0,0 ,160,90);
-iconBase64 = canvas.toDataURL('image/png',1.0);
-}catch{}
+  try {
+    context.drawImage(img, 0, 0, 160, 90);
+    iconBase64 = canvas.toDataURL('image/png', 1.0);
+  } catch { }
 
 
 
@@ -185,15 +263,15 @@ iconBase64 = canvas.toDataURL('image/png',1.0);
 
 
 
-if(window.serviceRunning){
-setTimeout(()=>{Android.bgUpdate(iconBase64.replace("data:image/png;base64,", ""),info.title,info.artist,ytproAud.duration*1000);},50);
-setTimeout(()=>{Android.bgPlay(ytproAud.currentTime*1000);},100);
-}
-else{
-window.serviceRunning=true;
-setTimeout(()=>{Android.bgStart(iconBase64.replace("data:image/png;base64,", ""),info.title,info.artist,ytproAud.duration*1000);},50);
-setTimeout(()=>{Android.bgPlay(ytproAud.currentTime*1000);},100);
-}
+  if (window.serviceRunning) {
+    setTimeout(() => { Android.bgUpdate(iconBase64.replace("data:image/png;base64,", ""), info.title, info.artist, ytproAud.duration * 1000); }, 50);
+    setTimeout(() => { Android.bgPlay(ytproAud.currentTime * 1000); }, 100);
+  }
+  else {
+    window.serviceRunning = true;
+    setTimeout(() => { Android.bgStart(iconBase64.replace("data:image/png;base64,", ""), info.title, info.artist, ytproAud.duration * 1000); }, 50);
+    setTimeout(() => { Android.bgPlay(ytproAud.currentTime * 1000); }, 100);
+  }
 
 
 
@@ -225,32 +303,32 @@ setTimeout(()=>{Android.bgPlay(ytproAud.currentTime*1000);},100);
 
 
 /*When user hits the notification*/
-function seekTo(t){
-handlers.seekto({ seekTime: t/1000 });
+function seekTo(t) {
+  handlers.seekto({ seekTime: t / 1000 });
 }
 
 /*Daamm , its play*/
-function playVideo(){
+function playVideo() {
 
 
-if(!pauseAllowed){
-window.PIPause = false;
-navigator.mediaSession.playbackState = 'playing';
-}
+  if (!pauseAllowed) {
+    window.PIPause = false;
+    navigator.mediaSession.playbackState = 'playing';
+  }
 
-handlers.play();
+  handlers.play();
 }
 
 /*Daamm , its pause*/
-function pauseVideo(){
+function pauseVideo() {
 
 
 
-if(!pauseAllowed){
-window.PIPause=true;
-navigator.mediaSession.playbackState = 'paused';
-}
-handlers.pause();
+  if (!pauseAllowed) {
+    window.PIPause = true;
+    navigator.mediaSession.playbackState = 'paused';
+  }
+  handlers.pause();
 
 
 
@@ -260,14 +338,14 @@ handlers.pause();
 
 
 /*Alexa , play da next song*/
-async function playNext(){
-handlers.nexttrack();
+async function playNext() {
+  handlers.nexttrack();
 }
 
 
 
 
 /*Alexa , play the f**ng song once again */
-function playPrev(){
-handlers.previoustrack();
+function playPrev() {
+  handlers.previoustrack();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lrkmusic-ytpro",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "you can find the source code at",
   "main": "script.js",
   "scripts": {
@@ -14,4 +14,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}