miqro 6.0.9 → 6.0.10

package/build/lib.cjs

@@ -4336,11 +4336,12 @@ var init_reload_api = __esm({
       },
       handler: async (req, res) => {
         const errors = await req?.editor?.reload();
+        const parsedErrors = parseInflateErrors2(errors);
         return res.json({
           message: "OK",
           reloadString: req.uuid,
           migrations: req?.editor?.getMigrations().map((m) => m.name),
-          errors: parseInflateErrors2(errors)
+          errors: parsedErrors ? parsedErrors : []
         });
       }
     };
@@ -7176,7 +7177,13 @@ var ClusterWebSocketServer2 = class extends WebSocketServer {
         console.error(e);
       }
     };
+    this.connect();
+  }
+  remoteClients = /* @__PURE__ */ new Set();
+  listener;
+  connect() {
     if (process.send) {
+      process.removeListener("message", this.listener);
       process.on("message", this.listener);
       process.send({
         type: ClusterWebSocketServer2MessageType,
@@ -7186,8 +7193,6 @@ var ClusterWebSocketServer2 = class extends WebSocketServer {
       });
     }
   }
-  remoteClients = /* @__PURE__ */ new Set();
-  listener;
   dispose() {
     process.removeListener("message", this.listener);
   }
@@ -7282,14 +7287,18 @@ var ClusterCache = class {
         this.logger?.error(e);
       }
     };
-    if (process.send) {
-      process.on("message", this.listener);
-    }
+    this.connect();
   }
   localCache = /* @__PURE__ */ new Map();
   //private logger: Logger;
   listener;
