@abtnode/core 1.16.52 → 1.16.53-beta-20251009-103017-c7694a7e

package/lib/api/team.js

@@ -223,7 +223,7 @@ class TeamAPI extends EventEmitter {
    *
    * @param {object} states abtnode core StateDB
    */
-  constructor({ teamManager, states, dataDirs, nodeAPI, passportAPI }) {
+  constructor({ teamManager, states, dataDirs, nodeAPI, passportAPI, passportIssueQueue }) {
     super();
 
     this.notification = states.notification;
@@ -236,6 +236,7 @@ class TeamAPI extends EventEmitter {
     this.nodeAPI = nodeAPI;
     this.passportAPI = passportAPI;
     this.throttleMap = new Map();
+    this.passportIssueQueue = passportIssueQueue;
     // 创建一个通用的节流发送函数
     this.throttledEmit = throttle(
       (eventName, payload) => {
@@ -249,6 +250,12 @@ class TeamAPI extends EventEmitter {
     this.runtimeMonitor = new BlockletRuntimeMonitor({ states });
   }
 
+  async onJob(job) {
+    if (job.entity === 'blocklet' && job.action === 'issueOrgOwnerPassport') {
+      await this.issueOrgOwnerPassport(job.params);
+    }
+  }
+
   getThrottledEmit(teamDid) {
     if (!this.throttleMap.has(teamDid)) {
       this.throttleMap.set(teamDid, this.throttledEmit);
@@ -2840,13 +2847,29 @@ class TeamAPI extends EventEmitter {
     }
   }
 
-  async createOrg({ teamDid, ...rest }, context) {
+  async issueOrgOwnerPassport({ teamDid, org }) {
+    try {
+      // 创建 org 的 owner passport, 并赋值给 owner
+      const roleName = md5(`${org.id}-owner`); // 避免 name 重复
+      await this.createRole({ teamDid, name: roleName, title: org.name, description: 'Owner', orgId: org.id });
+      await this.issuePassportToUser({
+        teamDid,
+        userDid: org.ownerDid,
+        role: roleName,
+        notification: {},
+      });
+    } catch (err) {
+      logger.error('Failed to create passport to org owner', { err, teamDid, org });
+    }
+  }
+
+  async createOrg({ teamDid, deferPassport = false, ...rest }, context) {
     try {
       // 1. 对输入进行转义
       const sanitizedOrg = {
         ...rest,
-        description: sanitizeTag(rest.description),
-        name: sanitizeTag(rest.name),
+        description: sanitizeTag(rest.description || ''),
+        name: sanitizeTag(rest.name || ''),
       };
 
       const { error } = createOrgInputSchema.validate(sanitizedOrg);
@@ -2861,7 +2884,8 @@ class TeamAPI extends EventEmitter {
         dataDirs: this.dataDirs,
         useCache: true,
       });
-      const orgCount = await state.getOrgCountByUser(context.user.did);
+      const checkedUserDid = rest.ownerDid || context.user.did || '';
+      const orgCount = await state.getOrgCountByUser(checkedUserDid);
 
       const { veriftMaxOrgPerUser } = createOrgValidators(blocklet);
 
@@ -2870,16 +2894,23 @@ class TeamAPI extends EventEmitter {
       const result = await state.create({ ...sanitizedOrg }, context);
 
       // 创建 org 的 owner passport, 并赋值给 owner
-      const roleName = md5(`${result.id}-owner`); // 避免 name 重复
-      await Promise.all([
-        this.createRole({ teamDid, name: roleName, title: result.name, description: 'Owner', orgId: result.id }),
-        this.issuePassportToUser({
-          teamDid,
-          userDid: result.ownerDid,
-          role: roleName,
-          notification: {},
-        }),
-      ]);
+      if (!deferPassport) {
+        await this.issueOrgOwnerPassport({ teamDid, org: result });
+      } else {
+        const jobId = md5(`${teamDid}-${result.id}-${checkedUserDid}`);
+        this.passportIssueQueue.push(
+          {
+            action: 'issueOrgOwnerPassport',
+            entity: 'blocklet',
+            params: {
+              teamDid,
+              org: result,
+            },
+          },
+          jobId,
+          true
+        );
+      }
 
       return result;
     } catch (err) {

package/lib/blocklet/manager/helper/blue-green-start-blocklet.js

@@ -125,7 +125,7 @@ const blueGreenStartBlocklet = async (
     await states.blocklet.setBlockletStatus(did, BlockletStatus.running, {
       componentDids: nonEntryComponentIds,
       operator,
-      isGreen: true,
+      isGreenAndBlue: true,
     });
   }
 
@@ -173,13 +173,6 @@ const blueGreenStartBlocklet = async (
     if (!item.componentDids.length) {
       continue;
     }
-    const nextBlocklet = await ensureAppPortsNotOccupied({
-      blocklet: blocklet1,
-      componentDids: item.componentDids,
-      states,
-      manager,
-      isGreen: item.changeToGreen,
-    });
 
     try {
       const doc1 = await states.blocklet.setBlockletStatus(did, BlockletStatus.starting, {
@@ -187,6 +180,15 @@ const blueGreenStartBlocklet = async (
         operator,
         isGreen: item.changeToGreen,
       });
+
+      const nextBlocklet = await ensureAppPortsNotOccupied({
+        blocklet: blocklet1,
+        componentDids: item.componentDids,
+        states,
+        manager,
+        isGreen: item.changeToGreen,
+      });
+
       nextBlocklet.greenStatus = BlockletStatus.starting;
       manager.emit(BlockletEvents.statusChange, doc1);
 
@@ -263,6 +265,13 @@ const blueGreenStartBlocklet = async (
 
       try {
         await manager.deleteProcess({ did, componentDids: item.componentDids, isGreen: item.changeToGreen });
+        // 如果需要把失败状态设置成 error:
+        // const doc1 = await states.blocklet.setBlockletStatus(did, BlockletStatus.error, {
+        //   componentDids: item.componentDids,
+        //   operator,
+        //   isGreen: item.changeToGreen,
+        // });
+        // manager.emit(BlockletEvents.statusChange, doc1);
         manager.emit(BlockletEvents.statusChange, blocklet1);
       } catch (cleanupError) {
         logger.error('Failed to cleanup green environment', { cleanupError });

package/lib/blocklet/manager/helper/blue-green-upgrade-blocklet.js

@@ -159,6 +159,7 @@ const blueGreenUpgradeBlocklet = async (
     return blocklet;
   } catch (err) {
     logger.error('failed to upgrade blocklet', { did, version, name, error: err });
+    await states.blocklet.upgradeBlocklet({ ...oldBlocklet });
     manager.configSynchronizer.throttledSyncAppConfig(oldBlocklet);
     await manager._updateDependents(did);
 

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

@@ -759,6 +759,10 @@ module.exports = Object.freeze({
     checkDomains: true,
     isDidDomain: true,
   },
+  SDK_ALLOWED_METHODS: {
+    configBlocklet: true,
+    configNavigations: true,
+  },
   // 这些接口可以跳过 ACCESS VERIFY
   SKIP_ACCESS_VERIFY_METHODS: {
     makeAllNotificationsAsRead: true,
@@ -38950,7 +38954,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.51","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","test:disk":"CI=true npm run test tests/blocklet/manager/disk.spec.js","test:blue":"CI=true npm run test tests/blocklet/manager/disk-blue-green.spec.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.51","@abtnode/auth":"1.16.51","@abtnode/certificate-manager":"1.16.51","@abtnode/constant":"1.16.51","@abtnode/cron":"1.16.51","@abtnode/db-cache":"1.16.51","@abtnode/docker-utils":"1.16.51","@abtnode/logger":"1.16.51","@abtnode/models":"1.16.51","@abtnode/queue":"1.16.51","@abtnode/rbac":"1.16.51","@abtnode/router-provider":"1.16.51","@abtnode/static-server":"1.16.51","@abtnode/timemachine":"1.16.51","@abtnode/util":"1.16.51","@aigne/aigne-hub":"^0.10.0","@arcblock/did":"1.25.6","@arcblock/did-connect-js":"1.25.6","@arcblock/did-ext":"1.25.6","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"1.25.6","@arcblock/event-hub":"1.25.6","@arcblock/jwt":"1.25.6","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.25.6","@arcblock/vc":"1.25.6","@blocklet/constant":"1.16.51","@blocklet/did-space-js":"^1.1.29","@blocklet/env":"1.16.51","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.51","@blocklet/resolver":"1.16.51","@blocklet/sdk":"1.16.51","@blocklet/server-js":"1.16.51","@blocklet/store":"1.16.51","@blocklet/theme":"^3.1.45","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.25.6","@ocap/util":"1.25.6","@ocap/wallet":"1.25.6","@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":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.52","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","test:disk":"CI=true npm run test tests/blocklet/manager/disk.spec.js","test:blue":"CI=true npm run test tests/blocklet/manager/disk-blue-green.spec.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.52","@abtnode/auth":"1.16.52","@abtnode/certificate-manager":"1.16.52","@abtnode/constant":"1.16.52","@abtnode/cron":"1.16.52","@abtnode/db-cache":"1.16.52","@abtnode/docker-utils":"1.16.52","@abtnode/logger":"1.16.52","@abtnode/models":"1.16.52","@abtnode/queue":"1.16.52","@abtnode/rbac":"1.16.52","@abtnode/router-provider":"1.16.52","@abtnode/static-server":"1.16.52","@abtnode/timemachine":"1.16.52","@abtnode/util":"1.16.52","@aigne/aigne-hub":"^0.10.0","@arcblock/did":"1.25.6","@arcblock/did-connect-js":"1.25.6","@arcblock/did-ext":"1.25.6","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"1.25.6","@arcblock/event-hub":"1.25.6","@arcblock/jwt":"1.25.6","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.25.6","@arcblock/vc":"1.25.6","@blocklet/constant":"1.16.52","@blocklet/did-space-js":"^1.1.29","@blocklet/env":"1.16.52","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.52","@blocklet/resolver":"1.16.52","@blocklet/sdk":"1.16.52","@blocklet/server-js":"1.16.52","@blocklet/store":"1.16.52","@blocklet/theme":"^3.1.45","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.25.6","@ocap/util":"1.25.6","@ocap/wallet":"1.25.6","@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":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
 
 /***/ }),
 

package/lib/index.js

@@ -222,6 +222,23 @@ function ABTNode(options) {
     },
   });
 
+  const passportIssueQueue = createQueue({
+    daemon: options.daemon,
+    model: states.job,
+    name: 'passport_issue_queue',
+    onJob: async (job) => {
+      if (typeof teamAPI.onJob === 'function') {
+        await teamAPI.onJob(job);
+      }
+    },
+    options: {
+      concurrency,
+      maxRetries: 30,
+      retryDelay: 60 * 1000, // retry after 1 minute
+      maxTimeout: 60 * 1000 * 30, // throw timeout error after 30 minutes
+    },
+  });
+
   // 3. init team manager
   const teamManager = new TeamManager({ nodeDid: options.nodeDid, dataDirs, states });
 
@@ -265,7 +282,7 @@ function ABTNode(options) {
 
   const nodeAPI = new NodeAPI(states, options.nodeDid);
   const passportAPI = new PassportAPI({ states, teamManager, nodeAPI, teamDid: options.nodeDid });
-  const teamAPI = new TeamAPI({ states, teamManager, dataDirs, nodeAPI, passportAPI });
+  const teamAPI = new TeamAPI({ states, teamManager, dataDirs, nodeAPI, passportAPI, passportIssueQueue });
 
   // 5. init blocklet manager
   const blockletManager = new BlockletManager({

package/lib/util/blocklet.js

@@ -854,11 +854,9 @@ const startBlockletProcess = async (
     }
 
     // run hook
-    try {
-      await postStart(b, { env });
-    } catch (err) {
+    postStart(b, { env }).catch((err) => {
       logger.error('blocklet post start failed', { processId: processIdName, error: err });
-    }
+    });
   };
 
   await forEachBlocklet(

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.52",
+  "version": "1.16.53-beta-20251009-103017-c7694a7e",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -21,21 +21,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.52",
-    "@abtnode/auth": "1.16.52",
-    "@abtnode/certificate-manager": "1.16.52",
-    "@abtnode/constant": "1.16.52",
-    "@abtnode/cron": "1.16.52",
-    "@abtnode/db-cache": "1.16.52",
-    "@abtnode/docker-utils": "1.16.52",
-    "@abtnode/logger": "1.16.52",
-    "@abtnode/models": "1.16.52",
-    "@abtnode/queue": "1.16.52",
-    "@abtnode/rbac": "1.16.52",
-    "@abtnode/router-provider": "1.16.52",
-    "@abtnode/static-server": "1.16.52",
-    "@abtnode/timemachine": "1.16.52",
-    "@abtnode/util": "1.16.52",
+    "@abtnode/analytics": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@abtnode/auth": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@abtnode/certificate-manager": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@abtnode/constant": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@abtnode/cron": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@abtnode/db-cache": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@abtnode/docker-utils": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@abtnode/logger": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@abtnode/models": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@abtnode/queue": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@abtnode/rbac": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@abtnode/router-provider": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@abtnode/static-server": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@abtnode/timemachine": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@abtnode/util": "1.16.53-beta-20251009-103017-c7694a7e",
     "@aigne/aigne-hub": "^0.10.0",
     "@arcblock/did": "1.25.6",
     "@arcblock/did-connect-js": "1.25.6",
@@ -47,15 +47,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.25.6",
     "@arcblock/vc": "1.25.6",
-    "@blocklet/constant": "1.16.52",
+    "@blocklet/constant": "1.16.53-beta-20251009-103017-c7694a7e",
     "@blocklet/did-space-js": "^1.1.29",
-    "@blocklet/env": "1.16.52",
+    "@blocklet/env": "1.16.53-beta-20251009-103017-c7694a7e",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.52",
-    "@blocklet/resolver": "1.16.52",
-    "@blocklet/sdk": "1.16.52",
-    "@blocklet/server-js": "1.16.52",
-    "@blocklet/store": "1.16.52",
+    "@blocklet/meta": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@blocklet/resolver": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@blocklet/sdk": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@blocklet/server-js": "1.16.53-beta-20251009-103017-c7694a7e",
+    "@blocklet/store": "1.16.53-beta-20251009-103017-c7694a7e",
     "@blocklet/theme": "^3.1.45",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.25.6",
@@ -120,5 +120,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "80c999e25b5395854cc7f8860f54b34c6b5cf1f4"
+  "gitHead": "092a23ac8eaef355ce922cf764fb0f104a99d3ad"
 }