Merge branch 'main' of https://code.caldwell.digital/home/torsearch

.env

@@ -13,7 +13,7 @@
 #
 # Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
-
+APP_URL=
 ###> symfony/framework-bundle ###
 APP_ENV=prod
 APP_SECRET=
@@ -27,6 +27,7 @@ APP_SECRET=
 # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
 # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
 # DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8"
+DATABASE_URL=
 
 ###< doctrine/doctrine-bundle ###
 MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"

.gitea/workflows/sonarqube_scans.yml

@@ -1,24 +1,29 @@
-on:
+name: CI
-  push:
+
-    branches:
+on: [push]
-      - main
-  pull_request:
-    types: [opened, synchronize, reopened]
 
-name: SonarQube Scan
 jobs:
-  sonarqube:
+  build-test:
-    name: SonarQube Trigger
     runs-on: ubuntu-latest
+
     steps:
-      - name: Checking out
+      - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
+      
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2 
         with:
-          fetch-depth: 0
+          php-version: '8.4'
-      - name: SonarQube Scan
+
-        uses: https://code.caldwell.digital/tools/sonarqube-action@v0.0.3
+      - name: Install phing
-        with:
+        run: composer global require phing/phing
-          host: "https://qube.caldwell.digital"
+
-          login: ${{ secrets.SONARQUBE_TOKEN }}
+      - name: Run composer
-          projectName: "torsearch"
+        run: composer install --no-dev --no-scripts -o
-          projectBaseDir: "./src"
+  
+      - name: Build tailwind
+        run: APP_ENV=build php bin/console tailwind:build
+      
+      - name: Compile assets
+        run: APP_ENV=build php bin/console asset-map:compile
+  

assets/bootstrap.js

@@ -5,6 +5,7 @@ import DownloadOptionTr from './components/download-option-tr.js';
 import DownloadListRow from './components/download-list-row.js';
 import MonitorListRow from './components/monitor-list-row.js';
 import MovieContainer   from "./components/movie-container.js";
+import StatusCheckerSpan from "./components/status-checker-span.js";
 
 import { startStimulusApp } from '@symfony/stimulus-bundle';
 import Popover from '@stimulus-components/popover';
@@ -24,3 +25,4 @@ customElements.define('movie-container', MovieContainer);
 customElements.define('dl-tr', DownloadOptionTr, {extends: 'tr'});
 customElements.define('download-list-row', DownloadListRow, {extends: 'tr'});
 customElements.define('monitor-list-row', MonitorListRow, {extends: 'tr'});
+customElements.define('status-checker-span', StatusCheckerSpan, {extends: 'span'});

assets/components/status-checker-span.js

@@ -0,0 +1,40 @@
+export default class PreviewContentDialog extends HTMLSpanElement {
+    #url;
+    #service;
+    #status;
+
+    #statusTexts = {
+        200: 'up',
+        204: 'up'
+    }
+
+    #statusColors = {
+        200: 'bg-green-500',
+        204: 'bg-green-500'
+    }
+
+    constructor() {
+        super();
+        this.#url = this.getAttribute('url');
+        this.#service = this.getAttribute('service');
+
+        (async () => await this.checkStatus())();
+        setInterval(async () => await this.checkStatus(), 1000 * 60 * 10);
+    }
+
+    async checkStatus() {
+        const response = await fetch(this.#url);
+        this.#status = response.status;
+        this.setAttribute('title', this.getTitle());
+        this.classList.remove('bg-red-500', 'bg-green-500');
+        this.classList.add(this.getColor());
+    }
+
+    getTitle() {
+        return `${this.#service} is ${this.#statusTexts[this.#status] ?? 'down'}`
+    }
+
+    getColor() {
+        return this.#statusColors[this.#status] ?? 'bg-red-500';
+    }
+}

config/packages/sentry.yaml

@@ -1,40 +1,43 @@
-sentry:
+when@prod: &prod
-    register_error_listener: true # Disables the ErrorListener to avoid duplicated log in sentry
+    sentry:
-    register_error_handler: true # Disables the ErrorListener, ExceptionListener and FatalErrorListener integrations of the base PHP SDK
+        register_error_listener: true # Disables the ErrorListener to avoid duplicated log in sentry
+        register_error_handler: true # Disables the ErrorListener, ExceptionListener and FatalErrorListener integrations of the base PHP SDK
 
