@zhin.js/console 1.0.12 → 1.0.14

package/lib/index.js

@@ -1,167 +1,425 @@
-import { register, useContext, useLogger } from "@zhin.js/core";
-import mime from "mime";
-import connect from "koa-connect";
-import * as fs from "fs";
-import * as path from "path";
-import { createViteDevServer } from "./dev.js";
-import { setupWebSocket, notifyDataUpdate } from "./websocket.js";
-const logger = useLogger();
-const createSyncMsg = (key, value) => {
-    return {
-        type: "sync",
-        data: {
-            key,
-            value,
-        },
-    };
+import * as path2 from 'path';
+import path2__default from 'path';
+import * as fs2 from 'fs';
+import fs2__default from 'fs';
+import { usePlugin } from '@zhin.js/core';
+import mime from 'mime';
+import WebSocket from 'ws';
+
+var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __esm = (fn, res) => function __init() {
+  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
-const createAddMsg = (key, value) => {
-    return {
-        type: "add",
-        data: {
-            key,
-            value,
-        },
-    };
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-const createDeleteMsg = (key, value) => {
-    return {
-        type: "delete",
+
+// src/dev.ts
+var dev_exports = {};
+__export(dev_exports, {
+  createViteDevServer: () => createViteDevServer
+});
+async function createViteDevServer(options) {
+  const { root: root3, base = "/vite/", enableTailwind = true } = options;
+  try {
+    const [
+      { createServer, searchForWorkspaceRoot },
+      { default: react },
+      { default: tailwindcss }
+    ] = await Promise.all([
+      import('vite'),
+      import('@vitejs/plugin-react'),
+      import('@tailwindcss/vite')
+    ]);
+    const plugins = [react()];
+    if (enableTailwind) {
+      plugins.push(tailwindcss());
+    }
+    const clientPath = path2__default.resolve(process.cwd(), "node_modules/@zhin.js/client/client");
+    if (!fs2__default.existsSync(clientPath)) {
+      throw new Error("@zhin.js/client not found");
+    }
+    return await createServer({
+      root: root3,
+      base,
+      plugins: [react(), tailwindcss()],
+      server: {
+        middlewareMode: true,
+        allowedHosts: true,
+        fs: {
+          strict: false,
+          // 添加文件访问过滤，避免访问特殊文件
+          allow: [
+            // 允许访问的目录
+            root3,
+            searchForWorkspaceRoot(root3),
+            path2__default.resolve(process.cwd(), "node_modules"),
+            path2__default.resolve(process.cwd(), "client"),
+            path2__default.resolve(process.cwd(), "src")
+          ],
+          // 拒绝访问某些文件模式
+          deny: [
+            "**/.git/**",
+            "**/node_modules/.cache/**",
+            "**/*.socket",
+            "**/*.pipe",
+            "**/Dockerfile*",
+            "**/.env*"
+          ]
+        }
+      },
+      resolve: {
+        dedupe: [
+          "react",
+          "react-dom",
+          "clsx",
+          "tailwind-merge",
+          "@reduxjs/toolkit",
+          "react-router",
+          "react-redux",
+          "redux-persist"
+        ],
+        alias: {
+          "@zhin.js/client": path2__default.resolve(process.cwd(), "node_modules/@zhin.js/client/client"),
+          "@": path2__default.resolve(root3, "../client/src")
+        }
+      },
+      optimizeDeps: {
+        include: ["react", "react-dom"]
+      },
+      build: {
+        rollupOptions: {
+          input: root3 + "/index.html"
+        }
+      }
+    });
+  } catch (error) {
+    throw new Error(
+      `Failed to create Vite dev server. Make sure all development dependencies are installed: vite, @vitejs/plugin-react, @tailwindcss/vite. Run: pnpm install --include=optional
+Original error: ${error.message}`
+    );
+  }
+}
+var init_dev = __esm({
+  "src/dev.ts"() {
+  }
+});
+var { root, logger } = usePlugin();
+function setupWebSocket(webServer) {
+  webServer.ws.on("connection", (ws) => {
+    ws.send(
+      JSON.stringify({
+        type: "sync",
         data: {
-            key,
-            value,
-        },
+          key: "entries",
+          value: Object.values(webServer.entries)
+        }
+      })
+    );
+    ws.send(
+      JSON.stringify({
+        type: "init-data",
+        timestamp: Date.now()
+      })
+    );
+    ws.on("message", async (data) => {
+      try {
+        const message = JSON.parse(data.toString());
+        await handleWebSocketMessage(ws, message, webServer);
+      } catch (error) {
+        console.error("WebSocket \u6D88\u606F\u5904\u7406\u9519\u8BEF:", error);
+        ws.send(
+          JSON.stringify({
+            error: "Invalid message format"
+          })
+        );
+      }
+    });
+    ws.on("close", () => {
+    });
+    ws.on("error", (error) => {
+      console.error("WebSocket \u9519\u8BEF:", error);
+    });
+  });
+}
+async function handleWebSocketMessage(ws, message, webServer) {
+  const { type, requestId, pluginName } = message;
+  switch (type) {
+    case "ping":
+      ws.send(JSON.stringify({ type: "pong", requestId }));
+      break;
+    case "entries:get":
+      ws.send(
+        JSON.stringify({
+          requestId,
+          data: Object.values(webServer.entries)
+        })
+      );
+      break;
+    case "config:get":
+      try {
+        const configService2 = root.inject("config");
+        const appConfig2 = configService2.get("zhin.config.yml");
+        const config = pluginName ? appConfig2[pluginName] || {} : appConfig2;
+        ws.send(JSON.stringify({ requestId, data: config }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: `Failed to get config: ${error.message}` }));
+      }
+      break;
+    case "config:get-all":
+      try {
+        const configService2 = root.inject("config");
+        const appConfig2 = configService2.get("zhin.config.yml");
+        ws.send(JSON.stringify({ requestId, data: appConfig2 }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: `Failed to get all configs: ${error.message}` }));
+      }
+      break;
+    case "config:set":
+      try {
+        const { data } = message;
+        if (!pluginName) {
+          ws.send(JSON.stringify({ requestId, error: "Plugin name is required" }));
+          break;
+        }
+        const configService2 = root.inject("config");
+        const appConfig2 = configService2.get("zhin.config.yml");
+        appConfig2[pluginName] = data;
+        configService2.set("zhin.config.yml", appConfig2);
+        ws.send(JSON.stringify({ requestId, success: true }));
+        broadcastToAll(webServer, {
+          type: "config:updated",
+          data: { pluginName, config: data }
+        });
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: `Failed to set config: ${error.message}` }));
+      }
+      break;
+    case "schema:get":
+      try {
+        const schemaService = root.inject("schema");
+        const schema = pluginName && schemaService ? schemaService.get(pluginName) : null;
+        if (schema) {
+          ws.send(JSON.stringify({ requestId, data: schema.toJSON() }));
+        } else {
+          ws.send(JSON.stringify({ requestId, data: null }));
+        }
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: `Failed to get schema: ${error.message}` }));
+      }
+      break;
+    case "schema:get-all":
+      try {
+        const schemaService = root.inject("schema");
+        const schemas = {};
+        if (schemaService) {
+          for (const [name, schema] of schemaService.items.entries()) {
+            schemas[name] = schema.toJSON();
+          }
+        }
+        ws.send(JSON.stringify({ requestId, data: schemas }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: `Failed to get all schemas: ${error.message}` }));
+      }
+      break;
+    default:
+      ws.send(
+        JSON.stringify({
+          requestId,
+          error: `Unknown message type: ${type}`
+        })
+      );
+  }
+}
+function broadcastToAll(webServer, message) {
+  for (const ws of webServer.ws.clients || []) {
+    if (ws.readyState === WebSocket.OPEN) {
+      ws.send(JSON.stringify(message));
+    }
+  }
+}
+function notifyDataUpdate(webServer) {
+  broadcastToAll(webServer, {
+    type: "data-update",
+    timestamp: Date.now()
+  });
+}
+
+// src/index.ts
+async function loadDevDependencies() {
+  try {
+    const devModule = await Promise.resolve().then(() => (init_dev(), dev_exports));
+    const koaConnectModule = await import('koa-connect');
+    return {
+      createViteDevServer: devModule.createViteDevServer,
+      connect: koaConnectModule.default
     };
-};
-useContext("router", async (router) => {
+  } catch {
+    return null;
+  }
+}
+var { provide, root: root2, useContext, logger: logger2, inject, onDispose } = usePlugin();
+var configService = inject("config");
+var appConfig = configService?.get("zhin.config.yml") || {};
+var consoleConfig = appConfig.plugins?.console || {};
+var {
+  enabled = true
+  // 默认不延迟加载，避免 addEntry 等功能不可用
+} = consoleConfig;
+if (enabled) {
+  const createAddMsg = (key, value) => ({
+    type: "add",
+    data: { key, value }
+  });
+  const createDeleteMsg = (key, value) => ({
+    type: "delete",
+    data: { key, value }
+  });
+  useContext("router", async (router) => {
     const base = "/vite/";
+    const isDev = process.env.NODE_ENV === "development";
+    const rootDir = isDev ? path2.join(import.meta.dirname, "../client") : path2.join(import.meta.dirname, "../dist");
+    let viteStarting = false;
+    let viteStarted = false;
+    let devDeps = null;
     const webServer = {
-        entries: {},
-        addEntry(entry) {
-            const hash = Date.now().toString(16) + Math.random().toString(16).slice(2, 8);
-            const entryFile = typeof entry === "string"
-                ? entry
-                : entry[process.env.NODE_ENV ||
-                    "development"];
-            this.entries[hash] = `/vite/@fs/${entryFile}`;
+      entries: {},
+      addEntry(entry) {
+        const hash = Date.now().toString(16) + Math.random().toString(16).slice(2, 8);
+        const entryFile = typeof entry === "string" ? entry : entry[process.env.NODE_ENV || "development"];
+        this.entries[hash] = `/vite/@fs/${entryFile}`;
+        if (this.ws) {
+          for (const ws of this.ws.clients || []) {
+            ws.send(JSON.stringify(createAddMsg("entries", this.entries[hash])));
+          }
+        }
+        return () => {
+          if (this.ws) {
             for (const ws of this.ws.clients || []) {
-                ws.send(JSON.stringify(createAddMsg("entries", this.entries[hash])));
+              ws.send(JSON.stringify(createDeleteMsg("entries", this.entries[hash])));
             }
-            return () => {
-                for (const ws of this.ws.clients || []) {
-                    ws.send(JSON.stringify(createDeleteMsg("entries", this.entries[hash])));
-                }
-                delete this.entries[hash];
-            };
-        },
-        ws: router.ws("/server"),
+          }
+          delete this.entries[hash];
+        };
+      },
+      ws: router.ws("/server")
     };
-    const isDev = process.env.NODE_ENV === "development";
-    const root = isDev
-        ? path.join(import.meta.dirname, "../client")
-        : path.join(import.meta.dirname, "../dist");
-    if (isDev) {
-        webServer.vite = await await createViteDevServer({
-            root,
+    const ensureViteStarted = async () => {
+      if (viteStarted || viteStarting || !isDev) return;
+      viteStarting = true;
+      try {
+        logger2.info("\u{1F504} \u68C0\u6D4B\u5230\u63A7\u5236\u53F0\u8BBF\u95EE\uFF0C\u6B63\u5728\u542F\u52A8 Vite \u5F00\u53D1\u670D\u52A1\u5668...");
+        devDeps = await loadDevDependencies();
+        if (devDeps) {
+          webServer.vite = await devDeps.createViteDevServer({
+            root: rootDir,
             base,
-            enableTailwind: true,
-        });
-        // Vite 中间件 - 必须在其他路由之前
-        router.use((ctx, next) => {
-            if (ctx.request.originalUrl.startsWith("/api"))
-                return next();
-            return connect(webServer.vite.middlewares)(ctx, next);
-        });
-    }
-    else {
-        router.use((ctx, next) => {
-            if (ctx.request.originalUrl.startsWith("/api"))
-                return next();
-            if (!ctx.path.startsWith('/vite/@fs/'))
-                return next();
-            const filename = ctx.path.replace(`/vite/@fs/`, '');
-            if (!fs.existsSync(filename))
-                return next();
-            ctx.type = mime.getType(filename) || path.extname(filename);
-            ctx.body = fs.createReadStream(filename);
-        });
+            enableTailwind: true
+          });
+          viteStarted = true;
+          logger2.info("\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557");
+          logger2.info("\u2551   Web \u63A7\u5236\u53F0\u5DF2\u542F\u52A8 (\u6309\u9700\u52A0\u8F7D)         \u2551");
+          logger2.info("\u2560\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2563");
+          logger2.info("\u2551  \u5730\u5740: http://localhost:8086/          \u2551");
+          logger2.info("\u2551  \u6A21\u5F0F: \u5F00\u53D1\u6A21\u5F0F (Vite HMR)             \u2551");
+          logger2.info("\u2551  \u5185\u5B58: \u5DF2\u52A0\u8F7D (~23MB)                  \u2551");
+          logger2.info("\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D");
+        }
+      } catch (error) {
+        logger2.error("Vite \u542F\u52A8\u5931\u8D25:", error);
+      } finally {
+        viteStarting = false;
+      }
+    };
+    if (isDev) {
+      await ensureViteStarted();
+      router.use(async (ctx, next) => {
+        if (ctx.request.originalUrl.startsWith("/api")) return next();
+        if (webServer.vite && devDeps) {
+          return devDeps.connect(webServer.vite.middlewares)(ctx, next);
+        }
+        return next();
+      });
+    } else {
+      router.use((ctx, next) => {
+        if (ctx.request.originalUrl.startsWith("/api")) return next();
+        if (!ctx.path.startsWith("/vite/@fs/")) return next();
+        const filename = ctx.path.replace(`/vite/@fs/`, "");
+        if (!fs2.existsSync(filename)) return next();
+        ctx.type = mime.getType(filename) || path2.extname(filename);
+        ctx.body = fs2.createReadStream(filename);
+      });
+      logger2.info("\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557");
+      logger2.info("\u2551      Web \u63A7\u5236\u53F0\u5DF2\u542F\u52A8                  \u2551");
+      logger2.info("\u2560\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2563");
+      logger2.info("\u2551  \u5730\u5740: http://localhost:8086/          \u2551");
+      logger2.info("\u2551  \u6A21\u5F0F: \u751F\u4EA7\u6A21\u5F0F (\u9759\u6001\u6587\u4EF6)             \u2551");
+      logger2.info("\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D");
     }
-    // SPA 回退路由 - 处理所有未匹配的路由
     router.all("*all", async (ctx, next) => {
-        const url = ctx.request.originalUrl.replace(base, "");
-        const name = isDev ? ctx.path.slice(1) : ctx.path.slice(1);
-        const sendFile = (filename) => {
-            // 安全检查：确保是常规文件
-            try {
-                const stat = fs.statSync(filename);
-                if (!stat.isFile()) {
-                    ctx.status = 404;
-                    return;
-                }
-            }
-            catch (error) {
-                ctx.status = 404;
-                return;
-            }
-            ctx.type = path.extname(filename);
-            ctx.type = mime.getType(filename) || ctx.type;
-            return (ctx.body = fs.createReadStream(filename));
-        };
-        // 1. 检查是否是动态入口
-        if (Object.keys(webServer.entries).includes(name)) {
-            return sendFile(path.resolve(process.cwd(), webServer.entries[name]));
+      const url = ctx.request.originalUrl.replace(base, "");
+      const name = ctx.path.slice(1);
+      const sendFile = (filename2) => {
+        try {
+          const stat = fs2.statSync(filename2);
+          if (!stat.isFile()) {
+            ctx.status = 404;
+            return;
+          }
+        } catch (error) {
+          ctx.status = 404;
+          return;
         }
-        // 2. 检查是否是静态文件
-        const filename = path.resolve(root, name);
-        if (filename.startsWith(root) || filename.includes("node_modules")) {
-            try {
-                if (fs.existsSync(filename)) {
-                    const fileState = fs.statSync(filename);
-                    // 只处理常规文件，忽略目录、socket、符号链接等
-                    if (fileState.isFile() &&
-                        !fileState.isSocket() &&
-                        !fileState.isFIFO()) {
-                        return sendFile(filename);
-                    }
-                }
-            }
-            catch (error) {
-                // 忽略文件系统错误，继续处理
-                console.warn(`文件访问错误: ${filename}`, error.message);
+        ctx.type = path2.extname(filename2);
+        ctx.type = mime.getType(filename2) || ctx.type;
+        return ctx.body = fs2.createReadStream(filename2);
+      };
+      if (Object.keys(webServer.entries).includes(name)) {
+        return sendFile(path2.resolve(process.cwd(), webServer.entries[name]));
+      }
+      const filename = path2.resolve(rootDir, name);
+      if (filename.startsWith(rootDir) || filename.includes("node_modules")) {
+        try {
+          if (fs2.existsSync(filename)) {
+            const fileState = fs2.statSync(filename);
+            if (fileState.isFile() && !fileState.isSocket() && !fileState.isFIFO()) {
+              return sendFile(filename);
             }
+          }
+        } catch (error) {
+          logger2.warn(`\u6587\u4EF6\u8BBF\u95EE\u9519\u8BEF: ${filename}`, error.message);
         }
-        else {
-            // 安全检查：路径不在允许范围内
-            return (ctx.status = 403);
-        }
-        // 3. 所有其他路径（包括 SPA 路由）都返回 index.html
-        // 这样前端路由可以正确处理
-        const indexFile = path.resolve(root, "index.html");
-        if (!isDev)
-            return sendFile(indexFile);
-        const template = fs.readFileSync(indexFile, "utf8");
-        ctx.type = "html";
-        ctx.body = await webServer.vite.transformIndexHtml(url, template);
+      } else {
+        return ctx.status = 403;
+      }
+      const indexFile = path2.resolve(rootDir, "index.html");
+      if (!isDev) return sendFile(indexFile);
+      const template = fs2.readFileSync(indexFile, "utf8");
+      ctx.type = "html";
+      ctx.body = await webServer.vite?.transformIndexHtml(url, template) || template;
     });
-    // 定时通知客户端更新数据
+    webServer.ws;
     const dataUpdateInterval = setInterval(() => {
-        notifyDataUpdate(webServer);
-    }, 5000); // 每5秒通知一次更新
+      notifyDataUpdate(webServer);
+    }, 5e3);
     setupWebSocket(webServer);
-    // 插件卸载时清理定时器
-    process.on("exit", () => {
-        clearInterval(dataUpdateInterval);
+    onDispose(() => {
+      clearInterval(dataUpdateInterval);
     });
-    register({
-        name: "web",
-        description: "web服务",
-        async mounted() {
-            return webServer;
-        },
-        async dispose(server) {
-            await server.vite?.close();
-            server.ws.close();
-        },
+    provide({
+      name: "web",
+      description: "web\u670D\u52A1",
+      value: webServer,
+      dispose(server) {
+        return Promise.all([
+          server.vite?.close(),
+          new Promise((resolve2) => {
+            server.ws.close(() => resolve2());
+          })
+        ]);
+      }
     });
-});
-//# sourceMappingURL=index.js.map
+  });
+}

package/lib/websocket.d.ts

@@ -1,14 +1,19 @@
-import type { WebServer } from "./index.js";
+import { WebServer } from './index.js';
+import '@zhin.js/http';
+import 'ws';
+import 'vite';
+
 /**
  * 设置 WebSocket 连接处理
  */
-export declare function setupWebSocket(webServer: WebServer): void;
+declare function setupWebSocket(webServer: WebServer): void;
 /**
  * 广播消息给所有连接的客户端
  */
-export declare function broadcastToAll(webServer: WebServer, message: any): void;
+declare function broadcastToAll(webServer: WebServer, message: any): void;
 /**
  * 通知数据更新
  */
-export declare function notifyDataUpdate(webServer: WebServer): void;
-//# sourceMappingURL=websocket.d.ts.map
+declare function notifyDataUpdate(webServer: WebServer): void;
+
+export { broadcastToAll, notifyDataUpdate, setupWebSocket };