@blocklet/sdk 1.16.44-beta-20250529-223630-10e16ac8 → 1.16.44-beta-20250603-231026-30a9d27f

package/lib/middlewares/fallback.js

@@ -10,6 +10,7 @@ const crypto_1 = __importDefault(require("crypto"));
 const constant_1 = require("@blocklet/constant");
 const theme_1 = require("@blocklet/theme");
 const config_1 = require("../config");
+const constants_1 = require("../util/constants");
 // Cache configurations
 const DEFAULT_CACHE_TTL = 1 * 60 * 1000; // 1 minute
 const cache = new Map();
@@ -67,49 +68,6 @@ const tryWithTimeout = (asyncFn, timeout) => {
         }
     });
 };
-const buildThemeStyles = (theme) => {
-    const { light, dark } = theme;
-    return `
-    <style id="blocklet-theme-style">
-      :root {
-        --blocklet-background-default-color: ${light.palette?.background?.default ?? '#fff'};
-        --blocklet-text-primary-color: ${light.palette?.text?.primary ?? '#000'};
-      }
-
-      [data-theme='dark'] {
-        --blocklet-background-default-color: ${dark.palette?.background?.default ?? '#000'};
-        --blocklet-text-primary-color: ${dark.palette?.text?.primary ?? '#fff'};
-      }
-
-      html, body {
-        background-color: var(--blocklet-background-default-color);
-        color: var(--blocklet-text-primary-color);
-      }
-    </style>
-  `;
-};
-const buildThemeScript = (theme) => {
-    return `
-    <script id="blocklet-theme-script">
-      (function() {
-        try {
-          const BLOCKLET_THEME_PREFER_KEY = '${theme_1.BLOCKLET_THEME_PREFER_KEY}';
-          ${theme_1.isValidThemeMode.toString()}
-          ${theme_1.getDefaultThemePrefer.toString()}
-
-          const prefer = getDefaultThemePrefer(${JSON.stringify({ theme: { prefer: theme.prefer } })});
-          if(prefer === 'dark') {
-            document.documentElement.setAttribute('data-theme', 'dark');
-          } else {
-            document.documentElement.removeAttribute('data-theme');
-          }
-        } catch (e) {
-          console.error('Theme init error:', e);
-        }
-      })();
-    </script>
-  `;
-};
 const fallback = (file, options = {}) => {
     const filePath = options.root ? (0, path_1.join)(options.root, file) : file;
     // Check file existence during initialization
@@ -149,7 +107,7 @@ const fallback = (file, options = {}) => {
             validatePageData(pageData, options.maxLength || 1000);
             pageData.title = (0, escape_1.default)(pageData.title || config_1.env.appName);
             pageData.description = (0, escape_1.default)(pageData.description || config_1.env.appDescription);
-            pageData.ogImage = pageData.ogImage || (0, ufo_1.joinURL)(config_1.env.appUrl || '/', '/.well-known/service/blocklet/og.png');
+            pageData.ogImage = pageData.ogImage || (0, ufo_1.joinURL)(config_1.env.appUrl || '/', constants_1.SERVICE_PREFIX, '/blocklet/og.png');
             let source = await fs_1.default.promises.readFile(filePath, 'utf8');
             // Optimize string replacements
             if (pageData.title) {
@@ -176,8 +134,8 @@ const fallback = (file, options = {}) => {
                     .replace('<script src="__meta__.js"></script>', `<script>${blockletJs}</script>`);
             }
             // Inject theme styles and script
-            const themeStyles = buildThemeStyles(theme);
-            const themeScript = buildThemeScript(theme);
+            const themeStyles = (0, theme_1.buildThemeStyles)(theme);
+            const themeScript = (0, theme_1.buildThemeScript)(theme);
             // 注入主题样式
             if (!source.includes('<style id="blocklet-theme">')) {
                 source = source.replace(HEAD_END_TAG, `${themeStyles}${HEAD_END_TAG}`);

package/lib/middlewares/index.d.ts

@@ -84,6 +84,7 @@ declare const _default: {
         componentCall?: boolean;
         signedToken?: boolean;
         accessKey?: boolean;
+        signedTokenKey?: string;
     }) => (req: import("express").Request & {
         user?: import("../util/login").SessionUser;
     }, res: import("express").Response, next: import("express").NextFunction) => Promise<void>;

package/lib/middlewares/session.d.ts

@@ -6,6 +6,7 @@ type SessionOptions = {
     componentCall?: boolean;
     signedToken?: boolean;
     accessKey?: boolean;
+    signedTokenKey?: string;
 };
 declare const sessionMiddleware: (options?: SessionOptions) => (req: Request & {
     user?: SessionUser;

package/lib/middlewares/session.js

@@ -3,7 +3,7 @@ const get_token_from_req_1 = require("@abtnode/util/lib/get-token-from-req");
 const login_1 = require("../util/login");
 const verify_session_1 = require("../util/verify-session");
 const sessionMiddleware = (options = {}) => {
-    const { loginToken = true, componentCall = false, signedToken = '', strictMode = false, accessKey = false } = options;
+    const { loginToken = true, componentCall = false, signedToken = '', strictMode = false, accessKey = false, signedTokenKey = '__jwt', } = options;
     return async (req, res, next) => {
         let result = null;
         try {
@@ -31,7 +31,7 @@ const sessionMiddleware = (options = {}) => {
             }
             // authenticate by signed tmp token: which expires in 5 minutes
             if (!result && signedToken) {
-                const token = req.query.__jwt || '';
+                const token = req.query[signedTokenKey] || '';
                 result = await (0, verify_session_1.verifySignedToken)({ token, strictMode });
             }
         }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.44-beta-20250529-223630-10e16ac8",
+  "version": "1.16.44-beta-20250603-231026-30a9d27f",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,24 +27,24 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.44-beta-20250529-223630-10e16ac8",
-    "@abtnode/constant": "1.16.44-beta-20250529-223630-10e16ac8",
-    "@abtnode/util": "1.16.44-beta-20250529-223630-10e16ac8",
-    "@arcblock/did": "1.20.11",
-    "@arcblock/did-auth": "1.20.11",
-    "@arcblock/jwt": "1.20.11",
-    "@arcblock/ws": "1.20.11",
-    "@blocklet/constant": "1.16.44-beta-20250529-223630-10e16ac8",
-    "@blocklet/env": "1.16.44-beta-20250529-223630-10e16ac8",
-    "@blocklet/error": "^0.2.4",
-    "@blocklet/meta": "1.16.44-beta-20250529-223630-10e16ac8",
-    "@blocklet/theme": "^2.13.55",
+    "@abtnode/client": "1.16.44-beta-20250603-231026-30a9d27f",
+    "@abtnode/constant": "1.16.44-beta-20250603-231026-30a9d27f",
+    "@abtnode/util": "1.16.44-beta-20250603-231026-30a9d27f",
+    "@arcblock/did": "1.20.12",
+    "@arcblock/did-auth": "1.20.12",
+    "@arcblock/jwt": "1.20.12",
+    "@arcblock/ws": "1.20.12",
+    "@blocklet/constant": "1.16.44-beta-20250603-231026-30a9d27f",
+    "@blocklet/env": "1.16.44-beta-20250603-231026-30a9d27f",
+    "@blocklet/error": "^0.2.5",
+    "@blocklet/meta": "1.16.44-beta-20250603-231026-30a9d27f",
+    "@blocklet/theme": "^2.13.61",
     "@did-connect/authenticator": "^2.2.8",
     "@did-connect/handler": "^2.2.8",
     "@nedb/core": "^2.1.5",
-    "@ocap/mcrypto": "1.20.11",
-    "@ocap/util": "1.20.11",
-    "@ocap/wallet": "1.20.11",
+    "@ocap/mcrypto": "1.20.12",
+    "@ocap/util": "1.20.12",
+    "@ocap/wallet": "1.20.12",
     "axios": "^1.7.9",
     "cheerio": "1.0.0-rc.12",
     "debug": "^4.3.7",
@@ -84,5 +84,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "381ba5459e32dd7bc94f7ea62df65b72644d6d16"
+  "gitHead": "c76d07121652516f178de4188d8694fc130767b8"
 }