Persist icons and altsvcs on Postgres (#2189)

* Persist icons and altsvcs on Postgres

* Fix list API to terminate SQL output with LF

README.md

@@ -83,7 +83,7 @@ BuildKit（または Docker の対応するバージョン）あるいは Builda
 - `docker build` を利用する場合: Docker 18.09 以上
 - `docker buildx` を利用する場合: Docker 19.03 以上
 
-nginx + PHP-FPM + PostgreSQL + Redis で構成されています。
+nginx + PHP-FPM + PostgreSQL で構成されています。
 
 ### 設定
 
@@ -105,8 +105,6 @@ $ export HOMOCHECKER_DB_SSLCERT=/path/to/sslcert
 $ export HOMOCHECKER_DB_SSLKEY=/path/to/sslkey
 $ export HOMOCHECKER_DB_SSLROOTCERT=/path/to/sslrootcert
 $ export HOMOCHECKER_LOG_LEVEL=debug
-$ export HOMOCHECKER_REDIS_HOST=redis
-$ export HOMOCHECKER_REDIS_PORT=6379
 $ export HOMOCHECKER_TWITTER_CONSUMER_KEY=
 $ export HOMOCHECKER_TWITTER_CONSUMER_SECRET=
 $ export HOMOCHECKER_TWITTER_TOKEN=

api/Dockerfile

@@ -98,11 +98,9 @@ RUN --mount=type=cache,id=api:/var/cache/apt,target=/var/cache/apt \
     make clean && \
     ln -s /etc/ssl /usr/local/ssl && \
     pecl install \
-        apcu \
-        redis && \
+        apcu && \
     docker-php-ext-enable \
-        apcu \
-        redis && \
+        apcu && \
     docker-php-ext-install \
         opcache \
         pdo_pgsql && \

api/composer.json

@@ -4,12 +4,10 @@
     "require": {
         "guzzlehttp/guzzle": "^7.5",
         "guzzlehttp/oauth-subscriber": "^0.6.0",
-        "illuminate/cache": "^9.43",
         "illuminate/config": "^9.43",
         "illuminate/database": "^9.43",
         "illuminate/events": "^9.43",
         "illuminate/log": "^9.43",
-        "illuminate/redis": "^9.43",
         "middlewares/access-log": "^2.1",
         "phpoption/phpoption": "^1.9",
         "promphp/prometheus_client_php": "^2.6",

api/src/Contracts/Repository/AltsvcRepository.php

@@ -0,0 +1,21 @@
+<?php
+declare(strict_types=1);
+
+namespace HomoChecker\Contracts\Repository;
+
+interface AltsvcRepository
+{
+    /**
+     * Retrieve all entries.
+     * @return \stdClass[] The entries.
+     */
+    public function findAll(): array;
+
+    /**
+     * Save the entry.
+     * @param string $url      The URL.
+     * @param string $protocol The protocol ID.
+     * @param string $maxAge   The max age.
+     */
+    public function save(string $url, string $protocol, string $maxAge): void;
+}

api/src/Contracts/Repository/ProfileRepository.php

@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace HomoChecker\Contracts\Repository;
+
+interface ProfileRepository
+{
+    /**
+     * Save the profile.
+     * @param string $screenName The screen name.
+     * @param string $iconURL    The icon URL.
+     * @param string $expiresAt  The expiration.
+     */
+    public function save(string $screenName, string $iconURL, string $expiresAt): void;
+}

api/src/Domain/Homo.php

@@ -25,6 +25,11 @@ class Homo
      */
     protected ?string $url;
 
+    /**
+     * @var ?Profile The profile.
+     */
+    protected ?Profile $profile = null;
+
     /**
      * @param array|object $homo
      */
@@ -36,6 +41,10 @@ public function __construct(array|object $homo = null)
         $this->setScreenName($homo->screen_name ?? null);
         $this->setService($homo->service ?? null);
         $this->setUrl($homo->url ?? null);
+
+        if (isset($homo->icon_url)) {
+            $this->setProfile(new Profile(['icon_url' => $homo->icon_url]));
+        }
     }
 
     /**
@@ -109,4 +118,22 @@ public function setUrl(?string $url): void
     {
         $this->url = $url;
     }
+
+    /**
+     * Get the profile.
+     * @return ?Profile The profile.
+     */
+    public function getProfile(): ?Profile
+    {
+        return $this->profile;
+    }
+
+    /**
+     * Set the profile.
+     * @param ?Profile $profile The profile.
+     */
+    public function setProfile(?Profile $profile): void
+    {
+        $this->profile = $profile;
+    }
 }

api/src/Domain/Profile.php

@@ -0,0 +1,39 @@
+<?php
+declare(strict_types=1);
+
+namespace HomoChecker\Domain;
+
+class Profile
+{
+    /**
+     * @var ?string The icon URL.
+     */
+    protected ?string $iconUrl;
+
+    /**
+     * @param array|object $profile
+     */
+    public function __construct(array|object $profile = null)
+    {
+        $profile = (object) $profile;
+
+        $this->setIconUrl($profile->icon_url ?? null);
+    }
+
+    /**
+     * Get the icon URL.
+     * @return ?string The icon URL.
+     */
+    public function getIconUrl(): ?string
+    {
+        return $this->iconUrl;
+    }
+
+    /**
+     * Set the icon URL.
+     */
+    public function setIconUrl(?string $iconUrl): void
+    {
+        $this->iconUrl = $iconUrl;
+    }
+}

api/src/Providers/HomoAppProvider.php

@@ -8,12 +8,16 @@
 use HomoChecker\Action\HealthCheckAction;
 use HomoChecker\Action\ListAction;
 use HomoChecker\Action\MetricsAction;
+use HomoChecker\Contracts\Repository\AltsvcRepository as AltsvcRepositoryContract;
 use HomoChecker\Contracts\Repository\HomoRepository as HomoRepositoryContract;
+use HomoChecker\Contracts\Repository\ProfileRepository as ProfileRepositoryContract;
 use HomoChecker\Http\NonBufferedBody;
 use HomoChecker\Middleware\AccessLogMiddleware;
 use HomoChecker\Middleware\ErrorMiddleware;
 use HomoChecker\Middleware\MetricsMiddleware;
+use HomoChecker\Repository\AltsvcRepository;
 use HomoChecker\Repository\HomoRepository;
+use HomoChecker\Repository\ProfileRepository;
 use Illuminate\Config\Repository;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Support\ServiceProvider;
@@ -35,7 +39,9 @@ public function register()
         $this->app->singleton(ListAction::class);
         $this->app->singleton(BadgeAction::class);
 
+        $this->app->singleton(AltsvcRepositoryContract::class, AltsvcRepository::class);
         $this->app->singleton(HomoRepositoryContract::class, HomoRepository::class);
+        $this->app->singleton(ProfileRepositoryContract::class, ProfileRepository::class);
 
         $this->app->singleton('app', function (Container $app) {
             AppFactory::setContainer($app);