alex/yomichan
1
Fork 0
Code Releases Activity

refactor getTemporaryListenerResult timeout

Browse Source
This commit is contained in:
siikamiika 2020-03-22 12:45:58 +02:00
parent d88635cbb2
commit fa65ab3512
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/fg/js/frame-offset-forwarder.js
View File

@ -50,7 +50,8 @@ class FrameOffsetForwarder {
if (action === 'frameOffset' && isObject(params) && params.uniqueId === uniqueId) { if (action === 'frameOffset' && isObject(params) && params.uniqueId === uniqueId) {
resolve(params); resolve(params);
} }
} },
5000
); );
window.parent.postMessage({ window.parent.postMessage({

23
ext/mixed/js/core.js
View File

@ -312,8 +312,7 @@ const yomichan = (() => {
this.trigger('orphaned', {error}); this.trigger('orphaned', {error});
} }
getTemporaryListenerResult(eventHandler, userCallback, timeout=30000) { getTemporaryListenerResult(eventHandler, userCallback, timeout=null) {
let resolved = false;
let resolve; let resolve;
let reject; let reject;
const listenerPromise = new Promise((_resolve, _reject) => { const listenerPromise = new Promise((_resolve, _reject) => {
@ -323,20 +322,24 @@ const yomichan = (() => {
if (eventHandler === chrome.runtime.onMessage) { if (eventHandler === chrome.runtime.onMessage) {
const runtimeMessageCallback = ({action, params}, sender, sendResponse) => { const runtimeMessageCallback = ({action, params}, sender, sendResponse) => {
let timeoutId = null;
if (timeout !== null) {
timeoutId = window.setTimeout(() => {
timeoutId = null;
reject(new Error(`Listener timed out in ${timeout} ms`));
eventHandler.removeListener(runtimeMessageCallback);
}, timeout);
}
const cleanupResolve = (value) => { const cleanupResolve = (value) => {
resolved = true; if (timeoutId !== null) {
window.clearTimeout(timeoutId);
}
eventHandler.removeListener(runtimeMessageCallback); eventHandler.removeListener(runtimeMessageCallback);
sendResponse(); sendResponse();
resolve(value); resolve(value);
}; };
setTimeout(() => {
if (!resolved) {
reject(new Error(`Listener timed out in ${timeout} ms`));
eventHandler.removeListener(runtimeMessageCallback);
}
}, timeout);
userCallback({action, params}, {resolve: cleanupResolve, sender}); userCallback({action, params}, {resolve: cleanupResolve, sender});
}; };