@blocklet/meta 1.16.16 → 1.16.17-beta-7ec31a60

package/lib/axios.d.ts

@@ -0,0 +1,2 @@
+import axios from 'axios';
+export default axios;

package/lib/axios.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const axios_1 = __importDefault(require("axios"));
+const hpagent_1 = require("hpagent");
+function proxyInterceptor(config) {
+    /* istanbul ignore if */
+    if (config.socketPath != null)
+        return config;
+    const { proxy } = config;
+    /* istanbul ignore if */
+    if (proxy === false)
+        return config;
+    const httpProxyUrl = process.env.HTTP_PROXY || process.env.http_proxy;
+    const httpsProxyUrl = process.env.HTTPS_PROXY || process.env.https_proxy;
+    const proxyOptions = Object.assign({ keepAlive: true, keepAliveMsecs: 1000, maxSockets: 256, maxFreeSockets: 256 }, config.proxyOptions || {});
+    if (httpProxyUrl) {
+        config.proxy = false;
+        config.httpAgent = new hpagent_1.HttpProxyAgent({ proxy: httpProxyUrl, ...proxyOptions });
+    }
+    if (httpsProxyUrl) {
+        config.proxy = false;
+        config.httpsAgent = new hpagent_1.HttpsProxyAgent({ proxy: httpsProxyUrl, ...proxyOptions });
+    }
+    return config;
+}
+axios_1.default.interceptors.request.use(proxyInterceptor);
+exports.default = axios_1.default;

package/lib/normalize-path-prefix.d.ts

@@ -0,0 +1,6 @@
+declare const normalizePathPrefix: (prefix: any) => string;
+export { normalizePathPrefix };
+declare const _default: {
+    normalizePathPrefix: (prefix: any) => string;
+};
+export default _default;

package/lib/normalize-path-prefix.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizePathPrefix = void 0;
+const normalizePathPrefix = (prefix) => {
+    if (typeof prefix === 'string') {
+        if (!prefix || prefix === '/') {
+            return '/';
+        }
+        return `/${prefix}/`.replace(/\/+/g, '/');
+    }
+    return '/';
+};
+exports.normalizePathPrefix = normalizePathPrefix;
+exports.default = { normalizePathPrefix };

