@synchjs/ewb 1.0.0 → 1.0.2

package/dist/Components/ServeMemoryStore.js

@@ -1,27 +1,142 @@
 import tailwindPlugin from "bun-plugin-tailwind";
+import fs from "fs";
+import path from "path";
+import { load } from "cheerio";
 export class ServeMemoryStore {
     static _instance;
     _assets = new Map();
     _htmlCache = new Map();
-    constructor() { }
+    _cacheDir = path.join(process.cwd(), ".ebw-cache");
+    _devMode = false;
+    _watchers = new Map();
+    _listeners = [];
+    constructor() {
+        this.ensureCacheDir();
+    }
+    ensureCacheDir() {
+        if (!fs.existsSync(this._cacheDir)) {
+            try {
+                fs.mkdirSync(this._cacheDir, { recursive: true });
+            }
+            catch (e) {
+                // Fallback if we can't create directory
+            }
+        }
+    }
+    clearCache() {
+        if (fs.existsSync(this._cacheDir)) {
+            try {
+                const files = fs.readdirSync(this._cacheDir);
+                for (const file of files) {
+                    fs.unlinkSync(path.join(this._cacheDir, file));
+                }
+                // Silent clear
+            }
+            catch (e) {
+                console.error("[Cache] Error clearing cache:", e);
+            }
+        }
+        this._htmlCache.clear();
+        this._assets.clear();
+    }
     static get instance() {
         if (!ServeMemoryStore._instance) {
             ServeMemoryStore._instance = new ServeMemoryStore();
         }
         return ServeMemoryStore._instance;
     }
-    getAsset(path) {
-        // Remove leading slash for matching if stored without it, or normalize.
-        // We will store with leading slash.
-        return this._assets.get(path);
+    setDevMode(enabled) {
+        this._devMode = enabled;
     }
-    async buildAndCache(htmlPath, options = { enable: false, plugins: [] }) {
-        const cacheKey = htmlPath +
+    onRebuild(listener) {
+        this._listeners.push(listener);
+    }
+    notify(data) {
+        this._listeners.forEach((l) => l(data));
+    }
+    getAsset(rawPath) {
+        // Basic path traversal protection
+        const normalizedPath = path.posix.normalize(rawPath);
+        if (normalizedPath.includes(".."))
+            return undefined;
+        return this._assets.get(normalizedPath);
+    }
+    getCacheKey(htmlPath, options) {
+        return (htmlPath +
             (options.enable ? ":tw" : "") +
-            (options.plugins ? ":" + options.plugins.length : "");
-        if (this._htmlCache.has(cacheKey)) {
+            (options.plugins ? ":" + options.plugins.length : ""));
+    }
+    async loadFromDisk(cacheKey) {
+        if (this._devMode)
+            return null; // Skip disk cache in dev mode
+        const hash = Bun.hash(cacheKey).toString(16);
+        const cacheFile = path.join(this._cacheDir, `${hash}.json`);
+        if (fs.existsSync(cacheFile)) {
+            try {
+                const data = JSON.parse(fs.readFileSync(cacheFile, "utf-8"));
+                this._htmlCache.set(cacheKey, data.html);
+                for (const [webPath, asset] of Object.entries(data.assets)) {
+                    this._assets.set(webPath, {
+                        type: asset.type,
+                        content: Buffer.from(asset.content, "base64"),
+                    });
+                }
+                return data.html;
+            }
+            catch (e) {
+                console.error("Error loading cache from disk:", e);
+            }
+        }
+        return null;
+    }
+    setupWatcher(htmlPath, options) {
+        const cacheKey = this.getCacheKey(htmlPath, options);
+        if (this._watchers.has(cacheKey))
+            return;
+        const absolutePath = path.resolve(process.cwd(), htmlPath);
+        const watchDir = path.dirname(absolutePath);
+        const watcher = fs.watch(watchDir, { recursive: true }, async (event, filename) => {
+            if (!filename)
+                return;
+            // Ignore common noise
+            if (filename.includes("node_modules") ||
+                filename.includes(".git") ||
+                filename.includes(".ebw-cache"))
+                return;
+            // Silent detect
+            // Clear cache for this entry
+            this._htmlCache.delete(cacheKey);
+            // Clear disk cache by deleting file
+            const hash = Bun.hash(cacheKey).toString(16);
+            const cacheFile = path.join(this._cacheDir, `${hash}.json`);
+            if (fs.existsSync(cacheFile)) {
+                fs.unlinkSync(cacheFile);
+            }
+            try {
+                const newHtml = await this.buildAndCache(htmlPath, options);
+                this.notify({ html: newHtml });
+            }
+            catch (e) {
+                console.error("[HMR] Rebuild failed:", e);
+            }
+        });
+        this._watchers.set(cacheKey, watcher);
+    }
+    async buildAndCache(htmlPath, options = { enable: false, plugins: [] }) {
+        const cacheKey = this.getCacheKey(htmlPath, options);
+        // 1. Check Memory Cache
+        if (!this._devMode && this._htmlCache.has(cacheKey)) {
             return this._htmlCache.get(cacheKey);
         }
+        // 2. Check Disk Cache
+        const diskHtml = await this.loadFromDisk(cacheKey);
+        if (diskHtml) {
+            if (this._devMode) {
+                this.setupWatcher(htmlPath, options);
+            }
+            return diskHtml;
+        }
+        // 3. Perform Build
         try {
             const plugins = [...(options.plugins || [])];
             if (options.enable) {
@@ -30,9 +145,9 @@ export class ServeMemoryStore {
             const build = await Bun.build({
                 entrypoints: [htmlPath],
                 target: "browser",
-                minify: true,
-                naming: "[name]-[hash].[ext]", // Ensure unique names
-                publicPath: "/", // Assets served from root
+                minify: !this._devMode,
+                naming: "[name]-[hash].[ext]",
+                publicPath: "/",
                 plugins: plugins,
             });
             if (!build.success) {
@@ -40,33 +155,100 @@ export class ServeMemoryStore {
                 throw new Error("Build failed");
             }
             let htmlContent = "";
+            const currentBuildAssets = {};
             for (const output of build.outputs) {
                 const content = await output.arrayBuffer();
-                let text = await output.text(); // For HTML/CSS
-                // output.path is the absolute path if we were writing, or the name.
-                // With naming option, output.path usually contains the generated name.
-                // For artifacts, we need to map the requested URL to this content.
-                // output.kind gives us hint.
-                // Parse the relative path (URL) from the output.
-                // Since we didn't specify outdir, Bun might give us just the name or path relative to cwd.
-                // However, with `publicPath: "/"`, the HTML imports will look like `/foo-hash.js`.
-                // We need to store keys as `/foo-hash.js`.
-                // Let's rely on the fact that `output.path` usually returns what would be written to disk.
-                // We need the filename part.
+                const uint8 = new Uint8Array(content);
                 const filename = output.path.split(/[/\\]/).pop();
                 const webPath = "/" + filename;
                 if (output.type === "text/html" || filename?.endsWith(".html")) {
-                    htmlContent = text;
+                    htmlContent = await output.text();
                 }
                 else {
-                    let finalContent = new Uint8Array(content);
-                    this._assets.set(webPath, {
+                    const asset = {
                         type: output.type,
-                        content: finalContent,
-                    });
+                        content: uint8,
+                    };
+                    this._assets.set(webPath, asset);
+                    currentBuildAssets[webPath] = {
+                        type: output.type,
+                        content: Buffer.from(uint8).toString("base64"),
+                    };
                 }
             }
+            // Inject HMR/Reload script in dev mode
+            if (this._devMode) {
+                const reloadScript = `
+<script src="/socket.io/socket.io.js"></script>
+<script id="ebw-hmr-script">
+  (function() {
+    const socket = io(window.location.origin);
+    
+    socket.on('rebuild', (data) => {
+      if (!data || !data.html) return;
+      console.log('[HMR] Rebuild detected. Hot swapping scripts...');
+      
+      const parser = new DOMParser();
+      const newDoc = parser.parseFromString(data.html, 'text/html');
+      const newScripts = Array.from(newDoc.querySelectorAll('script[src]'))
+        .filter(s => !s.id && s.getAttribute('src').includes('-')); // Find bundled scripts
+        
+      if (newScripts.length === 0) {
+        console.warn('[HMR] No bundled scripts found in rebuild. Falling back to reload.');
+        location.reload();
+        return;
+      }
+      
+      // Remove old bundled scripts
+      const oldScripts = Array.from(document.querySelectorAll('script[src]'))
+        .filter(s => !s.id && s.getAttribute('src').includes('-'));
+      
+      oldScripts.forEach(s => s.remove());
+      
+      // Add new scripts
+      newScripts.forEach(s => {
+        const script = document.createElement('script');
+        Array.from(s.attributes).forEach(attr => script.setAttribute(attr.name, attr.value));
+        document.body.appendChild(script);
+      });
+      
+      console.log('[HMR] Hot swap complete!');
+    });
+
+    socket.on('reload', () => {
+      console.log('[HMR] Hard reload signal received.');
+      location.reload();
+    });
+    
+    socket.on('disconnect', () => {
+      console.warn('[HMR] Connection lost. Attempting to reconnect...');
+    });
+  })();
+</script>
+`;
+                // In dev mode, we might want to prevent caching by appending a timestamp to asset links in the HTML
+                const timestamp = Date.now();
+                htmlContent = htmlContent.replace(/(\.js|\.css)(\?.*)?/g, `$1?t=${timestamp}`);
+                const $ = load(htmlContent);
+                if ($("body").length > 0) {
+                    $("body").append(reloadScript);
+                }
+                else {
+                    $.root().append(reloadScript);
+                }
+                htmlContent = $.html();
+                this.setupWatcher(htmlPath, options);
+            }
+            // 4. Save to Memory and Disk
             this._htmlCache.set(cacheKey, htmlContent);
+            if (!this._devMode) {
+                const hash = Bun.hash(cacheKey).toString(16);
+                const cacheFile = path.join(this._cacheDir, `${hash}.json`);
+                fs.writeFileSync(cacheFile, JSON.stringify({
+                    html: htmlContent,
+                    assets: currentBuildAssets,
+                }));
+            }
             return htmlContent;
         }
         catch (error) {

package/dist/Components/Server.d.ts

@@ -2,10 +2,12 @@ import { type Request, type Response, type NextFunction } from "express";
 import { type HelmetOptions } from "helmet";
 import cors from "cors";
 import { type Options as RateLimitOptions } from "express-rate-limit";
+import { UserHandler } from "./UserHandler";
 export declare class Server {
     private readonly _app;
     private readonly _port;
     private readonly _controllersDir;
+    private readonly _viewsDir?;
     readonly _id: string;
     private readonly _enableSwagger;
     private readonly _swaggerPath;
@@ -14,17 +16,24 @@ export declare class Server {
     private readonly _ajv;
     private readonly _securityHandlers;
     private readonly _container?;
+    private readonly _roleHandler?;
+    private _userHandler?;
     private _serverInstance?;
+    private _io?;
     private _controllerCount;
     private _routeCount;
     private _tailwindEnabled;
+    private _devMode;
     constructor(options: ServerOptions);
+    private setupHmr;
     private log;
     init(): Promise<void>;
     private printStartupMessage;
     close(): void;
+    setUserHandler(handler: UserHandler): void;
+    private setupAuthRoutes;
     private loadControllers;
-    private createJwtMiddleware;
+    private createRoleMiddleware;
     private createAuthMiddleware;
     private createValidationMiddleware;
     private setupSwagger;
@@ -36,6 +45,7 @@ export interface ServerOptions {
     logging?: boolean;
     id: string;
     controllersDir?: string;
+    viewsDir?: string;
     corsOptions?: cors.CorsOptions;
     helmetOptions?: HelmetOptions;
     rateLimitOptions?: Partial<RateLimitOptions>;
@@ -44,5 +54,6 @@ export interface ServerOptions {
     container?: {
         get: (target: any) => any;
     };
+    roleHandler?: (req: Request, roles: string[]) => boolean | Promise<boolean>;
 }
 //# sourceMappingURL=Server.d.ts.map

package/dist/Components/Server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../../src/Components/Server.ts"],"names":[],"mappings":"AAAA,OAAgB,EAEd,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,KAAK,YAAY,EAClB,MAAM,SAAS,CAAC;AAKjB,OAAe,EAAE,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAC;AACpD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAkB,EAChB,KAAK,OAAO,IAAI,gBAAgB,EACjC,MAAM,oBAAoB,CAAC;AAuB5B,qBAAa,MAAM;IACjB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAU;IAC/B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,SAAgB,GAAG,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAM;IACxC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAM;IAC3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAGhC;IACF,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAgC;IAC5D,OAAO,CAAC,eAAe,CAAC,CAAa;IAErC,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,gBAAgB,CAAS;gBAErB,OAAO,EAAE,aAAa;IAkClC,OAAO,CAAC,GAAG;IAME,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqClC,OAAO,CAAC,mBAAmB;IAmCpB,KAAK,IAAI,IAAI;YASN,eAAe;IAoP7B,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,CAAC,oBAAoB;IAyD5B,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,YAAY;CAmErB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC;IAC/B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC7C,gBAAgB,CAAC,EAAE,MAAM,CACvB,MAAM,EACN,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAC1D,CAAC;IACF,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACtC,SAAS,CAAC,EAAE;QAAE,GAAG,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAA;KAAE,CAAC;CAC3C"}
+{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../../src/Components/Server.ts"],"names":[],"mappings":"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"}