[Bref] Dont use internal classes from bref/bref (#88)

* [Bref] Dont use internal classes from bref/bref

* cs fixes

Author: Nyholm

src/bref/composer.json

@@ -11,6 +11,7 @@
     ],
     "require": {
         "ext-json": "*",
+        "ext-sockets": "*",
         "bref/bref": "^1.3",
         "clue/arguments": "^2.1",
         "psr/http-server-handler": "^1.0",

src/bref/src/BrefRunner.php

@@ -3,7 +3,7 @@
 namespace Runtime\Bref;
 
 use Bref\Event\Handler;
-use Bref\Runtime\LambdaRuntime;
+use Runtime\Bref\Lambda\LambdaClient;
 use Symfony\Component\Runtime\RunnerInterface;
 
 /**
@@ -24,7 +24,7 @@ public function __construct(Handler $handler, int $loopMax)
 
     public function run(): int
     {
-        $lambda = LambdaRuntime::fromEnvironmentVariable('symfony-runtime');
+        $lambda = LambdaClient::fromEnvironmentVariable('symfony-runtime');
 
         $loops = 0;
         while (true) {

src/bref/src/ConsoleApplicationHandler.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Runtime\Bref;
+
+use Bref\Context\Context;
+use Bref\Event\Handler;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Output\BufferedOutput;
+
+/**
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @internal
+ */
+class ConsoleApplicationHandler implements Handler
+{
+    private $application;
+
+    public function __construct(Application $application)
+    {
+        $this->application = $application;
+        $this->application->setAutoExit(false);
+    }
+
+    public function handle($event, Context $context)
+    {
+        $args = \Clue\Arguments\split((string) $event);
+        array_unshift($args, 'command');
+
+        $input = new ArgvInput($args);
+        $output = new BufferedOutput();
+        $exitCode = $this->application->run($input, $output);
+
+        $content = $output->fetch();
+        // Echo the output so that it is written to CloudWatch logs
+        echo $content;
+
+        if ($exitCode > 0) {
+            throw new \Exception('The command exited with a non-zero status code: '.$exitCode);
+        }
+
+        return [
+            'exitCode' => $exitCode, // will always be 0
+            'output' => $content,
+        ];
+    }
+}

src/bref/src/ConsoleApplicationRunner.php

@@ -2,11 +2,8 @@
 
 namespace Runtime\Bref;
 
-use Bref\Context\Context;
-use Bref\Runtime\LambdaRuntime;
+use Runtime\Bref\Lambda\LambdaClient;
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Runtime\RunnerInterface;
 
 /**
@@ -16,40 +13,19 @@
  */
 class ConsoleApplicationRunner implements RunnerInterface
 {
-    private $application;
+    private $handler;
 
     public function __construct(Application $application)
     {
-        $this->application = $application;
-        $this->application->setAutoExit(false);
+        $this->handler = new ConsoleApplicationHandler($application);
     }
 
     public function run(): int
     {
-        $lambda = LambdaRuntime::fromEnvironmentVariable('symfony-runtime-console');
+        $lambda = LambdaClient::fromEnvironmentVariable('symfony-runtime-console');
 
         while (true) {
-            $lambda->processNextEvent(function ($event, Context $context): array {
-                $args = \Clue\Arguments\split((string) $event);
-                array_unshift($args, 'command');
-
-                $input = new ArgvInput($args);
-                $output = new BufferedOutput();
-                $exitCode = $this->application->run($input, $output);
-
-                $content = $output->fetch();
-                // Echo the output so that it is written to CloudWatch logs
-                echo $content;
-
-                if ($exitCode > 0) {
-                    throw new \Exception('The command exited with a non-zero status code: '.$exitCode);
-                }
-
-                return [
-                    'exitCode' => $exitCode, // will always be 0
-                    'output' => $content,
-                ];
-            });
+            $lambda->processNextEvent($this->handler);
         }
     }
 }

src/bref/src/Lambda/ContextBuilder.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Runtime\Bref\Lambda;
+
+use Bref\Context\Context;
+
+/**
+ * @internal
+ */
+final class ContextBuilder
+{
+    /** @var string */
+    private $awsRequestId;
+
+    /** @var int */
+    private $deadlineMs;
+
+    /** @var string */
+    private $invokedFunctionArn;
+
+    /** @var string */
+    private $traceId;
+
+    public function __construct()
+    {
+        $this->awsRequestId = '';
+        $this->deadlineMs = 0;
+        $this->invokedFunctionArn = '';
+        $this->traceId = '';
+    }
+
+    public function setAwsRequestId(string $awsRequestId): void
+    {
+        $this->awsRequestId = $awsRequestId;
+    }
+
+    public function setDeadlineMs(int $deadlineMs): void
+    {
+        $this->deadlineMs = $deadlineMs;
+    }
+
+    public function setInvokedFunctionArn(string $invokedFunctionArn): void
+    {
+        $this->invokedFunctionArn = $invokedFunctionArn;
+    }
+
+    public function setTraceId(string $traceId): void
+    {
+        $this->traceId = $traceId;
+    }
+
+    public function buildContext(): Context
+    {
+        return new Context(
+            $this->awsRequestId,
+            $this->deadlineMs,
+            $this->invokedFunctionArn,
+            $this->traceId
+        );
+    }
+}