failing to appear, making it more consistent

build.py

@@ -0,0 +1,118 @@
+import glob
+import os
+import re
+import shutil
+import tempfile
+import zipfile
+
+SCRIPT_NAME = os.path.basename(__file__)
+TARGET_FILE = "manifest.json"
+
+
+def zip_folder(output_name, folder, exclude_files, exclude_dirs):
+    with zipfile.ZipFile(output_name, "w", zipfile.ZIP_DEFLATED) as zipf:
+        for root, dirs, files in os.walk(folder):
+            dirs[:] = [
+                d
+                for d in dirs
+                if os.path.relpath(os.path.join(root, d), folder) not in exclude_dirs
+            ]
+            for file in files:
+                rel_path = os.path.relpath(os.path.join(root, file), folder)
+                if (
+                    file in exclude_files
+                    or rel_path in exclude_files
+                    or any(rel_path.startswith(ed + os.sep) for ed in exclude_dirs)
+                ):
+                    continue
+                zipf.write(os.path.join(root, file), arcname=rel_path)
+
+
+def update_version_line(file_path, new_version):
+    with open(file_path, "r", encoding="utf-8") as f:
+        lines = f.readlines()
+
+    updated = False
+    for i, line in enumerate(lines):
+        match = re.match(r'\s*"version":\s*"([^"]+)"', line)
+        if match:
+            old_version = match.group(1)
+            lines[i] = re.sub(
+                r'"version":\s*".+?"', f'"version": "{new_version}"', line
+            )
+            updated = True
+            print(
+                f"🛠️ Changed version in {file_path} from {old_version} ➜ {new_version}"
+            )
+            break
+
+    if updated:
+        with open(file_path, "w", encoding="utf-8") as f:
+            f.writelines(lines)
+    else:
+        print(f"⚠️ No version line found in {file_path}.")
+
+
+def main():
+    # Step 0: Remove all existing .xpi files upfront
+    xpi_files = glob.glob("*.xpi")
+    for f in xpi_files:
+        try:
+            os.remove(f)
+            print(f"🗑️ Removed existing archive: {f}")
+        except Exception as e:
+            print(f"⚠️ Failed to remove {f}: {e}")
+
+    base_version = input("Enter the new base version (e.g., 2.0.1): ").strip()
+    if not base_version:
+        print("❌ No version entered. Exiting.")
+        return
+
+    firefox_version = f"{base_version}.0"
+    current_dir = os.getcwd()
+    manifest_path = os.path.join(current_dir, TARGET_FILE)
+
+    # Step 1: Update manifest.json on disk to base_version
+    if os.path.exists(manifest_path):
+        update_version_line(manifest_path, base_version)
+    else:
+        print(f"❌ {TARGET_FILE} not found. Aborting.")
+        return
+
+    # Step 2: Create videospeed-github.xpi (exclude script, .git, AND videospeed-github.xpi itself)
+    exclude_files = [SCRIPT_NAME, "videospeed-github.xpi"]
+    exclude_dirs = [".git"]
+    zip_folder("videospeed-github.xpi", current_dir, exclude_files, exclude_dirs)
+    print("✅ Created videospeed-github.xpi")
+
+    # Step 3: Re-scan for .xpi files after GitHub archive creation, exclude them for Firefox zip
+    current_xpi_files = set(glob.glob("*.xpi"))
+    exclude_temp_files = current_xpi_files.union({SCRIPT_NAME})
+    exclude_temp_dirs = set(exclude_dirs)
+
+    # Step 4: Create videospeed-firefox.xpi from temp folder with version bumped to .0
+    with tempfile.TemporaryDirectory() as temp_dir:
+        for item in os.listdir(current_dir):
+            if item in exclude_temp_files or item in exclude_temp_dirs:
+                continue
+            src = os.path.join(current_dir, item)
+            dst = os.path.join(temp_dir, item)
+            if os.path.isdir(src):
+                shutil.copytree(src, dst)
+            else:
+                shutil.copy2(src, dst)
+
+        temp_manifest = os.path.join(temp_dir, TARGET_FILE)
+        if os.path.exists(temp_manifest):
+            update_version_line(temp_manifest, firefox_version)
+        else:
+            print(f"⚠️ {TARGET_FILE} not found in temp folder.")
+
+        zip_folder(
+            "videospeed-firefox.xpi", temp_dir, exclude_files=[], exclude_dirs=[]
+        )
+        print("✅ Created videospeed-firefox.xpi")
+
+
+if __name__ == "__main__":
+    main()

