alex/yomichan
1
Fork 0
Code Releases Activity

Use Map for Mecab.listeners

Browse Source
This commit is contained in:
toasted-nutbread 2020-01-24 22:02:53 -05:00
parent 632765a3b5
commit d7ce829107
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ext/bg/js/mecab.js
View File

@ -20,7 +20,7 @@
class Mecab {
constructor() {
this.port = null;
this.listeners = {};
this.listeners = new Map();
this.sequence = 0;
}
@ -55,17 +55,18 @@ class Mecab {
if (this.port === null) { return; }
this.port.disconnect();
this.port = null;
this.listeners = {};
this.listeners.clear();
this.sequence = 0;
}
onNativeMessage({sequence, data}) {
if (hasOwn(this.listeners, sequence)) {
const {callback, timer} = this.listeners[sequence];
const listener = this.listeners.get(sequence);
if (typeof listener === 'undefined') { return; }
const {callback, timer} = listener;
clearTimeout(timer);
callback(data);
delete this.listeners[sequence];
}
this.listeners.delete(sequence);
}
invoke(action, params) {
@ -75,13 +76,13 @@ class Mecab {
return new Promise((resolve, reject) => {
const sequence = this.sequence++;
this.listeners[sequence] = {
this.listeners.set(sequence, {
callback: resolve,
timer: setTimeout(() => {
delete this.listeners[sequence];
this.listeners.delete(sequence);
reject(new Error(`Mecab invoke timed out in ${Mecab.timeout} ms`));
}, Mecab.timeout)
};
});
this.port.postMessage({action, params, sequence});
});