@abtnode/core 1.6.14 → 1.6.18

package/lib/util/get-domain-for-blocklet.js

@@ -16,8 +16,8 @@ const getIpDnsDomainForBlocklet = (blocklet, blockletInterface) => {
   }${iName}-${SLOT_FOR_IP_DNS_SITE}.${DEFAULT_IP_DNS_DOMAIN_SUFFIX}`;
 };
 
-const getDidDomainForBlocklet = ({ appId, didDomain }) => {
-  return `${appId.toLowerCase()}.${didDomain}`;
+const getDidDomainForBlocklet = ({ name, daemonDid, didDomain }) => {
+  return `${formatName(name)}-${daemonDid.toLowerCase()}.${didDomain}`;
 };
 
 module.exports = { getIpDnsDomainForBlocklet, getDidDomainForBlocklet };

package/lib/util/router.js

@@ -0,0 +1,13 @@
+const { BLOCKLET_SITE_GROUP_SUFFIX } = require('@abtnode/constant');
+
+const getBlockletDomainGroupName = (did) => `${did}${BLOCKLET_SITE_GROUP_SUFFIX}`;
+
+const getDidFromDomainGroupName = (name) => {
+  const did = name.replace(BLOCKLET_SITE_GROUP_SUFFIX, '');
+  return did;
+};
+
+module.exports = {
+  getBlockletDomainGroupName,
+  getDidFromDomainGroupName,
+};

package/lib/validators/node.js

@@ -9,14 +9,23 @@ const nodeInfoSchema = Joi.object({
   description: Joi.string()
     .required()
     .messages({ zh: { 'string.empty': '描述不能为空' }, en: { 'string.empty': 'Description cannot be empty' } }),
+  registerUrl: Joi.string()
+    .uri({ scheme: [/https?/] })
+    .label('register url')
+    .allow('')
+    .optional()
+    .messages({
+      zh: { 'string.uriCustomScheme': '应用启动器必须是合法的 URL' },
+      en: { 'string.uriCustomScheme': 'Blocklet Launcher must be a valid URL' },
+    }),
   webWalletUrl: Joi.string()
     .uri({ scheme: [/https?/] })
     .label('web wallet url')
     .allow('')
     .optional()
     .messages({
-      zh: { 'string.uriCustomScheme': 'Web DID Wallet 必须是合法的 URL' },
-      en: { 'string.uriCustomScheme': 'Web DID Wallet must be a valid URL' },
+      zh: { 'string.uriCustomScheme': 'Web Wallet 必须是合法的 URL' },
+      en: { 'string.uriCustomScheme': 'Web Wallet must be a valid URL' },
     }),
   autoUpgrade: Joi.boolean(),
   enableWelcomePage: Joi.boolean(),
@@ -31,16 +40,6 @@ const nodeInfoSchema = Joi.object({
         'number.max': 'Disk usage alert threshold cannot be higher than 99%',
       },
     }),
-  // removed in 1.5.1
-  registerUrl: Joi.string()
-    .uri({ scheme: [/https?/] })
-    .label('register url')
-    .allow('')
-    .optional()
-    .messages({
-      zh: { 'string.uriCustomScheme': '注册地址必须是合法的 URL' },
-      en: { 'string.uriCustomScheme': 'Registry URL must be a valid URL' },
-    }),
 }).options({ stripUnknown: true });
 
 module.exports = {

package/lib/validators/permission.js

@@ -2,7 +2,22 @@
 const JOI = require('joi');
 const { getMultipleLangParams } = require('./util');
 
-const nameSchema = JOI.string().trim().max(64);
+const nameSchema = JOI.string()
+  .trim()
+  .max(64)
+  .custom((name) => {
+    const arr = name.split('_');
+    const formatTip = 'The format of permission name should be "{action}_{resource}", e.g. query_data';
+    if (arr.length > 2) {
+      throw new Error(`Too much "_". ${formatTip}`);
+    }
+
+    if (arr.length < 2) {
+      throw new Error(formatTip);
+    }
+
+    return name;
+  });
 const descriptionSchema = JOI.string().trim().max(600);
 
 const createPermissionSchema = JOI.object({

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.14",
+  "version": "1.6.18",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,28 +19,28 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.6.14",
-    "@abtnode/constant": "1.6.14",
-    "@abtnode/cron": "1.6.14",
-    "@abtnode/db": "1.6.14",
-    "@abtnode/logger": "1.6.14",
-    "@abtnode/queue": "1.6.14",
-    "@abtnode/rbac": "1.6.14",
-    "@abtnode/router-provider": "1.6.14",
-    "@abtnode/static-server": "1.6.14",
-    "@abtnode/timemachine": "1.6.14",
-    "@abtnode/util": "1.6.14",
-    "@arcblock/did": "^1.13.79",
-    "@arcblock/event-hub": "1.13.79",
+    "@abtnode/certificate-manager": "1.6.18",
+    "@abtnode/constant": "1.6.18",
+    "@abtnode/cron": "1.6.18",
+    "@abtnode/db": "1.6.18",
+    "@abtnode/logger": "1.6.18",
+    "@abtnode/queue": "1.6.18",
+    "@abtnode/rbac": "1.6.18",
+    "@abtnode/router-provider": "1.6.18",
+    "@abtnode/static-server": "1.6.18",
+    "@abtnode/timemachine": "1.6.18",
+    "@abtnode/util": "1.6.18",
+    "@arcblock/did": "^1.14.8",
+    "@arcblock/event-hub": "1.14.8",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.13.79",
-    "@blocklet/meta": "1.6.14",
+    "@arcblock/vc": "^1.14.8",
+    "@blocklet/meta": "1.6.18",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.13.79",
-    "@ocap/util": "^1.13.79",
-    "@ocap/wallet": "^1.13.79",
+    "@ocap/mcrypto": "^1.14.8",
+    "@ocap/util": "^1.14.8",
+    "@ocap/wallet": "^1.14.8",
     "@slack/webhook": "^5.0.3",
     "axios": "^0.21.4",
     "axon": "^2.0.3",
@@ -57,7 +57,7 @@
     "js-yaml": "^3.14.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
-    "pm2": "^4.2.3",
+    "pm2": "^5.1.2",
     "semver": "^7.3.2",
     "shelljs": "^0.8.4",
     "slugify": "^1.4.6",
@@ -75,5 +75,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "0ae215d5cf1160631bdd9b64639c8fcf80eb2d5f"
+  "gitHead": "2f02f166869d8ebedc0466068f6ed90ab3e07b87"
 }