@abtnode/core 1.16.44-beta-20250512-155818-937e465d → 1.16.44-beta-20250516-225119-c0b5ec8d

package/lib/api/team.js

@@ -29,7 +29,7 @@ const {
   upsertToPassports,
   createUserPassport,
 } = require('@abtnode/auth/lib/passport');
-const formatError = require('@abtnode/util/lib/format-error');
+const { formatError } = require('@blocklet/error');
 const { getPassportStatusEndpoint, getApplicationInfo } = require('@abtnode/auth/lib/auth');
 const { callFederated, getFederatedMaster, findFederatedSite } = require('@abtnode/auth/lib/util/federated');
 const { hasActiveOwnerPassport } = require('@abtnode/util/lib/passport');
@@ -47,7 +47,7 @@ const { validateTrustedPassportIssuers } = require('../validators/trusted-passpo
 const { validateTrustedFactories } = require('../validators/trusted-factory');
 const { validateCreateRole, validateUpdateRole } = require('../validators/role');
 const { validateCreatePermission, validateUpdatePermission } = require('../validators/permission');
-
+const { BlockletRuntimeMonitor } = require('../monitor/blocklet-runtime-monitor');
 const { getBlocklet } = require('../util/blocklet');
 const StoreUtil = require('../util/store');
 const { profileSchema } = require('../validators/user');
@@ -156,6 +156,9 @@ const getUserSessionWhere = ({ status, blocklet }) => {
       updatedAt: {
         [Op.gt]: new Date(now - sessionTtl * 1000),
       },
+      status: {
+        [Op.ne]: 'offline',
+      },
     };
   }
   if (status === 'expired') {
@@ -163,6 +166,14 @@ const getUserSessionWhere = ({ status, blocklet }) => {
       updatedAt: {
         [Op.lt]: new Date(now - sessionTtl * 1000),
       },
+      status: {
+        [Op.ne]: 'offline',
+      },
+    };
+  }
+  if (status === 'offline') {
+    return {
+      status: 'offline',
     };
   }
   return {};
@@ -195,6 +206,8 @@ class TeamAPI extends EventEmitter {
       1000 * 10, // 30s 节流
       { leading: true, trailing: true }
     );
+
+    this.runtimeMonitor = new BlockletRuntimeMonitor({ states });
   }
 
   getThrottledEmit(teamDid) {
@@ -221,6 +234,7 @@ class TeamAPI extends EventEmitter {
       limit: 1,
     });
     const backup = Array.isArray(backups) && backups.length > 0 ? backups[0] : null;
+    const appRuntimeInfo = await this.runtimeMonitor.getBlockletRuntimeInfo(teamDid);
 
     return {
       user: {
@@ -232,6 +246,7 @@ class TeamAPI extends EventEmitter {
         activePassports,
       },
       backup,
+      appRuntimeInfo,
     };
   }
 
@@ -2264,7 +2279,7 @@ class TeamAPI extends EventEmitter {
     if (nodeInfo.did === teamDid) {
       return 0;
     }
-    const state = await this.getUserSessionState(teamDid);
+    const userSessionState = await this.getUserSessionState(teamDid);
     const where = { userDid };
     if (visitorId) where.visitorId = visitorId;
     if (appPid) where.appPid = appPid;
@@ -2272,8 +2287,7 @@ class TeamAPI extends EventEmitter {
     const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs, useCache: true });
     const whereStatus = getUserSessionWhere({ status, blocklet });
     Object.assign(where, whereStatus);