package/lib/parse-navigation.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const get_1 = __importDefault(require("lodash/get"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
-const normalize_path_prefix_1 = __importDefault(require("@abtnode/util/lib/normalize-path-prefix"));
-const parseLinkString = (link, prefix = '') => link.startsWith('/') ? (0, normalize_path_prefix_1.default)(`${prefix}${link || '/'}`) : link;
+const normalize_path_prefix_1 = require("./normalize-path-prefix");
+const parseLinkString = (link, prefix = '') => link.startsWith('/') ? (0, normalize_path_prefix_1.normalizePathPrefix)(`${prefix}${link || '/'}`) : link;
 const parseLink = (input, prefix) => {
     if (Object.prototype.toString.call(input) === '[object Object]') {
         return Object.entries(input).reduce((o, [key, value]) => {
@@ -119,9 +119,9 @@ const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
                     if (childNav.section) {
                         item.section = item.section || childNav.section;
                     }
-                    item.link = parseLink(childNavigation[0].link || '/', (0, normalize_path_prefix_1.default)(`${prefix}${child.mountPoint}`));
+                    item.link = parseLink(childNavigation[0].link || '/', (0, normalize_path_prefix_1.normalizePathPrefix)(`${prefix}${child.mountPoint}`));
                     // doParseNavigation because child nav depth may be > 1
-                    const list = doParseNavigation(childNavigation, child, (0, normalize_path_prefix_1.default)(`${prefix}${child.mountPoint}`), _level + 1);
+                    const list = doParseNavigation(childNavigation, child, (0, normalize_path_prefix_1.normalizePathPrefix)(`${prefix}${child.mountPoint}`), _level + 1);
                     if (list.length > 1) {
                         // more than 1 child nav
                         delete item.link;
@@ -139,7 +139,7 @@ const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
                 else {
                     // child declares multiple menus
                     const groupSection = childNavigation[0].section || [];
-                    const list = doParseNavigation(childNavigation, child, (0, normalize_path_prefix_1.default)(`${prefix}${child.mountPoint}`), _level + 1);
+                    const list = doParseNavigation(childNavigation, child, (0, normalize_path_prefix_1.normalizePathPrefix)(`${prefix}${child.mountPoint}`), _level + 1);
                     if (_level === 1) {
                         // primary menu
                         const item = (0, cloneDeep_1.default)(itemProto);

package/lib/payment/v2.js

@@ -35,7 +35,6 @@ const json_stable_stringify_1 = __importDefault(require("json-stable-stringify")
 const get_1 = __importDefault(require("lodash/get"));
 const pick_1 = __importDefault(require("lodash/pick"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
-const axios_1 = __importDefault(require("@abtnode/util/lib/axios"));
 const util_1 = require("@ocap/util");
 const asset_1 = require("@ocap/asset");
 const wallet_1 = require("@ocap/wallet");
@@ -46,6 +45,7 @@ const nft_templates_1 = require("../nft-templates");
 const validate_1 = require("../validate");
 const util_2 = require("../util");
 const util_meta_1 = require("../util-meta");
+const axios_1 = __importDefault(require("../axios"));
 const debug = (0, debug_1.default)('@blocklet/meta:payment');
 const { toTypeInfo } = did;
 const { BLOCKLET_STORE_META_PATH } = constant_1.default;

package/lib/schema.d.ts

@@ -1,4 +1,7 @@
-import JOI from 'joi';
+import JOI, { Root } from 'joi';
+declare const Joi: Root & {
+    [key: string]: Function;
+};
 declare const titleSchema: JOI.StringSchema<string>;
 declare const descriptionSchema: JOI.StringSchema<string>;
 declare const logoSchema: JOI.StringSchema<string>;
@@ -30,7 +33,7 @@ declare const createBlockletSchema: (baseDir: string, { ensureFiles, ensureDist,
     ensureName?: boolean;
     skipValidateDidName?: boolean;
 }) => JOI.ObjectSchema;
-export { blockletMetaSchema, blockletNameSchema, componentSchema, createBlockletSchema, descriptionSchema, distSchema, endpointSchema, engineSchema, environmentSchema, environmentNameSchema, interfaceSchema, logoSchema, mountPointSchema, updateMountPointSchema, navigationItemSchema, navigationSchema, personSchema, scriptsSchema, serviceSchema, signatureSchema, themeSchema, titleSchema, statsSchema, cacheableSchema, authConfigSchema, };
+export { blockletMetaSchema, blockletNameSchema, componentSchema, createBlockletSchema, descriptionSchema, distSchema, endpointSchema, engineSchema, environmentSchema, environmentNameSchema, interfaceSchema, logoSchema, mountPointSchema, updateMountPointSchema, navigationItemSchema, navigationSchema, personSchema, scriptsSchema, serviceSchema, signatureSchema, themeSchema, titleSchema, statsSchema, cacheableSchema, authConfigSchema, Joi, };
 declare const _default: {
     blockletNameSchema: JOI.StringSchema<string>;
     componentSchema: JOI.ObjectSchema<any>;
@@ -57,5 +60,8 @@ declare const _default: {
     mountPointSchema: JOI.StringSchema<string>;
     updateMountPointSchema: JOI.StringSchema<string>;
     authConfigSchema: JOI.ObjectSchema<any>;
+    Joi: JOI.Root & {
+        [key: string]: Function;
+    };
 };
 export default _default;

package/lib/schema.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.authConfigSchema = exports.cacheableSchema = exports.statsSchema = exports.titleSchema = exports.themeSchema = exports.signatureSchema = exports.serviceSchema = exports.scriptsSchema = exports.personSchema = exports.navigationSchema = exports.navigationItemSchema = exports.updateMountPointSchema = exports.mountPointSchema = exports.logoSchema = exports.interfaceSchema = exports.environmentNameSchema = exports.environmentSchema = exports.engineSchema = exports.endpointSchema = exports.distSchema = exports.descriptionSchema = exports.createBlockletSchema = exports.componentSchema = exports.blockletNameSchema = exports.blockletMetaSchema = void 0;
+exports.Joi = exports.authConfigSchema = exports.cacheableSchema = exports.statsSchema = exports.titleSchema = exports.themeSchema = exports.signatureSchema = exports.serviceSchema = exports.scriptsSchema = exports.personSchema = exports.navigationSchema = exports.navigationItemSchema = exports.updateMountPointSchema = exports.mountPointSchema = exports.logoSchema = exports.interfaceSchema = exports.environmentNameSchema = exports.environmentSchema = exports.engineSchema = exports.endpointSchema = exports.distSchema = exports.descriptionSchema = exports.createBlockletSchema = exports.componentSchema = exports.blockletNameSchema = exports.blockletMetaSchema = void 0;
 const fs_1 = __importDefault(require("fs"));
 const joi_1 = __importDefault(require("joi"));
 const cjk_length_1 = __importDefault(require("cjk-length"));
@@ -48,6 +48,7 @@ const Joi = joi_1.default.extend(joi_extension_semver_1.semver)
     .extend(joi_extension_semver_1.semverRange)
     .extend(extension_1.fileExtension)
     .extend(extension_1.didExtension);
+exports.Joi = Joi;
 const checkLinkHelper = (value, helper) => {
     if ((0, parse_navigation_from_blocklet_1.checkLink)(value)) {
         return value;
@@ -623,20 +624,19 @@ const blockletMetaProps = {
     scripts: scriptsSchema,
     // capabilities
     capabilities: Joi.object({
-        clusterMode: Joi.boolean().default(false),
-        // added in 1.2.2
-        component: Joi.boolean().default(true),
+        clusterMode: Joi.boolean(),
         didSpace: Joi.string()
             .valid(...Object.values(constant_2.BLOCKLET_APP_SPACE_ENDPOINTS))
             .optional(),
         navigation: Joi.boolean().default(true),
-        serverless: Joi.boolean().optional(), // Can the blocklet be installed on serverless
-    }).default({
-        clusterMode: false,
-        component: true,
-    }),
+        serverless: Joi.boolean().optional(),
+        // @deprecated
+        component: Joi.boolean().default(true),
+        resourceExportPage: Joi.string().trim(),
+    }).default({}),
     // Other contents to be included in the bundle
     files: Joi.array().items(Joi.string().trim()).optional(),
+    resources: Joi.array().items(Joi.string().trim().required()),
     // TODO: this field should be refactored in future version
     engine: Joi.alternatives().try(engineSchema, Joi.array().items(engineSchema)).optional(),
     // NOTE: following fields are appended by registry or bundling process
@@ -688,7 +688,6 @@ const createBlockletSchema = (baseDir, { ensureFiles = false, ensureDist = false
         components: componentsSchema({ checkStore: ensureComponentStore }),
         staticComponents: componentsSchema({ isStatic: true, checkStore: ensureComponentStore }),
         name: ensureName ? Joi.string().optional() : Joi.string().required(),
-        resources: Joi.array().items(Joi.string().trim().required()),
     })
         .options({ stripUnknown: true, noDefaults: false, ...schemaOptions })
         .rename('children', 'components')
@@ -743,4 +742,5 @@ exports.default = {
     mountPointSchema,
     updateMountPointSchema,
     authConfigSchema,
+    Joi,
 };

package/lib/types/schema.d.ts

@@ -15,6 +15,7 @@ export interface TBlockletMeta {
         component?: boolean;
         didSpace?: 'required' | 'optional';
         navigation?: boolean;
+        resourceExportPage?: string;
         serverless?: boolean;
     };
     community?: string;
@@ -95,6 +96,7 @@ export interface TBlockletMeta {
         os?: '*' | 'aix' | 'darwin' | 'freebsd' | 'linux' | 'openbsd' | 'sunos' | 'win32' | ('aix' | 'darwin' | 'freebsd' | 'linux' | 'openbsd' | 'sunos' | 'win32')[];
         server?: string;
     };
+    resources?: string[];
     screenshots?: string[];
     scripts?: TScripts;
     signatures?: TSignature[];

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

@@ -1,3 +1,6 @@
-import { urlPathFriendly, isValidUrlPath } from '@abtnode/util/lib/url-path-friendly';
+declare const isValidUrlPath: (name: any) => boolean;
+declare const urlPathFriendly: (name: any, { keepSlash }?: {
+    keepSlash?: boolean;
+}) => any;
 export { isValidUrlPath };
 export default urlPathFriendly;

package/lib/url-path-friendly.js

@@ -1,6 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidUrlPath = void 0;
-const url_path_friendly_1 = require("@abtnode/util/lib/url-path-friendly");
-Object.defineProperty(exports, "isValidUrlPath", { enumerable: true, get: function () { return url_path_friendly_1.isValidUrlPath; } });
-exports.default = url_path_friendly_1.urlPathFriendly;
+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 } = {}) => {
+    // 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-meta.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSourceUrlsFromConfig = exports.getBlockletMetaFromUrls = exports.getBlockletMetaFromUrl = exports.getBlockletMetaByUrl = exports.validateUrl = void 0;
 const url_1 = require("url");
 const fs_1 = __importDefault(require("fs"));
-const axios_1 = __importDefault(require("@abtnode/util/lib/axios"));
 const promise_any_1 = __importDefault(require("promise.any"));
 const url_join_1 = __importDefault(require("url-join"));
 const constant_1 = __importDefault(require("@abtnode/constant"));
+const axios_1 = __importDefault(require("./axios"));
 const did_1 = __importDefault(require("./did"));
 const validate_1 = require("./validate");
 // @ts-ignore

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.16",
+  "version": "1.16.17-beta-7ec31a60",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -24,24 +24,24 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.16",
-    "@abtnode/util": "1.16.16",
-    "@arcblock/did": "1.18.90",
-    "@arcblock/did-ext": "1.18.90",
-    "@arcblock/did-util": "1.18.90",
-    "@arcblock/jwt": "1.18.90",
-    "@blocklet/constant": "1.16.16",
-    "@ocap/asset": "1.18.90",
-    "@ocap/mcrypto": "1.18.90",
-    "@ocap/types": "1.18.90",
-    "@ocap/util": "1.18.90",
-    "@ocap/wallet": "1.18.90",
+    "@abtnode/constant": "1.16.17-beta-7ec31a60",
+    "@arcblock/did": "1.18.91",
+    "@arcblock/did-ext": "1.18.91",
+    "@arcblock/did-util": "1.18.91",
+    "@arcblock/jwt": "1.18.91",
+    "@blocklet/constant": "1.16.17-beta-7ec31a60",
+    "@ocap/asset": "1.18.91",
+    "@ocap/mcrypto": "1.18.91",
+    "@ocap/types": "1.18.91",
+    "@ocap/util": "1.18.91",
+    "@ocap/wallet": "1.18.91",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
     "debug": "^4.3.4",
     "fs-extra": "^10.1.0",
     "hosted-git-info": "3.0.8",
+    "hpagent": "^1.1.0",
     "is-absolute-url": "^3.0.3",
     "is-glob": "^4.0.3",
     "is-var-name": "^2.0.0",
@@ -78,5 +78,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "2de4f6dbad086bd861273a4fc9ca8a87ddda4778"
+  "gitHead": "622bb131130d28c3fc554dcb5dc9d72b7da3fba2"
 }