eee

.gitignore

@@ -34,3 +34,4 @@ runtime/
 oot
 d
 composer.lock
+.gstack/

Kiri.php

@@ -37,13 +37,6 @@ class Kiri
     }
 
 
-    /**
-     * @return Container|null
-     */
-    public static function getContainerContext(): ?Container
-    {
-        return static::getContainer();
-    }
 
 
     /**
@@ -131,17 +124,6 @@ class Kiri
     }
 
 
-    /**
-     * @return bool
-     */
-    public static function isDocker(): bool
-    {
-        $output = shell_exec('[ -f /.dockerenv ] && echo yes || echo no');
-        if (trim($output) === 'yes') {
-            return true;
-        }
-        return false;
-    }
 
 
     /**
@@ -177,54 +159,6 @@ class Kiri
     }
 
 
-    /**
-     * @return mixed
-     */
-    public static function localhost(): mixed
-    {
-        return current(swoole_get_local_ip());
-    }
-
-
-    /**
-     * @param array $v1
-     * @param array $v2
-     * @return float
-     */
-    #[Pure] public static function distance(array $v1, array $v2): float
-    {
-        $maxX = max($v1['x'], $v2['x']);
-        $minX = min($v1['x'], $v2['x']);
-
-        $maxZ = max($v1['z'], $v2['z']);
-        $minZ = min($v1['z'], $v2['z']);
-
-        $dx = abs($maxX - $minX);
-        $dy = abs($maxZ - $minZ);
-
-        $sqrt = sqrt($dx * $dx + $dy * $dy);
-        if ($sqrt < 0) {
-            $sqrt = abs($sqrt);
-        }
-        return (float)$sqrt;
-    }
-
-
-    /**
-     * @param $tmp_name
-     * @return string
-     */
-    public static function rename($tmp_name): string
-    {
-        $hash = md5_file($tmp_name);
-
-        $later = '.' . exif_imagetype($tmp_name);
-
-        $match = '/(\w{12})(\w{5})(\w{9})(\w{6})/';
-        $tmp   = preg_replace($match, '$1-$2-$3-$4', $hash);
-
-        return strtoupper($tmp) . $later;
-    }
 
 
     /**

composer.json

@@ -9,7 +9,7 @@
   ],
   "license": "MIT",
   "require": {
-    "php": ">=8.4",
+    "php": ">=8.5",
     "ext-json": "*",
     "ext-fileinfo": "*",
     "ext-pdo": "*",
@@ -23,7 +23,7 @@
     "ext-openssl": "*",
     "ext-swoole": "*",
     "ext-msgpack": "*",
-    "symfony/console": "^v8.0",
+    "symfony/console": "^v8.1.1",
     "psr/log": "1.*",
     "composer-runtime-api": "^2.0",
     "psr/http-server-middleware": "^1.0.2",
@@ -32,17 +32,12 @@
     "nikic/php-parser": "^v5.5.0",
     "ext-inotify": "*",
     "game-worker/kiri-pool": "^v1.0",
-    "psr/container": "^2.0",
-    "swiftmailer/swiftmailer": "^v6.3.0"
+    "psr/container": "^2.0"
   },
   "replace": {
     "symfony/polyfill-apcu": "*",
-    "symfony/polyfill-php80": "*",
     "symfony/polyfill-mbstring": "*",
-    "symfony/polyfill-ctype": "*",
-    "symfony/polyfill-php73": "*",
-    "symfony/polyfill-php72": "*",
-    "symfony/polyfill-php81": "*"
+    "symfony/polyfill-ctype": "*"
   },
   "autoload": {
     "psr-4": {

function.php

@@ -166,8 +166,7 @@ if (!function_exists('isJson')) {
 	{
 		if (is_null($string))
 			return false;
-		return (str_starts_with($string, '{') && str_ends_with($string, '}'))
-			   || (str_ends_with($string, '[') && str_starts_with($string, ']'));
+		return (str_starts_with($string, '{') && str_ends_with($string, '}')) || (str_ends_with($string, '[') && str_starts_with($string, ']'));
 	}
 
 }
@@ -1029,9 +1028,7 @@ if (!function_exists('json_log')) {
 		];
 		$param['data']      = $data;
 
-		file_put_contents(storage('exception-' . date('Y-m-d') . '.log','exception'),
-						  json_encode($param, JSON_UNESCAPED_UNICODE),
-						  FILE_APPEND);
+		file_put_contents(storage('exception-' . date('Y-m-d') . '.log', 'exception'), json_encode($param, JSON_UNESCAPED_UNICODE) . PHP_EOL, FILE_APPEND);
 	}
 }
 

kiri-engine/Abstracts/BaseApplication.php

@@ -46,13 +46,21 @@ abstract class BaseApplication extends LocalService
     public function __construct(public EventProvider $provider, public ConfigProvider $config, public ContainerInterface $container)
     {
         $this->mapping($config);
-        $this->parseStorage($config);
-        $this->parseEvents($config);
-
         parent::__construct();
     }
 
 
+    /**
+     * @return void
+     * @throws
+     */
+    public function init(): void
+    {
+        $this->parseStorage($this->config);
+        $this->parseEvents($this->config);
+    }
+
+
     /**
      * @param ConfigProvider $config
      * @return void

kiri-engine/Abstracts/Component.php

@@ -1,15 +1,8 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/3/30 0030
- * Time: 14:28
- */
 declare(strict_types=1);
 
 namespace Kiri\Abstracts;
 
