miqro 7.3.6 → 8.0.2

package/README.md

@@ -4,7 +4,7 @@
 
 fully typed TypeScript · REST · WebSocket · SQL · JWT · HTTP
 
-runtime dependencies: `jose`, `esbuild`, `cookie`, `showdown`
+runtime dependencies: `jose`, `esbuild`, `cookie`, `marked`
 
 - **Web Components** using JSX — server-rendered and client-side
 - **static site generation** — `.html.tsx` handlers run against a live DB at build time
@@ -12,7 +12,7 @@ runtime dependencies: `jose`, `esbuild`, `cookie`, `showdown`
 - **database** — `sqlite3`, `node:sqlite`, `postgres` with migrations
 - **cluster** — multi-worker with shared cache and hot reload
 - **NODE:SEA** — compile to single binary, no Node.js required on target machine
-- **built-in editor**, **test runner**, **API doc generation**
+- **test runner**, **API doc generation**
 
 ## packages
 
@@ -169,7 +169,6 @@ all files and folders are optional.
 
 ```
 miqro --service app/
-miqro --service app/ --editor
 ```
 
 ## http folder
@@ -899,8 +898,7 @@ const app = new Miqro({
   services: ["app/"],
   port: "3000",
   name: "myapp",       // required in cluster mode
-  hotreload: false,
-  editor: false
+  hotreload: false
 });
 
 await app.inflate({ inflateDir: "build/" });  // generate static files
