Browse Source

fix: browser event block

Ahmad Kholid 3 years ago
parent
commit
f2b045749d

+ 1 - 1
src/background/workflowEngine/blocksHandler/handlerBrowserEvent.js

@@ -75,7 +75,7 @@ function onTabLoaded({ tabLoadedUrl, activeTabLoaded, timeout }, { id }) {
 
     setTimeout(() => {
       resolved = true;
-      resolve('');
+      reject(new Error('timeout'));
     }, timeout || 10000);
   });
 }

+ 2 - 2
src/background/workflowEngine/blocksHandler/handlerProxy.js

@@ -25,7 +25,7 @@ function setProxy({ data, outputs }) {
       config.rules.singleProxy.host = data.host;
     } else {
       if (data.clearProxy) {
-        this.isUsingProxy = false;
+        this.engine.isUsingProxy = false;
 
         resolve({
           data: '',
@@ -47,7 +47,7 @@ function setProxy({ data, outputs }) {
     }
 
     chrome.proxy.settings.set({ value: config, scope: 'regular' }, () => {
-      this.isUsingProxy = true;
+      this.engine.isUsingProxy = true;
 
       resolve({
         data: data.host,

+ 6 - 0
src/background/workflowEngine/worker.js

@@ -214,7 +214,13 @@ class Worker {
           blockOnError.toDo === 'continue' ? 1 : 2
         );
         if (blockOnError.toDo !== 'error' && nextBlocks.connections) {
+          addBlockLog('error', {
+            message: error.message,
+            ...(error.data || {}),
+          });
+
           this.executeNextBlocks(nextBlocks.connections, prevBlockData);
+
           return;
         }
       }