@blocklet/meta 1.7.4 → 1.7.5

package/lib/did.js

@@ -3,7 +3,7 @@ const { toHex } = require('@ocap/util');
 const { fromPublicKey } = require('@arcblock/did');
 
 const toBlockletDid = (name) => {
-  const pk = toHex(name);
+  const pk = toHex(Buffer.from(typeof name === 'string' ? name.trim() : name));
   return fromPublicKey(pk, { role: types.RoleType.ROLE_ANY });
 };
 

package/lib/schema.js

@@ -37,6 +37,12 @@ const environmentSchema = Joi.object({
   secure: Joi.boolean().default(false),
   validation: Joi.string().optional(),
   shared: Joi.boolean().default((parent) => !parent.secure),
+}).custom((x, helper) => {
+  if (x.secure && x.default) {
+    return helper.message(`Cannot declare default value for secure env ${x.name}`);
+  }
+
+  return x;
 });
 
 const scriptsSchema = Joi.object({

package/lib/util.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-await-in-loop */
 const get = require('lodash/get');
 
-const { NODE_SERVICES } = require('@abtnode/constant');
+const { NODE_SERVICES, SLOT_FOR_IP_DNS_SITE } = require('@abtnode/constant');
 
 const { BlockletGroup, fromBlockletStatus, fromBlockletSource, BLOCKLET_INTERFACE_TYPE_WEB } = require('./constants');
 
@@ -213,6 +213,8 @@ const isInvitedUserOnlyInMeta = (blocklet) => {
   return service && service.config && ['yes', 'not-first'].includes(service.config.invitedUserOnly);
 };
 
+const replaceSlotToIp = (url, ip) => (url || '').replace(SLOT_FOR_IP_DNS_SITE, (ip || '').replace(/\./g, '-'));
+
 module.exports = {
   isFreeBlocklet,
   isComponentBlocklet,
@@ -227,4 +229,5 @@ module.exports = {
   findWebInterface,
   findServiceFromMeta,
   isInvitedUserOnlyInMeta,
+  replaceSlotToIp,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,19 +18,19 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.7.4",
-    "@arcblock/did": "^1.15.3",
-    "@arcblock/did-ext": "^1.15.3",
-    "@arcblock/did-util": "^1.15.3",
-    "@arcblock/nft": "^1.15.3",
-    "@ocap/asset": "^1.15.3",
-    "@ocap/mcrypto": "^1.15.3",
-    "@ocap/util": "^1.15.3",
-    "@ocap/wallet": "^1.15.3",
+    "@abtnode/constant": "1.7.5",
+    "@arcblock/did": "^1.15.7",
+    "@arcblock/did-ext": "^1.15.7",
+    "@arcblock/did-util": "^1.15.7",
+    "@arcblock/nft": "^1.15.7",
+    "@ocap/asset": "^1.15.7",
+    "@ocap/mcrypto": "^1.15.7",
+    "@ocap/util": "^1.15.7",
+    "@ocap/wallet": "^1.15.7",
     "ajv": "^7.0.3",
     "cjk-length": "^1.0.0",
     "debug": "^4.3.3",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.0.1",
     "hosted-git-info": "3.0.8",
     "is-glob": "^4.0.3",
     "joi": "^17.6.0",
@@ -44,5 +44,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "02b25a877e5b56b389ab318a851bea01212e10df"
+  "gitHead": "b17d83773e5a4c06bae390fc70398d49d6dd86b3"
 }