Merge branch 'release/1.2.2'

.gitignore

@@ -2,3 +2,4 @@ composer.lock
 .idea/
 vendor/
 tests/prikey.pem
+demo.php

composer.json

@@ -2,7 +2,7 @@
   "name": "maiyoule/mqttclient_author",
   "type": "library",
   "description": "MQTT管理模块操作库",
-  "version": "1.0.3",
+  "version": "1.2.2",
   "license": "MIT",
   "authors": [
     {
@@ -15,7 +15,8 @@
     "php": ">=8.0",
     "guzzlehttp/guzzle": "^7.0",
     "phpseclib/phpseclib": "~3.0",
-    "workerman/mqtt": "^2.2"
+    "workerman/mqtt": "^2.2",
+    "psr/log": "^3.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^11.0"

src/AuthorAppMQTTClient.php

@@ -3,6 +3,7 @@
 namespace cn\com\maiyoule\mqttclient;
 
 use cn\com\maiyoule\mqttclient\biz\client\SendMQTTMessage;
+use Psr\Log\LoggerInterface;
 use Workerman\Mqtt\Client;
 use Workerman\Worker;
 
@@ -22,7 +23,7 @@ class AuthorAppMQTTClient
     }
 
     private string $appid = '';
-    private string $server = '';
+    private string $server = 'mqtt://mqttauthor.maiyoule.com.cn';
     private int $port = 1883;
     private string $clientId = '';
     private string $username = '';
@@ -99,6 +100,19 @@ class AuthorAppMQTTClient
     }
 
 
+    private LoggerInterface $logger;
+
+    public function getLogger(): LoggerInterface
+    {
+        return $this->logger;
+    }
+
+    public function setLogger(LoggerInterface $logger): void
+    {
+        $this->logger = $logger;
+    }
+
+
     /**
      * @throws \Exception
      */
@@ -121,16 +135,18 @@ class AuthorAppMQTTClient
         $this->worker = new Worker();
 
         $this->worker->onWorkerStart = function () {
+            $this->logger->info('Worker 启动');
             $this->__startWorker();
         };
         $this->worker->onMessage = function ($conn, $data) {
-            print_r($data);
+            $this->logger->debug($data);
         };
         $this->worker->onWorkerStop = function () {
+            $this->logger->info('Worker 停止');
             $this->__stopWorker();
         };
         $this->worker->onError = function () {
-            print_r('遇到错误');
+            $this->logger->error('Worker启动遇到错误');
         };
         if (!Worker::isRunning()) {
             Worker::runAll();
@@ -163,6 +179,9 @@ class AuthorAppMQTTClient
         $this->client->disconnect();
     }
 
+    /**
+     * @throws \Exception
+     */
     private function __startWorker(): void
     {
         //参考 https://www.workerman.net/doc/workerman/components/workerman-mqtt.html
@@ -170,39 +189,49 @@ class AuthorAppMQTTClient
             'keepalive' => 29,
             'client_id' => $this->getClientId(),
             'protocol_name' => 'MQTT',
-            'protocol_level' => 4,
+            'protocol_level' => 5,
             'clean_session' => true,
             'reconnect_period' => 2,
             'connect_timeout' => 10,
             'username' => $this->getUsername(),
             'password' => $this->getPassword(),
-            'resubscribe' => true
+            'resubscribe' => true,
+            'debug' => false
         ];
         $address = sprintf('mqtt://%s:%d', $this->getServer(), $this->getPort());
