@abtnode/core 1.8.64 → 1.8.65-beta-5405baf2

package/lib/router/helper.js

@@ -728,6 +728,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
             rules: [rule],
           },
           skipCheckDynamicBlacklist: true,
+          skipValidation: true,
         },
         context
       );
@@ -1070,10 +1071,15 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
         },
       });
 
-      certManager.on(EVENTS.CERT_ADDED, () => providers[providerName].reload());
-      certManager.on(EVENTS.CERT_REMOVED, () => providers[providerName].reload());
-      certManager.on(EVENTS.CERT_ISSUED, () => providers[providerName].reload());
-      certManager.on(EVENTS.CERT_UPDATED, () => providers[providerName].reload());
+      [
+        BlockletEvents.certIssued,
+        EVENTS.CERT_ADDED,
+        EVENTS.CERT_REMOVED,
+        EVENTS.CERT_ISSUED,
+        EVENTS.CERT_UPDATED,
+      ].forEach((event) => {
+        certManager.on(event, () => providers[providerName].reload());
+      });
 
       await providers[providerName].start();
     }

package/lib/router/manager.js

@@ -8,6 +8,7 @@ const path = require('path');
 const os = require('os');
 const fse = require('fs-extra');
 const get = require('lodash/get');
+const toLower = require('lodash/toLower');
 const { EventEmitter } = require('events');
 const uuid = require('uuid');
 const isUrl = require('is-url');
