Overview
Comment: | [fx] Pas mal de simplifications dans le code, mais le SharedWorker ne se partage toujours pas... |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | fx | webext_sharedworker |
Files: | files | file ages | folders |
SHA3-256: |
d51f7da95186690faa341aee2544fe6d |
User & Date: | IllusionPerdu on 2017-08-11 16:33:03 |
Original Comment: | [fx] Pas mal de simplification dans le code mais le ShraredWorker ne se partage toujours pas... |
Other Links: | branch diff | manifest | tags |
Context
2017-08-11
| ||
16:33 | [fx] Pas mal de simplifications dans le code, mais le SharedWorker ne se partage toujours pas... Leaf check-in: d51f7da951 user: IllusionPerdu tags: fx, webext_sharedworker | |
10:44 | [fx] Le SharedWorker ne se partage pas dans toutes les fenêtres... Estce à cause de la bidouille ??? check-in: c262fc885d user: IllusionPerdu tags: fx, webext_sharedworker | |
Changes
Modified gc_lang/fr/webext/background.js from [897ba1cfeb] to [f938801ed1].
1 2 3 4 5 6 7 8 9 10 11 12 | // Background "use strict"; function showError (e) { console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message); } /* Worker (separate thread to avoid freezing Firefox) */ //let xGCEWorker = new Worker("gce_worker.js"); | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | // Background "use strict"; function showError (e) { console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message); } /* Worker (separate thread to avoid freezing Firefox) */ //let xGCEWorker = new Worker("gce_worker.js"); var xGCESharedWorker = xGCESharedWorker || new SharedWorker(browser.extension.getURL("gce_sharedworker.js"), {type:"classic", credentials:"omit", name:"GrammarWorker"}); var xGCEWorker = xGCESharedWorker.port; xGCEWorker.onmessage = function (e) { // https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent try { switch (e.data[0]) { case "grammar_errors": console.log("GRAMMAR ERRORS"); |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/communicate.js from [dd49867218] to [5abad65778].
|
| | > > > > > > > | < | | < < < < | | | | | | | | | | | | | | | | | | | | | | | | | | | | < < | < | | | 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 | console.log('[Iframe] Loaded'); /*console.log(self); console.log(browser); console.log(location); console.log(window.parent.location);*/ var sPathOrigin, sPathExtension = browser.extension.getURL(""); /* Worker (separate thread to avoid freezing Firefox) */ var xGCESharedWorker = xGCESharedWorker || new SharedWorker(browser.extension.getURL("gce_sharedworker.js"), {type:"classic", credentials:"omit", name:"GrammarWorker"}); var xGCEWorker = xGCESharedWorker.port; xGCESharedWorker.onerror = function(e) { console.log('There is an error with your worker!'); console.log(typeof(e)); console.log(e); } xGCEWorker.onmessage = function (e) { // https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent try { // On retransmet directement le message à la page console.log("[Iframe] send from Message Worker ",sPathExtension); window.postMessage({SharedWorker: e.data}, sPathExtension); } catch (e) { console.error(e); } }; xGCEWorker.start(); console.log("[Iframe] [worker]"); console.log(xGCESharedWorker); //xGCEWorker.start(); //console.log("Content script [port started]"); xGCEWorker.postMessage(["init", {sExtensionPath: browser.extension.getURL(""), sOptions: "", sContext: "Firefox"}]); //xGCEWorker.postMessage(["parse", {sText: "Vas... J’en aie mare...", sCountry: "FR", bDebug: false, bContext: false}]); //xGCEWorker.postMessage(["parseAndSpellcheck", {sText: oRequest.sText, sCountry: "FR", bDebug: false, bContext: false}]); //xGCEWorker.postMessage(["getListOfTokens", {sText: oRequest.sText}]); //xGCEWorker.postMessage(["textToTest", {sText: oRequest.sText, sCountry: "FR", bDebug: false, bContext: false}]); //xGCEWorker.postMessage(["fullTests"]); console.log('[Iframe] Set receivedMessageWeb'); function receivedMessageWeb (oEvent) { // Pour être sûr que ça vient bien de notre iframe ;) if (typeof oEvent.data.sPage !== "undefined" && oEvent.data.sPage === oEvent.origin) { console.log('[Iframe] Create the Sharedworker ', oEvent.origin); sPathOrigin = oEvent.origin; } else if (sPathOrigin === oEvent.origin && typeof oEvent.data.SharedWorker === "undefined") { console.log('[Iframe] received (no SharedWorker):', oEvent, oEvent.origin); // Les messages reçus maintenant ont un SharedWorker fonctionnel // On transmet au SharedWorker uniquement si ça vient de la page web et on s’assure que ce n’est pas une réponse du SharedWorker. // TODO: Établir un protocole de communication afin de traiter uniquement les messages utiles console.log('[Iframe] exec command with SharedWorker'); xGCEWorker.postMessage(oEvent.data); console.log('[Iframe] end send message to worker'); } } window.addEventListener("message", receivedMessageWeb, false); console.log('[Iframe] END'); |
Modified gc_lang/fr/webext/content_scripts/modify_page.js from [8eb0661a77] to [f0b77e9ea3].
︙ | ︙ | |||
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 | for (let oErr of answer.aGrammErr) { console.log(oErr); } break; } } } /* * Creation d'une iframe pour communiquer entre la page visitée et le Shareworker */ var sFrameID = browser.extension.getURL("").split('/')[2]; var xIframe = document.createElement('iframe'); let xFrameContent = null; xIframe.id = sFrameID; xIframe.src = browser.extension.getURL('content_scripts/communicate.html'); xIframe.hidden = true; xIframe.onload= function () { console.log('[Web] Init protocol de communication'); //var xFrameContent = xIframe.contentWindow; xFrameContent = document.getElementById(sFrameID).contentWindow; xFrameContent.addEventListener("message", receivedMessageFromIframe, false); try { //La frame est chargé on envoie l'initialisation du Sharedworker console.log('[Web] Initialise the worker :s'); console.log('[Web] Domaine ext: '+browser.extension.getURL("")); | > > > > > > > > | | | 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 | for (let oErr of answer.aGrammErr) { console.log(oErr); } break; } } } /* * Inject a script to page site to define extension path */ /*var xScript = document.createElement('script'); xScript.textContent = 'var sExtensionPath = "'+browser.extension.getURL("")+'";'; document.body.appendChild(xScript);*/ /* * Creation d'une iframe pour communiquer entre la page visitée et le Shareworker */ var sFrameID = browser.extension.getURL("").split('/')[2]; var xIframe = document.createElement('iframe'); let xFrameContent = null; xIframe.id = sFrameID; xIframe.src = browser.extension.getURL('content_scripts/communicate.html'); xIframe.hidden = true; xIframe.onload= function () { console.log('[Web] Init protocol de communication'); //var xFrameContent = xIframe.contentWindow; xFrameContent = document.getElementById(sFrameID).contentWindow; xFrameContent.addEventListener("message", receivedMessageFromIframe, false); try { //La frame est chargé on envoie l'initialisation du Sharedworker console.log('[Web] Initialise the worker :s'); console.log('[Web] Domaine ext: '+browser.extension.getURL("")); xFrameContent.postMessage({sPage: location.origin.trim("/")}, browser.extension.getURL("")); //Un petit test pour débogage ;) console.log('[Web] Test the worker :s'); //xFrameContent.postMessage(["parse", {sText: "Vas... J’en aie mare...", sCountry: "FR", bDebug: false, bContext: false}], browser.extension.getURL("")); //Un test qui envoie a tout le monde xFrameContent.postMessage(["all", {}], browser.extension.getURL("")); //Un test qui envoie aux autres xFrameContent.postMessage(["other", {}], browser.extension.getURL("")); } catch (e) { console.error(e); |
︙ | ︙ |
Modified gc_lang/fr/webext/gce_sharedworker.js from [1348682312] to [7892fc1e3d].
︙ | ︙ | |||
55 56 57 58 59 60 61 | /* Message Event Object https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent */ | < < < > > > | > > > | | | | | | | | | | | < | < < | < < < < < > | > | | | < | > | | | | | | < > | | | > > > | 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 | /* Message Event Object https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent */ function showError (e) { for (let sParam in e) { console.log(sParam); console.log(e[sParam]); } } var xListPort = xListPort || []; //var xPort = null; self.addEventListener("connect", function(e){ console.log("START CONNECTION"); var xPort = e.ports[0]; xListPort.push(xPort); xPort.addEventListener("message", function(e){ console.log("[Sharedworker] ONMESSAGE"); console.log(e); console.log(e.data[0]); let oReplyToSend; let oParam = e.data[1]; switch (e.data[0]) { case "init": oReplyToSend = loadGrammarChecker(oParam.sExtensionPath, oParam.sOptions, oParam.sContext); break; case "parse": oReplyToSend = parse(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext); break; case "parseAndSpellcheck": oReplyToSend = parseAndSpellcheck(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext); break; case "getOptions": oReplyToSend = getOptions(); break; case "getDefaultOptions": oReplyToSend = getDefaultOptions(); break; case "setOptions": oReplyToSend = setOptions(oParam.sOptions); break; case "setOption": oReplyToSend = setOption(oParam.sOptName, oParam.bValue); break; case "resetOptions": oReplyToSend = resetOptions(); break; case "textToTest": oReplyToSend = textToTest(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext); break; case "fullTests": oReplyToSend = fullTests(); break; case "getListOfTokens": oReplyToSend = getListOfTokens(oParam.sText); break; case "other": oReplyToSend = "Message to Other"; break; case "all": oReplyToSend = "Message to All"; break; default: console.log("Unknown command: " + showError(e.data[0])); } console.log("[Sharedworker PortList] ",xListPort,this); if ( e.data[0] == "all" ) { console.log("[Sharedworker All] Number of client: "+xListPort.length); xListPort.forEach(function(client){ client.postMessage(oReplyToSend); }); } else if ( e.data[0] == "other" ) { console.log("[Sharedworker Other] Number of client: "+xListPort.length); xListPort.forEach(function(client){ if (client !== this){ client.postMessage(oReplyToSend); } }); } else { console.log("[Sharedworker Direct reply]"); this.postMessage(oReplyToSend); } }); xPort.start(); }); let oDict = null; let oTokenizer = null; let oLxg = null; let oTest = null; |
︙ | ︙ | |||
167 168 169 170 171 172 173 | oLxg = new Lexicographe(oDict); if (sGCOptions !== "") { gc_engine.setOptions(helpers.objectToMap(JSON.parse(sGCOptions))); } oTokenizer = new Tokenizer("fr"); //tests(); // we always retrieve options from the gc_engine, for setOptions filters obsolete options | | | | | | | | | | | < | | < | | | | 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 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | oLxg = new Lexicographe(oDict); if (sGCOptions !== "") { gc_engine.setOptions(helpers.objectToMap(JSON.parse(sGCOptions))); } oTokenizer = new Tokenizer("fr"); //tests(); // we always retrieve options from the gc_engine, for setOptions filters obsolete options return ["options", gc_engine.getOptions().gl_toString()]; } catch (e) { console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message); return ["error", e.message]; } } function parse (sText, sCountry, bDebug, bContext) { let aGrammErr = gc_engine.parse(sText, sCountry, bDebug, bContext); return ["grammar_errors", {aGrammErr: aGrammErr}]; } function parseAndSpellcheck (sText, sCountry, bDebug, bContext) { let aGrammErr = gc_engine.parse(sText, sCountry, bDebug, bContext); let aSpellErr = oTokenizer.getSpellingErrors(sText, oDict); return ["spelling_and_grammar_errors", {aGrammErr: aGrammErr, aSpellErr: aSpellErr}]; } function getOptions () { return ["options", gc_engine.getOptions().gl_toString()]; } function getDefaultOptions () { return ["options", gc_engine.getDefaultOptions().gl_toString()]; } function setOptions (sGCOptions) { gc_engine.setOptions(helpers.objectToMap(JSON.parse(sGCOptions))); return ["options", gc_engine.getOptions().gl_toString()]; } function setOption (sOptName, bValue) { gc_engine.setOptions(new Map([ [sOptName, bValue] ])); return ["options", gc_engine.getOptions().gl_toString()]; } function resetOptions () { gc_engine.resetOptions(); return ["options", gc_engine.getOptions().gl_toString()]; } function tests () { console.log(conj.getConj("devenir", ":E", ":2s")); console.log(mfsp.getMasForm("emmerdeuse", true)); console.log(mfsp.getMasForm("pointilleuse", false)); console.log(phonet.getSimil("est")); let aRes = gc_engine.parse("Je suit..."); for (let oErr of aRes) { console.log(text.getReadableError(oErr)); } } function textToTest (sText, sCountry, bDebug, bContext) { if (!gc_engine || !oDict) { return ["error", "# Error: grammar checker or dictionary not loaded."]; } let aGrammErr = gc_engine.parse(sText, sCountry, bDebug, bContext); let sMsg = ""; for (let oErr of aGrammErr) { sMsg += text.getReadableError(oErr) + "\n"; } return ["text_to_test_result", sMsg]; } function fullTests (sGCOptions='{"nbsp":true, "esp":true, "unit":true, "num":true}') { if (!gc_engine || !oDict) { return ["error", "# Error: grammar checker or dictionary not loaded."]; } let dMemoOptions = gc_engine.getOptions(); if (sGCOptions) { gc_engine.setOptions(helpers.objectToMap(JSON.parse(sGCOptions))); } let sMsg = ""; for (let sRes of oTest.testParse()) { sMsg += sRes + "\n"; console.log(sRes); } gc_engine.setOptions(dMemoOptions); return ["fulltests_result", sMsg]; } // Lexicographer function getListOfTokens (sText) { try { let aElem = []; let aRes = null; for (let oToken of oTokenizer.genTokens(sText)) { aRes = oLxg.getInfoForToken(oToken); if (aRes) { aElem.push(aRes); } } return ["tokens", aElem]; } catch (e) { helpers.logerror(e); return ["error", e.message]; } } |