@abtnode/core 1.16.43-beta-20250419-231352-c78ac93d → 1.16.43-beta-20250422-042711-c40bec75

package/lib/blocklet/manager/disk.js

@@ -415,7 +415,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         const { did } = job;
         const checkUpdate = await this.getAutoCheckUpdate({ did });
         if (checkUpdate?.enabled) {
-          this.checkUpdateQueue.push(job, jobId, true, CHECK_UPDATE.JOB.INTERVAL);
+          this.checkUpdateQueue.push(job, jobId, true, CHECK_UPDATE.JOB.DAY_INTERVAL);
         }
       };
       this.checkUpdateQueue.on('finished', handleCheckUpdateComplete).on('failed', handleCheckUpdateComplete);
@@ -513,7 +513,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       },
       entity: 'blocklet',
       action: 'autoCheckUpdate',
-      interval: CHECK_UPDATE.JOB.INTERVAL,
+      interval: CHECK_UPDATE.JOB.DAY_INTERVAL,
       restoreCancelled: true,
     });
   }
@@ -2647,8 +2647,7 @@ class DiskBlockletManager extends BaseBlockletManager {
           context,
         },
         jobId,
-        true,
-        CHECK_UPDATE.JOB.DAY_INTERVAL
+        true
       );
     }
   }

package/lib/blocklet/manager/helper/install-component-from-upload.js

@@ -17,6 +17,7 @@ const {
   checkStructVersion,
   checkVersionCompatibility,
   getBlockletStatus,
+  resolveMountPointConflict,
 } = require('../../../util/blocklet');
 const { resolveDownload, resolveDiffDownload, downloadFromUpload } = require('../../downloader/resolve-download');
 
