@abtnode/core 1.7.20 → 1.7.23

package/lib/api/node.js

@@ -6,6 +6,7 @@ const isDocker = require('@abtnode/util/lib/is-docker');
 const isGitpod = require('@abtnode/util/lib/is-gitpod');
 const getFolderSize = require('@abtnode/util/lib/get-folder-size');
 const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
+const { toDelegateAddress } = require('@arcblock/did-util');
 
 const logger = require('@abtnode/logger')('@abtnode/core:api:node');
 
@@ -13,6 +14,7 @@ const IP = require('../util/ip');
 const { validateNodeInfo, validateUpdateGateway } = require('../validators/node');
 const BlockletRegistry = require('../blocklet/registry');
 const { getAll } = require('../blocklet/manager/engine');
+const { getDelegateState } = require('../util');
 
 const sanitizeUrl = (url) => {
   if (!url) {
@@ -160,6 +162,24 @@ class NodeAPI {
 
     return this.state.updateGateway(data);
   }
+
+  async getDelegationState() {
+    const info = await this.state.read();
+
+    const ownerNft = info.ownerNft || {};
+    if (!ownerNft.did) {
+      throw new Error('Invalid owner NFT');
+    }
+
+    const address = toDelegateAddress(ownerNft.holder, info.did);
+    const state = await getDelegateState(info.launcher.chainHost, address);
+    if (!state) {
+      return { delegated: false };
+    }
+
+    const transferV2Delegation = (state.ops || []).find(({ key }) => key === 'fg:t:transfer_v2');
+    return { delegated: !!transferV2Delegation };
+  }
 }
 
 module.exports = NodeAPI;

package/lib/api/team.js

@@ -25,7 +25,8 @@ class TeamAPI extends EventEmitter {
 
     this.notification = states.notification;
     this.node = states.node;
-    this.inviteExpireTime = 1000 * 3600 * 24 * 30; // 30 days
+    this.memberInviteExpireTime = 1000 * 3600 * 24 * 30; // 30 days
+    this.serverInviteExpireTime = 1000 * 3600; // 1 hour
     this.teamManager = teamManager;
   }
 
@@ -224,9 +225,13 @@ class TeamAPI extends EventEmitter {
 
   // Invite member
 
-  async createInvitation({ teamDid, role, remark }, context) {
+  async createMemberInvitation({ teamDid, role, expireTime, remark }, context) {
     await this.teamManager.checkEnablePassportIssuance(teamDid);
 
+    if (expireTime && expireTime <= 0) {
+      throw new Error('Expire time must be greater than 0');
+    }
+
     if (!role) {
       throw new Error('Role cannot be empty');
     }
@@ -246,7 +251,7 @@ class TeamAPI extends EventEmitter {
       throw new Error('Inviter does not exist');
     }
 
-    const expireDate = Date.now() + this.inviteExpireTime;
+    const expireDate = Date.now() + (expireTime || this.memberInviteExpireTime);
     const state = await this.getSessionState(teamDid);
     const { id: inviteId } = await state.start({
       type: 'invite',
@@ -269,6 +274,36 @@ class TeamAPI extends EventEmitter {
     };
   }
 
+  async createTransferInvitation({ teamDid, remark }, context) {
+    return this.createMemberInvitation(
+      { teamDid, expireTime: this.serverInviteExpireTime, remark, role: 'owner' },
+      context
+    );
+  }
+
+  async getInvitation({ teamDid, inviteId }) {
+    if (!teamDid || !inviteId) {
+      return null;
+    }
+
+    const state = await this.getSessionState(teamDid);
+
+    const invitation = await state.findOne({ _id: inviteId, type: 'invite' });
+    if (!invitation) {
+      return null;
+    }
+
+    return {
+      // eslint-disable-next-line no-underscore-dangle
+      inviteId: invitation._id,
+      role: invitation.role,
+      remark: invitation.remark,
+      expireDate: new Date(invitation.expireDate).toString(),
+      inviter: invitation.inviter,
+      teamDid: invitation.teamDid,
+    };
+  }
+
   async getInvitations({ teamDid }) {
     const state = await this.getSessionState(teamDid);
 
@@ -350,7 +385,7 @@ class TeamAPI extends EventEmitter {
       throw new Error(`Passport does not exist: ${name}`);
     }
 
-    const expireDate = Date.now() + this.inviteExpireTime;
+    const expireDate = Date.now() + this.memberInviteExpireTime;
 
     const state = await this.getSessionState(teamDid);
     const { id } = await state.start({
@@ -668,7 +703,7 @@ class TeamAPI extends EventEmitter {
   // Just for test
   // =============
   setInviteExpireTime(ms) {
-    this.inviteExpireTime = ms;
+    this.memberInviteExpireTime = ms;
   }
 }
 

package/lib/index.js

@@ -247,9 +247,10 @@ function ABTNode(options) {
     addBlockletStore: nodeAPI.addRegistry.bind(nodeAPI),
     deleteBlockletStore: nodeAPI.deleteRegistry.bind(nodeAPI),
     selectBlockletStore: nodeAPI.selectRegistry.bind(nodeAPI),
+    getDelegationState: nodeAPI.getDelegationState.bind(nodeAPI),
     cleanupDirtyUpgradeState: states.node.cleanupDirtyUpgradeState.bind(states.node),
-    addNodeOwner: states.node.addNodeOwner.bind(states.node),
     updateNodeOwner: states.node.updateNodeOwner.bind(states.node),
+    updateNftHolder: states.node.updateNftHolder.bind(states.node),
     updateNodeRouting,
     isInitialized,
     resetNode: (params, context) =>
@@ -261,7 +262,9 @@ function ABTNode(options) {
     // Team && Access control
 
     // Invitation
-    createInvitation: teamAPI.createInvitation.bind(teamAPI),
+    createMemberInvitation: teamAPI.createMemberInvitation.bind(teamAPI),
+    createTransferInvitation: teamAPI.createTransferInvitation.bind(teamAPI),
+    getInvitation: teamAPI.getInvitation.bind(teamAPI),
     getInvitations: teamAPI.getInvitations.bind(teamAPI),
     processInvitation: teamAPI.processInvitation.bind(teamAPI),
     deleteInvitation: teamAPI.deleteInvitation.bind(teamAPI),

package/lib/states/audit-log.js

@@ -9,7 +9,6 @@ const logger = require('@abtnode/logger')('@abtnode/core:states:audit-log');
 const BaseState = require('./base');
 
 const { parse } = require('../util/ua');
-const { lookup } = require('../util/ip');
 
 const getServerInfo = (info) => `[${info.name}](${joinUrl(info.routing.adminPath, '/settings/about')})`;
 const getBlockletInfo = (blocklet, info) => `[${getDisplayName(blocklet)} v${blocklet.meta.version}](${joinUrl(info.routing.adminPath, '/blocklets/', blocklet.meta.did, '/overview')})`; // prettier-ignore
@@ -154,7 +153,7 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `${args.user.approved ? 'enabled' : 'disabled'} user ${user} for ${team}`;
     case 'deletePassportIssuance':
       return `removed passport issuance ${args.sessionId} from ${team}`;
-    case 'createInvitation':
+    case 'createMemberInvitation':
       return `created member invitation(${result.inviteId}: ${args.remark}) with **${args.role}** passport for ${team}`; // prettier-ignore
     case 'deleteInvitation':
       return `removed unused member invitation(${args.inviteId}) from ${team}`;
@@ -169,6 +168,8 @@ const getLogContent = async (action, args, context, result, info, node) => {
         return `removed all trusted passport issuers for ${team}`;
       }
       return `updated trusted passport issuers to following for ${team}: \n${args.trustedPassports.map(x => `- ${x.remark}: ${x.issuerDid}`).join('\n')}`; // prettier-ignore
+    case 'delegateTransferNFT':
+      return `${args.owner} ${args.reason}`;
 
     // accessKeys
     case 'createAccessKey':
@@ -258,12 +259,13 @@ const getLogCategory = (action) => {
     case 'revokeUserPassport':
     case 'enableUserPassport':
     case 'updateUserApproval':
-    case 'createInvitation':
+    case 'createMemberInvitation':
     case 'deleteInvitation':
     case 'createRole':
     case 'updateRole':
     case 'updatePermissionsForRole':
     case 'configTrustedPassports':
+    case 'delegateTransferNFT':
       return 'team';
 
     // accessKeys
@@ -299,6 +301,25 @@ const getLogCategory = (action) => {
   }
 };
 
+const getScope = (args = {}) => {
+  // this param usually means mutating an application (server or blocklet)
+  if (args.teamDid) {
+    return args.teamDid;
+  }
+
+  // this param usually means mutating a child component
+  if (args.rootDid) {
+    return args.rootDid;
+  }
+
+  // this param usually means mutating a nested child component
+  if (Array.isArray(args.did)) {
+    return args.did[0];
+  }
+
+  return null;
+};
+
 class AuditLogState extends BaseState {
   constructor(baseDir, options = {}) {
     super(baseDir, { filename: 'audit-log.db', ...options });
@@ -352,17 +373,16 @@ class AuditLogState extends BaseState {
 
       try {
         const { ip, ua, user } = context;
-        const [info, geoInfo, uaInfo] = await Promise.all([node.states.node.read(), lookup(ip), parse(ua)]);
+        const [info, uaInfo] = await Promise.all([node.states.node.read(), parse(ua)]);
 
         const data = await this.asyncDB.insert({
-          scope: args.teamDid || info.did, // server or blocklet did
+          scope: getScope(args) || info.did, // server or blocklet did
           action,
           category: await getLogCategory(action, args, context, result, info, node),
           content: (await getLogContent(action, args, context, result, info, node)).trim(),
           actor: pick(user.actual || user, ['did', 'fullName', 'role']),
           extra: args,
           env: pick(uaInfo, ['browser', 'os', 'device']),
-          geo: pick(geoInfo || { country: '', city: '' }, ['country', 'city']),
           ip,
           ua,
         });

package/lib/states/node.js

@@ -1,7 +1,6 @@
 /* eslint-disable no-underscore-dangle */
 const semver = require('semver');
 const omit = require('lodash/omit');
-const isEqual = require('lodash/isEqual');
 const isEmpty = require('lodash/isEmpty');
 const security = require('@abtnode/util/lib/security');
 const { isFromPublicKey } = require('@arcblock/did');
@@ -215,32 +214,43 @@ class NodeState extends BaseState {
     return updateResult;
   }
 
-  async addNodeOwner(owner) {
-    if (!validateOwner(owner)) {
+  async updateNodeOwner({ nodeOwner, ownerNft }) {
+    if (!validateOwner(nodeOwner)) {
       throw new Error('Node owner is invalid');
     }
 
     const doc = await this.read();
 
-    if (doc.nodeOwner) {
-      if (isEqual(owner, doc.nodeOwner)) {
-        return doc;
-      }
+    const initialized = this.isInitialized({ nodeOwner });
+
+    if (this.notification && typeof this.notification.setDefaultReceiver === 'function') {
+      this.notification.setDefaultReceiver(nodeOwner.did);
+    }
 
-      throw new Error('Cannot set owner because owner already exists');
+    const entities = { nodeOwner, initialized, initializedAt: initialized ? new Date() : null };
+    if (ownerNft) {
+      entities.ownerNft = ownerNft;
     }
 
-    return this.addOwner(owner, doc);
+    const updateResult = await this.update(doc._id, {
+      $set: entities,
+    });
+
+    this.emit(EVENTS.NODE_ADDED_OWNER, updateResult);
+
+    return updateResult;
   }
 
-  async updateNodeOwner(owner) {
-    if (!validateOwner(owner)) {
-      throw new Error('Node owner is invalid');
+  async updateNftHolder(holder) {
+    if (!holder) {
+      throw new Error('NFT holder can not be empty');
     }
 
     const doc = await this.read();
 
-    return this.addOwner(owner, doc);
+    return this.update(doc._id, {
+      $set: { 'ownerNft.holder': holder },
+    });
   }
 
   async enterMode(mode) {

package/lib/util/index.js

@@ -14,6 +14,7 @@ const { Certificate } = require('@fidm/x509');
 const getPortLib = require('get-port');
 const v8 = require('v8');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
+const axios = require('@abtnode/util/lib/axios');
 const parseBlockletMeta = require('@blocklet/meta/lib/parse');
 const { validateMeta, fixAndValidateService } = require('@blocklet/meta/lib/validate');
 const { BlockletStatus, BLOCKLET_INTERFACE_WELLKNOWN } = require('@blocklet/meta/lib/constants');
@@ -503,6 +504,33 @@ const getStateCrons = (states) => [
   },
 ];
 
+const getDelegateState = async (chainHost, address) => {
+  const result = await axios.post(
+    joinUrl(chainHost, '/gql/'),
+    JSON.stringify({
+      query: `{
+        getDelegateState(address: "${address}") {
+          state {
+            address
+            ops {
+              key
+            }
+          }
+        }
+      }`,
+    }),
+    {
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+      },
+      timeout: 60 * 1000,
+    }
+  );
+
+  return get(result.data, 'data.getDelegateState.state');
+};
+
 const lib = {
   validateOwner,
   getProviderFromNodeInfo,
@@ -541,6 +569,7 @@ const lib = {
   getSafeEnv,
   memoizeAsync,
   getStateCrons,
+  getDelegateState,
 };
 
 module.exports = lib;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.20",
+  "version": "1.7.23",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,23 +19,24 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.7.20",
-    "@abtnode/constant": "1.7.20",
-    "@abtnode/cron": "1.7.20",
-    "@abtnode/db": "1.7.20",
-    "@abtnode/logger": "1.7.20",
-    "@abtnode/queue": "1.7.20",
-    "@abtnode/rbac": "1.7.20",
-    "@abtnode/router-provider": "1.7.20",
-    "@abtnode/static-server": "1.7.20",
-    "@abtnode/timemachine": "1.7.20",
-    "@abtnode/util": "1.7.20",
+    "@abtnode/certificate-manager": "1.7.23",
+    "@abtnode/constant": "1.7.23",
+    "@abtnode/cron": "1.7.23",
+    "@abtnode/db": "1.7.23",
+    "@abtnode/logger": "1.7.23",
+    "@abtnode/queue": "1.7.23",
+    "@abtnode/rbac": "1.7.23",
+    "@abtnode/router-provider": "1.7.23",
+    "@abtnode/static-server": "1.7.23",
+    "@abtnode/timemachine": "1.7.23",
+    "@abtnode/util": "1.7.23",
     "@arcblock/did": "^1.16.15",
     "@arcblock/did-motif": "^1.1.9",
+    "@arcblock/did-util": "^1.16.15",
     "@arcblock/event-hub": "1.16.15",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "^1.16.15",
-    "@blocklet/meta": "1.7.20",
+    "@blocklet/meta": "1.7.23",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
@@ -79,5 +80,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "7e579415aa56cc422f3e26d902cf029fbc92e47a"
+  "gitHead": "aa13838b7597bce11851d0b902575f861aa1ab34"
 }