Fallbacks for artifact urls

.lintstagedrc.json

@@ -1,7 +1,4 @@
 {
-  "**/*.php": [
-    "./vendor/bin/ecs check --ansi --fix",
-    "./vendor/bin/phpstan analyse"
-  ],
+  "**/*.php": ["composer run fix-cs", "composer run phpstan analyse"],
   "*": "prettier --ignore-unknown --write"
 }

src/Config.php

@@ -4,7 +4,6 @@
 
 use craft\config\BaseConfig;
 use craft\helpers\App;
-use craft\helpers\StringHelper;
 
 /**
  * @method array s3ClientOptions(array $options)
@@ -59,9 +58,4 @@ public function getRegion(): ?string
     {
         return $this->region ?? App::env('AWS_REGION');
     }
-
-    public function getCdnBaseUrl(): string
-    {
-        return StringHelper::ensureRight($this->cdnBaseUrl, '/');
-    }
 }

src/Helper.php

@@ -4,7 +4,6 @@
 
 use Craft;
 use craft\cloud\fs\BuildArtifactsFs;
-use craft\cloud\fs\CpResourcesFs;
 use craft\helpers\App;
 use craft\helpers\ConfigHelper;
 
@@ -19,18 +18,9 @@ public static function isCraftCloud(): bool
         return (bool)App::env('AWS_LAMBDA_RUNTIME_API') || App::env('LAMBDA_TASK_ROOT');
     }
 
-    public static function artifactUrl(string $path = ''): ?string
+    public static function artifactUrl(string $path = ''): string
     {
-        return Module::getInstance()->getConfig()->enableCdn
-            ? (new BuildArtifactsFs())->createUrl($path)
-            : null;
-    }
-
-    public static function cpResourceUrl(string $path = ''): ?string
-    {
-        return Module::getInstance()->getConfig()->enableCdn
-            ? (new CpResourcesFs())->createUrl($path)
-            : null;
+        return (new BuildArtifactsFs())->createUrl($path);
     }
 
     public static function setMemoryLimit(int|string $limit, int|string $offset = 0): int|float
@@ -41,4 +31,19 @@ public static function setMemoryLimit(int|string $limit, int|string $offset = 0)
 
         return $memoryLimit;
     }
+
+    public static function getComponents(): array
+    {
+        if (!Helper::isCraftCloud()) {
+            return [];
+        }
+
+        $components = [
+            'response' => [
+                'class' => \craft\cloud\web\Response::class,
+            ],
+        ];
+
+        return $components;
+    }
 }

src/Module.php

@@ -132,10 +132,6 @@ public function bootstrap($app): void
                 'fs' => Craft::createObject(CpResourcesFs::class),
             ]);
 
-            $app->getConfig()->getGeneral()->resourceBaseUrl(
-                Helper::cpResourceUrl(),
-            );
-
             $app->getImages()->supportedImageFormats = ImageTransformer::SUPPORTED_IMAGE_FORMATS;
 
             /**

src/TwigExtension.php

@@ -19,7 +19,6 @@ public function getFunctions(): array
     {
         return [
             new TwigFunction('artifactUrl', [Helper::class, 'artifactUrl']),
-            new TwigFunction('cpResourceUrl', [Helper::class, 'cpResourceUrl']),
         ];
     }
 }

src/fs/AssetsFs.php

@@ -6,6 +6,9 @@
 
 class AssetsFs extends Fs
 {
+    public ?string $localFsPath = '@webroot/craft-cloud/{handle}';
+    public ?string $localFsUrl = '@web/craft-cloud/{handle}';
+
     /**
      * @inheritDoc
      */

src/fs/BuildArtifactsFs.php

@@ -2,12 +2,20 @@
 
 namespace craft\cloud\fs;
 
+use craft\cloud\Module;
 use League\Uri\Components\HierarchicalPath;
 
 class BuildArtifactsFs extends BuildsFs
 {
+    public ?string $localFsPath = '@webroot';
+    public ?string $localFsUrl = '@web';
+
     public function getPrefix(): string
     {
+        if (!Module::getInstance()->getConfig()->enableCdn) {
+            return '';
+        }
+
         return HierarchicalPath::createRelativeFromSegments([
             parent::getPrefix(),
             'artifacts',

src/fs/Fs.php

@@ -33,15 +33,15 @@
  * @property-read string $prefix
  * @property-read ?string $settingsHtml
  */
-class Fs extends FlysystemFs
+abstract class Fs extends FlysystemFs
 {
     protected static bool $showUrlSetting = false;
     protected ?string $expires = null;
     protected ?Local $localFs = null;
     protected S3Client $client;
     public ?string $subpath = null;
-    public ?string $localFsPath = '@webroot/craft-cloud/{handle}';
-    public ?string $localFsUrl = '@web/craft-cloud/{handle}';
+    public ?string $localFsPath = null;
+    public ?string $localFsUrl = null;
     public ?string $url = '__URL__';
 
     /**
@@ -100,7 +100,7 @@ public function getRootUrl(): ?string
     public function createUrl(string $path = ''): string
     {
         $baseUrl = Module::getInstance()->getConfig()->enableCdn
-            ? Module::getInstance()->getConfig()->getCdnBaseUrl()
+            ? Module::getInstance()->getConfig()->cdnBaseUrl
             : $this->getLocalFs()->getRootUrl();
 
         if (!$baseUrl) {

src/runtime/Runtime.php

@@ -6,6 +6,7 @@
 use Bref\FpmRuntime\FpmHandler;
 use Bref\Runtime\LambdaRuntime;
 use craft\cloud\runtime\event\EventHandler;
+use RuntimeException;
 use Throwable;
 
 /**
@@ -28,15 +29,15 @@ public static function run(): void
         $appRoot = getenv('LAMBDA_TASK_ROOT');
         $handlerFile = $appRoot . '/' . getenv('_HANDLER');
         if (!is_file($handlerFile)) {
-            $lambdaRuntime->failInitialization("Handler `$handlerFile` doesn't exist");
+            $lambdaRuntime->failInitialization("Handler `$handlerFile` doesn't exist", 'Runtime.NoSuchHandler');
         }
 
         // use the Bref fpm handler to start php-fpm
         $phpFpm = new FpmHandler($handlerFile);
         try {
             $phpFpm->start();
         } catch (Throwable $e) {
-            $lambdaRuntime->failInitialization('Error while starting PHP-FPM', $e);
+            $lambdaRuntime->failInitialization(new RuntimeException('Error while starting PHP-FPM: ' . $e->getMessage(), 0, $e));
         }
 
         // create our own event handler and pass the fpm handler to it