@abtnode/core 1.16.6-beta-9e9fec72 → 1.16.6-beta-1fde60e3

package/lib/blocklet/manager/helper/install-application-from-dev.js

@@ -1,4 +1,5 @@
 const { BlockletStatus, BLOCKLET_MODES, fromBlockletStatus, BlockletSource } = require('@blocklet/constant');
+const toDid = require('@blocklet/meta/lib/did');
 
 const logger = require('@abtnode/logger')('@abtnode/core:install-app-dev');
 const { ensureMeta, updateBlockletFallbackLogo, ensureAppLogo } = require('../../../util/blocklet');
@@ -12,7 +13,10 @@ const { ensureMeta, updateBlockletFallbackLogo, ensureAppLogo } = require('../..
  * @returns
  */
 const installApplicationFromDev = async ({ folder, meta, states, manager } = {}) => {
-  const { did, version } = meta;
+  const { version } = meta;
+
+  const name = `${meta.name}-dev`;
+  const did = toDid(name);
 
   const exist = await states.blocklet.getBlocklet(did);
   if (exist) {
@@ -53,8 +57,8 @@ const installApplicationFromDev = async ({ folder, meta, states, manager } = {})
   // create app
   const added = await manager._addBlocklet({
     component,
-    name: meta.name,
-    did: meta.did,
+    name,
+    did,
     mode: BLOCKLET_MODES.DEVELOPMENT,
   });
   logger.info('add blocklet for dev', { did, version, meta });

package/lib/router/helper.js

@@ -16,7 +16,7 @@ const getTmpDir = require('@abtnode/util/lib/get-tmp-directory');
 const downloadFile = require('@abtnode/util/lib/download-file');
 const { updateBlockletDocument } = require('@abtnode/util/lib/did-document');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
-const { forEachBlocklet } = require('@blocklet/meta/lib/util');
+const { forEachBlockletSync } = require('@blocklet/meta/lib/util');
 const {
   DOMAIN_FOR_DEFAULT_SITE,
   DOMAIN_FOR_IP_SITE_REGEXP,
@@ -71,6 +71,8 @@ const { getBlockletKnownAs, getBlockletDidDomainList } = require('../util/blockl
 
 const isServiceFeDevelopment = process.env.ABT_NODE_SERVICE_FE_PORT;
 
+const hasRuleByPrefix = (site, value) => site.rules.find((x) => x.isProtected && get(x, 'from.pathPrefix') === value);
+
 /**
  * replace 888-888-888-888 with accessible ip for domain
  */
@@ -399,6 +401,79 @@ const filterSitesForRemovedBlocklets = async (sites = [], blocklets) => {
   });
 };
 
+/**
+ * Add system routing rules for blocklet in wellknown site
+ *
+ * @returns {boolean} if routing changed
+ */
+const ensureBlockletWellknownRules = async (sites, blocklets) => {
+  /**
+   * 1. component blocklet 不允许有相同多的 wellknown
+   * 1. wellknown 可以访问的路由:
+   *    /.well-known/xxx
+   *    /{wellknown owner blocklet}/.well-known/xxx
+   */
+  const isWellknownInterface = (x) => x.type === BLOCKLET_INTERFACE_TYPE_WELLKNOWN;
+
+  const handler = ({ rules, site, blocklet, tmpInterface, mountPoint }) => {
+    let pathPrefix = normalizePathPrefix(tmpInterface.prefix);
+    if (!pathPrefix.startsWith(WELLKNOWN_PATH_PREFIX)) {
+      throw new Error(`Wellknown path prefix must start with: ${WELLKNOWN_PATH_PREFIX}`);
+    }
+
+    const tmpMountPoint = mountPoint || blocklet.mountPoint;
+    if (tmpMountPoint) {
+      pathPrefix = joinUrl(tmpMountPoint, pathPrefix);
+    }
+
+    const port = findInterfacePortByName(blocklet, tmpInterface.name);
+    const existedRule = hasRuleByPrefix(site, pathPrefix);
+    if (existedRule) {
+      return;
+    }
+
+    rules.push({
+      from: { pathPrefix },
+      to: {
+        did: blocklet.meta.did,
+        port,
+        targetPrefix: tmpMountPoint,
+        type: ROUTING_RULE_TYPES.GENERAL_PROXY,
+        interfaceName: tmpInterface.name,
+      },
+      isProtected: true,
+    });
+  };
+
+  return sites
+    .map((site) => {
+      if (!site.domain.endsWith(BLOCKLET_SITE_GROUP_SUFFIX)) {
+        return site;
+      }
+
+      const blocklet = blocklets.find((x) => x.meta.did === site.blockletDid);
+
+      const rules = [];
+
+      forEachBlockletSync(blocklet, (b) => {
+        (b.meta.interfaces || []).forEach((item) => {
+          if (isWellknownInterface(item)) {
+            handler({ rules, blocklet: b, tmpInterface: item, site });
+
+            // 在站点的根路由下挂载一个
+            if (b.mountPoint && b.mountPoint !== '/') {
+              handler({ rules, blocklet: b, tmpInterface: item, site, mountPoint: '/' });
+            }
+          }
+        });
+      });
+
+      site.rules = site.rules.concat(rules);
+      return site;
+    })
+    .filter(Boolean);
+};
+
 const ensureBlockletCache = async (sites = [], blocklets) => {
   return sites
     .map((site) => {
@@ -456,6 +531,7 @@ const ensureLatestInfo = async (sites = [], { withDefaultCors = true } = {}) =>
   let result = await ensureLatestNodeInfo(sites, { withDefaultCors });
   result = await ensureBlockletDid(result);
   result = await filterSitesForRemovedBlocklets(sites, blocklets);
+  result = await ensureBlockletWellknownRules(result, blocklets);
   result = await ensureBlockletCache(result, blocklets);
   result = await ensureWellknownRule(result);
   result = await ensureCorsForWebWallet(result);
@@ -485,7 +561,6 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
   const notification = states.notification;
 
   // site level duplication detection
-  const hasRuleByPrefix = (site, value) => site.rules.find((x) => x.isProtected && get(x, 'from.pathPrefix') === value);
 
   const downloadCert = async ({ domain, url }) => {
     const destFolder = getTmpDir(path.join(`certificate-${Date.now()}`));
@@ -794,7 +869,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
    *
    * @returns {boolean} if routing state db changed
    */
-  const _ensureBlockletSites = async (blocklet, sites, nodeInfo, context = {}) => {
+  const _ensureBlockletSites = async (blocklet, nodeInfo, context = {}) => {
     const webInterface = (blocklet.meta.interfaces || []).find((x) => x.type === BLOCKLET_INTERFACE_TYPE_WEB);
     if (!webInterface) {
       return false;
@@ -884,97 +959,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     return true;
   };
 
-  /**
-   * Add system routing rules for blocklet in wellknown site
-   *
-   * @returns {boolean} if routing changed
-   */
-  const _ensureBlockletRulesForWellknownSite = async (blocklet, sites, context = {}) => {
-    const wellknownSite = sites.find((x) => x.name === NAME_FOR_WELLKNOWN_SITE);
-    if (!wellknownSite) {
-      return false;
-    }
-
-    /**
-     * 1. component blocklet 不允许有相同多的 wellknown
-     * 1. wellknown 可以访问的路由:
-     *    /.well-known/xxx
-     *    /{wellknown owner blocklet}/.well-known/xxx
-     */
-
-    const isWellknownInterface = (x) => x.type === BLOCKLET_INTERFACE_TYPE_WELLKNOWN;
-
-    const handler = async (tmpBlocklet, tmpInterface, mountPoint) => {
-      let pathPrefix = normalizePathPrefix(tmpInterface.prefix);
-      if (!pathPrefix.startsWith(WELLKNOWN_PATH_PREFIX)) {
-        throw new Error(`Wellknown path prefix must start with: ${WELLKNOWN_PATH_PREFIX}`);
-      }
-
-      const tmpMountPoint = mountPoint || tmpBlocklet.mountPoint;
-      if (tmpMountPoint) {
-        pathPrefix = joinUrl(tmpMountPoint, pathPrefix);
-      }
-
-      const port = findInterfacePortByName(tmpBlocklet, tmpInterface.name);
-      const existedRule = hasRuleByPrefix(wellknownSite, pathPrefix);
-
-      const rule = {
-        from: { pathPrefix },
-        to: {
-          did: tmpBlocklet.meta.did,
-          port,
-          type: ROUTING_RULE_TYPES.GENERAL_PROXY,
-          interfaceName: tmpInterface.name,
-        },
-        isProtected: true,
-      };
-
-      if (!existedRule) {
-        await routerManager.addRoutingRule(
-          { id: wellknownSite.id, rule, skipCheckDynamicBlacklist: true, formatPathPrefix: false },
-          context
-        );
-        return true;
-      }
-
-      // 兼容代码，旧的 rule 没有 to.did 字段
-      if (port !== existedRule.to.port || existedRule.to.did !== tmpBlocklet.meta.did) {
-        existedRule.to = rule.to;
-
-        await routerManager.updateRoutingRule(
-          { id: wellknownSite.id, rule: existedRule, skipProtectedRuleChecking: true, formatPathPrefix: false },
-          context
-        );
-
-        return true;
-      }
-
-      return false;
-    };
-
-    const tasks = [];
-
-    forEachBlocklet(
-      blocklet,
-      (b) => {
-        (b.meta.interfaces || []).forEach((item) => {
-          if (isWellknownInterface(item)) {
-            tasks.push(handler(b, item));
-
-            if (!b.mountPoint || b.mountPoint !== '/') {
-              tasks.push(handler(b, item, '/')); // 在站点的根路由下挂载一个
-            }
-          }
-        });
-      },
-      { sync: true }
-    );
-
-    const changes = await Promise.all(tasks);
-    return changes.some(Boolean);
-  };
-
-  const _removeBlockletSites = async (blocklet, nodeInfo, context = {}) => {
+  const _removeBlockletSites = async (blocklet, context = {}) => {
     let changed = false;
 
     const site = await states.site.findOne({ domain: `${blocklet.meta.did}${BLOCKLET_SITE_GROUP_SUFFIX}` });
@@ -1002,16 +987,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       return false;
     }
 
-    const sites = await siteState.getSites();
-
-    const tasks = [
-      _ensureBlockletRulesForWellknownSite(blocklet, sites, context),
-      _ensureBlockletSites(blocklet, sites, nodeInfo, context),
-    ];
-
-    const changes = await Promise.all(tasks);
-
-    return changes.some(Boolean);
+    return _ensureBlockletSites(blocklet, nodeInfo, context);
   };
 
   /**
@@ -1105,12 +1081,10 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
    * @returns {boolean} if routing changed
    */
   const removeBlockletRouting = async (blocklet, context = {}) => {
-    const nodeInfo = await nodeState.read();
-
     const ruleChanged = await routerManager.deleteRoutingRulesItemByDid({ did: blocklet.meta.did }, context);
     let siteChanged;
     if (!context.keepRouting) {
-      siteChanged = await _removeBlockletSites(blocklet, nodeInfo, context);
+      siteChanged = await _removeBlockletSites(blocklet, context);
     }
 
     return ruleChanged || siteChanged;
@@ -1468,3 +1442,4 @@ module.exports.ensureLatestNodeInfo = ensureLatestNodeInfo;
 module.exports.ensureLatestInterfaceInfo = ensureLatestInterfaceInfo;
 module.exports.ensureLatestInfo = ensureLatestInfo;
 module.exports.ensureWellknownRule = ensureWellknownRule;
+module.exports.ensureBlockletWellknownRules = ensureBlockletWellknownRules;

package/lib/states/notification.js

@@ -1,4 +1,3 @@
-const get = require('lodash/get');
 const logger = require('@abtnode/logger')('@abtnode/core:states:notification');
 const { EVENTS } = require('@abtnode/constant');
 
@@ -54,23 +53,12 @@ class NotificationState extends BaseState {
     });
   }
 
-  async findPaginated({ receiver, sender, read, paging } = {}, context) {
+  async findPaginated({ read, paging } = {}) {
     const conditions = {};
-    // eslint-disable-next-line no-param-reassign
-    receiver = receiver || get(context, 'user.did');
-    if (!receiver && !sender) {
-      throw new Error('Receiver or sender is required to find notifications');
-    }
 
     if (typeof read === 'boolean') {
       conditions.read = read;
     }
-    if (sender) {
-      conditions.sender = sender;
-    }
-    if (receiver) {
-      conditions.receiver = receiver;
-    }
 
     return this.paginate(conditions, { createdAt: -1 }, { ...paging, pageSize: 10 });
   }

package/lib/states/user.js

@@ -438,9 +438,9 @@ class User extends BaseState {
    * @param {string} did user's did
    * @returns {BlockletUser}
    */
-  async getUser(did, { enableConnectedAccout = false, enableNormalize = false, blockletSk } = {}) {
+  async getUser(did, { enableConnectedAccount = false, enableNormalize = false, blockletSk } = {}) {
     let user = await this.findOne({ did });
-    if (enableConnectedAccout) {
+    if (enableConnectedAccount) {
       if (!user) {
         user = await this.findOne({
           'extraConfigs.connectedAccounts.did': did,
@@ -513,7 +513,7 @@ class User extends BaseState {
     let action = '';
     const now = new Date().toISOString();
     const oldUser = await this.getUser(user.did, {
-      enableConnectedAccout: true,
+      enableConnectedAccount: true,
     });
     const cloneData = cloneDeep(user);
     const passports = upsertToPassports(

package/lib/util/blocklet.js

@@ -1407,7 +1407,13 @@ const getBlocklet = async ({
   // app settings
   const settings = await states.blockletExtras.getSettings(blocklet.meta.did);
   blocklet.trustedPassports = get(settings, 'trustedPassports') || [];
-  blocklet.trustedFactories = get(settings, 'trustedFactories') || [];
+  blocklet.trustedFactories = (get(settings, 'trustedFactories') || []).map((x) => {
+    if (!x.passport.ttlPolicy) {
+      x.passport.ttlPolicy = 'never';
+      x.passport.ttl = 0;
+    }
+    return x;
+  });
   blocklet.enablePassportIssuance = get(settings, 'enablePassportIssuance', true);
   blocklet.settings = settings || {};
 

package/lib/validators/router.js

@@ -70,6 +70,7 @@ const ruleSchema = {
       .valid(...Object.keys(ROUTER_CACHE_GROUPS))
       .allow('')
       .default(''),
+    targetPrefix: Joi.string().trim().max(150), // path prefix of interface of target blocklet
   },
 
   // List of services that manipulate the request before the upstream blocklet

package/lib/validators/trusted-factory.js

@@ -14,6 +14,7 @@ const trustedFactoriesSchema = Joi.array()
       remark: Joi.string().trim().required(),
       passport: Joi.object({
         role: Joi.string().required(),
+        ttlPolicy: Joi.string().valid('never', 'mint', 'exchange').required(),
         ttl: Joi.number().integer().min(0).default(0),
       }).required(),
     })

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-9e9fec72",
+  "version": "1.16.6-beta-1fde60e3",
   "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.16.6-beta-9e9fec72",
-    "@abtnode/certificate-manager": "1.16.6-beta-9e9fec72",
-    "@abtnode/constant": "1.16.6-beta-9e9fec72",
-    "@abtnode/cron": "1.16.6-beta-9e9fec72",
-    "@abtnode/db": "1.16.6-beta-9e9fec72",
-    "@abtnode/logger": "1.16.6-beta-9e9fec72",
-    "@abtnode/queue": "1.16.6-beta-9e9fec72",
-    "@abtnode/rbac": "1.16.6-beta-9e9fec72",
-    "@abtnode/router-provider": "1.16.6-beta-9e9fec72",
-    "@abtnode/static-server": "1.16.6-beta-9e9fec72",
-    "@abtnode/timemachine": "1.16.6-beta-9e9fec72",
-    "@abtnode/util": "1.16.6-beta-9e9fec72",
+    "@abtnode/auth": "1.16.6-beta-1fde60e3",
+    "@abtnode/certificate-manager": "1.16.6-beta-1fde60e3",
+    "@abtnode/constant": "1.16.6-beta-1fde60e3",
+    "@abtnode/cron": "1.16.6-beta-1fde60e3",
+    "@abtnode/db": "1.16.6-beta-1fde60e3",
+    "@abtnode/logger": "1.16.6-beta-1fde60e3",
+    "@abtnode/queue": "1.16.6-beta-1fde60e3",
+    "@abtnode/rbac": "1.16.6-beta-1fde60e3",
+    "@abtnode/router-provider": "1.16.6-beta-1fde60e3",
+    "@abtnode/static-server": "1.16.6-beta-1fde60e3",
+    "@abtnode/timemachine": "1.16.6-beta-1fde60e3",
+    "@abtnode/util": "1.16.6-beta-1fde60e3",
     "@arcblock/did": "1.18.75",
     "@arcblock/did-auth": "1.18.75",
     "@arcblock/did-ext": "^1.18.75",
@@ -40,12 +40,11 @@
     "@arcblock/jwt": "^1.18.75",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.75",
-    "@blocklet/constant": "1.16.6-beta-9e9fec72",
-    "@blocklet/meta": "1.16.6-beta-9e9fec72",
-    "@blocklet/sdk": "1.16.6-beta-9e9fec72",
-    "@did-space/client": "^0.2.80",
+    "@blocklet/constant": "1.16.6-beta-1fde60e3",
+    "@blocklet/meta": "1.16.6-beta-1fde60e3",
+    "@blocklet/sdk": "1.16.6-beta-1fde60e3",
+    "@did-space/client": "^0.2.83",
     "@fidm/x509": "^1.2.1",
-    "@ocap/client": "1.18.75",
     "@ocap/mcrypto": "1.18.75",
     "@ocap/util": "1.18.75",
     "@ocap/wallet": "1.18.75",
@@ -66,18 +65,15 @@
     "get-port": "^5.1.1",
     "hasha": "^5.2.2",
     "is-base64": "^1.1.0",
-    "is-ip": "^3.1.0",
     "is-url": "^1.2.4",
     "joi": "17.7.0",
     "js-yaml": "^4.1.0",
     "kill-port": "^2.0.1",
     "lodash": "^4.17.21",
-    "lru-cache": "^6.0.0",
     "moment-timezone": "^0.5.37",
     "node-stream-zip": "^1.15.0",
     "p-limit": "^3.1.0",
     "p-retry": "4.6.1",
-    "pm2": "^5.2.0",
     "semver": "^7.3.8",
     "shelljs": "^0.8.5",
     "ssri": "^8.0.1",
@@ -98,5 +94,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "a30731223bc19231bac0dea7bd0d01a3bbf8e84c"
+  "gitHead": "be8d8eab7d210910e24dae3b389f2c70aa414a13"
 }