miqro 6.2.2 → 6.2.4

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

@@ -111,13 +111,15 @@ export function parseArguments() {
                     console.error(usage);
                     process.exit(EXIT_CODES.BAD_ARGUMENTS);
                 }
-                const cPath = String(args[i + 1]).toUpperCase();
-                if (typeof cPath !== "string") {
+                if (typeof args[i + 1] !== "string") {
                     console.error("bad arguments. --config must be a string.");
                     console.error(usage);
                     process.exit(EXIT_CODES.BAD_ARGUMENTS);
                 }
-                flags.miqroJSONPath = cPath;
+                else {
+                    const cPath = String(args[i + 1]);
+                    flags.miqroJSONPath = cPath;
+                }
                 i++;
                 continue;
             case "--install-tsconfig":
@@ -195,13 +197,15 @@ export function parseArguments() {
                     console.error(usage);
                     process.exit(EXIT_CODES.BAD_ARGUMENTS);
                 }
-                const cPort = String(args[i + 1]);
-                if (typeof cPort !== "string") {
+                if (typeof args[i + 1] !== "string") {
                     console.error("bad arguments. --port must be a string.");
                     console.error(usage);
                     process.exit(EXIT_CODES.BAD_ARGUMENTS);
                 }
-                flags.port = cPort;
+                else {
+                    const cPort = String(args[i + 1]);
+                    flags.port = cPort;
+                }
                 i++;
                 continue;
             case "--name":
@@ -210,13 +214,15 @@ export function parseArguments() {
                     console.error(usage);
                     process.exit(EXIT_CODES.BAD_ARGUMENTS);
                 }
-                const cName = String(args[i + 1]).toUpperCase();
-                if (typeof cName !== "string") {
+                if (typeof args[i + 1] !== "string") {
                     console.error("bad arguments. --port must be a string.");
                     console.error(usage);
                     process.exit(EXIT_CODES.BAD_ARGUMENTS);
                 }
-                flags.name = cName;
+                else {
+                    const cName = String(args[i + 1]).toUpperCase();
+                    flags.name = cName;
+                }
                 i++;
                 continue;
             case "--log-file":
@@ -225,13 +231,15 @@ export function parseArguments() {
                     console.error(usage);
                     process.exit(EXIT_CODES.BAD_ARGUMENTS);
                 }
-                const cLofFile = String(args[i + 1]);
-                if (typeof cLofFile !== "string") {
+                if (typeof args[i + 1] !== "string") {
                     console.error("bad arguments. --port must be a string.");
                     console.error(usage);
                     process.exit(EXIT_CODES.BAD_ARGUMENTS);
                 }
-                flags.logFile = cLofFile;
+                else {
+                    const cLofFile = String(args[i + 1]);
+                    flags.logFile = cLofFile;
+                }
                 i++;
                 continue;
             case "--browser":
@@ -240,13 +248,15 @@ export function parseArguments() {
                     console.error(usage);
                     process.exit(EXIT_CODES.BAD_ARGUMENTS);
                 }
-                const cBrowser = String(args[i + 1]);
-                if (typeof cBrowser !== "string") {
+                if (typeof args[i + 1] !== "string") {
                     console.error("bad arguments. --port must be a string.");
                     console.error(usage);
                     process.exit(EXIT_CODES.BAD_ARGUMENTS);
                 }
-                flags.browser = cBrowser;
+                else {
+                    const cBrowser = String(args[i + 1]);
+                    flags.browser = cBrowser;
+                }
                 i++;
                 continue;
             case "--generate-doc":

package/build/esm/src/inflate/inflate-sea.d.ts

@@ -1,5 +1,5 @@
 import { Logger } from "@miqro/core";
 import { RouteFileMap, StaticFileMap } from "./setup-http.js";
 export declare function inflateSeaAssets(logger: Logger, inflateDir: string): Promise<void>;
-export declare function inflateAppForSea(logger: Logger, inflateDir: string, services: string[]): Promise<void>;
+export declare function inflateAppForSea(logger: Logger, inflateDir: string, services: string[], port: string): Promise<void>;
 export declare function inflateServiceForSea(logger: Logger, inflateDir: string, service: string, servicePath: string, serviceRouteFileMap: RouteFileMap, serviceStaticFileMap: StaticFileMap): Promise<void>;

package/build/esm/src/inflate/inflate-sea.js

@@ -32,19 +32,20 @@ export async function inflateSeaAssets(logger, inflateDir) {
     writeFile(logger, resolve(inflateDir, "sea", "sign-remove.sh"), Buffer.from(getAsset("sign-remove.sh")));
     writeFile(logger, resolve(inflateDir, "install-nodejs.sh"), Buffer.from(getAsset("install-nodejs.sh")));
 }
-export async function inflateAppForSea(logger, inflateDir, services) {
+export async function inflateAppForSea(logger, inflateDir, services, port) {
+    const PORT = port;
     inflateSeaAssets(logger, inflateDir);
     writeFile(logger, resolve(inflateDir, "sea", "lib.cjs"), Buffer.from(getAsset("lib.cjs")));
     const WSLIST = services.filter(service => getWSConfigPath(resolve(cwd(), service))).map(service => {
-        return `(await import("../${service}/ws.js")).default`;
+        return `(await import("../${service}/ws.cjs")).default`;
     }).join(",");
     const SERVERCONFIGLIST = services.filter(service => getServerConfigPath(resolve(cwd(), service))).map(service => {
-        return `(await import("../${service}/server.js")).default`;
+        return `(await import("../${service}/server.cjs")).default`;
     }).join(",\n");
     const DBCONFIGLIST = services.filter(service => getDBConfigPath(resolve(cwd(), service))).map(service => {
         return `new Promise(async (resolve, reject) => {
     try {
-      const db = await dbManager.setupDB((await import("../${service}/db.js")).default);
+      const db = await dbManager.setupDB((await import("../${service}/db.cjs")).default);
       await (await import("./${service}/migration-up.js")).runMigrations(db);
       resolve();
     } catch(e) {
@@ -57,7 +58,7 @@ export async function inflateAppForSea(logger, inflateDir, services) {
     writeFile(logger, join(inflateDir, "sea", "app.cjs"), `const { createServerInterface, ServerRequestHandler, WebSocketManager, initGlobals, DBManager, App, LoggerHandler, LogProvider, LocalCache, ClusterCache } = require("./lib.cjs");
 
 async function main() {
-  const PORT = process.env["PORT"] ? process.env["PORT"] : 8080; 
+  const PORT = "${PORT}"; 
   const loggerProvider = new LogProvider();
   const localCache = new LocalCache();
   const cache = new ClusterCache();
@@ -88,6 +89,7 @@ async function main() {
   
   await app.listen(PORT);
   ${SERVERCONFIGLIST ? `\n  await Promise.all([${SERVERCONFIGLIST}].filter(config=>config.start).map(config=>config.start(serverInterface)));` : ""}
+  loggerProvider.getLogger("server").info("listening on [%s]", PORT);
 }
 main().catch(e=>console.error(e));
 `);
@@ -99,16 +101,16 @@ export async function inflateServiceForSea(logger, inflateDir, service, serviceP
 export async function setupRouter() {
   const router = new Router();
 ${getErrorConfigPath(servicePath) ? `
-  const errorConfig = (await import("../../${service}/catch.js")).default;
+  const errorConfig = (await import("../../${service}/catch.cjs")).default.default;
   if(errorConfig && errorConfig.catch) {
     for(const m of errorConfig.catch) {
       router.catch(m);
     }
   }` : ""}
-${getCORSConfigPath(servicePath) ? `  router.use(server.middleware.cors((await import("../../${service}/cors.js")).default));` : ""}
-${getAuthConfigPath(servicePath) ? `  router.use(server.middleware.session((await import("../../${service}/auth.js")).default));` : ""}
+${getCORSConfigPath(servicePath) ? `  router.use(server.middleware.cors((await import("../../${service}/cors.cjs")).default.default));` : ""}
+${getAuthConfigPath(servicePath) ? `  router.use(server.middleware.session((await import("../../${service}/auth.cjs")).default.default));` : ""}
 ${getMiddlewareConfigPath(servicePath) ? `
-  const middlewareConfig = (await import("../../${service}/middleware.js")).default;
+  const middlewareConfig = (await import("../../${service}/middleware.cjs")).default.default;
   if(middlewareConfig && middlewareConfig.middleware) {
     for(const m of middlewareConfig.middleware) {
       router.use(m);
@@ -121,8 +123,8 @@ ${Object.keys(serviceRouteFileMap)
         const rPath = join(relative(cwd(), dirname(data.filePath)), basename(data.filePath));
         if (rPath) {
             const rPathExt = extname(rPath);
-            const apiInflatedPath = join("..", "..", rPath.substring(0, rPath.length - rPathExt.length) + ".js");
-            return `  await appendAPIModule(router, "../../${service}/http", "./${apiInflatedPath}", (await import("./${apiInflatedPath}")).default);`;
+            const apiInflatedPath = join("..", "..", rPath.substring(0, rPath.length - rPathExt.length) + ".cjs");
+            return `  await appendAPIModule(router, "../../${service}/http", "./${apiInflatedPath}", (await import("./${apiInflatedPath}")).default.default);`;
         }
         else {
             return "";
@@ -145,7 +147,7 @@ export async function runMigrations(db) {
   await migration.init(db);
 ${serviceMigrations.map(file => {
         const name = `${file.substring(0, file.length - extname(file).length)}`;
-        return `  await migration.up.module(db, "${name}", (await import("../../${service}/migration/${name}.js")).default)`;
+        return `  await migration.up.module(db, "${file}", (await import("../../${service}/migration/${name}.cjs")).default.default)`;
     }).join("\n")}
 }`);
     writeFile(logger, join(inflateDir, "sea", service, "migration-down.js"), `import { migration } from "./../lib.cjs";\n
@@ -153,7 +155,7 @@ export async function runMigrations(db) {
   await migration.init(db);
 ${serviceMigrations.reverse().map(file => {
         const name = `${file.substring(0, file.length - extname(file).length)}`;
-        return `  await migration.down.module(db, "${name}", (await import("../../${service}/migration/${name}.js")).default)`;
+        return `  await migration.down.module(db, "${file}", (await import("../../${service}/migration/${name}.cjs")).default.default)`;
     }).join("\n")}
 }`);
     const staticFiles = Object.keys(serviceStaticFileMap);

package/build/esm/src/inflate/inflate.d.ts

@@ -9,6 +9,7 @@ export interface InflateAppOptions {
     inflateDir: string | undefined | false;
     inflateSea: boolean;
     hotreload?: boolean;
+    port: string;
     serverInterface: ServerInterface;
 }
-export declare function inflateApp({ serverInterface, logger, hotreload, services, inflateDir, inflateSea }: InflateAppOptions): Promise<[Router, InflateError[] | null, RouteFileMap, WSConfig[], LogConfigMap]>;
+export declare function inflateApp({ serverInterface, logger, hotreload, services, inflateDir, inflateSea, port }: InflateAppOptions): Promise<[Router, InflateError[] | null, RouteFileMap, WSConfig[], LogConfigMap]>;

package/build/esm/src/inflate/inflate.js

@@ -8,7 +8,7 @@ import { inflateWSConfig } from "./setup-ws.js";
 import { inflateAppForSea, inflateServiceForSea } from "./inflate-sea.js";
 import { setupLogConfig } from "./setup-log.js";
 import { setupDoc } from "./setup.doc.js";
-export async function inflateApp({ serverInterface, logger, hotreload, services /*, dbManager*/, inflateDir, inflateSea /*, editor, inflateTests*/ }) {
+export async function inflateApp({ serverInterface, logger, hotreload, services /*, dbManager*/, inflateDir, inflateSea /*, editor, inflateTests*/, port }) {
     logger.trace("inflateApp");
     const errors = [];
     //const migrations: string[] = [];
@@ -59,7 +59,7 @@ export async function inflateApp({ serverInterface, logger, hotreload, services
         }*/
     }
     if (inflateDir && inflateSea) {
-        await inflateAppForSea(logger, inflateDir, services);
+        await inflateAppForSea(logger, inflateDir, services, port);
     }
     router.use(assertGlobalTampered);
     return errors.length === 0 ? [router, null, routeFileMap /*, migrations*/, wsConfigList /*, serverConfigMap*/, logConfigMap] : [router, errors, routeFileMap /*, migrations*/, wsConfigList /*, serverConfigMap*/, logConfigMap];

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

@@ -12,7 +12,7 @@ export async function setupAUTH(logger, servicePath, service, mainRouter, inflat
             logger.debug("setting up authentication from [%s]", join(service, basename(authPath)));
             mainRouter.use(SessionHandler(authModule));
             if (inflateDir && inflateSea) {
-                const inflatePath = resolve(inflateDir, service, "auth.js");
+                const inflatePath = resolve(inflateDir, service, "auth.cjs");
                 mkdirSync(dirname(inflatePath), {
                     recursive: true
                 });
@@ -21,6 +21,7 @@ export async function setupAUTH(logger, servicePath, service, mainRouter, inflat
                     embemedJSX: false,
                     minify: false,
                     useExport: true,
+                    platform: "node",
                     logger
                 }));
             }

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

@@ -12,7 +12,7 @@ export async function setupCORS(logger, servicePath, service, mainRouter, inflat
             logger.debug("setting up cors from [%s]", join(service, basename(corsPath)));
             mainRouter.use(CORS(corsOptions));
             if (inflateDir && inflateSea) {
-                const inflatePath = resolve(inflateDir, service, "cors.js");
+                const inflatePath = resolve(inflateDir, service, "cors.cjs");
                 mkdirSync(dirname(inflatePath), {
                     recursive: true
                 });
@@ -21,6 +21,7 @@ export async function setupCORS(logger, servicePath, service, mainRouter, inflat
                     embemedJSX: false,
                     minify: false,
                     useExport: true,
+                    platform: "node",
                     logger
                 }));
             }

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

@@ -22,7 +22,7 @@ export async function inflateDBConfig(logger, service, dbConfigList, inflateDir,
             }
             if (config) {
                 if (inflateDir) {
-                    const inflatePath = resolve(inflateDir, service, "db.js");
+                    const inflatePath = resolve(inflateDir, service, "db.cjs");
                     mkdirSync(dirname(inflatePath), {
                         recursive: true
                     });
@@ -31,6 +31,7 @@ export async function inflateDBConfig(logger, service, dbConfigList, inflateDir,
                         embemedJSX: false,
                         minify: false,
                         useExport: true,
+                        platform: "node",
                         logger
                     }));
                 }
@@ -69,7 +70,7 @@ export async function inflateDBMigrations(logger, service, dbName, inflateDir, e
                     ...migrationModule
                 });
                 if (inflateDir) {
-                    const inflatePath = resolve(inflateDir, service, "migration", migrationName.substring(0, migrationName.length - extname(migrationName).length) + ".js");
+                    const inflatePath = resolve(inflateDir, service, "migration", migrationName.substring(0, migrationName.length - extname(migrationName).length) + ".cjs");
                     mkdirSync(dirname(inflatePath), {
                         recursive: true
                     });
@@ -78,6 +79,7 @@ export async function inflateDBMigrations(logger, service, dbName, inflateDir, e
                         embemedJSX: false,
                         minify: false,
                         useExport: true,
+                        platform: "node",
                         logger
                     }));
                 }

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

@@ -15,7 +15,7 @@ export async function setupError(logger, servicePath, service, mainRouter, infla
                 }
             }
             if (inflateDir && inflateSea) {
-                const inflatePath = resolve(inflateDir, service, "catch.js");
+                const inflatePath = resolve(inflateDir, service, "catch.cjs");
                 mkdirSync(dirname(inflatePath), {
                     recursive: true
                 });
@@ -24,6 +24,7 @@ export async function setupError(logger, servicePath, service, mainRouter, infla
                     embemedJSX: false,
                     minify: false,
                     useExport: true,
+                    platform: "node",
                     logger
                 }));
             }

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

@@ -145,6 +145,7 @@ async function createRouterFromDirectory(server, hotreload, service, logger, dir
                                 embemedJSX: false,
                                 minify: false,
                                 useExport: true,
+                                platform: "node",
                                 logger
                             }) : "";
                             for (const r of routes) {
@@ -159,7 +160,7 @@ async function createRouterFromDirectory(server, hotreload, service, logger, dir
                                 }*/
                                 if (inflateDir && r.defaultInflatePath && inflateSea) {
                                     const rPath = r.defaultInflatePath;
-                                    const inflatePath = join(inflateDir, service, "http", rPath + ".api.js");
+                                    const inflatePath = join(inflateDir, service, "http", rPath + ".api.cjs");
                                     mkdirSync(dirname(inflatePath), {
                                         recursive: true
                                     });

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

@@ -11,7 +11,7 @@ export async function setupLogConfig(logger, servicePath, service, logConfigMap,
             const logConfig = await importLogConfigModule(logPath, logger);
             logConfigMap[service] = logConfig;
             if (inflateDir) {
-                const inflatePath = resolve(inflateDir, service, "log.js");
+                const inflatePath = resolve(inflateDir, service, "log.cjs");
                 mkdirSync(dirname(inflatePath), {
                     recursive: true
                 });
@@ -20,6 +20,7 @@ export async function setupLogConfig(logger, servicePath, service, logConfigMap,
                     embemedJSX: false,
                     minify: false,
                     useExport: true,
+                    platform: "node",
                     logger
                 }));
             }

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

@@ -15,7 +15,7 @@ export async function setupMiddleware(logger, servicePath, service, mainRouter,
                 }
             }
             if (inflateDir && inflateSea) {
-                const inflatePath = resolve(inflateDir, service, "middleware.js");
+                const inflatePath = resolve(inflateDir, service, "middleware.cjs");
                 mkdirSync(dirname(inflatePath), {
                     recursive: true
                 });
@@ -23,6 +23,7 @@ export async function setupMiddleware(logger, servicePath, service, mainRouter,
                 writeFileSync(inflatePath, await inflateJSX(middlewarePath, {
                     embemedJSX: false,
                     minify: false,
+                    platform: "node",
                     useExport: true,
                     logger
                 }));

package/build/esm/src/inflate/setup-server-config.js

@@ -11,7 +11,7 @@ export async function setupServerConfig(logger, servicePath, service, serverConf
             const serverConfig = await importServerConfigModule(serverPath, logger);
             serverConfigMap[service] = serverConfig;
             if (inflateDir) {
-                const inflatePath = resolve(inflateDir, service, "server.js");
+                const inflatePath = resolve(inflateDir, service, "server.cjs");
                 mkdirSync(dirname(inflatePath), {
                     recursive: true
                 });
@@ -19,6 +19,7 @@ export async function setupServerConfig(logger, servicePath, service, serverConf
                 writeFileSync(inflatePath, await inflateJSX(serverPath, {
                     embemedJSX: false,
                     minify: false,
+                    platform: "node",
                     useExport: true,
                     logger
                 }));

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

@@ -18,7 +18,7 @@ export async function inflateWSConfig(logger, servicePath, service, wsConfigList
                 //wsMap[wsConfig.path] = { name: service, options: wsConfig };
             }
             if (inflateDir) {
-                const inflatePath = resolve(inflateDir, service, "ws.js");
+                const inflatePath = resolve(inflateDir, service, "ws.cjs");
                 mkdirSync(dirname(inflatePath), {
                     recursive: true
                 });
@@ -26,6 +26,7 @@ export async function inflateWSConfig(logger, servicePath, service, wsConfigList
                 writeFileSync(inflatePath, await inflateJSX(wsPath, {
                     embemedJSX: false,
                     minify: false,
+                    platform: "node",
                     useExport: true,
                     logger
                 }));

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

@@ -286,6 +286,7 @@ export class Miqro {
                 services: this.options.services,
                 serverInterface: this.serverInterface,
                 //dbManager: this.dbManager,
+                port: this.options.port,
                 inflateDir: options?.inflateDir,
                 inflateSea: options?.inflateSea ? true : false,
                 //inflateTests: options?.inflateTests ? true : false,
@@ -367,15 +368,17 @@ export class Miqro {
         reloadInflatedRouter(this);
         await notifiyServerConfig(this.logger, this.serverInterface, this.adminInterface, this.inflated.serverConfigMap, "load");
         if (this.logger && (cluster.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === "0")) {
-            this.logger?.debug("\t\t==http routes==");
+            /*this.logger?.debug("\t\t==http routes==");
             this.server.logPaths({
-                debug: this.logger.debug.bind(this.logger),
-                error: this.logger.error.bind(this.logger),
-                info: this.logger.debug.bind(this.logger),
-                log: this.logger.debug.bind(this.logger),
-                trace: this.logger.trace.bind(this.logger),
-                warn: this.logger.warn.bind(this.logger)
-            });
+              debug: this.logger.debug.bind(this.logger),
+              error: this.logger.error.bind(this.logger),
+              info: this.logger.debug.bind(this.logger),
+              log: this.logger.debug.bind(this.logger),
+              trace: this.logger.trace.bind(this.logger),
+              warn: this.logger.warn.bind(this.logger)
+            });*/
+            this.logger?.info("\t\t==http routes==");
+            this.server.logPaths(this.logger);
         }
         this.logger?.trace("calling listen on [%s]", this.options.port);
         await this.server.listen(this.options.port);
@@ -496,15 +499,16 @@ export class Miqro {
         this.webSocketManager.replaceALLWSBuLOGSocket(this.inflated.wsConfigList);
         await notifiyServerConfig(this.logger, this.serverInterface, this.adminInterface, this.inflated.serverConfigMap, "load");
         if (this.logger && (cluster.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === "0")) {
-            this.logger?.debug("\t\t==http routes==");
-            this.server.logPaths({
-                debug: this.logger.debug.bind(this.logger),
-                error: this.logger.error.bind(this.logger),
-                info: this.logger.debug.bind(this.logger),
-                log: this.logger.debug.bind(this.logger),
-                trace: this.logger.trace.bind(this.logger),
-                warn: this.logger.warn.bind(this.logger)
-            });
+            this.logger?.info("\t\t==http routes==");
+            this.server.logPaths(this.logger);
+            /*this.server.logPaths({
+              debug: this.logger.debug.bind(this.logger),
+              error: this.logger.error.bind(this.logger),
+              info: this.logger.debug.bind(this.logger),
+              log: this.logger.debug.bind(this.logger),
+              trace: this.logger.trace.bind(this.logger),
+              warn: this.logger.warn.bind(this.logger)
+            });*/
         }
         //this.logger?.log("=====================");
         this.logger?.debug("\t\t==reload done==");

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

@@ -15,7 +15,7 @@ export async function runMigrations(logger, db, servicePath, service, inflateDir
         migrations.push(...serviceMigrations);
         if (inflateDir) {
             for (const migration of serviceMigrations) {
-                const inflatePath = resolve(inflateDir, service, "migration", migration.substring(0, migration.length - extname(migration).length) + ".js");
+                const inflatePath = resolve(inflateDir, service, "migration", migration.substring(0, migration.length - extname(migration).length) + ".cjs");
                 mkdirSync(dirname(inflatePath), {
                     recursive: true
                 });
@@ -24,6 +24,7 @@ export async function runMigrations(logger, db, servicePath, service, inflateDir
                     embemedJSX: false,
                     minify: false,
                     useExport: true,
+                    platform: "node",
                     logger
                 }));
             }
@@ -42,13 +43,14 @@ export async function runMigrationsDown(logger, db, servicePath, service, inflat
         migrations.push(...serviceMigrations);
         if (inflateDir) {
             for (const migration of serviceMigrations) {
-                const inflatePath = resolve(inflateDir, service, "migration", migration.substring(0, migration.length - extname(migration).length) + ".js");
+                const inflatePath = resolve(inflateDir, service, "migration", migration.substring(0, migration.length - extname(migration).length) + ".cjs");
                 mkdirSync(dirname(inflatePath), {
                     recursive: true
                 });
                 logger?.log("writing [%s]", relative(cwd(), inflatePath));
                 writeFileSync(inflatePath, await inflateJSX(resolve(migrationsFolderPath, migration), {
                     embemedJSX: false,
+                    platform: "node",
                     minify: false,
                     useExport: true,
                     logger