@abtnode/core 1.16.0-beta-7a7d5d97 → 1.16.0-beta-b741bcb3

package/lib/api/team.js

@@ -136,7 +136,7 @@ class TeamAPI extends EventEmitter {
     return doc;
   }
 
-  async getUsers({ teamDid, query, paging: inputPaging, sort, dids }) {
+  async getUsers({ teamDid, query, paging: inputPaging, sort, dids, sourceIds }) {
     const state = await this.getUserState(teamDid);
 
     if (inputPaging?.pageSize > MAX_USER_PAGE_SIZE) {
@@ -158,6 +158,14 @@ class TeamAPI extends EventEmitter {
         pageCount: 1,
         page: 1,
       };
+    } else if (sourceIds) {
+      list = await state.getUsersBySourceIds({ query, sourceIds });
+      paging = {
+        total: list.length,
+        pageSize: sourceIds.length,
+        pageCount: 1,
+        page: 1,
+      };
     } else {
       const doc = await state.getUsers({ query, sort, paging: { pageSize: 20, ...inputPaging } });
       list = doc.list;
@@ -185,8 +193,7 @@ class TeamAPI extends EventEmitter {
             'locale',
             // oauth relate fields
             'source',
-            'derivedAccount',
-            'connectedAccounts',
+            'extraConfigs',
           ])
         // eslint-disable-next-line function-paren-newline
       ),
@@ -647,7 +654,6 @@ class TeamAPI extends EventEmitter {
         }),
         ownerProfile: {
           ...currentUser,
-          // avatar: await parseUserAvatar(currentUser.avatar, { dataDir: blocklet.env.dataDir }),
         },
         preferredColor: passportColor,
       });

package/lib/blocklet/manager/disk.js

@@ -548,21 +548,29 @@ class BlockletManager extends BaseBlockletManager {
       this.emit(BlockletEvents.statusChange, blocklet);
     }
 
-    const nodeEnvironments = await states.node.getEnvironments();
-
-    await stopBlockletProcess(blocklet, {
-      preStop: (b, { ancestors }) =>
-        hooks.preStop(b.env.processId, {
-          appDir: b.env.appDir,
-          hooks: Object.assign(b.meta.hooks || {}, b.meta.scripts || {}),
-          env: getRuntimeEnvironments(b, nodeEnvironments, ancestors),
-          did, // root blocklet did
-          notification: states.notification,
-          context,
-          exitOnError: false,
-          silent,
-        }),
-    });
+    try {
+      const nodeEnvironments = await states.node.getEnvironments();
+      await stopBlockletProcess(blocklet, {
+        preStop: (b, { ancestors }) =>
+          hooks.preStop(b.env.processId, {
+            appDir: b.env.appDir,
+            hooks: Object.assign(b.meta.hooks || {}, b.meta.scripts || {}),
+            env: getRuntimeEnvironments(b, nodeEnvironments, ancestors),
+            did, // root blocklet did
+            notification: states.notification,
+            context,
+            exitOnError: false,
+            silent,
+          }),
+      });
+    } catch (error) {
+      logger.error('Failed to stop blocklet', { error, did });
+      if (updateStatus) {
+        const res = await states.blocklet.setBlockletStatus(did, BlockletStatus.error);
+        this.emit(BlockletEvents.statusChange, res);
+      }
+      throw error;
+    }
 
     logger.info('blocklet stopped successfully', { processId, did });
 
