Added nsq.

.travis.yml

@@ -40,6 +40,6 @@ before_script:
   - composer config -g process-timeout 900 && composer update
 
 script:
-  - composer analyse src/di src/json-rpc src/tracer src/metric src/redis src/nats src/db src/retry src/grpc-client
+  - composer analyse src/di src/json-rpc src/tracer src/metric src/redis src/nats src/db src/retry src/grpc-client src/nsq
   - composer test -- --exclude-group NonCoroutine
   - vendor/bin/phpunit --group NonCoroutine

composer.json

@@ -12,6 +12,7 @@
         "php": ">=7.2",
         "ext-json": "*",
         "ext-swoole": ">=4.4",
+        "ext-bcmath": "*",
         "bandwidth-throttle/token-bucket": "^2.0",
         "doctrine/annotations": "^1.6",
         "doctrine/inflector": "^1.3",
@@ -167,6 +168,7 @@
             "Hyperf\\ModelCache\\": "src/model-cache/src/",
             "Hyperf\\ModelListener\\": "src/model-listener/src/",
             "Hyperf\\Nats\\": "src/nats/src/",
+            "Hyperf\\Nsq\\": "src/nsq/src/",
             "Hyperf\\Paginator\\": "src/paginator/src/",
             "Hyperf\\Pool\\": "src/pool/src/",
             "Hyperf\\Process\\": "src/process/src/",
@@ -235,6 +237,7 @@
             "HyperfTest\\ModelCache\\": "src/model-cache/tests/",
             "HyperfTest\\ModelListener\\": "src/model-listener/tests/",
             "HyperfTest\\Nats\\": "src/nats/tests/",
+            "HyperfTest\\Nsq\\": "src/nsq/tests/",
             "HyperfTest\\Paginator\\": "src/paginator/tests/",
             "HyperfTest\\Pool\\": "src/pool/tests/",
             "HyperfTest\\Process\\": "src/process/tests/",
@@ -298,6 +301,7 @@
                 "Hyperf\\ModelCache\\ConfigProvider",
                 "Hyperf\\ModelListener\\ConfigProvider",
                 "Hyperf\\Nats\\ConfigProvider",
+                "Hyperf\\Nsq\\ConfigProvider",
                 "Hyperf\\Paginator\\ConfigProvider",
                 "Hyperf\\Pool\\ConfigProvider",
                 "Hyperf\\Process\\ConfigProvider",

phpunit.xml

@@ -79,6 +79,7 @@
             <directory suffix=".php">./src/json-rpc/src</directory>
             <directory suffix=".php">./src/logger/src</directory>
             <directory suffix=".php">./src/model-cache/src</directory>
+            <directory suffix=".php">./src/nsq/src</directory>
             <directory suffix=".php">./src/paginator/src</directory>
             <directory suffix=".php">./src/redis/src</directory>
             <directory suffix=".php">./src/rpc/src</directory>

src/devtool/src/Generator/NsqConsumerCommand.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://doc.hyperf.io
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace Hyperf\Devtool\Generator;
+
+use Hyperf\Command\Annotation\Command;
+
+/**
+ * @Command
+ */
+class NsqConsumerCommand extends GeneratorCommand
+{
+    public function __construct()
+    {
+        parent::__construct('gen:nsq-consumer');
+        $this->setDescription('Create a new nsq consumer class');
+    }
+
+    protected function getStub(): string
+    {
+        return $this->getConfig()['stub'] ?? __DIR__ . '/stubs/nsq-consumer.stub';
+    }
+
+    protected function getDefaultNamespace(): string
+    {
+        return $this->getConfig()['namespace'] ?? 'App\\Nsq\\Consumer';
+    }
+}

src/devtool/src/Generator/stubs/nsq-consumer.stub

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace %NAMESPACE%;
+
+use Hyperf\Nsq\AbstractConsumer;
+use Hyperf\Nsq\Annotation\Consumer;
+use Hyperf\Nsq\Message;
+use Hyperf\Nsq\Result;
+
+/**
+ * @Consumer(topic="hyperf", channel="hyperf", name ="%CLASS%", nums=1)
+ */
+class %CLASS% extends AbstractConsumer
+{
+    public function consume(Message $payload)
+    {
+        var_dump($payload->getBody());
+
+        return Result::ACK;
+    }
+}

src/nats/src/ConfigProvider.php

