@abtnode/core 1.16.44-beta-20250606-000924-3db49e6a → 1.16.45-beta-20250609-025419-7fd1f86c

package/lib/blocklet/manager/engine.js

@@ -1,5 +1,6 @@
 const shelljs = require('shelljs');
 const semver = require('semver');
+const { ABT_NODE_KERNEL_OR_BLOCKLET_MODE } = require('@blocklet/constant');
 const logger = require('@abtnode/logger')('@abtnode/core:blocklet:engine');
 
 // eslint-disable-next-line no-underscore-dangle
@@ -48,7 +49,10 @@ const engineMap = new Map([
       displayName: 'Node.js',
       interpreter: 'node',
       description: 'Powered by Node.js',
-      args: '--max-http-header-size=16384',
+      args:
+        process.env.ABT_NODE_KERNEL_MODE === ABT_NODE_KERNEL_OR_BLOCKLET_MODE.PERFORMANT
+          ? '--max-http-header-size=16384'
+          : '--max-http-header-size=16384 --optimize_for_size',
       visible: true,
       version() {
         return _getVersion(() => process.version, this.name);

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

@@ -38888,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.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"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.44","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.44","@abtnode/auth":"1.16.44","@abtnode/db-cache":"1.16.44","@abtnode/certificate-manager":"1.16.44","@abtnode/client":"1.16.44","@abtnode/constant":"1.16.44","@abtnode/cron":"1.16.44","@abtnode/docker-utils":"1.16.44","@abtnode/logger":"1.16.44","@abtnode/models":"1.16.44","@abtnode/queue":"1.16.44","@abtnode/rbac":"1.16.44","@abtnode/router-provider":"1.16.44","@abtnode/static-server":"1.16.44","@abtnode/timemachine":"1.16.44","@abtnode/util":"1.16.44","@arcblock/did":"1.20.14","@arcblock/did-auth":"1.20.14","@arcblock/did-ext":"1.20.14","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.14","@arcblock/event-hub":"1.20.14","@arcblock/jwt":"1.20.14","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.14","@arcblock/vc":"1.20.14","@blocklet/constant":"1.16.44","@blocklet/did-space-js":"^1.0.58","@blocklet/env":"1.16.44","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.44","@blocklet/resolver":"1.16.44","@blocklet/sdk":"1.16.44","@blocklet/store":"1.16.44","@blocklet/theme":"^2.13.62","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.14","@ocap/util":"1.20.14","@ocap/wallet":"1.20.14","@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","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/router/manager.js

@@ -342,49 +342,14 @@ class RouterManager extends EventEmitter {
     }
 
     if (issueCert) {
-      const didDomain = doc.domainAliases.find((x) => isDidDomain(x.value));
-      const [dnsValue, cert] = await Promise.all([
-        this.checkDomainDNS(domain, didDomain?.value),
-        this.getHttpsCert({ domain }),
-      ]);
-
-      // 自定义域名如果 DNS 未解析成功 或 CNAME 不匹配 或 已配置证书，则不自动颁发证书
-      const shouldSkipCertIssue =
-        isCustomDomain(domain) && (!dnsValue.isDnsResolved || !dnsValue.isCnameMatch || !!cert);
-
-      if (shouldSkipCertIssue) {
-        const reasonFn = () => {
-          if (cert) {
-            return 'cert already exists';
-          }
-
-          if (!dnsValue.isDnsResolved) {
-            return 'DNS not resolved';
-          }
-
-          if (!dnsValue.isCnameMatch) {
-            return 'CNAME not match';
-          }
-
-          return 'unknown reason';
-        };
-
-        logger.info('skip cert issue for domain alias', {
-          cert,
-          domain,
-          dnsValue,
-          reason: reasonFn(),
+      logger.info('try to issue cert', { domain, id });
+      this.issueCert({ did, siteId: id, site: doc, domain, inBlockletSetup })
+        .then(() => {
+          logger.info('try to issue cert done', { domain, id });
+        })
+        .catch((error) => {
+          logger.error('try to issue cert failed', { error, domain, id });
         });
-      } else {
-        this.certManager
-          .issue({ domain, did, siteId: id, inBlockletSetup }, { delay: 3000 })
-          .then(() => {
-            logger.info('issue cert for domain alias', { domain, did });
-          })
-          .catch((error) => {
-            logger.error('issue cert for domain alias failed', { error, domain, did });
-          }); // 延迟 5s, 需要等待的原因: Nginx Reload, DNS 生效
-      }
     }
 
     const newSite = await states.site.findOne({ id });
@@ -688,6 +653,48 @@ class RouterManager extends EventEmitter {
     }
   }
 
+  async issueCert({ did, siteId, site, domain, inBlockletSetup = false }) {
+    const didDomain = site.domainAliases.find((x) => isDidDomain(x.value));
+    const [dnsValue, cert] = await Promise.all([
+      this.checkDomainDNS(domain, didDomain?.value),
+      this.getHttpsCert({ domain }),
+    ]);
+
+    // 自定义域名如果 DNS 未解析成功 或 CNAME 不匹配 或 已配置证书，则不自动颁发证书
+    const shouldSkipCertIssue = isCustomDomain(domain) && (!dnsValue.isDnsResolved || !dnsValue.isCnameMatch || !!cert);
+
+    if (shouldSkipCertIssue) {
+      const reasonFn = () => {
+        if (cert) {
+          return 'cert already exists';
+        }
+
+        if (!dnsValue.isDnsResolved) {
+          return 'DNS not resolved';
+        }
+
+        if (!dnsValue.isCnameMatch) {
+          return 'CNAME not match';
+        }
+
+        return 'unknown reason';
+      };
+
+      logger.warn('skip cert issue for domain alias', {
+        cert,
+        domain,
+        dnsValue,
+        reason: reasonFn(),
+      });
+
+      return;
+    }
+
+    // 延迟 3s, 需要等待的原因: Nginx Reload, DNS 生效
+    await this.certManager.issue({ domain, did, siteId, inBlockletSetup }, { delay: 3000 });
+    logger.info('issue cert for domain alias', { domain, did });
+  }
+
   async getHttpsCert({ domain }) {
     const matchedCert = await this.getMatchedCert(domain);
 

package/lib/router/monitor.js

@@ -35,9 +35,10 @@ function parseLogEntry(line, check = true) {
       logEntry.status >= 500 &&
       logEntry.status !== 503 &&
       logEntry.status <= 599 &&
-      logEntry.request.includes('/.well-known/did.json') === false &&
-      logEntry.request.includes('/websocket') === false &&
-      logEntry.request.includes(`${WELLKNOWN_SERVICE_PATH_PREFIX}/health`) === false
+      logEntry.userAgent?.includes('Prometheus') === false &&
+      logEntry.request?.includes('/.well-known/did.json') === false &&
+      logEntry.request?.includes('/websocket') === 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

@@ -719,6 +719,11 @@ const fixActor = (actor) => {
  * @extends BaseState<import('@abtnode/models').AuditLogState>
  */
 class AuditLogState extends BaseState {
+  constructor(...args) {
+    super(...args);
+    this.enableCountCache = `audit-log-count-${Math.random().toString(36).substring(2, 15)}`;
+  }
+
   /**
    * Create new audit log
    *
@@ -831,7 +836,6 @@ class AuditLogState extends BaseState {
   }
 
   findPaginated({ scope, category, actionOrContent, paging } = {}) {
-    this.enableCountCache = true;
     const conditions = {
       where: {},
     };

package/lib/states/node.js

@@ -6,7 +6,7 @@ const security = require('@abtnode/util/lib/security');
 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');
+const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 const {
   NODE_MODES,
   DISK_ALERT_THRESHOLD_PERCENT,
@@ -23,8 +23,6 @@ const { validateOwner } = require('../util');
 const { get: getDefaultConfigs } = require('../util/default-node-config');
 const { checkDockerInstalled } = require('../util/docker/check-docker-installed');
 
-const CACHE_KEY = 'info';
-
 /**
  * @extends BaseState<import('@abtnode/models').ServerState>
  */
@@ -54,12 +52,14 @@ class NodeState extends BaseState {
 
     this.dataDirs = dataDirs;
     this.notification = notification;
+    this.cacheGroup = `node-${config.nodeDid}`;
   }
 
-  cache = new SingleFlightLRUCache({
-    max: 1,
+  cache = new DBCache(() => ({
+    ...getAbtNodeRedisAndSQLiteUrl(),
+    prefix: 'node-state',
     ttl: SERVER_CACHE_TTL,
-  });
+  }));
 
   isInitialized(doc) {
     const isOwnerConnected = !!doc.nodeOwner;
@@ -68,8 +68,8 @@ class NodeState extends BaseState {
     return isOwnerConnected || isControlledBy3rdParty;
   }
 
-  deleteCache = () => {
-    this.cache.clear();
+  deleteCache = async () => {
+    await this.cache.del(this.cacheGroup);
   };
 
   /**
@@ -167,7 +167,7 @@ class NodeState extends BaseState {
   }
 
   read() {
-    return this.cache.autoCache(CACHE_KEY, () => this._read());
+    return this.cache.autoCache(this.cacheGroup, () => this._read());
   }
 
   // FIXME: 这个接口比较危险，可能会修改一些本不应该修改的字段，后续需要考虑改进

package/lib/states/notification-receiver.js

@@ -4,9 +4,10 @@ const BaseState = require('./base');
  * @extends BaseState<import('@abtnode/models').NotificationReceiverState>
  */
 class NotificationReceiverState extends BaseState {
+  // eslint-disable-next-line no-useless-constructor
   constructor(...args) {
     super(...args);
-    this.enableCountCache = true;
+    this.enableCountCache = `notification-receiver-count-${Math.random().toString(36).substring(2, 15)}`;
   }
 }
 

package/lib/team/manager.js

@@ -14,7 +14,7 @@ const { createRBAC, MemoryStorage, SequelizeStorage } = require('@abtnode/rbac')
 const logger = require('@abtnode/logger')('@abtnode/core:team:manager');
 const { ROLES, RBAC_CONFIG, EVENTS, NOTIFICATION_SEND_CHANNEL } = require('@abtnode/constant');
 const { BlockletEvents } = require('@blocklet/constant');
-const FileLock = require('@abtnode/util/lib/lock-with-file');
+const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 const {
   BaseState,
   doSchemaMigration,
@@ -104,7 +104,11 @@ class TeamManager extends EventEmitter {
 
     this.init();
 
-    this.lock = new FileLock(path.join(dataDirs.tmp, 'team-manager-locks'), 1000 * 30);
+    this.lock = new DBCache(() => ({
+      ...getAbtNodeRedisAndSQLiteUrl(),
+      prefix: 'team-manager-locks',
+      ttl: 1000 * 30,
+    }));
   }
 
   async init() {
@@ -645,7 +649,7 @@ class TeamManager extends EventEmitter {
         logger.info('create rbac', { did });
         const models = await this.getModels(did);
         const db = new BaseState(models.Rbac);
-        const rbac = await createRBAC({ storage: new SequelizeStorage(db) });
+        const rbac = await createRBAC({ storage: new SequelizeStorage(db, did) });
         this.cache[pid].rbac = rbac;
 
         const roles = await rbac.getRoles();
@@ -659,7 +663,7 @@ class TeamManager extends EventEmitter {
 
         return rbac;
       } finally {
-        this.lock.release(`init-rbac-${did}`);
+        this.lock.releaseLock(`init-rbac-${did}`);
       }
     }
 
@@ -910,7 +914,7 @@ class TeamManager extends EventEmitter {
       // This error is not fatal, just log it, will happen when there are multiple service processes
       logger.error('initDatabase failed', { did, dbPath, error });
     } finally {
-      this.lock.release(`init-database-${did}`);
+      this.lock.releaseLock(`init-database-${did}`);
     }
   }
 

package/lib/util/blocklet.js

@@ -36,7 +36,7 @@ const getFolderSize = require('@abtnode/util/lib/get-folder-size');
 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 SingleFlightLRUCache = require('@abtnode/util/lib/single-flight-lru-cache');
+const { DBCache } = require('@abtnode/db-cache');
 const {
   BLOCKLET_MAX_MEM_LIMIT_IN_MB,
   BLOCKLET_INSTALL_TYPE,
@@ -113,7 +113,7 @@ const { getDidDomainForBlocklet } = require('@abtnode/util/lib/get-domain-for-bl
 const md5 = require('@abtnode/util/lib/md5');
 
 const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
-const FileLock = require('@abtnode/util/lib/lock-with-file');
+const { getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 const { validate: validateEngine, get: getEngine } = require('../blocklet/manager/engine');
 
 const isRequirementsSatisfied = require('./requirement');
@@ -140,15 +140,17 @@ const { createDockerNetwork } = require('./docker/docker-network');
  */
 const getBlockletEngineNameByPlatform = (meta) => getBlockletEngine(meta).interpreter;
 
-const startLock = new FileLock(
-  process.env.ABT_NODE_DATA_DIR ? path.join(process.env.ABT_NODE_DATA_DIR, 'tmp', 'blocklet-start-locks') : '',
-  1000 * 60 * 2
-);
+const startLock = new DBCache(() => ({
+  ...getAbtNodeRedisAndSQLiteUrl(),
+  prefix: 'blocklet-start-locks2',
+  ttl: 1000 * 60 * 1,
+}));
 
-const blockletCache = new SingleFlightLRUCache({
-  max: 300,
+const blockletCache = new DBCache(() => ({
+  ...getAbtNodeRedisAndSQLiteUrl(),
+  prefix: 'blocklet-state',
   ttl: BLOCKLET_CACHE_TTL,
-});
+}));
 
 const getVersionScope = (meta) => {
   if (meta.dist?.integrity) {
@@ -162,14 +164,8 @@ const getVersionScope = (meta) => {
   return meta.version;
 };
 
-const deleteBlockletCache = (did) => {
-  const flags = [false, true];
-  flags.forEach((ensureIntegrity) => {
-    flags.forEach((getOptionalComponents) => {
-      const key = JSON.stringify({ did, ensureIntegrity, getOptionalComponents });
-      blockletCache.delete(key);
-    });
-  });
+const deleteBlockletCache = async (did) => {
+  await blockletCache.del(did);
 };
 
 const noop = () => {
@@ -765,7 +761,7 @@ const startBlockletProcess = async (
             rootBlocklet: blocklet,
           });
 
-    await pm2.startAsync(nextOptions);
+    await pm2.startAsync({ ...nextOptions, pmx: false });
 
     // eslint-disable-next-line no-use-before-define
     const status = await getProcessState(processId);
@@ -808,10 +804,7 @@ const startBlockletProcess = async (
         b.meta.group,
       ].join('__');
 
-      if (startLock.lockDir && !startLock.tryLock(lockName)) {
-        await startLock.waitUnLock(lockName);
-        return;
-      }
+      await startLock.acquire(lockName);
       try {
         await startBlockletTask(b, { ancestors });
       } finally {
@@ -1665,7 +1658,7 @@ const getBlocklet = ({
     });
   }
 
-  return blockletCache.autoCache(cacheKey, () => {
+  return blockletCache.autoCacheGroup(did, cacheKey, () => {
     return _getBlocklet({ did, ensureIntegrity, getOptionalComponents, ...rest });
   });
 };

package/lib/util/check-dns.js

@@ -1,15 +1,16 @@
 const dns = require('dns');
 const { promisify } = require('util');
-const { LRUCache } = require('lru-cache');
+const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 const logger = require('@abtnode/logger')('checkDNS');
 
 const resolveCname = promisify(dns.resolveCname);
 const resolve = promisify(dns.resolve);
 
-const cache = new LRUCache({
-  max: 100,
+const cache = new DBCache(() => ({
+  ...getAbtNodeRedisAndSQLiteUrl(),
+  prefix: 'check-dns',
   ttl: 60 * 60 * 1000,
-});
+}));
 
 async function checkDnsAndCname(domain, expectedCname = '') {
   try {
@@ -49,16 +50,8 @@ async function checkDnsAndCname(domain, expectedCname = '') {
   }
 }
 
-async function getDNSInfo(domain, expectedCname) {
-  const cachedAddress = cache.get(domain);
-
-  if (cachedAddress) {
-    return cachedAddress;
-  }
-
-  const result = await checkDnsAndCname(domain, expectedCname);
-  cache.set(domain, result);
-  return result;
+function getDNSInfo(domain, expectedCname) {
+  return cache.autoCache(domain, () => checkDnsAndCname(domain, expectedCname));
 }
 
 module.exports = getDNSInfo;

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

@@ -12,6 +12,7 @@ function checkDockerInstalled() {
   lastTime = now;
   lastResultPromise = (async () => {
     if (process.env.ABT_NODE_NOT_ALLOW_DOCKER) return false;
+    if (process.env.NODE_ENV === 'test') return false;
     try {
       await promiseSpawn('docker ps', { mute: true });
       logger.info('Docker is installed');

package/lib/util/docker/docker-exec-chown.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const fs = require('fs');
-const LockFile = require('@abtnode/util/lib/lock-with-file');
+const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
 const logger = require('@abtnode/logger')('@abtnode/docker-exec-chown');
 const debianChmodDockerfile = require('./debian-chmod-dockerfile');
@@ -10,10 +10,11 @@ const { checkDockerInstalled } = require('./check-docker-installed');
 const filterParentDirs = require('./filter-parent-dirs');
 const { createDockerImage } = require('./create-docker-image');
 
-const lockFile = new LockFile(
-  process.env.ABT_NODE_DATA_DIR ? path.join(process.env.ABT_NODE_DATA_DIR, 'tmp', 'docker-exec-locks') : '',
-  1000 * 60 * 2
-);
+const lockFile = new DBCache(() => ({
+  ...getAbtNodeRedisAndSQLiteUrl(),
+  prefix: 'docker-exec-chown-locks',
+  ttl: 1000 * 60 * 2,
+}));
 
 async function dockerExecChown({ name, dirs, code = 777, force = false }) {
   if (process.env.ABT_NODE_SKIP_DOCKER_CHOWN === '1' && !force) {
@@ -55,10 +56,7 @@ async function dockerExecChown({ name, dirs, code = 777, force = false }) {
   const realName = parseDockerName(name, 'docker-exec-chown');
   const startTime = Date.now();
 
-  if (!lockFile.tryLock(realName)) {
-    await lockFile.waitUnLock(realName);
-    return;
-  }
+  await lockFile.acquire(realName);
   try {
     await promiseSpawn(
       `docker rm -fv ${realName} > /dev/null 2>&1 || true && docker run --rm --name ${realName} ${volumes} ${image} sh -c '${command}'`,
@@ -66,8 +64,8 @@ async function dockerExecChown({ name, dirs, code = 777, force = false }) {
       { timeout: 1000 * 120, retry: 3 }
     );
   } finally {
-    lockFile.releaseLock(realName);
     await promiseSpawn(`docker rm -fv ${realName} > /dev/null 2>&1 || true`, {}, { timeout: 1000 * 10, retry: 3 });
+    await lockFile.releaseLock(realName);
   }
 
   logger.info(`dockerExecChown ${name} cost time: ${Date.now() - startTime}ms`);

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

@@ -1,16 +1,14 @@
-const path = require('path');
 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 { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 
 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') : '',
-  1000 * 20
-);
-
-const networkPruneLockName = 'docker-network-prune';
+const lockNetwork = new DBCache(() => ({
+  ...getAbtNodeRedisAndSQLiteUrl(),
+  prefix: 'docker-network-locks',
+  ttl: 1000 * 10,
+}));
 
 async function getDockerNetworks() {
   try {
@@ -22,7 +20,7 @@ async function getDockerNetworks() {
   }
 }
 
-async function _createDockerNetwork(dockerNetworkName) {
+async function _createDockerNetwork(dockerNetworkName, retry = 0) {
   if (!process.env.ABT_NODE_DATA_DIR) {
     return;
   }
@@ -30,30 +28,33 @@ async function _createDockerNetwork(dockerNetworkName) {
     return;
   }
   const networks = await getDockerNetworks();
-  if (!networks.includes(`${dockerNetworkName}-internal`)) {
-    await promiseSpawn(`docker network create --internal ${dockerNetworkName}-internal`);
-  } else {
-    logger.info(`Network ${dockerNetworkName}-internal already exists. Skipping creation.`);
-  }
+  try {
+    if (!networks.includes(`${dockerNetworkName}-internal`)) {
+      await promiseSpawn(`docker network create --internal ${dockerNetworkName}-internal`);
+    } else {
+      logger.info(`Network ${dockerNetworkName}-internal already exists. Skipping creation.`);
+    }
 
-  if (!networks.includes(dockerNetworkName)) {
-    await promiseSpawn(`docker network create ${dockerNetworkName}`);
-  } else {
-    logger.info(`Network ${dockerNetworkName} already exists. Skipping creation.`);
+    if (!networks.includes(dockerNetworkName)) {
+      await promiseSpawn(`docker network create ${dockerNetworkName}`);
+    } else {
+      logger.info(`Network ${dockerNetworkName} already exists. Skipping creation.`);
+    }
+  } catch (error) {
+    if (retry < 3 && error.message.includes('all predefined address pools')) {
+      await promiseSpawn('docker network prune -f');
+      await _createDockerNetwork(dockerNetworkName, retry + 1);
+      return;
+    }
+    throw error;
   }
 }
 
 async function createDockerNetwork(dockerNetworkName) {
   // 创建网络添加锁，防止并发创建相同子网
-  if (!lockFile.tryLock(dockerNetworkName)) {
-    // 等待锁释放
-    await lockFile.waitUnLock(dockerNetworkName);
-    return;
-  }
-  // 创建网络的过程不允许清理网络
-  lockFile.tryLock(networkPruneLockName);
+  await lockNetwork.acquire(dockerNetworkName);
   try {
-    await _createDockerNetwork(dockerNetworkName);
+    await _createDockerNetwork(dockerNetworkName, 0);
   } catch (error) {
     if (/already exists in network/i.test(error?.message || '')) {
       logger.error('Error docker network already exists, but it can be ignored', error);
@@ -61,16 +62,12 @@ async function createDockerNetwork(dockerNetworkName) {
       throw error;
     }
   } finally {
-    lockFile.releaseLock(networkPruneLockName);
-    lockFile.releaseLock(dockerNetworkName);
+    lockNetwork.releaseLock(dockerNetworkName);
   }
 }
 
 async function removeDockerNetwork(dockerNetworkName) {
   try {
-    if (!lockFile.tryLock(networkPruneLockName)) {
-      return;
-    }
     const isDockerInstalled = await checkDockerInstalled();
     if (isDockerInstalled) {
       await promiseSpawn(`docker network rm ${dockerNetworkName}`);
@@ -79,8 +76,6 @@ async function removeDockerNetwork(dockerNetworkName) {
     logger.info(`docker remove network ${dockerNetworkName} done`);
   } catch (error) {
     logger.error(`Error remove network ${dockerNetworkName}:`, error);
-  } finally {
-    lockFile.releaseLock(networkPruneLockName);
   }
 }
 

package/lib/util/docker/ensure-docker-redis.js

@@ -0,0 +1,77 @@
+const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
+const logger = require('@abtnode/logger')('@abtnode/ensure-docker-redis');
+const { checkDockerInstalled } = require('./check-docker-installed');
+
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+async function ensureDockerRedis(name = 'db-cache-redis', port = 40409) {
+  if (!(await checkDockerInstalled())) {
+    return '';
+  }
+  // 1. 检查是否有正在运行的同名容器
+  const checkRunningCmd = `docker ps --filter "name=${name}" --format "{{.Names}}"`;
+  // 2. 如果没有运行，再检查是否存在已停止的同名容器
+  const checkAllCmd = `docker ps -a --filter "name=${name}" --format "{{.Names}}"`;
+  // 3. 如果既没运行也不存在，则创建新的容器，禁用持久化、限制内存、设置淘汰策略
+  const runCmd = [
+    'docker run -d',
+    `--name ${name}`,
+    `-p 127.0.0.1:${port}:6379`,
+    'redis:8.0.2',
+    'redis-server',
+    '--save ""',
+    '--appendonly no',
+    '--maxmemory 512mb',
+    '--maxmemory-policy allkeys-lru',
+  ].join(' ');
+
+  const url = `redis://localhost:${port}`;
+
+  const running = (await promiseSpawn(checkRunningCmd)).trim();
+  if (running === name) {
+    // 已经在运行，直接返回
+    logger.info('redis is already running', name);
+    return url;
+  }
+
+  // 查看是否有已停止的同名容器
+  const all = (await promiseSpawn(checkAllCmd)).trim();
+  if (all === name) {
+    // 容器存在，但可能是 stopped，直接启动它
+    await promiseSpawn(`docker start ${name}`);
+    await sleep(3000);
+    logger.info('redis is started', name);
+    return url;
+  }
+
+  await promiseSpawn(runCmd);
+  await sleep(3000);
+  logger.info('redis is started', name);
+  return url;
+}
+
+// 停止, 并且返回是否 docker 中存在 redis 容器
+async function stopDockerRedis(name = 'db-cache-redis') {
+  if (!(await checkDockerInstalled())) {
+    return false;
+  }
+  const checkRunningCmd = `docker ps --filter "name=${name}" --format "{{.Names}}"`;
+  const running = (await promiseSpawn(checkRunningCmd)).trim();
+  if (running === name) {
+    // 已经在运行，直接返回
+    logger.info('redis is already running', name);
+    try {
+      await promiseSpawn(`docker rm -f ${name}`, { mute: true });
+    } catch (_) {
+      // 不需要打印日志, 因为 redis 可能本来就没有运行
+    }
+    return true;
+  }
+
+  return false;
+}
+
+module.exports = {
+  ensureDockerRedis,
+  stopDockerRedis,
+};

package/lib/util/docker/parse-docker-options-from-pm2.js

@@ -1,6 +1,6 @@
 require('./docker-container-prune');
 
-const { COMPONENT_DOCKER_ENV_FILE_NAME } = require('@blocklet/constant');
+const { COMPONENT_DOCKER_ENV_FILE_NAME, ABT_NODE_KERNEL_OR_BLOCKLET_MODE } = require('@blocklet/constant');
 const { stringify: stringifyEnvFile } = require('envfile');
 const path = require('path');
 const fsp = require('fs/promises');
@@ -95,8 +95,9 @@ async function parseDockerOptionsFromPm2({
     throw new Error(`Docker CMD is invalid: ${dockerInfo.command}`);
   }
 
+  options.interpreter = 'none';
   const defaultCpus = '2';
-  const defaultMemory = '2g';
+  const defaultMemory = '1.5g';
   const defaultDiskSize = '0g';
 
   const cpus = isServerless
@@ -218,10 +219,10 @@ async function parseDockerOptionsFromPm2({
 
   let runScript = dockerInfo.script || '';
   if (!runScript && dockerInfo.installNodeModules) {
-    const maxOldSpaceSize = Math.floor(Number(dockerEnv.BLOCKLET_DOCKER_MEMORY.replace('g', '')) * 0.8 * 1024);
+    const maxOldSpaceSize = Math.floor(Number(dockerEnv.BLOCKLET_DOCKER_MEMORY.replace('g', '')) * 0.85 * 1024);
     runScript = /(npm|yarn|pnpm|bun)/g.test(nextOptions.script)
       ? nextOptions.script
-      : `node --max-old-space-size=${maxOldSpaceSize} ${nextOptions.script}`;
+      : `node ${process.env.ABT_NODE_BLOCKLET_MODE === ABT_NODE_KERNEL_OR_BLOCKLET_MODE.PERFORMANT ? '' : '--optimize_for_size'} --max-old-space-size=${maxOldSpaceSize} --max-http-header-size=16384 ${nextOptions.script} -- BLOCKLET_NAME=${options.name}`;
   }
 
   const runScripts = ['preInstall', '--installScript--', 'postInstall', 'preFlight', 'preStart', '--runScript--']

package/lib/webhook/index.js

@@ -157,7 +157,7 @@ module.exports = ({ events, dataDirs, instance, teamManager }) => {
   });
 
   [EVENTS.NOTIFICATION_CREATE, EVENTS.NOTIFICATION_BLOCKLET_CREATE].forEach((event) => {
-    events.on(event, (data) => {
+    events.on(event, async (data) => {
       const {
         id,
         title,
@@ -173,7 +173,12 @@ module.exports = ({ events, dataDirs, instance, teamManager }) => {
         ignorePush,
         message,
       } = data;
-      if (!reduceQueue({ id, title, description, entityType, entityId, severity, action, extra }) && !ignorePush) {
+      if (
+        !(await reduceQueue.acquire(
+          JSON.stringify({ id, title, description, entityType, entityId, severity, action, extra })
+        )) &&
+        !ignorePush
+      ) {
         queue.push({
           title,
           description,

package/lib/webhook/reduce-queue.js

@@ -1,12 +1,10 @@
-const { LRUCache } = require('lru-cache');
+const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 
-const reduceCache = new LRUCache({ max: 50, ttl: 5 * 1000 });
-
-const reduceQueue = (obj) => {
-  const key = JSON.stringify(obj);
-  const has = reduceCache.has(key);
-  reduceCache.set(key, true);
-  return has;
-};
+// 确保多进程只会有一个任务在执行
+const reduceQueue = new DBCache(() => ({
+  ...getAbtNodeRedisAndSQLiteUrl(),
+  prefix: 'reduce-queue',
+  ttl: 5 * 1000,
+}));
 
 module.exports = reduceQueue;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.44-beta-20250606-000924-3db49e6a",
+  "version": "1.16.45-beta-20250609-025419-7fd1f86c",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,44 +19,45 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@abtnode/auth": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@abtnode/certificate-manager": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@abtnode/client": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@abtnode/constant": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@abtnode/cron": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@abtnode/docker-utils": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@abtnode/logger": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@abtnode/models": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@abtnode/queue": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@abtnode/rbac": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@abtnode/router-provider": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@abtnode/static-server": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@abtnode/timemachine": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@abtnode/util": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@arcblock/did": "1.20.13",
-    "@arcblock/did-auth": "1.20.13",
-    "@arcblock/did-ext": "1.20.13",
+    "@abtnode/analytics": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/auth": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/certificate-manager": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/client": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/constant": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/cron": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/db-cache": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/docker-utils": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/logger": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/models": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/queue": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/rbac": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/router-provider": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/static-server": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/timemachine": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/util": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@arcblock/did": "1.20.14",
+    "@arcblock/did-auth": "1.20.14",
+    "@arcblock/did-ext": "1.20.14",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.20.13",
-    "@arcblock/event-hub": "1.20.13",
-    "@arcblock/jwt": "1.20.13",
+    "@arcblock/did-util": "1.20.14",
+    "@arcblock/event-hub": "1.20.14",
+    "@arcblock/jwt": "1.20.14",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "1.20.13",
-    "@arcblock/vc": "1.20.13",
-    "@blocklet/constant": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@blocklet/did-space-js": "^1.0.57",
-    "@blocklet/env": "1.16.44-beta-20250606-000924-3db49e6a",
+    "@arcblock/validator": "1.20.14",
+    "@arcblock/vc": "1.20.14",
+    "@blocklet/constant": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@blocklet/did-space-js": "^1.0.58",
+    "@blocklet/env": "1.16.45-beta-20250609-025419-7fd1f86c",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@blocklet/resolver": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@blocklet/sdk": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@blocklet/store": "1.16.44-beta-20250606-000924-3db49e6a",
-    "@blocklet/theme": "^2.13.61",
+    "@blocklet/meta": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@blocklet/resolver": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@blocklet/sdk": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@blocklet/store": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@blocklet/theme": "^2.13.62",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.20.13",
-    "@ocap/util": "1.20.13",
-    "@ocap/wallet": "1.20.13",
+    "@ocap/mcrypto": "1.20.14",
+    "@ocap/util": "1.20.14",
+    "@ocap/wallet": "1.20.14",
     "@slack/webhook": "^5.0.4",
     "archiver": "^7.0.1",
     "axios": "^1.7.9",
@@ -83,7 +84,6 @@
     "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",
@@ -116,5 +116,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "e0ec7ffc4caa20e2cf79075b4c5e347506445db5"
+  "gitHead": "0457b82da528653a1b903149ea1fb1966c31bee3"
 }