@abtnode/core 1.8.25 → 1.8.26

package/lib/index.js

@@ -208,8 +208,8 @@ function ABTNode(options) {
     upgradeBlocklet: blockletManager.upgrade.bind(blockletManager),
     configBlocklet: blockletManager.config.bind(blockletManager),
     devBlocklet: blockletManager.dev.bind(blockletManager),
-    checkChildBlockletsForUpdates: blockletManager.checkChildrenForUpdates.bind(blockletManager),
-    upgradeChildBlocklets: blockletManager.updateChildren.bind(blockletManager),
+    checkComponentsForUpdates: blockletManager.checkChildrenForUpdates.bind(blockletManager),
+    upgradeComponents: blockletManager.updateChildren.bind(blockletManager),
     getLatestBlockletVersion: blockletManager.getLatestBlockletVersion.bind(blockletManager),
     getBlockletMetaFromUrl: blockletManager.getMetaFromUrl.bind(blockletManager),
     resetBlocklet: blockletManager.reset.bind(blockletManager),

package/lib/states/audit-log.js

@@ -115,7 +115,7 @@ const getLogContent = async (action, args, context, result, info, node) => {
         return `upgrade blocklet failed: ${getBlockletInfo(result, info)}`;
       }
       return `upgraded blocklet ${getBlockletInfo(result, info)} to v${result.meta.version}`;
-    case 'updateChildBlocklets':
+    case 'upgradeComponents':
       return `upgraded components for blocklet ${getBlockletInfo(result, info)}`;
     case 'configPublicToStore':
       if (args.publicToStore) {
@@ -259,7 +259,7 @@ const getLogCategory = (action) => {
     case 'deleteComponent':
     case 'configBlocklet':
     case 'upgradeBlocklet':
-    case 'updateChildBlocklets':
+    case 'upgradeComponents':
     case 'configPublicToStore':
     case 'updateComponentTitle':
     case 'updateComponentMountPoint':

package/lib/states/node.js

@@ -294,6 +294,7 @@ class NodeState extends BaseState {
     return this.read().then((info) => ({
       ABT_NODE: info.version,
       ABT_NODE_DID: info.did,
+      ABT_NODE_SK: info.sk,
       ABT_NODE_PK: info.pk,
       ABT_NODE_PORT: info.port,
       ABT_NODE_SERVICE_PORT: process.env.ABT_NODE_SERVICE_PORT,

package/lib/util/blocklet.js

@@ -41,6 +41,7 @@ const verifyMultiSig = require('@blocklet/meta/lib/verify-multi-sig');
 const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const getBlockletEngine = require('@blocklet/meta/lib/engine');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
+const getBlockletWallet = require('@blocklet/meta/lib/wallet');
 const { validateMeta, fixAndValidateService } = require('@blocklet/meta/lib/validate');
 const {
   forEachBlocklet,
@@ -68,6 +69,8 @@ const { getDidDomainForBlocklet } = require('./get-domain-for-blocklet');
 const { getBlockletDomainGroupName } = require('./router');
 const { isBeforeInstalled, expandBundle, findInterfacePortByName, validateBlockletMeta } = require('./index');
 
+const getComponentConfig = (meta) => meta.components || meta.children;
+
 /**
  * get blocklet engine info, default is node
  * @param {object} blockletMeta blocklet meta
@@ -363,6 +366,11 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
     mountPoints.push(mountPoint);
   }
 
+  // use index 1 as the path to derive deterministic encryption key for blocklet
+  const tmp = get(nodeEnvironments, 'ABT_NODE_SK')
+    ? getBlockletWallet(blocklet.meta.did, nodeEnvironments.ABT_NODE_SK, undefined, 1)
+    : null;
+
   return {
     ...blocklet.configObj,
     ...getSharedConfigObj(blocklet, ancestors),
@@ -371,6 +379,7 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
     BLOCKLET_WEB_PORTS: JSON.stringify(ports),
     BLOCKLET_MOUNT_POINTS: JSON.stringify(mountPoints),
     BLOCKLET_MODE: blocklet.mode || BLOCKLET_MODES.PRODUCTION,
+    BLOCKLET_APP_EK: tmp?.secretKey,
     ...nodeEnvironments,
     ...safeNodeEnvironments,
   };
@@ -652,7 +661,7 @@ const reloadProcess = (processId) =>
   });
 
 const parseChildren = (children, parentMeta = {}, { dynamic } = {}) => {
-  const configs = Array.isArray(parentMeta) ? parentMeta : parentMeta.children || [];
+  const configs = Array.isArray(parentMeta) ? parentMeta : getComponentConfig(parentMeta) || [];
 
   children.forEach((x) => {
     if (dynamic !== undefined) {
@@ -673,7 +682,7 @@ const parseChildrenFromMeta = async (src, context = {}) => {
     throw new Error('The depth of component should not exceed 40');
   }
 
-  const configs = Array.isArray(src) ? src : src.children || [];
+  const configs = Array.isArray(src) ? src : getComponentConfig(src) || [];
 
   if (!configs || !configs.length) {
     return [];
@@ -1012,7 +1021,7 @@ const getRuntimeInfo = async (processId) => {
 const mergeMeta = (source, childrenMeta = []) => {
   // configMap
   const configMap = {};
-  (Array.isArray(source) ? source : source.children || []).forEach((x) => {
+  (Array.isArray(source) ? source : getComponentConfig(source) || []).forEach((x) => {
     configMap[x.name] = x;
   });
 
@@ -1065,8 +1074,29 @@ const mergeMeta = (source, childrenMeta = []) => {
 };
 
 const fixAndVerifyMetaFromStore = (meta) => {
+  // strip unknown properties
+  // rename property alias
+
   const sanitized = validateMeta(meta, { ensureDist: false, schemaOptions: { noDefaults: true, stripUnknown: true } });
 
+  // rollback meta renamed by validateMeta
+
+  if (meta.children) {
+    sanitized.children = meta.children;
+    delete sanitized.components;
+  }
+
+  if (meta.navigation) {
+    meta.navigation.forEach((nav, index) => {
+      if (nav.child) {
+        sanitized.navigation[index].child = nav.child;
+        delete sanitized.navigation[index].component;
+      }
+    });
+  }
+
+  // verify
+
   try {
     const result = verifyMultiSig(sanitized);
     if (!result) {

package/lib/util/index.js

@@ -412,9 +412,10 @@ const getQueueConcurrencyByMem = () => {
 
 const getSafeEnv = (inputEnv, processEnv = process.env) => {
   const whiteList = ['ABT_NODE', 'ABT_NODE_DID', 'ABT_NODE_PK', 'ABT_NODE_PORT', 'ABT_NODE_SERVICE_PORT'];
+  const blackList = { ABT_NODE_SK: '' };
   // 此处需要保留 process.env 中的环境变量，只移除和 ABT_NODE 相关的环境变量（否则丢失了 process.env.SHELL 变量可能会造成无法使用 nodejs 的情况）
   const filterProcessEnv = pickBy(processEnv, (value, key) => !key.startsWith('ABT_NODE') || whiteList.includes(key));
-  const mergedEnv = { ...filterProcessEnv, ...inputEnv };
+  const mergedEnv = { ...filterProcessEnv, ...inputEnv, ...blackList };
   return mergedEnv;
 };
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.25",
+  "version": "1.8.26",
   "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.25",
-    "@abtnode/certificate-manager": "1.8.25",
-    "@abtnode/constant": "1.8.25",
-    "@abtnode/cron": "1.8.25",
-    "@abtnode/db": "1.8.25",
-    "@abtnode/logger": "1.8.25",
-    "@abtnode/queue": "1.8.25",
-    "@abtnode/rbac": "1.8.25",
-    "@abtnode/router-provider": "1.8.25",
-    "@abtnode/static-server": "1.8.25",
-    "@abtnode/timemachine": "1.8.25",
-    "@abtnode/util": "1.8.25",
+    "@abtnode/auth": "1.8.26",
+    "@abtnode/certificate-manager": "1.8.26",
+    "@abtnode/constant": "1.8.26",
+    "@abtnode/cron": "1.8.26",
+    "@abtnode/db": "1.8.26",
+    "@abtnode/logger": "1.8.26",
+    "@abtnode/queue": "1.8.26",
+    "@abtnode/rbac": "1.8.26",
+    "@abtnode/router-provider": "1.8.26",
+    "@abtnode/static-server": "1.8.26",
+    "@abtnode/timemachine": "1.8.26",
+    "@abtnode/util": "1.8.26",
     "@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.25",
-    "@blocklet/sdk": "1.8.25",
+    "@blocklet/meta": "1.8.26",
+    "@blocklet/sdk": "1.8.26",
     "@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": "ea34dcd0037c63cb63b31744efcf169edf8aa776"
+  "gitHead": "71937dabc196a98a1bb514789bc32aee44a1e8c4"
 }