mirror of
https://github.com/HackTricks-wiki/hacktricks.git
synced 2025-10-10 18:36:50 +00:00
improve searcher
This commit is contained in:
parent
96756761c8
commit
9e634b0394
@ -1,105 +1,120 @@
|
||||
/* ht_searcher.js ────────────────────────────────────────────────
|
||||
Full Web-Worker search with “⏳” while loading and “🔍” after.
|
||||
Keeps every feature of the original theme (teasers, breadcrumbs,
|
||||
highlight link, hot-keys, arrow navigation, ESC to close, …).
|
||||
Dual-index Web-Worker search (HackTricks + HackTricks-Cloud)
|
||||
with loading icon swap ⏳ → 🔍 and proper host prefix for
|
||||
cloud results (https://cloud.hacktricks.wiki).
|
||||
|
||||
Dependencies already expected by the theme:
|
||||
• mark.js (for in-page highlights)
|
||||
• elasticlunr.min.js (worker fetches a CDN or /elasticlunr.min.js)
|
||||
• searchindex.js (worker fetches GitHub raw or /searchindex.js)
|
||||
• mark.js
|
||||
• elasticlunr.min.js (worker fetches CDN or /elasticlunr.min.js)
|
||||
• searchindex.js (local fallback copies for both wikis)
|
||||
*/
|
||||
|
||||
(() => {
|
||||
"use strict";
|
||||
|
||||
/* ───────────────── 0. Worker code (string) ───────────────── */
|
||||
/* ───────────── 0. Utility (main thread) ─────────────────── */
|
||||
const clear = el => { while (el.firstChild) el.removeChild(el.firstChild); };
|
||||
|
||||
/* ───────────── 1. Web‑Worker code (as string) ───────────── */
|
||||
const workerCode = `
|
||||
self.window = self; /* make 'window' exist */
|
||||
/* emulate browser globals inside worker */
|
||||
self.window = self;
|
||||
self.search = self.search || {};
|
||||
|
||||
const abs = p => location.origin + p; /* helper */
|
||||
const abs = p => location.origin + p; /* helper */
|
||||
|
||||
/* 0.1 load elasticlunr (CDN → local fallback) */
|
||||
/* 1 ─ elasticlunr (CDN → local) */
|
||||
try {
|
||||
importScripts('https://cdn.jsdelivr.net/npm/elasticlunr@0.9.5/elasticlunr.min.js');
|
||||
} catch {
|
||||
importScripts(abs('/elasticlunr.min.js'));
|
||||
}
|
||||
|
||||
/* 0.2 load searchindex.js (GitHub → local fallback) */
|
||||
(async () => {
|
||||
async function loadRemote () {
|
||||
const r = await fetch(
|
||||
'https://raw.githubusercontent.com/HackTricks-wiki/hacktricks/refs/heads/master/searchindex.js',
|
||||
{ mode:'cors' }
|
||||
);
|
||||
/* 2 ─ helper to load one search index */
|
||||
async function loadIndex(remoteRaw, localPath){
|
||||
try {
|
||||
const r = await fetch(remoteRaw, {mode:'cors'});
|
||||
if (!r.ok) throw new Error('HTTP '+r.status);
|
||||
importScripts(
|
||||
URL.createObjectURL(
|
||||
new Blob([await r.text()],{type:'application/javascript'})
|
||||
)
|
||||
);
|
||||
importScripts(URL.createObjectURL(new Blob([await r.text()],{type:'application/javascript'})));
|
||||
} catch (e) {
|
||||
console.warn(remoteRaw,'→',e,'. Trying local fallback …');
|
||||
importScripts(abs(localPath));
|
||||
}
|
||||
try { await loadRemote(); }
|
||||
catch(e){ console.warn('remote index failed →',e);
|
||||
importScripts(abs('/searchindex.js')); }
|
||||
const data = { idxJSON: self.search.index, urls: self.search.doc_urls };
|
||||
delete self.search.index; delete self.search.doc_urls;
|
||||
return data;
|
||||
}
|
||||
|
||||
/* 0.3 build index once, keep for all queries */
|
||||
const idx = elasticlunr.Index.load(self.search.index);
|
||||
const DOC_URLS = self.search.doc_urls;
|
||||
const MAX = 30;
|
||||
/* 3 ─ load BOTH indexes */
|
||||
(async () => {
|
||||
const MAIN_RAW = 'https://raw.githubusercontent.com/HackTricks-wiki/hacktricks/refs/heads/master/searchindex.js';
|
||||
const CLOUD_RAW = 'https://raw.githubusercontent.com/HackTricks-wiki/hacktricks-cloud/refs/heads/master/searchindex.js';
|
||||
|
||||
/* ping main-thread so it can swap the icon */
|
||||
const { idxJSON:mainJSON, urls:mainURLs } = await loadIndex(MAIN_RAW , '/searchindex.js');
|
||||
const { idxJSON:cloudJSON, urls:cloudURLs } = await loadIndex(CLOUD_RAW, '/searchindex-cloud.js');
|
||||
|
||||
const mainIdx = elasticlunr.Index.load(mainJSON);
|
||||
const cloudIdx = elasticlunr.Index.load(cloudJSON);
|
||||
const MAX_OUT = 30;
|
||||
|
||||
/* ✔ notify UI */
|
||||
postMessage({ready:true});
|
||||
|
||||
/* 4 ─ search handler */
|
||||
self.onmessage = ({data:q}) => {
|
||||
if (!q) { postMessage([]); return; }
|
||||
const res = idx.search(q,{bool:'AND',expand:true}).slice(0,MAX);
|
||||
postMessage(res.map(r => {
|
||||
const d = idx.documentStore.getDoc(r.ref);
|
||||
return { /* only the fields the UI needs */
|
||||
ref : r.ref,
|
||||
title : d.title,
|
||||
body : d.body,
|
||||
breadcrumbs: d.breadcrumbs,
|
||||
url : DOC_URLS[r.ref]
|
||||
};
|
||||
const opts = { bool:'AND', expand:true };
|
||||
|
||||
function searchAndScale(idx, urls, base=''){
|
||||
const res = idx.search(q, opts);
|
||||
if (!res.length) return [];
|
||||
const max = res[0].score || 1;
|
||||
return res.map(r => ({
|
||||
normScore: r.score / max,
|
||||
doc : idx.documentStore.getDoc(r.ref),
|
||||
url : base + urls[r.ref]
|
||||
}));
|
||||
}
|
||||
|
||||
const combined = [
|
||||
...searchAndScale(mainIdx , mainURLs , ''),
|
||||
...searchAndScale(cloudIdx, cloudURLs, 'https://cloud.hacktricks.wiki/')
|
||||
];
|
||||
|
||||
combined.sort((a,b) => b.normScore - a.normScore);
|
||||
const top = combined.slice(0, MAX_OUT).map(o => ({
|
||||
title : o.doc.title,
|
||||
body : o.doc.body,
|
||||
breadcrumbs: o.doc.breadcrumbs,
|
||||
url : o.url
|
||||
}));
|
||||
postMessage(top);
|
||||
};
|
||||
})();
|
||||
`;
|
||||
|
||||
/* ───────────────── 1. Build worker ───────────────────────── */
|
||||
const workerURL = URL.createObjectURL(
|
||||
new Blob([workerCode],{type:'application/javascript'})
|
||||
);
|
||||
const worker = new Worker(workerURL);
|
||||
URL.revokeObjectURL(workerURL); /* tidy blob */
|
||||
/* ───────────── 2. Spawn worker ─────────────────────────── */
|
||||
const worker = new Worker(URL.createObjectURL(new Blob([workerCode],{type:'application/javascript'})));
|
||||
|
||||
/* ───────────────── 2. DOM references ─────────────────────── */
|
||||
const wrap = document.getElementById('search-wrapper');
|
||||
const modal = document.getElementById('search-modal');
|
||||
const bar = document.getElementById('searchbar');
|
||||
const list = document.getElementById('searchresults');
|
||||
const listOut= document.getElementById('searchresults-outer');
|
||||
const header = document.getElementById('searchresults-header');
|
||||
const icon = document.getElementById('search-toggle');
|
||||
/* ───────────── 3. DOM refs ─────────────────────────────── */
|
||||
const wrap = document.getElementById('search-wrapper');
|
||||
const bar = document.getElementById('searchbar');
|
||||
const list = document.getElementById('searchresults');
|
||||
const listOut = document.getElementById('searchresults-outer');
|
||||
const header = document.getElementById('searchresults-header');
|
||||
const icon = document.getElementById('search-toggle');
|
||||
|
||||
/* ───────────────── 3. Constants & state ─────────────────── */
|
||||
const HOTKEY = 83, ESC=27, DOWN=40, UP=38, ENTER=13;
|
||||
const URL_MARK_PARAM = 'highlight';
|
||||
const MAX_RESULTS = 30;
|
||||
const READY_ICON_HTML= icon.innerHTML; /* save original “🔍” */
|
||||
icon.textContent = '⏳'; /* show hour-glass */
|
||||
/* loading icon */
|
||||
const READY_ICON = icon.innerHTML; /* theme SVG/HTML */
|
||||
icon.textContent = '⏳';
|
||||
icon.setAttribute('aria-label','Loading search …');
|
||||
|
||||
let debounce, teaserCount = 0;
|
||||
/* key codes */
|
||||
const HOTKEY=83, ESC=27, DOWN=40, UP=38, ENTER=13;
|
||||
let debounce, teaserCount=0;
|
||||
|
||||
/* ───────────────── 4. Helpers (escaped, teaser, format …) ─ */
|
||||
const escapeHTML = (() => {
|
||||
const MAP = {'&':'&','<':'<','>':'>','"':'"',"'":'''};
|
||||
return s => s.replace(/[&<>'"]/g,c=>MAP[c]);
|
||||
})();
|
||||
/* ───────────── 4. helpers (teaser etc.) ─────────────── */
|
||||
const escapeHTML = (()=>{const M={'&':'&','<':'<','>':'>','"':'"','\'':'''};return s=>s.replace(/[&<>'"]/g,c=>M[c]);})();
|
||||
|
||||
function metric(c,t){
|
||||
return c===0 ? `No search results for '${t}'.`
|
||||
@ -107,105 +122,84 @@
|
||||
: `${c} search results for '${t}':`;
|
||||
}
|
||||
|
||||
/* ── teaser algorithm (unchanged from theme, just ES-ified) ── */
|
||||
function makeTeaser(body,terms){
|
||||
const stem = w=>elasticlunr.stemmer(w.toLowerCase());
|
||||
const t = terms.map(stem);
|
||||
const W_SEARCH=40,W_FIRST=8,W_NORM=2,WIN=30;
|
||||
const wArr=[],sents=body.toLowerCase().split('. ');
|
||||
let idx=0, val=W_FIRST, found=false;
|
||||
|
||||
sents.forEach(sent=>{
|
||||
val=W_FIRST;
|
||||
sent.split(' ').forEach(word=>{
|
||||
if(word){
|
||||
if(t.some(st=>stem(word).startsWith(st))){val=W_SEARCH;found=true;}
|
||||
wArr.push([word,val,idx]); val=W_NORM;
|
||||
const stem=w=>elasticlunr.stemmer(w.toLowerCase());
|
||||
const T=terms.map(stem), W_SRCH=40,W_1ST=8,W_NRM=2,WIN=30;
|
||||
const W=[], sents=body.toLowerCase().split('. ');
|
||||
let idx=0, v=W_1ST, found=false;
|
||||
sents.forEach(s=>{
|
||||
v=W_1ST;
|
||||
s.split(' ').forEach(w=>{
|
||||
if(w){
|
||||
if(T.some(t=>stem(w).startsWith(t))){v=W_SRCH;found=true;}
|
||||
W.push([w,v,idx]); v=W_NRM;
|
||||
}
|
||||
idx+=word.length+1;
|
||||
idx+=w.length+1;
|
||||
});
|
||||
idx+=1; /* account for '. ' */
|
||||
idx++;
|
||||
});
|
||||
if(!wArr.length) return body;
|
||||
|
||||
const win = Math.min(wArr.length,WIN);
|
||||
const sums=[ wArr.slice(0,win).reduce((a,[,w])=>a+w,0) ];
|
||||
for(let i=1;i<=wArr.length-win;i++)
|
||||
sums[i]=sums[i-1]-wArr[i-1][1]+wArr[i+win-1][1];
|
||||
|
||||
const best = found ? sums.lastIndexOf(Math.max(...sums)) : 0;
|
||||
const out=[], start=wArr[best][2];
|
||||
idx=start;
|
||||
if(!W.length) return body;
|
||||
const win=Math.min(W.length,WIN);
|
||||
const sums=[W.slice(0,win).reduce((a,[,wt])=>a+wt,0)];
|
||||
for(let i=1;i<=W.length-win;i++)
|
||||
sums[i]=sums[i-1]-W[i-1][1]+W[i+win-1][1];
|
||||
const best=found ? sums.lastIndexOf(Math.max(...sums)) : 0;
|
||||
const out=[]; idx=W[best][2];
|
||||
for(let i=best;i<best+win;i++){
|
||||
const [word,w,pos] = wArr[i];
|
||||
const [w,wt,pos]=W[i];
|
||||
if(idx<pos){out.push(body.substring(idx,pos)); idx=pos;}
|
||||
if(w===W_SEARCH) out.push('<em>');
|
||||
out.push(body.substr(pos,word.length));
|
||||
if(w===W_SEARCH) out.push('</em>');
|
||||
idx=pos+word.length;
|
||||
if(wt===W_SRCH) out.push('<em>');
|
||||
out.push(body.substr(pos,w.length));
|
||||
if(wt===W_SRCH) out.push('</em>');
|
||||
idx=pos+w.length;
|
||||
}
|
||||
return out.join('');
|
||||
}
|
||||
|
||||
function formatResult(doc,terms){
|
||||
const teaser = makeTeaser(escapeHTML(doc.body),terms);
|
||||
const URL_MARK_PARAM='highlight';
|
||||
function formatResult(d,terms){
|
||||
const teaser = makeTeaser(escapeHTML(d.body),terms);
|
||||
teaserCount++;
|
||||
const enc = encodeURIComponent(terms.join(' ')).replace(/'/g,'%27');
|
||||
const u = doc.url.split('#'); if(u.length===1)u.push('');
|
||||
return `<a href="${path_to_root}${u[0]}?${URL_MARK_PARAM}=${enc}#${u[1]}" aria-details="teaser_${teaserCount}">`+
|
||||
`${doc.breadcrumbs}<span class="teaser" id="teaser_${teaserCount}" aria-label="Search Result Teaser">`+
|
||||
|
||||
/* decide if absolute */
|
||||
const absolute = d.url.startsWith('http');
|
||||
const parts = d.url.split('#'); if(parts.length===1) parts.push('');
|
||||
const base = absolute ? '' : path_to_root;
|
||||
const href = `${base}${parts[0]}?${URL_MARK_PARAM}=${enc}#${parts[1]}`;
|
||||
|
||||
return `<a href="${href}" aria-details="teaser_${teaserCount}">`+
|
||||
`${d.breadcrumbs}<span class="teaser" id="teaser_${teaserCount}" aria-label="Search Result Teaser">`+
|
||||
`${teaser}</span></a>`;
|
||||
}
|
||||
|
||||
const clear = el => { while(el.firstChild) el.removeChild(el.firstChild); };
|
||||
|
||||
function showUI(show){
|
||||
wrap.classList.toggle('hidden',!show);
|
||||
icon.setAttribute('aria-expanded',show);
|
||||
if(!show){
|
||||
listOut.classList.add('hidden');
|
||||
[...list.children].forEach(li=>li.classList.remove('focus'));
|
||||
}else{
|
||||
window.scrollTo(0,0);
|
||||
bar.focus(); bar.select();
|
||||
}
|
||||
if(show){ window.scrollTo(0,0); bar.focus(); bar.select(); }
|
||||
else{ listOut.classList.add('hidden'); [...list.children].forEach(li=>li.classList.remove('focus')); }
|
||||
}
|
||||
|
||||
function blurBar(){
|
||||
const tmp=document.createElement('input');
|
||||
tmp.style.position='absolute'; tmp.style.opacity=0;
|
||||
tmp.style.cssText='position:absolute;opacity:0;';
|
||||
icon.appendChild(tmp); tmp.focus(); tmp.remove();
|
||||
}
|
||||
|
||||
/* ───────────────── 5. Event handlers ─────────────────────── */
|
||||
/* ───────────── 5. UI events ───────────────────────────── */
|
||||
icon.addEventListener('click',()=>showUI(wrap.classList.contains('hidden')));
|
||||
|
||||
document.addEventListener('keydown',e=>{
|
||||
if(e.altKey||e.ctrlKey||e.metaKey||e.shiftKey) return;
|
||||
const isInput=/^(?:input|select|textarea)$/i.test(e.target.nodeName);
|
||||
|
||||
if(e.keyCode===HOTKEY && !isInput){
|
||||
e.preventDefault(); showUI(true);
|
||||
}else if(e.keyCode===ESC){
|
||||
e.preventDefault(); showUI(false); blurBar();
|
||||
}else if(e.keyCode===DOWN && document.activeElement===bar){
|
||||
e.preventDefault();
|
||||
const first=list.firstElementChild;
|
||||
if(first){ blurBar(); first.classList.add('focus'); }
|
||||
}else if((e.keyCode===DOWN||e.keyCode===UP||e.keyCode===ENTER)
|
||||
&& document.activeElement!==bar){
|
||||
const cur=list.querySelector('li.focus'); if(!cur) return;
|
||||
e.preventDefault();
|
||||
if(e.keyCode===DOWN){
|
||||
const nxt=cur.nextElementSibling;
|
||||
if(nxt){ cur.classList.remove('focus'); nxt.classList.add('focus'); }
|
||||
}else if(e.keyCode===UP){
|
||||
const prv=cur.previousElementSibling;
|
||||
cur.classList.remove('focus');
|
||||
if(prv){ prv.classList.add('focus'); } else { bar.focus(); }
|
||||
}else{ /* ENTER */
|
||||
const a=cur.querySelector('a'); if(a) window.location.assign(a.href);
|
||||
}
|
||||
const inForm=/^(?:input|select|textarea)$/i.test(e.target.nodeName);
|
||||
if(e.keyCode===HOTKEY && !inForm){ e.preventDefault(); showUI(true); }
|
||||
else if(e.keyCode===ESC){ e.preventDefault(); showUI(false); blurBar(); }
|
||||
else if(e.keyCode===DOWN && document.activeElement===bar){
|
||||
e.preventDefault(); const first=list.firstElementChild; if(first){ blurBar(); first.classList.add('focus'); }
|
||||
}else if([DOWN,UP,ENTER].includes(e.keyCode) && document.activeElement!==bar){
|
||||
const cur=list.querySelector('li.focus'); if(!cur) return; e.preventDefault();
|
||||
if(e.keyCode===DOWN){ const nxt=cur.nextElementSibling; if(nxt){ cur.classList.remove('focus'); nxt.classList.add('focus'); }}
|
||||
else if(e.keyCode===UP){ const prv=cur.previousElementSibling; cur.classList.remove('focus'); if(prv){ prv.classList.add('focus'); } else { bar.focus(); }}
|
||||
else { const a=cur.querySelector('a'); if(a) window.location.assign(a.href); }
|
||||
}
|
||||
});
|
||||
|
||||
@ -214,16 +208,15 @@
|
||||
debounce=setTimeout(()=>worker.postMessage(e.target.value.trim()),120);
|
||||
});
|
||||
|
||||
/* ───────────────── 6. Worker messages ────────────────────── */
|
||||
worker.onmessage = ({data})=>{
|
||||
if(data && data.ready){ /* first ping */
|
||||
icon.innerHTML=READY_ICON_HTML; /* restore “🔍” */
|
||||
/* ───────────── 6. Worker messages ─────────────────────── */
|
||||
worker.onmessage = ({data}) => {
|
||||
if(data && data.ready){
|
||||
icon.innerHTML=READY_ICON;
|
||||
icon.setAttribute('aria-label','Open search (S)');
|
||||
return;
|
||||
}
|
||||
const docs=data;
|
||||
const q=bar.value.trim();
|
||||
const terms=q.split(/\s+/).filter(Boolean);
|
||||
const q = bar.value.trim(); const terms=q.split(/\s+/).filter(Boolean);
|
||||
header.textContent=metric(docs.length,q);
|
||||
clear(list);
|
||||
docs.forEach(d=>{
|
||||
|
Loading…
x
Reference in New Issue
Block a user