@d-i-t-a/reader 2.3.7 → 2.3.9

package/dist/esm/index.js

@@ -56120,9 +56120,6 @@ var SearchModule = class {
     self2.currentChapterSearchResult = [];
     self2.currentSearchHighlights = [];
     var localSearchResultChapter = [];
-    if (this.navigator.rights.enableContentProtection) {
-      this.navigator.contentProtectionModule?.deactivate();
-    }
     await this.searchAndPaintChapter(searchVal, index2, async (result) => {
       localSearchResultChapter = result;
       goToResultPage(1);
@@ -56210,6 +56207,9 @@ var SearchModule = class {
     }
   }
   async searchAndPaintChapter(term, index2 = 0, callback) {
+    if (this.navigator.rights.enableContentProtection) {
+      this.navigator.contentProtectionModule?.deactivate();
+    }
     const linkHref = this.publication.getAbsoluteHref(this.publication.readingOrder[this.navigator.currentResource() ?? 0].Href);
     let tocItem = this.publication.getTOCItem(linkHref);
     if (tocItem === null) {
@@ -56289,6 +56289,9 @@ var SearchModule = class {
     this.bookSearchResult = [];
     reset();
     await this.searchAndPaintChapter(term, 0, async () => {
+      if (this.navigator.rights.enableContentProtection) {
+        this.navigator.contentProtectionModule?.recalculate(200);
+      }
     });
     if (current) {
       await this.searchBook(term);
@@ -56326,6 +56329,9 @@ var SearchModule = class {
         this.navigator.navigate(position);
         setTimeout(() => {
           this.searchAndPaintChapter(item.textMatch, filteredIndex, async () => {
+            if (this.navigator.rights.enableContentProtection) {
+              this.navigator.contentProtectionModule?.recalculate(200);
+            }
           });
         }, 300);
       }
@@ -56357,6 +56363,9 @@ var SearchModule = class {
         this.navigator.navigate(position);
         setTimeout(() => {
           this.searchAndPaintChapter(item.textMatch, filteredIndex, async () => {
+            if (this.navigator.rights.enableContentProtection) {
+              this.navigator.contentProtectionModule?.recalculate(200);
+            }
           });
         }, 300);
       }
@@ -57464,11 +57473,6 @@ var TTSModule2 = class {
       let doc = this.navigator.iframes[0].contentDocument;
       if (doc) {
         let selection = this.highlighter.dom(doc.body).getSelection();
-        if (selection.isCollapsed) {
-          let doc2 = this.navigator.iframes[0].contentDocument;
-          const selectionInfo = this.navigator.annotationModule?.annotator?.getTemporarySelectionInfo(doc2);
-          selection.addRange(selectionInfo.range);
-        }
         let range = selection.getRangeAt(0);
         let node = selection.anchorNode;
         while (range.toString().indexOf(" ") !== 0) {
@@ -57551,6 +57555,11 @@ var TTSModule2 = class {
     }
   }
   async speak(selectionInfo, partial, callback) {
+    if (!partial) {
+      if (this.navigator.rights.enableContentProtection) {
+        this.navigator.contentProtectionModule?.deactivate();
+      }
+    }
     if (this.api?.started)
       this.api?.started();
     this.navigator.emit("readaloud.started", "started");
@@ -57607,6 +57616,10 @@ var TTSModule2 = class {
               restOfTheText = restOfTheText.replace(textToBeSpoken, "").trim();
             }
             utterance = new SpeechSynthesisUtterance(textToBeSpoken);
+            utterance.rate = this.tts.rate;
+            utterance.pitch = this.tts.pitch;
+            utterance.volume = this.tts.volume;
+            this.setVoice(this, utterance);
             import_loglevel18.default.log(selectionInfo);
             import_loglevel18.default.log(textToBeSpoken, selectionInfo.range?.commonAncestorContainer.textContent);
             import_loglevel18.default.log(ttsQueueItem);
@@ -57629,19 +57642,85 @@ var TTSModule2 = class {
     utterance.rate = this.tts.rate;
     utterance.pitch = this.tts.pitch;
     utterance.volume = this.tts.volume;
+    this.setVoice(self2, utterance);
+    this.index = 0;
+    function onend() {
+      utterance.onend = function() {
+        if (idxEnd > idx) {
+          idx = idx + 1;
+          if (idx !== idxEnd) {
+            const ttsQueueItem = getTtsQueueItemRef(ttsQueue, idx);
+            if (ttsQueueItem) {
+              const sentence = getTtsQueueItemRefText(ttsQueueItem);
+              utterance = new SpeechSynthesisUtterance(sentence);
+              utterance.rate = self2.tts.rate;
+              utterance.pitch = self2.tts.pitch;
+              utterance.volume = self2.tts.volume;
+              self2.setVoice(self2, utterance);
+              utterance.onboundary = (ev) => {
+                self2.updateTTSInfo(ttsQueueItem, ev.charIndex, ev.charLength, 0, utterance.text);
+              };
+              setTimeout(() => {
+                window.speechSynthesis.speak(utterance);
+              }, 0);
+              onend();
+            }
+          } else {
+            const ttsQueueItem = getTtsQueueItemRef(ttsQueue, idx);
+            if (ttsQueueItem) {
+              utterance = new SpeechSynthesisUtterance(restOfTheText);
+              utterance.rate = self2.tts.rate;
+              utterance.pitch = self2.tts.pitch;
+              utterance.volume = self2.tts.volume;
+              self2.setVoice(self2, utterance);
+              utterance.onboundary = (ev) => {
+                self2.updateTTSInfo(ttsQueueItem, ev.charIndex, ev.charLength, 0, utterance.text);
+              };
+              setTimeout(() => {
+                window.speechSynthesis.speak(utterance);
+              }, 0);
+              onend();
+            }
+            if (idx > idxEnd) {
+              import_loglevel18.default.log("utterance ended");
+              self2.highlighter.doneSpeaking();
+              self2.api?.finished();
+              self2.navigator.emit("readaloud.finished", "finished");
+            }
+          }
+        } else {
+          import_loglevel18.default.log("utterance ended");
+          self2.highlighter.doneSpeaking();
+          self2.api?.finished();
+          self2.navigator.emit("readaloud.finished", "finished");
+        }
+      };
+    }
+    setTimeout(() => {
+      window.speechSynthesis.speak(utterance);
+      if (!partial) {
+        if (this.navigator.rights.enableContentProtection) {
+          this.navigator.contentProtectionModule?.recalculate(200);
+        }
+      }
+    }, 0);
+    onend();
+    callback();
+  }
+  setVoice(self2, utterance) {
     import_loglevel18.default.log("this.tts.voice.lang", this.tts.voice.lang);
-    var initialVoiceHasHyphen = true;
+    let initialVoiceHasHyphen = true;
     if (this.tts.voice && this.tts.voice.lang) {
       initialVoiceHasHyphen = this.tts.voice.lang.indexOf("-") !== -1;
-      if (initialVoiceHasHyphen === false) {
+      if (!initialVoiceHasHyphen) {
         this.tts.voice.lang = this.tts.voice.lang.replace("_", "-");
         initialVoiceHasHyphen = true;
       }
     }
     import_loglevel18.default.log("initialVoiceHasHyphen", initialVoiceHasHyphen);
     import_loglevel18.default.log("voices", this.voices);
-    var initialVoice;
-    if (initialVoiceHasHyphen === true) {
+    let initialVoice;
+    if (initialVoiceHasHyphen) {
       initialVoice = this.tts.voice && this.tts.voice.lang && this.tts.voice.name ? this.voices.filter((v) => {
         var lang = v.lang.replace("_", "-");
         return lang === this.tts.voice.lang && v.name === this.tts.voice.name;
@@ -57658,10 +57737,10 @@ var TTSModule2 = class {
       }
     }
     import_loglevel18.default.log("initialVoice", initialVoice);
-    var publicationVoiceHasHyphen = self2.navigator.publication.Metadata.Language[0].indexOf("-") !== -1;
+    const publicationVoiceHasHyphen = self2.navigator.publication.Metadata.Language[0].indexOf("-") !== -1;
     import_loglevel18.default.log("publicationVoiceHasHyphen", publicationVoiceHasHyphen);
-    var publicationVoice;
-    if (publicationVoiceHasHyphen === true) {
+    let publicationVoice;
+    if (publicationVoiceHasHyphen) {
       publicationVoice = this.tts.voice && this.tts.voice.usePublication ? this.voices.filter((v) => {
         var lang = v.lang.replace("_", "-");
         return lang.startsWith(self2.navigator.publication.Metadata.Language[0]) || lang.endsWith(self2.navigator.publication.Metadata.Language[0].toUpperCase());
@@ -57672,24 +57751,24 @@ var TTSModule2 = class {
       })[0] : void 0;
     }
     import_loglevel18.default.log("publicationVoice", publicationVoice);
-    var defaultVoiceHasHyphen = navigator.language.indexOf("-") !== -1;
+    const defaultVoiceHasHyphen = navigator.language.indexOf("-") !== -1;
     import_loglevel18.default.log("defaultVoiceHasHyphen", defaultVoiceHasHyphen);
-    var defaultVoice;
-    if (defaultVoiceHasHyphen === true) {
+    let defaultVoice;
+    if (defaultVoiceHasHyphen) {
       defaultVoice = this.voices.filter((voice) => {
-        var lang = voice.lang.replace("_", "-");
-        return lang === navigator.language && voice.localService === true;
+        const lang = voice.lang.replace("_", "-");
+        return lang === navigator.language && voice.localService;
       })[0];
     } else {
       defaultVoice = this.voices.filter((voice) => {
-        var lang = voice.lang;
-        return lang === navigator.language && voice.localService === true;
+        const lang = voice.lang;
+        return lang === navigator.language && voice.localService;
       })[0];
     }
     if (defaultVoice === void 0) {
       defaultVoice = this.voices.filter((voice) => {
-        var lang = voice.lang;
-        return lang.includes(navigator.language) && voice.localService === true;
+        const lang = voice.lang;
+        return lang.includes(navigator.language) && voice.localService;
       })[0];
     }
     import_loglevel18.default.log("defaultVoice", defaultVoice);
@@ -57709,58 +57788,11 @@ var TTSModule2 = class {
       import_loglevel18.default.log("utterance.lang", utterance.lang);
     }
     import_loglevel18.default.log("navigator.language", navigator.language);
-    setTimeout(() => {
-      window.speechSynthesis.speak(utterance);
-    }, 0);
-    this.index = 0;
-    function onend() {
-      utterance.onend = function() {
-        if (idxEnd > idx) {
-          idx = idx + 1;
-          if (idx !== idxEnd) {
-            const ttsQueueItem = getTtsQueueItemRef(ttsQueue, idx);
-            if (ttsQueueItem) {
-              const sentence = getTtsQueueItemRefText(ttsQueueItem);
-              utterance = new SpeechSynthesisUtterance(sentence);
-              utterance.onboundary = (ev) => {
-                self2.updateTTSInfo(ttsQueueItem, ev.charIndex, ev.charLength, 0, utterance.text);
-              };
-              setTimeout(() => {
-                window.speechSynthesis.speak(utterance);
-              }, 0);
-              onend();
-            }
-          } else {
-            const ttsQueueItem = getTtsQueueItemRef(ttsQueue, idx);
-            if (ttsQueueItem) {
-              utterance = new SpeechSynthesisUtterance(restOfTheText);
-              utterance.onboundary = (ev) => {
-                self2.updateTTSInfo(ttsQueueItem, ev.charIndex, ev.charLength, 0, utterance.text);
-              };
-              setTimeout(() => {
-                window.speechSynthesis.speak(utterance);
-              }, 0);
-              onend();
-            }
-            if (idx > idxEnd) {
-              import_loglevel18.default.log("utterance ended");
-              self2.highlighter.doneSpeaking();
-              self2.api?.finished();
-              self2.navigator.emit("readaloud.finished", "finished");
-            }
-          }
-        } else {
-          import_loglevel18.default.log("utterance ended");
-          self2.highlighter.doneSpeaking();
-          self2.api?.finished();
-          self2.navigator.emit("readaloud.finished", "finished");
-        }
-      };
-    }
-    onend();
-    callback();
   }
   speakPlay() {
+    if (this.navigator.rights.enableContentProtection) {
+      this.navigator.contentProtectionModule?.deactivate();
+    }
     this.scrollPartial = true;
     this.cancel(false);
     if (this.api?.started)
@@ -57810,6 +57842,9 @@ var TTSModule2 = class {
         this.startTTSSession(ttsQueue, ttsQueueIndex);
       }, 200);
     }
+    if (this.navigator.rights.enableContentProtection) {
+      this.navigator.contentProtectionModule?.recalculate(200);
+    }
   }
   speakPause() {
     if (window.speechSynthesis.speaking) {
@@ -58024,87 +58059,8 @@ var TTSModule2 = class {
     utterance.rate = this.tts.rate;
     utterance.pitch = this.tts.pitch;
     utterance.volume = this.tts.volume;
-    import_loglevel18.default.log("this.tts.voice.lang", this.tts.voice.lang);
-    var initialVoiceHasHyphen = true;
-    if (this.tts.voice && this.tts.voice.lang) {
-      initialVoiceHasHyphen = this.tts.voice.lang.indexOf("-") !== -1;
-      if (initialVoiceHasHyphen === false) {
-        this.tts.voice.lang = this.tts.voice.lang.replace("_", "-");
-        initialVoiceHasHyphen = true;
-      }
-    }
-    import_loglevel18.default.log("initialVoiceHasHyphen", initialVoiceHasHyphen);
-    import_loglevel18.default.log("voices", this.voices);
-    var initialVoice;
-    if (initialVoiceHasHyphen === true) {
-      initialVoice = this.tts.voice && this.tts.voice.lang && this.tts.voice.name ? this.voices.filter((v) => {
-        var lang = v.lang.replace("_", "-");
-        return lang === this.tts.voice.lang && v.name === this.tts.voice.name;
-      })[0] : void 0;
-      if (initialVoice === void 0) {
-        initialVoice = this.tts.voice && this.tts.voice.lang ? this.voices.filter((v) => v.lang.replace("_", "-") === this.tts.voice.lang)[0] : void 0;
-      }
-    } else {
-      initialVoice = this.tts.voice && this.tts.voice.lang && this.tts.voice.name ? this.voices.filter((v) => {
-        return v.lang === this.tts.voice.lang && v.name === this.tts.voice.name;
-      })[0] : void 0;
-      if (initialVoice === void 0) {
-        initialVoice = this.tts.voice && this.tts.voice.lang ? this.voices.filter((v) => v.lang === this.tts.voice.lang)[0] : void 0;
-      }
-    }
-    import_loglevel18.default.log("initialVoice", initialVoice);
-    var self2 = this;
-    var publicationVoiceHasHyphen = self2.navigator.publication.Metadata.Language[0].indexOf("-") !== -1;
-    import_loglevel18.default.log("publicationVoiceHasHyphen", publicationVoiceHasHyphen);
-    var publicationVoice;
-    if (publicationVoiceHasHyphen === true) {
-      publicationVoice = this.tts.voice && this.tts.voice.usePublication ? this.voices.filter((v) => {
-        var lang = v.lang.replace("_", "-");
-        return lang.startsWith(self2.navigator.publication.Metadata.Language[0]) || lang.endsWith(self2.navigator.publication.Metadata.Language[0].toUpperCase());
-      })[0] : void 0;
-    } else {
-      publicationVoice = this.tts.voice && this.tts.voice.usePublication ? this.voices.filter((v) => {
-        return v.lang.startsWith(self2.navigator.publication.Metadata.Language[0]) || v.lang.endsWith(self2.navigator.publication.Metadata.Language[0].toUpperCase());
-      })[0] : void 0;
-    }
-    import_loglevel18.default.log("publicationVoice", publicationVoice);
-    var defaultVoiceHasHyphen = navigator.language.indexOf("-") !== -1;
-    import_loglevel18.default.log("defaultVoiceHasHyphen", defaultVoiceHasHyphen);
-    var defaultVoice;
-    if (defaultVoiceHasHyphen === true) {
-      defaultVoice = this.voices.filter((voice) => {
-        var lang = voice.lang.replace("_", "-");
-        return lang === navigator.language && voice.localService === true;
-      })[0];
-    } else {
-      defaultVoice = this.voices.filter((voice) => {
-        var lang = voice.lang;
-        return lang === navigator.language && voice.localService === true;
-      })[0];
-    }
-    if (defaultVoice === void 0) {
-      defaultVoice = this.voices.filter((voice) => {
-        var lang = voice.lang;
-        return lang.includes(navigator.language) && voice.localService === true;
-      })[0];
-    }
-    import_loglevel18.default.log("defaultVoice", defaultVoice);
-    if (initialVoice) {
-      import_loglevel18.default.log("initialVoice");
-      utterance.voice = initialVoice;
-    } else if (publicationVoice) {
-      import_loglevel18.default.log("publicationVoice");
-      utterance.voice = publicationVoice;
-    } else if (defaultVoice) {
-      import_loglevel18.default.log("defaultVoice");
-      utterance.voice = defaultVoice;
-    }
-    if (utterance.voice !== void 0 && utterance.voice !== null) {
-      utterance.lang = utterance.voice.lang;
-      import_loglevel18.default.log("utterance.voice.lang", utterance.voice.lang);
-      import_loglevel18.default.log("utterance.lang", utterance.lang);
-    }
-    import_loglevel18.default.log("navigator.language", navigator.language);
+    const self2 = this;
+    this.setVoice(self2, utterance);
     utterance.onboundary = (ev) => {
       import_loglevel18.default.log(ev.name);
       this.updateTTSInfo(ttsQueueItem, ev.charIndex, ev.charLength, 0, utterance.text);
@@ -58199,7 +58155,7 @@ var TTSModule2 = class {
       const range = new Range();
       range.setStart(rangeStartNode, rangeStartOffset);
       range.setEnd(rangeEndNode, rangeEndOffset);
-      var self2 = this;
+      const self2 = this;
       const rangeInfo = convertRange(range, getCssSelector);
       if (!rangeInfo) {
         return;