@abtnode/core 1.16.11-beta-0ae58a71 → 1.16.11-beta-f74663ac

package/lib/util/reset-node.js

@@ -12,9 +12,13 @@ const resetOwner = async ({ teamManager }) => {
     const nodeInfo = await states.node.read();
     const teamDid = nodeInfo.did;
     const userState = await teamManager.getUserState(teamDid);
-    const count = await userState.remove({ role: 'owner' });
+    const passportState = await teamManager.getPassportState(teamDid);
+    const connectedAccountState = await teamManager.getConnectedAccountState(teamDid);
+    await passportState.remove({ userDid: nodeInfo.nodeOwner.did });
+    await connectedAccountState.remove({ userDid: nodeInfo.nodeOwner.did });
+    await userState.remove({ did: nodeInfo.nodeOwner.did });
     await states.node.updateNodeInfo({ nodeOwner: null });
-    logger.info('reset node owner', result, count);
+    logger.info('reset node owner', result);
   } catch (err) {
     // Do nothing
   }
@@ -69,22 +73,21 @@ const resetCertificates = async ({ certManager }) => {
 };
 
 const resetUsers = async ({ teamManager }) => {
-  const nodeInfo = await states.node.read();
-
-  const teamDid = nodeInfo.did;
-  const userState = await teamManager.getUserState(teamDid);
-  const users = await userState.find({});
+  try {
+    const nodeInfo = await states.node.read();
 
-  let count = 0;
-  for (const user of users) {
-    if (nodeInfo.nodeOwner.did !== user.did) {
-      // eslint-disable-next-line no-await-in-loop
-      await userState.remove({ did: user.did });
-      count++;
-    }
+    const teamDid = nodeInfo.did;
+    const userState = await teamManager.getUserState(teamDid);
+    const passportState = await teamManager.getPassportState(teamDid);
+    const connectedAccountState = await teamManager.getConnectedAccountState(teamDid);
+    await passportState.remove({ userDid: { $ne: nodeInfo.nodeOwner.did } });
+    await connectedAccountState.remove({ userDid: { $ne: nodeInfo.nodeOwner.did } });
+    await userState.remove({ did: { $ne: nodeInfo.nodeOwner.did } });
+
+    logger.info('reset users');
+  } catch (error) {
+    logger.error('failed reset users', { error });
   }
-
-  logger.info('reset users', { count });
 };
 
 const resetInvitations = async ({ teamManager }) => {

package/lib/util/rpc.js

@@ -9,7 +9,7 @@ const logger = require('@abtnode/logger')('@abtnode/core:rpc');
 const host = '127.0.0.1';
 const port = Number(process.env.ABT_NODE_UPDATER_PORT || 40405);
 
-const doRpcCall = async (message) =>
+const doRpcCall = (message) =>
   new Promise((resolve) => {
     logger.info('try send rpc request', message);
     const sock = axon.socket('req');

package/lib/util/store.js

@@ -120,7 +120,7 @@ const parseSourceUrl = async (url) => {
   };
 };
 
-const resolveTarballURL = async ({ did, tarball = '', storeUrl = '' }) => {
+const resolveTarballURL = ({ did, tarball = '', storeUrl = '' }) => {
   if (!tarball) {
     return '';
   }

package/lib/validators/space-gateway.js

@@ -1,6 +1,8 @@
 const { Joi } = require('@arcblock/validator');
 
 const validateAddSpaceGateway = Joi.object({
+  // 表示 space did
+  did: Joi.DID(),
   url: Joi.string()
     .uri({ scheme: ['http', 'https'] })
     .required(),
@@ -13,6 +15,7 @@ const validateAddSpaceGateway = Joi.object({
 });
 
 const validateUpdateSpaceGateway = Joi.object({
+  did: Joi.DID(),
   url: Joi.string()
     .uri({ scheme: ['http', 'https'] })
     .required(),

package/lib/validators/util.js

@@ -15,6 +15,9 @@ const blockletController = Joi.object({
   nftOwner: Joi.DID().required(),
   chainHost: Joi.string().uri().required(),
   appMaxCount: Joi.number().required().min(1),
+  launcherUrl: Joi.string().uri().optional(),
+  launcherSessionId: Joi.string().optional(),
+  ownerDid: Joi.DID().optional(),
 }).options({ stripUnknown: true });
 
 const createValidator = (schema) => (entity) => schema.validateAsync(entity);

package/lib/webhook/sender/api/index.js

@@ -20,7 +20,7 @@ class APISender extends BaseSender {
     }
   }
 
-  async sendTestMessage(params, message) {
+  sendTestMessage(params, message) {
     return this.send(params, {
       description: message,
       status: 'info',

package/lib/webhook/sender/slack/index.js

@@ -64,7 +64,7 @@ class SlackSender extends BaseSender {
     }
   }
 
-  async sendTestMessage(params, message) {
+  sendTestMessage(params, message) {
     return this.send(
       params,
       {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.11-beta-0ae58a71",
+  "version": "1.16.11-beta-f74663ac",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.11-beta-0ae58a71",
-    "@abtnode/certificate-manager": "1.16.11-beta-0ae58a71",
-    "@abtnode/constant": "1.16.11-beta-0ae58a71",
-    "@abtnode/cron": "1.16.11-beta-0ae58a71",
-    "@abtnode/logger": "1.16.11-beta-0ae58a71",
-    "@abtnode/models": "1.16.11-beta-0ae58a71",
-    "@abtnode/queue": "1.16.11-beta-0ae58a71",
-    "@abtnode/rbac": "1.16.11-beta-0ae58a71",
-    "@abtnode/router-provider": "1.16.11-beta-0ae58a71",
-    "@abtnode/static-server": "1.16.11-beta-0ae58a71",
-    "@abtnode/timemachine": "1.16.11-beta-0ae58a71",
-    "@abtnode/util": "1.16.11-beta-0ae58a71",
+    "@abtnode/auth": "1.16.11-beta-f74663ac",
+    "@abtnode/certificate-manager": "1.16.11-beta-f74663ac",
+    "@abtnode/constant": "1.16.11-beta-f74663ac",
+    "@abtnode/cron": "1.16.11-beta-f74663ac",
+    "@abtnode/logger": "1.16.11-beta-f74663ac",
+    "@abtnode/models": "1.16.11-beta-f74663ac",
+    "@abtnode/queue": "1.16.11-beta-f74663ac",
+    "@abtnode/rbac": "1.16.11-beta-f74663ac",
+    "@abtnode/router-provider": "1.16.11-beta-f74663ac",
+    "@abtnode/static-server": "1.16.11-beta-f74663ac",
+    "@abtnode/timemachine": "1.16.11-beta-f74663ac",
+    "@abtnode/util": "1.16.11-beta-f74663ac",
     "@arcblock/did": "1.18.80",
     "@arcblock/did-auth": "1.18.80",
     "@arcblock/did-ext": "^1.18.80",
@@ -41,9 +41,9 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.80",
     "@arcblock/vc": "1.18.80",
-    "@blocklet/constant": "1.16.11-beta-0ae58a71",
-    "@blocklet/meta": "1.16.11-beta-0ae58a71",
-    "@blocklet/sdk": "1.16.11-beta-0ae58a71",
+    "@blocklet/constant": "1.16.11-beta-f74663ac",
+    "@blocklet/meta": "1.16.11-beta-f74663ac",
+    "@blocklet/sdk": "1.16.11-beta-f74663ac",
     "@did-space/client": "^0.2.113",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.80",
@@ -96,5 +96,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "5d044a08b4399eb855563e670af7cbd0d3851e94"
+  "gitHead": "c59bc852f73b9e216af9d806b9c9e24b2e37ae27"
 }