Merge pull request #10 from mstephen19/develop

mstephen19 · web-flow · commit d4100b5fd6f7 · 2025-01-22T03:46:24.000+01:00
Develop
diff --git a/README.md b/README.md
@@ -46,4 +46,4 @@ Tab Samurai offers four primary features.
 
 ## License
 
-Tab Samurai is an open-source project operating under a modified MIT license. [See license](./LICENSE)
+Tab Samurai is an open-source project operating under a modified MIT license. [See license](./LICENSE).
diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 3,
     "name": "Tab Samurai",
     "short_name": "Tabs",
-    "version": "1.1.1",
+    "version": "1.2.0",
     "description": "Take your browsing experience to the next level with automatic tab hibernation, smart tab management, and intuitive tab recovery.",
     "icons": {
         "16": "public/icon16.png",
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "tabs",
     "private": true,
-    "version": "1.1.1",
+    "version": "1.2.0",
     "type": "module",
     "scripts": {
         "dev": "vite",
diff --git a/src/background/cache.ts b/src/background/cache.ts
@@ -1,3 +1,4 @@
-import { store, storageMemCache } from '../storage';
+import { store, storageMemCache, collections, collectionMemCache } from '../storage';
 
 export const config = storageMemCache(store.config);
+export const tabPageStates = collectionMemCache(collections.tabPageStates);
diff --git a/src/background/index.ts b/src/background/index.ts
@@ -2,6 +2,7 @@ import * as tabState from './tabState';
 import * as tabDiscard from './tabDiscard';
 import * as tabMetadata from './tabMetadata';
 import * as cache from './cache';
+import * as updates from './updates';
 import { defaultConfig, UNINSTALL_URL } from '../consts';
 import './listener/index';
 
@@ -12,11 +13,13 @@ async function main() {
         // Tab discard is dependent on tabState & user config (Settings)
         tabState.initialize(),
         cache.config.init(defaultConfig),
+        cache.tabPageStates.init(),
     ]);
 
     tabDiscard.initialize();
 
     chrome.runtime.setUninstallURL(UNINSTALL_URL);
+    updates.initialize();
 }
 
 main();
diff --git a/src/background/tabDiscard.ts b/src/background/tabDiscard.ts
@@ -1,5 +1,5 @@
 import { collections } from '../storage';
-import { config } from './cache';
+import * as cache from './cache';
 import { store } from '../storage';
 import { tabs as tabUtils, logger } from '../utils';
 
