@abtnode/core 1.16.52-beta-20251003-083412-fdfc4e36 → 1.16.52-beta-20251008-091027-c46c73e3

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

@@ -0,0 +1,301 @@
+/* eslint-disable no-await-in-loop */
+const logger = require('@abtnode/logger')('@abtnode/core:blocklet-manager:blue-green');
+const { BlockletStatus, BlockletGroup, BlockletEvents, BlockletInternalEvents } = require('@blocklet/constant');
+const {
+  hasRunnableComponent,
+  getDisplayName,
+  isExternalBlocklet,
+  forEachBlockletSync,
+  getComponentMissingConfigs,
+} = require('@blocklet/meta/lib/util');
+const { getBlockletEngine, hasStartEngine } = require('@blocklet/meta/lib/engine');
+const { getComponentsInternalInfo } = require('@blocklet/meta/lib/blocklet');
+const {
+  forEachBlocklet,
+  validateBlocklet,
+  validateBlockletChainInfo,
+  ensureAppPortsNotOccupied,
+  getHealthyCheckTimeout,
+  getHookArgs,
+  shouldSkipComponent,
+} = require('../../../util/blocklet');
+const { startBlockletProcess } = require('../../../util/blocklet');
+const hooks = require('../../hooks');
+const checkNeedRunDocker = require('../../../util/docker/check-need-run-docker');
+const { blueGreenGetComponentIds } = require('./blue-green-get-componentids');
+const { dockerExec } = require('../../../util/docker/docker-exec');
+const { isDockerOnlySingleInstance } = require('../../../util/docker/is-docker-only-single-instances');
+
+/**
+ * 绿（Green）环境：指一个并行的、与蓝环境几乎一模一样的环境，用来部署新的版本。新代码、新配置都会先部署到绿环境中。
+ *
+ * @param {Object} params - 启动参数
+ * @param {string} params.did - blocklet DID
+ * @param {Array<string>} params.componentDids - 组件 DID 列表
+ * @param {string} params.operator - 操作者
+ * @param {Object} context - 上下文信息
+ * @param {Object} manager - blocklet 管理器实例
+ * @param {Object} states - 状态管理器
+ * @returns {Promise<Object>} 返回启动后的 blocklet 对象
+ */
+const blueGreenStartBlocklet = async (
+  { did, componentDids, operator: _operator, ignoreErrorNotification },
+  context,
+  manager,
+  states
+) => {
+  const operator = _operator || context?.user?.did;
+  const throwOnError = true;
+  const checkHealthImmediately = true;
+  const e2eMode = false;
+
+  logger.info('start green blocklet (blue-green deployment)', {
+    did,
+    componentDids,
+    throwOnError,
+    checkHealthImmediately,
+    e2eMode,
+    operator,
+  });
+
+  // 获取并验证 blocklet
+  const blocklet1 = await manager.ensureBlocklet(did, { e2eMode });
+  did = blocklet1.meta.did; // eslint-disable-line no-param-reassign
+
+  // 验证组件需求和引擎
+  await validateBlocklet(blocklet1);
+  await validateBlockletChainInfo(blocklet1);
+
+  if (!hasRunnableComponent(blocklet1)) {
+    throw new Error('No runnable component found');
+  }
+
+  const customerDockerUseVolumeComponentIds = [];
+  const otherComponentIds = [];
+  await forEachBlockletSync(blocklet1, (b) => {
+    if (!componentDids.includes(b.meta.did)) {
+      return;
+    }
+    if (isDockerOnlySingleInstance(b.meta)) {
+      customerDockerUseVolumeComponentIds.push(b.meta.did);
+    } else {
+      otherComponentIds.push(b.meta.did);
+    }
+  });
+
+  if (customerDockerUseVolumeComponentIds.length) {
+    await manager.stop(
+      { did, componentDids: customerDockerUseVolumeComponentIds, updateStatus: false, operator },
+      context
+    );
+    await manager.start({ did, componentDids: customerDockerUseVolumeComponentIds, operator }, context);
+  }
+
+  // 分类组件 ID
+  const entryComponentIds = [];
+  const nonEntryComponentIds = [];
+  const componentDidsSet = new Set(otherComponentIds);
+
+  await forEachBlocklet(
+    blocklet1,
+    (b) => {
+      if (!componentDidsSet.has(b.meta.did)) {
+        return;
+      }
+
+      if (b.meta.group === BlockletGroup.gateway) {
+        nonEntryComponentIds.push(b.meta.did);
+        return;
+      }
+      const engine = getBlockletEngine(b.meta);
+      if (engine.interpreter === 'blocklet') {
+        nonEntryComponentIds.push(b.meta.did);
+        return;
+      }
+      if (!hasStartEngine(b.meta)) {
+        nonEntryComponentIds.push(b.meta.did);
+        return;
+      }
+      entryComponentIds.push(b.meta.did);
+    },
+    { parallel: true, concurrencyLimit: 4 }
+  );
+
+  if (nonEntryComponentIds.length) {
+    await states.blocklet.setBlockletStatus(did, BlockletStatus.running, {
+      componentDids: nonEntryComponentIds,
+      operator,
+      isGreen: true,
+    });
+  }
+
+  if (!entryComponentIds.length) {
+    await manager.emit(BlockletEvents.started, {
+      ...blocklet1,
+      componentDids: nonEntryComponentIds,
+    });
+    return;
+  }
+
+  // check required config
+  try {
+    for (const component of blocklet1.children) {
+      if (!entryComponentIds.includes(component.meta.did)) {
+        continue;
+      }
+      if (!shouldSkipComponent(component.meta.did, entryComponentIds)) {
+        const missingProps = getComponentMissingConfigs(component, blocklet1);
+        if (missingProps.length) {
+          throw new Error(
+            `Missing required configuration to start ${component.meta.title}: ${missingProps.map((x) => x.key).join(',')}`
+          );
+        }
+      }
+    }
+  } catch (error) {
+    const description = `Green environment start failed for ${getDisplayName(blocklet1)}: ${error.message}`;
+    if (!ignoreErrorNotification) {
+      manager._createNotification(did, {
+        title: 'Blue-Green Deployment: Green Start Failed',
+        description,
+        entityType: 'blocklet',
+        entityId: did,
+        severity: 'error',
+      });
+    }
+    return;
+  }
+
+  const blueGreenComponentIds = await blueGreenGetComponentIds(blocklet1, entryComponentIds);
+
+  // eslint-disable-next-line no-unreachable-loop
+  for (const item of blueGreenComponentIds) {
+    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, {
+        componentDids: item.componentDids,
+        operator,
+        isGreen: item.changeToGreen,
+      });
+      nextBlocklet.greenStatus = BlockletStatus.starting;
+      manager.emit(BlockletEvents.statusChange, doc1);
+
+      const nodeInfo = await states.node.read();
+      const nodeEnvironments = await states.node.getEnvironments();
+
+      // 钩子函数设置
+      const getHookFn =
+        (hookName) =>
+        async (b, { env }) => {
+          const hookArgs = getHookArgs(b);
+          const needRunDocker = await checkNeedRunDocker(b.meta, env, nodeInfo, isExternalBlocklet(nextBlocklet));
+          if (!b.meta.scripts?.[hookName]) {
+            return null;
+          }
+          if (needRunDocker) {
+            return dockerExec({
+              blocklet: nextBlocklet,
+              meta: b.meta,
+              script: b.meta.scripts?.[hookName],
+              hookName,
+              nodeInfo,
+              env,
+              ...hookArgs,
+            });
+          }
+          return hooks[hookName](b, {
+            appDir: b.env.appDir,
+            hooks: Object.assign(b.meta.hooks || {}, b.meta.scripts || {}),
+            env,
+            did, // root blocklet did,
+            teamManager: manager.teamManager,
+            ...hookArgs,
+          });
+        };
+
+      await startBlockletProcess(nextBlocklet, {
+        ...context,
+        preFlight: getHookFn('preFlight'),
+        preStart: getHookFn('preStart'),
+        postStart: getHookFn('postStart'),
+        nodeEnvironments,
+        nodeInfo,
+        e2eMode,
+        componentDids: item.componentDids,
+        configSynchronizer: manager.configSynchronizer,
+        isGreen: item.changeToGreen,
+      });
+
+      // 健康检查绿色环境
+      const { startTimeout, minConsecutiveTime } = getHealthyCheckTimeout(nextBlocklet, {
+        checkHealthImmediately,
+        componentDids: item.componentDids,
+      });
+
+      await manager._onCheckIfStarted(
+        {
+          did,
+          context,
+          minConsecutiveTime,
+          timeout: startTimeout,
+          componentDids: item.componentDids,
+        },
+        { throwOnError: true, isGreen: item.changeToGreen, needUpdateBlueStatus: true }
+      );
+
+      logger.info('Green environment started successfully', {
+        did,
+        componentDids: item.componentDids,
+      });
+    } catch (err) {
+      const error = Array.isArray(err) ? err[0] : err;
+      logger.error('Failed to start green environment', { error, did, title: blocklet1.meta.title });
+
+      try {
+        await manager.deleteProcess({ did, componentDids: item.componentDids, isGreen: item.changeToGreen });
+        manager.emit(BlockletEvents.statusChange, blocklet1);
+      } catch (cleanupError) {
+        logger.error('Failed to cleanup green environment', { cleanupError });
+      }
+
+      const description = `Green environment start failed for ${getDisplayName(blocklet1)}: ${error.message}`;
+      if (!ignoreErrorNotification) {
+        manager._createNotification(did, {
+          title: 'Blue-Green Deployment: Green Start Failed',
+          description,
+          entityType: 'blocklet',
+          entityId: did,
+          severity: 'error',
+        });
+      }
+
+      if (throwOnError) {
+        throw new Error(description);
+      }
+      throw error;
+    }
+  }
+
+  const nextBlocklet = await manager.getBlocklet(did);
+  const componentsInfo = getComponentsInternalInfo(nextBlocklet);
+  manager.emit(BlockletInternalEvents.componentStarted, {
+    appDid: nextBlocklet.appDid,
+    components: componentsInfo,
+  });
+
+  manager.emit(BlockletEvents.statusChange, nextBlocklet);
+};
+
+module.exports = {
+  blueGreenStartBlocklet,
+};

