@abtnode/core 1.17.3-beta-20251120-052956-035abea6 → 1.17.3-beta-20251123-232619-53258789

package/lib/util/blocklet.js

@@ -781,15 +781,15 @@ const startBlockletProcess = async (
       namespace: 'blocklets',
       name: processIdName,
       cwd,
-      // FIXME @linchen [] does not work, so use () here
       log_date_format: '(YYYY-MM-DD HH:mm:ss)',
       output: path.join(logsDir, 'output.log'),
       error: path.join(logsDir, 'error.log'),
-      wait_ready: process.env.NODE_ENV !== 'test',
+      // wait_ready: process.env.NODE_ENV !== 'test',
+      wait_ready: false,
       listen_timeout: 3000,
       max_memory_restart: `${maxMemoryRestart}M`,
       max_restarts: b.mode === BLOCKLET_MODES.DEVELOPMENT ? 0 : 3,
-      min_uptime: 60 * 1000,
+      min_uptime: 10_000,
       exp_backoff_restart_delay: 300,
       env: omit(
         {
@@ -1142,9 +1142,52 @@ const _checkProcessHealthy = async (
         timeout,
         doConsecutiveCheck: blocklet.mode !== BLOCKLET_MODES.DEVELOPMENT,
         waitTCP: !webInterface,
+        shouldAbort: async () => {
+          // Check if pm2 process exists and is online
+          try {
+            const info = await getProcessInfo(processId, { timeout: 3_000 });
+            const currentStatus = info.pm2_env.status;
+            if (currentStatus !== 'online') {
+              throw new Error(`pm2 process ${processId} status is ${currentStatus}, not online`);
+            }
+          } catch (err) {
+            // If process doesn't exist or has error, abort immediately
+            logger.error('pm2 process check failed in shouldAbort', { appDid, error: err, processId, name });
+            const isProcessNotExist =
+              err.message &&
+              (err.message.includes('not found') ||
+                err.message.includes('does not exist') ||
+                err.message.includes('not running'));
+            if (isProcessNotExist) {
+              throw new Error(`pm2 process ${processId} (${name}) died or does not exist: ${err.message}`);
+            }
+            throw new Error(`pm2 process ${processId} (${name}) check failed: ${err.message}`);
+          }
+        },
       });
     } catch (error) {
-      logger.error('ensure endpoint healthy failed', { appDid, port, minConsecutiveTime, timeout });
+      const isProcessDead =
+        error.message &&
+        (error.message.includes('pm2 process') ||
+          error.message.includes('died') ||
+          error.message.includes('does not exist'));
+      if (isProcessDead) {
+        logger.error('blocklet process died during health check', {
+          appDid,
+          processId,
+          name,
+          port,
+          error: error.message,
+        });
+        throw error;
+      }
+      logger.error('ensure endpoint healthy failed', {
+        appDid,
+        port,
+        minConsecutiveTime,
+        timeout,
+        error: error.message,
+      });
       throw error;
     }
   } catch (error) {

package/lib/util/docker/docker-exec-chown.js

@@ -3,6 +3,7 @@ const fs = require('fs');
 const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
 const logger = require('@abtnode/logger')('@abtnode/docker-exec-chown');
+const sleep = require('@abtnode/util/lib/sleep');
 const debianChmodDockerfile = require('./debian-chmod-dockerfile');
 const parseDockerName = require('./parse-docker-name');
 const { checkDockerHasImage } = require('./check-docker-has-image');
@@ -65,10 +66,11 @@ async function dockerExecChown({ name, dirs, code = 777, force = false }) {
     await promiseSpawn(
       `docker rm -fv ${realName} > /dev/null 2>&1 || true && docker run --rm --name ${realName} ${volumes} ${image} sh -c '${command}'`,
       {},
-      { timeout: 1000 * 120, retry: 3 }
+      { timeout: 1000 * 120, retry: 0 }
     );
   } finally {
     await promiseSpawn(`docker rm -fv ${realName} > /dev/null 2>&1 || true`, {}, { timeout: 1000 * 10, retry: 3 });
+    await sleep(500);
     await lockFile.releaseLock(realName);
   }
 

package/lib/util/docker/docker-exec.js

@@ -5,6 +5,7 @@ const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
 const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 const logger = require('@abtnode/logger')('@abtnode/docker-exec');
 
+const sleep = require('@abtnode/util/lib/sleep');
 const parseDockerOptionsFromPm2 = require('./parse-docker-options-from-pm2');
 const { checkDockerInstalled } = require('./check-docker-installed');
 
@@ -26,7 +27,7 @@ async function dockerExec({
   runScriptParams,
   nodeInfo,
   timeout = 120_000,
-  retry = 3,
+  retry = 0,
   output,
   error,
 }) {
@@ -81,10 +82,11 @@ async function dockerExec({
       { timeout, retry }
     );
   } finally {
-    await lock.releaseLock(lockKey);
     if (nodeInfo.isDockerInstalled) {
       await promiseSpawn(`docker rm -f ${options.env.dockerName} > /dev/null 2>&1 || true`, {}, { timeout: 1000 * 10 });
     }
+    await sleep(500);
+    await lock.releaseLock(lockKey);
   }
   logger.info(`dockerExec ${options.env.dockerName} cost time: ${Date.now() - startTime}ms`);
 }

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

@@ -167,7 +167,6 @@ class SlackSender extends BaseSender {
       });
       return res;
     } catch (err) {
-      console.error(err);
       logger.error('failed to push notification to slack', { api: url, error: err });
       throw err;
     }

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

