@abtnode/core 1.16.45-beta-20250610-112229-2eb0face → 1.16.45-beta-20250612-231219-481217be

package/lib/blocklet/manager/disk.js

@@ -100,6 +100,7 @@ const {
   SUSPENDED_REASON,
   APP_CONFIG_DIR,
   COMPONENT_ENV_FILE_NAME,
+  BLOCKLET_PREFERENCE_PREFIX,
 } = require('@blocklet/constant');
 
 const { WELLKNOWN_SERVICE_PATH_PREFIX, WELLKNOWN_BLOCKLET_ADMIN_PATH } = require('@abtnode/constant');
@@ -1669,10 +1670,12 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
 
     // 对用户输入的配置进行 XSS 清理
-    const sanitizedConfigs = newConfigs.map((c) => ({
-      ...c,
-      value: sanitizeTag(c.value),
-    }));
+    const sanitizedConfigs = newConfigs
+      .map((c) => ({
+        ...c,
+        value: sanitizeTag(c.value),
+      }))
+      .filter((x) => (x.key.startsWith(BLOCKLET_PREFERENCE_PREFIX) ? omit(x, 'shared') : x));
 
     const tmpDids = Array.isArray(did) ? did : [did];
     const [rootDid, childDid] = tmpDids;
@@ -2768,8 +2771,32 @@ class DiskBlockletManager extends BaseBlockletManager {
     return summary;
   }
 