-
 use Exception;
 use JetBrains\PhpStorm\Pure;
 use Kiri;
@@ -18,44 +11,23 @@ use Kiri\Events\EventDispatch;
 use Kiri\Events\EventProvider;
 use Psr\Container\ContainerInterface;
 
-/**
- * Class Component
- * @package Kiri\Base
- * @property ContainerInterface $container
- * @property EventDispatch $dispatch
- * @property EventProvider $provider
- */
-class Component implements Configure
+class Component
 {
 
-
-    /**
-     * BaseAbstract constructor.
-     */
 	public function __construct()
 	{
 	}
 
-
-    /**
-     * @return void
-     */
 	public function init(): void
 	{
 	}
 
-
-    /**
-     * @return string
-     */
 	#[Pure] public static function className(): string
 	{
 		return static::class;
 	}
 
-
 	/**
-     * @return StdoutLogger
 	 * @throws
 	 */
 	public function getLogger(): StdoutLogger
@@ -63,10 +35,22 @@ class Component implements Configure
 		return Kiri::getLogger();
 	}
 
+	public function getDispatch(): EventDispatch
+	{
+		return Kiri::getDi()->get(EventDispatch::class);
+	}
+
+	public function getProvider(): EventProvider
+	{
+		return Kiri::getDi()->get(EventProvider::class);
+	}
+
+	public function getContainer(): ContainerInterface
+	{
+		return Kiri::getDi();
+	}
 
 	/**
-     * @param string $name
-     * @return mixed
 	 * @throws
 	 */
 	public function __get(string $name)
@@ -74,56 +58,8 @@ class Component implements Configure
 		$method = 'get' . ucfirst($name);
 		if (method_exists($this, $method)) {
 			return $this->{$method}();
-        } else if (method_exists($this, $name)) {
-            return $this->{$name};
-        } else {
+		}
 		throw new Exception('Unable getting property ' . get_called_class() . '::' . $name);
 	}
-    }
 
-
-    /**
-     * @param string $name
-     * @param $value
-     * @return void
-     * @throws
-     */
-    public function __set(string $name, $value): void
-    {
-        $method = 'set' . ucfirst($name);
-        if (method_exists($this, $method)) {
-            $this->{$method}($value);
-        } else if (method_exists($this, $name)) {
-            $this->{$name} = $value;
-        } else {
-            throw new Exception('Unable setting property ' . get_called_class() . '::' . $name);
-        }
-    }
-
-
-    /**
-     * @return EventDispatch
-     */
-    public function getDispatch(): EventDispatch
-    {
-        return Kiri::getDi()->get(EventDispatch::class);
-    }
-
-
-    /**
-     * @return EventProvider
-     */
-    public function getProvider(): EventProvider
-    {
-        return Kiri::getDi()->get(EventProvider::class);
-    }
-
-
-    /**
-     * @return ContainerInterface
-     */
-    public function getContainer(): ContainerInterface
-    {
-        return Kiri::getDi();
-    }
 }

kiri-engine/Abstracts/Configure.php

@@ -1,18 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/3/30 0030
- * Time: 14:11
- */
-declare(strict_types=1);
-namespace Kiri\Abstracts;
-
-/**
- * Interface Configure
- * @package Kiri\Base
- */
-interface Configure
-{
-	
-}

kiri-engine/Abstracts/CoordinatorManager.php

