@abtnode/core 1.16.44-beta-20250528-003415-7a5e5d90 → 1.16.44-beta-20250529-223630-10e16ac8

package/lib/blocklet/manager/disk.js

@@ -238,6 +238,8 @@ const { transformNotification } = require('../../util/notification');
 const { generateUserUpdateData } = require('../../util/user');
 const { blockletThemeSchema } = require('../../validators/theme');
 const checkDNS = require('../../util/check-dns.js');
+const { removeDockerNetwork } = require('../../util/docker/docker-network.js');
+const parseDockerName = require('../../util/docker/parse-docker-name.js');
 
 const { formatEnvironments, getBlockletMeta, validateOwner, isCLI } = util;
 
@@ -1275,11 +1277,13 @@ class DiskBlockletManager extends BaseBlockletManager {
         entityId: doc.meta.did,
         severity: 'success',
       });
+      await removeDockerNetwork(parseDockerName(did, 'docker-network'));
       return doc;
     } catch (error) {
       // If we installed a corrupted blocklet accidentally, just cleanup the disk and state db
       logger.error('blocklet delete failed, will delete again', { did, error });
       const doc = await this._deleteBlocklet({ did, keepData, keepLogsDir, keepConfigs }, context);
+      await removeDockerNetwork(parseDockerName(did, 'docker-network'));
 
       this._createNotification(doc.meta.did, {
         title: 'Blocklet Deleted',
@@ -1466,6 +1470,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     // support edge case
     if (newBlocklet.children.length === 0) {
       await states.blocklet.setBlockletStatus(newBlocklet.meta.did, BlockletStatus.stopped);
+      await removeDockerNetwork(parseDockerName(app.meta.did, 'docker-network'));
     }
 
     this.emit(BlockletEvents.upgraded, { blocklet: newBlocklet, context: { ...context, createAuditLog: false } }); // trigger router refresh

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

@@ -286,6 +286,7 @@ const EVENTS = {
   CERT_ERROR: 'cert.error',
   RELOAD_GATEWAY: 'gateway.reload',
   NOTIFICATION_CREATE_QUEUED: 'notification.create.queued',
+  UPDATE_DOMAIN_ALIAS: 'router.domain.alias.updated',
 };
 
 const WHO_CAN_ACCESS = Object.freeze({
@@ -38884,7 +38885,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.43","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.43","@abtnode/auth":"1.16.43","@abtnode/certificate-manager":"1.16.43","@abtnode/client":"1.16.43","@abtnode/constant":"1.16.43","@abtnode/cron":"1.16.43","@abtnode/docker-utils":"1.16.43","@abtnode/logger":"1.16.43","@abtnode/models":"1.16.43","@abtnode/queue":"1.16.43","@abtnode/rbac":"1.16.43","@abtnode/router-provider":"1.16.43","@abtnode/static-server":"1.16.43","@abtnode/timemachine":"1.16.43","@abtnode/util":"1.16.43","@arcblock/did":"1.20.11","@arcblock/did-auth":"1.20.11","@arcblock/did-ext":"1.20.11","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.11","@arcblock/event-hub":"1.20.11","@arcblock/jwt":"1.20.11","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.11","@arcblock/vc":"1.20.11","@blocklet/constant":"1.16.43","@blocklet/did-space-js":"^1.0.56","@blocklet/env":"1.16.43","@blocklet/error":"^0.2.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.54","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.11","@ocap/util":"1.20.11","@ocap/wallet":"1.20.11","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","lru-cache":"^11.0.2","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^9.0.1","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.43","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.43","@abtnode/auth":"1.16.43","@abtnode/certificate-manager":"1.16.43","@abtnode/client":"1.16.43","@abtnode/constant":"1.16.43","@abtnode/cron":"1.16.43","@abtnode/docker-utils":"1.16.43","@abtnode/logger":"1.16.43","@abtnode/models":"1.16.43","@abtnode/queue":"1.16.43","@abtnode/rbac":"1.16.43","@abtnode/router-provider":"1.16.43","@abtnode/static-server":"1.16.43","@abtnode/timemachine":"1.16.43","@abtnode/util":"1.16.43","@arcblock/did":"1.20.11","@arcblock/did-auth":"1.20.11","@arcblock/did-ext":"1.20.11","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.11","@arcblock/event-hub":"1.20.11","@arcblock/jwt":"1.20.11","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.11","@arcblock/vc":"1.20.11","@blocklet/constant":"1.16.43","@blocklet/did-space-js":"^1.0.56","@blocklet/env":"1.16.43","@blocklet/error":"^0.2.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.55","@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/event/index.js

@@ -54,6 +54,7 @@ module.exports = ({
   removeBlockletRouting,
   takeRoutingSnapshot,
   handleRouting,
+  handleBlockletWafChange,
   domainStatus,
   teamAPI,
   securityAPI,
@@ -583,6 +584,23 @@ module.exports = ({
     });
   });
 
+  routerManager.on(EVENTS.UPDATE_DOMAIN_ALIAS, (did) => {
+    if (did) {
+      blockletManager
+        .detail({ did })
+        .then((blocklet) => {
+          if (blocklet?.settings?.gateway?.wafPolicy?.enabled === false) {
+            handleBlockletWafChange({ teamDid: did, wafPolicy: blocklet?.settings?.gateway?.wafPolicy }).catch(
+              (err) => {
+                logger.error('Update blocklet wafPolicy failed on add domain alias', { error: err });
+              }
+            );
+          }
+        })
+        .catch((err) => logger.error('Update blocklet wafPolicy failed on update domain alias', { error: err }));
+    }
+  });
+
   [EVENTS.DOMAIN_STATUS, BlockletEvents.domainStatus].forEach((eventName) => {
     domainStatus.on(eventName, (data) => {
       if (data) {

package/lib/index.js

@@ -286,6 +286,8 @@ function ABTNode(options) {
   const webhookAPI = new WebhookAPI({ states, teamManager });
 
   const {
+    updateBlockletWafSettings,
+    handleBlockletWafChange,
     handleRouting,
     resetSiteByDid,
     updateNodeRouting,
@@ -772,6 +774,8 @@ function ABTNode(options) {
     deleteOAuthClient: teamAPI.deleteOAuthClient.bind(teamAPI),
     createOAuthClient: teamAPI.createOAuthClient.bind(teamAPI),
     updateOAuthClient: teamAPI.updateOAuthClient.bind(teamAPI),
+
+    updateBlockletGateway: ({ teamDid, wafPolicy }) => updateBlockletWafSettings({ teamDid, wafPolicy }),
   };
 
   blockletManager.createAuditLog = (params) => states.auditLog.create(params, instance);
@@ -793,6 +797,7 @@ function ABTNode(options) {
     node: instance,
     nodeRuntimeMonitor: nodeAPI.runtimeMonitor,
     daemon: options.daemon,
+    handleBlockletWafChange,
   });
 
   const webhook = WebHook({ events, dataDirs, instance, teamManager });

package/lib/router/helper.js

@@ -1539,6 +1539,11 @@ module.exports = function getRouterHelpers({
               headers: get(nodeInfo, 'routing.headers', {}),
               services: await blockletState.getServices(),
               nodeInfo: info,
+              wafDisabledBlocklets: await Promise.all(
+                (await states.blockletExtras.getWafDisabledBlocklets()).map((x) =>
+                  states.site.findOneByBlocklet(x.did).then((result) => ({ did: x.did, site: result }))
+                )
+              ),
             };
           } catch (err) {
             logger.error('Read routing rules failed', { error: err });
@@ -1889,7 +1894,39 @@ module.exports = function getRouterHelpers({
     return uniq([...blacklist]);
   };
 
+  const updateBlockletWafSettings = async ({ teamDid, wafPolicy }) => {
+    await states.blockletExtras.setSettings(teamDid, { gateway: { wafPolicy } });
+
+    const doc = await nodeState.read();
+    nodeState.emit(EVENTS.RELOAD_GATEWAY, doc);
+  };
+
+  const handleBlockletWafChange = async ({ teamDid, wafPolicy }) => {
+    const blocklet = await blockletManager.detail({ did: teamDid });
+    if (!blocklet) {
+      return;
+    }
+
+    const domainAliases = blocklet?.site?.domainAliases || [];
+    if (!domainAliases.length) {
+      return;
+    }
+
+    const doc = await nodeState.read();
+    const providerName = get(doc, 'routing.provider', null);
+    const defaultWAF = doc.routing.wafPolicy?.mode;
+
+    // update nginx waf
+    const provider = providerName && providers[providerName] && providers[providerName].provider;
+    if (provider && typeof provider.addCustomWAFConf === 'function') {
+      await provider.addCustomWAFConf({ did: teamDid, domainAliases, wafPolicy, defaultWAF });
+      nodeState.emit(EVENTS.RELOAD_GATEWAY, doc);
+    }
+  };
+
   return {
+    updateBlockletWafSettings,
+    handleBlockletWafChange,
     ensureDashboardRouting,
     ensureBlockletRouting,
     ensureBlockletRoutingForUpgrade,

package/lib/router/index.js

@@ -114,7 +114,14 @@ class Router {
   async updateRoutingTable() {
     logger.info('update routing table');
 
-    const { sites, certificates, headers = {}, services = [], nodeInfo = {} } = (await this.getRoutingParams()) || {};
+    const {
+      sites,
+      certificates,
+      headers = {},
+      services = [],
+      nodeInfo = {},
+      wafDisabledBlocklets = [],
+    } = (await this.getRoutingParams()) || {};
     if (!Array.isArray(sites)) {
       logger.error('sites is not an array', { sites });
       return;
@@ -186,6 +193,7 @@ class Router {
       proxyPolicy,
       wafPolicy,
       cacheEnabled: isGatewayCacheEnabled(nodeInfo),
+      wafDisabledBlocklets,
     });
   }
 

package/lib/router/manager.js

@@ -22,6 +22,7 @@ const { getProvider } = require('@abtnode/router-provider');
 const checkDomainMatch = require('@abtnode/util/lib/check-domain-match');
 const { isDidDomain, isCustomDomain } = require('@abtnode/util/lib/url-evaluation');
 const { isTopLevelDomain } = require('@abtnode/util/lib/domain');
+const { EVENTS } = require('@abtnode/constant');
 const {
   DOMAIN_FOR_IP_SITE,
   DOMAIN_FOR_DEFAULT_SITE,
@@ -359,6 +360,7 @@ class RouterManager extends EventEmitter {
     const newSite = await states.site.findOne({ id });
     await attachRuntimeDomainAliases({ sites: newSite, context, node: states.node });
 
+    this.emit(EVENTS.UPDATE_DOMAIN_ALIAS, did);
     return newSite;
   }
 
@@ -413,6 +415,7 @@ class RouterManager extends EventEmitter {
         );
     }
 
+    this.emit(EVENTS.UPDATE_DOMAIN_ALIAS, getDidFromDomainGroupName(dbSite.domain));
     return dbSite;
   }
 

package/lib/states/audit-log.js

@@ -534,6 +534,9 @@ const getLogContent = async (action, args, context, result, info, node) => {
     case 'deleteOAuthClient':
       return `Delete ${args.teamDid} OAuth Client:(${args.clientId})`;
 
+    case 'updateBlockletGateway':
+      return `Update Blocklet WAF:(${args.teamDid} to ${args.wafPolicy?.enabled})`;
+
     default:
       return action;
   }
@@ -581,6 +584,7 @@ const getLogCategory = (action) => {
     case 'deleteOAuthClient':
     case 'createOAuthClient':
     case 'updateOAuthClient':
+    case 'updateBlockletGateway':
       return 'blocklet';
 
     case 'addUploadEndpoint':

package/lib/states/blocklet-extras.js

@@ -253,6 +253,10 @@ class BlockletExtrasState extends BaseState {
   updateByDid(did, updates) {
     return super.update({ did }, { $set: updates });
   }
+
+  getWafDisabledBlocklets() {
+    return super.find({ where: { 'settings.gateway.wafPolicy.enabled': false } });
+  }
 }
 
 module.exports = BlockletExtrasState;

package/lib/states/node.js

@@ -309,7 +309,8 @@ class NodeState extends BaseState {
   }
 
   async updateGateway(updates) {
-    const { routing } = await this.read();
+    const old = await this.read();
+    const { routing } = old;
     ['requestLimit', 'cacheEnabled', 'blockPolicy', 'proxyPolicy', 'wafPolicy', 'blacklistHash'].forEach((key) => {
       if (key in updates) {
         routing[key] = updates[key];
@@ -318,6 +319,7 @@ class NodeState extends BaseState {
 
     const doc = await this.update({ $set: { routing } });
     this.emit(EVENTS.RELOAD_GATEWAY, doc);
+    this.emit(EVENTS.NODE_UPDATED, doc, old);
     return doc.routing;
   }
 

package/lib/states/oauth-client.js

@@ -1,6 +1,5 @@
 const crypto = require('crypto');
 const uuid = require('uuid');
-const { OAUTH_CLIENT_SECRET_TTL } = require('@abtnode/constant');
 const { CustomError } = require('@blocklet/error');
 const BaseState = require('./base');
 const { oauthClientSchema } = require('../validators/oauth');
@@ -34,6 +33,7 @@ class OauthClient extends BaseState {
       jwks,
       softwareId,
       softwareVersion,
+      clientSecretExpiresAt = null,
     } = input || {};
 
     const data = {
@@ -55,7 +55,7 @@ class OauthClient extends BaseState {
       clientId: uuid.v4(),
       clientSecret: generateCode(32),
       clientIdIssuedAt: parseInt(Date.now() / 1000, 10),
-      clientSecretExpiresAt: parseInt(Date.now() / 1000 + OAUTH_CLIENT_SECRET_TTL, 10),
+      clientSecretExpiresAt,
       createdBy: context.user.did,
     };
 
@@ -76,6 +76,7 @@ class OauthClient extends BaseState {
       policyUri,
       logoUri,
       clientId,
+      clientSecretExpiresAt,
     } = input || {};
 
     const doc = await this.findOne({ clientId });
@@ -91,6 +92,7 @@ class OauthClient extends BaseState {
     doc.tosUri = tosUri;
     doc.policyUri = policyUri;
     doc.logoUri = logoUri;
+    doc.clientSecretExpiresAt = clientSecretExpiresAt;
 
     await super.update({ clientId }, { $set: doc });
     return doc;

package/lib/util/blocklet.js

@@ -124,7 +124,7 @@ const dockerRemoveByName = require('./docker/docker-remove-by-name');
 const checkNeedRunDocker = require('./docker/check-need-run-docker');
 const getDockerRuntimeInfo = require('./docker/get-docker-runtime-info');
 const parseDockerName = require('./docker/parse-docker-name');
-const createDockerNetwork = require('./docker/docker-network');
+const { createDockerNetwork } = require('./docker/docker-network');
 
 /**
  * get blocklet engine info, default is node
@@ -611,7 +611,7 @@ const startBlockletProcess = async (
   }
 
   const dockerNetworkName = parseDockerName(blocklet?.meta?.did, 'docker-network');
-  await createDockerNetwork(dockerNetworkName, nodeInfo);
+  await createDockerNetwork(dockerNetworkName);
 
   const startBlockletTask = async (b, { ancestors }) => {
     // 需要在在这里传入字符串类型，否则进程中如法转化成 Date 对象
@@ -1590,6 +1590,13 @@ const _getBlocklet = async ({
 
   blocklet.settings.languages = blocklet.settings.languages || [];
 
+  // 移除第一个版本中 from 为 tmpl 的导航
+  if (blocklet?.settings?.navigations && Array.isArray(blocklet.settings.navigations)) {
+    blocklet.settings.navigations = (blocklet.settings.navigations || []).filter(
+      (item) => !(item?.parent === '/team' && ['tmpl'].includes(item.from))
+    );
+  }
+
   const nodeInfo = await states.node.read();
 
   (nodeInfo?.blockletRegistryList || []).forEach((store) => {

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

@@ -6,28 +6,6 @@ const { checkDockerInstalled } = require('./check-docker-installed');
 const parseDockerName = require('./parse-docker-name');
 const promiseDebounce = require('../promise-debounce');
 
-let pruneLock = false;
-
-async function pruneDockerNetwork() {
-  if (pruneLock) {
-    return;
-  }
-  pruneLock = true;
-  try {
-    const isDockerInstalled = await checkDockerInstalled();
-    if (isDockerInstalled) {
-      await promiseSpawn('docker network prune -f');
-    }
-  } catch (e) {
-    logger.error(e);
-  } finally {
-    pruneLock = false;
-  }
-}
-
-// 每小时清理一次没用到的 network, 因为 network 占用很低，并且每个应用只有 2 个， 所以不需要频繁清理
-setInterval(pruneDockerNetwork, 1000 * 60 * 60);
-
 async function cleanPm2NotHasContainer() {
   const isDockerInstalled = await checkDockerInstalled();
   if (!isDockerInstalled) {

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

@@ -22,35 +22,12 @@ async function getDockerNetworks() {
   }
 }
 
-// 每 10 分钟清理一次没用到的子网
-setInterval(
-  async () => {
-    try {
-      if (!lockFile.tryLock(networkPruneLockName)) {
-        return;
-      }
-      const isDockerInstalled = await checkDockerInstalled();
-      if (isDockerInstalled) {
-        await promiseSpawn('docker network prune -f');
-      }
-      logger.info('docker prune network done');
-    } catch (error) {
-      logger.error('Error pruning network:', error);
-    } finally {
-      lockFile.releaseLock(networkPruneLockName);
-    }
-  },
-  1000 * 60 * 10
-);
-
-async function _createDockerNetwork(dockerNetworkName, nodeInfo) {
+async function _createDockerNetwork(dockerNetworkName) {
   if (!process.env.ABT_NODE_DATA_DIR) {
     return;
   }
-  if (!nodeInfo.isDockerInstalled) {
-    if (!(await checkDockerInstalled())) {
-      return;
-    }
+  if (!(await checkDockerInstalled())) {
+    return;
   }
   const networks = await getDockerNetworks();
   if (!networks.includes(`${dockerNetworkName}-internal`)) {
@@ -66,7 +43,7 @@ async function _createDockerNetwork(dockerNetworkName, nodeInfo) {
   }
 }
 
-async function createDockerNetwork(dockerNetworkName, nodeInfo) {
+async function createDockerNetwork(dockerNetworkName) {
   // 创建网络添加锁，防止并发创建相同子网
   if (!lockFile.tryLock(dockerNetworkName)) {
     // 等待锁释放
@@ -76,7 +53,7 @@ async function createDockerNetwork(dockerNetworkName, nodeInfo) {
   // 创建网络的过程不允许清理网络
   lockFile.tryLock(networkPruneLockName);
   try {
-    await _createDockerNetwork(dockerNetworkName, nodeInfo);
+    await _createDockerNetwork(dockerNetworkName);
   } catch (error) {
     if (/already exists in network/i.test(error?.message || '')) {
       logger.error('Error docker network already exists, but it can be ignored', error);
@@ -89,4 +66,25 @@ async function createDockerNetwork(dockerNetworkName, nodeInfo) {
   }
 }
 
-module.exports = createDockerNetwork;
+async function removeDockerNetwork(dockerNetworkName) {
+  try {
+    if (!lockFile.tryLock(networkPruneLockName)) {
+      return;
+    }
+    const isDockerInstalled = await checkDockerInstalled();
+    if (isDockerInstalled) {
+      await promiseSpawn(`docker network rm ${dockerNetworkName}`);
+      await promiseSpawn(`docker network rm ${dockerNetworkName}-internal`);
+    }
+    logger.info(`docker remove network ${dockerNetworkName} done`);
+  } catch (error) {
+    logger.error(`Error remove network ${dockerNetworkName}:`, error);
+  } finally {
+    lockFile.releaseLock(networkPruneLockName);
+  }
+}
+
+module.exports = {
+  createDockerNetwork,
+  removeDockerNetwork,
+};

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

@@ -374,6 +374,9 @@ async function parseDockerOptionsFromPm2({
   ${diskSizeOption} \
   --cpus="${dockerEnv.BLOCKLET_DOCKER_CPUS}" \
   --memory="${dockerEnv.BLOCKLET_DOCKER_MEMORY}" \
+  --memory-swap="${dockerEnv.BLOCKLET_DOCKER_MEMORY}" \
+  --memory-swappiness=0 \
+  --oom-kill-disable=false \
   --env-file ${dockerEnvFile} \
   ${dockerInfo.network} \
   ${dockerInfo.runParamString || ''} \

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.44-beta-20250528-003415-7a5e5d90",
+  "version": "1.16.44-beta-20250529-223630-10e16ac8",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,21 +19,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@abtnode/auth": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@abtnode/certificate-manager": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@abtnode/client": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@abtnode/constant": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@abtnode/cron": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@abtnode/docker-utils": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@abtnode/logger": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@abtnode/models": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@abtnode/queue": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@abtnode/rbac": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@abtnode/router-provider": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@abtnode/static-server": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@abtnode/timemachine": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@abtnode/util": "1.16.44-beta-20250528-003415-7a5e5d90",
+    "@abtnode/analytics": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@abtnode/auth": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@abtnode/certificate-manager": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@abtnode/client": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@abtnode/constant": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@abtnode/cron": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@abtnode/docker-utils": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@abtnode/logger": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@abtnode/models": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@abtnode/queue": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@abtnode/rbac": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@abtnode/router-provider": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@abtnode/static-server": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@abtnode/timemachine": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@abtnode/util": "1.16.44-beta-20250529-223630-10e16ac8",
     "@arcblock/did": "1.20.11",
     "@arcblock/did-auth": "1.20.11",
     "@arcblock/did-ext": "1.20.11",
@@ -44,15 +44,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.20.11",
     "@arcblock/vc": "1.20.11",
-    "@blocklet/constant": "1.16.44-beta-20250528-003415-7a5e5d90",
+    "@blocklet/constant": "1.16.44-beta-20250529-223630-10e16ac8",
     "@blocklet/did-space-js": "^1.0.56",
-    "@blocklet/env": "1.16.44-beta-20250528-003415-7a5e5d90",
+    "@blocklet/env": "1.16.44-beta-20250529-223630-10e16ac8",
     "@blocklet/error": "^0.2.4",
-    "@blocklet/meta": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@blocklet/resolver": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@blocklet/sdk": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@blocklet/store": "1.16.44-beta-20250528-003415-7a5e5d90",
-    "@blocklet/theme": "^2.13.54",
+    "@blocklet/meta": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@blocklet/resolver": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@blocklet/sdk": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@blocklet/store": "1.16.44-beta-20250529-223630-10e16ac8",
+    "@blocklet/theme": "^2.13.55",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.20.11",
     "@ocap/util": "1.20.11",
@@ -116,5 +116,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "095d89d3b8e40dc1d956203cac94a45a4a843024"
+  "gitHead": "381ba5459e32dd7bc94f7ea62df65b72644d6d16"
 }