From f7b9554a5af720eeb2eaf6c9f91420faee91bebb Mon Sep 17 00:00:00 2001 From: dessant Date: Sun, 7 Apr 2019 11:17:55 +0300 Subject: [PATCH] fix: remove demo speech service The service is unreliable. --- .github/ISSUE_TEMPLATE/feature_request.md | 6 ++--- src/_locales/en/messages.json | 5 ---- src/options/App.vue | 1 - src/solve/main.js | 33 +++++++++-------------- src/storage/versions/local/DlgF14Chrh.js | 28 +++++++++++++++++++ src/storage/versions/local/versions.json | 3 ++- src/storage/versions/sync/DlgF14Chrh.js | 28 +++++++++++++++++++ src/storage/versions/sync/versions.json | 3 ++- 8 files changed, 76 insertions(+), 31 deletions(-) create mode 100644 src/storage/versions/local/DlgF14Chrh.js create mode 100644 src/storage/versions/sync/DlgF14Chrh.js diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 5cdb50f..b6bda75 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -5,11 +5,11 @@ about: Suggest an idea for this project --- **Is your feature request related to a problem? Please describe.** diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index b2a3081..1d0c76c 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -19,11 +19,6 @@ "description": "Title of the option." }, - "optionValue_speechService_googleSpeechApiDemo": { - "message": "Google Cloud Speech API (demo)", - "description": "Value of the option." - }, - "optionValue_speechService_googleSpeechApi": { "message": "Google Cloud Speech API", "description": "Value of the option." diff --git a/src/options/App.vue b/src/options/App.vue index 9bab6b0..df69fc2 100644 --- a/src/options/App.vue +++ b/src/options/App.vue @@ -162,7 +162,6 @@ export default { selectOptions: getOptionLabels({ speechService: [ - 'googleSpeechApiDemo', 'witSpeechApiDemo', 'googleSpeechApi', 'witSpeechApi', diff --git a/src/solve/main.js b/src/solve/main.js index 2204946..8d3f7cf 100644 --- a/src/solve/main.js +++ b/src/solve/main.js @@ -465,27 +465,20 @@ async function solve(simulateUserInput, clickEvent) { } solution = await getWitSpeechApiResult(apiKey, audioContent); } - } else if ( - ['googleSpeechApiDemo', 'googleSpeechApi'].includes(speechService) - ) { - let apiUrl; - if (speechService === 'googleSpeechApiDemo') { - apiUrl = - 'https://cxl-services.appspot.com/proxy?url=https://speech.googleapis.com/v1p1beta1/speech:recognize'; - } else { - const {googleSpeechApiKey: apiKey} = await storage.get( - 'googleSpeechApiKey', - 'sync' - ); - if (!apiKey) { - browser.runtime.sendMessage({ - id: 'notification', - messageId: 'error_missingApiKey' - }); - return; - } - apiUrl = `https://speech.googleapis.com/v1p1beta1/speech:recognize?key=${apiKey}`; + } else if (speechService === 'googleSpeechApi') { + const {googleSpeechApiKey: apiKey} = await storage.get( + 'googleSpeechApiKey', + 'sync' + ); + if (!apiKey) { + browser.runtime.sendMessage({ + id: 'notification', + messageId: 'error_missingApiKey' + }); + return; } + const apiUrl = `https://speech.googleapis.com/v1p1beta1/speech:recognize?key=${apiKey}`; + const language = captchaGoogleSpeechApiLangCodes[lang] || 'en-US'; const data = { diff --git a/src/storage/versions/local/DlgF14Chrh.js b/src/storage/versions/local/DlgF14Chrh.js new file mode 100644 index 0000000..d872f4f --- /dev/null +++ b/src/storage/versions/local/DlgF14Chrh.js @@ -0,0 +1,28 @@ +import browser from 'webextension-polyfill'; + +const message = 'Revision description'; + +const revision = 'DlgF14Chrh'; +const downRevision = 'X3djS8vZC'; + +const storage = browser.storage.local; + +async function upgrade() { + const changes = {}; + const {speechService} = await storage.get('speechService'); + if (speechService === 'googleSpeechApiDemo') { + changes.speechService = 'witSpeechApiDemo'; + } + + changes.storageVersion = revision; + return storage.set(changes); +} + +async function downgrade() { + const changes = {}; + + changes.storageVersion = downRevision; + return storage.set(changes); +} + +export {message, revision, upgrade, downgrade}; diff --git a/src/storage/versions/local/versions.json b/src/storage/versions/local/versions.json index 01906d9..af3378b 100644 --- a/src/storage/versions/local/versions.json +++ b/src/storage/versions/local/versions.json @@ -6,6 +6,7 @@ "nOedd0Txqd", "ZtLMLoh1ag", "t335iRDhZ8", - "X3djS8vZC" + "X3djS8vZC", + "DlgF14Chrh" ] } diff --git a/src/storage/versions/sync/DlgF14Chrh.js b/src/storage/versions/sync/DlgF14Chrh.js new file mode 100644 index 0000000..457f070 --- /dev/null +++ b/src/storage/versions/sync/DlgF14Chrh.js @@ -0,0 +1,28 @@ +import browser from 'webextension-polyfill'; + +const message = 'Revision description'; + +const revision = 'DlgF14Chrh'; +const downRevision = 'X3djS8vZC'; + +const storage = browser.storage.sync; + +async function upgrade() { + const changes = {}; + const {speechService} = await storage.get('speechService'); + if (speechService === 'googleSpeechApiDemo') { + changes.speechService = 'witSpeechApiDemo'; + } + + changes.storageVersion = revision; + return storage.set(changes); +} + +async function downgrade() { + const changes = {}; + + changes.storageVersion = downRevision; + return storage.set(changes); +} + +export {message, revision, upgrade, downgrade}; diff --git a/src/storage/versions/sync/versions.json b/src/storage/versions/sync/versions.json index 01906d9..af3378b 100644 --- a/src/storage/versions/sync/versions.json +++ b/src/storage/versions/sync/versions.json @@ -6,6 +6,7 @@ "nOedd0Txqd", "ZtLMLoh1ag", "t335iRDhZ8", - "X3djS8vZC" + "X3djS8vZC", + "DlgF14Chrh" ] }