@abtnode/core 1.17.2-beta-20251112-085154-0103b877 → 1.17.2-beta-20251113-212234-9e640edd

package/lib/api/team.js

@@ -2412,20 +2412,35 @@ class TeamAPI extends EventEmitter {
   }
 
   async getPassportFromFederated({ site, passportId, teamDid }) {
-    const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs, useCache: true });
-    const nodeInfo = await this.node.read();
-    const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+    try {
+      const blocklet = await getBlocklet({
+        did: teamDid,
+        states: this.states,
+        dataDirs: this.dataDirs,
+        useCache: true,
+      });
+      const nodeInfo = await this.node.read();
+      const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
 
-    const result = await callFederated({
-      action: 'getPassport',
-      data: {
-        passportId,
-      },
-      permanentWallet,
-      site,
-    });
+      const result = await callFederated({
+        action: 'getPassport',
+        data: {
+          passportId,
+        },
+        permanentWallet,
+        site,
+        requestOptions: {
+          // 缩短查询通行证的请求时间，这个请求不会很复杂
+          timeout: 3 * 1000,
+        },
+      });
 
-    return result;
+      return result;
+    } catch (error) {
+      // 吞没错误，查询失败也不会影响整个快捷登录流程
+      logger.error('Failed to getPassportFromFederated', { site, passportId, teamDid, error });
+      return null;
+    }
   }
 
   /**

package/lib/blocklet/manager/disk.js

@@ -259,7 +259,13 @@ const { formatEnvironments, getBlockletMeta, validateOwner, isCLI } = util;
 
 const statusLock = new DBCache(() => ({
   prefix: 'blocklet-status-lock',
-  ttl: 1000 * 120,
+  ttl: 1000 * 60,
+  ...getAbtNodeRedisAndSQLiteUrl(),
+}));
+
+const startLock = new DBCache(() => ({
+  prefix: 'blocklet-start-lock',
+  ttl: process.env.NODE_ENV === 'test' ? 100 : 1000 * 60,
   ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
@@ -795,11 +801,11 @@ class DiskBlockletManager extends BaseBlockletManager {
     },
     context
   ) {
-    const lockName = `${did}-start-not-input-component-dids`;
+    const lockName = `start-not-input-component-dids-${did}`;
     const shouldLock = !inputComponentDids?.length;
 
     if (shouldLock) {
-      await statusLock.acquire(lockName);
+      await startLock.acquire(lockName);
     }
 
     try {
@@ -906,7 +912,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       return rest[0];
     } finally {
       if (shouldLock) {
-        await statusLock.releaseLock(lockName);
+        await startLock.releaseLock(lockName);
       }
     }
   }

package/lib/blocklet/migration-dist/migration.cjs

@@ -39024,7 +39024,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.17.1","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.17.1","@abtnode/auth":"1.17.1","@abtnode/certificate-manager":"1.17.1","@abtnode/constant":"1.17.1","@abtnode/cron":"1.17.1","@abtnode/db-cache":"1.17.1","@abtnode/docker-utils":"1.17.1","@abtnode/logger":"1.17.1","@abtnode/models":"1.17.1","@abtnode/queue":"1.17.1","@abtnode/rbac":"1.17.1","@abtnode/router-provider":"1.17.1","@abtnode/static-server":"1.17.1","@abtnode/timemachine":"1.17.1","@abtnode/util":"1.17.1","@aigne/aigne-hub":"^0.10.5","@arcblock/did":"^1.27.4","@arcblock/did-connect-js":"^1.27.4","@arcblock/did-ext":"^1.27.4","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.27.4","@arcblock/event-hub":"^1.27.4","@arcblock/jwt":"^1.27.4","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.27.4","@arcblock/vc":"^1.27.4","@blocklet/constant":"1.17.1","@blocklet/did-space-js":"^1.2.2","@blocklet/env":"1.17.1","@blocklet/error":"^0.3.2","@blocklet/meta":"1.17.1","@blocklet/resolver":"1.17.1","@blocklet/sdk":"1.17.1","@blocklet/server-js":"1.17.1","@blocklet/store":"1.17.1","@blocklet/theme":"^3.2.3","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.27.4","@ocap/util":"^1.27.4","@ocap/wallet":"^1.27.4","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","private-ip":"^2.3.4","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^11.1.0","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"axios-mock-adapter":"^2.1.0","expand-tilde":"^2.0.2","express":"^4.18.2","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.17.1","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.17.1","@abtnode/auth":"1.17.1","@abtnode/certificate-manager":"1.17.1","@abtnode/constant":"1.17.1","@abtnode/cron":"1.17.1","@abtnode/db-cache":"1.17.1","@abtnode/docker-utils":"1.17.1","@abtnode/logger":"1.17.1","@abtnode/models":"1.17.1","@abtnode/queue":"1.17.1","@abtnode/rbac":"1.17.1","@abtnode/router-provider":"1.17.1","@abtnode/static-server":"1.17.1","@abtnode/timemachine":"1.17.1","@abtnode/util":"1.17.1","@aigne/aigne-hub":"^0.10.5","@arcblock/did":"^1.27.4","@arcblock/did-connect-js":"^1.27.4","@arcblock/did-ext":"^1.27.4","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.27.4","@arcblock/event-hub":"^1.27.4","@arcblock/jwt":"^1.27.4","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.27.4","@arcblock/vc":"^1.27.4","@blocklet/constant":"1.17.1","@blocklet/did-space-js":"^1.2.2","@blocklet/env":"1.17.1","@blocklet/error":"^0.3.2","@blocklet/meta":"1.17.1","@blocklet/resolver":"1.17.1","@blocklet/sdk":"1.17.1","@blocklet/server-js":"1.17.1","@blocklet/store":"1.17.1","@blocklet/theme":"^3.2.3","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.27.4","@ocap/util":"^1.27.4","@ocap/wallet":"^1.27.4","@slack/webhook":"^7.0.6","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","private-ip":"^2.3.4","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^11.1.0","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"axios-mock-adapter":"^2.1.0","expand-tilde":"^2.0.2","express":"^4.18.2","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
 
 /***/ }),
 

