Merge pull request #103 from spiral/feature/client-interceptors

Inject interceptors to a GRPC clients
spiral · May 20, 2024 · e7709ed · e7709ed
2 parents 191042e + 6ae8b59
commit e7709ed
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 16 deletions.
diff --git a/src/GRPC/Generator/BootloaderGenerator.php b/src/GRPC/Generator/BootloaderGenerator.php
@@ -129,16 +129,19 @@ private function addSingleton(Method $servicesMethod, FileDeclaration $bootloade
                 <<<'EOL'
 $container->bindSingleton(
     %s::class,
-    static function(GRPCServicesConfig $config): %s
+    static function(GRPCServicesConfig $config) use($container): %s
     {
         $service = $config->getService(%s::class);
+        $core = new InterceptableCore(new ServiceClientCore(
+            $service['host'],
+            ['credentials' => $service['credentials'] ?? $config->getDefaultCredentials()]
+        ));
 
-        return new %s(
-            new InterceptableCore(new ServiceClientCore(
-                $service['host'],
-                ['credentials' => $service['credentials'] ?? $config->getDefaultCredentials()]
-            ))
-        );
+        foreach ($config->getInterceptors() as $interceptor) {
+            $core->addInterceptor($container->get($interceptor));
+        }
+
+        return $container->make(%s::class, ['core' => $core]);
     }
 );
 EOL,

diff --git a/src/GRPC/Generator/ConfigGenerator.php b/src/GRPC/Generator/ConfigGenerator.php
@@ -38,7 +38,7 @@ public function run(array $files, string $targetPath, string $namespace): void
 
         $config->addConstant('CONFIG', 'grpcServices')->setPublic();
         $config
-            ->addProperty('config', ['services' => []])
+            ->addProperty('config', ['services' => [], 'interceptors' => []])
             ->setProtected()
             ->setType('array')
             ->setComment('@var array<class-string, array{host: string, credentials?: mixed}>');
@@ -47,6 +47,11 @@ public function run(array $files, string $targetPath, string $namespace): void
             ->setPublic()
             ->addBody('return ChannelCredentials::createInsecure();')
             ->setReturnType('mixed');
+        $config
+            ->addMethod('getInterceptors')
+            ->setPublic()
+            ->setBody('return $this->config[\'interceptors\'];')
+            ->setReturnType('array');
         $config
             ->addMethod('getService')
             ->addComment('Get service definition.')

diff --git a/tests/app/GRPC/Generator/Bootloader/ExpectedBootloader.php b/tests/app/GRPC/Generator/Bootloader/ExpectedBootloader.php
@@ -53,16 +53,19 @@ private function initServices(Container $container): void
     {
         $container->bindSingleton(
             UsersServiceInterface::class,
-            static function(GRPCServicesConfig $config): UsersServiceInterface
+            static function(GRPCServicesConfig $config) use($container): UsersServiceInterface
             {
                 $service = $config->getService(UsersServiceClient::class);
+                $core = new InterceptableCore(new ServiceClientCore(
+                    $service['host'],
+                    ['credentials' => $service['credentials'] ?? $config->getDefaultCredentials()]
+                ));
 
-                return new UsersServiceClient(
-                    new InterceptableCore(new ServiceClientCore(
-                        $service['host'],
-                        ['credentials' => $service['credentials'] ?? $config->getDefaultCredentials()]
-                    ))
-                );
+                foreach ($config->getInterceptors() as $interceptor) {
+                    $core->addInterceptor($container->get($interceptor));
+                }
+
+                return $container->make(UsersServiceClient::class, ['core' => $core]);
             }
         );
     }

diff --git a/tests/app/GRPC/Generator/Config/ExpectedConfig.php b/tests/app/GRPC/Generator/Config/ExpectedConfig.php
@@ -12,13 +12,18 @@ class GRPCServicesConfig extends InjectableConfig
     public const CONFIG = 'grpcServices';
 
     /** @var array<class-string, array{host: string, credentials?: mixed}> */
-    protected array $config = ['services' => []];
+    protected array $config = ['services' => [], 'interceptors' => []];
 
     public function getDefaultCredentials(): mixed
     {
         return ChannelCredentials::createInsecure();
     }
 
+    public function getInterceptors(): array
+    {
+        return $this->config['interceptors'];
+    }
+
     /**
      * Get service definition.
      * @return array{host: string, credentials?: mixed}