改名

.phpstorm.meta.php

@@ -4,7 +4,10 @@ namespace PHPSTORM_META {
 
     // Reflect
 	use Kiri\Di\Container;
+	use Psr\Container\ContainerInterface;
 
+	override(ContainerInterface::get(0), map('@'));
+	override(Container::make(0), map('@'));
 	override(Container::get(0), map('@'));
 	override(Container::create(0), map('@'));
 //    override(\Hyperf\Utils\Context::get(0), map('@'));

src/Base/Model.php

@@ -40,7 +40,7 @@ use validator\Validator;
  *
  * @package Kiri\Abstracts
  *
- * @property bool $isCreate
+ * @property bool $isNowExample
  * @property Application $container
  * @property EventDispatch $eventDispatch
  * @property array $attributes
@@ -102,15 +102,6 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	private array $_with = [];
 
 
-	/**
-	 * @return Application
-	 */
-	#[Pure] protected function getContainer(): Application
-	{
-		return Kiri::app();
-	}
-
-
 	/**
 	 * @return array
 	 */
@@ -120,11 +111,12 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	}
 
 
-    /**
+	/**
-     * @param string $name
+	 * @param string $name
-     * @param mixed $value
+	 * @param mixed $value
-     * @return mixed
+	 * @return mixed
-     */
+	 * @throws ReflectionException
+	 */
 	private function _setter(string $name, mixed $value): mixed
 	{
 		$method = di(Setter::class)->getSetter(static::class, $name);
@@ -139,7 +131,6 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param string $name
 	 * @param $value
 	 * @return mixed
-	 * @throws NotFindClassException
 	 * @throws ReflectionException
 	 */
 	private function _getter(string $name, $value): mixed
@@ -156,7 +147,6 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param string $name
 	 * @param $value
 	 * @return mixed
-	 * @throws NotFindClassException
 	 * @throws ReflectionException
 	 * @throws Exception
 	 */
@@ -176,6 +166,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 
 	/**
 	 * @return EventDispatch
+	 * @throws ReflectionException
 	 */
 	protected function getEventDispatch(): EventDispatch
 	{
@@ -221,7 +212,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function init()
 	{
-		$an = Kiri::app()->getAnnotation();
+		$an = Kiri::app()->getNote();
 		$an->injectProperty($this);
 	}
 
@@ -238,7 +229,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	/**
 	 * @return bool
 	 */
-	public function getIsCreate(): bool
+	public function getIsNowExample(): bool
 	{
 		return $this->isNewExample === TRUE;
 	}
@@ -248,7 +239,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param bool $bool
 	 * @return $this
 	 */
-	public function setIsCreate(bool $bool = FALSE): static
+	public function setIsNowExample(bool $bool = FALSE): static
 	{
 		$this->isNewExample = $bool;
 		return $this;
@@ -403,6 +394,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 
 	/**
 	 * @return static
+	 * @throws ReflectionException
 	 */
 	private static function makeNewInstance(): static
 	{
@@ -486,6 +478,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param $name
 	 * @param $value
 	 * @return mixed
+	 * @throws ReflectionException
 	 */
 	public function setAttribute($name, $value): mixed
 	{
@@ -496,6 +489,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param $name
 	 * @param $value
 	 * @return mixed
+	 * @throws ReflectionException
 	 */
 	public function setOldAttribute($name, $value): mixed
 	{
@@ -521,6 +515,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	/**
 	 * @param $param
 	 * @return $this
+	 * @throws ReflectionException
 	 */
 	public function setOldAttributes($param): static
 	{
@@ -634,7 +629,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
     {
         $this->_attributes = $value;
         $this->_oldAttributes = $value;
-        $this->setIsCreate(FALSE);
+        $this->setIsNowExample(FALSE);
         return $this;
     }
 
@@ -682,8 +677,8 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function getAttribute(string $name)
 	{
-		if ($this->hasAnnotation($name)) {
+		if ($this->hasNote($name)) {
-			return $this->runAnnotation($name, $this->_attributes[$name]);
+			return $this->runNote($name, $this->_attributes[$name]);
 		}
 		return $this->_attributes[$name] ?? null;
 	}
@@ -695,7 +690,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param string $type
 	 * @return mixed
 	 */
-	protected function runAnnotation(string $name, mixed $value, string $type = self::GET): mixed
+	protected function runNote(string $name, mixed $value, string $type = self::GET): mixed
 	{
 		return call_user_func($this->_annotations[$type][$name], $value);
 	}
@@ -781,6 +776,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 
 	/**
 	 * @return Relation|null
+	 * @throws ReflectionException
 	 */
 	public function getRelation(): ?Relation
 	{
@@ -822,8 +818,8 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 			throw new Exception('You need add static method `tableName` and return table name.');
 		}
 		$table = trim($this->table, '{{%}}');
-		if (!empty($tablePrefix) && !str_starts_with($this->table, $tablePrefix)) {
+		if (!empty($tablePrefix) && !str_starts_with($table, $tablePrefix)) {
-			$table = $tablePrefix . $this->table;
+			$table = $tablePrefix . $table;
 		}
 		return '`' . $connection->database . '`.' . $table;
 	}
@@ -922,7 +918,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param string $type
 	 * @return array
 	 */
-	protected function getAnnotation(string $type = self::GET): array
+	protected function getNote(string $type = self::GET): array
 	{
 		return $this->_annotations[$type] ?? [];
 	}
@@ -933,7 +929,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param string $type
 	 * @return bool
 	 */
-	protected function hasAnnotation($name, string $type = self::GET): bool
+	protected function hasNote($name, string $type = self::GET): bool
 	{
 		if (!isset($this->_annotations[$type])) {
 			return false;
@@ -1062,7 +1058,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		$model = duplicate(static::class);
 		$model->_attributes = $data;
 		$model->_oldAttributes = $data;
-		$model->setIsCreate(false);
+		$model->setIsNowExample(false);
 		return $model;
 	}
 

src/Condition/Condition.php

@@ -5,14 +5,13 @@ namespace Database\Condition;
 
 
 use JetBrains\PhpStorm\Pure;
-use Kiri\Abstracts\BaseObject;
+use Kiri\Abstracts\Component;
-use Kiri\Core\Str;
 
 /**
  * Class Condition
  * @package Database\Condition
  */
-abstract class Condition extends BaseObject
+abstract class Condition extends Component
 {
 
 	protected string $column = '';

src/Connection.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 namespace Database;
 
 
-use Annotation\Inject;
 use Database\Affair\BeginTransaction;
 use Database\Affair\Commit;
 use Database\Affair\Rollback;
@@ -23,6 +22,7 @@ use Kiri\Abstracts\Config;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\NotFindClassException;
 use Kiri\Kiri;
+use Note\Inject;
 use ReflectionException;
 use Server\Events\OnWorkerExit;
 use Server\Events\OnWorkerStop;
@@ -43,7 +43,11 @@ class Connection extends Component
 
 	public string $database = '';
 
-	public int $timeout = 1900;
+	public int $connect_timeout = 30;
+
+	public int $read_timeout = 10;
+
+	public array $pool;
 
 	/**
 	 * @var bool
@@ -61,6 +65,7 @@ class Connection extends Component
 	 * @var array
 	 */
 	public array $slaveConfig = [];
+	public array $attributes = [];
 
 
 	/**
@@ -70,24 +75,18 @@ class Connection extends Component
 	public Schema $_schema;
 
 
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
-
 	/**
 	 * execute by __construct
 	 * @throws Exception
 	 */
 	public function init()
 	{
-		$this->eventProvider->on(OnWorkerStop::class, [$this, 'clear_connection'], 0);
+		$eventProvider = Kiri::getDi()->get(EventProvider::class);
-		$this->eventProvider->on(OnWorkerExit::class, [$this, 'clear_connection'], 0);
+		$eventProvider->on(OnWorkerStop::class, [$this, 'clear_connection'], 0);
-		$this->eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
+		$eventProvider->on(OnWorkerExit::class, [$this, 'clear_connection'], 0);
-		$this->eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
+		$eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
-		$this->eventProvider->on(Commit::class, [$this, 'commit'], 0);
+		$eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
+		$eventProvider->on(Commit::class, [$this, 'commit'], 0);
 
 		if (Db::transactionsActive()) {
 			$this->beginTransaction();
@@ -197,10 +196,14 @@ class Connection extends Component
 	public function masterInstance(): PDO
 	{
 		return $this->connections()->get([
-			'cds'      => $this->cds,
+			'cds'             => $this->cds,
-			'username' => $this->username,
+			'username'        => $this->username,
-			'password' => $this->password,
+			'password'        => $this->password,
-			'database' => $this->database
+			'attributes'      => $this->attributes,
+			'connect_timeout' => $this->connect_timeout,
+			'read_timeout'    => $this->read_timeout,
+			'dbname'          => $this->database,
+			'pool'            => $this->pool
 		], true);
 	}
 

src/DatabasesProviders.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 namespace Database;
 
 
-use Annotation\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Abstracts\Providers;
@@ -24,13 +23,6 @@ class DatabasesProviders extends Providers
 	private array $_pooLength = ['min' => 0, 'max' => 1];
 
 
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
-
 	/**
 	 * @param Application $application
 	 * @throws Exception
@@ -83,18 +75,20 @@ class DatabasesProviders extends Providers
 	 */
 	private function _settings($database): array
 	{
+		$clientPool = $database['pool'] ?? ['min' => 1, 'max' => 5, 'tick' => 60];
 		return [
-			'class'       => Connection::class,
+			'id'              => $database['id'],
-			'id'          => $database['id'],
+			'cds'             => $database['cds'],
-			'cds'         => $database['cds'],
+			'username'        => $database['username'],
-			'username'    => $database['username'],
+			'password'        => $database['password'],
-			'password'    => $database['password'],
+			'tablePrefix'     => $database['tablePrefix'],
-			'tablePrefix' => $database['tablePrefix'],
+			'database'        => $database['database'],
-			'database'    => $database['database'],
+			'connect_timeout' => $database['connect_timeout'] ?? 30,
-			'maxNumber'   => $this->_pooLength['max'],
+			'read_timeout'    => $database['read_timeout'] ?? 10,
-			'minNumber'   => $this->_pooLength['min'],
+			'pool'            => $clientPool,
-			'charset'     => $database['charset'] ?? 'utf8mb4',
+			'attributes'      => $database['attributes'] ?? [],
-			'slaveConfig' => $database['slaveConfig']
+			'charset'         => $database['charset'] ?? 'utf8mb4',
+			'slaveConfig'     => $database['slaveConfig']
 		];
 	}
 

src/Model.php

@@ -117,6 +117,7 @@ class Model extends Base\Model
 		if (empty($select)) {
 			$select = duplicate(static::class);
 			$select->attributes = $attributes;
+			$select->setIsNowExample(true);
 			if (!$select->save()) {
 				Db::rollback();
 				return $logger->addError($select->getLastError(), 'mysql');

src/Mysql/PDO.php

@@ -3,8 +3,8 @@
 namespace Database\Mysql;
 
 use Exception;
+use Kiri\Abstracts\Config;
 use Kiri\Abstracts\Logger;
-use Kiri\Context;
 use Kiri\Kiri;
 use Kiri\Pool\StopHeartbeatCheck;
 use PDOStatement;
@@ -29,18 +29,31 @@ class PDO implements StopHeartbeatCheck
 
 	private int $_last = 0;
 
+	public string $dbname;
+	public string $cds;
+	public string $username;
+	public string $password;
+	public string $charset;
+	public int $connect_timeout;
+	public int $read_timeout;
+
+
+	public array $attributes = [];
+
 
 	/**
-	 * @param string $dbname
+	 * @param array $config
-	 * @param string $cds
-	 * @param string $username
-	 * @param string $password
-	 * @param string $chatset
-	 * @throws
 	 */
-	public function __construct(public string $dbname, public string $cds,
+	public function __construct(array $config)
-	                            public string $username, public string $password, public string $chatset = 'utf8mb4')
 	{
+		$this->dbname = $config['dbname'];
+		$this->cds = $config['cds'];
+		$this->username = $config['username'];
+		$this->password = $config['password'];
+		$this->connect_timeout = $config['connect_timeout'] ?? 30;
+		$this->read_timeout = $config['read_timeout'] ?? 10;
+		$this->charset = $config['charset'] ?? 'utf8mb4';
+		$this->attributes = $config['attributes'] ?? [];
 	}
 
 
@@ -67,21 +80,28 @@ class PDO implements StopHeartbeatCheck
 		if (env('state', 'start') == 'exit') {
 			return;
 		}
-		if ($this->_timer === -1 && Context::inCoroutine()) {
+		if ($this->_timer === -1) {
-			$this->_timer = Timer::tick(1000, function () {
+			$this->_timer = Timer::tick(1000, fn() => $this->waite());
-				try {
+		}
-					if (env('state', 'start') == 'exit') {
+	}
-						Kiri::getDi()->get(Logger::class)->critical('timer end');
+
-						$this->stopHeartbeatCheck();
+
-					}
+	/**
-					if (time() - $this->_last > 10 * 60) {
+	 * @throws Exception
-						$this->stopHeartbeatCheck();
+	 */
-						$this->pdo = null;
+	private function waite(): void
-					}
+	{
-				} catch (\Throwable $throwable) {
+		try {
-					error($throwable);
+			if (env('state', 'start') == 'exit') {
-				}
+				Kiri::getDi()->get(Logger::class)->critical('timer end');
-			});
+				$this->stopHeartbeatCheck();
+			}
+			if (time() - $this->_last > (int)Config::get('databases.pool.tick', 60)) {
+				$this->stopHeartbeatCheck();
+				$this->pdo = null;
+			}
+		} catch (\Throwable $throwable) {
+			error($throwable);
 		}
 	}
 
@@ -286,13 +306,18 @@ class PDO implements StopHeartbeatCheck
 		$link = new \PDO('mysql:dbname=' . $this->dbname . ';host=' . $this->cds, $this->username, $this->password, [
 			\PDO::ATTR_EMULATE_PREPARES         => false,
 			\PDO::ATTR_CASE                     => \PDO::CASE_NATURAL,
-			\PDO::ATTR_TIMEOUT                  => 60,
+			\PDO::ATTR_TIMEOUT                  => $this->connect_timeout,
 			\PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,
-			\PDO::MYSQL_ATTR_INIT_COMMAND       => 'SET NAMES ' . $this->chatset
+			\PDO::MYSQL_ATTR_INIT_COMMAND       => 'SET NAMES ' . $this->charset
 		]);
 		$link->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
 		$link->setAttribute(\PDO::ATTR_STRINGIFY_FETCHES, false);
 		$link->setAttribute(\PDO::ATTR_ORACLE_NULLS, \PDO::NULL_EMPTY_STRING);
+		if (!empty($this->attributes) && is_array($this->attributes)) {
+			foreach ($this->attributes as $key => $attribute) {
+				$link->setAttribute($key, $attribute);
+			}
+		}
 		return $link;
 	}
 

src/Note/Get.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Database\Annotation;
+namespace Database\Note;
 
 
 use Attribute;
@@ -11,9 +11,9 @@ use Exception;
 
 /**
  * Class Get
- * @package Annotation\Model
+ * @package Note\Model
  */
-#[Attribute(Attribute::TARGET_METHOD)] class Get extends \Annotation\Attribute
+#[Attribute(Attribute::TARGET_METHOD)] class Get extends \Note\Attribute
 {
 
 

src/Note/Relation.php

@@ -1,17 +1,17 @@
 <?php
 
 
-namespace Database\Annotation;
+namespace Database\Note;
 
 
-use Annotation\Attribute;
+use Note\Attribute;
 use Database\Base\Relate;
 use Exception;
 
 
 /**
  * Class Relation
- * @package Annotation\Model
+ * @package Note\Model
  */
 #[\Attribute(\Attribute::TARGET_METHOD)] class Relation extends Attribute
 {

src/Note/Set.php

@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Database\Annotation;
+namespace Database\Note;
 
 
-use Annotation\Attribute;
+use Note\Attribute;
 use Database\Base\Setter;
 use Exception;
 

src/Traits/Builder.php

@@ -194,7 +194,7 @@ trait Builder
 			$class = $defaultConfig['class'];
 			unset($defaultConfig['class']);
 
-			$builder = Kiri::getDi()->get($class, [], $defaultConfig);
+			$builder = Kiri::getDi()->make($class, [], $defaultConfig);
 			$builder->setValue($condition[2]);
 			$builder->setColumn($condition[1]);
 		} else {

src/Traits/QueryTrait.php

@@ -522,7 +522,7 @@ trait QueryTrait
 			$conditionArray = $this->sprintf($conditionArray, $value, $opera);
 		}
 
-		$this->where = ['(' . implode(' AND ', $this->where) . ') OR (' . $conditionArray . ')'];
+		$this->where = ['((' . implode(' AND ', $this->where) . ') OR (' . $conditionArray . '))'];
 		return $this;
 	}