@@ -56,14 +56,14 @@ export const initialize = async () => {
 
     // Initial scheduling
     Object.entries(timestamps).forEach(([tabId, timestamp]) => {
-        if (tabUtils.shouldWhitelist(tabs.find(({ id }) => id === +tabId)!, config.latest!)) {
+        if (tabUtils.shouldWhitelist(tabs.find(({ id }) => id === +tabId)!, cache.config.latest!, cache.tabPageStates.latest)) {
             tabWhitelist.add(+tabId);
             return;
         }
 
         if (tabs.find(({ id }) => id === +tabId)?.discarded) return;
 
-        scheduler.schedule(tabId, timestamp, config.latest!.discardTabsAfterMilliseconds);
+        scheduler.schedule(tabId, timestamp, cache.config.latest!.discardTabsAfterMilliseconds);
     });
 
     log.debug('Initialized');
@@ -78,7 +78,7 @@ export const initialize = async () => {
             return;
         }
 
-        scheduler.schedule(tabId, timestamp, config.latest!.discardTabsAfterMilliseconds);
+        scheduler.schedule(tabId, timestamp, cache.config.latest!.discardTabsAfterMilliseconds);
     };
 
     collections.tabDeactivationTimestamps.onChange(handleTabActivationChange);
@@ -90,7 +90,7 @@ export const initialize = async () => {
         const tab = await chrome.tabs.get(tabId);
 
         // If a change was made to the tab that means it should now be whitelisted, add to the whitelist
-        if (tabUtils.shouldWhitelist(tab, config.latest!)) {
+        if (tabUtils.shouldWhitelist(tab, cache.config.latest!, cache.tabPageStates.latest)) {
             scheduler.unschedule(tabId);
             tabWhitelist.add(tabId);
             return;
@@ -99,12 +99,39 @@ export const initialize = async () => {
         // If the tab was previously marked as should never discard, but that's now changed,
         // schedule the discard
         if (tabWhitelist.has(tabId)) {
+            // Remove whitelist status
+            tabWhitelist.delete(tabId);
+
             const timestamp = await collections.tabDeactivationTimestamps.get(tabId);
 
-            scheduler.schedule(tabId, timestamp, config.latest!.discardTabsAfterMilliseconds);
+            scheduler.schedule(tabId, timestamp, cache.config.latest!.discardTabsAfterMilliseconds);
+        }
+    });
+
+    cache.tabPageStates.onChange(async (tabId, state, latest) => {
+        // Tab should be whitelisted if it's recording audio/video
+        if (state && (state.audio || state.video)) {
+            scheduler.unschedule(tabId);
+            tabWhitelist.add(+tabId);
+            return;
         }
 
-        tabWhitelist.delete(tabId);
+        // Otherwise, shouldn't be in whitelist
+
+        // If it is in the whitelist already though
+        if (tabWhitelist.has(+tabId)) {
+            const tab = await chrome.tabs.get(+tabId);
+
+            // Check if other conditions say the tab should remain whitelisted, don't remove it
+            if (tabUtils.shouldWhitelist(tab, cache.config.latest!, latest)) return;
+
+            // Otherwise, remove it
+            tabWhitelist.delete(+tabId);
+
+            const timestamp = await collections.tabDeactivationTimestamps.get(tabId);
+
+            scheduler.schedule(tabId, timestamp, cache.config.latest!.discardTabsAfterMilliseconds);
+        }
     });
 
     store.config.onChange(async (latest, previous) => {
@@ -123,7 +150,7 @@ export const initialize = async () => {
                     if (tab.discarded || !tab.id) return;
 
                     const tabAlreadyInWhitelist = tabWhitelist.has(tab.id);
-                    const shouldAddToWhitelist = tabUtils.shouldWhitelist(tab, latest);
+                    const shouldAddToWhitelist = tabUtils.shouldWhitelist(tab, latest, cache.tabPageStates.latest);
 
                     // If the tab should be added to the whitelist, but is already in it, do nothing
                     // Improves performance by not iterating through every tab each time
diff --git a/src/background/updates.ts b/src/background/updates.ts
@@ -0,0 +1,26 @@
+import { store } from '../storage';
+
+export const initialize = async () => {
+    const [availableUpdateVersion, updateDetails] = await Promise.all([
+        store.availableUpdateVersion.read(),
+        chrome.runtime.requestUpdateCheck(),
+    ]);
+
+    const updateAvailable = updateDetails.status === 'update_available';
+    // const throttled = updateDetails.status === 'throttled';
+
+    // If an update is available & not already tracked
+    if (updateAvailable && updateDetails.version !== availableUpdateVersion) {
+        console.log('hi');
+        store.availableUpdateVersion.write(updateDetails.version);
+    }
+
+    // If an update isn't available but a version is still tracked
+    if (!updateAvailable && availableUpdateVersion) {
+        store.availableUpdateVersion.write(null);
+    }
+
+    chrome.runtime.onUpdateAvailable.addListener(({ version }) => {
+        store.availableUpdateVersion.write(version);
+    });
+};
diff --git a/src/popup/Accordions/QuickActions/index.tsx b/src/popup/Accordions/QuickActions/index.tsx
@@ -1,9 +1,10 @@
 import { useCallback, useContext, useMemo } from 'react';
 import { TabsContext } from '../../context/TabsProvider';
-import { Box, Button, type ButtonProps, styled } from '@mui/material';
+import { Box, Button, type ButtonProps, styled, Tooltip } from '@mui/material';
 import { ConfigContext } from '../../context/ConfigProvider';
 import { pluralize, tabs as tabUtils } from '../../../utils';
 import { toast } from '../../Toast';
+import { PageStateContext } from '../../context/PageStateProvider';
 
 const QuickActionButton = styled((props: ButtonProps) => <Button {...props} variant='contained' />)({
     textTransform: 'none',
@@ -13,12 +14,15 @@ const QuickActionButton = styled((props: ButtonProps) => <Button {...props} vari
 export const QuickActions = () => {
     const tabs = useContext(TabsContext);
     const config = useContext(ConfigContext);
+    const pageStates = useContext(PageStateContext);
 
-    const allTabsDiscardedActiveOrWhitelisted = tabs.every((tab) => tab.discarded || tab.active || tabUtils.shouldWhitelist(tab, config));
+    const allTabsDiscardedActiveOrWhitelisted = tabs.every(
+        (tab) => tab.discarded || tab.active || tabUtils.shouldWhitelist(tab, config, pageStates)
+    );
 
     const handleSuspendInactiveTabs = useCallback(async () => {
         try {
-            const inactiveTabs = tabs.filter((tab) => !tab.active && !tab.discarded && !tabUtils.shouldWhitelist(tab, config));
+            const inactiveTabs = tabs.filter((tab) => !tab.active && !tab.discarded && !tabUtils.shouldWhitelist(tab, config, pageStates));
 
             await Promise.all(inactiveTabs.map((tab) => chrome.tabs.discard(tab.id!)));
 
@@ -32,9 +36,9 @@ export const QuickActions = () => {
                 message: 'Failed to hibernate inactive tabs.',
             });
         }
-    }, [tabs, config]);
+    }, [tabs, config, pageStates]);
 
-    const audibleTabs = tabs.filter((tab) => tab.audible);
+    const audibleTabs = tabs.filter((tab) => tab.audible && !tab.mutedInfo?.muted);
     const someTabsAudible = Boolean(audibleTabs.length);
 
     const handleMuteMediaTabs = useCallback(async () => {
@@ -93,17 +97,21 @@ export const QuickActions = () => {
 
     return (
         <Box display='flex' gap='5px' flexWrap='wrap'>
-            <QuickActionButton disabled={someDuplicateTabs} onClick={handleCloseDuplicateTabs}>
-                Close Duplicate Tabs
-            </QuickActionButton>
+            <Tooltip title={`Found ${duplicateTabs.length} tabs which are duplicates`}>
+                <QuickActionButton disabled={!someDuplicateTabs} onClick={handleCloseDuplicateTabs}>
+                    Close Duplicate Tabs
+                </QuickActionButton>
+            </Tooltip>
 
             <QuickActionButton disabled={allTabsDiscardedActiveOrWhitelisted} onClick={handleSuspendInactiveTabs}>
                 Hibernate All Inactive Tabs
             </QuickActionButton>
 
-            <QuickActionButton disabled={!someTabsAudible} onClick={handleMuteMediaTabs}>
-                Mute All Media-Playing Tabs
-            </QuickActionButton>
+            <Tooltip title={`Found ${audibleTabs.length} audible tabs`}>
+                <QuickActionButton disabled={!someTabsAudible} onClick={handleMuteMediaTabs}>
+                    Mute All Media-Playing Tabs
+                </QuickActionButton>
+            </Tooltip>
 
             <QuickActionButton disabled={!someTabsUnpinned} onClick={handleCloseUnpinnedTabs}>
                 Close All Unpinned Tabs
diff --git a/src/popup/Accordions/Settings/index.tsx b/src/popup/Accordions/Settings/index.tsx
@@ -43,7 +43,7 @@ export const Settings = () => {
             <Box display='flex' flexDirection='column'>
                 <ConfigName
                     name='Hibernate Pinned Tabs'
-                    tip='Whether or not to hibernate pinned tabs. Tabs playing audio will never hibernate.'
+                    tip='Whether or not to hibernate pinned tabs. Tabs playing audio and/or recording video/audio will never hibernate.'
                 />
 
                 <FormControlLabel
diff --git a/src/popup/Accordions/TabManager/index.tsx b/src/popup/Accordions/TabManager/index.tsx
@@ -16,6 +16,8 @@ export const TabManager = () => {
     const [inputText, setInputText] = useState('');
 
     const groupedTabs = useMemo(() => {
+        console.log(pageStates);
+
         const groupedTabList = Object.entries(tabGroupFns[appData.manageTabsGroupBy](tabs));
 
         switch (appData.manageTabsGroupBy) {
@@ -54,9 +56,10 @@ export const TabManager = () => {
                 const pageStateA = pageStates[a.id!];
                 const pageStateB = pageStates[b.id!];
 
-                if (pageStateA?.video !== pageStateB?.video) return pageStateA?.video ? -1 : 1;
-                if (pageStateA?.audio !== pageStateB?.audio) return pageStateA?.audio ? -1 : 1;
-                if (a.audible !== b.audible) return a.audible ? -1 : 1;
+                if (Boolean(pageStateA?.video) !== Boolean(pageStateB?.video)) return pageStateA?.video ? -1 : 1;
+                if (Boolean(pageStateA?.audio) !== Boolean(pageStateB?.audio)) return pageStateA?.audio ? -1 : 1;
+                if (Boolean(a.audible && !a.mutedInfo?.muted) !== Boolean(b.audible && !b.mutedInfo?.muted))
+                    return a.audible && !a.mutedInfo?.muted ? -1 : 1;
                 return 0;
             })
         );
diff --git a/src/popup/Accordions/index.tsx b/src/popup/Accordions/index.tsx
@@ -33,9 +33,7 @@ const ManageTabsAccordion = () => {
 
     return (
         <ManagedAccordion chip={tabs.length.toString()} stateKey='manage' title='Manage Tabs' icon={<ManageSearchIcon />} unmountOnExit>
-            <PageStateProvider>
-                <TabManager />
-            </PageStateProvider>
+            <TabManager />
         </ManagedAccordion>
     );
 };
@@ -63,11 +61,13 @@ export const Accordions = () => {
                 <Divider flexItem />
 
                 <TabsProvider>
-                    <QuickActionsAccordion />
+                    <PageStateProvider>
+                        <QuickActionsAccordion />
 
-                    <Divider flexItem />
+                        <Divider flexItem />
 
-                    <ManageTabsAccordion />
+                        <ManageTabsAccordion />
+                    </PageStateProvider>
                 </TabsProvider>
 
                 <Divider flexItem />
diff --git a/src/popup/UpdatePrompt.tsx b/src/popup/UpdatePrompt.tsx
@@ -3,7 +3,8 @@ import { useCallback, useContext, useState } from 'react';
 import { UpdateContext } from './context/UpdateProvider';
 
 export const UpdatePrompt = () => {
-    const { available, version } = useContext(UpdateContext);
+    const version = useContext(UpdateContext);
+    const available = Boolean(version);
     const [dismissed, setDismissed] = useState(false);
 
     const handleUpdate = useCallback(() => chrome.runtime.reload(), []);
diff --git a/src/popup/context/UpdateProvider.tsx b/src/popup/context/UpdateProvider.tsx
@@ -1,38 +1,11 @@
-import { createContext, type ReactNode, useEffect, useState } from 'react';
-import { EXTENSION_VERSION } from '../../consts';
+import { createContext } from 'react';
+import { store } from '../../storage';
+import { storeProvider } from './StoreProvider';
 
-export const UpdateContext = createContext({
-    available: false,
-    version: EXTENSION_VERSION,
-});
-
-export const UpdateProvider = ({ children }: { children?: ReactNode }) => {
-    const [info, setInfo] = useState({
-        available: false,
-        version: EXTENSION_VERSION,
-    });
-
-    useEffect(() => {
-        const listener = ({ version }: chrome.runtime.UpdateAvailableDetails) => setInfo({ available: true, version: version });
-
-        const init = async () => {
-            const details = await chrome.runtime.requestUpdateCheck();
-
-            if (details.status === 'update_available') {
-                chrome.runtime.onUpdateAvailable.removeListener(listener);
+export const UpdateContext = createContext<string | null>(null);
 
-                setInfo({ available: true, version: details.version });
-            }
-        };
-
-        init();
-
-        chrome.runtime.onUpdateAvailable.addListener(listener);
-
-        return () => {
-            chrome.runtime.onUpdateAvailable.removeListener(listener);
-        };
-    }, []);
-
-    return <UpdateContext.Provider value={info}>{children}</UpdateContext.Provider>;
-};
+export const UpdateProvider = storeProvider({
+    store: store.availableUpdateVersion,
+    defaultValue: null,
+    context: UpdateContext,
+});
diff --git a/src/storage.ts b/src/storage.ts
diff --git a/src/utils.ts b/src/utils.ts

Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,4 @@ Tab Samurai offers four primary features.`
`46`	`46`
`47`	`47`	`## License`
`48`	`48`
`49`		`-Tab Samurai is an open-source project operating under a modified MIT license. [See license](./LICENSE)`
	`49`	`+Tab Samurai is an open-source project operating under a modified MIT license. [See license](./LICENSE).`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tabs",`
`3`	`3`	`"private": true,`
`4`		`- "version": "1.1.1",`
	`4`	`+ "version": "1.2.0",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"dev": "vite",`