@blocklet/meta 1.16.16-beta-e038cde7 → 1.16.16-beta-740ea329

package/lib/schema.js

@@ -162,7 +162,7 @@ const environmentSchema = Joi.object({
     required: Joi.boolean().default(false),
     secure: Joi.boolean().default(false),
     validation: Joi.string().optional(),
-    shared: Joi.boolean().default((parent) => !parent.secure),
+    shared: Joi.boolean().default((parent) => (parent.secure ? false : undefined)),
 })
     .custom((x, helper) => {
     if (x.secure && x.default) {

package/lib/util.d.ts

@@ -84,11 +84,15 @@ declare const findComponentById: (blocklet: TComponent, componentId: string | Ar
 declare const findComponentV2: (app: TApp, isEqualFn: (component: TComponent, app: TApp) => boolean) => ComponentState;
 declare const findComponentByIdV2: (app: TApp, componentId: string | Array<string>) => ComponentState;
 declare const filterComponentsV2: (app: TApp, isEqualFn: (component: TComponent, app: TApp) => boolean) => any[];
-declare const isEnvShareable: (env?: TConfig) => boolean;
-declare const getSharedConfigObj: (component: BlockletState, ancestors?: any[]) => any;
+declare const isEnvShareableToClient: (env?: TConfig) => boolean;
+/**
+ * is env shareable between components
+ */
+declare const isEnvShareable: (env?: Partial<TConfig>) => boolean;
+declare const getSharedConfigObj: (app?: BlockletState, component?: BlockletState) => any;
 declare const isPreferenceKey: (x: Partial<TConfig>) => Boolean;
-declare const getAppMissingConfigs: (blocklet?: any) => any[];
-declare const getComponentMissingConfigs: (component?: any, ancestors?: any[]) => any[];
+declare const getAppMissingConfigs: (app?: any) => any[];
+declare const getComponentMissingConfigs: (component?: any, app?: any) => any[];
 declare const isFreeBlocklet: (meta: TBlockletMeta) => boolean;
 declare const isFreeComponent: (meta: TBlockletMeta) => boolean;
 declare const isComponentBlocklet: (meta?: TBlockletMeta) => boolean;
@@ -143,7 +147,7 @@ declare const isInProgress: (status: string | number) => boolean;
 declare const isBeforeInstalled: (status: string | number) => boolean;
 declare const isRunning: (status: string | number) => boolean;
 declare const hasStartEngine: (meta: TBlockletMeta) => boolean;
-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, isGatewayBlocklet, hasStartEngine, };
+export { isFreeBlocklet, isFreeComponent, isComponentBlocklet, forEachBlocklet, forEachBlockletSync, forEachChild, forEachChildSync, forEachComponentV2, forEachComponentV2Sync, isDeletableBlocklet, getSharedConfigObj, getAppMissingConfigs, getComponentMissingConfigs, isEnvShareableToClient, 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, isGatewayBlocklet, hasStartEngine, };
 declare const _default: {
     isFreeBlocklet: (meta: TBlockletMeta) => boolean;
     isFreeComponent: (meta: TBlockletMeta) => boolean;
@@ -170,10 +174,11 @@ declare const _default: {
     }) => Promise<unknown>;
     forEachComponentV2Sync: (blocklet: any, cb: Function) => Promise<unknown>;
     isDeletableBlocklet: (blocklet?: BlockletState) => boolean;
-    getSharedConfigObj: (component: BlockletState, ancestors?: any[]) => any;
-    getAppMissingConfigs: (blocklet?: any) => any[];
-    getComponentMissingConfigs: (component?: any, ancestors?: any[]) => any[];
-    isEnvShareable: (env?: TConfig) => boolean;
+    getSharedConfigObj: (app?: BlockletState, component?: BlockletState) => any;
+    getAppMissingConfigs: (app?: any) => any[];
+    getComponentMissingConfigs: (component?: any, app?: any) => any[];
+    isEnvShareableToClient: (env?: TConfig) => boolean;
+    isEnvShareable: (env?: Partial<TConfig>) => boolean;
     wipeSensitiveData: (blocklet?: BlockletState) => BlockletState;
     hasRunnableComponent: (blocklet: BlockletState) => boolean;
     getAppName: (blocklet: BlockletState, onlyUseMeta?: boolean) => string;

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.hasStartEngine = exports.isGatewayBlocklet = 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;
+exports.hasStartEngine = exports.isGatewayBlocklet = 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.isEnvShareableToClient = 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"));
@@ -259,40 +259,47 @@ const filterComponentsV2 = (app, isEqualFn) => {
     return list;
 };
 exports.filterComponentsV2 = filterComponentsV2;
-const isEnvShareable = (env) => {
+const isEnvShareableToClient = (env) => {
     return (!!env &&
         !!(env.key || env.name) &&
         !env.secure &&
         env.shared !== false &&
         !constant_2.BLOCKLET_CONFIGURABLE_KEY[env.key || env.name]);
 };
+exports.isEnvShareableToClient = isEnvShareableToClient;
+/**
+ * is env shareable between components
+ */
+const isEnvShareable = (env) => {
+    return (!!env && !!(env.key || env.name) && !env.secure && !!env.shared && !constant_2.BLOCKLET_CONFIGURABLE_KEY[env.key || env.name]);
+};
 exports.isEnvShareable = isEnvShareable;
-const getSharedConfigObj = (component, ancestors) => {
+const getSharedConfigObj = (app, component) => {
     const res = {};
-    if (!ancestors || !ancestors.length) {
+    if (!app || !component) {
         return res;
     }
-    for (let i = ancestors.length - 1; i >= 0; i--) {
-        const ancestor = ancestors[i];
-        if (Array.isArray(ancestor.configs)) {
-            ancestor.configs.forEach(({ key, value, secure, shared }) => {
-                if (res[key]) {
-                    return;
-                }
-                if (!value || secure !== false || shared === false || constant_2.BLOCKLET_CONFIGURABLE_KEY[key]) {
-                    return;
-                }
-                const config = (component.configs || []).find((x) => x.key === key);
-                if (config && config.value) {
-                    return;
-                }
-                res[key] = (0, get_1.default)(ancestor, `configObj.${key}`) || value;
-            });
-        }
+    if (Array.isArray(app.configs)) {
+        app.configs.forEach(({ key, value, secure }) => {
+            if (!isEnvShareable({
+                key,
+                secure,
+                // config in container is force shared to components
+                shared: true,
+            })) {
+                return;
+            }
+            const config = (component.configs || []).find((x) => x.key === key);
+            if (!config || // component does not have this config
+                isEnvShareable(config) || // component config is shareable
+                !config.value // component config is empty
+            ) {
+                res[key] = value;
+            }
+        });
     }
     // share blocklet app chain config
-    const ancestor = ancestors[0];
-    (ancestor.configs || []).forEach(({ key, value }) => {
+    (app.configs || []).forEach(({ key, value }) => {
         if (![
             constant_2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_CHAIN_HOST,
             constant_2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_CHAIN_ID,
@@ -321,14 +328,14 @@ const isConfigMissing = (item, sharedConfigObj) => {
     }
     return false;
 };
-const getAppMissingConfigs = (blocklet = {}) => {
+const getAppMissingConfigs = (app = {}) => {
     const missingConfigs = [];
-    forEachBlockletSync(blocklet, (b, { ancestors, level }) => {
-        if (level === 0 && b.meta?.group === constant_2.BlockletGroup.gateway) {
+    forEachComponentV2Sync(app, (b) => {
+        if (b.meta?.group === constant_2.BlockletGroup.gateway) {
             return;
         }
         const configs = b.configs || [];
-        const sharedConfigObj = getSharedConfigObj(b, ancestors);
+        const sharedConfigObj = getSharedConfigObj(app, b);
         configs.forEach((item) => {
             if (isConfigMissing(item, sharedConfigObj)) {
                 missingConfigs.push({ did: b.meta.did, key: item.key, description: item.description });
@@ -338,10 +345,10 @@ const getAppMissingConfigs = (blocklet = {}) => {
     return missingConfigs.filter((x) => !isPreferenceKey(x));
 };
 exports.getAppMissingConfigs = getAppMissingConfigs;
-const getComponentMissingConfigs = (component = {}, ancestors = []) => {
+const getComponentMissingConfigs = (component = {}, app = {}) => {
     const missingConfigs = [];
     const configs = component.configs || [];
-    const sharedConfigObj = getSharedConfigObj(component, ancestors);
+    const sharedConfigObj = getSharedConfigObj(app, component);
     configs.forEach((item) => {
         if (isConfigMissing(item, sharedConfigObj)) {
             missingConfigs.push({ did: component.meta.did, key: item.key, description: item.description });
@@ -689,6 +696,7 @@ exports.default = {
     getSharedConfigObj,
     getAppMissingConfigs,
     getComponentMissingConfigs,
+    isEnvShareableToClient,
     isEnvShareable,
     wipeSensitiveData,
     hasRunnableComponent,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.16-beta-e038cde7",
+  "version": "1.16.16-beta-740ea329",
   "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.16-beta-e038cde7",
-    "@abtnode/util": "1.16.16-beta-e038cde7",
+    "@abtnode/constant": "1.16.16-beta-740ea329",
+    "@abtnode/util": "1.16.16-beta-740ea329",
     "@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.16-beta-e038cde7",
+    "@blocklet/constant": "1.16.16-beta-740ea329",
     "@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": "688b1c7ae0f6652094100c101f5d218266dd86ac"
+  "gitHead": "6abb5a7319ad1093f1e2d04d76215d4a127b538d"
 }