-  dispose() {
+  connect() {
+    if (process.send) {
+      process.removeListener("message", this.listener);
+      process.on("message", this.listener);
+    }
+  }
+  disconnect() {
     process.removeListener("message", this.listener);
   }
   get(key) {
@@ -7523,8 +7532,16 @@ var WebSocketManager = class {
     this.name = options && options.name ? options.name : "WebSocketManager";
     this.avoidLogSocket = options && options.avoidLogSocket ? options.avoidLogSocket : false;
   }
+  deleteWS(path) {
+    const ws = this.runningGlobalWSMap.get(path);
+    this.disconnectAllFrom(path);
+    ws.dispose();
+    this.runningGlobalWSMap.delete(path);
+  }
   deleteAllWS() {
-    this.runningGlobalWSMap.clear();
+    for (const path of this.runningGlobalWSMap.keys()) {
+      this.deleteWS(path);
+    }
   }
   getWS(path) {
     return this.runningGlobalWSMap.get(path);
@@ -7545,7 +7562,7 @@ var WebSocketManager = class {
   replaceALLWSBuLOGSocket(list) {
     for (const path of this.runningGlobalWSMap.keys()) {
       if (path !== LOG_SOCKET_PATH || !this.avoidLogSocket) {
-        this.runningGlobalWSMap.delete(path);
+        this.deleteWS(path);
       }
     }
     for (const wsConfig of list) {
@@ -7583,7 +7600,6 @@ var WebSocketManager = class {
             }
           }
         }
-        ws.dispose();
       }
     } catch (e) {
       this.logger?.error("error disconnecting web socket clients");
@@ -9187,6 +9203,18 @@ var DBManager = class {
       return db;
     }
   }
+  async connectAll() {
+    this.options?.logger?.debug("connection all db connections");
+    const tR = [];
+    for (const name of this.map.keys()) {
+      const db = this.map.get(name);
+      if (db && db.status === "disconnected") {
+        this.options?.logger?.debug("connecting db connection [%s]", name);
+        tR.push(db.connect());
+      }
+    }
+    await Promise.all(tR);
+  }
   async closeAll() {
     this.options?.logger?.debug("closing all db connections");
     for (const name of this.map.keys()) {
@@ -11699,15 +11727,6 @@ async function inflateJSX(inFile, options) {
     throw e;
   }
 }
-async function importAPIRoute(inFile, logger) {
-  const mod = (await importJSXFile(inFile, logger)).default;
-  const module2 = typeof mod === "function" ? { handler: mod } : parser2.parse(mod, APIRouteSchema, (0, import_node_path5.basename)(inFile));
-  if (module2 !== void 0) {
-    return module2;
-  } else {
-    throw new Error(`error with module [${inFile}] undefined`);
-  }
-}
 var APIOptionsSchema = {
   type: "object?",
   properties: {
@@ -11728,6 +11747,7 @@ var APIOptionsSchema = {
     },
     ...RouteOptionsSchema.properties
   }
+  //mode:"add_extra"
 };
 var HTMLModuleSchema = {
   type: "object",
@@ -11737,6 +11757,7 @@ var HTMLModuleSchema = {
     },
     apiOptions: APIOptionsSchema
   }
+  //mode:"add_extra"
 };
 var JSONModuleSchema = {
   type: "object",
@@ -11746,13 +11767,15 @@ var JSONModuleSchema = {
     },
     apiOptions: APIOptionsSchema
   }
+  //mode:"add_extra"
 };
 var MigrationSchema = {
   type: "object",
   properties: {
     up: "function",
     down: "function"
-  }
+  },
+  mode: "add_extra"
 };
 var CORSOptionsSchema = {
   type: "object",
@@ -11762,6 +11785,7 @@ var CORSOptionsSchema = {
     methods: "string?",
     preflightContinue: "boolean?"
   }
+  //mode:"add_extra"
 };
 var WSConfigSchema = {
   type: "object",
@@ -11774,6 +11798,7 @@ var WSConfigSchema = {
     onMessage: "function?",
     onDisconnect: "function?"
   }
+  //mode:"add_extra"
 };
 var DBConfigSchema = {
   type: "object",
@@ -11784,6 +11809,7 @@ var DBConfigSchema = {
     dialect: "string?",
     name: "string"
   }
+  //mode:"add_extra"
 };
 var ServerConfigSchema = {
   type: "object",
@@ -11794,6 +11820,7 @@ var ServerConfigSchema = {
     start: "function?",
     load: "function?"
   }
+  //mode:"add_extra"
 };
 var LogConfigSchema = {
   type: "object",
@@ -11806,13 +11833,24 @@ var LogConfigSchema = {
     replaceFileTransport: "boolean?",
     write: "function"
   }
+  //mode:"add_extra"
 };
 var AuthConfigSchema = {
   type: "object",
   properties: {
     ...SessionHandlerOptionsSchema.properties
   }
+  //mode:"add_extra"
 };
