Merge pull request 'Drop Laravel 11, add PHP 8.5 and merge CI workflows' (#22) from laravel-12-13-ci into main

Reviewed-on: #22

.gitea/workflows/ci.yml

@@ -0,0 +1,88 @@
+name: CI
+
+on:
+  push:
+    paths:
+      - '**.php'
+      - '.gitea/workflows/ci.yml'
+      - 'phpunit.xml.dist'
+      - 'phpstan.neon.dist'
+      - 'phpstan-baseline.neon'
+      - 'composer.json'
+      - 'composer.lock'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  phpstan:
+    name: PHPStan
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.5'
+          coverage: none
+
+      - name: Install composer dependencies
+        run: composer install --prefer-dist --no-interaction --no-progress
+
+      - name: Run PHPStan
+        run: vendor/bin/phpstan --error-format=github
+
+  pest:
+    name: Pest (PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, ${{ matrix.stability }})
+    needs: phpstan
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    strategy:
+      fail-fast: true
+      matrix:
+        php: ['8.3', '8.4', '8.5']
+        laravel: ['12.*', '13.*']
+        stability: [prefer-lowest, prefer-stable]
+        include:
+          - laravel: '12.*'
+            testbench: '10.*'
+          - laravel: '13.*'
+            testbench: '11.*'
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          coverage: none
+
+      - name: Setup problem matchers
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Install dependencies
+        run: |
+          composer require \
+            "laravel/framework:${{ matrix.laravel }}" \
+            "orchestra/testbench:${{ matrix.testbench }}" \
+            "nesbot/carbon:^3.8.4" \
+            --dev --no-interaction --no-update
+
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
+      - name: List installed dependencies
+        run: composer show -D
+
+      - name: Execute tests
+        run: vendor/bin/pest --ci

.gitea/workflows/dependabot-auto-merge.yml

@@ -14,7 +14,7 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.3.0
+        uses: dependabot/fetch-metadata@v2.5.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

.gitea/workflows/fix-php-code-style-issues.yml

@@ -20,7 +20,7 @@ jobs:
           ref: ${{ github.head_ref }}
 
       - name: Fix PHP code style issues
-        uses: aglipanci/laravel-pint-action@2.4
+        uses: aglipanci/laravel-pint-action@2.6
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v5

.github/FUNDING.yml

@@ -1 +0,0 @@
-github: Mattitja AB

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Ask a question
-    url: https://github.com/mattitjaab/laravel-plausible-proxy/discussions/new?category=q-a
-    about: Ask the community for help
-  - name: Request a feature
-    url: https://github.com/mattitjaab/laravel-plausible-proxy/discussions/new?category=ideas
-    about: Share ideas for new features
+  - name: Ask a question or request a feature
+    url: https://git.mattitja.se/559342-9607/laravel-plausible-proxy/issues
+    about: Open an issue in the repository
   - name: Report a security issue
-    url: https://github.com/mattitjaab/laravel-plausible-proxy/security/policy
-    about: Learn how to notify us for sensitive bugs
+    url: mailto:hej@mattitja.se
+    about: Please report security issues privately by email

.github/workflows/phpstan.yml

@@ -1,28 +0,0 @@
-name: PHPStan
-
-on:
-  push:
-    paths:
-      - '**.php'
-      - 'phpstan.neon.dist'
-      - '.github/workflows/phpstan.yml'
-
-jobs:
-  phpstan:
-    name: phpstan
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.4'
-          coverage: none
-
-      - name: Install composer dependencies
-        uses: ramsey/composer-install@v3
-
-      - name: Run PHPStan
-        run: ./vendor/bin/phpstan --error-format=github

.github/workflows/run-tests.yml

@@ -1,55 +0,0 @@
-name: run-tests
-
-on:
-  push:
-    paths:
-      - '**.php'
-      - '.github/workflows/run-tests.yml'
-      - 'phpunit.xml.dist'
-      - 'composer.json'
-      - 'composer.lock'
-
-jobs:
-  test:
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 5
-    strategy:
-      fail-fast: true
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-        php: [8.4]
-        laravel: [11.*]
-        stability: [prefer-lowest, prefer-stable]
-        include:
-          - laravel: 11.*
-            testbench: 9.*
-            carbon: ^2.63
-
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
-          coverage: none
-
-      - name: Setup problem matchers
-        run: |
-          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-      - name: Install dependencies
-        run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.os == 'windows-latest' && '^^^' || '' }}${{ matrix.carbon }}" --no-interaction --no-update
-          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
-
-      - name: List Installed Dependencies
-        run: composer show -D
-
-      - name: Execute tests
-        run: vendor/bin/pest --ci

