@abtnode/util 1.16.43-beta-20250427-232837-e671de06 → 1.16.43-beta-20250429-130236-269254ff

package/lib/blocklet.js

@@ -56,9 +56,15 @@ const formatLogoURL = (logoURL, defaultLogoURL, height = 80) => {
 
 const getBlockletLogos = (blocklet) => {
   let appLogo = blocklet.environments?.find((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE)?.value;
+  let appLogoDark = blocklet.environments?.find(
+    (x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE_DARK
+  )?.value;
   let appLogoRect = blocklet.environments?.find(
     (x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_RECT
   )?.value;
+  let appLogoRectDark = blocklet.environments?.find(
+    (x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_RECT_DARK
+  )?.value;
   let appSplashPortrait = blocklet.environments?.find(
     (x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPLASH_PORTRAIT
   )?.value;
@@ -67,7 +73,12 @@ const getBlockletLogos = (blocklet) => {
   )?.value;
 
   appLogo = formatLogoURL(appLogo, `http://127.0.0.1${WELLKNOWN_SERVICE_PATH_PREFIX}/blocklet/logo`);
+  appLogoDark = formatLogoURL(appLogoDark, `http://127.0.0.1${WELLKNOWN_SERVICE_PATH_PREFIX}/blocklet/logo-dark`);
   appLogoRect = formatLogoURL(appLogoRect, `http://127.0.0.1${WELLKNOWN_SERVICE_PATH_PREFIX}/blocklet/logo-rect`);
+  appLogoRectDark = formatLogoURL(
+    appLogoRectDark,
+    `http://127.0.0.1${WELLKNOWN_SERVICE_PATH_PREFIX}/blocklet/logo-rect-dark`
+  );
   appSplashPortrait = formatLogoURL(
     appSplashPortrait,
     `http://127.0.0.1${WELLKNOWN_SERVICE_PATH_PREFIX}/blocklet/splash/portrait`,
@@ -82,6 +93,8 @@ const getBlockletLogos = (blocklet) => {
   return {
     appLogo: appLogo || joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo?imageFilter=convert&f=png&h=80'),
     appLogoRect: appLogoRect || '',
+    appLogoDark: appLogoDark || '',
+    appLogoRectDark: appLogoRectDark || '',
     appSplashPortrait,
     appSplashLandscape,
   };

package/lib/logo-middleware.js

@@ -120,6 +120,9 @@ const ensureCustomLogo = (req, res, next, logoKey) => {
 const ensureCustomSquareLogo = (req, res, next) => {
   return ensureCustomLogo(req, res, next, 'BLOCKLET_APP_LOGO_SQUARE');
 };
+const ensureCustomSquareDarkLogo = (req, res, next) => {
+  return ensureCustomLogo(req, res, next, 'BLOCKLET_APP_LOGO_SQUARE_DARK');
+};
 
 /**
  * @param {import('express').Request & {blocklet: any, sendOptions: any}} req
@@ -130,6 +133,9 @@ const ensureCustomSquareLogo = (req, res, next) => {
 const ensureCustomRectLogo = (req, res, next) => {
   return ensureCustomLogo(req, res, next, 'BLOCKLET_APP_LOGO_RECT');
 };
+const ensureCustomRectDarkLogo = (req, res, next) => {
+  return ensureCustomLogo(req, res, next, 'BLOCKLET_APP_LOGO_RECT_DARK');
+};
 
 const ensureCustomSplashPortrait = (req, res, next) => {
   return ensureCustomLogo(req, res, next, 'BLOCKLET_APP_SPLASH_PORTRAIT');
@@ -276,9 +282,11 @@ module.exports = {
   attachSendLogoContext,
   ensureBlockletExist,
   ensureCustomSquareLogo,
+  ensureCustomSquareDarkLogo,
   ensureBundleLogo,
   ensureCustomFavicon,
   ensureCustomRectLogo,
+  ensureCustomRectDarkLogo,
   ensureCustomSplashPortrait,
   ensureCustomSplashLandscape,
   ensureCustomOgImage,

package/lib/security.js

@@ -190,7 +190,7 @@ function patchValueIntoDirectives(directives, key, value) {
   return [...new Set(currentValue)];
 }
 
-async function patchResponseHeader(rawConfig, { node, blocklet }) {
+async function patchResponseHeader(rawConfig, { node, blocklet, trustedDomains = [] }) {
   if (!rawConfig?.contentSecurityPolicy?.directives) {
     return rawConfig;
   }
@@ -261,7 +261,11 @@ async function patchResponseHeader(rawConfig, { node, blocklet }) {
   config.contentSecurityPolicy.directives['frame-ancestors'] = patchValueIntoDirectives(
     config.contentSecurityPolicy.directives,
     'frame-ancestors',
-    ["'self'", ...(blocklet.settings.userSpaceHosts || []).map((x) => `https://${x}`)]
+    [
+      "'self'",
+      ...(blocklet.settings.userSpaceHosts || []).map((x) => `https://${x}`),
+      ...trustedDomains.filter(Boolean).map((x) => `http://${x}`),
+    ]
   );
 
   return config;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.43-beta-20250427-232837-e671de06",
+  "version": "1.16.43-beta-20250429-130236-269254ff",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,11 +18,11 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.43-beta-20250427-232837-e671de06",
+    "@abtnode/constant": "1.16.43-beta-20250429-130236-269254ff",
     "@arcblock/did": "^1.20.2",
     "@arcblock/pm2": "^5.4.0",
-    "@blocklet/constant": "1.16.43-beta-20250427-232837-e671de06",
-    "@blocklet/meta": "1.16.43-beta-20250427-232837-e671de06",
+    "@blocklet/constant": "1.16.43-beta-20250429-130236-269254ff",
+    "@blocklet/meta": "1.16.43-beta-20250429-130236-269254ff",
     "@ocap/client": "1.20.2",
     "@ocap/mcrypto": "1.20.2",
     "@ocap/util": "1.20.2",
@@ -86,5 +86,5 @@
     "fs-extra": "^11.2.0",
     "jest": "^29.7.0"
   },
-  "gitHead": "3644f271b67d5ebaa7a8b852173860a005f1d057"
+  "gitHead": "0826633a53695ac92965f8993e46985259adb65f"
 }