@blocklet/meta 1.7.0 → 1.7.1

package/lib/schema.js

@@ -36,7 +36,7 @@ const environmentSchema = Joi.object({
   required: Joi.boolean().default(false),
   secure: Joi.boolean().default(false),
   validation: Joi.string().optional(),
-  shared: Joi.boolean().default(true),
+  shared: Joi.boolean().default((parent) => !parent.secure),
 });
 
 const scriptsSchema = Joi.object({
@@ -178,6 +178,18 @@ const signatureSchema = Joi.object({
   appended: Joi.array().items(Joi.string()).optional(),
 });
 
+const titleSchema = Joi.string()
+  .trim()
+  .min(3)
+  .custom((value) => {
+    if (cjkLength(value) > MAX_TITLE_LENGTH) {
+      throw new Error(`Blocklet title is too long. Max length is ${MAX_TITLE_LENGTH}`);
+    }
+
+    return value;
+  });
+const descriptionSchema = Joi.string().trim().min(3).max(160);
+
 const createBlockletSchema = (
   baseDir,
   { ensureMain = false, ensureFiles = false, ensureDist = false, ...schemaOptions } = {}
@@ -197,25 +209,14 @@ const createBlockletSchema = (
       })
       .max(MAX_NAME_LENGTH)
       .required(),
-    description: Joi.string().trim().min(3).max(512).required(),
+    description: descriptionSchema.required(),
     group: Joi.string().valid(...BLOCKLET_GROUPS).required(), // prettier-ignore
     main: Joi.when('group', {
       is: Joi.valid(BlockletGroup.gateway),
       then: Joi.forbidden(),
       otherwise: ensureMain ? Joi.file().exists({ baseDir }).required() : Joi.string().trim().required(),
     }),
-    title: Joi.string()
-      .trim()
-      .min(3)
-      .custom((value) => {
-        if (cjkLength(value) > MAX_TITLE_LENGTH) {
-          throw new Error(`Blocklet title is too long. Max length is ${MAX_TITLE_LENGTH}`);
-        }
-
-        return value;
-      })
-      .optional()
-      .allow(''),
+    title: titleSchema.optional().allow(''),
     logo: ensureFiles ? Joi.file().trim().exists({ baseDir }).optional() : Joi.string().trim().optional(),
     specVersion: Joi.semver().valid().gte('1.0.0').optional(),
 
@@ -310,6 +311,14 @@ const createBlockletSchema = (
           .items(Joi.string().valid(...BLOCKLET_ARCHITECTURES))
           .min(1)
       ),
+      fuels: Joi.array().items(
+        Joi.object({
+          endpoint: Joi.string().required(),
+          address: Joi.string().required(),
+          value: Joi.string().required(),
+          reason: Joi.string().required(),
+        })
+      ),
     }).default({ server: BLOCKLET_LATEST_REQUIREMENT_SERVER, os: '*', cpu: '*' }),
 
     // interfaces: https://github.com/blocklet/blocklet-specification/issues/2
@@ -398,4 +407,6 @@ module.exports = {
   scriptsSchema,
   personSchema,
   distSchema,
+  titleSchema,
+  descriptionSchema,
 };

package/lib/util.js

@@ -1,7 +1,9 @@
 /* eslint-disable no-await-in-loop */
 const get = require('lodash/get');
 
-const { BlockletGroup, fromBlockletStatus, fromBlockletSource } = require('./constants');
+const { NODE_SERVICES } = require('@abtnode/constant');
+
+const { BlockletGroup, fromBlockletStatus, fromBlockletSource, BLOCKLET_INTERFACE_TYPE_WEB } = require('./constants');
 
 const forEachBlocklet = (blocklet, cb, { parallel = false, sync } = {}) => {
   // sync
@@ -170,6 +172,47 @@ const fixBlockletStatus = (blocklet) => {
   });
 };
 
+const findWebInterface = (blocklet) => {
+  if (!blocklet) {
+    return null;
+  }
+
+  const meta = blocklet.meta || blocklet || {};
+  const { interfaces = [] } = meta;
+
+  if (!Array.isArray(interfaces)) {
+    return null;
+  }
+
+  return interfaces.find((x) => x.type === BLOCKLET_INTERFACE_TYPE_WEB);
+};
+
+const findServiceFromMeta = (meta, ServiceName) => {
+  const names = [ServiceName];
+
+  // backward compatible
+  if (ServiceName === NODE_SERVICES.AUTH) {
+    names.push(NODE_SERVICES.AUTH_SERVICE);
+  }
+
+  const webInterface = findWebInterface(meta);
+
+  if (!webInterface) {
+    return null;
+  }
+
+  return (webInterface.services || []).find((x) => names.includes(x.name));
+};
+
+const isInvitedUserOnlyInMeta = (blocklet) => {
+  if (!blocklet) {
+    return false;
+  }
+
+  const service = findServiceFromMeta(blocklet.meta, NODE_SERVICES.AUTH);
+  return service && service.config && ['yes', 'not-first'].includes(service.config.invitedUserOnly);
+};
+
 module.exports = {
   isFreeBlocklet,
   isComponentBlocklet,
@@ -181,4 +224,7 @@ module.exports = {
   hasRunnableComponent,
   getDisplayName,
   fixBlockletStatus,
+  findWebInterface,
+  findServiceFromMeta,
+  isInvitedUserOnlyInMeta,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,14 +18,15 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "^1.14.25",
-    "@arcblock/did-ext": "^1.14.25",
-    "@arcblock/did-util": "^1.14.25",
-    "@arcblock/nft": "^1.14.25",
-    "@ocap/asset": "^1.14.25",
-    "@ocap/mcrypto": "^1.14.25",
-    "@ocap/util": "^1.14.25",
-    "@ocap/wallet": "^1.14.25",
+    "@abtnode/constant": "1.7.1",
+    "@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",
     "ajv": "^7.0.3",
     "cjk-length": "^1.0.0",
     "debug": "^4.3.3",
@@ -43,5 +44,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "fc949a5e8a1017fbe17533d3bd78b166c7dad132"
+  "gitHead": "5d7efb21dd09f90206251fb74601ca37b0ef84bf"
 }