@@ -1,19 +1,27 @@
 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 { ROLES, PASSPORT_STATUS, NOTIFICATION_SEND_CHANNEL } = require('@abtnode/constant');
 const BaseSender = require('../base');
 
 class WalletSender extends BaseSender {
   async send(params, data = {}) {
-    const { id, title, description, nodeInfo, node, receiver, actions, attachments, message, appInfo } = data;
+    const {
+      id,
+      title,
+      description,
+      nodeInfo,
+      node,
+      receiver,
+      actions,
+      attachments,
+      message,
+      appInfo,
+      entityType,
+      entityId,
+      source,
+      teamDid,
+    } = data;
 
     try {
-      const sender = {
-        appDid: nodeInfo.did,
-        appSk: nodeInfo.sk,
-        type: 'server',
-      };
-
       const _message = message ?? {
         id,
         title,
@@ -21,6 +29,9 @@ class WalletSender extends BaseSender {
         actions,
         attachments,
         appInfo,
+        ...(entityType ? { entityType } : {}),
+        ...(entityId ? { entityId } : {}),
+        ...(source ? { source } : {}),
       };
 
       let to = [];
@@ -48,7 +59,14 @@ class WalletSender extends BaseSender {
       if (!to.length) {
         return;
       }
-      await sendToUser(to, _message, sender, process.env.ABT_NODE_SERVICE_PORT);
+
+      // @FIXME: liushuang 感觉这里不需要创建 notification，只需要发送消息到 wallet 即可
+      await node.createNotification({
+        teamDid: teamDid || nodeInfo.did,
+        ..._message,
+        receiver: to,
+        channels: [NOTIFICATION_SEND_CHANNEL.WALLET],
+      });
     } catch (error) {
       delete error.request;
       delete error.response;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.3-beta-20251120-052956-035abea6",
+  "version": "1.17.3-beta-20251123-232619-53258789",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -17,21 +17,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.17.3-beta-20251120-052956-035abea6",
-    "@abtnode/auth": "1.17.3-beta-20251120-052956-035abea6",
-    "@abtnode/certificate-manager": "1.17.3-beta-20251120-052956-035abea6",
-    "@abtnode/constant": "1.17.3-beta-20251120-052956-035abea6",
-    "@abtnode/cron": "1.17.3-beta-20251120-052956-035abea6",
-    "@abtnode/db-cache": "1.17.3-beta-20251120-052956-035abea6",
-    "@abtnode/docker-utils": "1.17.3-beta-20251120-052956-035abea6",
-    "@abtnode/logger": "1.17.3-beta-20251120-052956-035abea6",
-    "@abtnode/models": "1.17.3-beta-20251120-052956-035abea6",
-    "@abtnode/queue": "1.17.3-beta-20251120-052956-035abea6",
-    "@abtnode/rbac": "1.17.3-beta-20251120-052956-035abea6",
-    "@abtnode/router-provider": "1.17.3-beta-20251120-052956-035abea6",
-    "@abtnode/static-server": "1.17.3-beta-20251120-052956-035abea6",
-    "@abtnode/timemachine": "1.17.3-beta-20251120-052956-035abea6",
-    "@abtnode/util": "1.17.3-beta-20251120-052956-035abea6",
+    "@abtnode/analytics": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/auth": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/certificate-manager": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/constant": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/cron": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/db-cache": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/docker-utils": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/logger": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/models": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/queue": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/rbac": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/router-provider": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/static-server": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/timemachine": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/util": "1.17.3-beta-20251123-232619-53258789",
     "@aigne/aigne-hub": "^0.10.9",
     "@arcblock/did": "^1.27.7",
     "@arcblock/did-connect-js": "^1.27.7",
@@ -43,15 +43,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.27.7",
     "@arcblock/vc": "^1.27.7",
-    "@blocklet/constant": "1.17.3-beta-20251120-052956-035abea6",
+    "@blocklet/constant": "1.17.3-beta-20251123-232619-53258789",
     "@blocklet/did-space-js": "^1.2.4",
-    "@blocklet/env": "1.17.3-beta-20251120-052956-035abea6",
+    "@blocklet/env": "1.17.3-beta-20251123-232619-53258789",
     "@blocklet/error": "^0.3.3",
-    "@blocklet/meta": "1.17.3-beta-20251120-052956-035abea6",
-    "@blocklet/resolver": "1.17.3-beta-20251120-052956-035abea6",
-    "@blocklet/sdk": "1.17.3-beta-20251120-052956-035abea6",
-    "@blocklet/server-js": "1.17.3-beta-20251120-052956-035abea6",
-    "@blocklet/store": "1.17.3-beta-20251120-052956-035abea6",
+    "@blocklet/meta": "1.17.3-beta-20251123-232619-53258789",
+    "@blocklet/resolver": "1.17.3-beta-20251123-232619-53258789",
+    "@blocklet/sdk": "1.17.3-beta-20251123-232619-53258789",
+    "@blocklet/server-js": "1.17.3-beta-20251123-232619-53258789",
+    "@blocklet/store": "1.17.3-beta-20251123-232619-53258789",
     "@blocklet/theme": "^3.2.6",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "^1.27.7",
@@ -116,5 +116,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "fe41f1c21bb8e3efcf42623e9b0d24c77563862a"
+  "gitHead": "d37497a49c982e82ba60249ed06c1b73f340b893"
 }