package/lib/blocklet/manager/helper/blue-green-update-blocklet-status.js

@@ -0,0 +1,18 @@
+const blueGreenUpdateBlockletStatus = async ({ states, did, status, blueGreenComponentIds }) => {
+  const outputBlocklet = {};
+  await Promise.all(
+    blueGreenComponentIds.map(async (item) => {
+      if (!item.componentDids.length) {
+        return;
+      }
+      const res = await states.blocklet.setBlockletStatus(did, status, {
+        componentDids: item.componentDids,
+        isGreen: item.changeToGreen,
+      });
+      Object.assign(outputBlocklet, res);
+    })
+  );
+  return outputBlocklet;
+};
+
+module.exports = { blueGreenUpdateBlockletStatus };

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

@@ -0,0 +1,191 @@
+/* eslint-disable no-await-in-loop */
+const logger = require('@abtnode/logger')('@abtnode/core:blocklet-manager:upgrade-blue-green');
+const { BlockletStatus, BlockletEvents, BlockletInternalEvents } = require('@blocklet/constant');
+const { INSTALL_ACTIONS, WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
+const { getDisplayName, hasStartEngine } = require('@blocklet/meta/lib/util');
+const { getComponentsInternalInfo } = require('@blocklet/meta/lib/blocklet');
+const { getComponentNamesWithVersion, updateBlockletFallbackLogo } = require('../../../util/blocklet');
+const { blueGreenStartBlocklet } = require('./blue-green-start-blocklet');
+
+const blueGreenUpgradeBlocklet = async (
+  { newBlocklet, oldBlocklet, componentDids, action, shouldCleanUploadFile, url },
+  context,
+  manager,
+  states
+) => {
+  const { meta, source, deployedFrom, children } = newBlocklet;
+  const { did, version, name } = meta;
+  const title = getDisplayName(newBlocklet);
+
+  for (const child of newBlocklet.children) {
+    for (const child2 of oldBlocklet.children) {
+      if (child && child2 && child.meta.did === child2.meta.did) {
+        child.status = child2.status;
+        child.greenStatus = child2.greenStatus;
+        child.ports = child2.ports;
+        child.greenPorts = child2.greenPorts;
+      }
+    }
+  }
+
+  try {
+    await states.blocklet.upgradeBlocklet({ meta, source, deployedFrom, children });
+    logger.info('updated blocklet for upgrading', { did, componentDids, source, name });
+
+    await manager._setConfigsFromMeta(did);
+
+    let blocklet = await manager.ensureBlocklet(did);
+
+    await manager._updateBlockletEnvironment(did);
+    blocklet = await manager.getBlocklet(did);
+
+    await manager._runUserHook('preInstall', blocklet, context);
+    await manager._runUserHook('postInstall', blocklet, context);
+    await manager._runUserHook('preFlight', blocklet, context);
+    await manager._runMigration({
+      parallel: false,
+      did,
+      blocklet,
+      oldBlocklet,
+      componentDids,
+    });
+
+    const runningDids = [];
+    const stoppedDids = [];
+
+    if (action === INSTALL_ACTIONS.INSTALL_COMPONENT) {
+      for (const componentDid of componentDids) {
+        const component = blocklet.children.find((x) => x.meta.did === componentDid);
+        if (!component) {
+          continue;
+        }
+        if (hasStartEngine(component.meta)) {
+          stoppedDids.push(componentDid);
+        } else {
+          runningDids.push(componentDid);
+        }
+      }
+    } else {
+      for (const componentDid of componentDids) {
+        const oldComponent = oldBlocklet.children.find((x) => x.meta.did === componentDid);
+        if (oldComponent?.status === BlockletStatus.running || oldComponent?.greenStatus === BlockletStatus.running) {
+          runningDids.push(componentDid);
+        } else {
+          stoppedDids.push(componentDid);
+        }
+      }
+    }
+
+    const initialized = !!blocklet.settings?.initialized;
+
+    if (runningDids.length) {
+      if (initialized) {
+        await blueGreenStartBlocklet(
+          { did, componentDids: runningDids, operator: context?.user?.did, ignoreErrorNotification: true },
+          context,
+          manager,
+          states
+        );
+        await states.blocklet.setInstalledAt(did);
+      } else {
+        await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, {
+          componentDids: runningDids,
+          isGreenAndBlue: true,
+        });
+      }
+    }
+
+    if (stoppedDids.length) {
+      const status = action === INSTALL_ACTIONS.INSTALL_COMPONENT ? BlockletStatus.installed : BlockletStatus.stopped;
+      await states.blocklet.setBlockletStatus(did, status, {
+        componentDids: stoppedDids,
+        isGreenAndBlue: true,
+      });
+    }
+
+    blocklet = await manager.getBlocklet(did, context);
+
+    await updateBlockletFallbackLogo(blocklet);
+
+    await manager._updateDependents(did);
+
+    manager.refreshListCache();
+
+    manager.configSynchronizer.throttledSyncAppConfig(blocklet);
+
+    try {
+      manager.emit(BlockletEvents.upgraded, { blocklet, context });
+
+      const isInstallAction = action === INSTALL_ACTIONS.INSTALL_COMPONENT;
+      const notificationEvent = isInstallAction ? BlockletEvents.componentInstalled : BlockletEvents.componentUpgraded;
+      const actionName = isInstallAction ? 'installed' : 'upgraded';
+
+      manager.emit(notificationEvent, { ...blocklet, componentDids, oldBlocklet, context });
+
+      manager._createNotification(did, {
+        title: `Component ${actionName} succeed`,
+        description: `${getComponentNamesWithVersion(
+          newBlocklet,
+          componentDids
+        )} is ${actionName} successfully for ${title}`,
+        action: `/blocklets/${did}/overview`,
+        blockletDashboardAction: `${WELLKNOWN_SERVICE_PATH_PREFIX}/admin/blocklets`,
+        entityType: 'blocklet',
+        entityId: did,
+        severity: 'success',
+      });
+
+      if (shouldCleanUploadFile && url) {
+        manager._cleanUploadFile(url);
+      }
+    } catch (error) {
+      logger.error('emit upgrade notification failed', { name, version, error });
+    }
+
+    await manager._ensureDeletedChildrenInSettings(blocklet);
+
+    if (oldBlocklet.status === BlockletStatus.running || oldBlocklet.greenStatus === BlockletStatus.running) {
+      manager.emit(
+        action === INSTALL_ACTIONS.INSTALL_COMPONENT
+          ? BlockletInternalEvents.componentInstalled
+          : BlockletInternalEvents.componentUpgraded,
+        {
+          appDid: blocklet.appDid,
+          components: getComponentsInternalInfo(blocklet).filter((c) => componentDids.includes(c.did)),
+        }
+      );
+    }
+
+    return blocklet;
+  } catch (err) {
+    logger.error('failed to upgrade blocklet', { did, version, name, error: err });
+    manager.configSynchronizer.throttledSyncAppConfig(oldBlocklet);
+    await manager._updateDependents(did);
+
+    const actionName = action === INSTALL_ACTIONS.INSTALL_COMPONENT ? 'install' : 'upgrade';
+    const notificationEvent =
+      action === INSTALL_ACTIONS.INSTALL_COMPONENT
+        ? BlockletEvents.componentInstallFailed
+        : BlockletEvents.componentUpgradeFailed;
+
+    manager.emit(notificationEvent, {
+      blocklet: { ...newBlocklet, componentDids, error: { message: err.message } },
+      context,
+    });
+
+    manager._createNotification(did, {
+      title: `Component ${actionName} failed`,
+      description: `${getComponentNamesWithVersion(newBlocklet, componentDids)} ${actionName} failed for ${title}: ${
+        err.message
+      }.`,
+      entityType: 'blocklet',
+      entityId: did,
+      severity: 'error',
+    });
+    throw err;
+  }
+};
+
+module.exports = {
+  blueGreenUpgradeBlocklet,
+};

