miqro 6.1.2 → 6.1.4

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

@@ -13,36 +13,40 @@ CLUSTER_COUNT=10 ${BIN_NAME}-cluster --service api/`;
 export const help = `
 ==flags==
 
--v, --version\t\toutputs the version number
--h, --help\t\toutputs this page.
---watch\t\t\tuse to enable the hot-reload functionality.
---test\t\t\trun the tests for a service.
---migrate-up\t\tmigrations up.
---migrate-down\t\tmigrations down.
---inflate\t\tinflates the application.
---inflate-dir\t\tto set the output directory of the --inflate command. default value is inflated/.
---editor\t\truns the application with a built-in editor.
---generate-doc\t\tgenerates a documentation for the api endpoints of the service.
---generate-doc-out\tthe output file for the generated documentation. default value is API.md.
---generate-doc-type\tthe format of the generated documentation. it can be JSON or MD. default value is MD.
---generate-doc-all\toutputs all the server routes in the documentation output.
---compile\t\tinflates the application and tries to create a NODE SEA binary.
---inflate-sea\t\tinflates the application with sea compilation scripts.
---install-tsconfig\tcreates a tsconfig.json configured to use with --install-types.
---install-types\t\tcreates and updates the .types/ folder use together with --install-tsconfig.
---disable-miqrojson\tdisables the load of miqro.json file.
---config\toverrides the default miqro.json path with a new one.
---port\toverrides the default port loading from environment variables.
---name\toverrides the default name of the server.
+-v, --version\n\toutputs the version number
+-h, --help\n\toutputs this page.
+--watch\n\tuse to enable the hot-reload functionality.
+--test\n\trun the tests for a service.
+--migrate-up\n\tmigrations up.
+--migrate-down\n\tmigrations down.
+--inflate\n\tinflates the application.
+--inflate-dir\n\tto set the output directory of the --inflate command. default value is inflated/.
+--editor\n\truns the application with a built-in editor.
+--generate-doc\n\tgenerates a documentation for the api endpoints of the service.
+--generate-doc-out\n\tthe output file for the generated documentation. default value is API.md.
+--generate-doc-type\n\tthe format of the generated documentation. it can be JSON or MD. default value is MD.
+--generate-doc-all\n\toutputs all the server routes in the documentation output.
+--compile\n\tinflates the application and tries to create a NODE SEA binary.
+--inflate-sea\n\tinflates the application with sea compilation scripts.
+--install-tsconfig\n\tcreates a tsconfig.json configured to use with --install-types.
+--install-types\n\tcreates and updates the .types/ folder use together with --install-tsconfig.
+--install-miqrojson\n\tcreates a default miqro.json file.
+--disable-miqrojson\n\tdisables the load of miqro.json file.
+--log-file\n\toverrides the default log file from LOG_FILE.
+--browser\n\toverrides the default browser from BROWSER.
+--config\n\toverrides the default miqro.json path.
+--port\n\toverrides the default port from PORT.
+--name\n\toverrides the default name of the server.
 
 ==environment variables==
 
