@blocklet/meta 1.16.52-beta-20251002-030549-0f91dab2 → 1.16.52-beta-20251005-235515-42ad5caf

package/lib/blocklet.js

@@ -42,17 +42,17 @@ const getComponentsInternalInfo = (app) => {
             version: x.meta.version,
             mountPoint: x.mountPoint || '',
             status: x.status,
-            port: 0,
+            port: (0, util_1.findWebInterfacePort)(x) || 0,
             containerPort: '',
             resources: getComponentResourcesPath(x),
             resourcesV2: getComponentResourcesPathV2(x),
             group: x.meta.group,
         };
-        const webInterface = (0, util_1.findWebInterface)(x) || (0, util_1.findDockerInterface)(x);
-        if (webInterface && (x.environments || []).find((y) => y.key === webInterface.port)) {
-            component.port = x.environments.find((y) => y.key === webInterface.port).value;
-            component.containerPort = `${webInterface.containerPort || ''}`;
+        if (x.greenStatus === constant_1.BlockletStatus.running) {
+            component.status = constant_1.BlockletStatus.running;
         }
+        const webInterface = (0, util_1.findWebInterface)(x) || (0, util_1.findDockerInterface)(x);
+        component.containerPort = `${webInterface?.containerPort || ''}`;
         components.push(component);
     });
     return components;

package/lib/get-component-process-id.js

@@ -5,9 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const crypto_1 = __importDefault(require("crypto"));
 const md5 = (str) => crypto_1.default.createHash('md5').update(str).digest('hex');
 const getComponentProcessId = (component, ancestors = []) => {
+    const realName = component.meta.name;
     const name = !ancestors.length
-        ? component.meta.name
-        : `${ancestors.map((x) => encodeURIComponent(x.meta.name)).join('/')}/${encodeURIComponent(component.meta.name)}`;
+        ? realName
+        : `${ancestors.map((x) => encodeURIComponent(x.meta.name)).join('/')}/${encodeURIComponent(realName)}`;
     if (name.length < 240) {
         return name;
     }

package/lib/parse-navigation-from-blocklet.js

@@ -18,6 +18,7 @@ const unionWith_1 = __importDefault(require("lodash/unionWith"));
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const pick_1 = __importDefault(require("lodash/pick"));
 const isNil_1 = __importDefault(require("lodash/isNil"));
+const get_1 = __importDefault(require("lodash/get"));
 const omit_1 = __importDefault(require("lodash/omit"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const ufo_1 = require("ufo");
@@ -543,6 +544,7 @@ function parseNavigation(blocklet = {}, options = {}) {
             navigationMap.set((0, ufo_1.joinURL)(item.id, child.id), child);
         });
     });
+    const orgIsEnabled = (0, get_1.default)(blocklet, 'settings.org.enabled', false);
     // 移除存在 db 中的默认导航
     if (blocklet?.settings?.navigations) {
         if (!Array.isArray(blocklet.settings.navigations)) {
@@ -560,8 +562,13 @@ function parseNavigation(blocklet = {}, options = {}) {
                         item.private = target.private;
                     }
                 }
+                // 检测如果 org 处于关闭状态，但是 userCenter/orgs 菜单存在，则删除 userCenter/orgs 菜单
+                if (!orgIsEnabled && item.section === 'userCenter' && item.id === '/userCenter/orgs') {
+                    return null;
+                }
                 return item;
-            });
+            })
+                .filter(Boolean);
         }
     }
     const customNavigationList = normalizeNavigationList(cleanOldNavigationHistory(blocklet?.settings?.navigations || [])).map(normalizeI18nFields);

package/lib/util.d.ts

