@abtnode/core 1.8.66-beta-b56e3b54 → 1.8.67-beta-f8b4c9ec

package/lib/blocklet/manager/disk.js

@@ -47,7 +47,7 @@ const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-
 const toBlockletDid = require('@blocklet/meta/lib/did');
 const { validateMeta } = require('@blocklet/meta/lib/validate');
 const { update: updateMetaFile } = require('@blocklet/meta/lib/file');
-const { titleSchema, mountPointSchema, environmentNameSchema } = require('@blocklet/meta/lib/schema');
+const { titleSchema, updateMountPointSchema, environmentNameSchema } = require('@blocklet/meta/lib/schema');
 const hasReservedKey = require('@blocklet/meta/lib/has-reserved-key');
 const Lock = require('@abtnode/util/lib/lock');
 
@@ -334,7 +334,7 @@ class BlockletManager extends BaseBlockletManager {
   async installComponent(
     {
       rootDid,
-      mountPoint,
+      mountPoint: tmpMountPoint,
       url,
       file,
       did,
@@ -348,6 +348,7 @@ class BlockletManager extends BaseBlockletManager {
     },
     context = {}
   ) {
+    const mountPoint = await updateMountPointSchema.validateAsync(tmpMountPoint);
     logger.debug('start install component', { rootDid, mountPoint, url });
 
     if (file) {
@@ -1193,8 +1194,8 @@ class BlockletManager extends BaseBlockletManager {
     return this.getBlocklet(rootDid);
   }
 
-  async updateComponentMountPoint({ did, rootDid: inputRootDid, mountPoint }, context) {
-    await mountPointSchema.validateAsync(mountPoint);
+  async updateComponentMountPoint({ did, rootDid: inputRootDid, mountPoint: tmpMountPoint }, context) {
+    const mountPoint = await updateMountPointSchema.validateAsync(tmpMountPoint);
 
     const blocklet = await states.blocklet.getBlocklet(inputRootDid);
 

package/lib/router/index.js

@@ -183,6 +183,10 @@ Router.formatSites = (sites = []) => {
   result.forEach((site) => {
     if (Array.isArray(site.rules) && site.rules.length > 0) {
       const rules = cloneDeep(site.rules);
+
+      let hasRootPathBlockletRule = false;
+      let tmpBlockletRule;
+
       rules.forEach((rule) => {
         if ([ROUTING_RULE_TYPES.BLOCKLET].includes(rule.to.type) === false) {
           return;
@@ -197,6 +201,11 @@ Router.formatSites = (sites = []) => {
         }
 
         if (daemonRule) {
+          if (rule.from.pathPrefix === '/') {
+            hasRootPathBlockletRule = true;
+          }
+          tmpBlockletRule = rule;
+
           // Serve meta js: both prefix and suffix do not contain trailing slash
           // NOTICE: 这里隐含了一个约定
           //   如果安装的 blockletA 和 blockletB 都需要 __blocklet__.js
@@ -244,6 +253,24 @@ Router.formatSites = (sites = []) => {
           });
         }
       });
+
+      // ensure /__blocklet__.js should be proxy to daemon
+      if (daemonRule && !hasRootPathBlockletRule && tmpBlockletRule) {
+        site.rules.push({
+          from: {
+            pathPrefix: '/',
+            groupPathPrefix: '/',
+            pathSuffix: '/__blocklet__.js',
+          },
+          to: {
+            type: ROUTING_RULE_TYPES.DAEMON,
+            port: daemonRule.to.port,
+            did: tmpBlockletRule.to.did,
+            componentId: tmpBlockletRule.to.did,
+            cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
+          },
+        });
+      }
     }
   });
 

package/lib/router/manager.js

@@ -258,8 +258,8 @@ class RouterManager extends EventEmitter {
     return dbSite;
   }
 
-  async addRoutingRule({ id, rule, skipCheckDynamicBlacklist = false }, context = {}) {
-    await validateAddRule({ id, rule }, context);
+  async addRoutingRule({ id, rule: tempRule, skipCheckDynamicBlacklist = false }, context = {}) {
+    const { rule } = await validateAddRule({ id, rule: tempRule }, context);
     const dbSite = await states.site.findOne({ _id: id });
     if (!dbSite) {
       throw new Error(`site ${id} does not exist`);
@@ -294,8 +294,8 @@ class RouterManager extends EventEmitter {
     return newSite;
   }
 
-  async updateRoutingRule({ id, rule, skipProtectedRuleChecking = false }, context = {}) {
-    await validateEditRule({ id, rule }, context);
+  async updateRoutingRule({ id, rule: tmpRule, skipProtectedRuleChecking = false }, context = {}) {
+    const { rule } = await validateEditRule({ id, rule: tmpRule }, context);
     const dbSite = await states.site.findOne({ _id: id, 'rules.id': rule.id });
     if (!dbSite) {
       throw new Error(`site ${id}, rule ${rule.id} does not exist`);

package/lib/validators/router.js

@@ -1,6 +1,7 @@
 /* eslint-disable newline-per-chained-call */
 const Joi = require('joi');
 const { DOMAIN_FOR_DEFAULT_SITE, ROUTING_RULE_TYPES, ROUTER_CACHE_GROUPS } = require('@abtnode/constant');
+const urlFriendly = require('@blocklet/meta/lib/url-friendly').default;
 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]/;
@@ -27,7 +28,8 @@ const ruleSchema = {
       .messages({
         zh: { 'string.empty': 'URL 前缀不能为空', 'string.max': 'URL 前缀的最大长度是 150' },
         en: { 'string.empty': 'URL prefix cannot be empty', 'string.max': 'The maximum length of URL prefix is 150' },
-      }),
+      })
+      .custom((value) => urlFriendly(value)),
     groupPathPrefix: Joi.string().trim().min(1).max(150), // path prefix of interface of root blocklet
     header: Joi.any(), // TODO: header does not take effect
   }),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.66-beta-b56e3b54",
+  "version": "1.8.67-beta-f8b4c9ec",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,33 +19,33 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.66-beta-b56e3b54",
-    "@abtnode/certificate-manager": "1.8.66-beta-b56e3b54",
-    "@abtnode/constant": "1.8.66-beta-b56e3b54",
-    "@abtnode/cron": "1.8.66-beta-b56e3b54",
-    "@abtnode/db": "1.8.66-beta-b56e3b54",
-    "@abtnode/logger": "1.8.66-beta-b56e3b54",
-    "@abtnode/queue": "1.8.66-beta-b56e3b54",
-    "@abtnode/rbac": "1.8.66-beta-b56e3b54",
-    "@abtnode/router-provider": "1.8.66-beta-b56e3b54",
-    "@abtnode/static-server": "1.8.66-beta-b56e3b54",
-    "@abtnode/timemachine": "1.8.66-beta-b56e3b54",
-    "@abtnode/util": "1.8.66-beta-b56e3b54",
-    "@arcblock/did": "1.18.52",
+    "@abtnode/auth": "1.8.67-beta-f8b4c9ec",
+    "@abtnode/certificate-manager": "1.8.67-beta-f8b4c9ec",
+    "@abtnode/constant": "1.8.67-beta-f8b4c9ec",
+    "@abtnode/cron": "1.8.67-beta-f8b4c9ec",
+    "@abtnode/db": "1.8.67-beta-f8b4c9ec",
+    "@abtnode/logger": "1.8.67-beta-f8b4c9ec",
+    "@abtnode/queue": "1.8.67-beta-f8b4c9ec",
+    "@abtnode/rbac": "1.8.67-beta-f8b4c9ec",
+    "@abtnode/router-provider": "1.8.67-beta-f8b4c9ec",
+    "@abtnode/static-server": "1.8.67-beta-f8b4c9ec",
+    "@abtnode/timemachine": "1.8.67-beta-f8b4c9ec",
+    "@abtnode/util": "1.8.67-beta-f8b4c9ec",
+    "@arcblock/did": "1.18.54",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.52",
-    "@arcblock/event-hub": "1.18.52",
-    "@arcblock/jwt": "^1.18.52",
+    "@arcblock/did-util": "1.18.54",
+    "@arcblock/event-hub": "1.18.54",
+    "@arcblock/jwt": "^1.18.54",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.18.52",
-    "@blocklet/constant": "1.8.66-beta-b56e3b54",
-    "@blocklet/meta": "1.8.66-beta-b56e3b54",
-    "@blocklet/sdk": "1.8.66-beta-b56e3b54",
+    "@arcblock/vc": "1.18.54",
+    "@blocklet/constant": "1.8.67-beta-f8b4c9ec",
+    "@blocklet/meta": "1.8.67-beta-f8b4c9ec",
+    "@blocklet/sdk": "1.8.67-beta-f8b4c9ec",
     "@did-space/client": "^0.1.76",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.52",
-    "@ocap/util": "1.18.52",
-    "@ocap/wallet": "1.18.52",
+    "@ocap/mcrypto": "1.18.54",
+    "@ocap/util": "1.18.54",
+    "@ocap/wallet": "1.18.54",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -89,5 +89,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "4d95b431526128c14cd04c0741cac423afce8f48"
+  "gitHead": "ebf19fcbc6d99fff0d214dc0680c4df81aa94d6d"
 }