feat: v0.3.1 — barra preferiti dropdown, history cliccabile, import HTML, adblock fix, WebRTC, popup bloccati

shadowbipnode · shadowbipnode · commit d3c658887d45 · 2026-05-05T10:38:40.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zap-browser",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Privacy-first Bitcoin browser with Lightning, Liquid, Cashu and Nostr",
   "main": "src/main/index.js",
   "scripts": {
diff --git a/src/main/index.js b/src/main/index.js
@@ -14,7 +14,7 @@ let mainWindow  = null
 let activeView  = null
 const tabUrls   = new Map()
 let activeTabId = null
-const SHELL_H   = 114
+const SHELL_H   = 142  // titlebar(32) + tabbar(36) + toolbar(46) + favbar(28)
 
 const UA_POOL = [
   'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
@@ -314,6 +314,24 @@ ipcMain.handle('decode-invoice',   (_, {bolt11}) => nwc.decodeInvoice(bolt11))
 
 // Favorites
 ipcMain.handle('get-favorites',   () => DB.getFavorites())
+ipcMain.handle('import-favorites-html', (_, { html }) => {
+  const results = []
+  const linkRe = /<A[^>]+HREF="([^"]+)"[^>]*>([^<]+)<\/A>/gi
+  let match
+  while ((match = linkRe.exec(html)) !== null) {
+    const url   = match[1].trim()
+    const title = match[2].trim()
+    if (url.startsWith('http') && title) {
+      try {
+        DB._db().prepare('INSERT OR IGNORE INTO favorites (url,title,favicon,created_at) VALUES(?,?,NULL,?)')
+          .run(url, title, Math.floor(Date.now()/1000))
+        results.push({ url, title })
+      } catch(_) {}
+    }
+  }
+  return results
+})
+
 ipcMain.handle('add-favorite',    (_, args) => DB.addFavorite(args))
 ipcMain.handle('remove-favorite', (_, {id}) => DB.removeFavorite(id))
 
