feat: Implement workflow definition caching with invalidation, introduce safe error messages, improve JSON query compatibility, and add cache locking for batch dispatch.

Author: Óscar J. Baeza

.gitignore

@@ -44,7 +44,6 @@ coverage.xml
 clover.xml
 
 # Package development
-composer.lock
 package-lock.json
 
 # PHPStan

app/Actions/Batch/DispatchJobs.php

@@ -26,15 +26,17 @@ public function handle(string $driver, int $count, string $queue, int $delay, in
         Cache::put("batch:{$batchId}:queue", $queue, now()->addHours(24));
         Cache::put("batch:{$batchId}:started_at", now()->toIso8601String(), now()->addHours(24));
 
-        $activeBatches = Cache::get('active_batches', []);
-        $activeBatches[$batchId] = [
-            'id' => $batchId,
-            'driver' => $driver,
-            'queue' => $queue,
-            'total' => $count,
-            'started_at' => now()->toIso8601String(),
-        ];
-        Cache::put('active_batches', $activeBatches, now()->addHours(24));
+        Cache::lock('active_batches_lock', 5)->block(3, static function () use ($batchId, $driver, $queue, $count): void {
+            $activeBatches = Cache::get('active_batches', []);
+            $activeBatches[$batchId] = [
+                'id' => $batchId,
+                'driver' => $driver,
+                'queue' => $queue,
+                'total' => $count,
+                'started_at' => now()->toIso8601String(),
+            ];
+            Cache::put('active_batches', $activeBatches, now()->addHours(24));
+        });
 
         $chunkSize = 1000;
         for ($i = 0; $i < $count; $i += $chunkSize) {

app/Actions/Workflow/CreateWorkflowDefinition.php

@@ -6,12 +6,15 @@
 
 use App\Jobs\WorkflowStepJob;
 use App\Models\WorkflowDefinition;
+use Illuminate\Support\Facades\Cache;
 use Station\Facades\Workflow;
 
 class CreateWorkflowDefinition
 {
     public function handle(array $data): array
     {
+        Cache::forget('workflow_definitions');
+
         $definition = WorkflowDefinition::create([
             'name' => $data['name'],
             'description' => $data['description'] ?? null,

app/Actions/Workflow/DeleteWorkflowDefinition.php

@@ -5,11 +5,14 @@
 namespace App\Actions\Workflow;
 
 use App\Models\WorkflowDefinition;
+use Illuminate\Support\Facades\Cache;
 
 class DeleteWorkflowDefinition
 {
     public function handle(string $name): bool
     {
+        Cache::forget('workflow_definitions');
+
         return WorkflowDefinition::where('name', $name)->delete() > 0;
     }
 }

app/Actions/Workflow/ListStationWorkflows.php

@@ -21,7 +21,7 @@ public function handle(int $page, ?string $status = null, ?string $connection =
         }
 
         if ($connection) {
-            $query->whereRaw("JSON_UNQUOTE(JSON_EXTRACT(context, '$.connection')) = ?", [$connection]);
+            $query->where('context->connection', $connection);
         }
 
         $total = (clone $query)->count();

app/Actions/Workflow/UpdateWorkflowDefinition.php

@@ -6,6 +6,7 @@
 
 use App\Jobs\WorkflowStepJob;
 use App\Models\WorkflowDefinition;
+use Illuminate\Support\Facades\Cache;
 use Station\Workflows\WorkflowManager;
 
 class UpdateWorkflowDefinition
@@ -22,7 +23,15 @@ public function handle(string $name, array $data): ?array
             return null;
         }
 
-        $definition->update($data);
+        Cache::forget('workflow_definitions');
+
+        $definition->update([
+            'name' => $data['name'],
+            'description' => $data['description'] ?? null,
+            'steps' => $data['steps'],
+            'timeout' => $data['timeout'],
+            'connection' => $data['connection'] ?? null,
+        ]);
 
         $wf = $this->workflowManager->define($data['name'])
             ->description($data['description'] ?? '')

app/Http/Controllers/Controller.php

@@ -6,5 +6,10 @@
 
 abstract class Controller
 {
-    //
+    protected function safeErrorMessage(\Throwable $e): string
+    {
+        return app()->environment('local', 'testing')
+            ? $e->getMessage()
+            : 'An internal error occurred.';
+    }
 }

app/Http/Controllers/DriverController.php

@@ -18,7 +18,7 @@ public function index(GetDrivers $action): JsonResponse
             return response()->json([
                 'drivers' => [],
                 'default' => config('queue.default', 'sync'),
-                'error' => $e->getMessage(),
+                'error' => $this->safeErrorMessage($e),
             ]);
         }
     }

app/Http/Controllers/FailedJobController.php

@@ -24,7 +24,7 @@ public function index(Request $request, ListFailedJobs $action): JsonResponse
         } catch (Throwable $e) {
             return response()->json([
                 'success' => false,
-                'error' => $e->getMessage(),
+                'error' => $this->safeErrorMessage($e),
                 'failed_jobs' => [],
                 'count' => 0,
                 'pagination' => ['current_page' => 1, 'last_page' => 1, 'total' => 0, 'per_page' => 10],
@@ -39,7 +39,7 @@ public function retry(string $uuid, RetryFailedJob $action): JsonResponse
         } catch (Throwable $e) {
             return response()->json([
                 'success' => false,
-                'error' => $e->getMessage(),
+                'error' => $this->safeErrorMessage($e),
             ], 500);
         }
     }
@@ -51,7 +51,7 @@ public function retryAll(RetryAllFailedJobs $action): JsonResponse
         } catch (Throwable $e) {
             return response()->json([
                 'success' => false,
-                'error' => $e->getMessage(),
+                'error' => $this->safeErrorMessage($e),
             ], 500);
         }
     }
@@ -68,7 +68,7 @@ public function destroy(string $uuid, DeleteFailedJob $action): JsonResponse
         } catch (Throwable $e) {
             return response()->json([
                 'success' => false,
-                'error' => $e->getMessage(),
+                'error' => $this->safeErrorMessage($e),
             ], 500);
         }
     }
