Skip to content

Commit 3ae485f

Browse files
committed
Speed up highlights in extension
1 parent 73e317d commit 3ae485f

5 files changed

Lines changed: 199 additions & 240 deletions

File tree

‎src/data/modules/api.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ function* req(url, options={}, retries=0) {
108108
finalURL = url
109109

110110
let errorMessage = 'failed to load'
111+
let status
111112

112113
for(let i = 0; i <= retries; i++){
113114
try{
@@ -122,6 +123,7 @@ function* req(url, options={}, retries=0) {
122123
return winner.req;
123124
}catch(e){
124125
errorMessage = e.message || ''
126+
status = e.status
125127

126128
//stop if client error
127129
if (e && e.status && e.status >= 400 && e.status < 500)
@@ -133,7 +135,7 @@ function* req(url, options={}, retries=0) {
133135
}
134136
}
135137

136-
throw new ApiError({ errorMessage: `${errorMessage} ${finalURL}` })
138+
throw new ApiError({ status, errorMessage: `${errorMessage} ${finalURL}` })
137139
}
138140

139141
const fetchWrap = (url, options)=>(
Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
# Flow
2-
1. tab.onActivated / tab.onTabsUpdated
3-
- tab.status = completed
4-
- load
5-
- load user
6-
- have permissions
7-
- links.has
8-
- highlights not yet loaded:
9-
- load api
10-
- inject JS
11-
- send RDH_CONFIG, RDH_APPLY
12-
2. permissions.onAdded / LINKS_CHANGED
13-
- reset
14-
- go to 1
15-
3. addCurrentTabSelection()
16-
- request permissions
17-
- send RDH_ADD_SELECTION
2+
- tab activated / page loaded / BOOKMARKS_CHANGED
3+
- sync: links cache → load highlights → push to page (inject script if needed)
4+
- page sends RDH_ADD / RDH_UPDATE / RDH_REMOVE
5+
- save to server → push verified state back to page
6+
- on failure → sync, page reverts to real state
7+
- RDH_READY is ignored: every injection is followed by push with config
8+
- addCurrentTabSelection()
9+
- request permissions → RDH_ADD_SELECTION → page sends RDH_ADD
Lines changed: 24 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,36 @@
11
import browser from 'webextension-polyfill'
22
import { currentTab } from '~target'
3-
import { load, add, update, remove, addSelection, requestPermission } from './logic'
3+
import { sync, add, update, remove, addSelection, requestPermission } from './logic'
44

5-
//Received messages from page
65
async function onMessage({ type, payload }, sender) {
76
if (sender.id != browser.runtime.id) return
87

98
const tab = sender.tab || await currentTab()
109

10+
//RDH_READY is ignored on purpose: every injection is followed by push() with config
1111
switch(type) {
12-
case 'RDH_READY':
1312
case 'BOOKMARKS_CHANGED':
14-
await load(tab)
13+
await sync(tab)
1514
break
1615

1716
case 'RDH_ADD':
18-
try {
19-
await add(tab, payload)
20-
} catch(e) {
21-
alert(`Error saving highlight!\n${String(e)}`)
22-
}
23-
break
24-
2517
case 'RDH_UPDATE':
26-
try {
27-
await update(tab, payload._id, payload)
28-
} catch(e) {
29-
alert(`Error updating highlight!\n${String(e)}`)
30-
}
31-
break
32-
3318
case 'RDH_REMOVE':
3419
try {
35-
await remove(tab, payload._id)
20+
if (type == 'RDH_ADD')
21+
await add(tab, payload)
22+
else if (type == 'RDH_UPDATE')
23+
await update(tab, payload)
24+
else
25+
await remove(tab, payload._id)
3626
} catch(e) {
37-
alert(`Error removing highlight!\n${String(e)}`)
27+
console.error(e)
28+
await sync(tab) //revert page to real state
3829
}
3930
break
4031
}
4132
}
4233

43-
//Reload highlights when tab url change
4434
async function onTabActivated({ tabId }) {
4535
if (!tabId) return
4636

@@ -49,38 +39,35 @@ async function onTabActivated({ tabId }) {
4939
if (!tab || !tab.url || !tab.active || tab.status != 'complete')
5040
return
5141

52-
await load(tab)
42+
await sync(tab)
5343
}
5444

55-
async function onTabsUpdated(id) {
56-
return onTabActivated({ tabId: id })
45+
async function onTabUpdated(tabId, changeInfo={}) {
46+
//full load or spa navigation, title/favicon/etc. is noise
47+
if (changeInfo.status == 'complete' || changeInfo.url)
48+
await onTabActivated({ tabId })
5749
}
5850

59-
//Reload when bookmarks or permissions change
60-
async function reloadAll() {
51+
async function onPermissionsAdded() {
6152
const { id } = await currentTab()
62-
return onTabActivated({ tabId: id })
53+
if (id)
54+
await onTabActivated({ tabId: id })
6355
}
6456

65-
//public methods
6657
export async function addCurrentTabSelection() {
6758
if (await requestPermission())
6859
return addSelection(await currentTab())
6960
}
7061

71-
//default
7262
export default function() {
73-
//connection to injected script
7463
browser.runtime.onMessage.removeListener(onMessage)
7564
browser.runtime.onMessage.addListener(onMessage)
7665

77-
//current tab changed
7866
browser.tabs.onActivated.removeListener(onTabActivated)
7967
browser.tabs.onActivated.addListener(onTabActivated)
80-
browser.tabs.onUpdated.removeListener(onTabsUpdated)
81-
browser.tabs.onUpdated.addListener(onTabsUpdated)
68+
browser.tabs.onUpdated.removeListener(onTabUpdated)
69+
browser.tabs.onUpdated.addListener(onTabUpdated)
8270

83-
//permissions changed
84-
browser.permissions.onAdded.removeListener(reloadAll)
85-
browser.permissions.onAdded.addListener(reloadAll)
86-
}
71+
browser.permissions.onAdded.removeListener(onPermissionsAdded)
72+
browser.permissions.onAdded.addListener(onPermissionsAdded)
73+
}

0 commit comments

Comments
 (0)