@abtnode/core 1.16.14 → 1.16.15-beta-04d1e821

package/lib/api/team.js

@@ -13,6 +13,7 @@ const {
   MAX_USER_PAGE_SIZE,
   STORE_DETAIL_PAGE_PATH_PREFIX,
   MAIN_CHAIN_ENDPOINT,
+  USER_AVATAR_URL_PREFIX,
 } = require('@abtnode/constant');
 const { isValid: isValidDid } = require('@arcblock/did');
 const { BlockletEvents } = require('@blocklet/constant');
@@ -25,9 +26,10 @@ const {
 } = require('@abtnode/auth/lib/passport');
 const { getPassportStatusEndpoint } = require('@abtnode/auth/lib/auth');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
-const { getUserAvatarUrl, getAppAvatarUrl } = require('@abtnode/util/lib/user');
+const { getUserAvatarUrl, getAppAvatarUrl, extractUserAvatar, getAvatarByUrl } = require('@abtnode/util/lib/user');
 const { getChainClient } = require('@abtnode/util/lib/get-chain-client');
 const { getWalletDid } = require('@blocklet/meta/lib/did-utils');
+const isUrl = require('is-url');
 
 const { validateTrustedPassportIssuers } = require('../validators/trusted-passport');
 const { validateTrustedFactories } = require('../validators/trusted-factory');
