Merge pull request #44 from dapr/release/1.0.0-rc.4

Release rc.4

Author: withinboredom

.github/workflows/php.yml

@@ -96,7 +96,7 @@ jobs:
       - name: Install logger
         run: composer require monolog/monolog
       - name: Install Dapr
-        run: wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash -s 1.0.0-rc.4
+        run: wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash -s 1.0.0-rc.6
       - name: Initialize Integration Environment
         run: composer run-script dapr-init
       - name: Integration Environment Logs

composer.json

@@ -41,7 +41,7 @@
       "PHP_CLI_SERVER_WORKERS=100 dapr run --components-path components -a dev -p 9502 -- php -S 0.0.0.0:9502 -t src"
     ],
     "dapr-init": [
-      "dapr init --runtime-version 1.0.0-rc.3"
+      "dapr init --runtime-version 1.0.0-rc.4"
     ],
     "clean": [
       "dapr uninstall",

src/index.php

@@ -20,6 +20,7 @@
 use Dapr\PubSub\CloudEvent;
 use Dapr\PubSub\Publish;
 use Dapr\PubSub\Subscription;
+use Dapr\PubSub\Topic;
 use Dapr\State\Attributes\StateStore;
 use Dapr\State\StateManager;
 use Dapr\State\TransactionalState;
@@ -263,8 +264,11 @@ function () use ($one) {
     '/test/pubsub',
     function (FactoryInterface $container) {
         $publisher = $container->make(Publish::class, ['pubsub' => 'pubsub']);
-        $topic     = $publisher->topic(topic: 'test');
-        $body      = [];
+        /**
+         * @var Topic $topic
+         */
+        $topic = $publisher->topic(topic: 'test');
+        $body  = [];
 
         $topic->publish(['test_event']);
         sleep(5);
@@ -351,6 +355,17 @@ function (FactoryInterface $container) {
         unlink('/tmp/sub-received');
         $return['Publishing raw event'] = $body;
 
+        $topic->publish('raw data', content_type: 'application/octet-stream');
+        sleep(2);
+        $return['Binary response'] = ['raw' => json_decode($raw_event = file_get_contents('/tmp/sub-received'), true)];
+        unlink('/tmp/sub-received');
+        $return['Binary response'] = assert_equals(
+            $return['Binary response'],
+            'raw data',
+            $return['Binary response']['raw']['data'],
+            'Data properly decoded'
+        );
+
         return $return;
     }
 );

src/lib/PubSub/CloudEvent.php

@@ -163,7 +163,11 @@ private static function from_array(array $raw): CloudEvent
         if ( ! empty($time)) {
             $event->time = new DateTime($time);
         }
-        $event->data = $raw['data'] ?? null;
+        if (isset($raw['data_base64'])) {
+            $event->data = base64_decode($raw['data_base64']);
+        } else {
+            $event->data = $raw['data'] ?? null;
+        }
 
         return $event;
     }

src/lib/PubSub/Topic.php

@@ -25,10 +25,11 @@ public function __construct(
      *
      * @param CloudEvent|mixed $event The event to publish
      * @param array|null $metadata Additional metadata to pass to the component
+     * @param string $content_type The header to include in the publish request. Ignored when $event is a CloudEvent
      *
      * @return bool Whether the event was successfully dispatched
      */
-    public function publish(mixed $event, ?array $metadata = null): bool
+    public function publish(mixed $event, ?array $metadata = null, $content_type = 'application/json'): bool
     {
         $this->logger->debug('Sending {event} to {topic}', ['event' => $event, 'topic' => $this->topic]);
         if ($event instanceof CloudEvent) {
@@ -42,7 +43,7 @@ public function publish(mixed $event, ?array $metadata = null): bool
         try {
             $this->client->post("/publish/{$this->pubsub}/{$this->topic}", $event, $metadata);
 
-            $this->client->extra_headers = [];
+            $this->client->extra_headers = ['Content-Type: '.$content_type];
 
             return true;
         } catch (DaprException) { // @codeCoverageIgnoreStart

tests/PublishTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Dapr\DaprClient;
 use Dapr\PubSub\CloudEvent;
 use Dapr\PubSub\Publish;
 use DI\DependencyException;
@@ -27,6 +28,15 @@ public function testSimplePublish()
         $publisher->topic('topic')->publish(['my' => 'event']);
     }
 
+    public function testBinaryPublish()
+    {
+        $publisher = $this->container->make(Publish::class, ['pubsub' => 'pubsub']);
+        $this->get_client()->register_post('/publish/pubsub/topic', 200, null, 'data');
+        $publisher->topic('topic')->publish('data', content_type: 'application/octet-stream');
+        $client = $this->container->get(DaprClient::class);
+        $this->assertSame(['Content-Type: application/octet-stream'], $client->extra_headers);
+    }
+
     /**
      * @throws DependencyException
      * @throws NotFoundException
@@ -83,4 +93,24 @@ public function testParsingCloudEvent()
         $this->assertTrue($event->validate());
         $this->assertSame('https://example.com/message', $event->source);
     }
+
+    public function testParsingBinaryEvent()
+    {
+        $eventjson = <<<JSON
+{
+    "specversion" : "1.0",
+    "type" : "xml.message",
+    "source" : "https://example.com/message",
+    "subject" : "Test binary Message",
+    "id" : "id-1234-5678-9101",
+    "time" : "2020-09-23T06:23:21Z",
+    "datacontenttype" : "application/octet-stream",
+    "data" : "ZGF0YQ==",
+    "data_base64": "ZGF0YQ=="
+}
+JSON;
+        $event     = CloudEvent::parse($eventjson);
+        $this->assertTrue($event->validate());
+        $this->assertSame('data', $event->data);
+    }
 }