@abtnode/core 1.16.0-beta-b16cb035 → 1.16.0-beta-8ee536d7

package/lib/blocklet/manager/disk.js

@@ -4,6 +4,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const flat = require('flat');
 const get = require('lodash/get');
+const uniq = require('lodash/uniq');
 const merge = require('lodash/merge');
 const pick = require('lodash/pick');
 const cloneDeep = require('lodash/cloneDeep');
@@ -989,7 +990,7 @@ class BlockletManager extends BaseBlockletManager {
       throw new Error('configs list is not an array');
     }
 
-    const dids = Array.isArray(did) ? did : [did];
+    const dids = Array.isArray(did) ? uniq(did) : [did];
     const [rootDid, ...childDids] = dids;
     logger.info('config blocklet', { dids });
 

package/lib/blocklet/manager/helper/migrate-application-to-struct-v2.js

@@ -325,16 +325,16 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
       Object.entries(sharedConfigObj).forEach(([key, value]) => {
         if (!extraData.configs.some((x) => x.key === key)) {
           logger.info('add shared config to container configs', { did, key, value });
-          extraData.configs.push({ key, value });
+          extraData.configs.push({ key, value, secure: false, shared: true });
         }
       });
     }
 
     // move component data dir
     const src = component.env.dataDir;
-    const dist = path.join(dataDirSrc, component.meta.bundleName);
-    if (src !== dist) {
-      dataMoveList.push({ src: component.env.dataDir, dist: path.join(dataDirDist, component.meta.bundleName) });
+    const dist = path.join(dataDirDist, component.meta.bundleName);
+    if (fs.existsSync(src)) {
+      dataMoveList.push({ src, dist });
     }
   });
 

package/lib/router/helper.js

