Merge pull request #898 from ilyhalight/dev

Option to use an experimental variation of Yandex voices for some videos

changelog.md

@@ -8,6 +8,7 @@
 
 # 1.x [WIP]
 
+- Добавлена возможность использования эксперементальной вариации голосов Яндекса. Новые голоса работают, только при некоторых условиях, во всех остальных случаях используются старые (#897)
 - Исправлена некорректная генерация Sec-{Vsubs|Vtrans}-Token заголовков ([vot.js#36](https://github.com/FOSWLY/vot.js/issues/36))
 
 # 1.7.1

package.json

@@ -58,6 +58,6 @@
     "chaimu": "^1.0.2",
     "lit": "^3.2.1",
     "requestidlecallback-polyfill": "^1.0.2",
-    "vot.js": "^1.3.9"
+    "vot.js": "^1.3.10"
   }
 }

patches/vot.js+1.3.3+007+added-coursera.patch → patches/vot.js+1.3.10+007+added-coursera.patch

@@ -1,8 +1,8 @@
 diff --git a/node_modules/vot.js/dist/config/sites.js b/node_modules/vot.js/dist/config/sites.js
-index 9c2d6a0..199665d 100644
+index c2db3cc..e7ffb83 100644
 --- a/node_modules/vot.js/dist/config/sites.js
 +++ b/node_modules/vot.js/dist/config/sites.js
-@@ -370,6 +370,14 @@ export default [
+@@ -371,6 +371,14 @@ export default [
              'div[data-purpose="curriculum-item-viewer-content"] > section > div > div > div > div:nth-of-type(2)',
          needExtraData: true,
      },
@@ -265,10 +265,10 @@ index 0000000..693da49
 +export {}
 \ No newline at end of file
 diff --git a/node_modules/vot.js/dist/types/yandex.d.ts b/node_modules/vot.js/dist/types/yandex.d.ts
-index 555b4ac..783def9 100644
+index 4715dab..6b4fd96 100644
 --- a/node_modules/vot.js/dist/types/yandex.d.ts
 +++ b/node_modules/vot.js/dist/types/yandex.d.ts
-@@ -60,6 +60,7 @@ export declare enum VideoService {
+@@ -66,6 +66,7 @@ export declare enum VideoService {
      coursehunterLike = "coursehunterLike",
      sap = "sap",
      udemy = "udemy",
@@ -277,7 +277,7 @@ index 555b4ac..783def9 100644
      linkedin = "linkedin",
      ricktube = "ricktube",
 diff --git a/node_modules/vot.js/dist/types/yandex.js b/node_modules/vot.js/dist/types/yandex.js
-index 520989c..963c358 100644
+index 3811fda..9bd062d 100644
 --- a/node_modules/vot.js/dist/types/yandex.js
 +++ b/node_modules/vot.js/dist/types/yandex.js
 @@ -50,6 +50,7 @@ export var VideoService;

src/index.js

@@ -102,6 +102,9 @@ class VideoHandler {
   audioContext = initAudioContext();
 
   hls = initHls(); // debug enabled only in dev mode
+  /**
+   * @type {import("vot.js").default}
+   */
   votClient;
 
   /**
@@ -185,6 +188,9 @@ class VideoHandler {
         requestLang,
         responseLang,
         translationHelp,
+        extraOpts: {
+          useNewModel: this.data?.useNewModel,
+        },
       });
       debug.log("Translate video result", res);
       if (res.translated && res.remainingTime < 1) {
@@ -343,7 +349,6 @@ class VideoHandler {
     this.audioPlayer = new Chaimu({
       video: this.video,
       debug: DEBUG_MODE,
-      // debug: true,
       fetchFn: GM_fetch,
       preferAudio,
     });
@@ -394,6 +399,7 @@ class VideoHandler {
       translateProxyEnabled: votStorage.get("translateProxyEnabled", 0),
       proxyWorkerHost: votStorage.get("proxyWorkerHost", proxyWorkerHost),
       audioBooster: votStorage.get("audioBooster", 0),
+      useNewModel: votStorage.get("useNewModel", 1),
       localeHash: votStorage.get("locale-hash", ""),
       localeUpdatedAt: votStorage.get("locale-updated-at", 0),
     };
@@ -817,6 +823,14 @@ class VideoHandler {
         this.votDownloadWithNameCheckbox.container,
       );
 
+      this.votUseNewModelCheckbox = ui.createCheckbox(
+        localizationProvider.get("VOTUseNewModel"),
+        this.data?.useNewModel ?? false,
+      );
+      this.votSettingsDialog.bodyContainer.appendChild(
+        this.votUseNewModelCheckbox.container,
+      );
+
       this.votTranslationServiceSelect = ui.createVOTSelect(
         this.data.translationService.toUpperCase(),
         localizationProvider.get("VOTTranslationService"),
@@ -1383,6 +1397,18 @@ class VideoHandler {
         })();
       });
 
+      this.votUseNewModelCheckbox.input.addEventListener("change", (e) => {
+        (async () => {
+          this.data.useNewModel = Number(e.target.checked);
+          await votStorage.set("useNewModel", this.data.useNewModel);
+          debug.log(
+            "useNewModel value changed. New value: ",
+            this.data.useNewModel,
+          );
+          this.stopTranslate();
+        })();
+      });
+
       this.votTranslationServiceSelect.labelElement.addEventListener(
         "change",
         (e) => {
@@ -2420,7 +2446,8 @@ class VideoHandler {
         t.videoId === VIDEO_ID &&
         t.expires > getTimestamp() &&
         t.from === requestLang &&
-        t.to === responseLang,
+        t.to === responseLang &&
+        t.useNewModel === this.data.useNewModel,
     );
 
     if (this.cachedTranslation) {
@@ -2462,6 +2489,7 @@ class VideoHandler {
       to: responseLang,
       url: this.downloadTranslationUrl,
       expires: getTimestamp() + this.videoTranslationTTL,
+      useNewModel: this.data?.useNewModel,
     });
   }
 

src/localization/hashes.json

@@ -1,64 +1,64 @@
 {
-  "af": "f68b5b8ec36f965a3c197cfc09c3a13e",
-  "am": "eb88f856ee2491f75a693588c9692149",
-  "ar": "208f24997d2d5fbfd3c60c8e339da119",
-  "az": "2e94b7c69d6afc35b5a27c65a3d1b99c",
-  "bg": "a3faf5b064d0210af56feae57a9e78c8",
-  "bn": "5c08f3177145632d0d6f9d1ac186fd68",
-  "bs": "369877867e0f353a440710e1ea357947",
-  "ca": "8143c3289562e81d382feed1faa36958",
-  "cs": "77baaa4ad7c7eb1110667d942fd82824",
-  "cy": "7eab9ff7991f4d9c59957f4415d134df",
-  "da": "e1a11e3dc644c7398467ce12783db3aa",
-  "de": "fc36180e2724f551a6965a58733b1431",
-  "el": "fa00dadb12dd90c5fe997c253e11ad8e",
-  "en": "cb8faddc6e9caa588be88f0ac723a30f",
-  "es": "9f777e3f09f1f109749164f482f94ca9",
-  "et": "58a419847b94c5c7455507dab4b0bb45",
-  "eu": "b6d195853dfa82c950bd529ad7584109",
-  "fa": "cd4e1e22d2e29f0e0db35f730dc36c3a",
-  "fi": "ead261e9f83485f994155ac59e4a4643",
-  "fr": "be3cd9e0b1b1ed4e1462481cda6544a2",
-  "gl": "b8cfc3e9625ad09943465b35e11553a0",
-  "hi": "7ec63cb98bf45d1764c49bc31172cfa1",
-  "hr": "0fe81cdec287f0f8648b2edc0f286b47",
-  "hu": "e1354ba5a4517737828378969b17e74f",
-  "hy": "1695bd2ef449c08e6cd4876df258082d",
-  "id": "c238d74f6379ff0c1066c71db746dad9",
-  "it": "a104c012ecdf6ffec1c0ce628ce436b2",
-  "ja": "e356855d332cf5742b14a9ac5bc57ae3",
-  "jv": "df40695c20313e0763fb7fb204f17cca",
-  "kk": "c9e3e2b298b8e137b1deec789b13255d",
-  "km": "f06db5cfe04fb018adf16ec41764e63b",
-  "kn": "de95f27b205ec84c54065b06de52d0a5",
-  "ko": "8f9d1fa64bb12e10868702be2baff9cf",
-  "lo": "a7c32deff8ae06e6459ecad6dabf13df",
-  "mk": "a3e55dbd72c84a8e9f3a052673289613",
-  "ml": "03ab16b4dc431d4de84e62f7ef550522",
-  "mn": "deeb7ee450cca18993b49893bb762f29",
-  "ms": "f64290d0c75915cc11550e0921c964d6",
-  "mt": "8d8d1961b9a542001dfe9fd1c7f74c6d",
-  "my": "6c7031334ff269dd0ad54a7ad41a27f1",
-  "ne": "d89fe27ad6c9767160809078020cae62",
-  "nl": "0479ab00d4faf53c570f5a3ccadd781f",
-  "pa": "e3fceb0947044e422ccc1f92678efef9",
-  "pl": "a988ac7aed4a217fdb024dcb81c873f5",
-  "pt": "0b523c1c470371ff16e041bd866003fd",
-  "ro": "8529221a47f338e0b8b8574084ecc75d",
-  "ru": "367850d9c7512dba1c4162e873407644",
-  "si": "5d805bdb82bf96e2752352297953af0b",
-  "sk": "c5217324fd7f6b87c359ee212f14591d",
-  "sl": "3fa935809e0b08198f47b1bda7ae1fba",
-  "sq": "46272c2b87cd6503687bf6ec92f01e22",
-  "sr": "9a5da418351b9afa29f9532b6f28f265",
-  "su": "f0f5092ebc0c59b614f735b4c17eb02a",
-  "sv": "b9b54963b905b4fa626a81ba0debce4b",
-  "sw": "dd7390feac22bce31d29a4e4c705dc92",
-  "tr": "3065730d7b543a221233eba3752a7c26",
-  "uk": "bbd67113245959459d3e7622aab0f9fa",
-  "ur": "d1d832f228e9df54d17927be0dedcf84",
-  "uz": "87820f65ad870c833d79aa8471b675d5",
-  "vi": "69238396c6fc68d89c17a464e2b8692d",
-  "zh": "94aa400e570e5e57605877fca2d29d2f",
-  "zu": "f0b1b3cf72deda6069063bb5ffe7d21e"
+  "af": "176f19f0b2038bea3d3159a6f1d866bd",
+  "am": "066f31a83d146aca3e17c487b6ffc6a5",
+  "ar": "68c2d77ba42d6e804549dfc4b8ec1e90",
+  "az": "542541565c95e4f8a8cc1288296068b1",
+  "bg": "128647e19866a70b51bfa36e30ae6f6f",
+  "bn": "14fc407aa3f8ef87750b8b5eca58960f",
+  "bs": "f58db98f7b41761a356aa459a4c4a80a",
+  "ca": "868e5f00b493fc9d4450daa7c1e0b70e",
+  "cs": "6833ad71911054be1a70c3480794a0c9",
+  "cy": "3906ca1898fa34b5c19721c80994e925",
+  "da": "c711c55e3c963384fac37e8f919e0a15",
+  "de": "a824a8827e06bf6c681a343a199e8a2e",
+  "el": "39811497806efa7bae4f853328a6ac75",
+  "en": "8cdc589ac6f53baf84d0d6f9c47a3b9b",
+  "es": "d7b3e28d39b514a903c3acccbef749e8",
+  "et": "b401bb2d6d00c516dc13ccfebbda6273",
+  "eu": "382c4e6019abd4e2dad1705d7bc2ee66",
+  "fa": "55ceb979dc77c1e7a44f4e831c0f92ac",
+  "fi": "d45a421f441d3089b32273295884f41e",
+  "fr": "3e8989a66db1cee065dceaa034bc0f99",
+  "gl": "b7fa5ef4b5c0e67225ca7d4b867d8d2b",
+  "hi": "ad0547eec65bc0e3d622fb906af6d8ed",
+  "hr": "ac2282efa60423b1f106071f8cef628c",
+  "hu": "7b2ba673348911fce77fa0bb000926fa",
+  "hy": "022cf299450ae4930208c32747726423",
+  "id": "88f49a482bbf129816fa5d4038238080",
+  "it": "cfc50df8d9306ee7683f6ad292fbf29c",
+  "ja": "373af9c8abb87dd814e770fe2b8969d8",
+  "jv": "291e363370b90e24a86141943b6e3838",
+  "kk": "3df9e236760f43136fd3ed86fb18595f",
+  "km": "33c0151aa3b6ae8225f9ce8a46dae6f5",
+  "kn": "1397ce0bfb8e342552991c24be56b808",
+  "ko": "d1b3b465ce9ee5e8554fc29989ac1259",
+  "lo": "6985efa4bd84f309da1f41e9f27c94b9",
+  "mk": "6c99cbda472e569d61ed1de548a5c9be",
+  "ml": "8692a1466f9102a4c52ade0c9a04db71",
+  "mn": "d4e94c0a94b288592ac416bc5145687c",
+  "ms": "90883f18604cf032671b82c710f2c125",
+  "mt": "9d07ff0407e72e381cf66c7d9371004e",
+  "my": "a0ce9421d24c283788d39c26a1415c33",
+  "ne": "8061c09e6124f1d7c14ed512a67b01fe",
+  "nl": "b27dcee35b32fc2ff14993a297dd25eb",
+  "pa": "ba9f8eff2583dd774e804826e4e18a76",
+  "pl": "7bd575cd344731531888f634494958ba",
+  "pt": "ae06b757cfbf379af0ab4a2ceef843c7",
+  "ro": "c9ebb058d42d25ad0f5640725b1a2ec4",
+  "ru": "4b567130c05f68cfeec63628992f6a38",
+  "si": "c2d53ad5fce583e7b3664b7685fbae18",
+  "sk": "13e4c841932df3dd186fad99d4646cad",
+  "sl": "da6bae3da2aee1933caff7d50fd37f50",
+  "sq": "767885d62d64458cb53f9eaa79b0e0b5",
+  "sr": "111ffbab9d848a3140f2f8baf57ae061",
+  "su": "240a58abcb019ef9b91bfacc16108f38",
+  "sv": "4e655546560328a95cf3712be5e86348",
+  "sw": "5ca3bee3dac025beb9772c31e60964cd",
+  "tr": "01a06cb67264ea2bdc6125f685a6815e",
+  "uk": "9bb17b1cd9c24d589f25f638e132c854",
+  "ur": "f75cfb34e442595900e487d42f06f3bd",
+  "uz": "49803eb7f30e28188e7deb3e40ec2db2",
+  "vi": "412ea327fbf3743a4b87ebaf42fdaa02",
+  "zh": "4ed9f2f7692583bc1ff33677311a4549",
+  "zu": "44a34145d8d652d0bd87501de3bf27a4"
 }

src/localization/locales/af.json

@@ -203,5 +203,6 @@
   "VOTNeedWebAudioAPI": "Om dit te aktiveer, moet jy'n Web Audio API",
   "VOTMediaCSPEnabledOnSite": "MEDIA CSP is geaktiveer op hierdie webwerf",
   "VOTOnlyBypassMediaCSP": "Gebruik dit slegs vir omseil Media CSP",
-  "VOTNewAudioPlayer": "Gebruik die nuwe oudiospeler"
+  "VOTNewAudioPlayer": "Gebruik die nuwe oudiospeler",
+  "VOTUseNewModel": "Gebruik'n eksperimentele variasie Van Yandex-stemme vir sommige video's"
 }

src/localization/locales/am.json

@@ -203,5 +203,6 @@
   "VOTNeedWebAudioAPI": "ይህንን ለማስቻል, አንድ የድር ኦዲዮ ኤፒአይ ሊኖርዎት ይገባል",
   "VOTMediaCSPEnabledOnSite": "በዚህ ድረ ገጽ ላይ የፒ",
   "VOTOnlyBypassMediaCSP": "የሚዲያ ሲ ኤስ ፒ ለማለፍ ብቻ ይጠቀሙ",
-  "VOTNewAudioPlayer": "አዲሱን የድምፅ ማጫወቻ ይጠቀሙ"
+  "VOTNewAudioPlayer": "አዲሱን የድምፅ ማጫወቻ ይጠቀሙ",
+  "VOTUseNewModel": "ለአንዳንድ ቪዲዮዎች የ Yandex ድምፆች የሙከራ ልዩነት ይጠቀሙ"
 }

src/localization/locales/ar.json

@@ -203,5 +203,6 @@
   "VOTNeedWebAudioAPI": "لتمكين هذا ، يجب أن يكون لديك واجهة برمجة تطبيقات صوت الويب",
   "VOTMediaCSPEnabledOnSite": "يتم تمكين الطاقة الشمسية المركزة وسائل الإعلام على هذا الموقع",
   "VOTOnlyBypassMediaCSP": "استخدامه فقط لتجاوز وسائل الإعلام سب",
-  "VOTNewAudioPlayer": "استخدم مشغل الصوت الجديد"
+  "VOTNewAudioPlayer": "استخدم مشغل الصوت الجديد",
+  "VOTUseNewModel": "استخدم تباينا تجريبيا لأصوات ياندكس لبعض مقاطع الفيديو"
 }

src/localization/locales/az.json

@@ -203,5 +203,6 @@
   "VOTNeedWebAudioAPI": "Bunu aktivləşdirmək üçün veb Audio API olmalıdır",
   "VOTMediaCSPEnabledOnSite": "Media CSP bu saytda aktivdir",
   "VOTOnlyBypassMediaCSP": "Yalnız Media CSP-ni keçmək üçün istifadə edin",
-  "VOTNewAudioPlayer": "Yeni audio pleyerdən istifadə edin"
+  "VOTNewAudioPlayer": "Yeni audio pleyerdən istifadə edin",
+  "VOTUseNewModel": "Bəzi videolar üçün Yandex voices-in eksperimental versiyasından istifadə edin"
 }

src/localization/locales/bg.json

@@ -203,5 +203,6 @@
   "VOTNeedWebAudioAPI": "За да разрешите това, трябва да имате уеб аудио интерфейс",
   "VOTMediaCSPEnabledOnSite": "Медиа ДУСП е активирана на този сайт",
   "VOTOnlyBypassMediaCSP": "Използвайте го само за заобикаляне на медийния ДУУ",
-  "VOTNewAudioPlayer": "Използвайте новия аудио плейър"
+  "VOTNewAudioPlayer": "Използвайте новия аудио плейър",
+  "VOTUseNewModel": "Използвайте експериментална вариация на Яндекс гласове за някои видеоклипове"
 }

src/localization/locales/bn.json

@@ -203,5 +203,6 @@
   "VOTNeedWebAudioAPI": "এটি সক্ষম করতে আপনার অবশ্যই একটি ওয়েব অডিও এপিআই থাকতে হবে",
   "VOTMediaCSPEnabledOnSite": "এই সাইটে মিডিয়া সিএসপি সক্ষম করা হয়েছে",
   "VOTOnlyBypassMediaCSP": "মিডিয়া সিএসপি বাইপাস করার জন্য এটি ব্যবহার করুন",
-  "VOTNewAudioPlayer": "নতুন অডিও প্লেয়ার ব্যবহার করুন"
+  "VOTNewAudioPlayer": "নতুন অডিও প্লেয়ার ব্যবহার করুন",
+  "VOTUseNewModel": "কিছু ভিডিওর জন্য ইয়ানডেক্স ভয়েসের একটি পরীক্ষামূলক বৈচিত্র ব্যবহার করুন"
 }

src/localization/locales/bs.json

@@ -203,5 +203,6 @@
   "VOTNeedWebAudioAPI": "Da biste to omogućili, morate imati Web Audio API",
   "VOTMediaCSPEnabledOnSite": "Media CSP je omogućen na ovom sajtu",
   "VOTOnlyBypassMediaCSP": "Koristi ga samo za zaobilaženje medija CSP",
-  "VOTNewAudioPlayer": "Koristi novi audio player"
+  "VOTNewAudioPlayer": "Koristi novi audio player",
+  "VOTUseNewModel": "Upotrijebite eksperimentalnu varijaciju Yandex glasova za neke videozapise"
 }

src/localization/locales/ca.json

@@ -203,5 +203,6 @@
   "VOTNeedWebAudioAPI": "Per activar-ho, heu de tenir UNA API D'Àudio",
   "VOTMediaCSPEnabledOnSite": "Media CSP està habilitat en aquest lloc",
   "VOTOnlyBypassMediaCSP": "Utilitzeu lo només per evitar Els Mitjans Csp",
-  "VOTNewAudioPlayer": "Utilitzeu el nou reproductor d'àudio"
+  "VOTNewAudioPlayer": "Utilitzeu el nou reproductor d'àudio",
+  "VOTUseNewModel": "Utilitzeu una variació experimental De veus De Yandex per a alguns vídeos"
 }

src/localization/locales/cs.json

@@ -203,5 +203,6 @@
   "VOTNeedWebAudioAPI": "Chcete-li to povolit, musíte mít webové Audio API",
   "VOTMediaCSPEnabledOnSite": "Media CSP je povoleno na tomto webu",
   "VOTOnlyBypassMediaCSP": "Použijte jej pouze pro obcházení médií CSP",
-  "VOTNewAudioPlayer": "Použijte nový audio přehrávač"
+  "VOTNewAudioPlayer": "Použijte nový audio přehrávač",
+  "VOTUseNewModel": "U některých videí použijte experimentální variantu hlasů Yandex"
 }

src/localization/locales/cy.json

@@ -203,5 +203,6 @@
   "VOTNeedWebAudioAPI": "I alluogi HYN, rhaid bod GENNYCH API Sain Gwe",
   "VOTMediaCSPEnabledOnSite": "Mae csp cyfryngau wedi'i alluogi ar y wefan hon",
   "VOTOnlyBypassMediaCSP": "Defnyddiwch ef yn unig ar gyfer osgoi Cyfryngau CSP",
-  "VOTNewAudioPlayer": "Defnyddio'r chwaraewr sain newydd"
+  "VOTNewAudioPlayer": "Defnyddio'r chwaraewr sain newydd",
+  "VOTUseNewModel": "Defnyddiwch amrywiad arbrofol o leisiau Yandex ar gyfer rhai fideos"
 }

src/localization/locales/da.json

@@ -203,5 +203,6 @@
   "VOTNeedWebAudioAPI": "For at aktivere dette skal du have en Internet Audio API",
   "VOTMediaCSPEnabledOnSite": "Media CSP er aktiveret på dette site",
   "VOTOnlyBypassMediaCSP": "Brug den kun til at omgå Media CSP",
-  "VOTNewAudioPlayer": "Brug den nye lydafspiller"
+  "VOTNewAudioPlayer": "Brug den nye lydafspiller",
+  "VOTUseNewModel": "Brug en eksperimentel variation af Yandeks stemmer til nogle videoer"
 }

src/localization/locales/de.json

@@ -203,5 +203,6 @@
   "VOTNeedWebAudioAPI": "Um dies zu aktivieren, benötigen Sie eine Web-Audio-API",
   "VOTMediaCSPEnabledOnSite": "Medien-CSP ist auf dieser Site aktiviert",
   "VOTOnlyBypassMediaCSP": "Verwenden Sie es nur zum Umgehen von Medien-CSP",
-  "VOTNewAudioPlayer": "Verwenden Sie den neuen Audioplayer"
+  "VOTNewAudioPlayer": "Verwenden Sie den neuen Audioplayer",
+  "VOTUseNewModel": "Verwenden Sie für einige Videos eine experimentelle Variante von Yandex-Stimmen"
 }

src/localization/locales/el.json

@@ -203,5 +203,6 @@
   "VOTNeedWebAudioAPI": "Για να το ενεργοποιήσετε, πρέπει να έχετε ένα API Web Audio",
   "VOTMediaCSPEnabledOnSite": "Το Media CSP είναι ενεργοποιημένο σε αυτόν τον ιστότοπο",
   "VOTOnlyBypassMediaCSP": "Χρησιμοποιήστε το μόνο για παράκαμψη CSP πολυμέσων",
-  "VOTNewAudioPlayer": "Χρησιμοποιήστε τη νέα συσκευή αναπαραγωγής ήχου"
+  "VOTNewAudioPlayer": "Χρησιμοποιήστε τη νέα συσκευή αναπαραγωγής ήχου",
+  "VOTUseNewModel": "Χρησιμοποιήστε μια πειραματική παραλλαγή των φωνών Yandex για ορισμένα βίντεο"
 }