@abtnode/core 1.16.54-beta-20251030-092518-0e109845 → 1.16.54-beta-20251031-043051-f3b56e3a

package/lib/blocklet/manager/disk.js

@@ -857,6 +857,16 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     const rest = await pAll(tasks, { concurrency: 6 });
 
+    const nextBlocklet = await this.ensureBlocklet(did, { e2eMode });
+
+    if (!['true', '1'].includes(process.env.ABT_NODE_DISABLE_BLUE_GREEN)) {
+      this.emit(BlockletEvents.blurOrGreenStarted, {
+        blocklet: nextBlocklet,
+        componentDids: inputComponentDids,
+        context,
+      });
+    }
+
     return rest[0];
   }
 
@@ -3274,17 +3284,25 @@ class DiskBlockletManager extends BaseBlockletManager {
     const blueGreenComponentIds = await blueGreenGetComponentIds(oldBlocklet || blocklet, componentDids);
 
     try {
-      await Promise.all(
-        blueGreenComponentIds.map(async (item) => {
-          if (item.componentDids.length === 0) {
-            return;
-          }
-          await states.blocklet.setBlockletStatus(did, BlockletStatus.downloading, {
-            componentDids: item.componentDids,
-            isGreen: item.changeToGreen,
-          });
-        })
-      );
+      if (process.env.ABT_NODE_DISABLE_BLUE_GREEN === 'true' || process.env.ABT_NODE_DISABLE_BLUE_GREEN === '1') {
+        await states.blocklet.setBlockletStatus(did, BlockletStatus.downloading, {
+          componentDids,
+          isGreen: false,
+        });
+      } else {
+        await Promise.all(
+          blueGreenComponentIds.map(async (item) => {
+            if (item.componentDids.length === 0) {
+              return;
+            }
+            await states.blocklet.setBlockletStatus(did, BlockletStatus.downloading, {
+              componentDids: item.componentDids,
+              isGreen: item.changeToGreen,
+            });
+          })
+        );
+      }
+
       const state = await states.blocklet.getBlocklet(did);
       this.emit(BlockletEvents.statusChange, state);
       const { isCancelled } = await this._downloadBlocklet(
@@ -3429,19 +3447,31 @@ class DiskBlockletManager extends BaseBlockletManager {
 
         try {
           if (postAction === INSTALL_ACTIONS.UPGRADE_COMPONENT) {
-            await blueGreenUpgradeBlocklet(
-              {
+            if (process.env.ABT_NODE_DISABLE_BLUE_GREEN === 'true' || process.env.ABT_NODE_DISABLE_BLUE_GREEN === '1') {
+              await this._upgradeBlocklet({
                 newBlocklet: blocklet,
                 oldBlocklet,
                 componentDids,
+                context,
                 action: postAction,
                 shouldCleanUploadFile,
                 url,
-              },
-              context,
-              this,
-              states
-            );
+              });
+            } else {
+              await blueGreenUpgradeBlocklet(
+                {
+                  newBlocklet: blocklet,
+                  oldBlocklet,
+                  componentDids,
+                  action: postAction,
+                  shouldCleanUploadFile,
+                  url,
+                },
+                context,
+                this,
+                states
+              );
+            }
           } else {
             await this._upgradeBlocklet({
               newBlocklet: blocklet,
@@ -3510,6 +3540,11 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   async _onRestart({ did, componentDids, context, operator }) {
+    if (process.env.ABT_NODE_DISABLE_BLUE_GREEN) {
+      await this.stop({ did, componentDids, context, operator });
+      await this.start({ did, componentDids, checkHealthImmediately: true });
+      return;
+    }
     await blueGreenStartBlocklet({ did, componentDids, operator }, context, this, states);
   }
 
@@ -5071,7 +5106,7 @@ class DiskBlockletManager extends BaseBlockletManager {
             blocklet,
             meta: b.meta,
             script,
-            hooksName: name,
+            hookName: name,
             nodeInfo,
             env,
             ...hookArgs,

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

@@ -293,6 +293,9 @@ const blueGreenStartBlocklet = async (
       }
       throw error;
     }
+
+    const nextBlocklet = await manager.ensureBlocklet(did, { e2eMode });
+    manager.emit(BlockletEvents.blurOrGreenStarted, { blocklet: nextBlocklet, componentDids, context });
   }
 
   const nextBlocklet = await manager.getBlocklet(did);

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

@@ -38983,7 +38983,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.53","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"bun test --bail --timeout 30000","coverage":"bun test --bail --timeout 30000 --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.53","@abtnode/auth":"1.16.53","@abtnode/certificate-manager":"1.16.53","@abtnode/constant":"1.16.53","@abtnode/cron":"1.16.53","@abtnode/db-cache":"1.16.53","@abtnode/docker-utils":"1.16.53","@abtnode/logger":"1.16.53","@abtnode/models":"1.16.53","@abtnode/queue":"1.16.53","@abtnode/rbac":"1.16.53","@abtnode/router-provider":"1.16.53","@abtnode/static-server":"1.16.53","@abtnode/timemachine":"1.16.53","@abtnode/util":"1.16.53","@aigne/aigne-hub":"^0.10.3","@arcblock/did":"^1.27.0","@arcblock/did-connect-js":"^1.27.0","@arcblock/did-ext":"^1.27.0","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.27.0","@arcblock/event-hub":"^1.27.0","@arcblock/jwt":"^1.27.0","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.27.0","@arcblock/vc":"^1.27.0","@blocklet/constant":"1.16.53","@blocklet/did-space-js":"^1.2.0","@blocklet/env":"1.16.53","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.53","@blocklet/resolver":"1.16.53","@blocklet/sdk":"1.16.53","@blocklet/server-js":"1.16.53","@blocklet/store":"1.16.53","@blocklet/theme":"^3.1.54","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.27.0","@ocap/util":"^1.27.0","@ocap/wallet":"^1.27.0","@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.16.53","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.16.53","@abtnode/auth":"1.16.53","@abtnode/certificate-manager":"1.16.53","@abtnode/constant":"1.16.53","@abtnode/cron":"1.16.53","@abtnode/db-cache":"1.16.53","@abtnode/docker-utils":"1.16.53","@abtnode/logger":"1.16.53","@abtnode/models":"1.16.53","@abtnode/queue":"1.16.53","@abtnode/rbac":"1.16.53","@abtnode/router-provider":"1.16.53","@abtnode/static-server":"1.16.53","@abtnode/timemachine":"1.16.53","@abtnode/util":"1.16.53","@aigne/aigne-hub":"^0.10.3","@arcblock/did":"^1.27.0","@arcblock/did-connect-js":"^1.27.0","@arcblock/did-ext":"^1.27.0","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.27.0","@arcblock/event-hub":"^1.27.0","@arcblock/jwt":"^1.27.0","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.27.0","@arcblock/vc":"^1.27.0","@blocklet/constant":"1.16.53","@blocklet/did-space-js":"^1.2.0","@blocklet/env":"1.16.53","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.53","@blocklet/resolver":"1.16.53","@blocklet/sdk":"1.16.53","@blocklet/server-js":"1.16.53","@blocklet/store":"1.16.53","@blocklet/theme":"^3.1.54","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.27.0","@ocap/util":"^1.27.0","@ocap/wallet":"^1.27.0","@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"}');
 
 /***/ }),
 

package/lib/event/index.js

@@ -43,6 +43,7 @@ const {
   rollbackBlockletSites,
   routingSnapshotPrefix,
 } = require('./util');
+const { ensureBlockletHasMultipleInterfaces } = require('../router/helper');
 
 /**
  *
@@ -175,6 +176,40 @@ module.exports = ({
     }
   };
 
+  const handleBlockletBlurOrGreenStarted = async (name, { blocklet, componentDids, context }) => {
+    try {
+      // 只有某些 children 有多个接口时, 才需要更新路由
+      const hasMultipleInterfaces = ensureBlockletHasMultipleInterfaces(blocklet, componentDids);
+      if (!hasMultipleInterfaces) {
+        return false;
+      }
+      const changed = await ensureBlockletRouting(blocklet, context);
+      if (changed) {
+        const hash = await takeRoutingSnapshot(
+          {
+            message: `${routingSnapshotPrefix(blocklet)}Blur or green start blocklet ${blocklet.meta.name}`,
+            dryRun: false,
+          },
+          context
+        );
+        logger.info('created.url.mapping', { event: name, did: blocklet.meta.did, hash });
+        return true;
+      }
+      return false;
+    } catch (error) {
+      logger.error('create.url.mapping.error', { event: name, error });
+      teamManager.createNotification({
+        title: 'Blocklet URL Mapping Error',
+        // eslint-disable-next-line max-len
+        description: `Failed to create URL mapping for blocklet ${blocklet.meta.title}, due to: ${error.message}`,
+        entityType: 'blocklet',
+        entityId: blocklet.meta.did,
+        severity: 'error',
+      });
+      return false;
+    }
+  };
+
   const handleBlockletInstall = async (name, { blocklet, context }) => {
     try {
       const changed = await ensureBlockletRouting(blocklet, context);
@@ -307,7 +342,9 @@ module.exports = ({
       return;
     }
 
-    if ([BlockletEvents.installed].includes(eventName)) {
+    if ([BlockletEvents.blurOrGreenStarted].includes(eventName)) {
+      await handleBlockletBlurOrGreenStarted(eventName, payload);
+    } else if ([BlockletEvents.installed].includes(eventName)) {
       await handleBlockletInstall(eventName, payload);
 
       try {
@@ -554,6 +591,7 @@ module.exports = ({
     BlockletEvents.nftConsumed,
 
     BlockletEvents.configTheme,
+    BlockletEvents.blurOrGreenStarted,
   ].forEach((eventName) => {
     listen(blockletManager, eventName, handleBlockletEvent);
   });

package/lib/router/helper.js

@@ -2083,6 +2083,16 @@ module.exports = function getRouterHelpers({
   };
 };
 
+const ensureBlockletHasMultipleInterfaces = (blocklet, componentDids) => {
+  for (const child of blocklet.children) {
+    const interfaces = (child.meta.interfaces || []).filter((x) => !!x.port);
+    if (componentDids.includes(child.meta.did) && interfaces.length > 1) {
+      return true;
+    }
+  }
+  return false;
+};
+
 module.exports.attachRuntimeDomainAliases = attachRuntimeDomainAliases;
 module.exports.ensureLatestNodeInfo = ensureLatestNodeInfo;
 module.exports.ensureLatestInterfaceInfo = ensureLatestInterfaceInfo;
@@ -2092,3 +2102,4 @@ module.exports.ensureBlockletWellknownRules = ensureBlockletWellknownRules;
 module.exports.ensureBlockletProxyBehavior = ensureBlockletProxyBehavior;
 module.exports.expandComponentRules = expandComponentRules;
 module.exports.getDomainsByDid = getDomainsByDid;
+module.exports.ensureBlockletHasMultipleInterfaces = ensureBlockletHasMultipleInterfaces;

package/lib/util/index.js

@@ -286,17 +286,19 @@ const findInterfaceByName = (blocklet, name) => {
 
 const findInterfacePortByName = (blocklet, name) => {
   const found = findInterfaceByName(blocklet, name);
-  const { ports } = blocklet;
+  const { ports, greenPorts, greenStatus } = blocklet;
 
-  if (!found || !ports) {
+  const realPorts = greenPorts && greenStatus === BlockletStatus.running ? greenPorts : ports;
+
+  if (!found || !realPorts) {
     return null;
   }
 
   if (typeof found.port === 'string') {
-    return ports[found.port];
+    return realPorts[found.port];
   }
 
-  return ports[found.port.internal];
+  return realPorts[found.port.internal];
 };
 
 const getWellknownSitePort = async () => {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.54-beta-20251030-092518-0e109845",
+  "version": "1.16.54-beta-20251031-043051-f3b56e3a",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -11,29 +11,27 @@
   ],
   "scripts": {
     "lint": "eslint tests lib --ignore-pattern 'tests/assets/*'",
-    "lint:fix": "eslint --fix tests lib",
-    "test": "bun test --bail --timeout 30000",
-    "coverage": "bun test --bail --timeout 30000 --coverage"
+    "lint:fix": "eslint --fix tests lib"
   },
   "keywords": [],
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.54-beta-20251030-092518-0e109845",
-    "@abtnode/auth": "1.16.54-beta-20251030-092518-0e109845",
-    "@abtnode/certificate-manager": "1.16.54-beta-20251030-092518-0e109845",
-    "@abtnode/constant": "1.16.54-beta-20251030-092518-0e109845",
-    "@abtnode/cron": "1.16.54-beta-20251030-092518-0e109845",
-    "@abtnode/db-cache": "1.16.54-beta-20251030-092518-0e109845",
-    "@abtnode/docker-utils": "1.16.54-beta-20251030-092518-0e109845",
-    "@abtnode/logger": "1.16.54-beta-20251030-092518-0e109845",
-    "@abtnode/models": "1.16.54-beta-20251030-092518-0e109845",
-    "@abtnode/queue": "1.16.54-beta-20251030-092518-0e109845",
-    "@abtnode/rbac": "1.16.54-beta-20251030-092518-0e109845",
-    "@abtnode/router-provider": "1.16.54-beta-20251030-092518-0e109845",
-    "@abtnode/static-server": "1.16.54-beta-20251030-092518-0e109845",
-    "@abtnode/timemachine": "1.16.54-beta-20251030-092518-0e109845",
-    "@abtnode/util": "1.16.54-beta-20251030-092518-0e109845",
+    "@abtnode/analytics": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@abtnode/auth": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@abtnode/certificate-manager": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@abtnode/constant": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@abtnode/cron": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@abtnode/db-cache": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@abtnode/docker-utils": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@abtnode/logger": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@abtnode/models": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@abtnode/queue": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@abtnode/rbac": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@abtnode/router-provider": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@abtnode/static-server": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@abtnode/timemachine": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@abtnode/util": "1.16.54-beta-20251031-043051-f3b56e3a",
     "@aigne/aigne-hub": "^0.10.3",
     "@arcblock/did": "^1.27.0",
     "@arcblock/did-connect-js": "^1.27.0",
@@ -45,15 +43,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.27.0",
     "@arcblock/vc": "^1.27.0",
-    "@blocklet/constant": "1.16.54-beta-20251030-092518-0e109845",
+    "@blocklet/constant": "1.16.54-beta-20251031-043051-f3b56e3a",
     "@blocklet/did-space-js": "^1.2.0",
-    "@blocklet/env": "1.16.54-beta-20251030-092518-0e109845",
+    "@blocklet/env": "1.16.54-beta-20251031-043051-f3b56e3a",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.54-beta-20251030-092518-0e109845",
-    "@blocklet/resolver": "1.16.54-beta-20251030-092518-0e109845",
-    "@blocklet/sdk": "1.16.54-beta-20251030-092518-0e109845",
-    "@blocklet/server-js": "1.16.54-beta-20251030-092518-0e109845",
-    "@blocklet/store": "1.16.54-beta-20251030-092518-0e109845",
+    "@blocklet/meta": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@blocklet/resolver": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@blocklet/sdk": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@blocklet/server-js": "1.16.54-beta-20251031-043051-f3b56e3a",
+    "@blocklet/store": "1.16.54-beta-20251031-043051-f3b56e3a",
     "@blocklet/theme": "^3.1.54",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "^1.27.0",
@@ -118,5 +116,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "431bc01b2abde0a41abe300cf3eef94476add035"
+  "gitHead": "3c8d3d08531c55eef3de4d9657b2452850d5bcc7"
 }