@abtnode/core 1.8.20 → 1.8.22

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

@@ -1195,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

@@ -348,12 +348,19 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
 
   const mountPoints = [];
   for (const x of root.children || []) {
-    mountPoints.push({
+    const mountPoint = {
       title: x.meta.title,
       did: x.meta.bundleDid,
       name: x.meta.bundleName,
       mountPoint: x.mountPoint || '',
-    });
+    };
+
+    const webInterface = findWebInterface(x);
+    if (webInterface && x.environmentObj[webInterface.port]) {
+      mountPoint.port = x.environmentObj[webInterface.port];
+    }
+
+    mountPoints.push(mountPoint);
   }
 
   return {

package/package.json

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