-        try {
+        $this->logger->debug('建立MQTT连接到' . $address);
-            $this->client = new Client($address, $option);
-            //连接回调
-            $this->client->onConnect = function (Client $connection) {
-                $topic = sprintf('biz/%s/#', $this->getAppid());
-                $connection->subscribe($topic, ['qos' => 0]);
 
-                $this->callEvent(self::EVENT_CONNECT, $connection);
+        $this->client = new Client($address, $option);
-            };
+        //连接回调
-            $this->client->onClose = function () {
+        $this->client->onConnect = function (Client $connection) {
-                $this->callEvent(self::EVENT_CLOSE);
+            $this->logger->debug('MQTT 连接成功');
-            };
+            $topic = sprintf('biz/%s/#', $this->getAppid());
-            $this->client->onMessage = function (string $topic, string $data, Client $client) {
+            $connection->subscribe($topic, ['qos' => 0], function (\Exception|null $exception, array $granted) {
-                //收到消息
+
-                $this->callEvent(self::EVENT_MESSAGE, $topic, $data, $client);
+                if (!is_null($exception)) {
-            };
+                    $this->logger->error($exception->getMessage());
-            //遇到错误
+                }
-            $this->client->onError = function (\Exception $err) {
+                $this->logger->debug('主题订阅:' . json_encode($granted));
-                $this->callEvent(self::EVENT_ERROR, $err);
+            });
-            };
+
-            $this->client->connect();
+            $this->callEvent(self::EVENT_CONNECT, $connection);
-        } catch (\Exception $e) {
+        };
+        $this->client->onClose = function () {
+            $this->logger->debug('MQTT 连接断开');
+            $this->callEvent(self::EVENT_CLOSE);
+        };
+        $this->client->onMessage = function (string $topic, string $data, Client $client) {
+            //收到消息
+            $this->logger->debug(sprintf('MQTT 收到消息 Topic:%s Data:%s', $topic, $data));
+            $this->callEvent(self::EVENT_MESSAGE, $topic, $data, $client);
+        };
+        //遇到错误
+        $this->client->onError = function (\Exception $err) {
+            $this->logger->error('MQTT 遇到错误' . $err->getMessage());
+            $this->callEvent(self::EVENT_ERROR, $err);
+        };
+        $this->client->connect();
 
-        }
     }
 
     const EVENT_CONNECT = 'connect';

src/AuthorServerClient.php

@@ -162,7 +162,7 @@ class AuthorServerClient
                 return new BizResponse();
             }
             $data = json_decode($content, true);
-            return new BizResponse($data['code'] ?? 0, $data['message'] ?? '', $data['data'] ?? []);
+            return new BizResponse($data['code'] ?? 0, $data['message'] ?? '', $data['data'] ?? [], $data['err'] ?? '');
 
         } catch (ClientException $e) {
             $body = $e->getResponse()->getBody()->getContents();

src/biz/AppUpdateCallbackRequest.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace cn\com\maiyoule\mqttclient\biz;
+
+use cn\com\maiyoule\mqttclient\IRequest;
+
+class AppUpdateCallbackRequest extends IRequest
+{
+
+    public function path(): string
+    {
+        return 'app/callback/update';
+    }
+
+    public function body(): array
+    {
+        return [
+            'url' => $this->getUrl()
+        ];
+    }
+
+
+    private string $url;
+
+    /**
+     * @return string
+     */
+    public function getUrl(): string
+    {
+        return $this->url;
+    }
+
+    public function setUrl(string $url): void
+    {
+        $this->url = $url;
+    }
+}

src/biz/AppUserCreateRequest.php

@@ -18,25 +18,60 @@ class AppUserCreateRequest extends IRequest
             'password' => $this->getPassword(),
             'fettle' => $this->getFettle(),
             'role' => $this->getRole(),
-            'biz' => join(',', $this->getBiz())
+            'publish' => join(',', $this->getPublish()),
+            'subscribe' => join(',', $this->getSubscribe()),
+            'expire' => $this->expireAt
         ];
     }
 
-    private array $biz = [];
+    private array $subscribe = [];
 
-    public function getBiz(): array
+    public function getSubscribe(): array
     {
-        return $this->biz;
+        return $this->subscribe;
     }
 
