Added Proxy procedure (#47)

src/Guide.php

@@ -94,14 +94,17 @@ public function makeResponse($result = null, Request $request = null): Response
     }
 
     /**
+     * Search for a procedure and execute it.
+     *
      * @param Request $request
      * @param bool    $notification
      *
      * @return Response
      */
     public function handleProcedure(Request $request, bool $notification): Response
     {
-        \request()->replace($request->getParams()->toArray());
+        request()->replace($request->getParams()->toArray());
+        app()->bind(Request::class, fn () => $request);
 
         $procedure = $this->findProcedure($request);
 
@@ -117,6 +120,8 @@ public function handleProcedure(Request $request, bool $notification): Response
     }
 
     /**
+     * Find procedure by request.
+     *
      * @param Request $request
      *
      * @return null|string
@@ -128,9 +133,25 @@ public function findProcedure(Request $request): ?string
 
         return $this->map
             ->filter(fn (string $procedure) => $this->getProcedureName($procedure) === $class)
-            ->filter(fn (string $procedure) => method_exists($procedure, $method))
             ->filter(fn (string $procedure) => $this->checkExistPublicMethod($procedure, $method))
             ->map(fn (string $procedure) => Str::finish($procedure, self::DEFAULT_DELIMITER.$method))
+            ->whenEmpty(fn (Collection $collection) => $collection->push($this->findProxy($class)))
+            ->first();
+    }
+
+    /**
+     * Fallback to the first procedure that implements the Proxy interface.
+     *
+     * @param string $class
+     *
+     * @return null|string
+     */
+    public function findProxy(string $class): ?string
+    {
+        return $this->map
+            ->filter(fn (string $procedure) => $this->getProcedureName($procedure) === $class)
+            ->filter(fn (string $procedure) => is_subclass_of($procedure, Proxy::class))
+            ->map(fn (string $procedure) => Str::finish($procedure, self::DEFAULT_DELIMITER.'__invoke'))
             ->first();
     }
 
@@ -142,7 +163,7 @@ public function findProcedure(Request $request): ?string
      */
     private function checkExistPublicMethod(string $procedure, string $method): bool
     {
-        return (new ReflectionMethod($procedure, $method))->isPublic();
+        return method_exists($procedure, $method) && (new ReflectionMethod($procedure, $method))->isPublic();
     }
 
     /**

src/Proxy.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sajya\Server;
+
+use Sajya\Server\Http\Request;
+
+interface Proxy
+{
+    /**
+     * The method used by request handlers.
+     *
+     * @param \Sajya\Server\Http\Request $request
+     *
+     * @return mixed
+     */
+    public function __invoke(Request $request): mixed;
+}

tests/Expected/Requests/testFindMethod.json

@@ -0,0 +1,5 @@
+{
+    "jsonrpc": "2.0",
+    "method": "foobar",
+    "id": "1"
+}

tests/Expected/Requests/testFindProcedure.json

@@ -1,5 +1,5 @@
 {
     "jsonrpc": "2.0",
-    "method": "foobar",
+    "method": "fixture@foobar",
     "id": "1"
 }

tests/Expected/Requests/testProxyMethod.json

@@ -0,0 +1,13 @@
+{
+    "jsonrpc": "2.0",
+    "method": "proxy@any",
+    "params": {
+        "firstname": "Vere",
+        "lastname": "Bonilla",
+        "city": "Padang",
+        "country": "Jordan",
+        "countryCode": "BE",
+        "group": "default"
+    },
+    "id": "1"
+}

tests/Expected/Responses/testBindDeepValue.json

@@ -1,5 +1,5 @@
 {
     "id": "1",
-    "result": "Alexandr",
+    "result": "binding@deepValue Alexandr",
     "jsonrpc": "2.0"
 }

tests/Expected/Responses/testFindMethod.json

@@ -0,0 +1,9 @@
+{
+    "jsonrpc": "2.0",
+    "error": {
+        "code": -32601,
+        "message": "Method not found",
+        "data": null
+    },
+    "id": "1"
+}

tests/Expected/Responses/testProxyMethod.json

@@ -0,0 +1,12 @@
+{
+    "id": "1",
+    "result": {
+        "firstname": "Vere",
+        "lastname": "Bonilla",
+        "city": "Padang",
+        "country": "Jordan",
+        "countryCode": "BE",
+        "group": "default"
+    },
+    "jsonrpc": "2.0"
+}

tests/FixtureBindProcedure.php

@@ -25,7 +25,7 @@ class FixtureBindProcedure extends Procedure
      */
     public function deepValue(Request $request, string $nameDeepValue): string
     {
-        return $nameDeepValue;
+        return $request->getMethod().' '.$nameDeepValue;
     }
 
     /**

tests/FixtureProxyProcedure.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sajya\Server\Tests;
+
+use Sajya\Server\Http\Request;
+use Sajya\Server\Procedure;
+use Sajya\Server\Proxy;
+
+class FixtureProxyProcedure extends Procedure implements Proxy
+{
+    /**
+     * The name of the procedure that will be
+     * displayed and taken into account in the search.
+     *
+     * @var string
+     */
+    public static string $name = 'proxy';
+
+    /**
+     * The method that will be called if there is no match.
+     *
+     * @param \Sajya\Server\Http\Request $request
+     *
+     * @return mixed
+     */
+    public function __invoke(Request $request): mixed
+    {
+        return $request->getMethod();
+    }
+}

tests/TestCase.php

@@ -17,6 +17,7 @@ class TestCase extends \Orchestra\Testbench\TestCase
     public array $mapProcedures = [
         FixtureProcedure::class,
         FixtureBindProcedure::class,
+        FixtureProxyProcedure::class,
     ];
 
     /**

tests/Unit/ExpectedTest.php

@@ -63,6 +63,7 @@ public function exampleCalls(): Generator
         yield ['testBatchSum'];
         yield ['testDelimiter', null, null, 'rpc.delimiter'];
         yield ['testDependencyInjection'];
+        yield ['testFindMethod'];
         yield ['testFindProcedure'];
         yield ['testInvalidParams'];
         yield ['testNotificationSum', static function () {
@@ -104,6 +105,9 @@ public function exampleCalls(): Generator
         yield ['testBindModel', static function () {
             RPC::model('fixtureModel', FixtureBind::class);
         }];
+
+        // Proxy
+        yield ['testProxyMethod'];
     }
 
     /**