Merge pull request #187 from open-runtimes/feat-set-cookie-comma-separtion

Feat: coma-separated set-cookie

Author: Meldiron

app/controllers.php

@@ -261,16 +261,6 @@ function (
                 $log
             );
 
-            // Backwards compatibility for headers
-            $responseFormat = $request->getHeader('x-executor-response-format', '0.8.6'); // Last version without support for this header
-            if (version_compare($responseFormat, '0.9.0', '<')) {
-                $oldHeaders = [];
-                foreach ($execution['headers'] as $pair) {
-                    $oldHeaders[$pair['key']] = $pair['value'];
-                }
-                $execution['headers'] = $oldHeaders;
-            }
-
             $acceptTypes = \explode(', ', $request->getHeader('accept', 'multipart/form-data'));
             $isJson = false;
 

src/Executor/Runner/Docker.php

@@ -977,7 +977,11 @@ public function createExecution(
                     $value = \urldecode($value);
                 }
 
-                $responseHeaders[] = ['key' => $key, 'value' => $value ];
+                if (\array_key_exists($key, $responseHeaders)) {
+                    $responseHeaders[$key] .= ', ' . $value;
+                } else {
+                    $responseHeaders[$key] = $value;
+                }
 
                 return $len;
             });
@@ -1025,14 +1029,7 @@ public function createExecution(
             }
 
             // Extract logs and errors from file based on fileId in header
-            $logIdHeader = [];
-            foreach ($responseHeaders as $responseHeader) {
-                if ($responseHeader['key'] === 'x-open-runtimes-log-id') {
-                    $logIdHeader = $responseHeader;
-                    break;
-                }
-            }
-            $fileId = $logIdHeader['value'] ?? '';
+            $fileId = $responseHeaders['x-open-runtimes-log-id'] ?? '';
             $logs = '';
             $errors = '';
             if (!empty($fileId)) {
@@ -1067,12 +1064,12 @@ public function createExecution(
             }
 
             $outputHeaders = [];
-            foreach ($responseHeaders as $pair) {
-                if (\str_starts_with($pair['key'], 'x-open-runtimes-')) {
+            foreach ($responseHeaders as $key => $value) {
+                if (\str_starts_with($key, 'x-open-runtimes-')) {
                     continue;
                 }
 
-                $outputHeaders[] = $pair;
+                $outputHeaders[$key] = $value;
             }
 
             return [

tests/Client.php

@@ -18,7 +18,6 @@ class Client
     public const METHOD_TRACE = 'TRACE';
 
     protected bool $selfSigned = false;
-    protected string $version = '0.9.0';
     protected string $endpoint = '';
 
     /**
@@ -62,9 +61,6 @@ public function addHeader(string $key, string $value): self
     public function call(string $method, string $path = '', array $headers = [], array $params = [], bool $decode = true, callable $callback = null): array
     {
         $headers            = array_merge($this->headers, $headers);
-        if (!\array_key_exists('x-executor-response-format', $headers)) {
-            $headers['x-executor-response-format'] = $this->version;
-        }
 
         $ch                 = curl_init($this->endpoint . $path . (($method == self::METHOD_GET && !empty($params)) ? '?' . http_build_query($params) : ''));
 

tests/ExecutorTest.php

@@ -382,24 +382,7 @@ public function testExecute(): void
         $response = $this->client->call(Client::METHOD_POST, '/runtimes/test-exec/executions');
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals(200, $response['body']['statusCode']);
-
-        // Example of expected headers:
-        // "[{"key":"x-my-cookie","value":"cookieValue"},{"key":"content-type","value":"application\/json; charset=utf-8"},{"key":"server","value":"swoole-http-server"},{"key":"date","value":"Tue, 02 Sep 2025 13:43:32 GMT"},{"key":"connection","value":"keep-alive"},{"key":"content-length","value":"235"}]"
-        $headers = [];
-        foreach (\json_decode($response['body']['headers'], true) as $pair) {
-            $headers[$pair['key']] = $pair['value'];
-        }
-        $this->assertEquals('cookieValue', $headers['x-my-cookie']);
-
-        /** Execute with intentionally old version to ensure response filter */
-        $response = $this->client->call(Client::METHOD_POST, '/runtimes/test-exec/executions', [
-            'x-executor-response-format' => '0.8.6'
-        ]);
-        $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(200, $response['body']['statusCode']);
-        // Example of expected headers:
-        // "{"x-my-cookie":"cookieValue","content-type":"application\/json; charset=utf-8","server":"swoole-http-server","date":"Tue, 02 Sep 2025 13:38:22 GMT","connection":"keep-alive","content-length":"235"}"
-        $this->assertEquals('cookieValue', \json_decode($response['body']['headers'], true)['x-my-cookie']);
+        $this->assertEquals('cookie1=value1; Path=/; HttpOnly; Secure; SameSite=Lax, cookie2=value2; Path=/; HttpOnly; Secure; SameSite=Lax', \json_decode($response['body']['headers'], true)['set-cookie']);
 
         /** Execute on cold-started runtime */
         $response = $this->client->call(Client::METHOD_POST, '/runtimes/test-exec/executions', [], [
@@ -550,6 +533,7 @@ public function testExecute(): void
         $this->assertEquals(200, $response['headers']['status-code']);
     }
 
+    // We also test SSR two Set-cookie here
     public function testSSRLogs(): void
     {
         /** Prepare function */
@@ -586,6 +570,7 @@ public function testSSRLogs(): void
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals(200, $response['body']['statusCode']);
         $this->assertStringContainsString('<p>OK</p>', $response['body']['body']);
+        $this->assertEquals('astroCookie1=astroValue1; Max-Age=1800; HttpOnly, astroCookie2=astroValue2; Max-Age=1800; HttpOnly', \json_decode($response['body']['headers'], true)['set-cookie']);
 
         $this->assertNotEmpty($response['body']['logs']);
         $this->assertStringContainsString('Open runtimes log', $response['body']['logs']);

tests/resources/functions/php/index.php

@@ -22,6 +22,6 @@
         'url' => $context->req->url,
         'todo' => $todo
     ], 200, [
-        'x-my-cookie' => 'cookieValue'
+        'Set-Cookie' => 'cookie1=value1; Path=/; HttpOnly; Secure; SameSite=Lax, cookie2=value2; Path=/; HttpOnly; Secure; SameSite=Lax'
     ]);
 };

tests/resources/sites/astro/src/pages/logs.astro

@@ -2,6 +2,17 @@
 console.log('Open runtimes log');
 console.log('A developer log');
 console.error('Open runtimes error');
+
+Astro.cookies.set('astroCookie1', 'astroValue1', {
+    httpOnly: true,
+    maxAge: 1800
+});
+
+Astro.cookies.set('astroCookie2', 'astroValue2', {
+    httpOnly: true,
+    maxAge: 1800
+});
+
 ---
 
 <p>OK</p>