@@ -204,6 +204,7 @@ const ensureLatestNodeInfo = async (sites = [], { withDefaultCors = true } = {})
  * set rule.to.target by interface.path and interface.prefix
  */
 const ensureLatestInterfaceInfo = async (sites = []) => {
+  // FIXME @linchen groupAllInterfaces() may have performance issue
   const interfaces = await states.blocklet.groupAllInterfaces();
   return sites.map((site) => {
     if (!Array.isArray(site.rules)) {
@@ -223,10 +224,10 @@ const ensureLatestInterfaceInfo = async (sites = []) => {
         return rule;
       }
 
-      const { did, interfaceName } = rule.to;
-      if (interfaces[did] && interfaces[did][interfaceName]) {
+      const { componentId, interfaceName } = rule.to;
+      if (interfaces[componentId] && interfaces[componentId][interfaceName]) {
         // eslint-disable-next-line no-shadow
-        const { path, prefix } = interfaces[did][interfaceName];
+        const { path, prefix } = interfaces[componentId][interfaceName];
         if (prefix === BLOCKLET_DYNAMIC_PATH_PREFIX) {
           rule.to.target = path;
         } else {

package/lib/states/blocklet-extras.js

@@ -5,6 +5,7 @@ const logger = require('@abtnode/logger')('state-blocklet-extras');
 const { EXPIRED_BLOCKLET_DATA_RETENTION_DAYS } = require('@abtnode/constant');
 const camelCase = require('lodash/camelCase');
 const get = require('lodash/get');
+const uniq = require('lodash/uniq');
 const dayjs = require('dayjs');
 
 const BaseState = require('./base');
@@ -127,7 +128,7 @@ class BlockletExtrasState extends BaseState {
   generateGetFn(extra) {
     return async (dids, path, defaultValue) => {
       // eslint-disable-next-line no-param-reassign
-      dids = [].concat(dids);
+      dids = uniq([].concat(dids));
       const [rootDid, ...childDids] = dids;
       const { dek } = this.config;
       const { name, afterGet = noop('data') } = extra;
@@ -149,7 +150,7 @@ class BlockletExtrasState extends BaseState {
   generateSetFn(extra) {
     return async (dids, data) => {
       // eslint-disable-next-line no-param-reassign
-      dids = [].concat(dids);
+      dids = uniq([].concat(dids));
       const [rootDid, ...childDids] = dids;
       const { dek } = this.config;
       const { name, beforeSet = noop('cur') } = extra;
@@ -189,7 +190,7 @@ class BlockletExtrasState extends BaseState {
   generateDelFn(extra) {
     return async (dids) => {
       // eslint-disable-next-line no-param-reassign
-      dids = [].concat(dids);
+      dids = uniq([].concat(dids));
       const [rootDid, ...childDids] = dids;
       const { name } = extra;
       const item = await this.findOne({ did: rootDid });

package/lib/states/blocklet.js

@@ -509,17 +509,21 @@ class BlockletState extends BaseState {
    * @return {Object} { <did> : { interfaceName } }
    */
   async groupAllInterfaces() {
-    const blocklets = await this.getBlocklets({}, { meta: 1 });
+    const blocklets = await this.getBlocklets({}, { meta: 1, children: 1 });
     const result = {};
-    blocklets.forEach((blocklet) => {
-      const { did, interfaces } = blocklet.meta;
-      if (typeof result[did] === 'undefined') {
-        result[did] = {};
+    const fillResult = (component, { id }) => {
+      const { interfaces } = component.meta;
+      if (typeof result[id] === 'undefined') {
+        result[id] = {};
       }
 
       (interfaces || []).forEach((x) => {
-        result[did][x.name] = x;
+        result[id][x.name] = x;
       });
+    };
+
+    blocklets.forEach((blocklet) => {
+      forEachBlockletSync(blocklet, fillResult);
     });
 
     return result;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0-beta-b16cb035",
+  "version": "1.16.0-beta-8ee536d7",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,34 +19,34 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.0-beta-b16cb035",
-    "@abtnode/certificate-manager": "1.16.0-beta-b16cb035",
-    "@abtnode/constant": "1.16.0-beta-b16cb035",
-    "@abtnode/cron": "1.16.0-beta-b16cb035",
-    "@abtnode/db": "1.16.0-beta-b16cb035",
-    "@abtnode/logger": "1.16.0-beta-b16cb035",
-    "@abtnode/queue": "1.16.0-beta-b16cb035",
-    "@abtnode/rbac": "1.16.0-beta-b16cb035",
-    "@abtnode/router-provider": "1.16.0-beta-b16cb035",
-    "@abtnode/static-server": "1.16.0-beta-b16cb035",
-    "@abtnode/timemachine": "1.16.0-beta-b16cb035",
-    "@abtnode/util": "1.16.0-beta-b16cb035",
-    "@arcblock/did": "1.18.59",
+    "@abtnode/auth": "1.16.0-beta-8ee536d7",
+    "@abtnode/certificate-manager": "1.16.0-beta-8ee536d7",
+    "@abtnode/constant": "1.16.0-beta-8ee536d7",
+    "@abtnode/cron": "1.16.0-beta-8ee536d7",
+    "@abtnode/db": "1.16.0-beta-8ee536d7",
+    "@abtnode/logger": "1.16.0-beta-8ee536d7",
+    "@abtnode/queue": "1.16.0-beta-8ee536d7",
+    "@abtnode/rbac": "1.16.0-beta-8ee536d7",
+    "@abtnode/router-provider": "1.16.0-beta-8ee536d7",
+    "@abtnode/static-server": "1.16.0-beta-8ee536d7",
+    "@abtnode/timemachine": "1.16.0-beta-8ee536d7",
+    "@abtnode/util": "1.16.0-beta-8ee536d7",
+    "@arcblock/did": "1.18.62",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.59",
-    "@arcblock/event-hub": "1.18.59",
-    "@arcblock/jwt": "^1.18.59",
+    "@arcblock/did-util": "1.18.62",
+    "@arcblock/event-hub": "1.18.62",
+    "@arcblock/jwt": "^1.18.62",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.18.59",
-    "@blocklet/constant": "1.16.0-beta-b16cb035",
-    "@blocklet/meta": "1.16.0-beta-b16cb035",
-    "@blocklet/sdk": "1.16.0-beta-b16cb035",
+    "@arcblock/vc": "1.18.62",
+    "@blocklet/constant": "1.16.0-beta-8ee536d7",
+    "@blocklet/meta": "1.16.0-beta-8ee536d7",
+    "@blocklet/sdk": "1.16.0-beta-8ee536d7",
     "@did-space/client": "^0.2.33",
     "@fidm/x509": "^1.2.1",
-    "@ocap/client": "1.18.59",
-    "@ocap/mcrypto": "1.18.59",
-    "@ocap/util": "1.18.59",
-    "@ocap/wallet": "1.18.59",
+    "@ocap/client": "1.18.62",
+    "@ocap/mcrypto": "1.18.62",
+    "@ocap/util": "1.18.62",
+    "@ocap/wallet": "1.18.62",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -91,5 +91,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "138bd91aee5a35b28c2de4e1e924c44932efaf3a"
+  "gitHead": "57d0c45be311a5fbc1c0fffa2814b62c1a3ee34c"
 }