inject.js

@@ -1,5 +1,8 @@
 var regStrip = /^[\r\t\f\v ]+|[\r\t\f\v ]+$/gm;
 
+var isUserSeek = false; // Track if seek was user-initiated
+var lastToggleSpeed = {}; // Store last toggle speeds per video
+
 var tc = {
   settings: {
     lastSpeed: 1.0,
@@ -162,7 +165,6 @@ function defineVideoController() {
       if (!storedSpeed) {
         storedSpeed = 1.0;
       }
-      setKeyBindings("reset", getKeyBindings("fast"));
     } else {
       storedSpeed = tc.settings.lastSpeed;
     }
@@ -171,22 +173,37 @@ function defineVideoController() {
     }
     target.playbackRate = storedSpeed;
     this.div = this.initializeControls();
+
+    // Make the controller visible for 5 seconds on startup
+    runAction("blink", 5000, null, this.video);
+
+    // Rewritten mediaEventAction to prevent speed reset on pause.
     var mediaEventAction = function (event) {
-      let storedSpeed = tc.settings.speeds[event.target.currentSrc];
+      // Handle subtitle nudging based on the event type first.
-      if (!tc.settings.rememberSpeed) {
+      if (event.type === "play") {
-        if (!storedSpeed) {
+        this.startSubtitleNudge();
-          storedSpeed = 1.0;
+
+        // Reapply the current speed to ensure it doesn't get reset
+        const currentSpeed = event.target.playbackRate;
+        if (currentSpeed !== 1.0) {
+          // Only reapply if it's not already at the correct speed
+          setTimeout(() => {
+            if (Math.abs(event.target.playbackRate - currentSpeed) > 0.01) {
+              event.target.playbackRate = currentSpeed;
+            }
+          }, 0);
         }
-        setKeyBindings("reset", getKeyBindings("fast"));
+      } else if (event.type === "pause" || event.type === "ended") {
-      } else {
-        storedSpeed = tc.settings.lastSpeed;
-      }
-      if (tc.settings.forceLastSavedSpeed) storedSpeed = tc.settings.lastSpeed;
-      setSpeed(event.target, storedSpeed);
-      if (event.type === "play") this.startSubtitleNudge();
-      else if (event.type === "pause" || event.type === "ended")
         this.stopSubtitleNudge();
+      }
+
+      // For seek events, don't mess with speed
+      if (event.type === "seeked" && isUserSeek) {
+        isUserSeek = false;
+        return;
+      }
     };
+
     target.addEventListener(
       "play",
       (this.handlePlay = mediaEventAction.bind(this))
@@ -241,31 +258,7 @@ function defineVideoController() {
     if (idx != -1) tc.mediaElements.splice(idx, 1);
   };
 
-  // MODIFIED: Using your debug-enhanced startSubtitleNudge function
   tc.videoController.prototype.startSubtitleNudge = function () {
-    console.log("[VSC DEBUG] startSubtitleNudge called");
-    console.log("[VSC DEBUG] location.hostname:", location.hostname);
-    console.log(
-      "[VSC DEBUG] enableSubtitleNudge:",
-      tc.settings.enableSubtitleNudge
-    );
-    console.log("[VSC DEBUG] video element:", this.video);
-    console.log(
-      "[VSC DEBUG] video src:",
-      this.video ? this.video.src : "no video"
-    );
-    console.log(
-      "[VSC DEBUG] video currentSrc:",
-      this.video ? this.video.currentSrc : "no video"
-    );
-    console.log(
-      "[VSC DEBUG] video paused:",
-      this.video ? this.video.paused : "no video"
-    );
-    console.log(
-      "[VSC DEBUG] video playbackRate:",
-      this.video ? this.video.playbackRate : "no video"
-    );
     const isYouTube =
       (this.video &&
         this.video.currentSrc &&
@@ -277,19 +270,12 @@ function defineVideoController() {
       this.nudgeIntervalId !== null ||
       !this.video
     ) {
-      console.log("[VSC DEBUG] Nudge blocked - reasons:", {
-        enableSubtitleNudge: tc.settings.enableSubtitleNudge,
-        nudgeIntervalId: this.nudgeIntervalId,
-        hasVideo: !!this.video
-      });
       return;
     }
     if (this.video.paused || this.video.playbackRate === 1.0) {
-      console.log("[VSC DEBUG] Nudge stopped - video paused or 1.0x speed");
       this.stopSubtitleNudge();
       return;
     }
-    console.log("[VSC DEBUG] Starting nudge interval");
     log(`Nudge: Starting interval: ${tc.settings.subtitleNudgeInterval}ms.`, 5);
     this.nudgeIntervalId = setInterval(() => {
       if (
@@ -329,8 +315,15 @@ function defineVideoController() {
   tc.videoController.prototype.initializeControls = function () {
     const doc = this.video.ownerDocument;
     const speed = this.video.playbackRate.toFixed(2);
-    var top = Math.max(this.video.offsetTop, 0) + "px",
+    // Fix for videos rendered after page load - use relative positioning
+    var top = "10px",
+      left = "10px";
+
+    // Try to get actual position, but fallback to default if not available
+    if (this.video.offsetTop > 0 || this.video.offsetLeft > 0) {
+      top = Math.max(this.video.offsetTop, 0) + "px";
       left = Math.max(this.video.offsetLeft, 0) + "px";
+    }
     var wrapper = doc.createElement("div");
     wrapper.classList.add("vsc-controller");
     if (!this.video.src && !this.video.currentSrc)
@@ -345,8 +338,7 @@ function defineVideoController() {
         runAction(
           e.target.dataset["action"],
           getKeyBindings(e.target.dataset["action"], "value"),
-          e,
+          e
-          this.video
         );
         e.stopPropagation();
       },
@@ -359,8 +351,7 @@ function defineVideoController() {
           runAction(
             e.target.dataset["action"],
             getKeyBindings(e.target.dataset["action"]),
-            e,
+            e
-            this.video
           );
           e.stopPropagation();
         },
@@ -397,7 +388,7 @@ function defineVideoController() {
         const r = parentEl.getRootNode();
         const s = r && r.querySelector ? r.querySelector(".scrim") : null;
         if (s) s.prepend(fragment);
-        else parentEl.insertBefore(fragment, pEl.firstChild);
+        else parentEl.insertBefore(fragment, parentEl.firstChild);
         break;
       default:
         parentEl.insertBefore(fragment, parentEl.firstChild);
@@ -450,7 +441,7 @@ function setupListener() {
     tc.settings.lastSpeed = speed;
     chrome.storage.sync.set({ lastSpeed: speed }, () => {});
     if (fromUserInput) {
-      runAction("blink", getKeyBindings("blink", "value") || 1000, null, video);
+      runAction("blink", 1000, null, video);
     }
     if (video.vsc) {
       if (speed === 1.0 || video.paused) video.vsc.stopSubtitleNudge();
@@ -522,12 +513,7 @@ function getShadow(parent) {
   return r;
 }
 
-// MODIFIED: Replaced with your debug-enhanced initializeNow
 function initializeNow(doc) {
-  console.log(
-    "[VSC DEBUG] initializeNow called for:",
-    doc.location ? doc.location.hostname : "unknown doc"
-  );
   if (vscInitializedDocuments.has(doc) || !doc.body) return;
   if (!tc.settings.enabled) return;
   if (!doc.body.classList.contains("vsc-initialized"))
@@ -535,7 +521,6 @@ function initializeNow(doc) {
   if (typeof tc.videoController === "undefined") defineVideoController();
   setupListener();
 
-  // Re-inserting original keydown listener logic from your codebase
   var docs = Array(doc);
   try {
     if (inIframe()) docs.push(window.top.document);
@@ -578,7 +563,6 @@ function initializeNow(doc) {
     d.vscKeydownListenerAttached = true;
   });
 
-  // Original MutationObserver logic
   if (!doc.vscMutationObserverAttached) {
     const observer = new MutationObserver(function (mutations) {
       requestIdleCallback(
@@ -652,31 +636,19 @@ function initializeNow(doc) {
 
   const q = tc.settings.audioBoolean ? "video,audio" : "video";
   const foundVideos = doc.querySelectorAll(q);
-  console.log(
-    "[VSC DEBUG] Found videos:",
-    foundVideos.length,
-    "in doc:",
-    doc.location ? doc.location.hostname : "unknown"
-  );
   foundVideos.forEach((v) => {
     if (!v.vsc) new tc.videoController(v, v.parentElement);
   });
 
-  // Your enhanced iframe handling
   Array.from(doc.getElementsByTagName("iframe")).forEach((f) => {
-    console.log("[VSC DEBUG] Found iframe:", f.src);
+    if (f.vscLoadListenerAttached) return;
-    if (f.vscLoadListenerAttached) return; // Prevent attaching multiple load listeners
     f.addEventListener("load", () => {
-      console.log("[VSC DEBUG] Iframe loaded, attempting to access");
       try {
         if (f.contentDocument) {
           initializeWhenReady(f.contentDocument);
         }
       } catch (e) {
-        console.log(
+        // Silently ignore CORS errors
-          "[VSC DEBUG] Still cannot access iframe after load:",
-          e.message
-        );
       }
     });
     f.vscLoadListenerAttached = true;
@@ -685,13 +657,12 @@ function initializeNow(doc) {
         initializeWhenReady(f.contentDocument);
       }
     } catch (e) {
-      console.log("[VSC DEBUG] Error accessing iframe immediately:", e.message);
+      // Silently ignore CORS errors
     }
   });
   vscInitializedDocuments.add(doc);
 }
 
-// MODIFIED: setSpeed now takes isUserKeyPress for blink logic
 function setSpeed(video, speed, isInitialCall = false, isUserKeyPress = false) {
   const numericSpeed = Number(speed);
   if (isNaN(numericSpeed) || numericSpeed <= 0 || numericSpeed > 16) return;
@@ -705,7 +676,7 @@ function setSpeed(video, speed, isInitialCall = false, isUserKeyPress = false) {
   video.vsc.speedIndicator.textContent = numericSpeed.toFixed(2);
 
   if (isUserKeyPress && !isInitialCall && video.vsc && video.vsc.div) {
-    runAction("blink", null, null, video); // Pass video to blink
+    runAction("blink", 1000, null, video); // Pass video to blink
   }
 
   if (tc.settings.forceLastSavedSpeed) {
@@ -733,11 +704,14 @@ function setSpeed(video, speed, isInitialCall = false, isUserKeyPress = false) {
   }
 }
 
-// MODIFIED: runAction is now context-aware and calls the new simpler resetSpeed
 function runAction(action, value, e) {
   log("runAction Begin", 5);
   var mediaTagsToProcess;
-  if (e && e.target && e.target.getRootNode) {
+  const specificVideo = arguments[3] || null;
+
+  if (specificVideo) {
+    mediaTagsToProcess = [specificVideo];
+  } else if (e && e.target && e.target.getRootNode) {
     // Event-driven action
     const docContext = e.target.ownerDocument || document;
     mediaTagsToProcess = tc.mediaElements.filter(
@@ -746,20 +720,18 @@ function runAction(action, value, e) {
     const targetController = e.target.getRootNode().host;
     if (targetController) {
       // If it's a click on a controller, only use that one video
-      const specificVideo = tc.mediaElements.find(
+      const videoFromController = tc.mediaElements.find(
         (v) => v.vsc && v.vsc.div === targetController
       );
-      if (specificVideo) mediaTagsToProcess = [specificVideo];
+      if (videoFromController) mediaTagsToProcess = [videoFromController];
     }
   } else {
-    // No event context (e.g., internal blink call) or a passed specificVideo
+    mediaTagsToProcess = tc.mediaElements;
-    const specificVideo = arguments[3] || null; // The optional 4th argument
-    if (specificVideo) mediaTagsToProcess = [specificVideo];
-    else mediaTagsToProcess = tc.mediaElements;
   }
   if (mediaTagsToProcess.length === 0 && action !== "display") return;
 
   mediaTagsToProcess.forEach(function (v) {
+    if (!v.vsc) return; // Don't process videos without a controller
     var controller = v.vsc.div;
     const userDrivenActionsThatShowController = [
       "rewind",
@@ -781,9 +753,11 @@ function runAction(action, value, e) {
     const numValue = parseFloat(value);
     switch (action) {
       case "rewind":
+        isUserSeek = true;
         v.currentTime -= numValue;
         break;
       case "advance":
+        isUserSeek = true;
         v.currentTime += numValue;
         break;
       case "faster":
@@ -801,11 +775,11 @@ function runAction(action, value, e) {
         setSpeed(v, Math.max(v.playbackRate - numValue, 0.07), false, true);
         break;
       case "reset":
-        resetSpeed(v, 1.0);
+        resetSpeed(v, 1.0, false); // Use enhanced resetSpeed
-        break; // Use new simpler resetSpeed
+        break;
       case "fast":
-        resetSpeed(v, numValue, true);
+        resetSpeed(v, numValue, true); // Use enhanced resetSpeed
-        break; // Use new simpler resetSpeed
+        break;
       case "display":
         controller.classList.add("vsc-manual");
         controller.classList.toggle("vsc-hidden");
@@ -827,7 +801,7 @@ function runAction(action, value, e) {
               controller.classList.add("vsc-hidden");
             }
             controller.blinkTimeOut = undefined;
-          }, value || 1000);
+          }, numValue || 1000); // FIXED: Use numValue for consistency
         }
         break;
       case "drag":
@@ -855,22 +829,39 @@ function pause(v) {
   else v.pause();
 }
 
-// MODIFIED: Replaced with new, simpler resetSpeed function
 function resetSpeed(v, target, isFastKey = false) {
-  const fastSpeed = getKeyBindings("fast", "value") || 1.8;
+  const videoId = v.currentSrc || v.src || "default";
+  const currentSpeed = v.playbackRate;
+
   if (isFastKey) {
-    // Called by 'fast' action
+    // G key: Toggle between current speed and preferred speed (e.g., 1.8)
-    if (Math.abs(v.playbackRate - target) < 0.01) {
+    const preferredSpeed = target;
-      setSpeed(v, 1.0, false, true); // Toggle to 1.0
+    const lastToggle = lastToggleSpeed[videoId] || currentSpeed;
+
+    if (Math.abs(currentSpeed - preferredSpeed) < 0.01) {
+      // Currently at preferred speed, toggle to the last speed
+      setSpeed(v, lastToggle, false, true);
     } else {
-      setSpeed(v, target, false, true); // Set to preferred speed
+      // Not at preferred speed, save current as toggle speed and go to preferred
+      lastToggleSpeed[videoId] = currentSpeed;
+      setSpeed(v, preferredSpeed, false, true);
     }
   } else {
-    // Called by 'reset' action
+    // R key: Toggle between current speed and 1.0
-    if (Math.abs(v.playbackRate - 1.0) < 0.01) {
+    const resetSpeedValue = 1.0;
-      setSpeed(v, fastSpeed, false, true); // Toggle to fast speed
+    const lastToggle = lastToggleSpeed[videoId] || currentSpeed;
+
+    if (Math.abs(currentSpeed - resetSpeedValue) < 0.01) {
+      // Currently at 1.0, toggle to the last speed (or 1.8 if no history)
+      const speedToRestore =
+        Math.abs(lastToggle - 1.0) < 0.01
+          ? getKeyBindings("fast") || 1.8
+          : lastToggle;
+      setSpeed(v, speedToRestore, false, true);
     } else {
-      setSpeed(v, 1.0, false, true); // Set to 1.0
+      // Not at 1.0, save current as toggle speed and go to 1.0
+      lastToggleSpeed[videoId] = currentSpeed;
+      setSpeed(v, resetSpeedValue, false, true);
     }
   }
 }
@@ -885,7 +876,6 @@ function jumpToMark(v) {
   if (v.vsc && typeof v.vsc.mark === "number") v.currentTime = v.vsc.mark;
 }
 function handleDrag(video, e) {
-  /* ... Same original logic ... */
   const c = video.vsc.div;
   const sC = c.shadowRoot.querySelector("#controller");
   var pE = c.parentElement;
@@ -917,9 +907,8 @@ function handleDrag(video, e) {
 }
 var timer = null;
 function showController(controller) {
-  /* ... Same original logic ... */
   if (!controller || typeof controller.classList === "undefined") return;
-  controller.classList.add("vcs-show");
+  controller.classList.add("vsc-show");
   if (timer) clearTimeout(timer);
   timer = setTimeout(function () {
     controller.classList.remove("vsc-show");

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "Video Speed Controller",
   "short_name": "videospeed",
-  "version": "1.1.3",
+  "version": "1.4.1",
   "manifest_version": 2,
   "description": "Speed up, slow down, advance and rewind HTML5 audio/video with shortcuts",
   "homepage_url": "https://github.com/SoPat712/videospeed",