@blocklet/meta 1.8.66-beta-ff281dd5 → 1.8.66-beta-7f4224af

package/lib/channel.d.ts

@@ -1,27 +1,32 @@
 declare const getAppPublicChannelRegex: () => RegExp;
+declare const getRelayChannelRegex: () => RegExp;
 declare const getAppPublicChannel: (appDid: string) => string;
+declare const getRelayChannel: (appDid: string, topic: string) => string;
 declare const CHANNEL_TYPE: {
     DID: string;
     APP: string;
+    RELAY: string;
 };
 declare const parseChannel: (channel: string) => {
     type: string;
     appDid?: string;
+    topic?: string;
 };
-export { CHANNEL_TYPE };
-export { getAppPublicChannel };
-export { getAppPublicChannelRegex };
-export { parseChannel };
+export { CHANNEL_TYPE, getAppPublicChannel, getAppPublicChannelRegex, getRelayChannel, getRelayChannelRegex, parseChannel, };
 declare const _default: {
     CHANNEL_TYPE: {
         DID: string;
         APP: string;
+        RELAY: string;
     };
     getAppPublicChannel: (appDid: string) => string;
     getAppPublicChannelRegex: () => RegExp;
+    getRelayChannel: (appDid: string, topic: string) => string;
+    getRelayChannelRegex: () => RegExp;
     parseChannel: (channel: string) => {
         type: string;
         appDid?: string;
+        topic?: string;
     };
 };
 export default _default;

package/lib/channel.js

@@ -1,26 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseChannel = exports.getAppPublicChannelRegex = exports.getAppPublicChannel = exports.CHANNEL_TYPE = void 0;
+exports.parseChannel = exports.getRelayChannelRegex = exports.getRelayChannel = exports.getAppPublicChannelRegex = exports.getAppPublicChannel = exports.CHANNEL_TYPE = void 0;
 /* eslint-disable @typescript-eslint/indent */
 const did_1 = require("@arcblock/did");
 const getAppPublicChannelRegex = () => /app:(\w+):public/;
 exports.getAppPublicChannelRegex = getAppPublicChannelRegex;
+const getRelayChannelRegex = () => /relay:(\w+):(\w+)/;
+exports.getRelayChannelRegex = getRelayChannelRegex;
 const getAppPublicChannel = (appDid) => `app:${appDid}:public`;
 exports.getAppPublicChannel = getAppPublicChannel;
+const getRelayChannel = (appDid, topic) => `relay:${appDid}:${topic}`;
+exports.getRelayChannel = getRelayChannel;
 const CHANNEL_TYPE = {
     DID: 'DID',
     APP: 'APP',
+    RELAY: 'RELAY',
 };
 exports.CHANNEL_TYPE = CHANNEL_TYPE;
 const parseChannel = (channel) => {
     if (!channel) {
         throw new Error('Channel should not be empty');
     }
-    const matchAppPublicChannel = getAppPublicChannelRegex().exec(channel);
-    if (matchAppPublicChannel) {
+    let match = getRelayChannelRegex().exec(channel);
+    if (match && (0, did_1.isValid)(match[1])) {
+        return {
+            type: CHANNEL_TYPE.RELAY,
+            appDid: match[1],
+            topic: match[2],
+        };
+    }
+    match = getAppPublicChannelRegex().exec(channel);
+    if (match && (0, did_1.isValid)(match[1])) {
         return {
             type: CHANNEL_TYPE.APP,
-            appDid: matchAppPublicChannel[1],
+            appDid: match[1],
         };
     }
     if ((0, did_1.isValid)(channel)) {
@@ -35,5 +48,7 @@ exports.default = {
     CHANNEL_TYPE,
     getAppPublicChannel,
     getAppPublicChannelRegex,
+    getRelayChannel,
+    getRelayChannelRegex,
     parseChannel,
 };

package/lib/util.d.ts

@@ -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;
@@ -78,6 +89,7 @@ declare const hasRunnableComponent: (blocklet: BlockletState) => boolean;
 declare const getDisplayName: (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 }: {
@@ -108,6 +120,7 @@ export { hasRunnableComponent };
 export { getDisplayName };
 export { fixBlockletStatus };
 export { findWebInterface };
+export { findWebInterfacePort };
 export { findServiceFromMeta };
 export { getWhoCanAccess };
 export { replaceSlotToIp };
@@ -115,6 +128,7 @@ export { urlFriendly };
 export { getComponentId };
 export { getComponentName };
 export { getComponentBundleId };
+export { findComponent };
 export { findComponentById };
 export { getParentComponentName };
 export { getConnectAppUrl };
@@ -151,6 +165,7 @@ declare const _default: {
     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;
@@ -179,10 +194,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;
+    }) => ComponentState | {
+        component: ComponentState;
+        ancestors: ComponentState[];
+    };
+    findComponentById: (blocklet: BlockletState | ComponentState, componentId: string | string[], { returnAncestors, }?: {
         returnAncestors?: boolean;
-    }) => any;
+    }) => 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

@@ -12,7 +12,7 @@ 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.urlFriendly = 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.getRolesFromAuthConfig = exports.isPreferenceKey = exports.isExternalBlocklet = exports.getChainInfo = exports.getConnectAppUrl = exports.getParentComponentName = exports.findComponentById = exports.findComponent = exports.getComponentBundleId = exports.getComponentName = exports.getComponentId = exports.urlFriendly = 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;
 /* eslint-disable no-await-in-loop */
 const get_1 = __importDefault(require("lodash/get"));
 const slugify_1 = __importDefault(require("slugify"));
@@ -153,13 +153,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,
@@ -170,13 +168,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 &&
@@ -365,6 +374,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
@@ -445,6 +466,7 @@ exports.default = {
     getDisplayName,
     fixBlockletStatus,
     findWebInterface,
+    findWebInterfacePort,
     findServiceFromMeta,
     getWhoCanAccess,
     replaceSlotToIp,
@@ -452,6 +474,7 @@ exports.default = {
     getComponentId,
     getComponentName,
     getComponentBundleId,
+    findComponent,
     findComponentById,
     getParentComponentName,
     getConnectAppUrl,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.66-beta-ff281dd5",
+  "version": "1.8.66-beta-7f4224af",
   "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.66-beta-ff281dd5",
-    "@abtnode/constant": "1.8.66-beta-ff281dd5",
-    "@abtnode/util": "1.8.66-beta-ff281dd5",
-    "@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.66-beta-ff281dd5",
-    "@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.66-beta-7f4224af",
+    "@abtnode/constant": "1.8.66-beta-7f4224af",
+    "@abtnode/util": "1.8.66-beta-7f4224af",
+    "@arcblock/did": "1.18.47",
+    "@arcblock/did-ext": "1.18.47",
+    "@arcblock/did-util": "1.18.47",
+    "@arcblock/jwt": "1.18.47",
+    "@blocklet/constant": "1.8.66-beta-7f4224af",
+    "@ocap/asset": "1.18.47",
+    "@ocap/mcrypto": "1.18.47",
+    "@ocap/types": "1.18.47",
+    "@ocap/util": "1.18.47",
+    "@ocap/wallet": "1.18.47",
     "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.65",
     "@arcblock/eslint-config-ts": "^0.2.3",
     "@types/express": "^4.17.14",
     "@types/jest": "^29.2.2",
@@ -80,5 +80,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "92edfc81679a4749b30a7f8195d487afa148e26b"
+  "gitHead": "72d418f63ecb76b1d5d62edbcc5f336cb62bf308"
 }