Added PoC for data streaming from backend to frontend

backend/app_sdk/app_base.py

@@ -1755,6 +1755,10 @@ class AppBase:
                     self.logger.info("[DEBUG] Skipping liquid - size too big (%d)" % len(template))
                     return template
 
+                if "${" in template and "}$" in template:
+                    self.logger.info("[DEBUG] Shuffle loop shouldn't run in liquid. Data length: %d" % len(template))
+                    return template
+
                 #if not "{{" in template or not "}}" in template: 
                 #    if not "{%" in template or not "%}" in template: 
                 #        self.logger.info("Skipping liquid - missing {{ }} and {% %}")

backend/app_sdk/build.sh

@@ -3,7 +3,7 @@
 
 ### DEFAULT 
 NAME=shuffle-app_sdk
-VERSION=0.9.49
+VERSION=0.9.50
 
 docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force
 docker build . -f Dockerfile -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:nightly

backend/go-app/main.go

@@ -5804,6 +5804,8 @@ func initHandlers() {
 	r.HandleFunc("/api/v1/workflows/download_remote", loadSpecificWorkflows).Methods("POST", "OPTIONS")
 	r.HandleFunc("/api/v1/workflows/{key}/execute", executeWorkflow).Methods("GET", "POST", "OPTIONS")
 	r.HandleFunc("/api/v1/workflows/{key}/schedule/{schedule}", stopSchedule).Methods("DELETE", "OPTIONS")
+	r.HandleFunc("/api/v1/workflows/{key}/stream", shuffle.HandleStreamWorkflow).Methods("GET", "OPTIONS")
+	r.HandleFunc("/api/v1/workflows/{key}/stream", shuffle.HandleStreamWorkflowUpdate).Methods("POST", "OPTIONS")
 	r.HandleFunc("/api/v1/workflows/{key}", deleteWorkflow).Methods("DELETE", "OPTIONS")
 	r.HandleFunc("/api/v1/workflows/{key}", shuffle.SaveWorkflow).Methods("PUT", "OPTIONS")
 	r.HandleFunc("/api/v1/workflows/{key}", shuffle.GetSpecificWorkflow).Methods("GET", "OPTIONS")

frontend/src/App.jsx

@@ -26,6 +26,7 @@ import SetAuthenticationSSO from "./views/SetAuthenticationSSO";
 import LandingPageNew from "./views/LandingpageNew";
 import LoginPage from "./views/LoginPage";
 import SettingsPage from "./views/SettingsPage";
+import KeepAlive from "./views/KeepAlive.jsx";
 
 import MyView from "./views/MyView";
 
@@ -572,6 +573,22 @@ const App = (message, props) => {
         	    />
         	  }
         	/>
+        	<Route
+        	  exact
+        	  path="/keepalive"
+        	  element={
+        	    <KeepAlive
+        	      isLoggedIn={isLoggedIn}
+        	      setIsLoggedIn={setIsLoggedIn}
+        	      register={true}
+        	      isLoaded={isLoaded}
+        	      globalUrl={globalUrl}
+        	      setCookie={setCookie}
+        	      cookies={cookies}
+        	      {...props}
+        	    />
+        	  }
+        	/>
         	<Route
         	  exact
         	  path="/"

frontend/src/components/ParsedAction.jsx

@@ -171,11 +171,35 @@ const ParsedAction = (props) => {
 
   const [expansionModalOpen, setExpansionModalOpen] = React.useState(false);
   const [hideBody, setHideBody] = React.useState(true);
-  const [activateHidingBody, setActivateHidingBody] = React.useState(false);
+  const [activateHidingBodyButton, setActivateHidingBodyButton] = React.useState(false);
+
 	const [codedata, setcodedata] = React.useState("");
 	const [fieldCount, setFieldCount] = React.useState(0);
 	const [hiddenDescription, setHiddenDescription] = React.useState(true);
 
+  useEffect(() => {
+		
+		//if (data.startsWith("${") && data.endsWith("}")) {
+		//}
+				// PARAM FIX - Gonna use the ID field, even though it's a hack
+		const paramcheck = selectedAction.parameters.find(param => param.name === "body")
+		console.log("LOADED! Change hideBody based on input? Action: ", selectedAction, paramcheck)
+		if (paramcheck !== undefined && paramcheck !== null) {
+			if (paramcheck.id === "TOGGLED"){ 
+  			setHideBody(false)
+  			setActivateHidingBodyButton(false)
+				console.log("TOGGLED BODY!")
+			} else {
+  			setHideBody(true)
+
+				if (paramcheck.id === "UNTOGGLED") {
+  				setActivateHidingBodyButton(false)
+					console.log("UNTOGGLED!")
+				}
+			}
+		}
+	}, [])
+
   const keywords = [
     "len(",
     "lower(",
@@ -521,7 +545,7 @@ const ParsedAction = (props) => {
     });
 
     const changeActionParameter = (event, count, data) => {
-			console.log("Action change: ", selectedAction, data)
+			//console.log("Action change: ", selectedAction, data)
       if (data.name.startsWith("${") && data.name.endsWith("}")) {
         // PARAM FIX - Gonna use the ID field, even though it's a hack
         const paramcheck = selectedAction.parameters.find(
@@ -533,6 +557,7 @@ const ParsedAction = (props) => {
             .trim()
             .replaceAll('\\"', '"')
             .replaceAll('"', '\\"');
+
           console.log("REPLACE WITH: ", toReplace);
           if (
             paramcheck["value_replace"] === undefined ||
@@ -1155,14 +1180,25 @@ const ParsedAction = (props) => {
                           color: theme.palette.primary.secondary,
                         }}
                         onChange={(event) => {
-                          setHideBody(!hideBody);
+													var tag = "TOGGLED"
+													if (hideBody) {
+														tag = "UNTOGGLED"
+													} 
 
+                          setHideBody(!hideBody);
+			
                           for (var key in selectedActionParameters) {
                             var currentItem = selectedActionParameters[key];
 														if (currentItem.name === "ssl_verify") {
 
 														}
 
+														if (currentItem.name === "body") {
+															// FIXME: Workaround for toggling, as actions don't have IDs. 
+															// May screw up something in the future.
+															currentItem.id = tag
+														}
+
                             if (currentItem.description === openApiFieldDesc) {
                               currentItem.field_active = !hideBody;
                               console.log("Changing", currentItem);
@@ -1176,7 +1212,7 @@ const ParsedAction = (props) => {
                   />
                 </Tooltip>
               </div>
-            );
+            )
 
             if (selectedApp.generated && data.name === "body") {
               const regex = /\${(\w+)}/g;
@@ -1184,10 +1220,10 @@ const ParsedAction = (props) => {
 
               hideBodyButton = hideBodyButtonValue;
               if (found === null || !hideBody) {
-                //setExtraBodyFields([])
+								console.log("Should hide body? ", found)
                 //
                 if (found === null) {
-                  setActivateHidingBody(true);
+                  setActivateHidingBodyButton(true);
                 }
               } else {
                 //console.log("SHOW BUTTON");
@@ -1240,7 +1276,7 @@ const ParsedAction = (props) => {
               }
             }
 
-            if (activateHidingBody === true) {
+            if (activateHidingBodyButton === true) {
               hideBodyButton = "";
             }
 
@@ -2777,6 +2813,19 @@ const ParsedAction = (props) => {
               );
             }}
             renderInput={(params) => {
+							if (params.inputProps !== undefined && params.inputProps !== null && params.inputProps.value !== undefined && params.inputProps.value !== null) {
+								const prefixes = ["Post", "Put", "Patch"]
+								for (var key in prefixes) {
+									if (params.inputProps.value.startsWith(prefixes[key])) {
+										params.inputProps.value = params.inputProps.value.replace(prefixes[key]+" ", "", -1)
+										if (params.inputProps.value.length > 1) {
+											params.inputProps.value = params.inputProps.value.charAt(0).toUpperCase()+params.inputProps.value.substring(1)
+										}
+										break
+									}
+								}
+							}
+
               return (
 									<TextField
 										style={{

frontend/src/defaultCytoscapeStyle.js

@@ -159,6 +159,20 @@ const data = [
       "background-color": "data(iconBackground)",
     },
   },
+  {
+    selector: "node[?isSuggestion]",
+    css: {
+      shape: "ellipse",
+      width: "30px",
+      height: "30px",
+      "z-index": "5002",
+      "font-size": "0px",
+      border: "1px solid rgba(255,255,255,0.9)",
+      "background-image": "data(large_image)",
+      "background-color": "data(iconBackground)",
+      label: "data(label)",
+    },
+  },
   {
     selector: "node[?isDescriptor]",
     css: {

functions/onprem/orborus/build.sh

@@ -1,5 +1,5 @@
 NAME=shuffle-orborus
-VERSION=0.9.49
+VERSION=0.9.50
 
 echo "Running docker build with $NAME:$VERSION"
 #docker rmi frikky/shuffle:$NAME --force

functions/onprem/orborus/orborus.go

@@ -222,16 +222,16 @@ func deployServiceWorkers(image string) {
 
 		defaultNetworkAttach := false
 		if containerId != "" {
-			log.Printf("[WARNING] Should connect orborus container to worker network as it's running in Docker with name %#v!", containerId)
+			log.Printf("[DEBUG] Should connect orborus container to worker network as it's running in Docker with name %#v!", containerId)
 			// https://pkg.go.dev/github.com/docker/docker@v20.10.12+incompatible/api/types/network#EndpointSettings
 			networkConfig := &network.EndpointSettings{}
 			err := dockercli.NetworkConnect(ctx, networkName, containerId, networkConfig)
 			if err != nil {
-				log.Printf("[WARNING] Failed connecting to Orborus to docker network %s: %s", networkName, err)
+				log.Printf("[ERROR] Failed connecting to Orborus to docker network %s: %s", networkName, err)
 			}
 
 			if len(containerId) == 64 && baseUrl == "http://shuffle-backend:5001" {
-				log.Printf("[WARNING] Network MAY not work due to backend being %s and container length 64. Will try to attach shuffle_shuffle network", baseUrl)
+				log.Printf("[ERROR] Network MAY not work due to backend being %s and container length 64. Will try to attach shuffle_shuffle network", baseUrl)
 				defaultNetworkAttach = true
 			}
 		}
@@ -782,7 +782,8 @@ func main() {
 	//workerImage := fmt.Sprintf("%s/%s:worker%s", baseimageregistry, baseimagename, baseimagetagsuffix)
 	workerImage := fmt.Sprintf("%s/%s/shuffle-worker:%s", baseimageregistry, baseimagename, workerVersion)
 
-	go deployServiceWorkers(workerImage)
+	//go deployServiceWorkers(workerImage)
+	deployServiceWorkers(workerImage)
 
 	log.Printf("[INFO] Finished configuring docker environment")
 

functions/onprem/worker/build.sh

@@ -1,5 +1,5 @@
 NAME=shuffle-worker
-VERSION=0.9.49
+VERSION=0.9.50
 
 echo "Running docker build with $NAME:$VERSION"
 #CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o worker.bin .

functions/onprem/worker/go.mod

@@ -10,6 +10,6 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/gorilla/mux v1.8.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/shuffle/shuffle-shared v0.1.78
+	github.com/shuffle/shuffle-shared v0.1.83
 	go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
 )

functions/onprem/worker/go.sum

@@ -593,6 +593,8 @@ github.com/shuffle/shuffle-shared v0.1.73 h1:1rMOXAvxm/nDemwN/L8qWacswVMvdi6NjLf
 github.com/shuffle/shuffle-shared v0.1.73/go.mod h1:2ndjLm4ZOvY6arGFwOgGnkQ457Ke7gka9HDF/EkdIxQ=
 github.com/shuffle/shuffle-shared v0.1.78 h1://YsgQ85Ep40AA3pLUXb+85BUrNz5sqGqh0e3twKRy4=
 github.com/shuffle/shuffle-shared v0.1.78/go.mod h1:cW8LBv8P24rCPyJqGV6czxqrpnrv/R1d97EOqNgIvSk=
+github.com/shuffle/shuffle-shared v0.1.81 h1:/lOt7NSuMTWlRzgOKg2e7j95eakg3MgW6i/4Fp30kd4=
+github.com/shuffle/shuffle-shared v0.1.81/go.mod h1:cW8LBv8P24rCPyJqGV6czxqrpnrv/R1d97EOqNgIvSk=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
 github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=

functions/onprem/worker/worker.go

@@ -99,7 +99,7 @@ type UserInputSubflow struct {
 
 // removes every container except itself (worker)
 func shutdown(workflowExecution shuffle.WorkflowExecution, nodeId string, reason string, handleResultSend bool) {
-	log.Printf("[INFO][%s] Shutdown (%s) started with reason %#v. Result amount: %d. ResultsSent: %d, Send result: %#v", workflowExecution.ExecutionId, workflowExecution.Status, reason, len(workflowExecution.Results), requestsSent, handleResultSend)
+	log.Printf("[INFO][%s] Shutdown (%s) started with reason %#v. Result amount: %d. ResultsSent: %d, Send result: %#v, Parenent: %#v", workflowExecution.ExecutionId, workflowExecution.Status, reason, len(workflowExecution.Results), requestsSent, handleResultSend, workflowExecution.ExecutionParent)
 	//reason := "Error in execution"
 
 	sleepDuration := 1
@@ -351,6 +351,21 @@ func deployApp(cli *dockerclient.Client, image string, identifier string, env []
 		Env:   env,
 	}
 
+	// Checking as late as possible, just in case.
+	newExecId := fmt.Sprintf("%s_%s", workflowExecution.ExecutionId, action.ID)
+	_, err := shuffle.GetCache(ctx, newExecId)
+	if err == nil {
+		log.Printf("\n\n[DEBUG] Result for %s already found - returning\n\n", newExecId)
+		return nil
+	}
+	cacheData := []byte("1")
+	err = shuffle.SetCache(ctx, newExecId, cacheData)
+	if err != nil {
+		log.Printf("[WARNING] Failed setting cache for action %s: %s", newExecId, err)
+	} else {
+		log.Printf("[DEBUG] Adding %s to cache. Name: %s", newExecId, action.Name)
+	}
+
 	if action.ExecutionDelay > 0 {
 		log.Printf("[DEBUG] Running app %s in docker with delay of %d", action.Name, action.ExecutionDelay)
 		waitTime := time.Duration(action.ExecutionDelay) * time.Second
@@ -687,7 +702,7 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
 				if isSkipped {
 					//log.Printf("Skipping %s as all parents are done", item.Action.Label)
 					if !arrayContains(visited, item.Action.ID) {
-						log.Printf("[INFO][%s] Adding visited (1): %s", workflowExecution.ExecutionId, item.Action.Label)
+						//log.Printf("[INFO][%s] Adding visited (1): %s", workflowExecution.ExecutionId, item.Action.Label)
 						visited = append(visited, item.Action.ID)
 					}
 				} else {
@@ -696,7 +711,7 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
 				}
 			} else {
 				if item.Status == "FINISHED" {
-					log.Printf("[INFO][%s] Adding visited (2): %s", workflowExecution.ExecutionId, item.Action.Label)
+					//log.Printf("[INFO][%s] Adding visited (2): %s", workflowExecution.ExecutionId, item.Action.Label)
 					visited = append(visited, item.Action.ID)
 				}
 			}
@@ -874,22 +889,27 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
 			continue
 		} else {
 			log.Printf("[INFO][%s] %s:%s has no status result yet. Should execute.", workflowExecution.ExecutionId, action.Name, action.ID)
+
+			// Check cache here too.
 		}
 
+		// Rerunning this multiple places, as timing is the hardest part here.
 		newExecId := fmt.Sprintf("%s_%s", workflowExecution.ExecutionId, nextAction)
 		_, err := shuffle.GetCache(ctx, newExecId)
 		if err == nil {
-			//log.Printf("\n\n[DEBUG] Already found %s - returning\n\n", newExecId)
+			log.Printf("\n\n[DEBUG] Already found %s (1) - returning\n\n", newExecId)
 			continue
 		}
 
-		cacheData := []byte("1")
+		/*
-		err = shuffle.SetCache(ctx, newExecId, cacheData)
+			cacheData := []byte("1")
-		if err != nil {
+			err = shuffle.SetCache(ctx, newExecId, cacheData)
-			log.Printf("[WARNING] Failed setting cache for action %s: %s", newExecId, err)
+			if err != nil {
-		} else {
+				log.Printf("[WARNING] Failed setting cache for action %s: %s", newExecId, err)
-			log.Printf("\n\n[DEBUG] Adding %s to cache. Name: %s\n\n", newExecId, action.Name)
+			} else {
-		}
+				log.Printf("\n\n[DEBUG] Adding %s to cache. Name: %s\n\n", newExecId, action.Name)
+			}
+		*/
 
 		if action.AppName == "Shuffle Tools" && (action.Name == "skip_me" || action.Name == "router" || action.Name == "route") {
 			topClient := &http.Client{
@@ -899,7 +919,7 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
 			if err != nil {
 				log.Printf("[DEBUG][%s] Error in skipme for %s: %s", workflowExecution.ExecutionId, action.Label, err)
 			} else {
-				log.Printf("[INFO][%s] Adding visited (4): %s", workflowExecution.ExecutionId, action.Label)
+				//log.Printf("[INFO][%s] Adding visited (4): %s", workflowExecution.ExecutionId, action.Label)
 
 				visited = append(visited, action.ID)
 				executed = append(executed, action.ID)
@@ -1373,7 +1393,7 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
 			}
 		}
 
-		log.Printf("[INFO][%s] Adding visited (3): %s (%s). Actions: %d, Results: %d", workflowExecution.ExecutionId, action.Label, action.ID, len(workflowExecution.Workflow.Actions), len(workflowExecution.Results))
+		//log.Printf("[INFO][%s] Adding visited (3): %s (%s). Actions: %d, Results: %d", workflowExecution.ExecutionId, action.Label, action.ID, len(workflowExecution.Workflow.Actions), len(workflowExecution.Results))
 
 		visited = append(visited, action.ID)
 		executed = append(executed, action.ID)
@@ -1396,7 +1416,7 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
 	if len(workflowExecution.Results) == len(workflowExecution.Workflow.Actions)+extra {
 		shutdownCheck := true
 		for _, result := range workflowExecution.Results {
-			if result.Status == "EXECUTING" {
+			if result.Status == "EXECUTING" || result.Status == "WAITING" {
 				// Cleaning up executing stuff
 				shutdownCheck = false
 				// USED TO BE CONTAINER REMOVAL
@@ -1436,7 +1456,7 @@ func executionInit(workflowExecution shuffle.WorkflowExecution) error {
 
 	// Setting up extra counter
 	for _, trigger := range workflowExecution.Workflow.Triggers {
-		log.Printf("[DEBUG] Appname trigger (0): %s", trigger.AppName)
+		//log.Printf("[DEBUG] Appname trigger (0): %s", trigger.AppName)
 		if trigger.AppName == "User Input" || trigger.AppName == "Shuffle Workflow" {
 			extra += 1
 		}
@@ -2049,7 +2069,8 @@ func runWorkflowExecutionTransaction(ctx context.Context, attempts int64, workfl
 			return
 		}
 	}
-	log.Printf(`[DEBUG][%s] Got result %s from %s. Execution status: %s. Save: %#v`, actionResult.ExecutionId, actionResult.Status, actionResult.Action.ID, workflowExecution.Status, dbSave)
+
+	log.Printf(`[DEBUG][%s] Got result %s from %s. Execution status: %s. Save: %#v. Parent: %#v`, actionResult.ExecutionId, actionResult.Status, actionResult.Action.ID, workflowExecution.Status, dbSave, workflowExecution.ExecutionParent)
 	//dbSave := false
 
 	//if len(results) != len(workflowExecution.Results) {
@@ -2163,10 +2184,19 @@ func validateFinished(workflowExecution shuffle.WorkflowExecution) bool {
 	//startAction, extra, children, parents, visited, executed, nextActions, environments := shuffle.GetExecutionVariables(ctx, workflowExecution.ExecutionId)
 	_, extra, _, _, _, _, _, environments := shuffle.GetExecutionVariables(ctx, workflowExecution.ExecutionId)
 
-	log.Printf("[INFO][%s] VALIDATION. Status: %s, shuffle.Actions: %d, Extra: %d, Results: %d\n", workflowExecution.ExecutionId, workflowExecution.Status, len(workflowExecution.Workflow.Actions), extra, len(workflowExecution.Results))
+	log.Printf("[INFO][%s] VALIDATION. Status: %s, shuffle.Actions: %d, Extra: %d, Results: %d. Parent: %#v\n", workflowExecution.ExecutionId, workflowExecution.Status, len(workflowExecution.Workflow.Actions), extra, len(workflowExecution.Results), workflowExecution.ExecutionParent)
 
 	//if len(workflowExecution.Results) == len(workflowExecution.Workflow.Actions)+extra {
 	if (len(environments) == 1 && requestsSent == 0 && len(workflowExecution.Results) >= 1 && os.Getenv("SHUFFLE_SWARM_CONFIG") != "run" && os.Getenv("SHUFFLE_SWARM_CONFIG") != "swarm") || (len(workflowExecution.Results) >= len(workflowExecution.Workflow.Actions)+extra && len(workflowExecution.Workflow.Actions) > 0) {
+		if workflowExecution.Status == "FINISHED" {
+			for _, result := range workflowExecution.Results {
+				if result.Status == "EXECUTING" || result.Status == "WAITING" {
+					log.Printf("[WARNING] NOT returning full result, as a result may be unfinished: %s (%s) - %s", result.Action.Label, result.Action.ID, result.Status)
+					return false
+				}
+			}
+		}
+
 		if os.Getenv("SHUFFLE_SWARM_CONFIG") != "run" && os.Getenv("SHUFFLE_SWARM_CONFIG") != "swarm" {
 			requestsSent += 1
 		}
@@ -2754,6 +2784,8 @@ func sendAppRequest(incomingUrl, appName string, port int, action shuffle.Action
 		} else {
 			// Callback to worker
 			parsedRequest.Url = fmt.Sprintf("%s:%d", parsedBaseurl, baseport)
+
+			//parsedRequest.Url
 		}
 
 		//log.Printf("[DEBUG][%s] Should add a baseurl for the app to get back to: %s", workflowExecution.ExecutionId, parsedRequest.Url)
@@ -2764,6 +2796,8 @@ func sendAppRequest(incomingUrl, appName string, port int, action shuffle.Action
 	parsedRequest.Url = parsedRequest.BaseUrl
 	parsedRequest.BaseUrl = tmp
 
+	//http://3e05d1e7d7a0:33333,
+
 	// Run with proper hostname, but set to shuffle-worker to avoid specific host target.
 	// This means running with VIP instead.
 	if len(hostname) > 0 {
@@ -2793,15 +2827,39 @@ func sendAppRequest(incomingUrl, appName string, port int, action shuffle.Action
 		return err
 	}
 
+	// Checking as LATE as possible, ensuring we don't rerun what's already ran
+	ctx := context.Background()
+	newExecId := fmt.Sprintf("%s_%s", workflowExecution.ExecutionId, action.ID)
+	_, err = shuffle.GetCache(ctx, newExecId)
+	if err == nil {
+		log.Printf("\n\n[DEBUG] Result for %s already found (PRE REQUEST) - returning\n\n", newExecId)
+		return nil
+	}
+
+	cacheData := []byte("1")
+	err = shuffle.SetCache(ctx, newExecId, cacheData)
+	if err != nil {
+		log.Printf("[WARNING] Failed setting cache for action %s: %s", newExecId, err)
+	} else {
+		log.Printf("[DEBUG] Adding %s to cache. Name: %s", newExecId, action.Name)
+	}
+
+	// FIXME:
+
 	newresp, err := client.Do(req)
 	if err != nil {
+		if strings.Contains(fmt.Sprintf("%s", err), "timeout awaiting response") {
+			return nil
+		}
+
 		log.Printf("[ERROR] Error running app run request: %s", err)
+
 		return err
 	}
 
 	body, err := ioutil.ReadAll(newresp.Body)
 	if err != nil {
-		log.Printf("[ERROR] Failed reading body: %s", err)
+		log.Printf("[ERROR] Failed reading app request body body: %s", err)
 		return err
 	} else {
 		log.Printf("[INFO][%s] NEWRESP (from app): %s", workflowExecution.ExecutionId, string(body))
@@ -3060,7 +3118,7 @@ func main() {
 			//workflowExecution.StartedAt = int64(time.Now().Unix())
 
 			cacheKey := fmt.Sprintf("workflowexecution-%s", workflowExecution.ExecutionId)
-			requestCache = cache.New(5*time.Minute, 10*time.Minute)
+			requestCache = cache.New(60*time.Minute, 120*time.Minute)
 			requestCache.Set(cacheKey, &workflowExecution, cache.DefaultExpiration)
 			for _, action := range workflowExecution.Workflow.Actions {
 				found := false
@@ -3331,7 +3389,7 @@ func runWebserver(listener net.Listener) {
 			if err != nil {}
 		*/
 
-		requestCache = cache.New(5*time.Minute, 10*time.Minute)
+		requestCache = cache.New(60*time.Minute, 120*time.Minute)
 		log.Printf("[DEBUG] Running webserver config for SWARM and K8s")
 		r.HandleFunc("/api/v1/execute", handleRunExecution).Methods("POST", "OPTIONS")
 	}