Simplify DOM watcher with configuration-level settings and automatic action restart

.env.example

@@ -8,17 +8,15 @@ VITE_PUBLIC_NAME=__MSG_EXT_NAME_DEV__
 
 # ------------------- Extension
 KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxO2GOH63WJB07mAFB2/pfkIYPg27J4Scwyv/Z1P/hl0iRB9kCSFBRrYkt+vX9CToZvE/MmwExxFWxhAXpvz0yQFmB8trUQxP/ubc6TePQQ5NiuE6bg+qlfLqaNPfNojJfZZSCe5HYSVEGvW1hxRhiXfRCy26NyRu/Y6D7CPCHfhkGDoGLExpVW1zEqfUcRPBh5cedlwFxFtAbd1OzmZnPllMOW+AMBP6GqlybkGuxpys4xt+32lVq3kb36LogdudQRe9geq9qKnk0tFNiqMe5QR04c0+IRuq3IGHLre+4peViG2w7bBgGY0r4ZxQ1/sOvoeh5XGdKPQKFF61Io5hqwIDAQAB
-UNINSTALL_URL=https://forms.gle/49dAyTL1pLNEcvu76
 
 # -------------------- Web App
 INLINE_RUNTIME_CHUNK=false
 
 # Extension
 VITE_PUBLIC_CHROME_EXTENSION_ID=blfahkipmbikdeipdaogkjggbmgbippe
-VITE_PUBLIC_EDGE_EXTENSION_ID=blfahkipmbikdeipdaogkjggbmgbippe
 
 # i18n
-VITE_PUBLIC_I18N=http://localhost:3000/locales
+VITE_PUBLIC_I18N=/locales
 
 # Firebase
 VITE_PUBLIC_FIREBASE_API_KEY=

.github/instructions/nx.instructions.md

@@ -4,17 +4,19 @@ applyTo: '**'
 
 // This file is automatically generated by Nx Console
 
-You are in an nx workspace using Nx 21.2.3 and npm as the package manager.
+You are in an nx workspace using Nx 21.3.11 and npm as the package manager.
 
 You have access to the Nx MCP server and the tools it provides. Use them. Follow these guidelines in order to best help the user:
 
 # General Guidelines
+
 - When answering questions, use the nx_workspace tool first to gain an understanding of the workspace architecture
 - For questions around nx configuration, best practices or if you're unsure, use the nx_docs tool to get relevant, up-to-date docs!! Always use this instead of assuming things about nx configuration
 - If the user needs help with an Nx configuration or project graph error, use the 'nx_workspace' tool to get any errors
 - To help answer questions about the workspace structure or simply help with demonstrating how tasks depend on each other, use the 'nx_visualize_graph' tool
 
 # Generation Guidelines
+
 If the user wants to generate something, use the following flow:
 
 - learn about the nx workspace and any specifics the user needs by using the 'nx_workspace' tool and the 'nx_project_details' tool if applicable
@@ -29,19 +31,20 @@ If the user wants to generate something, use the following flow:
 - use the information provided in the log file to answer the user's question or continue with what they were doing
 
 # Running Tasks Guidelines
+
 If the user wants help with tasks or commands (which include keywords like "test", "build", "lint", or other similar actions), use the following flow:
+
 - Use the 'nx_current_running_tasks_details' tool to get the list of tasks (this can include tasks that were completed, stopped or failed).
 - If there are any tasks, ask the user if they would like help with a specific task then use the 'nx_current_running_task_output' tool to get the terminal output for that task/command
 - Use the terminal output from 'nx_current_running_task_output' to see what's wrong and help the user fix their problem. Use the appropriate tools if necessary
 - If the user would like to rerun the task or command, always use `nx run <taskId>` to rerun in the terminal. This will ensure that the task will run in the nx context and will be run the same way it originally executed
-- If the task was marked as "continuous" do not offer to rerun the task. This task is already running and the user can see the output in the terminal. You can use 'nx_current_running_task_output' to get the output of the task to verify the output. 
-
+- If the task was marked as "continuous" do not offer to rerun the task. This task is already running and the user can see the output in the terminal. You can use 'nx_current_running_task_output' to get the output of the task to verify the output.
 
 # CI Error Guidelines
+
 If the user wants help with fixing an error in their CI pipeline, use the following flow:
+
 - Retrieve the list of current CI Pipeline Executions (CIPEs) using the 'nx_cloud_cipe_details' tool
 - If there are any errors, use the 'nx_cloud_fix_cipe_failure' tool to retrieve the logs for a specific task
 - Use the task logs to see what's wrong and help the user fix their problem. Use the appropriate tools if necessary
 - Make sure that the problem is fixed by running the task that you passed into the 'nx_cloud_fix_cipe_failure' tool
-
-

apps/acf-extension/project.json

@@ -12,8 +12,7 @@
         "cwd": "apps/acf-extension",
         "args": ["--node-env=production", "--watch"]
       },
-      "continuous": true,
-      "dependsOn": ["watch-deps"]
+      "continuous": true
     }
   }
 }

apps/acf-extension/src/content_scripts/action.ts

