@abtnode/core 1.8.22 → 1.8.24

package/lib/blocklet/extras.js

@@ -12,6 +12,8 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
   const isUpdatingCustomConfig = newConfigs.every((x) => x.key);
   const configs = isUpdatingCustomConfig ? metaConfigs : metaConfigsToKeep;
 
+  const enableSecurity = dek && did;
+
   // oldConfig 表示从数据库中可以用的字段
   const oldConfig = [...configs, ...customConfigs].reduce((acc, x) => {
     acc[x.key] = {
@@ -26,8 +28,28 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
     return acc;
   }, {});
 
-  if (dek && did) {
-    newConfigs.forEach((x) => {
+  // newConfig 为用户传的,也可以是从环境变量中去读的
+  const uniqConfigs = uniqBy(newConfigs, (x) => x.key || x.name);
+
+  // `BLOCKLET_*` and `ABT_NODE_*`  vars can only be set by Blocklet Server Daemon with only a few exceptions.
+  const newConfig = cloneDeep(
+    uniqConfigs.filter((x) => {
+      const key = x.key || x.name;
+
+      if (!key) {
+        return false;
+      }
+
+      if (BLOCKLET_CONFIGURABLE_KEY[key]) {
+        return true;
+      }
+
+      return !(key.toString().startsWith('ABT_NODE_') || key.toString().startsWith('BLOCKLET_'));
+    })
+  );
+
+  if (enableSecurity) {
+    newConfig.forEach((x) => {
       if (x.secure) {
         x.value = security.encrypt(x.value, did, dek);
         if (x.default) {
@@ -37,24 +59,6 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
     });
   }
 
-  // newConfig 为用户传的,也可以是从环境变量中去读的
-  const uniqConfigs = uniqBy(newConfigs, (x) => x.key || x.name);
-
-  // `BLOCKLET_*` and `ABT_NODE_*`  vars can only be set by Blocklet Server Daemon with only a few exceptions.
-  const newConfig = uniqConfigs.filter((x) => {
-    const key = x.key || x.name;
-
-    if (!key) {
-      return false;
-    }
-
-    if (BLOCKLET_CONFIGURABLE_KEY[key]) {
-      return true;
-    }
-
-    return !(key.toString().startsWith('ABT_NODE_') || key.toString().startsWith('BLOCKLET_'));
-  });
-
   newConfig.forEach((config) => {
     const { name, key, value, default: defaultVal, required, description, secure, validation, custom, shared } = config;
     // 新增、更新或者删除
@@ -76,16 +80,21 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
     if (name) {
       // 重装时 name 和 value不覆盖
       if (oldConfig[name]) {
+        const oldSecure = oldConfig[name].secure;
+        const oldValue =
+          enableSecurity && oldSecure ? security.decrypt(oldConfig[name].value, did, dek) : oldConfig[name].value;
+
+        const newSecure = secure === undefined ? false : secure;
+
         oldConfig[name] = {
-          value: oldConfig[name].value,
+          value: enableSecurity && newSecure ? security.encrypt(oldValue, did, dek) : oldValue,
           required: required === undefined ? false : required,
           description: description || '',
           validation: validation || '',
-          secure: secure === undefined ? false : secure,
+          secure: newSecure,
           custom: custom === undefined ? false : custom,
           shared,
         };
-
         return;
       }
 
@@ -120,7 +129,9 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
 };
 
 const parseConfigs = ({ data, did, dek }) => {
-  if (dek && did && Array.isArray(data)) {
+  const enableSecurity = dek && did;
+
+  if (enableSecurity && Array.isArray(data)) {
     return cloneDeep(data).map((x) => {
       if (x.secure) {
         x.value = security.decrypt(x.value, did, dek);

package/lib/blocklet/manager/disk.js

@@ -43,7 +43,7 @@ const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const toBlockletDid = require('@blocklet/meta/lib/did');
 const { validateMeta } = require('@blocklet/meta/lib/validate');
 const { update: updateMetaFile } = require('@blocklet/meta/lib/file');
-const { titleSchema, descriptionSchema } = require('@blocklet/meta/lib/schema');
+const { titleSchema, descriptionSchema, mountPointSchema } = require('@blocklet/meta/lib/schema');
 const hasReservedKey = require('@blocklet/meta/lib/has-reserved-key');
 
 const {
@@ -698,7 +698,7 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     const newBlocklet = await this.ensureBlocklet(rootDid);
-    this.emit(BlockletEvents.upgraded, { blocklet: newBlocklet, context }); // trigger router refresh
+    this.emit(BlockletEvents.upgraded, { blocklet: newBlocklet, context: { ...context, createAuditLog: false } }); // trigger router refresh
 
     states.notification.create({
       title: 'Component Deleted',
@@ -946,6 +946,80 @@ class BlockletManager extends BaseBlockletManager {
     return blocklet;
   }
 
+  async updateComponentTitle({ did, rootDid: inputRootDid, title }) {
+    await titleSchema.validateAsync(title);
+
+    const blocklet = await states.blocklet.getBlocklet(inputRootDid);
+
+    if (!blocklet) {
+      throw new Error('blocklet does not exist');
+    }
+
+    const rootDid = blocklet.meta.did;
+
+    const { children } = blocklet;
+    const component = children.find((x) => x.meta.did === did);
+
+    if (!component) {
+      throw new Error('component does not exist');
+    }
+
+    if (!component.dynamic) {
+      throw new Error('cannot update title of non-dynamic component');
+    }
+
+    component.meta.title = title;
+
+    const navigation = await states.blockletExtras.getSettings(rootDid, 'navigation', []);
+    const nav = navigation.find((x) => x.child === component.meta.name);
+
+    if (nav) {
+      nav.title = title;
+    }
+
+    // update db
+    if (nav) {
+      await states.blockletExtras.setSettings(rootDid, { navigation });
+    }
+    await states.blocklet.updateBlocklet(rootDid, { children });
+
+    // trigger meta.js refresh
+    // trigger dashboard frontend refresh
+    this.emit(BlockletEvents.updated, blocklet);
+
+    return this.ensureBlocklet(rootDid);
+  }
+
+  async updateComponentMountPoint({ did, rootDid: inputRootDid, mountPoint }, context) {
+    await mountPointSchema.validateAsync(mountPoint);
+
+    const blocklet = await states.blocklet.getBlocklet(inputRootDid);
+
+    if (!blocklet) {
+      throw new Error('blocklet does not exist');
+    }
+
+    const rootDid = blocklet.meta.did;
+
+    const { children } = blocklet;
+    const component = children.find((x) => x.meta.did === did);
+
+    if (!component) {
+      throw new Error('component does not exist');
+    }
+
+    if (!component.dynamic) {
+      throw new Error('cannot update mountPoint of non-dynamic component');
+    }
+
+    component.mountPoint = mountPoint;
+    await states.blocklet.updateBlocklet(rootDid, { children });
+
+    this.emit(BlockletEvents.upgraded, { blocklet, context: { ...context, createAuditLog: false } }); // trigger router refresh
+
+    return this.ensureBlocklet(rootDid);
+  }
+
   /**
    * upgrade blocklet from registry
    */

package/lib/event.js

@@ -181,17 +181,19 @@ module.exports = ({
     } else if ([BlockletEvents.upgraded, BlockletEvents.downgraded].includes(eventName)) {
       await handleBlockletUpgrade(eventName, payload);
 
-      try {
-        await node.createAuditLog({
-          action: 'upgradeBlocklet',
-          args: {
-            did: blocklet.meta.did,
-          },
-          context: payload.context || {},
-          result: blocklet,
-        });
-      } catch (error) {
-        logger.error('Failed to createAuditLog for upgradeBlocklet', { error });
+      if (payload?.context?.createAuditLog !== false) {
+        try {
+          await node.createAuditLog({
+            action: 'upgradeBlocklet',
+            args: {
+              did: blocklet.meta.did,
+            },
+            context: payload.context || {},
+            result: blocklet,
+          });
+        } catch (error) {
+          logger.error('Failed to createAuditLog for upgradeBlocklet', { error });
+        }
       }
     } else if ([BlockletEvents.removed].includes(eventName)) {
       await handleBlockletRemove(eventName, payload);
@@ -285,6 +287,9 @@ module.exports = ({
   teamAPI.on(EVENTS.USER_UPDATED, (data) => onEvent(EVENTS.USER_UPDATED, data));
   teamAPI.on(BlockletEvents.updated, (data) => onEvent(BlockletEvents.updated, data));
 
+  certManager.on('cert.issued', (data) => onEvent(EVENTS.CERT_ISSUED, data));
+  certManager.on('cert.error', (data) => onEvent(EVENTS.CERT_ERROR, data));
+
   events.setEventHandler = (handler) => {
     if (typeof handler === 'function') {
       eventHandler = handler;
@@ -294,8 +299,5 @@ module.exports = ({
   events.handleServerEvent = handleServerEvent;
   events.handleBlockletEvent = handleBlockletEvent;
 
-  certManager.on('cert.issued', (data) => onEvent(EVENTS.CERT_ISSUED, data));
-  certManager.on('cert.error', (data) => onEvent(EVENTS.CERT_ERROR, data));
-
   return events;
 };

package/lib/index.js

@@ -209,13 +209,15 @@ function ABTNode(options) {
     configBlocklet: blockletManager.config.bind(blockletManager),
     devBlocklet: blockletManager.dev.bind(blockletManager),
     checkChildBlockletsForUpdates: blockletManager.checkChildrenForUpdates.bind(blockletManager),
-    updateChildBlocklets: blockletManager.updateChildren.bind(blockletManager),
+    upgradeChildBlocklets: blockletManager.updateChildren.bind(blockletManager),
     getLatestBlockletVersion: blockletManager.getLatestBlockletVersion.bind(blockletManager),
     getBlockletMetaFromUrl: blockletManager.getMetaFromUrl.bind(blockletManager),
     resetBlocklet: blockletManager.reset.bind(blockletManager),
     deleteBlockletProcess: blockletManager.deleteProcess.bind(blockletManager),
     configPublicToStore: blockletManager.configPublicToStore.bind(blockletManager),
     updateWhoCanAccess: blockletManager.updateWhoCanAccess.bind(blockletManager),
+    updateComponentTitle: blockletManager.updateComponentTitle.bind(blockletManager),
+    updateComponentMountPoint: blockletManager.updateComponentMountPoint.bind(blockletManager),
 
     // For diagnose purpose
     syncBlockletStatus: blockletManager.status.bind(blockletManager),
@@ -456,7 +458,9 @@ function ABTNode(options) {
       .catch((error) => logger.error('start certificate manager service failed', { error }));
 
     if (process.env.NODE_ENV === 'development') {
-      initCron();
+      setTimeout(() => {
+        initCron();
+      }, 1000);
     } else {
       // We should only respond to pm2 events when node is alive
       events.on(EVENTS.NODE_STARTED, () => {

package/lib/states/audit-log.js

@@ -122,6 +122,10 @@ const getLogContent = async (action, args, context, result, info, node) => {
         return `set publicToStore to true for blocklet ${getBlockletInfo(result, info)}`;
       }
       return `set publicToStore to false for blocklet ${getBlockletInfo(result, info)}`;
+    case 'updateComponentTitle':
+      return `update component title to **${args.title}** for blocklet ${getBlockletInfo(result, info)}`;
+    case 'updateComponentMountPoint':
+      return `update component mount point to **${args.mountPoint}** for blocklet ${getBlockletInfo(result, info)}`;
     // store
     case 'addBlockletStore':
       return `added blocklet store ${args.url}`;
@@ -257,6 +261,8 @@ const getLogCategory = (action) => {
     case 'upgradeBlocklet':
     case 'updateChildBlocklets':
     case 'configPublicToStore':
+    case 'updateComponentTitle':
+    case 'updateComponentMountPoint':
       return 'blocklet';
 
     // store
@@ -328,6 +334,11 @@ const getScope = (args = {}) => {
     return args.teamDid;
   }
 
+  // this param usually means mutating a child component
+  if (args.rootDid) {
+    return args.rootDid;
+  }
+
   // this param usually means mutating an blockle application
   if (args.did) {
     // this param usually means mutating a nested child component
@@ -338,11 +349,6 @@ const getScope = (args = {}) => {
     return args.did;
   }
 
-  // this param usually means mutating a child component
-  if (args.rootDid) {
-    return args.rootDid;
-  }
-
   return null;
 };
 

package/lib/states/blocklet-extras.js

@@ -133,7 +133,9 @@ class BlockletExtrasState extends BaseState {
         logger.info('update extra success', { name, dids });
       }
 
-      return newData;
+      // re get data because should return decrypted secure value
+      const getFn = this[camelCase(`get ${extra.name}`)].bind(this);
+      return getFn(dids);
     };
   }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.22",
+  "version": "1.8.24",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.22",
-    "@abtnode/certificate-manager": "1.8.22",
-    "@abtnode/constant": "1.8.22",
-    "@abtnode/cron": "1.8.22",
-    "@abtnode/db": "1.8.22",
-    "@abtnode/logger": "1.8.22",
-    "@abtnode/queue": "1.8.22",
-    "@abtnode/rbac": "1.8.22",
-    "@abtnode/router-provider": "1.8.22",
-    "@abtnode/static-server": "1.8.22",
-    "@abtnode/timemachine": "1.8.22",
-    "@abtnode/util": "1.8.22",
+    "@abtnode/auth": "1.8.24",
+    "@abtnode/certificate-manager": "1.8.24",
+    "@abtnode/constant": "1.8.24",
+    "@abtnode/cron": "1.8.24",
+    "@abtnode/db": "1.8.24",
+    "@abtnode/logger": "1.8.24",
+    "@abtnode/queue": "1.8.24",
+    "@abtnode/rbac": "1.8.24",
+    "@abtnode/router-provider": "1.8.24",
+    "@abtnode/static-server": "1.8.24",
+    "@abtnode/timemachine": "1.8.24",
+    "@abtnode/util": "1.8.24",
     "@arcblock/did": "1.17.19",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.17.19",
@@ -38,8 +38,8 @@
     "@arcblock/jwt": "^1.17.19",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.17.19",
-    "@blocklet/meta": "1.8.22",
-    "@blocklet/sdk": "1.8.22",
+    "@blocklet/meta": "1.8.24",
+    "@blocklet/sdk": "1.8.24",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.17.19",
     "@ocap/util": "1.17.19",
@@ -80,5 +80,5 @@
     "express": "^4.18.1",
     "jest": "^27.5.1"
   },
-  "gitHead": "b0b31c2a0d29de79b29591f020f577d6c3806248"
+  "gitHead": "2b955a638ca6177c04f3a722cc326770fba276f0"
 }