@abtnode/core 1.6.29 → 1.7.0

package/lib/blocklet/manager/disk.js

@@ -252,8 +252,9 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     const blocklet = await states.blocklet.getBlocklet(meta.did);
+    const isRunning = blocklet?.status === BlockletStatus.running;
 
-    return { meta, isFree, isInstalled: !!blocklet };
+    return { meta, isFree, isInstalled: !!blocklet, isRunning };
   }
 
   async installBlockletFromVc({ vcPresentation, challenge }, context) {
@@ -1594,7 +1595,7 @@ class BlockletManager extends BaseBlockletManager {
       const newBlocklet = await states.blocklet.getBlocklet(did);
       newBlocklet.meta = meta;
       newBlocklet.source = BlockletSource.upload;
-      newBlocklet.deployedFrom = `Upload by ${context.user.did}`;
+      newBlocklet.deployedFrom = `Upload by ${context.user.fullName}`;
       newBlocklet.children = await this._getChildren(meta);
       await validateBlocklet(newBlocklet);
       await this._downloadBlocklet(newBlocklet, oldBlocklet);
@@ -1620,7 +1621,7 @@ class BlockletManager extends BaseBlockletManager {
       const newBlocklet = await states.blocklet.getBlocklet(meta.did);
       newBlocklet.meta = meta;
       newBlocklet.source = BlockletSource.upload;
-      newBlocklet.deployedFrom = `Upload by ${context.user.did}`;
+      newBlocklet.deployedFrom = `Upload by ${context.user.fullName}`;
       newBlocklet.children = await this._getChildren(meta);
 
       await validateBlocklet(newBlocklet);
@@ -1639,7 +1640,7 @@ class BlockletManager extends BaseBlockletManager {
       did: meta.did,
       meta,
       source: BlockletSource.upload,
-      deployedFrom: `Upload by ${context.user.did}`,
+      deployedFrom: `Upload by ${context.user.fullName}`,
       children,
     });
 

package/lib/states/access-key.js

@@ -1,3 +1,4 @@
+const get = require('lodash/get');
 const { fromRandom } = require('@ocap/wallet');
 const { toBase58 } = require('@ocap/util');
 const logger = require('@abtnode/logger')('@abtnode/core:access-key');
@@ -15,6 +16,8 @@ const validatePassport = (passport) => {
   }
 };
 
+const getUserName = (context) => get(context, 'user.fullName', '');
+
 class AccessKeyState extends BaseState {
   constructor(baseDir, options = {}) {
     super(baseDir, { filename: 'access_key.db', ...options });
@@ -26,7 +29,6 @@ class AccessKeyState extends BaseState {
     });
   }
 
-  // eslint-disable-next-line no-unused-vars
   async create(input = {}, context) {
     const { remark, passport } = input;
 
@@ -42,6 +44,10 @@ class AccessKeyState extends BaseState {
     if (remark) {
       data.remark = remark;
     }
+
+    data.createdBy = getUserName(context);
+    data.updatedBy = getUserName(context);
+
     const doc = await this.asyncDB.insert(data);
     return {
       ...doc,
@@ -84,6 +90,7 @@ class AccessKeyState extends BaseState {
       doc.remark = remark;
     }
     doc.passport = passport;
+    doc.updatedBy = getUserName(context);
 
     await this.asyncDB.update({ accessKeyId }, { $set: doc });
     return doc;

package/lib/util/blocklet.js

@@ -338,7 +338,7 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, parent) => {
 const getSharedConfigs = (child, parent) => {
   const sharedConfigs = {};
   if (parent && Array.isArray(parent.configs) && child.meta.did !== parent.meta.did) {
-    const parentKeys = parent.configs.filter((x) => x.secure === false).map((x) => x.key);
+    const parentKeys = parent.configs.filter((x) => x.secure === false && x.shared !== false).map((x) => x.key);
     const childKeys = child.configs.map((x) => x.key);
     const sharedKeys = intersection(parentKeys, childKeys);
     sharedKeys.forEach((key) => {

package/lib/util/get-domain-for-blocklet.js

@@ -1,5 +1,5 @@
 const slugify = require('slugify');
-const { DEFAULT_IP_DNS_DOMAIN_SUFFIX } = require('@abtnode/constant');
+const { DEFAULT_IP_DOMAIN_SUFFIX } = require('@abtnode/constant');
 const md5 = require('@abtnode/util/lib/md5');
 
 const SLOT_FOR_IP_DNS_SITE = '888-888-888-888';
@@ -14,7 +14,7 @@ const getIpDnsDomainForBlocklet = (blocklet, blockletInterface) => {
 
   return `${formatName(blocklet.meta.name)}-${nameSuffix}${
     iName ? '-' : ''
-  }${iName}-${SLOT_FOR_IP_DNS_SITE}.${DEFAULT_IP_DNS_DOMAIN_SUFFIX}`;
+  }${iName}-${SLOT_FOR_IP_DNS_SITE}.${DEFAULT_IP_DOMAIN_SUFFIX}`;
 };
 
 const getDidDomainForBlocklet = ({ name, daemonDid, didDomain }) => {

package/lib/util/index.js

@@ -26,7 +26,7 @@ const {
   DEFAULT_HTTPS_PORT,
   ROUTING_RULE_TYPES,
   SLOT_FOR_IP_DNS_SITE,
-  DEFAULT_IP_DNS_DOMAIN_SUFFIX,
+  DEFAULT_IP_DOMAIN_SUFFIX,
   BLOCKLET_SITE_GROUP_SUFFIX,
 } = require('@abtnode/constant');
 
@@ -115,7 +115,7 @@ const getBlockletBaseUrls = ({ rules = [], context = {}, nodeIp }) => {
       const host = getBlockletHost({ domain: rule.from.domain, context, nodeIp });
       if (host) {
         let protocol = 'http'; // TODO: 这里固定为 http, 因为判断 url 是不是 https 和证书相关，这里实现的话比较复杂
-        if (host.includes(DEFAULT_IP_DNS_DOMAIN_SUFFIX)) {
+        if (host.includes(DEFAULT_IP_DOMAIN_SUFFIX)) {
           protocol = 'https';
         }
 

package/lib/util/requirement.js

@@ -28,7 +28,7 @@ const isSatisfied = (requirements, throwOnUnsatisfied = true) => {
       throw new Error(`Your blocklet is not supported on architecture ${actualCpu}`);
     }
     if (isVersionSatisfied === false) {
-      throw new Error(`Your blocklet is not supported on abtnode version v${actualVersion}`);
+      throw new Error(`Your blocklet is not supported on server version v${actualVersion}`);
     }
   }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.29",
+  "version": "1.7.0",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,28 +19,28 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.6.29",
-    "@abtnode/constant": "1.6.29",
-    "@abtnode/cron": "1.6.29",
-    "@abtnode/db": "1.6.29",
-    "@abtnode/logger": "1.6.29",
-    "@abtnode/queue": "1.6.29",
-    "@abtnode/rbac": "1.6.29",
-    "@abtnode/router-provider": "1.6.29",
-    "@abtnode/static-server": "1.6.29",
-    "@abtnode/timemachine": "1.6.29",
-    "@abtnode/util": "1.6.29",
-    "@arcblock/did": "^1.14.20",
-    "@arcblock/event-hub": "1.14.20",
+    "@abtnode/certificate-manager": "1.7.0",
+    "@abtnode/constant": "1.7.0",
+    "@abtnode/cron": "1.7.0",
+    "@abtnode/db": "1.7.0",
+    "@abtnode/logger": "1.7.0",
+    "@abtnode/queue": "1.7.0",
+    "@abtnode/rbac": "1.7.0",
+    "@abtnode/router-provider": "1.7.0",
+    "@abtnode/static-server": "1.7.0",
+    "@abtnode/timemachine": "1.7.0",
+    "@abtnode/util": "1.7.0",
+    "@arcblock/did": "^1.14.25",
+    "@arcblock/event-hub": "1.14.25",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.14.20",
-    "@blocklet/meta": "1.6.29",
+    "@arcblock/vc": "^1.14.25",
+    "@blocklet/meta": "1.7.0",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.14.20",
-    "@ocap/util": "^1.14.20",
-    "@ocap/wallet": "^1.14.20",
+    "@ocap/mcrypto": "^1.14.25",
+    "@ocap/util": "^1.14.25",
+    "@ocap/wallet": "^1.14.25",
     "@slack/webhook": "^5.0.3",
     "ajv": "^7.0.3",
     "axios": "^0.25.0",
@@ -77,5 +77,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "0d02246307d364e952990b3e64b608dfefc80efe"
+  "gitHead": "fc949a5e8a1017fbe17533d3bd78b166c7dad132"
 }