@@ -1023,7 +1021,6 @@ via env or `miqro.json`:
 ```
 miqro --service app/
 miqro --watch --service app/
-miqro --editor --service app/
 miqro --test --service app/
 miqro --migrate-up --service app/
 miqro --migrate-down --service app/
@@ -1042,7 +1039,6 @@ flags:
 --migrate-down          run migrations down
 --inflate               generate static files
 --inflate-dir           output directory (default: inflated/)
---editor                run with built-in editor
 --generate-doc          generate API documentation
 --generate-doc-out      output file (default: API.md)
 --generate-doc-type     MD | JSON | HTML (default: MD)

package/build/esm/{src/bin → bin}/types.js

@@ -1,7 +1,6 @@
 // import { initTypes } from "../common/assets.js";
 import { existsSync, writeFileSync } from "node:fs";
-import { TEMPLATES } from "../../editor/common/templates.js";
-import { EXIT_CODES } from "../common/constants.js";
+import { EXIT_CODES, TEMPLATES } from "../common/constants.js";
 import { installAsset } from "../common/assets.js";
 export async function installTypings(args, logger) {
     /*if (args.installTypes) {

package/build/esm/{src/common → common}/arguments.d.ts

@@ -6,7 +6,6 @@ interface MiqroJSON {
     name?: string;
     browser?: string | boolean;
     logFile?: string | boolean;
-    editor?: boolean;
     etag?: boolean;
     https?: boolean;
     serverOptions?: ServerOptions;
@@ -46,7 +45,6 @@ export interface Arguments {
     inflateSEA: boolean;
     inflateDir: string;
     services: string[];
-    editor: boolean;
     hotreload: boolean;
     watch: boolean;
     https: boolean;

package/build/esm/{src/common → common}/arguments.js

@@ -26,7 +26,6 @@ const MiqroJSONSchema = {
         inflateDir: "string?",
         browser: "boolean?|string?",
         logFile: "boolean?|string?",
-        editor: "boolean?",
         https: "boolean?",
         serverOptions: "any?",
         httpsRedirect: "number?",
@@ -84,7 +83,6 @@ export function parseArguments() {
         generateDocAll: null,
         generateDocOut: null,
         generateDocType: null,
-        editor: null,
         inflateDir: null
     };
     const services = [];
@@ -395,22 +393,6 @@ export function parseArguments() {
                 flags.inflateSEA = true;
                 flags.inflate = true;
                 continue;
-            /*case "--install-types":
-              if (flags.inflate !== null || flags.installTypes !== null) {
-                console.error("bad arguments.");
-                console.error(usage);
-                process.exit(EXIT_CODES.BAD_ARGUMENTS);
-              }
-              flags.installTypes = true;
-              continue;*/
-            case "--editor":
-                if (flags.editor !== null) {
-                    console.error("bad arguments.");
-                    console.error(usage);
-                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
-                }
-                flags.editor = true;
-                continue;
             case "--install-miqrojson":
                 if (flags.installMiqroJSON !== null) {
                     console.error("bad arguments. --install-miqrojson already set.");
@@ -611,18 +593,12 @@ export function parseArguments() {
                 flags.browser = miqroRC.browser;
             }
         }
-        if (flags.editor === null) {
-            if (miqroRC.editor !== undefined) {
-                flags.editor = miqroRC.editor;
-            }
-        }
         if (flags.inflateParallel === null) {
             if (miqroRC.inflateParallel !== undefined) {
                 flags.inflateParallel = miqroRC.inflateParallel;
             }
         }
     }
-    flags.editor = flags.editor ? flags.editor : false;
     if (services.length === 0 && (!flags.installTSConfig /* && !flags.installTypes*/ && !flags.installMiqroJSON)) {
         flags.inflateDir = flags.inflateDir ? flags.inflateDir : undefined;
         console.error(`bad arguments. missing --service argument`);
@@ -653,10 +629,6 @@ export function parseArguments() {
         console.error("bad arguments. cannot use --install with --inflate");
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
-    if (flags.inflate && flags.editor) {
-        console.error("bad arguments. cannot use --inflate with --editor");
-        process.exit(EXIT_CODES.BAD_ARGUMENTS);
-    }
     if (flags.inflate && ( /*flags.installTypes || */flags.installTSConfig || flags.installMiqroJSON || flags.install)) {
         console.error("bad arguments. cannot use --inflate with --install, --install-tsconfig or --install-miqrojson");
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
@@ -677,23 +649,19 @@ export function parseArguments() {
         console.error("bad arguments. cannot use --inflate-only-assets with --inflate-sea");
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
-    if (flags.editor && ( /*flags.installTypes || */flags.installTSConfig || flags.installMiqroJSON)) {
-        console.error("bad arguments. cannot use --editor with--install-types, --install-tsconfig or --install-miqrojson");
-        process.exit(EXIT_CODES.BAD_ARGUMENTS);
-    }
-    if (flags.test && (flags.watch || flags.hotreload || flags.editor || flags.compile || flags.inflate)) {
-        console.error("bad arguments. cannot use --editor with --test");
+    if (flags.test && (flags.watch || flags.hotreload || flags.compile || flags.inflate)) {
+        console.error("bad arguments. cannot use --inflage with --test");
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
-    if (flags.migrateUp && (flags.watch || flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateDown || flags.inflate)) {
+    if (flags.migrateUp && (flags.watch || flags.hotreload || 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.watch || flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate)) {
+    if (flags.migrateDown && (flags.watch || flags.hotreload || 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.watch || flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate || flags.migrateDown)) {
+    if (flags.generateDoc && (flags.watch || flags.hotreload || 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);
     }
@@ -745,7 +713,6 @@ export function parseArguments() {
         generateDocOut: flags.generateDocOut ? resolve(process.cwd(), flags.generateDocOut) : generateDocType === "MD" ? resolve(process.cwd(), "API.md") : resolve(process.cwd(), "API.json"),
         generateDocType,
         services,
-        editor: flags.editor ? true : false,
         https: flags.https ? true : false,
         httpsRedirect: flags.httpsRedirect ? flags.httpsRedirect : undefined,
         serverOptions: flags.serverOptions

package/build/esm/{src/common → common}/assets.js

@@ -8,7 +8,7 @@ import { initESBuild } from "./esbuild.js";
 import { mkdirASync, unlinkASync, writeFileASync } from "./fs.js";
 // import { initJSXJS } from "./jsx.js";
 //const require = createRequire(import.meta.url);
-export const __package_dirname = import.meta.url ? resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", "..", "..") : null;
+export const __package_dirname = import.meta.url ? resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", "..") : null;
 const ASSETS_ROUTER = {
     "lib.cjs": "build/lib.cjs",
     "version.tag": "sea/version.tag",

package/build/esm/{src/common → common}/constants.d.ts

@@ -10,3 +10,14 @@ export declare const CLEAR_JSX_CACHE: boolean;
 export declare const EDITOR_CONFIG_KEY = "$$editor$$";
 export declare const HOT_RELOAD_PATH = "/hot-reload";
 export declare const HOT_RELOAD_SCRIPT_PATH = "/hot-reload.js";
+export declare const TEMPLATES: {
+    [name: string]: {
+        displayName: string;
+        template?: ((filename: string, httpPath: string) => string);
+        httpSufix?: string;
+        sufix?: string;
+        prefix?: string;
+        language: string;
+        filename?: string;
+    };
+};

package/build/esm/{editor/common/templates.js → common/constants.js}

@@ -1,3 +1,17 @@
+export const EXIT_CODES = {
+    BAD_ARGUMENTS: 10,
+    NORMAL_EXIT: 0,
+    GLOBALS_ALTERED: 80,
+    ABNORMAL: 98,
+    ABNORMAL_UNCONTROLLED: 99,
+    TEST_FAILED: 30,
+};
+export const CLEAR_JSX_CACHE = (process.env["CLEAR_JSX_CACHE"] !== undefined ? process.env["CLEAR_JSX_CACHE"] : "1") === "1";
+export const EDITOR_CONFIG_KEY = "$$editor$$";
+export const HOT_RELOAD_PATH = "/hot-reload";
+export const HOT_RELOAD_SCRIPT_PATH = "/hot-reload.js";
+//export const SERVER_IDENTIFIER = cluster.isPrimary ? "SERVER" : process.env["CLUSTER_NODE_NUMBER"] ? `WORKER_${process.env["CLUSTER_NODE_NUMBER"]}` : "WORKER";
+//export const DB_IDENTIFIER = cluster.isPrimary ? "DATABASE" : process.env["CLUSTER_NODE_NUMBER"] ? `WORKER_${process.env["CLUSTER_NODE_NUMBER"]}_DATABASE` : "WORKER_DATABASE";
 export const TEMPLATES = {
     EMPTY: {
         displayName: "empty file",

package/build/esm/{src/common → common}/esbuild.js

@@ -41,7 +41,6 @@ export async function initESBuild(logger) {
   "pg"
 ];*/
 export const NODEJS_EXTERNAL = [
-    "sqlite3",
     "pg",
     "node:*"
 ];

package/build/esm/common/help.d.ts

@@ -0,0 +1,3 @@
+export declare const BIN_NAME = "miqro";
+export declare const usage = "usage: miqro [...FLAGS] --service app/\n\n==examples==\n\nmiqro --watch --service front/\nPORT=8181 miqro --service api/ --service front/\nmiqro --test --service front/\nmiqro --inflate --service front/\nmiqro --generate-doc --generate-doc-out API.md --service front/\nCLUSTER_COUNT=10 miqro-cluster --service api/";
+export declare const help = "\n==flags==\n\n-v, --version\n\toutputs the version number\n-h, --help\n\toutputs this page.\n--disable-etag\n\tuse to disable etag generation by default. each route can still enable this.\n--enable-etag\n\tuse to enable etag generation by default. each route can still disable this. ( by default etag is enabled )\n--watch\n\tuse to auto reload the server when files change.\n--hot-reload\n\tenables the hot-reload functionality use with --watch.\n--test\n\trun the tests for a service.\n--migrate-up\n\tmigrations up.\n--migrate-down\n\tmigrations down.\n--inflate\n\tinflates the application into a directory using esbuild.\n--inflate-dir\n\tto set the output directory of the --inflate command. default value is inflated/.\n--generate-doc\n\tgenerates a documentation for the api endpoints of the service.\n--generate-doc-out\n\tthe output file for the generated documentation. default value is API.md.\n--generate-doc-type\n\tthe format of the generated documentation. it can be JSON or MD. default value is MD.\n--generate-doc-all\n\toutputs all the server routes in the documentation output.\n--compile\n\tinflates the application and tries to create a NODE SEA binary.\n--no-build\n\tdisables calling esbuild during imports in runtime. Notice that to use jsx you will need to run tsc or esbuild on your jsx files to transpile them to js.\n--no-minify\n\tdisables calling minifing min.js files.\n--inflate-only-assets\n\tinflates ONLY the application assets. must be used with --inflate.\n--inflate-flat\n\tinflates files into the inflate-dir directly.\n--inflate-sea\n\tinflates the application with sea compilation scripts.\n--install-tsconfig\n\tcreates a tsconfig.json configured to use with --install-types.\n--install-miqrojson\n\tcreates a default miqro.json file.\n--install\n\tcreates a node_modules folder from binary cache (only available in sea binary).\n--disable-miqrojson\n\tdisables the load of miqro.json file.\n--log-file\n\toverrides the default log file from LOG_FILE.\n--browser\n\toverrides the default browser from BROWSER.\n--config\n\toverrides the default miqro.json path.\n--port\n\toverrides the default port from PORT.\n--name\n\toverrides the default name of the server.\n--https\n\tserves the server in https instead of http\n--https-key\n\tpoint to a server.key file for https.\n--https-cert\n\tpoint to a server.cert file for https.\n--https-redirect\n\tserves an aditional http server that redirects to https. it needs a port number.\n--inflate-parallel\n\tsets the max parallel esbuild instances. defaults to 1.\n\n==environment variables==\n\nPORT\n\toverride the default 8080 port.\nBROWSER\n\toverride the default browser. change to none to disable.\".\nLOG_FILE\n\toverride the default ./server.log file\nDB\n\tenable the server.db features\nDB_STORAGE\n\toverride the default local db location ./db.sqlite3\nDB_DIALECT\n\toverride the default node:sqlite\nDB_CONNECTION\n\toverride the default connection url\nCLEAR_JSX_CACHE\n\tset to 1 or 0 to enable or disable the clearing of the esbuild cache defaults to 1.\nJSX_TMP\n\tset custom location of esbuild builds defaults to /tmp/jsx_tmp.\n";

package/build/esm/{src/common → common}/help.js

@@ -24,7 +24,6 @@ export const help = `
 --migrate-down\n\tmigrations down.
 --inflate\n\tinflates the application into a directory using esbuild.
 --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.

