@abtnode/core 1.16.4-beta-f058f4e8 → 1.16.4

package/lib/api/team.js

@@ -12,7 +12,6 @@ const {
   WELLKNOWN_SERVICE_PATH_PREFIX,
   MAX_USER_PAGE_SIZE,
   STORE_DETAIL_PAGE_PATH_PREFIX,
-  USER_TYPE,
 } = require('@abtnode/constant');
 const { isValid: isValidDid } = require('@arcblock/did');
 const { BlockletEvents } = require('@blocklet/constant');
@@ -634,7 +633,9 @@ class TeamAPI extends EventEmitter {
     const state = await this.getSessionState(teamDid);
 
     const currentUser = await this.getUser({ teamDid, user: { did: ownerDid } });
-    if (currentUser?.source === USER_TYPE.DERIVED) {
+    const isRawWalletAccount =
+      !currentUser?.extraConfigs?.sourceProvider || currentUser?.extraConfigs?.sourceProvider === 'wallet';
+    if (!isRawWalletAccount) {
       const userDid = currentUser.did;
       const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
       const nodeInfo = await this.node.read();

package/lib/blocklet/manager/disk.js

@@ -34,6 +34,8 @@ const {
   getComponentId,
   isPreferenceKey,
   getRolesFromAuthConfig,
+  isInProgress,
+  isBeforeInstalled,
 } = require('@blocklet/meta/lib/util');
 const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
 const { update: updateMetaFile } = require('@blocklet/meta/lib/file');
@@ -124,14 +126,7 @@ const BlockletDownloader = require('../downloader/blocklet-downloader');
 const RollbackCache = require('./helper/rollback-cache');
 const { migrateApplicationToStructV2 } = require('./helper/migrate-application-to-struct-v2');
 
-const {
-  isInProgress,
-  isBeforeInstalled,
-  formatEnvironments,
-  shouldUpdateBlockletStatus,
-  getBlockletMeta,
-  validateOwner,
-} = util;
+const { formatEnvironments, shouldUpdateBlockletStatus, getBlockletMeta, validateOwner } = util;
 
 const statusLock = new Lock('blocklet-status-lock');
 

package/lib/blocklet/manager/helper/install-component-from-upload.js

@@ -2,9 +2,9 @@ const path = require('path');
 
 const logger = require('@abtnode/logger')('@abtnode/core:install-component-upload');
 const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
+const { isInProgress } = require('@blocklet/meta/lib/util');
 
 const { BlockletSource, BlockletGroup, fromBlockletStatus } = require('@blocklet/constant');
-const { isInProgress } = require('../../../util');
 const {
   parseComponents,
   filterDuplicateComponents,

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

@@ -3,13 +3,18 @@ const fs = require('fs-extra');
 const pick = require('lodash/pick');
 const pRetry = require('p-retry');
 const Client = require('@ocap/client');
-const urlFriendly = require('@blocklet/meta/lib/url-friendly').default;
+const urlPathFriendly = require('@blocklet/meta/lib/url-path-friendly').default;
 const { slugify } = require('transliteration');
 const Lock = require('@abtnode/util/lib/lock');
 
 const logger = require('@abtnode/logger')('@abtnode/core:migrate-application-to-struct-v2');
 
-const { forEachBlockletSync, getSharedConfigObj, getBlockletChainInfo } = require('@blocklet/meta/lib/util');
+const {
+  forEachBlockletSync,
+  getSharedConfigObj,
+  getBlockletChainInfo,
+  isInProgress,
+} = require('@blocklet/meta/lib/util');
 const { SLOT_FOR_IP_DNS_SITE, MAIN_CHAIN_ENDPOINT } = require('@abtnode/constant');
 
 const {
@@ -33,7 +38,6 @@ const { update: updateMetaFile } = require('@blocklet/meta/lib/file');
 const getBlockletWallet = require('@blocklet/meta/lib/wallet');
 const { cloneDeep } = require('lodash');
 
-const { isInProgress } = require('../../../util');
 const { getBlockletDomainGroupName } = require('../../../util/router');
 const { getIpDnsDomainForBlocklet } = require('../../../util/get-domain-for-blocklet');
 const { getBundleDir } = require('../../../util/blocklet');
@@ -107,7 +111,7 @@ const ensureAccountOnMainChain = async (blocklet, newWallet) => {
   if (!newResultOnMainChain.state) {
     logger.info('declare account on main chain', { address: newWallet.address, did: blocklet.meta.did });
     const hash = await mainChainClient.declare({
-      moniker: (urlFriendly(slugify(blocklet.meta.title || blocklet.meta.name)) || 'application').toLowerCase(),
+      moniker: (urlPathFriendly(slugify(blocklet.meta.title || blocklet.meta.name)) || 'application').toLowerCase(),
       wallet: newWallet,
     });
     logger.info('declare account on main chain done', { did: blocklet.meta.did, hash });

package/lib/event.js

@@ -1,7 +1,7 @@
 const get = require('lodash/get');
 const cloneDeep = require('lodash/cloneDeep');
 const { EventEmitter } = require('events');
-const { wipeSensitiveData } = require('@blocklet/meta/lib/util');
+const { wipeSensitiveData, isBeforeInstalled } = require('@blocklet/meta/lib/util');
 const logger = require('@abtnode/logger')('@abtnode/core:event');
 const { BLOCKLET_MODES, BlockletStatus, BlockletSource, BlockletEvents } = require('@blocklet/constant');
 const { EVENTS } = require('@abtnode/constant');
@@ -12,7 +12,6 @@ const eventHub =
   process.env.NODE_ENV === 'test' ? require('@arcblock/event-hub/single') : require('@arcblock/event-hub');
 
 const states = require('./states');
-const { isBeforeInstalled } = require('./util');
 
 const routingSnapshotPrefix = (blocklet) => (blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? '[DEV] ' : '');
 
@@ -104,7 +103,7 @@ module.exports = ({
       notificationState.create({
         title: 'Blocklet URL Mapping Error',
         // eslint-disable-next-line max-len
-        description: `Failed to create URL mapping for blocklet ${blocklet.meta.name}@${blocklet.meta.version}, due to: ${error.message}`,
+        description: `Failed to create URL mapping for blocklet ${blocklet.meta.title}, due to: ${error.message}`,
         entityType: 'blocklet',
         entityId: blocklet.meta.did,
         severity: 'error',
@@ -155,7 +154,7 @@ module.exports = ({
       notificationState.create({
         title: 'Blocklet URL Mapping Error',
         // eslint-disable-next-line max-len
-        description: `Failed to upgrade URL mapping for blocklet ${blocklet.meta.name}@${blocklet.meta.version}, due to: ${error.message}`,
+        description: `Failed to upgrade URL mapping for blocklet ${blocklet.meta.title}, due to: ${error.message}`,
         entityType: 'blocklet',
         entityId: blocklet.meta.did,
         severity: 'error',

package/lib/router/helper.js

@@ -912,7 +912,10 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       };
 
       if (!existedRule) {
-        await routerManager.addRoutingRule({ id: wellknownSite.id, rule, skipCheckDynamicBlacklist: true }, context);
+        await routerManager.addRoutingRule(
+          { id: wellknownSite.id, rule, skipCheckDynamicBlacklist: true, formatPathPrefix: false },
+          context
+        );
         return true;
       }
 
@@ -921,7 +924,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
         existedRule.to = rule.to;
 
         await routerManager.updateRoutingRule(
-          { id: wellknownSite.id, rule: existedRule, skipProtectedRuleChecking: true },
+          { id: wellknownSite.id, rule: existedRule, skipProtectedRuleChecking: true, formatPathPrefix: false },
           context
         );
 

package/lib/router/manager.js

@@ -258,8 +258,16 @@ class RouterManager extends EventEmitter {
     return dbSite;
   }
 
-  async addRoutingRule({ id, rule: tempRule, skipCheckDynamicBlacklist = false }, context = {}) {
+  async addRoutingRule(
+    { id, rule: tempRule, skipCheckDynamicBlacklist = false, formatPathPrefix = true },
+    context = {}
+  ) {
     const { rule } = await validateAddRule({ id, rule: tempRule }, context);
+
+    if (!formatPathPrefix) {
+      rule.from.pathPrefix = tempRule.from.pathPrefix;
+    }
+
     const dbSite = await states.site.findOne({ _id: id });
     if (!dbSite) {
       throw new Error(`site ${id} does not exist`);
@@ -275,7 +283,7 @@ class RouterManager extends EventEmitter {
       const existedRule = dbSite.rules.find((x) => x.from.pathPrefix === rule.from.pathPrefix);
 
       if (existedRule) {
-        throw new Error(`path prefix '${originalPathPrefix}' already exists`);
+        throw new Error(`addRoutingRule: path prefix '${originalPathPrefix}' already exists`);
       }
     }
 
@@ -294,8 +302,16 @@ class RouterManager extends EventEmitter {
     return newSite;
   }
 
-  async updateRoutingRule({ id, rule: tmpRule, skipProtectedRuleChecking = false }, context = {}) {
+  async updateRoutingRule(
+    { id, rule: tmpRule, skipProtectedRuleChecking = false, formatPathPrefix = true },
+    context = {}
+  ) {
     const { rule } = await validateEditRule({ id, rule: tmpRule }, context);
+
+    if (!formatPathPrefix) {
+      rule.from.pathPrefix = tmpRule.from.pathPrefix;
+    }
+
     const dbSite = await states.site.findOne({ _id: id, 'rules.id': rule.id });
     if (!dbSite) {
       throw new Error(`site ${id}, rule ${rule.id} does not exist`);
@@ -310,7 +326,7 @@ class RouterManager extends EventEmitter {
     // Ensure path prefix is unique across the site
     const existedRule = dbSite.rules.find((x) => x.id !== rule.id && x.from.pathPrefix === rule.from.pathPrefix);
     if (existedRule) {
-      throw new Error(`path prefix '${originalPathPrefix}' already exists`);
+      throw new Error(`updateRoutingRule: path prefix '${originalPathPrefix}' already exists`);
     }
 
     // Ensure we are not updating protected rules

package/lib/states/blocklet.js

@@ -9,14 +9,14 @@ const detectPort = require('detect-port');
 const Lock = require('@abtnode/util/lib/lock');
 const security = require('@abtnode/util/lib/security');
 const { fixPerson, fixInterfaces } = require('@blocklet/meta/lib/fix');
-const { getDisplayName, forEachBlocklet, forEachBlockletSync, forEachChildSync } = require('@blocklet/meta/lib/util');
 const {
-  BlockletStatus,
-  BlockletSource,
-  BLOCKLET_MODES,
-  BLOCKLET_DEFAULT_PORT_NAME,
-  BLOCKLET_INTERFACE_TYPE_SERVICE,
-} = require('@blocklet/constant');
+  getDisplayName,
+  forEachBlocklet,
+  forEachBlockletSync,
+  forEachChildSync,
+  getBlockletServices,
+} = require('@blocklet/meta/lib/util');
+const { BlockletStatus, BlockletSource, BLOCKLET_MODES, BLOCKLET_DEFAULT_PORT_NAME } = require('@blocklet/constant');
 const { APP_STRUCT_VERSION } = require('@abtnode/constant');
 
 const logger = require('@abtnode/logger')('state-blocklet');
@@ -491,16 +491,34 @@ class BlockletState extends BaseState {
   }
 
   async getServices() {
-    const blocklets = await this.getBlocklets({}, { ports: 1, 'meta.interfaces': 1 });
+    const blocklets = await this.getBlocklets({}, { meta: 1, children: 1, ports: 1 });
     const services = [];
+
     blocklets.forEach((blocklet) => {
-      const interfaces = (blocklet.meta.interfaces || []).filter((x) => x.type === BLOCKLET_INTERFACE_TYPE_SERVICE);
-      interfaces.forEach((x) => {
-        services.push({
-          protocol: x.protocol,
-          port: Number(x.port.external),
-          upstreamPort: Number(blocklet.ports[x.port.internal]),
-        });
+      const list = getBlockletServices(blocklet);
+      list.forEach((x) => {
+        if (!x.port) {
+          logger.error('Missing service port', { appId: blocklet.meta.did, x });
+          return;
+        }
+
+        if (!x.protocol) {
+          logger.error('Missing service protocol', { appId: blocklet.meta.did, x });
+          return;
+        }
+
+        if (!x.upstreamPort) {
+          logger.error('Missing service upstreamPort', { appId: blocklet.meta.did, x });
+          return;
+        }
+
+        if (services.find((s) => s.port === x.port)) {
+          // should not be here
+          logger.error('Duplicate service port', { appId: blocklet.meta.did, x });
+          return;
+        }
+
+        services.push(x);
       });
     });
 

package/lib/states/user.js

@@ -24,6 +24,32 @@ const isNullOrUndefined = (x) => x === undefined || x === null;
  * @property {string} role - passport's role
  */
 
+/**
+ * Auth0Account
+ * @typedef {Object} Auth0Account
+ * @property {'auth0'} provider
+ * @property {string} id - id from auth0
+ * @property {string} did - did for auth0 account
+ * @property {string} pk - pk for auth0 account
+ * @property {string} lastLoginAt - Last login time new Date().toISOString()
+ * @property {string} firstLoginAt - First login time new Date().toISOString()
+ */
+
+/**
+ * WalletAccount
+ * @typedef {Object} WalletAccount
+ * @property {'wallet'} provider
+ * @property {string} did - did for auth0 account
+ * @property {string} pk - pk for auth0 account
+ * @property {string} lastLoginAt - Last login time new Date().toISOString()
+ * @property {string} firstLoginAt - First login time new Date().toISOString()
+ */
+
+/**
+ * ConnectedAccount
+ * @typedef {(Auth0Account|WalletAccount)} ConnectedAccount
+ */
+
 /**
  * The Data structure of blocklet-service user
  * @typedef {Object} BlockletUser - Blocklet Service User Table
@@ -31,13 +57,16 @@ const isNullOrUndefined = (x) => x === undefined || x === null;
  * @property {('profile')} type - type of user
  * @property {string} fullName - user profile's name
  * @property {string} avatar - url of user's avatar, eg: bn://avatar/7f8848569405f8cdf8b1b2788ebf7d0f.jpg
- * @property {string} did - user's did
+ * @property {string} did - user's did -> 实际上变为 uid, 是不可变的；真正的 wallet-did 转移到 extraConfigs 中去了
+ * @property {string} pk - user's publicKey
  * @property {('owner'|'admin'|'member'|'guest'|string)} role - user's role
  * @property {UserPassport[]} passports - user's passport list
- * @property {string} pk - user's publicKey
  * @property {boolean} approved - enable user to login
  * @property {string} locale - locale
- * @property {Object} extra - extra data of user
+ * @property {Object} [extra] - extra data of user
+ * @property {Object} [extraConfigs] - extra data of user
+ * @property {ConnectedAccount[]} [extraConfigs.connectedAccounts] - connectedAccounts
+ * @property {('wallet'|'auth0')} [extraConfigs.sourceProvider] - sourceProvider, the main account provider
  * @property {Date} firstLoginAt - firstLoginAt
  * @property {Date} lastLoginAt - lastLoginAt
  * @property {string} lastLoginIp - lastLoginIp
@@ -139,7 +168,7 @@ class User extends BaseState {
   /**
    * update user's role
    * @param {string} did user's did
-   * @param {BlockletUser.role} role user's rolel
+   * @param {BlockletUser.role} role user's role
    * @returns {BlockletUser}
    */
   async updateRole({ did, role }) {
@@ -160,7 +189,7 @@ class User extends BaseState {
    * @returns {{list: BlockletUser[]; paging: any;}}
    */
   async getUsers({ query, sort, paging: inputPaging } = {}) {
-    const { approved, role, search, derivedDid } = query || {};
+    const { approved, role, search, connectedDid } = query || {};
 
     // make query param
     const queryParam = {};
@@ -191,9 +220,9 @@ class User extends BaseState {
       }
     }
 
-    // 根据 derivedDid 查询 user 信息（wallet 账户绑定 oauth 账户后，会有该字段）
-    if (derivedDid) {
-      queryParam['extraConfigs.derivedAccount.did'] = derivedDid;
+    // 根据 connectedDid 查询 user 信息（wallet 账户绑定 oauth 账户后，会有该字段）
+    if (connectedDid) {
+      queryParam['extraConfigs.connectedAccounts.did'] = connectedDid;
     }
 
     const sortParam = pickBy(sort, (x) => !isNullOrUndefined(x));

package/lib/util/blocklet.js

@@ -77,6 +77,7 @@ const {
   getComponentName,
   isEnvShareable,
   getBlockletAppIdList,
+  isBeforeInstalled,
 } = require('@blocklet/meta/lib/util');
 const toBlockletDid = require('@blocklet/meta/lib/did');
 const { titleSchema, descriptionSchema, logoSchema } = require('@blocklet/meta/lib/schema');
@@ -91,14 +92,7 @@ const { validate: validateEngine, get: getEngine } = require('../blocklet/manage
 
 const isRequirementsSatisfied = require('./requirement');
 const { getDidDomainForBlocklet } = require('./get-domain-for-blocklet');
-const {
-  isBeforeInstalled,
-  expandBundle,
-  findInterfacePortByName,
-  prettyURL,
-  getNFTState,
-  templateReplace,
-} = require('./index');
+const { expandBundle, findInterfacePortByName, prettyURL, getNFTState, templateReplace } = require('./index');
 
 const getComponentConfig = (meta) => {
   const components = meta.components || meta.children || [];

package/lib/util/index.js

@@ -17,7 +17,7 @@ const axios = require('@abtnode/util/lib/axios');
 const { encode: encodeBase32 } = require('@abtnode/util/lib/base32');
 const parseBlockletMeta = require('@blocklet/meta/lib/parse');
 const { BlockletStatus } = require('@blocklet/constant');
-const { replaceSlotToIp } = require('@blocklet/meta/lib/util');
+const { replaceSlotToIp, isInProgress } = require('@blocklet/meta/lib/util');
 const {
   StatusCode,
   DOMAIN_FOR_DEFAULT_SITE,
@@ -93,21 +93,6 @@ const getBlockletHost = ({ domain, context, nodeIp }) => {
 
 const isRoutingEnabled = (routing) => !!routing && !!routing.provider;
 
-const isInProgress = (status) =>
-  [
-    BlockletStatus.downloading,
-    BlockletStatus.waiting,
-    BlockletStatus.starting,
-    BlockletStatus.installing,
-    BlockletStatus.stopping,
-    BlockletStatus.upgrading,
-  ].includes(status);
-
-const isBeforeInstalled = (status) =>
-  [BlockletStatus.added, BlockletStatus.waiting, BlockletStatus.downloading, BlockletStatus.installing].includes(
-    status
-  );
-
 // Check whether a domain is setup
 const checkDomainDNS = (domain) =>
   new Promise((resolve) => {
@@ -479,8 +464,6 @@ const lib = {
   toStatus,
   fromStatus,
   formatEnvironments,
-  isInProgress,
-  isBeforeInstalled,
   replaceDomainSlot,
   getBlockletHost,
   isRoutingEnabled,

package/lib/validators/router.js

@@ -1,7 +1,7 @@
 /* eslint-disable newline-per-chained-call */
 const Joi = require('joi');
 const { DOMAIN_FOR_DEFAULT_SITE, ROUTING_RULE_TYPES, ROUTER_CACHE_GROUPS } = require('@abtnode/constant');
-const urlFriendly = require('@blocklet/meta/lib/url-friendly').default;
+const urlPathFriendly = require('@blocklet/meta/lib/url-path-friendly').default;
 const { getMultipleLangParams } = require('./util');
 
 const WILDCARD_DOMAIN_REGEX = /^\*.(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]/;
@@ -29,7 +29,7 @@ const ruleSchema = {
         zh: { 'string.empty': 'URL 前缀不能为空', 'string.max': 'URL 前缀的最大长度是 150' },
         en: { 'string.empty': 'URL prefix cannot be empty', 'string.max': 'The maximum length of URL prefix is 150' },
       })
-      .custom((value) => urlFriendly(value)),
+      .custom((value) => urlPathFriendly(value)),
     groupPathPrefix: Joi.string().trim().min(1).max(150), // path prefix of interface of root blocklet
     header: Joi.any(), // TODO: header does not take effect
   }),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.4-beta-f058f4e8",
+  "version": "1.16.4",
   "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.4-beta-f058f4e8",
-    "@abtnode/certificate-manager": "1.16.4-beta-f058f4e8",
-    "@abtnode/constant": "1.16.4-beta-f058f4e8",
-    "@abtnode/cron": "1.16.4-beta-f058f4e8",
-    "@abtnode/db": "1.16.4-beta-f058f4e8",
-    "@abtnode/logger": "1.16.4-beta-f058f4e8",
-    "@abtnode/queue": "1.16.4-beta-f058f4e8",
-    "@abtnode/rbac": "1.16.4-beta-f058f4e8",
-    "@abtnode/router-provider": "1.16.4-beta-f058f4e8",
-    "@abtnode/static-server": "1.16.4-beta-f058f4e8",
-    "@abtnode/timemachine": "1.16.4-beta-f058f4e8",
-    "@abtnode/util": "1.16.4-beta-f058f4e8",
+    "@abtnode/auth": "1.16.4",
+    "@abtnode/certificate-manager": "1.16.4",
+    "@abtnode/constant": "1.16.4",
+    "@abtnode/cron": "1.16.4",
+    "@abtnode/db": "1.16.4",
+    "@abtnode/logger": "1.16.4",
+    "@abtnode/queue": "1.16.4",
+    "@abtnode/rbac": "1.16.4",
+    "@abtnode/router-provider": "1.16.4",
+    "@abtnode/static-server": "1.16.4",
+    "@abtnode/timemachine": "1.16.4",
+    "@abtnode/util": "1.16.4",
     "@arcblock/did": "1.18.67",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.18.67",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.18.67",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.67",
-    "@blocklet/constant": "1.16.4-beta-f058f4e8",
-    "@blocklet/meta": "1.16.4-beta-f058f4e8",
-    "@blocklet/sdk": "1.16.4-beta-f058f4e8",
+    "@blocklet/constant": "1.16.4",
+    "@blocklet/meta": "1.16.4",
+    "@blocklet/sdk": "1.16.4",
     "@did-space/client": "^0.2.67",
     "@fidm/x509": "^1.2.1",
     "@ocap/client": "1.18.67",
@@ -93,5 +93,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "e15364f5d5125950c2a6fb8d964b12f1b8799ac0"
+  "gitHead": "8d1062af0f4e4f491b6a7205c9d6542328ca6b20"
 }