Improve error handling

Author: bencroker

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "putyourlightson/craft-datastar-module",
   "description": "A template-driven, reactive hypermedia framework for Craft.",
-  "version": "1.0.0-RC.7",
+  "version": "1.0.0-RC.8",
   "type": "yii-module",
   "license": "mit",
   "require": {

src/helpers/Action.php

@@ -59,17 +59,17 @@ public static function getUrl(string $route, array $params = []): string
 
     private static function addCsrfToken(array|string $options): string
     {
-        $token = Craft::$app->getRequest()->getCsrfToken();
         $csrfHeader = Request::CSRF_HEADER;
+        $token = Craft::$app->getRequest()->getCsrfToken();
 
         if (is_array($options)) {
-            return self::addCsrfToArray($options, $token, $csrfHeader);
+            return self::addCsrfToArray($options, $csrfHeader, $token);
         }
 
-        return self::addCsrfToString($options, $token, $csrfHeader);
+        return self::addCsrfToString($options, $csrfHeader, $token);
     }
 
-    private static function addCsrfToArray(array $options, string $token, string $csrfHeader): string
+    private static function addCsrfToArray(array $options, string $csrfHeader, string $token): string
     {
         $headers = $options['headers'] ?? [];
         $headers[$csrfHeader] = $token;
@@ -78,7 +78,7 @@ private static function addCsrfToArray(array $options, string $token, string $cs
         return Json::encode($options);
     }
 
-    private static function addCsrfToString(string $options, string $token, string $csrfHeader): string
+    private static function addCsrfToString(string $options, string $csrfHeader, string $token): string
     {
         if (preg_match('/headers:\s*\{/i', $options)) {
             return preg_replace(

src/services/SseService.php

@@ -8,6 +8,7 @@
 use Craft;
 use craft\base\Component;
 use craft\web\Response;
+use Exception;
 use putyourlightson\datastar\Datastar;
 use putyourlightson\datastar\helpers\Request;
 use starfederation\datastar\events\EventInterface;
@@ -18,7 +19,6 @@
 use starfederation\datastar\events\RemoveElements;
 use starfederation\datastar\ServerSentEventGenerator;
 use Throwable;
-use yii\web\BadRequestHttpException;
 
 class SseService extends Component
 {
@@ -210,10 +210,6 @@ public function location(string $uri, array $options = []): static
      */
     public function renderTemplate(string $template, array $variables = []): static
     {
-        if (!Craft::$app->getView()->doesTemplateExist($template)) {
-            $this->throwException('Template `' . $template . '` does not exist.');
-        }
-
         $signals = $this->readSignals();
         $variables = array_merge(
             [Datastar::getInstance()->settings->signalsVariableName => $signals],
@@ -282,20 +278,19 @@ public function shouldCloseSession(bool $value): static
     }
 
     /**
-     * Throws an exception with the appropriate formats for easier debugging.
+     * Throws an exception or logs a console error, for easier debugging.
      *
      * @phpstan-return never
      */
-    public function throwException(Throwable|string $exception): void
+    public function throwException(Throwable $exception): void
     {
-        Craft::$app->getRequest()->getHeaders()->set('Accept', 'text/html');
-        Craft::$app->getResponse()->format = Response::FORMAT_HTML;
-
-        if ($exception instanceof Throwable) {
+        if (!$this->isStreamedResponse) {
             throw $exception;
         }
 
-        throw new BadRequestHttpException($exception);
+        $this->executeScript('console.error(' . json_encode($exception->getMessage()) . ');');
+        flush();
+        exit();
     }
 
     /**
@@ -367,7 +362,7 @@ private function verifySseMethodInProcess(EventInterface $event): void
             if ($method === 'patchElements') {
                 $message .= ' Ensure that you are not setting or removing signals inside `{% patchelements %}` or `{% executescript %}` tags.';
             }
-            $this->throwException($message);
+            $this->throwException(new Exception($message));
         }
     }
 }