@@ -36,6 +38,7 @@ const { validateCreatePermission, validateUpdatePermission } = require('../valid
 
 const { getBlocklet } = require('../util/blocklet');
 const StoreUtil = require('../util/store');
+const { profileSchema } = require('../validators/user');
 
 const sanitizeUrl = (url) => {
   if (!url) {
@@ -466,6 +469,46 @@ class TeamAPI extends EventEmitter {
     return doc;
   }
 
+  async switchProfile({ teamDid, userDid, profile }) {
+    const state = await this.getUserState(teamDid);
+    // NOTICE: 这个 schema 没有对数据做任何 default 操作，所以没必要用 validate 之后的值
+    const { error } = profileSchema.validate({ ...profile, did: userDid });
+    if (error) {
+      throw new Error(error);
+    }
+    const oldUser = await state.getUser(userDid);
+    if (!oldUser) {
+      throw new Error('User is not exist', { userDid, teamDid });
+    }
+
+    let { avatar } = profile;
+    if (avatar.startsWith(USER_AVATAR_URL_PREFIX)) {
+      // pass
+    } else if (isUrl(avatar)) {
+      try {
+        avatar = await getAvatarByUrl(avatar);
+        avatar = await extractUserAvatar(avatar, { dataDirs: this.dataDirs });
+      } catch {
+        logger.error('Failed to convert external avatar', { teamDid, userDid, avatar });
+        throw new Error('Failed to convert external avatar');
+      }
+    } else {
+      // 仅当 avatar 是 base64 时，对 avatar 进行处理
+      const regex = /^data:image\/(\w+);base64,/;
+      const match = regex.exec(avatar);
+      if (match) {
+        avatar = await extractUserAvatar(avatar, { dataDirs: this.dataDirs });
+      } else {
+        logger.error('Profile avatar is invalid', { teamDid, userDid, profile });
+        throw new Error('Profile avatar is invalid');
+      }
+    }
+    const doc = await state.updateUser(userDid, { ...profile, avatar });
+    logger.info('User switch-profile successfully', { teamDid, userDid });
+    this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
+    return doc;
+  }
+
   // Invite member
 
   /**

package/lib/index.js

@@ -354,6 +354,7 @@ function ABTNode(options) {
     getUserByDid: teamAPI.getUserByDid.bind(teamAPI),
     isPassportValid: teamAPI.isPassportValid.bind(teamAPI),
     isConnectedAccount: teamAPI.isConnectedAccount.bind(teamAPI),
+    switchProfile: teamAPI.switchProfile.bind(teamAPI),
 
     // Access Control
     getRBAC: (did = options.nodeDid) => teamManager.getRBAC(did),

package/lib/router/index.js

@@ -194,6 +194,23 @@ Router.formatSites = (sites = []) => {
     const rules = Array.isArray(site.rules) ? cloneDeep(site.rules) : [];
     const grouped = {};
 
+    // 0. serve robots.txt/sitemap.xml from root and proxy to daemon
+    if (isBlockletSite(site.domain) && !site.rules.find((x) => x.from.pathPrefix === '/robots.txt')) {
+      site.rules.push({
+        dynamic: true,
+        from: {
+          pathPrefix: '/',
+          groupPathPrefix: '/',
+          pathSuffix: '/(robots.txt|sitemap.xml)',
+        },
+        to: {
+          type: ROUTING_RULE_TYPES.DAEMON,
+          port: daemonRule.to.port,
+          did: site.blockletDid,
+        },
+      });
+    }
+
     // 1. serve blocklet.js for each component: both prefix and suffix do not contain trailing slash
     rules.forEach((rule) => {
       if ([ROUTING_RULE_TYPES.BLOCKLET].includes(rule.to.type) === false) {
@@ -209,29 +226,12 @@ Router.formatSites = (sites = []) => {
       }
 
       grouped[rule.from.groupPathPrefix] = rule;
-
-      site.rules.push({
-        dynamic: true,
-        from: {
-          pathPrefix: rule.from.pathPrefix,
-          groupPathPrefix: rule.from.groupPathPrefix,
-          pathSuffix: '/__meta__.js',
-        },
-        to: {
-          type: ROUTING_RULE_TYPES.DAEMON,
-          port: daemonRule.to.port,
-          did: rule.to.did,
-          componentId: rule.to.componentId,
-          cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
-          pageGroup: rule.to.pageGroup,
-        },
-      });
       site.rules.push({
         dynamic: true,
         from: {
           pathPrefix: rule.from.pathPrefix,
           groupPathPrefix: rule.from.groupPathPrefix,
-          pathSuffix: '/__blocklet__.js',
+          pathSuffix: '/__(meta|blocklet)__.js',
         },
         to: {
           type: ROUTING_RULE_TYPES.DAEMON,
@@ -259,7 +259,7 @@ Router.formatSites = (sites = []) => {
       const rootFrom = {
         pathPrefix: groupPathPrefix,
         groupPathPrefix,
-        pathSuffix: '/__blocklet__.js',
+        pathSuffix: '/__(meta|blocklet)__.js',
       };
 
       const rule = grouped[groupPathPrefix];

package/lib/validators/user.js

@@ -40,4 +40,12 @@ const loginSchema = Joi.object({
     .required(),
 }).unknown();
 
+const profileSchema = Joi.object({
+  did: Joi.DID().trim().required(),
+  fullName: Joi.string().empty(''),
+  avatar: Joi.string().empty(''),
+  email: Joi.string().empty(''),
+});
+
 exports.loginSchema = loginSchema;
+exports.profileSchema = profileSchema;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.14",
+  "version": "1.16.15-beta-04d1e821",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.14",
-    "@abtnode/auth": "1.16.14",
-    "@abtnode/certificate-manager": "1.16.14",
-    "@abtnode/constant": "1.16.14",
-    "@abtnode/cron": "1.16.14",
-    "@abtnode/logger": "1.16.14",
-    "@abtnode/models": "1.16.14",
-    "@abtnode/queue": "1.16.14",
-    "@abtnode/rbac": "1.16.14",
-    "@abtnode/router-provider": "1.16.14",
-    "@abtnode/static-server": "1.16.14",
-    "@abtnode/timemachine": "1.16.14",
-    "@abtnode/util": "1.16.14",
+    "@abtnode/analytics": "1.16.15-beta-04d1e821",
+    "@abtnode/auth": "1.16.15-beta-04d1e821",
+    "@abtnode/certificate-manager": "1.16.15-beta-04d1e821",
+    "@abtnode/constant": "1.16.15-beta-04d1e821",
+    "@abtnode/cron": "1.16.15-beta-04d1e821",
+    "@abtnode/logger": "1.16.15-beta-04d1e821",
+    "@abtnode/models": "1.16.15-beta-04d1e821",
+    "@abtnode/queue": "1.16.15-beta-04d1e821",
+    "@abtnode/rbac": "1.16.15-beta-04d1e821",
+    "@abtnode/router-provider": "1.16.15-beta-04d1e821",
+    "@abtnode/static-server": "1.16.15-beta-04d1e821",
+    "@abtnode/timemachine": "1.16.15-beta-04d1e821",
+    "@abtnode/util": "1.16.15-beta-04d1e821",
     "@arcblock/did": "1.18.89",
     "@arcblock/did-auth": "1.18.89",
     "@arcblock/did-ext": "^1.18.89",
@@ -42,10 +42,10 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.89",
     "@arcblock/vc": "1.18.89",
-    "@blocklet/constant": "1.16.14",
-    "@blocklet/meta": "1.16.14",
-    "@blocklet/resolver": "1.16.14",
-    "@blocklet/sdk": "1.16.14",
+    "@blocklet/constant": "1.16.15-beta-04d1e821",
+    "@blocklet/meta": "1.16.15-beta-04d1e821",
+    "@blocklet/resolver": "1.16.15-beta-04d1e821",
+    "@blocklet/sdk": "1.16.15-beta-04d1e821",
     "@did-space/client": "^0.2.141",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.89",
@@ -98,5 +98,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "a2f588d8d5cbe9312260ffbd8fb4cb3bd4104853"
+  "gitHead": "42e1523e5b92a3a57d9083ae29455df429afb0f6"
 }