@abtnode/core 1.8.19 → 1.8.21

package/lib/blocklet/hooks.js

@@ -16,10 +16,10 @@ const runUserHook = async (processId, hookName, args) => {
       return;
     }
 
-    logger.info(`run hook:${hookName}:`, { hook });
+    logger.info(`run hook:${hookName}:`, { processId, hook });
     await runScript(hook, [processId, hookName].join(':'), { cwd: appDir, env: getSafeEnv(env), silent });
   } catch (error) {
-    logger.error(`run ${hook} error:`, { error });
+    logger.error(`run ${hook} error:`, { processId, error });
 
     if (notification) {
       notification.create({
@@ -32,12 +32,11 @@ const runUserHook = async (processId, hookName, args) => {
     }
 
     if (exitOnError) {
-      throw new Error(`Run [${hookName}] failed: ${error.message}`);
+      throw new Error(`Run [${processId} - ${hookName}] failed: ${error.message}`);
     }
   }
 };
 
-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);
@@ -56,8 +55,8 @@ const preStart = async (blocklet, options) => {
   return runUserHook(blocklet.env.processId, 'pre-start', options);
 };
 
-const postStart = (processId, ...args) => runUserHook(processId, 'post-start', ...args);
+const postStart = (blocklet, ...args) => runUserHook(blocklet.env.processId, 'post-start', ...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, postStart, preUninstall, preStop, preConfig };
+module.exports = { preInstall, postInstall, preStart, postStart, preUninstall, preStop, preConfig };

package/lib/blocklet/manager/disk.js

@@ -560,12 +560,30 @@ class BlockletManager extends BaseBlockletManager {
           }),
       });
 
