改名

src/Base/Model.php

@@ -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 mixed $value
-     * @return mixed
-     */
+	/**
+	 * @param string $name
+	 * @param mixed $value
+	 * @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
 	{
@@ -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
 	{
@@ -781,6 +776,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 
 	/**
 	 * @return Relation|null
+	 * @throws ReflectionException
 	 */
 	public function getRelation(): ?Relation
 	{

src/Condition/Condition.php

@@ -5,14 +5,13 @@ namespace Database\Condition;
 
 
 use JetBrains\PhpStorm\Pure;
-use Kiri\Abstracts\BaseObject;
-use Kiri\Core\Str;
+use Kiri\Abstracts\Component;
 
 /**
  * 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 Note\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 = [];
 
 
 	/**
@@ -197,10 +202,14 @@ class Connection extends Component
 	public function masterInstance(): PDO
 	{
 		return $this->connections()->get([
-			'cds'      => $this->cds,
-			'username' => $this->username,
-			'password' => $this->password,
-			'database' => $this->database
+			'cds'             => $this->cds,
+			'username'        => $this->username,
+			'password'        => $this->password,
+			'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 Note\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Abstracts\Providers;
@@ -12,6 +11,7 @@ use Kiri\Application;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
+use Note\Inject;
 use Server\Events\OnWorkerStart;
 
 /**
@@ -83,18 +83,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'],
-			'cds'         => $database['cds'],
-			'username'    => $database['username'],
-			'password'    => $database['password'],
-			'tablePrefix' => $database['tablePrefix'],
-			'database'    => $database['database'],
-			'maxNumber'   => $this->_pooLength['max'],
-			'minNumber'   => $this->_pooLength['min'],
-			'charset'     => $database['charset'] ?? 'utf8mb4',
-			'slaveConfig' => $database['slaveConfig']
+			'id'              => $database['id'],
+			'cds'             => $database['cds'],
+			'username'        => $database['username'],
+			'password'        => $database['password'],
+			'tablePrefix'     => $database['tablePrefix'],
+			'database'        => $database['database'],
+			'connect_timeout' => $database['connect_timeout'] ?? 30,
+			'read_timeout'    => $database['read_timeout'] ?? 10,
+			'pool'            => $clientPool,
+			'attributes'      => $database['attributes'] ?? [],
+			'charset'         => $database['charset'] ?? 'utf8mb4',
+			'slaveConfig'     => $database['slaveConfig']
 		];
 	}
 

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 string $cds
-	 * @param string $username
-	 * @param string $password
-	 * @param string $chatset
-	 * @throws
+	 * @param array $config
 	 */
-	public function __construct(public string $dbname, public string $cds,
-	                            public string $username, public string $password, public string $chatset = 'utf8mb4')
+	public function __construct(array $config)
 	{
+		$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()) {
-			$this->_timer = Timer::tick(1000, function () {
-				try {
-					if (env('state', 'start') == 'exit') {
-						Kiri::getDi()->get(Logger::class)->critical('timer end');
-						$this->stopHeartbeatCheck();
-					}
-					if (time() - $this->_last > 10 * 60) {
-						$this->stopHeartbeatCheck();
-						$this->pdo = null;
-					}
-				} catch (\Throwable $throwable) {
-					error($throwable);
-				}
-			});
+		if ($this->_timer === -1) {
+			$this->_timer = Timer::tick(1000, fn() => $this->waite());
+		}
+	}
+
+
+	/**
+	 * @throws Exception
+	 */
+	private function waite(): void
+	{
+		try {
+			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;
 	}