reduxjs/redux-devtools
1
1
Fork 0
mirror of https://github.com/reduxjs/redux-devtools.git synced 2025-07-15 10:42:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix monitoring on opening panel

Browse Source
This commit is contained in:
Nathan Bierema 2024-08-31 16:41:08 -04:00
parent e49708d831
commit 13e637052d
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extension/src/background/store/apiMiddleware.ts
View File

@ -249,7 +249,6 @@ const chunks: {
>; >;
} = {}; } = {};
let monitors = 0; let monitors = 0;
let isMonitored = false;
const getId = (sender: chrome.runtime.MessageSender, name?: string) => const getId = (sender: chrome.runtime.MessageSender, name?: string) =>
sender.tab ? sender.tab.id! : name || sender.id!; sender.tab ? sender.tab.id! : name || sender.id!;
@ -412,17 +411,15 @@ function toAllTabs(msg: TabMessage) {
} }
} }
function monitorInstances(shouldMonitor: boolean, id?: string) { function monitorInstances(id?: string) {
if (!id && isMonitored === shouldMonitor) return;
const action = { const action = {
type: shouldMonitor ? ('START' as const) : ('STOP' as const), type: monitors > 0 ? ('START' as const) : ('STOP' as const),
}; };
if (id) { if (id) {
if (connections.tab[id]) connections.tab[id].postMessage(action); if (connections.tab[id]) connections.tab[id].postMessage(action);
} else { } else {
toAllTabs(action); toAllTabs(action);
} }
isMonitored = shouldMonitor;
} }
function getReducerError() { function getReducerError() {
@ -559,7 +556,7 @@ function disconnect(
} }
} else { } else {
monitors--; monitors--;
if (!monitors) monitorInstances(false); if (monitors == 0) monitorInstances();
} }
}; };
} }
@ -581,7 +578,7 @@ function onConnect<S, A extends Action<string>>(port: chrome.runtime.Port) {
chrome.action.enable(id); chrome.action.enable(id);
chrome.action.setIcon({ tabId: id, path: 'img/logo/38x38.png' }); chrome.action.setIcon({ tabId: id, path: 'img/logo/38x38.png' });
} }
if (isMonitored) port.postMessage({ type: 'START' }); if (monitors > 0) port.postMessage({ type: 'START' });
const state = store.getState(); const state = store.getState();
if (state.instances.persisted) { if (state.instances.persisted) {
@ -609,20 +606,20 @@ function onConnect<S, A extends Action<string>>(port: chrome.runtime.Port) {
} else if (port.name && port.name.indexOf('monitor') === 0) { } else if (port.name && port.name.indexOf('monitor') === 0) {
id = getId(port.sender!, port.name); id = getId(port.sender!, port.name);
connections.monitor[id] = port; connections.monitor[id] = port;
monitorInstances(true); monitors++;
monitorInstances();
listener = (msg: BackgroundAction | 'heartbeat') => { listener = (msg: BackgroundAction | 'heartbeat') => {
if (msg === 'heartbeat') return; if (msg === 'heartbeat') return;
store.dispatch(msg); store.dispatch(msg);
}; };
port.onMessage.addListener(listener); port.onMessage.addListener(listener);
monitors++;
port.onDisconnect.addListener(disconnect('monitor', id)); port.onDisconnect.addListener(disconnect('monitor', id));
} else { } else {
// devpanel // devpanel
id = port.name || port.sender!.frameId!; id = port.name || port.sender!.frameId!;
connections.panel[id] = port; connections.panel[id] = port;
monitorInstances(true, port.name);
monitors++; monitors++;
monitorInstances(port.name);
listener = (msg: BackgroundAction | 'heartbeat') => { listener = (msg: BackgroundAction | 'heartbeat') => {
if (msg === 'heartbeat') return; if (msg === 'heartbeat') return;
store.dispatch(msg); store.dispatch(msg);