Refactor event forwarding and improve test coverage #1

Merged
mathiaspalmqvist merged 3 commits from v1.1 into main 2025-01-31 11:36:54 +00:00
2 changed files with 43 additions and 16 deletions
Showing only changes of commit 26454a9501 - Show all commits

No files matched your search

+12 -3
View File
@@ -1,13 +1,18 @@
<?php <?php
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Concurrency;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
Route::post('api/event', function (Request $request) { Route::post('api/event', function (Request $request) {
$validator = Validator::make($request->all(), [ $data = json_decode($request->getContent(), true);
if (json_last_error() !== JSON_ERROR_NONE) {
return response()->json(['error' => 'Invalid JSON format'], 422);
}
$validator = Validator::make($data, [
'n' => 'required|string', 'n' => 'required|string',
'u' => 'required|url', 'u' => 'required|url',
'd' => 'required|string', 'd' => 'required|string',
@@ -20,7 +25,11 @@ Route::post('api/event', function (Request $request) {
return response()->json(['status' => 'error', 'errors' => $validator->errors()], 422); return response()->json(['status' => 'error', 'errors' => $validator->errors()], 422);
} }
Concurrency::defer(fn () => Http::post(config('plausible-proxy.domain').'/api/event', $request->all())); $headers = collect($request->headers->all())
->mapWithKeys(fn($value, $key) => [$key => is_array($value) ? implode(', ', $value) : $value])
->all();
Http::withHeaders($headers)->post(config('plausible-proxy.domain').'/api/event', $data);
return response()->json(['status' => 'queued']); return response()->json(['status' => 'queued']);
}); });
+31 -13
View File
@@ -15,7 +15,7 @@ it('returns plausible script from cache', function () {
it('fetches plausible script if not cached', function () { it('fetches plausible script if not cached', function () {
Http::fake([ Http::fake([
'https://plausible.io/js/script.js' => Http::response('console.log("Plausible script");', 200), config('plausible-proxy.domain').'/js/script.js' => Http::response('console.log("Plausible script");', 200),
]); ]);
$response = $this->get('/js/script.js'); $response = $this->get('/js/script.js');
@@ -29,7 +29,7 @@ it('fetches plausible script if not cached', function () {
it('handles failed script fetch', function () { it('handles failed script fetch', function () {
Http::fake([ Http::fake([
'https://plausible.io/js/script.js' => Http::response('', 500), config('plausible-proxy.domain').'/js/script.js' => Http::response('', 500),
]); ]);
$response = $this->get('/js/script.js'); $response = $this->get('/js/script.js');
@@ -49,26 +49,44 @@ it('rejects invalid event data', function () {
->assertJsonStructure(['status', 'errors']); ->assertJsonStructure(['status', 'errors']);
}); });
it('accepts valid event data and defers request', function () { it('accepts valid event data and forwards headers', function () {
Http::fake(); config()->set('plausible-proxy.domain', 'https://plausible.io');
$concurrencyMock = Mockery::mock('alias:Illuminate\Support\Facades\Concurrency'); Http::fake([
$concurrencyMock->shouldReceive('defer')->once()->andReturnUsing(function ($callback) { 'https://plausible.io/api/event' => function ($request) {
$callback(); dump($request->headers());
}); dump($request->data());
return Http::response(['status' => 'queued'], 200);
},
]);
$headers = [
'User-Agent' => 'TestAgent',
'Accept' => 'application/json',
];
$response = $this->postJson('/api/event', [ $response = $this->postJson('/api/event', [
'n' => 'pageview', 'n' => 'pageview',
'u' => 'https://example.com/page', 'u' => 'https://example.com/page',
'd' => 'example.com', 'd' => 'example.com',
]); ], $headers);
$response->assertStatus(200) $response->assertStatus(200)
->assertJson(['status' => 'queued']); ->assertJson(['status' => 'queued']);
Http::assertSent(fn ($request) => $request->url() === config('plausible-proxy.domain').'/api/event' && Http::assertSentCount(1);
$request['n'] === 'pageview'
);
Mockery::close(); Http::assertSent(function ($request) {
dump($request->url());
dump($request->headers());
dump($request->data());
return $request->url() === 'https://plausible.io/api/event'
&& isset($request['n']) && $request['n'] === 'pageview'
&& isset($request['u']) && $request['u'] === 'https://example.com/page'
&& isset($request['d']) && $request['d'] === 'example.com';
}); });
});