@@ -80,7 +80,7 @@ public function flush(FlushFailedJobs $action): JsonResponse
         } catch (Throwable $e) {
             return response()->json([
                 'success' => false,
-                'error' => $e->getMessage(),
+                'error' => $this->safeErrorMessage($e),
             ], 500);
         }
     }

app/Http/Controllers/StationBatchController.php

@@ -40,7 +40,7 @@ public function store(Request $request, CreateStationBatch $action): JsonRespons
         } catch (Throwable $e) {
             return response()->json([
                 'success' => false,
-                'error' => $e->getMessage(),
+                'error' => $this->safeErrorMessage($e),
             ], 500);
         }
     }
@@ -57,7 +57,7 @@ public function index(Request $request, ListStationBatches $action): JsonRespons
             return response()->json([
                 'batches' => [],
                 'pagination' => ['current_page' => 1, 'last_page' => 1, 'total' => 0, 'per_page' => 10],
-                'error' => $e->getMessage(),
+                'error' => $this->safeErrorMessage($e),
             ]);
         }
     }
@@ -69,7 +69,7 @@ public function cancel(string $id, CancelBatch $action): JsonResponse
         } catch (Throwable $e) {
             return response()->json([
                 'success' => false,
-                'error' => $e->getMessage(),
+                'error' => $this->safeErrorMessage($e),
             ], 500);
         }
     }
@@ -81,7 +81,7 @@ public function retry(string $id, RetryBatch $action): JsonResponse
         } catch (Throwable $e) {
             return response()->json([
                 'success' => false,
-                'error' => $e->getMessage(),
+                'error' => $this->safeErrorMessage($e),
             ], 500);
         }
     }
@@ -93,7 +93,7 @@ public function clear(ClearStationBatches $action): JsonResponse
 
             return response()->json(['success' => true]);
         } catch (Throwable $e) {
-            return response()->json(['success' => false, 'error' => $e->getMessage()], 500);
+            return response()->json(['success' => false, 'error' => $this->safeErrorMessage($e)], 500);
         }
     }
 }