miqro 6.2.12 → 6.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miqro",
-  "version": "6.2.12",
+  "version": "6.3.0",
   "description": "",
   "type": "module",
   "main": "build/esm/src/lib.js",

package/src/common/arguments.ts

@@ -27,6 +27,7 @@ interface MiqroJSON {
   https?: boolean;
   serverOptions?: ServerOptions;
   httpsRedirect?: number;
+  inflateParallel?: number;
 }
 
 const MiqroJSONSchema: Schema<MiqroJSON> = {
@@ -41,7 +42,8 @@ const MiqroJSONSchema: Schema<MiqroJSON> = {
     editor: "boolean?",
     https: "boolean?",
     serverOptions: "any?",
-    httpsRedirect: "number?"
+    httpsRedirect: "number?",
+    inflateParallel: "number?"
   }
 }
 
@@ -83,9 +85,11 @@ export interface Arguments {
   services: string[];
   editor: boolean;
   hotreload: boolean;
+  watch: boolean;
   https: boolean;
   serverOptions: ServerOptions;
   httpsRedirect?: number;
+  inflateParallel?: number;
 }
 
 /**
@@ -97,6 +101,7 @@ export function parseArguments(): Arguments {
 
   const args = cluster.isPrimary ? process.argv.slice(2, process.argv.length) : process.argv.slice(3, process.argv.length);
   const flags: {
+    inflateParallel: number | null;
     httpsRedirect: number | null;
     https: boolean | null;
     serverOptions: ServerOptions;
@@ -122,7 +127,9 @@ export function parseArguments(): Arguments {
     editor: boolean | null;
     inflateDir?: string | null;
     hotreload?: boolean | null;
+    watch?: boolean | null;
   } = {
+    inflateParallel: null,
     httpsRedirect: null,
     https: null,
     serverOptions: {},
@@ -130,6 +137,7 @@ export function parseArguments(): Arguments {
     browser: null,
     logFile: null,
     hotreload: null,
+    watch: null,
     miqroJSONPath: null,
     installMiqroJSON: null,
     disableMiqroJSON: null,
@@ -206,6 +214,14 @@ export function parseArguments(): Arguments {
         flags.installTSConfig = true;
         continue;
       case "--watch":
+        if (flags.watch !== null) {
+          console.error("bad arguments.");
+          console.error(usage);
+          process.exit(EXIT_CODES.BAD_ARGUMENTS);
+        }
+        flags.watch = true;
+        continue;
+      case "--hot-reload":
         if (flags.hotreload !== null) {
           console.error("bad arguments.");
           console.error(usage);
@@ -466,6 +482,27 @@ export function parseArguments(): Arguments {
         services.push(args[i + 1]);
         i++;
         continue;
+      case "--inflate-parallel":
+        if (args[i + 1] === undefined) {
+          console.error("bad arguments. service directory not provided.");
+          console.error(usage);
+          process.exit(EXIT_CODES.BAD_ARGUMENTS);
+        }
+        if (typeof args[i + 1] !== "string") {
+          console.error("bad arguments. --inflate-parallel must be a number.");
+          console.error(usage);
+          process.exit(EXIT_CODES.BAD_ARGUMENTS);
+        } else {
+          const cParallel = parseInt(String(args[i + 1]), 10);
+          if (isNaN(cParallel)) {
+            console.error("bad arguments. --inflate-parallel must be a number.");
+            console.error(usage);
+            process.exit(EXIT_CODES.BAD_ARGUMENTS);
+          }
+          flags.inflateParallel = cParallel;
+        }
+        i++;
+        continue;
       case "--inflate-dir":
         if (flags.inflateDir !== null && flags.compile === null) {
           console.error("bad arguments. --inflate-dir already set.");
@@ -571,6 +608,12 @@ export function parseArguments(): Arguments {
         flags.editor = miqroRC.editor;
       }
     }
+
+    if (flags.inflateParallel === null) {
+      if (miqroRC.inflateParallel !== undefined) {
+        flags.inflateParallel = miqroRC.inflateParallel;
+      }
+    }
   }
 
   flags.editor = flags.editor ? flags.editor : false;
@@ -627,22 +670,22 @@ export function parseArguments(): Arguments {
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.test && (flags.hotreload || flags.editor || flags.compile || flags.inflate)) {
+  if (flags.test && (flags.watch || flags.hotreload || flags.editor || flags.compile || flags.inflate)) {
     console.error("bad arguments. cannot use --editor with --test");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.migrateUp && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateDown || flags.inflate)) {
+  if (flags.migrateUp && (flags.watch || flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateDown || flags.inflate)) {
     console.error("bad arguments. cannot use with --migrate-up");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.migrateDown && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate)) {
+  if (flags.migrateDown && (flags.watch || flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate)) {
     console.error("bad arguments. cannot use with --migrate-down");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.generateDoc && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate || flags.migrateDown)) {
+  if (flags.generateDoc && (flags.watch || flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate || flags.migrateDown)) {
     console.error("bad arguments. cannot use with --generate-doc");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
@@ -670,11 +713,13 @@ export function parseArguments(): Arguments {
   }
 
   return {
+    inflateParallel: flags.inflateParallel ? flags.inflateParallel : undefined,
     name: flags.name ? flags.name : undefined,
     browser: flags.browser !== null ? flags.browser : undefined,
     logFile: flags.logFile !== null ? flags.logFile : undefined,
     generateDocAll: flags.generateDocAll ? true : false,
     hotreload: flags.hotreload ? true : false,
+    watch: flags.watch ? true : false,
     disableMiqroJSON: flags.disableMiqroJSON !== null ? flags.disableMiqroJSON : false,
     miqroJSONPath: miqroJSONPath ? miqroJSONPath : false,
     installTypes: flags.installTypes ? true : false,

package/src/common/fs.ts

@@ -1,3 +1,4 @@
+import { mkdir, rmdir, unlink, writeFile } from "node:fs";
 import { basename, extname } from "node:path";
 
 export function describeFilePath(filePath: string) {
@@ -15,3 +16,67 @@ export function describeFilePath(filePath: string) {
     filePath
   };
 }
+
+export async function mkdirASync(path: string, options?: Partial<{ recursive: true; }>) {
+  return new Promise<void>((resolve, reject) => {
+    try {
+      mkdir(path, options, (err) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve();
+        }
+      });
+    } catch (e) {
+      reject(e);
+    }
+  })
+}
+
+export async function writeFileASync(path: string, body?) {
+  return new Promise<void>((resolve, reject) => {
+    try {
+      writeFile(path, body, (err) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve();
+        }
+      });
+    } catch (e) {
+      reject(e);
+    }
+  });
+}
+
+export async function rmdirASync(path: string) {
+  return new Promise<void>((resolve, reject) => {
+    try {
+      rmdir(path, (err) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve();
+        }
+      });
+    } catch (e) {
+      reject(e);
+    }
+  });
+}
+
+export async function unlinkASync(path: string) {
+  return new Promise<void>((resolve, reject) => {
+    try {
+      unlink(path, (err) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve();
+        }
+      });
+    } catch (e) {
+      reject(e);
+    }
+  });
+}

package/src/common/help.ts

@@ -18,7 +18,8 @@ export const help = `
 
 -v, --version\n\toutputs the version number
 -h, --help\n\toutputs this page.
---watch\n\tuse to enable the hot-reload functionality.
+--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.
 --migrate-up\n\tmigrations up.
 --migrate-down\n\tmigrations down.
@@ -44,6 +45,7 @@ export const help = `
 --https-key\n\tpoint to a server.key file for https.
 --https-cert\n\tpoint to a server.cert file for https.
 --https-redirect\n\tserves an aditional http server that redirects to https. it needs a port number.
+--inflate-parallel\n\tsets the max parallel esbuild instances. defaults to 1.
 
 ==environment variables==
 

package/src/common/jsx.ts

@@ -2,7 +2,6 @@ import { Runtime } from "@miqro/jsx";
 import { createNodeRuntime } from "@miqro/jsx-node";
 import { basename, dirname, extname, relative, resolve } from "node:path";
 import { randomUUID } from "node:crypto";
-import { mkdirSync, readFileSync, rmdirSync, unlinkSync, writeFileSync } from "node:fs";
 import { Request, Response, CORSOptions, Logger, APIRoute } from "@miqro/core";
 import { Parser, Schema } from "@miqro/parser";
 import { APIRouteSchema, SessionHandlerOptionsSchema } from "@miqro/core";
@@ -17,6 +16,7 @@ import { getAsset, initAsset, validateAsset } from "./assets.js";
 import { calculateChecksumFromBuffer } from "./checksum.js";
 import { HandlerWithOptionsSchema, RouteOptionsSchema } from "@miqro/core/build/types.js";
 import { Migration } from "@miqro/query";
+import { mkdirASync, rmdirASync, unlinkASync, writeFileASync } from "./fs.js";
 
 let jsxJSBuffer: null | Buffer = null; // Buffer.from(getAsset("jsx.dom.js"));
 let jsxJSBufferChecksumPromise: null | Promise<string> = null; // calculateChecksumFromBuffer(jsxJSBuffer);
@@ -70,11 +70,11 @@ export async function inflateJSX(inFile: string, options: InflateOptions): Promi
   try {
 
     if (!options.embemedJSX) {
-      mkdirSync(tmpBuildDir, {
+      await mkdirASync(tmpBuildDir, {
         recursive: true
       });
-      writeFileSync(inFileTmp, browserJSXGlobals(inFile, false, options.useExport));
-      //writeFileSync(inFileTmp, browserJSXGlobals(relative(tmpBuildDir, inFile), false));
+      await writeFileASync(inFileTmp, browserJSXGlobals(inFile, false, options.useExport));
+      //await writeFileASync(inFileTmp, browserJSXGlobals(relative(tmpBuildDir, inFile), false));
       logger?.trace("inflating [%s] from [%s]. to change the import folder set JSX_TMP", relative(cwd(), inFile), dirname(relative(JSX_TMP_DIR, inFileTmp)));
       const { outputFiles: [{ contents }] } = await esBuild({
         ...DEFAULT_ESOPTION,
@@ -84,17 +84,17 @@ export async function inflateJSX(inFile: string, options: InflateOptions): Promi
       });
       if (CLEAR_JSX_CACHE) {
         logger?.trace("clearing cache at [%s] to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
-        unlinkSync(inFileTmp);
-        rmdirSync(tmpBuildDir);
+        await unlinkASync(inFileTmp);
+        await rmdirASync(tmpBuildDir);
       }
       return contents;
     } else {
-      mkdirSync(tmpBuildDir, {
+      await mkdirASync(tmpBuildDir, {
         recursive: true
       });
-      //writeFileSync(jsxJSPath, Buffer.from(getAsset("jsx-dom-bundle")));
-      writeFileSync(inFileTmp, browserJSXGlobals(inFile, jsxJSPath));
-      //writeFileSync(inFileTmp, browserJSXGlobals(relative(tmpBuildDir, inFile), relative(tmpBuildDir, jsxJSPath)));
+      //await writeFileASync(jsxJSPath, Buffer.from(getAsset("jsx-dom-bundle")));
+      await writeFileASync(inFileTmp, browserJSXGlobals(inFile, jsxJSPath));
+      //await writeFileASync(inFileTmp, browserJSXGlobals(relative(tmpBuildDir, inFile), relative(tmpBuildDir, jsxJSPath)));
       logger?.trace("inflating [%s] from [%s] with jsx.js embedded. to change the import folder set JSX_TMP", relative(cwd(), inFile), dirname(relative(JSX_TMP_DIR, inFileTmp)));
       const { outputFiles: [{ contents }] } = await esBuild({
         ...DEFAULT_ESOPTION,
@@ -104,9 +104,9 @@ export async function inflateJSX(inFile: string, options: InflateOptions): Promi
       });
       if (CLEAR_JSX_CACHE) {
         logger?.trace("clearing cache at [%s] to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
-        unlinkSync(inFileTmp);
-        //unlinkSync(jsxJSPath);
-        rmdirSync(tmpBuildDir);
+        await unlinkASync(inFileTmp);
+        //await unlinkASync(jsxJSPath);
+        await rmdirASync(tmpBuildDir);
       }
       return contents;
     }
@@ -116,9 +116,9 @@ export async function inflateJSX(inFile: string, options: InflateOptions): Promi
     if (options.embemedJSX) {
       if (CLEAR_JSX_CACHE) {
         logger?.trace("clearing cache at [%s] to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
-        unlinkSync(inFileTmp);
-        //unlinkSync(jsxJSPath);
-        rmdirSync(tmpBuildDir);
+        await unlinkASync(inFileTmp);
+        //await unlinkASync(jsxJSPath);
+        await rmdirASync(tmpBuildDir);
       } else {
         //console.error("errors on: " + tmpBuildDir);
         logger?.error("error with: %s", inFileTmp);
@@ -489,11 +489,11 @@ export async function importJSXFile(inFile: string, logger?: Logger | Console):
   //const inFileTmp = resolve(tmpBuildDir, basename(inFile) + ".mjs");
   const inFileTmp = resolve(tmpBuildDir, basename(inFile) + ".cjs");
   //const logger = getLogger(`${SERVER_IDENTIFIER}_JSX`);
-  mkdirSync(tmpBuildDir, {
+  await mkdirASync(tmpBuildDir, {
     recursive: true
   });
   try {
-    writeFileSync(inFileTmp, inflatedCode);
+    await writeFileASync(inFileTmp, inflatedCode);
     assertGlobalTampered();
     logger?.trace("importing [%s] from [%s]. to change the import folder set JSX_TMP", relative(cwd(), inFile), dirname(relative(JSX_TMP_DIR, inFileTmp)));
     logger?.debug("importing [%s]", relative(cwd(), inFile));
@@ -501,8 +501,8 @@ export async function importJSXFile(inFile: string, logger?: Logger | Console):
     assertGlobalTampered();
     if (CLEAR_JSX_CACHE) {
       logger?.trace("clearing cache at [%s]. to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
-      unlinkSync(inFileTmp);
-      rmdirSync(tmpBuildDir);
+      await unlinkASync(inFileTmp);
+      await rmdirASync(tmpBuildDir);
     }
     return module.default;
   } catch (e) {
@@ -510,8 +510,8 @@ export async function importJSXFile(inFile: string, logger?: Logger | Console):
     logger?.error("error with2: " + inFile);
     if (CLEAR_JSX_CACHE) {
       logger?.trace("clearing cache at [%s] to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
-      unlinkSync(inFileTmp);
-      rmdirSync(tmpBuildDir);
+      await unlinkASync(inFileTmp);
+      await rmdirASync(tmpBuildDir);
     } else {
       //console.error("errors on: " + tmpBuildDir);
       logger?.error("error with: %s", inFileTmp);

package/src/common/watch.ts

@@ -47,6 +47,7 @@ export async function watchAndServer(app: Miqro) {
   }
 
   function watchDir(toWatch: string) {
+    clearTimeout(timeout);
     const files = existsSync(toWatch) ? readdirSync(toWatch) : [];
     for (const file of files) {
       const filePath = resolve(toWatch, file);
@@ -60,6 +61,7 @@ export async function watchAndServer(app: Miqro) {
   }
 
   function stopWatch() {
+    clearTimeout(timeout);
     const toClose = watchers.splice(0, watchers.length);
     for (const watcher of toClose) {
       watcher.close();
@@ -69,6 +71,7 @@ export async function watchAndServer(app: Miqro) {
 
   function reWatch() {
     stopWatch();
+    clearTimeout(timeout);
     for (const service of app.options.services) {
       const toWatch = resolve(process.cwd(), service);
       watchDir(toWatch);

package/src/inflate/inflate-sea.ts

@@ -1,10 +1,10 @@
 import { Logger } from "@miqro/core";
-import { chmodSync, constants, mkdirSync, writeFileSync } from "node:fs";
+import { chmodSync, constants, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, extname, join, relative, resolve } from "node:path";
 import { cwd, platform } from "node:process";
 
 import { RouteFileMap, StaticFileMap } from "./setup-http.js";
-import { getAuthConfigPath, getCORSConfigPath, getDBConfigPath, getErrorConfigPath, getMiddlewareConfigPath, getMigrationsPath, getServerConfigPath, getServicePath, getWSConfigPath } from "../common/paths.js";
+import { getAuthConfigPath, getCORSConfigPath, getDBConfigPath, getErrorConfigPath, getMiddlewareConfigPath, getMigrationsPath, getMiqroJSONPath, getServerConfigPath, getServicePath, getWSConfigPath } from "../common/paths.js";
 import { getAsset } from "../common/assets.js";
 import { migration } from "@miqro/query";
 import { esBuild } from "../common/esbuild.js";
@@ -119,6 +119,10 @@ main().catch(e=>console.error(e));
     platform: "node",
     outfile: join(inflateDir, "sea", "app.bundle.cjs")
   });
+  const miqroRCPath = getMiqroJSONPath();
+  if (miqroRCPath) {
+    writeFile(logger, join(inflateDir, "miqro.json"), readFileSync(miqroRCPath));
+  }
 }
 
 export async function inflateServiceForSea(logger: Logger, inflateDir: string, service: string, servicePath: string/*, serviceMigrations: string[]*/, serviceRouteFileMap: RouteFileMap, serviceStaticFileMap: StaticFileMap) {

package/src/inflate/inflate.ts

@@ -22,9 +22,10 @@ export interface InflateAppOptions {
   hotreload?: boolean;
   port: string;
   serverInterface: ServerInterface;
+  inflateParallel?: number;
 }
 
-export async function inflateApp({ serverInterface, logger, hotreload, services/*, dbManager*/, inflateDir, inflateSea/*, editor, inflateTests*/, port }: InflateAppOptions): Promise<[Router, InflateError[] | null, RouteFileMap, WSConfig[]/*, ServerConfigMap*/, LogConfigMap]> {
+export async function inflateApp({ inflateParallel, serverInterface, logger, hotreload, services/*, dbManager*/, inflateDir, inflateSea/*, editor, inflateTests*/, port }: InflateAppOptions): Promise<[Router, InflateError[] | null, RouteFileMap, WSConfig[]/*, ServerConfigMap*/, LogConfigMap]> {
   logger.trace("inflateApp");
   const errors: InflateError[] = [];
   //const migrations: string[] = [];
@@ -69,7 +70,7 @@ export async function inflateApp({ serverInterface, logger, hotreload, services/
 
     await setupLogConfig(logger, servicePath, service, logConfigMap, inflateSea ? inflateDir : false, errors);
 
-    router.use(await setupHTTPRouter(serverInterface, logger, hotreload ? hotreload : false, servicePath, service, serviceRouteFileMap, serviceStaticFileMap, inflateDir, inflateSea, errors));
+    router.use(await setupHTTPRouter(serverInterface, logger, hotreload ? hotreload : false, servicePath, service, serviceRouteFileMap, serviceStaticFileMap, inflateDir, inflateSea, errors, inflateParallel));
     routeFileMap = {
       ...routeFileMap,
       ...serviceRouteFileMap