Feature/without host permission (#48)

* fixed bug with scheduler and stale runOn value

* fixed bug with slidePanel error

* fixed bug with deleting a scheduled automation

* optional host permissions ui improvements

* working on removing permissions

Author: yooper

package.json

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

src/backgrounds/automation-runner.ts

@@ -62,7 +62,9 @@ async function queueScheduledAutomations(){
       for (const scheduledAutomation of scheduledAutomations) {
         const interval = CronExpressionParser.parse(scheduledAutomation.crontab);
         // run automation
-        if(!scheduledAutomation?.nextRunOn || scheduledAutomation.nextRunOn <= utcNow) {
+        const nextRunOn = getUtc(interval.next().toDate());
+        // getNextRunTime address a bug when the updated crontab was changed, but the nextRunOn isn't for a while.
+        if(!scheduledAutomation?.nextRunOn || scheduledAutomation.nextRunOn <= utcNow || nextRunOn <= utcNow) {
           // add bulk automation url
           const automation = BulkAutomationUrl.createBulkAutomationJob(scheduledAutomation.url, {
             keepTabOpen: scheduledAutomation.keepTabOpen ?? false,
@@ -76,8 +78,9 @@ async function queueScheduledAutomations(){
           automations.push(automation)
           scheduledAutomation.prevRanOn = utcNow;
           if(interval.hasNext()){
-            scheduledAutomation.nextRunOn = getUtc(interval.next().toDate());
+            scheduledAutomation.nextRunOn = nextRunOn;
           }
+
           else{
             // deactivate the scheduled automation if no future time exists
             scheduledAutomation.active = false;

src/components/TopAppBar.js

@@ -15,18 +15,22 @@ import { getUser } from '../models/schemas/User';
 import SyncIcon from '@mui/icons-material/Sync';
 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';
 
 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);
 
   useEffect(() => {
     async function fetchData(){
       const user = await getUser();
       setAuth(user && user.verify() ? true : false);
       setConfiguration(await Configuration.getConfiguration());
+      setHasPermission(await allSitesAccessApproved());
     }
     fetchData();
   }, []);
@@ -107,6 +111,28 @@ export default function TopAppBar() {
 
           </div>
 
+          <Tooltip
+            title={ hasPermission ? 'Advanced Scheduled Automations Enabled' : 'Enable the extension access to websites. Turning this feature on enables automations and streamlines data extraction processes.'}>
+            <IconButton
+              size="large"
+              aria-label=""
+              color="inherit"
+              onClick={async() => {
+                if(hasPermission) {
+                  alert('TODO: Find docs to remove permissions.');
+                  setHasPermission(false);
+                }
+                else {
+                  const isPermitted = await requestAllSitesAccess();
+                  setHasPermission(isPermitted);
+                }
+              }}
+            >
+              <SecurityIcon color={ hasPermission ? 'success' : 'error'}/>
+            </IconButton>
+          </Tooltip>
+
+
           {auth && configuration.syncBackgroundEnabled ? (
             <Tooltip title={'Local data sync is active'}>
               <IconButton
@@ -115,7 +141,7 @@ export default function TopAppBar() {
                 color="inherit"
                 onClick={() => createTab('https://github.com/yooper/your-rapport/wiki/Pro-features')}
               >
-                <SyncIcon />
+                <SyncIcon color={'success'} />
               </IconButton>
             </Tooltip>
               ) : (
@@ -127,7 +153,7 @@ export default function TopAppBar() {
                 color="inherit"
                 onClick={() => createTab(`https://github.com/yooper/your-rapport/wiki/Pro-features`)}
               >
-                <SyncDisabledIcon />
+                <SyncDisabledIcon color={'info'} />
               </IconButton>
             </Tooltip>
             )
@@ -140,7 +166,7 @@ export default function TopAppBar() {
                 color="inherit"
                 onClick={() => createTab('https://github.com/yooper/your-rapport/wiki/Pro-features')}
               >
-                <PersonIcon />
+                <PersonIcon color={'success'}/>
               </IconButton>
             </Tooltip>
           ) : (
@@ -151,7 +177,7 @@ export default function TopAppBar() {
                 color="inherit"
                 onClick={() => createTab(`chrome-extension://${chrome.runtime.id}/login.html`)}
               >
-                <PersonOffIcon />
+                <PersonOffIcon color={'info'} />
               </IconButton>
             </Tooltip>
           )}

src/components/tables/ScheduledAutomationDataTable.tsx

@@ -336,10 +336,13 @@ export default function ScheduledAutomationDataTable(): JSX.Element {
         rowsPerPage: 50,
         rowsPerPageOptions: [20, 50],
         searchAlwaysOpen: false,
-        onRowsDelete: async (deleteInfo: any) => {
+        onRowsDelete: async (records: any, data: any) => {
           setIsLoading(true);
           showLoader();
-
+          for (const [idx, value] of Object.entries(records.lookup)) {
+            await db.scheduledAutomation.delete(rows[idx].uuid);
+          }
+          setRows(await db.scheduledAutomation.toArray());
           setIsLoading(false);
           hideLoader();
         },

src/components/tables/SearchDataTable.js

@@ -569,7 +569,7 @@ export default function SearchDataTable(props) {
     customSearchRender: rapportDebounceSearchRender(800),
     textLabels: {
       toolbar: {
-        downloadCsv: 'Export as JSON file',
+        downloadCsv: 'Export all rapport records as a JSON file',
       },
     },
     onDownload: (buildHead, buildBody, columns, data) => {

src/datasources/browser_capture.ts

@@ -12,6 +12,7 @@ import { FastDrawError } from '../errors/FastDrawError';
 import { getActiveTab, sleep } from '../utilities/loaders';
 import { NoChangeDetectedError } from '../errors/NoChangeDetectedError';
 import { DuplicateDetectedError } from '../errors/DuplicateDetectedError';
+import { initExtensionPage } from '../services/init_services';
 
 
 let _lastRapport: Rapport|null = null;
@@ -30,7 +31,10 @@ export async function capture(
 
   ExtensionPin.setDefaultNotSaved(tab);
   // always force close the sidePanel upon save
-  chrome.sidePanel.close({tabId: tab.id});
+
+
+  // will close the sidePanel if its open
+  initExtensionPage();
 
   do {
     try {

src/manifest.json

@@ -9,7 +9,7 @@
     "default_title": "Your Rapport is a screenshot tool with auto scroll capabilities. Right click, select Collect or Alt+S to save. Alt+A for auto scrolling captures. Alt+X open the dashboard. Alt+Q for doing a quick scan.",
     "default_popup": "popup.html"
   },
-  "version": "0.25.0",
+  "version": "0.26.0",
   "icons": {
     "128": "icon-128.png",
     "48": "icon-48.png",
@@ -29,7 +29,7 @@
       "run_at": "document_idle"
     }
   ],
-  "host_permissions": ["<all_urls>"],
+  "optional_host_permissions": ["<all_urls>"],
   "permissions": [
     "unlimitedStorage",
     "storage",
@@ -41,7 +41,8 @@
     "alarms",
     "commands",
     "downloads",
-    "sidePanel"
+    "sidePanel",
+    "scripting"
   ],
   "side_panel": {
     "default_path": "sidePanel.html"

src/pages/Background/index.js

@@ -17,10 +17,7 @@ import {
 } from '../../services/constants';
 
 import { debug } from '../../services/logger_services';
-
-
 import { JobQueue } from '../../models/schemas/JobQueue';
-
 import { initializeAutomationRunner } from '../../backgrounds/automation-runner';
 import { fetchPackages } from '../../models/schemas/Package';
 import { db } from '../../models/db/dexieDb';
@@ -59,6 +56,18 @@ chrome.commands.onCommand.addListener(async(command) => {
   const activeTab = await getActiveTab()
   const response = await chrome.tabs.sendMessage(activeTab.id, { cmd: PAGE_INFO, requestId: crypto.randomUUID() });
   const { pageInfo } = response
+  function getTitle() { return document.title; }
+
+  chrome.scripting
+    .executeScript({
+      target : {tabId : activeTab.id, allFrames : true},
+      func : getTitle,
+    })
+    .then(injectionResults => {
+      for (const {frameId, result} of injectionResults) {
+        console.log(`Frame ${frameId} result:`, result);
+      }
+    });
 
   switch (command) {
     case 'deepSave':
@@ -238,7 +247,14 @@ chrome.runtime.onMessageExternal.addListener((message, sender, sendResponse) =>
 chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
   // when the tab changes, check if it changes to an extension page and close the side panel
   if(tab.url.startsWith(`chrome://extensions/?id=${chrome.runtime.id}`)){
-    chrome.sidePanel.close({tabId})
+    let gettingContextInfo = chrome.runtime.getContexts({ contextTypes: ['SIDE_PANEL']});
+    gettingContextInfo.then(contexts => {
+      contexts.forEach(c => {
+        if(c.tagId == tabId){
+          chrome.sidePanel.close({tabId})
+        }
+      })
+    })
   }
 
   if (changeInfo.status === 'complete') {

src/pages/Content/modules/autoScroller.ts

@@ -7,12 +7,9 @@ import {
   BULK_AUTOMATION,
   CAPTURE_VISIBLE_TAB,
   NO_VISIBLE_TEXT,
-  UUID,
 } from "../../../services/constants";
 import { getPageInfo } from "../index";
 import { debug } from "../../../services/logger_services";
-import { updateRecord } from "../../../models/db/local";
-import { db } from '../../../models/db/dexieDb';
 
 /** Local state machine */
 const STATE_STOPPED = "stopped" as const;

src/services/init_services.ts

@@ -1,11 +1,25 @@
+/**
+ * Disabled because it is buggy
+ */
+import { debug } from './logger_services';
 
 export const initExtensionPage = (): void => {
   try{
     chrome.tabs.query({ active: true, currentWindow: true }).then(tabs => {
-      chrome.sidePanel.close({tabId: tabs[0].id})
+    let gettingContextInfo = chrome.runtime.getContexts({ contextTypes: ['SIDE_PANEL']});
+    gettingContextInfo.then(contexts => {
+      contexts.forEach(c => {
+        if(c.tagId == tabs[0].id){
+          chrome.sidePanel.close({tabId: tabs[0].id})
+        }
+      })
+
+    });
     })
   }
   catch(e){
-    // ignore error
+    debug('initExtensionPage:error', e)
   }
-};
+};
+
+