fix: update speech recognition services

BREAKING CHANGE: the options for speech recognition services have changed, the configuration of certain services may be needed
1 year ago · cd84690f36
parent 428a5ee6d4
commit cd84690f36
10 changed files with 305 additions and 337 deletions
--- a/.babelrc.json
+++ b/.babelrc.json
@ -1,10 +0,0 @@
-{
-  "presets": [
-    ["@babel/env", {"useBuiltIns": "usage", "corejs": {"version": 3}}]
-  ],
-  "env": {
-    "production": {
-      "plugins": ["lodash"]
-    }
-  }
-}
--- a/README.md
+++ b/README.md
@ -25,15 +25,17 @@ please consider contributing with

 ## Description

-> Obviously, this blue part here is the land.
->
-> — <cite>Byron "Buster" Bluth, reading a map</cite>
-
 Buster is a browser extension which helps you to solve difficult captchas
 by completing reCAPTCHA audio challenges using speech recognition.
 Challenges are solved by clicking on the extension button at the bottom
 of the reCAPTCHA widget.

+> Obviously, this blue part here is the land.
+>
+> — <cite>Byron "Buster" Bluth, reading a map</cite>
+
+## Motivation
+
 reCAPTCHA challenges remain a considerable burden on the web,
 delaying and often blocking our access to services and information
 depending on our physical and cognitive abilities, our social
@ -42,8 +44,16 @@ and cultural background, and the devices or networks we connect from.
 The difficulty of captchas can be so out of balance,
 that sometimes they seem friendlier to bots than they are to humans.