-    options:
+        options:
-        release: 'torsearch@%app.version%'
+            release: 'torsearch@%app.version%'
-        enable_logs: true
+            enable_logs: true
-        traces_sample_rate: 1
+            traces_sample_rate: 1
-        profiles_sample_rate: 1
+            profiles_sample_rate: 1
-        attach_stacktrace: true
+            attach_stacktrace: true
 
-    tracing:
+        tracing:
-        enabled: true
-        dbal: # DB queries
-            enabled: true
-        cache: # cache pools
-            enabled: true
-        twig: # templating engine
             enabled: true
+            dbal: # DB queries
+                enabled: true
+            cache: # cache pools
+                enabled: true
+            twig: # templating engine
+                enabled: true
 
-services:
+    services:
-    # (Optionally) Configure the breadcrumb handler as a service (needed for the breadcrumb Monolog handler)
+        # (Optionally) Configure the breadcrumb handler as a service (needed for the breadcrumb Monolog handler)
-    Sentry\Monolog\BreadcrumbHandler:
+        Sentry\Monolog\BreadcrumbHandler:
-        arguments:
+            arguments:
-            - '@Sentry\State\HubInterface'
+                - '@Sentry\State\HubInterface'
-            - !php/const Monolog\Logger::INFO # Configures the level of messages to capture as breadcrumbs
+                - !php/const Monolog\Logger::INFO # Configures the level of messages to capture as breadcrumbs
-monolog:
+    monolog:
-    handlers:
+        handlers:
-        # (Optionally) Register the breadcrumb handler as a Monolog handler
+            # (Optionally) Register the breadcrumb handler as a Monolog handler
-        sentry_breadcrumbs:
+            sentry_breadcrumbs:
-            type: service
+                type: service
-            name: sentry_breadcrumbs
+                name: sentry_breadcrumbs
-            id: Sentry\Monolog\BreadcrumbHandler
+                id: Sentry\Monolog\BreadcrumbHandler
-        # Register the handler as a Monolog handler to capture messages as events
+            # Register the handler as a Monolog handler to capture messages as events
-        sentry:
+            sentry:
-            type: sentry
+                type: sentry
-            level: !php/const Monolog\Logger::ERROR # Configures the level of messages to capture as events
+                level: !php/const Monolog\Logger::ERROR # Configures the level of messages to capture as events
-            hub_id: Sentry\State\HubInterface
+                hub_id: Sentry\State\HubInterface
-            fill_extra_context: true # Enables sending monolog context to Sentry
+                fill_extra_context: true # Enables sending monolog context to Sentry
-            process_psr_3_messages: false # Disables the resolution of PSR-3 placeholders in reported messages
+                process_psr_3_messages: false # Disables the resolution of PSR-3 placeholders in reported messages
+
+when@dev: *prod

tailwind.config.js

@@ -18,9 +18,13 @@ module.exports = {
       "bg-green-400",
       "bg-purple-400",
       "bg-orange-400",
+      "bg-red-500",
+      "bg-green-500",
       "bg-blue-600",
       "bg-rose-600",
       "bg-black/20",
+      "text-red-500",
+      "text-green-500",
       "alert-success",
       "alert-warning",
       "font-bold",

templates/components/Header.html.twig

@@ -6,6 +6,20 @@
             <div class="md:flex md:items-center md:gap-12">
                 <nav aria-label="Global" class="md:block">
                     <ul class="ml-4 flex items-end md:items-center md:gap-6 text-sm">
+                        <li>
+                            <div class="flex flex-row justify-center items-start gap-2 p-2 w-10 mt-1 h-6 rounded-lg border border-orange-500 text-orange-500">
+                                <status-checker-span
+                                        class="h-2 w-2 rounded-full text-green-600 bg-green-600"
+                                        url="https://torrentio.strem.fun"
+                                        service="Torrentio">
+                                </status-checker-span>
+                                <status-checker-span
+                                        class="h-2 w-2 rounded-full text-green-600 bg-green-600"
+                                        url="https://api.themoviedb.org/3"
+                                        service="TMDB">
+                                </status-checker-span>
+                            </div>
+                        </li>
                         <li>
                             <a href="{{ path('app.monitor.upcoming-episodes') }}" data-turbo="false" title="View upcoming episodes of the shows you're subscribed to.">
                                 <twig:ux:icon name="solar:calendar-linear" width="25px" class="text-orange-500" />