miqro 7.2.9 → 7.3.1

package/build/esm/src/common/arguments.d.ts

@@ -7,6 +7,7 @@ interface MiqroJSON {
     browser?: string | boolean;
     logFile?: string | boolean;
     editor?: boolean;
+    etag?: boolean;
     https?: boolean;
     serverOptions?: ServerOptions;
     httpsRedirect?: number;
@@ -23,6 +24,7 @@ export interface Arguments {
     inflateFlat?: boolean;
     name?: string;
     noBuild?: boolean;
+    etag?: boolean;
     noMinify?: boolean;
     browser?: string | boolean;
     logFile?: string | boolean;

package/build/esm/src/common/arguments.js

@@ -16,6 +16,7 @@ const MiqroJSONSchema = {
     type: "object",
     properties: {
         name: "string?",
+        etag: "boolean?",
         services: "string[]?",
         noBuild: "boolean?",
         noMinify: "boolean?",
@@ -53,6 +54,7 @@ export function parseArguments() {
     const args = cluster.isPrimary ? process.argv.slice(2, process.argv.length) : process.argv.slice(3, process.argv.length);
     const flags = {
         inflateFlat: null,
+        etag: null,
         inflateOnlyAssets: null,
         inflateParallel: null,
         httpsRedirect: null,
@@ -182,6 +184,22 @@ export function parseArguments() {
                 }
                 flags.install = true;
                 continue;
+            case "--disable-etag":
+                if (flags.etag !== null) {
+                    console.error("bad arguments.");
+                    console.error(usage);
+                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
+                }
+                flags.etag = false;
+                continue;
+            case "--enable-etag":
+                if (flags.etag !== null) {
+                    console.error("bad arguments.");
+                    console.error(usage);
+                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
+                }
+                flags.etag = true;
+                continue;
             case "--watch":
                 if (flags.watch !== null) {
                     console.error("bad arguments.");
@@ -542,6 +560,11 @@ export function parseArguments() {
                 flags.https = miqroRC.https;
             }
         }
+        if (flags.etag === null) {
+            if (miqroRC.etag !== undefined) {
+                flags.etag = miqroRC.etag;
+            }
+        }
         if (flags.httpsRedirect === null) {
             if (miqroRC.httpsRedirect && flags.https) {
                 /*console.log("reading key from " + String(miqroRC.serverOptions?.key));
@@ -692,6 +715,7 @@ export function parseArguments() {
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
     return {
+        etag: flags.etag !== null ? flags.etag : true,
         inflateFlat: flags.inflateFlat === null ? false : flags.inflateFlat,
         inflateOnlyAssets: flags.inflateOnlyAssets === null ? undefined : flags.inflateOnlyAssets,
         noMinify: flags.noMinify === null ? false : flags.noMinify,

package/build/esm/src/common/help.d.ts

@@ -1,3 +1,3 @@
 export declare const BIN_NAME = "miqro";
 export declare const usage = "usage: miqro [...FLAGS] --service app/\n\n==examples==\n\nmiqro --watch --service front/\nPORT=8181 miqro --service api/ --service front/\nmiqro --test --service front/\nmiqro --inflate --service front/\nmiqro --generate-doc --generate-doc-out API.md --service front/\nCLUSTER_COUNT=10 miqro-cluster --service api/";
-export declare const help = "\n==flags==\n\n-v, --version\n\toutputs the version number\n-h, --help\n\toutputs this page.\n--watch\n\tuse to auto reload the server when files change.\n--hot-reload\n\tenables the hot-reload functionality use with --watch.\n--test\n\trun the tests for a service.\n--migrate-up\n\tmigrations up.\n--migrate-down\n\tmigrations down.\n--inflate\n\tinflates the application into a directory using esbuild.\n--inflate-dir\n\tto set the output directory of the --inflate command. default value is inflated/.\n--editor\n\truns the application with a built-in editor.\n--generate-doc\n\tgenerates a documentation for the api endpoints of the service.\n--generate-doc-out\n\tthe output file for the generated documentation. default value is API.md.\n--generate-doc-type\n\tthe format of the generated documentation. it can be JSON or MD. default value is MD.\n--generate-doc-all\n\toutputs all the server routes in the documentation output.\n--compile\n\tinflates the application and tries to create a NODE SEA binary.\n--no-build\n\tdisables calling esbuild during imports in runtime. Notice that to use jsx you will need to run tsc or esbuild on your jsx files to transpile them to js.\n--no-minify\n\tdisables calling minifing min.js files.\n--inflate-only-assets\n\tinflates ONLY the application assets. must be used with --inflate.\n--inflate-flat\n\tinflates files into the inflate-dir directly.\n--inflate-sea\n\tinflates the application with sea compilation scripts.\n--install-tsconfig\n\tcreates a tsconfig.json configured to use with --install-types.\n--install-miqrojson\n\tcreates a default miqro.json file.\n--install\n\tcreates a node_modules folder from binary cache (only available in sea binary).\n--disable-miqrojson\n\tdisables the load of miqro.json file.\n--log-file\n\toverrides the default log file from LOG_FILE.\n--browser\n\toverrides the default browser from BROWSER.\n--config\n\toverrides the default miqro.json path.\n--port\n\toverrides the default port from PORT.\n--name\n\toverrides the default name of the server.\n--https\n\tserves the server in https instead of http\n--https-key\n\tpoint to a server.key file for https.\n--https-cert\n\tpoint to a server.cert file for https.\n--https-redirect\n\tserves an aditional http server that redirects to https. it needs a port number.\n--inflate-parallel\n\tsets the max parallel esbuild instances. defaults to 1.\n\n==environment variables==\n\nPORT\n\toverride the default 8080 port.\nBROWSER\n\toverride the default browser. change to none to disable.\".\nLOG_FILE\n\toverride the default ./server.log file\nDB\n\tenable the server.db features\nDB_STORAGE\n\toverride the default local db location ./db.sqlite3\nDB_DIALECT\n\toverride the default node:sqlite\nDB_CONNECTION\n\toverride the default connection url\nCLEAR_JSX_CACHE\n\tset to 1 or 0 to enable or disable the clearing of the esbuild cache defaults to 1.\nJSX_TMP\n\tset custom location of esbuild builds defaults to /tmp/jsx_tmp.\n";
+export declare const help = "\n==flags==\n\n-v, --version\n\toutputs the version number\n-h, --help\n\toutputs this page.\n--disable-etag\n\tuse to disable etag generation by default. each route can still enable this.\n--enable-etag\n\tuse to enable etag generation by default. each route can still disable this. ( by default etag is enabled )\n--watch\n\tuse to auto reload the server when files change.\n--hot-reload\n\tenables the hot-reload functionality use with --watch.\n--test\n\trun the tests for a service.\n--migrate-up\n\tmigrations up.\n--migrate-down\n\tmigrations down.\n--inflate\n\tinflates the application into a directory using esbuild.\n--inflate-dir\n\tto set the output directory of the --inflate command. default value is inflated/.\n--editor\n\truns the application with a built-in editor.\n--generate-doc\n\tgenerates a documentation for the api endpoints of the service.\n--generate-doc-out\n\tthe output file for the generated documentation. default value is API.md.\n--generate-doc-type\n\tthe format of the generated documentation. it can be JSON or MD. default value is MD.\n--generate-doc-all\n\toutputs all the server routes in the documentation output.\n--compile\n\tinflates the application and tries to create a NODE SEA binary.\n--no-build\n\tdisables calling esbuild during imports in runtime. Notice that to use jsx you will need to run tsc or esbuild on your jsx files to transpile them to js.\n--no-minify\n\tdisables calling minifing min.js files.\n--inflate-only-assets\n\tinflates ONLY the application assets. must be used with --inflate.\n--inflate-flat\n\tinflates files into the inflate-dir directly.\n--inflate-sea\n\tinflates the application with sea compilation scripts.\n--install-tsconfig\n\tcreates a tsconfig.json configured to use with --install-types.\n--install-miqrojson\n\tcreates a default miqro.json file.\n--install\n\tcreates a node_modules folder from binary cache (only available in sea binary).\n--disable-miqrojson\n\tdisables the load of miqro.json file.\n--log-file\n\toverrides the default log file from LOG_FILE.\n--browser\n\toverrides the default browser from BROWSER.\n--config\n\toverrides the default miqro.json path.\n--port\n\toverrides the default port from PORT.\n--name\n\toverrides the default name of the server.\n--https\n\tserves the server in https instead of http\n--https-key\n\tpoint to a server.key file for https.\n--https-cert\n\tpoint to a server.cert file for https.\n--https-redirect\n\tserves an aditional http server that redirects to https. it needs a port number.\n--inflate-parallel\n\tsets the max parallel esbuild instances. defaults to 1.\n\n==environment variables==\n\nPORT\n\toverride the default 8080 port.\nBROWSER\n\toverride the default browser. change to none to disable.\".\nLOG_FILE\n\toverride the default ./server.log file\nDB\n\tenable the server.db features\nDB_STORAGE\n\toverride the default local db location ./db.sqlite3\nDB_DIALECT\n\toverride the default node:sqlite\nDB_CONNECTION\n\toverride the default connection url\nCLEAR_JSX_CACHE\n\tset to 1 or 0 to enable or disable the clearing of the esbuild cache defaults to 1.\nJSX_TMP\n\tset custom location of esbuild builds defaults to /tmp/jsx_tmp.\n";

package/build/esm/src/common/help.js

@@ -15,6 +15,8 @@ export const help = `
 
 -v, --version\n\toutputs the version number
 -h, --help\n\toutputs this page.
+--disable-etag\n\tuse to disable etag generation by default. each route can still enable this.
+--enable-etag\n\tuse to enable etag generation by default. each route can still disable this. ( by default etag is enabled )
 --watch\n\tuse to auto reload the server when files change.
 --hot-reload\n\tenables the hot-reload functionality use with --watch.
 --test\n\trun the tests for a service.

package/build/esm/src/common/jwt.js

@@ -17,7 +17,7 @@ export async function encryptJWT(payload, secret, options) {
         .setIssuer(options?.iss ? options?.iss : 'urn:example:issuer')
         .setAudience(options?.aud ? options?.aud : 'urn:example:audience')
         .setExpirationTime(options?.exp ? options?.exp : '2h');
-    return await en.encrypt(secret, options?.options);
+    return en.encrypt(secret, options?.options);
 }
 /**
  * decrypts a JWT token with jose
@@ -27,7 +27,7 @@ export async function encryptJWT(payload, secret, options) {
  * @returns
  */
 export async function decryptJWT(jwt, secret, options) {
-    return await joseJWTDecrypt(jwt, secret, options);
+    return joseJWTDecrypt(jwt, secret, options);
 }
 /**
  * verify a JWT token with jose
@@ -37,7 +37,7 @@ export async function decryptJWT(jwt, secret, options) {
  * @returns
  */
 export async function verifyJWT(jwt, secret, options) {
-    return await jwtVerify(jwt, secret, options);
+    return jwtVerify(jwt, secret, options);
 }
 /**
  * creates a signed JWT with jose

package/build/esm/src/inflate/setup-http.js

@@ -86,7 +86,7 @@ async function createStaticRoute(inflateJSXOptions, service, logger, router, dir
             }
             // router.use(assertGlobalTampered);
             router.get(path, async function (_req, res) {
-                await new Promise((resolve, reject) => {
+                return new Promise((resolve, reject) => {
                     try {
                         readFile(file.filePath, async (err, body) => {
                             if (err) {
@@ -94,14 +94,13 @@ async function createStaticRoute(inflateJSXOptions, service, logger, router, dir
                             }
                             else {
                                 try {
-                                    await res.asyncEnd({
+                                    resolve({
                                         status: 200,
                                         headers: {
                                             ["Content-Type"]: contentType ? contentType : DEFAULT_CONTENT_TYPE
                                         },
                                         body
                                     });
-                                    resolve();
                                 }
                                 catch (e) {
                                     reject(e);
@@ -113,6 +112,10 @@ async function createStaticRoute(inflateJSXOptions, service, logger, router, dir
                         reject(e);
                     }
                 });
+            }, {
+                response: {
+                    etag: true
+                }
             });
             resolve();
         }
@@ -250,13 +253,13 @@ async function createRouterFromDirectory(importOptions, inflateJSXOptions, serve
                                     // router.use(assertGlobalTampered);
                                     router.use(async function (req, res) {
                                         const JSON = await getJSON(req, res, newURL(req.path), module.apiOptions?.basePath, module.default);
-                                        return res.asyncEnd({
+                                        return {
                                             status: 200,
                                             headers: {
                                                 ["Content-Type"]: contentType ? contentType : DEFAULT_CONTENT_TYPE
                                             },
                                             body: JSON
-                                        });
+                                        };
                                     }, r.path, r.method, r.options);
                                 }
                                 return resolve();
@@ -310,13 +313,13 @@ async function createRouterFromDirectory(importOptions, inflateJSXOptions, serve
                                     router.use(async function (req, res) {
                                         const toRender = typeof module.default === "function" ? module.default(req, res) : module.default;
                                         const HTML = await getHTML(hotreload, req, res, newURL(req.path), module.apiOptions?.basePath, await toRender);
-                                        return res.asyncEnd({
+                                        return {
                                             status: 200,
                                             headers: {
                                                 ["Content-Type"]: contentType ? contentType : DEFAULT_CONTENT_TYPE
                                             },
                                             body: HTML
-                                        });
+                                        };
                                     }, r.path, r.method, r.options);
                                 }
                                 return resolve();
@@ -364,13 +367,17 @@ async function createRouterFromDirectory(importOptions, inflateJSXOptions, serve
                                     }
                                     // router.use(assertGlobalTampered);
                                     router.get(path, async function (req, res) {
-                                        return res.asyncEnd({
+                                        return {
                                             status: 200,
                                             headers: {
                                                 ["Content-Type"]: contentType ? contentType : DEFAULT_CONTENT_TYPE
                                             },
                                             body: code
-                                        });
+                                        };
+                                    }, {
+                                        response: {
+                                            etag: true
+                                        }
                                     });
                                     return resolve();
                                 }
@@ -413,13 +420,17 @@ async function createRouterFromDirectory(importOptions, inflateJSXOptions, serve
                                 }
                                 // router.use(assertGlobalTampered);
                                 router.get(path, async function (_req, res) {
-                                    res.asyncEnd({
+                                    return {
                                         status: 200,
                                         headers: {
                                             ["Content-Type"]: contentType ? contentType : DEFAULT_CONTENT_TYPE
                                         },
                                         body: code
-                                    });
+                                    };
+                                }, {
+                                    response: {
+                                        etag: true
+                                    }
                                 });
                                 return resolve();
                             }
@@ -472,13 +483,17 @@ async function createRouterFromDirectory(importOptions, inflateJSXOptions, serve
                                     }
                                     // router.use(assertGlobalTampered);
                                     router.get(path, async function (_req, res) {
-                                        res.asyncEnd({
+                                        return {
                                             status: 200,
                                             headers: {
                                                 ["Content-Type"]: contentType ? contentType : DEFAULT_CONTENT_TYPE
                                             },
                                             body: code
-                                        });
+                                        };
+                                    }, {
+                                        response: {
+                                            etag: true
+                                        }
                                     });
                                     return resolve();
                                 }
@@ -529,13 +544,17 @@ async function createRouterFromDirectory(importOptions, inflateJSXOptions, serve
                                     }
                                     // router.use(assertGlobalTampered);
                                     router.get(path, async function (_req, res) {
-                                        res.asyncEnd({
+                                        return {
                                             status: 200,
                                             headers: {
                                                 ["Content-Type"]: contentType ? contentType : DEFAULT_CONTENT_TYPE
                                             },
                                             body: code
-                                        });
+                                        };
+                                    }, {
+                                        response: {
+                                            etag: true
+                                        }
                                     });
                                     return resolve();
                                 }

package/build/esm/src/main.js

@@ -16,6 +16,7 @@ async function main(args) {
     else {
         const app = new Miqro({
             editor: args.editor,
+            etag: args.etag,
             name: args.name ? args.name : undefined,
             port: args.test ? TEST_SOCKET : args.port,
             services: args.services,

package/build/esm/src/services/app.d.ts

@@ -24,6 +24,7 @@ export interface MiqroOptions extends ImportJSXFileOptions {
     hotreload?: boolean;
     watch?: boolean;
     serverOptions?: ServerOptions<any, any>;
+    etag?: boolean;
     https?: boolean;
     httpRedirect?: number;
     noMinify?: boolean;

package/build/esm/src/services/app.js

@@ -47,6 +47,7 @@ export class Miqro {
     constructor(options) {
         this.options = {
             noMinify: false,
+            etag: true,
             editor: false,
             name: "server",
             noBuild: false,
@@ -374,6 +375,7 @@ export class Miqro {
                     this.logger?.error(e);
                 }
             },
+            etag: this.options?.etag ?? true,
             loggerFactory: this.loggerProvider.requestLoggerFactory,
             serverOptions: this.options?.serverOptions,
             https: this.options?.https

package/build/esm/src/services/utils/get-route.js

@@ -19,7 +19,9 @@ export function getRoutes(prePath, defaultPath, apiOptions) {
                     parser: apiOptions?.parser,
                     policy: apiOptions?.policy,
                     request: apiOptions?.request,
-                    response: apiOptions?.response,
+                    response: apiOptions?.response ?? {
+                        etag: true
+                    },
                     session: apiOptions?.session
                 },
                 inflatePath: defaultInflatePath,
@@ -42,7 +44,9 @@ export function getRoutes(prePath, defaultPath, apiOptions) {
                         parser: apiOptions?.parser,
                         policy: apiOptions?.policy,
                         request: apiOptions?.request,
-                        response: apiOptions?.response,
+                        response: apiOptions?.response ?? {
+                            etag: true
+                        },
                         session: apiOptions?.session
                     },
                     inflatePath: p !== "/" ? join(prePath, p) : defaultInflatePath,

package/build/lib.cjs

@@ -1013,31 +1013,37 @@ function ResultParser(options, parser4) {
     }
   };
 }
-async function ResponseHandler(req, res) {
-  req.logger.trace("results [%o]", req.results);
-  if (!req.results || req.results.length === 0) {
-    throw new Error(`no response to send. Is your handler returning a value differente than boolean 'true|false' ?`);
-  } else {
-    const lastResult = req.results[req.results.length - 1];
-    req.logger.debug("response [%o]", lastResult);
-    if (lastResult !== void 0) {
-      const headers = lastResult.headers;
-      const body = lastResult.body;
-      const status = lastResult.status;
-      const noContentType = headers && !headers["Content-Type"] || !headers;
-      if (noContentType) {
-        await res.json(body, headers, status);
+function ResponseHandler(options) {
+  const isEtagEnabled = options?.etag !== void 0;
+  return async function ResponseHandler2(req, res) {
+    req.logger.trace("results [%o]", req.results);
+    if (!req.results || req.results.length === 0) {
+      throw new Error(`no response to send. Is your handler returning a value differente than boolean 'true|false' ?`);
+    } else {
+      const lastResult = req.results[req.results.length - 1];
+      req.logger.debug("response [%o]", lastResult);
+      if (lastResult !== void 0) {
+        let headers = lastResult.headers;
+        const body = lastResult.body;
+        const status = lastResult.status;
+        const noContentType = headers && !headers["Content-Type"] || !headers;
+        if (options?.etag !== void 0) {
+          res.setETag(options?.etag);
+        }
+        if (noContentType) {
+          await res.json(body, headers, status);
+        } else {
+          await res.asyncEnd({
+            body,
+            headers,
+            status
+          });
+        }
       } else {
-        await res.asyncEnd({
-          body,
-          headers,
-          status
-        });
+        throw new Error(`no response to send. Is your handler returning a value different than boolean 'true|false' ?`);
       }
-    } else {
-      throw new Error(`no response to send. Is your handler returning a value different than boolean 'true|false' ?`);
     }
-  }
+  };
 }
 function parsePart(req, part, value, args, mode, parser4) {
   for (let i = 0; i < args.length; i++) {
@@ -1349,6 +1355,9 @@ function isMinimalRouter(obj) {
 function defineRoute(route) {
   return route;
 }
+function defaultETag({ body }) {
+  return body ? `"${(0, import_node_crypto.createHash)("sha1").update(body instanceof Buffer ? body : typeof body === "object" ? JSON.stringify(body) : String(body)).digest("hex").slice(0, 16)}"` : null;
+}
 function pathPartTokenize(token) {
   const isWild = token.value[0] === ":";
   const optional = token.value[token.value.length - 1] === "?";
@@ -1452,12 +1461,12 @@ function parseSearchParams(search) {
   });
   return query;
 }
-var import_cookie2, import_crypto, import_http, LoggerErrorEvent, GroupPolicySchema, SessionHandlerOptionsOptionsSchema, SessionHandlerOptionsSchema, OptionalSchema, OptionalSchemaWithBoolean, OptionalParserModeSchema, RouteOptionsSchema, RouterHandlerOptionsSchema, HandlerWithOptionsSchema, MinimalRouterSchema, APIRouteSchema, Request, Response, splitPath;
+var import_cookie2, import_node_crypto, import_node_http, LoggerErrorEvent, GroupPolicySchema, SessionHandlerOptionsOptionsSchema, SessionHandlerOptionsSchema, OptionalSchema, OptionalSchemaWithBoolean, OptionalParserModeSchema, RouteOptionsSchema, RouterHandlerOptionsSchema, HandlerWithOptionsSchema, MinimalRouterSchema, APIRouteSchema, Request, Response, splitPath;
 var init_types = __esm({
   "node_modules/@miqro/core/build/types.js"() {
     import_cookie2 = __toESM(require_dist(), 1);
-    import_crypto = require("crypto");
-    import_http = require("http");
+    import_node_crypto = require("node:crypto");
+    import_node_http = require("node:http");
     init_session();
     LoggerErrorEvent = class extends Event {
       constructor(event, init) {
@@ -1548,6 +1557,7 @@ var init_types = __esm({
         response: {
           type: "object?|boolean?",
           properties: {
+            etag: "boolean?|function?",
             status: "number[]!?",
             headers: OptionalSchema,
             headersMode: OptionalParserModeSchema,
@@ -1624,7 +1634,7 @@ var init_types = __esm({
         init: "function?"
       }
     };
-    Request = class extends import_http.IncomingMessage {
+    Request = class extends import_node_http.IncomingMessage {
       constructor(socket) {
         super(socket);
         this.logger = console;
@@ -1636,7 +1646,7 @@ var init_types = __esm({
         this.params = /* @__PURE__ */ Object.create(null);
         this.results = [];
         this.startMS = Date.now();
-        this.uuid = (0, import_crypto.randomUUID)();
+        this.uuid = (0, import_node_crypto.randomUUID)();
         let vURL;
         Object.defineProperty(this, "url", {
           get: () => {
@@ -1680,12 +1690,16 @@ var init_types = __esm({
         });
       }
     };
-    Response = class _Response extends import_http.ServerResponse {
+    Response = class _Response extends import_node_http.ServerResponse {
       //logger: Logger;
       constructor(req) {
         super(req);
+        this.useETag = false;
         this.removeHeader("Date");
       }
+      setETag(useETag) {
+        this.useETag = useETag;
+      }
       async redirect(url, headers, status) {
         return this.asyncEnd({
           status: status !== void 0 ? status : 302,
@@ -1778,18 +1792,38 @@ var init_types = __esm({
         if (this.headersSent) {
           return Promise.reject(new Error("already ended"));
         }
-        return new Promise((resolve24, reject) => {
+        return new Promise(async (resolve24, reject) => {
           try {
             if (this.headersSent) {
               reject(new Error("already ended"));
+              return;
             } else {
               const body = args ? args.body : void 0;
+              const nBody = body !== void 0 ? body instanceof Buffer ? body : String(body) : null;
               if (args !== void 0) {
                 const { status, headers } = args;
                 const nStatus = status !== void 0 ? parseInt(String(status), 10) : 200;
                 if (isNaN(nStatus)) {
                   reject(new Error("status not a number!"));
+                  return;
                 } else {
+                  if (this.useETag) {
+                    let incomingETag = this.req.headers["if-none-match"];
+                    if (incomingETag && incomingETag.indexOf("W/") === 0) {
+                      incomingETag = incomingETag.substring("W/".length);
+                    }
+                    const etag = typeof this.useETag === "function" ? await this.useETag(args) : defaultETag({ body: nBody });
+                    if (incomingETag && etag && etag === incomingETag && nStatus >= 200 && nStatus < 300) {
+                      this.statusCode = 304;
+                      this.setHeader("ETag", etag);
+                      this.end(() => {
+                        resolve24();
+                      });
+                      return;
+                    } else if (etag) {
+                      this.setHeader("ETag", etag);
+                    }
+                  }
                   this.statusCode = nStatus;
                   if (headers) {
                     const keys = Object.keys(headers);
@@ -1805,7 +1839,6 @@ var init_types = __esm({
                 }
               }
               this.setHeader("connection", "close");
-              const nBody = body !== void 0 ? body instanceof Buffer ? body : String(body) : null;
               this.end(nBody, () => {
                 resolve24();
               });
@@ -2262,6 +2295,9 @@ var init_router = __esm({
         const loggerFactory = this.config && this.config.loggerFactory ? this.config.loggerFactory : routerDefaultLoggerFactory;
         this.listener = async (req, res) => {
           req.logger = loggerFactory(req.uuid, req);
+          if (this.config?.etag !== void 0) {
+            res.setETag(this.config?.etag);
+          }
           req.logger.trace(`request received`);
           await this.run(req, res);
         };
@@ -2416,7 +2452,11 @@ ${tab}${tab}${methodData.description}` : ""}`;
         }
         handlers = handlers.concat(routeHandlers);
         if (this.options && this.options.response && !this.isRouter) {
-          const responseMiddleware = typeof this.options.response === "boolean" ? [ResponseHandler] : this.options.response.middleware ? this.options.response.middleware instanceof Array ? this.options.response.middleware : [this.options.response.middleware] : [ResponseHandler];
+          const responseMiddleware = typeof this.options.response === "boolean" ? [ResponseHandler({
+            etag: true
+          })] : this.options.response.middleware ? this.options.response.middleware instanceof Array ? this.options.response.middleware : [this.options.response.middleware] : [ResponseHandler({
+            etag: this.options?.response?.etag !== void 0 ? this.options?.response?.etag : true
+          })];
           if (typeof this.options.response !== "boolean") {
             handlers.push(ResultParser(this.options.response, this.options.parser));
           }
@@ -2518,14 +2558,14 @@ ${tab}${tab}${methodData.description}` : ""}`;
 });
 
 // node_modules/@miqro/core/build/app.js
-var import_http2, import_https, import_crypto2, App;
+var import_http, import_https, import_crypto, App;
 var init_app = __esm({
   "node_modules/@miqro/core/build/app.js"() {
-    import_http2 = require("http");
+    import_http = require("http");
     import_https = require("https");
     init_router();
     init_common();
-    import_crypto2 = require("crypto");
+    import_crypto = require("crypto");
     App = class extends Router2 {
       constructor(config) {
         super(config);
@@ -2544,6 +2584,9 @@ var init_app = __esm({
             const logger = loggerFactory(req.uuid, req);
             try {
               req.logger = logger;
+              if (this.config?.etag !== void 0) {
+                res.setETag(this.config?.etag);
+              }
               try {
                 req.logger.trace(`request received for [%s]`, req.path);
                 if (this.shouldCloseConnection) {
@@ -2581,10 +2624,10 @@ var init_app = __esm({
             console.error(loggerError);
           }
         };
-        const createS = config && config.https ? import_https.createServer : import_http2.createServer;
+        const createS = config && config.https ? import_https.createServer : import_http.createServer;
         this.httpServer = createS(this.serverOptions, this.listener);
         this.httpServer.on("connection", (conn) => {
-          const key = (0, import_crypto2.randomUUID)();
+          const key = (0, import_crypto.randomUUID)();
           this.connections[key] = conn;
           conn.on("close", () => {
             delete this.connections[key];
@@ -2670,7 +2713,7 @@ var init_app = __esm({
 
 // node_modules/@miqro/core/build/websocket.js
 function createUpgradeHeaders(acceptKey, extraHeaders) {
-  const acceptValue = (0, import_crypto3.createHash)("sha1").update(acceptKey + GUID, "binary").digest("base64");
+  const acceptValue = (0, import_crypto2.createHash)("sha1").update(acceptKey + GUID, "binary").digest("base64");
   let extra = extraHeaders && extraHeaders.length > 0 ? `\r
 ${extraHeaders.map((h) => `${h.name}: ${h.value}`).join("\r\n")}` : "";
   return `HTTP/1.1 101 Switching Protocols\r
@@ -2746,10 +2789,10 @@ function createFrame(payload) {
   buffer.write(payload, payloadBytesOffset);
   return buffer;
 }
-var import_crypto3, WebSocketServer, PING, OPCODES, GUID, DEFAULT_MAX_FRAME_SIZE;
+var import_crypto2, WebSocketServer, PING, OPCODES, GUID, DEFAULT_MAX_FRAME_SIZE;
 var init_websocket = __esm({
   "node_modules/@miqro/core/build/websocket.js"() {
-    import_crypto3 = require("crypto");
+    import_crypto2 = require("crypto");
     WebSocketServer = class {
       constructor(options) {
         this.options = options;
@@ -2825,7 +2868,7 @@ var init_websocket = __esm({
           return;
         } else {
           const validateRet = this.options.validate ? await this.options.validate(req) : true;
-          const uuid = typeof validateRet === "boolean" ? validateRet ? (0, import_crypto3.randomUUID)() : null : typeof validateRet === "object" ? validateRet.uuid : validateRet ? (0, import_crypto3.randomUUID)() : null;
+          const uuid = typeof validateRet === "boolean" ? validateRet ? (0, import_crypto2.randomUUID)() : null : typeof validateRet === "object" ? validateRet.uuid : validateRet ? (0, import_crypto2.randomUUID)() : null;
           const extraHeaders = typeof validateRet === "object" ? validateRet.headers : void 0;
           if (!uuid) {
             req.logger.debug("validating failed with result [%s]", validateRet);
@@ -9052,7 +9095,7 @@ var DEFAULT_BUILD_DIR = (0, import_os.tmpdir)();
 
 // src/common/jsx.ts
 var import_node_path6 = require("node:path");
-var import_node_crypto3 = require("node:crypto");
+var import_node_crypto4 = require("node:crypto");
 init_lib();
 init_lib3();
 var import_node_process3 = require("node:process");
@@ -9066,7 +9109,7 @@ var import_node_sea = require("node:sea");
 var import_node_path3 = require("node:path");
 
 // src/common/checksum.ts
-var import_node_crypto = require("node:crypto");
+var import_node_crypto2 = require("node:crypto");
 var import_node_fs2 = require("node:fs");
 async function calculateChecksum(filePath) {
   return calculateChecksumFromStream((0, import_node_fs2.createReadStream)(filePath));
@@ -9074,7 +9117,7 @@ async function calculateChecksum(filePath) {
 async function calculateChecksumFromStream(input) {
   return new Promise((resolve24, reject) => {
     try {
-      const hash = (0, import_node_crypto.createHash)("sha256");
+      const hash = (0, import_node_crypto2.createHash)("sha256");
       input.on("readable", () => {
         const data = input.read();
         if (data)
@@ -9094,7 +9137,7 @@ async function calculateChecksumFromStream(input) {
 async function calculateChecksumFromBuffer(buffer) {
   return new Promise((resolve24, reject) => {
     try {
-      const hash = (0, import_node_crypto.createHash)("sha256");
+      const hash = (0, import_node_crypto2.createHash)("sha256");
       hash.update(buffer);
       resolve24(hash.digest("hex").toString());
     } catch (e) {
@@ -9298,13 +9341,13 @@ async function initAsset(logger, path, buffer, executable, checksum, logInstalla
 
 // src/common/paths.ts
 init_lib3();
-var import_node_crypto2 = require("node:crypto");
+var import_node_crypto3 = require("node:crypto");
 var import_node_fs5 = require("node:fs");
 var import_node_os = require("node:os");
 var import_node_path4 = require("node:path");
 var import_node_process2 = require("node:process");
 var JSX_TMP_DIR = checkEnvVariable(`JSX_TMP`, (0, import_node_path4.resolve)((0, import_node_os.tmpdir)(), "jsx_tmp"));
-var TEST_SOCKET = (0, import_node_path4.resolve)(JSX_TMP_DIR, `test.${(0, import_node_crypto2.randomUUID)()}.sock`);
+var TEST_SOCKET = (0, import_node_path4.resolve)(JSX_TMP_DIR, `test.${(0, import_node_crypto3.randomUUID)()}.sock`);
 function getServicePath(service) {
   return (0, import_node_path4.resolve)((0, import_node_process2.cwd)(), service);
 }
@@ -9461,7 +9504,7 @@ function JSXTemplate(inFile, useExport = true) {
   return `${useExport ? `export * from "${inFile}";import * as lib from "${inFile}";export default lib.default;` : `import * as lib from "${inFile}"`}`;
 }
 async function inflateJSX(inFile, options) {
-  const tmpBuildDir = (0, import_node_path6.resolve)(JSX_TMP_DIR, String(process.pid), "build", Date.now() + "-" + (0, import_node_crypto3.randomUUID)());
+  const tmpBuildDir = (0, import_node_path6.resolve)(JSX_TMP_DIR, String(process.pid), "build", Date.now() + "-" + (0, import_node_crypto4.randomUUID)());
   const inFileTmp = (0, import_node_path6.resolve)(tmpBuildDir, (0, import_node_path6.basename)(inFile) + ".mjs");
   const logger = options.logger;
   try {
@@ -9792,7 +9835,7 @@ async function importJSXFile(inFile, options, logger) {
     platform: "node",
     logger
   });
-  const tmpBuildDir = (0, import_node_path6.resolve)(JSX_TMP_DIR, String(process.pid), "import", Date.now() + "-" + (0, import_node_crypto3.randomUUID)());
+  const tmpBuildDir = (0, import_node_path6.resolve)(JSX_TMP_DIR, String(process.pid), "import", Date.now() + "-" + (0, import_node_crypto4.randomUUID)());
   const inFileTmp = (0, import_node_path6.resolve)(tmpBuildDir, (0, import_node_path6.basename)(inFile) + ".cjs");
   await mkdirASync(tmpBuildDir, {
     recursive: true
@@ -12632,7 +12675,9 @@ function getRoutes(prePath, defaultPath, apiOptions) {
           parser: apiOptions?.parser,
           policy: apiOptions?.policy,
           request: apiOptions?.request,
-          response: apiOptions?.response,
+          response: apiOptions?.response ?? {
+            etag: true
+          },
           session: apiOptions?.session
         },
         inflatePath: defaultInflatePath,
@@ -12654,7 +12699,9 @@ function getRoutes(prePath, defaultPath, apiOptions) {
             parser: apiOptions?.parser,
             policy: apiOptions?.policy,
             request: apiOptions?.request,
-            response: apiOptions?.response,
+            response: apiOptions?.response ?? {
+              etag: true
+            },
             session: apiOptions?.session
           },
           inflatePath: p !== "/" ? (0, import_node_path9.join)(prePath, p) : defaultInflatePath,
@@ -12842,21 +12889,20 @@ async function createStaticRoute(inflateJSXOptions, service, logger, router, dir
         }
       }
       router.get(path, async function(_req, res) {
-        await new Promise((resolve25, reject2) => {
+        return new Promise((resolve25, reject2) => {
           try {
             (0, import_node_fs11.readFile)(file.filePath, async (err, body) => {
               if (err) {
                 reject2(err);
               } else {
                 try {
-                  await res.asyncEnd({
+                  resolve25({
                     status: 200,
                     headers: {
                       ["Content-Type"]: contentType ? contentType : DEFAULT_CONTENT_TYPE
                     },
                     body
                   });
-                  resolve25();
                 } catch (e) {
                   reject2(e);
                 }
@@ -12866,6 +12912,10 @@ async function createStaticRoute(inflateJSXOptions, service, logger, router, dir
             reject2(e);
           }
         });
+      }, {
+        response: {
+          etag: true
+        }
       });
       resolve24();
     } catch (e) {
@@ -12987,13 +13037,13 @@ async function createRouterFromDirectory(importOptions, inflateJSXOptions, serve
                   }
                   router.use(async function(req, res) {
                     const JSON2 = await getJSON(req, res, newURL2(req.path), module2.apiOptions?.basePath, module2.default);
-                    return res.asyncEnd({
+                    return {
                       status: 200,
                       headers: {
                         ["Content-Type"]: contentType ? contentType : DEFAULT_CONTENT_TYPE
                       },
                       body: JSON2
-                    });
+                    };
                   }, r.path, r.method, r.options);
                 }
                 return resolve24();
@@ -13044,13 +13094,13 @@ async function createRouterFromDirectory(importOptions, inflateJSXOptions, serve
                   router.use(async function(req, res) {
                     const toRender = typeof module2.default === "function" ? module2.default(req, res) : module2.default;
                     const HTML = await getHTML(hotreload, req, res, newURL2(req.path), module2.apiOptions?.basePath, await toRender);
-                    return res.asyncEnd({
+                    return {
                       status: 200,
                       headers: {
                         ["Content-Type"]: contentType ? contentType : DEFAULT_CONTENT_TYPE
                       },
                       body: HTML
-                    });
+                    };
                   }, r.path, r.method, r.options);
                 }
                 return resolve24();
@@ -13096,13 +13146,17 @@ async function createRouterFromDirectory(importOptions, inflateJSXOptions, serve
                     }
                   }
                   router.get(path, async function(req, res) {
-                    return res.asyncEnd({
+                    return {
                       status: 200,
                       headers: {
                         ["Content-Type"]: contentType ? contentType : DEFAULT_CONTENT_TYPE
                       },
                       body: code
-                    });
+                    };
+                  }, {
+                    response: {
+                      etag: true
+                    }
                   });
                   return resolve24();
                 }
@@ -13144,13 +13198,17 @@ async function createRouterFromDirectory(importOptions, inflateJSXOptions, serve
                   }
                 }
                 router.get(path, async function(_req, res) {
-                  res.asyncEnd({
+                  return {
                     status: 200,
                     headers: {
                       ["Content-Type"]: contentType ? contentType : DEFAULT_CONTENT_TYPE
                     },
                     body: code
-                  });
+                  };
+                }, {
+                  response: {
+                    etag: true
+                  }
                 });
                 return resolve24();
               }
@@ -13202,13 +13260,17 @@ async function createRouterFromDirectory(importOptions, inflateJSXOptions, serve
                     }
                   }
                   router.get(path, async function(_req, res) {
-                    res.asyncEnd({
+                    return {
                       status: 200,
                       headers: {
                         ["Content-Type"]: contentType ? contentType : DEFAULT_CONTENT_TYPE
                       },
                       body: code
-                    });
+                    };
+                  }, {
+                    response: {
+                      etag: true
+                    }
                   });
                   return resolve24();
                 }
@@ -13252,13 +13314,17 @@ async function createRouterFromDirectory(importOptions, inflateJSXOptions, serve
                     }
                   }
                   router.get(path, async function(_req, res) {
-                    res.asyncEnd({
+                    return {
                       status: 200,
                       headers: {
                         ["Content-Type"]: contentType ? contentType : DEFAULT_CONTENT_TYPE
                       },
                       body: code
-                    });
+                    };
+                  }, {
+                    response: {
+                      etag: true
+                    }
                   });
                   return resolve24();
                 }
@@ -14055,7 +14121,7 @@ init_constants();
 init_constants();
 
 // editor/auth.ts
-var import_node_crypto4 = require("node:crypto");
+var import_node_crypto5 = require("node:crypto");
 var ADMIN_EDITOR_AUTH_KEY = "$$ADMIN_EDITOR_AUTH_KEY$$";
 var ADMIN_EDITOR_AUTH_QUERY = "key";
 var ADMIN_EDITOR_AUTH_COOKIE = ADMIN_EDITOR_AUTH_KEY;
@@ -14074,7 +14140,7 @@ var auth_default = {
       const queryToken = args.req.query[ADMIN_EDITOR_AUTH_QUERY];
       const cookieToken = args.req.cookies[ADMIN_EDITOR_AUTH_COOKIE];
       if (queryToken) {
-        if (typeof queryToken === "string" && (0, import_node_crypto4.timingSafeEqual)(Buffer.from(queryToken), Buffer.from(KEY))) {
+        if (typeof queryToken === "string" && (0, import_node_crypto5.timingSafeEqual)(Buffer.from(queryToken), Buffer.from(KEY))) {
           args.res.setCookie(ADMIN_EDITOR_AUTH_COOKIE, KEY, {
             expires: new Date(Date.now() + 1e3 * 60 * 60 * 24 * 31 * 12 * 500),
             httpOnly: true,
@@ -14109,7 +14175,7 @@ var ws_default = {
 };
 
 // editor/server.ts
-var import_node_crypto5 = require("node:crypto");
+var import_node_crypto6 = require("node:crypto");
 init_constants();
 var import_node_fs17 = require("node:fs");
 var import_node_path18 = require("node:path");
@@ -14124,7 +14190,7 @@ var server_default = {
           serverInterface.logger.warn("loading static ADMIN_KEY from [%s]", (0, import_node_path18.relative)(process.cwd(), adminKEYPath));
           cache2.set(ADMIN_EDITOR_AUTH_KEY, (0, import_node_fs17.readFileSync)(adminKEYPath).toString().trim());
         } else {
-          cache2.set(ADMIN_EDITOR_AUTH_KEY, (0, import_node_crypto5.randomUUID)());
+          cache2.set(ADMIN_EDITOR_AUTH_KEY, (0, import_node_crypto6.randomUUID)());
         }
       }
     }
@@ -17048,13 +17114,13 @@ async function encryptJWT(payload, secret, options) {
     alg: options?.alg ? options?.alg : "dir",
     enc: options?.enc ? options?.enc : "A128CBC-HS256"
   }).setIssuedAt(options?.iat).setIssuer(options?.iss ? options?.iss : "urn:example:issuer").setAudience(options?.aud ? options?.aud : "urn:example:audience").setExpirationTime(options?.exp ? options?.exp : "2h");
-  return await en.encrypt(secret, options?.options);
+  return en.encrypt(secret, options?.options);
 }
 async function decryptJWT(jwt2, secret, options) {
-  return await jwtDecrypt(jwt2, secret, options);
+  return jwtDecrypt(jwt2, secret, options);
 }
 async function verifyJWT(jwt2, secret, options) {
-  return await jwtVerify(jwt2, secret, options);
+  return jwtVerify(jwt2, secret, options);
 }
 async function signJWT(payload, secret, options) {
   const sign2 = new SignJWT(payload).setProtectedHeader({
@@ -17070,9 +17136,9 @@ function decodeJWT(jwt2) {
 }
 
 // src/services/utils/jwt.ts
-var import_node_crypto6 = require("node:crypto");
+var import_node_crypto7 = require("node:crypto");
 var jwt = {
-  createSecretKey: import_node_crypto6.createSecretKey,
+  createSecretKey: import_node_crypto7.createSecretKey,
   decode(jwt2) {
     return decodeJWT(jwt2);
   },
@@ -17208,6 +17274,7 @@ var MiqroJSONSchema = {
   type: "object",
   properties: {
     name: "string?",
+    etag: "boolean?",
     services: "string[]?",
     noBuild: "boolean?",
     noMinify: "boolean?",
@@ -17346,6 +17413,7 @@ var Miqro = class _Miqro {
   constructor(options) {
     this.options = {
       noMinify: false,
+      etag: true,
       editor: false,
       name: "server",
       noBuild: false,
@@ -17637,6 +17705,7 @@ var Miqro = class _Miqro {
           this.logger?.error(e);
         }
       },
+      etag: this.options?.etag ?? true,
       loggerFactory: this.loggerProvider.requestLoggerFactory,
       serverOptions: this.options?.serverOptions,
       https: this.options?.https

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miqro",
-  "version": "7.2.9",
+  "version": "7.3.1",
   "description": "",
   "type": "module",
   "main": "build/esm/src/lib.js",
@@ -16,7 +16,7 @@
     "prerelease:package": "npm run compile",
     "prebuild": "rm -Rf build/;",
     "build": "tsc",
-    "postbuild": "npm run postbuild:lib && npm run postbuild:sh && npm run postbuild:assets && npm run postbuild:editor && npm run postbuild:editor-assets && npm run postbuild:versiontag",
+    "postbuild": "npm run postbuild:lib && npm run postbuild:sh && npm run postbuild:editor && npm run postbuild:editor-assets && npm run postbuild:versiontag",
     "postbuild:versiontag": "node sea/version.tag.js",
     "postbuild:editor-assets": "cp sea/editor-assets/style.css build/style.css",
     "postbuild:editor": "esbuild --external:node:process --external:node:path --bundle --loader:.js=jsx --jsx-factory=jsx.createElement --jsx-fragment=jsx.Fragment sea/editor-assets/editor.bundle.in.mjs --outfile=build/editor.bundle.js",
@@ -41,10 +41,10 @@
   },
   "dependencies": {
     "postject": "1.0.0-alpha.6",
-    "@miqro/core": "^5.0.20",
+    "@miqro/core": "^5.1.1",
     "@miqro/jsx": "^1.0.2",
     "@miqro/jsx-dom": "^1.0.6",
-    "@miqro/jsx-node": "^1.0.7",
+    "@miqro/jsx-node": "^1.0.8",
     "@miqro/parser": "^2.0.6",
     "@miqro/query": "^0.0.8",
     "@miqro/runner": "^2.0.3",