@blocklet/meta 1.8.68-beta-500af7e5 → 1.8.69-beta-e0666d0d

package/lib/index.d.ts

@@ -82,10 +82,10 @@ declare const _default: {
         name: string;
         version: string;
         description: string;
-        passportColor?: string;
+        passportColor: string;
         appUrl: string;
-        wallet?: import("@ocap/wallet").WalletObject<string>;
-        permanentWallet?: import("@ocap/wallet").WalletObject<string>;
+        wallet: import("@ocap/wallet").WalletObject<string>;
+        permanentWallet: import("@ocap/wallet").WalletObject<string>;
     };
     getBlockletEngine: (meta: import("./types").TBlockletMeta) => import("./types").TEngine;
     verifyMultiSig: (blockletMeta: import("./types").TBlockletMeta) => boolean;

package/lib/info.d.ts

@@ -7,9 +7,9 @@ declare const getBlockletInfo: (state: BlockletState, nodeSk?: string, { returnW
     name: string;
     version: string;
     description: string;
-    passportColor?: string;
+    passportColor: string;
     appUrl: string;
-    wallet?: WalletObject;
-    permanentWallet?: WalletObject;
+    wallet: WalletObject;
+    permanentWallet: WalletObject;
 };
 export = getBlockletInfo;

package/lib/info.js

@@ -25,7 +25,10 @@ const getBlockletInfo = (state, nodeSk, { returnWallet = true } = {}) => {
             version,
             name,
             description,
+            passportColor,
             appUrl,
+            wallet: null,
+            permanentWallet: null,
         };
     }
     const customSk = envs.find((x) => x.key === 'BLOCKLET_APP_SK');

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;
 };
@@ -86,7 +86,14 @@ 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;
@@ -102,38 +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 { findWebInterfacePort };
-export { findServiceFromMeta };
-export { getWhoCanAccess };
-export { replaceSlotToIp };
-export { getComponentId };
-export { getComponentName };
-export { getComponentBundleId };
-export { findComponent };
-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;
@@ -160,6 +137,8 @@ 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;

package/lib/util.js

@@ -3,9 +3,10 @@ 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.findComponent = exports.getComponentBundleId = exports.getComponentName = exports.getComponentId = exports.replaceSlotToIp = exports.getWhoCanAccess = exports.findServiceFromMeta = exports.findWebInterfacePort = 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"));
@@ -317,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 displayName || meta.title || meta.name;
+    return name || meta.title || meta.name;
 };
-exports.getDisplayName = getDisplayName;
+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 description || meta.description || meta.name;
+};
+exports.getAppDescription = getAppDescription;
 const fixBlockletStatus = (blocklet) => {
     if (!blocklet) {
         return;
@@ -439,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,
@@ -454,7 +482,9 @@ exports.default = {
     isEnvShareable,
     wipeSensitiveData,
     hasRunnableComponent,
-    getDisplayName,
+    getAppName,
+    getAppDescription,
+    getDisplayName: getAppName,
     fixBlockletStatus,
     findWebInterface,
     findWebInterfacePort,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.68-beta-500af7e5",
+  "version": "1.8.69-beta-e0666d0d",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -24,14 +24,14 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.8.68-beta-500af7e5",
-    "@abtnode/constant": "1.8.68-beta-500af7e5",
-    "@abtnode/util": "1.8.68-beta-500af7e5",
+    "@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.68-beta-500af7e5",
+    "@blocklet/constant": "1.8.69-beta-e0666d0d",
     "@ocap/asset": "1.18.57",
     "@ocap/mcrypto": "1.18.57",
     "@ocap/types": "1.18.57",
@@ -59,7 +59,7 @@
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "@abtnode/client": "^1.8.67",
+    "@abtnode/client": "^1.8.68",
     "@arcblock/eslint-config-ts": "^0.2.3",
     "@types/express": "^4.17.14",
     "@types/jest": "^29.2.2",
@@ -81,5 +81,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "9070621373f317a10ff0d289323bf725e30d3521"
+  "gitHead": "acf0373591eaa3aff76483edc4e648afc543f1f7"
 }