Merge pull request #1 from bckp/feature-dlx-queues

Added DLX feature for queues

Author: bckp

.docs/README.md

@@ -18,7 +18,7 @@ config.neon:
 
 ```neon
 extensions:
-	rabbitmq: Mallgroup\RabbitMQ\DI\RabbitMQExtension
+	rabbitmq: Bckp\RabbitMQ\DI\RabbitMQExtension
 ```
 
 ### Example configuration
@@ -47,6 +47,13 @@ rabbitmq:
 			  # false - do not declare (will fail if not created)
 			  # never - do not declare even if command is called, this one is mainly for no-permissions state
 
+		autoDlxQueue:
+			connection: default
+			autoCreate: true
+			dlx: [+5min, +15min]
+			# Will create automaticly 2 new dlx queues and exchanges to handle them
+			# if message is rejected in queue, it will go to first DLX, on second reject it will go to second DLX, on third will be throwed away
+
 	exchanges:
 		testExchange:
 			connection: default
@@ -111,7 +118,7 @@ rabbitmq:
 # Enable tracy bar panel
 tracy:
 	bar:
-		- Mallgroup\RabbitMQ\Diagnostics\BarPanel
+		- Bckp\RabbitMQ\Diagnostics\BarPanel
 ```
 
 ### Declaring Queues and Exchanges
@@ -154,7 +161,7 @@ services.neon:
 
 ```neon
 services:
