@wxn0brp/falcon-frame 0.5.2 → 0.5.4

package/dist/index.js

@@ -27,9 +27,9 @@ export class FalconFrame extends Router {
             this.addBodyParser(json(this, { limit: this.opts.bodyLimit }));
         if (!this.opts.disableUrlencodedParser)
             this.addBodyParser(urlencoded(this, { limit: this.opts.bodyLimit }));
-        this.engine(".html", (path, options, callback) => {
+        this.engine(".html", (path, options, callback, FF) => {
             try {
-                const content = renderHTML(path, options);
+                const content = renderHTML(path, options, [], FF);
                 callback(null, content);
             }
             catch (e) {
@@ -43,15 +43,30 @@ export class FalconFrame extends Router {
     }
     listen(port, callback, beforeHandleRequest) {
         const server = http.createServer(this.getApp(beforeHandleRequest));
+        let parsedPort = 0;
+        let host = "";
+        if (typeof port === "string") {
+            if (port.includes(":")) {
+                const [h, po] = port.split(":");
+                host = h;
+                parsedPort = +po;
+            }
+            else
+                parsedPort = +port;
+        }
+        else if (typeof port === "number") {
+            parsedPort = port;
+        }
         if (typeof callback === "boolean") {
             if (callback)
                 callback = () => {
-                    console.log(`[FF] Server running on http://localhost:${port}`);
+                    console.log(`[FF] Server running on http://${host || "localhost"}:${parsedPort}`);
                 };
             else
                 callback = () => { };
         }
-        server.listen(port, callback || (() => { }));
+        const cb = callback || (() => { });
+        server.listen(parsedPort, host || "0.0.0.0", cb);
         return server;
     }
     getApp(beforeHandleRequest) {
@@ -65,9 +80,8 @@ export class FalconFrame extends Router {
         };
     }
     engine(ext, callback) {
-        if (ext[0] !== ".") {
+        if (ext[0] !== ".")
             ext = "." + ext;
-        }
         this.engines[ext] = callback;
         return this;
     }

package/dist/render.js

@@ -20,7 +20,7 @@ export function renderHTML(templatePath, data, renderedPaths = [], FF) {
             return renderHTML(partialPath, data, [
                 ...renderedPaths,
                 realPath,
-            ]);
+            ], FF);
         });
         // Layout
         if (FF && FF.vars["layout"]) {
@@ -31,7 +31,7 @@ export function renderHTML(templatePath, data, renderedPaths = [], FF) {
                 return template;
             if (!hasHtmlStructure && forceNoLayout)
                 return template;
-            return renderHTML(FF.vars["layout"], { ...data, body: template }, [...renderedPaths, realPath]);
+            return renderHTML(FF.vars["layout"], { ...data, body: template }, [...renderedPaths, realPath], FF);
         }
         return template;
     }

package/dist/res.js

@@ -137,7 +137,7 @@ export class FFResponse extends http.ServerResponse {
                     this.ct(opts.contentType || "text/html");
                     this.end(str);
                 }
-            });
+            }, opts.notShareFF ? undefined : this.FF);
         }
         catch (err) {
             ff.logger.error(`Unhandled error in template engine: ${err}`);

package/dist/types.d.ts

@@ -61,11 +61,12 @@ export interface StaticServeOptions {
     errorIfDirNotFound?: boolean;
     notRenderHtml?: boolean;
 }
-export type EngineCallback = (path: string, options: any, callback: (e: any, rendered?: string) => void) => void;
+export type EngineCallback = (path: string, options: any, callback: (e: any, rendered?: string) => void, FF?: FalconFrame) => void;
 export interface RenderOptions {
     notUseViews?: boolean;
     contentType?: string;
     baseDir?: string;
     engine?: string;
     notAppendExt?: boolean;
+    notShareFF?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/falcon-frame",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "wxn0brP",