@blocklet/meta 1.16.3 → 1.16.4-beta-8682e092

package/lib/did-utils.d.ts

@@ -0,0 +1,10 @@
+import { UserInfo } from '@abtnode/client';
+export interface ExtraConfigs {
+    sourceProvider: string;
+    connectedAccounts: any[];
+}
+export declare function getMainDidFromUser(user: UserInfo): string;
+export declare function getAliasAccountFromUser(user: UserInfo): any[];
+export declare function getAliasDidFromUser(user: UserInfo): any[];
+export declare function getWalletAccountFromUser(user: UserInfo): any;
+export declare function getWalletDidFromUser(user: UserInfo): any;

package/lib/did-utils.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWalletDidFromUser = exports.getWalletAccountFromUser = exports.getAliasDidFromUser = exports.getAliasAccountFromUser = exports.getMainDidFromUser = void 0;
+function getMainDidFromUser(user) {
+    return user.did;
+}
+exports.getMainDidFromUser = getMainDidFromUser;
+function getAliasAccountFromUser(user) {
+    const connectedAccounts = user.extraConfigs?.connectedAccounts || [];
+    return connectedAccounts;
+}
+exports.getAliasAccountFromUser = getAliasAccountFromUser;
+function getAliasDidFromUser(user) {
+    const connectedAccounts = getAliasAccountFromUser(user);
+    const didList = connectedAccounts.map((item) => item.did);
+    return didList;
+}
+exports.getAliasDidFromUser = getAliasDidFromUser;
+function getWalletAccountFromUser(user) {
+    const connectedAccounts = user.extraConfigs?.connectedAccounts || [];
+    const walletAccount = connectedAccounts.find((item) => item.provider === 'wallet');
+    return walletAccount;
+}
+exports.getWalletAccountFromUser = getWalletAccountFromUser;
+function getWalletDidFromUser(user) {
+    const walletAccount = getWalletAccountFromUser(user);
+    return walletAccount?.did;
+}
+exports.getWalletDidFromUser = getWalletDidFromUser;

package/lib/index.d.ts

@@ -9,6 +9,7 @@ import { validateMeta, fixAndValidateService } from './validate';
 import { formatPerson, parsePerson, fixPerson, fixInterfaces, fixService, fixName } from './fix';
 import { list, select, update, read } from './file';
 import verifyMultiSig from './verify-multi-sig';
+import { getAliasAccountFromUser, getAliasDidFromUser, getMainDidFromUser, getWalletAccountFromUser, getWalletDidFromUser } from './did-utils';
 export { constants };
 export { list };
 export { select };
@@ -28,6 +29,7 @@ export { getBlockletWallet };
 export { getBlockletInfo };
 export { getBlockletEngine };
 export { verifyMultiSig };
+export { getAliasAccountFromUser, getAliasDidFromUser, getMainDidFromUser, getWalletAccountFromUser, getWalletDidFromUser, };
 declare const _default: {
     constants: any;
     list: any[];
@@ -82,5 +84,10 @@ declare const _default: {
     };
     getBlockletEngine: (meta: import("./types").TBlockletMeta) => import("./types").TEngine;
     verifyMultiSig: (blockletMeta: import("./types").TBlockletMeta) => boolean;
+    getAliasAccountFromUser: typeof getAliasAccountFromUser;
+    getAliasDidFromUser: typeof getAliasDidFromUser;
+    getMainDidFromUser: typeof getMainDidFromUser;
+    getWalletAccountFromUser: typeof getWalletAccountFromUser;
+    getWalletDidFromUser: typeof getWalletDidFromUser;
 };
 export default _default;

package/lib/index.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.verifyMultiSig = exports.getBlockletEngine = exports.getBlockletInfo = exports.getBlockletWallet = exports.toBlockletDid = exports.fixName = exports.fixService = exports.fixInterfaces = exports.fixPerson = exports.parsePerson = exports.formatPerson = exports.fixAndValidateService = exports.validateMeta = exports.parse = exports.read = exports.update = exports.select = exports.list = exports.constants = void 0;
+exports.getWalletDidFromUser = exports.getWalletAccountFromUser = exports.getMainDidFromUser = exports.getAliasDidFromUser = exports.getAliasAccountFromUser = exports.verifyMultiSig = exports.getBlockletEngine = exports.getBlockletInfo = exports.getBlockletWallet = exports.toBlockletDid = exports.fixName = exports.fixService = exports.fixInterfaces = exports.fixPerson = exports.parsePerson = exports.formatPerson = exports.fixAndValidateService = exports.validateMeta = exports.parse = exports.read = exports.update = exports.select = exports.list = exports.constants = void 0;
 const constants_1 = __importDefault(require("./constants"));
 exports.constants = constants_1.default;
 const parse_1 = __importDefault(require("./parse"));