@@ -1007,16 +1015,17 @@ class BlockletManager extends BaseBlockletManager {
     const [rootDid, ...childDids] = dids;
     logger.info('config blocklet', { dids });
 
+    const ancestors = [];
     let blocklet = await this.getBlocklet(rootDid);
     for (const childDid of childDids) {
+      ancestors.push(blocklet);
       blocklet = blocklet.children.find((x) => x.meta.did === childDid);
       if (!blocklet) {
         throw new Error('Child blocklet does not exist', { dids });
       }
     }
 
-    // run hook
-    const nodeEnvironments = await states.node.getEnvironments();
+    const configObj = {};
     for (const x of newConfigs) {
       if (x.custom === true) {
         // custom key
@@ -1036,21 +1045,25 @@ class BlockletManager extends BaseBlockletManager {
         }
       }
 
-      blocklet.configObj[x.key] = x.value;
+      configObj[x.key] = x.value;
     }
 
+    // run hook
     if (!skipHook) {
+      const nodeEnvironments = await states.node.getEnvironments();
       // FIXME: we should also call preConfig for child blocklets
       await hooks.preConfig(blocklet.env.processId, {
         appDir: blocklet.env.appDir,
         hooks: Object.assign(blocklet.meta.hooks || {}, blocklet.meta.scripts || {}),
         exitOnError: true,
-        env: { ...getRuntimeEnvironments(blocklet, nodeEnvironments), ...blocklet.configObj },
+        env: { ...getRuntimeEnvironments(blocklet, nodeEnvironments, ancestors), ...configObj },
         did,
         context,
       });
     }
 
+    Object.assign(blocklet.configObj, configObj);
+
     const willAppSkChange = isRotatingAppSk(newConfigs, blocklet.configs, blocklet.externalSk);
     const willAppDidChange = isRotatingAppDid(newConfigs, blocklet.configs, blocklet.externalSk);
 
@@ -1404,6 +1417,7 @@ class BlockletManager extends BaseBlockletManager {
       {
         name: 'clean-expired-blocklet-data',
         time: '0 */20 0 * * *', // 每天凌晨 0 点的每 20 分钟
+        options: { runOnInit: false },
         fn: () => this._cleanExpiredBlockletData(),
       },
       {
@@ -1720,6 +1734,7 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     // update state to db
+    await states.blockletExtras.updateByDid(did, { appDid: blocklet.appDid });
     return states.blocklet.updateBlocklet(did, blocklet);
   }
 
@@ -1851,24 +1866,46 @@ class BlockletManager extends BaseBlockletManager {
 
     const children = component ? await this._getChildrenForInstallation(component) : [];
 
-    if (children[0]?.meta?.logo) {
+    // FIXME @linchen
+    // 当应用本身是容器时, 下载这个容器, 因为容器可能除 blocklet.yml 额外的文件
+    // 本身就是容器的应用, 在容器中添加额外文件可能不是合理的做法
+    // 容器只在安装时有效, 安装后容器无法升级
+    const containerSourceUrl =
+      component && component.meta.group === BlockletGroup.gateway && component.meta.dist && component.bundleSource?.url;
+
+    if (containerSourceUrl) {
+      meta.bundleDid = component.meta.did;
+      meta.bundleName = component.meta.name;
+      meta.version = component.meta.version;
+      meta.dist = component.meta.dist;
+      meta.logo = component.meta.logo;
+    } else if (children[0]?.meta?.logo) {
       meta.logo = children[0].meta.logo;
     }
 
     await validateBlocklet({ meta, children });
 
     // fake install bundle
-    const bundleDir = getBundleDir(this.installDir, meta);
-    fs.mkdirSync(bundleDir, { recursive: true });
-    updateMetaFile(path.join(bundleDir, BLOCKLET_META_FILE), meta);
+    if (!containerSourceUrl) {
+      const bundleDir = getBundleDir(this.installDir, meta);
+      fs.mkdirSync(bundleDir, { recursive: true });
+      updateMetaFile(path.join(bundleDir, BLOCKLET_META_FILE), meta);
+    }
 
     // add blocklet to db
-    const blocklet = await states.blocklet.addBlocklet({
+    const params = {
       meta,
       source: BlockletSource.custom,
       children,
       mode,
-    });
+    };
+
+    if (containerSourceUrl) {
+      params.source = BlockletSource.url;
+      params.deployedFrom = containerSourceUrl;
+    }
+
+    const blocklet = await states.blocklet.addBlocklet(params);
 
     return blocklet;
   }
@@ -1906,7 +1943,7 @@ class BlockletManager extends BaseBlockletManager {
       logger.info('blocklet installed', { source, did: meta.did });
 
       // logo
-      if (blocklet.children[0]?.meta?.logo) {
+      if (blocklet.source === BlockletSource.custom && blocklet.children[0]?.meta?.logo) {
         const fileName = blocklet.children[0].meta.logo;
         const src = path.join(getBundleDir(this.installDir, blocklet.children[0].meta), fileName);
         const dist = path.join(getBundleDir(this.installDir, blocklet.meta), fileName);
@@ -2388,7 +2425,7 @@ class BlockletManager extends BaseBlockletManager {
           controller: {
             $exists: true,
           },
-          'controller.expiredAt': {
+          expiredAt: {
             $exists: false,
           },
         },
@@ -2406,11 +2443,21 @@ class BlockletManager extends BaseBlockletManager {
               nftId: data.controller.nftId,
             });
 
-            await this.delete({ did: data.meta.did, keepData: true, keepConfigs: true, keepLogsDir: true });
-            logger.info('the expired blocklet already deleted', {
-              blockletDid: data.meta.did,
-              nftId: data.controller.nftId,
-            });
+            const blocklet = await states.blocklet.getBlocklet(data.meta.did);
+            if (blocklet) {
+              // 预防 Blocklet 已经删除，但是 blocklet extra data 没有清理的场景
+              await this._backupToDisk({ blocklet });
+              logger.info('backed up the expired blocklet', {
+                blockletDid: data.meta.did,
+                nftId: data.controller.nftId,
+              });
+
+              await this.delete({ did: data.meta.did, keepData: true, keepConfigs: true, keepLogsDir: true });
+              logger.info('the expired blocklet already deleted', {
+                blockletDid: data.meta.did,
+                nftId: data.controller.nftId,
+              });
+            }
 
             const expiredAt = getNftExpirationDate(assetState);
             await states.blockletExtras.updateExpireInfo({ did: data.meta.did, expiredAt });
@@ -2435,7 +2482,7 @@ class BlockletManager extends BaseBlockletManager {
 
       logger.info('check expired external blocklet end');
     } catch (error) {
-      logger.info('check expired external blocklet failed', { error });
+      logger.error('check expired external blocklet failed', { error });
     }
   }
 
@@ -2448,16 +2495,19 @@ class BlockletManager extends BaseBlockletManager {
         return;
       }
 
-      const tasks = blockletExtras.map(async ({ did }) => {
-        const blocklet = await states.blocklet.getBlocklet(did);
-        await this._cleanBlockletData({ blocklet, keepData: false, keepLogsDir: false, keepConfigs: false });
+      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`);
+
+        await removeBackup(this.dataDirs.data, appDid);
+        logger.info(`removed blocklet ${meta.did} backup`);
 
         this.emit(BlockletEvents.dataCleaned, {
-          blocklet,
+          blocklet: { meta },
           keepRouting: false,
         });
 
-        logger.info(`cleaned expired blocklet blocklet ${did} data`);
+        logger.info(`cleaned expired blocklet blocklet ${meta.did} data`);
       });
 
       await Promise.all(tasks);

package/lib/event.js

@@ -327,6 +327,7 @@ module.exports = ({
     BlockletEvents.restoreProgress,
 
     BlockletEvents.spaceConnected,
+    BlockletEvents.nftConsumed,
   ].forEach((eventName) => {
     listen(blockletManager, eventName, handleBlockletEvent);
   });

package/lib/states/blocklet-extras.js

@@ -291,6 +291,10 @@ class BlockletExtrasState extends BaseState {
 
     return data;
   }
+
+  updateByDid(did, data) {
+    return super.update({ did }, { $set: data });
+  }
 }
 
 module.exports = BlockletExtrasState;

package/lib/states/user.js

@@ -193,7 +193,7 @@ class User extends BaseState {
 
     // 根据 derivedDid 查询 user 信息（wallet 账户绑定 oauth 账户后，会有该字段）
     if (derivedDid) {
-      queryParam['derivedAccount.did'] = derivedDid;
+      queryParam['extraConfigs.derivedAccount.did'] = derivedDid;
     }
 
     const sortParam = pickBy(sort, (x) => !isNullOrUndefined(x));
@@ -232,6 +232,27 @@ class User extends BaseState {
     return this.find(queryParam);
   }
 
+  /**
+   * get user list by sourceId list
+   * @param {string[]} sourceIds user sourceId list
+   * @returns {BlockletUser[]}
+   */
+  async getUsersBySourceIds({ sourceIds, query } = {}) {
+    const { approved } = query || {};
+    const sourceIdList = sourceIds || [];
+
+    const queryParam = {
+      'extraConfigs.sourceId': { $in: sourceIdList },
+    };
+
+    if (!isNullOrUndefined(approved)) {
+      queryParam.approved = !!approved;
+    }
+
+    // get data
+    return this.find(queryParam);
+  }
+
   /**
    * get user by did
    * @param {string} did user's did

package/lib/util/blocklet.js

@@ -460,7 +460,10 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
 };
 
 const isUsefulError = (err) =>
-  err && err.message !== 'process or namespace not found' && !/^Process \d+ not found$/.test(err.message);
+  err &&
+  err.message !== 'process or namespace not found' &&
+  !/id unknown/.test(err.message) &&
+  !/^Process \d+ not found$/.test(err.message);
 
 const getHealthyCheckTimeout = (blocklet, { checkHealthImmediately } = {}) => {
   let minConsecutiveTime = 5000;
@@ -611,6 +614,10 @@ const stopBlockletProcess = async (blocklet, { preStop = noop, skippedProcessIds
   await forEachBlocklet(
     blocklet,
     async (b, { ancestors }) => {
+      if (b.meta?.group === BlockletGroup.gateway) {
+        return;
+      }
+
       if (skippedProcessIds.includes(b.env.processId)) {
         logger.info(`skip stop process ${b.env.processId}`);
         return;
@@ -806,9 +813,7 @@ const parseComponents = async (component, context = {}) => {
     try {
       rawMeta = await getBlockletMetaFromUrls(urls, { logger });
     } catch (error) {
-      throw new Error(
-        `Failed get component meta. Component: ${rawMeta.title || rawMeta.did}, reason: ${error.message}`
-      );
+      throw new Error(`Failed get component meta. Component: ${urls.join(', ')}, reason: ${error.message}`);
     }
 
     if (rawMeta.group === BlockletGroup.gateway) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0-beta-7a7d5d97",
+  "version": "1.16.0-beta-b741bcb3",
   "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.0-beta-7a7d5d97",
-    "@abtnode/certificate-manager": "1.16.0-beta-7a7d5d97",
-    "@abtnode/constant": "1.16.0-beta-7a7d5d97",
-    "@abtnode/cron": "1.16.0-beta-7a7d5d97",
-    "@abtnode/db": "1.16.0-beta-7a7d5d97",
-    "@abtnode/logger": "1.16.0-beta-7a7d5d97",
-    "@abtnode/queue": "1.16.0-beta-7a7d5d97",
-    "@abtnode/rbac": "1.16.0-beta-7a7d5d97",
-    "@abtnode/router-provider": "1.16.0-beta-7a7d5d97",
-    "@abtnode/static-server": "1.16.0-beta-7a7d5d97",
-    "@abtnode/timemachine": "1.16.0-beta-7a7d5d97",
-    "@abtnode/util": "1.16.0-beta-7a7d5d97",
+    "@abtnode/auth": "1.16.0-beta-b741bcb3",
+    "@abtnode/certificate-manager": "1.16.0-beta-b741bcb3",
+    "@abtnode/constant": "1.16.0-beta-b741bcb3",
+    "@abtnode/cron": "1.16.0-beta-b741bcb3",
+    "@abtnode/db": "1.16.0-beta-b741bcb3",
+    "@abtnode/logger": "1.16.0-beta-b741bcb3",
+    "@abtnode/queue": "1.16.0-beta-b741bcb3",
+    "@abtnode/rbac": "1.16.0-beta-b741bcb3",
+    "@abtnode/router-provider": "1.16.0-beta-b741bcb3",
+    "@abtnode/static-server": "1.16.0-beta-b741bcb3",
+    "@abtnode/timemachine": "1.16.0-beta-b741bcb3",
+    "@abtnode/util": "1.16.0-beta-b741bcb3",
     "@arcblock/did": "1.18.64",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.18.64",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.18.64",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.64",
-    "@blocklet/constant": "1.16.0-beta-7a7d5d97",
-    "@blocklet/meta": "1.16.0-beta-7a7d5d97",
-    "@blocklet/sdk": "1.16.0-beta-7a7d5d97",
+    "@blocklet/constant": "1.16.0-beta-b741bcb3",
+    "@blocklet/meta": "1.16.0-beta-b741bcb3",
+    "@blocklet/sdk": "1.16.0-beta-b741bcb3",
     "@did-space/client": "^0.2.45",
     "@fidm/x509": "^1.2.1",
     "@ocap/client": "1.18.64",
@@ -91,5 +91,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "c25ddcc371454b2e2f7038aa5e64c7b7c27763cb"
+  "gitHead": "f41666daf2c499566ff2f8e76a2de4fa6e1122ba"
 }