@abtnode/core 1.16.6-beta-1fde60e3 → 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

@@ -5,9 +5,9 @@ const path = require('path');
 const flat = require('flat');
 const get = require('lodash/get');
 const omit = require('lodash/omit');
-const uniq = require('lodash/uniq');
 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');
@@ -1010,7 +1010,7 @@ class BlockletManager extends BaseBlockletManager {
       throw new Error('configs list is not an array');
     }
 
-    const tmpDids = Array.isArray(did) ? uniq(did) : [did];
+    const tmpDids = Array.isArray(did) ? did : [did];
     const [rootDid, ...childDids] = tmpDids;
     const rootMetaDid = await states.blocklet.getBlockletMetaDid(rootDid);
     const dids = [rootMetaDid, ...childDids];
@@ -1993,7 +1993,7 @@ class BlockletManager extends BaseBlockletManager {
         });
       }
 
-      if (blocklet.controller && process.env.NODE_ENV !== 'test') {
+      if (blocklet?.controller?.nftId && process.env.NODE_ENV !== 'test') {
         const nodeInfo = await states.node.read();
         await consumeServerlessNFT({ nftId: blocklet.controller.nftId, nodeInfo, blocklet });
         this.emit(BlockletEvents.nftConsumed, { blocklet, context });
@@ -2273,19 +2273,6 @@ class BlockletManager extends BaseBlockletManager {
     fs.removeSync(cacheDir);
     await this._cleanBlockletData({ blocklet, keepData, keepLogsDir, keepConfigs });
 
-    if (blocklet.mode !== BLOCKLET_MODES.DEVELOPMENT) {
-      const nodeInfo = await states.node.read();
-      const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
-      didDocument
-        .disableBlockletDNS({ appPid: blocklet.appPid, wallet, didRegistryUrl: nodeInfo.didRegistry })
-        .then(() => {
-          logger.info(`disabled blocklet ${blocklet.appPid} dns`);
-        })
-        .catch((err) => {
-          logger.error(`disable blocklet ${blocklet.appPid} dns failed`, { error: err });
-        });
-    }
-
     const result = await states.blocklet.deleteBlocklet(did);
     logger.info('blocklet removed successfully', { did });
 
@@ -2467,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, 所以这里每次删除一个
@@ -2508,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,
           });
         }
@@ -2530,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/blocklet/manager/helper/install-application-from-backup.js