.gitignore

@@ -30,3 +30,7 @@ phpstan.neon
 testbench.yaml
 /docs
 /coverage
+
+# Ignore Mac DS_Store files
+.DS_Store
+**/.DS_Store

CHANGELOG.md

@@ -1,3 +1,53 @@
 # Changelog
 
 All notable changes to `laravel-plausible-proxy` will be documented in this file.
+
+## v1.5 - 2025-06-25
+
+### What's Changed
+
+* Cleanup by @mathiaspalmqvist in https://github.com/MattitjaAB/laravel-plausible-proxy/pull/8
+
+**Full Changelog**: https://github.com/MattitjaAB/laravel-plausible-proxy/compare/v1.4...v1.5
+
+## v1.4 - 2025-06-16
+
+### What's Changed
+
+* Bump aglipanci/laravel-pint-action from 2.4 to 2.5 by @dependabot in https://github.com/MattitjaAB/laravel-plausible-proxy/pull/3
+* Bump dependabot/fetch-metadata from 2.3.0 to 2.4.0 by @dependabot in https://github.com/MattitjaAB/laravel-plausible-proxy/pull/4
+* Added support for L12 by @mathiaspalmqvist in https://github.com/MattitjaAB/laravel-plausible-proxy/pull/7
+
+### New Contributors
+
+* @dependabot made their first contribution in https://github.com/MattitjaAB/laravel-plausible-proxy/pull/3
+
+**Full Changelog**: https://github.com/MattitjaAB/laravel-plausible-proxy/compare/v1.3...v1.4
+
+## v1.3 - 2025-01-31
+
+### What's Changed
+
+* Remove site by @mathiaspalmqvist in https://github.com/MattitjaAB/laravel-plausible-proxy/pull/2
+
+**Full Changelog**: https://github.com/MattitjaAB/laravel-plausible-proxy/compare/v1.2...v1.3
+
+## v1.2 - 2025-01-31
+
+**Full Changelog**: https://github.com/MattitjaAB/laravel-plausible-proxy/compare/v1.1...v1.2
+
+## v1.1 - 2025-01-31
+
+### What's Changed
+
+* Refactor event forwarding and improve test coverage by @mathiaspalmqvist in https://github.com/MattitjaAB/laravel-plausible-proxy/pull/1
+
+### New Contributors
+
+* @mathiaspalmqvist made their first contribution in https://github.com/MattitjaAB/laravel-plausible-proxy/pull/1
+
+**Full Changelog**: https://github.com/MattitjaAB/laravel-plausible-proxy/compare/v1.0...v1.1
+
+## First release - 2025-01-30
+
+**Full Changelog**: https://github.com/MattitjaAB/laravel-plausible-proxy/commits/v1.0

README.md

@@ -1,21 +1,22 @@
 # laravel-plausible-proxy
 
