@nuraly/lumenjs 0.1.3 → 0.2.0

package/dist/dev-server/server.js

@@ -11,13 +11,21 @@ import { ssrRenderPage } from './ssr-render.js';
 import { readProjectConfig, getLumenJSNodeModules, getLumenJSDirs } from './config.js';
 import { getNuralyUIAliases, resolveNuralyUIPaths } from './nuralyui-aliases.js';
 import { litDedupPlugin } from './plugins/vite-plugin-lit-dedup.js';
+import { autoDefinePlugin } from './plugins/vite-plugin-auto-define.js';
 import { autoImportPlugin } from './plugins/vite-plugin-auto-import.js';
 import { litHmrPlugin } from './plugins/vite-plugin-lit-hmr.js';
 import { sourceAnnotatorPlugin } from './plugins/vite-plugin-source-annotator.js';
+import { editorApiPlugin } from './plugins/vite-plugin-editor-api.js';
 import { virtualModulesPlugin } from './plugins/vite-plugin-virtual-modules.js';
 import { i18nPlugin, loadTranslationsFromDisk } from './plugins/vite-plugin-i18n.js';
+import { authPlugin } from './plugins/vite-plugin-auth.js';
+import { communicationPlugin } from './plugins/vite-plugin-communication.js';
+import { lumenStoragePlugin } from './plugins/vite-plugin-storage.js';
+import { lumenSocketIOPlugin } from './plugins/vite-plugin-socketio.js';
 import { resolveLocale } from './middleware/locale.js';
 import { setProjectDir } from '../db/context.js';
+import { scanMiddleware, getMiddlewareDirsForPathname } from '../build/scan.js';
+import { runMiddlewareChain, extractMiddleware } from '../shared/middleware-runner.js';
 // Re-export for backwards compatibility
 export { readProjectConfig, readProjectTitle, getLumenJSNodeModules, getLumenJSDirs } from './config.js';
 export { getNuralyUIAliases, resolveNuralyUIPaths } from './nuralyui-aliases.js';
