satto 1.1.1 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "satto",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "A minimal server-rendered web framework for Node.js",
   "main": "src/lib/index.js",
   "bin": {
@@ -29,6 +29,6 @@
     "express": "^5.2.1"
   },
   "overrides": {
-    "minimatch": "10.2.1"
+    "minimatch": "10.2.4"
   }
 }

package/src/bin/satto.js

@@ -69,7 +69,7 @@ createServer(__dirname, routes);
     "build": "satto run build"
   },
   "overrides": {
-    "minimatch": "10.2.1"
+    "minimatch": "10.2.4"
   }
 }`
   };

package/src/lib/index.js

@@ -57,6 +57,28 @@ async function renderPage(html, params) {
   }
 }
 
+function renderErrorPage(code, message) {
+  return `
+    <style>
+      body {
+        margin: 0;
+        height: 100vh;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background: black;
+        color: white;
+        font-family: system-ui, sans-serif;
+      }
+      h1 {
+        font-size: 2rem;
+        font-weight: 400;
+      }
+    </style>
+    <h1>${code} — ${message}</h1>
+  `;
+}
+
 function createServer(__dirname, routes = [], port = 3000) {
   const versionApp = Date.now();
   const app = express();
@@ -67,15 +89,19 @@ function createServer(__dirname, routes = [], port = 3000) {
   app.use(express.static(path.join(__dirname, "static")));
 
   routes.forEach((route) => {
-    app.get(route.path, (req, res) => {
+    app.use(express.static(path.join(__dirname, "app", route.page)));
+    app.get(route.path, (req, res, next) => {
+      if(req.path.includes('.')){
+        return next();
+      }
+
       const page = route.page;
       const htmlPath = path.join(__dirname, "app", page, page + ".html");
-      app.use(express.static(path.join(__dirname, "app", page)));
 
       fs.readFile(htmlPath, "utf8", async (err, html) => {
         try {
           if (err) {
-            res.status(404).send();
+            return next();
           }
 
           const params = { ...req.params };
@@ -101,13 +127,28 @@ function createServer(__dirname, routes = [], port = 3000) {
 
           res.send(await renderPage(html, params));
         } catch (err) {
-          console.error(err);
-          res.status(500).send();
+          next(err);
         }
       });
     });
   });
 
+  app.use((req, res) => {
+    res.status(404).send(renderErrorPage(404, "Page Not Found"));
+  });
+
+  app.use((err, req, res, next) => {
+    console.error(err);
+
+    const isFetchError = err.message?.includes('fetch failed') || err.code === 'ECONNREFUSED' || err.code === 'ENOTFOUND';
+
+    if (isFetchError) {
+      return res.status(404).send(renderErrorPage(404, "Page Not Found"));
+    }
+
+    res.status(500).send(renderErrorPage(500, "Internal Server Error"));
+  });
+
   app.listen(port, () => {
     const banner = [
       "  ____        _   _        ",