@abtnode/core 1.16.52-beta-20251002-030549-0f91dab2 → 1.16.52-beta-20251005-235515-42ad5caf

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);

package/lib/states/audit-log.js

@@ -10,6 +10,7 @@ const isArray = require('lodash/isArray');
 const isString = require('lodash/isString');
 const mapValues = require('lodash/mapValues');
 const map = require('lodash/map');
+const omit = require('lodash/omit');
 const { joinURL } = require('ufo');
 const { Op } = require('sequelize');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
@@ -273,13 +274,15 @@ const getLogContent = async (action, args, context, result, info, node) => {
     expandSite(args.id, info, node),
     expandUser(
       args.teamDid,
-      args.userDid || get(args, 'user.did') || args.ownerDid || args.did,
+      args.userDid || get(args, 'user.did') || args.ownerDid || args.did || context.user.did,
       args.passportId,
       info,
       node
     ),
   ]);
 
+  const prefix = process.env.NODE_ENV === 'production' ? info.routing.adminPath : '';
+
   switch (action) {
     // blocklets
     case 'installBlocklet':
@@ -684,7 +687,6 @@ const getLogContent = async (action, args, context, result, info, node) => {
     case 'followUser':
     case 'unfollowUser':
       const followerUser = await node.getUser({ teamDid: args.teamDid, user: { did: args.followerDid } });
-      const prefix = process.env.NODE_ENV === 'production' ? info.routing.adminPath : '';
       return `[${followerUser.fullName}](${joinURL(prefix, '/team/members')}) ${action === 'followUser' ? 'followed' : 'unfollowed'} user ${user}`;
 
     // connect to aigne
@@ -693,6 +695,49 @@ const getLogContent = async (action, args, context, result, info, node) => {
     case 'disconnectToAigne':
       return `Disconnect to Aigne(${args.url})`;
 
+    // org 相关
+    case 'createOrg':
+      return `${user} created an org(${args.name})`;
+    case 'deleteOrg':
+      return `${user} deleted the org(${args.id})`;
+    case 'updateOrg':
+      return `${user} updated the org(${args.org.name}): \n${Object.keys(omit(args.org, ['id']))
+        .map((x) => `- ${x}: ${args.org[x]}`)
+        .join('\n')}`;
+    case 'removeOrgMember': {
+      const [member, org, operator] = await Promise.all([
+        node.getUser({ teamDid: args.teamDid, user: { did: args.userDid } }),
+        node.getOrg({ teamDid: args.teamDid, id: args.orgId }, context),
+        node.getUser({ teamDid: args.teamDid, user: { did: context.user.did } }),
+      ]);
+      return `[${operator.fullName}](${joinURL(prefix, '/team/members')}) removed a member([${member.fullName}](${joinURL(prefix, '/team/members')})) from the org(${org.name})`;
+    }
+    case 'inviteMembersToOrg': {
+      const [operator, joinedOrg] = await Promise.all([
+        node.getUser({ teamDid: args.teamDid, user: { did: context.user.did } }),
+        node.getOrg({ teamDid: args.teamDid, id: args.orgId }, context),
+      ]);
+      if (args.inviteType === 'internal') {
+        const dids = args.userDids || [];
+        const { users } = await node.getUsers({ teamDid: args.teamDid, dids: dids.slice(0, 5) });
+        const invitedMembers = users.length < dids.length ? [...users, '...'] : users;
+        return `[${operator.fullName}](${joinURL(prefix, '/team/members')}) invited ${dids.length} ${dids.length > 1 ? 'members' : 'member'} to join the org(${joinedOrg.name}): \n${invitedMembers.map((x) => (x.fullName ? `- [${x.fullName}](${joinURL(prefix, '/team/members')})` : `- ${x}`)).join('\n')}`;
+      }
+      return `[${operator.fullName}](${joinURL(prefix, '/team/members')}) invited members to join the org(${joinedOrg.name})`;
+    }
+    case 'addOrgResource': {
+      const org = await node.getOrg({ teamDid: args.teamDid, id: args.orgId }, context);
+      const resourceIds = (args.resourceIds || []).slice(0, 5);
+      const displayResourceIds = resourceIds.length < args.resourceIds.length ? [...resourceIds, '...'] : resourceIds;
+      return `${user} added ${resourceIds.length} ${resourceIds.length > 1 ? 'resources' : 'resource'} to the org(${org.name}): \n${displayResourceIds.map((x) => `- ${x}`).join('\n')}`;
+    }
+    case 'migrateOrgResource': {
+      const org = await node.getOrg({ teamDid: args.teamDid, id: args.to }, context);
+      const resourceIds = (args.resourceIds || []).slice(0, 5);
+      const displayResourceIds = resourceIds.length < args.resourceIds.length ? [...resourceIds, '...'] : resourceIds;
+      return `${user} migrated ${resourceIds.length} ${resourceIds.length > 1 ? 'resources' : 'resource'} to the org(${org.name}): \n${displayResourceIds.map((x) => `- ${x}`).join('\n')}`;
+    }
+
     default:
       return action;
   }
@@ -797,6 +842,13 @@ const getLogCategory = (action) => {
     case 'updateUserInfo':
     case 'followUser':
     case 'unfollowUser':
+    case 'createOrg':
+    case 'updateOrg':
+    case 'deleteOrg':
+    case 'removeOrgMember':
+    case 'inviteMembersToOrg':
+    case 'addOrgResource':
+    case 'migrateOrgResource':
       return 'team';
 
     // accessKeys

package/lib/states/blocklet.js

@@ -198,7 +198,10 @@ class BlockletState extends BaseState {
 
   async getBlockletStatus(did) {
     const doc = await this.getBlocklet(did);
-    return doc ? doc.status : null;
+    if (!doc) {
+      return null;
+    }
+    return doc.status;
   }
 
   async hasBlocklet(did) {
@@ -469,7 +472,7 @@ class BlockletState extends BaseState {
   /**
    * refresh ports for blocklet if occupied during starting workflow
    */
-  async refreshBlockletPorts(did, componentDids = []) {
+  async refreshBlockletPorts(did, componentDids = [], isGreen = false) {
     const blocklet = await this.getBlocklet(did);
     if (!blocklet) {
       throw new CustomError(404, `Blocklet does not exist on refresh: ${did}`);
@@ -479,9 +482,12 @@ class BlockletState extends BaseState {
 
     await forEachComponentV2(blocklet, async (component) => {
       if (!shouldSkipComponent(component.meta.did, componentDids)) {
-        component.ports = await refreshPorts(component.ports, {
-          blackList: [...occupiedExternalPorts.keys(), ...occupiedInternalPorts.keys()],
-        });
+        component[isGreen ? 'greenPorts' : 'ports'] = await refreshPorts(
+          component[isGreen ? 'greenPorts' : 'ports'] || component.ports,
+          {
+            blackList: [...occupiedExternalPorts.keys(), ...occupiedInternalPorts.keys()],
+          }
+        );
       }
     });
 
@@ -556,7 +562,11 @@ class BlockletState extends BaseState {
    *   componentDids?: Array<Did>
    * }}
    */
-  async setBlockletStatus(did, status, { componentDids, operator = 'daemon' } = {}) {
+  async setBlockletStatus(
+    did,
+    status,
+    { componentDids, operator = 'daemon', isGreen = false, isGreenAndBlue = false } = {}
+  ) {
     logger.info('setBlockletStatus', { did, status, componentDids, operator });
     if (typeof status === 'undefined') {
       throw new Error('Unsupported blocklet status');
@@ -589,7 +599,11 @@ class BlockletState extends BaseState {
           return;
         }
 
-        component.status = status;
+        component[isGreen ? 'greenStatus' : 'status'] = status;
+        if (isGreenAndBlue) {
+          component.greenStatus = status;
+          component.status = status;
+        }
         if (status === BlockletStatus.running) {
           component.startedAt = new Date();
           component.stoppedAt = null;
@@ -602,7 +616,8 @@ class BlockletState extends BaseState {
         component.inProgressStart = Date.now();
       });
 
-      const updateData = pick(doc, ['status', 'children']);
+      const isSetStatus = status === BlockletStatus.downloading || status === BlockletStatus.waiting;
+      const updateData = isSetStatus ? pick(doc, ['status', 'children']) : pick(doc, ['children']);
       updateData.operator = operator;
 
       const res = await this.updateBlocklet(did, updateData);

package/lib/states/index.js

@@ -18,6 +18,7 @@ const BackupState = require('./backup');
 const TrafficInsightState = require('./traffic-insight');
 const RuntimeInsightState = require('./runtime-insight');
 const BlacklistState = require('./blacklist');
+const OrgState = require('./org');
 
 const { getDbFilePath } = require('../util');
 
@@ -46,6 +47,7 @@ const init = (dataDirs, config = {}) => {
   const trafficInsight = new TrafficInsightState(models.TrafficInsight, config);
   const runtimeInsight = new RuntimeInsightState(models.RuntimeInsight, { ...config, maxPageSize: 8640 });
   const blacklistState = new BlacklistState(models.Blacklist, config);
+  const orgState = new OrgState(models.Org, config, models);
 
   return {
     node: nodeState,
@@ -64,6 +66,7 @@ const init = (dataDirs, config = {}) => {
     trafficInsight,
     runtimeInsight,
     blacklist: blacklistState,
+    org: orgState,
   };
 };