Compare commits

...

8 Commits

Author SHA1 Message Date
as2252258 73cb94f657 改名 2021-07-09 14:38:49 +08:00
as2252258 b3ea8978b1 改名 2021-07-09 14:24:23 +08:00
as2252258 008a0914eb 改名 2021-07-09 13:55:52 +08:00
as2252258 01f8e16b38 改名 2021-07-09 13:41:06 +08:00
as2252258 c095b69f67 改名 2021-07-09 10:41:31 +08:00
as2252258 4c8c5ac239 改名 2021-07-09 10:36:45 +08:00
as2252258 cfc847133e 改名 2021-07-09 10:34:27 +08:00
as2252258 30b430f1cf 改名 2021-07-08 19:16:27 +08:00
4 changed files with 1041 additions and 1015 deletions
File diff suppressed because it is too large Load Diff
+23 -23
View File
@@ -39,7 +39,7 @@ class Logger extends Component
/** /**
* @param $message * @param mixed $message
* @param string $method * @param string $method
* @param null $file * @param null $file
* @throws Exception * @throws Exception
@@ -51,18 +51,18 @@ class Logger extends Component
/** /**
* @param $message * @param mixed $message
* @param string $method * @param string $method
* @throws Exception * @throws Exception
*/ */
public function trance($message, $method = 'app') public function trance(mixed $message, string $method = 'app')
{ {
$this->writer($message, $method); $this->writer($message, $method);
} }
/** /**
* @param $message * @param mixed $message
* @param string $method * @param string $method
* @param null $file * @param null $file
* @throws Exception * @throws Exception
@@ -72,13 +72,13 @@ class Logger extends Component
$this->writer($message, $method); $this->writer($message, $method);
} }
/** /**
* @param $message * @param mixed $message
* @param string $method * @param string $method
* @param null $file * @param null $file
* @throws Exception * @throws Exception
*/ */
public function success(mixed $message, $method = 'app', $file = null) public function success(mixed $message, string $method = 'app', $file = null)
{ {
$this->writer($message, $method); $this->writer($message, $method);
} }
@@ -89,7 +89,7 @@ class Logger extends Component
* @return string * @return string
* @throws Exception * @throws Exception
*/ */
private function writer($message, $method = 'app'): string private function writer($message, string $method = 'app'): string
{ {
$this->print_r($message, $method); $this->print_r($message, $method);
if ($message instanceof Throwable) { if ($message instanceof Throwable) {
@@ -114,10 +114,10 @@ class Logger extends Component
/** /**
* @param $message * @param $message
* @param $method * @param string $method
* @throws Exception * @throws Exception
*/ */
public function print_r($message, $method = '') public function print_r($message, string $method = '')
{ {
$debug = Config::get('debug', ['enable' => false]); $debug = Config::get('debug', ['enable' => false]);
if ((bool)$debug['enable'] === true) { if ((bool)$debug['enable'] === true) {
@@ -145,7 +145,7 @@ class Logger extends Component
* @param string $application * @param string $application
* @return mixed * @return mixed
*/ */
public function getLastError($application = 'app'): mixed public function getLastError(string $application = 'app'): mixed
{ {
$filetype = []; $filetype = [];
foreach ($this->logs as $key => $val) { foreach ($this->logs as $key => $val) {
@@ -160,15 +160,15 @@ class Logger extends Component
return end($filetype); return end($filetype);
} }
/** /**
* @param $messages * @param string $messages
* @param string $method * @param string $method
* @throws * @throws Exception
*/ */
public function write(string $messages, $method = 'app') public function write(string $messages, string $method = 'app')
{ {
if (empty($messages)) { return;
return; if (empty($messages)) {
} }
$fileName = 'server-' . date('Y-m-d') . '.log'; $fileName = 'server-' . date('Y-m-d') . '.log';
+386 -366
View File
@@ -5,11 +5,12 @@ namespace Snowflake\Jwt;
use Exception; use Exception;
use HttpServer\Http\HttpHeaders; use HttpServer\Http\HttpHeaders;
use Snowflake\Cache\Redis; use Snowflake\Abstracts\Component;
use Snowflake\Abstracts\Config; use Snowflake\Abstracts\Config;
use Snowflake\Cache\Redis;
use Snowflake\Core\Json;
use Snowflake\Core\Str; use Snowflake\Core\Str;
use Snowflake\Exception\AuthException; use Snowflake\Exception\AuthException;
use Snowflake\Abstracts\Component;
use Snowflake\Exception\ConfigException; use Snowflake\Exception\ConfigException;
use Snowflake\Snowflake; use Snowflake\Snowflake;
@@ -21,20 +22,20 @@ use Snowflake\Snowflake;
class Jwt extends Component class Jwt extends Component
{ {
/** @var int $user */ /** @var int $user */
private int $user; private int $user;
private array $data; private array $data;
private array $source = ['browser', 'android', 'iphone', 'pc', 'mingame']; private array $source = ['browser', 'android', 'iphone', 'pc', 'mingame'];
private array $config = ['token' => '']; private array $config = ['token' => ''];
private ?int $timeout = 7200; private ?int $timeout = 7200;
private string $key = 'www.xshucai.com'; private string $key = 'www.xshucai.com';
private ?string $public = '-----BEGIN PUBLIC KEY----- private ?string $public = '-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6BuML3gtLGde7QKNuNST MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6BuML3gtLGde7QKNuNST
UCB9gdHC7XIpOc7Wx2I64Esj3UxWHTgp3URj0ge8zpy7A3FfBdppR7d1nwoD6Xad UCB9gdHC7XIpOc7Wx2I64Esj3UxWHTgp3URj0ge8zpy7A3FfBdppR7d1nwoD6Xad
jqfjEWpTy4WwGYsOfH0tFl3wAmse0lebF4NFsS9pzrikQT6c9qsVm88pCjvg4i5t jqfjEWpTy4WwGYsOfH0tFl3wAmse0lebF4NFsS9pzrikQT6c9qsVm88pCjvg4i5t
@@ -44,7 +45,7 @@ WlQhpQrA5/wKd76dCzjvqw9M32OiZl2lCKT73cV8GUvt7BNsM1SiPhqfY7nhO6y3
cwIDAQAB cwIDAQAB
-----END PUBLIC KEY-----'; -----END PUBLIC KEY-----';
private ?string $private = '-----BEGIN RSA PRIVATE KEY----- private ?string $private = '-----BEGIN RSA PRIVATE KEY-----
MIIEpQIBAAKCAQEA6BuML3gtLGde7QKNuNSTUCB9gdHC7XIpOc7Wx2I64Esj3UxW MIIEpQIBAAKCAQEA6BuML3gtLGde7QKNuNSTUCB9gdHC7XIpOc7Wx2I64Esj3UxW
HTgp3URj0ge8zpy7A3FfBdppR7d1nwoD6XadjqfjEWpTy4WwGYsOfH0tFl3wAmse HTgp3URj0ge8zpy7A3FfBdppR7d1nwoD6XadjqfjEWpTy4WwGYsOfH0tFl3wAmse
0lebF4NFsS9pzrikQT6c9qsVm88pCjvg4i5tWhTMEnpTFDYoDR0KXlLXltQMudBB 0lebF4NFsS9pzrikQT6c9qsVm88pCjvg4i5tWhTMEnpTFDYoDR0KXlLXltQMudBB
@@ -73,419 +74,438 @@ mlAZUEjsoaT9vjvjGTxl3uCm0TX5KTgtSJIt2kA1tYVjQef+/iZTHxY=
-----END RSA PRIVATE KEY-----'; -----END RSA PRIVATE KEY-----';
/** /**
* @throws ConfigException * @throws ConfigException
*/ */
public function init() public function init()
{ {
if (!Config::has('ssl.public') || !Config::has('ssl.private')) { if (!Config::has('ssl.public') || !Config::has('ssl.private')) {
return; return;
} }
$this->public = Config::get('ssl.public', $this->public); $this->public = Config::get('ssl.public', $this->public);
$this->private = Config::get('ssl.private', $this->private); $this->private = Config::get('ssl.private', $this->private);
$this->timeout = Config::get('ssl.timeout', 7200); $this->timeout = Config::get('ssl.timeout', 7200);
} }
/** /**
* @param string $publicKey * @param string $publicKey
*/ */
public function setPublic(string $publicKey) public function setPublic(string $publicKey)
{ {
$this->public = $publicKey; $this->public = $publicKey;
} }
/** /**
* @param int $timeout * @param int $timeout
*/ */
public function setTimeout(int $timeout) public function setTimeout(int $timeout)
{ {
$this->timeout = $timeout; $this->timeout = $timeout;
} }
/** /**
* @param string $timeout * @param string $timeout
*/ */
public function setKey(string $timeout) public function setKey(string $timeout)
{ {
$this->key = $timeout; $this->key = $timeout;
} }
/** /**
* @param string $privateKey * @param string $privateKey
*/ */
public function setPrivate(string $privateKey) public function setPrivate(string $privateKey)
{ {
$this->private = $privateKey; $this->private = $privateKey;
} }
/** /**
* @param int $unionId * @param int $unionId
* @param array $headers * @param array $headers
* *
* @return array * @return array
* @throws Exception * @throws Exception
*/ */
public function create(int $unionId, array $headers = []): array public function create(int $unionId, array $headers = []): array
{ {
$this->user = $unionId; $this->user = $unionId;
$this->config['time'] = time(); $this->config['time'] = time();
if (empty($headers)) { if (empty($headers)) {
$headers = request()->headers->getHeaders(); $headers = request()->headers->getHeaders();
} else if ($headers instanceof HttpHeaders) { } else if ($headers instanceof HttpHeaders) {
$headers = $headers->getHeaders(); $headers = $headers->getHeaders();
} }
$this->data = $headers; $this->data = $headers;
if (!isset($this->data['source'])) { if (!isset($this->data['source'])) {
$this->data['source'] = 'browser'; $this->data['source'] = 'browser';
} }
return $this->createEncrypt($unionId); return $this->createEncrypt($unionId);
} }
/** /**
* @param $unionId * @param $unionId
* @return array * @return array
* @throws Exception * @throws Exception
* 对相关信息进行加密 * 对相关信息进行加密
*/ */
private function createEncrypt($unionId): array private function createEncrypt($unionId): array
{ {
$caches = $this->clear($unionId); $caches = $this->clear($unionId);
$param = $this->assembly(array_merge($this->config, [ $param = $this->assembly(array_merge($this->config, [
'user' => $unionId, 'user' => $unionId,
'token' => $this->token($unionId, [ 'token' => $this->token($unionId, [
'device' => Str::rand(128), 'device' => Str::rand(128),
], $this->config['time']), ], $this->config['time']),
]), TRUE); ]), TRUE);
$refresh = array_intersect_key($param, $this->config); $refresh = array_intersect_key($param, $this->config);
$params['user'] = $this->user; $params['user'] = $this->user;
$params['token'] = $refresh['token']; $params['token'] = $refresh['token'];
$json = json_encode($params, JSON_NUMERIC_CHECK | JSON_UNESCAPED_UNICODE); $json = json_encode($params, JSON_NUMERIC_CHECK | JSON_UNESCAPED_UNICODE);
openssl_private_encrypt($json, $encode, $this->private); openssl_private_encrypt($json, $encode, $this->private);
$refresh['refresh'] = base64_encode($encode); $refresh['refresh'] = base64_encode($encode);
$this->setRefresh($refresh['refresh']); $this->setRefresh($refresh['refresh']);
$redis = $this->getRedis(); $redis = $this->getRedis();
foreach ($caches as $cache) { foreach ($caches as $cache) {
$redis->del($cache); $redis->del($cache);
} }
return $refresh; return $refresh;
} }
/** /**
* @param bool $update * @param bool $update
* @param array $param * @param array $param
* @return array * @return array
* @throws * @throws
*/ */
private function assembly(array $param, bool $update = FALSE): array private function assembly(array $param, bool $update = FALSE): array
{ {
if (isset($param['sign'])) { if (isset($param['sign'])) {
unset($param['sign']); unset($param['sign']);
} }
$param = $this->initialize($param); $param = $this->initialize($param);
asort($param, SORT_STRING); asort($param, SORT_STRING);
$_tmp = []; $_tmp = [];
foreach ($param as $key => $val) { foreach ($param as $key => $val) {
$_tmp[] = trim($key) . '=>' . trim((string)$val); $_tmp[] = trim($key) . '=>' . trim((string)$val);
} }
$param['sign'] = md5(implode(':', $_tmp)); $param['sign'] = md5(implode(':', $_tmp));
if ($update) { if ($update) {
$this->setCache($param); $this->setCache($param);
} }
return $param; return $param;
} }
/** /**
* @param array $headers * @param array $headers
* @return array * @return array
* @throws Exception * @throws Exception
*/ */
public function refresh(array $headers = []): array public function refresh(array $headers = []): array
{ {
$this->data = $headers; $this->data = $headers;
if (!openssl_public_decrypt(base64_decode($headers['refresh']), $data, $this->public)) { if (!openssl_public_decrypt(base64_decode($headers['refresh']), $data, $this->public)) {
throw new AuthException('信息解码失败.'); throw new AuthException('信息解码失败.');
} }
$this->user = $data['user']; $this->user = $data['user'];
if (!$this->getRedis()->exists('refresh:' . $this->user)) { if (!$this->getRedis()->exists('refresh:' . $this->user)) {
throw new AuthException('refresh data error.'); throw new AuthException('refresh data error.');
} }
$this->getRedis()->del('refresh:' . $this->user); $this->getRedis()->del('refresh:' . $this->user);
return $this->create($this->user, $headers);
}
/**
* @param array $headers
* @return mixed
* @throws AuthException
*/
public function getTokenUser(array $headers = []): int
{
$this->data = $headers;
if (!openssl_public_decrypt(base64_decode($headers['refresh']), $data, $this->public)) {
throw new AuthException('信息解码失败.');
}
$data = Json::decode($data, true);
return (int)$data['user'];
}
return $this->create($this->user, $headers);
}
/** /**
* @param array $param * @param array $param
* *
* @return array * @return array
*/ */
private function initialize(array $param): array private function initialize(array $param): array
{ {
$_param = [ $_param = [
'version' => '1', 'version' => '1',
'source' => $this->getSource(), 'source' => $this->getSource(),
]; ];
if (!isset($param['device'])) { if (!isset($param['device'])) {
$param['device'] = Str::rand(128); $param['device'] = Str::rand(128);
} }
return array_merge($_param, $param); return array_merge($_param, $param);
} }
/** /**
* @param array $data * @param array $data
* @throws Exception * @throws Exception
*/ */
private function setCache(array $data) private function setCache(array $data)
{ {
$redis = $this->getRedis(); $redis = $this->getRedis();
$redis->hMset($this->authKey($this->getSource(), $data['token']), $data); $redis->hMset($this->authKey($this->getSource(), $data['token']), $data);
$redis->expire($this->authKey($this->getSource(), $data['token']), $this->timeout); $redis->expire($this->authKey($this->getSource(), $data['token']), $this->timeout);
} }
/** /**
* @param string $refresh * @param string $refresh
* @throws Exception * @throws Exception
*/ */
private function setRefresh(string $refresh) private function setRefresh(string $refresh)
{ {
$redis = $this->getRedis(); $redis = $this->getRedis();
$redis->set('refresh:' . $this->user, $refresh); $redis->set('refresh:' . $this->user, $refresh);
$redis->expire('refresh:' . $this->user, $this->timeout); $redis->expire('refresh:' . $this->user, $this->timeout);
} }
/** /**
* @param string $_source * @param string $_source
* @param string $token * @param string $token
* *
* @return string * @return string
* @throws Exception * @throws Exception
*/ */
private function authKey(string $_source, string $token): string private function authKey(string $_source, string $token): string
{ {
$source = $this->getSource(); $source = $this->getSource();
if (!empty($_source)) $source = $_source; if (!empty($_source)) $source = $_source;
return 'Tmp_Token:' . strtoupper($source) . ':' . $token; return 'Tmp_Token:' . strtoupper($source) . ':' . $token;
} }
/** /**
* @return string * @return string
*/ */
public function getSource(): string public function getSource(): string
{ {
return $this->data['source'] ?? 'browser'; return $this->data['source'] ?? 'browser';
} }
/** /**
* @param int $user * @param int $user
* @param array $param * @param array $param
* @param null $requestTime * @param null $requestTime
* *
* @return string * @return string
*/ */
private function token(int $user, array $param = [], $requestTime = NULL): string private function token(int $user, array $param = [], $requestTime = NULL): string
{ {
$str = ''; $str = '';
$user = (string)$user; $user = (string)$user;
$_user = str_split(md5($user . md5($user))); $_user = str_split(md5($user . md5($user)));
ksort($_user); ksort($_user);
foreach ($_user as $key => $val) { foreach ($_user as $key => $val) {
$str .= md5(sha1($key . $val . $this->key)); $str .= md5(sha1($key . $val . $this->key));
} }
foreach ($param as $key => $val) { foreach ($param as $key => $val) {
$str .= md5($str . sha1($key . md5($val))); $str .= md5($str . sha1($key . md5($val)));
} }
$str .= sha1(base64_encode((string)$requestTime)); $str .= sha1(base64_encode((string)$requestTime));
return $this->preg(md5($str . $user)); return $this->preg(md5($str . $user));
} }
/** /**
* @param string $str * @param string $str
* *
* @return array|string|null 将字符串替换成指定格式 * @return array|string|null 将字符串替换成指定格式
*/ */
private function preg(string $str): null|array|string private function preg(string $str): null|array|string
{ {
return preg_replace('/(\w{10})(\w{3})(\w{4})(\w{9})(\w{6})/', '$1-$2-$3-$4-$5', $str); return preg_replace('/(\w{10})(\w{3})(\w{4})(\w{9})(\w{6})/', '$1-$2-$3-$4-$5', $str);
} }
/** /**
* @param int $user * @param int $user
* @return string[] * @return string[]
* @throws Exception * @throws Exception
*/ */
public function clear(int $user): array public function clear(int $user): array
{ {
$this->user = $user; $this->user = $user;
$redis = $this->getRedis(); $redis = $this->getRedis();
if (is_bool($refresh = $redis->get('refresh:' . $this->user))) { if (is_bool($refresh = $redis->get('refresh:' . $this->user))) {
return []; return [];
}; };
openssl_public_decrypt(base64_decode($refresh), $info, $this->public); openssl_public_decrypt(base64_decode($refresh), $info, $this->public);
$_tmp = []; $_tmp = [];
if (!empty($info) && $json = json_decode($info, true)) { if (!empty($info) && $json = json_decode($info, true)) {
if (!isset($json['token'])) { if (!isset($json['token'])) {
return []; return [];
} }
foreach ($this->source as $value) { foreach ($this->source as $value) {
$_tmp[] = $this->authKey($value, $json['token']); $_tmp[] = $this->authKey($value, $json['token']);
} }
} }
return $_tmp; return $_tmp;
} }
/** /**
* @param array $data * @param array $data
* @param int $user * @param int $user
* @return bool * @return bool
* @throws AuthException|Exception * @throws AuthException|Exception
*/ */
public function check(array $data, int $user): bool public function check(array $data, int $user): bool
{ {
$this->data = $data; $this->data = $data;
$this->user = $user; $this->user = $user;
if (empty($this->user)) return FALSE; if (empty($this->user)) return FALSE;
$cache = $this->getUserModel(); $cache = $this->getUserModel();
if (empty($cache)) { if (empty($cache)) {
return FALSE; return FALSE;
} }
$merge = $this->assembly(array_merge($cache, [ $merge = $this->assembly(array_merge($cache, [
'token' => $data['token'], 'token' => $data['token'],
])); ]));
$check = array_diff_assoc($this->initialize($cache), $merge); $check = array_diff_assoc($this->initialize($cache), $merge);
return !((bool)count($check)); return !((bool)count($check));
} }
/** /**
* @return mixed * @return mixed
* @throws * @throws
*/ */
public function getCurrentOnlineUser(): int public function getCurrentOnlineUser(): int
{ {
$this->data = request()->headers->getHeaders(); $this->data = request()->headers->getHeaders();
return $this->loadByCache(); return $this->loadByCache();
} }
/** /**
* @param string $token * @param string $token
* @param string $source * @param string $source
* @return mixed * @return mixed
* @throws AuthException * @throws AuthException
*/ */
public function getOnlineUserByToken(string $token, string $source = 'BROWSER'): int public function getOnlineUserByToken(string $token, string $source = 'BROWSER'): int
{ {
$this->data['token'] = $token; $this->data['token'] = $token;
$this->data['source'] = $source; $this->data['source'] = $source;
return $this->loadByCache(); return $this->loadByCache();
} }
/** /**
* @return int * @return int
* @throws AuthException * @throws AuthException
* @throws Exception * @throws Exception
*/ */
private function loadByCache(): int private function loadByCache(): int
{ {
$model = $this->getUserModel(); $model = $this->getUserModel();
if (empty($model)) { if (empty($model)) {
return (int)$this->addError('授权信息已过期!'); return (int)$this->addError('授权信息已过期!');
} }
if (!isset($model['user'])) { if (!isset($model['user'])) {
return (int)$this->addError('授权信息错误!'); return (int)$this->addError('授权信息错误!');
} }
if (!$this->check($this->data, (int)$model['user'])) { if (!$this->check($this->data, (int)$model['user'])) {
return (int)$this->addError('授权信息不合法!'); return (int)$this->addError('授权信息不合法!');
} }
$this->expireRefresh(); $this->expireRefresh();
return (int)$model['user']; return (int)$model['user'];
} }
/** /**
* @param array $header * @param array $header
* @return mixed * @return mixed
* @throws AuthException * @throws AuthException
* @throws Exception * @throws Exception
*/ */
public static function checkAuth(array $header = []): mixed public static function checkAuth(array $header = []): mixed
{ {
$instance = Snowflake::app()->getJwt(); $instance = Snowflake::app()->getJwt();
if (empty($header)) { if (empty($header)) {
$header = request()->headers->getHeaders(); $header = request()->headers->getHeaders();
} }
$instance->data = $header; $instance->data = $header;
$model = $instance->getUserModel(); $model = $instance->getUserModel();
if (empty($model) || !isset($model['user'])) { if (empty($model) || !isset($model['user'])) {
return false; return false;
} }
if (!$instance->check($header, (int)$model['user'])) { if (!$instance->check($header, (int)$model['user'])) {
return false; return false;
} }
$instance->expireRefresh(); $instance->expireRefresh();
return $model['user']; return $model['user'];
} }
/** /**
* @param null $token * @param null $token
* @param null $source * @param null $source
* @throws Exception * @throws Exception
*/ */
public function expireRefresh($token = null, $source = null) public function expireRefresh($token = null, $source = null)
{ {
if (!empty($token)) { if (!empty($token)) {
$this->data['token'] = $token; $this->data['token'] = $token;
} }
if (!empty($source)) { if (!empty($source)) {
$this->data['source'] = $source; $this->data['source'] = $source;
} }
if (!isset($this->data['token'])) { if (!isset($this->data['token'])) {
return; return;
} }
$key = $this->authKey($this->getSource(), $this->data['token']); $key = $this->authKey($this->getSource(), $this->data['token']);
$this->getRedis()->expire($key, $this->timeout); $this->getRedis()->expire($key, $this->timeout);
} }
/** /**
* @return bool|array * @return bool|array
* @throws Exception * @throws Exception
*/ */
private function getUserModel(): bool|array private function getUserModel(): bool|array
{ {
if (!isset($this->data['token'])) { if (!isset($this->data['token'])) {
return $this->addError('暂无访问权限!'); return $this->addError('暂无访问权限!');
} }
$key = $this->authKey($this->getSource(), $this->data['token']); $key = $this->authKey($this->getSource(), $this->data['token']);
return $this->getRedis()->hGetAll($key); return $this->getRedis()->hGetAll($key);
} }
/** /**
* @return Redis|\Redis * @return Redis|\Redis
* @throws * @throws
*/ */
private function getRedis(): Redis|\Redis private function getRedis(): Redis|\Redis
{ {
return Snowflake::app()->getRedis(); return Snowflake::app()->getRedis();
} }
} }
+9 -1
View File
@@ -81,6 +81,11 @@ class ClientsPool extends Component
{ {
if (env('state') == 'exit') { if (env('state') == 'exit') {
Timer::clear($this->creates); Timer::clear($this->creates);
foreach (static::$_connections as $channel) {
$this->flush($channel, 0);
$channel->close();
}
static::$_connections = [];
$this->creates = -1; $this->creates = -1;
} else { } else {
$this->heartbeat_flush(); $this->heartbeat_flush();
@@ -131,7 +136,6 @@ class ClientsPool extends Component
public function flush($channel, $retain_number) public function flush($channel, $retain_number)
{ {
$this->pop($channel, $retain_number); $this->pop($channel, $retain_number);
static::$_connections = [];
} }
@@ -180,12 +184,16 @@ class ClientsPool extends Component
* @param $name * @param $name
* @return Channel * @return Channel
* @throws ConfigException * @throws ConfigException
* @throws Exception
*/ */
private function getChannel($name): Channel private function getChannel($name): Channel
{ {
if (!isset(static::$_connections[$name])) { if (!isset(static::$_connections[$name])) {
static::$_connections[$name] = new Channel(Config::get('databases.pool.max', 10)); static::$_connections[$name] = new Channel(Config::get('databases.pool.max', 10));
} }
if (static::$_connections[$name]->errCode == SWOOLE_CHANNEL_CLOSED){
throw new Exception('Channel is Close.');
}
if ($this->creates === -1) { if ($this->creates === -1) {
$this->creates = Timer::tick(60000, [$this, 'Heartbeat_detection']); $this->creates = Timer::tick(60000, [$this, 'Heartbeat_detection']);
} }