Skip to content

Commit 2e84939

Browse files
committed
[client] Extend FsDriver from GenericDriver.
1 parent cde3e3c commit 2e84939

4 files changed

Lines changed: 73 additions & 453 deletions

File tree

‎pkg/enqueue/Client/Driver/AmqpDriver.php‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
namespace Enqueue\Client\Driver;
66

77
use Enqueue\AmqpExt\AmqpProducer;
8-
use Enqueue\Client\Config;
98
use Enqueue\Client\Message;
10-
use Enqueue\Client\RouteCollection;
119
use Interop\Amqp\AmqpContext;
1210
use Interop\Amqp\AmqpMessage;
1311
use Interop\Amqp\AmqpQueue;
@@ -20,30 +18,14 @@
2018
use Psr\Log\LoggerInterface;
2119
use Psr\Log\NullLogger;
2220

21+
/**
22+
* @method AmqpContext getContext
23+
*/
2324
class AmqpDriver extends GenericDriver
2425
{
25-
/**
26-
* @var AmqpContext
27-
*/
28-
private $context;
29-
30-
/**
31-
* @var Config
32-
*/
33-
private $config;
34-
35-
/**
36-
* @var RouteCollection
37-
*/
38-
private $routeCollection;
39-
40-
public function __construct(AmqpContext $context, Config $config, RouteCollection $routeCollection)
26+
public function __construct(AmqpContext $context, ...$args)
4127
{
42-
$this->context = $context;
43-
$this->config = $config;
44-
$this->routeCollection = $routeCollection;
45-
46-
parent::__construct($context, $config, $routeCollection);
28+
parent::__construct($context, ...$args);
4729
}
4830

4931
/**
@@ -86,26 +68,26 @@ public function setupBroker(LoggerInterface $logger = null): void
8668
// setup router
8769
$routerTopic = $this->createRouterTopic();
8870
$log('Declare router exchange: %s', $routerTopic->getTopicName());
89-
$this->context->declareTopic($routerTopic);
71+
$this->getContext()->declareTopic($routerTopic);
9072

91-
$routerQueue = $this->createQueue($this->config->getRouterQueueName());
73+
$routerQueue = $this->createQueue($this->getConfig()->getRouterQueueName());
9274
$log('Declare router queue: %s', $routerQueue->getQueueName());
93-
$this->context->declareQueue($routerQueue);
75+
$this->getContext()->declareQueue($routerQueue);
9476

9577
$log('Bind router queue to exchange: %s -> %s', $routerQueue->getQueueName(), $routerTopic->getTopicName());
96-
$this->context->bind(new AmqpBind($routerTopic, $routerQueue, $routerQueue->getQueueName()));
78+
$this->getContext()->bind(new AmqpBind($routerTopic, $routerQueue, $routerQueue->getQueueName()));
9779

9880
// setup queues
9981
$declaredQueues = [];
100-
foreach ($this->routeCollection->all() as $route) {
82+
foreach ($this->getRouteCollection()->all() as $route) {
10183
/** @var AmqpQueue $queue */
10284
$queue = $this->createRouteQueue($route);
10385
if (array_key_exists($queue->getQueueName(), $declaredQueues)) {
10486
continue;
10587
}
10688

10789
$log('Declare processor queue: %s', $queue->getQueueName());
108-
$this->context->declareQueue($queue);
90+
$this->getContext()->declareQueue($queue);
10991

11092
$declaredQueues[$queue->getQueueName()] = true;
11193
}

‎pkg/enqueue/Client/Driver/FsDriver.php‎

Lines changed: 21 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -2,69 +2,21 @@
22

33
namespace Enqueue\Client\Driver;
44

5-
use Enqueue\Client\Config;
6-
use Enqueue\Client\DriverInterface;
7-
use Enqueue\Client\Message;
8-
use Enqueue\Client\MessagePriority;
9-
use Enqueue\Client\Meta\QueueMetaRegistry;
105
use Enqueue\Fs\FsContext;
116
use Enqueue\Fs\FsDestination;
12-
use Enqueue\Fs\FsMessage;
13-
use Interop\Queue\PsrMessage;
14-
use Interop\Queue\PsrQueue;
157
use Psr\Log\LoggerInterface;
168
use Psr\Log\NullLogger;
179