-    // HACK: 使用 state.remove 并不能按预期工作，先改为使用 state.model.destroy 来实现
-    const result = await state.model.destroy({ where });
+    const result = await userSessionState.update(where, { $set: { status: 'offline' } });
     const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
     const masterSite = getFederatedMaster(blocklet);
     if (masterSite && masterSite.isMaster !== false && masterSite.appPid !== teamDid) {

package/lib/blocklet/downloader/resolve-download.js

@@ -106,7 +106,8 @@ const resolveDiffDownload = async (
 
   logger.info('Resolve diff download', { tarFile, cwd });
   const downloadDir = path.join(path.dirname(tarFile), path.basename(tarFile, path.extname(tarFile)));
-  const diffDir = `${downloadDir}-diff`;
+  let diffDir = `${downloadDir}-diff`;
+  const baseDiffDir = diffDir;
   try {
     await expandTarball({ source: tarFile, dest: diffDir, strip: 0 });
     fs.removeSync(tarFile);
@@ -115,6 +116,12 @@ const resolveDiffDownload = async (
     logger.error('expand blocklet tar file error', { error });
     throw error;
   }
+  if (
+    !fs.existsSync(path.join(diffDir, 'blocklet.yml')) &&
+    fs.existsSync(path.join(diffDir, 'package', 'blocklet.yml'))
+  ) {
+    diffDir = path.join(diffDir, 'package');
+  }
   logger.info('Copy installDir to downloadDir', { installDir: distDir, downloadDir });
   await fs.copy(getBundleDir(distDir, oldMeta), downloadDir);
   try {
@@ -141,7 +148,7 @@ const resolveDiffDownload = async (
       }
     };
     await walkDiff(diffDir);
-    fs.removeSync(diffDir);
+    fs.removeSync(baseDiffDir);
     const meta = getBlockletMeta(downloadDir);
     if (dist?.integrity) {
       meta.dist = dist;

package/lib/blocklet/manager/disk.js

@@ -235,6 +235,7 @@ const ensureBlockletRunning = require('./ensure-blocklet-running');
 
 const { transformNotification } = require('../../util/notification');
 const { generateUserUpdateData } = require('../../util/user');
+const { blockletThemeSchema } = require('../../validators/theme');
 const checkDNS = require('../../util/check-dns.js');
 
 const { formatEnvironments, getBlockletMeta, validateOwner, isCLI } = util;
@@ -257,9 +258,6 @@ const USER_PROFILE_SYNC_FIELDS = [
   'phoneVerified',
 ];
 
-const startTime = Date.now();
-const TWO_DAYS = 2 * 24 * 60 * 60 * 1000;
-
 const getHookArgs = (blocklet) => ({
   output: blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? '' : path.join(blocklet.env.logsDir, 'output.log'),
   error: blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? '' : path.join(blocklet.env.logsDir, 'error.log'),
@@ -1908,7 +1906,12 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   async configTheme({ did, theme = {} }, context) {
-    await states.blockletExtras.setSettings(did, { theme });
+    const { error, value } = blockletThemeSchema.validate(theme);
+    if (error) {
+      throw new Error(error.message);
+    }
+
+    await states.blockletExtras.setSettings(did, { theme: value });
 
     const newState = await this.getBlocklet(did);
     this.emit(BlockletInternalEvents.appSettingChanged, { appDid: did });
@@ -2329,16 +2332,19 @@ class DiskBlockletManager extends BaseBlockletManager {
     await Promise.all(
       customAliases.map(async (alias) => {
         const dns = await checkDNS(alias.value, cnameDomain?.value);
+        logger.info('dns info', { dns });
         if (!dns.isDnsResolved || !dns.isCnameMatch) {
           return;
         }
 
         if (!alias.certificateId) {
+          logger.info('cron check dns no certificate');
           await issueCert(alias);
           return;
         }
 
         const cert = await this.certManager.manager.getByDomain(alias.value);
+        logger.info('cron check dns certificate', { cert });
         if (cert?.status === 'error') {
           await issueCert(alias);
         }
@@ -2424,10 +2430,6 @@ class DiskBlockletManager extends BaseBlockletManager {
         time: '*/10 * * * *',
         options: { runOnInit: false },
         fn: () => {
-          if (Date.now() - startTime > TWO_DAYS) {
-            return;
-          }
-
           const fn = this.updateAllBlockletCertificate.bind(this);
           fn();
         },

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

@@ -38744,7 +38744,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.8","@arcblock/did-auth":"1.20.8","@arcblock/did-ext":"1.20.8","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.8","@arcblock/event-hub":"1.20.8","@arcblock/jwt":"1.20.8","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.8","@arcblock/vc":"1.20.8","@blocklet/constant":"1.16.43","@blocklet/did-space-js":"^1.0.51","@blocklet/env":"1.16.43","@blocklet/error":"^0.2.4","@blocklet/meta":"1.16.43","@blocklet/resolver":"1.16.43","@blocklet/sdk":"1.16.43","@blocklet/store":"1.16.43","@blocklet/theme":"^2.13.29","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.8","@ocap/util":"1.20.8","@ocap/wallet":"1.20.8","@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.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.53","@blocklet/env":"1.16.43","@blocklet/error":"^0.2.4","@blocklet/meta":"1.16.43","@blocklet/resolver":"1.16.43","@blocklet/sdk":"1.16.43","@blocklet/store":"1.16.43","@blocklet/theme":"^2.13.37","@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"}');
 
 /***/ }),
 

package/lib/blocklet/project/publish-to-endpoint.js

@@ -11,7 +11,6 @@ const tar = require('tar');
 
 const { default: axios } = require('axios');
 const hashFiles = require('@abtnode/util/lib/hash-files');
-const isPathPrefixEqual = require('@abtnode/util/lib/is-path-prefix-equal');
 const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const { hasMountPoint } = require('@blocklet/meta/lib/engine');
 const urlPathFriendly = require('@blocklet/meta/lib/url-path-friendly').default;
@@ -162,48 +161,6 @@ const publishToEndpoint = async ({ did, projectId, endpointId, releaseId, manage
     }
   }
 
-  let blockletDiff;
-  try {
-    blockletDiff = await client.getBlockletDiff(
-      {
-        input: {
-          did: localMeta.did,
-          hashFiles: Object.entries(files).map(([file, hash]) => ({ file, hash })),
-          rootDid: rootDid || '',
-        },
-      },
-      {
-        headers: {
-          'x-access-blocklet': rootDid,
-        },
-      }
-    );
-  } catch (error) {
-    throw new Error(`Blocklet deploy failed when fetching diff: ${formatError(error)}`);
-  }
-
-  logger.info(`blockletDiff: ${JSON.stringify(blockletDiff)}`);
-
-  const {
-    addSet = [],
-    changeSet = [],
-    deleteSet = [],
-    hasBlocklet: hasDiff,
-    version: serverVersion,
-  } = blockletDiff.blockletDiff || {};
-  const diffList = hasDiff ? [...addSet, ...changeSet] : null;
-
-  // if no diff and mountPoint not changed, stop deploy
-  if (hasDiff && localMeta.version === serverVersion && !addSet.length && !changeSet.length && !deleteSet.length) {
-    let needNotDeploy = true;
-    const child = app.children.find((x) => x.meta.did === localMeta.did);
-    needNotDeploy = isPathPrefixEqual(mountPoint, child?.mountPoint);
-
-    if (needNotDeploy) {
-      logger.info(`${localMeta.title}@${localMeta.version} already exists in ${app.meta.title}`);
-      return;
-    }
-  }
   logger.info(`start deploy ${localMeta.name}@${localMeta.version} to ${connected.endpoint}`);
 
   const tarFile = path.join(releaseDir, `${slugify(localMeta.name)}-${localMeta.version}.tgz`);
@@ -211,17 +168,14 @@ const publishToEndpoint = async ({ did, projectId, endpointId, releaseId, manage
     {
       file: tarFile,
       cwd: bundleDir,
-      filter: (f) => !diffList || fileFilter(f.replace(/^\.\//, ''), { diffList }),
+      filter: (f) => !files || fileFilter(f.replace(/^\.\//, ''), { files }),
     },
     ['.']
   );
 
   const { form } = makeFormData({
     tarFile,
-    hasDiff,
     did: localMeta.did,
-    serverVersion,
-    deleteSet,
     mountPoint,
     rootDid,
     dist: {

package/lib/blocklet/security/vault.js

@@ -6,7 +6,7 @@ const { isValid, isFromPublicKey } = require('@arcblock/did');
 const { getBlockletAppIdList } = require('@blocklet/meta/lib/util');
 const { verifyVault } = require('@blocklet/meta/lib/security');
 const { getWalletDid } = require('@blocklet/meta/lib/did-utils');
-const formatError = require('@abtnode/util/lib/format-error');
+const { formatError } = require('@blocklet/error');
 
 const logger = require('@abtnode/logger')('@abtnode/core');
 

package/lib/event/index.js

@@ -22,6 +22,7 @@ const {
 } = require('@abtnode/constant');
 const { joinURL } = require('ufo');
 const { encode } = require('@abtnode/util/lib/base32');
+const dayjs = require('dayjs');
 
 const { NodeMonitSender } = require('../monitor/node-monit-sender');
 const { isCLI } = require('../util');
@@ -652,11 +653,11 @@ module.exports = ({
     };
 
     const translation = translations[locale] || translations.en;
-    const localeMap = {
-      en: 'en-US',
-      zh: 'zh-CN',
-    };
-    const targetLocale = localeMap[locale] || localeMap.en;
+    // const localeMap = {
+    //   en: 'en-US',
+    //   zh: 'zh-CN',
+    // };
+    // const targetLocale = localeMap[locale] || localeMap.en;
     const notification = {
       title: translation.title,
       body: translation.body,
@@ -679,7 +680,7 @@ module.exports = ({
             },
             {
               type: 'text',
-              data: { type: 'plain', text: userSession.updatedAt.toLocaleString(targetLocale) },
+              data: { type: 'plain', text: dayjs(userSession.updatedAt).utc().format('YYYY-MM-DD HH:mm:ss [UTC]') },
             },
           ],
         },

package/lib/monitor/blocklet-runtime-monitor.js

@@ -220,6 +220,23 @@ class BlockletRuntimeMonitor extends EventEmitter {
     }
   }
 
+  async getBlockletRuntimeInfo(blockletDid) {
+    if (this.getRuntimeInfo(blockletDid)) {
+      return this.getRuntimeInfo(blockletDid);
+    }
+
+    const blocklets = await this.states.blocklet.getBlocklets();
+    const blocklet = blocklets.find((x) => x.meta.did === blockletDid);
+
+    if (blocklet) {
+      await this._monit(blocklet, { addToHistory: true }).catch((err) => {
+        this.logger.error('failed to get blocklet runtime info', { error: err });
+      });
+    }
+
+    return this.getRuntimeInfo(blockletDid);
+  }
+
   delete(blockletDid) {
     delete this.data[blockletDid];
   }

package/lib/states/access-key.js

@@ -3,7 +3,7 @@ const { Op } = require('sequelize');
 const { isValid } = require('@arcblock/did');
 const { fromRandom, fromPublicKey } = require('@ocap/wallet');
 const { toBase58, fromBase58 } = require('@ocap/util');
-const CustomError = require('@abtnode/util/lib/custom-error');
+const { CustomError } = require('@blocklet/error');
 
 const logger = require('@abtnode/logger')('@abtnode/core:states:access-key');
 const BaseState = require('./base');

package/lib/states/backup.js

@@ -1,6 +1,6 @@
 const { Joi } = require('@arcblock/validator');
 const { BACKUPS } = require('@abtnode/constant');
-const CustomError = require('@abtnode/util/lib/custom-error');
+const { CustomError } = require('@blocklet/error');
 
 const { Op } = require('sequelize');
 const dayjs = require('@abtnode/util/lib/dayjs');

package/lib/states/blocklet-extras.js

@@ -4,7 +4,7 @@
 const logger = require('@abtnode/logger')('@abtnode/core:states:blocklet-extras');
 const camelCase = require('lodash/camelCase');
 const get = require('lodash/get');
-const CustomError = require('@abtnode/util/lib/custom-error');
+const { CustomError } = require('@blocklet/error');
 
 const BaseState = require('./base');
 

package/lib/states/blocklet.js

@@ -9,7 +9,7 @@ const cloneDeep = require('@abtnode/util/lib/deep-clone');
 const detectPort = require('detect-port');
 const Lock = require('@abtnode/util/lib/lock');
 const security = require('@abtnode/util/lib/security');
-const CustomError = require('@abtnode/util/lib/custom-error');
+const { CustomError } = require('@blocklet/error');
 const { fixPerson, fixInterfaces } = require('@blocklet/meta/lib/fix');
 const {
   getDisplayName,

package/lib/states/node.js

@@ -3,7 +3,7 @@ const semver = require('semver');
 const omit = require('lodash/omit');
 const isEmpty = require('lodash/isEmpty');
 const security = require('@abtnode/util/lib/security');
-const CustomError = require('@abtnode/util/lib/custom-error');
+const { CustomError } = require('@blocklet/error');
 const { generateRandomString } = require('@abtnode/models/lib/util');
 const { isFromPublicKey } = require('@arcblock/did');
 const SingleFlightLRUCache = require('@abtnode/util/lib/single-flight-lru-cache');

package/lib/states/oauth-client.js

@@ -1,7 +1,7 @@
 const crypto = require('crypto');
 const uuid = require('uuid');
 const { OAUTH_CLIENT_SECRET_TTL } = require('@abtnode/constant');
-const CustomError = require('@abtnode/util/lib/custom-error');
+const { CustomError } = require('@blocklet/error');
 const BaseState = require('./base');
 const { oauthClientSchema } = require('../validators/oauth');
 

package/lib/states/project.js

@@ -1,6 +1,6 @@
 const pickBy = require('lodash/pickBy');
 const pick = require('lodash/pick');
-const CustomError = require('@abtnode/util/lib/custom-error');
+const { CustomError } = require('@blocklet/error');
 const BaseState = require('./base');
 
 const isUndefinedOrNull = (x) => x === undefined || x === null;

package/lib/states/session.js

@@ -1,6 +1,6 @@
 const { getRandomBytes } = require('@ocap/mcrypto');
 const omit = require('lodash/omit');
-const CustomError = require('@abtnode/util/lib/custom-error');
+const { CustomError } = require('@blocklet/error');
 const BaseState = require('./base');
 
 /**

package/lib/states/user.js

@@ -9,7 +9,7 @@ const { BaseState } = require('@abtnode/models');
 const { Sequelize, Op } = require('sequelize');
 const { updateConnectedAccount } = require('@abtnode/util/lib/user');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
-const CustomError = require('@abtnode/util/lib/custom-error');
+const { CustomError } = require('@blocklet/error');
 
 const logger = require('@abtnode/logger')('@abtnode/core:states:user');
 

package/lib/states/verify-code.js

@@ -1,6 +1,6 @@
 const logger = require('@abtnode/logger')('@abtnode/core:states:verify-code');
 
-const CustomError = require('@abtnode/util/lib/custom-error');
+const { CustomError } = require('@blocklet/error');
 const { Hasher } = require('@ocap/mcrypto');
 const { Joi } = require('@arcblock/validator');
 const { VERIFY_CODE_LENGTH, VERIFY_CODE_TTL, VERIFY_SEND_TTL } = require('@abtnode/constant');

package/lib/team/manager.js

@@ -26,7 +26,7 @@ const {
 const { isActivityIncluded } = require('@abtnode/util/lib/notification-preview/util');
 const { joinURL, withHttps } = require('ufo');
 const { isCustomDomain } = require('@abtnode/util/lib/url-evaluation');
-
+const dayjs = require('dayjs');
 const { getDidDomainForBlocklet } = require('@abtnode/util/lib/get-domain-for-blocklet');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const { getDomainsByDid } = require('../router/helper');
@@ -196,6 +196,13 @@ class TeamManager extends EventEmitter {
     return this.getState(teamDid, 'verifyCode');
   }
 
+  /**
+   * 判断 passport 是否已经过期
+   */
+  isPassportExpired(passport) {
+    return passport.status !== 'valid' || (passport.expirationDate && dayjs(passport.expirationDate).isBefore(dayjs()));
+  }
+
   async getNotificationReceivers(payload) {
     const { teamDid, userDids = [], roles = [], selection = {}, includeConnectedAccounts = false } = payload;
     // 会根据 teamDid 返回对应 state
@@ -217,9 +224,20 @@ class TeamManager extends EventEmitter {
             approved: true,
             selection,
             includeConnectedAccounts,
+            includePassports: true,
           },
         });
-        users = users.concat(queryUsers);
+
+        const validUsers = queryUsers.filter((user) => {
+          const { passports } = user;
+          if (passports.length && passports.some((x) => !this.isPassportExpired(x))) {
+            return true;
+          }
+          logger.warn(`user's passports are all expired: ${user.did}`);
+          return false;
+        });
+
+        users = users.concat(validUsers);
       }
 
       return users;
@@ -487,7 +505,8 @@ class TeamManager extends EventEmitter {
       const receivers = await this._getReceiverList(teamDid, receiver, isExist);
 
       if (!receivers?.length && process.env.NODE_ENV !== 'test') {
-        throw new Error('receivers is empty');
+        logger.warn('No valid receivers', { teamDid, receiver });
+        throw new Error('No valid receivers');
       }
 
       const notificationActor = notification?.activity?.actor || payload.activity?.actor;

package/lib/util/blocklet.js

@@ -60,6 +60,7 @@ 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 { hasMountPoint } = require('@blocklet/meta/lib/engine');
 
 const SCRIPT_ENGINES_WHITE_LIST = ['npm', 'npx', 'pnpm', 'yarn'];
 
@@ -1943,7 +1944,7 @@ const resolveMountPointConflict = (comp, blocklet) => {
   try {
     if (!comp?.mountPoint) return comp;
 
-    const children = blocklet?.children || [];
+    const children = (blocklet?.children || []).filter((x) => x?.meta && hasMountPoint(x.meta));
 
     const existingComponent = children.find((x) => x.mountPoint === comp.mountPoint && x.meta?.did !== comp.meta?.did);
     if (!existingComponent) return comp;

package/lib/util/docker/check-docker-installed.js

@@ -1,35 +1,27 @@
 const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
 const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
 
-const checkDockerInstalledCache = {
-  checked: false,
-  installed: false,
-};
-
-async function checkDockerInstalled() {
-  if (process.env.ABT_NODE_NOT_ALLOW_DOCKER) {
-    return false;
-  }
+let lastTime = 0;
+let lastResultPromise = null;
 
-  if (checkDockerInstalledCache.checked) {
-    return checkDockerInstalledCache.installed;
+function checkDockerInstalled() {
+  const now = Date.now();
+  if (now - lastTime < 5000 && lastResultPromise) {
+    return lastResultPromise;
   }
-
-  try {
-    await promiseSpawn('docker --version', { mute: true });
-    const output = await promiseSpawn('docker ps -a', { mute: true });
-    logger.info(`Docker is installed: ${output.trim()}`);
-    checkDockerInstalledCache.installed = true;
-  } catch (_) {
-    checkDockerInstalledCache.installed = false;
-  } finally {
-    checkDockerInstalledCache.checked = true;
-  }
-
-  return checkDockerInstalledCache.installed;
+  lastTime = now;
+  lastResultPromise = (async () => {
+    if (process.env.ABT_NODE_NOT_ALLOW_DOCKER) return false;
+    try {
+      await promiseSpawn('docker ps', { mute: true });
+      logger.info('Docker is installed');
+      return true;
+    } catch {
+      return false;
+    }
+  })();
+  return lastResultPromise;
 }
-
 module.exports = {
   checkDockerInstalled,
-  checkDockerInstalledCache,
 };

package/lib/util/docker/check-need-run-docker.js

@@ -1,6 +1,6 @@
 const { NODE_MODES } = require('@abtnode/constant');
 const { BLOCKLET_MODES } = require('@blocklet/constant');
-const { checkDockerInstalled, checkDockerInstalledCache } = require('./check-docker-installed');
+const { checkDockerInstalled } = require('./check-docker-installed');
 
 async function checkNeedRunDocker(meta = {}, env = {}, nodeInfo = {}) {
   if (!process.env.ABT_NODE_DATA_DIR) {
@@ -27,7 +27,6 @@ async function checkNeedRunDocker(meta = {}, env = {}, nodeInfo = {}) {
 
   // Ensure Docker is installed
   if (!nodeInfo.isDockerInstalled) {
-    checkDockerInstalledCache.checked = false;
     if (!(await checkDockerInstalled())) {
       throw new Error('Docker is not installed');
     }

package/lib/util/docker/docker-container-prune.js

@@ -2,7 +2,7 @@ const pm2 = require('@abtnode/util/lib/async-pm2');
 const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
 const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
 
-const { checkDockerInstalled, checkDockerInstalledCache } = require('./check-docker-installed');
+const { checkDockerInstalled } = require('./check-docker-installed');
 const parseDockerName = require('./parse-docker-name');
 const promiseDebounce = require('../promise-debounce');
 
@@ -14,7 +14,8 @@ async function pruneDockerNetwork() {
   }
   pruneLock = true;
   try {
-    if (checkDockerInstalledCache.installed) {
+    const isDockerInstalled = await checkDockerInstalled();
+    if (isDockerInstalled) {
       await promiseSpawn('docker network prune -f');
     }
   } catch (e) {

package/lib/util/docker/docker-network.js

@@ -3,7 +3,7 @@ const logger = require('@abtnode/logger')('@abtnode/docker-network');
 const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
 const LockFile = require('@abtnode/util/lib/lock-with-file');
 
-const { checkDockerInstalledCache, checkDockerInstalled } = require('./check-docker-installed');
+const { checkDockerInstalled } = require('./check-docker-installed');
 
 const lockFile = new LockFile(
   process.env.ABT_NODE_DATA_DIR ? path.join(process.env.ABT_NODE_DATA_DIR, 'tmp', 'docker-network-locks') : '',
@@ -29,7 +29,8 @@ setInterval(
       if (!lockFile.tryLock(networkPruneLockName)) {
         return;
       }
-      if (checkDockerInstalledCache.installed) {
+      const isDockerInstalled = await checkDockerInstalled();
+      if (isDockerInstalled) {
         await promiseSpawn('docker network prune -f');
       }
       logger.info('docker prune network done');
@@ -47,7 +48,6 @@ async function _createDockerNetwork(dockerNetworkName, nodeInfo) {
     return;
   }
   if (!nodeInfo.isDockerInstalled) {
-    checkDockerInstalledCache.checked = false;
     if (!(await checkDockerInstalled())) {
       return;
     }

package/lib/util/domain-status.js

@@ -91,16 +91,26 @@ class DomainStatus extends EventEmitter {
   }
 
   checkDomainDNS(domain, cnameDomain) {
-    if (isCustomDomain(domain)) {
-      return checkDNS(domain, cnameDomain);
+    try {
+      if (isCustomDomain(domain)) {
+        return checkDNS(domain, cnameDomain);
+      }
+
+      return Promise.resolve({
+        isDnsResolved: true,
+        hasCname: true,
+        cnameRecords: [cnameDomain],
+        isCnameMatch: true,
+      });
+    } catch (error) {
+      logger.error('check domain dns error', error?.message);
+      return Promise.resolve({
+        isDnsResolved: false,
+        hasCname: false,
+        cnameRecords: [],
+        isCnameMatch: false,
+      });
     }
-
-    return Promise.resolve({
-      isDnsResolved: true,
-      hasCname: true,
-      cnameRecords: [cnameDomain],
-      isCnameMatch: true,
-    });
   }
 
   async checkDomainsStatus({ domains, did } = {}) {
@@ -109,24 +119,16 @@ class DomainStatus extends EventEmitter {
       domains = await this.states.site.getBlockletDomains(did);
     }
 
+    const cnameDomain = domains.find((x) => isDidDomain(x));
+
     (domains || []).forEach((domain) => {
-      Promise.all([
-        this.getHttpsCert(domain),
-        checkDomainDnsWrapper(domain),
-        this.checkDomainDNS(
-          domain,
-          domains.find((x) => isDidDomain(x))
-        ),
-      ])
+      Promise.all([this.getHttpsCert(domain), checkDomainDnsWrapper(domain), this.checkDomainDNS(domain, cnameDomain)])
         .then(([matchedCert, dns, dnsResolve]) => {
           const eventData = {
             domain,
             matchedCert,
             isHttps: !!matchedCert,
-            dns: {
-              ...dns,
-              ...dnsResolve,
-            },
+            dns: { ...dns, ...dnsResolve },
           };
 
           if (did) {

package/lib/util/launcher.js

@@ -491,6 +491,7 @@ const isDataRetentionExceeded = (terminatedAt) =>
   !!terminatedAt && dayjs().diff(dayjs(terminatedAt), 'days') > SERVERLESS_BLOCKLET_DATA_RETENTION_DAYS;
 
 const launchBlockletByLauncher = async (node, extraParams, context) => {
+  logger.debug('launchBlockletByLauncher', { extraParams, context });
   const checker = createServerlessInstallGuard(node, true);
 
   extraParams.locale = context.locale || 'en';

package/lib/validators/theme.js

@@ -0,0 +1,159 @@
+const Joi = require('joi');
+
+const colorString = Joi.string(); // Accepts rgba, hex, etc.
+
+const paletteColorSchema = Joi.object({
+  main: colorString,
+  contrastText: colorString.optional(),
+  light: colorString.optional(),
+  dark: colorString.optional(),
+});
+
+const greySchema = Joi.object({
+  50: colorString.optional(),
+  100: colorString.optional(),
+  200: colorString.optional(),
+  300: colorString.optional(),
+  400: colorString.optional(),
+  500: colorString.optional(),
+  600: colorString.optional(),
+  700: colorString.optional(),
+  800: colorString.optional(),
+  900: colorString.optional(),
+  A100: colorString.optional(),
+  A200: colorString.optional(),
+  A400: colorString.optional(),
+  A700: colorString.optional(),
+});
+
+const textSchema = Joi.object({
+  primary: colorString.optional(),
+  secondary: colorString.optional(),
+  disabled: colorString.optional(),
+  hint: colorString.optional(),
+  contrast: colorString.optional(),
+});
+
+const backgroundSchema = Joi.object({
+  default: colorString.optional(),
+  paper: colorString.optional(),
+});
+
+const commonSchema = Joi.object({
+  black: colorString.optional(),
+  white: colorString.optional(),
+});
+
+const actionSchema = Joi.object({
+  active: colorString.optional(),
+  hover: colorString.optional(),
+  hoverOpacity: Joi.number().optional(),
+  selected: colorString.optional(),
+  selectedOpacity: Joi.number().optional(),
+  disabled: colorString.optional(),
+  disabledBackground: colorString.optional(),
+  disabledOpacity: Joi.number().optional(),
+  focus: colorString.optional(),
+  focusOpacity: Joi.number().optional(),
+  activatedOpacity: Joi.number().optional(),
+});
+
+const paletteSchema = Joi.object({
+  mode: Joi.string().valid('light', 'dark').required(),
+  primary: paletteColorSchema.required(),
+  secondary: paletteColorSchema.required(),
+  error: paletteColorSchema.required(),
+  warning: paletteColorSchema.required(),
+  info: paletteColorSchema.required(),
+  success: paletteColorSchema.required(),
+  grey: greySchema.required(),
+  text: textSchema.required(),
+  divider: colorString.optional(),
+  background: backgroundSchema.optional(),
+  common: commonSchema.optional(),
+  action: actionSchema.optional(),
+  storeSecondary: paletteColorSchema.optional(),
+  did: Joi.object({
+    primary: colorString.optional(),
+    secondary: colorString.optional(),
+  }).optional(),
+});
+
+const shapeSchema = Joi.object({
+  borderRadius: Joi.number().optional(),
+});
+
+const typographyVariantSchema = Joi.object({
+  fontSize: Joi.alternatives(Joi.string(), Joi.number()).optional(),
+  lineHeight: Joi.alternatives(Joi.string(), Joi.number()).optional(),
+  fontWeight: Joi.number().optional(),
+  textTransform: Joi.string().optional(),
+  fontFamily: Joi.string().optional(),
+});
+
+const allowedTypographyVariants = [
+  'h1',
+  'h2',
+  'h3',
+  'h4',
+  'h5',
+  'h6',
+  'subtitle1',
+  'subtitle2',
+  'body1',
+  'body2',
+  'caption',
+  'overline',
+  'button',
+  'allVariants',
+];
+const typographySchema = Joi.object({
+  fontSize: Joi.number().optional(),
+  fontFamily: Joi.string().optional(),
+  color: Joi.object({
+    main: colorString.optional(),
+    gray: colorString.optional(),
+  }).optional(),
+  ...Object.fromEntries(allowedTypographyVariants.map((v) => [v, typographyVariantSchema.optional()])),
+});
+
+const breakpointsSchema = Joi.object({
+  values: Joi.object({
+    xs: Joi.number().optional(),
+    sm: Joi.number().optional(),
+    md: Joi.number().optional(),
+    lg: Joi.number().optional(),
+    xl: Joi.number().optional(),
+  }).optional(),
+});
+
+const shadowsSchema = Joi.array().items(Joi.string()).min(1).max(25);
+
+const styleOverrideSchema = Joi.object().pattern(Joi.string(), Joi.any());
+
+const componentsSchema = Joi.object().pattern(
+  Joi.string(),
+  Joi.object({
+    styleOverrides: styleOverrideSchema.optional(),
+  })
+);
+
+const muiThemeSchema = Joi.object({
+  palette: paletteSchema.optional(),
+  shape: shapeSchema.optional(),
+  typography: typographySchema.optional(),
+  breakpoints: breakpointsSchema.optional(),
+  shadows: shadowsSchema.optional(),
+  components: componentsSchema.optional(),
+}).options({ allowUnknown: true, stripUnknown: true });
+
+const blockletThemeSchema = Joi.object({
+  light: muiThemeSchema.required(),
+  dark: muiThemeSchema.required(),
+  prefer: Joi.string().valid('light', 'dark', 'system').default('light'),
+}).options({ allowUnknown: true, stripUnknown: true });
+
+module.exports = {
+  muiThemeSchema,
+  blockletThemeSchema,
+};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.44-beta-20250512-155818-937e465d",
+  "version": "1.16.44-beta-20250516-225119-c0b5ec8d",
   "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-20250512-155818-937e465d",
-    "@abtnode/auth": "1.16.44-beta-20250512-155818-937e465d",
-    "@abtnode/certificate-manager": "1.16.44-beta-20250512-155818-937e465d",
-    "@abtnode/client": "1.16.44-beta-20250512-155818-937e465d",
-    "@abtnode/constant": "1.16.44-beta-20250512-155818-937e465d",
-    "@abtnode/cron": "1.16.44-beta-20250512-155818-937e465d",
-    "@abtnode/docker-utils": "1.16.44-beta-20250512-155818-937e465d",
-    "@abtnode/logger": "1.16.44-beta-20250512-155818-937e465d",
-    "@abtnode/models": "1.16.44-beta-20250512-155818-937e465d",
-    "@abtnode/queue": "1.16.44-beta-20250512-155818-937e465d",
-    "@abtnode/rbac": "1.16.44-beta-20250512-155818-937e465d",
-    "@abtnode/router-provider": "1.16.44-beta-20250512-155818-937e465d",
-    "@abtnode/static-server": "1.16.44-beta-20250512-155818-937e465d",
-    "@abtnode/timemachine": "1.16.44-beta-20250512-155818-937e465d",
-    "@abtnode/util": "1.16.44-beta-20250512-155818-937e465d",
-    "@arcblock/did": "1.20.8",
-    "@arcblock/did-auth": "1.20.8",
-    "@arcblock/did-ext": "1.20.8",
+    "@abtnode/analytics": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/auth": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/certificate-manager": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/client": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/constant": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/cron": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/docker-utils": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/logger": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/models": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/queue": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/rbac": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/router-provider": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/static-server": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/timemachine": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/util": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@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.8",
-    "@arcblock/event-hub": "1.20.8",
-    "@arcblock/jwt": "1.20.8",
+    "@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.8",
-    "@arcblock/vc": "1.20.8",
-    "@blocklet/constant": "1.16.44-beta-20250512-155818-937e465d",
-    "@blocklet/did-space-js": "^1.0.51",
-    "@blocklet/env": "1.16.44-beta-20250512-155818-937e465d",
+    "@arcblock/validator": "1.20.11",
+    "@arcblock/vc": "1.20.11",
+    "@blocklet/constant": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@blocklet/did-space-js": "^1.0.53",
+    "@blocklet/env": "1.16.44-beta-20250516-225119-c0b5ec8d",
     "@blocklet/error": "^0.2.4",
-    "@blocklet/meta": "1.16.44-beta-20250512-155818-937e465d",
-    "@blocklet/resolver": "1.16.44-beta-20250512-155818-937e465d",
-    "@blocklet/sdk": "1.16.44-beta-20250512-155818-937e465d",
-    "@blocklet/store": "1.16.44-beta-20250512-155818-937e465d",
-    "@blocklet/theme": "^2.13.29",
+    "@blocklet/meta": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@blocklet/resolver": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@blocklet/sdk": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@blocklet/store": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@blocklet/theme": "^2.13.37",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.20.8",
-    "@ocap/util": "1.20.8",
-    "@ocap/wallet": "1.20.8",
+    "@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",
@@ -116,5 +116,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "562fc0ac82df09c8fc50f27811565de331bda84d"
+  "gitHead": "eb15dee761c0ea273981c848992e5f29b94a69dc"
 }