-The goal of this project is to improve our experience with captchas,
-by giving us easy access to solutions already utilized by automated systems.
+The goal of this project is to improve our experience on the web,
+by giving us easy access to solutions utilized by automated systems.
+
+## Client App
+
+The client app enables you to simulate user interactions and improves
+the success rate of the extension. Follow the instructions
+from the extension's options to download and install the client app
+on Windows, Linux and macOS, or get the app
+from [this](https://github.com/dessant/buster-client#readme) repository.

 ## Screenshots

--- a/secrets.json.example
+++ b/secrets.json.example
@ -2,7 +2,6 @@
  "witApiKeys": {
    "arabic": "",
    "bengali": "",
-    "catalan": "",
    "chinese": "",
    "dutch": "",
    "english": "",
@ -25,7 +24,6 @@
    "spanish": "",
    "swedish": "",
    "tamil": "",
-    "telugu": "",
    "thai": "",
    "turkish": "",
    "urdu": "",
--- a/src/assets/locales/en/messages.json
+++ b/src/assets/locales/en/messages.json
@ -44,158 +44,148 @@
    "description": "Value of the option."
  },

-  "optionTitle_ibmSpeechApiLoc": {
+  "optionTitle_microsoftSpeechApiLoc": {
    "message": "API location",
    "description": "Title of the option."
  },

-  "optionValue_ibmSpeechApiLoc_seoul": {
-    "message": "Seoul",
+  "optionValue_microsoftSpeechApiLoc_southafricanorth": {
+    "message": "South Africa North",
    "description": "Value of the option."
  },

-  "optionValue_ibmSpeechApiLoc_london": {
-    "message": "London",
+  "optionValue_microsoftSpeechApiLoc_eastasia": {
+    "message": "East Asia",
    "description": "Value of the option."
  },

-  "optionValue_ibmSpeechApiLoc_frankfurt": {
-    "message": "Frankfurt",
+  "optionValue_microsoftSpeechApiLoc_southeastasia": {
+    "message": "Southeast Asia",
    "description": "Value of the option."
  },

-  "optionValue_ibmSpeechApiLoc_dallas": {
-    "message": "Dallas",
+  "optionValue_microsoftSpeechApiLoc_australiaeast": {
+    "message": "Australia East",
    "description": "Value of the option."
  },

-  "optionValue_ibmSpeechApiLoc_washington": {
-    "message": "Washington DC",
+  "optionValue_microsoftSpeechApiLoc_centralindia": {
+    "message": "Central India",
    "description": "Value of the option."
  },

-  "optionValue_ibmSpeechApiLoc_sydney": {
-    "message": "Sydney",
+  "optionValue_microsoftSpeechApiLoc_japaneast": {
+    "message": "Japan East",
    "description": "Value of the option."
  },

-  "optionValue_ibmSpeechApiLoc_tokyo": {
-    "message": "Tokyo",
+  "optionValue_microsoftSpeechApiLoc_japanwest": {
+    "message": "Japan West",
    "description": "Value of the option."
  },

-  "optionTitle_microsoftSpeechApiLoc": {
-    "message": "API location",
-    "description": "Title of the option."
-  },
-
-  "optionValue_microsoftSpeechApiLoc_eastAu": {
-    "message": "Australia East",
+  "optionValue_microsoftSpeechApiLoc_koreacentral": {
+    "message": "Korea Central",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_centralCa": {
+  "optionValue_microsoftSpeechApiLoc_canadacentral": {
    "message": "Canada Central",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_centralUs": {
-    "message": "Central US",
-    "description": "Value of the option."
-  },
-
-  "optionValue_microsoftSpeechApiLoc_centralFr": {
-    "message": "France Central",
+  "optionValue_microsoftSpeechApiLoc_northeurope": {
+    "message": "North Europe",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_centralIn": {
-    "message": "Central India",
+  "optionValue_microsoftSpeechApiLoc_westeurope": {
+    "message": "West Europe",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_eastJp": {
-    "message": "Japan East",
+  "optionValue_microsoftSpeechApiLoc_francecentral": {
+    "message": "France Central",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_westJp": {
-    "message": "Japan West",
+  "optionValue_microsoftSpeechApiLoc_germanywestcentral": {
+    "message": "Germany West Central",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_southBr": {
-    "message": "Brazil South",
+  "optionValue_microsoftSpeechApiLoc_norwayeast": {
+    "message": "Norway East",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_centralKr": {
-    "message": "Korea Central",
+  "optionValue_microsoftSpeechApiLoc_switzerlandnorth": {
+    "message": "Switzerland North",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_northCh": {
-    "message": "Switzerland North",
+  "optionValue_microsoftSpeechApiLoc_switzerlandwest": {
+    "message": "Switzerland West",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_northCentralUs": {
-    "message": "North Central US",
+  "optionValue_microsoftSpeechApiLoc_uksouth": {
+    "message": "UK South",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_southCentralUs": {
-    "message": "South Central US",
+  "optionValue_microsoftSpeechApiLoc_uaenorth": {
+    "message": "UAE North",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_westCentralUs": {
-    "message": "West Central US",
+  "optionValue_microsoftSpeechApiLoc_brazilsouth": {
+    "message": "Brazil South",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_southUk": {
-    "message": "UK South",
+  "optionValue_microsoftSpeechApiLoc_centralus": {
+    "message": "Central US",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_eastUs": {
+  "optionValue_microsoftSpeechApiLoc_eastus": {
    "message": "East US",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_eastUs2": {
+  "optionValue_microsoftSpeechApiLoc_eastus2": {
    "message": "East US 2",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_westUs": {
-    "message": "West US",
+  "optionValue_microsoftSpeechApiLoc_northcentralus": {
+    "message": "North Central US",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_westUs2": {
-    "message": "West US 2",
+  "optionValue_microsoftSpeechApiLoc_southcentralus": {
+    "message": "South Central US",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_eastAsia": {
-    "message": "East Asia",
+  "optionValue_microsoftSpeechApiLoc_westcentralus": {
+    "message": "West Central US",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_southeastAsia": {
-    "message": "Southeast Asia",
+  "optionValue_microsoftSpeechApiLoc_westus": {
+    "message": "West US",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_westEu": {
-    "message": "West Europe",
+  "optionValue_microsoftSpeechApiLoc_westus2": {
+    "message": "West US 2",
    "description": "Value of the option."
  },

-  "optionValue_microsoftSpeechApiLoc_northEu": {
-    "message": "North Europe",
+  "optionValue_microsoftSpeechApiLoc_westus3": {
+    "message": "West US 3",
    "description": "Value of the option."
  },

@ -279,11 +269,6 @@
    "description": "Value of the option."
  },

-  "optionValue_witSpeechApiLang_catalan": {
-    "message": "Catalan",
-    "description": "Value of the option."
-  },
-
  "optionValue_witSpeechApiLang_chinese": {
    "message": "Chinese",
    "description": "Value of the option."
@ -394,11 +379,6 @@
    "description": "Value of the option."
  },

-  "optionValue_witSpeechApiLang_telugu": {
-    "message": "Telugu",
-    "description": "Value of the option."
-  },
-
  "optionValue_witSpeechApiLang_thai": {
    "message": "Thai",
    "description": "Value of the option."
@ -419,6 +399,11 @@
    "description": "Value of the option."
  },

+  "inputLabel_apiUrl": {
+    "message": "API endpoint",
+    "description": "Label of the input."
+  },
+
  "inputLabel_apiKey": {
    "message": "API key",
    "description": "Label of the input."
@ -576,6 +561,16 @@
    "description": "Error message."
  },

+  "error_captchaNotSolvedWitai": {
+    "message": "Wit.ai could not detect any speech. Try a new challenge, or switch to a more reliable service from the extension's options, such as IBM Watson.",
+    "description": "Error message."
+  },
+
+  "error_missingApiUrl": {
+    "message": "API endpoint missing. Visit the extension's options to configure the service.",
+    "description": "Error message."
+  },
+
  "error_missingApiKey": {
    "message": "API key missing. Visit the extension's options to configure the service.",
    "description": "Error message."
--- a/src/background/main.js
+++ b/src/background/main.js
@ -27,9 +27,7 @@ import {
  captchaGoogleSpeechApiLangCodes,
  captchaIbmSpeechApiLangCodes,
  captchaMicrosoftSpeechApiLangCodes,
-  captchaWitSpeechApiLangCodes,
-  ibmSpeechApiUrls,
-  microsoftSpeechApiUrls
+  captchaWitSpeechApiLangCodes
 } from 'utils/data';
 import {targetEnv, clientAppVersion} from 'utils/config';

@ -298,8 +296,7 @@ async function getWitSpeechApiKey(speechService, language) {
 async function getWitSpeechApiResult(apiKey, audioContent) {
  const result = {};

-  const rsp = await fetch('https://api.wit.ai/speech?v=20200513', {
-    referrer: '',
+  const rsp = await fetch('https://api.wit.ai/speech?v=20221114', {
    mode: 'cors',
    method: 'POST',
    headers: {
@ -316,7 +313,7 @@ async function getWitSpeechApiResult(apiKey, audioContent) {
      throw new Error(`API response: ${rsp.status}, ${await rsp.text()}`);
    }
  } else {
-    const data = (await rsp.json()).text;
+    const data = JSON.parse((await rsp.text()).split('\r\n').at(-1)).text;
    if (data) {
      result.text = data.trim();
    }
@ -325,15 +322,56 @@ async function getWitSpeechApiResult(apiKey, audioContent) {
  return result;
 }

-async function getIbmSpeechApiResult(apiUrl, apiKey, audioContent, language) {
+async function getGoogleSpeechApiResult(
+  apiKey,
+  audioContent,
+  language,
+  detectAltLanguages
+) {
+  const data = {
+    audio: {
+      content: arrayBufferToBase64(audioContent)
+    },
+    config: {
+      encoding: 'LINEAR16',
+      languageCode: language,
+      model: 'video',
+      sampleRateHertz: 16000
+    }
+  };
+
+  if (!['en-US', 'en-GB'].includes(language) && detectAltLanguages) {
+    data.config.model = 'default';
+    data.config.alternativeLanguageCodes = ['en-US'];
+  }
+
+  const rsp = await fetch(
+    `https://speech.googleapis.com/v1p1beta1/speech:recognize?key=${apiKey}`,
+    {
+      mode: 'cors',
+      method: 'POST',
+      body: JSON.stringify(data)
+    }
+  );
+
+  if (rsp.status !== 200) {
+    throw new Error(`API response: ${rsp.status}, ${await rsp.text()}`);
+  }
+
+  const results = (await rsp.json()).results;
+  if (results) {
+    return results[0].alternatives[0].transcript.trim();
+  }
+}
+
+async function getIbmSpeechApiResult(apiUrl, apiKey, audioContent, model) {
  const rsp = await fetch(
-    `${apiUrl}?model=${language}&profanity_filter=false`,
+    `${apiUrl}/v1/recognize?model=${model}&profanity_filter=false`,
    {
-      referrer: '',
      mode: 'cors',
      method: 'POST',
      headers: {
-        Authorization: 'Basic ' + window.btoa('apiKey:' + apiKey),
+        Authorization: 'Basic ' + window.btoa('apikey:' + apiKey),
        'X-Watson-Learning-Opt-Out': 'true'
      },
      body: new Blob([audioContent], {type: 'audio/wav'})
@ -351,15 +389,14 @@ async function getIbmSpeechApiResult(apiUrl, apiKey, audioContent, language) {
 }

 async function getMicrosoftSpeechApiResult(
-  apiUrl,
+  apiLocation,
  apiKey,
  audioContent,
  language
 ) {
  const rsp = await fetch(
-    `${apiUrl}?language=${language}&format=detailed&profanity=raw`,
+    `https://${apiLocation}.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1?language=${language}&format=detailed&profanity=raw`,
    {
-      referrer: '',
      mode: 'cors',
      method: 'POST',
      headers: {
@ -383,7 +420,7 @@ async function getMicrosoftSpeechApiResult(
 async function transcribeAudio(audioUrl, lang) {
  let solution;

-  const audioRsp = await fetch(audioUrl, {referrer: ''});
+  const audioRsp = await fetch(audioUrl);
  const audioContent = await prepareAudio(await audioRsp.arrayBuffer());

  const {speechService, tryEnglishSpeechModel} = await storage.get([
@ -395,6 +432,7 @@ async function transcribeAudio(audioUrl, lang) {
    const language = captchaWitSpeechApiLangCodes[lang] || 'english';

    const apiKey = await getWitSpeechApiKey(speechService, language);
+
    if (!apiKey) {
      showNotification({messageId: 'error_missingApiKey'});
      return;
@ -412,10 +450,12 @@ async function transcribeAudio(audioUrl, lang) {

    if (!solution && language !== 'english' && tryEnglishSpeechModel) {
      const apiKey = await getWitSpeechApiKey(speechService, 'english');
+
      if (!apiKey) {
        showNotification({messageId: 'error_missingApiKey'});
        return;
      }
+
      const result = await getWitSpeechApiResult(apiKey, audioContent);
      if (result.errorId) {
        showNotification({
@ -430,86 +470,62 @@ async function transcribeAudio(audioUrl, lang) {
    const {googleSpeechApiKey: apiKey} = await storage.get(
      'googleSpeechApiKey'
    );
+
    if (!apiKey) {
      showNotification({messageId: 'error_missingApiKey'});
      return;
    }
-    const apiUrl = `https://speech.googleapis.com/v1p1beta1/speech:recognize?key=${apiKey}`;

    const language = captchaGoogleSpeechApiLangCodes[lang] || 'en-US';

-    const data = {
-      audio: {
-        content: arrayBufferToBase64(audioContent)
-      },
-      config: {
-        encoding: 'LINEAR16',
-        languageCode: language,
-        model: 'video',
-        sampleRateHertz: 16000
-      }
-    };
-    if (!['en-US', 'en-GB'].includes(language) && tryEnglishSpeechModel) {
-      data.config.model = 'default';
-      data.config.alternativeLanguageCodes = ['en-US'];
-    }
-
-    const rsp = await fetch(apiUrl, {
-      referrer: '',
-      mode: 'cors',
-      method: 'POST',
-      body: JSON.stringify(data)
-    });
-
-    if (rsp.status !== 200) {
-      throw new Error(`API response: ${rsp.status}, ${await rsp.text()}`);
-    }
+    solution = await getGoogleSpeechApiResult(
+      apiKey,
+      audioContent,
+      language,
+      tryEnglishSpeechModel
+    );
+  } else if (speechService === 'ibmSpeechApi') {
+    const {ibmSpeechApiUrl: apiUrl, ibmSpeechApiKey: apiKey} =
+      await storage.get(['ibmSpeechApiUrl', 'ibmSpeechApiKey']);

-    const results = (await rsp.json()).results;
-    if (results) {
-      solution = results[0].alternatives[0].transcript.trim();
+    if (!apiUrl) {
+      showNotification({messageId: 'error_missingApiUrl'});
+      return;
    }
-  } else if (speechService === 'ibmSpeechApi') {
-    const {ibmSpeechApiLoc: apiLoc, ibmSpeechApiKey: apiKey} =
-      await storage.get(['ibmSpeechApiLoc', 'ibmSpeechApiKey']);
    if (!apiKey) {
      showNotification({messageId: 'error_missingApiKey'});
      return;
    }
-    const apiUrl = ibmSpeechApiUrls[apiLoc];
-    const language =
-      captchaIbmSpeechApiLangCodes[lang] || 'en-US_BroadbandModel';

-    solution = await getIbmSpeechApiResult(
-      apiUrl,
-      apiKey,
-      audioContent,
-      language
-    );
+    const model = captchaIbmSpeechApiLangCodes[lang] || 'en-US_Multimedia';
+
+    solution = await getIbmSpeechApiResult(apiUrl, apiKey, audioContent, model);
+
    if (
      !solution &&
-      !['en-US_BroadbandModel', 'en-GB_BroadbandModel'].includes(language) &&
+      !['en-US_Multimedia', 'en-GB_Multimedia'].includes(model) &&
      tryEnglishSpeechModel
    ) {
      solution = await getIbmSpeechApiResult(
        apiUrl,
        apiKey,
        audioContent,
-        'en-US_BroadbandModel'
+        'en-US_Multimedia'
      );
    }
  } else if (speechService === 'microsoftSpeechApi') {
-    const {microsoftSpeechApiLoc: apiLoc, microsoftSpeechApiKey: apiKey} =
+    const {microsoftSpeechApiLoc: apiLocaction, microsoftSpeechApiKey: apiKey} =
      await storage.get(['microsoftSpeechApiLoc', 'microsoftSpeechApiKey']);
+
    if (!apiKey) {
      showNotification({messageId: 'error_missingApiKey'});
      return;
    }
-    const apiUrl = microsoftSpeechApiUrls[apiLoc];
+
    const language = captchaMicrosoftSpeechApiLangCodes[lang] || 'en-US';

    solution = await getMicrosoftSpeechApiResult(
-      apiUrl,
+      apiLocaction,
      apiKey,
      audioContent,
      language
@ -520,7 +536,7 @@ async function transcribeAudio(audioUrl, lang) {
      tryEnglishSpeechModel
    ) {
      solution = await getMicrosoftSpeechApiResult(
-        apiUrl,
+        apiLocaction,
        apiKey,
        audioContent,
        'en-US'
@ -529,7 +545,14 @@ async function transcribeAudio(audioUrl, lang) {
  }

  if (!solution) {
-    showNotification({messageId: 'error_captchaNotSolved', timeout: 6000});
+    if (['witSpeechApiDemo', 'witSpeechApi'].includes(speechService)) {
+      showNotification({
+        messageId: 'error_captchaNotSolvedWitai',
+        timeout: 60000
+      });
+    } else {
+      showNotification({messageId: 'error_captchaNotSolved', timeout: 6000});
+    }
  } else {
    return solution;
  }
--- a/src/options/App.vue
+++ b/src/options/App.vue
@ -36,15 +36,14 @@
        </a>

        <div
-          class="option select"
+          class="option text-field"
          v-if="options.speechService === 'ibmSpeechApi'"
        >
-          <vn-select
-            :label="getText('optionTitle_ibmSpeechApiLoc')"
-            :items="listItems.ibmSpeechApiLoc"
-            v-model="options.ibmSpeechApiLoc"
+          <vn-text-field
+            v-model.trim="options.ibmSpeechApiUrl"
+            :label="getText('inputLabel_apiUrl')"
          >
-          </vn-select>
+          </vn-text-field>
        </div>
        <div
          class="option text-field"
@ -271,7 +270,8 @@ import {enableContributions, clientAppVersion} from 'utils/config';
 import {
  optionKeys,
  clientAppPlatforms,
-  captchaWitSpeechApiLangCodes
+  captchaWitSpeechApiLangCodes,
+  microsoftSpeechApiRegions
 } from 'utils/data';

 export default {
@ -301,46 +301,7 @@ export default {
          {scope: 'optionValue_speechService'}
        ),
        ...getListItems(
-          {
-            ibmSpeechApiLoc: [
-              'seoul',
-              'london',
-              'frankfurt',
-              'dallas',
-              'washington',
-              'sydney',
-              'tokyo'
-            ]
-          },
-          {scope: 'optionValue_ibmSpeechApiLoc'}
-        ),
-        ...getListItems(
-          {
-            microsoftSpeechApiLoc: [
-              'eastAu',
-              'centralCa',
-              'centralUs',
-              'centralFr',
-              'centralIn',
-              'eastJp',
-              'westJp',
-              'southBr',
-              'centralKr',
-              'northCh',
-              'northCentralUs',
-              'southCentralUs',
-              'westCentralUs',
-              'southUk',
-              'eastUs',
-              'eastUs2',
-              'westUs',
-              'westUs2',
-              'eastAsia',
-              'southeastAsia',
-              'westEu',
-              'northEu'
-            ]
-          },
+          {microsoftSpeechApiLoc: microsoftSpeechApiRegions},
          {scope: 'optionValue_microsoftSpeechApiLoc'}
        ),
        ...getListItems(
@ -372,7 +333,7 @@ export default {
      options: {
        speechService: '',
        googleSpeechApiKey: '',
-        ibmSpeechApiLoc: '',
+        ibmSpeechApiUrl: '',
        ibmSpeechApiKey: '',
        microsoftSpeechApiLoc: '',
        microsoftSpeechApiKey: '',
--- a/src/setup/App.vue
+++ b/src/setup/App.vue
@ -135,7 +135,6 @@ export default {
        data.append('session', this.session);

        await fetch(`${this.apiUrl}/setup/close`, {
-          referrer: '',
          mode: 'cors',
          method: 'POST',
          body: data
@ -150,7 +149,6 @@ export default {
      data.append('targetEnv', this.$env.targetEnv);

      const rsp = await fetch(`${this.apiUrl}/setup/location`, {
-        referrer: '',
        mode: 'cors',
        method: 'POST',
        body: data
@ -176,7 +174,6 @@ export default {
      data.append('extension', this.getExtensionId());

      const rsp = await fetch(`${this.apiUrl}/setup/install`, {
-        referrer: '',
        mode: 'cors',
        method: 'POST',
        body: data
--- a/src/storage/config.json
+++ b/src/storage/config.json
@ -10,7 +10,8 @@
      "X3djS8vZC",
      "DlgF14Chrh",
      "Lj3MYlSr4L",
-      "20221211221603_add_theme_support"
+      "20221211221603_add_theme_support",
+      "20221214080901_update_services"
    ],
    "sync": []
  }
--- a/src/storage/revisions/local/20221214080901_update_services.js
+++ b/src/storage/revisions/local/20221214080901_update_services.js
@ -0,0 +1,24 @@
+const message = 'Update services';
+
+const revision = '20221214080901_update_services';
+
+async function upgrade() {
+  const changes = {};
+
+  const {witSpeechApiKeys} = await browser.storage.local.get(
+    'witSpeechApiKeys'
+  );
+  delete witSpeechApiKeys['catalan'];
+  delete witSpeechApiKeys['telugu'];
+  changes.witSpeechApiKeys = witSpeechApiKeys;
+
+  await browser.storage.local.remove('ibmSpeechApiLoc');
+  changes.ibmSpeechApiUrl = '';
+
+  changes.microsoftSpeechApiLoc = 'eastus';
+
+  changes.storageVersion = revision;
+  return browser.storage.local.set(changes);
+}
+
+export {message, revision, upgrade};
--- a/src/utils/data.js
+++ b/src/utils/data.js
@ -1,7 +1,7 @@
 const optionKeys = [
  'speechService',
  'googleSpeechApiKey',
-  'ibmSpeechApiLoc',
+  'ibmSpeechApiUrl',
  'ibmSpeechApiKey',
  'microsoftSpeechApiLoc',
  'microsoftSpeechApiKey',
@ -26,7 +26,7 @@ const recaptchaChallengeUrlRx =
  /^https:\/\/(?:www\.)?(?:google\.com|recaptcha\.net)\/recaptcha\/(?:api2|enterprise)\/bframe.*/;

 // https://developers.google.com/recaptcha/docs/language
-// https://cloud.google.com/speech-to-text/docs/languages
+// https://cloud.google.com/speech-to-text/docs/speech-to-text-supported-languages
 const captchaGoogleSpeechApiLangCodes = {
  ar: 'ar-SA', // Arabic
  af: 'af-ZA', // Afrikaans
@ -46,7 +46,7 @@ const captchaGoogleSpeechApiLangCodes = {
  nl: 'nl-NL', // Dutch
  'en-GB': 'en-GB', // English (UK)
  en: 'en-US', // English (US)
-  et: '', // Estonian
+  et: 'et-EE', // Estonian
  fil: 'fil-PH', // Filipino
  fi: 'fi-FI', // Finnish
  fr: 'fr-FR', // French
@ -73,7 +73,7 @@ const captchaGoogleSpeechApiLangCodes = {
  ms: 'ms-MY', // Malay
  ml: 'ml-IN', // Malayalam
  mr: 'mr-IN', // Marathi
-  mn: '', // Mongolian
+  mn: 'mn-MN', // Mongolian
  no: 'nb-NO', // Norwegian
  fa: 'fa-IR', // Persian
  pl: 'pl-PL', // Polish
@ -100,9 +100,9 @@ const captchaGoogleSpeechApiLangCodes = {
  zu: 'zu-ZA' // Zulu
 };

-// https://cloud.ibm.com/docs/services/speech-to-text?topic=speech-to-text-models#models
+// https://cloud.ibm.com/docs/speech-to-text?topic=speech-to-text-models-ng#models-ng-supported
 const captchaIbmSpeechApiLangCodes = {
-  ar: 'ar-AR_BroadbandModel', // Arabic
+  ar: 'ar-MS_Telephony', // Arabic
  af: '', // Afrikaans
  am: '', // Amharic
  hy: '', // Armenian
@ -112,35 +112,35 @@ const captchaIbmSpeechApiLangCodes = {
  bg: '', // Bulgarian
  ca: '', // Catalan
  'zh-HK': '', // Chinese (Hong Kong)
-  'zh-CN': 'zh-CN_BroadbandModel', // Chinese (Simplified)
-  'zh-TW': 'zh-CN_BroadbandModel', // Chinese (Traditional)
+  'zh-CN': 'zh-CN_Telephony', // Chinese (Simplified)
+  'zh-TW': 'zh-CN_Telephony', // Chinese (Traditional)
  hr: '', // Croatian
-  cs: '', // Czech
+  cs: 'cs-CZ_Telephony', // Czech
  da: '', // Danish
-  nl: 'nl-NL_BroadbandModel', // Dutch
-  'en-GB': 'en-GB_BroadbandModel', // English (UK)
-  en: 'en-US_BroadbandModel', // English (US)
+  nl: 'nl-NL_Multimedia', // Dutch
+  'en-GB': 'en-GB_Multimedia', // English (UK)
+  en: 'en-US_Multimedia', // English (US)
  et: '', // Estonian
  fil: '', // Filipino
  fi: '', // Finnish
-  fr: 'fr-FR_BroadbandModel', // French
-  'fr-CA': 'fr-FR_BroadbandModel', // French (Canadian)
+  fr: 'fr-FR_Multimedia', // French
+  'fr-CA': 'fr-CA_Multimedia', // French (Canadian)
  gl: '', // Galician
  ka: '', // Georgian
-  de: 'de-DE_BroadbandModel', // German
-  'de-AT': 'de-DE_BroadbandModel', // German (Austria)
-  'de-CH': 'de-DE_BroadbandModel', // German (Switzerland)
+  de: 'de-DE_Multimedia', // German
+  'de-AT': 'de-DE_Multimedia', // German (Austria)
+  'de-CH': 'de-DE_Multimedia', // German (Switzerland)
  el: '', // Greek
  gu: '', // Gujarati
  iw: '', // Hebrew
-  hi: '', // Hindi
+  hi: 'hi-IN_Telephony', // Hindi
  hu: '', // Hungarian
  is: '', // Icelandic
  id: '', // Indonesian
-  it: 'it-IT_BroadbandModel', // Italian
-  ja: 'ja-JP_BroadbandModel', // Japanese
+  it: 'it-IT_Multimedia', // Italian
+  ja: 'ja-JP_Multimedia', // Japanese
  kn: '', // Kannada
-  ko: 'ko-KR_BroadbandModel', // Korean
+  ko: 'ko-KR_Multimedia', // Korean
  lo: '', // Laothian
  lv: '', // Latvian
  lt: '', // Lithuanian
@ -151,19 +151,19 @@ const captchaIbmSpeechApiLangCodes = {
  no: '', // Norwegian
  fa: '', // Persian
  pl: '', // Polish
-  pt: 'pt-BR_BroadbandModel', // Portuguese
-  'pt-BR': 'pt-BR_BroadbandModel', // Portuguese (Brazil)
-  'pt-PT': 'pt-BR_BroadbandModel', // Portuguese (Portugal)
+  pt: 'pt-BR_Multimedia', // Portuguese
+  'pt-BR': 'pt-BR_Multimedia', // Portuguese (Brazil)
+  'pt-PT': 'pt-BR_Multimedia', // Portuguese (Portugal)
  ro: '', // Romanian
  ru: '', // Russian
  sr: '', // Serbian
  si: '', // Sinhalese
  sk: '', // Slovak
  sl: '', // Slovenian
-  es: 'es-ES_BroadbandModel', // Spanish
-  'es-419': 'es-ES_BroadbandModel', // Spanish (Latin America)
+  es: 'es-ES_Multimedia', // Spanish
+  'es-419': 'es-LA_Telephony', // Spanish (Latin America)
  sw: '', // Swahili
-  sv: '', // Swedish
+  sv: 'sv-SE_Telephony', // Swedish
  ta: '', // Tamil
  te: '', // Telugu
  th: '', // Thai
@ -174,78 +174,78 @@ const captchaIbmSpeechApiLangCodes = {
  zu: '' // Zulu
 };

-// https://docs.microsoft.com/en-us/azure/cognitive-services/speech-service/language-support#speech-to-text
+// https://learn.microsoft.com/en-us/azure/cognitive-services/speech-service/language-support?tabs=stt-tts
 const captchaMicrosoftSpeechApiLangCodes = {
  ar: 'ar-EG', // Arabic
-  af: '', // Afrikaans
-  am: '', // Amharic
-  hy: '', // Armenian
-  az: '', // Azerbaijani
-  eu: '', // Basque
-  bn: '', // Bengali
-  bg: '', // Bulgarian
+  af: 'af-ZA', // Afrikaans
+  am: 'am-ET', // Amharic
+  hy: 'hy-AM', // Armenian
+  az: 'az-AZ', // Azerbaijani
+  eu: 'eu-ES', // Basque
+  bn: 'bn-IN', // Bengali
+  bg: 'bg-BG', // Bulgarian
  ca: 'ca-ES', // Catalan
  'zh-HK': 'zh-HK', // Chinese (Hong Kong)
  'zh-CN': 'zh-CN', // Chinese (Simplified)
  'zh-TW': 'zh-TW', // Chinese (Traditional)
-  hr: '', // Croatian
-  cs: '', // Czech
+  hr: 'hr-HR', // Croatian
+  cs: 'cs-CZ', // Czech
  da: 'da-DK', // Danish
  nl: 'nl-NL', // Dutch
  'en-GB': 'en-GB', // English (UK)
  en: 'en-US', // English (US)
-  et: '', // Estonian
-  fil: '', // Filipino
+  et: 'et-EE', // Estonian
+  fil: 'fil-PH', // Filipino
  fi: 'fi-FI', // Finnish
  fr: 'fr-FR', // French
  'fr-CA': 'fr-CA', // French (Canadian)
-  gl: '', // Galician
-  ka: '', // Georgian
+  gl: 'gl-ES', // Galician
+  ka: 'ka-GE', // Georgian
  de: 'de-DE', // German
-  'de-AT': 'de-DE', // German (Austria)
-  'de-CH': 'de-DE', // German (Switzerland)
-  el: '', // Greek
+  'de-AT': 'de-AT', // German (Austria)
+  'de-CH': 'de-CH', // German (Switzerland)
+  el: 'el-GR', // Greek
  gu: 'gu-IN', // Gujarati
-  iw: '', // Hebrew
+  iw: 'he-IL', // Hebrew
  hi: 'hi-IN', // Hindi
-  hu: '', // Hungarian
-  is: '', // Icelandic
-  id: '', // Indonesian
+  hu: 'hu-HU', // Hungarian
+  is: 'is-IS', // Icelandic
+  id: 'id-ID', // Indonesian
  it: 'it-IT', // Italian
  ja: 'ja-JP', // Japanese
-  kn: '', // Kannada
+  kn: 'kn-IN', // Kannada
  ko: 'ko-KR', // Korean
-  lo: '', // Laothian
-  lv: '', // Latvian
-  lt: '', // Lithuanian
-  ms: '', // Malay
-  ml: '', // Malayalam
+  lo: 'lo-LA', // Laothian
+  lv: 'lv-LV', // Latvian
+  lt: 'lt-LT', // Lithuanian
+  ms: 'ms-MY', // Malay
+  ml: 'ml-IN', // Malayalam
  mr: 'mr-IN', // Marathi
-  mn: '', // Mongolian
+  mn: 'mn-MN', // Mongolian
  no: 'nb-NO', // Norwegian
-  fa: '', // Persian
+  fa: 'fa-IR', // Persian
  pl: 'pl-PL', // Polish
  pt: 'pt-PT', // Portuguese
  'pt-BR': 'pt-BR', // Portuguese (Brazil)
  'pt-PT': 'pt-PT', // Portuguese (Portugal)
-  ro: '', // Romanian
+  ro: 'ro-RO', // Romanian
  ru: 'ru-RU', // Russian
-  sr: '', // Serbian
-  si: '', // Sinhalese
-  sk: '', // Slovak
-  sl: '', // Slovenian
+  sr: 'sr-RS', // Serbian
+  si: 'si-LK', // Sinhalese
+  sk: 'sk-SK', // Slovak
+  sl: 'sl-SI', // Slovenian
  es: 'es-ES', // Spanish
  'es-419': 'es-MX', // Spanish (Latin America)
-  sw: '', // Swahili
+  sw: 'sw-TZ', // Swahili
  sv: 'sv-SE', // Swedish
  ta: 'ta-IN', // Tamil
  te: 'te-IN', // Telugu
  th: 'th-TH', // Thai
  tr: 'tr-TR', // Turkish
-  uk: '', // Ukrainian
+  uk: 'uk-UA', // Ukrainian
  ur: '', // Urdu
-  vi: '', // Vietnamese
-  zu: '' // Zulu
+  vi: 'vi-VN', // Vietnamese
+  zu: 'zu-ZA' // Zulu
 };

 // https://wit.ai/faq
@ -258,7 +258,7 @@ const captchaWitSpeechApiLangCodes = {
  eu: '', // Basque
  bn: 'bengali', // Bengali
  bg: '', // Bulgarian
-  ca: 'catalan', // Catalan
+  ca: '', // Catalan
  'zh-HK': '', // Chinese (Hong Kong)
  'zh-CN': 'chinese', // Chinese (Simplified)
  'zh-TW': 'chinese', // Chinese (Traditional)
@ -313,7 +313,7 @@ const captchaWitSpeechApiLangCodes = {
  sw: '', // Swahili
  sv: 'swedish', // Swedish
  ta: 'tamil', // Tamil
-  te: 'telugu', // Telugu
+  te: '', // Telugu
  th: 'thai', // Thai
  tr: 'turkish', // Turkish
  uk: '', // Ukrainian
@ -322,67 +322,37 @@ const captchaWitSpeechApiLangCodes = {
  zu: '' // Zulu
 };

-// https://cloud.ibm.com/apidocs/speech-to-text#service-endpoint
-const ibmSpeechApiUrls = {
-  seoul: 'https://api.kr-seo.speech-to-text.watson.cloud.ibm.com/v1/recognize',
-  london: 'https://api.eu-gb.speech-to-text.watson.cloud.ibm.com/v1/recognize',
-  frankfurt:
-    'https://api.eu-de.speech-to-text.watson.cloud.ibm.com/v1/recognize',
-  dallas:
-    'https://api.us-south.speech-to-text.watson.cloud.ibm.com/v1/recognize',
-  washington:
-    'https://api.us-east.speech-to-text.watson.cloud.ibm.com/v1/recognize',
-  sydney: 'https://api.au-syd.speech-to-text.watson.cloud.ibm.com/v1/recognize',
-  tokyo: 'https://api.jp-tok.speech-to-text.watson.cloud.ibm.com/v1/recognize'
-};
-
-// https://docs.microsoft.com/en-us/azure/cognitive-services/speech-service/rest-speech-to-text#regions-and-endpoints
-const microsoftSpeechApiUrls = {
-  eastAu:
-    'https://australiaeast.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  centralCa:
-    'https://canadacentral.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  centralUs:
-    'https://centralus.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  centralFr:
-    'https://francecentral.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  centralIn:
-    'https://centralindia.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  eastJp:
-    'https://japaneast.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  westJp:
-    'https://japanwest.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  southBr:
-    'https://brazilsouth.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  centralKr:
-    'https://koreacentral.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  northCh:
-    'https://switzerlandnorth.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  northCentralUs:
-    'https://northcentralus.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  southCentralUs:
-    'https://southcentralus.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  westCentralUs:
-    'https://westcentralus.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  southUk:
-    'https://uksouth.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  eastUs:
-    'https://eastus.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  eastUs2:
-    'https://eastus.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  westUs:
-    'https://westus.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  westUs2:
-    'https://westus2.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  eastAsia:
-    'https://eastasia.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  southeastAsia:
-    'https://southeastasia.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  westEu:
-    'https://westeurope.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1',
-  northEu:
-    'https://northeurope.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1'
-};
+// https://learn.microsoft.com/en-us/azure/cognitive-services/speech-service/regions#speech-service
+const microsoftSpeechApiRegions = [
+  'southafricanorth',
+  'eastasia',
+  'southeastasia',
+  'australiaeast',
+  'centralindia',
+  'japaneast',
+  'japanwest',
+  'koreacentral',
+  'canadacentral',
+  'northeurope',
+  'westeurope',
+  'francecentral',
+  'germanywestcentral',
+  'norwayeast',
+  'switzerlandnorth',
+  'switzerlandwest',
+  'uksouth',
+  'uaenorth',
+  'brazilsouth',
+  'centralus',
+  'eastus',
+  'eastus2',
+  'northcentralus',
+  'southcentralus',
+  'westcentralus',
+  'westus',
+  'westus2',
+  'westus3'
+];

 export {
  optionKeys,
@ -392,6 +362,5 @@ export {
  captchaIbmSpeechApiLangCodes,
  captchaMicrosoftSpeechApiLangCodes,
  captchaWitSpeechApiLangCodes,
-  ibmSpeechApiUrls,
-  microsoftSpeechApiUrls
+  microsoftSpeechApiRegions
 };