@abtnode/core 1.16.6-beta-7cbab489 → 1.16.6-beta-61cf68d3

package/lib/api/team.js

@@ -27,6 +27,7 @@ const { getPassportStatusEndpoint } = require('@abtnode/auth/lib/auth');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const { parseUserAvatar } = require('@abtnode/util/lib/user-avatar');
 const { getChainClient } = require('@abtnode/util/lib/get-chain-client');
+const { getWalletDid } = require('@blocklet/meta/lib/did-utils');
 
 const { validateTrustedPassportIssuers } = require('../validators/trusted-passport');
 const { validateTrustedFactories } = require('../validators/trusted-factory');
@@ -290,6 +291,7 @@ class TeamAPI extends EventEmitter {
 
     const state = await this.getUserState(teamDid);
 
+    // NOTICE: 目前 owner 只能为 did-wallet，无需查询 connectedAccount
     const full = await state.getUser(owner.did);
     return full || owner;
   }
@@ -371,6 +373,7 @@ class TeamAPI extends EventEmitter {
     const { locale = 'en' } = context;
 
     const userState = await this.getUserState(teamDid);
+    // NOTICE: issuePassportToUser 必须传入 wallet did，无需查询 connectedAccount
     const user = await userState.getUser(userDid);
 
     if (!user) {
@@ -772,52 +775,61 @@ class TeamAPI extends EventEmitter {
 
     const state = await this.getSessionState(teamDid);
 
+    // 为指定用户颁发通行证，拿到的 did 是永久 did，无需查询 connectedAccount
     const currentUser = await this.getUser({ teamDid, user: { did: ownerDid } });
-    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();
-      const blockletInfo = getBlockletInfo(blocklet, nodeInfo.sk);
-      const { wallet, passportColor, appUrl, name: issuerName } = blockletInfo;
-      const vc = createPassportVC({
-        issuerName,
-        issuerWallet: wallet,
-        ownerDid: userDid,
-        passport: await createPassport({
-          role,
-        }),
-        endpoint: getPassportStatusEndpoint({
-          baseUrl: joinUrl(appUrl, WELLKNOWN_SERVICE_PATH_PREFIX),
-          userDid,
-          teamDid,
-        }),
-        ownerProfile: {
-          ...currentUser,
-        },
-        preferredColor: passportColor,
-      });
+    const walletDid = getWalletDid(currentUser);
+    const userDid = walletDid || ownerDid;
+    // 这里可能是为一个不存在的用户创建一个 passport，所以需要额外判断一下
+    if (currentUser) {
+      // auth0 账户不需要手动领取
+      if (walletDid !== ownerDid) {
+        const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
+        const nodeInfo = await this.node.read();
+        const blockletInfo = getBlockletInfo(blocklet, nodeInfo.sk);
+        const { wallet, passportColor, appUrl, name: issuerName } = blockletInfo;
+        const vc = createPassportVC({
+          issuerName,
+          issuerWallet: wallet,
+          ownerDid: userDid,
+          passport: await createPassport({
+            role,
+          }),
+          endpoint: getPassportStatusEndpoint({
+            baseUrl: joinUrl(appUrl, WELLKNOWN_SERVICE_PATH_PREFIX),
+            userDid,
+            teamDid,
+          }),
+          ownerProfile: {
+            ...currentUser,
+            avatar: await parseUserAvatar(currentUser.avatar, { dataDir: blocklet.env.dataDir }),
+          },
+          preferredColor: passportColor,
+        });
 
-      // write passport to db
-      const passport = createUserPassport(vc, { role: role.name });
-      const passports = upsertToPassports(currentUser.passports || [], passport);
-      await this.updateUser({
-        teamDid,
-        user: {
-          did: ownerDid,
-          pk: currentUser.pk,
-          passports,
-        },
-      });
-      return undefined;
+        if (walletDid) {
+          sendPassportVcNotification({ userDid, appWallet: wallet, locale: 'en', vc });
+        }
+
+        // write passport to db
+        const passport = createUserPassport(vc, { role: role.name });
+        const passports = upsertToPassports(currentUser.passports || [], passport);
+        await this.updateUser({
+          teamDid,
+          user: {
+            did: currentUser.did,
+            pk: currentUser.pk,
+            passports,
+          },
+        });
+        return undefined;
+      }
     }
     const { id } = await state.start({
       type: 'passport-issuance',
       expireDate, // session expireDate
       name: role.name,
       title: role.title,
-      ownerDid,
+      ownerDid: userDid,
       teamDid,
     });
 
@@ -828,7 +840,7 @@ class TeamAPI extends EventEmitter {
       name: role.name,
       title: role.title,
       expireDate: new Date(expireDate).toString(),
-      ownerDid,
+      ownerDid: userDid,
       teamDid,
     };
   }

package/lib/blocklet/manager/disk.js

@@ -7,6 +7,7 @@ const get = require('lodash/get');
 const omit = require('lodash/omit');
 const merge = require('lodash/merge');
 const pick = require('lodash/pick');
+const isEmpty = require('lodash/isEmpty');
 const cloneDeep = require('lodash/cloneDeep');
 const { isNFTExpired, getNftExpirationDate } = require('@abtnode/util/lib/nft');
 const didDocument = require('@abtnode/util/lib/did-document');
@@ -2453,38 +2454,47 @@ class BlockletManager extends BaseBlockletManager {
         { did: 1, meta: 1, controller: 1 }
       );
 
+      logger.info('external blocklet count', { count: blockletExtras.length });
+
       for (const data of blockletExtras) {
         try {
+          if (isEmpty(data.controller)) {
+            logger.info('skip the blocklet without controller', { blockletDid: data.did, controller: data.controller });
+            // eslint-disable-next-line no-continue
+            continue;
+          }
+
+          const { did } = data;
           const assetState = await util.getNFTState(data.controller.chainHost, data.controller.nftId);
           const isExpired = isNFTExpired(assetState);
 
           if (isExpired) {
             logger.info('the blocklet already expired', {
-              blockletDid: data.meta.did,
+              blockletDid: did,
               nftId: data.controller.nftId,
             });
 
-            const blocklet = await states.blocklet.getBlocklet(data.meta.did);
+            const blocklet = await states.blocklet.getBlocklet(did);
             if (blocklet) {
               // 预防 Blocklet 已经删除，但是 blocklet extra data 没有清理的场景
               await this._backupToDisk({ blocklet });
               logger.info('backed up the expired blocklet', {
-                blockletDid: data.meta.did,
+                blockletDid: did,
                 nftId: data.controller.nftId,
               });
 
-              await this.delete({ did: data.meta.did, keepData: true, keepConfigs: true, keepLogsDir: true });
+              await this.delete({ did, keepData: true, keepConfigs: true, keepLogsDir: true });
               logger.info('the expired blocklet already deleted', {
-                blockletDid: data.meta.did,
+                blockletDid: did,
                 nftId: data.controller.nftId,
               });
             }
 
             const expiredAt = getNftExpirationDate(assetState);
-            await states.blockletExtras.updateExpireInfo({ did: data.meta.did, expiredAt });
+            await states.blockletExtras.updateExpireInfo({ did, expiredAt });
             logger.info('updated expired blocklet extra info', {
               nftId: data.controller.nftId,
-              blockletDid: data.meta.did,
+              blockletDid: did,
             });
 
             // 删除 blocklet 后会 reload nginx, 所以这里每次删除一个
@@ -2494,8 +2504,8 @@ class BlockletManager extends BaseBlockletManager {
           }
         } catch (error) {
           logger.error('delete expired blocklet failed', {
-            blockletDid: data.meta.did,
-            nftId: data.controller.nftId,
+            blockletDid: data.did,
+            nftId: data.controller?.nftId,
             error,
           });
         }
@@ -2516,19 +2526,37 @@ class BlockletManager extends BaseBlockletManager {
         return;
       }
 
-      const tasks = blockletExtras.map(async ({ appDid, meta }) => {
-        await this._cleanBlockletData({ blocklet: { meta }, keepData: false, keepLogsDir: false, keepConfigs: false });
-        logger.info(`clean blocklet ${meta.did} extra data`);
+      const tasks = blockletExtras.map(async ({ appDid, did, meta }) => {
+        const blocklet = await this.getBlocklet(did);
+        if (blocklet) {
+          logger.error('skip cleaning the blocklet which is not deleted', { blockletDid: did });
+          return;
+        }
+
+        let blockletMeta = meta;
+        if (isEmpty(blockletMeta)) {
+          // 旧版本的 blocklet 没有 meta 信息，这里补充一下
+          blockletMeta = { did, name: did };
+          logger.error('the blocklet original meta is empty', { did, blockletMeta });
+        }
+
+        await this._cleanBlockletData({
+          blocklet: { meta: blockletMeta },
+          keepData: false,
+          keepLogsDir: false,
+          keepConfigs: false,
+        });
+        logger.info(`clean blocklet ${blockletMeta.did} extra data`);
 
         await removeBackup(this.dataDirs.data, appDid);
-        logger.info(`removed blocklet ${meta.did} backup`);
+        logger.info(`removed blocklet ${blockletMeta.did} backup`);
 
         this.emit(BlockletEvents.dataCleaned, {
-          blocklet: { meta },
+          blocklet: { meta: blockletMeta },
           keepRouting: false,
         });
 
-        logger.info(`cleaned expired blocklet blocklet ${meta.did} data`);
+        logger.info(`cleaned expired blocklet blocklet ${blockletMeta.did} data`);
       });
 
       await Promise.all(tasks);

package/lib/processes/updater.js

@@ -89,7 +89,8 @@ const verifyBlockletServer = async (version) => {
 
   if (result.code === 0) {
     const actual = semver.coerce(result.stdout);
-    if (actual && actual.version === version) {
+    const expected = semver.coerce(version);
+    if (actual && expected && actual.version === expected.version) {
       return result;
     }
 

package/lib/states/audit-log.js

@@ -57,7 +57,13 @@ const expandUser = async (teamDid, userDid, passportId, info, node) => {
     return ['', ''];
   }
 
-  const user = await node.getUser({ teamDid, user: { did: userDid } });
+  const user = await node.getUser({
+    teamDid,
+    user: { did: userDid },
+    options: {
+      enableConnectedAccount: true,
+    },
+  });
   if (!user) {
     return ['', ''];
   }

package/lib/validators/user.js

@@ -12,7 +12,6 @@ const passportSchema = Joi.object({
   .unknown()
   .empty(null);
 
-// TODO: @zhanghan 这里目前仅包含必填的字段，后续需要增加其他字段
 const connectedAccountSchema = Joi.object({
   provider: Joi.string().required(),
   did: Joi.DID().trim().required(),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-7cbab489",
+  "version": "1.16.6-beta-61cf68d3",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,35 +19,35 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.6-beta-7cbab489",
-    "@abtnode/certificate-manager": "1.16.6-beta-7cbab489",
-    "@abtnode/constant": "1.16.6-beta-7cbab489",
-    "@abtnode/cron": "1.16.6-beta-7cbab489",
-    "@abtnode/db": "1.16.6-beta-7cbab489",
-    "@abtnode/logger": "1.16.6-beta-7cbab489",
-    "@abtnode/queue": "1.16.6-beta-7cbab489",
-    "@abtnode/rbac": "1.16.6-beta-7cbab489",
-    "@abtnode/router-provider": "1.16.6-beta-7cbab489",
-    "@abtnode/static-server": "1.16.6-beta-7cbab489",
-    "@abtnode/timemachine": "1.16.6-beta-7cbab489",
-    "@abtnode/util": "1.16.6-beta-7cbab489",
-    "@arcblock/did": "1.18.75",
-    "@arcblock/did-auth": "1.18.75",
-    "@arcblock/did-ext": "^1.18.75",
+    "@abtnode/auth": "1.16.6-beta-61cf68d3",
+    "@abtnode/certificate-manager": "1.16.6-beta-61cf68d3",
+    "@abtnode/constant": "1.16.6-beta-61cf68d3",
+    "@abtnode/cron": "1.16.6-beta-61cf68d3",
+    "@abtnode/db": "1.16.6-beta-61cf68d3",
+    "@abtnode/logger": "1.16.6-beta-61cf68d3",
+    "@abtnode/queue": "1.16.6-beta-61cf68d3",
+    "@abtnode/rbac": "1.16.6-beta-61cf68d3",
+    "@abtnode/router-provider": "1.16.6-beta-61cf68d3",
+    "@abtnode/static-server": "1.16.6-beta-61cf68d3",
+    "@abtnode/timemachine": "1.16.6-beta-61cf68d3",
+    "@abtnode/util": "1.16.6-beta-61cf68d3",
+    "@arcblock/did": "1.18.76",
+    "@arcblock/did-auth": "1.18.76",
+    "@arcblock/did-ext": "^1.18.76",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.75",
-    "@arcblock/event-hub": "1.18.75",
-    "@arcblock/jwt": "^1.18.75",
+    "@arcblock/did-util": "1.18.76",
+    "@arcblock/event-hub": "1.18.76",
+    "@arcblock/jwt": "^1.18.76",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.18.75",
-    "@blocklet/constant": "1.16.6-beta-7cbab489",
-    "@blocklet/meta": "1.16.6-beta-7cbab489",
-    "@blocklet/sdk": "1.16.6-beta-7cbab489",
-    "@did-space/client": "^0.2.83",
+    "@arcblock/vc": "1.18.76",
+    "@blocklet/constant": "1.16.6-beta-61cf68d3",
+    "@blocklet/meta": "1.16.6-beta-61cf68d3",
+    "@blocklet/sdk": "1.16.6-beta-61cf68d3",
+    "@did-space/client": "^0.2.87",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.75",
-    "@ocap/util": "1.18.75",
-    "@ocap/wallet": "1.18.75",
+    "@ocap/mcrypto": "1.18.76",
+    "@ocap/util": "1.18.76",
+    "@ocap/wallet": "1.18.76",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -94,5 +94,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "36b58c0651762472ac34ad880965c47510eb9768"
+  "gitHead": "574a27436b429a97f443fc9ea1b44988807206bd"
 }