@@ -30,24 +38,37 @@ export function getSharedViteConfig(projectDir, options) {
     const isDev = mode === 'development';
     const pagesDir = path.join(projectDir, 'pages');
     const lumenNodeModules = getLumenJSNodeModules();
-    const { runtimeDir, editorDir } = getLumenJSDirs();
+    const { distDir, runtimeDir, editorDir } = getLumenJSDirs();
     // Resolve NuralyUI paths for aliases (only when nuralyui integration is enabled)
     const aliases = {};
     if (options?.integrations?.includes('nuralyui')) {
         const nuralyUIPaths = resolveNuralyUIPaths(projectDir);
         if (nuralyUIPaths) {
             Object.assign(aliases, getNuralyUIAliases(nuralyUIPaths.componentsPath, nuralyUIPaths.commonPath));
+            // Add root aliases for theme CSS imports
+            const nuralyUIRoot = path.resolve(nuralyUIPaths.componentsPath, '..');
+            aliases['@nuralyui-theme'] = path.join(nuralyUIRoot, 'shared/themes');
+            aliases['@nuralyui-common'] = nuralyUIPaths.commonPath;
         }
     }
     const resolve = {
         alias: {
             ...aliases,
-            // Map @lumenjs/i18n to the physical dist file so Vite resolves it
-            // without going through node_modules (it's not an npm package).
             '@lumenjs/i18n': path.join(runtimeDir, 'i18n.js'),
+            '@lumenjs/auth': path.join(runtimeDir, 'auth.js'),
+            '@nuraly/lumenjs-auth': path.join(runtimeDir, 'auth.js'),
+            '@lumenjs/communication': path.join(runtimeDir, 'communication.js'),
+            '@lumenjs/webrtc': path.join(runtimeDir, 'webrtc.js'),
+            '@lumenjs/db': path.join(distDir, 'db', 'client.js'),
+            '@lumenjs/permissions': path.join(distDir, 'permissions', 'index.js'),
+            '@lumenjs/storage': path.join(distDir, 'storage', 'index.js'),
+            '@nuraly/lumenjs': path.resolve(distDir, '..'),
         },
         conditions: isDev ? ['development', 'browser'] : ['browser'],
-        dedupe: ['lit', 'lit-html', 'lit-element', '@lit/reactive-element'],
+        // Note: resolve.dedupe is NOT used — it resolves via Node's algorithm
+        // which ignores Vite's resolve.conditions, picking the `default` export
+        // (prod proxy) instead of `development`. The litDedupPlugin handles
+        // single-copy resolution with correct conditions instead.
     };
     const esbuild = {
         tsconfigRaw: {
@@ -60,6 +81,7 @@ export function getSharedViteConfig(projectDir, options) {
     const plugins = [
         lumenRoutesPlugin(pagesDir),
         lumenLoadersPlugin(pagesDir),
+        autoDefinePlugin(pagesDir),
         litDedupPlugin(lumenNodeModules, isDev),
         virtualModulesPlugin(runtimeDir, editorDir),
     ];
@@ -83,15 +105,41 @@ export function getSharedViteConfig(projectDir, options) {
 }
 export async function createDevServer(options) {
     const { projectDir, port, editorMode = false, base = '/' } = options;
-    setProjectDir(projectDir);
     const pagesDir = path.join(projectDir, 'pages');
     const apiDir = path.join(projectDir, 'api');
     const publicDir = path.join(projectDir, 'public');
     const config = readProjectConfig(projectDir);
-    const { title, integrations, i18n: i18nConfig } = config;
+    const { title, integrations, i18n: i18nConfig, prefetch: prefetchStrategy } = config;
+    // Read optional head.html for blocking scripts (e.g. theme initialization)
+    const headHtmlPath = path.join(projectDir, 'head.html');
+    const headContent = fs.existsSync(headHtmlPath) ? fs.readFileSync(headHtmlPath, 'utf-8') : undefined;
+    // Set project dir for DB context (used by loaders, API routes, plugins)
+    setProjectDir(projectDir);
+    process.env.LUMENJS_PROJECT_DIR = projectDir;
     const shared = getSharedViteConfig(projectDir, { integrations });
+    // Load user-defined Vite plugins from lumenjs.plugins.js (if present).
+    // This allows apps to add custom Vite plugins (e.g. proxy middleware)
+    // that run at the raw Connect level, before LumenJS's own middleware.
+    let userPlugins = [];
+    const pluginsPath = path.join(projectDir, 'lumenjs.plugins.js');
+    if (fs.existsSync(pluginsPath)) {
+        try {
+            // Use a temporary Vite server to load the TS file via ssrLoadModule
+            // would be circular, so we import it directly via dynamic import
+            // after Vite transforms it. Instead, read and eval the JS-compatible parts.
+            // Simplest: the file exports an array of plugin objects.
+            const pluginsMod = await import(pathToFileURL(pluginsPath).href);
+            const exported = pluginsMod.default || pluginsMod.plugins || pluginsMod;
+            if (Array.isArray(exported))
+                userPlugins = exported;
+        }
+        catch (err) {
+            console.warn(`[LumenJS] Failed to load lumenjs.plugins.js:`, err?.message);
+        }
+    }
     const server = await createViteServer({
         root: projectDir,
+        base,
         publicDir: fs.existsSync(publicDir) ? publicDir : undefined,
         server: {
             port,
@@ -99,93 +147,217 @@ export async function createDevServer(options) {
             strictPort: false,
             allowedHosts: true,
             cors: true,
-            hmr: true,
+            hmr: process.env.HMR_CLIENT_PORT ? {
+                clientPort: parseInt(process.env.HMR_CLIENT_PORT),
+                port: parseInt(process.env.HMR_CLIENT_PORT),
+                ...(process.env.HMR_PROTOCOL ? { protocol: process.env.HMR_PROTOCOL } : {}),
+                ...(process.env.HMR_HOST ? { host: process.env.HMR_HOST } : {}),
+            } : true,
+            fs: {
+                allow: [projectDir, getLumenJSNodeModules(), path.resolve(getLumenJSNodeModules(), '..')],
+            },
         },
         resolve: shared.resolve,
+        // 'custom' prevents Vite from adding SPA fallback and indexHtml middleware,
+        // which would interfere with LumenJS's own HTML handler (especially when base != '/')
+        appType: 'custom',
         plugins: [
+            ...userPlugins,
+            ...(integrations.includes('auth') ? [authPlugin(projectDir)] : []),
             ...shared.plugins,
+            ...(integrations.includes('communication') ? [communicationPlugin(projectDir)] : []),
+            lumenStoragePlugin(projectDir),
             lumenApiRoutesPlugin(apiDir, projectDir),
             litHmrPlugin(projectDir),
             ...(i18nConfig ? [i18nPlugin(projectDir, i18nConfig)] : []),
-            ...(editorMode ? [sourceAnnotatorPlugin(projectDir)] : []),
-            {
-                name: 'lumenjs-index-html',
-                configureServer(server) {
-                    server.middlewares.use((req, res, next) => {
-                        // Guard against malformed percent-encoded URLs that crash Vite's transformIndexHtml
-                        if (req.url) {
-                            try {
-                                decodeURIComponent(req.url);
+            ...(editorMode ? [sourceAnnotatorPlugin(projectDir), editorApiPlugin(projectDir)] : []),
+            lumenSocketIOPlugin(pagesDir),
+            ...(base !== '/' ? [{
+                    // Fix HMR fetch URLs when Vite runs behind a base path.
+                    // Vite's import analysis injects createHotContext() with the full filesystem
+                    // path (e.g. /data/user-apps/.../bb2/pages/index.ts) instead of root-relative.
+                    // When @vite/client fetches the updated module it builds the URL as
+                    //   base + filesystemPath.slice(1) → /__app_dev/{id}/data/.../pages/index.ts
+                    // which 404s because transformMiddleware resolves relative to root, doubling
+                    // the path. This pre-hook middleware strips the projectDir prefix so
+                    // baseMiddleware sees the correct root-relative path.
+                    name: 'lumenjs-hmr-path-fix',
+                    configureServer(server) {
+                        const projSlash = projectDir.replace(/\\/g, '/');
+                        server.middlewares.use((req, _res, next) => {
+                            if (req.url) {
+                                const prefix = base + projSlash.slice(1) + '/';
+                                if (req.url.startsWith(prefix)) {
+                                    req.url = base + req.url.slice(prefix.length);
+                                }
                             }
-                            catch {
-                                res.statusCode = 400;
-                                res.end('Bad Request');
-                                return;
+                            next();
+                        });
+                    },
+                }] : []),
+            {
+                // Clear SSR module cache on file changes so the next SSR request uses fresh code.
+                // Without this, HMR updates the client but SSR keeps serving stale modules.
+                name: 'lumenjs-ssr-invalidate-on-change',
+                handleHotUpdate({ file, server }) {
+                    const mods = server.moduleGraph.getModulesByFile(file);
+                    if (mods) {
+                        for (const m of mods) {
+                            m.ssrModule = null;
+                            m.ssrTransformResult = null;
+                        }
+                    }
+                },
+            },
+            {
+                name: 'lumenjs-user-middleware',
+                config(config) {
+                    const entries = scanMiddleware(pagesDir);
+                    if (entries.length === 0)
+                        return;
+                    const npmDeps = new Set();
+                    for (const entry of entries) {
+                        try {
+                            const content = fs.readFileSync(entry.filePath, 'utf-8');
+                            const importMatches = content.matchAll(/(?:import|require)\s*(?:\(?\s*['"]([^./][^'"]*)['"]\s*\)?|.*from\s*['"]([^./][^'"]*)['"]\s*)/g);
+                            for (const m of importMatches) {
+                                const pkg = m[1] || m[2];
+                                if (pkg) {
+                                    const pkgName = pkg.startsWith('@') ? pkg.split('/').slice(0, 2).join('/') : pkg.split('/')[0];
+                                    npmDeps.add(pkgName);
+                                }
                             }
                         }
-                        if (req.url && !req.url.startsWith('/@') && !req.url.startsWith('/node_modules') &&
-                            !req.url.startsWith('/api/') && !req.url.startsWith('/__nk_loader/') &&
-                            !req.url.startsWith('/__nk_i18n/') &&
-                            !req.url.includes('.') && req.method === 'GET') {
-                            let pathname = req.url.split('?')[0];
-                            // Resolve locale from URL/cookie/header
-                            let locale;
-                            let translations;
-                            if (i18nConfig) {
-                                const localeResult = resolveLocale(pathname, i18nConfig, req.headers);
-                                locale = localeResult.locale;
-                                pathname = localeResult.pathname;
-                                translations = loadTranslationsFromDisk(projectDir, locale);
+                        catch { }
+                    }
+                    if (npmDeps.size > 0) {
+                        const existing = config.ssr?.external || [];
+                        return { ssr: { external: [...existing, ...npmDeps] } };
+                    }
+                },
+                configureServer(server) {
+                    return () => {
+                        server.middlewares.use(async (req, res, next) => {
+                            const pathname = (req.url || '/').split('?')[0];
+                            if (pathname.startsWith('/@') || pathname.startsWith('/node_modules') || pathname.includes('.')) {
+                                return next();
                             }
-                            const SSR_PLACEHOLDER = '<!--__NK_SSR_CONTENT__-->';
-                            ssrRenderPage(server, pagesDir, pathname, req.headers, locale).then(async (ssrResult) => {
-                                if (ssrResult?.redirect) {
-                                    res.writeHead(ssrResult.redirect.status, { Location: ssrResult.redirect.location });
-                                    res.end();
+                            const middlewareEntries = scanMiddleware(pagesDir);
+                            if (middlewareEntries.length === 0)
+                                return next();
+                            const matchingDirs = getMiddlewareDirsForPathname(pathname, middlewareEntries);
+                            if (matchingDirs.length === 0)
+                                return next();
+                            const allMw = [];
+                            for (const entry of matchingDirs) {
+                                try {
+                                    const mod = await server.ssrLoadModule(entry.filePath);
+                                    allMw.push(...extractMiddleware(mod));
+                                }
+                                catch (err) {
+                                    console.error(`[LumenJS] Failed to load _middleware.ts (${entry.dir || 'root'}):`, err);
+                                }
+                            }
+                            if (allMw.length === 0)
+                                return next();
+                            runMiddlewareChain(allMw, req, res, next);
+                        });
+                    };
+                }
+            },
+            {
+                name: 'lumenjs-index-html',
+                configureServer(server) {
+                    return () => {
+                        server.middlewares.use((req, res, next) => {
+                            // Guard against malformed percent-encoded URLs that crash Vite's transformIndexHtml
+                            if (req.url) {
+                                try {
+                                    decodeURIComponent(req.url);
+                                }
+                                catch {
+                                    res.statusCode = 400;
+                                    res.end('Bad Request');
                                     return;
                                 }
-                                const shellHtml = generateIndexHtml({
-                                    title,
-                                    editorMode,
-                                    ssrContent: ssrResult ? SSR_PLACEHOLDER : undefined,
-                                    loaderData: ssrResult?.loaderData,
-                                    layoutsData: ssrResult?.layoutsData,
-                                    integrations,
-                                    locale,
-                                    i18nConfig: i18nConfig || undefined,
-                                    translations,
-                                });
-                                const transformed = await server.transformIndexHtml(req.url, shellHtml);
-                                const finalHtml = ssrResult
-                                    ? transformed.replace(SSR_PLACEHOLDER, ssrResult.html)
-                                    : transformed;
-                                res.setHeader('Content-Type', 'text/html');
-                                res.setHeader('Cache-Control', 'no-store');
-                                res.end(finalHtml);
-                            }).catch(err => {
-                                console.error('[LumenJS] SSR/HTML generation error:', err);
-                                const html = generateIndexHtml({ title, editorMode, integrations, locale, i18nConfig: i18nConfig || undefined, translations });
-                                server.transformIndexHtml(req.url, html).then(transformed => {
+                            }
+                            if (req.url && !req.url.startsWith('/@') && !req.url.startsWith('/node_modules') &&
+                                !req.url.startsWith('/api/') && !req.url.startsWith('/__nk_loader/') &&
+                                !req.url.startsWith('/__nk_i18n/') &&
+                                !req.url.includes('.') && req.method === 'GET') {
+                                let pathname = req.url.split('?')[0];
+                                // Resolve locale from URL/cookie/header
+                                let locale;
+                                let translations;
+                                if (i18nConfig) {
+                                    const localeResult = resolveLocale(pathname, i18nConfig, req.headers);
+                                    locale = localeResult.locale;
+                                    pathname = localeResult.pathname;
+                                    translations = loadTranslationsFromDisk(projectDir, locale);
+                                }
+                                const SSR_PLACEHOLDER = '<!--__NK_SSR_CONTENT__-->';
+                                ssrRenderPage(server, pagesDir, pathname, req.headers, locale, req.nkAuth?.user ?? undefined).then(async (ssrResult) => {
+                                    if (ssrResult?.redirect) {
+                                        res.writeHead(ssrResult.redirect.status, { Location: ssrResult.redirect.location });
+                                        res.end();
+                                        return;
+                                    }
+                                    const shellHtml = generateIndexHtml({
+                                        title,
+                                        editorMode,
+                                        ssrContent: ssrResult ? SSR_PLACEHOLDER : undefined,
+                                        loaderData: ssrResult?.loaderData,
+                                        layoutsData: ssrResult?.layoutsData,
+                                        integrations,
+                                        locale,
+                                        i18nConfig: i18nConfig || undefined,
+                                        translations,
+                                        prefetch: prefetchStrategy,
+                                        authUser: ssrResult?.authUser ?? req.nkAuth?.user ?? undefined,
+                                        headContent,
+                                        base,
+                                    });
+                                    const transformed = await server.transformIndexHtml(req.url, shellHtml);
+                                    const finalHtml = ssrResult
+                                        ? transformed.replace(SSR_PLACEHOLDER, ssrResult.html)
+                                        : transformed;
                                     res.setHeader('Content-Type', 'text/html');
                                     res.setHeader('Cache-Control', 'no-store');
-                                    res.end(transformed);
-                                }).catch(next);
-                            });
-                            return;
-                        }
-                        next();
-                    });
+                                    res.end(finalHtml);
+                                }).catch(err => {
+                                    console.error('[LumenJS] SSR/HTML generation error:', err);
+                                    const html = generateIndexHtml({ title, editorMode, integrations, locale, i18nConfig: i18nConfig || undefined, translations, prefetch: prefetchStrategy, headContent, base });
+                                    server.transformIndexHtml(req.url, html).then(transformed => {
+                                        res.setHeader('Content-Type', 'text/html');
+                                        res.setHeader('Cache-Control', 'no-store');
+                                        res.end(transformed);
+                                    }).catch(next);
+                                });
+                                return;
+                            }
+                            next();
+                        });
+                    };
                 }
             }
         ],
         esbuild: shared.esbuild,
         optimizeDeps: {
-            include: ['lit', 'lit/decorators.js', 'lit/directive.js', 'lit/directive-helpers.js', 'lit/async-directive.js', 'lit-html', 'lit-element', '@lit/reactive-element'],
-            exclude: ['@lumenjs/i18n'],
+            exclude: [
+                '@lumenjs/i18n',
+                '@nuraly/lumenjs-auth',
+                // Lit packages must NOT be pre-bundled — pre-bundling creates separate
+                // module entries (/.vite/deps/) alongside raw /@fs/ files, causing
+                // multiple lit-html instances. Instead, resolve.dedupe forces all lit
+                // imports to a single copy. The project's lit version MUST match
+                // lumenjs's lit version for dedupe to work.
+                'lit', 'lit-html', 'lit-element', '@lit/reactive-element',
+                '@lit-labs/ssr-client',
+            ],
         },
         ssr: {
             noExternal: true,
-            external: ['node-domexception'],
+            external: ['node-domexception', 'socket.io-client', 'xmlhttprequest-ssl', 'engine.io-client', 'better-sqlite3', '@lumenjs/db', '@lumenjs/permissions', 'amqplib'],
             resolve: {
                 conditions: ['node', 'import'],
             },

package/dist/dev-server/ssr-render.d.ts

@@ -9,7 +9,7 @@ export interface LayoutSSRData {
  *
  * Returns pre-rendered HTML and loader data, or null on failure (falls back to CSR).
  */
-export declare function ssrRenderPage(server: ViteDevServer, pagesDir: string, pathname: string, headers?: Record<string, string | string[] | undefined>, locale?: string): Promise<{
+export declare function ssrRenderPage(server: ViteDevServer, pagesDir: string, pathname: string, headers?: Record<string, string | string[] | undefined>, locale?: string, user?: any): Promise<{
     html: string;
     loaderData: any;
     layoutsData?: LayoutSSRData[];
@@ -17,4 +17,5 @@ export declare function ssrRenderPage(server: ViteDevServer, pagesDir: string, p
         location: string;
         status: number;
     };
+    authUser?: any;
 } | null>;