diff --git a/src/preload/shell.js b/src/preload/shell.js
@@ -52,6 +52,7 @@ contextBridge.exposeInMainWorld('zap', {
 
   getFavorites:   () => ipcRenderer.invoke('get-favorites'),
   addFavorite:    (a) => ipcRenderer.invoke('add-favorite', a),
+  importFavoritesHtml: (a) => ipcRenderer.invoke('import-favorites-html', a),
   removeFavorite: (a) => ipcRenderer.invoke('remove-favorite', a),
 
   cashuGetBalance:  () => ipcRenderer.invoke('cashu-get-balance'),
diff --git a/src/renderer/components/browser/FavoritesPanel.tsx b/src/renderer/components/browser/FavoritesPanel.tsx
@@ -17,7 +17,10 @@ export default function FavoritesPanel({ onClose, onNavigate, currentUrl, curren
 
   useEffect(() => { load() }, [])
 
-  const load = () => (window as any).zap?.getFavorites().then(setFavs)
+  const load = () => {
+    (window as any).zap?.getFavorites().then(setFavs)
+    window.dispatchEvent(new Event('favorites-updated'))
+  }
 
   const saveCurrentPage = async () => {
     if (!currentUrl || currentUrl === 'zap://newtab') {
diff --git a/src/renderer/components/settings/SettingsPanel.tsx b/src/renderer/components/settings/SettingsPanel.tsx
@@ -170,8 +170,32 @@ export default function SettingsPanel({ onClose }: { onClose:()=>void }) {
             </select>
 
             <div className="sec-title">{lang==='it'?'Dati browser':'Browser data'}</div>
+            <div style={{display:'flex',alignItems:'center',justifyContent:'space-between',
+              padding:'10px 0',borderBottom:'1px solid var(--b0)',marginBottom:8}}>
+              <div>
+                <div style={{fontSize:13,fontWeight:600,color:'var(--t0)'}}>
+                  {lang==='it'?'Barra preferiti':'Bookmarks bar'}
+                </div>
+                <div style={{fontSize:11,color:'var(--t2)'}}>
+                  {lang==='it'?'Mostra barra sotto la barra indirizzi':'Show bar below address bar'}
+                </div>
+              </div>
+              <button onClick={() => {
+                const cur = localStorage.getItem('showFavBar') !== 'false'
+                localStorage.setItem('showFavBar', String(!cur))
+                window.dispatchEvent(new CustomEvent('toggle-favbar', { detail: !cur }))
+              }} style={{
+                padding:'4px 12px', borderRadius:'var(--r-sm)', cursor:'pointer',
+                border:'1px solid var(--b1)', fontSize:11, fontWeight:600,
+                background: localStorage.getItem('showFavBar') !== 'false' ? 'var(--amber)' : 'var(--bg-3)',
+                color: localStorage.getItem('showFavBar') !== 'false' ? '#000' : 'var(--t2)',
+              }}>
+                {localStorage.getItem('showFavBar') !== 'false' ? (lang==='it'?'Attiva':'On') : (lang==='it'?'Disattiva':'Off')}
+              </button>
+            </div>
             {[
               {label:t('clearHistory'), desc:t('clearHistoryDesc'), action:()=>z()?.clearHistory()},
+
               {label:t('clearCookies'), desc:t('clearCookiesDesc'), action:()=>z()?.clearCookies()},
               {label:t('clearCache'),   desc:t('clearCacheDesc'),   action:()=>z()?.clearCache()},
             ].map(item=>(
diff --git a/src/renderer/pages/BrowserPage.tsx b/src/renderer/pages/BrowserPage.tsx
@@ -21,6 +21,9 @@ export default function BrowserPage() {
   const [privacy, setPrivacy]   = useState<any>(null)
   const [uaDrop, setUaDrop]     = useState(false)
   const [blocked,  setBlocked]   = useState(0)
+  const [favBar,      setFavBar]    = useState<any[]>([])
+  const [showFavBar,  setShowFavBar] = useState(() => localStorage.getItem('showFavBar') !== 'false')
+  const [favDropOpen, setFavDropOpen] = useState(false)
   const [currentUA, setCurrentUA] = useState('')
   const [payment, setPayment]   = useState<any>(null)
   const [pageNostr, setPageNostr] = useState(false)
@@ -36,10 +39,14 @@ export default function BrowserPage() {
   // Load privacy settings
   useEffect(() => {
     window.zap?.getPrivacy().then(setPrivacy)
+    const loadFavBar = () => window.zap?.getFavorites().then((f: any[]) => setFavBar(f || []))
+    loadFavBar()
+    window.addEventListener('favorites-updated', loadFavBar)
     window.zap?.getUAPool().then((pool: string[]) => {
       if (pool && pool.length > 0) setCurrentUA(pool[Math.floor(Math.random() * pool.length)])
     })
     window.zap?.getBlockedCount().then(setBlocked)
+    return () => window.removeEventListener('favorites-updated', loadFavBar)
   }, [])
 
   // Listen to events from main process
@@ -57,6 +64,22 @@ export default function BrowserPage() {
       handleNewTab(url)
     })
     window.zap?.on('payment-detected', (data: any) => setPayment(data))
+
+    // Navigate from history/bookmarks
+    const onNavigateTo = (e: any) => {
+      handleNavigate((e as CustomEvent).detail)
+      setPanel(null)
+    }
+    window.addEventListener('navigate-to', onNavigateTo)
+
+    // Toggle bookmarks bar
+    const onToggleFavBar = (e: any) => setShowFavBar((e as CustomEvent).detail)
+    window.addEventListener('toggle-favbar', onToggleFavBar)
+
+    return () => {
+      window.removeEventListener('navigate-to', onNavigateTo)
+      window.removeEventListener('toggle-favbar', onToggleFavBar)
+    }
   }, [activeId])
 
   // Sync address bar with active tab
@@ -92,6 +115,7 @@ export default function BrowserPage() {
     const url = (!tab?.url || tab.url === 'zap://newtab') ? '' : tab.url
     setActive(id)
     setAddrVal(url)
+    setShowSuggest(false)
     window.zap?.tabSwitch({ tabId: id, url })
   }, [setActive, tabs])
 
@@ -311,6 +335,75 @@ export default function BrowserPage() {
         </div>
       </div>
 
+      {/* ── Bookmarks bar ────────────────────────────────────────── */}
+      {showFavBar && favBar.length > 0 && (() => {
+        const MAX = 10
+        const visible = favBar.slice(0, MAX)
+        const hidden  = favBar.slice(MAX)
+        return (
+          <div style={{
+            display:'flex', alignItems:'center', gap:2,
+            padding:'2px 8px', borderBottom:'1px solid var(--b0)',
+            background:'var(--bg-1)', flexShrink:0,
+            WebkitAppRegion:'no-drag' as any, height:28, position:'relative',
+          }}>
+            {visible.map((f: any) => (
+              <button key={f.id} onClick={() => handleNavigate(f.url)}
+                title={f.url}
+                style={{
+                  background:'none', border:'none', cursor:'pointer',
+                  color:'var(--t0)', fontSize:11, padding:'2px 7px',
+                  borderRadius:'var(--r-sm)', whiteSpace:'nowrap',
+                  display:'flex', alignItems:'center', gap:3, flexShrink:0,
+                }}
+                onMouseEnter={e => (e.currentTarget.style.background='var(--bg-3)')}
+                onMouseLeave={e => (e.currentTarget.style.background='none')}
+              >
+                🌐 {f.title?.slice(0, 18) || (() => { try { return new URL(f.url).hostname } catch(_) { return f.url } })()}
+              </button>
+            ))}
+            {hidden.length > 0 && (
+              <div style={{ position:'relative', marginLeft:'auto', flexShrink:0 }}>
+                <button
+                  onClick={() => setFavDropOpen(d => !d)}
+                  style={{
+                    background:'none', border:'none', cursor:'pointer',
+                    color:'var(--t2)', fontSize:12, padding:'2px 7px',
+                    borderRadius:'var(--r-sm)',
+                  }}
+                  onMouseEnter={e => (e.currentTarget.style.background='var(--bg-3)')}
+                  onMouseLeave={e => (e.currentTarget.style.background='none')}
+                >» {hidden.length}</button>
+                {favDropOpen && (
+                  <div style={{
+                    position:'absolute', top:24, right:0, zIndex:9999,
+                    background:'var(--bg-1)', border:'1px solid var(--b1)',
+                    borderRadius:'var(--r-md)', boxShadow:'0 8px 32px rgba(0,0,0,.4)',
+                    minWidth:220, maxHeight:300, overflowY:'auto',
+                  }}>
+                    {hidden.map((f: any) => (
+                      <button key={f.id}
+                        onClick={() => { handleNavigate(f.url); setFavDropOpen(false) }}
+                        style={{
+                          display:'block', width:'100%', textAlign:'left',
+                          background:'none', border:'none', cursor:'pointer',
+                          color:'var(--t0)', fontSize:12, padding:'8px 12px',
+                          whiteSpace:'nowrap', overflow:'hidden', textOverflow:'ellipsis',
+                        }}
+                        onMouseEnter={e => (e.currentTarget.style.background='var(--bg-3)')}
+                        onMouseLeave={e => (e.currentTarget.style.background='none')}
+                      >
+                        🌐 {f.title || f.url}
+                      </button>
+                    ))}
+                  </div>
+                )}
+              </div>
+            )}
+          </div>
+        )
+      })()}
+
       {/* ── Browser body ─────────────────────────────────────────────── */}
       <div className="app-body">
         {/* New tab page (shown when tab is zap://newtab) */}
@@ -322,7 +415,9 @@ export default function BrowserPage() {
         {/* When not new tab, BrowserView renders here (injected by Electron) */}
         {!isNew && <div style={{ flex:1 }} />}
 
-        {/* Suggestions dropdown */}
+
+
+      {/* Suggestions dropdown */}
         {showSuggest && (
           <div style={{
             position:'fixed', top:114, left:0, right:panel?320:0,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zap-browser",`
`3`		`- "version": "0.3.0",`
	`3`	`+ "version": "0.3.1",`
`4`	`4`	`"description": "Privacy-first Bitcoin browser with Lightning, Liquid, Cashu and Nostr",`
`5`	`5`	`"main": "src/main/index.js",`
`6`	`6`	`"scripts": {`