@webtypen/webframez-core 0.2.67 → 0.2.69

package/dist/DataBuilder/DataBuilder.js

@@ -201,7 +201,7 @@ class DataBuilder {
                         newData.forms = yield type.forms(req);
                     }
                     for (let form in type.forms) {
-                        if (!type.forms[form] || !type.forms[form].fields || type.forms[form].fields.length < 1) {
+                        if (!type.forms[form] || !type.forms[form].fields) {
                             continue;
                         }
                         newData.forms[form] = {};
@@ -220,6 +220,9 @@ class DataBuilder {
                         else if (type.forms[form].fields) {
                             newData.forms[form].fields = JSON.parse(JSON.stringify(type.forms[form].fields));
                         }
+                        if (!newData.forms[form].fields || newData.forms[form].fields.length < 1) {
+                            continue;
+                        }
                         newData.forms[form].allowDeletion =
                             (typeof type.forms[form].allowDeletion === "boolean" && type.forms[form].allowDeletion) ||
                                 (typeof type.forms[form].allowDeletion === "function" && (yield type.forms[form].allowDeletion(req)))

package/dist/Router/Response.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { ServerResponse } from "http";
+import { Request } from "./Request";
 export declare class Response {
     res?: ServerResponse;
     statusCode: number;
@@ -42,6 +43,31 @@ export declare class Response {
      * @returns Response
      */
     send(content: any): this;
+    /**
+     * Sends a CSV file to the client
+     *
+     * @param content
+     * @param filename
+     * @param options
+     * @returns Response
+     */
+    sendCsv(content: string | [string[]], filename?: string, options?: {
+        seperator?: string;
+        eol: string;
+        skipUtf8BOM?: boolean;
+        contentType?: string;
+        contentDisposition?: string;
+    }): Promise<this>;
+    /**
+     * Streams a media file to the client
+     *
+     * @param req
+     * @param filepath
+     * @param filename
+     * @param mimeType
+     * @returns void
+     */
+    stream(req: Request, filepath: string, filename: string, mimeType: string): Promise<unknown>;
     download(filepath: string, options?: any): Promise<unknown>;
     end(): this;
     registerEvent(eventKey: string, func: any): Promise<void>;

package/dist/Router/Response.js

@@ -91,6 +91,89 @@ class Response {
         }
         return this;
     }
+    /**
+     * Sends a CSV file to the client
+     *
+     * @param content
+     * @param filename
+     * @param options
+     * @returns Response
+     */
+    sendCsv(content, filename = "export.csv", options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.header("Content-Type", options && options.contentType ? options.contentType : "text/csv");
+            this.header("Content-Disposition", (options && options.contentDisposition ? options.contentDisposition : "attachment") +
+                ";filename=" +
+                (filename ? filename : "export.csv"));
+            let str = "";
+            if (content && typeof content === "string") {
+                str = content;
+            }
+            else if (content && Array.isArray(content) && content.length > 0) {
+                for (let row of content) {
+                    str +=
+                        (str.trim() !== "" ? (options && options.eol ? options.eol : "\n") : "") +
+                            row.join(options && options.seperator ? options.seperator : ";");
+                }
+            }
+            return this.send((options && options.skipUtf8BOM ? "" : "\uFEFF") + str);
+        });
+    }
+    /**
+     * Streams a media file to the client
+     *
+     * @param req
+     * @param filepath
+     * @param filename
+     * @param mimeType
+     * @returns void
+     */
+    stream(req, filepath, filename, mimeType) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const stats = fs_1.default.statSync(filepath);
+            const range = ((_a = req.req) === null || _a === void 0 ? void 0 : _a.headers.range) || "";
+            const total = stats.size;
+            let start = undefined;
+            let end = undefined;
+            if (range) {
+                var parts = range.replace(/bytes=/, "").split("-");
+                var partialstart = parts[0];
+                var partialend = parts[1];
+                start = parseInt(partialstart, 10);
+                end = partialend ? parseInt(partialend, 10) : total - 1;
+                var chunksize = end - start + 1;
+                this.status(206);
+                this.header("Content-Range", "bytes " + start + "-" + end + "/" + total);
+                this.header("Accept-Ranges", "bytes");
+                this.header("Content-Length", chunksize.toString());
+                this.header("Content-Type", mimeType);
+                this.header("Content-Disposition", `attachment; filename="${filename}"`);
+            }
+            else {
+                this.status(200);
+                this.header("Accept-Ranges", "bytes");
+                this.header("Content-Length", stats.size.toString());
+                this.header("Content-Type", mimeType);
+                this.header("Content-Disposition", `attachment; filename="${filename}"`);
+            }
+            // @ts-ignore
+            var readStream = fs_1.default.createReadStream(filePath, { start: start, end: end });
+            readStream.on("error", (streamError) => {
+                console.error("WebframezStreamError:", streamError);
+            });
+            readStream.on("end", () => { });
+            // Prüfe ob res.res verfügbar ist
+            if (!this.res) {
+                throw new Error("Native Response-Objekt nicht verfügbar");
+            }
+            readStream.pipe(this.res);
+            return new Promise((resolve) => {
+                readStream.on("end", resolve);
+                readStream.on("error", resolve);
+            });
+        });
+    }
     download(filepath, options) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.2.67",