-  async updateInviteSettings({ did, invite }, context) {
-    await states.blockletExtras.setSettings(did, { invite });
+  async updateBlockletSettings({ did, enableSessionHardening, invite, gateway }, context) {
+    let params = {};
+    if (!isNil(enableSessionHardening)) {
+      params.enableSessionHardening = enableSessionHardening;
+    }
+
+    if (!isNil(invite)) {
+      params.invite = invite;
+    }
+
+    if (!isNil(gateway)) {
+      params = { ...params, ...gateway };
+    }
+
+    const keys = Object.keys(params);
+    if (!keys.length) {
+      throw new Error('No settings to update');
+    }
+
+    await states.blockletExtras.setSettings(did, params);
+
+    if (!isNil(gateway)) {
+      const nodeState = states.node;
+      const doc = await nodeState.read();
+      nodeState.emit(EVENTS.RELOAD_GATEWAY, doc);
+    }
 
     const newState = await this.getBlocklet(did);
     this.emit(BlockletInternalEvents.appSettingChanged, { appDid: did });

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

@@ -8202,7 +8202,7 @@ function save(namespaces) {
 function load() {
 	let r;
 	try {
-		r = exports.storage.getItem('debug');
+		r = exports.storage.getItem('debug') || exports.storage.getItem('DEBUG') ;
 	} catch (error) {
 		// Swallow
 		// XXX (@Qix-) should we be logging these?
@@ -8430,7 +8430,7 @@ function setup(env) {
 
 		const split = (typeof namespaces === 'string' ? namespaces : '')
 			.trim()
-			.replace(' ', ',')
+			.replace(/\s+/g, ',')
 			.split(',')
 			.filter(Boolean);
 
@@ -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.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/certificate-manager":"1.16.44","@abtnode/client":"1.16.44","@abtnode/constant":"1.16.44","@abtnode/cron":"1.16.44","@abtnode/db-cache":"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.59","@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.63","@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"}');
+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/certificate-manager":"1.16.44","@abtnode/client":"1.16.44","@abtnode/constant":"1.16.44","@abtnode/cron":"1.16.44","@abtnode/db-cache":"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.60","@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.66","@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/index.js

@@ -287,7 +287,6 @@ function ABTNode(options) {
   const webhookAPI = new WebhookAPI({ states, teamManager });
 
   const {
-    updateBlockletWafSettings,
     handleBlockletWafChange,
     handleRouting,
     resetSiteByDid,
@@ -454,8 +453,6 @@ function ABTNode(options) {
     // check update
     updateAutoCheckUpdate: blockletManager.updateAutoCheckUpdate.bind(blockletManager),
 
-    updateInviteSettings: blockletManager.updateInviteSettings.bind(blockletManager),
-
     // Store
     getBlockletMeta: StoreUtil.getBlockletMeta,
     getStoreMeta: StoreUtil.getStoreMeta,
@@ -777,7 +774,7 @@ function ABTNode(options) {
     createOAuthClient: teamAPI.createOAuthClient.bind(teamAPI),
     updateOAuthClient: teamAPI.updateOAuthClient.bind(teamAPI),
 
-    updateBlockletGateway: ({ teamDid, wafPolicy }) => updateBlockletWafSettings({ teamDid, wafPolicy }),
+    updateBlockletSettings: blockletManager.updateBlockletSettings.bind(blockletManager),
   };
 
   blockletManager.createAuditLog = (params) => states.auditLog.create(params, instance);

package/lib/router/helper.js

@@ -1894,13 +1894,6 @@ 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) {
@@ -1925,7 +1918,6 @@ module.exports = function getRouterHelpers({
   };
 
   return {
-    updateBlockletWafSettings,
     handleBlockletWafChange,
     ensureDashboardRouting,
     ensureBlockletRouting,

package/lib/states/audit-log.js

@@ -536,8 +536,20 @@ 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})`;
+    case 'updateBlockletSettings': {
+      const changes = [];
+      if (!isNil(args.enableSessionHardening)) {
+        changes.push(`* Session Hardening: ${args.enableSessionHardening}`);
+      }
+      if (!isNil(args.invite)) {
+        changes.push(`* Invite: ${JSON.stringify(args.invite)}`);
+      }
+      if (!isNil(args.gateway)) {
+        changes.push(`* Gateway: ${JSON.stringify(args.gateway)}`);
+      }
+
+      return `Update Blocklet Extras Settings:(${args.did} to ${changes.join(', ')})`;
+    }
 
     default:
       return action;
@@ -586,7 +598,7 @@ const getLogCategory = (action) => {
     case 'deleteOAuthClient':
     case 'createOAuthClient':
     case 'updateOAuthClient':
-    case 'updateBlockletGateway':
+    case 'updateBlockletSettings':
       return 'blocklet';
 
     case 'addUploadEndpoint':

package/lib/states/node.js

@@ -56,9 +56,9 @@ class NodeState extends BaseState {
   }
 
   cache = new DBCache(() => ({
-    ...getAbtNodeRedisAndSQLiteUrl(),
     prefix: 'node-state',
     ttl: SERVER_CACHE_TTL,
+    ...getAbtNodeRedisAndSQLiteUrl(),
   }));
 
   isInitialized(doc) {

package/lib/team/manager.js

@@ -105,9 +105,9 @@ class TeamManager extends EventEmitter {
     this.init();
 
     this.lock = new DBCache(() => ({
-      ...getAbtNodeRedisAndSQLiteUrl(),
       prefix: 'team-manager-locks',
       ttl: 1000 * 30,
+      ...getAbtNodeRedisAndSQLiteUrl(),
     }));
   }
 

package/lib/util/blocklet.js

@@ -147,9 +147,9 @@ const startLock = new DBCache(() => ({
 }));
 
 const blockletCache = new DBCache(() => ({
-  ...getAbtNodeRedisAndSQLiteUrl(),
   prefix: 'blocklet-state',
   ttl: BLOCKLET_CACHE_TTL,
+  ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
 const getVersionScope = (meta) => {
@@ -1655,7 +1655,6 @@ const getBlocklet = ({
 
   if (useCache) {
     cacheKey = JSON.stringify({
-      did,
       ensureIntegrity,
       getOptionalComponents,
     });
@@ -2322,7 +2321,7 @@ const getConfigsFromInput = (configs = [], oldConfigs = []) => {
 
   configs.forEach((config) => {
     const oldConfig = oldConfigs.find((y) => y.key === config.key);
-    if (isEnvShareable(config) || isEnvShareable(oldConfig)) {
+    if (!config.key.startsWith(BLOCKLET_PREFERENCE_PREFIX) && (isEnvShareable(config) || isEnvShareable(oldConfig))) {
       sharedConfigs.push(config);
     } else {
       selfConfigs.push(config);

package/lib/util/check-dns.js

@@ -1,17 +1,10 @@
 const dns = require('dns');
 const { promisify } = require('util');
-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 DBCache(() => ({
-  ...getAbtNodeRedisAndSQLiteUrl(),
-  prefix: 'check-dns',
-  ttl: 60 * 60 * 1000,
-}));
-
 async function checkDnsAndCname(domain, expectedCname = '') {
   try {
     await resolve(domain);
@@ -50,8 +43,4 @@ async function checkDnsAndCname(domain, expectedCname = '') {
   }
 }
 
-function getDNSInfo(domain, expectedCname) {
-  return cache.autoCache(domain, () => checkDnsAndCname(domain, expectedCname));
-}
-
-module.exports = getDNSInfo;
+module.exports = checkDnsAndCname;

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

@@ -11,9 +11,9 @@ const filterParentDirs = require('./filter-parent-dirs');
 const { createDockerImage } = require('./create-docker-image');
 
 const lockFile = new DBCache(() => ({
-  ...getAbtNodeRedisAndSQLiteUrl(),
   prefix: 'docker-exec-chown-locks',
   ttl: 1000 * 60 * 2,
+  ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
 async function dockerExecChown({ name, dirs, code = 777, force = false }) {

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

@@ -5,9 +5,9 @@ const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 const { checkDockerInstalled } = require('./check-docker-installed');
 
 const lockNetwork = new DBCache(() => ({
-  ...getAbtNodeRedisAndSQLiteUrl(),
   prefix: 'docker-network-locks',
   ttl: 1000 * 10,
+  ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
 async function getDockerNetworks() {

package/lib/webhook/reduce-queue.js

@@ -2,9 +2,9 @@ const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 
 // 确保多进程只会有一个任务在执行
 const reduceQueue = new DBCache(() => ({
-  ...getAbtNodeRedisAndSQLiteUrl(),
   prefix: 'reduce-queue',
   ttl: 5 * 1000,
+  ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
 module.exports = reduceQueue;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.45-beta-20250610-112229-2eb0face",
+  "version": "1.16.45-beta-20250612-231219-481217be",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,22 +19,22 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/auth": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/certificate-manager": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/client": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/constant": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/cron": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/db-cache": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/docker-utils": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/logger": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/models": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/queue": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/rbac": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/router-provider": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/static-server": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/timemachine": "1.16.45-beta-20250610-112229-2eb0face",
-    "@abtnode/util": "1.16.45-beta-20250610-112229-2eb0face",
+    "@abtnode/analytics": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/auth": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/certificate-manager": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/client": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/constant": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/cron": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/db-cache": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/docker-utils": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/logger": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/models": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/queue": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/rbac": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/router-provider": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/static-server": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/timemachine": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/util": "1.16.45-beta-20250612-231219-481217be",
     "@arcblock/did": "1.20.14",
     "@arcblock/did-auth": "1.20.14",
     "@arcblock/did-ext": "1.20.14",
@@ -45,15 +45,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.20.14",
     "@arcblock/vc": "1.20.14",
-    "@blocklet/constant": "1.16.45-beta-20250610-112229-2eb0face",
-    "@blocklet/did-space-js": "^1.0.59",
-    "@blocklet/env": "1.16.45-beta-20250610-112229-2eb0face",
+    "@blocklet/constant": "1.16.45-beta-20250612-231219-481217be",
+    "@blocklet/did-space-js": "^1.0.60",
+    "@blocklet/env": "1.16.45-beta-20250612-231219-481217be",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.45-beta-20250610-112229-2eb0face",
-    "@blocklet/resolver": "1.16.45-beta-20250610-112229-2eb0face",
-    "@blocklet/sdk": "1.16.45-beta-20250610-112229-2eb0face",
-    "@blocklet/store": "1.16.45-beta-20250610-112229-2eb0face",
-    "@blocklet/theme": "^2.13.63",
+    "@blocklet/meta": "1.16.45-beta-20250612-231219-481217be",
+    "@blocklet/resolver": "1.16.45-beta-20250612-231219-481217be",
+    "@blocklet/sdk": "1.16.45-beta-20250612-231219-481217be",
+    "@blocklet/store": "1.16.45-beta-20250612-231219-481217be",
+    "@blocklet/theme": "^2.13.66",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.20.14",
     "@ocap/util": "1.20.14",
@@ -116,5 +116,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "d35fb6c907c29f4466fa965c079e1662dc77e582"
+  "gitHead": "01a3fb21f16a515e2565d12797baeda5fdf585b0"
 }