-	- TestQueue(@Mallgroup\RabbitMQ\Client::getProducer(testProducer))
+	- TestQueue(@Bckp\RabbitMQ\Client::getProducer(testProducer))
 ```
 
 TestQueue.php:
@@ -164,7 +171,7 @@ TestQueue.php:
 
 declare(strict_types=1);
 
-use Mallgroup\RabbitMQ\Producer\Producer;
+use Bckp\RabbitMQ\Producer\Producer;
 
 final class TestQueue
 {
@@ -196,7 +203,7 @@ final class TestQueue
 
 Bunny does not support well producers that run a long time but send the message only once in a long period. Producers often drop connection in the middle but bunny have no idea about it (stream is closed) and if you try to write some data, an exception will be thrown about broken connection.
 Drawback: you must call heartbeat by yourself.
-In the example below, you can see that Connection::sendHearbeat() is callen in every single cycle - that is not a problem as internally, `Mallgroup\rabbitmq` will actually let you send the heartbeat to rabbitmq only once per 1 second.
+In the example below, you can see that Connection::sendHearbeat() is callen in every single cycle - that is not a problem as internally, `Bckp\RabbitMQ` will actually let you send the heartbeat to rabbitmq only once per 1 second.
 
 LongRunningTestQueue.php:
 
@@ -205,7 +212,7 @@ LongRunningTestQueue.php:
 
 declare(strict_types=1);
 
-use Mallgroup\RabbitMQ\Producer\Producer;
+use Bckp\RabbitMQ\Producer\Producer;
 
 final class LongRunningTestQueue
 {
@@ -270,7 +277,7 @@ TestConsumer.php
 declare(strict_types=1);
 
 use Bunny\Message;
-use Mallgroup\RabbitMQ\Consumer\IConsumer;
+use Bckp\RabbitMQ\Consumer\IConsumer;
 
 final class TestConsumer implements IConsumer
 {
@@ -303,7 +310,7 @@ TestBulkConsumer.php
 declare(strict_types=1);
 
 use Bunny\Message;
-use Mallgroup\RabbitMQ\Consumer\IConsumer;
+use Bckp\RabbitMQ\Consumer\IConsumer;
 
 final class TestConsumer
 {

.github/workflows/main.yaml

@@ -15,7 +15,7 @@ jobs:
     name: "Quality assurance"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
           php-version: 8.0
@@ -28,7 +28,7 @@ jobs:
     name: PHPStan
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
           php-version: 8.0
@@ -41,7 +41,7 @@ jobs:
     name: Psalm
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
           php-version: 8.0
@@ -54,13 +54,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '8.0', '8.1', '8.2' ]
+        php: [ '8.0', '8.1', '8.2', '8.3' ]
 
       fail-fast: false
 
     name: PHP ${{ matrix.php }} tests
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
@@ -74,7 +74,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [tests]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
           php-version: 8.0

Makefile

@@ -9,10 +9,10 @@ install:
 qa: phpstan cs
 
 cs:
-	vendor/bin/phpcs --standard=vendor/gamee/php-code-checker-rules/ruleset.xml --extensions=php,phpt --tab-width=4 --ignore=temp -sp src
+	composer phpcs
 
 csf:
-	vendor/bin/phpcbf --standard=vendor/gamee/php-code-checker-rules/ruleset.xml --extensions=php,phpt --tab-width=4 --ignore=temp -sp src
+	composer fix-style
 
 phpstan:
 	vendor/bin/phpstan analyse src

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "mallgroup/rabbitmq",
+  "name": "bckp/rabbitmq",
   "description": "Nette extension for RabbitMQ (using BunnyPHP)",
   "type": "library",
   "license": "MIT",
@@ -26,12 +26,12 @@
   ],
   "autoload": {
     "psr-4": {
-      "Mallgroup\\RabbitMQ\\": "src/"
+      "Bckp\\RabbitMQ\\": "src/"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Mallgroup\\RabbitMQ\\Tests\\": "tests"
+      "Bckp\\RabbitMQ\\Tests\\": "tests"
     }
   },
   "require": {

docker/docker-compose.yaml

@@ -0,0 +1,34 @@
+version: '3.3'
+
+services:
+    app:
+        image: "trafex/php-nginx"
+        container_name: nette-rabbit
+        ports:
+            - "8088:80"
+        volumes:
+            - ../src.:/var/www/html
+        links:
+            - rabbitmq
+        depends_on:
+            - rabbitmq
+        stdin_open: true
+        tty: true
+
+    rabbitmq:
+        image: "rabbitmq:3.11.19-management"
+        container_name: rabbit
+        environment:
+            RABBITMQ_ERLANG_COOKIE: "uTVS3R2GmZJWN3rQ7zWM"
+            RABBITMQ_DEFAULT_USER: "guest"
+            RABBITMQ_DEFAULT_PASS: "guest"
+            RABBITMQ_DEFAULT_VHOST: "/"
+        ports:
+            - "15672:15672"
+        volumes:
+            - ./docker/etc/rabbitmq/enabled_plugins:/etc/rabbitmq/enabled_plugins
+        dns:
+            - 10.1.17.211
+            - 172.26.1.227
+        labels:
+            NAME: "rabbitmq"

src/AbstractDataBag.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mallgroup\RabbitMQ;
+namespace Bckp\RabbitMQ;
 
 abstract class AbstractDataBag
 {

src/Client.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Mallgroup\RabbitMQ;
+namespace Bckp\RabbitMQ;
 
-use Mallgroup\RabbitMQ\Producer\Exception\ProducerFactoryException;
-use Mallgroup\RabbitMQ\Producer\IProducer;
-use Mallgroup\RabbitMQ\Producer\ProducerFactory;
+use Bckp\RabbitMQ\Producer\Exception\ProducerFactoryException;
+use Bckp\RabbitMQ\Producer\IProducer;
+use Bckp\RabbitMQ\Producer\ProducerFactory;
 
 /**
  * This package uses composer library bunny/bunny. For more information,

src/Connection/Api.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mallgroup\RabbitMQ\Connection;
+namespace Bckp\RabbitMQ\Connection;
 
 class Api implements IApi
 {

src/Connection/Client.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Mallgroup\RabbitMQ\Connection;
+namespace Bckp\RabbitMQ\Connection;
 
 use Bunny\Client as BunnyClient;
 use Bunny\ClientStateEnum;
 use Bunny\Constants;
 use Bunny\Exception\BunnyException;
 use Bunny\Exception\ClientException;
 use Bunny\Protocol;
-use Mallgroup\RabbitMQ\Connection\Exception\WaitTimeoutException;
+use Bckp\RabbitMQ\Connection\Exception\WaitTimeoutException;
 use Nette\Utils\Strings;
 use function time;
 

src/Connection/Connection.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Mallgroup\RabbitMQ\Connection;
+namespace Bckp\RabbitMQ\Connection;
 
 use Bunny\Channel;
 use Bunny\Exception\ClientException;
-use Mallgroup\RabbitMQ\Connection\Exception\ConnectionException;
+use Bckp\RabbitMQ\Connection\Exception\ConnectionException;
 use function in_array;
 use function max;
 use function time;