-[![Latest Version on Packagist](https://img.shields.io/packagist/v/mattitjaab/laravel-plausible-proxy.svg?style=flat-square)](https://packagist.org/packages/mattitjaab/laravel-plausible-proxy)
-[![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/mattitjaab/laravel-plausible-proxy/run-tests.yml?branch=main&label=tests&style=flat-square)](https://github.com/mattitjaab/laravel-plausible-proxy/actions?query=workflow%3Arun-tests+branch%3Amain)
-[![GitHub Code Style Action Status](https://img.shields.io/github/actions/workflow/status/mattitjaab/laravel-plausible-proxy/fix-php-code-style-issues.yml?branch=main&label=code%20style&style=flat-square)](https://github.com/mattitjaab/laravel-plausible-proxy/actions?query=workflow%3A"Fix+PHP+code+style+issues"+branch%3Amain)
-[![Total Downloads](https://img.shields.io/packagist/dt/mattitjaab/laravel-plausible-proxy.svg?style=flat-square)](https://packagist.org/packages/mattitjaab/laravel-plausible-proxy)
+[![Latest Version on Packagist](https://img.shields.io/packagist/v/mattitja/laravel-plausible-proxy.svg?style=flat-square)](https://packagist.org/packages/mattitja/laravel-plausible-proxy)
+[![Tests](https://git.mattitja.se/559342-9607/laravel-plausible-proxy/actions/workflows/ci.yml/badge.svg?branch=main)](https://git.mattitja.se/559342-9607/laravel-plausible-proxy/actions?workflow=ci.yml)
+[![Code Style](https://git.mattitja.se/559342-9607/laravel-plausible-proxy/actions/workflows/fix-php-code-style-issues.yml/badge.svg?branch=main)](https://git.mattitja.se/559342-9607/laravel-plausible-proxy/actions?workflow=fix-php-code-style-issues.yml)
+[![Total Downloads](https://img.shields.io/packagist/dt/mattitja/laravel-plausible-proxy.svg?style=flat-square)](https://packagist.org/packages/mattitja/laravel-plausible-proxy)
 
 A Laravel package for proxying Plausible Analytics, improving performance and privacy.
 
 ## Requirements
-- Laravel 11
-- PHP 8.4+
 
-## 🚀 Installation
+- Laravel 12 or 13
+- PHP 8.3, 8.4 or 8.5
+
+## Installation
 
 1. Install the package via Composer:
    ```sh
-   composer require mattitjaab/laravel-plausible-proxy
+   composer require mattitja/laravel-plausible-proxy
    ```
 
 2. Publish the configuration file:
@@ -23,65 +24,86 @@ A Laravel package for proxying Plausible Analytics, improving performance and pr
    php artisan vendor:publish --tag=plausible-proxy-config
    ```
 
-3. Add the following environment variables to your `.env` file:
+3. Add the following environment variable to your `.env` file:
    ```env
    PLAUSIBLE_DOMAIN=https://plausible.io
-   PLAUSIBLE_SITE=example.com
    ```
 
-4. **(Optional)** If you want to use Laravel Queues to send events in the background, ensure your queue driver is set up correctly:
-   ```env
-   QUEUE_CONNECTION=database
-   ```
-   Then run migrations to create the necessary queue tables:
-   ```sh
-   php artisan queue:table
-   php artisan migrate
-   ```
+## Configuration
 
-## ⚙️ Configuration
-
-The `config/plausible-proxy.php` file allows you to customize the package settings:
+The `config/plausible-proxy.php` file allows you to customize the Plausible domain:
 
 ```php
 return [
     'domain' => env('PLAUSIBLE_DOMAIN', 'https://plausible.io'),
-    'site' => env('PLAUSIBLE_SITE', 'example.com'),
+    'script' => env('PLAUSIBLE_SCRIPT', 'js/script.js'),
 ];
 ```
 
-## 🔥 Usage
+`PLAUSIBLE_SCRIPT` is the path of the script on your Plausible instance. Whatever script you choose, it is always served locally from `/js/script.js`.
+
+## Usage
+
+### 1. Proxying the JavaScript file
 
-### **1. Proxying the JavaScript file**
 This package proxies Plausible's `script.js` while caching it to improve performance and reduce external requests.
 
 After installation, you can include the script like this:
+
 ```html
 <script defer data-domain="example.com" src="/js/script.js"></script>
 ```
 
-The route `/js/script.js` is automatically handled and caches the script for **6 hours**.
+The route `/js/script.js` is handled automatically and caches the script for 6 hours.
 
-### **2. Sending Events to Plausible**
-Instead of sending events directly to `plausible.io`, you can now send them to `/api/event`, and they will be queued and processed asynchronously.
+#### Site-specific script (pa-XXXXX.js)
 
-Example request:
-```sh
-curl -X POST "https://example.com/api/event" \
-     -H "Content-Type: application/json" \
-     -d '{"n":"pageview","u":"https://example.com/page","d":"example.com"}'
+Plausible's current installation instructions use a site-specific script such as `https://plausible.io/js/pa-12345ABCDE.js`, where optional measurements (outbound links, file downloads, etc.) are configured in the Plausible dashboard. To use it, set the script path in your `.env`:
+
+```env
+PLAUSIBLE_SCRIPT=js/pa-12345ABCDE.js
 ```
 
-## ✅ Features
+Then load it locally and tell it to send events through the proxy with the `endpoint` option:
 
-- 🚀 **Fast & Optimized**: Caches the Plausible script to reduce external calls.
-- 🔒 **Privacy-Friendly**: Prevents direct calls to `plausible.io`.
-- 📊 **Improved Performance**: Events are processed via Laravel Queues to avoid blocking user interactions.
-- 🛠 **Fully Configurable**: Easily set your own Plausible instance and domain via `.env`.
+```html
+<script async src="/js/script.js"></script>
+<script>
+  window.plausible=window.plausible||function(){(plausible.q=plausible.q||[]).push(arguments)},plausible.init=plausible.init||function(i){plausible.o=i||{}};
+  plausible.init({ endpoint: '/api/event' })
+</script>
+```
 
-## 🛠 Testing
+#### Legacy script extensions
+
+Legacy script variants work the same way, for example:
+
+```env
+PLAUSIBLE_SCRIPT=js/script.outbound-links.js
+```
+
+### 2. Sending events to Plausible
+
+The script loaded from `/js/script.js` sends events to `/api/event` on your own domain, which forwards them to Plausible. This helps prevent blocking by ad blockers.
+
+Only the visitor's `User-Agent` and IP address (as `X-Forwarded-For`) are forwarded to Plausible, which is what Plausible needs to count unique visitors. Cookies and other request headers are never forwarded.
+
+If your application runs behind a load balancer or reverse proxy, make sure Laravel's [trusted proxies](https://laravel.com/docs/requests#configuring-trusted-proxies) are configured so the correct visitor IP is resolved.
+
+## Upgrading from mattitjaab/laravel-plausible-proxy
+
+Version 2.0 renames the package and its namespace:
+
+1. Replace the package:
+   ```sh
+   composer remove mattitjaab/laravel-plausible-proxy
+   composer require mattitja/laravel-plausible-proxy
+   ```
+2. If you reference any package classes directly, change the namespace from `MattitjaAB\LaravelPlausibleProxy` to `Mattitja\LaravelPlausibleProxy`.
+3. Laravel 10 is no longer supported.
+
+## Testing
 
-You can run tests with:
 ```sh
 composer test
 ```
@@ -90,18 +112,13 @@ composer test
 
 Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed recently.
 
-## Contributing
-
-Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
-
 ## Security Vulnerabilities
 
-Please review [our security policy](../../security/policy) on how to report security vulnerabilities.
+Please report security vulnerabilities by email to hej@mattitja.se.
 
 ## Credits
 
 - [Mathias Palmqvist](https://github.com/mathiaspalmqvist)
-- [All Contributors](../../contributors)
 
 ## License
 

composer.json

@@ -1,14 +1,13 @@
 {
-    "name": "mattitjaab/laravel-plausible-proxy",
+    "name": "mattitja/laravel-plausible-proxy",
     "description": "A Laravel package for proxying Plausible Analytics, improving performance and privacy.",
     "keywords": [
-        "Mattitja AB",
-        "MattitjaAB",
+        "Mattitja",
         "laravel",
         "laravel-plausible-proxy",
         "plausible"
     ],
-    "homepage": "https://github.com/mattitjaab/laravel-plausible-proxy",
+    "homepage": "https://git.mattitja.se/559342-9607/laravel-plausible-proxy",
     "license": "MIT",
     "authors": [
         {
@@ -18,33 +17,31 @@
         }
     ],
     "require": {
-        "php": "^8.4",
+        "php": "^8.3",
         "spatie/laravel-package-tools": "^1.16",
-        "illuminate/contracts": "^10.0||^11.0"
+        "illuminate/contracts": "^12.0||^13.0"
     },
     "require-dev": {
         "laravel/pint": "^1.14",
-        "nunomaduro/collision": "^8.1.1||^7.10.0",
-        "larastan/larastan": "^2.9",
-        "orchestra/testbench": "^9.0.0||^8.22.0",
-        "pestphp/pest": "^3.0",
-        "pestphp/pest-plugin-arch": "^3.0",
-        "pestphp/pest-plugin-laravel": "^3.0",
+        "nunomaduro/collision": "^8.1",
+        "larastan/larastan": "^3.0",
+        "orchestra/testbench": "^10.0||^11.0",
+        "pestphp/pest": "^3.0||^4.0",
+        "pestphp/pest-plugin-arch": "^3.0||^4.0",
+        "pestphp/pest-plugin-laravel": "^3.0||^4.0",
         "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan-deprecation-rules": "^1.1",
-        "phpstan/phpstan-phpunit": "^1.3",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
         "spatie/laravel-ray": "^1.35"
     },
     "autoload": {
         "psr-4": {
-            "MattitjaAB\\LaravelPlausibleProxy\\": "src/",
-            "MattitjaAB\\LaravelPlausibleProxy\\Database\\Factories\\": "database/factories/"
+            "Mattitja\\LaravelPlausibleProxy\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "MattitjaAB\\LaravelPlausibleProxy\\Tests\\": "tests/",
-            "Workbench\\App\\": "workbench/app/"
+            "Mattitja\\LaravelPlausibleProxy\\Tests\\": "tests/"
         }
     },
     "scripts": {
@@ -65,11 +62,8 @@
     "extra": {
         "laravel": {
             "providers": [
-                "MattitjaAB\\LaravelPlausibleProxy\\LaravelPlausibleProxyServiceProvider"
-            ],
-            "aliases": {
-                "LaravelPlausibleProxy": "MattitjaAB\\LaravelPlausibleProxy\\Facades\\LaravelPlausibleProxy"
-            }
+                "Mattitja\\LaravelPlausibleProxy\\LaravelPlausibleProxyServiceProvider"
+            ]
         }
     },
     "minimum-stability": "dev",

config/plausible-proxy.php

@@ -3,6 +3,17 @@
 // Config for Laravel Plausible Proxy
 
 return [
+    /*
+     * The Plausible instance to proxy, e.g. https://plausible.io or your
+     * self-hosted instance.
+     */
     'domain' => env('PLAUSIBLE_DOMAIN', 'https://plausible.io'),
-    'site' => env('PLAUSIBLE_SITE', 'example.com'),
+
+    /*
+     * Path of the script to fetch from the Plausible instance. Use this for
+     * site-specific scripts (e.g. js/pa-12345ABCDE.js) or legacy script
+     * extensions (e.g. js/script.outbound-links.js). The script is always
+     * served locally from /js/script.js.
+     */
+    'script' => env('PLAUSIBLE_SCRIPT', 'js/script.js'),
 ];

database/factories/ModelFactory.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace MattitjaAB\LaravelPlausibleProxy\Database\Factories;
-
-use Illuminate\Database\Eloquent\Factories\Factory;
-
-/*
-class ModelFactory extends Factory
-{
-    protected $model = YourModel::class;
-
-    public function definition()
-    {
-        return [
-
-        ];
-    }
-}
-*/

database/migrations/create_plausible_proxy_table.php.stub

@@ -1,19 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up()
-    {
-        Schema::create('laravel_plausible_proxy_table', function (Blueprint $table) {
-            $table->id();
-
-            // add fields
-
-            $table->timestamps();
-        });
-    }
-};

phpstan.neon.dist

@@ -6,7 +6,10 @@ parameters:
     paths:
         - src
         - config
-        - database
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true
+    ignoreErrors:
+        -
+            identifier: larastan.noEnvCallsOutsideOfConfig
+            path: config/plausible-proxy.php

phpunit.xml.dist

@@ -16,7 +16,7 @@
     backupStaticProperties="false"
 >
     <testsuites>
-        <testsuite name="MattitjaAB Test Suite">
+        <testsuite name="Mattitja Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>

routes/api.php

@@ -1,26 +1,6 @@
 <?php
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Concurrency;
-use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\Validator;
+use Mattitja\LaravelPlausibleProxy\Http\Controllers\PlausibleEventApiController;
 
-Route::post('api/event', function (Request $request) {
-    $validator = Validator::make($request->all(), [
-        'n' => 'required|string',
-        'u' => 'required|url',
-        'd' => 'required|string',
-        'r' => 'nullable|url',
-        'm' => 'nullable|string',
-        'p' => 'nullable|array',
-    ]);
-
-    if ($validator->fails()) {
-        return response()->json(['status' => 'error', 'errors' => $validator->errors()], 422);
-    }
-
-    Concurrency::defer(fn () => Http::post(config('plausible-proxy.domain').'/api/event', $request->all()));
-
-    return response()->json(['status' => 'queued']);
-});
+Route::post('api/event', PlausibleEventApiController::class);

routes/web.php

@@ -1,34 +1,6 @@
 <?php
 
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
+use Mattitja\LaravelPlausibleProxy\Http\Controllers\PlausibleScriptProxyController;
 
-Route::get('/js/script.js', function () {
-    $plausibleDomain = config('plausible-proxy.domain');
-
-    if (Cache::has('plausible_script_js')) {
-        return response(Cache::get('plausible_script_js'))
-            ->header('Content-Type', 'application/javascript')
-            ->header('Cache-Control', 'public, max-age=86400');
-    }
-
-    $response = Http::timeout(5)->get("{$plausibleDomain}/js/script.js");
-
-    if ($response->successful()) {
-        $script = $response->body();
-        Cache::put('plausible_script_js', $script, now()->addHours(6));
-
-        return response($script)
-            ->header('Content-Type', 'application/javascript')
-            ->header('Cache-Control', 'public, max-age=86400');
-    }
-
-    return response('Error fetching Plausible script', 500);
-});
-
-Route::get('/api/routes', function () {
-    return response()->json(
-        collect(Route::getRoutes())->map(fn ($route) => $route->uri())
-    );
-});
+Route::get('/js/script.js', PlausibleScriptProxyController::class);

src/Commands/LaravelPlausibleProxyCommand.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace MattitjaAB\LaravelPlausibleProxy\Commands;
-
-use Illuminate\Console\Command;
-
-class LaravelPlausibleProxyCommand extends Command
-{
-    public $signature = 'laravel-plausible-proxy';
-
-    public $description = 'My command';
-
-    public function handle(): int
-    {
-        $this->comment('All done');
-
-        return self::SUCCESS;
-    }
-}

src/Facades/LaravelPlausibleProxy.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace MattitjaAB\LaravelPlausibleProxy\Facades;
-
-use Illuminate\Support\Facades\Facade;
-
-/**
- * @see \MattitjaAB\LaravelPlausibleProxy\LaravelPlausibleProxy
- */
-class LaravelPlausibleProxy extends Facade
-{
-    protected static function getFacadeAccessor(): string
-    {
-        return \MattitjaAB\LaravelPlausibleProxy\LaravelPlausibleProxy::class;
-    }
-}

src/Http/Controllers/PlausibleEventApiController.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Mattitja\LaravelPlausibleProxy\Http\Controllers;
+
+use Illuminate\Http\Client\ConnectionException;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+use Mattitja\LaravelPlausibleProxy\Http\Requests\PlausibleEventRequest;
+
+class PlausibleEventApiController
+{
+    public function __invoke(PlausibleEventRequest $request): Response
+    {
+        $url = rtrim((string) config('plausible-proxy.domain'), '/').'/api/event';
+
+        try {
+            $upstream = Http::timeout(5)
+                ->withHeaders([
+                    'User-Agent' => (string) $request->userAgent(),
+                    'X-Forwarded-For' => (string) $request->ip(),
+                ])
+                ->post($url, $request->all());
+        } catch (ConnectionException $e) {
+            Log::error('Failed to forward Plausible event: '.$e->getMessage());
+
+            return response('Bad Gateway', 502);
+        }
+
+        return response($upstream->body(), $upstream->status())
+            ->header('Content-Type', $upstream->header('Content-Type') ?: 'text/plain');
+    }
+}

src/Http/Controllers/PlausibleScriptProxyController.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Mattitja\LaravelPlausibleProxy\Http\Controllers;
+
+use Illuminate\Http\Client\RequestException;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+
+class PlausibleScriptProxyController
+{
+    public function __invoke(): Response
+    {
+        $url = rtrim((string) config('plausible-proxy.domain'), '/')
+            .'/'.ltrim((string) config('plausible-proxy.script', 'js/script.js'), '/');
+
+        try {
+            $script = Cache::remember(
+                key: 'plausible_script_js:'.md5($url),
+                ttl: now()->addHours(6),
+                callback: fn () => Http::timeout(5)->get($url)->throw()->body(),
+            );
+        } catch (RequestException $e) {
+            Log::error('Failed to fetch Plausible script: '.$e->getMessage());
+
+            return response('Error fetching Plausible script', 500);
+        }
+
+        return response($script)
+            ->header('Content-Type', 'application/javascript')
+            ->header('Cache-Control', 'public, max-age=86400');
+    }
+}

src/Http/Requests/PlausibleEventRequest.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Mattitja\LaravelPlausibleProxy\Http\Requests;
+
+use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Http\Exceptions\HttpResponseException;
+
+class PlausibleEventRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * The Plausible tracker sends its JSON payload with a text/plain content
+     * type, which Laravel does not parse automatically.
+     */
+    protected function prepareForValidation(): void
+    {
+        if ($this->isJson()) {
+            return;
+        }
+
+        $payload = json_decode($this->getContent(), true);
+
+        if (is_array($payload)) {
+            $this->merge($payload);
+        }
+    }
+
+    protected function failedValidation(Validator $validator): void
+    {
+        if (! $this->expectsJson()) {
+            throw new HttpResponseException(response('Bad Request', 400));
+        }
+
+        parent::failedValidation($validator);
+    }
+
+    public function rules(): array
+    {
+        return [
+            'n' => ['required', 'string'],
+            'u' => ['required', 'url'],
+            'd' => ['required', 'string'],
+            'r' => ['nullable', 'url'],
+            'm' => ['nullable', 'string'],
+            'p' => ['nullable', function (string $attribute, mixed $value, \Closure $fail) {
+                if (is_array($value)) {
+                    return;
+                }
+
+                if (! is_string($value) || ! is_array(json_decode($value, true))) {
+                    $fail("The {$attribute} field must be an object or a JSON-encoded object.");
+                }
+            }],
+        ];
+    }
+}

src/LaravelPlausibleProxy.php

@@ -1,5 +0,0 @@
-<?php
-
-namespace MattitjaAB\LaravelPlausibleProxy;
-
-class LaravelPlausibleProxy {}

src/LaravelPlausibleProxyServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace MattitjaAB\LaravelPlausibleProxy;
+namespace Mattitja\LaravelPlausibleProxy;
 
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;

tests/Pest.php

@@ -1,5 +1,5 @@
 <?php
 
-use MattitjaAB\LaravelPlausibleProxy\Tests\TestCase;
+use Mattitja\LaravelPlausibleProxy\Tests\TestCase;
 
 uses(TestCase::class)->in(__DIR__);

tests/PlausibleProxyTest.php

@@ -1,30 +1,61 @@
 <?php
 
-use Illuminate\Support\Facades\Cache;
+use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Support\Facades\Http;
 
-it('returns plausible script from cache', function () {
-    Cache::put('plausible_script_js', 'console.log("Cached script");', now()->addHours(6));
-
-    $response = $this->get('/js/script.js');
-
-    $response->assertStatus(200)
-        ->assertHeader('Content-Type', 'application/javascript')
-        ->assertSee('Cached script');
-});
-
-it('fetches plausible script if not cached', function () {
+it('fetches plausible script and caches it', function () {
     Http::fake([
         'https://plausible.io/js/script.js' => Http::response('console.log("Plausible script");', 200),
     ]);
 
-    $response = $this->get('/js/script.js');
-
-    $response->assertStatus(200)
+    $this->get('/js/script.js')
+        ->assertStatus(200)
         ->assertHeader('Content-Type', 'application/javascript')
         ->assertSee('Plausible script');
 
-    expect(Cache::get('plausible_script_js'))->toBe('console.log("Plausible script");');
+    $this->get('/js/script.js')
+        ->assertStatus(200)
+        ->assertSee('Plausible script');
+
+    Http::assertSentCount(1);
+});
+
+it('fetches a custom script path', function () {
+    config()->set('plausible-proxy.script', 'js/pa-12345ABCDE.js');
+
+    Http::fake([
+        'https://plausible.io/js/pa-12345ABCDE.js' => Http::response('console.log("Custom script");', 200),
+    ]);
+
+    $this->get('/js/script.js')
+        ->assertStatus(200)
+        ->assertSee('Custom script');
+
+    Http::assertSent(fn ($request) => $request->url() === 'https://plausible.io/js/pa-12345ABCDE.js');
+});
+
+it('handles trailing and leading slashes in domain and script path', function () {
+    config()->set('plausible-proxy.domain', 'https://plausible.example.com/');
+    config()->set('plausible-proxy.script', '/js/script.outbound-links.js');
+
+    Http::fake([
+        'https://plausible.example.com/js/script.outbound-links.js' => Http::response('console.log("Outbound");', 200),
+    ]);
+
+    $this->get('/js/script.js')->assertStatus(200)->assertSee('Outbound');
+});
+
+it('does not serve a cached script after the script path changes', function () {
+    Http::fake([
+        'https://plausible.io/js/script.js' => Http::response('console.log("Old script");', 200),
+        'https://plausible.io/js/pa-12345ABCDE.js' => Http::response('console.log("New script");', 200),
+    ]);
+
+    $this->get('/js/script.js')->assertSee('Old script');
+
+    config()->set('plausible-proxy.script', 'js/pa-12345ABCDE.js');
+
+    $this->get('/js/script.js')->assertSee('New script');
 });
 
 it('handles failed script fetch', function () {
@@ -46,29 +77,125 @@ it('rejects invalid event data', function () {
     ]);
 
     $response->assertStatus(422)
-        ->assertJsonStructure(['status', 'errors']);
+        ->assertJsonValidationErrors(['u' => 'The u field must be a valid URL.']);
 });
 
-it('accepts valid event data and defers request', function () {
-    Http::fake();
+it('forwards only user agent and client ip to plausible', function () {
+    config()->set('plausible-proxy.domain', 'https://plausible.io');
 
-    $concurrencyMock = Mockery::mock('alias:Illuminate\Support\Facades\Concurrency');
-    $concurrencyMock->shouldReceive('defer')->once()->andReturnUsing(function ($callback) {
-        $callback();
+    Http::fake([
+        'https://plausible.io/api/event' => Http::response('ok', 202),
+    ]);
+
+    $response = $this->withServerVariables(['REMOTE_ADDR' => '203.0.113.7'])
+        ->postJson('/api/event', [
+            'n' => 'pageview',
+            'u' => 'https://example.com/page',
+            'd' => 'example.com',
+        ], [
+            'User-Agent' => 'TestAgent',
+            'Cookie' => 'laravel_session=secret',
+            'Authorization' => 'Bearer secret',
+        ]);
+
+    $response->assertStatus(202);
+    expect($response->getContent())->toBe('ok');
+
+    Http::assertSentCount(1);
+
+    Http::assertSent(function ($request) {
+        return $request->url() === 'https://plausible.io/api/event'
+            && $request->header('User-Agent') === ['TestAgent']
+            && $request->header('X-Forwarded-For') === ['203.0.113.7']
+            && ! $request->hasHeader('Cookie')
+            && ! $request->hasHeader('Authorization')
+            && $request['n'] === 'pageview'
+            && $request['u'] === 'https://example.com/page'
+            && $request['d'] === 'example.com';
     });
+});
 
-    $response = $this->postJson('/api/event', [
+it('forwards additional plausible fields', function () {
+    config()->set('plausible-proxy.domain', 'https://plausible.io');
+
+    Http::fake([
+        'https://plausible.io/api/event' => Http::response('ok', 202),
+    ]);
+
+    $this->postJson('/api/event', [
+        'n' => 'Purchase',
+        'u' => 'https://example.com/checkout',
+        'd' => 'example.com',
+        'i' => false,
+        'p' => '{"plan":"pro"}',
+        '$' => ['amount' => '9.99', 'currency' => 'EUR'],
+    ])->assertStatus(202);
+
+    Http::assertSent(function ($request) {
+        return $request['i'] === false
+            && $request['p'] === '{"plan":"pro"}'
+            && $request['$'] === ['amount' => '9.99', 'currency' => 'EUR'];
+    });
+});
+
+it('rejects invalid props', function () {
+    $this->postJson('/api/event', [
         'n' => 'pageview',
         'u' => 'https://example.com/page',
         'd' => 'example.com',
+        'p' => 'not-json',
+    ])->assertStatus(422)->assertJsonValidationErrors(['p']);
+});
+
+it('accepts events sent as text/plain by the plausible tracker', function () {
+    Http::fake([
+        'https://plausible.io/api/event' => Http::response('ok', 202),
     ]);
 
-    $response->assertStatus(200)
-        ->assertJson(['status' => 'queued']);
+    $this->call('POST', '/api/event', [], [], [], ['CONTENT_TYPE' => 'text/plain'], json_encode([
+        'n' => 'pageview',
+        'u' => 'https://example.com/page',
+        'd' => 'example.com',
+        'r' => null,
+    ]))->assertStatus(202);
 
-    Http::assertSent(fn ($request) => $request->url() === config('plausible-proxy.domain').'/api/event' &&
-        $request['n'] === 'pageview'
-    );
-
-    Mockery::close();
+    Http::assertSent(fn ($request) => $request->url() === 'https://plausible.io/api/event'
+        && $request['n'] === 'pageview'
+        && $request['u'] === 'https://example.com/page'
+        && $request['d'] === 'example.com');
+});
+
+it('responds with 400 for invalid text/plain events', function () {
+    Http::fake();
+
+    $this->call('POST', '/api/event', [], [], [], ['CONTENT_TYPE' => 'text/plain'], 'not-json')
+        ->assertStatus(400);
+
+    Http::assertNothingSent();
+});
+
+it('handles a trailing slash in the domain when forwarding events', function () {
+    config()->set('plausible-proxy.domain', 'https://plausible.example.com/');
+
+    Http::fake([
+        'https://plausible.example.com/api/event' => Http::response('ok', 202),
+    ]);
+
+    $this->postJson('/api/event', [
+        'n' => 'pageview',
+        'u' => 'https://example.com/page',
+        'd' => 'example.com',
+    ])->assertStatus(202);
+
+    Http::assertSent(fn ($request) => $request->url() === 'https://plausible.example.com/api/event');
+});
+
+it('responds with 502 when plausible is unreachable', function () {
+    Http::fake(fn () => throw new ConnectionException('Connection refused'));
+
+    $this->postJson('/api/event', [
+        'n' => 'pageview',
+        'u' => 'https://example.com/page',
+        'd' => 'example.com',
+    ])->assertStatus(502);
 });

tests/TestCase.php

@@ -1,22 +1,12 @@
 <?php
 
-namespace MattitjaAB\LaravelPlausibleProxy\Tests;
+namespace Mattitja\LaravelPlausibleProxy\Tests;
 
-use Illuminate\Database\Eloquent\Factories\Factory;
-use MattitjaAB\LaravelPlausibleProxy\LaravelPlausibleProxyServiceProvider;
+use Mattitja\LaravelPlausibleProxy\LaravelPlausibleProxyServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
 
 class TestCase extends Orchestra
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        Factory::guessFactoryNamesUsing(
-            fn (string $modelName) => 'MattitjaAB\\LaravelPlausibleProxy\\Database\\Factories\\'.class_basename($modelName).'Factory'
-        );
-    }
-
     protected function getPackageProviders($app)
     {
         return [