npm - webspresso - Versions diffs - 0.0.2 → 0.0.4 - Mend

webspresso 0.0.2 → 0.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/src/server.js CHANGED Viewed

@@ -8,6 +8,8 @@ const helmet = require('helmet');
 const nunjucks = require('nunjucks');
 const { mountPages } = require('./file-router');
+const { configureAssets } = require('./helpers');
+const { createPluginManager } = require('./plugin-manager');
 /**
  * Get default Helmet configuration
@@ -51,6 +53,62 @@ function getDefaultHelmetConfig(isDev) {
   };
 }
+/**
+ * Default 404 page HTML
+ */
+function default404Html() {
+  return `<!DOCTYPE html>
+<html>
+<head>
+  <title>404 - Not Found</title>
+  <style>
+    body { font-family: system-ui, sans-serif; display: flex; align-items: center; justify-content: center; min-height: 100vh; margin: 0; background: #f5f5f5; }
+    .container { text-align: center; }
+    h1 { font-size: 4rem; margin: 0; color: #333; }
+    p { color: #666; margin: 1rem 0; }
+    a { color: #0066cc; text-decoration: none; }
+    a:hover { text-decoration: underline; }
+  </style>
+</head>
+<body>
+  <div class="container">
+    <h1>404</h1>
+    <p>Page not found</p>
+    <a href="/">← Back to Home</a>
+  </div>
+</body>
+</html>`;
+}
+/**
+ * Default 500 page HTML
+ */
+function default500Html(err, isDev) {
+  return `<!DOCTYPE html>
+<html>
+<head>
+  <title>500 - Server Error</title>
+  <style>
+    body { font-family: system-ui, sans-serif; display: flex; align-items: center; justify-content: center; min-height: 100vh; margin: 0; background: #f5f5f5; }
+    .container { text-align: center; }
+    h1 { font-size: 4rem; margin: 0; color: #333; }
+    p { color: #666; margin: 1rem 0; }
+    pre { background: #fff; padding: 1rem; border-radius: 4px; text-align: left; overflow: auto; max-width: 600px; }
+    a { color: #0066cc; text-decoration: none; }
+    a:hover { text-decoration: underline; }
+  </style>
+</head>
+<body>
+  <div class="container">
+    <h1>500</h1>
+    <p>Internal Server Error</p>
+    ${isDev && err ? `<pre>${err.stack || err.message}</pre>` : ''}
+    <a href="/">← Back to Home</a>
+  </div>
+</body>
+</html>`;
+}
 /**
  * Create and configure the Express app
  * @param {Object} options - Configuration options
@@ -59,7 +117,16 @@ function getDefaultHelmetConfig(isDev) {
  * @param {string} options.publicDir - Path to public/static directory
  * @param {boolean} options.logging - Enable request logging (default: isDev)
  * @param {Object|boolean} options.helmet - Helmet configuration (default: auto-configured, false to disable)
- * @returns {Object} { app, nunjucksEnv }
+ * @param {Object} options.middlewares - Named middleware registry for route configs
+ * @param {Array} options.plugins - Array of plugin definitions
+ * @param {Object} options.assets - Asset manager configuration
+ * @param {string} options.assets.manifestPath - Path to asset manifest file (Vite, Webpack)
+ * @param {string} options.assets.version - Asset version for cache busting
+ * @param {string} options.assets.prefix - URL prefix for assets
+ * @param {Object} options.errorPages - Custom error page handlers
+ * @param {Function|string} options.errorPages.notFound - Custom 404 handler or template path
+ * @param {Function|string} options.errorPages.serverError - Custom 500 handler or template path
+ * @returns {Object} { app, nunjucksEnv, pluginManager }
  */
 function createApp(options = {}) {
   const NODE_ENV = process.env.NODE_ENV || 'development';
@@ -71,9 +138,22 @@ function createApp(options = {}) {
     viewsDir,
     publicDir,
     logging = isDev && !isTest,
-    helmet: helmetConfig
+    helmet: helmetConfig,
+    middlewares = {},
+    plugins = [],
+    assets: assetsConfig = {},
+    errorPages = {}
   } = options;
+  // Create plugin manager
+  const pluginManager = createPluginManager();
+  // Configure asset manager
+  configureAssets({
+    publicDir: publicDir || 'public',
+    ...assetsConfig
+  });
   if (!pagesDir) {
     throw new Error('pagesDir is required');
   }
@@ -139,6 +219,10 @@ function createApp(options = {}) {
     return d.toString();
   });