-PORT\t\t\toverride the default 8080 port.
-LOG_FILE\t\toverride the default ./server.log file
-DB\t\t\tenable the server.db features
-DB_STORAGE\t\toverride the default local db location ./db.sqlite3
-DB_DIALECT\t\toverride the default node:sqlite
-DB_CONNECTION\t\toverride the default connection url
-CLEAR_JSX_CACHE\t\tset to 1 or 0 to enable or disable the clearing of the esbuild cache defaults to 1.
-JSX_TMP\t\t\tset custom location of esbuild builds defaults to /tmp/jsx_tmp.
+PORT\n\toverride the default 8080 port.
+BROWSER\n\toverride the default browser. change to none to disable.".
+LOG_FILE\n\toverride the default ./server.log file
+DB\n\tenable the server.db features
+DB_STORAGE\n\toverride the default local db location ./db.sqlite3
+DB_DIALECT\n\toverride the default node:sqlite
+DB_CONNECTION\n\toverride the default connection url
+CLEAR_JSX_CACHE\n\tset to 1 or 0 to enable or disable the clearing of the esbuild cache defaults to 1.
+JSX_TMP\n\tset custom location of esbuild builds defaults to /tmp/jsx_tmp.
 `;

package/build/esm/src/inflate/setup-ws.d.ts

@@ -1,4 +1,4 @@
 import { Logger } from "@miqro/core";
 import { InflateError } from "../common/jsx.js";
 import { WSConfig } from "../types.js";
-export declare function inflateWSConfig(logger: Logger, servicePath: string, service: string, wsConfigList: WSConfig[] | undefined, inflateDir: string | undefined | false, errors: InflateError[]): Promise<false | WSConfig>;
+export declare function inflateWSConfig(logger: Logger, servicePath: string, service: string, wsConfigList: WSConfig[] | undefined, inflateDir: string | undefined | false, errors: InflateError[]): Promise<void>;

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

@@ -30,7 +30,7 @@ export async function inflateWSConfig(logger, servicePath, service, wsConfigList
                     logger
                 }));
             }
-            return wsConfig;
+            //return wsConfigList;
         }
         catch (e) {
             errors.push({
@@ -39,7 +39,7 @@ export async function inflateWSConfig(logger, servicePath, service, wsConfigList
             });
             logger.error("error with " + wsPath);
             logger.error(e);
-            return false;
+            //return false;
         }
     }
 }

package/build/esm/src/main.js

@@ -9,7 +9,7 @@ import { Miqro } from "./services/app.js";
 import { TEST_SOCKET } from "./common/paths.js";
 import { Logger } from "@miqro/core";
 async function main(args) {
-    if (args.installTypes || args.installTSConfig) {
+    if (args.installTypes || args.installTSConfig || args.installMiqroJSON) {
         await installTypings(args, new Logger(""));
         process.exit(EXIT_CODES.NORMAL_EXIT);
     }
@@ -19,6 +19,8 @@ async function main(args) {
             name: args.name ? args.name : undefined,
             port: args.test ? TEST_SOCKET : args.port,
             services: args.services,
+            browser: args.browser,
+            logFile: args.logFile,
             hotreload: args.test ? false : args.hotreload
         });
         // check arguments

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

@@ -18,6 +18,8 @@ export interface MiqroOptions {
     services: string[];
     editor: boolean;
     port: string;
+    browser?: string | boolean;
+    logFile?: string | boolean;
     hotreload?: boolean;
 }
 export interface InflateOptions {

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

@@ -183,9 +183,9 @@ export class Miqro {
     async loadDBConfig(options) {
         const errors = [];
         const dbList = [];
-        const dbConfigList = [];
+        const dbConfigListALL = [];
         for (const service of this.options.services) {
-            const dbConfig = await inflateDBConfig(this.logger, service, dbConfigList, options?.inflateSea ? options?.inflateDir : undefined, errors);
+            const dbConfig = await inflateDBConfig(this.logger, service, dbConfigListALL, options?.inflateSea ? options?.inflateDir : undefined, errors);
             if (dbConfig) {
                 const migrations = await inflateDBMigrations(this.logger, service, dbConfig.name, options?.inflateSea ? options?.inflateDir : undefined, errors);
                 dbList.push({

package/build/esm/src/services/utils/log-transport.d.ts

@@ -1,7 +1,7 @@
-import { WriteArgs } from "@miqro/core";
+import { LoggerTransport, WriteArgs } from "@miqro/core";
 import { Miqro } from "../app.js";
 export declare function createLogProviderOptions(app: Miqro): {
     name: string;
-    transports: import("@miqro/core").LoggerTransport[];
+    transports: LoggerTransport[];
     formatter: (args: WriteArgs) => string;
 };

package/build/esm/src/services/utils/log-transport.js

@@ -3,7 +3,12 @@ import { format } from "node:util";
 import { LOG_SOCKET_PATH, LOG_WRITE_EVENT } from "../../../editor/common/constants.js";
 export function createLogProviderOptions(app) {
     const defaultConsole = ConsoleTransport();
-    const defaultFile = FileTransport();
+    //console.log("app.options.logFile [%s]", app.options.logFile);
+    const defaultFile = app.options.logFile !== true && app.options.logFile !== false && String(app.options.logFile).toUpperCase() !== "TRUE" && String(app.options.logFile).toUpperCase() !== "FALSE" &&
+        app.options.logFile ? FileTransport(app.options.logFile) :
+        String(app.options.logFile).toUpperCase() === "TRUE" || app.options.logFile === true || app.options.logFile === undefined ?
+            FileTransport() :
+            undefined;
     const defaultWrite = async (args, level) => {
         try {
             const serviceNamesWithLogConfigReplaceConsole = level === undefined && app.inflated ?
@@ -12,9 +17,9 @@ export function createLogProviderOptions(app) {
                 Object.keys(app.inflated.logConfigMap).filter(serviceName => app.inflated.logConfigMap[serviceName].replaceFileTransport) : [];
             await Promise.allSettled((level === undefined ?
                 [
-                    level === undefined && serviceNamesWithLogConfigReplaceConsole.length === 0 ?
+                    level === undefined && serviceNamesWithLogConfigReplaceConsole.length === 0 && defaultConsole ?
                         defaultConsole.write(args) : Promise.resolve(),
-                    level === undefined && serviceNamesWithLogConfigReplaceFile.length === 0 ?
+                    level === undefined && serviceNamesWithLogConfigReplaceFile.length === 0 && defaultFile ?
                         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)) : []));

package/build/esm/src/services/utils/server-interface.d.ts

@@ -30,11 +30,11 @@ export declare class ServerInterfaceImpl implements ServerInterface {
         disconnectAll(path: string): void;
     };
     loggerProvider?: LogProvider;
+    openBrowser: (path: string) => void;
     constructor(options: ServerInterfaceImplOptions);
     getWorkerNumber(): number;
     getWorkerCount(): number;
     isPrimaryWorker(): boolean;
-    openBrowser(path: string): void;
     getLogger(identifier: string, options?: {
         level?: any;
         transports?: any[];

package/build/esm/src/services/utils/server-interface.js

@@ -8,6 +8,7 @@ export class ServerInterfaceImpl {
     db;
     ws;
     loggerProvider;
+    openBrowser;
     constructor(options) {
         this.cache = options.cache;
         this.localCache = options.localCache;
@@ -17,6 +18,24 @@ export class ServerInterfaceImpl {
         const wsManager = options.wsManager;
         this.loggerProvider = options.loggerProvider;
         const app = options.app;
+        this.openBrowser = (path) => {
+            const PORT = this.port;
+            const URL = `http://localhost${PORT ? `:${PORT}` : ""}${path}`;
+            const DEFAULT_OPEN = process.platform === "win32" ? "explorer" : process.platform === "darwin" ? "open" : "xdg-open";
+            const OPEN = app.options.browser !== undefined && String(app.options.browser).toUpperCase() !== "TRUE" && String(app.options.browser).toUpperCase() !== "1" ?
+                String(app.options.browser).toUpperCase() !== "0" && String(app.options.browser).toUpperCase() !== "FALSE" && String(app.options.browser).toUpperCase() !== "NONE" && app.options.browser ?
+                    app.options.browser : false :
+                process.env["BROWSER"] ?
+                    process.env["BROWSER"] === "none" ? false : process.env["BROWSER"] : DEFAULT_OPEN;
+            if (OPEN) {
+                const openCMD = `${OPEN} "${URL}"`;
+                this.logger?.info("opening browser with [%s]", openCMD);
+                execSync(openCMD);
+            }
+            else {
+                this.logger?.warn("ignoring browser [%s]", OPEN);
+            }
+        };
         this.db = Object.freeze({
             get: (name) => {
                 return dbManager.getDB(name);
@@ -59,20 +78,6 @@ export class ServerInterfaceImpl {
     isPrimaryWorker() {
         return cluster.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === "0";
     }
-    openBrowser(path) {
-        const PORT = this.port;
-        const URL = `http://localhost${PORT ? `:${PORT}` : ""}${path}`;
-        const DEFAULT_OPEN = process.platform === "win32" ? "explorer" : process.platform === "darwin" ? "open" : "xdg-open";
-        const OPEN = process.env["BROWSER"] ? process.env["BROWSER"] === "none" ? false : process.env["BROWSER"] : DEFAULT_OPEN;
-        if (OPEN) {
-            const openCMD = `${OPEN} "${URL}"`;
-            this.logger?.info("opening browser with [%s]", openCMD);
-            execSync(openCMD);
-        }
-        else {
-            this.logger?.warn("ignoring browser [%s]", process.env["BROWSER"]);
-        }
-    }
     getLogger(identifier, options) {
         return this.loggerProvider?.getLogger(identifier, options);
     }

package/build/lib.cjs

@@ -12892,7 +12892,6 @@ async function inflateWSConfig(logger, servicePath, service, wsConfigList, infla
           logger
         }));
       }
-      return wsConfig;
     } catch (e) {
       errors.push({
         filePath: wsPath,
@@ -12900,7 +12899,6 @@ async function inflateWSConfig(logger, servicePath, service, wsConfigList, infla
       });
       logger.error("error with " + wsPath);
       logger.error(e);
-      return false;
     }
   }
 }
