@blocklet/meta 1.5.13 → 1.15.17

package/lib/constants.js

@@ -1,6 +1,11 @@
 const BLOCKLET_INTERFACE_TYPE_WEB = 'web';
 const BLOCKLET_INTERFACE_TYPE_SERVICE = 'service';
 
+// Wellknown interface declares an sub-interface under web interface
+// The path of the wellknown interface must starts with /.well-known, e.g. /.well-known/acme-challenge)
+// The wellknown interface can be mounted to every endpoint of the abtnode and all blocklets on the abtnode
+const BLOCKLET_INTERFACE_TYPE_WELLKNOWN = 'wellknown';
+
 const BlockletStatus = Object.freeze({
   added: 0,
   downloading: 1,
@@ -60,7 +65,7 @@ const BLOCKLET_INTERFACE_PUBLIC = 'publicUrl';
 const BLOCKLET_INTERFACE_ADMIN = 'adminUrl';
 const BLOCKLET_INTERFACE_CONFIG = 'configUrl';
 const BLOCKLET_INTERFACE_DOC = 'docUrl';
-const BLOCKLET_INTERFACE_WELLKNOWN = 'wellknownUrl';
+const BLOCKLET_INTERFACE_WELLKNOWN = 'wellknownUrl'; // Deprecated
 
 module.exports = Object.freeze({
   BlockletStatus,
@@ -87,7 +92,7 @@ module.exports = Object.freeze({
     DEVELOPMENT: 'development',
   }),
 
-  BLOCKLET_FACTORY_SHARES: { developer: 0.7, registry: 0.3 },
+  BLOCKLET_FACTORY_SHARES: { developer: 0.7, store: 0.3 },
 
   BLOCKLET_DYNAMIC_PATH_PREFIX: '*',
 
@@ -114,7 +119,12 @@ module.exports = Object.freeze({
 
   BLOCKLET_INTERFACE_TYPE_WEB,
   BLOCKLET_INTERFACE_TYPE_SERVICE,
-  BLOCKLET_INTERFACE_TYPES: [BLOCKLET_INTERFACE_TYPE_WEB, BLOCKLET_INTERFACE_TYPE_SERVICE],
+  BLOCKLET_INTERFACE_TYPE_WELLKNOWN,
+  BLOCKLET_INTERFACE_TYPES: [
+    BLOCKLET_INTERFACE_TYPE_WEB,
+    BLOCKLET_INTERFACE_TYPE_SERVICE,
+    BLOCKLET_INTERFACE_TYPE_WELLKNOWN,
+  ],
 
   BLOCKLET_INTERFACE_PROTOCOLS: ['tcp', 'udp', 'http'],
 

package/lib/schema.js

@@ -18,8 +18,12 @@ const {
   BLOCKLET_DYNAMIC_PATH_PREFIX,
   BlockletGroup,
   BLOCKLET_LATEST_REQUIREMENT_ABTNODE,
+  BLOCKLET_INTERFACE_TYPE_WEB,
+  BLOCKLET_INTERFACE_TYPE_WELLKNOWN,
 } = require('./constants');
 
+const WELLKNOWN_PATH_PREFIX = '/.well-known';
+
 const Joi = JOI.extend(semver).extend(semverRange).extend(fileExtension).extend(didExtension);
 
 const environmentSchema = Joi.object({
@@ -277,7 +281,26 @@ const createBlockletSchema = (
     }).default({ abtnode: BLOCKLET_LATEST_REQUIREMENT_ABTNODE, os: '*', cpu: '*' }),
 
     // interfaces: https://github.com/blocklet/blocklet-specification/issues/2
-    interfaces: Joi.array().items(interfaceSchema).unique('name').min(1).default([]),
+    interfaces: Joi.array()
+      .items(interfaceSchema)
+      .unique('name')
+      .min(1)
+      .custom((value, helper) => {
+        const webItems = value.filter((x) => x.type === BLOCKLET_INTERFACE_TYPE_WEB);
+        if (webItems.length > 1) {
+          return helper.message(`Only one ${BLOCKLET_INTERFACE_TYPE_WEB} interface can be declared`);
+        }
+
+        const wellknownItems = value.filter((x) => x.type === BLOCKLET_INTERFACE_TYPE_WELLKNOWN);
+        for (const x of wellknownItems) {
+          if (!x.prefix.startsWith(WELLKNOWN_PATH_PREFIX)) {
+            return helper.message(`Wellknown path prefix must start with: ${WELLKNOWN_PATH_PREFIX}`);
+          }
+        }
+
+        return value;
+      })
+      .default([]),
 
     // environments
     environments: Joi.array().items(environmentSchema).default([]).optional(),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.13",
+  "version": "1.15.17",
   "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.59",
-    "@arcblock/did-ext": "^1.13.59",
-    "@arcblock/did-util": "^1.13.59",
-    "@arcblock/nft": "^1.13.59",
-    "@ocap/asset": "^1.13.59",
-    "@ocap/mcrypto": "^1.13.59",
-    "@ocap/util": "^1.13.59",
-    "@ocap/wallet": "^1.13.59",
+    "@arcblock/did": "^1.13.61",
+    "@arcblock/did-ext": "^1.13.61",
+    "@arcblock/did-util": "^1.13.61",
+    "@arcblock/nft": "^1.13.61",
+    "@ocap/asset": "^1.13.61",
+    "@ocap/mcrypto": "^1.13.61",
+    "@ocap/util": "^1.13.61",
+    "@ocap/wallet": "^1.13.61",
     "ajv": "^7.0.3",
     "debug": "^4.3.2",
     "fs-extra": "^10.0.0",
@@ -42,5 +42,5 @@
   "devDependencies": {
     "jest": "^27.3.1"
   },
-  "gitHead": "abb145ffccdab4a9496a9e8a4dbc617306e17b84"
+  "gitHead": "22715c3ea74d0230f3413162a17f491614b6735a"
 }