package/build/esm/{src/inflate → inflate}/inflate-sea.js

@@ -61,6 +61,8 @@ export async function inflateAppForSea(logger, inflateDir, services, port) {
     writeFile(logger, join(inflateDir, "sea", "package.json"), `{ "type": "module", "private": true }`);
     writeFile(logger, join(inflateDir, "sea", "app.cjs"), `const { createLogProviderOptions, createServerInterface, ServerRequestHandler, WebSocketManager, DBManager, App, LoggerHandler, LogProvider, LocalCache, ClusterCache } = require("./lib.cjs");
 
+const pg = require("pg");
+
 async function main() {
   const PORT = "${PORT}";
 
@@ -131,6 +133,7 @@ main().catch(e=>console.error(e));
         jsxFactory: "JSX.createElement",
         jsxFragment: "JSX.Fragment",
         platform: "node",
+        external: ["node:*"],
         outfile: join(inflateDir, "sea", "app.bundle.cjs")
     });
     const miqroRCPath = getMiqroJSONPath();

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

@@ -0,0 +1 @@
+export declare function inflateMDString2HTML(text: string): Promise<string>;

package/build/esm/inflate/md.js

@@ -0,0 +1,4 @@
+import { marked } from "marked";
+export async function inflateMDString2HTML(text) {
+    return marked.parse(text, {});
+}

package/build/esm/{src/inflate → inflate}/setup-http.js

@@ -6,13 +6,12 @@ import { importHTMLModule, importAPIRoute, inflateJSX, importJSONModule, jsx2HTM
 import { createNodeRuntime } from "@miqro/jsx-node";
 import { getHotReloadScript } from "../services/hot-reload.js";
 import { cwd } from "node:process";
-// import { assertGlobalTampered } from "../services/globals.js";
 import { getHTTPRouterPath, getStaticFilesPath } from "../common/paths.js";
 import { setupCORS } from "./setup-cors.js";
 import { setupAUTH } from "./setup-auth.js";
 import { getRoutes } from "../services/utils/get-route.js";
 import { describeFilePath, mkdirASync, writeFileASync } from "../common/fs.js";
-import { inflateMD2HTML } from "./md.js";
+import { inflateMDString2HTML } from "./md.js";
 import { setupMiddleware } from "./setup-middleware.js";
 import { setupError } from "./setup-error.js";
 export async function setupHTTPRouter(importOptions, inflateOptions, server, logger, hotreload, servicePath, service, routeFileMap, staticFileMap, inflateDir, inflateSea, errors, inflateParallel) {
@@ -387,7 +386,7 @@ async function createRouterFromDirectory(importOptions, inflateJSXOptions, serve
                     case ".md": {
                         switch (file.subExt) {
                             case ".html": {
-                                const code = await inflateMD2HTML(file.filePath, logger);
+                                const code = await inflateMDString2HTML(readFileSync(file.filePath).toString());
                                 const contentType = CONTENT_TYPE_MAP[".html"];
                                 const path = join("/", dirname(relative(dir, file.filePath)), file.name);
                                 routeFileMap[file.filePath] = {

package/build/esm/{src/main.js → main.js}

@@ -15,7 +15,6 @@ async function main(args) {
     }
     else {
         const app = new Miqro({
-            editor: args.editor,
             etag: args.etag,
             name: args.name ? args.name : undefined,
             port: args.test ? TEST_SOCKET : args.port,

package/build/esm/{src/services → services}/app.d.ts

@@ -17,7 +17,6 @@ export interface MiqroOptions extends ImportJSXFileOptions {
     logger?: Logger;
     logProviderOptions?: LogProviderOptions;
     services: string[];
-    editor: boolean;
     port: string;
     browser?: string | boolean;
     logFile?: string | boolean;

package/build/esm/{src/services → services}/app.js

@@ -5,11 +5,7 @@ import { WebSocketManager } from "./utils/websocketmanager.js";
 import { DBManager } from "./utils/db-manager.js";
 import { inflateApp } from "../inflate/inflate.js";
 import { setupServerConfig } from "../inflate/setup-server-config.js";
-import { BASEEDITOR_PATH, LOG_SOCKET_PATH, LOG_WRITE_EVENT } from "../../editor/common/constants.js";
-import editorWSConfig from "../../editor/ws.js";
-import editorServerConfig from "../../editor/server.js";
 import { ClusterCache } from "./utils/cluster-cache.js";
-import { createEditorRouter } from "./editor.js";
 import { EDITOR_CONFIG_KEY, HOT_RELOAD_PATH, HOT_RELOAD_SCRIPT_PATH } from "../common/constants.js";
 import { watchAndServer } from "../common/watch.js";
 import { LocalCache } from "./utils/cache.js";
@@ -21,7 +17,6 @@ import { getServicePath } from "../common/paths.js";
 import { createServerInterface } from "./utils/server-interface.js";
 import { getPORT, importMiqroJSON } from "../common/arguments.js";
 import { createLogProviderOptions } from "./utils/log-transport.js";
-import { createAdminInterface } from "./utils/admin-interface.js";
 import { dirname, join, relative, resolve } from "node:path";
 import { cwd } from "node:process";
 import { HOT_RELOAD_JS_SCRIPT } from "./hot-reload.js";
@@ -48,7 +43,6 @@ export class Miqro {
         this.options = {
             noMinify: false,
             etag: true,
-            editor: false,
             name: "server",
             noBuild: false,
             port: getPORT(),
@@ -56,7 +50,6 @@ export class Miqro {
             ...(options ? options : {})
         };
         const loggerOptions = createLogProviderOptions(this);
-        loggerOptions.transports.push(createEditorLoggerTransport(this));
         this.loggerProvider = new LogProvider(loggerOptions);
         //if (!this.options.logger) {
         const SERVER_IDENTIFIER = cluster.isPrimary ?
@@ -97,8 +90,7 @@ export class Miqro {
         this.webSocketManager = new WebSocketManager({
             logger: this.logger,
             loggerProvider: this.loggerProvider,
-            name: `MiqroApplicationWebsocketManager[${this.options.name}]`,
-            avoidLogSocket: this.options.editor
+            name: `MiqroApplicationWebsocketManager[${this.options.name}]`
         });
         this.listener = this.listener.bind(this);
         //this.requestLoggerFactory = this.requestLoggerFactory.bind(this);
@@ -118,7 +110,6 @@ export class Miqro {
             port: this.options.port
         });
         this.serverRequestHandler = ServerRequestHandler(this.serverInterface);
-        this.adminInterface = createAdminInterface(this);
         this.webSocketManager.adminInterface = this.adminInterface;
         setupExitHandlers(this);
     }
@@ -272,15 +263,6 @@ export class Miqro {
             await Promise.all(dbList.map(db => this.dbManager.setupDB(db.dbConfig)));
             /* setup server config before inflate app router and ws and bs for preload*/
             const { errors: serviceConfigErrors, serverConfigMap } = await this.loadServerConfig(options);
-            // editor WSConfig must be put a head of the service WSConfig to avoid LOG_SOCKET replacement
-            if (this.options.editor) {
-                this.logger?.debug("setting up editor on %s", BASEEDITOR_PATH);
-                const editorRouter = await createEditorRouter(this.adminInterface);
-                router.use(editorRouter);
-                this.logger?.debug("setting up log websocket on [%s]", LOG_SOCKET_PATH);
-                wsConfigList.push(editorWSConfig);
-                serverConfigMap[EDITOR_CONFIG_KEY] = editorServerConfig;
-            }
             if (this.options?.hotreload /* && !options?.inflateTests*/) {
                 this.logger?.debug("setting up websocket on [%s]", HOT_RELOAD_PATH);
                 wsConfigList.push({
@@ -562,11 +544,6 @@ function reloadInflatedRouter(app) {
     app.logger?.debug("load running server with new routes");
     app.server.use(app.serverRequestHandler);
     app.server.use(LoggerHandler());
-    if (app.options.editor) {
-        app.server.use(async (req, res) => {
-            res.setHeader("x-uuid", req.uuid);
-        });
-    }
     app.server.use(app.inflated.router);
 }
 async function notifiyServerConfig(logger, serverInterface, adminInterface, serverConfigMap, method) {
@@ -610,32 +587,3 @@ export function notifiyServerConfigSync(app, method) {
         });
     }
 }
-function createEditorLoggerTransport(app) {
-    return {
-        level: "trace",
-        write: async (args) => {
-            try {
-                if (app.options.editor) {
-                    try {
-                        const ws = app.webSocketManager.getWS(LOG_SOCKET_PATH);
-                        if (ws) {
-                            //console.log("\n\n" + process.pid + " broadcasting " + LOG_SOCKET_PATH + "\n\n\n")
-                            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);
-            }
-        }
-    };
-}

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

@@ -1,18 +1,33 @@
 import cluster from "node:cluster";
 import { execSync } from "node:child_process";
-import { HTMLEncode } from "../../../editor/common/html-encode.js";
-import { inflateMD2HTML } from "../../inflate/md.js";
 import { Parser } from "@miqro/parser";
 import { ClusterCache } from "./cluster-cache.js";
 import { LocalCache } from "./cache.js";
 import { middleware } from "./middleware.js";
 import { jwt } from "./jwt.js";
+import { inflateMDString2HTML } from "../../inflate/md.js";
+import { jsx2HTML } from "../../lib.js";
+function HTMLEncode(str) {
+    let i = str.length;
+    const aRet = [];
+    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('');
+}
 export function createServerInterface(options) {
     // initGlobals();
     return Object.freeze({
         middleware,
+        getHTML: jsx2HTML,
         encodeHTML: HTMLEncode,
-        inflateMDtoHTML: inflateMD2HTML,
+        inflateMDtoHTML: inflateMDString2HTML,
         newParser() {
             return new Parser();
         },

package/build/esm/{src/services → services}/utils/websocketmanager.d.ts

@@ -7,7 +7,6 @@ export interface WebSocketManagerOptions {
     logger?: Logger | Console;
     loggerProvider?: LogProvider;
     name?: string;
-    avoidLogSocket?: boolean;
 }
 export declare class WebSocketManager {
     runningGlobalWSMap: Map<string, ClusterWebSocketServer2>;

package/build/esm/{src/services → services}/utils/websocketmanager.js

@@ -1,4 +1,3 @@
-import { LOG_SOCKET_PATH } from "../../../editor/common/constants.js";
 import { ClusterWebSocketServer2 } from "./cluster-ws.js";
 export class WebSocketManager {
     runningGlobalWSMap = new Map();
@@ -12,7 +11,6 @@ export class WebSocketManager {
         this.logger = options && options.logger ? options.logger : null;
         this.name = options && options.name ? options.name : "WebSocketManager";
         this.loggerProvider = options && options.loggerProvider;
-        this.avoidLogSocket = options && options.avoidLogSocket ? options.avoidLogSocket : false;
     }
     deleteWS(path) {
         const ws = this.runningGlobalWSMap.get(path);
@@ -46,22 +44,18 @@ export class WebSocketManager {
     }
     replaceALLWSBuLOGSocket(list) {
         for (const path of this.runningGlobalWSMap.keys()) {
-            if (path !== LOG_SOCKET_PATH || !this.avoidLogSocket) {
-                this.deleteWS(path);
-            }
+            this.deleteWS(path);
         }
         for (const wsConfig of list) {
             if (!wsConfig.disabled) {
-                if (wsConfig.path !== LOG_SOCKET_PATH || !this.avoidLogSocket) {
-                    if (this.runningGlobalWSMap.has(wsConfig.path)) {
-                        throw new Error(`ws on path ${wsConfig.path} already setup!`);
-                    }
-                    this.logger?.debug("setting up websocket on [%s]", wsConfig.path);
-                    const identifier = wsConfig.path.replaceAll("/", "_").toUpperCase();
-                    const logger = this.loggerProvider && identifier.length >= 0 ? this.loggerProvider.getLogger(identifier.substring(identifier.charAt(0) === "_" ? 1 : 0)) : this.logger;
-                    const server = new ClusterWebSocketServer2(this.name + wsConfig.path, wsConfig.path, logger, wsConfig);
-                    this.runningGlobalWSMap.set(wsConfig.path, server);
+                if (this.runningGlobalWSMap.has(wsConfig.path)) {
+                    throw new Error(`ws on path ${wsConfig.path} already setup!`);
                 }
+                this.logger?.debug("setting up websocket on [%s]", wsConfig.path);
+                const identifier = wsConfig.path.replaceAll("/", "_").toUpperCase();
+                const logger = this.loggerProvider && identifier.length >= 0 ? this.loggerProvider.getLogger(identifier.substring(identifier.charAt(0) === "_" ? 1 : 0)) : this.logger;
+                const server = new ClusterWebSocketServer2(this.name + wsConfig.path, wsConfig.path, logger, wsConfig);
+                this.runningGlobalWSMap.set(wsConfig.path, server);
             }
         }
     }
@@ -99,9 +93,7 @@ export class WebSocketManager {
     disconnectAllButLOGSocket() {
         try {
             for (const wsPath of this.runningGlobalWSMap.keys()) {
-                if (wsPath !== LOG_SOCKET_PATH || !this.avoidLogSocket) {
-                    this.disconnectAllFrom(wsPath);
-                }
+                this.disconnectAllFrom(wsPath);
             }
         }
         catch (e) {
@@ -124,9 +116,7 @@ export class WebSocketManager {
         try {
             const wsServer = this.getWS(req.path);
             if (wsServer) {
-                if (LOG_SOCKET_PATH === req.path) {
-                    req.editor = this.adminInterface;
-                }
+                req.editor = this.adminInterface;
                 const ret = wsServer.onUpgrade(req, socket, head);
                 delete req.editor;
                 return ret;

package/build/esm/{src/types.d.ts → types.d.ts}

@@ -75,8 +75,9 @@ export interface JWTInterface {
     decode: <PayloadType = JWTPayload>(jwt: string) => PayloadType & JWTPayload;
 }
 export interface ServerGlobal {
+    getHTML: (out: JSX.Element, runtime?: Runtime) => string;
     encodeHTML: (str: string) => string;
-    inflateMDtoHTML: (str: string) => string;
+    inflateMDtoHTML: (str: string) => Promise<string>;
     middleware: {
         buffer: typeof ReadBuffer;
         url: typeof URLEncodedParser;