Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add headers for sync executions

Browse Source
This commit is contained in:
Khushboo Verma
2025-07-28 10:58:36 +05:30
parent bd1b548cd8
commit dd2a04b362
3 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/general.php
+5 -3
View File
@@ -57,7 +57,6 @@ Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey)
{
// add headers here as well
$host = $request->getHostname() ?? '';
if (!empty($previewHostname)) {
$host = $previewHostname;
@@ -371,8 +370,11 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
$headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $jwtKey;
$headers['x-appwrite-trigger'] = 'http';
$headers['x-appwrite-user-jwt'] = '';
// add here
// in API - for sync executions, hard code delay to 0
// add headers for sync executions
$currentTime = new \DateTime();
$headers['x-appwrite-scheduled-at'] = $currentTime->format('Y-m-d\TH:i:s.v\Z');
$headers['x-appwrite-executed-at'] = $currentTime->format('Y-m-d\TH:i:s.v\Z');
$headers['x-appwrite-execution-delay'] = '0';
$ip = $headers['x-real-ip'] ?? '';
if (!empty($ip)) {
src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
+6
View File
@@ -231,6 +231,12 @@ class Create extends Base
$currentTime = new \DateTime();
$headers['x-appwrite-scheduled-at'] = $currentTime->format('Y-m-d\TH:i:s.v\Z');
if (!$async) {
$executedAt = new \DateTime();
$headers['x-appwrite-executed-at'] = $executedAt->format('Y-m-d\TH:i:s.v\Z');
$headers['x-appwrite-execution-delay'] = '0';
}
$ip = $headers['x-real-ip'] ?? '';
if (!empty($ip)) {
$record = $geodb->get($ip);
tests/e2e/Services/Functions/FunctionsCustomServerTest.php
+41 -1
View File
@@ -2294,7 +2294,7 @@ class FunctionsCustomServerTest extends Scope
$this->cleanupFunction($functionId);
}
public function testExecutionHeaders()
public function testAsyncExecutionHeaders()
{
$functionId = $this->setupFunction([
'functionId' => ID::unique(),
@@ -2343,4 +2343,44 @@ class FunctionsCustomServerTest extends Scope
$this->cleanupFunction($functionId);
}
public function testSyncExecutionHeaders()
{
$functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test sync execution headers',
'execute' => [Role::any()->toString()],
'runtime' => 'node-22',
'entrypoint' => 'index.js',
'timeout' => 10,
]);
$deploymentId = $this->setupDeployment($functionId, [
'code' => $this->packageFunction('basic'),
'activate' => true,
]);
$deployment = $this->getDeployment($functionId, $deploymentId);
$this->assertEquals(200, $deployment['headers']['status-code']);
$execution = $this->createExecution($functionId, [
'async' => false,
]);
$this->assertEquals(201, $execution['headers']['status-code']);
$this->assertEquals('completed', $execution['body']['status']);
$this->assertEquals(200, $execution['body']['responseStatusCode']);
$this->assertGreaterThan(0, $execution['body']['duration']);
$this->assertNotEmpty($execution['body']['logs']);
$this->assertNotEmpty($execution['body']['responseHeaders']);
$requestHeaders = array_column($execution['body']['requestHeaders'], 'value', 'name');
$this->assertArrayHasKey('x-appwrite-scheduled-at', $requestHeaders);
$this->assertArrayHasKey('x-appwrite-executed-at', $requestHeaders);
$this->assertArrayHasKey('x-appwrite-execution-delay', $requestHeaders);
$this->assertEquals('0', $requestHeaders['x-appwrite-execution-delay']);
$this->assertGreaterThanOrEqual($requestHeaders['x-appwrite-scheduled-at'], $requestHeaders['x-appwrite-executed-at']);
$this->cleanupFunction($functionId);
}
}