@blocklet/meta 1.8.27 → 1.8.29

package/lib/payment/v2.js

@@ -2,11 +2,11 @@
 const crypto = require('crypto');
 const debug = require('debug')('@blocklet/meta:payment');
 const joinURL = require('url-join');
-const axios = require('axios').create();
 const stableStringify = require('json-stable-stringify');
 const get = require('lodash/get');
 const pick = require('lodash/pick');
 const cloneDeep = require('lodash/cloneDeep');
+const axios = require('@abtnode/util/lib/axios');
 const { BN, fromTokenToUnit, fromUnitToToken } = require('@ocap/util');
 const { isValidFactory } = require('@ocap/asset');
 const { fromPublicKey } = require('@ocap/wallet');

package/lib/util-meta.js

@@ -1,5 +1,6 @@
+const { fileURLToPath } = require('url');
 const fs = require('fs');
-const axios = require('axios');
+const axios = require('@abtnode/util/lib/axios');
 const any = require('promise.any');
 const joinUrl = require('url-join');
 
@@ -10,11 +11,11 @@ const { validateMeta, fixAndValidateService } = require('./validate');
 
 const validateUrl = async (url, expectedHttpResTypes = ['application/json', 'text/plain']) => {
   const parsed = new URL(url);
-  const { protocol, pathname } = parsed;
+  const { protocol } = parsed;
 
   // file
   if (protocol.startsWith('file')) {
-    const decoded = decodeURIComponent(pathname);
+    const decoded = decodeURIComponent(fileURLToPath(url));
     if (!fs.existsSync(decoded)) {
       throw new Error(`File does not exist: ${decoded}`);
     }
@@ -50,10 +51,10 @@ const validateBlockletMeta = (meta, opts = {}) => {
 };
 
 const getBlockletMetaByUrl = async (url) => {
-  const { protocol, pathname } = new URL(url);
+  const { protocol } = new URL(url);
 
   if (protocol.startsWith('file')) {
-    const decoded = decodeURIComponent(pathname);
+    const decoded = decodeURIComponent(fileURLToPath(url));
     if (!fs.existsSync(decoded)) {
       throw new Error(`File does not exist: ${decoded}`);
     }

package/lib/util.js

@@ -11,6 +11,7 @@ const {
   fromBlockletSource,
   BLOCKLET_INTERFACE_TYPE_WEB,
   BLOCKLET_CONFIGURABLE_KEY,
+  CHAIN_INFO_CONFIG,
 } = require('./constants');
 
 const getComponentId = (component, ancestors = []) =>
@@ -189,6 +190,16 @@ const findComponentById = (blocklet, componentId, { _ancestors = [], returnAnces
   return null;
 };
 
+const isEnvShareable = (env) => {
+  return (
+    !!env &&
+    !!(env.key || env.name) &&
+    !env.secure &&
+    env.shared !== false &&
+    !BLOCKLET_CONFIGURABLE_KEY[env.key || env.name]
+  );
+};
+
 const getSharedConfigObj = (component, ancestors) => {
   const res = {};
   if (!ancestors) {
@@ -442,6 +453,14 @@ const replaceSlotToIp = (url, ip) => (url || '').replace(SLOT_FOR_IP_DNS_SITE, (
 
 const urlFriendly = (name) => slugify(name.replace(/^[@./-]/, '').replace(/[@./_]/g, '-'));
 
+// transform process.env.CHAIN_x => { x: v }
+const getChainInfo = (env) =>
+  Object.entries(CHAIN_INFO_CONFIG).reduce((info, x) => {
+    const [envName, [key, value]] = x;
+    info[key] = get(env, envName) || value;
+    return info;
+  }, {});
+
 module.exports = {
   isFreeBlocklet,
   isFreeComponent,
@@ -454,6 +473,7 @@ module.exports = {
   getSharedConfigObj,
   getAppMissingConfigs,
   getComponentMissingConfigs,
+  isEnvShareable,
   wipeSensitiveData,
   hasRunnableComponent,
   getDisplayName,
@@ -469,4 +489,5 @@ module.exports = {
   findComponentById,
   getParentComponentName,
   getConnectAppUrl,
+  getChainInfo,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.27",
+  "version": "1.8.29",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,17 +18,17 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.27",
-    "@abtnode/util": "1.8.27",
-    "@arcblock/did": "1.17.20",
-    "@arcblock/did-ext": "1.17.20",
-    "@arcblock/did-util": "1.17.20",
-    "@arcblock/jwt": "1.17.20",
-    "@blocklet/constant": "1.8.27",
-    "@ocap/asset": "1.17.20",
-    "@ocap/mcrypto": "1.17.20",
-    "@ocap/util": "1.17.20",
-    "@ocap/wallet": "1.17.20",
+    "@abtnode/constant": "1.8.29",
+    "@abtnode/util": "1.8.29",
+    "@arcblock/did": "1.17.23",
+    "@arcblock/did-ext": "1.17.23",
+    "@arcblock/did-util": "1.17.23",
+    "@arcblock/jwt": "1.17.23",
+    "@blocklet/constant": "1.8.29",
+    "@ocap/asset": "1.17.23",
+    "@ocap/mcrypto": "1.17.23",
+    "@ocap/util": "1.17.23",
+    "@ocap/wallet": "1.17.23",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -36,7 +36,7 @@
     "fs-extra": "^10.1.0",
     "hosted-git-info": "3.0.8",
     "is-glob": "^4.0.3",
-    "joi": "^17.6.0",
+    "joi": "^17.6.2",
     "joi-extension-semver": "^5.0.0",
     "js-yaml": "^4.1.0",
     "json-stable-stringify": "^1.0.1",
@@ -47,12 +47,12 @@
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "body-parser": "^1.20.0",
+    "body-parser": "^1.20.1",
     "compression": "^1.7.4",
-    "detect-port": "^1.3.0",
+    "detect-port": "^1.5.1",
     "expand-tilde": "^2.0.2",
-    "express": "^4.18.1",
+    "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "84b2cb3ee703479f17e88c91650ecf3015cbf6af"
+  "gitHead": "ee52d838f0cf97e551d53a6509cb0da7e5f31978"
 }