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

改名

Browse Source
This commit is contained in:
Mr·x
2021-02-25 14:33:34 +08:00
parent e65caae5a4
commit 8539971ca0
2 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Events/OnRequest.php
+2 -3
View File
@@ -38,11 +38,10 @@ class OnRequest extends Callback
{ {
try { try {
Coroutine::defer(function () use ($request) { Coroutine::defer(function () use ($request) {
write(Json::encode(get_object_vars($request)), 'request');
fire(Event::SYSTEM_RESOURCE_RELEASES); fire(Event::SYSTEM_RESOURCE_RELEASES);
}); });
[$req, $rep] = static::create($request, $response); [$request, $response] = static::create($request, $response);
if ($req->is('favicon.ico')) { if ($request->is('favicon.ico')) {
return \send(null, 404); return \send(null, 404);
} }
return \router()->dispatch(); return \router()->dispatch();
HttpServer/Http/Context.php
+26 -26
View File
@@ -13,9 +13,8 @@ use Swoole\Coroutine;
class Context extends BaseContext class Context extends BaseContext
{ {
protected static array $_requests = []; protected static array $_contents = [];
protected static array $_response = [];
/** /**
@@ -37,18 +36,19 @@ class Context extends BaseContext
* @param $id * @param $id
* @param $context * @param $context
* @param null $key * @param null $key
* @return mixed * @return array
*/ */
private static function setStatic($id, $context, $key = null): mixed private static function setStatic($id, $context, $key = null): array
{ {
if (empty($key)) { if (empty($key)) {
return static::$_requests[$id] = $context; return static::$_contents[$id] = $context;
} }
if (!is_array(static::$_requests[$id])) { if (!is_array(static::$_contents[$id])) {
return static::$_requests[$id] = [$key => $context]; static::$_contents[$id] = [$key => $context];
} else { } else {
return static::$_requests[$id][$key] = $context; static::$_contents[$id][$key] = $context;
} }
return $context;
} }
/** /**
@@ -60,12 +60,12 @@ class Context extends BaseContext
private static function setCoroutine($id, $context, $key = null): mixed private static function setCoroutine($id, $context, $key = null): mixed
{ {
if (empty($key)) { if (empty($key)) {
return Coroutine::getContext()[$id] = $context; return Coroutine::getContext(Coroutine::getPcid())[$id] = $context;
} }
if (!is_array(Coroutine::getContext()[$id])) { if (!is_array(Coroutine::getContext(Coroutine::getPcid())[$id])) {
Coroutine::getContext()[$id] = [$key => $context]; Coroutine::getContext(Coroutine::getPcid())[$id] = [$key => $context];
} else { } else {
Coroutine::getContext()[$id][$key] = $context; Coroutine::getContext(Coroutine::getPcid())[$id][$key] = $context;
} }
return $context; return $context;
} }
@@ -81,10 +81,10 @@ class Context extends BaseContext
if (!static::inCoroutine()) { if (!static::inCoroutine()) {
return false; return false;
} }
if (!isset(Coroutine::getContext()[$id][$key])) { if (!isset(Coroutine::getContext(Coroutine::getPcid())[$id][$key])) {
return false; return false;
} }
return Coroutine::getContext()[$id][$key] += $value; return Coroutine::getContext(Coroutine::getPcid())[$id][$key] += $value;
} }
/** /**
@@ -98,10 +98,10 @@ class Context extends BaseContext
if (!static::inCoroutine() || !static::hasContext($id)) { if (!static::inCoroutine() || !static::hasContext($id)) {
return false; return false;
} }
if (!isset(Coroutine::getContext()[$id][$key])) { if (!isset(Coroutine::getContext(Coroutine::getPcid())[$id][$key])) {
return false; return false;
} }
return Coroutine::getContext()[$id][$key] -= $value; return Coroutine::getContext(Coroutine::getPcid())[$id][$key] -= $value;
} }
/** /**
@@ -129,7 +129,7 @@ class Context extends BaseContext
*/ */
private static function loadByContext($id, $key = null): mixed private static function loadByContext($id, $key = null): mixed
{ {
$data = Coroutine::getContext()[$id] ?? null; $data = Coroutine::getContext(Coroutine::getPcid())[$id] ?? null;
if ($data === null) { if ($data === null) {
return null; return null;
} }
@@ -147,7 +147,7 @@ class Context extends BaseContext
*/ */
private static function loadByStatic($id, $key = null): mixed private static function loadByStatic($id, $key = null): mixed
{ {
$data = static::$_requests[$id] ?? null; $data = static::$_contents[$id] ?? null;
if ($data === null) { if ($data === null) {
return null; return null;
} }
@@ -166,7 +166,7 @@ class Context extends BaseContext
if (static::inCoroutine()) { if (static::inCoroutine()) {
return Coroutine::getContext() ?? []; return Coroutine::getContext() ?? [];
} else { } else {
return static::$_requests ?? []; return static::$_contents ?? [];
} }
} }
@@ -180,13 +180,13 @@ class Context extends BaseContext
return; return;
} }
if (static::inCoroutine()) { if (static::inCoroutine()) {
unset(static::$_requests[$id]); unset(static::$_contents[$id]);
return; return;
} }
if (!empty($key)) { if (!empty($key)) {
unset(Coroutine::getContext()[$id][$key]); unset(Coroutine::getContext(Coroutine::getPcid())[$id][$key]);
} else { } else {
unset(Coroutine::getContext()[$id]); unset(Coroutine::getContext(Coroutine::getPcid())[$id]);
} }
} }
@@ -212,10 +212,10 @@ class Context extends BaseContext
*/ */
private static function searchByStatic($id, $key = null): bool private static function searchByStatic($id, $key = null): bool
{ {
if (!isset(static::$_requests[$id])) { if (!isset(static::$_contents[$id])) {
return false; return false;
} }
if (!empty($key) && !isset(static::$_requests[$id][$key])) { if (!empty($key) && !isset(static::$_contents[$id][$key])) {
return false; return false;
} }
return true; return true;
@@ -229,11 +229,11 @@ class Context extends BaseContext
*/ */
private static function searchByCoroutine($id, $key = null): bool private static function searchByCoroutine($id, $key = null): bool
{ {
if (!isset(Coroutine::getContext()[$id])) { if (!isset(Coroutine::getContext(Coroutine::getPcid())[$id])) {
return false; return false;
} }
if ($key !== null) { if ($key !== null) {
return isset((Coroutine::getContext()[$id] ?? [])[$key]); return isset((Coroutine::getContext(Coroutine::getPcid())[$id] ?? [])[$key]);
} }
return true; return true;
} }