@@ -7,9 +7,7 @@ use Kiri\Coordinator;
 class CoordinatorManager
 {
 
-
-
-	private static array $_waite = [];
+	private static array $_items = [];
 
 
 	/**
@@ -18,10 +16,10 @@ class CoordinatorManager
 	 */
 	public static function utility(string $category): Coordinator
 	{
-		if (!((static::$_waite[$category] ?? null) instanceof Coordinator)) {
-			static::$_waite[$category] = new Coordinator();
+		if (!((static::$_items[$category] ?? null) instanceof Coordinator)) {
+			static::$_items[$category] = new Coordinator();
 		}
-		return static::$_waite[$category];
+		return static::$_items[$category];
 	}
 
 }

kiri-engine/Application.php

@@ -57,9 +57,12 @@ class Application extends BaseApplication
         $this->errorHandler->registerShutdownHandler(config('site.error.shutdown', []));
         $this->errorHandler->registerExceptionHandler(config('site.error.exception', []));
         $this->errorHandler->registerErrorHandler(config('site.error.error', []));
+
         $this->id = config('site.id', uniqid('id.'));
 
         $this->provider->on(OnBeforeCommandExecute::class, [$this, 'beforeCommandExecute']);
+
+        parent::init();
     }
 
 

kiri-engine/Coordinator.php

@@ -1,15 +1,19 @@
 <?php
 declare(strict_types=1);
 
-
 namespace Kiri;
 
+use Swoole\Coroutine;
+use Swoole\Coroutine\Channel;
+
 class Coordinator
 {
 
 	const string WORKER_START = 'worker:start';
 
-	private bool $waite = true;
+	private bool $wait = false;
+
+	private ?Channel $channel = null;
 
 
 	/**
@@ -17,7 +21,17 @@ class Coordinator
 	 */
 	public function yield(): void
 	{
-		while ($this->waite) {
+		if (Coroutine::getCid() > 0) {
+			if ($this->channel instanceof Channel) {
+				$this->channel->pop();
+			}
+			return;
+		}
+
+		if ($this->wait === false) {
+			return;
+		}
+		while ($this->wait === true) {
 			usleep(1000);
 		}
 	}
@@ -26,9 +40,9 @@ class Coordinator
 	/**
 	 * @return void
 	 */
-	public function waite(): void
+	public function wait(): void
 	{
-		$this->waite = true;
+		Coroutine::getCid() > 0 ? $this->channel = new Channel(1) : $this->wait = true;
 	}
 
 
@@ -37,8 +51,13 @@ class Coordinator
 	 */
 	public function done(): void
 	{
-		$this->waite = false;
+		if (Coroutine::getCid() > 0) {
+			$this->channel?->push(true);
+			$this->channel->close();
+			$this->channel = null;
+		} else {
+			$this->wait = false;
+		}
 	}
 
-
 }

kiri-engine/Environmental.php

@@ -22,14 +22,9 @@ class Environmental
 	 */
 	public function isMac(): bool
 	{
-		$output = strtolower(PHP_OS | PHP_OS_FAMILY);
-		if (str_contains('mac', $output)) {
-			return true;
-		} else if (str_contains('darwin', $output)) {
-			return true;
-		} else {
-			return false;
-		}
+		$os = strtolower(PHP_OS);
+
+		return str_contains($os, 'mac') || str_contains($os, 'darwin');
 	}
 
 
@@ -38,11 +33,7 @@ class Environmental
 	 */
 	#[Pure] public function isLinux(): bool
 	{
-		if (!static::isMac()) {
-			return true;
-		} else {
-			return false;
-		}
+		return PHP_OS_FAMILY === 'Linux' || strtolower(PHP_OS) === 'linux';
 	}
 
 }

kiri-engine/NoSql/MongoDB.php

@@ -106,7 +106,8 @@ class MongoDB
 
 
     /**
-     * 代理方法调用到 MongoDB Client
+     * 代理方法调用到 MongoDB Client，内置连接健康检查和回收
+     * 异常时关闭连接并回退计数器，防止断连对象污染连接池
      * @param $name
      * @param $arguments
      * @return mixed
@@ -124,18 +125,50 @@ class MongoDB
             // 如果方法存在于 Database，通过默认数据库调用
             $database = $this->getDatabase();
             if (method_exists($database, $name)) {
-                return $database->{$name}(...$arguments);
+                $result = $database->{$name}(...$arguments);
+				$this->returnClient($client);
+                return $result;
             }
             
             throw new \BadMethodCallException("Method {$name} does not exist on MongoDB Client or Database.");
         } catch (\Throwable $throwable) {
 			\Kiri::getLogger()->json_log($throwable);
 
+			$this->closeClient($client);
+
 			return false;
-        } finally {
-            // MongoDB 连接是持久的，不需要释放
-            $this->pool()->push($this->getName(), $client);
         }
+		$this->returnClient($client);
+    }
+
+
+	/**
+	 * 归还连接
+	 * @param Client $client
+	 * @return void
+	 */
+	private function returnClient(Client $client): void
+	{
+		try {
+			$this->pool()->push($this->getName(), $client);
+		} catch (\Throwable) {
+			$this->closeClient($client);
+		}
+	}
+
+
+	/**
+	 * 关闭连接并回退计数器
+	 * @param Client $client
+	 * @return void
+	 */
+	private function closeClient(Client $client): void
+	{
+		try {
+			$client->close();
+		} catch (\Throwable) {
+		}
+		$this->pool()->abandon($this->getName());
 	}
 
 
