eee

This reverts commit fdf58326

.phpstorm.meta.php

@@ -3,7 +3,7 @@
 namespace PHPSTORM_META {
 
     // Reflect
-	use Http\Context\Context;
+	use Kiri\Message\Context\Context;
 	use Kiri\Di\Container;
 
 	override(Container::get(0), map('@'));
@@ -12,6 +12,6 @@ namespace PHPSTORM_META {
 //    override(\make(0), map('@'));
     override(\di(0), map('@'));
     override(\duplicate(0), map('@'));
-    override(Context::getContext(0), map('@'));
+    override(Context::get(0), map('@'));
 
 }

EventDispatch.php

@@ -0,0 +1,55 @@
+<?php
+declare(strict_types=1);
+
+namespace Kiri\Events;
+
+use Kiri\Abstracts\Component;
+use Psr\EventDispatcher\EventDispatcherInterface;
+use Psr\EventDispatcher\StoppableEventInterface;
+use SplPriorityQueue;
+
+
+/**
+ *
+ */
+class EventDispatch extends Component implements EventDispatcherInterface
+{
+
+
+	/**
+	 * @param object $event
+	 * @return object
+     */
+	public function dispatch(object $event): object
+	{
+		$lists = make(EventProvider::class)->getListenersForEvent($event);
+
+		return $this->execute($lists, $event);
+	}
+
+
+    /**
+     * @param SplPriorityQueue $lists
+     * @param object $event
+     * @return object
+     */
+	public function execute(SplPriorityQueue $lists, object $event): object
+	{
+		if ($lists->isEmpty()) {
+			return $event;
+		}
+        foreach ($lists as $item)  {
+            try {
+                call_user_func($item, $event);
+            } catch (\Throwable $exception) {
+				\Kiri::getLogger()->json_log($exception);
+            }
+            if ($event instanceof StoppableEventInterface && $event->isPropagationStopped()) {
+                break;
+            }
+        }
+		return $event;
+	}
+
+
+}

EventInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Kiri\Events;
+
+interface EventInterface
+{
+	
+	/**
+	 * @param object $event
+	 * @return void
+	 */
+    public function process(object $event): void;
+
+}

EventListener.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Kiri\Events;
+
+
+use Exception;
+use Kiri\Di\Interface\InjectTargetInterface;
+
+#[\Attribute]
+readonly class EventListener implements InjectTargetInterface
+{
+
+
+    /**
+     * @param string $event
+     * @throws Exception
+     */
+    public function __construct(public string $event)
+    {
+    }
+
+
+    /**
+     * @param string $class
+     * @return void
+     * @throws Exception
+     */
+    public function dispatch(string $class): void
+    {
+        // TODO: Implement dispatch() method.
+        $target = \Kiri::getDi()->getReflectionClass($class)->newInstanceWithoutConstructor();
+		
+		if (!($target instanceof EventInterface)) {
+            throw new Exception("Event listen must implement " . EventInterface::class);
+        }
+        on($this->event, [$target, "process"]);
+    }
+
+}

EventProvider.php

@@ -0,0 +1,67 @@
+<?php
+declare(strict_types=1);
+
+namespace Kiri\Events;
+
+
+use Closure;
+use Psr\EventDispatcher\ListenerProviderInterface;
+use SplPriorityQueue;
+
+/**
+ *
+ */
+class EventProvider implements ListenerProviderInterface
+{
+
+    /** @var Struct[] */
+    private array $_listeners = [];
+
+
+    /**
+     * @param object $event
+     * @return SplPriorityQueue
+     */
+    public function getListenersForEvent(object $event): SplPriorityQueue
+    {
+        $queue = new SplPriorityQueue();
+        $queue->setExtractFlags(SplPriorityQueue::EXTR_DATA);
+        // TODO: Implement getListenersForEvent() method.
+        foreach ($this->_listeners[get_class($event)] ?? [] as $listener) {
+            $queue->insert($listener->listener, $listener->priority);
+        }
+        return $queue;
+    }
+
+
+    /**
+     * @param string $event
+     * @param array|Closure|string $handler
+     * @param int $zOrder
+     * @throws
+     */
+    public function on(string $event, array|Closure|string $handler, int $zOrder = 1): void
+    {
+        if (is_string($handler) && !is_callable($handler, true)) {
+            throw new \Exception('Event handler must is execute function.');
+        }
+        $this->_listeners[$event][] = new Struct($event, $handler, $zOrder);
+    }
+
+
+    /**
+     * @param string $event
+     * @param callable $handler
+     * @return void
+     */
+    public function off(string $event, callable $handler): void
+    {
+        $events = $this->_listeners[$event] ?? [];
+
+        $this->_listeners[$event] = array_filter($events, function ($value) use ($handler) {
+            return $value->listener !== $handler;
+        });
+    }
+
+
+}

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Struct.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Kiri\Events;
+
+/**
+ *
+ */
+class Struct
+{
+
+	public string $event;
+
+	public array|\Closure|string $listener;
+
+	public int $priority;
+
+
+    /**
+     * @param string $event
+     * @param array|\Closure|string $listener
+     * @param int $priority
+     */
+	public function __construct(string $event, array|\Closure|string $listener, int $priority)
+	{
+		$this->event = $event;
+		$this->listener = $listener;
+		$this->priority = $priority;
+	}
+}

TestListener.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Kiri\Events;
+
+class TestListener implements EventInterface
+{
+	
+	
+	/**
+	 * @param object $event
+	 * @return void
+	 */
+    public function process(object $event): void
+    {
+        // TODO: Implement process() method.
+    }
+
+}

composer.json

@@ -9,16 +9,14 @@
   ],
   "license": "MIT",
   "require": {
-    "php": ">=8.0",
-    "ext-json": "*",
+    "php": ">=8.5",
     "psr/event-dispatcher": "^1.0"
   },
   "autoload": {
     "psr-4": {
-      "Kiri\\Events\\": "src/"
+      "Kiri\\Events\\": "./"
      }
   },
   "require-dev": {
-    "kwn/php-rdkafka-stubs": "^2.0"
   }
 }