@@ -33,6 +33,12 @@ Object.defineProperty(exports, "update", { enumerable: true, get: function () {
 Object.defineProperty(exports, "read", { enumerable: true, get: function () { return file_1.read; } });
 const verify_multi_sig_1 = __importDefault(require("./verify-multi-sig"));
 exports.verifyMultiSig = verify_multi_sig_1.default;
+const did_utils_1 = require("./did-utils");
+Object.defineProperty(exports, "getAliasAccountFromUser", { enumerable: true, get: function () { return did_utils_1.getAliasAccountFromUser; } });
+Object.defineProperty(exports, "getAliasDidFromUser", { enumerable: true, get: function () { return did_utils_1.getAliasDidFromUser; } });
+Object.defineProperty(exports, "getMainDidFromUser", { enumerable: true, get: function () { return did_utils_1.getMainDidFromUser; } });
+Object.defineProperty(exports, "getWalletAccountFromUser", { enumerable: true, get: function () { return did_utils_1.getWalletAccountFromUser; } });
+Object.defineProperty(exports, "getWalletDidFromUser", { enumerable: true, get: function () { return did_utils_1.getWalletDidFromUser; } });
 exports.default = {
     constants: constants_1.default,
     list: file_1.list,
@@ -53,4 +59,9 @@ exports.default = {
     getBlockletInfo: info_1.default,
     getBlockletEngine: engine_1.default,
     verifyMultiSig: verify_multi_sig_1.default,
+    getAliasAccountFromUser: did_utils_1.getAliasAccountFromUser,
+    getAliasDidFromUser: did_utils_1.getAliasDidFromUser,
+    getMainDidFromUser: did_utils_1.getMainDidFromUser,
+    getWalletAccountFromUser: did_utils_1.getWalletAccountFromUser,
+    getWalletDidFromUser: did_utils_1.getWalletDidFromUser,
 };

package/lib/schema.js

@@ -40,7 +40,7 @@ const extension_1 = require("./extension");
 const name_1 = require("./name");
 const constants_1 = __importDefault(require("./constants"));
 const parse_navigation_from_blocklet_1 = require("./parse-navigation-from-blocklet");
-const url_friendly_1 = __importStar(require("./url-friendly"));
+const url_path_friendly_1 = __importStar(require("./url-path-friendly"));
 const cjkLength = cjk_length_1.default.default;
 const { BLOCKLET_GROUPS, BLOCKLET_PLATFORMS, BLOCKLET_ARCHITECTURES, BLOCKLET_INTERFACE_TYPES, BLOCKLET_INTERFACE_PROTOCOLS, BLOCKLET_ENTRY_FILE, BLOCKLET_BUNDLE_FILE, BLOCKLET_DEFAULT_PORT_NAME, BLOCKLET_DYNAMIC_PATH_PREFIX, BlockletGroup, BLOCKLET_LATEST_REQUIREMENT_SERVER, BLOCKLET_INTERFACE_TYPE_WEB, BLOCKLET_INTERFACE_TYPE_WELLKNOWN, BLOCKLET_APP_SPACE_ENDPOINTS, BLOCKLET_CONFIGURABLE_KEY, } = constants_1.default;
 const WELLKNOWN_PATH_PREFIX = '/.well-known';
@@ -106,16 +106,16 @@ const baseMountPointSchema = Joi.string().trim().min(1);
 const mountPointSchema = baseMountPointSchema
     .meta({ className: 'TMountPoint' })
     .custom((value, helper) => {
-    if ((0, url_friendly_1.isValidUrl)(value)) {
+    if ((0, url_path_friendly_1.isValidUrlPath)(value)) {
         return value;
     }
     // @ts-expect-error
-    return helper.message('mountPoint cannot contain such characters space $*_+~.()\'"!:@\\');
+    return helper.message('mountPoint cannot contain such characters space $*+~()\'"!:@\\');
 });
 exports.mountPointSchema = mountPointSchema;
 const updateMountPointSchema = baseMountPointSchema
     .meta({ className: 'TUpdateMountPoint' })
-    .custom((value) => (0, url_friendly_1.default)(value));
+    .custom((value) => (0, url_path_friendly_1.default)(value));
 exports.updateMountPointSchema = updateMountPointSchema;
 const blockletNameSchema = Joi.string()
     .custom((value) => {

package/lib/url-friendly.d.ts

@@ -1,3 +1,6 @@
+/**
+ * Deprecated: use ./url-path-friendly.ts instead
+ */
 declare const isValidUrl: (name: string) => boolean;
 declare const urlFriendly: (name: string, { keepSlash }?: {
     keepSlash: boolean;

package/lib/url-friendly.js

@@ -1,4 +1,7 @@
 "use strict";
+/**
+ * Deprecated: use ./url-path-friendly.ts instead
+ */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/lib/url-path-friendly.d.ts

@@ -0,0 +1,6 @@
+declare const isValidUrlPath: (name: string) => boolean;
+declare const urlPathFriendly: (name: string, { keepSlash }?: {
+    keepSlash: boolean;
+}) => string;
+export { isValidUrlPath };
+export default urlPathFriendly;

package/lib/url-path-friendly.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidUrlPath = void 0;
+const isValidUrlPath = (name) => {
+    // Check if the path contains any uppercase letters
+    if (/[A-Z]/.test(name)) {
+        return false;
+    }
+    // Check if the path contains any non-ASCII characters
+    if (/[^\x20-\x7F]/.test(name)) {
+        return false;
+    }
+    // Check if the resulting string matches the pattern of a valid URL path
+    const regex = /^[a-z0-9/\-._]*$/i;
+    return regex.test(name) && !name.includes('//');
+};
+exports.isValidUrlPath = isValidUrlPath;
+const urlPathFriendly = (name, { keepSlash = true } = { keepSlash: true }) => {
+    // Replace non-URL path friendly characters with hyphens
+    const pathFriendlyStr = name
+        .trim()
+        .replace(/[^\x20-\x7F]/g, '')
+        .replace(/[^a-z0-9_.\-/]/gi, '-')
+        .toLowerCase();
+    // Remove consecutive hyphens
+    const noConsecutiveHyphens = pathFriendlyStr.replace(/-+/g, '-');
+    // Replace consecutive periods with a single period
+    const result = noConsecutiveHyphens.replace(/\.+/g, '.');
+    // Remove consecutive slashes if keepSlash is true
+    const noConsecutiveSlashes = result.replace(/\/+/g, '/');
+    // Remove leading/trailing slashes if keepSlash is false
+    if (!keepSlash) {
+        return noConsecutiveSlashes.replace(/^\/|\/$/g, '');
+    }
+    return noConsecutiveSlashes;
+};
+exports.default = urlPathFriendly;

package/lib/util.d.ts

@@ -121,7 +121,16 @@ declare const getRolesFromAuthConfig: (config: {
     whoCanAccess: string;
 }) => Array<string>;
 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, getBlockletChainInfo, isExternalBlocklet, isPreferenceKey, getRolesFromAuthConfig, getBlockletAppIdList, };
+declare const getBlockletServices: (blocklet: Partial<BlockletState>) => Array<{
+    name: string;
+    protocol: string;
+    port: number;
+    upstreamPort: number;
+}>;
+declare const isInProgress: (status: string | number) => boolean;
+declare const isBeforeInstalled: (status: string | number) => boolean;
+declare const isRunning: (status: string | number) => boolean;
+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, getBlockletChainInfo, isExternalBlocklet, isPreferenceKey, getRolesFromAuthConfig, getBlockletAppIdList, getBlockletServices, isInProgress, isBeforeInstalled, isRunning, };
 declare const _default: {
     isFreeBlocklet: (meta: TBlockletMeta) => boolean;
     isFreeComponent: (meta: TBlockletMeta) => boolean;
@@ -208,5 +217,14 @@ declare const _default: {
     getRolesFromAuthConfig: (config: {
         whoCanAccess: string;
     }) => string[];
+    getBlockletServices: (blocklet: Partial<BlockletState>) => {
+        name: string;
+        protocol: string;
+        port: number;
+        upstreamPort: number;
+    }[];
+    isInProgress: (status: string | number) => boolean;
+    isBeforeInstalled: (status: string | number) => boolean;
+    isRunning: (status: string | number) => boolean;
 };
 export default _default;

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.getBlockletAppIdList = exports.getRolesFromAuthConfig = exports.isPreferenceKey = exports.isExternalBlocklet = exports.getBlockletChainInfo = 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;
+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.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"));
@@ -12,7 +12,7 @@ const p_limit_1 = __importDefault(require("p-limit"));
 const constant_1 = __importDefault(require("@abtnode/constant"));
 const constants_1 = __importDefault(require("./constants"));
 const { NODE_SERVICES, SLOT_FOR_IP_DNS_SITE, WHO_CAN_ACCESS, WHO_CAN_ACCESS_PREFIX_ROLES } = constant_1.default;
-const { BlockletGroup, fromBlockletStatus, fromBlockletSource, BLOCKLET_INTERFACE_TYPE_WEB, BLOCKLET_CONFIGURABLE_KEY, CHAIN_INFO_CONFIG, BLOCKLET_PREFERENCE_PREFIX, } = constants_1.default;
+const { BlockletGroup, BlockletStatus, fromBlockletStatus, fromBlockletSource, BLOCKLET_INTERFACE_TYPE_WEB, BLOCKLET_CONFIGURABLE_KEY, CHAIN_INFO_CONFIG, BLOCKLET_PREFERENCE_PREFIX, BLOCKLET_INTERFACE_TYPE_SERVICE, } = constants_1.default;
 const getComponentId = (component, ancestors = []) => `${ancestors.map((x) => (x && x.meta ? x.meta.did : '')).join('/')}${ancestors.length ? '/' : ''}${component && component.meta ? component.meta.did : ''}`;
 exports.getComponentId = getComponentId;
 const getComponentName = (component, ancestors = []) => `${ancestors.map((x) => (x && x.meta ? x.meta.name : '')).join('/')}${ancestors.length ? '/' : ''}${component && component.meta ? component.meta.name : ''}`;
@@ -497,6 +497,56 @@ const getBlockletAppIdList = (blocklet) => {
     return (0, uniq_1.default)([blocklet.appDid, blocklet.appPid, ...migratedFrom].filter(Boolean));
 };
 exports.getBlockletAppIdList = getBlockletAppIdList;
+const getBlockletServices = (blocklet) => {
+    const services = [];
+    if (!blocklet) {
+        return services;
+    }
+    forEachBlockletSync(blocklet, (component) => {
+        const interfaces = (component.meta?.interfaces || []).filter((x) => x.type === BLOCKLET_INTERFACE_TYPE_SERVICE);
+        interfaces.forEach((x) => {
+            const port = (x.port || {});
+            services.push({
+                name: x.name,
+                protocol: x.protocol,
+                port: Number(port.external),
+                upstreamPort: Number((component.ports || {})[port.internal]),
+            });
+        });
+    });
+    return services;
+};
+exports.getBlockletServices = getBlockletServices;
+const isInProgress = (status) => [
+    BlockletStatus.downloading,
+    BlockletStatus.waiting,
+    BlockletStatus.starting,
+    BlockletStatus.installing,
+    BlockletStatus.stopping,
+    BlockletStatus.upgrading,
+    'downloading',
+    'waiting',
+    'starting',
+    'installing',
+    'stopping',
+    'upgrading',
+    'restarting',
+    'deleting',
+].includes(status);
+exports.isInProgress = isInProgress;
+const isBeforeInstalled = (status) => [
+    BlockletStatus.added,
+    BlockletStatus.waiting,
+    BlockletStatus.downloading,
+    BlockletStatus.installing,
+    'added',
+    'waiting',
+    'downloading',
+    'installing',
+].includes(status);
+exports.isBeforeInstalled = isBeforeInstalled;
+const isRunning = (status) => [BlockletStatus.running, 'running'].includes(status);
+exports.isRunning = isRunning;
 exports.default = {
     isFreeBlocklet,
     isFreeComponent,
@@ -533,4 +583,8 @@ exports.default = {
     isExternalBlocklet,
     isPreferenceKey,
     getRolesFromAuthConfig,
+    getBlockletServices,
+    isInProgress,
+    isBeforeInstalled,
+    isRunning,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.3",
+  "version": "1.16.4-beta-8682e092",
   "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.16.3",
-    "@abtnode/constant": "1.16.3",
-    "@abtnode/util": "1.16.3",
-    "@arcblock/did": "1.18.65",
-    "@arcblock/did-ext": "1.18.65",
-    "@arcblock/did-util": "1.18.65",
-    "@arcblock/jwt": "1.18.65",
-    "@blocklet/constant": "1.16.3",
-    "@ocap/asset": "1.18.65",
-    "@ocap/mcrypto": "1.18.65",
-    "@ocap/types": "1.18.65",
-    "@ocap/util": "1.18.65",
-    "@ocap/wallet": "1.18.65",
+    "@abtnode/client": "1.16.4-beta-8682e092",
+    "@abtnode/constant": "1.16.4-beta-8682e092",
+    "@abtnode/util": "1.16.4-beta-8682e092",
+    "@arcblock/did": "1.18.67",
+    "@arcblock/did-ext": "1.18.67",
+    "@arcblock/did-util": "1.18.67",
+    "@arcblock/jwt": "1.18.67",
+    "@blocklet/constant": "1.16.4-beta-8682e092",
+    "@ocap/asset": "1.18.67",
+    "@ocap/mcrypto": "1.18.67",
+    "@ocap/types": "1.18.67",
+    "@ocap/util": "1.18.67",
+    "@ocap/wallet": "1.18.67",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -80,5 +80,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "a21d48225c6f89963796871f404a2318a335701d"
+  "gitHead": "ab6fc7aeaec32f14ec2153976f2121aa893486b5"
 }