Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Faster search by offloading fuse to web worker #1668

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 58 additions & 28 deletions assets/js/fastsearch.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
import * as params from '@params';

let fuse; // holds our search engine
let resList = document.getElementById('searchResults');
let sInput = document.getElementById('searchInput');
let first, last, current_elem = null
let resultsAvailable = false;

const currentScriptSrc = document.currentScript.src
let data, options

/** @type {Worker} */
let fuseWorker

// load our search index
window.onload = function () {
let xhr = new XMLHttpRequest();
xhr.onreadystatechange = function () {
if (xhr.readyState === 4) {
if (xhr.status === 200) {
let data = JSON.parse(xhr.responseText);
data = JSON.parse(xhr.responseText);
if (data) {
// fuse.js options; check fuse.js website for details
let options = {
options = {
distance: 100,
threshold: 0.4,
ignoreLocation: true,
Expand All @@ -41,7 +46,54 @@ window.onload = function () {
ignoreLocation: params.fuseOpts.ignorelocation ?? true
}
}
fuse = new Fuse(data, options); // build the index from the json file

fetch(currentScriptSrc)
.then(resp => resp.text())
.then(currentScriptCode => {
const m = currentScriptCode.match(/Fuse=t\(\);/)
const fuseScript = currentScriptCode.slice(0, m.index) + 'Fuse=t();'

const workerScript = `
${fuseScript};

let data = ${JSON.stringify(data)};
let options = ${JSON.stringify(options)};
let fuse = new Fuse(data, options);

onmessage = (e) => {
const results = fuse.search(e.data)

postMessage(results)
}
`
const workerScriptBlob = new Blob([workerScript], { type: 'script/js' })
const workerScriptUrl = URL.createObjectURL(workerScriptBlob)

fuseWorker = new Worker(workerScriptUrl)

fuseWorker.addEventListener('message', (ev) => {
const results = ev.data

if (results.length !== 0) {
// build our html if result exists
let resultSet = ''; // our results bucket

for (let item in results) {
resultSet += `<li class="post-entry"><header class="entry-header">${results[item].item.title}&nbsp;»</header>` +
`<a href="${results[item].item.permalink}" aria-label="${results[item].item.title}"></a></li>`
}

resList.innerHTML = resultSet;
resultsAvailable = true;
first = resList.firstChild;
last = resList.lastChild;
} else {
resultsAvailable = false;
resList.innerHTML = '';
}
})
})

}
} else {
console.log(xhr.responseText);
Expand Down Expand Up @@ -76,30 +128,8 @@ function reset() {
sInput.onkeyup = function (e) {
// run a search query (for "term") every time a letter is typed
// in the search box
if (fuse) {
let results;
if (params.fuseOpts) {
results = fuse.search(this.value.trim(), {limit: params.fuseOpts.limit}); // the actual query being run using fuse.js along with options
} else {
results = fuse.search(this.value.trim()); // the actual query being run using fuse.js
}
if (results.length !== 0) {
// build our html if result exists
let resultSet = ''; // our results bucket

for (let item in results) {
resultSet += `<li class="post-entry"><header class="entry-header">${results[item].item.title}&nbsp;»</header>` +
`<a href="${results[item].item.permalink}" aria-label="${results[item].item.title}"></a></li>`
}

resList.innerHTML = resultSet;
resultsAvailable = true;
first = resList.firstChild;
last = resList.lastChild;
} else {
resultsAvailable = false;
resList.innerHTML = '';
}
if (fuseWorker) {
fuseWorker.postMessage(this.value.trim())
}
}

Expand Down