18-
class FsDriver implements DriverInterface
10+
/**
11+
* @method FsContext getContext
12+
* @method FsDestination createQueue(string $name)
13+
* @method FsDestination createRouterTopic
14+
*/
15+
class FsDriver extends GenericDriver
1916
{
20-
/**
21-
* @var FsContext
22-
*/
23-
private $context;
24-
25-
/**
26-
* @var Config
27-
*/
28-
private $config;
29-
30-
/**
31-
* @var QueueMetaRegistry
32-
*/
33-
private $queueMetaRegistry;
34-
35-
public function __construct(FsContext $context, Config $config, QueueMetaRegistry $queueMetaRegistry)
36-
{
37-
$this->context = $context;
38-
$this->config = $config;
39-
$this->queueMetaRegistry = $queueMetaRegistry;
40-
}
41-
42-
public function sendToRouter(Message $message): void
43-
{
44-
if (false == $message->getProperty(Config::PARAMETER_TOPIC_NAME)) {
45-
throw new \LogicException('Topic name parameter is required but is not set');
46-
}
47-
48-
$topic = $this->createRouterTopic();
49-
$transportMessage = $this->createTransportMessage($message);
50-
51-
$this->context->createProducer()->send($topic, $transportMessage);
52-
}
53-
54-
public function sendToProcessor(Message $message): void
17+
public function __construct(FsContext $context, ...$args)
5518
{
56-
if (false == $message->getProperty(Config::PARAMETER_PROCESSOR_NAME)) {
57-
throw new \LogicException('Processor name parameter is required but is not set');
58-
}
59-
60-
if (false == $queueName = $message->getProperty(Config::PARAMETER_PROCESSOR_QUEUE_NAME)) {
61-
throw new \LogicException('Queue name parameter is required but is not set');
62-
}
63-
64-
$transportMessage = $this->createTransportMessage($message);
65-
$destination = $this->createQueue($queueName);
66-
67-
$this->context->createProducer()->send($destination, $transportMessage);
19+
parent::__construct($context, ...$args);
6820
}
6921

7022
public function setupBroker(LoggerInterface $logger = null): void
@@ -76,85 +28,27 @@ public function setupBroker(LoggerInterface $logger = null): void
7628

7729
// setup router
7830
$routerTopic = $this->createRouterTopic();
79-
$routerQueue = $this->createQueue($this->config->getRouterQueueName());
31+
$routerQueue = $this->createQueue($this->getConfig()->getRouterQueueName());
8032

8133
$log('Declare router exchange "%s" file: %s', $routerTopic->getTopicName(), $routerTopic->getFileInfo());
82-
$this->context->declareDestination($routerTopic);
34+
$this->getContext()->declareDestination($routerTopic);
8335

8436
$log('Declare router queue "%s" file: %s', $routerQueue->getQueueName(), $routerTopic->getFileInfo());
85-
$this->context->declareDestination($routerQueue);
37+
$this->getContext()->declareDestination($routerQueue);
8638

8739
// setup queues
88-
foreach ($this->queueMetaRegistry->getQueuesMeta() as $meta) {
89-
$queue = $this->createQueue($meta->getClientName());
40+
$declaredQueues = [];
41+
foreach ($this->getRouteCollection()->all() as $route) {
42+
/** @var FsDestination $queue */
43+
$queue = $this->createRouteQueue($route);
44+
if (array_key_exists($queue->getQueueName(), $declaredQueues)) {
45+
continue;
46+
}
9047

9148
$log('Declare processor queue "%s" file: %s', $queue->getQueueName(), $queue->getFileInfo());
92-
$this->context->declareDestination($queue);
93-
}
94-
}
95-
96-
/**
97-
* @return FsDestination
98-
*/
99-
public function createQueue(string $queueName): PsrQueue
100-
{
101-
$transportName = $this->queueMetaRegistry->getQueueMeta($queueName)->getTransportName();
102-
103-
return $this->context->createQueue($transportName);
104-
}
105-
106-
/**
107-
* @return FsMessage
108-
*/
109-
public function createTransportMessage(Message $message): PsrMessage
110-
{
111-
$properties = $message->getProperties();
112-
113-
$headers = $message->getHeaders();
114-
$headers['content_type'] = $message->getContentType();
115-
116-
$transportMessage = $this->context->createMessage();
117-
$transportMessage->setBody($message->getBody());
118-
$transportMessage->setHeaders($headers);
119-
$transportMessage->setProperties($properties);
120-
$transportMessage->setMessageId($message->getMessageId());
121-
$transportMessage->setTimestamp($message->getTimestamp());
122-
$transportMessage->setReplyTo($message->getReplyTo());
123-
$transportMessage->setCorrelationId($message->getCorrelationId());
124-
125-
return $transportMessage;
126-
}
127-
128-
/**
129-
* @param FsMessage $message
130-
*/
131-
public function createClientMessage(PsrMessage $message): Message
132-
{
133-
$clientMessage = new Message();
134-
135-
$clientMessage->setBody($message->getBody());
136-
$clientMessage->setHeaders($message->getHeaders());
137-
$clientMessage->setProperties($message->getProperties());
138-
139-
$clientMessage->setContentType($message->getHeader('content_type'));
140-
$clientMessage->setMessageId($message->getMessageId());
141-
$clientMessage->setTimestamp($message->getTimestamp());
142-
$clientMessage->setPriority(MessagePriority::NORMAL);
143-
$clientMessage->setReplyTo($message->getReplyTo());
144-
$clientMessage->setCorrelationId($message->getCorrelationId());
145-
146-
return $clientMessage;
147-
}
49+
$this->getContext()->declareDestination($queue);
14850

149-
public function getConfig(): Config
150-
{
151-
return $this->config;
152-
}
153-
154-
private function createRouterTopic(): FsDestination
155-
{
156-
return $this->context->createTopic(
157-
$this->config->createTransportQueueName($this->config->getRouterTopicName())
158-
);
51+
$declaredQueues[$queue->getQueueName()] = true;
52+
}
15953
}
16054
}

‎pkg/enqueue/Client/Driver/RabbitMqDriver.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Interop\Amqp\AmqpQueue;
66
use Interop\Queue\PsrQueue;
77

8-
final class RabbitMqDriver extends AmqpDriver
8+
class RabbitMqDriver extends AmqpDriver
99
{
1010
/**
1111
* @return AmqpQueue

0 commit comments

Comments
 (0)