@blocklet/pages-kit-inner-components 0.6.65 → 0.6.67

package/lib/cjs/project-html.js

@@ -1,4 +1,4 @@
-"use strict";const W=require("@arcblock/did-connect-storage-nedb"),E=require("@blocklet/sdk/lib/config"),B=require("@blocklet/sdk/lib/service/auth"),D=require("@blocklet/sdk/lib/wallet"),U=require("@blocklet/sdk/lib/wallet-authenticator"),H=require("@blocklet/sdk/lib/wallet-handler"),C=require("path"),S=require("./chunks/components-DLLpFRy5.js"),I=require("./chunks/html-JOhPskS4.js"),K=require("@arcblock/crawler-middleware"),N=require("@blocklet/pages-kit/types"),R=require("@blocklet/pages-kit/utils/common"),T=require("@blocklet/pages-kit/utils/preload"),F=require("@blocklet/sdk/lib/component"),O=require("express"),P=require("fs"),J=require("lodash/get"),z=require("mustache"),A=require("ufo"),l=n=>n&&n.__esModule?n:{default:n},G=l(W),s=l(E),Y=l(B),Q=l(D),V=l(U),X=l(H),Z=l(C),ee=l(J),te=l(z),ne=(n={})=>{const e={data:new Map,timers:new Map,set:(t,u,p=n.ttl||36e5)=>{n.max&&e.data.size>=n.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),p)),e.data.set(t,u)},get:t=>e.data.get(t),has:t=>e.data.has(t),delete:t=>(e.timers.has(t)&&clearTimeout(e.timers.get(t)),e.timers.delete(t),e.data.delete(t)),clear:()=>{e.data.clear();for(const t of e.timers.values())clearTimeout(t);e.timers.clear()}};return e},q=ne({max:1,ttl:1e3*30});Q.default();const oe=new V.default;new X.default({authenticator:oe,tokenStorage:new G.default({dbPath:Z.default.join(s.default.env.dataDir,"auth.db")})});const se=new Y.default,ae=async()=>{try{const n=q.get("blockletInfo");if(n)return n;const{blocklet:e}=await se.getBlocklet();return q.set("blockletInfo",e),e}catch{return null}},ce=["/assets/"];function le({app:n,viteDevServer:e,state:t}){let u;if(e){const o=P.readFileSync(C.resolve(process.cwd(),"./index.html"),"utf-8");n.use(async(g,k,b)=>{const d=g.originalUrl;u=await e.transformIndexHtml(d,o),b()})}else u=P.readFileSync(C.resolve(process.env.BLOCKLET_APP_DIR,"dist/index.html"),"utf-8");const p=O.Router();p.use((o,g,k)=>{if(o.headers["x-unique-record"]==="dial_http"){S.logger.info("[html] dial http request, return 200 status code"),g.status(200).send("ok");return}k()}),s.default.env.preferences.snapkitEnabled&&s.default.env.preferences.snapkitEndpoint&&s.default.env.SNAP_KIT_ACCESS_KEY&&p.use(K.createSnapshotMiddleware({endpoint:s.default.env.preferences.snapkitEndpoint,accessKey:s.default.env.SNAP_KIT_ACCESS_KEY,cacheMax:s.default.env.preferences.snapkitCacheSize||100})),p.get("/:path(*)?",async(o,g,k)=>{if(ce.some(a=>o.path?.startsWith(a))){k();return}const b="production";let d,v,_=u;if(o.path.startsWith("/pages")){const a=o.params.lang,y=o.cookies.nf_lang,w=new Set([...s.default.env.languages.map(h=>h.code)]);let f=(a&&w.has(a)?a:void 0)||(w.has(y)?y:void 0)||[...w][0];if((!f||!t.supportedLocales?.find(h=>h.locale===f))&&(f=t.supportedLocales?.[0]?.locale||""),f){const h=[];Object.values(t.pages).forEach(c=>{const L=Object.values(c?.sections??{}).filter(i=>i.component==="custom-component"&&i.config?.componentId).map(i=>({id:i.id,componentId:i.config.componentId,useCache:i.config.useCache,cacheDuration:i.config.cacheDuration,properties:c?.dataSource?.[i.id]?.[f]}));h.push(...L)});const x=new Promise(c=>{setTimeout(()=>{c({})},30*1e3)});try{await Promise.race([x,S.getPreloadComponents({mode:b,req:o,state:t,locale:f,instances:h,module:N.PreloadComponentScriptModule.UMD_FN}).then(c=>{c&&(v=T.injectPreloadComponents(c))})])}catch(c){S.logger.warn("getPreloadComponents timeout in promise race, skip inject html elements",c)}}}try{const a=d?.title||s.default.env.appName,y=d?.description||s.default.env.appDescription,w=A.withQuery(A.joinURL(s.default.env.appUrl,"/.well-known/service/blocklet/og.png"),{title:a,description:y});_=te.default.render(u,{ogTitle:a,ogDescription:y,ogImage:re(d?.image)||w,pagesPublishedAt:t?.config.publishedAt||new Date().getTime()})}catch{}const m=t?.config.fontFamily,M=o.query.mode==="draft"||o.url.includes("preview")||o.path?.startsWith("/admin");let r=d?.backgroundColor;if(r&&R.isMuiColorKey(r)){const a=await ae();r=ee.default(a,`settings.theme.light.palette.${r}`,r)}const j=E.getBlockletJs(),$=[{selector:{cheerio:"#injected-head-elements",pattern:/<script[^>]*id=["']injected-head-elements["'][^>]*><\/script>/gis},value:`
+"use strict";const W=require("@arcblock/did-connect-storage-nedb"),E=require("@blocklet/sdk/lib/config"),B=require("@blocklet/sdk/lib/wallet"),D=require("@blocklet/sdk/lib/wallet-authenticator"),U=require("@blocklet/sdk/lib/wallet-handler"),H=require("@blocklet/sdk/service/auth"),C=require("path"),S=require("./chunks/components-DLLpFRy5.js"),I=require("./chunks/html-JOhPskS4.js"),K=require("@arcblock/crawler-middleware"),N=require("@blocklet/pages-kit/types"),R=require("@blocklet/pages-kit/utils/common"),T=require("@blocklet/pages-kit/utils/preload"),F=require("@blocklet/sdk/lib/component"),O=require("express"),P=require("fs"),J=require("lodash/get"),z=require("mustache"),A=require("ufo"),l=n=>n&&n.__esModule?n:{default:n},G=l(W),s=l(E),Y=l(B),Q=l(D),V=l(U),X=l(H),Z=l(C),ee=l(J),te=l(z),ne=(n={})=>{const e={data:new Map,timers:new Map,set:(t,u,p=n.ttl||36e5)=>{n.max&&e.data.size>=n.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),p)),e.data.set(t,u)},get:t=>e.data.get(t),has:t=>e.data.has(t),delete:t=>(e.timers.has(t)&&clearTimeout(e.timers.get(t)),e.timers.delete(t),e.data.delete(t)),clear:()=>{e.data.clear();for(const t of e.timers.values())clearTimeout(t);e.timers.clear()}};return e},q=ne({max:1,ttl:1e3*30});Y.default();const oe=new Q.default;new V.default({authenticator:oe,tokenStorage:new G.default({dbPath:Z.default.join(s.default.env.dataDir,"auth.db")})});const se=new X.default,ae=async()=>{try{const n=q.get("blockletInfo");if(n)return n;const{blocklet:e}=await se.getBlocklet();return q.set("blockletInfo",e),e}catch{return null}},ce=["/assets/"];function le({app:n,viteDevServer:e,state:t}){let u;if(e){const o=P.readFileSync(C.resolve(process.cwd(),"./index.html"),"utf-8");n.use(async(g,k,b)=>{const d=g.originalUrl;u=await e.transformIndexHtml(d,o),b()})}else u=P.readFileSync(C.resolve(process.env.BLOCKLET_APP_DIR,"dist/index.html"),"utf-8");const p=O.Router();p.use((o,g,k)=>{if(o.headers["x-unique-record"]==="dial_http"){S.logger.info("[html] dial http request, return 200 status code"),g.status(200).send("ok");return}k()}),s.default.env.preferences.snapkitEnabled&&s.default.env.preferences.snapkitEndpoint&&s.default.env.SNAP_KIT_ACCESS_KEY&&p.use(K.createSnapshotMiddleware({endpoint:s.default.env.preferences.snapkitEndpoint,accessKey:s.default.env.SNAP_KIT_ACCESS_KEY,cacheMax:s.default.env.preferences.snapkitCacheSize||100})),p.get("/:path(*)?",async(o,g,k)=>{if(ce.some(a=>o.path?.startsWith(a))){k();return}const b="production";let d,v,_=u;if(o.path.startsWith("/pages")){const a=o.params.lang,y=o.cookies.nf_lang,w=new Set([...s.default.env.languages.map(h=>h.code)]);let f=(a&&w.has(a)?a:void 0)||(w.has(y)?y:void 0)||[...w][0];if((!f||!t.supportedLocales?.find(h=>h.locale===f))&&(f=t.supportedLocales?.[0]?.locale||""),f){const h=[];Object.values(t.pages).forEach(c=>{const L=Object.values(c?.sections??{}).filter(i=>i.component==="custom-component"&&i.config?.componentId).map(i=>({id:i.id,componentId:i.config.componentId,useCache:i.config.useCache,cacheDuration:i.config.cacheDuration,properties:c?.dataSource?.[i.id]?.[f]}));h.push(...L)});const x=new Promise(c=>{setTimeout(()=>{c({})},30*1e3)});try{await Promise.race([x,S.getPreloadComponents({mode:b,req:o,state:t,locale:f,instances:h,module:N.PreloadComponentScriptModule.UMD_FN}).then(c=>{c&&(v=T.injectPreloadComponents(c))})])}catch(c){S.logger.warn("getPreloadComponents timeout in promise race, skip inject html elements",c)}}}try{const a=d?.title||s.default.env.appName,y=d?.description||s.default.env.appDescription,w=A.withQuery(A.joinURL(s.default.env.appUrl,"/.well-known/service/blocklet/og.png"),{title:a,description:y});_=te.default.render(u,{ogTitle:a,ogDescription:y,ogImage:re(d?.image)||w,pagesPublishedAt:t?.config.publishedAt||new Date().getTime()})}catch{}const m=t?.config.fontFamily,M=o.query.mode==="draft"||o.url.includes("preview")||o.path?.startsWith("/admin");let r=d?.backgroundColor;if(r&&R.isMuiColorKey(r)){const a=await ae();r=ee.default(a,`settings.theme.light.palette.${r}`,r)}const j=E.getBlockletJs(),$=[{selector:{cheerio:"#injected-head-elements",pattern:/<script[^>]*id=["']injected-head-elements["'][^>]*><\/script>/gis},value:`
         ${r?`<meta name="theme-color" content="${r}" /><style>html,body,#app {background-color: ${r};}</style>`:""}
         ${m?.title?`<link rel="preload" as="style" href="https://fonts.googleapis.com/css?family=${m.title}&display=swap">`:""}
         ${m?.description&&m?.description!==m?.title?`<link rel="preload" as="style" href="https://fonts.googleapis.com/css?family=${m.description}&display=swap">`:""}

package/lib/es/project-html.js

@@ -1,9 +1,9 @@
 import x from "@arcblock/did-connect-storage-nedb";
 import i, { getBlockletJs as L } from "@blocklet/sdk/lib/config";
-import M from "@blocklet/sdk/lib/service/auth";
-import B from "@blocklet/sdk/lib/wallet";
-import D from "@blocklet/sdk/lib/wallet-authenticator";
-import K from "@blocklet/sdk/lib/wallet-handler";
+import M from "@blocklet/sdk/lib/wallet";
+import B from "@blocklet/sdk/lib/wallet-authenticator";
+import D from "@blocklet/sdk/lib/wallet-handler";
+import K from "@blocklet/sdk/service/auth";
 import U, { resolve as C } from "path";
 import { l as v, g as W } from "./chunks/components-DLwSTd_N.js";
 import { e as H, i as N } from "./chunks/html-DfzaaIYa.js";
@@ -43,15 +43,15 @@ const Z = (o = {}) => {
   ttl: 1e3 * 30
   // 30 seconds
 });
-B();
-const q = new D();
-new K({
+M();
+const q = new B();
+new D({
   authenticator: q,
   tokenStorage: new x({
     dbPath: U.join(i.env.dataDir, "auth.db")
   })
 });
-const ee = new M(), te = async () => {
+const ee = new K(), te = async () => {
   try {
     const o = T.get("blockletInfo");
     if (o)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/pages-kit-inner-components",
-  "version": "0.6.65",
+  "version": "0.6.67",
   "description": "Pages Kit inner components library",
   "publishConfig": {
     "access": "public"
@@ -69,23 +69,23 @@
     "url": "git+https://github.com/blocklet/pages-kit.git"
   },
   "dependencies": {
-    "@arcblock/did-connect-react": "^3.1.32",
+    "@arcblock/did-connect-react": "^3.1.34",
     "@arcblock/did-connect-storage-nedb": "^1.8.0",
-    "@arcblock/react-hooks": "^3.1.32",
-    "@arcblock/ux": "^3.1.32",
-    "@blocklet/aigne-hub": "^0.3.26",
-    "@blocklet/aigne-sdk": "^0.5.14",
-    "@blocklet/code-editor": "^0.5.14",
+    "@arcblock/react-hooks": "^3.1.34",
+    "@arcblock/ux": "^3.1.34",
+    "@blocklet/aigne-hub": "^0.3.29",
+    "@blocklet/aigne-sdk": "^0.5.16",
+    "@blocklet/code-editor": "^0.5.16",
     "@blocklet/embed": "^0.2.5",
-    "@blocklet/js-sdk": "^1.16.48",
+    "@blocklet/js-sdk": "^1.16.51",
     "@blocklet/logger": "1.16.48",
-    "@blocklet/quickjs": "^0.5.14",
-    "@blocklet/sdk": "^1.16.48",
-    "@blocklet/studio-ui": "^0.5.14",
-    "@blocklet/tracker": "^1.16.48",
-    "@blocklet/ui-react": "^3.1.32",
-    "@blocklet/uploader": "^0.2.7",
-    "@blocklet/uploader-server": "^0.2.7",
+    "@blocklet/quickjs": "^0.5.16",
+    "@blocklet/sdk": "^1.16.51",
+    "@blocklet/studio-ui": "^0.5.16",
+    "@blocklet/tracker": "^1.16.51",
+    "@blocklet/ui-react": "^3.1.34",
+    "@blocklet/uploader": "^0.2.9",
+    "@blocklet/uploader-server": "^0.2.8",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
@@ -107,9 +107,9 @@
     "@mui/styles": "^5.16.14",
     "@mui/utils": "^7.1.1",
     "@mui/x-date-pickers": "^8.6.0",
-    "@ocap/client": "^1.23.1",
-    "@ocap/mcrypto": "^1.23.1",
-    "@ocap/wallet": "^1.23.1",
+    "@ocap/client": "^1.24.8",
+    "@ocap/mcrypto": "^1.24.8",
+    "@ocap/wallet": "^1.24.8",
     "@reactivedata/reactive": "^0.2.2",
     "@syncedstore/core": "^0.6.0",
     "@syncedstore/react": "^0.6.0",
@@ -201,8 +201,8 @@
     "yaml": "^2.5.0",
     "yjs": "^13.6.18",
     "zustand": "^4.5.5",
-    "@blocklet/pages-kit": "^0.6.65",
-    "@blocklet/pages-kit-block-studio": "^0.6.65"
+    "@blocklet/pages-kit-block-studio": "^0.6.67",
+    "@blocklet/pages-kit": "^0.6.67"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^5.2.1",