Merge branch 'develop'

Author: litzinger

.github/workflows/build.yml

@@ -1,9 +1,12 @@
 name: Build with Tag
 
+on:
+  push:
+
 on:
   push:
     tags:
-      - '*' # Triggers on any tag
+      - '*'
 
 jobs:
   build:
@@ -13,21 +16,25 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Set up PHP
-        uses: shivammathur/setup-php@v2
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
         with:
-          php-version: '8.2'
+          version: 10
+          run_install: false
 
-      - name: Install Composer dependencies
-        run: composer install --no-interaction --prefer-dist --optimize-autoloader
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: '20'
-
-      - name: Install Node dependencies
-        run: npm ci
+#      - name: Set up PHP
+#        uses: shivammathur/setup-php@v2
+#        with:
+#          php-version: '8.2'
+#
+#      - name: Install Composer dependencies
+#        run: composer install --no-interaction --prefer-dist --optimize-autoloader
 
       - name: Build assets
-        run: npm run build
+        run: cd themes/user/app; pnpm install; pnpm run build;
+
+      - name: Archive build artifacts
+        run: |
+          grep composer.json | xargs rm
+          grep composer.lock | xargs rm
+          zip -r ../release.zip .

README.md

@@ -185,13 +185,13 @@ To see working examples you can run the following commands.
 This will execute `queue/Commands/CommandQueueTest.php`, which adds 5 jobs to the queue, each an instance of `TestJob` (see below)
 
 ```bash
-php system/ee/eecli.php queue:test`
+php system/ee/eecli.php queue:test
 ```
 
 Then run this command, which will process the jobs, which calls the `fire()` method for each job.
 
 ```bash
-`php system/ee/eecli.php queue:work --limit=5`
+php system/ee/eecli.php queue:work --limit=5
 ```
 
 Example job class you can use as a starting point.

addons/queue/Queue/Drivers/DatabaseDriver.php

@@ -90,15 +90,15 @@ public function getPendingJobs(string $queueName = 'default'): array
             ->get();
 
         return array_map(function ($job) {
-            return [
-                'id' => $job->id,
-                'queue' => $job->queue,
-                'payload' => $job->payload,
-                'attempts' => $job->attempts,
-                'available_at' => $job->available_at,
-                'created_at' => $job->created_at,
-                'reserved_at' => $job->reserved_at,
-            ];
+            return (new PendingJob(
+                id: $job->id,
+                queue: $job->queue,
+                payload: $job->payload,
+                attempts: $job->attempts ?? 0,
+                available_at: $job->available_at ?? 0,
+                created_at: $job->created_at ?? 0,
+                reserved_at: $job->reserved_at ?? 0,
+            ))->toArray();
         }, $jobs->toArray());
     }
 
@@ -113,14 +113,13 @@ public function getFailedJobs(string $queueName = 'default'): array
             ->get();
 
         return array_map(function ($job) {
-            return [
-                'id' => $job->id,
-                'uuid' => $job->uuid,
-                'queue' => $job->queue,
-                'payload' => $job->payload,
-                'exception' => $job->exception,
-                'failed_at' => $job->failed_at,
-            ];
+            return (new FailedJob(
+                id: $job->id,
+                uuid: $job->uuid,
+                payload: $job->payload ?? '',
+                failed_at: $job->failed_at ?? '',
+                exception: $job->exception ?? '',
+            ))->toArray();
         }, $jobs->toArray());
     }
 

addons/queue/Queue/Drivers/FailedJob.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace BoldMinded\Queue\Queue\Drivers;
+
+final class FailedJob
+{
+    public function __construct(
+        public int $id = 0,
+        public string $uuid = '',
+        public string $queue = 'default',
+        public string $payload = '',
+        public string $exception = '',
+        public string $failed_at = '',
+    ) {}
+
+    public function toArray(): array
+    {
+        return [
+            'id' => $this->id,
+            'uuid' => $this->uuid,
+            'queue' => $this->queue,
+            'payload' => $this->payload,
+            'exception' => $this->exception,
+            'failed_at' => $this->failed_at,
+        ];
+    }
+}

addons/queue/Queue/Drivers/PendingJob.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace BoldMinded\Queue\Queue\Drivers;
+
+final class PendingJob
+{
+    public function __construct(
+        public string $id,
+        public string $queue = 'default',
+        public string $payload = '',
+        public int $attempts = 0,
+        public int $available_at = 0,
+        public int $created_at = 0,
+        public int $reserved_at = 0,
+    ) {}
+
+    public function toArray(): array
+    {
+        return [
+            'id' => $this->id,
+            'queue' => $this->queue,
+            'payload' => $this->payload,
+            'attempts' => $this->attempts,
+            'available_at' => $this->available_at,
+            'created_at' => $this->created_at,
+            'reserved_at' => $this->reserved_at,
+        ];
+    }
+}

addons/queue/Queue/Drivers/RedisDriver.php

@@ -132,15 +132,15 @@ private function getJobsFromQueue(string $queueName): array
         return array_map(function ($job) use ($queueName) {
             $decoded = json_decode($job);
 
-            return [
-                'id' => $decoded->uuid,
-                'queue' => $queueName,
-                'payload' => $decoded->data,
-                'attempts' => $decoded->attempts,
-                'available_at' => $decoded->available_at ?? 0,
-                'created_at' => $decoded->created_at ?? 0,
-                'reserved_at' => $decoded->reserved_at ?? 0,
-            ];
+            return (new PendingJob(
+                id: $decoded->id,
+                queue: $queueName,
+                payload: (string) $decoded->data,
+                attempts: $decoded->attempts ?? 0,
+                available_at: $decoded->available_at ?? 0,
+                created_at: $decoded->created_at ?? 0,
+                reserved_at: $decoded->reserved_at ?? 0,
+            ))->toArray();
         }, $queueList);
     }
 

themes/user/app/package.json

@@ -12,7 +12,8 @@
   "dependencies": {
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "react-router": "^7.4.0"
+    "react-router": "^7.4.0",
+    "zod": "^3.24.2"
   },
   "devDependencies": {
     "@eslint/js": "^9.21.0",

themes/user/app/pnpm-lock.yaml

@@ -1,5 +1,5 @@
 import config from "./Config.ts";
-import { BasicResponse } from "./BasicResponse.ts";
+import { BasicResponse, BasicResponseSchema } from "./Queue.ts";
 
 export default async function DeleteFailedJob(jobId: string): Promise<BasicResponse> {
     const requestConfig = {
@@ -15,14 +15,12 @@ export default async function DeleteFailedJob(jobId: string): Promise<BasicRespo
         }),
     };
 
-    return await fetch(config.urlDeleteFailedJob, requestConfig)
-        .then(res => res.json())
-        .then(
-            (result) => {
-                return result;
-            },
-            (error) => {
-                console.log(error);
-            }
-        );
+    try {
+        const response = await fetch(config.urlDeleteFailedJob, requestConfig);
+        const data = await response.json();
+        return BasicResponseSchema.parse(data);
+    } catch (error) {
+        console.error('Error deleting failed job:', error);
+        throw error;
+    }
 }