@@ -382,4 +415,3 @@ class MongoDB
         ], $this->options);
     }
 }
-

kiri-engine/NoSql/Redis.php

@@ -136,6 +136,8 @@ class Redis
 
 
     /**
+     * 代理 Redis 方法调用，内置健康检查和连接回收
+     * 如果连接 ping 失败则关闭连接并移除，不归还池中防止污染
      * @param $name
      * @param $arguments
      * @return mixed
@@ -151,6 +153,9 @@ class Redis
         } finally {
             if ($client->ping('h') == 'h') {
                 $this->pool()->push($this->getName(), $client);
+            } else {
+				$client->close();
+				$this->pool()->abandon($this->getName());
             }
         }
     }

socket.html

@@ -67,7 +67,7 @@
     }
 
     function connect() {
-        sock = new WebSocket('wss://center-wss.stupideyes.com/ws?access_token=a8exu0la-77ecu-ijhk-inkgt6vln-rlwwuk');
+        sock = new WebSocket('ws://121.40.147.153:6611/sockets/?auth=dG9rZW49NjYxNTBhMWQwYS0wMWItMDMxYS0wZTRjNTJiNGEtMjkzMTI5JnRpbWU9MTc4MjEyODcwMCZyZWZyZXNoPTJzMTdyR1BMWDRuWElKWExycTdNU1pQNEsyUXQwQ1pId1RsWUM5dzZJTmpLU1dvOThocW5KR0tQVFNCU2E2QTllNWRMTm9DYkRBaVhVQVd1cUU3Q1B5ejZLMTVzamdaTlpJWHhXNVlKeWQ2ODBaTkhZdktHUnd5RklKT1NZTEVBMURSb3JrbTUwRVUrTmpNMjJJL0lsMmpPT3p2MzFFNFZ4WkZwb1pXSmZVV015Q1VZenFtYTg4MDRHZ0Z3anZobDlYdWFkakR3QmhmZFd4QloxSC9HWndDRHdVQjN3elFrL01wUWFOSTB2YTlqZjZzQTRESFI2VlJtYWpxYWFHdkVNV3BGOXllbGVrTXFhcUhyT0tkdUpZRXVpSzEzZkNoRUljblFqdUVzWjdGUDBYVGlkNTUybUlyQnlYQjc0YktxQVRNbklvZlFQcnl3aEVUNGRSZVhhdz09');
         // sock = new WebSocket('wss://meet-bottle.zhuangb123.com/socket/?auth=dG9rZW49M2I2ODJhNzg0NS0xMTktMzBiMS1mMDkxOGRhNjktNTg2ZDEyJnRpbWU9MTc1MzA4MTI5MyZyZWZyZXNoPXBDT0VFYk9KOG8xTEVZQytyUkR4VlZIaXR1TmVWcndCY2crRTBua2U1ZkJuUWNJaHl6NUtTV0x2ZExXa1Y5aXlyK3NmRnRwOVRCVU91MnhPSVRPRjROTjhoT0hlODNNVmZjN1NXb2QyeDY0TXEvZTFEUCtySjNzNjZhVlplcXdYV0QzV2VRd0V6YkowZ29oOFFqRHVvZGcyb281OEZkZVp5TjVIcHFyejRZQ0VMbkxydXlCUmpFdjNTWnRsQ3gxMWthNDNxbEwzM1lJYVlaV2t3dEhOMm9VaXllNFpKOHFnU1FueEZ4N0c4RDhabzBhajFFeEJIZTlJUFQ0VUo3UkR0V0g2Y3A3bkY3bXlkVHB4Wnp5NG1kRlgxa3M5eC9iVlJHaVFDRnU4VEFsUVdDdHEzbmJ1TnNYZVd3Q2dXWEd1OEUzMld3THVFRzRCZFRCanA2MGtYUT09');
         sock.onopen = function (data) {
             if (tick) {