This commit is contained in:
2022-01-09 14:00:32 +08:00
parent b0ed7650c5
commit 4eefe54be0
19 changed files with 1485 additions and 1485 deletions
+37 -37
View File
@@ -1,37 +1,37 @@
# Created by .ignore support plugin (hsz.mobi) # Created by .ignore support plugin (hsz.mobi)
### Yii template ### Yii template
assets/* assets/*
!assets/.gitignore !assets/.gitignore
protected/runtime/* protected/runtime/*
!protected/runtime/.gitignore !protected/runtime/.gitignore
protected/data/*.db protected/data/*.db
themes/classic/views/ themes/classic/views/
### Example user template template ### Example user template template
### Example user template ### Example user template
# IntelliJ project files # IntelliJ project files
.idea .idea
*.iml *.iml
out out
gen gen
db/ db/
async-queue/ async-queue/
composer.lock composer.lock
*.log *.log
commands/result commands/result
config/setting.php config/setting.php
tests/ tests/
vendor/ vendor/
runtime/ runtime/
*.xml *.xml
*.lock *.lock
oot oot
d d
composer.lock composer.lock
+18 -18
View File
@@ -1,18 +1,18 @@
<?php <?php
namespace PHPSTORM_META { namespace PHPSTORM_META {
// Reflect // Reflect
use Kiri\Di\Container; use Kiri\Di\Container;
use Psr\Container\ContainerInterface; use Psr\Container\ContainerInterface;
override(ContainerInterface::get(0), map('@')); override(ContainerInterface::get(0), map('@'));
override(Container::get(0), map('@')); override(Container::get(0), map('@'));
override(Container::make(0), map('@')); override(Container::make(0), map('@'));
override(Container::create(0), map('@')); override(Container::create(0), map('@'));
// override(\Hyperf\Utils\Context::get(0), map('@')); // override(\Hyperf\Utils\Context::get(0), map('@'));
// override(\make(0), map('@')); // override(\make(0), map('@'));
override(\di(0), map('@')); override(\di(0), map('@'));
override(\duplicate(0), map('@')); override(\duplicate(0), map('@'));
} }
+91 -91
View File
@@ -1,91 +1,91 @@
<?php <?php
namespace Kiri\Rpc\Annotation; namespace Kiri\Rpc\Annotation;
use Kiri\Abstracts\Config; use Kiri\Abstracts\Config;
use Kiri\Core\Network; use Kiri\Core\Network;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
use Kiri\Kiri; use Kiri\Kiri;
use Kiri\Rpc\RpcManager; use Kiri\Rpc\RpcManager;
use Kiri\Annotation\Attribute; use Kiri\Annotation\Attribute;
use ReflectionException; use ReflectionException;
#[\Attribute(\Attribute::TARGET_CLASS)] class JsonRpc extends Attribute #[\Attribute(\Attribute::TARGET_CLASS)] class JsonRpc extends Attribute
{ {
private string $uniqueId = ''; private string $uniqueId = '';
/** /**
* @param string $service * @param string $service
* @param string $driver * @param string $driver
* @param array $tags * @param array $tags
* @param array $meta * @param array $meta
* @param array $checkOptions * @param array $checkOptions
* @param string $checkUrl * @param string $checkUrl
*/ */
public function __construct(public string $service, public string $driver, public array $tags = [], public array $meta = [], public array $checkOptions = [], public string $checkUrl = '') public function __construct(public string $service, public string $driver, public array $tags = [], public array $meta = [], public array $checkOptions = [], public string $checkUrl = '')
{ {
$this->uniqueId = preg_replace('/(\w{11})(\w{4})(\w{3})(\w{8})(\w{6})/', '$1-$2-$3-$4-$5', md5(__DIR__ . 'Annotation' . md5(Network::local()))); $this->uniqueId = preg_replace('/(\w{11})(\w{4})(\w{3})(\w{8})(\w{6})/', '$1-$2-$3-$4-$5', md5(__DIR__ . 'Annotation' . md5(Network::local())));
} }
/** /**
* @param mixed $class * @param mixed $class
* @param mixed|string $method * @param mixed|string $method
* @return mixed * @return mixed
* @throws ReflectionException * @throws ReflectionException
* @throws ConfigException * @throws ConfigException
*/ */
public function execute(mixed $class, mixed $method = ''): bool public function execute(mixed $class, mixed $method = ''): bool
{ {
return Kiri::getDi()->get(RpcManager::class)->add($this->service, $class, $this->create()); return Kiri::getDi()->get(RpcManager::class)->add($this->service, $class, $this->create());
} }
/** /**
* @throws ConfigException * @throws ConfigException
*/ */
protected function create(): array protected function create(): array
{ {
$rpcPort = Config::get('rpc.port'); $rpcPort = Config::get('rpc.port');
if (empty($this->checkUrl)) { if (empty($this->checkUrl)) {
$this->checkUrl = Network::local() . ":" . Config::get('rpc.port'); $this->checkUrl = Network::local() . ":" . Config::get('rpc.port');
} }
$defaultConfig = [ $defaultConfig = [
"ID" => "rpc.json.{$this->service}." . $this->uniqueId, "ID" => "rpc.json.{$this->service}." . $this->uniqueId,
"Name" => $this->service, "Name" => $this->service,
"EnableTagOverride" => false, "EnableTagOverride" => false,
"TaggedAddresses" => [ "TaggedAddresses" => [
"lan_ipv4" => [ "lan_ipv4" => [
"address" => "127.0.0.1", "address" => "127.0.0.1",
"port" => $rpcPort "port" => $rpcPort
], ],
"wan_ipv4" => [ "wan_ipv4" => [
"address" => Network::local(), "address" => Network::local(),
"port" => $rpcPort "port" => $rpcPort
] ]
], ],
"Check" => [ "Check" => [
"CheckId" => "service:rpc.json.{$this->service}." . $this->uniqueId, "CheckId" => "service:rpc.json.{$this->service}." . $this->uniqueId,
"Name" => "service " . $this->service . ' health check', "Name" => "service " . $this->service . ' health check',
"Annotations" => "Script based health check", "Annotations" => "Script based health check",
"ServiceID" => $this->service, "ServiceID" => $this->service,
"TCP" => $this->checkUrl, "TCP" => $this->checkUrl,
"Interval" => "5s", "Interval" => "5s",
"Timeout" => "1s", "Timeout" => "1s",
"DeregisterCriticalServiceAfter" => "30s" "DeregisterCriticalServiceAfter" => "30s"
], ],
]; ];
if (!empty($this->meta)) { if (!empty($this->meta)) {
$defaultConfig["Meta"] = $this->meta; $defaultConfig["Meta"] = $this->meta;
} }
if (!empty($this->tags)) { if (!empty($this->tags)) {
$defaultConfig["tags"] = $this->tags; $defaultConfig["tags"] = $this->tags;
} }
return $defaultConfig; return $defaultConfig;
} }
} }
+76 -76
View File
@@ -1,76 +1,76 @@
<?php <?php
namespace Kiri\Rpc; namespace Kiri\Rpc;
use Exception; use Exception;
use Kiri\Abstracts\Component; use Kiri\Abstracts\Component;
use Kiri\Context; use Kiri\Context;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
use Kiri\Kiri; use Kiri\Kiri;
use Kiri\Pool\Alias; use Kiri\Pool\Alias;
use Kiri\Pool\Pool; use Kiri\Pool\Pool;
use Swoole\Client; use Swoole\Client;
/** /**
* *
*/ */
class ClientPool extends Component class ClientPool extends Component
{ {
const POOL_NAME = 'rpc.client.pool'; const POOL_NAME = 'rpc.client.pool';
use Alias; use Alias;
public int $max; public int $max;
public int $min; public int $min;
public int $waite; public int $waite;
/** /**
* @param $config * @param $config
* @param callable $callback * @param callable $callback
* @return mixed * @return mixed
* @throws ConfigException * @throws ConfigException
* @throws Exception * @throws Exception
*/ */
public function get($config, callable $callback): mixed public function get($config, callable $callback): mixed
{ {
$coroutineName = $this->name(self::POOL_NAME . '::' . $config['Address'] . '::' . $config['Port'], true); $coroutineName = $this->name(self::POOL_NAME . '::' . $config['Address'] . '::' . $config['Port'], true);
$pool = $config['pool'] ?? ['min' => 1, 'max' => 100]; $pool = $config['pool'] ?? ['min' => 1, 'max' => 100];
return $this->getPool()->get($coroutineName, $callback, $pool['min'] ?? 1); return $this->getPool()->get($coroutineName, $callback, $pool['min'] ?? 1);
} }
/** /**
* @param \Swoole\Coroutine\Client|Client $client * @param \Swoole\Coroutine\Client|Client $client
* @param $host * @param $host
* @param $port * @param $port
* @throws ConfigException * @throws ConfigException
* @throws Exception * @throws Exception
*/ */
public function push(\Swoole\Coroutine\Client|Client $client, $host, $port) public function push(\Swoole\Coroutine\Client|Client $client, $host, $port)
{ {
$coroutineName = $this->name(self::POOL_NAME . '::' . $host . '::' . $port, true); $coroutineName = $this->name(self::POOL_NAME . '::' . $host . '::' . $port, true);
$this->getPool()->push($coroutineName, $client); $this->getPool()->push($coroutineName, $client);
} }
/** /**
* @return Pool * @return Pool
* @throws Exception * @throws Exception
*/ */
public function getPool(): Pool public function getPool(): Pool
{ {
return Kiri::getDi()->get(Pool::class); return Kiri::getDi()->get(Pool::class);
} }
} }
+23 -23
View File
@@ -1,23 +1,23 @@
<?php <?php
namespace Kiri\Rpc; namespace Kiri\Rpc;
use Throwable; use Throwable;
class InvalidRpcParamsException extends \Exception class InvalidRpcParamsException extends \Exception
{ {
/** /**
* @param string $message * @param string $message
* @param int $code * @param int $code
* @param Throwable|null $previous * @param Throwable|null $previous
*/ */
public function __construct($message = "", $code = 0, Throwable $previous = null) public function __construct($message = "", $code = 0, Throwable $previous = null)
{ {
parent::__construct($message, -32602, $previous); parent::__construct($message, -32602, $previous);
} }
} }
+150 -150
View File
@@ -1,150 +1,150 @@
<?php <?php
namespace Kiri\Rpc; namespace Kiri\Rpc;
use Exception; use Exception;
use Http\Message\ServerRequest; use Http\Message\ServerRequest;
use Http\Message\Stream; use Http\Message\Stream;
use Kiri\Core\Number; use Kiri\Core\Number;
use Kiri\Kiri; use Kiri\Kiri;
use Kiri\Pool\Pool; use Kiri\Pool\Pool;
use Psr\Http\Client\ClientExceptionInterface; use Psr\Http\Client\ClientExceptionInterface;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
/** /**
* *
*/ */
abstract class JsonRpcConsumers implements OnRpcConsumerInterface abstract class JsonRpcConsumers implements OnRpcConsumerInterface
{ {
/** /**
* @var Pool * @var Pool
*/ */
public Pool $pool; public Pool $pool;
protected string $name = ''; protected string $name = '';
/** /**
* @param string $method * @param string $method
* @param mixed $data * @param mixed $data
* @param string $version * @param string $version
* @throws Exception * @throws Exception
* @throws ClientExceptionInterface * @throws ClientExceptionInterface
*/ */
public function notify(string $method, mixed $data, string $version = '2.0'): void public function notify(string $method, mixed $data, string $version = '2.0'): void
{ {
$config = $this->get_consul($this->name); $config = $this->get_consul($this->name);
$transporter = Kiri::getDi()->get(RpcClientInterface::class); $transporter = Kiri::getDi()->get(RpcClientInterface::class);
$transporter->withConfig($config)->sendRequest( $transporter->withConfig($config)->sendRequest(
$this->requestBody([ $this->requestBody([
'jsonrpc' => $version, 'jsonrpc' => $version,
'service' => $this->name, 'service' => $this->name,
'method' => $method, 'method' => $method,
'params' => $data, 'params' => $data,
]) ])
); );
} }
/** /**
* @param array $data * @param array $data
* @return ServerRequestInterface * @return ServerRequestInterface
* @throws \ReflectionException * @throws \ReflectionException
*/ */
private function requestBody(array $data): ServerRequestInterface private function requestBody(array $data): ServerRequestInterface
{ {
$server = Kiri::getDi()->get(ServerRequest::class); $server = Kiri::getDi()->get(ServerRequest::class);
return $server->withBody(new Stream(json_encode($data))); return $server->withBody(new Stream(json_encode($data)));
} }
/** /**
* @param string $method * @param string $method
* @param mixed $data * @param mixed $data
* @param string $version * @param string $version
* @param string $id * @param string $id
* @return mixed * @return mixed
* @throws Exception * @throws Exception
* @throws ClientExceptionInterface * @throws ClientExceptionInterface
*/ */
public function get(string $method, mixed $data, string $version = '2.0', string $id = ''): ResponseInterface public function get(string $method, mixed $data, string $version = '2.0', string $id = ''): ResponseInterface
{ {
if (empty($id)) $id = Number::create(time()); if (empty($id)) $id = Number::create(time());
$config = $this->get_consul($this->name); $config = $this->get_consul($this->name);
$transporter = Kiri::getDi()->get(RpcClientInterface::class); $transporter = Kiri::getDi()->get(RpcClientInterface::class);
return $transporter->withConfig($config)->sendRequest( return $transporter->withConfig($config)->sendRequest(
$this->requestBody([ $this->requestBody([
'jsonrpc' => $version, 'jsonrpc' => $version,
'service' => $this->name, 'service' => $this->name,
'method' => $method, 'method' => $method,
'params' => $data, 'params' => $data,
'id' => $id 'id' => $id
]) ])
); );
} }
/** /**
* @param array $data * @param array $data
* @return mixed * @return mixed
* @throws ClientExceptionInterface * @throws ClientExceptionInterface
* @throws Exception * @throws Exception
*/ */
public function batch(array $data): mixed public function batch(array $data): mixed
{ {
$config = $this->get_consul($this->name); $config = $this->get_consul($this->name);
$transporter = Kiri::getDi()->get(RpcClientInterface::class); $transporter = Kiri::getDi()->get(RpcClientInterface::class);
return $transporter->withConfig($config)->sendRequest( return $transporter->withConfig($config)->sendRequest(
$this->requestBody($data) $this->requestBody($data)
); );
} }
/** /**
* @param $service * @param $service
* @return array * @return array
* @throws RpcServiceException|\ReflectionException * @throws RpcServiceException|\ReflectionException
* @throws Exception * @throws Exception
*/ */
private function get_consul($service): array private function get_consul($service): array
{ {
if (empty($service)) { if (empty($service)) {
throw new RpcServiceException('You need set rpc service name if used.'); throw new RpcServiceException('You need set rpc service name if used.');
} }
$sf = Kiri::getDi()->get(RpcManager::class)->getServices($service); $sf = Kiri::getDi()->get(RpcManager::class)->getServices($service);
if (empty($sf) || !is_array($sf)) { if (empty($sf) || !is_array($sf)) {
throw new RpcServiceException('You need set rpc service name if used.'); throw new RpcServiceException('You need set rpc service name if used.');
} }
return $this->_loadRand($sf); return $this->_loadRand($sf);
} }
/** /**
* @param $services * @param $services
* @return array * @return array
*/ */
private function _loadRand($services): array private function _loadRand($services): array
{ {
$array = []; $array = [];
foreach ($services as $value) { foreach ($services as $value) {
$value['Weight'] = $value['Weights']['Passing']; $value['Weight'] = $value['Weights']['Passing'];
$array[] = $value; $array[] = $value;
} }
if (count($array) < 2) { if (count($array) < 2) {
$luck = $array[0]; $luck = $array[0];
} else { } else {
$luck = Luckdraw::luck($array, 'Weight'); $luck = Luckdraw::luck($array, 'Weight');
} }
return [ return [
'Address' => $luck['TaggedAddresses']['wan_ipv4']['Address'], 'Address' => $luck['TaggedAddresses']['wan_ipv4']['Address'],
'Port' => $luck['TaggedAddresses']['wan_ipv4']['Port'] 'Port' => $luck['TaggedAddresses']['wan_ipv4']['Port']
]; ];
} }
} }
+68 -68
View File
@@ -1,68 +1,68 @@
<?php <?php
namespace Kiri\Rpc; namespace Kiri\Rpc;
use Kiri\Annotation\Inject; use Kiri\Annotation\Inject;
use Exception; use Exception;
use Http\Message\Response; use Http\Message\Response;
use Http\Message\Stream; use Http\Message\Stream;
use Kiri\Abstracts\Config; use Kiri\Abstracts\Config;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
use Psr\Http\Client\ClientInterface; use Psr\Http\Client\ClientInterface;
use Psr\Http\Message\RequestInterface; use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Swoole\Coroutine\Client; use Swoole\Coroutine\Client;
class JsonRpcPoolTransporter implements ClientInterface class JsonRpcPoolTransporter implements ClientInterface
{ {
use TraitTransporter; use TraitTransporter;
#[Inject(ClientPool::class)] #[Inject(ClientPool::class)]
public ClientPool $pool; public ClientPool $pool;
const POOL_NAME = 'rpc.client.pool'; const POOL_NAME = 'rpc.client.pool';
/** /**
*/ */
public function init() public function init()
{ {
} }
/** /**
* @param RequestInterface $request * @param RequestInterface $request
* @return ResponseInterface * @return ResponseInterface
* @throws Exception * @throws Exception
*/ */
public function sendRequest(RequestInterface $request): ResponseInterface public function sendRequest(RequestInterface $request): ResponseInterface
{ {
$content = $request->getBody()->getContents(); $content = $request->getBody()->getContents();
$response = $this->request($client = $this->getClient(), $content, false); $response = $this->request($client = $this->getClient(), $content, false);
$this->pool->push($client, $this->config['Address'], $this->config['Port']); $this->pool->push($client, $this->config['Address'], $this->config['Port']);
return (new Response())->withBody(new Stream($response)); return (new Response())->withBody(new Stream($response));
} }
/** /**
* @return Client|\Swoole\Client * @return Client|\Swoole\Client
* @throws ConfigException * @throws ConfigException
* @throws Exception * @throws Exception
*/ */
private function getClient(): Client|\Swoole\Client private function getClient(): Client|\Swoole\Client
{ {
$this->config['pool'] = Config::get('rpc.pool', ['max' => 10, 'min' => 1, 'waite' => 60]); $this->config['pool'] = Config::get('rpc.pool', ['max' => 10, 'min' => 1, 'waite' => 60]);
return $this->pool->get($this->config, function () { return $this->pool->get($this->config, function () {
return $this->newClient(); return $this->newClient();
}); });
} }
} }
+37 -37
View File
@@ -1,37 +1,37 @@
<?php <?php
namespace Kiri\Rpc; namespace Kiri\Rpc;
use Http\Message\Response; use Http\Message\Response;
use Http\Message\Stream; use Http\Message\Stream;
use Psr\Http\Client\ClientInterface; use Psr\Http\Client\ClientInterface;
use Psr\Http\Message\RequestInterface; use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
/** /**
* *
*/ */
class JsonRpcTransporter implements ClientInterface class JsonRpcTransporter implements ClientInterface
{ {
use TraitTransporter; use TraitTransporter;
/** /**
* @param RequestInterface $request * @param RequestInterface $request
* @return ResponseInterface * @return ResponseInterface
* @throws \Exception * @throws \Exception
*/ */
public function sendRequest(RequestInterface $request): ResponseInterface public function sendRequest(RequestInterface $request): ResponseInterface
{ {
$content = $request->getBody()->getContents(); $content = $request->getBody()->getContents();
$response = $this->request($this->newClient(), $content, true); $response = $this->request($this->newClient(), $content, true);
return (new Response())->withBody(new Stream($response)); return (new Response())->withBody(new Stream($response));
} }
} }
+201 -201
View File
@@ -1,201 +1,201 @@
Apache License Apache License
Version 2.0, January 2004 Version 2.0, January 2004
http://www.apache.org/licenses/ http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions. 1. Definitions.
"License" shall mean the terms and conditions for use, reproduction, "License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document. and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by "Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License. the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all "Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition, control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the "control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity. outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity "You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License. exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications, "Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation including but not limited to software source code, documentation
source, and configuration files. source, and configuration files.
"Object" form shall mean any form resulting from mechanical "Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation, not limited to compiled object code, generated documentation,
and conversions to other media types. and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or "Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work copyright notice that is included in or attached to the work
(an example is provided in the Appendix below). (an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object "Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of, separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof. the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including "Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted" the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems, communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution." designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity "Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work. subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of 2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual, this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of, copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form. Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of 3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual, this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made, (except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work, use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s) Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate granted to You under this License for that Work shall terminate
as of the date such litigation is filed. as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the 4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You modifications, and in Source or Object form, provided that You
meet the following conditions: meet the following conditions:
(a) You must give any other recipients of the Work or (a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices (b) You must cause any modified files to carry prominent notices
stating that You changed the files; and stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works (c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work, attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of excluding those notices that do not pertain to any part of
the Derivative Works; and the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its (d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or, documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed that such additional attribution notices cannot be construed
as modifying the License. as modifying the License.
You may add Your own copyright statement to Your modifications and You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use, for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License. the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise, 5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions. this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions. with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade 6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor, names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file. origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or 7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS, Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License. risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory, 8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise, whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special, liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill, Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages. has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing 9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer, the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity, and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify, of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability. of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work. APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]" boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier same "printed page" as the copyright notice for easier
identification within third-party archives. identification within third-party archives.
Copyright [yyyy] [name of copyright owner] Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
+151 -151
View File
@@ -1,151 +1,151 @@
<?php <?php
namespace Kiri\Rpc; namespace Kiri\Rpc;
use Exception; use Exception;
class Luckdraw class Luckdraw
{ {
/** /**
* @param array $goods * @param array $goods
* @param string $wight * @param string $wight
* @return mixed * @return mixed
* @array = [ * @array = [
* ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'], * ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'],
* ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'], * ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'],
* ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'], * ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'],
* ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'], * ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'],
* ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'], * ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'],
* ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'], * ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'],
* ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'], * ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'],
* ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'], * ['name'=> '商品名称', 'probability'=> '概率', 'total'=> '库存'],
* ] * ]
* *
* @uses $reward = Lucked::luck($data); * @uses $reward = Lucked::luck($data);
*/ */
public static function luck(array $goods, string $wight = 'probability'): mixed public static function luck(array $goods, string $wight = 'probability'): mixed
{ {
static $class = null; static $class = null;
if ($class === null) $class = new Luckdraw(); if ($class === null) $class = new Luckdraw();
if (empty($goods)) return null; if (empty($goods)) return null;
$array = $prob = $alias = []; $array = $prob = $alias = [];
$defaultIndex = 0; $defaultIndex = 0;
foreach ($goods as $key => $val) { foreach ($goods as $key => $val) {
if ($val[$wight] == 0) $defaultIndex = $key; if ($val[$wight] == 0) $defaultIndex = $key;
$array[] = (float)$val[$wight]; $array[] = (float)$val[$wight];
} }
$array[$defaultIndex] = 1 - array_sum($array); $array[$defaultIndex] = 1 - array_sum($array);
$class->ket($array, $prob, $alias); $class->ket($array, $prob, $alias);
$result = $class->generation($array, $prob, $alias); $result = $class->generation($array, $prob, $alias);
if (!isset($goods[$result])) { if (!isset($goods[$result])) {
return null; return null;
} }
return $goods[$result]; return $goods[$result];
} }
/** /**
* @param $data * @param $data
* @param $prob * @param $prob
* @param $alias * @param $alias
* @return mixed * @return mixed
*/ */
private function generation($data, $prob, $alias): mixed private function generation($data, $prob, $alias): mixed
{ {
$nums = count($prob) - 1; $nums = count($prob) - 1;
$MAX_P = $this->getMin($data); // 假设最小的几率是万分之一 $MAX_P = $this->getMin($data); // 假设最小的几率是万分之一
$coin_toss = rand(1, $MAX_P) / $MAX_P; // 抛出硬币 $coin_toss = rand(1, $MAX_P) / $MAX_P; // 抛出硬币
$col = rand(0, $nums); // 随机落在一列 $col = rand(0, $nums); // 随机落在一列
$b_head = $coin_toss < $prob[$col]; // 判断是否落在原色 $b_head = $coin_toss < $prob[$col]; // 判断是否落在原色
return $b_head ? $col : @$alias[$col]; return $b_head ? $col : @$alias[$col];
} }
/** /**
* @param $num * @param $num
* @return string * @return string
*/ */
private function getMin($num): string private function getMin($num): string
{ {
$def = current($num); $def = current($num);
foreach ($num as $val) { foreach ($num as $val) {
if ($val < $def) { if ($val < $def) {
$def = $val; $def = $val;
} }
} }
$length = $this->getFloatLength($def) + 1; $length = $this->getFloatLength($def) + 1;
return sprintf('1%0' . $length . 'd', 0); return sprintf('1%0' . $length . 'd', 0);
} }
/** /**
* @param $float * @param $float
* @return int * @return int
*/ */
private function getFloatLength($float): int private function getFloatLength($float): int
{ {
$ex = explode('.', 1 - $float); $ex = explode('.', 1 - $float);
return strlen(end($ex)); return strlen(end($ex));
} }
/** /**
* @param array $data * @param array $data
* @param array $prob * @param array $prob
* @param array $alias * @param array $alias
*/ */
private function ket(array $data, array &$prob, array &$alias) private function ket(array $data, array &$prob, array &$alias)
{ {
$nums = count($data); $nums = count($data);
$small = $large = []; $small = $large = [];
for ($i = 0; $i < $nums; ++$i) { for ($i = 0; $i < $nums; ++$i) {
$data[$i] = $data[$i] * $nums; // 扩大倍数,使每列高度可为1 $data[$i] = $data[$i] * $nums; // 扩大倍数,使每列高度可为1
/** 分到两个数组,便于组合 */ /** 分到两个数组,便于组合 */
if ($data[$i] < 1) { if ($data[$i] < 1) {
$small[] = $i; $small[] = $i;
} else { } else {
$large[] = $i; $large[] = $i;
} }
} }
/** 将超过1的色块与原色拼凑成1 */ /** 将超过1的色块与原色拼凑成1 */
while (!empty($small) && !empty($large)) { while (!empty($small) && !empty($large)) {
$n_index = array_shift($small); $n_index = array_shift($small);
$a_index = array_shift($large); $a_index = array_shift($large);
$prob[$n_index] = $data[$n_index]; $prob[$n_index] = $data[$n_index];
$alias[$n_index] = $a_index; $alias[$n_index] = $a_index;
// 重新调整大色块 // 重新调整大色块
$data[$a_index] = ($data[$a_index] + $data[$n_index]) - 1; $data[$a_index] = ($data[$a_index] + $data[$n_index]) - 1;
if ($data[$a_index] < 1) { if ($data[$a_index] < 1) {
$small[] = $a_index; $small[] = $a_index;
} else { } else {
$large[] = $a_index; $large[] = $a_index;
} }
} }
/** 剩下大色块都设为1 */ /** 剩下大色块都设为1 */
while (!empty($large)) { while (!empty($large)) {
$n_index = array_shift($large); $n_index = array_shift($large);
$prob[$n_index] = 1; $prob[$n_index] = 1;
} }
/** 一般是精度问题才会执行这一步 */ /** 一般是精度问题才会执行这一步 */
while (!empty($small)) { while (!empty($small)) {
$n_index = array_shift($small); $n_index = array_shift($small);
$prob[$n_index] = 1; $prob[$n_index] = 1;
} }
} }
} }
+12 -12
View File
@@ -1,12 +1,12 @@
<?php <?php
namespace Kiri\Rpc; namespace Kiri\Rpc;
interface OnJsonRpcInterface interface OnJsonRpcInterface
{ {
// public function execute(); // public function execute();
} }
+8 -8
View File
@@ -1,8 +1,8 @@
<?php <?php
namespace Kiri\Rpc; namespace Kiri\Rpc;
interface OnRpcConsumerInterface interface OnRpcConsumerInterface
{ {
} }
+14 -14
View File
@@ -1,14 +1,14 @@
<?php <?php
namespace Kiri\Rpc; namespace Kiri\Rpc;
use Psr\Http\Client\ClientInterface; use Psr\Http\Client\ClientInterface;
/** /**
* @mixin JsonRpcTransporter * @mixin JsonRpcTransporter
*/ */
interface RpcClientInterface extends ClientInterface interface RpcClientInterface extends ClientInterface
{ {
} }
+274 -274
View File
@@ -1,274 +1,274 @@
<?php <?php
namespace Kiri\Rpc; namespace Kiri\Rpc;
use Http\Constrict\RequestInterface; use Http\Constrict\RequestInterface;
use Http\Handler\Handler; use Http\Handler\Handler;
use Http\Handler\Router; use Http\Handler\Router;
use Http\Message\ServerRequest; use Http\Message\ServerRequest;
use Kiri\Abstracts\Component; use Kiri\Abstracts\Component;
use Kiri\Abstracts\Config; use Kiri\Abstracts\Config;
use Kiri\Consul\Agent; use Kiri\Consul\Agent;
use Kiri\Context; use Kiri\Context;
use Kiri\Events\EventProvider; use Kiri\Events\EventProvider;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
use Kiri\Kiri; use Kiri\Kiri;
use Kiri\Annotation\Inject; use Kiri\Annotation\Inject;
use Kiri\Annotation\Annotation; use Kiri\Annotation\Annotation;
use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface; use Psr\Container\NotFoundExceptionInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use ReflectionException; use ReflectionException;
use Server\Contract\OnCloseInterface; use Server\Contract\OnCloseInterface;
use Server\Contract\OnConnectInterface; use Server\Contract\OnConnectInterface;
use Server\Contract\OnReceiveInterface; use Server\Contract\OnReceiveInterface;
use Server\Events\OnBeforeShutdown; use Server\Events\OnBeforeShutdown;
use Server\Events\OnServerBeforeStart; use Server\Events\OnServerBeforeStart;
use Server\Events\OnTaskerStart; use Server\Events\OnTaskerStart;
use Server\Events\OnWorkerStart; use Server\Events\OnWorkerStart;
use Swoole\Coroutine; use Swoole\Coroutine;
use Swoole\Coroutine\Channel; use Swoole\Coroutine\Channel;
use Swoole\Server; use Swoole\Server;
use Swoole\Timer; use Swoole\Timer;
/** /**
* *
*/ */
class RpcJsonp extends Component implements OnConnectInterface, OnReceiveInterface, OnCloseInterface class RpcJsonp extends Component implements OnConnectInterface, OnReceiveInterface, OnCloseInterface
{ {
#[Inject(Router::class)] #[Inject(Router::class)]
public Router $router; public Router $router;
#[Inject(Annotation::class)] #[Inject(Annotation::class)]
public Annotation $annotation; public Annotation $annotation;
private RpcManager $manager; private RpcManager $manager;
/** /**
* *
* @throws \Exception * @throws \Exception
*/ */
public function init(): void public function init(): void
{ {
$this->eventProvider->on(OnBeforeShutdown::class, [$this, 'onBeforeShutdown']); $this->eventProvider->on(OnBeforeShutdown::class, [$this, 'onBeforeShutdown']);
scan_directory(APP_PATH . 'rpc', 'Rpc'); scan_directory(APP_PATH . 'rpc', 'Rpc');
$this->eventProvider->on(OnWorkerStart::class, [$this, 'consulWatches']); $this->eventProvider->on(OnWorkerStart::class, [$this, 'consulWatches']);
$this->eventProvider->on(OnServerBeforeStart::class, [$this, 'register']); $this->eventProvider->on(OnServerBeforeStart::class, [$this, 'register']);
$this->manager = Kiri::getDi()->get(RpcManager::class); $this->manager = Kiri::getDi()->get(RpcManager::class);
} }
/** /**
* @param OnBeforeShutdown $beforeShutdown * @param OnBeforeShutdown $beforeShutdown
* @return void * @return void
* @throws ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
public function onBeforeShutdown(OnBeforeShutdown $beforeShutdown) public function onBeforeShutdown(OnBeforeShutdown $beforeShutdown)
{ {
$doneList = $this->manager->doneList(); $doneList = $this->manager->doneList();
$agent = $this->container->get(Agent::class); $agent = $this->container->get(Agent::class);
foreach ($doneList as $value) { foreach ($doneList as $value) {
$agent->service->deregister($value['config']['ID']); $agent->service->deregister($value['config']['ID']);
$agent->checks->deregister($value['config']['Check']['CheckId']); $agent->checks->deregister($value['config']['Check']['CheckId']);
} }
} }
/** /**
* @param OnWorkerStart|OnTaskerStart $server * @param OnWorkerStart|OnTaskerStart $server
* @throws ConfigException * @throws ConfigException
*/ */
public function consulWatches(OnWorkerStart|OnTaskerStart $server) public function consulWatches(OnWorkerStart|OnTaskerStart $server)
{ {
if ($server->workerId != 0) { if ($server->workerId != 0) {
return; return;
} }
$async_time = (int)Config::get('consul.async_time', 1000); $async_time = (int)Config::get('consul.async_time', 1000);
Timer::tick($async_time, static function ($timeId) { Timer::tick($async_time, static function ($timeId) {
if (env('state', 'start') == 'exit') { if (env('state', 'start') == 'exit') {
Timer::clear($timeId); Timer::clear($timeId);
return; return;
} }
Kiri::getDi()->get(RpcManager::class)->tick(); Kiri::getDi()->get(RpcManager::class)->tick();
}); });
} }
/** /**
* @param OnServerBeforeStart $server * @param OnServerBeforeStart $server
*/ */
public function register(OnServerBeforeStart $server) public function register(OnServerBeforeStart $server)
{ {
$this->manager->register(); $this->manager->register();
} }
/** /**
* @param Server $server * @param Server $server
* @param int $fd * @param int $fd
*/ */
public function onConnect(Server $server, int $fd): void public function onConnect(Server $server, int $fd): void
{ {
// TODO: Implement onConnect() method. // TODO: Implement onConnect() method.
} }
/** /**
* @param Server $server * @param Server $server
* @param int $fd * @param int $fd
* @param int $reactor_id * @param int $reactor_id
* @param string $data * @param string $data
*/ */
public function onReceive(Server $server, int $fd, int $reactor_id, string $data): void public function onReceive(Server $server, int $fd, int $reactor_id, string $data): void
{ {
$data = json_decode($data, true); $data = json_decode($data, true);
if (is_null($data)) { if (is_null($data)) {
$this->failure(-32700, 'Parse error语法解析错误'); $this->failure(-32700, 'Parse error语法解析错误');
} else if (!isset($data['jsonrpc']) || !isset($data['method']) || $data['jsonrpc'] != '2.0') { } else if (!isset($data['jsonrpc']) || !isset($data['method']) || $data['jsonrpc'] != '2.0') {
$this->failure(-32600, 'Invalid Request无效请求'); $this->failure(-32600, 'Invalid Request无效请求');
} else { } else {
$this->batchDispatch($server, $fd, $data); $this->batchDispatch($server, $fd, $data);
} }
} }
/** /**
* @param Server $server * @param Server $server
* @param int $fd * @param int $fd
* @param array $data * @param array $data
* @return void * @return void
*/ */
private function batchDispatch(Server $server, int $fd, array $data): void private function batchDispatch(Server $server, int $fd, array $data): void
{ {
if (isset($data['jsonrpc'])) { if (isset($data['jsonrpc'])) {
$dispatch = $this->dispatch($data); $dispatch = $this->dispatch($data);
if (!isset($data['id'])) { if (!isset($data['id'])) {
$dispatch = [1]; $dispatch = [1];
} }
$result = json_encode($dispatch, JSON_UNESCAPED_UNICODE); $result = json_encode($dispatch, JSON_UNESCAPED_UNICODE);
} else { } else {
$channel = new Channel($total = count($data)); $channel = new Channel($total = count($data));
foreach ($data as $datum) { foreach ($data as $datum) {
$this->_execute($channel, $datum); $this->_execute($channel, $datum);
} }
$result = []; $result = [];
for ($i = 0; $i < $total; $i++) { for ($i = 0; $i < $total; $i++) {
$result[] = $channel->pop(); $result[] = $channel->pop();
} }
} }
$server->send($fd, json_encode($result, JSON_UNESCAPED_UNICODE)); $server->send($fd, json_encode($result, JSON_UNESCAPED_UNICODE));
} }
/** /**
* @param $channel * @param $channel
* @param $datum * @param $datum
*/ */
private function _execute($channel, $datum) private function _execute($channel, $datum)
{ {
Coroutine::create(function () use ($channel, $datum) { Coroutine::create(function () use ($channel, $datum) {
if (empty($datum) || !isset($datum['jsonrpc'])) { if (empty($datum) || !isset($datum['jsonrpc'])) {
$channel->push($this->failure(-32700, 'Parse error语法解析错误')); $channel->push($this->failure(-32700, 'Parse error语法解析错误'));
} else if (!isset($datum['method'])) { } else if (!isset($datum['method'])) {
$channel->push($this->failure(-32700, 'Parse error语法解析错误')); $channel->push($this->failure(-32700, 'Parse error语法解析错误'));
} else { } else {
$dispatch = $this->dispatch($datum); $dispatch = $this->dispatch($datum);
if (!isset($dispatch['id'])) { if (!isset($dispatch['id'])) {
$dispatch = [1]; $dispatch = [1];
} }
$channel->push($dispatch); $channel->push($dispatch);
} }
}); });
} }
/** /**
* @param $data * @param $data
* @return array * @return array
*/ */
private function dispatch($data): array private function dispatch($data): array
{ {
try { try {
[$handler, $params] = $this->container->get(RpcManager::class)->get($data['service'], $data['method']); [$handler, $params] = $this->container->get(RpcManager::class)->get($data['service'], $data['method']);
if (is_null($handler)) { if (is_null($handler)) {
throw new \Exception('Method not found', -32601); throw new \Exception('Method not found', -32601);
} else { } else {
Context::setContext(RequestInterface::class, $this->createServerRequest($params)); Context::setContext(RequestInterface::class, $this->createServerRequest($params));
return $this->handler($handler); return $this->handler($handler);
} }
} catch (\Throwable $throwable) { } catch (\Throwable $throwable) {
$code = $throwable->getCode() == 0 ? -32603 : $throwable->getCode(); $code = $throwable->getCode() == 0 ? -32603 : $throwable->getCode();
return $this->failure($code, jTraceEx($throwable), [], $data['id'] ?? null); return $this->failure($code, jTraceEx($throwable), [], $data['id'] ?? null);
} }
} }
/** /**
* @param $params * @param $params
* @return ServerRequestInterface * @return ServerRequestInterface
* @throws \Exception * @throws \Exception
*/ */
private function createServerRequest($params): ServerRequestInterface private function createServerRequest($params): ServerRequestInterface
{ {
return (new ServerRequest())->withParsedBody($params); return (new ServerRequest())->withParsedBody($params);
} }
/** /**
* @param Handler $handler * @param Handler $handler
* @return array * @return array
*/ */
private function handler(Handler $handler): array private function handler(Handler $handler): array
{ {
return [ return [
'jsonrpc' => '2.0', 'jsonrpc' => '2.0',
'result' => call_user_func($handler->callback, ...$handler->params), 'result' => call_user_func($handler->callback, ...$handler->params),
'id' => $data['id'] ?? null 'id' => $data['id'] ?? null
]; ];
} }
/** /**
* @param $code * @param $code
* @param $message * @param $message
* @param array $data * @param array $data
* @param null $id * @param null $id
* @return array * @return array
*/ */
protected function failure($code, $message, array $data = [], $id = null): array protected function failure($code, $message, array $data = [], $id = null): array
{ {
$error = [ $error = [
'jsonrpc' => '2.0', 'jsonrpc' => '2.0',
'error' => [ 'error' => [
'code' => $code, 'code' => $code,
'message' => $message, 'message' => $message,
'data' => $data 'data' => $data
] ]
]; ];
if (!is_null($id)) { if (!is_null($id)) {
$error['id'] = $id; $error['id'] = $id;
} }
return $error; return $error;
} }
/** /**
* @param Server $server * @param Server $server
* @param int $fd * @param int $fd
*/ */
public function onClose(Server $server, int $fd): void public function onClose(Server $server, int $fd): void
{ {
// TODO: Implement onClose() method. // TODO: Implement onClose() method.
} }
} }
+138 -138
View File
@@ -1,138 +1,138 @@
<?php <?php
namespace Kiri\Rpc; namespace Kiri\Rpc;
use Http\Handler\Handler; use Http\Handler\Handler;
use Kiri\Abstracts\Component; use Kiri\Abstracts\Component;
use Kiri\Consul\Agent; use Kiri\Consul\Agent;
use Kiri\Consul\Health; use Kiri\Consul\Health;
use Kiri\Kiri; use Kiri\Kiri;
use ReflectionException; use ReflectionException;
class RpcManager extends Component class RpcManager extends Component
{ {
/** /**
* @var array * @var array
*/ */
private array $_rpc = []; private array $_rpc = [];
/** /**
* @param $serviceName * @param $serviceName
* @return void * @return void
* @throws ReflectionException * @throws ReflectionException
* @throws \Exception * @throws \Exception
*/ */
public function async($serviceName): void public function async($serviceName): void
{ {
$lists = Kiri::getDi()->get(Health::class)->setQuery('passing=true')->service($serviceName); $lists = Kiri::getDi()->get(Health::class)->setQuery('passing=true')->service($serviceName);
if ($lists->getStatusCode() != 200) { if ($lists->getStatusCode() != 200) {
return; return;
} }
$body = json_decode($lists->getBody(), true); $body = json_decode($lists->getBody(), true);
$file = storage('.rpc.clients.' . md5($serviceName), 'rpc'); $file = storage('.rpc.clients.' . md5($serviceName), 'rpc');
if (!empty($body) && is_array($body)) { if (!empty($body) && is_array($body)) {
file_put_contents($file, json_encode(array_column($body, 'Service')), LOCK_EX); file_put_contents($file, json_encode(array_column($body, 'Service')), LOCK_EX);
} else { } else {
file_put_contents($file, json_encode([]), LOCK_EX); file_put_contents($file, json_encode([]), LOCK_EX);
} }
} }
/** /**
* @throws ReflectionException * @throws ReflectionException
*/ */
public function tick(): void public function tick(): void
{ {
foreach ($this->_rpc as $name => $list) { foreach ($this->_rpc as $name => $list) {
$this->async($name); $this->async($name);
} }
} }
/** /**
* @param $serviceName * @param $serviceName
* @return array * @return array
* @throws \Exception * @throws \Exception
*/ */
public function getServices($serviceName): array public function getServices($serviceName): array
{ {
$file = storage('.rpc.clients.' . md5($serviceName), 'rpc'); $file = storage('.rpc.clients.' . md5($serviceName), 'rpc');
if (!file_exists($file) || filesize($file) < 10) { if (!file_exists($file) || filesize($file) < 10) {
$this->async($serviceName); $this->async($serviceName);
} }
$content = json_decode(file_get_contents($file), true); $content = json_decode(file_get_contents($file), true);
if (empty($content) || !is_array($content)) { if (empty($content) || !is_array($content)) {
return []; return [];
} }
return $content; return $content;
} }
/** /**
* @param string $name * @param string $name
* @param string $class * @param string $class
* @param array $serviceConfig * @param array $serviceConfig
* @return bool * @return bool
* @throws ReflectionException * @throws ReflectionException
*/ */
public function add(string $name, string $class, array $serviceConfig): bool public function add(string $name, string $class, array $serviceConfig): bool
{ {
$methods = Kiri::getDi()->getReflect($class); $methods = Kiri::getDi()->getReflect($class);
$lists = $methods->getMethods(\ReflectionMethod::IS_PUBLIC); $lists = $methods->getMethods(\ReflectionMethod::IS_PUBLIC);
if (!isset($this->_rpc[$name])) { if (!isset($this->_rpc[$name])) {
$this->_rpc[$name] = ['methods' => [], 'id' => $serviceConfig['ID'], 'config' => $serviceConfig]; $this->_rpc[$name] = ['methods' => [], 'id' => $serviceConfig['ID'], 'config' => $serviceConfig];
} }
foreach ($lists as $reflection) { foreach ($lists as $reflection) {
if ($reflection->getDeclaringClass() != $class) { if ($reflection->getDeclaringClass() != $class) {
continue; continue;
} }
$methodName = $reflection->getName(); $methodName = $reflection->getName();
$this->_rpc[$name]['methods'][$methodName] = [new Handler('/', [$class, $methodName]), null]; $this->_rpc[$name]['methods'][$methodName] = [new Handler('/', [$class, $methodName]), null];
} }
return true; return true;
} }
/** /**
* @return array * @return array
*/ */
public function doneList(): array public function doneList(): array
{ {
$array = []; $array = [];
foreach ($this->_rpc as $list) { foreach ($this->_rpc as $list) {
$array[] = $list; $array[] = $list;
} }
return $array; return $array;
} }
/** /**
*/ */
public function register() public function register()
{ {
$agent = Kiri::getDi()->get(Agent::class); $agent = Kiri::getDi()->get(Agent::class);
foreach ($this->_rpc as $list) { foreach ($this->_rpc as $list) {
$data = $agent->service->register($list['config']); $data = $agent->service->register($list['config']);
if ($data->getStatusCode() != 200) { if ($data->getStatusCode() != 200) {
return; return;
} }
} }
} }
/** /**
* @param string $name * @param string $name
* @param string $method * @param string $method
* @return mixed * @return mixed
*/ */
public function get(string $name, string $method): array public function get(string $name, string $method): array
{ {
return $this->_rpc[$name]['methods'][$method] ?? [null, null]; return $this->_rpc[$name]['methods'][$method] ?? [null, null];
} }
} }
+8 -8
View File
@@ -1,8 +1,8 @@
<?php <?php
namespace Kiri\Rpc; namespace Kiri\Rpc;
class RpcServiceException extends \Exception class RpcServiceException extends \Exception
{ {
} }
+78 -78
View File
@@ -1,78 +1,78 @@
<?php <?php
namespace Kiri\Rpc; namespace Kiri\Rpc;
use Exception; use Exception;
use Kiri\Context; use Kiri\Context;
use Swoole\Client; use Swoole\Client;
use Swoole\Coroutine; use Swoole\Coroutine;
trait TraitTransporter trait TraitTransporter
{ {
protected array $config; protected array $config;
protected array $clients = []; protected array $clients = [];
/** /**
* @param $config * @param $config
* @return $this * @return $this
*/ */
public function withConfig($config): static public function withConfig($config): static
{ {
$this->config = $config; $this->config = $config;
return $this; return $this;
} }
/** /**
* @param Client|Coroutine\Client $client * @param Client|Coroutine\Client $client
* @param $content * @param $content
* @param bool $isClose * @param bool $isClose
* @return mixed * @return mixed
*/ */
private function request(Client|Coroutine\Client $client, $content, bool $isClose): mixed private function request(Client|Coroutine\Client $client, $content, bool $isClose): mixed
{ {
$client->send($content); $client->send($content);
$read = $client->recv(); $read = $client->recv();
if ($isClose) { if ($isClose) {
$client->close(); $client->close();
} }
return $read; return $read;
} }
/** /**
* @return Client|Coroutine\Client * @return Client|Coroutine\Client
* @throws Exception * @throws Exception
*/ */
private function newClient(): Coroutine\Client|Client private function newClient(): Coroutine\Client|Client
{ {
$alias = $this->alias($this->config); $alias = $this->alias($this->config);
$client = $this->clients[$alias] ?? null; $client = $this->clients[$alias] ?? null;
if (is_null($client)) { if (is_null($client)) {
$client = Context::inCoroutine() ? new Coroutine\Client(SWOOLE_SOCK_TCP) : new Client(SWOOLE_SOCK_TCP); $client = Context::inCoroutine() ? new Coroutine\Client(SWOOLE_SOCK_TCP) : new Client(SWOOLE_SOCK_TCP);
$this->clients[$alias] = $client; $this->clients[$alias] = $client;
} }
[$host, $port] = [$this->config['Address'], $this->config['Port']]; [$host, $port] = [$this->config['Address'], $this->config['Port']];
if (!$client->isConnected() && !$client->connect($host, $port, 60)) { if (!$client->isConnected() && !$client->connect($host, $port, 60)) {
throw new Exception('connect fail.'); throw new Exception('connect fail.');
} }
return $client; return $client;
} }
/** /**
* @param array $config * @param array $config
* @return string * @return string
*/ */
private function alias(array $config): string private function alias(array $config): string
{ {
return $config['Address'] . '::' . $config['Port']; return $config['Address'] . '::' . $config['Port'];
} }
} }
+24 -24
View File
@@ -1,24 +1,24 @@
{ {
"name": "game-worker/kiri-rpc", "name": "game-worker/kiri-rpc",
"description": "kiri-rpc", "description": "kiri-rpc",
"authors": [ "authors": [
{ {
"name": "XiangLin", "name": "XiangLin",
"email": "as2252258@163.com" "email": "as2252258@163.com"
} }
], ],
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": ">=8.0", "php": ">=8.0",
"ext-json": "*", "ext-json": "*",
"psr/http-client": "^1.0", "psr/http-client": "^1.0",
"psr/http-message": "^1.0" "psr/http-message": "^1.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Kiri\\Rpc\\": "./" "Kiri\\Rpc\\": "./"
} }
}, },
"require-dev": { "require-dev": {
} }
} }
+77 -77
View File
@@ -1,77 +1,77 @@
<?php <?php
use Kiri\Rpc\RpcJsonp; use Kiri\Rpc\RpcJsonp;
use Kiri\Rpc\TestRpcService; use Kiri\Rpc\TestRpcService;
use Server\Constant; use Server\Constant;
return [ return [
'rpc' => [ 'rpc' => [
'name' => 'json-rpc', 'name' => 'json-rpc',
'type' => Constant::SERVER_TYPE_BASE, 'type' => Constant::SERVER_TYPE_BASE,
'mode' => SWOOLE_SOCK_TCP, 'mode' => SWOOLE_SOCK_TCP,
'host' => '0.0.0.0', 'host' => '0.0.0.0',
'port' => 9526, 'port' => 9526,
'settings' => [ 'settings' => [
], ],
'events' => [ 'events' => [
Constant::RECEIVE => [RpcJsonp::class, 'onReceive'] Constant::RECEIVE => [RpcJsonp::class, 'onReceive']
], ],
'consumers' => [ 'consumers' => [
'class' => TestRpcService::class, 'class' => TestRpcService::class,
'name' => 'test-rpc', 'name' => 'test-rpc',
'package' => 'test', 'package' => 'test',
'register' => [ 'register' => [
'host' => '', 'host' => '',
'port' => '' 'port' => ''
] ]
] ]
], ],
'service' => [ 'service' => [
[ [
"datacenter" => "dc1", "datacenter" => "dc1",
"id" => "40e4a748-2192-161a-0510-9bf59fe950b5", "id" => "40e4a748-2192-161a-0510-9bf59fe950b5",
"node" => "FriendRpcService", "node" => "FriendRpcService",
"skipNodeUpdate" => false, "skipNodeUpdate" => false,
"service" => [ "service" => [
"id" => "redis1", "id" => "redis1",
"service" => "FriendRpcService", "service" => "FriendRpcService",
"address" => "172.26.221.211", "address" => "172.26.221.211",
"taggedAddresses" => [ "taggedAddresses" => [
"lan" => [ "lan" => [
"address" => "127.0.0.1", "address" => "127.0.0.1",
"port" => 8000 "port" => 8000
], ],
"wan" => [ "wan" => [
"address" => "172.26.221.211", "address" => "172.26.221.211",
"port" => 80 "port" => 80
] ]
], ],
"meta" => [ "meta" => [
"redis_version" => "4.0" "redis_version" => "4.0"
], ],
"port" => 8000 "port" => 8000
], ],
"check" => [ "check" => [
"node" => "t2.320", "node" => "t2.320",
"checkId" => "service:redis1", "checkId" => "service:redis1",
"name" => "Redis health check", "name" => "Redis health check",
"Annotations" => "Script based health check", "Annotations" => "Script based health check",
"status" => "passing", "status" => "passing",
"serviceID" => "redis1", "serviceID" => "redis1",
"definition" => [ "definition" => [
"http" => "172.26.221.211:9527", "http" => "172.26.221.211:9527",
"interval" => "5s", "interval" => "5s",
"timeout" => "1s", "timeout" => "1s",
"deregisterCriticalServiceAfter" => "30s" "deregisterCriticalServiceAfter" => "30s"
], ],
], ],
] ]
] ]
]; ];