as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

qqq

Browse Source
This commit is contained in:
xl
2023-05-25 16:59:20 +08:00
parent 3016bb54f1
commit 0f1a55462e
12 changed files with 343 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Kiri.php
+2 -3
View File
@@ -6,7 +6,6 @@ error_reporting(0);
use JetBrains\PhpStorm\Pure;
use Kiri\Abstracts\Config;
use Kiri\Di\Container;
use Kiri\Di\LocalService;
use Kiri\Environmental;
@@ -92,7 +91,7 @@ class Kiri
if (Kiri::getPlatform()->isMac()) {
return;
}
$name = '[' . Config::get('id', 'system-service') . ']';
$name = '[' . \config('id', 'system-service') . ']';
if (!empty($prefix)) {
$name .= '.' . $prefix;
}
@@ -107,7 +106,7 @@ class Kiri
public static function getStoragePath(): string
{
$default = APP_PATH . 'storage' . DIRECTORY_SEPARATOR;
$path = Config::get('storage', $default);
$path = \config('storage', $default);
if (!is_dir($path)) {
mkdir($path, 0777, true);
}
composer.json
+1 -1
View File
@@ -9,7 +9,7 @@
],
"license": "MIT",
"require": {
"php": ">=8.0",
"php": ">=8.1",
"ext-json": "*",
"ext-fileinfo": "*",
"ext-pdo": "*",
function.php
+22 -5
View File
@@ -4,7 +4,7 @@ defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../'));
use JetBrains\PhpStorm\Pure;
use Kiri\Abstracts\Config;
use Kiri\Config\ConfigProvider;
use Kiri\Core\ArrayAccess;
use Kiri\Error\StdoutLogger;
use Kiri\Events\EventDispatch;
@@ -16,7 +16,6 @@ use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Log\LoggerInterface;
use Swoole\Process;
if (!function_exists('make')) {
@@ -890,7 +889,7 @@ if (!function_exists('name')) {
return;
}
$name = Config::get('id', 'system') . '[' . $pid . ']';
$name = \config('id', 'system') . '[' . $pid . ']';
if (!empty($prefix)) {
$name .= '.' . $prefix;
}
@@ -934,9 +933,27 @@ if (!function_exists('config')) {
* @param null $default
* @return array|string|null
*/
#[Pure] function config($key, $default = NULL): null|array|string
function config($key, $default = NULL): null|array|string
{
return Config::get($key, $default);
return make(ConfigProvider::class)->get($key, $default);
}
}
if (!function_exists('created')) {
/**
* @param $key
* @param array $construct
* @param array $config
* @return array|string|null
* @throws ReflectionException
*/
function created($key, array $construct = [], array $config = []): null|array|string
{
return Kiri::getDi()->make($key,$construct, $config);
}
}
kiri-engine/Abstracts/BaseApplication.php
+182
View File
@@ -0,0 +1,182 @@
<?php
/**
* Created by PhpStorm.
* User: whwyy
* Date: 2018/10/7 0007
* Time: 2:13
*/
declare(strict_types=1);
namespace Kiri\Abstracts;
use Exception;
use Kiri;
use Kiri\Di\LocalService;
use Kiri\Config\ConfigProvider;
use Kiri\Error\StdoutLogger;
use Kiri\Exception\{InitException};
use Psr\Log\LoggerInterface;
use Kiri\Events\EventProvider;
/**
* Class BaseApplication
* @package Kiri\Base
*/
abstract class BaseApplication extends Component
{
/**
* @var string
*/
public string $storage = APP_PATH . 'storage';
public string $envPath = APP_PATH . '.env';
public LocalService $localService;
/**
* Init constructor.
*
*
* @throws
*/
public function __construct()
{
$this->localService = make(LocalService::class);
/** @var ConfigProvider $config */
$config = instance(ConfigProvider::class, [sweep(APP_PATH . '/config')]);
$this->mapping($config);
$this->parseStorage($config);
$this->parseEvents($config);
parent::__construct();
}
/**
* @param ConfigProvider $config
* @return void
*/
public function mapping(ConfigProvider $config): void
{
$di = Kiri::getDi();
$di->set(LoggerInterface::class, StdoutLogger::class);
foreach ($config->get('mapping', []) as $interface => $class) {
$di->set($interface, $class);
}
foreach ($config->get('components', []) as $id => $component) {
$this->set($id, $component);
}
}
/**
* @param ConfigProvider $config
* @return void
* @throws InitException
*/
public function parseStorage(ConfigProvider $config): void
{
if ($storage = $config->get('storage', 'storage')) {
if (!str_contains($storage, APP_PATH)) {
$storage = APP_PATH . $storage . '/';
}
if (!is_dir($storage)) {
mkdir($storage, 0777, true);
}
if (!is_dir($storage) || !is_writeable($storage)) {
throw new InitException("Directory {$storage} does not have write permission");
}
}
}
/**
* @param ConfigProvider $config
* @return void
* @throws Exception
*/
public function parseEvents(ConfigProvider $config): void
{
$events = $config->get('events', []);
foreach ($events as $key => $value) {
if (is_string($value)) {
$value = Kiri::createObject($value);
}
$this->addEvent($key, $value);
}
}
/**
* @param $key
* @param $value
* @return void
* @throws InitException
* @throws Exception
*/
private function addEvent($key, $value): void
{
$provider = Kiri::getDi()->get(EventProvider::class);
if ($value instanceof \Closure || is_object($value)) {
$provider->on($key, $value, 0);
return;
}
if (!is_array($value)) {
return;
}
if (is_object($value[0]) && !($value[0] instanceof \Closure)) {
$provider->on($key, $value, 0);
return;
} else if (is_string($value[0])) {
$value[0] = Kiri::createObject($value[0]);
$provider->on($key, $value, 0);
return;
}
foreach ($value as $item) {
if (!is_callable($item, true)) {
throw new InitException("Class does not hav callback.");
}
$provider->on($key, $item, 0);
}
}
/**
* @param string $name
* @return mixed|null
* @throws Exception
*/
public function __get(string $name)
{
if ($this->localService->has($name)) {
return $this->localService->get($name);
}
return parent::__get($name); // TODO: Change the autogenerated stub
}
/**
* @param $id
* @param $definition
*/
public function set($id, $definition): void
{
$this->localService->set($id, $definition);
}
/**
* @param $id
* @return bool
*/
public function has($id): bool
{
return $this->localService->has($id);
}
}
kiri-engine/Abstracts/BaseMain.php
-263
View File
@@ -1,263 +0,0 @@
<?php
/**
* Created by PhpStorm.
* User: whwyy
* Date: 2018/10/7 0007
* Time: 2:13
*/
declare(strict_types=1);
namespace Kiri\Abstracts;
use Exception;
use Kiri;
use Kiri\Di\LocalService;
use ReflectionException;
use Kiri\Error\StdoutLogger;
use Kiri\Exception\{InitException};
use Psr\Log\LoggerInterface;
use Kiri\Events\EventProvider;
/**
* Class BaseApplication
* @package Kiri\Base
*/
abstract class BaseMain extends Component
{
/**
* @var string
*/
public string $storage = APP_PATH . 'storage';
public string $envPath = APP_PATH . '.env';
/**
* Init constructor.
*
*
* @throws
*/
public function __construct()
{
$config = sweep(APP_PATH . '/config');
$this->mapping($config['mapping'] ?? [], $config['components']);
$this->parseInt($config);
$this->parseEvents($config);
$this->enableEnvConfig();
parent::__construct();
}
/**
* @param array $mapping
* @param array $components
* @throws ReflectionException
*/
public function mapping(array $mapping, array $components)
{
$di = Kiri::getDi();
$di->set(LoggerInterface::class, StdoutLogger::class);
foreach ($mapping as $interface => $class) {
$di->set($interface, $class);
}
foreach ($components as $id => $component) {
$this->set($id, $component);
}
}
/**
* @return array
*/
public function enableEnvConfig(): array
{
if (!file_exists($this->envPath)) {
return [];
}
$lines = $this->readLinesFromFile($this->envPath);
foreach ($lines as $line) {
if (!$this->isComment($line) && $this->looksLikeSetter($line)) {
[$key, $value] = explode('=', $line);
putenv(trim($key) . '=' . trim($value));
}
}
return $lines;
}
/**
* Read lines from the file, auto detecting line endings.
*
* @param string $filePath
*
* @return array
*/
protected function readLinesFromFile(string $filePath): array
{
// Read file into an array of lines with auto-detected line endings
// $autodetect = ini_get('auto_detect_line_endings');
// ini_set('auto_detect_line_endings', '1');
// ini_set('auto_detect_line_endings', $autodetect);
return file($filePath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
}
/**
* Determine if the line in the file is a comment, e.g. begins with a #.
*
* @param string $line
*
* @return bool
*/
protected function isComment(string $line): bool
{
$line = ltrim($line);
return isset($line[0]) && $line[0] === '#';
}
/**
* Determine if the given line looks like it's setting a variable.
*
* @param string $line
*
* @return bool
*/
protected function looksLikeSetter(string $line): bool
{
return str_contains($line, '=');
}
/**
* @param $config
*
* @throws
*/
public function parseInt($config)
{
Config::sets($config);
if ($storage = Config::get('storage', 'storage')) {
if (!str_contains($storage, APP_PATH)) {
$storage = APP_PATH . $storage . '/';
}
if (!is_dir($storage)) {
mkdir($storage);
}
if (!is_dir($storage) || !is_writeable($storage)) {
throw new InitException("Directory {$storage} does not have write permission");
}
}
}
/**
* @param $config
*
* @throws
*/
public function parseEvents($config)
{
if (!isset($config['events']) || !is_array($config['events'])) {
return;
}
foreach ($config['events'] as $key => $value) {
if (is_string($value)) {
$value = Kiri::createObject($value);
}
$this->addEvent($key, $value);
}
}
/**
* @param $key
* @param $value
* @return void
* @throws InitException
* @throws Exception
*/
private function addEvent($key, $value): void
{
$provider = Kiri::getDi()->get(EventProvider::class);
if ($value instanceof \Closure || is_object($value)) {
$provider->on($key, $value, 0);
return;
}
if (!is_array($value)) {
return;
}
if (is_object($value[0]) && !($value[0] instanceof \Closure)) {
$provider->on($key, $value, 0);
return;
} else if (is_string($value[0])) {
$value[0] = Kiri::createObject($value[0]);
$provider->on($key, $value, 0);
return;
}
foreach ($value as $item) {
if (!is_callable($item, true)) {
throw new InitException("Class does not hav callback.");
}
$provider->on($key, $item, 0);
}
}
/**
* @return mixed
*/
public function getLocalIps(): mixed
{
return swoole_get_local_ip();
}
/**
* @return mixed
*/
public function getFirstLocal(): mixed
{
return current($this->getLocalIps());
}
/**
* @param string $name
* @return mixed|null
* @throws Exception
*/
public function __get(string $name)
{
$localService = Kiri::getDi()->get(LocalService::class);
if ($localService->has($name)) {
return $localService->get($name);
}
return parent::__get($name); // TODO: Change the autogenerated stub
}
/**
* @param $id
* @param $definition
* @throws ReflectionException
*/
public function set($id, $definition): void
{
Kiri::getDi()->get(LocalService::class)->set($id, $definition);
}
/**
* @param $id
* @return bool
* @throws ReflectionException
*/
public function has($id): bool
{
return Kiri::getDi()->get(LocalService::class)->has($id);
}
}
kiri-engine/Abstracts/Component.php
-1
View File
@@ -13,7 +13,6 @@ namespace Kiri\Abstracts;
use Exception;
use JetBrains\PhpStorm\Pure;
use Kiri;
use Kiri\Error\StdoutLoggerInterface;
/**
* Class Component
kiri-engine/Abstracts/Config.php
-142
View File
@@ -1,142 +0,0 @@
<?php
/**
* Created by PhpStorm.
* User: whwyy
* Date: 2018/5/24 0024
* Time: 11:50
*/
declare(strict_types=1);
namespace Kiri\Abstracts;
use Kiri\Exception\ConfigException;
/**
* @param $key
* @param $try
* @return void
* @throws ConfigException
*/
function ConfigTry($key, $try): void
{
if ($try) {
throw new ConfigException(sprintf(Config::ERROR_MESSAGE, $key));
}
}
/**
* Class Config
* @package Kiri\Base
*/
class Config extends Component
{
const ERROR_MESSAGE = 'The not find %s in app configs.';
protected static mixed $data = [];
/**
* @return mixed
*/
public static function getData(): mixed
{
return static::$data;
}
/**
* @param $key
* @param $value
* @return mixed
*/
public static function setData($key, $value): mixed
{
return static::$data[$key] = $value;
}
/**
* @param array $configs
*/
public static function sets(array $configs)
{
if (empty($configs)) {
return;
}
static::$data = $configs;
}
/**
* @param $key
* @param bool $try
* @param mixed $default
* @return mixed
* @throws
*/
public static function get($key, mixed $default = null, bool $try = FALSE): mixed
{
if (!str_contains($key, '.')) {
return static::$data[$key] ?? $default;
}
$array = explode('.', $key);
$data = static::$data[array_shift($array)] ?? null;
if ($data === null) {
return $default;
} else if (count($array) === 0) {
return $data;
} else if (!is_array($data)) {
return $default;
}
foreach ($array as $value) {
$data = $data[$value] ?? null;
if ($data === null) {
ConfigTry($key, $try);
return $default;
}
}
return $data;
}
/**
* @param $key
* @param $value
* @return mixed
*/
public static function set($key, $value): mixed
{
$explode = explode('.', $key);
$parent = &static::$data;
foreach ($explode as $item) {
if (!isset($parent[$item])) {
$parent[$item] = [];
}
$parent = &$parent[$item];
}
$parent = $value;
unset($parent);
return static::$data;
}
/**
* @param $key
* @param bool $must_not_null
* @return bool
*/
public static function has($key, bool $must_not_null = false): bool
{
if (!isset(static::$data[$key])) {
return false;
}
$config = static::$data[$key];
if ($must_not_null === false) {
return true;
}
return !empty($config);
}
}
kiri-engine/Abstracts/Logger.php
+1 -1
View File
@@ -46,7 +46,7 @@ class Logger implements LoggerInterface
public function __construct()
{
$this->levels = Config::get('log.level', Logger::LOGGER_LEVELS);
$this->levels = \config('log.level', Logger::LOGGER_LEVELS);
}
kiri-engine/Main.php → kiri-engine/Application.php
+6 -6
View File
@@ -12,7 +12,7 @@ namespace Kiri;
use Exception;
use Kiri;
use Kiri\Abstracts\{BaseMain, Config, Kernel};
use Kiri\Abstracts\{BaseApplication, Config, Kernel};
use Kiri\Di\LocalService;
use Kiri\Di\Scanner;
use Kiri\Error\ErrorHandler;
@@ -34,7 +34,7 @@ use Symfony\Component\Console\{Application as ConsoleApplication,
*
* @property-read Config $config
*/
class Main extends BaseMain
class Application extends BaseApplication
{
/**
@@ -53,10 +53,10 @@ class Main extends BaseMain
public function init(): void
{
$error = Kiri::getDi()->get(ErrorHandler::class);
$error->registerShutdownHandler(Config::get('error.shutdown', []));
$error->registerExceptionHandler(Config::get('error.exception', []));
$error->registerErrorHandler(Config::get('error.error', []));
$this->id = Config::get('id', uniqid('id.'));
$error->registerShutdownHandler(\config('error.shutdown', []));
$error->registerExceptionHandler(\config('error.exception', []));
$error->registerErrorHandler(\config('error.error', []));
$this->id = \config('id', uniqid('id.'));
}
/**
kiri-engine/Config/ConfigProvider.php
+121
View File
@@ -0,0 +1,121 @@
<?php
namespace Kiri\Config;
use Kiri\Core\HashMap;
class ConfigProvider
{
private HashMap $hashMap;
/**
* @param array $config
*/
public function __construct(array $config)
{
$this->hashMap = new HashMap();
$this->load($config);
$this->enableEnvConfig(APP_PATH . '.env');
}
/**
* @param string $key
* @param int|string|bool|array|null $default
* @return int|string|bool|array|null
*/
public function get(string $key, int|string|bool|null|array $default = null): int|string|bool|null|array
{
$keys = explode($key, '.');
$hashMap = $this->hashMap->get(array_unshift($keys));
if (is_null($hashMap)) {
return $default;
}
if (count($keys) < 1 || !is_array($hashMap)) {
return $hashMap;
}
foreach ($keys as $string) {
if (!isset($hashMap[$string])) {
return $default;
}
$hashMap = $hashMap[$string];
}
return $hashMap;
}
/**
* @param array $config
* @return void
*/
private function load(array $config): void
{
foreach ($config as $key => $value) {
$this->hashMap->put($key, $value);
}
}
/**
* @param $envPath
* @return void
*/
private function enableEnvConfig($envPath): void
{
if (!file_exists($envPath)) {
return;
}
$lines = $this->readLinesFromFile($envPath);
foreach ($lines as $line) {
if (!$this->isComment($line) && $this->looksLikeSetter($line)) {
[$key, $value] = explode('=', $line);
putenv(trim($key) . '=' . trim($value));
}
}
}
/**
* Read lines from the file, auto detecting line endings.
*
* @param string $filePath
*
* @return array
*/
protected function readLinesFromFile(string $filePath): array
{
// Read file into an array of lines with auto-detected line endings
return file($filePath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
}
/**
* Determine if the line in the file is a comment, e.g. begins with a #.
*
* @param string $line
*
* @return bool
*/
protected function isComment(string $line): bool
{
$line = ltrim($line);
return isset($line[0]) && $line[0] === '#';
}
/**
* Determine if the given line looks like it's setting a variable.
*
* @param string $line
*
* @return bool
*/
protected function looksLikeSetter(string $line): bool
{
return str_contains($line, '=');
}
}
kiri-engine/Core/HashMap.php
+7 -6
View File
@@ -61,14 +61,15 @@ class HashMap implements \ArrayAccess, \IteratorAggregate
}
/**
* @param string $key
* @return mixed
*/
#[Pure] public function get(string $key): mixed
/**
* @param string $key
* @param mixed|null $default
* @return mixed
*/
#[Pure] public function get(string $key, mixed $default = null): mixed
{
if (!$this->has($key)) {
return null;
return $default;
}
return $this->lists[$key];
}
kiri-engine/Redis/Redis.php
+1 -2
View File
@@ -12,7 +12,6 @@ namespace Kiri\Redis;
use Exception;
use Kiri;
use Kiri\Abstracts\Component;
use Kiri\Abstracts\Config;
use Kiri\Events\EventProvider;
use Kiri\Di\Inject\Container;
use Kiri\Exception\ConfigException;
@@ -67,7 +66,7 @@ class Redis extends Component
{
$config = $this->get_config();
$length = Config::get('cache.redis.pool.max', 10);
$length = \config('cache.redis.pool.max', 10);
on(OnWorkerExit::class, [$this, 'destroy']);
Kiri::getPool()->initConnections($config['host'], $length, static function () use ($config) {
$redis = new \Redis();