@@ -108,6 +109,8 @@ const installComponentFromUpload = async ({
   const action = index >= 0 ? INSTALL_ACTIONS.UPGRADE_COMPONENT : INSTALL_ACTIONS.INSTALL_COMPONENT;
 
   const { dynamicComponents } = await parseComponents(newChild);
+  dynamicComponents.forEach((comp) => resolveMountPointConflict(comp, newBlocklet));
+
   const newChildren = filterDuplicateComponents(dynamicComponents, newBlocklet.children).map((x) => ({
     ...x,
     installedAt: x.installedAt || new Date(),

package/lib/blocklet/manager/helper/install-component-from-url.js

@@ -19,6 +19,7 @@ const {
   validateBlocklet,
   filterRequiredComponents,
   getComponentNamesWithVersion,
+  resolveMountPointConflict,
 } = require('../../../util/blocklet');
 const StoreUtil = require('../../../util/store');
 
@@ -108,6 +109,9 @@ const installComponentFromUrl = async ({
     dynamicComponents.unshift(newChild);
   }
 
+  // 检查不存在的 blocklet mountPoint 是否冲突
+  dynamicComponents.forEach((comp) => resolveMountPointConflict(comp, blocklet));
+
   let newChildren = filterDuplicateComponents(dynamicComponents, blocklet.children).map((x) => ({
     ...x,
     installedAt: x.installedAt || new Date(),

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

@@ -43,6 +43,7 @@ const BLOCKLET_ROLES = [
 ];
 
 const isBlockletRole = (role) => role && BLOCKLET_ROLES.includes(role);
+const isSystemRole = (role) => role && ROLES[(role || '').toUpperCase()];
 
 const BLOCKLET_MULTIPLE_TENANT_ROLES = [
   SERVER_ROLES.BLOCKLET_OWNER,
@@ -343,6 +344,8 @@ const CHECK_UPDATE = {
   JOB: {
     // 自动备份的时间间隔,单位为 s,目前是间隔2个小时
     INTERVAL: 2 * 60 * 60,
+    // 1 天
+    DAY_INTERVAL: 24 * 60 * 60,
   },
 };
 
@@ -590,6 +593,7 @@ module.exports = Object.freeze({
   SERVER_ROLES,
   BLOCKLET_ROLES,
   isBlockletRole,
+  isSystemRole,
   isBlockletMultipleTenantRole,
   AUTH_CERT_TYPE,
   RBAC_CONFIG,
@@ -38735,7 +38739,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.42","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.42","@abtnode/auth":"1.16.42","@abtnode/certificate-manager":"1.16.42","@abtnode/constant":"1.16.42","@abtnode/cron":"1.16.42","@abtnode/docker-utils":"1.16.42","@abtnode/logger":"1.16.42","@abtnode/models":"1.16.42","@abtnode/queue":"1.16.42","@abtnode/rbac":"1.16.42","@abtnode/router-provider":"1.16.42","@abtnode/static-server":"1.16.42","@abtnode/timemachine":"1.16.42","@abtnode/util":"1.16.42","@arcblock/did":"1.20.1","@arcblock/did-auth":"1.20.1","@arcblock/did-ext":"^1.20.1","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.1","@arcblock/event-hub":"1.20.1","@arcblock/jwt":"^1.20.1","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.20.1","@arcblock/vc":"1.20.1","@blocklet/constant":"1.16.42","@blocklet/did-space-js":"^1.0.48","@blocklet/env":"1.16.42","@blocklet/meta":"1.16.42","@blocklet/resolver":"1.16.42","@blocklet/sdk":"1.16.42","@blocklet/store":"1.16.42","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.1","@ocap/util":"1.20.1","@ocap/wallet":"1.20.1","@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","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","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.42","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.42","@abtnode/auth":"1.16.42","@abtnode/certificate-manager":"1.16.42","@abtnode/constant":"1.16.42","@abtnode/cron":"1.16.42","@abtnode/docker-utils":"1.16.42","@abtnode/logger":"1.16.42","@abtnode/models":"1.16.42","@abtnode/queue":"1.16.42","@abtnode/rbac":"1.16.42","@abtnode/router-provider":"1.16.42","@abtnode/static-server":"1.16.42","@abtnode/timemachine":"1.16.42","@abtnode/util":"1.16.42","@arcblock/did":"1.20.1","@arcblock/did-auth":"1.20.1","@arcblock/did-ext":"^1.20.1","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.1","@arcblock/event-hub":"1.20.1","@arcblock/jwt":"^1.20.1","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.20.1","@arcblock/vc":"1.20.1","@blocklet/constant":"1.16.42","@blocklet/did-space-js":"^1.0.48","@blocklet/env":"1.16.42","@blocklet/meta":"1.16.42","@blocklet/resolver":"1.16.42","@blocklet/sdk":"1.16.42","@blocklet/store":"1.16.42","@blocklet/theme":"^2.13.9","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.1","@ocap/util":"1.20.1","@ocap/wallet":"1.20.1","@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","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","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/crons/monitor-disk-usage.js

@@ -1,12 +1,15 @@
 const logger = require('@abtnode/logger')('@abtnode/disk-monitor');
+const { joinURL } = require('ufo');
 const info = require('../util/sysinfo');
 const states = require('../states');
 
 /**
- * @param {number} threshold Threshold for disk alerts, percentage
+ * @param {object} teamManager
  */
-const check = async (threshold, teamManager) => {
+const check = async (teamManager) => {
   const { disks } = await info.getSysInfo();
+  const nodeInfo = await states.node.read();
+  const threshold = nodeInfo.diskAlertThreshold; // Threshold for disk alerts, percentage
   for (const disk of disks) {
     const usageRatio = (disk.used / disk.total) * 100;
     if (Number.isNaN(usageRatio)) {
@@ -20,6 +23,8 @@ const check = async (threshold, teamManager) => {
       continue;
     }
 
+    const actionPath = '/analytics/runtime';
+    const action = process.env.NODE_ENV === 'production' ? joinURL(nodeInfo.routing.adminPath, actionPath) : actionPath;
     // eslint-disable-next-line no-await-in-loop
     await teamManager.createNotification({
       title: 'Disk Usage Alert',
@@ -27,6 +32,7 @@ const check = async (threshold, teamManager) => {
       entityType: 'node',
       severity: 'warning',
       sticky: true,
+      action,
     });
   }
 };
@@ -35,9 +41,7 @@ const getCron = (teamManager) => ({
   name: 'monitor-disk-usage',
   time: '0 5 * * * *', // check every hour
   fn: async () => {
-    const nodeInfo = await states.node.read();
-    const threshold = nodeInfo.diskAlertThreshold;
-    await check(threshold, teamManager);
+    await check(teamManager);
   },
   options: { runOnInit: true },
 });

package/lib/util/blocklet.js

@@ -35,6 +35,7 @@ const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const hashFiles = require('@abtnode/util/lib/hash-files');
 const didDocument = require('@abtnode/util/lib/did-document');
 const { BLOCKLET_MAX_MEM_LIMIT_IN_MB, BLOCKLET_INSTALL_TYPE, APP_STRUCT_VERSION } = require('@abtnode/constant');
+const { BLOCKLET_THEME_LIGHT, BLOCKLET_THEME_DARK } = require('@blocklet/theme');
 const {
   parseComponents,
   ensureMeta,
@@ -50,6 +51,7 @@ const { getComponentApiKey } = require('@abtnode/util/lib/blocklet');
 const { toSvg: createDidLogo } =
   process.env.NODE_ENV !== 'test' ? require('@arcblock/did-motif') : require('@arcblock/did-motif/dist/did-motif.cjs');
 const { createBlockiesSvg } = require('@blocklet/meta/lib/blockies');
+const formatName = require('@abtnode/util/lib/format-name');
 
 const SCRIPT_ENGINES_WHITE_LIST = ['npm', 'npx', 'pnpm', 'yarn'];
 
@@ -1510,6 +1512,10 @@ const getBlocklet = async ({
   }
 
   blocklet.settings.storeList = blocklet.settings.storeList || [];
+  blocklet.settings.theme = blocklet.settings.theme || {
+    light: BLOCKLET_THEME_LIGHT,
+    dark: BLOCKLET_THEME_DARK,
+  };
 
   const nodeInfo = await states.node.read();
 
@@ -1817,6 +1823,28 @@ const checkDuplicateMountPoint = (app, mountPoint) => {
   }
 };
 
+const resolveMountPointConflict = (comp, blocklet) => {
+  try {
+    if (!comp?.mountPoint) return comp;
+
+    const children = blocklet?.children || [];
+
+    const existingComponent = children.find((x) => x.mountPoint === comp.mountPoint && x.meta?.did !== comp.meta?.did);
+    if (!existingComponent) return comp;
+
+    const baseName = formatName(comp?.meta?.name) || formatName(comp?.meta?.title);
+    comp.mountPoint = children.some((x) => x.mountPoint === `/${baseName}`)
+      ? comp.meta.did
+      : baseName.toLocaleLowerCase();
+
+    return comp;
+  } catch (error) {
+    logger.error('Failed to resolve mount point:', error);
+    comp.mountPoint = comp.meta.did;
+    return comp;
+  }
+};
+
 const validateStore = (nodeInfo, storeUrl) => {
   if (nodeInfo.mode !== 'serverless') {
     return;
@@ -2306,4 +2334,5 @@ module.exports = {
   getPackConfig,
   getBlockletConfigObj,
   isDevelopmentMode,
+  resolveMountPointConflict,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.43-beta-20250419-231352-c78ac93d",
+  "version": "1.16.43-beta-20250422-042711-c40bec75",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,20 +19,20 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@abtnode/auth": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@abtnode/certificate-manager": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@abtnode/constant": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@abtnode/cron": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@abtnode/docker-utils": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@abtnode/logger": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@abtnode/models": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@abtnode/queue": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@abtnode/rbac": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@abtnode/router-provider": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@abtnode/static-server": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@abtnode/timemachine": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@abtnode/util": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/analytics": "1.16.43-beta-20250422-042711-c40bec75",
+    "@abtnode/auth": "1.16.43-beta-20250422-042711-c40bec75",
+    "@abtnode/certificate-manager": "1.16.43-beta-20250422-042711-c40bec75",
+    "@abtnode/constant": "1.16.43-beta-20250422-042711-c40bec75",
+    "@abtnode/cron": "1.16.43-beta-20250422-042711-c40bec75",
+    "@abtnode/docker-utils": "1.16.43-beta-20250422-042711-c40bec75",
+    "@abtnode/logger": "1.16.43-beta-20250422-042711-c40bec75",
+    "@abtnode/models": "1.16.43-beta-20250422-042711-c40bec75",
+    "@abtnode/queue": "1.16.43-beta-20250422-042711-c40bec75",
+    "@abtnode/rbac": "1.16.43-beta-20250422-042711-c40bec75",
+    "@abtnode/router-provider": "1.16.43-beta-20250422-042711-c40bec75",
+    "@abtnode/static-server": "1.16.43-beta-20250422-042711-c40bec75",
+    "@abtnode/timemachine": "1.16.43-beta-20250422-042711-c40bec75",
+    "@abtnode/util": "1.16.43-beta-20250422-042711-c40bec75",
     "@arcblock/did": "1.20.1",
     "@arcblock/did-auth": "1.20.1",
     "@arcblock/did-ext": "^1.20.1",
@@ -43,13 +43,14 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.20.1",
     "@arcblock/vc": "1.20.1",
-    "@blocklet/constant": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@blocklet/constant": "1.16.43-beta-20250422-042711-c40bec75",
     "@blocklet/did-space-js": "^1.0.48",
-    "@blocklet/env": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@blocklet/meta": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@blocklet/resolver": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@blocklet/sdk": "1.16.43-beta-20250419-231352-c78ac93d",
-    "@blocklet/store": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@blocklet/env": "1.16.43-beta-20250422-042711-c40bec75",
+    "@blocklet/meta": "1.16.43-beta-20250422-042711-c40bec75",
+    "@blocklet/resolver": "1.16.43-beta-20250422-042711-c40bec75",
+    "@blocklet/sdk": "1.16.43-beta-20250422-042711-c40bec75",
+    "@blocklet/store": "1.16.43-beta-20250422-042711-c40bec75",
+    "@blocklet/theme": "^2.13.9",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.20.1",
     "@ocap/util": "1.20.1",
@@ -111,5 +112,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "207acad34e8ccf318cd7539c1ac717cee7951b53"
+  "gitHead": "836a400c1f953f421a8e95dc9a32ba883ac2586d"
 }