-      return this._deleteBlocklet({ did, keepData, keepLogsDir, keepConfigs }, context);
+      const doc = await this._deleteBlocklet({ did, keepData, keepLogsDir, keepConfigs }, context);
+      states.notification.create({
+        title: 'Blocklet Deleted',
+        description: `Blocklet ${doc.meta.name}@${doc.meta.version} is deleted.`,
+        entityType: 'blocklet',
+        entityId: doc.meta.did,
+        severity: 'success',
+      });
+      return doc;
     } catch (err) {
       // If we installed a corrupted blocklet accidentally, just cleanup the disk and state db
       if (err.code === 'BLOCKLET_CORRUPTED') {
         logger.info('blocklet is corrupted, will delete again', { did });
-        return this._deleteBlocklet({ did, keepData, keepLogsDir, keepConfigs }, context);
+        const doc = await this._deleteBlocklet({ did, keepData, keepLogsDir, keepConfigs }, context);
+
+        states.notification.create({
+          title: 'Blocklet Deleted',
+          description: `Blocklet ${doc.meta.name}@${doc.meta.version} is deleted.`,
+          entityType: 'blocklet',
+          entityId: doc.meta.did,
+          severity: 'success',
+        });
+
+        return doc;
       }
 
       throw err;
@@ -681,6 +699,16 @@ class BlockletManager extends BaseBlockletManager {
 
     const newBlocklet = await this.ensureBlocklet(rootDid);
     this.emit(BlockletEvents.upgraded, { blocklet: newBlocklet, context }); // trigger router refresh
+
+    states.notification.create({
+      title: 'Component Deleted',
+      description: `Component ${child.meta.name} of ${newBlocklet.meta.name} is successfully deleted.`,
+      entityType: 'blocklet',
+      entityId: newBlocklet.meta.did,
+      severity: 'success',
+      action: `/blocklets/${newBlocklet.meta.did}/components`,
+    });
+
     return newBlocklet;
   }
 
@@ -1167,7 +1195,7 @@ class BlockletManager extends BaseBlockletManager {
   // ============================================================================================
 
   /**
-   * After the dev function finished, the caller should send a BlockletEvents.deployed event to the daemon
+   * After the dev function finished, the caller should send a BlockletEvents.installed event to the daemon
    * @returns {Object} blocklet
    */
   async dev(folder, { rootDid, mountPoint } = {}) {

package/lib/event.js

@@ -163,7 +163,7 @@ module.exports = ({
   const handleBlockletEvent = async (eventName, payload) => {
     const blocklet = payload.blocklet || payload;
 
-    if ([BlockletEvents.deployed, BlockletEvents.installed].includes(eventName)) {
+    if ([BlockletEvents.installed].includes(eventName)) {
       await handleBlockletAdd(eventName, payload);
 
       try {

package/lib/util/blocklet.js

@@ -220,21 +220,17 @@ const fillBlockletConfigs = (blocklet, configs) => {
 };
 
 const ensureBlockletExpanded = async (meta, appDir) => {
-  const { main } = meta;
-
-  if (main === BLOCKLET_BUNDLE_FILE) {
-    const bundlePath = path.join(appDir, BLOCKLET_BUNDLE_FILE);
-    if (fs.existsSync(bundlePath)) {
-      try {
-        const nodeModulesPath = path.join(appDir, 'node_modules');
-        if (fs.existsSync(nodeModulesPath)) {
-          fs.removeSync(nodeModulesPath);
-        }
-        await expandBundle(bundlePath, appDir);
-        fs.removeSync(bundlePath);
-      } catch (err) {
-        throw new Error(`Failed to expand blocklet bundle: ${err.message}`);
+  const bundlePath = path.join(appDir, BLOCKLET_BUNDLE_FILE);
+  if (fs.existsSync(bundlePath)) {
+    try {
+      const nodeModulesPath = path.join(appDir, 'node_modules');
+      if (fs.existsSync(nodeModulesPath)) {
+        fs.removeSync(nodeModulesPath);
       }
+      await expandBundle(bundlePath, appDir);
+      fs.removeSync(bundlePath);
+    } catch (err) {
+      throw new Error(`Failed to expand blocklet bundle: ${err.message}`);
     }
   }
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.19",
+  "version": "1.8.21",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.19",
-    "@abtnode/certificate-manager": "1.8.19",
-    "@abtnode/constant": "1.8.19",
-    "@abtnode/cron": "1.8.19",
-    "@abtnode/db": "1.8.19",
-    "@abtnode/logger": "1.8.19",
-    "@abtnode/queue": "1.8.19",
-    "@abtnode/rbac": "1.8.19",
-    "@abtnode/router-provider": "1.8.19",
-    "@abtnode/static-server": "1.8.19",
-    "@abtnode/timemachine": "1.8.19",
-    "@abtnode/util": "1.8.19",
+    "@abtnode/auth": "1.8.21",
+    "@abtnode/certificate-manager": "1.8.21",
+    "@abtnode/constant": "1.8.21",
+    "@abtnode/cron": "1.8.21",
+    "@abtnode/db": "1.8.21",
+    "@abtnode/logger": "1.8.21",
+    "@abtnode/queue": "1.8.21",
+    "@abtnode/rbac": "1.8.21",
+    "@abtnode/router-provider": "1.8.21",
+    "@abtnode/static-server": "1.8.21",
+    "@abtnode/timemachine": "1.8.21",
+    "@abtnode/util": "1.8.21",
     "@arcblock/did": "1.17.19",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.17.19",
@@ -38,8 +38,8 @@
     "@arcblock/jwt": "^1.17.19",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.17.19",
-    "@blocklet/meta": "1.8.19",
-    "@blocklet/sdk": "1.8.19",
+    "@blocklet/meta": "1.8.21",
+    "@blocklet/sdk": "1.8.21",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.17.19",
     "@ocap/util": "1.17.19",
@@ -80,5 +80,5 @@
     "express": "^4.18.1",
     "jest": "^27.5.1"
   },
-  "gitHead": "19d3e21ad3658e79a3ec60394d6c77793af7deb3"
+  "gitHead": "f990cddd5ef18ece7ada5d7573b8e0652d74abdc"
 }