miqro 7.3.2 → 7.3.4

package/build/esm/editor/auth.js

@@ -18,13 +18,15 @@ export default {
             const cookieToken = args.req.cookies[ADMIN_EDITOR_AUTH_COOKIE];
             //console.log("\n\nqueryToken[%s] cookieToken[%s] KEY[%s]\n\n", queryToken, cookieToken, KEY);
             if (queryToken) {
-                if (typeof queryToken === "string" && timingSafeEqual(Buffer.from(queryToken), Buffer.from(KEY))) {
+                const queryBuf = Buffer.from(String(queryToken));
+                const keyBuf = Buffer.from(KEY);
+                if (typeof queryToken === "string" && queryBuf.length === keyBuf.length && timingSafeEqual(queryBuf, keyBuf)) {
                     args.res.setCookie(ADMIN_EDITOR_AUTH_COOKIE, KEY, {
-                        expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 31 * 12 * 500),
+                        expires: new Date(Date.now() + 1000 * 60 * 60 * 24),
                         httpOnly: true,
-                        //secure: true,
+                        //secure: args.req.secure,
+                        sameSite: "strict",
                         path: "/",
-                        //sameSite: "strict"
                     });
                     args.req.searchParams.delete(ADMIN_EDITOR_AUTH_QUERY);
                     const queryString = args.req.searchParams.toString();

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

@@ -59,6 +59,7 @@ export async function esBuild(options, logger) {
             else {
                 exec(esBuildCMD, {
                     maxBuffer: 1024 * 1000 * 2000,
+                    timeout: 60000,
                     cwd: dirname(options.entryPoints[0])
                 }, (err, stdout, _stderr) => {
                     if (err) {

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

@@ -47,7 +47,7 @@ export function setupExitHandlers(app) {
         }
         process.exit(EXIT_CODES.ABNORMAL_UNCONTROLLED);
     });
-    process.on('exit', async function (code) {
+    process.on('exit', function (code) {
         if (exceptionOccured) {
             app.logger?.error('Exception occured');
         }
@@ -60,7 +60,7 @@ export function setupExitHandlers(app) {
             }*/
             cleanJSX(app);
             if (app.server) {
-                await app.stop();
+                app.stop();
             }
         }
     });
@@ -80,20 +80,38 @@ export function setupExitHandlers(app) {
         }
         process.exit(EXIT_CODES.ABNORMAL_UNCONTROLLED);
     });
-    process.on("SIGTERM", function () {
+    process.on("SIGTERM", async function () {
         app.logger?.info('SIGTERM received');
+        if (app.server) {
+            await Promise.race([
+                app.stop(),
+                new Promise(r => setTimeout(r, 5000))
+            ]);
+        }
         process.exit(EXIT_CODES.ABNORMAL_UNCONTROLLED);
     });
-    process.on('SIGHUP', function () {
+    process.on('SIGHUP', async function () {
         app.logger?.info('SIGHUP received');
+        if (app.server) {
+            await Promise.race([
+                app.stop(),
+                new Promise(r => setTimeout(r, 5000))
+            ]);
+        }
         process.exit(EXIT_CODES.ABNORMAL_UNCONTROLLED);
     });
     /*process.on('SIGKILL', function () {
       server.logger.info('SIGKILL received');
       process.exit(EXIT_CODES.ABNORMAL_UNCONTROLLED);
     });*/
-    process.on('SIGINT', function () {
+    process.on('SIGINT', async function () {
         app.logger?.info('SIGINT received');
+        if (app.server) {
+            await Promise.race([
+                app.stop(),
+                new Promise(r => setTimeout(r, 5000))
+            ]);
+        }
         process.exit(EXIT_CODES.ABNORMAL_UNCONTROLLED);
     });
 }

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

@@ -28,6 +28,7 @@ export interface MiqroOptions extends ImportJSXFileOptions {
     https?: boolean;
     httpRedirect?: number;
     noMinify?: boolean;
+    allowedRedirectHosts?: string[];
 }
 export interface InflateOptions {
     inflateDir?: string;

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

@@ -383,7 +383,12 @@ export class Miqro {
         if (this.options?.httpRedirect) {
             this.httpsRedirectServer = new App();
             this.httpsRedirectServer.use(async (req, res) => {
-                const hostname = req.headers.host.split(":").length > 1 ? req.headers.host.split(":")[0] : req.headers.host;
+                const hostname = req.headers.host?.split(":")[0] ?? "";
+                const allowed = this.options?.allowedRedirectHosts;
+                if (allowed && !allowed.includes(hostname)) {
+                    res.writeHead(400).end("Invalid Host header");
+                    return;
+                }
                 return await res.redirect('https://' + hostname + ":" + this.options.port + req.url);
             });
         }