@blocklet/meta 1.6.0 → 1.6.4

package/lib/constants.js

@@ -140,8 +140,9 @@ module.exports = Object.freeze({
   BLOCKLET_DEFAULT_VERSION: '1.0.0',
   BLOCKLET_DEFAULT_PORT_NAME: 'BLOCKLET_PORT',
 
-  BLOCKLET_LATEST_SPEC_VERSION: '1.2.0',
-  BLOCKLET_LATEST_REQUIREMENT_ABTNODE: '>=1.5.15',
+  BLOCKLET_LATEST_SPEC_VERSION: '1.2.1',
+  BLOCKLET_LATEST_REQUIREMENT_SERVER: '>=1.6.2',
+  BLOCKLET_LATEST_REQUIREMENT_ABTNODE: '>=1.5.15', // Deprecated
 
   BLOCKLET_CONFIGURABLE_KEY: {
     BLOCKLET_CLUSTER_SIZE: 'BLOCKLET_CLUSTER_SIZE',

package/lib/info.js

@@ -1,16 +1,30 @@
 const get = require('lodash/get');
 const getBlockletWallet = require('./wallet');
 
-module.exports = (state, nodeSk) => {
+module.exports = (state, nodeSk, { returnWallet = true } = {}) => {
   if (!state || typeof state !== 'object' || !Array.isArray(state.environments) || !get(state, 'meta.did')) {
     throw new Error('Blocklet state must be an object');
   }
+
+  const customName = state.environments.find((x) => x.key === 'BLOCKLET_APP_NAME');
+  const customDescription = state.environments.find((x) => x.key === 'BLOCKLET_APP_DESCRIPTION');
+
+  const { did } = state.meta;
+  const name = get(customName, 'value', state.meta.title || state.meta.name);
+  const description = get(customDescription, 'value', state.meta.description);
+
+  if (!returnWallet) {
+    return {
+      did,
+      name,
+      description,
+    };
+  }
+
   if (!nodeSk || typeof nodeSk !== 'string') {
     throw new Error('Node secret key must be a string');
   }
 
-  const customName = state.environments.find((x) => x.key === 'BLOCKLET_APP_NAME');
-  const customDescription = state.environments.find((x) => x.key === 'BLOCKLET_APP_DESCRIPTION');
   const customSk = state.environments.find((x) => x.key === 'BLOCKLET_APP_SK');
   const customType = state.environments.find((x) => x.key === 'BLOCKLET_WALLET_TYPE');
 
@@ -31,9 +45,9 @@ module.exports = (state, nodeSk) => {
   }
 
   return {
-    did: state.meta.did,
-    name: get(customName, 'value', state.meta.title || state.meta.name),
-    description: get(customDescription, 'value', state.meta.description),
+    did,
+    name,
+    description,
     wallet,
   };
 };

package/lib/payment.js

@@ -5,14 +5,7 @@ const { isValidFactory } = require('@ocap/asset');
 const { toFactoryAddress } = require('@arcblock/did-util');
 const { getBlockletPurchaseTemplate } = require('@arcblock/nft/lib/templates');
 
-const isFreeBlocklet = (meta) => {
-  if (!meta.payment) {
-    return true;
-  }
-
-  const priceList = (meta.payment.price || []).map((x) => x.value || 0);
-  return priceList.every((x) => x === 0);
-};
+const { isFreeBlocklet } = require('./util');
 
 const createShareContract = ({ tokens = [], shares = [] }) => {
   const zeroBN = new BN(0);

package/lib/schema.js

@@ -17,7 +17,7 @@ const {
   BLOCKLET_DEFAULT_PORT_NAME,
   BLOCKLET_DYNAMIC_PATH_PREFIX,
   BlockletGroup,
-  BLOCKLET_LATEST_REQUIREMENT_ABTNODE,
+  BLOCKLET_LATEST_REQUIREMENT_SERVER,
   BLOCKLET_INTERFACE_TYPE_WEB,
   BLOCKLET_INTERFACE_TYPE_WELLKNOWN,
 } = require('./constants');
@@ -274,7 +274,8 @@ const createBlockletSchema = (
     }).default({ start: 60 }),
 
     requirements: Joi.object({
-      abtnode: Joi.semverRange().valid(),
+      abtnode: Joi.semverRange().valid(), // deprecated in v1.6.1
+      server: Joi.semverRange().valid(),
       os: Joi.alternatives().try(
         Joi.string().valid('*', ...BLOCKLET_PLATFORMS),
         Joi.array()
@@ -287,7 +288,7 @@ const createBlockletSchema = (
           .items(Joi.string().valid(...BLOCKLET_ARCHITECTURES))
           .min(1)
       ),
-    }).default({ abtnode: BLOCKLET_LATEST_REQUIREMENT_ABTNODE, os: '*', cpu: '*' }),
+    }).default({ server: BLOCKLET_LATEST_REQUIREMENT_SERVER, os: '*', cpu: '*' }),
 
     // interfaces: https://github.com/blocklet/blocklet-specification/issues/2
     interfaces: Joi.array()

package/lib/util.js

@@ -82,7 +82,17 @@ const getRequiredMissingConfigs = (blocklet) => {
   return missingConfigs;
 };
 
+const isFreeBlocklet = (meta) => {
+  if (!meta.payment) {
+    return true;
+  }
+
+  const priceList = (meta.payment.price || []).map((x) => x.value || 0);
+  return priceList.every((x) => x === 0);
+};
+
 module.exports = {
+  isFreeBlocklet,
   forEachBlocklet,
   isAuthServiceEnabled,
   getRequiredMissingConfigs,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.0",
+  "version": "1.6.4",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,14 +18,14 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "^1.13.65",
-    "@arcblock/did-ext": "^1.13.65",
-    "@arcblock/did-util": "^1.13.65",
-    "@arcblock/nft": "^1.13.65",
-    "@ocap/asset": "^1.13.65",
-    "@ocap/mcrypto": "^1.13.65",
-    "@ocap/util": "^1.13.65",
-    "@ocap/wallet": "^1.13.65",
+    "@arcblock/did": "^1.13.77",
+    "@arcblock/did-ext": "^1.13.77",
+    "@arcblock/did-util": "^1.13.77",
+    "@arcblock/nft": "^1.13.77",
+    "@ocap/asset": "^1.13.77",
+    "@ocap/mcrypto": "^1.13.77",
+    "@ocap/util": "^1.13.77",
+    "@ocap/wallet": "^1.13.77",
     "ajv": "^7.0.3",
     "debug": "^4.3.3",
     "fs-extra": "^10.0.0",
@@ -42,5 +42,5 @@
   "devDependencies": {
     "jest": "^27.3.1"
   },
-  "gitHead": "5927d4780b21ce46406857575c44e1a8667eddaa"
+  "gitHead": "1c144cb9fb9a9952bc92f25cabbdb47a378cbd24"
 }