Move ::invokeable() to RuntimeApi

Author: thekid

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

@@ -20,27 +20,6 @@ public function __construct(Environment $environment) {
   /** @return com.amazon.aws.lambda.Environment */
   public function environment() { return $this->environment; }
 
-  /** @return com.amazon.aws.lambda.Lambda|com.amazon.aws.lambda.XXX|callable */
+  /** @return com.amazon.aws.lambda.Lambda|com.amazon.aws.lambda.Streaming|callable */
   public abstract function target();
-
-  /**
-   * Returns an invokeable
-   *
-   * @param  com.amazon.aws.lambda.RuntimeApi
-   * @return com.amazon.aws.lambda.Invokeable
-   * @throws lang.IllegalArgumentException
-   */
-  public final function invokeable($api) {
-    $target= $this->target();
-    if ($target instanceof Lambda) {
-      return new Invokeable([$target, 'process'], $api->buffered());
-    } else if ($target instanceof XXX) {
-      return new Invokeable([$target, 'yyy'], $api->streaming());
-    } else if (is_callable($target)) {
-      $n= (new ReflectionFunction($target))->getNumberOfParameters();
-      return new Invokeable($target, $n < 3 ? $api->buffered() : $api->streaming());
-    } else {
-      throw new IllegalArgumentException('Expected callable|Lambda|XXX, have '.typeof($target));
-    }
-  }
 }

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

@@ -1,12 +1,18 @@
 <?php namespace com\amazon\aws\lambda;
 
+use lang\Value;
+use util\Comparison;
+
 /** @see https://docs.aws.amazon.com/lambda/latest/dg/runtimes-custom.html#runtimes-custom-response-streaming */
