wip

Author: tangrufus

README.md

@@ -107,7 +107,7 @@ Moreover, even if a plugin is closed, its existing versions are still downloadab
 }
 ```
 
-To catch these closed plugins, `WP Org Closed Plugin` queries [WordPress.org API](https://codex.wordpress.org/WordPress.org_API#Plugins) to check whether a plugin is closed and mark them as abandoned in Composer.
+To catch these closed plugins, `WP Org Closed Plugin` queries [wp-packages.org](https://wp-packages.org/) for the list of plugins closed on WordPress.org and marks them as abandoned in Composer.
 
 ## What to do when a plugin is closed?
 
@@ -153,58 +153,14 @@ You should run `composer audit` without `--locked` to check for closed plugins.
 
 ### Cache
 
-WordPress.org API responses are cached for 10 minutes.
+The list of closed plugins is fetched from [wp-packages.org](https://wp-packages.org/) in a single request and cached for 10 minutes.
 
 If you must clear the cache, delete the `<composer-cache-dir>/wp-org-closed-plugin` directory.
 
 ```sh
 rm -rf $(composer config cache-dir)/wp-org-closed-plugin
 ```
 
-### Why `allow_self_signed` when connecting to `https://api.wordpress.org`?
-
-> [!IMPORTANT]
-> **Help Wanted!**
->
-> Please send pull requests if you know how to get around the error:
->
-> ```console
-> $ curl --http3-only 'https://api.wordpress.org/plugins/info/1.2/?action=plugin_information&slug=better-delete-revision'
-> curl: (56) ngtcp2_conn_writev_stream returned error: ERR_DRAINING
-> ```
-
-It is a hack to disallow HTTP/3, forcing `HttpDownloader` to use `RemoteFilesystem` instead of `CurlDownloader`.
-
-I suspect api.wordpress.org does not properly support HTTP/3:
-
-```console
-$ curl --http1.1 'https://api.wordpress.org/plugins/info/1.2/?action=plugin_information&slug=better-delete-revision'
-...json response
-
-$ curl --http2 'https://api.wordpress.org/plugins/info/1.2/?action=plugin_information&slug=better-delete-revision'
-...json response
-
-$ curl --http3-only 'https://api.wordpress.org/plugins/info/1.2/?action=plugin_information&slug=better-delete-revision'
-...sometimes json response
-...but most of the time ERR_DRAINING
-curl: (56) ngtcp2_conn_writev_stream returned error: ERR_DRAINING
-```
-
-See:
-- https://github.com/composer/composer/pull/12363
-- https://github.com/composer/composer/blob/f5854b140ca27164d352ce30deece798acf3e36b/src/Composer/Util/HttpDownloader.php#L537
-- https://github.com/typisttech/wp-org-closed-plugin/pull/22
-
-> [!TIP]
-> **Hire Tang Rufus!**
->
-> There is no need to understand any of these quirks.
-> Let me handle them for you.
-> I am seeking my next job, freelance or full-time.
->
-> If you are hiring PHP / Ruby / Go developers,
-> contact me at https://typist.tech/contact/
-
 ## Installation
 
 ```sh

src/MarkClosedPluginAsAbandoned.php

@@ -4,14 +4,12 @@
 
 namespace TypistTech\WpOrgClosedPlugin;
 
-use Composer\Cache;
+use Composer\Cache as ComposerCache;
 use Composer\Composer;
 use Composer\IO\IOInterface;
 use Composer\Package\CompletePackageInterface;
-use TypistTech\WpOrgClosedPlugin\WpOrg\Api\ArrayCache;
-use TypistTech\WpOrgClosedPlugin\WpOrg\Api\CacheProxy;
+use TypistTech\WpOrgClosedPlugin\WpOrg\Api\Cache;
 use TypistTech\WpOrgClosedPlugin\WpOrg\Api\Client;
-use TypistTech\WpOrgClosedPlugin\WpOrg\Api\FileCache;
 use TypistTech\WpOrgClosedPlugin\WpOrg\UrlParser\DownloadUrlParser;
 use TypistTech\WpOrgClosedPlugin\WpOrg\UrlParser\MultiUrlParser;
 use TypistTech\WpOrgClosedPlugin\WpOrg\UrlParser\SvnUrlParser;
@@ -21,26 +19,19 @@
 {
     public static function create(Composer $composer, IOInterface $io): self
     {
-        $loop = $composer->getLoop();
-
         $config = $composer->getConfig();
         $cachePath = "{$config->get('cache-dir')}/wp-org-closed-plugin";
-        $composerCache = new Cache($io, $cachePath);
+        $composerCache = new ComposerCache($io, $cachePath);
         $composerCache->setReadOnly($config->get('cache-read-only'));
-        $cache = new CacheProxy(
-            new ArrayCache,
-            new FileCache($composerCache),
-        );
 
         return new self(
             new MultiUrlParser(
                 new DownloadUrlParser,
                 new SvnUrlParser,
             ),
             new Client(
-                $loop->getHttpDownloader(),
-                $loop,
-                $cache,
+                $composer->getLoop()->getHttpDownloader(),
+                new Cache($composerCache),
             ),
             $io,
         );
@@ -52,28 +43,6 @@ public function __construct(
         private IOInterface $io,
     ) {}
 
-    public function warmCache(CompletePackageInterface ...$packages): void
-    {
-        $slugs = array_map(
-            fn (CompletePackageInterface $package): ?string => $this->slug(
-                ...$package->getDistUrls(),
-                ...$package->getSourceUrls(),
-            ),
-            $packages,
-        );
-        $slugs = array_filter($slugs, static fn (?string $slug) => $slug !== null);
-
-        $slugCount = count($slugs);
-        $message = sprintf(
-            'Warming WordPress.org plugin status cache for %d %s',
-            $slugCount,
-            $slugCount === 1 ? 'slug' : 'slugs',
-        );
-        $this->io->debug($message);
-
-        $this->client->warmCache(...$slugs);
-    }
-
     public function __invoke(CompletePackageInterface $package): void
     {
         $this->io->debug(

src/Plugin.php

@@ -48,14 +48,8 @@ public function uninstall(Composer $composer, IOInterface $io): void
     public static function getSubscribedEvents(): array
     {
         return [
-            PackageEvents::PRE_PACKAGE_INSTALL => [
-                ['warmCache', PHP_INT_MAX - 500],
-                ['markClosedAsAbandoned', PHP_INT_MAX - 1000],
-            ],
-            PackageEvents::PRE_PACKAGE_UPDATE => [
-                ['warmCache', PHP_INT_MAX - 500],
-                ['markClosedAsAbandoned', PHP_INT_MAX - 1000],
-            ],
+            PackageEvents::PRE_PACKAGE_INSTALL => ['markClosedAsAbandoned', PHP_INT_MAX - 1000],
+            PackageEvents::PRE_PACKAGE_UPDATE => ['markClosedAsAbandoned', PHP_INT_MAX - 1000],
 
             ScriptEvents::POST_INSTALL_CMD => ['markClosedLockedPackagesIfNotAlready', PHP_INT_MAX - 1000],
             ScriptEvents::POST_UPDATE_CMD => ['markClosedLockedPackagesIfNotAlready', PHP_INT_MAX - 1000],
@@ -64,22 +58,6 @@ public static function getSubscribedEvents(): array
         ];
     }
 
-    public function warmCache(PackageEvent $event): void
-    {
-        $packages = array_map(
-            static fn ($operation) => match (true) {
-                $operation instanceof InstallOperation => $operation->getPackage(),
-                $operation instanceof UpdateOperation => $operation->getTargetPackage(),
-                default => null,
-            },
-            $event->getOperations(),
-        );
-        $packages = array_filter($packages, static fn ($package) => $package instanceof CompletePackageInterface);
-        $packages = array_filter($packages, static fn ($package) => ! $package->isAbandoned());
-
-        $this->markClosedAsAbandoned->warmCache(...$packages);
-    }
-
     public function markClosedAsAbandoned(PackageEvent $event): void
     {
         $operation = $event->getOperation();
@@ -109,18 +87,18 @@ public function markClosedLockedPackagesIfNotAlready(ScriptEvent $event): void
             ->getLocker()
             ->getLockedRepository(true);
 
-        $packages = $lockedRepository->getPackages();
-        $packages = array_filter($packages, static fn ($package) => $package instanceof CompletePackage);
-        $packages = array_filter($packages, static fn ($package) => ! $package->isAbandoned());
         $packages = array_filter(
-            $packages,
-            fn ($package) => ! in_array($package->getPrettyName(), $this->marked, true),
+            $lockedRepository->getPackages(),
+            static fn ($package) => $package instanceof CompletePackage && ! $package->isAbandoned(),
         );
 
-        $this->markClosedAsAbandoned->warmCache(...$packages);
-
         foreach ($packages as $package) {
-            $this->marked[] = $package->getPrettyName();
+            $prettyName = $package->getPrettyName();
+            if (in_array($prettyName, $this->marked, true)) {
+                continue;
+            }
+
+            $this->marked[] = $prettyName;
             $this->markClosedAsAbandoned->__invoke($package);
         }
     }

src/WpOrg/Api/ArrayCache.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TypistTech\WpOrgClosedPlugin\WpOrg\Api;
+
+use Composer\Cache as ComposerCache;
+
+class Cache
+{
+    private const int TTL = 600;
+
+    private const string KEY = 'closed.json';
+
+    public function __construct(
+        private readonly ComposerCache $cache,
+    ) {}
+
+    public function read(): ?string
+    {
+        $age = $this->cache->getAge(self::KEY);
+
+        // Missed or expired.
+        if ($age === false || $age > self::TTL) {
+            return null;
+        }
+
+        $content = $this->cache->read(self::KEY);
+
+        return $content === false ? null : $content;
+    }
+
+    public function write(string $contents): void
+    {
+        if ($this->cache->isReadOnly()) {
+            return;
+        }
+
+        $this->cache->write(self::KEY, $contents);
+    }
+}