@blocklet/meta 1.16.33-beta-20241024-064549-2c1ad302 → 1.16.33-beta-20241028-005826-60afb7c4

package/lib/util-meta.js

@@ -18,7 +18,10 @@ const { BLOCKLET_STORE_API_BLOCKLET_PREFIX } = constant_1.default;
 // HACK: copy from core/state/lib/util/request.js
 const api = axios_1.default.create({
     timeout: 10 * 1000,
-    headers: { 'User-Agent': `ABTNode/${package_json_1.version}`, 'x-blocklet-server-version': package_json_1.version },
+    headers: {
+        'User-Agent': `ABTNode/${package_json_1.version}`,
+        'x-blocklet-server-version': package_json_1.version,
+    },
 });
 const validateUrl = async (url, expectedHttpResTypes = ['application/json', 'text/plain']) => {
     const parsed = new URL(url);

package/lib/util.d.ts

@@ -119,8 +119,6 @@ declare const findWebInterface: (blocklet?: BlockletState | TBlockletMeta) => an
 declare const findDockerInterface: (blocklet?: BlockletState | TBlockletMeta) => any;
 declare const findWebInterfacePort: (blocklet?: BlockletState) => any;
 declare const findServiceFromMeta: (meta?: TBlockletMeta, ServiceName?: string) => any;
-declare const getWhoCanAccess: (blocklet?: BlockletState) => any;
-declare const getComponentWhoCanAccess: (component: TComponent, app?: BlockletState) => string;
 declare const getConnectAppUrl: ({ request, baseUrl }: {
     request: Partial<Request>;
     baseUrl: string;
@@ -134,9 +132,6 @@ type ChainInfo = {
 declare const getChainInfo: (env: Record<string, string>) => ChainInfo;
 declare const getBlockletChainInfo: (blocklet?: TComponentPro) => ChainInfo;
 declare const isExternalBlocklet: (blocklet?: BlockletState) => boolean;
-declare const getRolesFromAuthConfig: (config: {
-    whoCanAccess: string;
-}) => Array<string>;
 declare const getBlockletAppIdList: (blocklet: Partial<BlockletState>) => string[];
 declare const getBlockletServices: (blocklet: Partial<BlockletState>) => Array<{
     name: string;
@@ -152,7 +147,9 @@ declare const hasResourceType: (component: ComponentState, { type, did }?: {
     type: string;
     did: string;
 }) => boolean;
-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, getWhoCanAccess, getComponentWhoCanAccess, replaceSlotToIp, getComponentId, getComponentName, getComponentBundleId, findComponent, findComponentById, findComponentV2, findComponentByIdV2, filterComponentsV2, getParentComponentName, getConnectAppUrl, getChainInfo, getBlockletChainInfo, isExternalBlocklet, isPreferenceKey, getRolesFromAuthConfig, getBlockletAppIdList, getBlockletServices, isInProgress, isBeforeInstalled, isRunning, isAccessible, isGatewayBlocklet, isPackBlocklet, hasStartEngine, hasResourceType, };
+declare const getMountPoints: (blocklet: any) => any[];
+declare const checkPublicAccess: (securityConfig: any) => boolean;
+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, isBeforeInstalled, isRunning, isAccessible, isGatewayBlocklet, isPackBlocklet, hasStartEngine, hasResourceType, getMountPoints, };
 declare const _default: {
     isFreeBlocklet: (meta: TBlockletMeta) => boolean;
     isFreeComponent: (meta: TBlockletMeta) => boolean;
@@ -194,8 +191,7 @@ declare const _default: {
     findWebInterfacePort: (blocklet?: BlockletState) => any;
     findDockerInterface: (blocklet?: BlockletState | TBlockletMeta) => any;
     findServiceFromMeta: (meta?: TBlockletMeta, ServiceName?: string) => any;
-    getWhoCanAccess: (blocklet?: BlockletState) => any;
-    getComponentWhoCanAccess: (component: TComponent, app?: BlockletState) => string;
+    checkPublicAccess: (securityConfig: any) => boolean;
     replaceSlotToIp: (url?: string, ip?: string) => string;
     getComponentId: (component?: {
         meta?: {
@@ -248,9 +244,6 @@ declare const _default: {
     getBlockletChainInfo: (blocklet?: TComponentPro) => ChainInfo;
     isExternalBlocklet: (blocklet?: BlockletState) => boolean;
     isPreferenceKey: (x: Partial<TConfig>) => Boolean;
-    getRolesFromAuthConfig: (config: {
-        whoCanAccess: string;
-    }) => Array<string>;
     getBlockletServices: (blocklet: Partial<BlockletState>) => Array<{
         name: string;
         protocol: string;
@@ -268,5 +261,6 @@ declare const _default: {
         type: string;
         did: string;
     }) => boolean;
+    getMountPoints: (blocklet: any) => any[];
 };
 export default _default;

package/lib/util.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPackBlocklet = exports.isGatewayBlocklet = exports.isAccessible = exports.isRunning = exports.isBeforeInstalled = exports.isInProgress = exports.getBlockletServices = exports.getBlockletAppIdList = exports.getRolesFromAuthConfig = 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.getComponentWhoCanAccess = exports.getWhoCanAccess = 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.hasResourceType = exports.hasStartEngine = void 0;
+exports.hasResourceType = exports.hasStartEngine = exports.isPackBlocklet = exports.isGatewayBlocklet = exports.isAccessible = exports.isRunning = exports.isBeforeInstalled = 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.getMountPoints = void 0;
 exports.getAppUrl = getAppUrl;
 /* eslint-disable no-await-in-loop */
 const get_1 = __importDefault(require("lodash/get"));
@@ -17,7 +17,7 @@ const engine_1 = require("./engine");
 Object.defineProperty(exports, "hasStartEngine", { enumerable: true, get: function () { return engine_1.hasStartEngine; } });
 Object.defineProperty(exports, "isGatewayBlocklet", { enumerable: true, get: function () { return engine_1.isGatewayBlocklet; } });
 Object.defineProperty(exports, "isPackBlocklet", { enumerable: true, get: function () { return engine_1.isPackBlocklet; } });
-const { NODE_SERVICES, SLOT_FOR_IP_DNS_SITE, WHO_CAN_ACCESS, WHO_CAN_ACCESS_PREFIX_ROLES } = constant_1.default;
+const { SLOT_FOR_IP_DNS_SITE } = constant_1.default;
 const getComponentId = (component, ancestors = []) => `${ancestors.map((x) => (x && x.meta ? x.meta.did : '')).join('/')}${ancestors.length ? '/' : ''}${component && component.meta ? component.meta.did : ''}`;
 exports.getComponentId = getComponentId;
 const getComponentName = (component, ancestors = []) => `${ancestors.map((x) => (x && x.meta ? x.meta.name : '')).join('/')}${ancestors.length ? '/' : ''}${component && component.meta ? component.meta.name : ''}`;
@@ -580,36 +580,6 @@ const findServiceFromMeta = (meta, ServiceName) => {
     return (webInterface.services || []).find((x) => names.includes(x.name));
 };
 exports.findServiceFromMeta = findServiceFromMeta;
-const getWhoCanAccess = (blocklet) => {
-    if (!blocklet) {
-        return WHO_CAN_ACCESS.ALL;
-    }
-    if ((0, get_1.default)(blocklet, 'settings.whoCanAccess')) {
-        return blocklet.settings.whoCanAccess;
-    }
-    // @ts-ignore
-    const service = findServiceFromMeta(blocklet.meta, NODE_SERVICES.AUTH);
-    if ((0, get_1.default)(service, 'config.whoCanAccess')) {
-        return service.config.whoCanAccess;
-    }
-    return WHO_CAN_ACCESS.ALL;
-};
-exports.getWhoCanAccess = getWhoCanAccess;
-const getComponentWhoCanAccess = (component, app) => {
-    const access = (component.configs || []).find((x) => x.key === constant_2.BLOCKLET_CONFIGURABLE_KEY.COMPONENT_ACCESS_WHO);
-    if (access) {
-        return access.value;
-    }
-    if (app && (0, get_1.default)(app, 'settings.whoCanAccess') && (0, get_1.default)(app, 'settings.whoCanAccess') !== WHO_CAN_ACCESS.ALL) {
-        return (0, get_1.default)(app, 'settings.whoCanAccess');
-    }
-    const service = findServiceFromMeta(component.meta, NODE_SERVICES.AUTH);
-    if ((0, get_1.default)(service, 'config.whoCanAccess')) {
-        return service.config.whoCanAccess;
-    }
-    return WHO_CAN_ACCESS.ALL;
-};
-exports.getComponentWhoCanAccess = getComponentWhoCanAccess;
 const getConnectAppUrl = ({ request, baseUrl }) => {
     const blockletDid = request.headers['x-blocklet-did'] || '';
     const blockletRealDid = request.headers['x-blocklet-real-did'] || '';
@@ -665,13 +635,6 @@ const getBlockletChainInfo = (blocklet) => {
 exports.getBlockletChainInfo = getBlockletChainInfo;
 const isExternalBlocklet = (blocklet) => !!blocklet?.controller;
 exports.isExternalBlocklet = isExternalBlocklet;
-const getRolesFromAuthConfig = (config) => {
-    if (!config.whoCanAccess.startsWith(WHO_CAN_ACCESS_PREFIX_ROLES)) {
-        return [];
-    }
-    return config.whoCanAccess.substring(WHO_CAN_ACCESS_PREFIX_ROLES.length).split(',');
-};
-exports.getRolesFromAuthConfig = getRolesFromAuthConfig;
 const getBlockletAppIdList = (blocklet) => {
     const migratedFrom = Array.isArray(blocklet.migratedFrom) ? blocklet.migratedFrom.map((x) => x.appDid) : [];
     return (0, uniq_1.default)([blocklet.appDid, blocklet.appPid, ...migratedFrom].filter(Boolean));
@@ -746,6 +709,44 @@ const hasResourceType = (component, { type, did } = { type: '', did: '' }) => {
         (component.meta.resource.bundles || []).some((y) => y.type === type && y.did === did));
 };
 exports.hasResourceType = hasResourceType;
+const getMountPoints = (blocklet) => {
+    const mountPoints = [];
+    forEachBlockletSync(blocklet, (component, { level, params: children }) => {
+        if ((0, engine_1.hasMountPoint)(component.meta) === false) {
+            return null;
+        }
+        const list = level > 1 ? children : mountPoints;
+        if (!list) {
+            return null;
+        }
+        const arr = [];
+        list.push({
+            title: component.meta?.title || '',
+            name: component.meta?.bundleName || '',
+            did: component.meta?.bundleDid || '',
+            version: component.meta?.version || '',
+            status: (0, constant_2.fromBlockletStatus)(component.status),
+            mountPoint: (0, ufo_1.joinURL)('/', component.mountPoint || ''),
+            components: arr,
+            capabilities: component.meta?.capabilities || {},
+        });
+        return arr;
+    });
+    return mountPoints;
+};
+exports.getMountPoints = getMountPoints;
+const checkPublicAccess = (securityConfig) => {
+    if (!securityConfig) {
+        return true;
+    }
+    const accessRoles = securityConfig?.accessPolicy?.roles ?? null;
+    const accessRevert = securityConfig?.accessPolicy?.revert ?? false;
+    if (accessRoles === null && accessRevert === false) {
+        return true;
+    }
+    return false;
+};
+exports.checkPublicAccess = checkPublicAccess;
 exports.default = {
     isFreeBlocklet,
     isFreeComponent,
@@ -772,8 +773,7 @@ exports.default = {
     findWebInterfacePort,
     findDockerInterface,
     findServiceFromMeta,
-    getWhoCanAccess,
-    getComponentWhoCanAccess,
+    checkPublicAccess,
     replaceSlotToIp,
     getComponentId,
     getComponentName,
@@ -789,7 +789,6 @@ exports.default = {
     getBlockletChainInfo,
     isExternalBlocklet,
     isPreferenceKey,
-    getRolesFromAuthConfig,
     getBlockletServices,
     isInProgress,
     isBeforeInstalled,
@@ -799,4 +798,5 @@ exports.default = {
     isPackBlocklet: engine_1.isPackBlocklet,
     hasStartEngine: engine_1.hasStartEngine,
     hasResourceType,
+    getMountPoints,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.33-beta-20241024-064549-2c1ad302",
+  "version": "1.16.33-beta-20241028-005826-60afb7c4",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -25,12 +25,12 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.33-beta-20241024-064549-2c1ad302",
+    "@abtnode/constant": "1.16.33-beta-20241028-005826-60afb7c4",
     "@arcblock/did": "1.18.136",
     "@arcblock/did-ext": "1.18.136",
     "@arcblock/did-util": "1.18.136",
     "@arcblock/jwt": "1.18.136",
-    "@blocklet/constant": "1.16.33-beta-20241024-064549-2c1ad302",
+    "@blocklet/constant": "1.16.33-beta-20241028-005826-60afb7c4",
     "@ocap/asset": "1.18.136",
     "@ocap/mcrypto": "1.18.136",
     "@ocap/types": "1.18.136",
@@ -59,7 +59,7 @@
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "@arcblock/eslint-config-ts": "^0.3.2",
+    "@arcblock/eslint-config-ts": "^0.3.3",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.13",
     "@types/joi": "^17.2.3",
@@ -79,5 +79,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "3b0da27501ff0c115335cbf46364c37a754fefdc"
+  "gitHead": "12b595141a023fe3c3fdb2d7083b3f11624601e8"
 }