Make requestContext available in $request->value("context")

ChangeLog.md

@@ -3,6 +3,10 @@ AWS Lambda Webservices change log
 
 ## ?.?.? / ????-??-??
 
+## 0.5.0 / 2021-08-29
+
+* Made events' requestContext member accessible via *request* value
+  (@thekid)
 * Made remote address available in HTTP headers, populated via events'
   requestContext.http.sourceIp member
   (@thekid)

src/main/php/com/amazon/aws/lambda/HttpApi.class.php

@@ -45,17 +45,17 @@ public function target() {
 
     // Return event handler
     return function($event, $context) use($routing, $logging) {
-      $request= new Request(new FromApiGateway($event));
-      $response= new Response(new ResponseDocument());
+      $req= new Request(new FromApiGateway($event));
+      $res= new Response(new ResponseDocument());
 
       try {
-        foreach ($routing->service($request->pass('context', $context), $response) ?? [] as $_) { }
-        $logging->log($request, $response);
-        return $response->output()->document;
+        foreach ($routing->service($req->pass('context', $context)->pass('request', $event['requestContext'] ?? []), $res) ?? [] as $_) { }
+        $logging->log($req, $res);
+        return $res->output()->document;
       } catch (Throwable $t) {
         $e= $t instanceof Error ? $t : new InternalServerError($t);
-        $logging->log($request, $response, $e);
-        return $response->output()->error($e);
+        $logging->log($req, $res, $e);
+        return $res->output()->error($e);
       }
     };
   }

src/test/php/com/amazon/aws/lambda/unittest/HttpApiTest.class.php

@@ -154,6 +154,29 @@ public function routes($env) {
     );
   }
 
+  #[Test]
+  public function has_access_to_request() {
+    $fixture= new class($this->environment) extends HttpApi {
+      public function routes($env) {
+        return ['/' => function($req, $res) {
+          $res->answer(200);
+          $res->send('Hello '.$req->param('name').' from '.$req->value('request')['apiId'], 'text/plain');
+        }];
+      }
+    };
+
+    Assert::equals(
+      [
+        'statusCode'        => 200,
+        'statusDescription' => 'OK',
+        'isBase64Encoded'   => false,
+        'multiValueHeaders' => ['Content-Type' => ['text/plain'], 'Content-Length' => ['26']],
+        'body'              => 'Hello Test from r3pmxmplak',
+      ],
+      $this->invoke($fixture->target(), 'GET', 'name=Test')
+    );
+  }
+
   #[Test]
   public function has_access_to_context() {
     $fixture= new class($this->environment) extends HttpApi {