miqro 6.0.10 → 6.0.12

package/src/cluster.ts

@@ -10,10 +10,14 @@ const __package_dirname = import.meta.url ? resolve(dirname(fileURLToPath(import
 
 //const usage = "CLUSTER_COUNT=os.cpus().length [CLUSTER_AUTO_BROADCAST=true|false] [CLUSTER_DISABLE_RESTART=true|false]";
 
-parseArguments();
+const args = parseArguments();
 
-const CMD = `CLUSTER_AUTO_BROADCAST=true ${process.argv[0]} ${mainPath()} ${resolve(__package_dirname, "main.js")} ${process.argv.slice(2).join(" ")}`;
+if (args.inflate || args.test || args.compile || args.installTSConfig || args.installTypes || args.migrateDown || args.migrateUp) {
+  await import("./main.js");
+} else {
+  const CMD = `CLUSTER_AUTO_BROADCAST=true ${process.argv[0]} ${mainPath()} ${resolve(__package_dirname, "main.js")} ${process.argv.slice(2).join(" ")}`;
 
-console.log(CMD);
+  console.log(CMD);
 
-execSync(CMD, { stdio: 'inherit' });
+  execSync(CMD, { stdio: 'inherit' });
+}

package/src/inflate/inflate-sea.ts

@@ -81,6 +81,7 @@ async function main() {
     localCache,
     logProvider,
     wsManager: webSocketManager,
+    logger: logProvider.getLogger("server"),
     dbManager,
     port: PORT
   });
@@ -91,7 +92,7 @@ async function main() {
   const app = new App({
     onUpgrade: webSocketManager.onUpgrade
   });
-  ${SERVERCONFIGLIST ? `\n  await Promise.all([${SERVERCONFIGLIST}].map(config=>config.preload(serverInterface)));\n` : ""}
+  ${SERVERCONFIGLIST ? `\n  await Promise.all([${SERVERCONFIGLIST}].filter(config=>config.preload).map(config=>config.preload(serverInterface)));\n` : ""}
   app.use(ServerRequestHandler(serverInterface));
   app.use(LoggerHandler());
   ${services.map(service => {
@@ -105,11 +106,11 @@ async function main() {
   ${services.map(service => `
   app.use(await (await import("./${join(service, "api-router.js")}")).setupRouter());
   app.use(await (await import("./${join(service, "static-router.js")}")).setupRouter())`).join("\n")}
-  ${SERVERCONFIGLIST ? `\n  await Promise.all([${SERVERCONFIGLIST}].map(config=>config.load(serverInterface)));\n` : ""}
+  ${SERVERCONFIGLIST ? `\n  await Promise.all([${SERVERCONFIGLIST}].filter(config=>config.load).map(config=>config.load(serverInterface)));\n` : ""}
   
 
   await app.listen(PORT);
-  ${SERVERCONFIGLIST ? `\n  await Promise.all([${SERVERCONFIGLIST}].map(config=>config.start(serverInterface)));` : ""}
+  ${SERVERCONFIGLIST ? `\n  await Promise.all([${SERVERCONFIGLIST}].filter(config=>config.start).map(config=>config.start(serverInterface)));` : ""}
 }
 main().catch(e=>console.error(e));
 `

package/src/services/utils/server-interface.ts

@@ -103,7 +103,7 @@ export class ServerInterfaceImpl implements ServerInterface {
   constructor(options: ServerInterfaceImplOptions) {
     this.cache = options.cache;
     this.localCache = options.localCache;
-    this.logger = options.logger;
+    this.logger = options.logger ? options.logger : options.loggerProvider ? options.loggerProvider.getLogger("server") : undefined;
     this.port = options.port;
 
     const dbManager = options.dbManager;

package/src/types/miqro.d.ts

@@ -105,5 +105,5 @@ export interface ServerRequest extends Request {
 export interface ServerResponse extends Response {
 }
 
-export { App, LoggerHandler, Router } from "@miqro/core/lib.js";
-export { migration } from "@miqro/query/lib.js";
+export { App, LoggerHandler, Router, APIRoute } from "@miqro/core/lib.js";
+export { migration, Migration } from "@miqro/query/lib.js";

package/src/types.ts

@@ -41,6 +41,9 @@ declare global {
   }
 }
 
+export { APIRoute } from "@miqro/core";
+export { Migration } from "@miqro/query";
+
 export interface ServerGlobal {
   encodeHTML: (str: string) => string;
   inflateMDtoHTML: (str: string) => string;