+async function importAPIRoute(inFile, logger) {
+  const mod = (await importJSXFile(inFile, logger)).default;
+  const module2 = typeof mod === "function" ? { handler: mod } : parser2.parse(mod, APIRouteSchema, (0, import_node_path5.basename)(inFile));
+  if (module2 !== void 0) {
+    return module2;
+  } else {
+    throw new Error(`error with module [${inFile}] undefined`);
+  }
+}
 async function importMigrationModule(inFile, logger) {
   const module2 = parser2.parse((await importJSXFile(inFile, logger)).default, MigrationSchema, (0, import_node_path5.basename)(inFile));
   if (module2 !== void 0) {
@@ -11822,7 +11860,9 @@ async function importMigrationModule(inFile, logger) {
   }
 }
 async function importHTMLModule(inFile, logger) {
-  const module2 = parser2.parse(await importJSXFile(inFile, logger), HTMLModuleSchema, (0, import_node_path5.basename)(inFile));
+  const module2 = await importJSXFile(inFile, logger);
+  parser2.parse(module2.default, HTMLModuleSchema.properties.default, `${(0, import_node_path5.basename)(inFile)}.default`);
+  parser2.parse(module2.apiOptions, APIOptionsSchema, `${(0, import_node_path5.basename)(inFile)}.apiOptions`);
   if (module2 !== void 0) {
     return module2;
   } else {
@@ -11830,7 +11870,9 @@ async function importHTMLModule(inFile, logger) {
   }
 }
 async function importJSONModule(inFile, logger) {
-  const module2 = parser2.parse(await importJSXFile(inFile, logger), JSONModuleSchema, (0, import_node_path5.basename)(inFile));
+  const module2 = await importJSXFile(inFile, logger);
+  parser2.parse(module2.default, JSONModuleSchema.properties.default, `${(0, import_node_path5.basename)(inFile)}.default`);
+  parser2.parse(module2.apiOptions, APIOptionsSchema, `${(0, import_node_path5.basename)(inFile)}.apiOptions`);
   if (module2 !== void 0) {
     return module2;
   } else {
@@ -13170,6 +13212,11 @@ async function watchAndServer(app) {
   }
   watchLogger?.info("watching for changes on [%s]", app.options.services.join(","));
   reWatch();
+  return {
+    stopWatch: () => {
+      stopWatch();
+    }
+  };
 }
 
 // src/common/exit.ts
@@ -13326,9 +13373,6 @@ async function inflateDBMigrations(logger, service, dbName, inflateDir, errors)
   return false;
 }
 
-// src/services/app.ts
-var import_node_util3 = require("node:util");
-
 // src/services/utils/server-interface.ts
 var import_node_cluster2 = __toESM(require("node:cluster"), 1);
 var import_node_child_process2 = require("node:child_process");
@@ -13425,9 +13469,114 @@ function getPORT() {
   return checkEnvVariable("PORT", "8080");
 }
 
+// src/services/utils/log-transport.ts
+var import_node_util3 = require("node:util");
+init_constants();
+function createLogProviderOptions(app) {
+  const defaultConsole = ConsoleTransport();
+  const defaultFile = FileTransport();
+  const defaultWrite = async (args, level) => {
+    try {
+      const serviceNamesWithLogConfigReplaceConsole = level === void 0 && app.inflated ? Object.keys(app.inflated.logConfigMap).filter((serviceName) => app.inflated.logConfigMap[serviceName].replaceConsoleTransport) : [];
+      const serviceNamesWithLogConfigReplaceFile = level === void 0 && app.inflated ? Object.keys(app.inflated.logConfigMap).filter((serviceName) => app.inflated.logConfigMap[serviceName].replaceFileTransport) : [];
+      await Promise.allSettled((level === void 0 ? [
+        level === void 0 && serviceNamesWithLogConfigReplaceConsole.length === 0 ? defaultConsole.write(args) : Promise.resolve(),
+        level === void 0 && serviceNamesWithLogConfigReplaceFile.length === 0 ? defaultFile.write(args) : Promise.resolve()
+      ] : []).concat(
+        app.inflated ? Object.keys(app.inflated.logConfigMap).map((serviceName) => app.inflated.logConfigMap[serviceName]).filter((c) => c.level === level).map((c) => c.write(args)) : []
+      ));
+    } catch (e) {
+      console.error(e);
+    }
+  };
+  return {
+    name: app.options.name,
+    formatter: (args) => {
+      const params = args.optionalParams;
+      return (0, import_node_util3.format)(
+        `${(/* @__PURE__ */ new Date()).toISOString()} PID[${process.pid}] ${args.identifier ? `[${args.identifier}] ` : ""}${args.level !== "info" ? args.level === "error" || args.level === "warn" ? `[${args.level.toUpperCase()}] ` : `[${args.level}] ` : ""}${args.message}`,
+        ...params
+      );
+    },
+    transports: [
+      ...[void 0, "error", "warn", "info", "debug", "trace"].map((level) => {
+        return level ? {
+          level,
+          write: async (args) => {
+            await defaultWrite(args, level);
+          }
+        } : {
+          write: async (args) => {
+            await defaultWrite(args, void 0);
+          }
+        };
+      }),
+      {
+        level: "trace",
+        write: async (args) => {
+          try {
+            if (app.options.editor) {
+              try {
+                const ws = app.webSocketManager.getWS(LOG_SOCKET_PATH);
+                if (ws) {
+                  await ws.broadcast(JSON.stringify({
+                    type: LOG_WRITE_EVENT,
+                    level: args.level,
+                    identifier: args.identifier,
+                    out: args.out
+                  }));
+                }
+              } catch (e) {
+                console.error(e);
+              }
+            }
+          } catch (e) {
+            console.error(e);
+          }
+        }
+      }
+    ],
+    ...app.options.logProviderOptions ? app.options.logProviderOptions : {}
+  };
+}
+
+// src/services/utils/admin-interface.ts
+function createAdminInterface(app) {
+  const adminCache = new ClusterCache("EditorCache[" + app.options.name + "]");
+  return {
+    getCache: () => adminCache,
+    stop: () => app.stop(),
+    restart: () => app.restart(),
+    reload: () => app.reload(),
+    getHotReloadHTML: getHotReloadScript,
+    getMigrations: () => {
+      if (app.inflated) {
+        const ret = [];
+        for (const db of app.inflated.dbList) {
+          for (const m of db.migrations) {
+            ret.push(m);
+          }
+        }
+        return ret;
+      }
+      return [];
+    },
+    getServices: () => {
+      return app.options.services;
+    },
+    getRouteFileMap: () => {
+      return app.inflated ? app.inflated.fileMap : {};
+    },
+    getInflateErrors: () => {
+      return app.inflated ? app.inflated.errors : [];
+    }
+  };
+}
+
 // src/services/app.ts
 var MiqroApplicationMessageType = "$$$MiqroApplicationMessageType$$$";
 var Miqro = class _Miqro {
+  status = "stopped";
   options;
   server = null;
   cache;
@@ -13442,6 +13591,7 @@ var Miqro = class _Miqro {
   logger;
   loggerProvider;
   static initAssetsPromise = null;
+  watcher;
   constructor(options) {
     this.options = {
       editor: false,
@@ -13450,65 +13600,7 @@ var Miqro = class _Miqro {
       services: [],
       ...options ? options : {}
     };
-    const defaultConsole = ConsoleTransport();
-    const defaultFile = FileTransport();
-    const defaultWrite = async (args, level) => {
-      try {
-        const serviceNamesWithLogConfigReplaceConsole = level === void 0 && this.inflated ? Object.keys(this.inflated.logConfigMap).filter((serviceName) => this.inflated.logConfigMap[serviceName].replaceConsoleTransport) : [];
-        const serviceNamesWithLogConfigReplaceFile = level === void 0 && this.inflated ? Object.keys(this.inflated.logConfigMap).filter((serviceName) => this.inflated.logConfigMap[serviceName].replaceFileTransport) : [];
-        await Promise.allSettled((level === void 0 ? [
-          level === void 0 && serviceNamesWithLogConfigReplaceConsole.length === 0 ? defaultConsole.write(args) : Promise.resolve(),
-          level === void 0 && serviceNamesWithLogConfigReplaceFile.length === 0 ? defaultFile.write(args) : Promise.resolve()
-        ] : []).concat(
-          this.inflated ? Object.keys(this.inflated.logConfigMap).map((serviceName) => this.inflated.logConfigMap[serviceName]).filter((c) => c.level === level).map((c) => c.write(args)) : []
-        ));
-      } catch (e) {
-        console.error(e);
-      }
-    };
-    this.loggerProvider = new LogProvider({
-      name: this.options.name,
-      formatter: ({ identifier, level, message, optionalParams }) => (0, import_node_util3.format)(`${(/* @__PURE__ */ new Date()).toISOString()} PID[${process.pid}] ${identifier ? `[${identifier}] ` : ""}${level !== "info" ? level === "error" || level === "warn" ? `[${level.toUpperCase()}] ` : `[${level}] ` : ""}${message}`, ...optionalParams),
-      transports: [
-        ...[void 0, "error", "warn", "info", "debug", "trace"].map((level) => {
-          return level ? {
-            level,
-            write: async (args) => {
-              await defaultWrite(args, level);
-            }
-          } : {
-            write: async (args) => {
-              await defaultWrite(args, void 0);
-            }
-          };
-        }),
-        {
-          level: "trace",
-          write: async (args) => {
-            try {
-              if (this.options.editor) {
-                try {
-                  const ws = this.webSocketManager.getWS(LOG_SOCKET_PATH);
-                  if (ws) {
-                    await ws.broadcast(JSON.stringify({
-                      type: LOG_WRITE_EVENT,
-                      level: args.level,
-                      identifier: args.identifier,
-                      out: args.out
-                    }));
-                  }
-                } catch (e) {
-                  console.error(e);
-                }
-              }
-            } catch (e) {
-              console.error(e);
-            }
-          }
-        }
-      ],
-      ...this.options.logProviderOptions ? this.options.logProviderOptions : {}
-    });
+    this.loggerProvider = new LogProvider(createLogProviderOptions(this));
     const SERVER_IDENTIFIER = import_node_cluster3.default.isPrimary ? "" : process.env["CLUSTER_NODE_NUMBER"] ? `WORKER_${process.env["CLUSTER_NODE_NUMBER"]}`.toUpperCase() : `WORKER`;
     this.logger = this.options.logger ? this.options.logger : this.loggerProvider.getLogger(SERVER_IDENTIFIER);
     this.listener = async (data) => {
@@ -13554,56 +13646,26 @@ var Miqro = class _Miqro {
       port: this.options.port
     });
     this.serverRequestHandler = ServerRequestHandler(this.serverInterface);
-    const adminCache = new ClusterCache("EditorCache[" + this.options.name + "]");
-    this.adminInterface = {
-      getCache: () => adminCache,
-      stop: () => this.stop(),
-      restart: () => this.restart(),
-      reload: () => this.reload(),
-      getHotReloadHTML: getHotReloadScript,
-      getMigrations: () => {
-        if (this.inflated) {
-          const ret = [];
-          for (const db of this.inflated.dbList) {
-            for (const m of db.migrations) {
-              ret.push(m);
-            }
-          }
-          return ret;
-        }
-        return [];
-      },
-      getServices: () => {
-        return this.options.services;
-      },
-      getRouteFileMap: () => {
-        return this.inflated ? this.inflated.fileMap : {};
-      },
-      getInflateErrors: () => {
-        return this.inflated ? this.inflated.errors : [];
-      }
-      /*,
-      inflateJSX: async function inflateJSX(path, minify: boolean = true) {
-        return realInflateJSX(path, {
-          embemedJSX: true,
-          minify,
-          useExport: true
-        });
-      }*/
-    };
+    this.adminInterface = createAdminInterface(this);
     setupExitHandlers(this);
+  }
+  connect() {
     if (process.send) {
+      process.removeListener("message", this.listener);
       process.on("message", this.listener);
     }
+    this.cache.connect();
+    this.adminInterface?.getCache()?.connect();
   }
-  dispose() {
+  disconnect() {
     if (this.server !== null) {
       throw new Error("already running! call stop() first");
     }
     if (process.send) {
       process.removeListener("message", this.listener);
     }
-    this.cache.dispose();
+    this.cache.disconnect();
+    this.adminInterface?.getCache()?.disconnect();
     this.webSocketManager.disconnectAll();
     this.dbManager.closeAll();
   }
@@ -13773,14 +13835,17 @@ var Miqro = class _Miqro {
     this.inflated = null;
   }
   async start() {
-    if (this.server !== null) {
+    if (this.server !== null || this.status !== "stopped") {
       throw new Error("cannot start app already running.");
     }
     if (!this.isInflated()) {
       throw new Error("cannot start uninflated app. call await app.inflate() first.");
     }
     this.logger?.debug("		==start==");
+    this.status = "starting";
     this.server = void 0;
+    this.connect();
+    await this.dbManager.connectAll();
     this.server = new App({
       onUpgrade: (req, socket, head) => {
         req.server = this.serverInterface;
@@ -13811,17 +13876,24 @@ var Miqro = class _Miqro {
     }
     await notifiyServerConfig(this.logger, this.serverInterface, this.adminInterface, this.inflated.serverConfigMap, "start");
     if (this.options.hotreload && (import_node_cluster3.default.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === "0")) {
-      await watchAndServer(this);
+      this.watcher = await watchAndServer(this);
     }
     this.logger?.debug("		==start done==");
+    this.status = "started";
     return this.inflated.errors && this.inflated.errors.length > 0 ? this.inflated.errors : null;
   }
   async stop() {
-    if (!this.server || !this.inflated) {
+    if (!this.server || !this.inflated || this.status !== "started") {
       throw new Error("cannot stop server not running");
     }
+    this.status = "stopping";
+    if (this.watcher) {
+      this.watcher.stopWatch();
+      this.watcher = null;
+    }
     const server2 = this.server;
     this.server = null;
+    this.disconnect();
     this.logger?.debug("		==stop==");
     this.logger?.debug("clear running server routes");
     server2.clear();
@@ -13831,13 +13903,14 @@ var Miqro = class _Miqro {
     notifiyServerConfigSync(this, "unload");
     this.logger?.debug("stopping");
     const p = server2.close();
-    notifiyServerConfigSync(this, "stop");
     await p;
     await pD;
+    this.status = "stopped";
+    notifiyServerConfigSync(this, "stop");
     this.logger?.debug("		==stop done==");
   }
   async restart(avoidSend) {
-    if (!this.server || !this.inflated) {
+    if (!this.server || !this.inflated || this.status !== "started") {
       throw new Error("cannot start server not running");
     }
     this.logger?.debug("		==restart==");
@@ -13855,9 +13928,10 @@ var Miqro = class _Miqro {
     return ret;
   }
   async reload(avoidSend) {
-    if (!this.server || !this.inflated) {
+    if (!this.server || !this.inflated || this.status !== "started") {
       throw new Error("cannot reload server not running");
     }
+    this.status = "reloading";
     if (!avoidSend) {
       this.logger?.debug("		==reload==");
     } else {
@@ -13900,6 +13974,7 @@ var Miqro = class _Miqro {
       });
     }
     this.logger?.debug("		==reload done==");
+    this.status = "started";
     return this.inflated.errors && this.inflated.errors.length > 0 ? this.inflated.errors : null;
   }
 };

package/editor/common/log-socket.tsx

@@ -7,7 +7,7 @@ export interface LogSocket {
   setMaxLogSize: (val: number | "unlimited") => void;
 }
 
-export function useLogSocket(): LogSocket {
+export function useLogSocket(options: { disableLog?: boolean; }): LogSocket {
 
   const [_, setmaxLogSize, getMaxlogsize] = jsx.useState<number | "unlimited">(1000000);
 
@@ -20,6 +20,9 @@ export function useLogSocket(): LogSocket {
 
     function setupSocket() {
       try {
+        if (options.disableLog) {
+          return;
+        }
         console.log("setting up log socket");
         const socket = new WebSocket("/admin/socket");
         socket.addEventListener("error", (err) => {

package/editor/components/editor.tsx

@@ -28,7 +28,10 @@ function InflateError2Map(errors: {
 }
 
 export function Editor(props: { disablelog?: boolean; disablepreview?: boolean; disablereload?: boolean; migrations: string; services: string; reloadstring: string; files: string; initialcurrent: string; classname?: string; errors: string }) {
-  const logSocket = useLogSocket();
+  //console.dir(props);
+  const logSocket = useLogSocket({
+    disableLog: (props as any).disablelog === "true" || props.disablelog === true ? true : false
+  });
 
   const [services, setservices] = jsx.useState<string[]>(JSON.parse(props.services));
   const [collapsed, setCollapsed] = jsx.useState<{