@@ -13929,6 +13927,7 @@ var ServerInterfaceImpl = class {
   db;
   ws;
   loggerProvider;
+  openBrowser;
   constructor(options) {
     this.cache = options.cache;
     this.localCache = options.localCache;
@@ -13938,6 +13937,19 @@ var ServerInterfaceImpl = class {
     const wsManager = options.wsManager;
     this.loggerProvider = options.loggerProvider;
     const app = options.app;
+    this.openBrowser = (path) => {
+      const PORT2 = this.port;
+      const URL2 = `http://localhost${PORT2 ? `:${PORT2}` : ""}${path}`;
+      const DEFAULT_OPEN = process.platform === "win32" ? "explorer" : process.platform === "darwin" ? "open" : "xdg-open";
+      const OPEN = app.options.browser !== void 0 && String(app.options.browser).toUpperCase() !== "TRUE" && String(app.options.browser).toUpperCase() !== "1" ? String(app.options.browser).toUpperCase() !== "0" && String(app.options.browser).toUpperCase() !== "FALSE" && String(app.options.browser).toUpperCase() !== "NONE" && app.options.browser ? app.options.browser : false : process.env["BROWSER"] ? process.env["BROWSER"] === "none" ? false : process.env["BROWSER"] : DEFAULT_OPEN;
+      if (OPEN) {
+        const openCMD = `${OPEN} "${URL2}"`;
+        this.logger?.info("opening browser with [%s]", openCMD);
+        (0, import_node_child_process2.execSync)(openCMD);
+      } else {
+        this.logger?.warn("ignoring browser [%s]", OPEN);
+      }
+    };
     this.db = Object.freeze({
       get: (name) => {
         return dbManager.getDB(name);
@@ -13980,19 +13992,6 @@ var ServerInterfaceImpl = class {
   isPrimaryWorker() {
     return import_node_cluster2.default.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === "0";
   }
-  openBrowser(path) {
-    const PORT2 = this.port;
-    const URL2 = `http://localhost${PORT2 ? `:${PORT2}` : ""}${path}`;
-    const DEFAULT_OPEN = process.platform === "win32" ? "explorer" : process.platform === "darwin" ? "open" : "xdg-open";
-    const OPEN = process.env["BROWSER"] ? process.env["BROWSER"] === "none" ? false : process.env["BROWSER"] : DEFAULT_OPEN;
-    if (OPEN) {
-      const openCMD = `${OPEN} "${URL2}"`;
-      this.logger?.info("opening browser with [%s]", openCMD);
-      (0, import_node_child_process2.execSync)(openCMD);
-    } else {
-      this.logger?.warn("ignoring browser [%s]", process.env["BROWSER"]);
-    }
-  }
   getLogger(identifier, options) {
     return this.loggerProvider?.getLogger(identifier, options);
   }
@@ -14024,7 +14023,10 @@ var MiqroJSONSchema = {
     name: "string?",
     services: "string[]?",
     port: "number?|string?",
-    inflateDir: "string?"
+    inflateDir: "string?",
+    browser: "boolean?|string?",
+    logFile: "boolean?|string?",
+    editor: "boolean?"
   }
 };
 function importMiqroJSON(inFile) {
@@ -14045,14 +14047,14 @@ var import_node_util3 = require("node:util");
 init_constants();
 function createLogProviderOptions(app) {
   const defaultConsole = ConsoleTransport();
-  const defaultFile = FileTransport();
+  const defaultFile = app.options.logFile !== true && app.options.logFile !== false && String(app.options.logFile).toUpperCase() !== "TRUE" && String(app.options.logFile).toUpperCase() !== "FALSE" && app.options.logFile ? FileTransport(app.options.logFile) : String(app.options.logFile).toUpperCase() === "TRUE" || app.options.logFile === true || app.options.logFile === void 0 ? FileTransport() : void 0;
   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()
+        level === void 0 && serviceNamesWithLogConfigReplaceConsole.length === 0 && defaultConsole ? defaultConsole.write(args) : Promise.resolve(),
+        level === void 0 && serviceNamesWithLogConfigReplaceFile.length === 0 && defaultFile ? 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)) : []
       ));
@@ -14290,9 +14292,9 @@ var Miqro = class _Miqro {
   async loadDBConfig(options) {
     const errors = [];
     const dbList = [];
-    const dbConfigList = [];
+    const dbConfigListALL = [];
     for (const service of this.options.services) {
-      const dbConfig = await inflateDBConfig(this.logger, service, dbConfigList, options?.inflateSea ? options?.inflateDir : void 0, errors);
+      const dbConfig = await inflateDBConfig(this.logger, service, dbConfigListALL, options?.inflateSea ? options?.inflateDir : void 0, errors);
       if (dbConfig) {
         const migrations = await inflateDBMigrations(this.logger, service, dbConfig.name, options?.inflateSea ? options?.inflateDir : void 0, errors);
         dbList.push({

package/editor/auth.ts

@@ -0,0 +1,51 @@
+import { AuthConfig, ServerRequest } from "../src/types.js";
+import { AdminRequest } from "./common/admin-interface.js";
+
+export const ADMIN_EDITOR_AUTH_KEY = "$$ADMIN_EDITOR_AUTH_KEY$$";
+
+export const ADMIN_EDITOR_AUTH_QUERY = "key";
+export const ADMIN_EDITOR_AUTH_COOKIE = ADMIN_EDITOR_AUTH_KEY;
+
+export default {
+  authService: {
+    verify: async (args) => {
+
+      const adminInterface = (args.req as AdminRequest).editor;
+      const serverInterface = (args.req as any as ServerRequest).server;
+      const KEY = (adminInterface ? adminInterface.getCache() : serverInterface.cache).get<string>(ADMIN_EDITOR_AUTH_KEY);
+
+      const validSesson = {
+        username: "username",
+        account: "account",
+        groups: [],
+        token: args.token
+      };
+
+      const queryToken = args.req.query[ADMIN_EDITOR_AUTH_QUERY];
+      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 (queryToken === KEY) {
+          args.res.setCookie(ADMIN_EDITOR_AUTH_COOKIE, KEY, {
+            expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 31 * 12 * 500),
+            httpOnly: true,
+
+            //secure: true,
+            path: "/",
+            //sameSite: "strict"
+          });
+          args.req.searchParams.delete(ADMIN_EDITOR_AUTH_QUERY);
+          const queryString = args.req.searchParams.toString();
+          const redirect = args.req.path + (queryString ? "?" + queryString : "");
+          await args.res.redirect(redirect);
+          return validSesson;
+        }
+      } else if (cookieToken) {
+        return cookieToken === KEY ? validSesson : null;
+      }
+      return null;
+    },
+  }
+} as AuthConfig;

package/editor/common/admin-interface.ts

@@ -0,0 +1,84 @@
+import { RouterHandlerOptions } from "@miqro/core";
+import { CacheInterface, ServerRequest } from "../../src/types.js";
+import { MigrationModule } from "../../src/inflate/setup-db.js";
+
+export interface EditorAdminInterface {
+  getCache: () => CacheInterface;
+  //inflateJSX: (path: string, minify?: boolean) => Promise<string>;
+  getMigrations(): MigrationModule[];
+  stop: () => Promise<void>;
+  reload: () => Promise<null | {
+    filePath: string;
+    error: Error;
+  }[]>;
+  restart: () => Promise<null | {
+    filePath: string;
+    error: Error;
+  }[]>;
+  getHotReloadHTML(): string;
+  getInflateErrors(): null | {
+    filePath: string;
+    error: Error;
+  }[];
+  getServices(): string[];
+  getRouteFileMap(): {
+    [filePath: string]: {
+      routes: {
+        path?: string;
+        method?: string | null;
+        options?: RouterHandlerOptions;
+        inflatePath?: string;
+      }[];
+      previewMethod: "api" | "html" | null;
+    }
+  };
+}
+
+export interface AdminRequest extends ServerRequest {
+  editor?: EditorAdminInterface;
+}
+
+/*let currentAdminInterface: EditorAdminInterface | null = null;
+function createFakeAdminInterface(server: any): EditorAdminInterface {
+  return {
+    getCache: () => {
+      return server.cache;
+    },
+    stop: async () => {
+
+    },
+    restart: async () => {
+      return null;
+    },
+    reload: async () => {
+      return null;
+    },
+    getHotReloadHTML: () => {
+      return "";
+    },
+    getMigrations: () => {
+      return [];
+    },
+    getServices: () => {
+      return ["."];
+    },
+    getRouteFileMap: () => {
+      return {};
+    },
+    getInflateErrors: () => {
+      return [];
+    },
+    inflateJSX: async function inflateJSX(path, minify: boolean = true) {
+      return "";
+    }
+  }
+}
+
+export function getEditorAdmin(server): EditorAdminInterface {
+  return currentAdminInterface ? currentAdminInterface : createFakeAdminInterface(server);
+}
+
+export function setEditorAdmin(admin: EditorAdminInterface): void {
+  currentAdminInterface = admin;
+}*/
+

package/editor/common/constants.server.ts

@@ -0,0 +1,5 @@
+import { resolve } from "node:path";
+import { cwd } from "node:process";
+
+export const PORT = process.env["PORT"] ? process.env["PORT"] : "8080";
+export const BASE_PATH = resolve(cwd());

package/editor/common/constants.ts

@@ -0,0 +1,21 @@
+export const BASEEDITOR_PATH = "/admin/editor";
+export const LOG_SOCKET_PATH = "/admin/socket";
+export const LOG_WRITE_EVENT = "LogWrite";
+
+export const SUPPORTED_LANGUAGES = [
+  "text",
+  "json",
+  "javascript",
+  "typescript",
+  "dockerfile",
+  "yaml",
+  "xml",
+  "html",
+  "css",
+  "scss",
+  "markdown",
+  "c",
+  "cpp",
+  "bash",
+  "python"
+];

package/editor/common/editor-index.tsx

@@ -0,0 +1,17 @@
+import { scanDir } from "../http/admin/editor/api/fs/scan.api.js";
+import { parseInflateErrors } from "../http/admin/editor/api/server/restart.api.js";
+import { AdminRequest } from "./admin-interface.js";
+import { HTMLEncode } from "./html-encode.js";
+
+export function EditorIndex(editorCSS: string, editorJS: string, enableHotReload: boolean) {
+  return async function editorIndex(req: AdminRequest, res) {
+    const admin = req.editor;
+
+    const errors = parseInflateErrors(admin ? admin.getInflateErrors() : []);
+    const files = scanDir(req);
+    const migrations = admin ? admin.getMigrations().map(m => m.name) : [];
+    const services = admin ? admin.getServices() : ["."];
+    const hotReload = enableHotReload ? (admin ? admin.getHotReloadHTML() : "") : "";
+    res.html(`<!DOCTYPE html><html><body><style>${editorCSS}</style><script type="module">${editorJS}</script><editor-component class="main-container" reloadstring="${req.uuid}" migrations="${HTMLEncode(JSON.stringify(migrations))}" services="${HTMLEncode(JSON.stringify(services))}" errors="${HTMLEncode(JSON.stringify(errors))}" files="${HTMLEncode(JSON.stringify(files))}"><noscript>Enable JavaScript</noscript></editor-component>${hotReload}</body></html>`)
+  }
+}

package/editor/common/html-encode.ts

@@ -0,0 +1,14 @@
+export function HTMLEncode(str: string): string {
+  let i = str.length;
+  const aRet: string[] = [];
+
+  while (i--) {
+    const iC = str[i].charCodeAt(0);
+    if (iC < 65 || iC > 127 || (iC > 90 && iC < 97)) {
+      aRet[i] = '&#' + iC + ';';
+    } else {
+      aRet[i] = str[i];
+    }
+  }
+  return aRet.join('');
+}

package/editor/common/log-socket.tsx

@@ -0,0 +1,85 @@
+interface LogLine { out: string; identifier: string; level: "error" | "warn" | "debug" | "trace" | "info" }
+
+export interface LogSocket {
+  lines: LogLine[];
+  clearLog: () => void;
+  getMaxlogsize: () => number | "unlimited";
+  setMaxLogSize: (val: number | "unlimited") => void;
+}
+
+export function useLogSocket(options: { disableLog?: boolean; }): LogSocket {
+
+  const [_, setmaxLogSize, getMaxlogsize] = jsx.useState<number | "unlimited">(1000000);
+
+  const [__, setlines, getLines] = jsx.useState<LogLine[]>([]);
+  const refresh = jsx.useRefresh();
+
+  jsx.useEffect(() => {
+
+    let timeout;
+
+    function setupSocket() {
+      try {
+        if (options.disableLog) {
+          return;
+        }
+        console.log("setting up log socket");
+        const socket = new WebSocket("/admin/socket");
+        socket.addEventListener("error", (err) => {
+          console.error(err);
+          clearTimeout(timeout);
+          timeout = setTimeout(() => {
+            setupSocket();
+          }, 1000);
+        });
+        socket.addEventListener("open", () => {
+          console.log("log socket open");
+          clearTimeout(timeout);
+          socket.addEventListener("message", (msg) => {
+            const lines = getLines();
+            const data = JSON.parse(msg.data);
+            //console.log(data.out);
+            const maxLogSize = getMaxlogsize();
+            if (maxLogSize !== "unlimited" && lines.length >= maxLogSize) {
+              lines.splice(0, (lines.length - maxLogSize) + 1);
+            }
+            lines.push(data);
+            setlines(lines);
+            refresh();
+          });
+        });
+        socket.addEventListener("close", () => {
+          console.log("log socket close");
+          clearTimeout(timeout);
+          timeout = setTimeout(() => {
+            setupSocket();
+          }, 1000);
+        });
+      } catch (e) {
+        console.error(e);
+        clearTimeout(timeout);
+        timeout = setTimeout(() => {
+          setupSocket();
+        }, 1000);
+      }
+    }
+
+    setupSocket();
+  }, []);
+
+  return {
+    lines: getLines(),
+    clearLog: () => {
+      setlines([]);
+    },
+    getMaxlogsize,
+    setMaxLogSize: (newValue: number | "unlimited") => {
+      if (newValue === "unlimited") {
+        setmaxLogSize(newValue);
+      } else {
+        setmaxLogSize(newValue);
+      }
+
+    }
+  }
+}