src/EventDispatch.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace Kiri\Events;
-
-use Annotation\Inject;
-use Kiri\Abstracts\BaseObject;
-use Psr\EventDispatcher\EventDispatcherInterface;
-use Psr\EventDispatcher\StoppableEventInterface;
-
-
-/**
- *
- */
-class EventDispatch extends BaseObject implements EventDispatcherInterface
-{
-
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
-
-	/**
-	 * @param object $event
-	 * @return object
-	 */
-	public function dispatch(object $event): object
-	{
-		$lists = $this->eventProvider->getListenersForEvent($event);
-		foreach ($lists as $listener) {
-			/** @var Struct $list */
-			$listener($event);
-			if ($event instanceof StoppableEventInterface && $event->isPropagationStopped()) {
-				break;
-			}
-		}
-		return $event;
-	}
-
-
-}

src/EventProvider.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace Kiri\Events;
-
-
-use Psr\EventDispatcher\ListenerProviderInterface;
-
-/**
- *
- */
-class EventProvider implements ListenerProviderInterface
-{
-
-	/** @var Struct[] */
-	private array $_listeners = [];
-
-
-	/**
-	 * @param object $event
-	 * @return iterable
-	 */
-	public function getListenersForEvent(object $event): iterable
-	{
-		$queue = new \SplPriorityQueue();
-		// TODO: Implement getListenersForEvent() method.
-		foreach ($this->_listeners[get_class($event)] ?? [] as $listener) {
-			$queue->insert($listener->listener, $listener->priority);
-		}
-		return $queue;
-	}
-
-
-	/**
-	 * @param string $event
-	 * @param callable $handler
-	 * @param int $zOrder
-	 */
-	public function on(string $event, callable $handler, int $zOrder = 1)
-	{
-		$this->_listeners[$event][] = new Struct($event, $handler, $zOrder);
-	}
-
-
-}

src/Struct.php

@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Kiri\Events;
-
-/**
- *
- */
-class Struct
-{
-
-	public string $event;
-
-	public array|\Closure $listener;
-
-	public int $priority;
-
-	public function __construct(string $event, callable $listener, int $priority)
-	{
-		$this->event = $event;
-		$this->listener = $listener;
-		$this->priority = $priority;
-	}
-}