@abtnode/core 1.6.30 → 1.7.1

package/lib/api/team.js

@@ -1,7 +1,7 @@
 const { EventEmitter } = require('events');
 const pick = require('lodash/pick');
 const logger = require('@abtnode/logger')('@abtnode/core:api:team');
-const { ROLES, genPermissionName, EVENTS } = require('@abtnode/constant');
+const { ROLES, genPermissionName, EVENTS, WHO_CAN_ACCESS } = require('@abtnode/constant');
 const { isValid: isValidDid } = require('@arcblock/did');
 const { BlockletEvents } = require('@blocklet/meta/lib/constants');
 const { validateTrustedPassportIssuers } = require('../validators/trusted-passport');
@@ -454,6 +454,14 @@ class TeamAPI extends EventEmitter {
     }
   }
 
+  async configWhoCanAccess({ teamDid, value }) {
+    if (!Object.values(WHO_CAN_ACCESS).includes(value)) {
+      throw new Error('value is invalid');
+    }
+
+    await this.teamManager.configWhoCanAccess(teamDid, value);
+  }
+
   // Access Control
 
   async getRoles({ teamDid }) {

package/lib/blocklet/manager/disk.js

@@ -34,6 +34,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 {
   BlockletStatus,
@@ -252,8 +253,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) {
@@ -622,6 +624,14 @@ class BlockletManager extends BaseBlockletManager {
         }
       }
 
+      if (x.key === 'BLOCKLET_APP_NAME') {
+        x.value = await titleSchema.validateAsync(x.value);
+      }
+
+      if (x.key === 'BLOCKLET_APP_DESCRIPTION') {
+        x.value = await descriptionSchema.validateAsync(x.value);
+      }
+
       if (x.key === 'BLOCKLET_WALLET_TYPE') {
         if (['default', 'eth'].includes(x.value) === false) {
           throw new Error('Invalid blocklet wallet type, only "default" and "eth" are supported');
@@ -997,13 +1007,14 @@ class BlockletManager extends BaseBlockletManager {
       }),
     };
 
-    const configs = await states.blockletExtras.getConfigs(did);
+    const configs = await states.blockletExtras.getConfigs(blocklet.meta.did);
     fillBlockletConfigs(blocklet, configs);
 
     // merge settings to blocklet
-    const settings = await states.blockletExtras.getSettings(did);
+    const settings = await states.blockletExtras.getSettings(blocklet.meta.did);
     blocklet.trustedPassports = get(settings, 'trustedPassports') || [];
     blocklet.enablePassportIssuance = get(settings, 'enablePassportIssuance', true);
+    blocklet.settings = settings || {};
 
     // handle child env
     for (const child of blocklet.children) {
@@ -1026,13 +1037,25 @@ class BlockletManager extends BaseBlockletManager {
         }),
       };
 
-      const childConfigs = await states.blockletExtras.getChildConfigs(did, childDid);
+      const childConfigs = await states.blockletExtras.getChildConfigs(blocklet.meta.did, childDid);
       fillBlockletConfigs(child, childConfigs, blocklet);
     }
 
+    // site
+    blocklet.site = await this.getSiteByDid(blocklet.meta.did);
+
     return blocklet;
   }
 
+  async setInitialized({ did }) {
+    const blocklet = await states.blocklet.getBlocklet(did);
+    await states.blockletExtras.setSettings(blocklet.meta.did, { initialized: true });
+
+    this.emit(BlockletEvents.updated, { meta: { did: blocklet.meta.did } });
+
+    return this.ensureBlocklet(did);
+  }
+
   async status(did, { forceSync = false } = {}) {
     const fastReturnOnForceSync = async (blocklet = {}) => {
       const { status } = blocklet;
@@ -1594,7 +1617,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 +1643,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 +1662,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/cert.js

@@ -37,6 +37,14 @@ const onCertIssued = (cert) => {
   });
 };
 