package/lib/blocklet/manager/helper/upgrade-components.js

@@ -3,7 +3,7 @@ const cloneDeep = require('@abtnode/util/lib/deep-clone');
 
 const logger = require('@abtnode/logger')('@abtnode/core:upgrade-component');
 
-const { BlockletStatus, BlockletEvents } = require('@blocklet/constant');
+const { BlockletEvents } = require('@blocklet/constant');
 const { INSTALL_ACTIONS } = require('@abtnode/constant');
 const { parseOptionalComponents } = require('@blocklet/resolver');
 const {
@@ -127,17 +127,11 @@ const upgrade = async ({ updateId, componentDids, context, states, manager }) =>
     children: children.map((x) => ({ name: x.meta.name, version: x.meta.version })),
   });
 
-  // new blocklet
-  const newBlocklet = await states.blocklet.setBlockletStatus(did, BlockletStatus.waiting, { componentDids });
-
-  newBlocklet.children = children;
+  const newBlocklet = { ...oldBlocklet, children };
   await validateBlocklet(newBlocklet);
 
-  manager.emit(BlockletEvents.statusChange, newBlocklet);
-
   const action = INSTALL_ACTIONS.UPGRADE_COMPONENT;
 
-  // backup rollback data
   await manager._rollbackCache.backup({ did, action, oldBlocklet });
 
   // add to queue