@@ -151,10 +151,15 @@ declare const hasResourceType: (component: ComponentState, { type, did }?: {
 declare const getMountPoints: (blocklet: any) => any[];
 declare const checkPublicAccess: (securityConfig: any) => boolean;
 declare const nanoid: (length?: number) => string;
-export { isFreeBlocklet, isFreeComponent, forEachBlocklet, forEachBlockletSync, forEachChild, forEachChildSync, forEachComponentV2, forEachComponentV2Sync, isDeletableBlocklet, getSharedConfigObj, getAppMissingConfigs, getComponentMissingConfigs, isEnvShareableToClient, isEnvShareable, wipeSensitiveData, hasRunnableComponent, getAppName, getAppName as getDisplayName, getAppDescription, fixBlockletStatus, findWebInterface, findWebInterfacePort, findDockerInterface, findServiceFromMeta, checkPublicAccess, replaceSlotToIp, getComponentId, getComponentName, getComponentBundleId, findComponent, findComponentById, findComponentV2, findComponentByIdV2, filterComponentsV2, getParentComponentName, getConnectAppUrl, getChainInfo, getBlockletChainInfo, isExternalBlocklet, isPreferenceKey, getBlockletAppIdList, getBlockletServices, isInProgress, inProgressStatuses, isBeforeInstalled, isRunning, isAccessible, isGatewayBlocklet, isPackBlocklet, hasStartEngine, hasResourceType, getMountPoints, nanoid, };
+declare function isBlockletRunning(blocklet: {
+    status: string;
+    greenStatus?: string;
+}): boolean;
+export { isFreeBlocklet, isFreeComponent, isBlockletRunning, forEachBlocklet, forEachBlockletSync, forEachChild, forEachChildSync, forEachComponentV2, forEachComponentV2Sync, isDeletableBlocklet, getSharedConfigObj, getAppMissingConfigs, getComponentMissingConfigs, isEnvShareableToClient, isEnvShareable, wipeSensitiveData, hasRunnableComponent, getAppName, getAppName as getDisplayName, getAppDescription, fixBlockletStatus, findWebInterface, findWebInterfacePort, findDockerInterface, findServiceFromMeta, checkPublicAccess, replaceSlotToIp, getComponentId, getComponentName, getComponentBundleId, findComponent, findComponentById, findComponentV2, findComponentByIdV2, filterComponentsV2, getParentComponentName, getConnectAppUrl, getChainInfo, getBlockletChainInfo, isExternalBlocklet, isPreferenceKey, getBlockletAppIdList, getBlockletServices, isInProgress, inProgressStatuses, isBeforeInstalled, isRunning, isAccessible, isGatewayBlocklet, isPackBlocklet, hasStartEngine, hasResourceType, getMountPoints, nanoid, };
 declare const _default: {
     isFreeBlocklet: (meta: TBlockletMeta) => boolean;
     isFreeComponent: (meta: TBlockletMeta) => boolean;
+    isBlockletRunning: typeof isBlockletRunning;
     forEachBlocklet: (blocklet: TComponentPro, cb: Function, { parallel, concurrencyLimit, sync, params: inputParams, _parent, _root, _level, _tasks: inputTasks, _ancestors, _limit, }?: {
         parallel?: boolean;
         concurrencyLimit?: number;

package/lib/util.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasStartEngine = exports.isPackBlocklet = exports.isGatewayBlocklet = exports.isAccessible = exports.isRunning = exports.isBeforeInstalled = exports.inProgressStatuses = exports.isInProgress = exports.getBlockletServices = exports.getBlockletAppIdList = exports.isPreferenceKey = exports.isExternalBlocklet = exports.getBlockletChainInfo = exports.getChainInfo = exports.getConnectAppUrl = exports.getParentComponentName = exports.filterComponentsV2 = exports.findComponentByIdV2 = exports.findComponentV2 = exports.findComponentById = exports.findComponent = exports.getComponentBundleId = exports.getComponentName = exports.getComponentId = exports.replaceSlotToIp = exports.checkPublicAccess = exports.findServiceFromMeta = exports.findDockerInterface = exports.findWebInterfacePort = exports.findWebInterface = exports.fixBlockletStatus = exports.getAppDescription = exports.getDisplayName = exports.getAppName = exports.hasRunnableComponent = exports.wipeSensitiveData = exports.isEnvShareable = exports.isEnvShareableToClient = exports.getComponentMissingConfigs = exports.getAppMissingConfigs = exports.getSharedConfigObj = exports.isDeletableBlocklet = exports.forEachComponentV2Sync = exports.forEachComponentV2 = exports.forEachChildSync = exports.forEachChild = exports.forEachBlockletSync = exports.forEachBlocklet = exports.isFreeComponent = exports.isFreeBlocklet = void 0;
 exports.nanoid = exports.getMountPoints = exports.hasResourceType = void 0;
 exports.getAppUrl = getAppUrl;
+exports.isBlockletRunning = isBlockletRunning;
 /* eslint-disable no-await-in-loop */
 const get_1 = __importDefault(require("lodash/get"));
 const uniq_1 = __importDefault(require("lodash/uniq"));
@@ -535,6 +536,9 @@ const fixBlockletStatus = (blocklet) => {
     }
     forEachBlockletSync(blocklet, (b) => {
         b.status = (0, constant_2.fromBlockletStatus)(b.status);
+        if (b.greenStatus !== undefined) {
+            b.greenStatus = (0, constant_2.fromBlockletStatus)(b.greenStatus);
+        }
         if (b.source !== undefined) {
             b.source = (0, constant_2.fromBlockletSource)(b.source);
         }
@@ -581,9 +585,18 @@ const findWebInterfacePort = (blocklet) => {
     if (!blocklet) {
         return null;
     }
-    const webInterface = findWebInterface(blocklet);
-    const { ports } = blocklet;
-    if (!webInterface || !ports) {
+    const webInterface = findWebInterface(blocklet) || findDockerInterface(blocklet);
+    const { ports, greenPorts } = blocklet;
+    if (!webInterface) {
+        return null;
+    }
+    if (blocklet.greenStatus === constant_2.BlockletStatus.running) {
+        if (!greenPorts) {
+            return null;
+        }
+        return greenPorts[webInterface.port];
+    }
+    if (!ports) {
         return null;
     }
     return ports[webInterface.port];
@@ -777,9 +790,16 @@ const checkPublicAccess = (securityConfig) => {
 exports.checkPublicAccess = checkPublicAccess;
 const nanoid = (length = 16) => [...Array(length)].map(() => Math.random().toString(36)[2]).join('');
 exports.nanoid = nanoid;
+function isBlockletRunning(blocklet) {
+    if (!blocklet) {
+        return false;
+    }
+    return blocklet.status === 'running' || blocklet.greenStatus === 'running';
+}
 exports.default = {
     isFreeBlocklet,
     isFreeComponent,
+    isBlockletRunning,
     forEachBlocklet,
     forEachBlockletSync,
     forEachChild,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.52-beta-20251002-030549-0f91dab2",
+  "version": "1.16.52-beta-20251005-235515-42ad5caf",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -25,14 +25,14 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.52-beta-20251002-030549-0f91dab2",
-    "@abtnode/db-cache": "1.16.52-beta-20251002-030549-0f91dab2",
-    "@abtnode/docker-utils": "1.16.52-beta-20251002-030549-0f91dab2",
+    "@abtnode/constant": "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",
     "@arcblock/did": "1.25.6",
     "@arcblock/did-ext": "1.25.6",
     "@arcblock/did-util": "1.25.6",
     "@arcblock/jwt": "1.25.6",
-    "@blocklet/constant": "1.16.52-beta-20251002-030549-0f91dab2",
+    "@blocklet/constant": "1.16.52-beta-20251005-235515-42ad5caf",
     "@ocap/asset": "1.25.6",
     "@ocap/mcrypto": "1.25.6",
     "@ocap/types": "1.25.6",
@@ -82,5 +82,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "57e57e5edc99bfbb7e4591d682f1057ec05655a8"
+  "gitHead": "7b295929a123edac2cb292c43f2edda0d3e3e6b8"
 }