-abstract class InvokeMode {
-  protected $api;
+abstract class InvokeMode implements Value {
+  use Comparison;
+
+  protected $api, $name;
 
   /** Creates a new invoke mode instance */
-  public function __construct(RuntimeApi $api) {
+  public function __construct(RuntimeApi $api, $name) {
     $this->api= $api;
+    $this->name= $name;
   }
 
   /**
@@ -19,4 +25,8 @@ public function __construct(RuntimeApi $api) {
    */
   public abstract function invoke($lambda, $event, $context);
 
+  /** @return string */
+  public function toString() {
+    return strtr(self::class, '\\', '.').'<'.$this->name.'>';
+  }
 }

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

@@ -1,6 +1,6 @@
 <?php namespace com\amazon\aws\lambda;
 
-use Throwable as Any;
+use ReflectionFunction, Throwable as Any;
 use io\Channel;
 use io\streams\InputStream;
 use lang\{Throwable, IllegalStateException, IllegalArgumentException};
@@ -33,7 +33,7 @@ public function __construct($endpoint, $version= '2018-06-01') {
 
   /** Returns the buffered invoke mode */
   public function buffered(): InvokeMode {
-    return new class($this) extends InvokeMode {
+    return new class($this, 'BUFFERED') extends InvokeMode {
       public function invoke($lambda, $event, $context) {
         try {
           $result= $lambda($event, $context);
@@ -47,7 +47,7 @@ public function invoke($lambda, $event, $context) {
 
   /** Returns the streaming invoke mode */
   public function streaming(): InvokeMode {
-    return new class($this) extends InvokeMode implements Stream {
+    return new class($this, 'RESPONSE_STREAM') extends InvokeMode implements Stream {
       private $request= null;
       private $response= null;
       private $stream= null;
@@ -128,6 +128,26 @@ public function invoke($lambda, $event, $context) {
     };
   }
 
+  /**
+   * Returns an invokeable
+   *
+   * @param  callable|com.amazon.aws.lambda.Lambda|com.amazon.aws.lambda.Streaming $target
+   * @return com.amazon.aws.lambda.Invokeable
+   * @throws lang.IllegalArgumentException
+   */
+  public final function invokeable($target) {
+    if ($target instanceof Lambda) {
+      return new Invokeable([$target, 'process'], $this->buffered());
+    } else if ($target instanceof Streaming) {
+      return new Invokeable([$target, 'handle'], $this->streaming());
+    } else if (is_callable($target)) {
+      $n= (new ReflectionFunction($target))->getNumberOfParameters();
+      return new Invokeable($target, $n < 3 ? $this->buffered() : $this->streaming());
+    } else {
+      throw new IllegalArgumentException('Expected callable|Lambda|Streaming, have '.typeof($target));
+    }
+  }
+
   /**
    * Marshals an exception according to the AWS specification.
    *

src/main/php/xp/lambda/AwsRunner.class.php

@@ -51,7 +51,7 @@ public static function main($args) {
 
     // Initialization
     try {
-      $lambda= self::handler($variables, Console::$out)->invokeable($api);
+      $lambda= $api->invokeable(self::handler($variables, Console::$out)->target());
     } catch (Throwable $t) {
       $api->report('init/error', $t);
       return 1;

src/main/php/xp/lambda/LocalRuntime.class.php

@@ -10,7 +10,7 @@ public function __construct($out) { $this->out= $out; }
 
   /** Returns the local buffered mode */
   public function buffered(): InvokeMode {
-    return new class($this) extends InvokeMode {
+    return new class($this, 'BUFFERED') extends InvokeMode {
       public function invoke($lambda, $event, $context) {
         $result= $lambda($event, $context);
         $this->api->out->writeLine($result);
@@ -20,7 +20,7 @@ public function invoke($lambda, $event, $context) {
 
   /** Returns the local streaming mode */
   public function streaming(): InvokeMode {
-    return new class($this) extends InvokeMode {
+    return new class($this, 'RESPONSE_STREAM') extends InvokeMode {
       public function invoke($lambda, $event, $context) {
         $stream= new class($this->api) implements Stream {
           private $api;

src/main/php/xp/lambda/RunLambda.class.php

@@ -42,9 +42,10 @@ public function run(): int {
     $deadlineMs= (time() + 900) * 1000;
     $variables= $_ENV + ['AWS_LAMBDA_FUNCTION_NAME' => $name, 'AWS_REGION' => $region, 'AWS_LOCAL' => true];
     $environment= new Environment(getcwd(), Console::$out, $variables);
+    $runtime= new LocalRuntime(Console::$out);
 
     try {
-      $lambda= $this->impl->newInstance($environment)->invokeable(new LocalRuntime(Console::$out));
+      $lambda= $runtime->invokeable($this->impl->newInstance($environment)->target());
     } catch (Throwable $e) {
       Console::$err->writeLine($e);
       return 127;

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

@@ -1,15 +1,9 @@
 <?php namespace com\amazon\aws\lambda\unittest;
 
-use com\amazon\aws\lambda\{Context, Environment, Handler, Lambda, RuntimeApi};
-use lang\IllegalArgumentException;
-use test\{Assert, Expect, Test};
+use com\amazon\aws\lambda\{Environment, Handler};
+use test\{Assert, Test};
 
-class HandlerTest extends RuntimeTest {
-  private $headers= [
-    'Lambda-Runtime-Aws-Request-Id'       => ['3e1afeb0-cde4-1d0e-c3c0-66b15046bb88'],
-    'Lambda-Runtime-Invoked-Function-Arn' => ['arn:aws:lambda:us-east-1:1185465369:function:test'],
-    'Lambda-Runtime-Trace-Id'             => ['Root=1-dc99d00f-c079a84d433534434534ef0d;Parent=91ed514f1e5c03b2;Sampled=1'],
-  ];
+class HandlerTest {
 
   #[Test]
   public function can_create() {
@@ -26,36 +20,4 @@ public function target() { /* TBI */ }
     };
     Assert::equals($env, $fixture->environment());
   }
-
-  #[Test]
-  public function return_function() {
-    $fixture= new class(new Environment('.')) extends Handler {
-      public function target() {
-        return function($event, $context) { return 'Test'; };
-      }
-    };
-    Assert::equals('Test', ($fixture->invokeable($this->runtime)->callable)(null, new Context($this->headers, [])));
-  }
-
-  #[Test]
-  public function return_lambda() {
-    $fixture= new class(new Environment('.')) extends Handler {
-      public function target() {
-        return new class() implements Lambda {
-          public function process($event, $context) { return 'Test'; }
-        };
-      }
-    };
-    Assert::equals('Test', ($fixture->invokeable($this->runtime)->callable)(null, new Context($this->headers, [])));
-  }
-
-  #[Test, Expect(IllegalArgumentException::class)]
-  public function cannot_return_null() {
-    $fixture= new class(new Environment('.')) extends Handler {
-      public function target() {
-        return null;
-      }
-    };
-    $fixture->invokeable($this->runtime);
-  }
 }

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

@@ -1,9 +1,11 @@
 <?php namespace com\amazon\aws\lambda\unittest;
 
-use com\amazon\aws\lambda\RuntimeApi;
-use test\{Assert, Test};
+use com\amazon\aws\lambda\{Context, RuntimeApi, Lambda, Streaming};
+use lang\IllegalArgumentException;
+use test\{Assert, Expect, Test};
 
 class RuntimeApiTest {
+  use TestContext;
 
   #[Test]
   public function can_create() {
@@ -31,4 +33,26 @@ public function endpoint_timeout_is_15_minutes() {
     $runtime= new RuntimeApi('localhost:9000');
     Assert::equals(15 * 60, $runtime->conn->getTimeout());
   }
+
+  #[Test]
+  public function return_function() {
+    $runtime= new RuntimeApi('localhost:9000');
+    $invokeable= $runtime->invokeable(function($event, $context) { return 'Test'; });
+    Assert::equals('Test', ($invokeable->callable)(null, new Context($this->headers, [])));
+  }
+
+  #[Test]
+  public function return_lambda() {
+    $runtime= new RuntimeApi('localhost:9000');
+    $invokeable= $runtime->invokeable(new class() implements Lambda {
+      public function process($event, $context) { return 'Test'; }
+    });
+    Assert::equals('Test', ($invokeable->callable)(null, new Context($this->headers, [])));
+  }
+
+  #[Test, Expect(IllegalArgumentException::class)]
+  public function cannot_return_null() {
+    $runtime= new RuntimeApi('localhost:9000');
+    $runtime->invokeable(null);
+  }
 }

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

@@ -1,9 +1,9 @@
 <?php namespace com\amazon\aws\lambda\unittest;
 
-use com\amazon\aws\lambda\Context;
+use com\amazon\aws\lambda\{Context, Streaming};
 use io\streams\MemoryInputStream;
 use lang\IllegalStateException;
-use test\{Assert, Expect, Test};
+use test\{Assert, Expect, Test, Values};
 
 class StreamingTest extends RuntimeTest {
   use TestContext;
@@ -22,6 +22,26 @@ private function invoke($lambda) {
     ;
   }
 
+  /**
+   * Lambda implementations for `write_event_stream` test.
+   *
+   * @return iterable
+   */
+  private function implementations() {
+    yield [$this->runtime->invokeable(function($event, $stream, $context) {
+      $stream->use('text/event-stream');
+      $stream->write("data: One\n\n");
+      $stream->write("data: Two\n\n");
+    })];
+    yield [$this->runtime->invokeable(new class() implements Streaming {
+      public function handle($event, $stream, $context) {
+        $stream->use('text/event-stream');
+        $stream->write("data: One\n\n");
+        $stream->write("data: Two\n\n");
+      }
+    })];
+  }
+
   #[Test]
   public function can_create() {
     $this->runtime->streaming();
@@ -62,13 +82,9 @@ public function reports_exceptions_before_streaming_via_error() {
     );
   }
 
-  #[Test]
-  public function write_event_stream() {
-    $response= $this->invoke(function($event, $stream, $context) {
-      $stream->use('text/event-stream');
-      $stream->write("data: One\n\n");
-      $stream->write("data: Two\n\n");
-    });
+  #[Test, Values(from: 'implementations')]
+  public function write_event_stream($lambda) {
+    $response= $this->invoke($lambda->callable);
 
     Assert::equals(
       "POST /2018-06-01/runtime/invocation/3e1afeb0-cde4-1d0e-c3c0-66b15046bb88/response HTTP/1.1\r\n".