refs #17 Added alternative for binding params

Author: tabuna

composer.json

@@ -56,7 +56,10 @@
         "laravel": {
             "providers": [
                 "Sajya\\Server\\ServerServiceProvider"
-            ]
+            ],
+            "aliases": {
+                "RPC": "Sajya\\Server\\Facades\\RPC"
+            }
         }
     }
 }

src/Binding.php

@@ -0,0 +1,88 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sajya\Server;
+
+use Closure;
+use Illuminate\Container\Container;
+use Illuminate\Routing\RouteBinding;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+use Sajya\Server\Http\Request;
+
+class Binding
+{
+    /**
+     * The IoC container instance.
+     *
+     * @var \Illuminate\Container\Container
+     */
+    protected $container;
+
+    /**
+     * The registered route value binders.
+     *
+     * @var array
+     */
+    protected $binders = [];
+
+    /**
+     * Application constructor.
+     *
+     * @param Container $container
+     */
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * Register a model binder for a wildcard.
+     *
+     * @param string        $key
+     * @param string        $class
+     * @param \Closure|null $callback
+     *
+     * @return void
+     */
+    public function model(string $key, string $class, Closure $callback = null)
+    {
+        $this->bind($key, RouteBinding::forModel($this->container, $class, $callback));
+    }
+
+    /**
+     * Add a new route parameter binder.
+     *
+     * @param string         $key
+     * @param Closure|string $binder
+     *
+     * @return void
+     */
+    public function bind(string $key, $binder)
+    {
+        $this->binders[$key] = RouteBinding::forCallback(
+            $this->container, $binder
+        );
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return array
+     */
+    public function bindResolve(Request $request): array
+    {
+        $possibleBindings = Arr::dot($request->getParams());
+
+        return collect($possibleBindings)
+            ->map(fn($value, string $key) => with($value, $this->binders[$key] ?? null))
+            ->mapWithKeys(function ($value, string $key) {
+                $nameForArgument = (string)Str::of($key)->replace('.', '_')->camel();
+
+                return [$nameForArgument => $value];
+            })
+            ->toArray();
+    }
+
+}

src/Facades/RPC.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sajya\Server\Facades;
+
+use Illuminate\Support\Facades\Facade;
+use Sajya\Server\Binding;
+
+/**
+ * Class RPC
+ *
+ * @method static void bind(string $key, string|callable $binder)
+ * @method static void model(string $key, string $class, \Closure|null $callback = null)
+ *
+ * @see \Sajya\Server\Binding
+ */
+class RPC extends Facade
+{
+    /**
+     * Initiate a mock expectation on the facade.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor(): string
+    {
+        return Binding::class;
+    }
+}

src/Guide.php

@@ -104,8 +104,8 @@ public function handleProcedure(Request $request, bool $notification): Response
         }
 
         $result = $notification
-            ? HandleProcedure::dispatchAfterResponse($procedure)
-            : HandleProcedure::dispatchNow($procedure);
+            ? HandleProcedure::dispatchAfterResponse($procedure, $request)
+            : HandleProcedure::dispatchNow($procedure, $request);
 
         return $this->makeResponse($result, $request);
     }

src/HandleProcedure.php

@@ -16,28 +16,34 @@
 use Sajya\Server\Exceptions\InternalErrorException;
 use Sajya\Server\Exceptions\InvalidParams;
 use Sajya\Server\Exceptions\RuntimeRpcException;
+use Sajya\Server\Facades\RPC;
+use Sajya\Server\Http\Request;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class HandleProcedure implements ShouldQueue
 {
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     /**
      * @var string
      */
     protected string $procedure;
 
+    /**
+     * @var Request
+     */
+    protected $request;
+
     /**
      * Create a new job instance.
      *
-     * @param string $procedure
+     * @param string  $procedure
+     * @param Request $request
      */
-    public function __construct(string $procedure)
+    public function __construct(string $procedure, Request $request)
     {
         $this->procedure = $procedure;
+        $this->request = $request;
     }
 
     /**
@@ -48,7 +54,7 @@ public function __construct(string $procedure)
     public function handle()
     {
         try {
-            return App::call($this->procedure);
+            return App::call($this->procedure, RPC::bindResolve($this->request));
         } catch (HttpException | RuntimeException | Exception $exception) {
             $message = $exception->getMessage();
 

src/ServerServiceProvider.php

@@ -42,6 +42,8 @@ public function register(): void
                 'procedures' => $procedures,
                 'delimiter'  => $delimiter,
             ]));
+
+        $this->app->singleton(Binding::class, fn($container) => new Binding($container));
     }
 
     /**

tests/Expected/Requests/testBindDeepValue.json

@@ -0,0 +1,12 @@
+{
+    "jsonrpc": "2.0",
+    "method": "binding@deepValue",
+    "params": {
+        "name": {
+            "deep": {
+                "value": "Alexandr"
+            }
+        }
+    },
+    "id": 1
+}

tests/Expected/Requests/testBindModel.json

@@ -0,0 +1,8 @@
+{
+    "jsonrpc": "2.0",
+    "method": "binding@getModel",
+    "params": {
+        "fixtureModel": 13
+    },
+    "id": 1
+}

tests/Expected/Requests/testBindSubtract.json

@@ -0,0 +1,9 @@
+{
+    "jsonrpc": "2.0",
+    "method": "binding@subtract",
+    "params": {
+        "a": 4,
+        "b": 2
+    },
+    "id": 1
+}

tests/Expected/Requests/testBindSubtractRewriteBind.json

@@ -0,0 +1,9 @@
+{
+    "jsonrpc": "2.0",
+    "method": "binding@subtract",
+    "params": {
+        "a": 4,
+        "b": 2
+    },
+    "id": 1
+}