@@ -67,7 +67,15 @@ const installApplicationFromBackup = async ({
   const { meta } = blockletState;
   const { did, name: appName } = meta;
 
-  const extra = omit(fs.readJSONSync(path.join(dir, 'blocklet-extras.json')), ['_id', 'createdAt', 'updatedAt']);
+  const extra = omit(fs.readJSONSync(path.join(dir, 'blocklet-extras.json')), [
+    '_id',
+    'createdAt',
+    'updatedAt',
+    'controller.nftId',
+    'controller.nftOwner',
+    'controller.chainHost',
+    'controller.appMaxCount',
+  ]);
 
   if (blockletState.meta.did !== extra.did) {
     throw new Error(

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

@@ -1,5 +1,4 @@
 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');
@@ -13,10 +12,7 @@ const { ensureMeta, updateBlockletFallbackLogo, ensureAppLogo } = require('../..
  * @returns
  */
 const installApplicationFromDev = async ({ folder, meta, states, manager } = {}) => {
-  const { version } = meta;
-
-  const name = `${meta.name}-dev`;
-  const did = toDid(name);
+  const { version, name, did } = meta;
 
   const exist = await states.blocklet.getBlocklet(did);
   if (exist) {

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/states/blocklet-extras.js

@@ -5,7 +5,6 @@ const logger = require('@abtnode/logger')('state-blocklet-extras');
 const { EXPIRED_BLOCKLET_DATA_RETENTION_DAYS } = require('@abtnode/constant');
 const camelCase = require('lodash/camelCase');
 const get = require('lodash/get');
-const uniq = require('lodash/uniq');
 const dayjs = require('dayjs');
 
 const BaseState = require('./base');
@@ -129,7 +128,7 @@ class BlockletExtrasState extends BaseState {
   generateGetFn(extra) {
     return async (dids, path, defaultValue) => {
       // eslint-disable-next-line no-param-reassign
-      dids = uniq([].concat(dids));
+      dids = [].concat(dids);
       const [rootDid, ...childDids] = dids;
       const { dek } = this.config;
       const { name, afterGet = noop('data') } = extra;
@@ -152,7 +151,7 @@ class BlockletExtrasState extends BaseState {
   generateSetFn(extra) {
     return async (dids, data) => {
       // eslint-disable-next-line no-param-reassign
-      dids = uniq([].concat(dids));
+      dids = [].concat(dids);
       const [rootDid, ...childDids] = dids;
       const { dek } = this.config;
       const { name, beforeSet = noop('cur') } = extra;
@@ -192,7 +191,7 @@ class BlockletExtrasState extends BaseState {
   generateDelFn(extra) {
     return async (dids) => {
       // eslint-disable-next-line no-param-reassign
-      dids = uniq([].concat(dids));
+      dids = [].concat(dids);
       const [rootDid, ...childDids] = dids;
       const { name } = extra;
       const item = await this.findOne({ did: rootDid });

package/lib/util/blocklet.js

@@ -28,6 +28,8 @@ const { isValid: isValidDid, isEthereumDid } = require('@arcblock/did');
 const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
 const pm2 = require('@abtnode/util/lib/async-pm2');
 const sleep = require('@abtnode/util/lib/sleep');
+const getPm2ProcessInfo = require('@abtnode/util/lib/get-pm2-process-info');
+const killProcessOccupiedPorts = require('@abtnode/util/lib/kill-process-occupied-ports');
 const getNodeWallet = require('@abtnode/util/lib/get-app-wallet');
 const { formatEnv } = require('@abtnode/util/lib/security');
 const ensureEndpointHealthy = require('@abtnode/util/lib/ensure-endpoint-healthy');
@@ -526,6 +528,14 @@ const startBlockletProcess = async (
       // run hook
       await preStart(b, { env });
 
+      // kill process if port is occupied
+      try {
+        const { ports } = b;
+        await killProcessOccupiedPorts({ ports, pm2ProcessId: processId, printError: logger.error.bind(logger) });
+      } catch (error) {
+        logger.error('Failed to killProcessOccupiedPorts', { error });
+      }
+
       // start process
       const maxMemoryRestart = get(nodeInfo, 'runtimeConfig.blockletMaxMemoryLimit', BLOCKLET_MAX_MEM_LIMIT_IN_MB);
 
@@ -720,21 +730,8 @@ const getProcessState = async (processId) => {
   return statusMap[info.pm2_env.status];
 };
 
-const getProcessInfo = (processId) =>
-  new Promise((resolve, reject) => {
-    pm2.describe(processId, async (err, [info]) => {
-      if (err) {
-        logger.error('Failed to get blocklet status from pm2', { error: err });
-        return reject(err);
-      }
-
-      if (!info) {
-        return reject(new CustomError('BLOCKLET_PROCESS_404', 'Blocklet process info is not available'));
-      }
-
-      return resolve(info);
-    });
-  });
+const getProcessInfo = (processId, { throwOnNotExist = true } = {}) =>
+  getPm2ProcessInfo(processId, { printError: logger.error.bind(logger), throwOnNotExist });
 
 const deleteProcess = (processId) =>
   new Promise((resolve, reject) => {

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-1fde60e3",
+  "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-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",
+    "@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-1fde60e3",
-    "@blocklet/meta": "1.16.6-beta-1fde60e3",
-    "@blocklet/sdk": "1.16.6-beta-1fde60e3",
-    "@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": "be8d8eab7d210910e24dae3b389f2c70aa414a13"
+  "gitHead": "574a27436b429a97f443fc9ea1b44988807206bd"
 }