+  // Register plugins (synchronous part)
+  const pluginContext = { app, nunjucksEnv, options };
+  pluginManager.register(plugins, pluginContext);
   // Request logging middleware
   if (logging) {
     app.use((req, res, next) => {
@@ -155,80 +239,104 @@ function createApp(options = {}) {
   if (!isTest) {
     console.log('\nMounting routes:');
   }
-  mountPages(app, {
+  const routeMetadata = mountPages(app, {
     pagesDir,
     nunjucks: nunjucksEnv,
+    middlewares,
+    pluginManager,
     silent: isTest
   });
+  // Set route metadata in plugin manager
+  pluginManager.setRoutes(routeMetadata);
+  // Call onRoutesReady hook synchronously (plugins should not be async in this phase)
+  // and mount any custom routes added by plugins
+  for (const [name, plugin] of pluginManager.plugins) {
+    if (typeof plugin.onRoutesReady === 'function') {
+      const ctx = {
+        app,
+        nunjucksEnv,
+        options,
+        routes: pluginManager.routes,
+        usePlugin: (n) => pluginManager.getPluginAPI(n),
+        addHelper: (n, fn) => pluginManager.registeredHelpers.set(n, fn),
+        addFilter: (n, fn) => pluginManager.registeredFilters.set(n, fn),
+        addRoute: (method, path, ...handlers) => {
+          app[method.toLowerCase()](path, ...handlers);
+        }
+      };
+      plugin.onRoutesReady(ctx);
+    }
+  }
   // 404 handler
   app.use((req, res) => {
     res.status(404);
+    // Custom handler function
+    if (typeof errorPages.notFound === 'function') {
+      return errorPages.notFound(req, res);
+    }
+    // Custom template
+    if (typeof errorPages.notFound === 'string') {
+      try {
+        const html = nunjucksEnv.render(errorPages.notFound, {
+          url: req.url,
+          method: req.method
+        });
+        return res.send(html);
+      } catch (e) {
+        console.error('Error rendering 404 template:', e);
+      }
+    }
+    // Default response
     if (req.accepts('html')) {
-      res.send(`
-        <!DOCTYPE html>
-        <html>
-        <head>
-          <title>404 - Not Found</title>
-          <style>
-            body { font-family: system-ui, sans-serif; display: flex; align-items: center; justify-content: center; min-height: 100vh; margin: 0; background: #f5f5f5; }
-            .container { text-align: center; }
-            h1 { font-size: 4rem; margin: 0; color: #333; }
-            p { color: #666; margin: 1rem 0; }
-            a { color: #0066cc; text-decoration: none; }
-            a:hover { text-decoration: underline; }
-          </style>
-        </head>
-        <body>
-          <div class="container">
-            <h1>404</h1>
-            <p>Page not found</p>
-            <a href="/">← Back to Home</a>
-          </div>
-        </body>
-        </html>
-      `);
+      res.send(default404Html());
     } else {
-      res.json({ error: 'Not Found' });
+      res.json({ error: 'Not Found', status: 404 });
     }
   });
   // Error handler
   app.use((err, req, res, next) => {
     console.error('Server error:', err);
-    res.status(500);
+    res.status(err.status || 500);
+    // Custom handler function
+    if (typeof errorPages.serverError === 'function') {
+      return errorPages.serverError(err, req, res);
+    }
+    // Custom template
+    if (typeof errorPages.serverError === 'string') {
+      try {
+        const html = nunjucksEnv.render(errorPages.serverError, {
+          error: isDev ? err : { message: 'Internal Server Error' },
+          status: err.status || 500,
+          isDev
+        });
+        return res.send(html);
+      } catch (e) {
+        console.error('Error rendering 500 template:', e);
+      }
+    }
+    // Default response
     if (req.accepts('html')) {
-      res.send(`
-        <!DOCTYPE html>
-        <html>
-        <head>
-          <title>500 - Server Error</title>
-          <style>
-            body { font-family: system-ui, sans-serif; display: flex; align-items: center; justify-content: center; min-height: 100vh; margin: 0; background: #f5f5f5; }
-            .container { text-align: center; }
-            h1 { font-size: 4rem; margin: 0; color: #333; }
-            p { color: #666; margin: 1rem 0; }
-            pre { background: #fff; padding: 1rem; border-radius: 4px; text-align: left; overflow: auto; max-width: 600px; }
-            a { color: #0066cc; text-decoration: none; }
-            a:hover { text-decoration: underline; }
-          </style>
-        </head>
-        <body>
-          <div class="container">
-            <h1>500</h1>
-            <p>Internal Server Error</p>
-            ${isDev ? `<pre>${err.stack || err.message}</pre>` : ''}
-            <a href="/">← Back to Home</a>
-          </div>
-        </body>
-        </html>
-      `);
+      res.send(default500Html(err, isDev));
     } else {
-      res.json({ error: 'Internal Server Error' });
+      res.json({
+        error: 'Internal Server Error',
+        status: err.status || 500,
+        ...(isDev && { message: err.message, stack: err.stack })
+      });
     }
   });
-  return { app, nunjucksEnv };
+  return { app, nunjucksEnv, pluginManager };
 }
 // Export for use as library