Overview
Comment: | [fx] new initialization for background and worker |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | fx |
Files: | files | file ages | folders |
SHA3-256: |
0d2811ed48262c7ca3aeb419eabe498c |
User & Date: | olr on 2019-08-09 10:02:00 |
Other Links: | manifest | tags |
Context
2019-08-10
| ||
10:56 | [fx] buttons to stop and restart the worker check-in: 7bf95d9332 user: olr tags: trunk, fx | |
2019-08-09
| ||
10:02 | [fx] new initialization for background and worker check-in: 0d2811ed48 user: olr tags: trunk, fx | |
07:23 | [fr] nr: confusion aile/elle check-in: ba098fe978 user: olr tags: trunk, fr | |
Changes
Modified gc_lang/fr/webext/background.js from [18ddcc20c6] to [3a97c6e44a].
1 2 3 4 | // Background /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ | | < < < < > > | > | > | > | < | > | | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > | | > > | > > | < | > | | | | | | | | | | | | | | | < < < < < < | | < < < < < < | | < < < < < < < | | < | < < < < < < | < < < < < < | | < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 | // Background /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ /* global helpers, showError, Worker, chrome, console */ "use strict"; // Chrome don’t follow the W3C specification: // https://browserext.github.io/browserext/ let bChrome = false; if (typeof(browser) !== "object") { var browser = chrome; bChrome = true; } const oWorkerHandler = { xGCEWorker: null, nLastTimeWorkerResponse: 0, // milliseconds since 1970-01-01 oTask: {}, start: function () { this.xGCEWorker = new Worker("gce_worker.js"); this.xGCEWorker.onmessage = function (e) { // Messages received from the Worker // https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent try { this.nLastTimeWorkerResponse = Date.now(); let {sActionDone, result, dInfo, bEnd, bError} = e.data; if (bError) { console.log(result); console.log(dInfo); return; } switch (sActionDone) { case "init": storeGCOptions(result); break; case "parse": case "parseAndSpellcheck": case "parseAndSpellcheck1": case "parseFull": case "getListOfTokens": case "getSpellSuggestions": case "getVerb": // send result to content script if (typeof(dInfo.iReturnPort) === "number") { let xPort = dConnx.get(dInfo.iReturnPort); xPort.postMessage(e.data); } else { console.log("[background] don’t know where to send results"); console.log(e.data); } break; case "textToTest": case "fullTests": // send result to panel browser.runtime.sendMessage(e.data); break; case "getOptions": case "getDefaultOptions": case "resetOptions": // send result to panel storeGCOptions(result); browser.runtime.sendMessage(e.data); break; case "setOptions": case "setOption": storeGCOptions(result); break; case "setDictionary": case "setDictionaryOnOff": //console.log("[background] " + sActionDone + ": " + result); break; default: console.log("[background] Unknown command: " + sActionDone); console.log(e.data); } } catch (error) { showError(error); console.log(e.data); } }; }, getTimeSinceLastResponse: function () { // result in seconds return Math.floor((Date.now() - this.nLastTimeWorkerResponse) / 1000); }, restart: function () { if (this.getTimeSinceLastResponse() <= 5) { return false; } if (this.xGCEWorker) { this.xGCEWorker.terminate(); } this.start(); oInitHandler.initGrammarChecker(); return true; }, addTask: function () { // }, closeTask: function () { // } } const oInitHandler = { initUIOptions: function () { if (bChrome) { browser.storage.local.get("ui_options", this._initUIOptions); return; } browser.storage.local.get("ui_options").then(this._initUIOptions, showError); }, initGrammarChecker: function () { if (bChrome) { browser.storage.local.get("gc_options", this._initGrammarChecker); browser.storage.local.get("personal_dictionary", this._setSpellingDictionaries); browser.storage.local.get("community_dictionary", this._setSpellingDictionaries); browser.storage.local.get("oPersonalDictionary", this._setSpellingDictionaries); // deprecated browser.storage.local.get("sc_options", this._initSCOptions); return; } browser.storage.local.get("gc_options").then(this._initGrammarChecker, showError); browser.storage.local.get("personal_dictionary").then(this._setSpellingDictionaries, showError); browser.storage.local.get("community_dictionary").then(this._setSpellingDictionaries, showError); browser.storage.local.get("oPersonalDictionary").then(this._setSpellingDictionaries, showError); // deprecated browser.storage.local.get("sc_options").then(this._initSCOptions, showError); }, _initUIOptions: function (oSavedOptions) { if (!oSavedOptions.hasOwnProperty("ui_options")) { browser.storage.local.set({"ui_options": { textarea: true, editablenode: true }}); } }, _initGrammarChecker: function (oSavedOptions) { try { let dOptions = (oSavedOptions.hasOwnProperty("gc_options")) ? oSavedOptions.gc_options : null; if (dOptions !== null && Object.getOwnPropertyNames(dOptions).length == 0) { console.log("# Error: the saved options was an empty object."); dOptions = null; } oWorkerHandler.xGCEWorker.postMessage({ sCommand: "init", dParam: {sExtensionPath: browser.extension.getURL(""), dOptions: dOptions, sContext: "Firefox"}, dInfo: {} }); } catch (e) { console.log("initGrammarChecker failed"); showError(e); } }, _setSpellingDictionaries: function (oData) { if (oData.hasOwnProperty("oPersonalDictionary")) { // deprecated (to be removed in 2020) console.log("personal dictionary migration"); browser.storage.local.set({ "personal_dictionary": oData["oPersonalDictionary"] }); oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionary", dParam: { sDictionary: "personal", oDict: oData["oPersonalDictionary"] }, dInfo: {} }); browser.storage.local.remove("oPersonalDictionary"); } if (oData.hasOwnProperty("community_dictionary")) { oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionary", dParam: { sDictionary: "community", oDict: oData["community_dictionary"] }, dInfo: {} }); } if (oData.hasOwnProperty("personal_dictionary")) { oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionary", dParam: { sDictionary: "personal", oDict: oData["personal_dictionary"] }, dInfo: {} }); } }, _initSCOptions: function (oData) { if (!oData.hasOwnProperty("sc_options")) { browser.storage.local.set({"sc_options": { extended: true, community: true, personal: true }}); oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionaryOnOff", dParam: { sDictionary: "community", bActivate: true }, dInfo: {} }); oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionaryOnOff", dParam: { sDictionary: "personal", bActivate: true }, dInfo: {} }); } else { oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionaryOnOff", dParam: { sDictionary: "community", bActivate: oData.sc_options["community"] }, dInfo: {} }); oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionaryOnOff", dParam: { sDictionary: "personal", bActivate: oData.sc_options["personal"] }, dInfo: {} }); } } } // start the Worker for the GC oWorkerHandler.start(); // init the options stuff and start the GC oInitHandler.initUIOptions(); oInitHandler.initGrammarChecker(); // When the extension is installed or updated browser.runtime.onInstalled.addListener(function (oDetails) { // launched at installation or update // https://developer.mozilla.org/fr/Add-ons/WebExtensions/API/runtime/onInstalled if (oDetails.reason == "update" || oDetails.reason == "installed") { // todo //browser.tabs.create({url: "http://grammalecte.net"}); } |
︙ | ︙ | |||
212 213 214 215 216 217 218 | case "setOptions": case "setOption": case "resetOptions": case "textToTest": case "fullTests": case "setDictionary": case "setDictionaryOnOff": | | | 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 | case "setOptions": case "setOption": case "resetOptions": case "textToTest": case "fullTests": case "setDictionary": case "setDictionaryOnOff": oWorkerHandler.xGCEWorker.postMessage(oRequest); break; case "openURL": browser.tabs.create({url: dParam.sURL}); break; case "openConjugueurTab": openConjugueurTab(); break; |
︙ | ︙ | |||
251 252 253 254 255 256 257 | case "parseAndSpellcheck": case "parseAndSpellcheck1": case "parseFull": case "getListOfTokens": case "getSpellSuggestions": case "getVerb": oRequest.dInfo.iReturnPort = iPortId; // we pass the id of the return port to receive answer | | | 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 | case "parseAndSpellcheck": case "parseAndSpellcheck1": case "parseFull": case "getListOfTokens": case "getSpellSuggestions": case "getVerb": oRequest.dInfo.iReturnPort = iPortId; // we pass the id of the return port to receive answer oWorkerHandler.xGCEWorker.postMessage(oRequest); break; case "openURL": browser.tabs.create({url: dParam.sURL}); break; case "openConjugueurTab": openConjugueurTab(); break; |
︙ | ︙ | |||
307 308 309 310 311 312 313 | // analyze case "grammar_checker_editable": case "grammar_checker_page": sendCommandToTab(xTab.id, xInfo.menuItemId); break; case "grammar_checker_selection": sendCommandToTab(xTab.id, xInfo.menuItemId, xInfo.selectionText); | | | 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 | // analyze case "grammar_checker_editable": case "grammar_checker_page": sendCommandToTab(xTab.id, xInfo.menuItemId); break; case "grammar_checker_selection": sendCommandToTab(xTab.id, xInfo.menuItemId, xInfo.selectionText); oWorkerHandler.xGCEWorker.postMessage({ sCommand: "parseAndSpellcheck", dParam: {sText: xInfo.selectionText, sCountry: "FR", bDebug: false, bContext: false}, dInfo: {iReturnPort: xTab.id} }); break; // tools case "conjugueur_window": |
︙ | ︙ | |||
407 408 409 410 411 412 413 | return; } browser.tabs.query({ currentWindow: true, active: true }).then((lTabs) => { for (let xTab of lTabs) { console.log(xTab); browser.tabs.sendMessage(xTab.id, {sActionRequest: sCommand}); } | | | | 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 | return; } browser.tabs.query({ currentWindow: true, active: true }).then((lTabs) => { for (let xTab of lTabs) { console.log(xTab); browser.tabs.sendMessage(xTab.id, {sActionRequest: sCommand}); } }, showError); } function openLexiconEditor (sName="__personal__") { if (nTabLexiconEditor === null) { if (bChrome) { browser.tabs.create({ url: browser.extension.getURL("panel/lex_editor.html") }, onLexiconEditorOpened); return; } let xLexEditor = browser.tabs.create({ url: browser.extension.getURL("panel/lex_editor.html") }); xLexEditor.then(onLexiconEditorOpened, showError); } else { browser.tabs.update(nTabLexiconEditor, {active: true}); } } function onLexiconEditorOpened (xTab) { |
︙ | ︙ | |||
443 444 445 446 447 448 449 | url: browser.extension.getURL("panel/dictionaries.html") }, onDictionariesOpened); return; } let xLexEditor = browser.tabs.create({ url: browser.extension.getURL("panel/dictionaries.html") }); | | | 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 | url: browser.extension.getURL("panel/dictionaries.html") }, onDictionariesOpened); return; } let xLexEditor = browser.tabs.create({ url: browser.extension.getURL("panel/dictionaries.html") }); xLexEditor.then(onDictionariesOpened, showError); } else { browser.tabs.update(nTabDictionaries, {active: true}); } } function onDictionariesOpened (xTab) { |
︙ | ︙ | |||
465 466 467 468 469 470 471 | url: browser.extension.getURL("panel/conjugueur.html") }, onConjugueurOpened); return; } let xConjTab = browser.tabs.create({ url: browser.extension.getURL("panel/conjugueur.html") }); | | | 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 | url: browser.extension.getURL("panel/conjugueur.html") }, onConjugueurOpened); return; } let xConjTab = browser.tabs.create({ url: browser.extension.getURL("panel/conjugueur.html") }); xConjTab.then(onConjugueurOpened, showError); } else { browser.tabs.update(nTabConjugueur, {active: true}); } } function onConjugueurOpened (xTab) { |
︙ | ︙ | |||
495 496 497 498 499 500 501 | type: "popup", width: 710, height: 980 }); } | | > | 524 525 526 527 528 529 530 531 532 533 534 | type: "popup", width: 710, height: 980 }); } function showError (e) { console.error(e); //console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message); } |