fix: workflows not showing up in website

AutomaApp · Jan 25, 2022 · d455092 · d455092
1 parent aece9ef
commit d455092
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 35 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "automa",
-  "version": "0.16.1",
+  "version": "0.16.2",
   "description": "An extension for automating your browser by connecting blocks",
   "license": "MIT",
   "repository": {

diff --git a/src/content/services/index.js b/src/content/services/index.js
diff --git a/src/content/services/shortcut-listener.js b/src/content/services/shortcut-listener.js
@@ -17,9 +17,12 @@ function getTriggerBlock(workflow) {
   return trigger;
 }
 
-export default async function (workflows) {
+(async () => {
   try {
-    const { shortcuts } = await browser.storage.local.get('shortcuts');
+    const { shortcuts, workflows } = await browser.storage.local.get([
+      'shortcuts',
+      'workflows',
+    ]);
     const shortcutsArr = Object.entries(shortcuts || {});
 
     if (shortcutsArr.length === 0) return;
@@ -52,4 +55,4 @@ export default async function (workflows) {
   } catch (error) {
     console.error(error);
   }
-}
+})();
diff --git a/src/content/services/web-service.js b/src/content/services/web-service.js
@@ -1,6 +1,5 @@
 import { openDB } from 'idb';
 import { nanoid } from 'nanoid';
-import secrets from 'secrets';
 import browser from 'webextension-polyfill';
 import { objectHasKey } from '@/utils/helper';
 import { sendMessage } from '@/utils/message';
@@ -23,10 +22,14 @@ function initWebListener() {
   return { on };
 }
 
-async function listenWindowMessage(workflows) {
+(async () => {
   try {
-    if (secrets?.webOrigin.includes(window.location.origin)) return;
+    document.body.setAttribute(
+      'data-atm-ext-installed',
+      browser.runtime.getManifest().version
+    );
 
+    const { workflows } = await browser.storage.local.get('workflows');
     const db = await openDB('automa', 1, {
       upgrade(event) {
         event.createObjectStore('store');
@@ -61,13 +64,4 @@ async function listenWindowMessage(workflows) {
   } catch (error) {
     console.error(error);
   }
-}
-
-export default async function (workflows) {
-  await listenWindowMessage(workflows);
-
-  document.body.setAttribute(
-    'data-atm-ext-installed',
-    browser.runtime.getManifest().version
-  );
-}
+})();
diff --git a/src/manifest.json b/src/manifest.json
@@ -20,10 +20,20 @@
         "<all_urls>"
       ],
       "js": [
-        "services.bundle.js"
+        "shortcutListener.bundle.js"
       ],
       "run_at": "document_end",
       "all_frames": false
+    },
+    {
+      "matches": [
+        "*://*.automa.site/*",
+        "*://automa.vercel.app/*"
+      ],
+      "js": [
+        "webService.bundle.js"
+      ],
+      "all_frames": false
     }
   ],
   "permissions": [

diff --git a/src/newtab/App.vue b/src/newtab/App.vue
@@ -42,7 +42,7 @@ const retrieved = ref(false);
 
 const currentVersion = browser.runtime.getManifest().version;
 const prevVersion = localStorage.getItem('ext-version') || '0.0.0';
-const isUpdated = ref(compare(currentVersion, prevVersion, '>'));
+const isUpdated = ref(false);
 
 function handleStorageChanged(change) {
   if (change.logs) {
@@ -71,6 +71,10 @@ window.addEventListener('beforeunload', () => {
 
 onMounted(async () => {
   try {
+    const { isFirstTime } = await browser.storage.local.get('isFirstTime');
+
+    isUpdated.value = !isFirstTime && compare(currentVersion, prevVersion, '>');
+
     await store.dispatch('retrieve', ['workflows', 'logs', 'collections']);
     await store.dispatch('retrieveWorkflowState');
 

diff --git a/webpack.config.js b/webpack.config.js
@@ -43,7 +43,20 @@ const options = {
     popup: path.join(__dirname, 'src', 'popup', 'index.js'),
     background: path.join(__dirname, 'src', 'background', 'index.js'),
     contentScript: path.join(__dirname, 'src', 'content', 'index.js'),
-    services: path.join(__dirname, 'src', 'content', 'services', 'index.js'),
+    shortcutListener: path.join(
+      __dirname,
+      'src',
+      'content',
+      'services',
+      'shortcut-listener.js'
+    ),
+    webService: path.join(
+      __dirname,
+      'src',
+      'content',
+      'services',
+      'web-service.js'
+    ),
     elementSelector: path.join(
       __dirname,
       'src',
@@ -53,7 +66,12 @@ const options = {
     ),
   },
   chromeExtensionBoilerplate: {
-    notHotReload: ['contentScript', 'services', 'elementSelector'],
+    notHotReload: [
+      'contentScript',
+      'webService',
+      'shortcutListener',
+      'elementSelector',
+    ],
   },
   output: {
     path: path.resolve(__dirname, 'build'),