deblan-mirror/TabFS
1
0
Fork 0
mirror of https://github.com/osnr/TabFS.git synced 2024-05-13 02:56:35 +02:00
Code Issues Projects Releases Wiki Activity

extension: Finish source code view on routes.html.

Browse source 
Remove vestiges of backgroundJS hot swap.
This commit is contained in:
Omar Rizwan 2021-08-19 19:10:13 -07:00
parent 37cdd270bd
commit d07c99e701
1 changed files with 30 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
extension/background.js
View file

@ -641,44 +641,41 @@ Routes["/runtime/reload"] = {
truncate() { return {}; } truncate() { return {}; }
}; };
(function() {
// window.__backgroundJS needs to be a global because we want its
// value (the changed JS text) to survive even as this whole file
// gets re-evaluated.
window.__backgroundJS = window.__backgroundJS || false;
Object.defineProperty(window, 'backgroundJS', {
async get() {
if (!window.__backgroundJS) {
window.__backgroundJS = await window.fetch(chrome.runtime.getURL('background.js'))
.then(r => r.text());
}
return window.__backgroundJS;
},
set(js) { window.__backgroundJS = js; },
configurable: true // so we can rerun this on hot reload
});
})();
Routes["/runtime/routes.html"] = makeRouteWithContents(async () => { Routes["/runtime/routes.html"] = makeRouteWithContents(async () => {
// WIP // WIP
const jsLines = (await window.backgroundJS).split('\n'); if (!window.__backgroundJS) {
window.__backgroundJS = await window.fetch(chrome.runtime.getURL('background.js'))
.then(r => r.text());
}
const jsLines = (window.__backgroundJS).split('\n');
function findRouteLineRange(path) { function findRouteLineRange(path) {
console.log('frlr', path);
for (let i = 0; i < jsLines.length; i++) { for (let i = 0; i < jsLines.length; i++) {
if (jsLines[i].includes(`Routes["${path}"] = `)) { return [ if (jsLines[i].includes(`Routes["${path}"] = `)) {
i + 1, // + 1 because GitHub line numbers are 1-indexed if (jsLines[i].match(/;/)) { return [i, i]; } // hacky: if it's a one-liner
(function() { const [_, startBracket] = jsLines[i].match(/Routes\[[^\]]*\] = [^\(\{]*([\(\{])/);
// TODO:
// find the first bracket on that line after the = const endBracket = ({'(': ')', '{': '}'})[startBracket];
// walk forward until we find the corresponding match for it let counter = 1;
// that's the last line? for (let j = i + 1; j < jsLines.length; j++) {
return i + 2; for (let k = 0; k < jsLines[j].length; k++) {
})() if (jsLines[j][k] === startBracket) { counter++; }
]; } else if (jsLines[j][k] === endBracket) { counter--; }
if (counter === 0) { return [i, j]; }
}
}
return null; // did not find
}
} }
return null; // did not find
} }
return ` return `
<html> <html>
<head>
<style>
dt:not(:first-of-type) { margin-top: 1em; }
</style>
</head>
<body> <body>
<p>(work in progress)</p> <p>(work in progress)</p>
<dl> <dl>
@ -698,10 +695,10 @@ Routes["/runtime/routes.html"] = makeRouteWithContents(async () => {
</dd>` : '<dd style="background-color: #f99">No usage found!</dd>'} </dd>` : '<dd style="background-color: #f99">No usage found!</dd>'}
${lineRange ? ${lineRange ?
`<dd><details> `<dd><details>
<summary>Source code (<a href="https://github.com/osnr/TabFS/blob/master/extension/background.js#L${lineRange[0]}-L${lineRange[1]}">on GitHub</a>)</summary> <summary>Source code (<a href="https://github.com/osnr/TabFS/blob/master/extension/background.js#L${lineRange[0]+1}-L${lineRange[1]+1}">on GitHub</a>)</summary>
<pre><code>${ <pre><code>${
jsLines[lineRange[0] - 1] jsLines.slice(lineRange[0], lineRange[1] + 1).join('\n')
// FIXME: get entire range; escape for HTML // FIXME: escape for HTML
}</code></pre> }</code></pre>
</details></dd>` : '<dd style="background-color: #f99">No source code found!</dd>'} </details></dd>` : '<dd style="background-color: #f99">No source code found!</dd>'}
`; `;
@ -864,9 +861,6 @@ async function onMessage(req) {
}; };
function tryConnect() { function tryConnect() {
// so we don't try to reconnect if we're hot-swapping background.js.
if (window.isConnected) return;
// Safari is very weird -- it has this native app that we have to talk to, // Safari is very weird -- it has this native app that we have to talk to,
// so we poke that app to wake it up, get it to start the TabFS process // so we poke that app to wake it up, get it to start the TabFS process
// and boot a WebSocket, then connect to it. // and boot a WebSocket, then connect to it.
@ -888,8 +882,6 @@ function tryConnect() {
setTimeout(() => { setTimeout(() => {
if (socket.readyState === 1) { if (socket.readyState === 1) {
window.isConnected = true;
} else { } else {
console.log('ws connection failed, retrying in', checkAfterTime); console.log('ws connection failed, retrying in', checkAfterTime);
connectSocket(checkAfterTime * 2); connectSocket(checkAfterTime * 2);
@ -902,10 +894,8 @@ function tryConnect() {
} }
port = chrome.runtime.connectNative('com.rsnous.tabfs'); port = chrome.runtime.connectNative('com.rsnous.tabfs');
window.isConnected = true;
port.onMessage.addListener(onMessage); port.onMessage.addListener(onMessage);
port.onDisconnect.addListener(p => { port.onDisconnect.addListener(p => {
window.isConnected = false;
console.log('disconnect', p); console.log('disconnect', p);
}); });
} }