make search reliable

Author: cortex-lp

assets/js/offline-search.js

@@ -30,31 +30,22 @@
             worker = new Worker('/js/worker.js');
             const url = '/json/lunr-index.json';
 
-            worker.postMessage({ type: 'init', url: url });
+            worker.postMessage({ 
+                type: 'init', 
+                lunrIndexUrl: url, 
+                rawIndexUrl: $searchInput.data('offline-search-index-json-src') 
+            });
 
             worker.onerror = function (error) {
                 console.error('Error in worker:', error);
             };
         }
-        
-        $.ajax($searchInput.data('offline-search-index-json-src')).then(
-            (data) => {
-                data.forEach((doc) => {
-                    resultDetails.set(doc.ref, {
-                        version: doc.version,
-                        title: doc.title,
-                        excerpt: doc.excerpt,
-                    });
-                });
-            }
-        );
 
         let currentTarget = null;
 
         worker.onmessage = function (event) {
             if (event.data.type === 'search') {
-                const results = event.data.results
-                console.log('Search results:', results);
+                const docs = event.data.docs;
                 const $html = $('<div>');
 
                 $html.append(
@@ -87,17 +78,19 @@
                 });
                 $html.append($searchResultBody);
 
-                if (results.length === 0) {
+                if (docs.size === 0) {
                     currentTarget.append(
                         $('<p>').text(`No results found for query "${searchQuery}"`)
                     );
                 } else {
-                    results.forEach((r) => {
-                        const doc = resultDetails.get(r.ref);
+                    docs.forEach((doc, key) => {
+                        if (doc === undefined) {
+                            return;
+                        }
 
                         const href =
                             $searchInput.data('offline-search-base-href') +
-                            r.ref.replace(/^\//, '');
+                            key.replace(/^\//, '');
 
                         const $entry = $('<div>').addClass('mt-4').addClass('search-result');
 
@@ -112,7 +105,7 @@
                         );
 
                         $entry.append(
-                            $('<small>').addClass('d-block text-muted').text(r.ref)
+                            $('<small>').addClass('d-block text-muted').text(key)
                         );
 
                         $entry.append($('<p>').text(doc.excerpt));
@@ -150,36 +143,6 @@
             }
 
             worker.postMessage({ type: 'search', query: searchQuery, maxResults: $targetSearchInput.data('offline-search-max-results') });
-
-            // const results = idx
-            //     .query((q) => {
-            //         const tokens = lunr.tokenizer(searchQuery.toLowerCase());
-            //         tokens.forEach((token) => {
-            //             const queryString = token.toString();
-            //             q.term(queryString, {
-            //                 boost: 100,
-            //             });
-            //             q.term(queryString, {
-            //                 wildcard:
-            //                     lunr.Query.wildcard.LEADING |
-            //                     lunr.Query.wildcard.TRAILING,
-            //                 boost: 10,
-            //             });
-            //             q.term(queryString, {
-            //                 editDistance: 2,
-            //             });
-            //         });
-            //     })
-            //     .slice(
-            //         0,
-            //         $targetSearchInput.data('offline-search-max-results')
-            //     );
-
-            //
-            // Make result html
-            //
-
-
         };
 
         //

assets/js/worker.js

@@ -1,17 +1,27 @@
 importScripts('https://unpkg.com/[email protected]/lunr.min.js');
 
 let idx;
+const resultDetails = new Map(); // Will hold the data for the search results (titles and summaries)
 let indexReadyPromise;
 
 // Initialize the index
-self.onmessage = async function(event) {
+self.onmessage = async function (event) {
     if (event.data.type === 'init') {
         indexReadyPromise = new Promise(async (resolve, reject) => {
             try {
-                console.log(event.data);
-                const response = await fetch(event.data.url);
-                const data = await response.json();
-                idx = lunr.Index.load(data);
+                const rawIndex = await fetch(event.data.rawIndexUrl);
+                let json = await rawIndex.json();
+                json.forEach((doc) => {
+                    resultDetails.set(doc.ref, {
+                        version: doc.version,
+                        title: doc.title,
+                        excerpt: doc.excerpt,
+                    });
+                });
+
+                const lunrIndex = await fetch(event.data.lunrIndexUrl);
+                json = await lunrIndex.json();
+                idx = lunr.Index.load(json);
                 resolve();
                 self.postMessage({ type: 'init', status: 'success' });
             } catch (error) {
@@ -41,7 +51,16 @@ self.onmessage = async function(event) {
                 })
                 .slice(0, event.data.maxResults);
 
-            self.postMessage({ type: 'search', results: results });
+            const docs = new Map();
+            results.forEach((result) => {
+                if  (resultDetails.get(result.ref) === undefined) {
+                    return;
+                }
+                
+                docs.set(result.ref, resultDetails.get(result.ref));
+            });
+
+            self.postMessage({ type: 'search', status: 'success', docs: docs });
         } catch (error) {
             self.postMessage({ type: 'search', status: 'error', message: 'Index not ready' });
         }