@@ -41,7 +41,7 @@ public function __invoke(): array
             'publish' => [
                 [
                     'id' => 'config',
-                    'description' => 'The config for amqp.',
+                    'description' => 'The config for nats.',
                     'source' => __DIR__ . '/../publish/nats.php',
                     'destination' => BASE_PATH . '/config/autoload/nats.php',
                 ],

src/nsq/.gitattributes

@@ -0,0 +1 @@
+/tests export-ignore

src/nsq/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Hyperf
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/nsq/composer.json

@@ -0,0 +1,55 @@
+{
+    "name": "hyperf/nsq",
+    "description": "A nsq library for Hyperf.",
+    "license": "MIT",
+    "keywords": [
+        "php",
+        "swoole",
+        "hyperf",
+        "nsq"
+    ],
+    "support": {
+    },
+    "require": {
+        "php": ">=7.2",
+        "ext-bcmath": "*",
+        "hyperf/contract": "~1.1.0",
+        "hyperf/utils": "~1.1.0",
+        "jean85/pretty-package-versions": "^1.2"
+    },
+    "require-dev": {
+        "malukenho/docheader": "^0.1.6",
+        "mockery/mockery": "^1.0",
+        "phpunit/phpunit": "^7.0.0",
+        "friendsofphp/php-cs-fixer": "^2.9"
+    },
+    "suggest": {
+    },
+    "autoload": {
+        "psr-4": {
+            "Hyperf\\Nsq\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "HyperfTest\\Nsq\\": "tests/"
+        }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.1-dev"
+        },
+        "hyperf": {
+            "config": "Hyperf\\Nsq\\ConfigProvider"
+        }
+    },
+    "bin": [
+    ],
+    "scripts": {
+        "cs-fix": "php-cs-fixer fix $1",
+        "test": "phpunit --colors=always"
+    }
+}

src/nsq/publish/nsq.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://doc.hyperf.io
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+return [
+    'default' => [
+        'host' => '127.0.0.1',
+        'port' => 4150,
+        'pool' => [
+            'min_connections' => 1,
+            'max_connections' => 10,
+            'connect_timeout' => 10.0,
+            'wait_timeout' => 3.0,
+            'heartbeat' => -1,
+            'max_idle_time' => 60.0,
+        ],
+    ],
+];

src/nsq/src/AbstractConsumer.php

@@ -0,0 +1,110 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://doc.hyperf.io
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace Hyperf\Nsq;
+
+use Psr\Container\ContainerInterface;
+
+abstract class AbstractConsumer
+{
+    /**
+     * @var string
+     */
+    protected $pool = 'default';
+
+    /**
+     * @var string
+     */
+    protected $topic = '';
+
+    /**
+     * @var string
+     */
+    protected $channel = '';
+
+    /**
+     * @var string
+     */
+    protected $name = 'NsqConsumer';
+
+    /**
+     * @var int
+     */
+    protected $nums = 1;
+
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    abstract public function consume(Message $message): ?string;
+
+    public function getTopic(): string
+    {
+        return $this->topic;
+    }
+
+    public function setTopic(string $topic): self
+    {
+        $this->topic = $topic;
+        return $this;
+    }
+
+    public function getChannel(): string
+    {
+        return $this->channel;
+    }
+
+    public function setChannel(string $channel): self
+    {
+        $this->channel = $channel;
+        return $this;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    public function getNums(): int
+    {
+        return $this->nums;
+    }
+
+    public function setNums(int $nums): self
+    {
+        $this->nums = $nums;
+        return $this;
+    }
+
+    public function getPool(): string
+    {
+        return $this->pool;
+    }
+
+    public function setPool(string $pool): self
+    {
+        $this->pool = $pool;
+        return $this;
+    }
+}

src/nsq/src/Annotation/Consumer.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://doc.hyperf.io
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace Hyperf\Nsq\Annotation;
+
+use Hyperf\Di\Annotation\AbstractAnnotation;
+
+/**
+ * @Annotation
+ * @Target({"CLASS"})
+ */
+class Consumer extends AbstractAnnotation
+{
+    /**
+     * @var string
+     */
+    public $topic = '';
+
+    /**
+     * @var string
+     */
+    public $channel = '';
+
+    /**
+     * @var string
+     */
+    public $name = '';
+
+    /**
+     * @var int
+     */
+    public $nums = 1;
+
+    /**
+     * @var string
+     */
+    public $pool = '';
+}