package/lib/util/blocklet.js

@@ -1158,6 +1158,10 @@ const checkBlockletProcessHealthy = async (
   blocklet,
   { minConsecutiveTime, timeout, componentDids, setBlockletRunning, isGreen = false, appDid } = {}
 ) => {
+  if (process.env.NODE_ENV === 'test' && process.env.ABT_NODE_TEST_MIN_CONSECUTIVE_TIME) {
+    // eslint-disable-next-line no-param-reassign
+    timeout = Math.max(+process.env.ABT_NODE_TEST_MIN_CONSECUTIVE_TIME * 10, minConsecutiveTime + 1);
+  }
   await forEachBlocklet(
     blocklet,
     async (b) => {

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

@@ -157,7 +157,9 @@ class SlackSender extends BaseSender {
           text: 'ok',
         };
       }
-      const webhook = new IncomingWebhook(url);
+      const webhook = new IncomingWebhook(url, {
+        timeout: 60 * 1000, // 1 minutes
+      });
       const res = await webhook.send({
         blocks,
         username: sender.name,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.2-beta-20251112-085154-0103b877",
+  "version": "1.17.2-beta-20251113-212234-9e640edd",
   "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.2-beta-20251112-085154-0103b877",
-    "@abtnode/auth": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/certificate-manager": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/constant": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/cron": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/db-cache": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/docker-utils": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/logger": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/models": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/queue": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/rbac": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/router-provider": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/static-server": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/timemachine": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/util": "1.17.2-beta-20251112-085154-0103b877",
+    "@abtnode/analytics": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/auth": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/certificate-manager": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/constant": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/cron": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/db-cache": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/docker-utils": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/logger": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/models": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/queue": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/rbac": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/router-provider": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/static-server": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/timemachine": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/util": "1.17.2-beta-20251113-212234-9e640edd",
     "@aigne/aigne-hub": "^0.10.5",
     "@arcblock/did": "^1.27.4",
     "@arcblock/did-connect-js": "^1.27.4",
@@ -43,21 +43,21 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.27.4",
     "@arcblock/vc": "^1.27.4",
-    "@blocklet/constant": "1.17.2-beta-20251112-085154-0103b877",
+    "@blocklet/constant": "1.17.2-beta-20251113-212234-9e640edd",
     "@blocklet/did-space-js": "^1.2.2",
-    "@blocklet/env": "1.17.2-beta-20251112-085154-0103b877",
+    "@blocklet/env": "1.17.2-beta-20251113-212234-9e640edd",
     "@blocklet/error": "^0.3.2",
-    "@blocklet/meta": "1.17.2-beta-20251112-085154-0103b877",
-    "@blocklet/resolver": "1.17.2-beta-20251112-085154-0103b877",
-    "@blocklet/sdk": "1.17.2-beta-20251112-085154-0103b877",
-    "@blocklet/server-js": "1.17.2-beta-20251112-085154-0103b877",
-    "@blocklet/store": "1.17.2-beta-20251112-085154-0103b877",
+    "@blocklet/meta": "1.17.2-beta-20251113-212234-9e640edd",
+    "@blocklet/resolver": "1.17.2-beta-20251113-212234-9e640edd",
+    "@blocklet/sdk": "1.17.2-beta-20251113-212234-9e640edd",
+    "@blocklet/server-js": "1.17.2-beta-20251113-212234-9e640edd",
+    "@blocklet/store": "1.17.2-beta-20251113-212234-9e640edd",
     "@blocklet/theme": "^3.2.3",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "^1.27.4",
     "@ocap/util": "^1.27.4",
     "@ocap/wallet": "^1.27.4",
-    "@slack/webhook": "^5.0.4",
+    "@slack/webhook": "^7.0.6",
     "archiver": "^7.0.1",
     "axios": "^1.7.9",
     "axon": "^2.0.3",
@@ -116,5 +116,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "78509a648488c741e93d33b743ea2f6d65535c34"
+  "gitHead": "ee25481c457076c9c7aa7f094dc1771301065f5a"
 }