fix reddit site conflict

Author: ttop32

doc/description.md

@@ -19,6 +19,8 @@ Mouseover Translate Any Language At Once
 English, Russian, Japanese, Chinese and so on
 
 # Change Log
+- 0.1.137
+  - Fix reddit site conflict
 - 0.1.136
   - Fix Japanese furigana recognition (request by cspotcode)
   - Add speech recognition translator

src/background.js

@@ -58,6 +58,9 @@ function addMessageListener() {
       } else if (request.type === "requestBase64") {
         var base64Url = await util.getBase64(request.url);
         sendResponse({ base64Url });
+      } else if (request.type === "createOffscreen") {
+        await util.createOffscreen();
+        sendResponse({});
       }
     })();
     return true;

src/contentScript.js

@@ -917,13 +917,12 @@ function initSpeechRecognition() {
   listenEngine.continuous = true;
   listenEngine.interimResults = true;
   initSpeechRecognitionLang();
-  var ignore_onend;
 
   listenEngine.onstart = function () {
     listening = true;
   };
   listenEngine.onerror = function (event) {
-    ignore_onend = true;
+    console.log(event);
   };
   listenEngine.onend = function () {
     listening = false;

src/event/mouseover.js

@@ -55,6 +55,7 @@ async function getMouseoverText(x, y) {
   var textElement;
   var range =
     caretRangeFromPoint(x, y, _win.document) ||
+    caretRangeFromPointOnDocument(x, y) ||
     caretRangeFromPointOnShadowDom(x, y);
 
   //get google doc select
@@ -155,7 +156,9 @@ export function caretRangeFromPointOnShadowDom(x, y) {
 }
 
 function getRangeFromTextNodes(x, y, textNodes) {
-  // text node that position in x y
+  //filter no text
+  var textNodes = textNodes.filter((textNode) => textNode.textContent.trim());
+  // filter no pos overlap
   var textNodes = textNodes.filter((textNode) =>
     checkXYInElement(getTextRange(textNode), x, y)
   );
@@ -182,7 +185,7 @@ export function getAllTextNodes(el) {
 function textNodesUnder(el) {
   return walkNodeTree(el, NodeFilter.SHOW_TEXT, {
     inspect: (textNode) =>
-      !PARENT_TAGS_TO_EXCLUDE.includes(textNode.parentElement?.nodeName),
+      !PARENT_TAGS_TO_EXCLUDE.includes(textNode?.parentElement?.nodeName),
   });
 }
 

src/tts/offscreen.js renamed to src/offscreen.js

@@ -8,15 +8,19 @@ var stopTtsTimestamp = 0;
 // Listen for messages from the extension
 browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
   (async () => {
-    if (request.type === "playAudioOffscreen") {
+    if (request.type == "playAudioOffscreen") {
       await playAudio(request.data);
       sendResponse({});
-    } else if (request.type === "playSpeechTTSOffscreen") {
+    } else if (request.type == "playSpeechTTSOffscreen") {
       await playSpeechTTS(request.data);
       sendResponse({});
-    } else if (request.type === "stopTTSOffscreen") {
+    } else if (request.type == "stopTTSOffscreen") {
       await stopAudio(request.data);
       sendResponse({});
+    } else if (request.type == "startSpeechRecognition") {
+      sendResponse({});
+    } else if (request.type == "stopSpeechRecognition") {
+      sendResponse({});
     }
   })();
 

src/tts/baseTTS.js

@@ -35,39 +35,12 @@ export default class BaseTTS {
   }
 
   static async playAudioOffscreen(source, rate, volume, timestamp) {
-    await this.createOffscreen();
-    await util.sendMessage({
-      type: "playAudioOffscreen",
-      data: {
-        source,
-        rate,
-        volume,
-        timestamp,
-      },
-    });
+    await util.createOffscreen();
+    await util.requestPlayTtsOffscreen(source, rate, volume, timestamp);
   }
 
   static async stopTtsOffscreen(timestamp) {
-    await this.createOffscreen();
-    await util.sendMessage({ type: "stopTTSOffscreen", data: { timestamp } });
-  }
-
-  // Create the offscreen document
-  static async createOffscreen() {
-    try {
-      await browser?.offscreen?.createDocument({
-        url: "offscreen.html",
-        reasons: ["AUDIO_PLAYBACK"],
-        justification: "play tts", // details for using the API
-      });
-    } catch (error) {
-      if (!error.message.startsWith("Only a single offscreen")) throw error;
-    }
-  }
-
-  static async removeOffscreen() {
-    return new Promise((resolve, reject) => {
-      browser.offscreen.closeDocument(() => resolve());
-    });
+    await util.createOffscreen();
+    await util.requestStopTtsOffscreen(timestamp);
   }
 }

src/util/index.js

@@ -799,3 +799,61 @@ export async function requestBase64(url) {
     url,
   });
 }
+
+export async function requestCreateOffscreen() {
+  return await sendMessage({
+    type: "createOffscreen",
+  });
+}
+
+export async function requestStartSpeechRecognitionOffscreen(lang) {
+  await requestCreateOffscreen();
+  return await sendMessage({
+    type: "startSpeechRecognition",
+    data: {
+      lang,
+    },
+  });
+}
+
+export async function requestStopSpeechRecognitionOffscreen() {
+  await requestCreateOffscreen();
+  return await sendMessage({
+    type: "stopSpeechRecognition",
+  });
+}
+
+export async function requestPlayTtsOffscreen(source, rate, volume, timestamp) {
+  return await sendMessage({
+    type: "playAudioOffscreen",
+    data: {
+      source,
+      rate,
+      volume,
+      timestamp,
+    },
+  });
+}
+
+export async function requestStopTtsOffscreen(timestamp) {
+  return await sendMessage({ type: "stopTTSOffscreen", data: { timestamp } });
+}
+
+//offscreen =======================
+// Create the offscreen document
+export async function createOffscreen() {
+  try {
+    await browser?.offscreen?.createDocument({
+      url: "offscreen.html",
+      reasons: ["WORKERS"],
+      justification: "TTS & Speech",
+    });
+  } catch (error) {
+    if (!error.message.startsWith("Only a single offscreen")) throw error;
+  }
+}
+export async function removeOffscreen() {
+  return new Promise((resolve, reject) => {
+    browser.offscreen.closeDocument(() => resolve());
+  });
+}