@@ -33,16 +33,23 @@ class AmqpConsumer implements PsrConsumer
3333 */
3434 private $ isInit ;
3535
36+ /**
37+ * @var string
38+ */
39+ private $ receiveMethod ;
40+
3641 /**
3742 * @param AmqpContext $context
3843 * @param AmqpQueue $queue
3944 * @param Buffer $buffer
45+ * @param string $receiveMethod
4046 */
41- public function __construct (AmqpContext $ context , AmqpQueue $ queue , Buffer $ buffer )
47+ public function __construct (AmqpContext $ context , AmqpQueue $ queue , Buffer $ buffer, $ receiveMethod )
4248 {
4349 $ this ->queue = $ queue ;
4450 $ this ->context = $ context ;
4551 $ this ->buffer = $ buffer ;
52+ $ this ->receiveMethod = $ receiveMethod ;
4653
4754 $ this ->isInit = false ;
4855 }
@@ -64,61 +71,15 @@ public function getQueue()
6471 */
6572 public function receive ($ timeout = 0 )
6673 {
67- // @see https://github.com/php-enqueue/enqueue-dev/issues/110 and https://github.com/pdezwart/php-amqp/issues/281
68- $ end = microtime (true ) + ($ timeout / 1000 );
74+ if ('basic_get ' == $ this ->receiveMethod ) {
75+ return $ this ->receiveBasicGet ($ timeout );
76+ }
6977
70- while (0 === $ timeout || microtime (true ) < $ end ) {
71- if ($ message = $ this ->receiveNoWait ()) {
72- return $ message ;
73- }
78+ if ('basic_consume ' == $ this ->receiveMethod ) {
79+ return $ this ->receiveBasicConsume ($ timeout );
7480 }
7581
76- // if ($this->isInit && $message = $this->buffer->pop($this->getExtQueue()->getConsumerTag())) {
77- // return $message;
78- // }
79- //
80- // /** @var \AMQPQueue $extQueue */
81- // $extConnection = $this->getExtQueue()->getChannel()->getConnection();
82- //
83- // $originalTimeout = $extConnection->getReadTimeout();
84- // try {
85- // $extConnection->setReadTimeout($timeout / 1000);
86- //
87- // if (false == $this->isInit) {
88- // $this->getExtQueue()->consume(null, AMQP_NOPARAM);
89- //
90- // $this->isInit = true;
91- // }
92- //
93- // /** @var AmqpMessage|null $message */
94- // $message = null;
95- //
96- // $this->getExtQueue()->consume(function (\AMQPEnvelope $extEnvelope, \AMQPQueue $q) use (&$message) {
97- // $message = $this->convertMessage($extEnvelope);
98- // $message->setConsumerTag($q->getConsumerTag());
99- //
100- // if ($this->getExtQueue()->getConsumerTag() == $q->getConsumerTag()) {
101- // return false;
102- // }
103- //
104- // // not our message, put it to buffer and continue.
105- // $this->buffer->push($q->getConsumerTag(), $message);
106- //
107- // $message = null;
108- //
109- // return true;
110- // }, AMQP_JUST_CONSUME);
111- //
112- // return $message;
113- // } catch (\AMQPQueueException $e) {
114- // if ('Consumer timeout exceed' == $e->getMessage()) {
115- // return null;
116- // }
117- //
118- // throw $e;
119- // } finally {
120- // $extConnection->setReadTimeout($originalTimeout);
121- // }
82+ throw new \LogicException ('The "receiveMethod" is not supported ' );
12283 }
12384
12485 /**
@@ -160,6 +121,77 @@ public function reject(PsrMessage $message, $requeue = false)
160121 );
161122 }
162123
124+ /**
125+ * @param int $timeout
126+ *
127+ * @return AmqpMessage|null
128+ */
129+ private function receiveBasicGet ($ timeout )
130+ {
131+ $ end = microtime (true ) + ($ timeout / 1000 );
132+
133+ while (0 === $ timeout || microtime (true ) < $ end ) {
134+ if ($ message = $ this ->receiveNoWait ()) {
135+ return $ message ;
136+ }
137+ }
138+ }
139+
140+ /**
141+ * @param int $timeout
142+ *
143+ * @return AmqpMessage|null
144+ */
145+ private function receiveBasicConsume ($ timeout )
146+ {
147+ if ($ this ->isInit && $ message = $ this ->buffer ->pop ($ this ->getExtQueue ()->getConsumerTag ())) {
148+ return $ message ;
149+ }
150+
151+ /** @var \AMQPQueue $extQueue */
152+ $ extConnection = $ this ->getExtQueue ()->getChannel ()->getConnection ();
153+
154+ $ originalTimeout = $ extConnection ->getReadTimeout ();
155+ try {
156+ $ extConnection ->setReadTimeout ($ timeout / 1000 );
157+
158+ if (false == $ this ->isInit ) {
159+ $ this ->getExtQueue ()->consume (null , AMQP_NOPARAM );
160+
161+ $ this ->isInit = true ;
162+ }
163+
164+ /** @var AmqpMessage|null $message */
165+ $ message = null ;
166+
167+ $ this ->getExtQueue ()->consume (function (\AMQPEnvelope $ extEnvelope , \AMQPQueue $ q ) use (&$ message ) {
168+ $ message = $ this ->convertMessage ($ extEnvelope );
169+ $ message ->setConsumerTag ($ q ->getConsumerTag ());
170+
171+ if ($ this ->getExtQueue ()->getConsumerTag () == $ q ->getConsumerTag ()) {
172+ return false ;
173+ }
174+
175+ // not our message, put it to buffer and continue.
176+ $ this ->buffer ->push ($ q ->getConsumerTag (), $ message );
177+
178+ $ message = null ;
179+
180+ return true ;
181+ }, AMQP_JUST_CONSUME );
182+
183+ return $ message ;
184+ } catch (\AMQPQueueException $ e ) {
185+ if ('Consumer timeout exceed ' == $ e ->getMessage ()) {
186+ return null ;
187+ }
188+
189+ throw $ e ;
190+ } finally {
191+ $ extConnection ->setReadTimeout ($ originalTimeout );
192+ }
193+ }
194+
163195 /**
164196 * @param \AMQPEnvelope $extEnvelope
165197 *
0 commit comments