Mirrors
/
noscript
mirror of https://github.com/hackademix/noscript.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved console reporting.

This commit is contained in:
hackademix 2019-10-01 22:48:33 +02:00
parent 958bfba66c
commit 242a3a1717
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/SyncMessage.js
View File

@ -79,7 +79,7 @@
try { try {
if ((result = l(JSON.parse(msg), sender)) !== undefined) break; if ((result = l(JSON.parse(msg), sender)) !== undefined) break;
} catch (e) { } catch (e) {
console.error(e, "Processing message %o from %o", msg, sender); console.error("%o processing message %o from %o", e, msg, sender);
} }
} }
return result instanceof Promise ? (async () => ret(await result)) : ret(result); return result instanceof Promise ? (async () => ret(await result)) : ret(result);
@ -132,17 +132,17 @@
// with "privileged" XHR // with "privileged" XHR
browser.runtime.sendMessage({___syncMessageId: msgId}); browser.runtime.sendMessage({___syncMessageId: msgId});
} }
// adding the payload
url += `&msg=${encodeURIComponent(JSON.stringify(msg))}`;
try {
// then we send the payload using a privileged XHR, which is not subject // then we send the payload using a privileged XHR, which is not subject
// to CORS but unfortunately doesn't carry any tab id except on Chromium // to CORS but unfortunately doesn't carry any tab id except on Chromium
url += `&msg=${encodeURIComponent(JSON.stringify(msg))}`; // adding the payload
let r = new XMLHttpRequest(); let r = new XMLHttpRequest();
try {
r.open("GET", url, false); r.open("GET", url, false);
r.send(null); r.send(null);
return JSON.parse(r.responseText); return JSON.parse(r.responseText);
} catch(e) { } catch(e) {
console.error(`syncMessage error in ${document.URL}: ${e.message}`); console.error(`syncMessage error in ${document.URL}: ${e.message} (response ${r.responseText})`);
} }
return null; return null;
}; };