@abtnode/core 1.8.3 → 1.8.4

package/lib/blocklet/manager/disk.js

@@ -128,7 +128,7 @@ const {
   validateOwner,
 } = util;
 
-const preDownloadLock = new Lock('pre-download-lock');
+const statusLock = new Lock('blocklet-status-lock');
 
 const asyncFs = fs.promises;
 
@@ -429,6 +429,12 @@ class BlockletManager extends BaseBlockletManager {
 
       return blocklet;
     } catch (err) {
+      const status = await states.blocklet.getBlockletStatus(did);
+      if ([BlockletStatus.stopping, BlockletStatus.stopped].includes(status)) {
+        logger.info('Failed to start blocklet maybe due to manually stopped');
+        return states.blocklet.getBlocklet(did);
+      }
+
       const error = Array.isArray(err) ? err[0] : err;
       logger.error('Failed to start blocklet', { error, did, name: blocklet.meta.name });
       const description = `Start blocklet ${blocklet.meta.name} failed with error: ${error.message}`;
@@ -679,26 +685,38 @@ class BlockletManager extends BaseBlockletManager {
     return newBlocklet;
   }
 
-  async cancelDownload({ did }, context) {
-    await preDownloadLock.acquire();
+  async cancelDownload({ did: inputDid }, context) {
     try {
-      const blocklet = await states.blocklet.getBlocklet(did);
+      await statusLock.acquire();
+      const blocklet = await states.blocklet.getBlocklet(inputDid);
       if (!blocklet) {
-        throw new Error('Can not cancel download for non-exist blocklet in database.', { did });
+        throw new Error('Can not cancel download for non-exist blocklet in database.', { inputDid });
+      }
+
+      const { name, did, version } = blocklet.meta;
+
+      if (![BlockletStatus.downloading, BlockletStatus.waiting].includes(blocklet.status)) {
+        throw new Error(`Can not cancel blocklet that status is ${fromBlockletStatus(blocklet.status)}`);
+      }
+
+      const job = await this.installQueue.get(did);
+      if (job) {
+        const { postAction, oldBlocklet } = job;
+        await this._rollback(postAction, did, oldBlocklet);
       }
 
       if (blocklet.status === BlockletStatus.downloading) {
         await this._cancelDownload(blocklet.meta, context);
       } else if (blocklet.status === BlockletStatus.waiting) {
         await this._cancelWaiting(blocklet.meta, context);
-      } else {
-        throw new Error(`Can not cancel blocklet that status is ${fromBlockletStatus(blocklet.status)}`);
       }
 
-      preDownloadLock.release();
+      logger.info('cancel download blocklet', { did, name, version, status: fromBlockletStatus(blocklet.status) });
+
+      statusLock.release();
       return blocklet;
     } catch (error) {
-      preDownloadLock.release();
+      statusLock.release();
       throw error;
     }
   }
@@ -1516,39 +1534,45 @@ class BlockletManager extends BaseBlockletManager {
     const { meta } = blocklet;
     const { name, did, version } = meta;
 
+    // check status
     try {
-      await preDownloadLock.acquire();
+      await statusLock.acquire();
 
       const b0 = await states.blocklet.getBlocklet(did);
-      if (!b0 || ![BlockletStatus.waiting, BlockletStatus.downloading].includes(b0.status)) {
+      if (!b0 || ![BlockletStatus.waiting].includes(b0.status)) {
         if (!b0) {
-          logger.error('blocklet does not exist before downloading', { name, did });
+          throw new Error('blocklet does not exist before downloading');
         } else {
-          logger.error('blocklet status is invalid before downloading', {
-            name,
-            did,
-            status: fromBlockletStatus(b0.status),
-          });
+          throw new Error(`blocklet status is invalid before downloading: ${fromBlockletStatus(b0.status)}`);
         }
-        preDownloadLock.release();
-        await this._rollback(postAction, did, oldBlocklet);
-        return;
       }
+      statusLock.release();
+    } catch (error) {
+      statusLock.release();
+      logger.error('Check blocklet status failed before downloading', {
+        name,
+        did,
+        error,
+      });
+      await this._rollback(postAction, did, oldBlocklet);
+      return;
+    }
 
-      preDownloadLock.release();
-
+    // download bundle
+    try {
       const { isCancelled } = await this._downloadBlocklet(blocklet, oldBlocklet, context);
 
       if (isCancelled) {
-        logger.info('Download was canceled manually', { name, did, version });
-        await this._rollback(postAction, did, oldBlocklet);
+        logger.info('Download was canceled', { name, did, version });
+
+        if ((await states.blocklet.getBlockletStatus(did)) === BlockletStatus.downloading) {
+          await this._rollback(postAction, did, oldBlocklet);
+        }
         return;
       }
     } catch (err) {
       logger.error('Download blocklet tarball failed', { name, did, version });
 
-      preDownloadLock.release();
-
       this.emit(BlockletEvents.downloadFailed, {
         meta: { did },
         error: {
@@ -1576,6 +1600,31 @@ class BlockletManager extends BaseBlockletManager {
       return;
     }
 
+    // update status
+    try {
+      await statusLock.acquire();
+
+      if ((await states.blocklet.getBlockletStatus(did)) !== BlockletStatus.downloading) {
+        throw new Error('blocklet status changed durning download');
+      }
+
+      if (postAction === 'install') {
+        const state = await states.blocklet.setBlockletStatus(did, BlockletStatus.installing);
+        this.emit(BlockletEvents.statusChange, state);
+      }
+
+      if (['upgrade', 'downgrade'].includes(postAction)) {
+        const state = await states.blocklet.setBlockletStatus(did, BlockletStatus.upgrading);
+        this.emit(BlockletEvents.statusChange, state);
+      }
+
+      statusLock.release();
+    } catch (error) {
+      logger.error(error.message);
+      statusLock.release();
+    }
+
+    // install
     try {
       // install blocklet
       if (postAction === 'install') {
@@ -1599,9 +1648,6 @@ class BlockletManager extends BaseBlockletManager {
     const { did, version } = meta;
     logger.info('do install blocklet', { did, version });
 
-    const state = await states.blocklet.setBlockletStatus(did, BlockletStatus.installing);
-    this.emit(BlockletEvents.statusChange, state);
-
     try {
       const installedBlocklet = await this._installBlocklet({
         did,
@@ -1629,9 +1675,6 @@ class BlockletManager extends BaseBlockletManager {
     const { version, did } = newBlocklet.meta;
     logger.info(`do ${action} blocklet`, { did, version });
 
-    const state = await states.blocklet.setBlockletStatus(did, BlockletStatus.upgrading);
-    this.emit(BlockletEvents.statusChange, state);
-
     try {
       await this._upgradeBlocklet({
         newBlocklet,
@@ -1663,6 +1706,12 @@ class BlockletManager extends BaseBlockletManager {
       const res = await this.status(did, { forceSync: true });
       this.emit(BlockletEvents.started, res);
     } catch (error) {
+      const status = await states.blocklet.getBlockletStatus(did);
+      if ([BlockletStatus.stopping, BlockletStatus.stopped].includes(status)) {
+        logger.info(`Check blocklet healthy failing because blocklet is ${fromBlockletStatus(status)}`);
+        return;
+      }
+
       logger.error('check blocklet if started failed', { did, name, context, timeout, error });
 
       await this.deleteProcess({ did }, context);
@@ -3157,26 +3206,19 @@ class BlockletManager extends BaseBlockletManager {
 
   // eslint-disable-next-line no-unused-vars
   async _cancelDownload(blockletMeta, context) {
-    const { did, name, version } = blockletMeta;
+    const { did } = blockletMeta;
 
     if (this.downloadCtrls[did]) {
       for (const cancelCtrl of this.downloadCtrls[did].values()) {
         cancelCtrl.cancel();
       }
-      logger.info('cancel download blocklet', { did, name, version });
     }
   }
 
   // eslint-disable-next-line no-unused-vars
   async _cancelWaiting(blockletMeta, context) {
-    const { did, name, version } = blockletMeta;
-
-    const {
-      job: { postAction, oldBlocklet },
-    } = await this.installQueue.cancel(did);
-    await this._rollback(postAction, did, oldBlocklet);
-
-    logger.info('cancel waiting blocklet', { did, name, version });
+    const { did } = blockletMeta;
+    return this.installQueue.cancel(did);
   }
 
   /**

package/lib/states/blocklet.js

@@ -102,6 +102,22 @@ class BlockletState extends BaseState {
     });
   }
 
+  async getBlockletStatus(did) {
+    return new Promise((resolve, reject) => {
+      if (!did) {
+        resolve(null);
+      }
+
+      this.db.findOne({ $or: [{ 'meta.did': did }, { appDid: did }] }, { status: 1 }, (err, doc) => {
+        if (err) {
+          return reject(err);
+        }
+
+        return resolve(doc ? doc.status : null);
+      });
+    });
+  }
+
   hasBlocklet(did) {
     return new Promise((resolve, reject) => {
       if (!did) {

package/lib/webhook/index.js

@@ -4,6 +4,7 @@ const { evaluateURLs } = require('@abtnode/util/lib/url-evaluation');
 const checkURLAccessible = require('@abtnode/util/lib/url-evaluation/check-accessible-node');
 const { EVENTS } = require('@abtnode/constant');
 const WebHookSender = require('./sender');
+const WalletSender = require('./sender/wallet');
 const createQueue = require('../queue');
 const IP = require('../util/ip');
 const states = require('../states');
@@ -72,6 +73,11 @@ module.exports = ({ events, dataDirs, instance }) => {
       const baseUrls = await getBaseUrls(instance, [external, internal]);
       const senderFns = {};
 
+      // Always send message to wallet
+      webhookList.push({
+        type: WalletSender.type,
+      });
+
       if (webhookList.length) {
         for (let i = 0; i < webhookList.length; i++) {
           const item = webhookList[i];
@@ -79,8 +85,7 @@ module.exports = ({ events, dataDirs, instance }) => {
             const senderInstance = WebHookSender.getMessageSender(item.type);
             senderFns[item.type] = senderInstance.send.bind(senderInstance);
           }
-          const { name } = nodeInfo;
-          const options = { ...message, nodeInfo: `*${name}*` };
+          const options = { ...message, nodeInfo, node: instance };
           if (item.type === 'slack') {
             // eslint-disable-next-line
             options.urlInfo = await getSlackUrlInfo(message.action, baseUrls);

package/lib/webhook/sender/index.js

@@ -3,6 +3,7 @@ const logger = require('@abtnode/logger')('@abtnode/core:sender');
 
 const Slack = require('./slack');
 const Api = require('./api');
+const Wallet = require('./wallet');
 
 const SenderMap = new Map([
   [Slack.type, Slack],
@@ -12,6 +13,10 @@ const SenderMap = new Map([
 const getSenderNames = () => [...SenderMap.keys()];
 
 const getSender = (name) => {
+  if (name === Wallet.type) {
+    return Wallet;
+  }
+
   if (!SenderMap.has(name)) {
     logger.error(`getSender:sender name [${name}] does not exist`);
     return null;

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

@@ -29,7 +29,7 @@ class SlackSender extends BaseSender {
             type: 'section',
             text: {
               type: 'mrkdwn',
-              text: nodeInfo,
+              text: `*${nodeInfo.name}*`,
             },
           },
           {

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

@@ -0,0 +1,45 @@
+const logger = require('@abtnode/logger')('@abtnode/core:sender:api');
+const { sendToUser } = require('@blocklet/sdk/lib/util/send-notification');
+const { ROLES, PASSPORT_STATUS } = require('@abtnode/constant');
+const BaseSender = require('../base');
+
+class WalletSender extends BaseSender {
+  async send(params, data = {}) {
+    const { title, description, nodeInfo, node } = data;
+
+    try {
+      const sender = {
+        appDid: nodeInfo.did,
+        appSk: nodeInfo.sk,
+      };
+
+      const message = {
+        title,
+        body: description,
+      };
+
+      const { users } = await node.getUsers({ teamDid: nodeInfo.did, paging: { pageSize: 100 } });
+      const adminUsers = users
+        .filter(
+          (x) =>
+            x.approved &&
+            (x.passports || []).some(
+              (y) => [ROLES.OWNER, ROLES.ADMIN].includes(y.name) && y.status === PASSPORT_STATUS.VALID
+            )
+        )
+        .map((x) => x.did);
+
+      if (!adminUsers.length) {
+        return;
+      }
+
+      await sendToUser(adminUsers, message, sender, process.env.ABT_NODE_SERVICE_PORT);
+    } catch (error) {
+      logger.error('failed to push notification to wallet', { error });
+    }
+  }
+}
+
+WalletSender.type = 'wallet';
+
+module.exports = WalletSender;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,17 +19,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.8.3",
-    "@abtnode/constant": "1.8.3",
-    "@abtnode/cron": "1.8.3",
-    "@abtnode/db": "1.8.3",
-    "@abtnode/logger": "1.8.3",
-    "@abtnode/queue": "1.8.3",
-    "@abtnode/rbac": "1.8.3",
-    "@abtnode/router-provider": "1.8.3",
-    "@abtnode/static-server": "1.8.3",
-    "@abtnode/timemachine": "1.8.3",
-    "@abtnode/util": "1.8.3",
+    "@abtnode/certificate-manager": "1.8.4",
+    "@abtnode/constant": "1.8.4",
+    "@abtnode/cron": "1.8.4",
+    "@abtnode/db": "1.8.4",
+    "@abtnode/logger": "1.8.4",
+    "@abtnode/queue": "1.8.4",
+    "@abtnode/rbac": "1.8.4",
+    "@abtnode/router-provider": "1.8.4",
+    "@abtnode/static-server": "1.8.4",
+    "@abtnode/timemachine": "1.8.4",
+    "@abtnode/util": "1.8.4",
     "@arcblock/did": "1.17.5",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.17.5",
@@ -37,10 +37,11 @@
     "@arcblock/jwt": "^1.17.5",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.17.5",
-    "@blocklet/meta": "1.8.3",
+    "@blocklet/meta": "1.8.4",
+    "@blocklet/sdk": "1.8.4",
     "@fidm/x509": "^1.2.1",
-    "@nedb/core": "^1.3.1",
-    "@nedb/multi": "^1.3.1",
+    "@nedb/core": "^1.3.2",
+    "@nedb/multi": "^1.3.2",
     "@ocap/mcrypto": "1.17.5",
     "@ocap/util": "1.17.5",
     "@ocap/wallet": "1.17.5",
@@ -81,5 +82,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "c734aca7bf1fc03378c3b082d0622b6a540a8bd3"
+  "gitHead": "c42fb1bb84c5eef0f753fd5397d8007c7a6eee19"
 }