@abtnode/core 1.16.44-beta-20250601-083116-288e5ea5 → 1.16.44-beta-20250605-131649-6eaf56d9

package/lib/blocklet/manager/disk.js

@@ -169,7 +169,9 @@ const {
   getAppConfigsFromComponent,
   removeAppConfigsFromComponent,
   getConfigsFromInput,
+  getPackComponent,
   getPackConfig,
+  copyPackImages,
   filterRequiredComponents,
 } = require('../../util/blocklet');
 const states = require('../../states');
@@ -445,7 +447,7 @@ class DiskBlockletManager extends BaseBlockletManager {
               title,
               description,
               action: `/blocklets/${did}/overview`,
-              blockletDashboardAction: '/.well-known/service/admin/blocklets',
+              blockletDashboardAction: `${WELLKNOWN_SERVICE_PATH_PREFIX}/admin/blocklets`,
               entityType: 'blocklet',
               entityId: did,
               severity,
@@ -1484,7 +1486,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       entityId: newBlocklet.meta.did,
       severity: 'success',
       action: `/blocklets/${newBlocklet.meta.did}/components`,
-      blockletDashboardAction: '/.well-known/service/admin/components',
+      blockletDashboardAction: `${WELLKNOWN_SERVICE_PATH_PREFIX}/admin/components`,
     });
 
     this.emit(BlockletEvents.componentRemoved, {
@@ -3080,6 +3082,8 @@ class DiskBlockletManager extends BaseBlockletManager {
       // install blocklet
       if (postAction === INSTALL_ACTIONS.INSTALL) {
         await this._onInstall({ blocklet, componentDids, context, oldBlocklet });
+        await this.getBlocklet(did);
+
         return;
       }
 
@@ -3103,6 +3107,7 @@ class DiskBlockletManager extends BaseBlockletManager {
           });
 
           const newBlocklet = await this.getBlocklet(did);
+
           if (newBlocklet.controller) {
             const eventType = 'install';
 
@@ -3527,7 +3532,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     };
 
     const action = `/blocklets/${did}/components?checkUpdate=1`;
-    const blockletDashboardAction = '/.well-known/service/admin/components?checkUpdate=1';
+    const blockletDashboardAction = `${WELLKNOWN_SERVICE_PATH_PREFIX}/admin/components?checkUpdate=1`;
     const users = await this.teamManager.getOwnerAndAdminUsers(did, 1);
     const nodeInfo = await states.node.read();
     const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
@@ -4022,8 +4027,34 @@ class DiskBlockletManager extends BaseBlockletManager {
       // Inject pack configs
       const packConfig = await getPackConfig(blocklet);
       if (packConfig) {
+        const packComponent = getPackComponent(blocklet);
+
+        // 同步图片资源
+        await copyPackImages({
+          appDataDir: path.join(this.dataDirs.data, blocklet.meta.name),
+          packDir: packComponent.env.appDir,
+          packConfig,
+        });
+
+        // 同步 App 导航配置
         await this.configNavigations({ did, navigations: packConfig.navigations });
 
+        // 同步 App 品牌相关图片配置
+        const configObj = packConfig.configObj || {};
+        for (const key of util.APP_CONFIG_IMAGE_KEYS) {
+          const value = configObj[key];
+          if (value) {
+            await this.config({
+              did: [blocklet.meta.did],
+              configs: [{ key, value }],
+              skipHook: true,
+              skipDidDocument: true,
+              skipEmitEvents: true,
+            });
+          }
+        }
+
+        // 同步各子组件配置
         for (const { did: componentDid, configs } of packConfig.components || []) {
           if (blocklet.children.some((x) => x.meta.did === componentDid)) {
             await this.config({
@@ -4081,7 +4112,7 @@ class DiskBlockletManager extends BaseBlockletManager {
               deployedFrom || fromBlockletSource(source)
             })`,
             action: `/blocklets/${did}/overview`,
-            blockletDashboardAction: '/.well-known/service/admin/blocklets',
+            blockletDashboardAction: `${WELLKNOWN_SERVICE_PATH_PREFIX}/admin/blocklets`,
             entityType: 'blocklet',
             entityId: did,
             severity: 'success',
@@ -4322,7 +4353,7 @@ class DiskBlockletManager extends BaseBlockletManager {
             componentDids
           )} is ${actionName} successfully for ${title}`,
           action: `/blocklets/${did}/overview`,
-          blockletDashboardAction: '/.well-known/service/admin/blocklets',
+          blockletDashboardAction: `${WELLKNOWN_SERVICE_PATH_PREFIX}/admin/blocklets`,
           entityType: 'blocklet',
           entityId: did,
           severity: 'success',

package/lib/blocklet/migration-dist/migration.cjs

@@ -287,6 +287,8 @@ const EVENTS = {
   RELOAD_GATEWAY: 'gateway.reload',
   NOTIFICATION_CREATE_QUEUED: 'notification.create.queued',
   UPDATE_DOMAIN_ALIAS: 'router.domain.alias.updated',
+
+  WEBHOOK_ATTEMPT: 'webhook.attempt',
 };
 
 const WHO_CAN_ACCESS = Object.freeze({
@@ -752,6 +754,7 @@ module.exports = Object.freeze({
     // FIXME: 梁柱, 下面两个 get 接口, 可以不开放但是前端需要根据情况取消获取这两个接口的调用
     getBlockletRuntimeHistory: true,
     checkDomains: true,
+    isDidDomain: true,
   },
   // 这些接口可以跳过 ACCESS VERIFY
   SKIP_ACCESS_VERIFY_METHODS: {
@@ -38885,7 +38888,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.43","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.43","@abtnode/auth":"1.16.43","@abtnode/certificate-manager":"1.16.43","@abtnode/client":"1.16.43","@abtnode/constant":"1.16.43","@abtnode/cron":"1.16.43","@abtnode/docker-utils":"1.16.43","@abtnode/logger":"1.16.43","@abtnode/models":"1.16.43","@abtnode/queue":"1.16.43","@abtnode/rbac":"1.16.43","@abtnode/router-provider":"1.16.43","@abtnode/static-server":"1.16.43","@abtnode/timemachine":"1.16.43","@abtnode/util":"1.16.43","@arcblock/did":"1.20.11","@arcblock/did-auth":"1.20.11","@arcblock/did-ext":"1.20.11","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.11","@arcblock/event-hub":"1.20.11","@arcblock/jwt":"1.20.11","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.11","@arcblock/vc":"1.20.11","@blocklet/constant":"1.16.43","@blocklet/did-space-js":"^1.0.56","@blocklet/env":"1.16.43","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.43","@blocklet/resolver":"1.16.43","@blocklet/sdk":"1.16.43","@blocklet/store":"1.16.43","@blocklet/theme":"^2.13.57","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.11","@ocap/util":"1.20.11","@ocap/wallet":"1.20.11","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","lru-cache":"^11.0.2","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^9.0.1","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.43","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.43","@abtnode/auth":"1.16.43","@abtnode/certificate-manager":"1.16.43","@abtnode/client":"1.16.43","@abtnode/constant":"1.16.43","@abtnode/cron":"1.16.43","@abtnode/docker-utils":"1.16.43","@abtnode/logger":"1.16.43","@abtnode/models":"1.16.43","@abtnode/queue":"1.16.43","@abtnode/rbac":"1.16.43","@abtnode/router-provider":"1.16.43","@abtnode/static-server":"1.16.43","@abtnode/timemachine":"1.16.43","@abtnode/util":"1.16.43","@arcblock/did":"1.20.13","@arcblock/did-auth":"1.20.13","@arcblock/did-ext":"1.20.13","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.13","@arcblock/event-hub":"1.20.13","@arcblock/jwt":"1.20.13","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.13","@arcblock/vc":"1.20.13","@blocklet/constant":"1.16.43","@blocklet/did-space-js":"^1.0.57","@blocklet/env":"1.16.43","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.43","@blocklet/resolver":"1.16.43","@blocklet/sdk":"1.16.43","@blocklet/store":"1.16.43","@blocklet/theme":"^2.13.61","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.13","@ocap/util":"1.20.13","@ocap/wallet":"1.20.13","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","lru-cache":"^11.0.2","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^9.0.1","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
 
 /***/ }),
 

package/lib/blocklet/project/util.js

@@ -3,7 +3,7 @@ const fs = require('fs-extra');
 const fg = require('fast-glob');
 const { isValid: isValidDid } = require('@arcblock/did');
 const { PROJECT, BLOCKLET_RESOURCE_DIR, BLOCKLET_META_FILE } = require('@blocklet/constant');
-const { expandBundle } = require('../../util');
+const { expandBundle, APP_CONFIG_IMAGE_KEYS } = require('../../util');
 
 const COMPONENT_CONFIG_MAP_DIR = '.component_config';
 
@@ -46,6 +46,42 @@ const exportBlockletResources = async ({
   await fs.remove(path.join(resourceDir, COMPONENT_CONFIG_MAP_DIR));
 
   if (isPack) {
+    const navigations = app.settings.navigations || [];
+    const imagesDir = path.join(exportDir, 'images');
+
+    // 将 tabbar icons 复制到 images 目录
+    const bottomNavItems = navigations.filter((item) => item.section === 'bottomNavigation' && item.icon);
+    if (bottomNavItems.length > 0) {
+      const mediaDir = path.join(app.env.dataDir, 'media', 'blocklet-service');
+      if (fs.existsSync(mediaDir)) {
+        await fs.ensureDir(imagesDir);
+
+        await Promise.all(
+          bottomNavItems.map(async (item) => {
+            const iconFileName = path.basename(item.icon);
+            const iconFile = path.join(mediaDir, iconFileName);
+            if (fs.existsSync(iconFile)) {
+              await fs.copy(iconFile, path.join(imagesDir, iconFileName));
+            }
+          })
+        );
+      }
+    }
+
+    // 将 branding images 复制到 images 目录
+    const configObj = app.configObj || {};
+    await Promise.all(
+      APP_CONFIG_IMAGE_KEYS.map(async (key) => {
+        const value = configObj[key];
+        if (value && !value.startsWith('http')) {
+          const imgFile = path.join(app.env.dataDir, value);
+          if (fs.existsSync(imgFile)) {
+            await fs.copy(imgFile, path.join(imagesDir, value));
+          }
+        }
+      })
+    );
+
     // create pack resource
     const packResourceDir = path.join(resourceDir, blockletDid, 'config');
     await fs.ensureDir(packResourceDir);
@@ -58,7 +94,6 @@ const exportBlockletResources = async ({
         }))
         .filter(Boolean),
     };
-    const navigations = app.settings.navigations || [];
     const componentsConfigs = app.children
       .filter((x) => {
         if (selectedComponentDids.length) {
@@ -72,6 +107,7 @@ const exportBlockletResources = async ({
       }));
     await fs.outputJSON(path.join(packResourceDir, 'config.json'), {
       site,
+      configObj,
       navigations,
       components: componentsConfigs,
     });

package/lib/blocklet/webhook/index.js

@@ -2,7 +2,9 @@ const pick = require('lodash/pick');
 const pickBy = require('lodash/pickBy');
 const get = require('lodash/get');
 const { EventEmitter } = require('events');
-const { API_VERSION } = require('./util');
+const { EVENTS } = require('@abtnode/constant');
+const { API_VERSION, STATUS } = require('./util');
+const endpointQueueInit = require('./queues');
 
 const DEFAULT_PAGE = 1;
 const DEFAULT_PAGE_SIZE = 10;
@@ -25,6 +27,9 @@ class WebhooksAPI extends EventEmitter {
 
     this.cache = new Map();
     this.TTL = 5 * 60 * 1000;
+
+    const { webhookEndpointQueue } = endpointQueueInit.init({ states, teamManager });
+    this.webhookEndpointQueue = webhookEndpointQueue;
   }
 
   async getUserInfo(userDid, teamDid, serverDid) {
@@ -161,6 +166,46 @@ class WebhooksAPI extends EventEmitter {
     const list = await webhookAttemptState.list(page, pageSize, where);
     return list;
   }
+
+  async retryWebhookAttempt({ eventId, webhookId, attemptId, teamDid }, context) {
+    const { webhookAttemptState } = await this.teamManager.getWebhookState(teamDid);
+
+    const result = await webhookAttemptState.insert({
+      eventId,
+      webhookId,
+      status: STATUS.PENDING,
+      retryCount: 1,
+      responseStatus: 200,
+      responseBody: {},
+      triggeredBy: getUserDid(context),
+      triggeredFrom: attemptId,
+    });
+
+    const emitResult = async () => {
+      return {
+        teamDid,
+        ...(await webhookAttemptState.findOne({ eventId, webhookId, id: result.id })),
+      };
+    };
+
+    this.webhookEndpointQueue.push({
+      eventId,
+      webhookId,
+      appDid: teamDid,
+      attemptId: result.id,
+      triggeredBy: getUserDid(context),
+      triggeredFrom: attemptId,
+    });
+
+    this.webhookEndpointQueue.on('finished', async () => {
+      this.emit(EVENTS.WEBHOOK_ATTEMPT, { ...(await emitResult()) });
+    });
+    this.webhookEndpointQueue.on('failed', async () => {
+      this.emit(EVENTS.WEBHOOK_ATTEMPT, { ...(await emitResult()) });
+    });
+
+    return result;
+  }
 }
 
 module.exports = WebhooksAPI;

package/lib/blocklet/webhook/queues.js

@@ -3,13 +3,19 @@ const axios = require('@abtnode/util/lib/axios');
 const { Op } = require('sequelize');
 
 const createQueue = require('../../util/queue');
-const { getWebhookJobId } = require('./util');
+const { getWebhookJobId, STATUS } = require('./util');
 
 const MAX_RETRY_COUNT = 2; // 重试一次
 const AXIOS_TIMEOUT = 1000 * 60 * 3;
 
 const createWebhookEndpointQueue = ({ states, teamManager }) => {
   // https://stripe.com/docs/webhooks
+  /**
+   *
+   * @param {*} job eventId: event.id, webhookId: webhook.id, appDid: job.appDid, attemptId?:string
+   *
+   * @returns
+   */
   const handleWebhookEndpoint = async (job) => {
     logger.info('handle webhook endpoint', job);
 
@@ -48,14 +54,31 @@ const createWebhookEndpointQueue = ({ states, teamManager }) => {
       // verify similar to component call, but supports external urls
       const response = await axios.post(webhook.url, event.request, { timeout: AXIOS_TIMEOUT });
 
-      await webhookAttemptState.insert({
-        eventId: event.id,
-        webhookId: webhook.id,
-        status: 'succeeded',
-        responseStatus: response.status,
-        responseBody: response.data || {},
-        retryCount,
-      });
+      if (job.attemptId) {
+        await webhookAttemptState.update(
+          { id: job.attemptId },
+          {
+            status: STATUS.SUCCEEDED,
+            responseStatus: response.status,
+            responseBody: response.data || {},
+            retryCount,
+            triggeredBy: job.triggeredBy,
+            triggeredFrom: job.triggeredFrom,
+          }
+        );
+      } else {
+        await webhookAttemptState.insert({
+          eventId: event.id,
+          webhookId: webhook.id,
+          status: STATUS.SUCCEEDED,
+          responseStatus: response.status,
+          responseBody: response.data || {},
+          retryCount,
+          triggeredBy: job.triggeredBy,
+          triggeredFrom: job.triggeredFrom,
+        });
+      }
+
       logger.info('WebhookAttempt created successfully', { eventId: event.id, webhookId: webhook.id });
 
       const newPendingCount = Math.max(0, event.pendingWebhooks - 1);
@@ -66,14 +89,31 @@ const createWebhookEndpointQueue = ({ states, teamManager }) => {
     } catch (err) {
       logger.warn('webhook attempt error', { ...job, retryCount, message: err.message });
 
-      await webhookAttemptState.insert({
-        eventId: event.id,
-        webhookId: webhook.id,
-        status: 'failed',
-        responseStatus: err.response?.status || 500,
-        responseBody: err.response?.data || {},
-        retryCount,
-      });
+      if (job.attemptId) {
+        await webhookAttemptState.update(
+          { id: job.attemptId },
+          {
+            status: STATUS.FAILED,
+            responseStatus: err.response?.status || 500,
+            responseBody: err.response?.data || {},
+            retryCount,
+            triggeredBy: job.triggeredBy,
+            triggeredFrom: job.triggeredFrom,
+          }
+        );
+      } else {
+        await webhookAttemptState.insert({
+          eventId: event.id,
+          webhookId: webhook.id,
+          status: STATUS.FAILED,
+          responseStatus: err.response?.status || 500,
+          responseBody: err.response?.data || {},
+          retryCount,
+          triggeredBy: job.triggeredBy,
+          triggeredFrom: job.triggeredFrom,
+        });
+      }
+
       logger.info('Failed WebhookAttempt created', { eventId: event.id, webhookId: webhook.id });
 
       // reschedule next attempt

package/lib/blocklet/webhook/util.js

@@ -6,7 +6,14 @@ const getWebhookJobId = (eventId, webhookId) => {
   return md5([eventId, webhookId].join('-'));
 };
 
+const STATUS = {
+  SUCCEEDED: 'succeeded',
+  FAILED: 'failed',
+  PENDING: 'pending',
+};
+
 module.exports = {
   API_VERSION,
+  STATUS,
   getWebhookJobId,
 };

package/lib/event/index.js

@@ -19,6 +19,7 @@ const {
   DEFAULT_DID_DOMAIN,
   WELLKNOWN_BLOCKLET_ADMIN_PATH,
   TEST_STORE_URL,
+  WELLKNOWN_SERVICE_PATH_PREFIX,
 } = require('@abtnode/constant');
 const { joinURL } = require('ufo');
 const { encode } = require('@abtnode/util/lib/base32');
@@ -65,6 +66,7 @@ module.exports = ({
   node,
   nodeRuntimeMonitor,
   daemon,
+  webhookManager,
 }) => {
   const nodeState = states.node;
   const nodeMonitSender = new NodeMonitSender({ node });
@@ -561,6 +563,10 @@ module.exports = ({
     eventHub.broadcast(name, data);
   });
 
+  listen(webhookManager, EVENTS.WEBHOOK_ATTEMPT, (name, data) => {
+    onEvent(name, data, true);
+  });
+
   listen(nodeState, BlockletEvents.purchaseChange, onEvent);
   nodeState.on(EVENTS.ROUTING_UPDATED, (nodeInfo) => onEvent(EVENTS.ROUTING_UPDATED, { routing: nodeInfo.routing }));
   nodeState.once(EVENTS.NODE_ADDED_OWNER, () => downloadAddedBlocklet());
@@ -706,7 +712,7 @@ module.exports = ({
       actions: [
         {
           name: translation.viewYourAccount,
-          link: joinURL(origin, '/.well-known/service/user/settings'),
+          link: joinURL(origin, `${WELLKNOWN_SERVICE_PATH_PREFIX}/user/settings`),
         },
       ],
     };

package/lib/index.js

@@ -753,6 +753,7 @@ function ABTNode(options) {
     getWebhookEndpoints: webhookAPI.getWebhookEndpoints.bind(webhookAPI),
     getWebhookEndpoint: webhookAPI.getWebhookEndpoint.bind(webhookAPI),
     getWebhookAttempts: webhookAPI.getWebhookAttempts.bind(webhookAPI),
+    retryWebhookAttempt: webhookAPI.retryWebhookAttempt.bind(webhookAPI),
 
     // passport
     createPassportLog: passportAPI.createPassportLog.bind(passportAPI),
@@ -799,6 +800,7 @@ function ABTNode(options) {
     nodeRuntimeMonitor: nodeAPI.runtimeMonitor,
     daemon: options.daemon,
     handleBlockletWafChange,
+    webhookManager: webhookAPI,
   });
 
   const webhook = WebHook({ events, dataDirs, instance, teamManager });

package/lib/router/monitor.js

@@ -1,3 +1,4 @@
+const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
 const { createLogWatcher } = require('./watcher');
 
 // Function to parse the log entry and extract relevant information
@@ -36,7 +37,7 @@ function parseLogEntry(line, check = true) {
       logEntry.status <= 599 &&
       logEntry.request.includes('/.well-known/did.json') === false &&
       logEntry.request.includes('/websocket') === false &&
-      logEntry.request.includes('/.well-known/service/health') === false
+      logEntry.request.includes(`${WELLKNOWN_SERVICE_PATH_PREFIX}/health`) === false
     ) {
       console.warn(`5xx request detected: ${logEntry.host}`, line);
       return logEntry;

package/lib/states/audit-log.js

@@ -515,6 +515,8 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `Delete Blocklet Webhook(${result.id})`;
     case 'ensureBlockletRunning':
       return `${result.title}:\n* ${result.description}`;
+    case 'retryWebhookAttempt':
+      return `Retry Webhook Attempt(${args.attemptId})`;
 
     case 'addUploadEndpoint':
       return `Create Upload Endpoint(${args.url})`;
@@ -657,6 +659,7 @@ const getLogCategory = (action) => {
     case 'createWebhookEndpoint':
     case 'updateWebhookEndpoint':
     case 'deleteWebhookEndpoint':
+    case 'retryWebhookAttempt':
       return 'integrations';
 
     // server

package/lib/util/blocklet.js

@@ -117,7 +117,14 @@ const FileLock = require('@abtnode/util/lib/lock-with-file');
 const { validate: validateEngine, get: getEngine } = require('../blocklet/manager/engine');
 
 const isRequirementsSatisfied = require('./requirement');
-const { expandBundle, findInterfacePortByName, prettyURL, templateReplace, getServerDidDomain } = require('./index');
+const {
+  expandBundle,
+  findInterfacePortByName,
+  prettyURL,
+  templateReplace,
+  getServerDidDomain,
+  APP_CONFIG_IMAGE_KEYS,
+} = require('./index');
 const { installExternalDependencies } = require('./install-external-dependencies');
 const parseDockerOptionsFromPm2 = require('./docker/parse-docker-options-from-pm2');
 const dockerRemoveByName = require('./docker/docker-remove-by-name');
@@ -1676,7 +1683,8 @@ const fromProperty2Config = (properties = {}, result) => {
         name: `${BLOCKLET_PREFERENCE_PREFIX}${key}`,
         required: prop.required || false,
         secure,
-        shared: secure ? false : prop.shared,
+        // eslint-disable-next-line no-nested-ternary
+        shared: secure ? false : typeof prop.shared === 'undefined' ? true : prop.shared,
       });
     }
   });
@@ -2351,8 +2359,12 @@ const removeAppConfigsFromComponent = async (componentConfigs, app, blockletExtr
   }
 };
 
+const getPackComponent = (app) => {
+  return (app?.children || []).find((x) => x.meta.group === BlockletGroup.pack);
+};
+
 const getPackConfig = (app) => {
-  const packComponent = (app?.children || []).find((x) => x.meta.group === BlockletGroup.pack);
+  const packComponent = getPackComponent(app);
   if (!packComponent) {
     return null;
   }
@@ -2374,6 +2386,52 @@ const getPackConfig = (app) => {
 
   return fs.readJSON(configFile);
 };
+
+/** 复制打包文件中的图片
+ * @param {string} appDataDir
+ * @param {string} packDir
+ * @param {{ navigations: Array<{ section: string | string[], icon: string }>, configObj: Record<string, string> }} packConfig
+ */
+const copyPackImages = async ({ appDataDir, packDir, packConfig = {} }) => {
+  const mediaDir = path.join(appDataDir, 'media', 'blocklet-service');
+  const { navigations = [], configObj = {} } = packConfig;
+  await fs.ensureDir(mediaDir);
+
+  // 过滤出 bottomNavigation 的图标
+  const bottomNavItems = navigations.filter((item) => {
+    // 处理 section 字段为数组的情况
+    const sections = Array.isArray(item.section) ? item.section : [item.section];
+    return sections.includes('bottomNavigation') && item.icon;
+  });
+
+  // 复制 tabbar 导航图标
+  if (bottomNavItems.length > 0) {
+    await Promise.all(
+      bottomNavItems.map(async (item) => {
+        const iconFileName = path.basename(item.icon);
+        const iconInImages = path.join(packDir, 'images', iconFileName);
+
+        if (fs.existsSync(iconInImages)) {
+          await fs.copy(iconInImages, path.join(mediaDir, iconFileName));
+        }
+      })
+    );
+  }
+
+  // 复制品牌相关图片
+  await Promise.all(
+    APP_CONFIG_IMAGE_KEYS.map(async (key) => {
+      const value = configObj[key];
+      if (value) {
+        const imgFile = path.join(packDir, 'images', value);
+        if (fs.existsSync(imgFile)) {
+          await fs.copy(imgFile, path.join(appDataDir, value));
+        }
+      }
+    })
+  );
+};
+
 /**
  * @param {import('@abtnode/client').BlockletState} blocklet
  * @returns {boolean}
@@ -2449,7 +2507,9 @@ module.exports = {
   getAppConfigsFromComponent,
   removeAppConfigsFromComponent,
   getConfigsFromInput,
+  getPackComponent,
   getPackConfig,
+  copyPackImages,
   getBlockletConfigObj,
   isDevelopmentMode,
   resolveMountPointConflict,

package/lib/util/index.js

@@ -30,8 +30,15 @@ const {
   SLOT_FOR_IP_DNS_SITE,
   BLOCKLET_SITE_GROUP_SUFFIX,
 } = require('@abtnode/constant');
+const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/constant');
 
 const DEFAULT_WELLKNOWN_PORT = 8088;
+const APP_CONFIG_IMAGE_KEYS = [
+  BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_FAVICON,
+  BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPLASH_PORTRAIT,
+  BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPLASH_LANDSCAPE,
+  BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_OG_IMAGE,
+];
 
 const logger = require('@abtnode/logger')('@abtnode/core:util');
 const getSafeEnv = require('./get-safe-env');
@@ -487,6 +494,7 @@ const toCamelCase = (obj) => {
 };
 
 const lib = {
+  APP_CONFIG_IMAGE_KEYS,
   validateOwner,
   getProviderFromNodeInfo,
   toStatus,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.44-beta-20250601-083116-288e5ea5",
+  "version": "1.16.44-beta-20250605-131649-6eaf56d9",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,44 +19,44 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@abtnode/auth": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@abtnode/certificate-manager": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@abtnode/client": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@abtnode/constant": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@abtnode/cron": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@abtnode/docker-utils": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@abtnode/logger": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@abtnode/models": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@abtnode/queue": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@abtnode/rbac": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@abtnode/router-provider": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@abtnode/static-server": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@abtnode/timemachine": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@abtnode/util": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@arcblock/did": "1.20.11",
-    "@arcblock/did-auth": "1.20.11",
-    "@arcblock/did-ext": "1.20.11",
+    "@abtnode/analytics": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@abtnode/auth": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@abtnode/certificate-manager": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@abtnode/client": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@abtnode/constant": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@abtnode/cron": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@abtnode/docker-utils": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@abtnode/logger": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@abtnode/models": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@abtnode/queue": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@abtnode/rbac": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@abtnode/router-provider": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@abtnode/static-server": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@abtnode/timemachine": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@abtnode/util": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@arcblock/did": "1.20.13",
+    "@arcblock/did-auth": "1.20.13",
+    "@arcblock/did-ext": "1.20.13",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.20.11",
-    "@arcblock/event-hub": "1.20.11",
-    "@arcblock/jwt": "1.20.11",
+    "@arcblock/did-util": "1.20.13",
+    "@arcblock/event-hub": "1.20.13",
+    "@arcblock/jwt": "1.20.13",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "1.20.11",
-    "@arcblock/vc": "1.20.11",
-    "@blocklet/constant": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@blocklet/did-space-js": "^1.0.56",
-    "@blocklet/env": "1.16.44-beta-20250601-083116-288e5ea5",
+    "@arcblock/validator": "1.20.13",
+    "@arcblock/vc": "1.20.13",
+    "@blocklet/constant": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@blocklet/did-space-js": "^1.0.57",
+    "@blocklet/env": "1.16.44-beta-20250605-131649-6eaf56d9",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@blocklet/resolver": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@blocklet/sdk": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@blocklet/store": "1.16.44-beta-20250601-083116-288e5ea5",
-    "@blocklet/theme": "^2.13.57",
+    "@blocklet/meta": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@blocklet/resolver": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@blocklet/sdk": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@blocklet/store": "1.16.44-beta-20250605-131649-6eaf56d9",
+    "@blocklet/theme": "^2.13.61",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.20.11",
-    "@ocap/util": "1.20.11",
-    "@ocap/wallet": "1.20.11",
+    "@ocap/mcrypto": "1.20.13",
+    "@ocap/util": "1.20.13",
+    "@ocap/wallet": "1.20.13",
     "@slack/webhook": "^5.0.4",
     "archiver": "^7.0.1",
     "axios": "^1.7.9",
@@ -116,5 +116,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "5d978739f099374dcc9d4ce9572eb343fd0c39b4"
+  "gitHead": "667899e10781e9fcc21c40c2a2f60f3fa2fecc88"
 }