@abtnode/core 1.8.17 → 1.8.20

package/lib/blocklet/hooks.js

@@ -56,7 +56,8 @@ const preStart = async (blocklet, options) => {
   return runUserHook(blocklet.env.processId, 'pre-start', options);
 };
 
+const postStart = (processId, ...args) => runUserHook(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, preUninstall, preStop, preConfig };
+module.exports = { preDeploy, preInstall, postInstall, preStart, postStart, preUninstall, preStop, preConfig };

package/lib/blocklet/manager/disk.js

@@ -385,17 +385,22 @@ class BlockletManager extends BaseBlockletManager {
         fs.mkdirSync(logsDir, { recursive: true });
       }
 
-      // start process
-      const nodeEnvironments = await states.node.getEnvironments();
-      await startBlockletProcess(blocklet, {
-        ...context,
-        preStart: (b, { env }) =>
-          hooks.preStart(b, {
+      const getHookFn =
+        (hookName) =>
+        (b, { env }) =>
+          hooks[hookName](b, {
             appDir: b.env.appDir,
             hooks: Object.assign(b.meta.hooks || {}, b.meta.scripts || {}),
             env,
             did, // root blocklet did,
-          }),
+          });
+
+      // start process
+      const nodeEnvironments = await states.node.getEnvironments();
+      await startBlockletProcess(blocklet, {
+        ...context,
+        preStart: getHookFn('preStart'),
+        postStart: getHookFn('postStart'),
         nodeEnvironments,
         nodeInfo: await states.node.read(),
         e2eMode,
@@ -555,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;
@@ -676,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;
   }
 

package/lib/util/blocklet.js

@@ -76,6 +76,7 @@ const { isBeforeInstalled, expandBundle, findInterfacePortByName, validateBlockl
 const getBlockletEngineNameByPlatform = (blockletMeta) => getBlockletEngine(blockletMeta).interpreter;
 
 const noop = () => {};
+const noopAsync = async () => {};
 
 const statusMap = {
   online: BlockletStatus.running,
@@ -86,7 +87,7 @@ const statusMap = {
 };
 
 const PRIVATE_NODE_ENVS = [
-  // 'NEDB_MULTI_PORT', // FIXME: 排查 abtnode 对外提供的 SDK(比如 @abtnode/queue), SDK 中不要自动使用 NEDB_MULTI_PORT 环境变量
+  'NEDB_MULTI_PORT',
   'ABT_NODE_UPDATER_PORT',
   'ABT_NODE_SESSION_TTL',
   'ABT_NODE_ROUTER_PROVIDER',
@@ -219,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}`);
     }
   }
 };
@@ -412,7 +409,7 @@ const getHealthyCheckTimeout = (blocklet, { checkHealthImmediately } = {}) => {
  */
 const startBlockletProcess = async (
   blocklet,
-  { preStart = noop, nodeEnvironments, nodeInfo, e2eMode, skippedProcessIds = [] } = {}
+  { preStart = noop, postStart = noopAsync, nodeEnvironments, nodeInfo, e2eMode, skippedProcessIds = [] } = {}
 ) => {
   if (!blocklet) {
     throw new Error('blocklet should not be empty');
@@ -487,8 +484,12 @@ const startBlockletProcess = async (
       if (status === BlockletStatus.error) {
         throw new Error(`${processId} is not running within 5 seconds`);
       }
-
       logger.info('blocklet started', { processId, status });
+
+      // run hook
+      postStart(b, { env }).catch((err) => {
+        logger.error('blocklet post start failed', { processId, error: err });
+      });
     },
     { parallel: true }
   );

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.17",
+  "version": "1.8.20",
   "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.17",
-    "@abtnode/certificate-manager": "1.8.17",
-    "@abtnode/constant": "1.8.17",
-    "@abtnode/cron": "1.8.17",
-    "@abtnode/db": "1.8.17",
-    "@abtnode/logger": "1.8.17",
-    "@abtnode/queue": "1.8.17",
-    "@abtnode/rbac": "1.8.17",
-    "@abtnode/router-provider": "1.8.17",
-    "@abtnode/static-server": "1.8.17",
-    "@abtnode/timemachine": "1.8.17",
-    "@abtnode/util": "1.8.17",
+    "@abtnode/auth": "1.8.20",
+    "@abtnode/certificate-manager": "1.8.20",
+    "@abtnode/constant": "1.8.20",
+    "@abtnode/cron": "1.8.20",
+    "@abtnode/db": "1.8.20",
+    "@abtnode/logger": "1.8.20",
+    "@abtnode/queue": "1.8.20",
+    "@abtnode/rbac": "1.8.20",
+    "@abtnode/router-provider": "1.8.20",
+    "@abtnode/static-server": "1.8.20",
+    "@abtnode/timemachine": "1.8.20",
+    "@abtnode/util": "1.8.20",
     "@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.17",
-    "@blocklet/sdk": "1.8.17",
+    "@blocklet/meta": "1.8.20",
+    "@blocklet/sdk": "1.8.20",
     "@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": "aa1854b3b71a6250182bfcad794235099f38a514"
+  "gitHead": "abe47e26c9583bfe5c4969e19cd36574f436a515"
 }