@@ -22,7 +22,7 @@ const ActionProcessor = (() => {
   const process = async (action: IAction) => {
     const elementFinder = await ACFValue.getValue(action.elementFinder);
     const elements = await Common.start(elementFinder, action.settings);
-    if (elements === undefined) {
+    if (elements === undefined || elements.length === 0) {
       throw EActionStatus.SKIPPED;
     }
     const value = action.value ? await ACFValue.getValue(action.value, action.settings) : action.value;

apps/acf-extension/src/content_scripts/actions.ts

@@ -52,9 +52,9 @@ const Actions = (() => {
         await statusBar.wait(action.initWait, STATUS_BAR_TYPE.ACTION_WAIT);
         await AddonProcessor.check(action.addon, action.settings);
         if (action.type === 'userscript') {
-          action.status = await UserScriptProcessor.start(action as IUserScript);
+          action.status = await UserScriptProcessor.start(action);
         } else {
-          action.status = await ActionProcessor.start(action as IAction);
+          action.status = await ActionProcessor.start(action);
         }
         notify(action);
       } catch (error) {

apps/acf-extension/src/content_scripts/common.ts

@@ -3,6 +3,7 @@ import { SettingsStorage } from '@dhruv-techapps/acf-store';
 import { ConfigError } from '@dhruv-techapps/core-common';
 import { I18N_ERROR } from './i18n';
 import { statusBar } from './status-bar';
+import DomWatchManager from './util/dom-watch-manager';
 
 const Common = (() => {
   const retryFunc = async (retry?: number, retryInterval?: number | string) => {
@@ -15,6 +16,19 @@ const Common = (() => {
     return false;
   };
 
+  const setElementProcessed = (elements: Array<HTMLElement>) => {
+    elements.forEach((element) => {
+      element.setAttribute('data-acf-processed', 'true');
+    });
+  };
+
+  const filterProcessedElements = (elements: Array<HTMLElement>): Array<HTMLElement> => {
+    return elements.filter((element) => {
+      // Add your filtering logic here
+      return !element.hasAttribute('data-acf-processed');
+    });
+  };
+
   const getElements = async (document: Document, elementFinder: string, retry: number, retryInterval: number | string): Promise<Array<HTMLElement> | undefined> => {
     let elements: HTMLElement[] | undefined;
     try {
@@ -132,6 +146,12 @@ const Common = (() => {
     if (!elements || elements.length === 0) {
       return checkRetryOption(retryOption, elementFinder, retryGoto);
     }
+
+    if (DomWatchManager.getStatus().isActive && elements) {
+      elements = filterProcessedElements(elements);
+    }
+
+    setElementProcessed(elements);
     return elements;
   };
 

apps/acf-extension/src/content_scripts/config.ts

@@ -9,11 +9,13 @@ import { GoogleAnalyticsService } from '@dhruv-techapps/shared-google-analytics'
 import { GoogleSheetsCS } from '@dhruv-techapps/shared-google-sheets';
 import { STATUS_BAR_TYPE } from '@dhruv-techapps/shared-status-bar';
 import { scope } from '../common/instrument';
+import Actions from './actions';
 import BatchProcessor from './batch';
 import Common from './common';
 import { Hotkey } from './hotkey';
 import { I18N_COMMON } from './i18n';
 import { statusBar } from './status-bar';
+import DomWatchManager from './util/dom-watch-manager';
 import GoogleSheets from './util/google-sheets';
 
 const CONFIG_I18N = {
@@ -45,6 +47,20 @@ const ConfigProcessor = (() => {
     return events;
   };
 
+  const InitializeDomWatcher = (config: IConfiguration) => {
+    // If watch settings are provided and enabled, set up DOM watcher for the entire configuration
+    if (config.watch?.watchEnabled) {
+      // Set up the sequence restart callback for DOM watcher
+      DomWatchManager.setSequenceRestartCallback(async () => {
+        console.debug(`Actions: Restarting entire action sequence due to DOM changes`);
+        await Actions.start(config.actions, window.ext.__batchRepeat + 1);
+      });
+
+      // Register the configuration-level DOM watcher after actions complete initially
+      DomWatchManager.registerConfiguration(config.watch);
+    }
+  };
+
   const start = async (config: IConfiguration) => {
     try {
       window.ext.__sessionCount = new Session(config.id).getCount();
@@ -53,7 +69,9 @@ const ConfigProcessor = (() => {
       }
       const sheets = GoogleSheets.getSheets(config);
       window.ext.__sheets = await new GoogleSheetsCS().getValues(sheets, config.spreadsheetId);
+      // Clear any existing DOM watchers before starting new actions
       await BatchProcessor.start(config.actions, config.batch);
+      InitializeDomWatcher(config);
       const { notifications } = await new SettingsStorage().getSettings();
       if (notifications) {
         const { onConfig, sound, discord } = notifications;

apps/acf-extension/src/content_scripts/index.ts

@@ -66,6 +66,7 @@ self.onerror = (...rest) => {
 
 chrome.runtime.onMessage.addListener(async (message) => {
   const { action, configId } = message;
+
   if (action === RUNTIME_MESSAGE_ACF.RUN_CONFIG) {
     try {
       new ConfigStorage().getConfigById(configId).then(async (config) => {