@blocklet/meta 1.16.14 → 1.16.15-beta-04d1e821

package/lib/util.d.ts

@@ -75,7 +75,7 @@ declare const findComponent: (blocklet: TComponent, isEqualFn: (component: TComp
     component: TComponent;
     ancestors: Array<TComponent>;
 };
-declare const findComponentById: (blocklet: BlockletState | ComponentState, componentId: string | Array<string>, { returnAncestors, }?: {
+declare const findComponentById: (blocklet: TComponent, componentId: string | Array<string>, { returnAncestors, }?: {
     returnAncestors?: boolean;
 }) => TComponent | {
     component: TComponent;
@@ -115,6 +115,7 @@ declare const findWebInterface: (blocklet?: BlockletState | TBlockletMeta) => an
 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;
@@ -150,7 +151,7 @@ type TComponentInternalInfo = {
     port: number;
 };
 declare const getComponentsInternalInfo: (app: TApp) => Array<TComponentInternalInfo>;
-export { isFreeBlocklet, isFreeComponent, isComponentBlocklet, forEachBlocklet, forEachBlockletSync, forEachChild, forEachChildSync, forEachComponentV2, forEachComponentV2Sync, isDeletableBlocklet, getSharedConfigObj, getAppMissingConfigs, getComponentMissingConfigs, isEnvShareable, wipeSensitiveData, hasRunnableComponent, getAppName, getAppName as getDisplayName, getAppDescription, fixBlockletStatus, findWebInterface, findWebInterfacePort, findServiceFromMeta, getWhoCanAccess, replaceSlotToIp, getComponentId, getComponentName, getComponentBundleId, findComponent, findComponentById, findComponentV2, findComponentByIdV2, filterComponentsV2, getParentComponentName, getConnectAppUrl, getChainInfo, getBlockletChainInfo, isExternalBlocklet, isPreferenceKey, getRolesFromAuthConfig, getBlockletAppIdList, getBlockletServices, isInProgress, isBeforeInstalled, isRunning, getComponentsInternalInfo, TComponentInternalInfo, isGatewayBlocklet, };
+export { isFreeBlocklet, isFreeComponent, isComponentBlocklet, forEachBlocklet, forEachBlockletSync, forEachChild, forEachChildSync, forEachComponentV2, forEachComponentV2Sync, isDeletableBlocklet, getSharedConfigObj, getAppMissingConfigs, getComponentMissingConfigs, isEnvShareable, wipeSensitiveData, hasRunnableComponent, getAppName, getAppName as getDisplayName, getAppDescription, fixBlockletStatus, findWebInterface, findWebInterfacePort, findServiceFromMeta, getWhoCanAccess, getComponentWhoCanAccess, replaceSlotToIp, getComponentId, getComponentName, getComponentBundleId, findComponent, findComponentById, findComponentV2, findComponentByIdV2, filterComponentsV2, getParentComponentName, getConnectAppUrl, getChainInfo, getBlockletChainInfo, isExternalBlocklet, isPreferenceKey, getRolesFromAuthConfig, getBlockletAppIdList, getBlockletServices, isInProgress, isBeforeInstalled, isRunning, getComponentsInternalInfo, TComponentInternalInfo, isGatewayBlocklet, };
 declare const _default: {
     isFreeBlocklet: (meta: TBlockletMeta) => boolean;
     isFreeComponent: (meta: TBlockletMeta) => boolean;
@@ -191,6 +192,7 @@ declare const _default: {
     findWebInterfacePort: (blocklet?: BlockletState) => any;
     findServiceFromMeta: (meta?: TBlockletMeta, ServiceName?: string) => any;
     getWhoCanAccess: (blocklet?: BlockletState) => any;
+    getComponentWhoCanAccess: (component: TComponent, app?: BlockletState) => string;
     replaceSlotToIp: (url?: string, ip?: string) => string;
     getComponentId: (component?: {
         meta?: {
@@ -225,7 +227,7 @@ declare const _default: {
         component: TComponent;
         ancestors: TComponent[];
     };
-    findComponentById: (blocklet: BlockletState | ComponentState, componentId: string | string[], { returnAncestors, }?: {
+    findComponentById: (blocklet: TComponent, componentId: string | string[], { returnAncestors, }?: {
         returnAncestors?: boolean;
     }) => TComponent | {
         component: TComponent;

package/lib/util.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isGatewayBlocklet = exports.getComponentsInternalInfo = 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.getWhoCanAccess = exports.findServiceFromMeta = exports.findWebInterfacePort = exports.findWebInterface = exports.fixBlockletStatus = exports.getAppDescription = exports.getDisplayName = exports.getAppName = exports.hasRunnableComponent = exports.wipeSensitiveData = exports.isEnvShareable = exports.getComponentMissingConfigs = exports.getAppMissingConfigs = exports.getSharedConfigObj = exports.isDeletableBlocklet = exports.forEachComponentV2Sync = exports.forEachComponentV2 = exports.forEachChildSync = exports.forEachChild = exports.forEachBlockletSync = exports.forEachBlocklet = exports.isComponentBlocklet = exports.isFreeComponent = exports.isFreeBlocklet = void 0;
+exports.isGatewayBlocklet = exports.getComponentsInternalInfo = 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.findWebInterfacePort = exports.findWebInterface = exports.fixBlockletStatus = exports.getAppDescription = exports.getDisplayName = exports.getAppName = exports.hasRunnableComponent = exports.wipeSensitiveData = exports.isEnvShareable = exports.getComponentMissingConfigs = exports.getAppMissingConfigs = exports.getSharedConfigObj = exports.isDeletableBlocklet = exports.forEachComponentV2Sync = exports.forEachComponentV2 = exports.forEachChildSync = exports.forEachChild = exports.forEachBlockletSync = exports.forEachBlocklet = exports.isComponentBlocklet = exports.isFreeComponent = exports.isFreeBlocklet = void 0;
 /* eslint-disable no-await-in-loop */
 const get_1 = __importDefault(require("lodash/get"));
 const uniq_1 = __importDefault(require("lodash/uniq"));
@@ -543,6 +543,21 @@ const getWhoCanAccess = (blocklet) => {
     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'] || '';
@@ -705,6 +720,7 @@ exports.default = {
     findWebInterfacePort,
     findServiceFromMeta,
     getWhoCanAccess,
+    getComponentWhoCanAccess,
     replaceSlotToIp,
     getComponentId,
     getComponentName,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.14",
+  "version": "1.16.15-beta-04d1e821",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -24,13 +24,13 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.14",
-    "@abtnode/util": "1.16.14",
+    "@abtnode/constant": "1.16.15-beta-04d1e821",
+    "@abtnode/util": "1.16.15-beta-04d1e821",
     "@arcblock/did": "1.18.89",
     "@arcblock/did-ext": "1.18.89",
     "@arcblock/did-util": "1.18.89",
     "@arcblock/jwt": "1.18.89",
-    "@blocklet/constant": "1.16.14",
+    "@blocklet/constant": "1.16.15-beta-04d1e821",
     "@ocap/asset": "1.18.89",
     "@ocap/mcrypto": "1.18.89",
     "@ocap/types": "1.18.89",
@@ -78,5 +78,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "a2f588d8d5cbe9312260ffbd8fb4cb3bd4104853"
+  "gitHead": "42e1523e5b92a3a57d9083ae29455df429afb0f6"
 }