@abtnode/core 1.16.52-beta-20251005-235515-42ad5caf → 1.16.52-beta-20251008-091027-c46c73e3

package/lib/states/blocklet.js

@@ -482,12 +482,13 @@ class BlockletState extends BaseState {
 
     await forEachComponentV2(blocklet, async (component) => {
       if (!shouldSkipComponent(component.meta.did, componentDids)) {
-        component[isGreen ? 'greenPorts' : 'ports'] = await refreshPorts(
-          component[isGreen ? 'greenPorts' : 'ports'] || component.ports,
-          {
-            blackList: [...occupiedExternalPorts.keys(), ...occupiedInternalPorts.keys()],
-          }
-        );
+        let oldPorts = component[isGreen ? 'greenPorts' : 'ports'];
+        if (!oldPorts || Object.keys(oldPorts).length === 0) {
+          oldPorts = component.ports;
+        }
+        component[isGreen ? 'greenPorts' : 'ports'] = await refreshPorts(oldPorts, {
+          blackList: [...occupiedExternalPorts.keys(), ...occupiedInternalPorts.keys()],
+        });
       }
     });
 

package/lib/states/org.js

@@ -167,21 +167,23 @@ class OrgState extends BaseState {
 
     // @FIXME: LiuShuang 这里没必要返回 owner 的信息, 可以直接通过 ownerDid 查询 owner 的信息
     const result = await this.paginate({ where, replacements }, { updatedAt: -1 }, paging);
+    const { includeMembers = true, includePassports = true } = payload.options || {};
+    if (includeMembers) {
+      // 查询每个 org 中的用户信息, 在org 列表页没必要查询全部
+      const orgMembers = await Promise.all(
+        result.list.map((org) => this.getOrgMembers({ orgId: org.id, paging: { page: 1, pageSize: 5 } }, context))
+      );
 
-    // 查询每个 org 中的用户信息, 在org 列表页没必要查询全部
-    const orgMembers = await Promise.all(
-      result.list.map((org) => this.getOrgMembers({ orgId: org.id, paging: { page: 1, pageSize: 5 } }, context))
-    );
-
-    result.list.forEach((org, index) => {
-      const itme = orgMembers[index];
-      org.members = itme.users;
-      org.membersCount = itme.paging.total;
-    });
+      result.list.forEach((org, index) => {
+        const item = orgMembers[index];
+        org.members = item.users;
+        org.membersCount = item.paging.total;
+      });
+    }
 
     // 查询用户的 passport
     let passports = [];
-    if (['joined', 'all'].includes(payload.type)) {
+    if (['joined', 'all'].includes(payload.type) && includePassports) {
       passports = await this.passport.find({
         where: { userDid: quertUserDid },
       });

package/lib/util/blocklet.js

@@ -56,7 +56,7 @@ const {
   filterRequiredComponents,
 } = require('@blocklet/resolver');
 const formatBackSlash = require('@abtnode/util/lib/format-back-slash');
-const { isPortsOccupiedByOtherProcess, killProcessOccupiedPorts } = require('@abtnode/util/lib/port');
+const { killProcessOccupiedPorts, isPortTaken } = require('@abtnode/util/lib/port');
 const { getComponentApiKey } = require('@abtnode/util/lib/blocklet');
 const { toSvg: createDidLogo } = require('@arcblock/did-motif');
 const { createBlockiesSvg } = require('@blocklet/meta/lib/blockies');
@@ -2337,56 +2337,61 @@ const shouldSkipComponent = (componentDid, whiteList) => {
   return !arr.includes(componentDid);
 };
 
-const ensureAppPortsNotOccupied = async ({
-  blocklet,
-  componentDids: inputDids,
-  states,
-  manager,
-  checkPortsFn = isPortsOccupiedByOtherProcess,
-  isGreen = false,
-}) => {
+const ensurePortsShape = (states, portsA, portsB) => {
+  if (!portsA || Object.keys(portsA).length === 0) {
+    return;
+  }
+  if (Object.keys(portsB).length === 0) {
+    for (const key of Object.keys(portsA)) {
+      portsB[key] = portsA[key];
+    }
+  }
+};
+
+const ensureAppPortsNotOccupied = async ({ blocklet, componentDids: inputDids, states, manager, isGreen = false }) => {
   const { did } = blocklet.meta;
-  const dids = new Set();
+  const occupiedDids = new Set();
+
   await forEachComponentV2(blocklet, async (b) => {
     try {
-      if (shouldSkipComponent(b.meta.did, inputDids)) {
-        return;
+      if (shouldSkipComponent(b.meta.did, inputDids)) return;
+
+      if (!b.greenPorts) {
+        b.greenPorts = {};
       }
-      const { processId } = b.env;
-      const { ports, greenPorts } = b;
+      const { ports = {}, greenPorts } = b;
+      ensurePortsShape(states, ports, greenPorts);
+
+      const targetPorts = isGreen ? greenPorts : ports;
 
-      if (
-        await checkPortsFn({
-          ports: greenPorts || ports,
-          pm2ProcessId: isGreen ? `${processId}-green` : processId,
-          printError: logger.error.bind(logger),
-        })
-      ) {
-        dids.add(b.meta.did);
+      let currentOccupied = false;
+      for (const port of Object.values(targetPorts)) {
+        currentOccupied = await isPortTaken(port);
+        if (currentOccupied) {
+          break;
+        }
       }
-      if (
-        await checkPortsFn({
-          ports,
-          pm2ProcessId: !isGreen ? `${processId}-green` : processId,
-          printError: logger.error.bind(logger),
-        })
-      ) {
-        dids.add(b.meta.did);
+
+      if (currentOccupied) {
+        occupiedDids.add(b.meta.did);
       }
     } catch (error) {
-      logger.error('Failed to check ports occupied', { error });
+      logger.error('Failed to check ports occupied', { error, blockletDid: b.meta.did, isGreen });
     }
   });
 
-  let newBlocklet = blocklet;
-  const componentDids = Array.from(dids);
-  if (componentDids.length) {
-    await states.blocklet.refreshBlockletPorts(did, componentDids, isGreen);
-    logger.info('refresh component ports', { did, componentDids });
-    await manager._updateBlockletEnvironment(did);
-    newBlocklet = await manager.ensureBlocklet(did);
+  if (occupiedDids.size === 0) {
+    logger.info('No occupied ports detected, no refresh needed');
+    return blocklet;
   }
 
+  const componentDids = Array.from(occupiedDids);
+  await states.blocklet.refreshBlockletPorts(did, componentDids, isGreen);
+  logger.info('Refreshed component ports due to conflict', { did, componentDids });
+
+  await manager._updateBlockletEnvironment(did);
+  const newBlocklet = await manager.ensureBlocklet(did);
+
   return newBlocklet;
 };
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.52-beta-20251005-235515-42ad5caf",
+  "version": "1.16.52-beta-20251008-091027-c46c73e3",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -14,27 +14,28 @@
     "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-beta-20251005-235515-42ad5caf",
-    "@abtnode/auth": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/certificate-manager": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/constant": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/cron": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/db-cache": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/docker-utils": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/logger": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/models": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/queue": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/rbac": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/router-provider": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/static-server": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/timemachine": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/util": "1.16.52-beta-20251005-235515-42ad5caf",
+    "@abtnode/analytics": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/auth": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/certificate-manager": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/constant": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/cron": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/db-cache": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/docker-utils": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/logger": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/models": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/queue": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/rbac": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/router-provider": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/static-server": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/timemachine": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/util": "1.16.52-beta-20251008-091027-c46c73e3",
     "@aigne/aigne-hub": "^0.10.0",
     "@arcblock/did": "1.25.6",
     "@arcblock/did-connect-js": "1.25.6",
@@ -46,15 +47,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.25.6",
     "@arcblock/vc": "1.25.6",
-    "@blocklet/constant": "1.16.52-beta-20251005-235515-42ad5caf",
+    "@blocklet/constant": "1.16.52-beta-20251008-091027-c46c73e3",
     "@blocklet/did-space-js": "^1.1.29",
-    "@blocklet/env": "1.16.52-beta-20251005-235515-42ad5caf",
+    "@blocklet/env": "1.16.52-beta-20251008-091027-c46c73e3",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@blocklet/resolver": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@blocklet/sdk": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@blocklet/server-js": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@blocklet/store": "1.16.52-beta-20251005-235515-42ad5caf",
+    "@blocklet/meta": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@blocklet/resolver": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@blocklet/sdk": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@blocklet/server-js": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@blocklet/store": "1.16.52-beta-20251008-091027-c46c73e3",
     "@blocklet/theme": "^3.1.45",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.25.6",
@@ -119,5 +120,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "7b295929a123edac2cb292c43f2edda0d3e3e6b8"
+  "gitHead": "2a8d239f019aece938d909a495ff1c54ad0e87a9"
 }