@@ -154,20 +155,20 @@ class RouterManager extends EventEmitter {
 
   // eslint-disable-next-line no-unused-vars
   async updateRoutingSite(params, context = {}) {
-    await validateUpdateSite(params, context);
-    const site = await states.site.findOne({ _id: params.id });
-    if (!site) {
+    const site = await validateUpdateSite(params, context);
+    const existed = await states.site.findOne({ _id: site.id });
+    if (!existed) {
       throw new Error('Can not update non-existing site');
     }
 
     const updateSet = {};
 
-    if (params.corsAllowedOrigins) {
-      updateSet.corsAllowedOrigins = params.corsAllowedOrigins.filter((x) => x !== '__none__');
+    if (site.corsAllowedOrigins) {
+      updateSet.corsAllowedOrigins = site.corsAllowedOrigins.filter((x) => x !== '__none__');
     }
 
-    if (params.domain) {
-      const newDomain = params.domain;
+    if (site.domain) {
+      const newDomain = site.domain;
       const ruleCountInDB = await states.site.count({
         $or: [{ domain: newDomain }, { domainAliases: newDomain }, { 'domainAliases.value': newDomain }],
       });
@@ -179,18 +180,18 @@ class RouterManager extends EventEmitter {
       updateSet.domain = newDomain;
     }
 
-    const updated = await states.site.update({ _id: params.id }, { $set: updateSet }, { multi: false, upsert: false });
+    const updated = await states.site.update({ _id: site.id }, { $set: updateSet }, { multi: false, upsert: false });
 
-    logger.info('router.site.updated', { params, updated });
-    this.emit('router.site.updated', params.id);
+    logger.info('router.site.updated', { site, updated });
+    this.emit('router.site.updated', site.id);
 
-    const dbSite = await states.site.findOne({ _id: params.id });
+    const dbSite = await states.site.findOne({ _id: site.id });
     await attachRuntimeDomainAliases({ sites: dbSite, context, node: states.node });
     return dbSite;
   }
 
-  async addDomainAlias({ id, domainAlias, force }, context = {}) {
-    await validateAddDomainAlias(domainAlias, context);
+  async addDomainAlias({ id, domainAlias: tmpAlias, force }, context = {}) {
+    const domainAlias = await validateAddDomainAlias(tmpAlias, context);
     const dbSite = await states.site.findOne({ _id: id });
     if (!dbSite) {
       throw new Error(`site ${id} does not exist`);
@@ -222,10 +223,10 @@ class RouterManager extends EventEmitter {
       }
     }
 
-    // let custom domain in front of protected domain
-    const domainAliases = [{ value: domainAlias, isProtected: false }, ...(dbSite.domainAliases || [])];
-
-    const updateResult = await states.site.update({ _id: id }, { $set: { domainAliases } });
+    const updateResult = await states.site.update(
+      { _id: id },
+      { $push: { domainAliases: { value: domainAlias, isProtected: false } } }
+    );
     logger.debug('add domain alias update result', { id, updateResult, domainAlias });
 
     const newSite = await states.site.findOne({ _id: id });
@@ -234,8 +235,8 @@ class RouterManager extends EventEmitter {
     return newSite;
   }
 
-  async deleteDomainAlias({ id, domainAlias }, context = {}) {
-    await validateAddDomainAlias(domainAlias, context);
+  async deleteDomainAlias({ id, domainAlias: tmpAlias }, context = {}) {
+    const domainAlias = await validateAddDomainAlias(tmpAlias, context);
     const dbSite = await states.site.findOne({ _id: id });
     if (!dbSite) {
       throw new Error(`site ${id} does not exist`);
@@ -243,10 +244,10 @@ class RouterManager extends EventEmitter {
 
     dbSite.domainAliases = dbSite.domainAliases.filter((x) => {
       if (typeof x === 'string') {
-        return x !== domainAlias;
+        return toLower(x) !== domainAlias;
       }
 
-      return x.value !== domainAlias;
+      return toLower(x.value) !== domainAlias;
     });
 
     const updateResult = await states.site.update({ _id: id }, { $set: { domainAliases: dbSite.domainAliases } });

package/lib/states/site.js

@@ -77,6 +77,7 @@ class SiteState extends BaseState {
 
   async findOneByBlocklet(did) {
     const result = await this.findOne({ domain: getBlockletDomainGroupName(did) });
+
     return BaseState.renameIdFiledName(result);
   }
 

package/lib/validators/router.js

@@ -5,6 +5,8 @@ const { getMultipleLangParams } = require('./util');
 
 const WILDCARD_DOMAIN_REGEX = /^\*.(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]/;
 
+const DOMAIN_SCHEMA = Joi.string().domain({ minDomainSegments: 1, tlds: false }).lowercase();
+
 const domainMessages = {
   en: {
     'alternatives.match': 'Illegal domain, please enter a domain like arcblock, arcblock.io, *.arcblock.io',
@@ -79,11 +81,7 @@ const ruleSchema = {
 };
 
 const corsSchema = Joi.array()
-  .items(
-    Joi.string().domain({ minDomainSegments: 1, tlds: false }),
-    Joi.string().valid(DOMAIN_FOR_DEFAULT_SITE, '__none__'),
-    Joi.string().ip()
-  )
+  .items(DOMAIN_SCHEMA, Joi.string().valid(DOMAIN_FOR_DEFAULT_SITE, '__none__'), Joi.string().ip())
   .min(1)
   .optional();
 
@@ -91,7 +89,7 @@ const ruleJoiSchema = Joi.object(ruleSchema);
 
 const addDomainAlias = Joi.alternatives()
   .try(
-    Joi.string().domain({ minDomainSegments: 1, tlds: false }),
+    DOMAIN_SCHEMA,
     Joi.string().regex(WILDCARD_DOMAIN_REGEX) // 这种其实是一种特殊的 tld
   )
   .required();
@@ -108,7 +106,7 @@ const updateAliases = domainAliases.required();
 const addSiteSchema = Joi.object({
   domain: Joi.alternatives()
     .try(
-      Joi.string().domain({ minDomainSegments: 1, tlds: false }),
+      DOMAIN_SCHEMA,
       Joi.string().valid('', DOMAIN_FOR_DEFAULT_SITE),
       Joi.string().regex(WILDCARD_DOMAIN_REGEX) // 这种其实是一种特殊的 tld
     )
@@ -125,7 +123,7 @@ const updateSite = Joi.object({
   corsAllowedOrigins: corsSchema,
   domain: Joi.alternatives()
     .try(
-      Joi.string().domain({ minDomainSegments: 1, tlds: false }),
+      DOMAIN_SCHEMA,
       Joi.string().regex(WILDCARD_DOMAIN_REGEX) // 这种其实是一种特殊的 tld
     )
     .optional()

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.64",
+  "version": "1.8.65-beta-5405baf2",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.64",
-    "@abtnode/certificate-manager": "1.8.64",
-    "@abtnode/constant": "1.8.64",
-    "@abtnode/cron": "1.8.64",
-    "@abtnode/db": "1.8.64",
-    "@abtnode/logger": "1.8.64",
-    "@abtnode/queue": "1.8.64",
-    "@abtnode/rbac": "1.8.64",
-    "@abtnode/router-provider": "1.8.64",
-    "@abtnode/static-server": "1.8.64",
-    "@abtnode/timemachine": "1.8.64",
-    "@abtnode/util": "1.8.64",
+    "@abtnode/auth": "1.8.65-beta-5405baf2",
+    "@abtnode/certificate-manager": "1.8.65-beta-5405baf2",
+    "@abtnode/constant": "1.8.65-beta-5405baf2",
+    "@abtnode/cron": "1.8.65-beta-5405baf2",
+    "@abtnode/db": "1.8.65-beta-5405baf2",
+    "@abtnode/logger": "1.8.65-beta-5405baf2",
+    "@abtnode/queue": "1.8.65-beta-5405baf2",
+    "@abtnode/rbac": "1.8.65-beta-5405baf2",
+    "@abtnode/router-provider": "1.8.65-beta-5405baf2",
+    "@abtnode/static-server": "1.8.65-beta-5405baf2",
+    "@abtnode/timemachine": "1.8.65-beta-5405baf2",
+    "@abtnode/util": "1.8.65-beta-5405baf2",
     "@arcblock/did": "1.18.37",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.18.37",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.18.37",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.37",
-    "@blocklet/constant": "1.8.64",
-    "@blocklet/meta": "1.8.64",
-    "@blocklet/sdk": "1.8.64",
+    "@blocklet/constant": "1.8.65-beta-5405baf2",
+    "@blocklet/meta": "1.8.65-beta-5405baf2",
+    "@blocklet/sdk": "1.8.65-beta-5405baf2",
     "@did-space/client": "^0.1.66",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.37",
@@ -88,5 +88,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "2abf7d3078ae9251ddeb394b4f0d82de4d9ababe"
+  "gitHead": "e5dc838baded7031096118462a604fd70d78ff1c"
 }