@@ -158,7 +152,6 @@ const upgrade = async ({ updateId, componentDids, context, states, manager }) =>
   ticket.on('failed', async (err) => {
     logger.error('queue failed', { entity: 'blocklet', action, did, error: err });
     await manager._rollback(action, did, oldBlocklet);
-
     manager.emit(BlockletEvents.componentUpgradeFailed, {
       blocklet: { ...oldBlocklet, componentDids, error: { message: err.message } },
       context: { ...context, createAuditLog: false },

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

@@ -730,6 +730,8 @@ module.exports = Object.freeze({
     'deleteBlockletResponseHeaderPolicy',
     'deleteBlockletAccessPolicy',
     'configVault',
+    'removeOrgMember',
+    'deleteOrg',
   ],
 
   // 如果是 multiple tenant 的情况下, 这些白名单不会验证 RBAC
@@ -860,6 +862,7 @@ module.exports = Object.freeze({
     'https://*.didspaces.com',
     'https://*.blocklet.dev',
     'https://domain.didlabs.org',
+    'https://cdn.blocklet.io',
   ],
   CSP_SYSTEM_SOURCES: [
     'https://*.did.abtnet.io',
@@ -38946,7 +38949,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":"node tools/jest.js tests/blocklet/manager/disk.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.44","@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.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"}');
 
 /***/ }),
 

package/lib/blocklet/passport/index.js

@@ -1,5 +1,6 @@
 const { EventEmitter } = require('events');
 const getRequestIP = require('@abtnode/util/lib/get-request-ip');
+const { Op } = require('sequelize');
 const logger = require('@abtnode/logger')('@abtnode/core:blocklet-passport');
 
 const Cron = require('@abtnode/cron');
@@ -72,8 +73,13 @@ class PassportAPI extends EventEmitter {
     const { page, pageSize } = validatePaging(paging);
 
     const where = query;
-    if (query.role === '$all') {
-      delete where.role;
+    if (query.role === '$all' || !query.role) {
+      // 只展示非 Org passport
+      const roles = await this.teamManager.getRoles(teamDid);
+      const queryRoles = roles.filter((x) => !x.orgId).map((x) => x.name);
+      where.role = {
+        [Op.in]: queryRoles,
+      };
     }
 
     const result = await passportState.passports(where, { issuanceDate: -1 }, { pageSize, page });

package/lib/index.js

@@ -555,6 +555,24 @@ function ABTNode(options) {
 
     createTagging: teamAPI.createTagging.bind(teamAPI),
     deleteTagging: teamAPI.deleteTagging.bind(teamAPI),
+    // Org
+    createOrg: teamAPI.createOrg.bind(teamAPI),
+    updateOrg: teamAPI.updateOrg.bind(teamAPI),
+    deleteOrg: teamAPI.deleteOrg.bind(teamAPI),
+    getOrgs: teamAPI.getOrgs.bind(teamAPI),
+    getOrg: teamAPI.getOrg.bind(teamAPI),
+    // Org Member
+    getOrgMembers: teamAPI.getOrgMembers.bind(teamAPI),
+    addOrgMember: teamAPI.addOrgMember.bind(teamAPI), // 加入的方式是通过邀请，因此不能批量添加
+    updateOrgMember: teamAPI.updateOrgMember.bind(teamAPI), // 加入的方式是通过邀请，因此不能批量添加
+    removeOrgMember: teamAPI.removeOrgMember.bind(teamAPI),
+    getOrgInvitableUsers: teamAPI.getOrgInvitableUsers.bind(teamAPI),
+    inviteMembersToOrg: teamAPI.inviteMembersToOrg.bind(teamAPI), // TODO: 批量邀请用户到组织 与 addOrgMember 可能重复
+
+    // org resource
+    getOrgResource: teamAPI.getOrgResource.bind(teamAPI),
+    addOrgResource: teamAPI.addOrgResource.bind(teamAPI),
+    migrateOrgResource: teamAPI.migrateOrgResource.bind(teamAPI),
 
     // Access Control
     getRBAC: (did = options.nodeDid) => teamManager.getRBAC(did),

package/lib/monitor/blocklet-runtime-monitor.js

@@ -11,7 +11,7 @@ const defaultLogger = require('@abtnode/logger')('blocklet-runtime-monitor');
 
 const { Op } = require('sequelize');
 const { isInstanceWorker } = require('@abtnode/util/lib/pm2/is-instence-worker');
-const { getRuntimeInfo, getDockerRuntimeInfoByDockerName } = require('../util/blocklet');
+const { getRuntimeInfo } = require('../util/blocklet');
 
 const insertThrottleMap = new Map();
 
@@ -73,9 +73,10 @@ class BlockletRuntimeMonitor extends EventEmitter {
     const {
       meta: { did: blockletDid },
       status,
+      greenStatus,
     } = blocklet;
 
-    if (status !== BlockletStatus.running) {
+    if (status !== BlockletStatus.running && greenStatus !== BlockletStatus.running) {
       if (this.data[blockletDid]) {
         Object.keys(this.data[blockletDid]).forEach((key) => {
           this.data[blockletDid][key].runtimeInfo = {};
@@ -105,14 +106,18 @@ class BlockletRuntimeMonitor extends EventEmitter {
       blocklet,
       async (component, { id: componentId, ancestors }) => {
         const { meta } = component;
-        if (!isGatewayBlocklet(meta) && hasStartEngine(meta) && component.status === BlockletStatus.running) {
-          const processId = getComponentProcessId(component, ancestors);
+        if (
+          !isGatewayBlocklet(meta) &&
+          hasStartEngine(meta) &&
+          (component.status === BlockletStatus.running || component.greenStatus === BlockletStatus.running)
+        ) {
+          const _processId = getComponentProcessId(component, ancestors);
+          const processId = component.greenStatus === BlockletStatus.running ? `${_processId}-green` : _processId;
+
           try {
             const runtimeInfo = await getRuntimeInfo(processId);
-            const dockerName = component.environments?.find((x) => x.key === 'BLOCKLET_DOCKER_NAME')?.value;
-            const dockerRuntimeInfo = dockerName ? await getDockerRuntimeInfoByDockerName(dockerName) : {};
 
-            this.data[blockletDid][componentId] = { runtimeInfo: { ...runtimeInfo, ...dockerRuntimeInfo } };
+            this.data[blockletDid][componentId] = { runtimeInfo };
 
             if (!component.mountPoint || component.mountPoint === '/') {
               this.data[blockletDid].app.runtimeInfo = cloneDeep(runtimeInfo);