+const getDomainFromInput = (input) => {
+  if (Object.prototype.toString.call(input) === '[object Object]') {
+    return input.domain;
+  }
+
+  return input;
+};
+
 class Cert extends EventEmitter {
   constructor({ maintainerEmail, dataDir }) {
     super();
@@ -74,7 +82,8 @@ class Cert extends EventEmitter {
     return this.manager.getNormalByDomain(domain);
   }
 
-  getByDomain(domain) {
+  getByDomain(inputDomain) {
+    const domain = getDomainFromInput(inputDomain);
     return this.manager.getByDomain(domain);
   }
 

package/lib/index.js

@@ -137,6 +137,7 @@ function ABTNode(options) {
   const {
     handleRouting,
     getRoutingRulesByDid,
+    getSiteByDid,
     updateNodeRouting,
     takeRoutingSnapshot,
     getRoutingSites,
@@ -157,6 +158,7 @@ function ABTNode(options) {
   const teamAPI = new TeamAPI({ states, teamManager });
 
   blockletManager.getRoutingRulesByDid = getRoutingRulesByDid;
+  blockletManager.getSiteByDid = getSiteByDid;
 
   // Generate an on node ready callback
   const onStatesReady = createStateReadyQueue({ states, options, dataDirs });
@@ -226,6 +228,7 @@ function ABTNode(options) {
     getBlocklet: blockletManager.detail.bind(blockletManager),
     getBlockletDiff: blockletManager.diff.bind(blockletManager),
     updateAllBlockletEnvironment: blockletManager.updateAllBlockletEnvironment.bind(blockletManager),
+    setBlockletInitialized: blockletManager.setInitialized.bind(blockletManager),
 
     // Registry
     listBlocklets: blockletRegistry.listBlocklets.bind(blockletRegistry),
@@ -295,6 +298,7 @@ function ABTNode(options) {
     processPassportIssuance: teamAPI.processPassportIssuance.bind(teamAPI),
     configTrustedPassports: teamAPI.configTrustedPassports.bind(teamAPI),
     configPassportIssuance: teamAPI.configPassportIssuance.bind(teamAPI),
+    configWhoCanAccess: teamAPI.configWhoCanAccess.bind(teamAPI),
 
     // Challenge
     generateChallenge: states.challenge.generate.bind(states.challenge),

package/lib/migrations/1.7.1-blocklet-setup.js

@@ -0,0 +1,18 @@
+/* eslint-disable no-continue */
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-underscore-dangle */
+
+module.exports = async ({ states, printInfo }) => {
+  printInfo('Try to update blocklet to 1.7.1...');
+
+  const blockletExtras = await states.blockletExtras.find({});
+  for (const extra of blockletExtras) {
+    if (!extra) {
+      continue;
+    }
+
+    await states.blockletExtras.setSettings(extra.did, { initialized: true });
+
+    printInfo(`Set initialized: ${extra}`);
+  }
+};

package/lib/router/helper.js

@@ -437,6 +437,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
         certificate,
         isProtected: true,
       });
+
       logger.info('dashboard certificate updated');
     } catch (error) {
       logger.error('update dashboard certificate failed', { error });
@@ -448,13 +449,14 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
 
   const updateCert = async (domain, url) => {
     try {
-      const cert = await routerManager.findCertificateByDomain(domain);
+      const cert = await certManager.getByDomain(domain);
       if (!cert) {
         return;
       }
 
       const now = Date.now();
       const certInfo = getHttpsCertInfo(cert.certificate);
+
       if (certInfo.validTo - now >= CERTIFICATE_EXPIRES_OFFSET) {
         logger.info('skip dashboard certificate update before not expired', { domain, url });
         return;
@@ -1122,6 +1124,12 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     return rules.filter((rule) => rule.to.did === did);
   }
 
+  async function getSiteByDid(did) {
+    const { sites } = await readRoutingSites();
+    const domain = getBlockletDomainGroupName(did);
+    return (sites || []).find((x) => x.domain === domain);
+  }
+
   const providers = {}; // we need to keep reference for different router instances
   const handleRouting = async (nodeInfo) => {
     const providerName = get(nodeInfo, 'routing.provider', null);
@@ -1372,6 +1380,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     removeBlockletRouting,
     handleRouting,
     getRoutingRulesByDid,
+    getSiteByDid,
     updateNodeRouting,
     takeRoutingSnapshot,
     getRoutingSites,

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/team/manager.js

@@ -234,6 +234,14 @@ class TeamManager extends EventEmitter {
     return this.states.blockletExtras.setSettings(did, { trustedPassports });
   }
 
+  async configWhoCanAccess(did, value) {
+    if (this.isNodeTeam(did)) {
+      throw new Error('Cannot be node did');
+    }
+
+    return this.states.blockletExtras.setSettings(did, { whoCanAccess: value });
+  }
+
   async configPassportIssuance(did, enable) {
     const enablePassportIssuance = enable;
     if (this.isNodeTeam(did)) {

package/lib/util/blocklet.js

@@ -42,7 +42,7 @@ const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const getBlockletEngine = require('@blocklet/meta/lib/engine');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const { validateMeta, fixAndValidateService } = require('@blocklet/meta/lib/validate');
-const { forEachBlocklet, isFreeBlocklet, getDisplayName } = require('@blocklet/meta/lib/util');
+const { forEachBlocklet, isFreeBlocklet, getDisplayName, findWebInterface } = require('@blocklet/meta/lib/util');
 
 const { validate: validateEngine, get: getEngine } = require('../blocklet/manager/engine');
 
@@ -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) => {
@@ -629,17 +629,6 @@ const reloadProcess = (appId) =>
     });
   });
 
-const findWebInterface = (blocklet) => {
-  const meta = blocklet.meta || blocklet || {};
-  const { interfaces = [] } = meta;
-
-  if (!Array.isArray(interfaces)) {
-    return null;
-  }
-
-  return interfaces.find((x) => x.type === BLOCKLET_INTERFACE_TYPE_WEB);
-};
-
 /**
  * this function has side effect on children
  */

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/lib/util/reset-node.js

@@ -77,7 +77,7 @@ const resetUsers = async ({ teamManager }) => {
 
   let count = 0;
   for (const user of users) {
-    if (nodeInfo.nodeOwner.did !== user.find) {
+    if (nodeInfo.nodeOwner.did !== user.did) {
       // eslint-disable-next-line no-await-in-loop
       await userState.remove({ did: user.did });
       count++;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.30",
+  "version": "1.7.1",
   "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.30",
-    "@abtnode/constant": "1.6.30",
-    "@abtnode/cron": "1.6.30",
-    "@abtnode/db": "1.6.30",
-    "@abtnode/logger": "1.6.30",
-    "@abtnode/queue": "1.6.30",
-    "@abtnode/rbac": "1.6.30",
-    "@abtnode/router-provider": "1.6.30",
-    "@abtnode/static-server": "1.6.30",
-    "@abtnode/timemachine": "1.6.30",
-    "@abtnode/util": "1.6.30",
-    "@arcblock/did": "^1.14.20",
-    "@arcblock/event-hub": "1.14.20",
+    "@abtnode/certificate-manager": "1.7.1",
+    "@abtnode/constant": "1.7.1",
+    "@abtnode/cron": "1.7.1",
+    "@abtnode/db": "1.7.1",
+    "@abtnode/logger": "1.7.1",
+    "@abtnode/queue": "1.7.1",
+    "@abtnode/rbac": "1.7.1",
+    "@abtnode/router-provider": "1.7.1",
+    "@abtnode/static-server": "1.7.1",
+    "@abtnode/timemachine": "1.7.1",
+    "@abtnode/util": "1.7.1",
+    "@arcblock/did": "^1.15.3",
+    "@arcblock/event-hub": "1.15.3",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.14.20",
-    "@blocklet/meta": "1.6.30",
+    "@arcblock/vc": "^1.15.3",
+    "@blocklet/meta": "1.7.1",
     "@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.15.3",
+    "@ocap/util": "^1.15.3",
+    "@ocap/wallet": "^1.15.3",
     "@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": "d8ea64b807f7852186cd4bf544193496fbb31e7c"
+  "gitHead": "5d7efb21dd09f90206251fb74601ca37b0ef84bf"
 }