@abtnode/core 1.7.19 → 1.7.22

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

@@ -51,11 +51,7 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
       return true;
     }
 
-    if (key.toString().startsWith('ABT_NODE_') || key.toString().startsWith('BLOCKLET_')) {
-      return false;
-    }
-
-    return true;
+    return !(key.toString().startsWith('ABT_NODE_') || key.toString().startsWith('BLOCKLET_'));
   });
 
   newConfig.forEach((config) => {

package/lib/blocklet/hooks.js

@@ -7,7 +7,7 @@ const logger = require('@abtnode/logger')(`${require('../../package.json').name}
 
 const { getSafeEnv } = require('../util');
 
-const runUserHook = async (appId, hookName, args) => {
+const runUserHook = async (processId, hookName, args) => {
   const { appDir, hooks, env, exitOnError = true, silent = false, notification, did } = args;
   const hook = get(hooks, `[${hookName}]`) || get(hooks, `[${camelCase(hookName)}]`);
 
@@ -17,7 +17,7 @@ const runUserHook = async (appId, hookName, args) => {
     }
 
     logger.info(`run hook:${hookName}:`, { hook });
-    await runScript(hook, [appId, hookName].join(':'), { cwd: appDir, env: getSafeEnv(env), silent });
+    await runScript(hook, [processId, hookName].join(':'), { cwd: appDir, env: getSafeEnv(env), silent });
   } catch (error) {
     logger.error(`run ${hook} error:`, { error });
 
@@ -37,10 +37,10 @@ const runUserHook = async (appId, hookName, args) => {
   }
 };
 
-const preDeploy = (appId, ...args) => runUserHook(appId, 'pre-deploy', ...args);
-const preInstall = (appId, ...args) => runUserHook(appId, 'pre-install', ...args);
-const postInstall = (appId, ...args) => runUserHook(appId, 'post-install', ...args);
-const preConfig = (appId, ...args) => runUserHook(appId, 'pre-config', ...args);
+const preDeploy = (processId, ...args) => runUserHook(processId, 'pre-deploy', ...args);
+const preInstall = (processId, ...args) => runUserHook(processId, 'pre-install', ...args);
+const postInstall = (processId, ...args) => runUserHook(processId, 'post-install', ...args);
+const preConfig = (processId, ...args) => runUserHook(processId, 'pre-config', ...args);
 const preStart = async (blocklet, options) => {
   // check required environments
   let environments = get(blocklet, 'meta.environments', []);
@@ -53,10 +53,10 @@ const preStart = async (blocklet, options) => {
     throw new Error(`Required environments is not set: ${tmp.join(',')}`);
   }
 
-  return runUserHook(blocklet.env.appId, 'pre-start', options);
+  return runUserHook(blocklet.env.processId, 'pre-start', options);
 };
 
-const preUninstall = (appId, ...args) => runUserHook(appId, 'pre-uninstall', ...args);
-const preStop = (appId, ...args) => runUserHook(appId, 'pre-stop', ...args);
+const preUninstall = (processId, ...args) => runUserHook(processId, 'pre-uninstall', ...args);
+const preStop = (processId, ...args) => runUserHook(processId, 'pre-stop', ...args);
 
 module.exports = { preDeploy, preInstall, postInstall, preStart, preUninstall, preStop, preConfig };