+    "version": "0.2.69",
     "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
     "homepage": "https://webtypen.de/",
     "license": "MIT",

package/src/DataBuilder/DataBuilder.ts

@@ -254,7 +254,7 @@ export class DataBuilder {
                 }
 
                 for (let form in type.forms) {
-                    if (!type.forms[form] || !type.forms[form].fields || type.forms[form].fields.length < 1) {
+                    if (!type.forms[form] || !type.forms[form].fields) {
                         continue;
                     }
 
@@ -275,6 +275,10 @@ export class DataBuilder {
                         newData.forms[form].fields = JSON.parse(JSON.stringify(type.forms[form].fields));
                     }
 
+                    if (!newData.forms[form].fields || newData.forms[form].fields.length < 1) {
+                        continue;
+                    }
+
                     newData.forms[form].allowDeletion =
                         (typeof type.forms[form].allowDeletion === "boolean" && type.forms[form].allowDeletion) ||
                         (typeof type.forms[form].allowDeletion === "function" && (await type.forms[form].allowDeletion(req)))

package/src/Router/Response.ts

@@ -2,6 +2,7 @@ import fs from "fs";
 import path from "path";
 import mime from "mime-types";
 import { ServerResponse } from "http";
+import { Request } from "./Request";
 
 export class Response {
     res?: ServerResponse;
@@ -89,6 +90,103 @@ export class Response {
         return this;
     }
 
+    /**
+     * Sends a CSV file to the client
+     *
+     * @param content
+     * @param filename
+     * @param options
+     * @returns Response
+     */
+    async sendCsv(
+        content: string | [string[]],
+        filename = "export.csv",
+        options?: { seperator?: string; eol: string; skipUtf8BOM?: boolean; contentType?: string; contentDisposition?: string }
+    ) {
+        this.header("Content-Type", options && options.contentType ? options.contentType : "text/csv");
+        this.header(
+            "Content-Disposition",
+            (options && options.contentDisposition ? options.contentDisposition : "attachment") +
+                ";filename=" +
+                (filename ? filename : "export.csv")
+        );
+
+        let str = "";
+        if (content && typeof content === "string") {
+            str = content;
+        } else if (content && Array.isArray(content) && content.length > 0) {
+            for (let row of content) {
+                str +=
+                    (str.trim() !== "" ? (options && options.eol ? options.eol : "\n") : "") +
+                    row.join(options && options.seperator ? options.seperator : ";");
+            }
+        }
+
+        return this.send((options && options.skipUtf8BOM ? "" : "\uFEFF") + str);
+    }
+
+    /**
+     * Streams a media file to the client
+     *
+     * @param req
+     * @param filepath
+     * @param filename
+     * @param mimeType
+     * @returns void
+     */
+    async stream(req: Request, filepath: string, filename: string, mimeType: string) {
+        const stats: any = fs.statSync(filepath);
+        const range = req.req?.headers.range || "";
+        const total = stats.size;
+
+        let start: any = undefined;
+        let end: any = undefined;
+
+        if (range) {
+            var parts = range.replace(/bytes=/, "").split("-");
+            var partialstart = parts[0];
+            var partialend = parts[1];
+
+            start = parseInt(partialstart, 10);
+            end = partialend ? parseInt(partialend, 10) : total - 1;
+            var chunksize = end - start + 1;
+
+            this.status(206);
+            this.header("Content-Range", "bytes " + start + "-" + end + "/" + total);
+            this.header("Accept-Ranges", "bytes");
+            this.header("Content-Length", chunksize.toString());
+            this.header("Content-Type", mimeType);
+            this.header("Content-Disposition", `attachment; filename="${filename}"`);
+        } else {
+            this.status(200);
+            this.header("Accept-Ranges", "bytes");
+            this.header("Content-Length", stats.size.toString());
+            this.header("Content-Type", mimeType);
+            this.header("Content-Disposition", `attachment; filename="${filename}"`);
+        }
+
+        // @ts-ignore
+        var readStream = fs.createReadStream(filePath, { start: start, end: end });
+
+        readStream.on("error", (streamError) => {
+            console.error("WebframezStreamError:", streamError);
+        });
+
+        readStream.on("end", () => {});
+
+        // Prüfe ob res.res verfügbar ist
+        if (!this.res) {
+            throw new Error("Native Response-Objekt nicht verfügbar");
+        }
+
+        readStream.pipe(this.res);
+
+        return new Promise((resolve: any) => {
+            readStream.on("end", resolve);
+            readStream.on("error", resolve);
+        });
+    }
+
     async download(filepath: string, options?: any) {
         return new Promise((resolve: Function, reject: Function) => {
             if (!this.res) {