@blocklet/meta 1.8.68 → 1.8.69-beta-e0666d0d

package/lib/url-friendly.d.ts

@@ -1,4 +1,6 @@
+declare const isValidUrl: (name: string) => boolean;
 declare const urlFriendly: (name: string, { keepSlash }?: {
     keepSlash: boolean;
 }) => string;
+export { isValidUrl };
 export default urlFriendly;

package/lib/url-friendly.js

@@ -3,12 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidUrl = void 0;
 const toLower_1 = __importDefault(require("lodash/toLower"));
 const slugify_1 = __importDefault(require("slugify"));
+const isValidUrl = (name) => {
+    const regex = /[\s$*_+~.()'"!:@\\]+/g;
+    return !regex.test(name);
+};
+exports.isValidUrl = isValidUrl;
 const urlFriendly = (name, { keepSlash = true } = { keepSlash: true }) => {
     if (!keepSlash) {
         return (0, toLower_1.default)((0, slugify_1.default)(name.replace(/^[@./-]/, '').replace(/[@./_]/g, '-')));
     }
-    return (0, toLower_1.default)((0, slugify_1.default)(name.replace(/^[@.-]/, '').replace(/[@._]/g, '-'), { remove: /[^\w\s$*_+~.()'"!\-:@^/]+/g }));
+    return (0, toLower_1.default)((0, slugify_1.default)(name.replace(/^[@.-]/, '').replace(/[@._]/g, '-'), { remove: /[^\w\s$*_+~.()'"!:@^/]+/g }));
 };
 exports.default = urlFriendly;

package/lib/util-meta.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -22,7 +13,7 @@ const constant_1 = __importDefault(require("@abtnode/constant"));
 const did_1 = __importDefault(require("./did"));
 const validate_1 = require("./validate");
 const { BLOCKLET_STORE_API_BLOCKLET_PREFIX } = constant_1.default;
-const validateUrl = (url, expectedHttpResTypes = ['application/json', 'text/plain']) => __awaiter(void 0, void 0, void 0, function* () {
+const validateUrl = async (url, expectedHttpResTypes = ['application/json', 'text/plain']) => {
     const parsed = new URL(url);
     const { protocol } = parsed;
     // file
@@ -37,7 +28,7 @@ const validateUrl = (url, expectedHttpResTypes = ['application/json', 'text/plai
     if (protocol.startsWith('http')) {
         let res;
         try {
-            res = yield (0, axios_1.default)({ url, method: 'HEAD', timeout: 1000 * 10 });
+            res = await (0, axios_1.default)({ url, method: 'HEAD', timeout: 1000 * 10 });
         }
         catch (err) {
             throw new Error(`Cannot get content-type from ${url}: ${err.message}`);
@@ -49,36 +40,36 @@ const validateUrl = (url, expectedHttpResTypes = ['application/json', 'text/plai
         return true;
     }
     throw new Error(`Invalid url protocol: ${protocol.replace(/:$/, '')}`);
-});
+};
 exports.validateUrl = validateUrl;
 const validateBlockletMeta = (meta, opts = {}) => {
     (0, validate_1.fixAndValidateService)(meta);
     return (0, validate_1.validateMeta)(meta, opts);
 };
-const getBlockletMetaByUrl = (url) => __awaiter(void 0, void 0, void 0, function* () {
+const getBlockletMetaByUrl = async (url) => {
     const { protocol } = new URL(url);
     if (protocol.startsWith('file')) {
         const decoded = decodeURIComponent((0, url_1.fileURLToPath)(url));
         if (!fs_1.default.existsSync(decoded)) {
             throw new Error(`File does not exist: ${decoded}`);
         }
-        const d = yield fs_1.default.promises.readFile(decoded);
+        const d = await fs_1.default.promises.readFile(decoded);
         // @ts-expect-error TS(2345) FIXME: Argument of type 'Buffer' is not assignable to par... Remove this comment to see the full error message
         const meta = JSON.parse(d);
         return meta;
     }
     if (protocol.startsWith('http')) {
-        const { data: meta } = yield (0, axios_1.default)({ url, method: 'GET', timeout: 1000 * 20 });
+        const { data: meta } = await (0, axios_1.default)({ url, method: 'GET', timeout: 1000 * 20 });
         if (Object.prototype.toString.call(meta) !== '[object Object]') {
             throw new Error('Url is not valid');
         }
         return meta;
     }
     throw new Error(`Invalid url protocol: ${protocol.replace(/:$/, '')}`);
-});
+};
 exports.getBlockletMetaByUrl = getBlockletMetaByUrl;
-const getBlockletMetaFromUrl = (url, { validateFn = validateBlockletMeta, returnUrl = false, ensureTarball = true, logger, } = {}) => __awaiter(void 0, void 0, void 0, function* () {
-    const meta = yield getBlockletMetaByUrl(url);
+const getBlockletMetaFromUrl = async (url, { validateFn = validateBlockletMeta, returnUrl = false, ensureTarball = true, logger, } = {}) => {
+    const meta = await getBlockletMetaByUrl(url);
     delete meta.htmlAst;
     const newMeta = validateFn(meta, { ensureDist: true });
     if (ensureTarball) {
@@ -86,7 +77,7 @@ const getBlockletMetaFromUrl = (url, { validateFn = validateBlockletMeta, return
             const { href } = new URL(newMeta.dist.tarball, url);
             const tarball = decodeURIComponent(href);
             try {
-                yield validateUrl(tarball, ['application/octet-stream', 'application/x-gzip']);
+                await validateUrl(tarball, ['application/octet-stream', 'application/x-gzip']);
             }
             catch (error) {
                 if (!error.message.startsWith('Cannot get content-type')) {
@@ -107,11 +98,11 @@ const getBlockletMetaFromUrl = (url, { validateFn = validateBlockletMeta, return
         return { meta: newMeta, url };
     }
     return newMeta;
-});
+};
 exports.getBlockletMetaFromUrl = getBlockletMetaFromUrl;
-const getBlockletMetaFromUrls = (urls, { validateFn, returnUrl = false, ensureTarball = true, logger, } = {}) => __awaiter(void 0, void 0, void 0, function* () {
+const getBlockletMetaFromUrls = async (urls, { validateFn, returnUrl = false, ensureTarball = true, logger, } = {}) => {
     try {
-        const res = yield (0, promise_any_1.default)(urls.map((url) => getBlockletMetaFromUrl(url, { validateFn, returnUrl, ensureTarball, logger })));
+        const res = await (0, promise_any_1.default)(urls.map((url) => getBlockletMetaFromUrl(url, { validateFn, returnUrl, ensureTarball, logger })));
         return res;
     }
     catch (err) {
@@ -124,7 +115,7 @@ const getBlockletMetaFromUrls = (urls, { validateFn, returnUrl = false, ensureTa
         }
         throw new Error(message);
     }
-});
+};
 exports.getBlockletMetaFromUrls = getBlockletMetaFromUrls;
 /**
  * @param {*} config defined in componentSchema in blocklet meta schema

package/lib/util.d.ts

@@ -1,6 +1,6 @@
-import { BlockletState, ComponentState } from '@abtnode/client';
-import { Request } from 'express';
-import { TBlockletMeta, TEnvironment } from './types';
+import type { BlockletState, ComponentState } from '@abtnode/client';
+import type { Request } from 'express';
+import type { TBlockletMeta, TEnvironment } from './types';
 type TConfig = TEnvironment & {
     key: string;
 };
@@ -54,10 +54,21 @@ declare const forEachBlocklet: (blocklet: BlockletState | ComponentState, cb: Fu
 declare const forEachBlockletSync: (blocklet: any, cb: Function) => Promise<unknown>;
 declare const forEachChild: (blocklet: any, cb: Function, params?: any) => Promise<any>;
 declare const forEachChildSync: (blocklet: BlockletState, cb: Function) => Promise<any>;
-declare const findComponentById: (blocklet: BlockletState | ComponentState, componentId: string | Array<string>, { _ancestors, returnAncestors, }?: {
-    _ancestors?: any[];
+declare const findComponent: (blocklet: BlockletState | ComponentState, isEqualFn: (component: ComponentState, context: {
+    ancestors: Array<ComponentState>;
+}) => boolean, { _ancestors, returnAncestors, }?: {
+    _ancestors?: Array<ComponentState>;
+    returnAncestors?: boolean;
+}) => ComponentState | {
+    component: ComponentState;
+    ancestors: Array<ComponentState>;
+};
+declare const findComponentById: (blocklet: BlockletState | ComponentState, componentId: string | Array<string>, { returnAncestors, }?: {
     returnAncestors?: boolean;
-}) => any;
+}) => ComponentState | {
+    component: ComponentState;
+    ancestors: Array<ComponentState>;
+};
 declare const isEnvShareable: (env?: TConfig) => boolean;
 declare const getSharedConfigObj: (component: BlockletState, ancestors?: any[]) => any;
 declare const isPreferenceKey: (x: TConfig) => Boolean;
@@ -75,9 +86,17 @@ declare const hasRunnableComponent: (blocklet: BlockletState) => boolean;
  * @param {Boolean} onlyUseMeta 优先使用应用元数据的name
  * @returns blocklet display name
  */
-declare const getDisplayName: (blocklet: BlockletState, onlyUseMeta?: boolean) => string;
+declare const getAppName: (blocklet: BlockletState, onlyUseMeta?: boolean) => string;
+/**
+ * 获取 blocklet 的 description
+ * @param {Object} blocklet 应用数据
+ * @param {Boolean} onlyUseMeta 优先使用应用元数据的name
+ * @returns blocklet display description
+ */
+declare const getAppDescription: (blocklet: BlockletState, onlyUseMeta?: boolean) => string;
 declare const fixBlockletStatus: (blocklet?: BlockletState) => void;
 declare const findWebInterface: (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 getConnectAppUrl: ({ request, baseUrl }: {
@@ -90,36 +109,8 @@ declare const isExternalBlocklet: (blocklet?: BlockletState) => boolean;
 declare const getRolesFromAuthConfig: (config: {
     whoCanAccess: string;
 }) => Array<string>;
-export { isFreeBlocklet };
-export { isFreeComponent };
-export { isComponentBlocklet };
-export { forEachBlocklet };
-export { forEachBlockletSync };
-export { forEachChild };
-export { forEachChildSync };
-export { isDeletableBlocklet };
-export { getSharedConfigObj };
-export { getAppMissingConfigs };
-export { getComponentMissingConfigs };
-export { isEnvShareable };
-export { wipeSensitiveData };
-export { hasRunnableComponent };
-export { getDisplayName };
-export { fixBlockletStatus };
-export { findWebInterface };
-export { findServiceFromMeta };
-export { getWhoCanAccess };
-export { replaceSlotToIp };
-export { getComponentId };
-export { getComponentName };
-export { getComponentBundleId };
-export { findComponentById };
-export { getParentComponentName };
-export { getConnectAppUrl };
-export { getChainInfo };
-export { isExternalBlocklet };
-export { isPreferenceKey };
-export { getRolesFromAuthConfig };
+declare const getBlockletAppIdList: (blocklet: Partial<BlockletState>) => string[];
+export { isFreeBlocklet, isFreeComponent, isComponentBlocklet, forEachBlocklet, forEachBlockletSync, forEachChild, forEachChildSync, isDeletableBlocklet, getSharedConfigObj, getAppMissingConfigs, getComponentMissingConfigs, isEnvShareable, wipeSensitiveData, hasRunnableComponent, getAppName, getAppName as getDisplayName, getAppDescription, fixBlockletStatus, findWebInterface, findWebInterfacePort, findServiceFromMeta, getWhoCanAccess, replaceSlotToIp, getComponentId, getComponentName, getComponentBundleId, findComponent, findComponentById, getParentComponentName, getConnectAppUrl, getChainInfo, isExternalBlocklet, isPreferenceKey, getRolesFromAuthConfig, getBlockletAppIdList, };
 declare const _default: {
     isFreeBlocklet: (meta: TBlockletMeta) => boolean;
     isFreeComponent: (meta: TBlockletMeta) => boolean;
@@ -146,9 +137,12 @@ declare const _default: {
     isEnvShareable: (env?: TConfig) => boolean;
     wipeSensitiveData: (blocklet?: BlockletState) => BlockletState;
     hasRunnableComponent: (blocklet: BlockletState) => boolean;
+    getAppName: (blocklet: BlockletState, onlyUseMeta?: boolean) => string;
+    getAppDescription: (blocklet: BlockletState, onlyUseMeta?: boolean) => string;
     getDisplayName: (blocklet: BlockletState, onlyUseMeta?: boolean) => string;
     fixBlockletStatus: (blocklet?: BlockletState) => void;
     findWebInterface: (blocklet?: TBlockletMeta | BlockletState) => any;
+    findWebInterfacePort: (blocklet?: BlockletState) => any;
     findServiceFromMeta: (meta?: TBlockletMeta, ServiceName?: string) => any;
     getWhoCanAccess: (blocklet?: BlockletState) => any;
     replaceSlotToIp: (url?: string, ip?: string) => string;
@@ -176,10 +170,21 @@ declare const _default: {
             version: string;
         };
     }) => string;
-    findComponentById: (blocklet: BlockletState | ComponentState, componentId: string | string[], { _ancestors, returnAncestors, }?: {
-        _ancestors?: any[];
+    findComponent: (blocklet: BlockletState | ComponentState, isEqualFn: (component: ComponentState, context: {
+        ancestors: ComponentState[];
+    }) => boolean, { _ancestors, returnAncestors, }?: {
+        _ancestors?: ComponentState[];
         returnAncestors?: boolean;
-    }) => any;
+    }) => ComponentState | {
+        component: ComponentState;
+        ancestors: ComponentState[];
+    };
+    findComponentById: (blocklet: BlockletState | ComponentState, componentId: string | string[], { returnAncestors, }?: {
+        returnAncestors?: boolean;
+    }) => ComponentState | {
+        component: ComponentState;
+        ancestors: ComponentState[];
+    };
     getParentComponentName: (name?: string) => string;
     getConnectAppUrl: ({ request, baseUrl }: {
         request: Partial<Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>>;

package/lib/util.js

@@ -1,20 +1,12 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRolesFromAuthConfig = exports.isPreferenceKey = exports.isExternalBlocklet = exports.getChainInfo = exports.getConnectAppUrl = exports.getParentComponentName = exports.findComponentById = exports.getComponentBundleId = exports.getComponentName = exports.getComponentId = exports.replaceSlotToIp = exports.getWhoCanAccess = exports.findServiceFromMeta = exports.findWebInterface = exports.fixBlockletStatus = exports.getDisplayName = exports.hasRunnableComponent = exports.wipeSensitiveData = exports.isEnvShareable = exports.getComponentMissingConfigs = exports.getAppMissingConfigs = exports.getSharedConfigObj = exports.isDeletableBlocklet = exports.forEachChildSync = exports.forEachChild = exports.forEachBlockletSync = exports.forEachBlocklet = exports.isComponentBlocklet = exports.isFreeComponent = exports.isFreeBlocklet = void 0;
+exports.getBlockletAppIdList = exports.getRolesFromAuthConfig = exports.isPreferenceKey = exports.isExternalBlocklet = exports.getChainInfo = exports.getConnectAppUrl = exports.getParentComponentName = 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.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"));
 const url_join_1 = __importDefault(require("url-join"));
 const p_limit_1 = __importDefault(require("p-limit"));
 const constant_1 = __importDefault(require("@abtnode/constant"));
@@ -87,9 +79,9 @@ const forEachBlocklet = (blocklet, cb, { parallel = false, concurrencyLimit = 5,
     // serial
     if (!parallel) {
         // eslint-disable-next-line no-async-promise-executor
-        return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
+        return new Promise(async (resolve, reject) => {
             try {
-                const params = yield cb(blocklet, {
+                const params = await cb(blocklet, {
                     parent: _parent,
                     root,
                     level: _level,
@@ -99,7 +91,7 @@ const forEachBlocklet = (blocklet, cb, { parallel = false, concurrencyLimit = 5,
                 });
                 if (blocklet.children) {
                     for (const child of blocklet.children) {
-                        yield forEachBlocklet(child, cb, {
+                        await forEachBlocklet(child, cb, {
                             params,
                             _parent: blocklet,
                             _root: root,
@@ -113,7 +105,7 @@ const forEachBlocklet = (blocklet, cb, { parallel = false, concurrencyLimit = 5,
             catch (err) {
                 reject(err);
             }
-        }));
+        });
     }
     // parallel
     const limit = _limit || (0, p_limit_1.default)(concurrencyLimit);
@@ -152,13 +144,11 @@ exports.forEachChild = forEachChild;
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const forEachChildSync = (blocklet, cb) => forEachChild(blocklet, cb, { sync: true });
 exports.forEachChildSync = forEachChildSync;
-const findComponentById = (blocklet, componentId, { _ancestors = [], returnAncestors = false, } = {}) => {
-    if (Array.isArray(componentId)) {
-        // eslint-disable-next-line no-param-reassign
-        componentId = componentId.join('/');
+const findComponent = (blocklet, isEqualFn, { _ancestors = [], returnAncestors = false, } = {}) => {
+    if (!isEqualFn) {
+        return null;
     }
-    const id = getComponentId(blocklet, _ancestors);
-    if (componentId === id) {
+    if (isEqualFn(blocklet, { ancestors: _ancestors })) {
         if (returnAncestors) {
             return {
                 component: blocklet,
@@ -169,13 +159,24 @@ const findComponentById = (blocklet, componentId, { _ancestors = [], returnAnces
     }
     for (const child of blocklet.children || []) {
         const ancestors = _ancestors.concat(blocklet);
-        const component = findComponentById(child, componentId, { _ancestors: ancestors, returnAncestors });
+        const component = findComponent(child, isEqualFn, { _ancestors: ancestors, returnAncestors });
         if (component) {
             return component;
         }
     }
     return null;
 };
+exports.findComponent = findComponent;
+const findComponentById = (blocklet, componentId, { returnAncestors = false, } = {}) => {
+    if (Array.isArray(componentId)) {
+        // eslint-disable-next-line no-param-reassign
+        componentId = componentId.join('/');
+    }
+    return findComponent(blocklet, (component, { ancestors }) => {
+        const id = getComponentId(component, ancestors);
+        return componentId === id;
+    }, { returnAncestors });
+};
 exports.findComponentById = findComponentById;
 const isEnvShareable = (env) => {
     return (!!env &&
@@ -204,7 +205,7 @@ const getSharedConfigObj = (component, ancestors) => {
                 if (config && config.value) {
                     return;
                 }
-                res[key] = value;
+                res[key] = (0, get_1.default)(ancestor, `configObj.${key}`) || value;
             });
         }
     }
@@ -275,10 +276,13 @@ const wipeSensitiveData = (blocklet) => {
             });
         }
         (d.environments || []).forEach((x) => {
-            if (['BLOCKLET_APP_SK'].includes(x.key)) {
+            if (['BLOCKLET_APP_SK', 'BLOCKLET_APP_PSK'].includes(x.key)) {
                 x.value = '__encrypted__';
             }
         });
+        (d.migratedFrom || []).forEach((x) => {
+            x.appSk = '__encrypted__';
+        });
         // @ts-ignore
         delete blocklet.configObj;
         // @ts-ignore
@@ -314,21 +318,43 @@ exports.hasRunnableComponent = hasRunnableComponent;
  * @param {Boolean} onlyUseMeta 优先使用应用元数据的name
  * @returns blocklet display name
  */
-const getDisplayName = (blocklet, onlyUseMeta = false) => {
+const getAppName = (blocklet, onlyUseMeta = false) => {
     if (!blocklet) {
         return '';
     }
     const { meta } = blocklet;
-    let displayName;
+    let name;
     if (!onlyUseMeta && blocklet.environments) {
         const target = blocklet.environments.find((e) => e.key === 'BLOCKLET_APP_NAME');
         if (target && target.value) {
-            displayName = target.value;
+            name = target.value;
+        }
+    }
+    return name || meta.title || meta.name;
+};
+exports.getAppName = getAppName;
+exports.getDisplayName = getAppName;
+/**
+ * 获取 blocklet 的 description
+ * @param {Object} blocklet 应用数据
+ * @param {Boolean} onlyUseMeta 优先使用应用元数据的name
+ * @returns blocklet display description
+ */
+const getAppDescription = (blocklet, onlyUseMeta = false) => {
+    if (!blocklet) {
+        return '';
+    }
+    const { meta } = blocklet;
+    let description;
+    if (!onlyUseMeta && blocklet.environments) {
+        const target = blocklet.environments.find((e) => e.key === 'BLOCKLET_APP_DESCRIPTION');
+        if (target && target.value) {
+            description = target.value;
         }
     }
-    return displayName || meta.title || meta.name;
+    return description || meta.description || meta.name;
 };
-exports.getDisplayName = getDisplayName;
+exports.getAppDescription = getAppDescription;
 const fixBlockletStatus = (blocklet) => {
     if (!blocklet) {
         return;
@@ -364,6 +390,18 @@ const findWebInterface = (blocklet) => {
     return interfaces.find((x) => x.type === BLOCKLET_INTERFACE_TYPE_WEB);
 };
 exports.findWebInterface = findWebInterface;
+const findWebInterfacePort = (blocklet) => {
+    if (!blocklet) {
+        return null;
+    }
+    const webInterface = findWebInterface(blocklet);
+    const { ports } = blocklet;
+    if (!webInterface || !ports) {
+        return null;
+    }
+    return ports[webInterface.port];
+};
+exports.findWebInterfacePort = findWebInterfacePort;
 const findServiceFromMeta = (meta, ServiceName) => {
     const names = [ServiceName];
     // backward compatible
@@ -415,7 +453,7 @@ const getChainInfo = (env) => Object.entries(CHAIN_INFO_CONFIG).reduce((info, x)
     return info;
 }, {});
 exports.getChainInfo = getChainInfo;
-const isExternalBlocklet = (blocklet) => !!(blocklet === null || blocklet === void 0 ? void 0 : blocklet.controller);
+const isExternalBlocklet = (blocklet) => !!blocklet?.controller;
 exports.isExternalBlocklet = isExternalBlocklet;
 const getRolesFromAuthConfig = (config) => {
     if (!config.whoCanAccess.startsWith(WHO_CAN_ACCESS_PREFIX_ROLES)) {
@@ -424,6 +462,11 @@ const getRolesFromAuthConfig = (config) => {
     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));
+};
+exports.getBlockletAppIdList = getBlockletAppIdList;
 exports.default = {
     isFreeBlocklet,
     isFreeComponent,
@@ -439,15 +482,19 @@ exports.default = {
     isEnvShareable,
     wipeSensitiveData,
     hasRunnableComponent,
-    getDisplayName,
+    getAppName,
+    getAppDescription,
+    getDisplayName: getAppName,
     fixBlockletStatus,
     findWebInterface,
+    findWebInterfacePort,
     findServiceFromMeta,
     getWhoCanAccess,
     replaceSlotToIp,
     getComponentId,
     getComponentName,
     getComponentBundleId,
+    findComponent,
     findComponentById,
     getParentComponentName,
     getConnectAppUrl,

package/lib/validate.js

@@ -21,10 +21,13 @@ const fixAndValidateService = (meta) => {
 };
 exports.fixAndValidateService = fixAndValidateService;
 const validateMeta = (meta, { ensureMain = false, ensureFiles = false, ensureDist = false, ensureComponentStore = true, schemaOptions = {}, } = {}) => {
-    const schema = (0, schema_1.createBlockletSchema)(null, Object.assign({ ensureMain,
+    const schema = (0, schema_1.createBlockletSchema)(null, {
+        ensureMain,
         ensureFiles,
         ensureDist,
-        ensureComponentStore }, schemaOptions));
+        ensureComponentStore,
+        ...schemaOptions,
+    });
     const { value, error } = schema.validate(meta);
     if (error) {
         throw new Error(`Invalid blocklet meta: ${error.details.map((x) => x.message).join(', ')}`);

package/lib/verify-multi-sig.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -49,7 +38,7 @@ function verifyDelegationToken(signature) {
     return true;
 }
 const verifyMultiSig = (blockletMeta) => {
-    const { signatures: tmpSignatures } = blockletMeta, meta = __rest(blockletMeta, ["signatures"]);
+    const { signatures: tmpSignatures, ...meta } = blockletMeta;
     const signatures = (0, cloneDeep_1.default)(tmpSignatures);
     if (!Array.isArray(signatures)) {
         throw new Error('Invalid signatures, signatures should be an array');
@@ -74,7 +63,7 @@ const verifyMultiSig = (blockletMeta) => {
             : signature;
         delete signature.sig;
         debug('verify', { signer });
-        let toBeVerifiedMeta = Object.assign({}, meta);
+        let toBeVerifiedMeta = { ...meta };
         if (lastSignature && lastSignature.appended) {
             debug('appended fields', { signer, appended: lastSignature.appended });
             lastSignature.appended.forEach((field) => {
@@ -89,7 +78,7 @@ const verifyMultiSig = (blockletMeta) => {
         }
         const type = (0, did_1.toTypeInfo)(signer);
         const wallet = (0, wallet_1.fromPublicKey)(pk, type);
-        const verifyRes = wallet.verify((0, json_stable_stringify_1.default)(Object.assign(Object.assign({}, toBeVerifiedMeta), { signatures: [signature, ...signatures] })), sig);
+        const verifyRes = wallet.verify((0, json_stable_stringify_1.default)({ ...toBeVerifiedMeta, signatures: [signature, ...signatures] }), sig);
         if (verifyRes !== true) {
             debug('verify failed', { signer });
             return verifyRes;

package/lib/wallet.d.ts

@@ -5,5 +5,5 @@ import { DIDType } from '@arcblock/did';
  *
  * Spec: https://github.com/ArcBlock/ABT-DID-Protocol#request-did-authentication
  */
-declare const getBlockletWallet: (blockletDid: string, nodeSk?: string, type?: DIDType, index?: number) => WalletObject;
+declare const getBlockletWallet: (blockletDid: string, nodeSk?: string, type?: DIDType | string, index?: number) => WalletObject;
 export = getBlockletWallet;

package/lib/wallet.js

@@ -8,10 +8,11 @@ const did_ext_1 = require("@arcblock/did-ext");
  *
  * Spec: https://github.com/ArcBlock/ABT-DID-Protocol#request-did-authentication
  */
-const getBlockletWallet = (blockletDid, nodeSk, type = { role: mcrypto_1.types.RoleType.ROLE_APPLICATION }, index = 0) => {
+const getBlockletWallet = (blockletDid, nodeSk, type, index) => {
+    const t = type || { role: mcrypto_1.types.RoleType.ROLE_APPLICATION };
     if (!(0, did_1.isValid)(blockletDid)) {
         try {
-            return (0, wallet_1.fromSecretKey)(blockletDid, type);
+            return (0, wallet_1.fromSecretKey)(blockletDid, t);
         }
         catch (err) {
             throw new Error(`Cannot get blocklet wallet with invalid blocklet did or custom sk: ${err.message}`);
@@ -20,6 +21,6 @@ const getBlockletWallet = (blockletDid, nodeSk, type = { role: mcrypto_1.types.R
     if (!nodeSk) {
         throw new Error('Cannot get blocklet wallet with empty node sk');
     }
-    return (0, did_ext_1.fromAppDid)(blockletDid, nodeSk, type, index);
+    return (0, did_ext_1.fromAppDid)(blockletDid, nodeSk, t, index || 0);
 };
 module.exports = getBlockletWallet;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.68",
+  "version": "1.8.69-beta-e0666d0d",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -24,19 +24,19 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.8.68",
-    "@abtnode/constant": "1.8.68",
-    "@abtnode/util": "1.8.68",
-    "@arcblock/did": "1.18.42",
-    "@arcblock/did-ext": "1.18.42",
-    "@arcblock/did-util": "1.18.42",
-    "@arcblock/jwt": "1.18.42",
-    "@blocklet/constant": "1.8.68",
-    "@ocap/asset": "1.18.42",
-    "@ocap/mcrypto": "1.18.42",
-    "@ocap/types": "1.18.42",
-    "@ocap/util": "1.18.42",
-    "@ocap/wallet": "1.18.42",
+    "@abtnode/client": "1.8.69-beta-e0666d0d",
+    "@abtnode/constant": "1.8.69-beta-e0666d0d",
+    "@abtnode/util": "1.8.69-beta-e0666d0d",
+    "@arcblock/did": "1.18.57",
+    "@arcblock/did-ext": "1.18.57",
+    "@arcblock/did-util": "1.18.57",
+    "@arcblock/jwt": "1.18.57",
+    "@blocklet/constant": "1.8.69-beta-e0666d0d",
+    "@ocap/asset": "1.18.57",
+    "@ocap/mcrypto": "1.18.57",
+    "@ocap/types": "1.18.57",
+    "@ocap/util": "1.18.57",
+    "@ocap/wallet": "1.18.57",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -59,7 +59,7 @@
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "@abtnode/client": "^1.8.64",
+    "@abtnode/client": "^1.8.68",
     "@arcblock/eslint-config-ts": "^0.2.3",
     "@types/express": "^4.17.14",
     "@types/jest": "^29.2.2",
@@ -75,10 +75,11 @@
     "expand-tilde": "^2.0.2",
     "express": "^4.18.2",
     "jest": "^29.3.0",
+    "joi-to-typescript": "^4.0.7",
     "prettier": "^2.7.1",
     "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "1392044ac5677bde567797adeb9a6d3f0b9264b8"
+  "gitHead": "acf0373591eaa3aff76483edc4e648afc543f1f7"
 }