Feature/automation fixes (#51)

* fixed long running issue with deepsave not working on the 1st save

* fixed automation saving issue

* have the user approve permission before running automations

* ready for release

Author: yooper

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "your-rapport",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "description": "A chrome extension for saving screenshots and making them searchable.",
   "license": "Commercial",
   "scripts": {

package.json

@@ -12,6 +12,7 @@ import BulkAutomationUrl from '../models/schemas/BulkAutomationUrl';
 import { NoChangeDetectedError } from '../errors/NoChangeDetectedError';
 import { Tag } from '../models/schemas/Tag';
 import { getUtc, getUtcNow } from '../utilities/transformers';
+import { getActivePageInfo } from '../pages/Content/scripts/pageInfo';
 
 
 let processing: boolean = false;
@@ -142,13 +143,9 @@ async function processQueue() {
 
       // Wait for load or DNS failure (ERR_NAME_NOT_RESOLVED)
       await waitForCompleteOrDnsError(tabId);
-      const response = await chrome.tabs.sendMessage(tabId, { cmd: PAGE_INFO });
-      const { pageInfo } = response
       await focusTab(tabId);
-
       // wait for the page to finish loading
       // TODO: add configurable delay
-      await sleep(2000)
 
       // the automation requires scrolling through the page
       if (!job.isDeepSave) {
@@ -158,10 +155,10 @@ async function processQueue() {
           })
         do {
 
-          await sleep(1000)
+          await sleep(3000)
           const refreshedJob = await db.bulkAutomation.get(job.uuid)
-
           if (!refreshedJob) {
+            await debug('Unknown automation job', job)
             throw Error('Unknown job')
           }
 
@@ -177,12 +174,12 @@ async function processQueue() {
           }
           job.screenShotsCollected = refreshedJob.screenShotsCollected
           ExtensionPin.setAutomationRunning(await getQueue());
-          await sleep(1000);
         }
         while (['running', 'queued'].includes(job.status));
       }
       // deep save
       else {
+        const pageInfo = await getActivePageInfo(tab);
         await capture(tab, pageInfo, true, job as BulkAutomationUrl);
       }
       await complete(job);
@@ -200,8 +197,9 @@ async function processQueue() {
       if (!job.keepTabOpen && job.status !== 'failed' && tabId) {
         try {
           await chrome.tabs.remove(tabId);
-        } catch {
-
+        }
+        catch {
+          // error closing the tab, ignore it
         }
       }
     }

src/backgrounds/automation-runner.ts

@@ -17,20 +17,27 @@ import SyncDisabledIcon from '@mui/icons-material/SyncDisabled';
 import { Configuration } from '../models/schemas/Configuration';
 import SecurityIcon from '@mui/icons-material/Security';
 import { allSitesAccessApproved, removeAllSitesAccess, requestAllSitesAccess } from '../services/manifest_permissions';
+import AutoAwesomeIcon from '@mui/icons-material/AutoAwesome';
+import { db } from '../models/db/dexieDb';
 
 export default function TopAppBar() {
   const [anchorEl, setAnchorEl] = React.useState(null);
   const open = Boolean(anchorEl);
   const [auth, setAuth] = React.useState(true);
   const [configuration, setConfiguration] = useState({})
   const [hasPermission, setHasPermission] = useState(true);
+  const [hasGeminiEnabled, setHasGeminiEnabled] = useState(false);
+  const [geminiTooltip, setGeminiTooltip] = useState('')
 
   useEffect(() => {
     async function fetchData(){
       const user = await getUser();
       setAuth(user && user.verify() ? true : false);
       setConfiguration(await Configuration.getConfiguration());
       setHasPermission(await allSitesAccessApproved());
+      const result = await LanguageModel.availability({ languages: ["en"] })
+      setGeminiTooltip(result)
+      setHasGeminiEnabled(result === 'available');
     }
     fetchData();
   }, []);
@@ -69,6 +76,19 @@ export default function TopAppBar() {
     if(found){
       createTab(found.url, '_blank');
     }
+
+    if(found.name === 'automations'){
+      // stop all automations from running
+      const automations = await db.bulkAutomation.toArray();
+      automations.forEach(a => {
+        // flagged to run
+        if(a.active && !a.ranOn){
+          a.active = false;
+        }
+      })
+      await db.bulkAutomation.bulkPut(automations);
+    }
+
   }
 
   return (
@@ -133,6 +153,23 @@ export default function TopAppBar() {
           </Tooltip>
 
 
+          <Tooltip
+            title={ 'Gemini Nano is ' + geminiTooltip}>
+            <IconButton
+              size="large"
+              aria-label=""
+              color="inherit"
+              onClick={async() => {
+                if(geminiTooltip === 'downloadable') {
+                  chrome.runtime.sendMessage({cmd: 'installGemini'})
+                }
+              }}
+            >
+              <AutoAwesomeIcon color={ ['available', 'downloading'].includes(geminiTooltip) ? 'info' : 'error'}/>
+            </IconButton>
+          </Tooltip>
+
+
           {auth && configuration.syncBackgroundEnabled ? (
             <Tooltip title={'Local data sync is active'}>
               <IconButton

src/components/TopAppBar.js

@@ -17,41 +17,43 @@ import {
   UUID
 } from '../../services/constants';
 import { debug } from '../../services/logger_services';
-import { sortByField } from '../../utilities/transformers';
+import { sha256, sortByField } from '../../utilities/transformers';
 import { db } from '../../models/db/dexieDb';
 import ExtensionPin from '../../utilities/ExtensionPin';
+import { requestAllSitesAccess } from '../../services/manifest_permissions';
 
 export default function BulkAutomationTable(props) {
   const [rows, setRows] = useState([]);
-  const [isLoading, setIsLoading] = useState(true);
+  const [isLoading, setIsLoading] = useState(false);
+  let cacheHash = '';
 
   async function fetchData() {
     showLoader();
-    setIsLoading(true);
     const start = performance.now();
     const data = await db.bulkAutomation.toArray();
+    cacheHash = await sha256(JSON.stringify(data));
     sortByField(data, 'createdOn')
-
-    if (data.length !== rows.length) {
-      setRows(data);
-    }
+    setRows(data);
     const elapsed = performance.now() - start;
     debug(`Finished after ${Math.max(elapsed).toFixed(0)}ms`);
-    setIsLoading(false)
     hideLoader();
   }
 
   useEffect(() => {
-    fetchData();
-
+    fetchData()
     /**
      * Check if any updates occurred
      * @type {number}
      */
     const intervalId = setInterval(async () => {
-      // TODO: improve reload algorithm
-      fetchData();
-    }, 10000); // wait 10 seconds before re-renders
+      const data = await db.bulkAutomation.toArray();
+      const currentHash = await sha256(JSON.stringify(data));
+      if(currentHash !== cacheHash){
+        cacheHash = currentHash;
+        sortByField(data, 'createdOn')
+        setRows(data);
+      }
+    }, 5000); // wait 5 seconds before re-renders
     return () => clearInterval(intervalId);
   }, []);
 
@@ -315,6 +317,12 @@ export default function BulkAutomationTable(props) {
             <Tooltip title={'Re run the automation on this url'}>
               <IconButton
                 onClick={async () => {
+                  const hasPermission = await requestAllSitesAccess();
+
+                  if(!hasPermission){
+                    alert('Automations do not work unless your approve the permission request.');
+                    return;
+                  }
                   db.transaction('rw', db.bulkAutomation, async () => {
                     const automation = await db.bulkAutomation.get(record.uuid);
                     automation.active = true;
@@ -372,7 +380,16 @@ export default function BulkAutomationTable(props) {
               'Start Automation Process, do not interact with your browser while automation is running.'
             }
           >
-            <IconButton onClick={() => startAutomationProcess()}>
+            <IconButton onClick={async() => {
+              const hasPermission = await requestAllSitesAccess();
+              if(hasPermission){
+                startAutomationProcess()
+              }
+              else{
+                alert('Automations do not work unless your approve the permission request.')
+              }
+            }}>
+
               <DirectionsRunIcon />
             </IconButton>
           </Tooltip>

src/components/tables/BulkAutomationDataTable.js

@@ -23,6 +23,7 @@ import ScheduleAutomationDialog from '../dialogs/automations/ScheduledAutomation
 import DirectionsRunIcon from '@mui/icons-material/DirectionsRun';
 import EditIcon from '@mui/icons-material/Edit';
 import { CronExpressionParser } from 'cron-parser';
+import { requestAllSitesAccess } from '../../services/manifest_permissions';
 
 
 export default function ScheduledAutomationDataTable(): JSX.Element {
@@ -349,7 +350,15 @@ export default function ScheduledAutomationDataTable(): JSX.Element {
         customToolbar: () => (
           <>
             <Tooltip title={'Add a new scheduled automation'}>
-              <IconButton onClick={() => { setIsOpen(true)}}>
+              <IconButton onClick={async() => {
+                  const hasPermission = await requestAllSitesAccess();
+                  if(!hasPermission){
+                    alert('Automations do not work unless your approve the permission request.');
+                    return;
+                  }
+
+                setIsOpen(true)
+              }}>
                 <AlarmAddIcon />
               </IconButton>
             </Tooltip>