@abtnode/core 1.8.34 → 1.8.36

package/lib/api/team.js

@@ -713,7 +713,7 @@ class TeamAPI extends EventEmitter {
   async updateRole({ teamDid, role: { name, title, description } = {} }) {
     logger.info('update role', { teamDid, name, title, description });
 
-    validateUpdateRole({ name, title, description });
+    await validateUpdateRole({ name, title, description });
 
     const rbac = await this.getRBAC(teamDid);
 

package/lib/blocklet/manager/disk.js

@@ -3,6 +3,7 @@
 const fs = require('fs-extra');
 const { fileURLToPath } = require('url');
 const path = require('path');
+const flat = require('flat');
 const urlHttp = require('url-http');
 const get = require('lodash/get');
 const pick = require('lodash/pick');
@@ -39,7 +40,6 @@ const {
   forEachChild,
   getComponentId,
   getComponentBundleId,
-  isExternalBlocklet,
 } = require('@blocklet/meta/lib/util');
 const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
 const validateBlockletEntry = require('@blocklet/meta/lib/entry');
@@ -860,46 +860,54 @@ class BlockletManager extends BaseBlockletManager {
     return this.attachRuntimeInfo({ did, nodeInfo, diskInfo: true, context });
   }
 
-  async list({ includeRuntimeInfo = true, useCache = true, filter } = {}, context) {
-    const blocklets = await states.blocklet.getBlocklets();
-    let list = blocklets;
+  async attachBlockletListRuntimeInfo({ blocklets, useCache }, context) {
+    const nodeInfo = await states.node.read();
+    const updated = (
+      await Promise.all(
+        blocklets.map((x) => {
+          if (isBeforeInstalled(x.status)) {
+            return x;
+          }
 
-    if (includeRuntimeInfo) {
-      const nodeInfo = await states.node.read();
-      const updated = (
-        await Promise.all(
-          blocklets.map((x) => {
-            if (isBeforeInstalled(x.status)) {
-              return x;
-            }
+          const cachedBlocklet =
+            useCache && this.cachedBlocklets ? this.cachedBlocklets.find((y) => y.meta.did === x.meta.did) : null;
 
-            const cachedBlocklet =
-              useCache && this.cachedBlocklets ? this.cachedBlocklets.find((y) => y.meta.did === x.meta.did) : null;
+          return this.attachRuntimeInfo({
+            did: x.meta.did,
+            nodeInfo,
+            diskInfo: false,
+            context,
+            cachedBlocklet,
+          });
+        })
+      )
+    ).filter(Boolean);
 
-            return this.attachRuntimeInfo({
-              did: x.meta.did,
-              nodeInfo,
-              diskInfo: false,
-              context,
-              cachedBlocklet,
-            });
-          })
-        )
-      ).filter(Boolean);
+    this.cachedBlocklets = cloneDeep(updated);
+    return updated;
+  }
 
-      this.cachedBlocklets = cloneDeep(updated);
-      list = updated;
+  async list({ includeRuntimeInfo = true, useCache = true, query, filter } = {}, context) {
+    const condition = { ...flat(query || {}) };
+    if (filter === 'external-only') {
+      condition.controller = {
+        $exists: true,
+      };
     }
 
     if (filter === 'external-excluded') {
-      return list.filter((x) => !isExternalBlocklet(x));
+      condition.controller = {
+        $exists: false,
+      };
     }
 
-    if (filter === 'external-only') {
-      return list.filter(isExternalBlocklet);
+    const blocklets = await states.blocklet.getBlocklets(condition);
+
+    if (includeRuntimeInfo) {
+      return this.attachBlockletListRuntimeInfo({ blocklets, useCache }, context);
     }
 
-    return list;
+    return blocklets;
   }
 
   // eslint-disable-next-line no-unused-vars
@@ -1989,14 +1997,14 @@ class BlockletManager extends BaseBlockletManager {
       throw new Error('Can not install an already installed blocklet');
     }
 
-    if (controller?.vcId) {
-      // sometimes nedb will throw error if use states.blocklet.count({ ['controller.vcId']: controller.vcId })
+    if (controller?.nftId) {
+      // sometimes nedb will throw error if use states.blocklet.count({ ['controller.nftId']: controller.nftId })
       const blocklets = await states.blocklet.find({}, { controller: 1 });
-      const count = blocklets.filter((x) => x.controller?.vcId === controller.vcId).length;
+      const count = blocklets.filter((x) => x.controller?.nftId === controller.nftId).length;
 
       if (count >= (controller.appMaxCount || 1)) {
         throw new Error(
-          `You can only install ${controller.appMaxCount} blocklet with this credential: ${controller.vcId}`
+          `You can only install ${controller.appMaxCount} blocklet with this credential: ${controller.nftId}`
         );
       }
     }
@@ -2016,7 +2024,7 @@ class BlockletManager extends BaseBlockletManager {
   /**
    * @type {{
    *  id: string;
-   *  vcId: string;
+   *  nftId: string;
    *  expireDate: Date;
    * }} Controller
    *

package/lib/index.js

@@ -355,6 +355,7 @@ function ABTNode(options) {
     // Access Key
     getAccessKeys: states.accessKey.list.bind(states.accessKey),
     getAccessKey: states.accessKey.detail.bind(states.accessKey),
+    getAccessKeyByTag: states.accessKey.getAccessKeyByTag.bind(states.accessKey),
     createAccessKey: states.accessKey.create.bind(states.accessKey),
     updateAccessKey: states.accessKey.update.bind(states.accessKey),
     deleteAccessKey: states.accessKey.remove.bind(states.accessKey),

package/lib/router/manager.js

@@ -162,7 +162,7 @@ class RouterManager extends EventEmitter {
     const updateSet = {};
 
     if (params.corsAllowedOrigins) {
-      updateSet.corsAllowedOrigins = params.corsAllowedOrigins;
+      updateSet.corsAllowedOrigins = params.corsAllowedOrigins.filter((x) => x !== '__none__');
     }
 
     if (params.domain) {

package/lib/states/access-key.js

@@ -31,8 +31,8 @@ class AccessKeyState extends BaseState {
     });
   }
 
-  async create(input = {}, context) {
-    const { remark, passport } = input;
+  async create(input, context) {
+    const { remark, passport, tag } = input || {};
 
     validateRemark(remark);
     validatePassport(passport);
@@ -43,10 +43,15 @@ class AccessKeyState extends BaseState {
       accessKeyPublic: wallet.publicKey,
       passport,
     };
+
     if (remark) {
       data.remark = remark;
     }
 
+    if (tag) {
+      data.tag = tag;
+    }
+
     data.createdBy = getUserName(context);
     data.updatedBy = getUserName(context);
 
@@ -57,6 +62,14 @@ class AccessKeyState extends BaseState {
     };
   }
 
+  async getAccessKeyByTag({ tag } = {}) {
+    if (!tag) {
+      throw new Error('tag should not be empty');
+    }
+
+    return this.findOne({ tag });
+  }
+
   // eslint-disable-next-line no-unused-vars
   async list(params, context) {
     const res = await this.paginate({}, { createdAt: -1 }, { pageSize: 100 });

package/lib/team/manager.js

@@ -19,13 +19,18 @@ const rbacCreationLock = new Lock('rbac-creation-lock');
 
 const closeDatabase = async (db) =>
   new Promise((resolve, reject) => {
+    if (!db) {
+      resolve(true);
+      return;
+    }
+
     db.closeDatabase((err) => {
       if (err) {
         reject(err);
         return;
       }
 
-      resolve();
+      resolve(true);
     });
   });
 

package/lib/validators/blocklet.js

@@ -5,7 +5,8 @@ const Joi = JOI.extend(didExtension);
 
 const blockletController = Joi.object({
   id: Joi.DID().required(), // userDid
-  vcId: Joi.DID().required(),
+  nftId: Joi.DID().required(),
+  nftOwner: Joi.DID().required(),
   appMaxCount: Joi.number().required().min(1),
   expireDate: Joi.date(),
 }).options({ stripUnknown: true });

package/lib/validators/role.js

@@ -2,18 +2,28 @@
 const JOI = require('joi');
 const { getMultipleLangParams } = require('./util');
 
-const nameSchema = JOI.string().trim().max(64);
+const roleNameSchema = JOI.string()
+  .trim()
+  .max(64)
+  .custom((value) => {
+    if (value.startsWith('blocklet')) {
+      throw new Error('role name cannot start with "blocklet"');
+    }
+
+    return value;
+  });
+
 const titleSchema = JOI.string().trim().max(25);
 const descriptionSchema = JOI.string().trim().max(600);
 
 const createRoleSchema = JOI.object({
-  name: nameSchema.required(),
+  name: roleNameSchema.required(),
   title: titleSchema.required(),
   description: descriptionSchema.required(),
 });
 
 const updateRoleSchema = JOI.object({
-  name: nameSchema.required(),
+  name: roleNameSchema.required(),
   title: titleSchema,
   description: descriptionSchema,
 });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.34",
+  "version": "1.8.36",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,32 +19,32 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.34",
-    "@abtnode/certificate-manager": "1.8.34",
-    "@abtnode/constant": "1.8.34",
-    "@abtnode/cron": "1.8.34",
-    "@abtnode/db": "1.8.34",
-    "@abtnode/logger": "1.8.34",
-    "@abtnode/queue": "1.8.34",
-    "@abtnode/rbac": "1.8.34",
-    "@abtnode/router-provider": "1.8.34",
-    "@abtnode/static-server": "1.8.34",
-    "@abtnode/timemachine": "1.8.34",
-    "@abtnode/util": "1.8.34",
-    "@arcblock/did": "1.18.13",
+    "@abtnode/auth": "1.8.36",
+    "@abtnode/certificate-manager": "1.8.36",
+    "@abtnode/constant": "1.8.36",
+    "@abtnode/cron": "1.8.36",
+    "@abtnode/db": "1.8.36",
+    "@abtnode/logger": "1.8.36",
+    "@abtnode/queue": "1.8.36",
+    "@abtnode/rbac": "1.8.36",
+    "@abtnode/router-provider": "1.8.36",
+    "@abtnode/static-server": "1.8.36",
+    "@abtnode/timemachine": "1.8.36",
+    "@abtnode/util": "1.8.36",
+    "@arcblock/did": "1.18.15",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.13",
-    "@arcblock/event-hub": "1.18.13",
-    "@arcblock/jwt": "^1.18.13",
+    "@arcblock/did-util": "1.18.15",
+    "@arcblock/event-hub": "1.18.15",
+    "@arcblock/jwt": "^1.18.15",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.18.13",
-    "@blocklet/constant": "1.8.34",
-    "@blocklet/meta": "1.8.34",
-    "@blocklet/sdk": "1.8.34",
+    "@arcblock/vc": "1.18.15",
+    "@blocklet/constant": "1.8.36",
+    "@blocklet/meta": "1.8.36",
+    "@blocklet/sdk": "1.8.36",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.13",
-    "@ocap/util": "1.18.13",
-    "@ocap/wallet": "1.18.13",
+    "@ocap/mcrypto": "1.18.15",
+    "@ocap/util": "1.18.15",
+    "@ocap/wallet": "1.18.15",
     "@slack/webhook": "^5.0.4",
     "axios": "^0.27.2",
     "axon": "^2.0.3",
@@ -82,5 +82,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "c5fbb8e57493db62f212217cfde1980c82f00297"
+  "gitHead": "507e974ce88bad1aa002c593130b32982207f803"
 }