-    public function setBiz(array|string $biz): void
+    public function setSubscribe(array|string $subscribe): void
     {
-        if (is_string($biz)) {
+        if (is_string($subscribe)) {
-            $biz = [$biz];
+            $subscribe = [$subscribe];
         }
-        $this->biz = $biz;
+        $this->subscribe = $subscribe;
     }
 
+    /**
+     * @var string 过期时间
+     */
+    private string $expireAt = '';
+
+    public function getExpireAt(): string
+    {
+        return $this->expireAt;
+    }
+
+    public function setExpireAt(string $expireAt): void
+    {
+        $this->expireAt = $expireAt;
+    }
+
+
+    private array $publish = [];
+
+    public function getPublish(): array
+    {
+        return $this->publish;
+    }
+
+    public function setPublish(array|string $publish): void
+    {
+        if (is_string($publish)) {
+            $publish = [$publish];
+        }
+
+        $this->publish = $publish;
+    }
+
+
     private string $password = '';
     private string $fettle = '';
     private string $role = 'user';

src/biz/AppUserUpdateRequest.php

@@ -29,23 +29,37 @@ class AppUserUpdateRequest extends IRequest
         if (!is_null($this->fettle)) {
             $data['fettle'] = $this->fettle;
         }
-        if (!is_null($this->biz)) {
+        if (!empty($this->publish)) {
-            $data['biz'] = join(',', $this->biz);
+            $data['publish'] = join(',', $this->getPublish());
+        }
+        if (!empty($this->subscribe)) {
+            $data['subscribe'] = join(',', $this->getSubscribe());
         }
 
         return $data;
     }
 
-    private ?array $biz = null;
+    private array $subscribe = [];
 
-    public function getBiz(): array
+    public function getSubscribe(): array
     {
-        return $this->biz;
+        return $this->subscribe;
     }
 
-    public function setBiz(array $biz): void
+    public function setSubscribe(array|string $subscribe): void
     {
-        $this->biz = $biz;
+        if (is_string($subscribe)) {
+            $subscribe = [$subscribe];
+        }
+        $this->subscribe = $subscribe;
+    }
+
+
+    private array $publish = [];
+
+    public function getPublish(): array
+    {
+        return $this->publish;
     }
 
     private string $username;

src/response/BizResponse.php

@@ -6,19 +6,22 @@ class BizResponse
 {
     private int $code;
     private string $message;
-    private $data;
+    private mixed $data;
 
+    private string $errCode;
 
     /**
      * @param int $code
      * @param string $message
-     * @param $data
+     * @param array $data
+     * @param string $errCode
      */
-    public function __construct(int $code = -1, string $message = '', $data = [])
+    public function __construct(int $code = -1, string $message = '', mixed $data = [], string $errCode = '')
     {
         $this->code = $code;
         $this->message = $message;
         $this->data = $data;
+        $this->errCode = $errCode;
     }
 
     public function isSuccess(): bool
@@ -49,7 +52,7 @@ class BizResponse
     /**
      * @return mixed
      */
-    public function getData()
+    public function getData(): mixed
     {
         return $this->data;
     }
@@ -62,5 +65,15 @@ class BizResponse
         $this->data = $data;
     }
 
+    public function getErrCode(): string
+    {
+        return $this->errCode;
+    }
+
+    public function setErrCode(string $errCode): void
+    {
+        $this->errCode = $errCode;
+    }
+
 
 }

tests/AppManagerTest.php

@@ -2,11 +2,13 @@
 
 namespace cn\com\maiyoule\mqttclient\test;
 
+use cn\com\maiyoule\mqttclient\biz\AppUpdateCallbackRequest;
 use cn\com\maiyoule\mqttclient\biz\AppUserCreateRequest;
 use cn\com\maiyoule\mqttclient\biz\AppUserDeleteRequest;
 use cn\com\maiyoule\mqttclient\biz\AppUserUpdateRequest;
 use cn\com\maiyoule\mqttclient\exception\ApiException;
 use cn\com\maiyoule\mqttclient\AuthorServerClient;
+use GuzzleHttp\Exception\GuzzleException;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 
@@ -80,4 +82,16 @@ class AppManagerTest extends TestCase
         }
     }
 
+    public function testUpdateAppUrl()
+    {
+        $request = new AppUpdateCallbackRequest();
+        $request->setUrl('http://202.200.18.46:8000/api.php');
+        try {
+            $biz = $this->manager->exec($request);
+            $this->assertTrue($biz->isSuccess(), $biz->getMessage());
+        } catch (GuzzleException|ApiException $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
 }