@patch-adams/core 1.4.2 → 1.4.3

package/dist/cli.js

@@ -3062,49 +3062,146 @@ function generateLrsBridgeCode(options) {
     function setupMediaInterceptors() {
       if (!TRACK_MEDIA) return;
 
-      document.addEventListener('play', function(e) {
-        var target = e.target;
-        if (target.tagName === 'VIDEO' || target.tagName === 'AUDIO') {
+      // Track which elements we've already attached listeners to
+      var trackedMedia = new WeakSet();
+
+      // Helper to get media name/title from element or surrounding context
+      function getMediaName(el) {
+        // Check element attributes
+        var name = el.title || el.getAttribute('aria-label') || el.getAttribute('data-name');
+        if (name) return name;
+
+        // Check parent Rise video block for title
+        var videoBlock = findClosest(el, '[data-block-type="video"], .blocks-video, .video-block');
+        if (videoBlock) {
+          var titleEl = videoBlock.querySelector('.video-title, .block-title, [class*="title"]');
+          if (titleEl) return titleEl.textContent.trim();
+        }
+
+        // Use src filename as fallback
+        var src = el.src || el.currentSrc || '';
+        if (src) {
+          var filename = src.split('/').pop().split('?')[0];
+          if (filename && filename.length < 100) return filename;
+        }
+
+        return el.tagName.toLowerCase();
+      }
+
+      // Attach media event listeners to a single element
+      function attachMediaListeners(el) {
+        if (trackedMedia.has(el)) return;
+        trackedMedia.add(el);
+
+        var mediaType = el.tagName.toLowerCase();
+        log('Attaching media listeners to:', mediaType, el.src || el.currentSrc || 'no-src');
+
+        el.addEventListener('play', function() {
+          log('Media play event captured:', mediaType);
           LRS.mediaPlayed({
-            type: target.tagName.toLowerCase(),
-            src: target.src || target.currentSrc || '',
-            name: target.title || target.getAttribute('aria-label') || '',
-            currentTime: target.currentTime || 0,
-            duration: target.duration || 0,
+            type: mediaType,
+            src: el.src || el.currentSrc || '',
+            name: getMediaName(el),
+            currentTime: el.currentTime || 0,
+            duration: el.duration || 0,
             action: 'play'
           });
-        }
-      }, true);
+        });
 
-      document.addEventListener('pause', function(e) {
-        var target = e.target;
-        if (target.tagName === 'VIDEO' || target.tagName === 'AUDIO') {
+        el.addEventListener('pause', function() {
+          // Ignore pause events that fire right before ended
+          if (el.ended) return;
+          log('Media pause event captured:', mediaType);
           LRS.mediaPlayed({
-            type: target.tagName.toLowerCase(),
-            src: target.src || target.currentSrc || '',
-            name: target.title || target.getAttribute('aria-label') || '',
-            currentTime: target.currentTime || 0,
-            duration: target.duration || 0,
+            type: mediaType,
+            src: el.src || el.currentSrc || '',
+            name: getMediaName(el),
+            currentTime: el.currentTime || 0,
+            duration: el.duration || 0,
             action: 'pause'
           });
-        }
-      }, true);
+        });
 
-      document.addEventListener('ended', function(e) {
-        var target = e.target;
-        if (target.tagName === 'VIDEO' || target.tagName === 'AUDIO') {
+        el.addEventListener('ended', function() {
+          log('Media ended event captured:', mediaType);
           LRS.mediaPlayed({
-            type: target.tagName.toLowerCase(),
-            src: target.src || target.currentSrc || '',
-            name: target.title || target.getAttribute('aria-label') || '',
-            currentTime: target.duration || 0,
-            duration: target.duration || 0,
+            type: mediaType,
+            src: el.src || el.currentSrc || '',
+            name: getMediaName(el),
+            currentTime: el.duration || 0,
+            duration: el.duration || 0,
             action: 'completed'
           });
+        });
+      }
+
+      // Scan for and attach listeners to all video/audio elements
+      function scanForMedia(root) {
+        var elements = (root || document).querySelectorAll('video, audio');
+        log('Scanning for media elements, found:', elements.length);
+        for (var i = 0; i < elements.length; i++) {
+          attachMediaListeners(elements[i]);
+        }
+      }
+
+      // Initial scan
+      scanForMedia();
+
+      // Document-level capture for any we might miss
+      document.addEventListener('play', function(e) {
+        var target = e.target;
+        if (target.tagName === 'VIDEO' || target.tagName === 'AUDIO') {
+          // Attach listeners if not already tracked
+          if (!trackedMedia.has(target)) {
+            log('Captured play from untracked media, attaching listeners');
+            attachMediaListeners(target);
+          }
         }
       }, true);
 
-      log('Media interceptors set up');
+      // MutationObserver to detect dynamically added video/audio elements
+      var mediaObserver = new MutationObserver(function(mutations) {
+        var needsScan = false;
+        mutations.forEach(function(mutation) {
+          mutation.addedNodes.forEach(function(node) {
+            if (node.nodeType === 1) {
+              if (node.tagName === 'VIDEO' || node.tagName === 'AUDIO') {
+                attachMediaListeners(node);
+              } else if (node.querySelectorAll) {
+                // Check for nested video/audio
+                var nested = node.querySelectorAll('video, audio');
+                if (nested.length > 0) {
+                  needsScan = true;
+                }
+              }
+            }
+          });
+        });
+        if (needsScan) {
+          scanForMedia();
+        }
+      });
+
+      // Start observing once DOM is ready
+      function startMediaObserver() {
+        if (document.body) {
+          mediaObserver.observe(document.body, {
+            childList: true,
+            subtree: true
+          });
+          log('Media mutation observer started');
+        } else {
+          setTimeout(startMediaObserver, 100);
+        }
+      }
+      startMediaObserver();
+
+      // Periodic rescan for Rise lazy-loaded content
+      setInterval(function() {
+        scanForMedia();
+      }, 3000);
+
+      log('Media interceptors set up (enhanced)');
     }
 
     function setupNavigationInterceptors() {
@@ -3345,7 +3442,7 @@ function generateLrsBridgeCode(options) {
     // ========================================================================
 
     function init() {
-      log('Initializing LRS bridge v2.2.0...');
+      log('Initializing LRS bridge v2.3.0...');
 
       // Extract course info early
       extractCourseInfo();