vome-core 0.0.87 → 0.0.89

package/dist/client/vite-plugin-eps.js

@@ -144,9 +144,13 @@ async function fetchEps(apiUrl) {
       return null;
     }
     const data = json.data;
-    const modules = "modules" in data && data.modules && typeof data.modules === "object" ? data.modules : data;
-    if (modules && Object.keys(modules).length)
-      return modules;
+    const rawModules = !Array.isArray(data) && "modules" in data && data.modules && typeof data.modules === "object" && !Array.isArray(data.modules) ? data.modules : !Array.isArray(data) ? data : null;
+    const modules = rawModules;
+    if (!modules || !Object.keys(modules).length)
+      return null;
+    const dict = !Array.isArray(data) && "dict" in data && data.dict && typeof data.dict === "object" && !Array.isArray(data.dict) ? data.dict : {};
+    const eps = !Array.isArray(data) && "eps" in data && typeof data.eps === "boolean" ? data.eps : true;
+    return { eps, modules, dict };
   } catch {}
   return null;
 }
@@ -160,10 +164,30 @@ export function createEpsVitePlugin(options) {
   const dtsSide = options.dtsSide ?? (sideMode === "both" ? "admin" : sideMode);
   const apiBase = raw.replace(/\/$/, "");
   let root = "";
+  let outDir = "";
   let bootOk = false;
   let bootTried = false;
   let timer = null;
   let running = null;
+  function readBundleFromJson(rawJson) {
+    if (!rawJson || typeof rawJson !== "object")
+      return null;
+    const obj = rawJson;
+    if (obj.admin || obj.app) {
+      return {
+        eps: typeof obj.eps === "boolean" ? obj.eps : false,
+        admin: obj.admin || {},
+        app: obj.app || {},
+        dict: obj.dict && typeof obj.dict === "object" ? obj.dict : {}
+      };
+    }
+    return {
+      eps: false,
+      admin: dtsSide === "admin" ? obj : {},
+      app: dtsSide === "app" ? obj : {},
+      dict: {}
+    };
+  }
   async function generate(reason = "start") {
     if (!root)
       return { changed: false };
@@ -174,24 +198,22 @@ export function createEpsVitePlugin(options) {
     const jsonPath = path.join(distDir, "eps.json");
     const needAdmin = sideMode === "admin" || sideMode === "both";
     const needApp = sideMode === "app" || sideMode === "both";
-    const [adminMap, appMap] = await Promise.all([
+    const [adminHit, appHit] = await Promise.all([
       needAdmin ? fetchEps(`${apiBase}/admin/base/open/eps`) : Promise.resolve(null),
       needApp ? fetchEps(`${apiBase}/app/base/open/eps`) : Promise.resolve(null)
     ]);
     let bundle = null;
-    if (adminMap || appMap) {
-      bundle = { admin: adminMap || {}, app: appMap || {} };
+    if (adminHit || appHit) {
+      const epsFlag = typeof adminHit?.eps === "boolean" ? adminHit.eps : typeof appHit?.eps === "boolean" ? appHit.eps : true;
+      bundle = {
+        eps: epsFlag,
+        admin: adminHit?.modules || {},
+        app: appHit?.modules || {},
+        dict: adminHit?.dict || appHit?.dict || {}
+      };
     } else if (reason !== "hot") {
       try {
-        const raw = JSON.parse(fs.readFileSync(jsonPath, "utf8"));
-        if (raw.admin || raw.app) {
-          bundle = { admin: raw.admin || {}, app: raw.app || {} };
-        } else {
-          bundle = {
-            admin: dtsSide === "admin" ? raw : {},
-            app: dtsSide === "app" ? raw : {}
-          };
-        }
+        bundle = readBundleFromJson(JSON.parse(fs.readFileSync(jsonPath, "utf8")));
       } catch {
         bundle = null;
       }
@@ -245,6 +267,7 @@ export function createEpsVitePlugin(options) {
     name: "vome-eps",
     configResolved(cfg) {
       root = cfg.root;
+      outDir = path.resolve(cfg.root, cfg.build.outDir || "dist");
     },
     async buildStart() {
       await generate("start");
@@ -253,7 +276,17 @@ export function createEpsVitePlugin(options) {
       if (!bootOk) {
         setTimeout(() => void generate("retry"), 3000);
       }
-      server.middlewares.use((req, _res, next) => {
+      const distDir = path.resolve(root, options.dist || "build");
+      const jsonPath = path.join(distDir, "eps.json");
+      server.middlewares.use((req, res, next) => {
+        const url = req.url?.split("?")[0] ?? "";
+        if (url === "/eps.json" || url.endsWith("/eps.json")) {
+          try {
+            res.setHeader("Content-Type", "application/json; charset=utf-8");
+            res.end(fs.readFileSync(jsonPath));
+            return;
+          } catch {}
+        }
         if (req.url === "/@vite/client") {
           scheduleHot((payload) => {
             (server.hot || server.ws).send(payload);
@@ -262,6 +295,19 @@ export function createEpsVitePlugin(options) {
         next();
       });
     },
+    closeBundle() {
+      const distDir = path.resolve(root, options.dist || "build");
+      const src = path.join(distDir, "eps.json");
+      if (!outDir || !fs.existsSync(src))
+        return;
+      try {
+        fs.mkdirSync(outDir, { recursive: true });
+        fs.copyFileSync(src, path.join(outDir, "eps.json"));
+        console.log("[vome-eps] copied eps.json →", path.join(outDir, "eps.json"));
+      } catch (e) {
+        console.warn("[vome-eps] copy eps.json to dist failed", e);
+      }
+    },
     handleHotUpdate({ file, server }) {
       const f = file.replace(/\\/g, "/");
       if (SKIP_HOT.some((x) => f.includes(x)))