@blocklet/pages-kit-inner-components 0.6.7 → 0.6.9

package/lib/es/project-html.js

@@ -1,31 +1,31 @@
-import L from "@arcblock/did-auth-storage-nedb";
-import r, { getBlockletJs as B } from "@blocklet/sdk/lib/config";
+import M from "@arcblock/did-auth-storage-nedb";
+import c, { getBlockletJs as B } from "@blocklet/sdk/lib/config";
 import H from "@blocklet/sdk/lib/service/auth";
-import W from "@blocklet/sdk/lib/wallet";
-import D from "@blocklet/sdk/lib/wallet-authenticator";
-import N from "@blocklet/sdk/lib/wallet-handler";
-import U, { resolve as T } from "path";
-import { l as _, g as O } from "./chunks/site-state-BdLTu3Od.js";
-import { createHash as R } from "crypto";
-import { createSnapshotMiddleware as F } from "@arcblock/crawler-middleware";
-import { PreloadComponentScriptModule as J } from "@blocklet/pages-kit/types";
-import { isMuiColorKey as z } from "@blocklet/pages-kit/utils/common";
-import { injectPreloadComponents as G, safeJSONStringify as Y } from "@blocklet/pages-kit/utils/preload";
-import { getComponentMountPoint as Q } from "@blocklet/sdk/lib/component";
-import { Router as V } from "express";
-import { readFileSync as j } from "fs";
-import X from "lodash/get";
-import Z from "mustache";
-import { withQuery as q, joinURL as P } from "ufo";
-const ee = (o = {}) => {
+import K from "@blocklet/sdk/lib/wallet";
+import L from "@blocklet/sdk/lib/wallet-authenticator";
+import W from "@blocklet/sdk/lib/wallet-handler";
+import D, { resolve as I } from "path";
+import { l as S, g as N } from "./chunks/components-BWQM8y6L.js";
+import { createHash as U } from "crypto";
+import { createSnapshotMiddleware as O } from "@arcblock/crawler-middleware";
+import { PreloadComponentScriptModule as R } from "@blocklet/pages-kit/types";
+import { isMuiColorKey as F } from "@blocklet/pages-kit/utils/common";
+import { injectPreloadComponents as J, safeJSONStringify as z } from "@blocklet/pages-kit/utils/preload";
+import { getComponentMountPoint as G } from "@blocklet/sdk/lib/component";
+import { Router as Y } from "express";
+import { readFileSync as T } from "fs";
+import Q from "lodash/get";
+import V from "mustache";
+import { withQuery as X, joinURL as j } from "ufo";
+const Z = (o = {}) => {
   const e = {
     data: /* @__PURE__ */ new Map(),
     timers: /* @__PURE__ */ new Map(),
-    set: (t, s, i = o.ttl || 36e5) => {
+    set: (t, n, s = o.ttl || 36e5) => {
       o.max && e.data.size >= o.max && e.delete(e.data.keys().next().value), e.timers.has(t) && clearTimeout(e.timers.get(t)), e.timers.set(
         t,
-        setTimeout(() => e.delete(t), i)
-      ), e.data.set(t, s);
+        setTimeout(() => e.delete(t), s)
+      ), e.data.set(t, n);
     },
     get: (t) => e.data.get(t),
     has: (t) => e.data.has(t),
@@ -38,158 +38,172 @@ const ee = (o = {}) => {
     }
   };
   return e;
-}, E = ee({
+}, E = Z({
   max: 1,
   ttl: 1e3 * 30
   // 30 seconds
 });
-W();
-const te = new D();
-new N({
-  authenticator: te,
-  tokenStorage: new L({
-    dbPath: U.join(r.env.dataDir, "auth.db")
+K();
+const q = new L();
+new W({
+  authenticator: q,
+  tokenStorage: new M({
+    dbPath: D.join(c.env.dataDir, "auth.db")
   })
 });
-const oe = new H(), ne = async () => {
+const ee = new H(), te = async () => {
   try {
     const o = E.get("blockletInfo");
     if (o)
       return o;
-    const { blocklet: e } = await oe.getBlocklet();
+    const { blocklet: e } = await ee.getBlocklet();
     return E.set("blockletInfo", e), e;
   } catch {
     return null;
   }
-}, re = async () => await import("cheerio"), C = {};
-function ce(o, e) {
+}, oe = async () => await import("cheerio"), _ = {};
+function ne(o, e) {
   const t = JSON.stringify([o, e]);
-  return R("md5").update(t).digest("hex");
+  return U("md5").update(t).digest("hex");
 }
-async function se(o, e) {
+async function re(o, e) {
   {
-    const s = (await re()).load(o);
-    return e.forEach((i) => {
-      s(i.selector.cheerio).replaceWith(i.value);
-    }), s.html();
+    let t = await oe();
+    try {
+      const n = t.load(o);
+      return e.forEach((s) => {
+        n(s.selector.cheerio).replaceWith(s.value);
+      }), n.html();
+    } catch {
+    } finally {
+      t = null;
+    }
   }
+  return ce(o, e);
 }
-async function ie(o, e) {
+function ce(o, e) {
+  let t = o;
+  return e.forEach((n) => {
+    const s = typeof n.selector.pattern == "string" ? new RegExp(n.selector.pattern, "gis") : n.selector.pattern;
+    t = t.replace(s, n.value);
+  }), t;
+}
+async function se(o, e) {
   if (!e || e.length === 0)
     return o;
-  const t = ce(o, e);
-  return C[t] ??= se(o, e).finally(() => {
+  const t = ne(o, e);
+  return _[t] ??= re(o, e).finally(() => {
     setTimeout(() => {
-      delete C[t];
-    }, 2 * 1e3);
-  }), C[t];
+      delete _[t];
+    }, 10 * 1e3);
+  }), _[t];
 }
 function ae(o) {
   return o.match(/<body[^>]*>(.*?)<\/body>/s)?.[1] || "";
 }
-const le = ["/assets/"];
-function $e({
+const ie = ["/assets/"];
+function Ae({
   app: o,
   viteDevServer: e,
   // projectId,
   state: t
 }) {
-  let s;
+  let n;
   if (e) {
-    const n = j(T(process.cwd(), "./index.html"), "utf-8");
-    o.use(async (u, b, v) => {
-      const S = u.originalUrl;
-      s = await e.transformIndexHtml(S, n), v();
+    const r = T(I(process.cwd(), "./index.html"), "utf-8");
+    o.use(async (f, b, v) => {
+      const m = f.originalUrl;
+      n = await e.transformIndexHtml(m, r), v();
     });
   } else
-    s = j(T(process.env.BLOCKLET_APP_DIR, "dist/index.html"), "utf-8");
-  const i = V();
-  i.use((n, u, b) => {
-    if (n.headers["x-unique-record"] === "dial_http") {
-      _.info("[html] dial http request, return 200 status code"), u.status(200).send("ok");
+    n = T(I(process.env.BLOCKLET_APP_DIR, "dist/index.html"), "utf-8");
+  const s = Y();
+  s.use((r, f, b) => {
+    if (r.headers["x-unique-record"] === "dial_http") {
+      S.info("[html] dial http request, return 200 status code"), f.status(200).send("ok");
       return;
     }
     b();
-  }), r.env.preferences.snapkitEnabled && r.env.preferences.snapkitEndpoint && r.env.SNAP_KIT_ACCESS_KEY && i.use(
-    F({
-      endpoint: r.env.preferences.snapkitEndpoint,
-      accessKey: r.env.SNAP_KIT_ACCESS_KEY,
-      cacheMax: r.env.preferences.snapkitCacheSize || 100
+  }), c.env.preferences.snapkitEnabled && c.env.preferences.snapkitEndpoint && c.env.SNAP_KIT_ACCESS_KEY && s.use(
+    O({
+      endpoint: c.env.preferences.snapkitEndpoint,
+      accessKey: c.env.SNAP_KIT_ACCESS_KEY,
+      cacheMax: c.env.preferences.snapkitCacheSize || 100
     })
-  ), i.get("/:path(*)?", async (n, u, b) => {
-    if (le.some((c) => n.path?.startsWith(c))) {
+  ), s.get("/:path(*)?", async (r, f, b) => {
+    if (ie.some((a) => r.path?.startsWith(a))) {
       b();
       return;
     }
-    const v = performance.now(), S = () => Math.round(performance.now() - v), A = "production";
-    let f, k, g = s;
-    if (n.path.startsWith("/pages")) {
-      const c = n.params.lang, y = n.cookies.nf_lang, w = /* @__PURE__ */ new Set([...r.env.languages.map((h) => h.code)]);
-      let d = (c && w.has(c) ? c : void 0) || (w.has(y) ? y : void 0) || [...w][0];
-      if ((!d || !t.supportedLocales?.find((h) => h.locale === d)) && (d = t.supportedLocales?.[0]?.locale || ""), d) {
+    const v = "production";
+    let m, k, g = n;
+    if (r.path.startsWith("/pages")) {
+      const a = r.params.lang, y = r.cookies.nf_lang, w = /* @__PURE__ */ new Set([...c.env.languages.map((h) => h.code)]);
+      let u = (a && w.has(a) ? a : void 0) || (w.has(y) ? y : void 0) || [...w][0];
+      if ((!u || !t.supportedLocales?.find((h) => h.locale === u)) && (u = t.supportedLocales?.[0]?.locale || ""), u) {
         const h = [];
-        Object.values(t.pages).forEach((a) => {
-          const K = Object.values(a?.sections ?? {}).filter(
-            (m) => m.component === "custom-component" && m.config?.componentId
-          ).map((m) => ({
-            id: m.id,
-            componentId: m.config.componentId,
-            useCache: m.config.useCache,
-            cacheDuration: m.config.cacheDuration,
-            properties: a?.dataSource?.[m.id]?.[d]
+        Object.values(t.pages).forEach((i) => {
+          const x = Object.values(i?.sections ?? {}).filter(
+            (p) => p.component === "custom-component" && p.config?.componentId
+          ).map((p) => ({
+            id: p.id,
+            componentId: p.config.componentId,
+            useCache: p.config.useCache,
+            cacheDuration: p.config.cacheDuration,
+            properties: i?.dataSource?.[p.id]?.[u]
             //  ?? i.locales?.[respectLocale!]?.properties,
           }));
-          h.push(...K);
+          h.push(...x);
         });
-        const M = new Promise((a) => {
+        const $ = new Promise((i) => {
           setTimeout(() => {
-            a({});
+            i({});
           }, 30 * 1e3);
         });
         try {
           await Promise.race([
-            M,
-            O({
-              mode: A,
-              req: n,
+            $,
+            N({
+              mode: v,
+              req: r,
               state: t,
-              locale: d,
+              locale: u,
               instances: h,
-              module: J.UMD_FN
-            }).then((a) => {
-              a && (k = G(a));
+              module: R.UMD_FN
+            }).then((i) => {
+              i && (k = J(i));
             })
           ]);
-        } catch (a) {
-          _.warn("getPreloadComponents timeout in promise race, skip inject html elements", a);
+        } catch (i) {
+          S.warn("getPreloadComponents timeout in promise race, skip inject html elements", i);
         }
       }
     }
     try {
-      const c = f?.title || r.env.appName, y = f?.description || r.env.appDescription, w = q(P(r.env.appUrl, "/.well-known/service/blocklet/og.png"), {
-        title: c,
+      const a = m?.title || c.env.appName, y = m?.description || c.env.appDescription, w = X(j(c.env.appUrl, "/.well-known/service/blocklet/og.png"), {
+        title: a,
         description: y
       });
-      g = Z.render(s, {
-        ogTitle: c,
+      g = V.render(n, {
+        ogTitle: a,
         ogDescription: y,
-        ogImage: me(f?.image) || w,
+        ogImage: le(m?.image) || w,
         pagesPublishedAt: t?.config.publishedAt || (/* @__PURE__ */ new Date()).getTime()
       });
     } catch {
     }
-    const p = t?.config.fontFamily, $ = n.query.mode === "draft" || n.url.includes("preview") || n.path?.startsWith("/admin");
-    let l = f?.backgroundColor;
-    if (l && z(l)) {
-      const c = await ne();
-      l = X(
-        c,
+    const d = t?.config.fontFamily, P = r.query.mode === "draft" || r.url.includes("preview") || r.path?.startsWith("/admin");
+    let l = m?.backgroundColor;
+    if (l && F(l)) {
+      const a = await te();
+      l = Q(
+        a,
         // 目前 dark 和 light 还是前端行为，后端通过 从 light 中获取
         `settings.theme.light.palette.${l}`,
         l
       );
     }
-    const I = B(), x = [
+    const C = B(), A = [
       {
         selector: {
           cheerio: "#injected-head-elements",
@@ -197,14 +211,12 @@ function $e({
         },
         value: `
         ${l ? `<meta name="theme-color" content="${l}" /><style>html,body,#app {background-color: ${l};}</style>` : ""}
-        ${p?.title ? `<link rel="preload" as="style" href="https://fonts.googleapis.com/css?family=${p.title}&display=swap">` : ""}
-        ${p?.description && p?.description !== p?.title ? `<link rel="preload" as="style" href="https://fonts.googleapis.com/css?family=${p.description}&display=swap">` : ""}
+        ${d?.title ? `<link rel="preload" as="style" href="https://fonts.googleapis.com/css?family=${d.title}&display=swap">` : ""}
+        ${d?.description && d?.description !== d?.title ? `<link rel="preload" as="style" href="https://fonts.googleapis.com/css?family=${d.description}&display=swap">` : ""}
       
 
         <script>
-
-        window.__PAGE_STATE__ = ${Y(t || null)};
-      
+        window.__PAGE_STATE__ = ${z(t || null)};
         <\/script>
 
 
@@ -215,10 +227,9 @@ function $e({
           l.href = link.href;
           document.head.appendChild(l);
         });
-        
         <\/script>
 
-        ${$ ? `<script src="https://cdn.tailwindcss.com"><\/script>
+        ${P ? `<script src="https://cdn.tailwindcss.com"><\/script>
 <script>
   window.tailwind.config = {
     darkMode: "class",
@@ -227,12 +238,12 @@ function $e({
         `
       },
       // blocklet.js script
-      I && {
+      C && {
         selector: {
           cheerio: 'script[src="__blocklet__.js"]',
           pattern: /<script[^>]*src=["']__blocklet__\.js["'][^>]*><\/script>/gis
         },
-        value: `<script>${I}<\/script>`
+        value: `<script>${C}<\/script>`
       },
       // injected-html-elements
       k?.html && {
@@ -243,21 +254,21 @@ function $e({
         value: k.html
       },
       // cachedHtml body content
-      n.cachedHtml && {
+      r.cachedHtml && {
         selector: {
           cheerio: "body",
           pattern: /(<body[^>]*>).*?(<\/body>)/gis
         },
-        value: `<body>${ae(n.cachedHtml)}</body>`
+        value: `<body>${ae(r.cachedHtml)}</body>`
       }
     ].filter(Boolean);
-    g = await ie(g, x), u.send(g), _.info(`[html] render: ${n.path}, ${S()}ms`), g = null, f = null, k = null;
-  }), o.use(i);
+    g = await se(g, A), f.send(g), S.info(`[html] render: ${r.path}`), g = null, m = null, k = null;
+  }), o.use(s);
 }
-function me(o) {
-  const e = Q("image-bin");
-  return e && o && !/^(https?:\/\/|\/)/.test(o) ? r.env.appUrl + P(e, "uploads", o) : o;
+function le(o) {
+  const e = G("image-bin");
+  return e && o && !/^(https?:\/\/|\/)/.test(o) ? c.env.appUrl + j(e, "uploads", o) : o;
 }
 export {
-  $e as default
+  Ae as default
 };

package/lib/es/resources.js

@@ -1,15 +1,14 @@
-import { P as w, i as A, a as M, l as b, C as J, R as X, S as x, t as W, b as G } from "./chunks/site-state-BdLTu3Od.js";
-import { AsyncLocalStorage as K } from "async_hooks";
-import { Router as Y } from "express";
+import { i as A, a as M, l as b } from "./chunks/components-BWQM8y6L.js";
+import { P as w, C as J, R as X, S as x, t as W, g as G } from "./chunks/site-state-BMW2lUR1.js";
+import { Router as K } from "express";
 import a from "fs";
 import m from "joi";
 import C from "lodash/groupBy";
-import $ from "lodash/sortBy";
-import O, { join as z } from "path";
+import Y from "lodash/sortBy";
+import O, { join as $ } from "path";
 import _ from "@blocklet/sdk/lib/middlewares/auth";
-import { getResourceExportDir as H } from "@blocklet/sdk/lib/component";
-new K();
-const Q = async (e, t, o) => {
+import { getResourceExportDir as z } from "@blocklet/sdk/lib/component";
+const H = async (e, t, o) => {
   try {
     const { projectId: s } = e.params;
     if (!s)
@@ -45,22 +44,22 @@ async function U(e, t) {
     s.isDirectory() ? await U(n, r) : await N(n, r);
   }
 }
-async function V(e, t) {
+async function Q(e, t) {
   (await a.promises.stat(e)).isDirectory() ? await U(e, t) : await N(e, t);
 }
-const E = (e, t, o) => A() ? _()(e, t, o) : _({ roles: ["owner", "admin", "pagesEditor"] })(e, t, o), Z = (e, t) => {
-  const o = H({ projectId: e, releaseId: t });
-  return z(o, J, X);
-}, S = Y(), B = "@page", T = "@component", l = ":", P = "ALL", L = "@project", D = ({ pageId: e, projectId: t }) => [B, t, e].join(l), q = (e) => {
+const E = (e, t, o) => A() ? _()(e, t, o) : _({ roles: ["owner", "admin", "pagesEditor"] })(e, t, o), V = (e, t) => {
+  const o = z({ projectId: e, releaseId: t });
+  return $(o, J, X);
+}, S = K(), B = "@page", T = "@component", l = ":", P = "ALL", F = "@project", D = ({ pageId: e, projectId: t }) => [B, t, e].join(l), Z = (e) => {
   const [t, o, s] = e.split(l);
   if (t === B) return { pageId: s, projectId: o };
-}, k = ({ componentId: e, projectId: t }) => [T, t, e].join(l), ee = (e) => {
+}, k = ({ componentId: e, projectId: t }) => [T, t, e].join(l), q = (e) => {
   const [t, o, s] = e.split(l);
   if (t === T) return { componentId: s, projectId: o };
-}, te = (e) => [L, e].join(l), oe = (e) => {
+}, ee = (e) => [F, e].join(l), te = (e) => {
   const [t, o] = e.split(l);
-  if (t === L) return o;
-}, re = (e) => {
+  if (t === F) return o;
+}, oe = (e) => {
   try {
     return JSON.parse(e);
   } catch {
@@ -72,12 +71,12 @@ async function v(e) {
     const c = t.pages[r];
     if (c)
       return { id: D({ pageId: r, projectId: e }), name: c.slug };
-  }).filter(Boolean), n = $(Object.values(t.components), (r) => r.index).map(({ data: r }) => ({
+  }).filter(Boolean), n = Y(Object.values(t.components), (r) => r.index).map(({ data: r }) => ({
     id: k({ componentId: r.id, projectId: e }),
     name: r.name || r.id
   }));
   return {
-    id: te(e),
+    id: ee(e),
     name: o?.name || "Unnamed Project",
     children: [
       { id: D({ pageId: P, projectId: e }), name: "Pages", children: s },
@@ -90,9 +89,9 @@ async function v(e) {
   };
 }
 S.get("/resources", E, async (e, t) => {
-  const { projectId: o } = re(e.query.resourcesParams);
+  const { projectId: o } = oe(e.query.resourcesParams);
   if (o) {
-    e.params = { ...e.params, projectId: o }, await Q(e, t, () => {
+    e.params = { ...e.params, projectId: o }, await H(e, t, () => {
     });
     const r = await v(o);
     t.json({ resources: [r] });
@@ -106,34 +105,34 @@ S.get("/resources", E, async (e, t) => {
   }), n = await Promise.all(s.map((r) => v(r.id)));
   t.json({ resources: n });
 });
-const se = m.object({
+const re = m.object({
   projectId: m.string().required().min(1),
   releaseId: m.string().allow(""),
   resources: m.array().items(m.string()).required(),
   locale: m.string().allow("")
 });
 S.post("/resources", E, async (e, t) => {
-  const { resources: o, projectId: s, releaseId: n } = await se.validateAsync(e.body), r = "production", c = [], j = [];
+  const { resources: o, projectId: s, releaseId: n } = await re.validateAsync(e.body), r = "production", c = [], j = [];
   for (const i of o) {
-    if (oe(i))
+    if (te(i))
       continue;
-    const { pageId: p, projectId: g } = q(i) || {};
+    const { pageId: p, projectId: g } = Z(i) || {};
     if (p)
       p === P || p && g && c.push({
         pageId: p,
         projectId: g
       });
     else {
-      const { componentId: f, projectId: d } = ee(i) || {};
+      const { componentId: f, projectId: d } = q(i) || {};
       f === P || f && d && j.push({
         componentId: f,
         projectId: d
       });
     }
   }
-  const I = C(c, "projectId"), h = C(j, "projectId"), F = /* @__PURE__ */ new Set([...Object.keys(I), ...Object.keys(h)]), y = Z(s, n);
+  const I = C(c, "projectId"), h = C(j, "projectId"), L = /* @__PURE__ */ new Set([...Object.keys(I), ...Object.keys(h)]), y = V(s, n);
   a.rmSync(y, { recursive: !0, force: !0 }), a.mkdirSync(y, { recursive: !0 });
-  for (const i of F) {
+  for (const i of L) {
     const p = await x.getStateByProjectId(i, r), g = I[i], f = h[i], d = g?.map((u) => u.pageId), R = f?.map((u) => u.componentId);
     if (d?.length || R?.length) {
       const u = await W(p, {
@@ -141,7 +140,7 @@ S.post("/resources", E, async (e, t) => {
         pageIds: d,
         componentIds: R
       });
-      await V(u, y), a.rmSync(u, { recursive: !0, force: !0 });
+      await Q(u, y), a.rmSync(u, { recursive: !0, force: !0 });
     }
     b.info(`Exported resources for project ${i}`, {
       pageIds: d,