@abtnode/core 1.16.17-beta-7ec31a60 → 1.16.17-beta-0213b250

package/lib/blocklet/manager/disk.js

@@ -3432,6 +3432,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     await updateBlockletDocument({
       blocklet,
       nodeInfo,
+      states,
     });
     logger.info('updated blocklet dns document', { appPid: blocklet.appPid, appDid: blocklet.appDid });
   }

package/lib/blocklet/manager/helper/install-component-from-url.js

@@ -2,7 +2,7 @@ const { sign } = require('@arcblock/jwt');
 
 const logger = require('@abtnode/logger')('@abtnode/core:install-component-url');
 
-const { isFreeBlocklet, isComponentBlocklet } = require('@blocklet/meta/lib/util');
+const { isFreeBlocklet } = require('@blocklet/meta/lib/util');
 const { titleSchema } = require('@blocklet/meta/lib/schema');
 const hasReservedKey = require('@blocklet/meta/lib/has-reserved-key');
 
@@ -66,14 +66,6 @@ const installComponentFromUrl = async ({
     };
   }
 
-  if (!isComponentBlocklet(meta)) {
-    throw new Error(
-      `The blocklet cannot be a component : ${
-        meta.title || meta.name
-      }. The reason may be that the developer set capabilities.component to false in blocklet.yml`
-    );
-  }
-
   if (title) {
     meta.title = await titleSchema.validateAsync(title);
   }

package/lib/router/helper.js

@@ -984,6 +984,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     updateBlockletDocument({
       blocklet,
       nodeInfo,
+      states,
     })
       .then(() => {
         logger.info(`updated blocklet ${blocklet.appDid} dns`);
@@ -1209,6 +1210,8 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
 
   const providers = {}; // we need to keep reference for different router instances
   const handleRouting = async (nodeInfo) => {
+    const now = Date.now();
+    logger.info('start handle routing');
     const providerName = get(nodeInfo, 'routing.provider', null);
     const httpsEnabled = get(nodeInfo, 'routing.https', true);
     logger.debug('handle routing', { providerName, httpsEnabled });
@@ -1272,6 +1275,8 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
 
       await providers[providerName].start();
     }
+
+    logger.info('done handle routing', { cost: Date.now() - now });
   };
 
   const rotateRouterLog = async () => {

package/lib/util/blocklet.js

@@ -1803,12 +1803,12 @@ const getComponentNamesWithVersion = (app = {}, componentDids = []) => {
   return str;
 };
 
-const shouldEnableSlpDomain = ({ mode, launcher, blocklet }) => {
+const shouldEnableSlpDomain = ({ mode, launcher, blockletController }) => {
   if (process.env.NODE_ENV === 'development' && process.env.ABT_NODE_ENABLE_SLP_DOMAIN === 'true') {
     return true;
   }
 
-  return mode === NODE_MODES.SERVERLESS && !!launcher && !!blocklet.controller;
+  return mode === NODE_MODES.SERVERLESS && !!launcher && !!blockletController;
 };
 
 const getSlpDid = (serverDid, appPid) => {
@@ -1824,13 +1824,15 @@ const getSlpDid = (serverDid, appPid) => {
 };
 
 // eslint-disable-next-line require-await
-const updateDidDocument = async ({ blocklet, nodeInfo }) => {
+const updateDidDocument = async ({ blocklet, nodeInfo, states }) => {
   const alsoKnownAs = getBlockletKnownAs(blocklet);
   const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
   const { mode, launcher, did: serverDid } = nodeInfo;
 
   let slpDid = null;
-  const enableSlpDomain = shouldEnableSlpDomain({ mode, launcher, blocklet });
+  const blockletExtra = await states.blockletExtras.getMeta(blocklet.meta.did);
+  const blockletController = blockletExtra?.controller;
+  const enableSlpDomain = shouldEnableSlpDomain({ mode, launcher, blockletController });
   if (enableSlpDomain) {
     slpDid = getSlpDid(serverDid, blocklet.appPid);
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.17-beta-7ec31a60",
+  "version": "1.16.17-beta-0213b250",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.17-beta-7ec31a60",
-    "@abtnode/auth": "1.16.17-beta-7ec31a60",
-    "@abtnode/certificate-manager": "1.16.17-beta-7ec31a60",
-    "@abtnode/constant": "1.16.17-beta-7ec31a60",
-    "@abtnode/cron": "1.16.17-beta-7ec31a60",
-    "@abtnode/logger": "1.16.17-beta-7ec31a60",
-    "@abtnode/models": "1.16.17-beta-7ec31a60",
-    "@abtnode/queue": "1.16.17-beta-7ec31a60",
-    "@abtnode/rbac": "1.16.17-beta-7ec31a60",
-    "@abtnode/router-provider": "1.16.17-beta-7ec31a60",
-    "@abtnode/static-server": "1.16.17-beta-7ec31a60",
-    "@abtnode/timemachine": "1.16.17-beta-7ec31a60",
-    "@abtnode/util": "1.16.17-beta-7ec31a60",
+    "@abtnode/analytics": "1.16.17-beta-0213b250",
+    "@abtnode/auth": "1.16.17-beta-0213b250",
+    "@abtnode/certificate-manager": "1.16.17-beta-0213b250",
+    "@abtnode/constant": "1.16.17-beta-0213b250",
+    "@abtnode/cron": "1.16.17-beta-0213b250",
+    "@abtnode/logger": "1.16.17-beta-0213b250",
+    "@abtnode/models": "1.16.17-beta-0213b250",
+    "@abtnode/queue": "1.16.17-beta-0213b250",
+    "@abtnode/rbac": "1.16.17-beta-0213b250",
+    "@abtnode/router-provider": "1.16.17-beta-0213b250",
+    "@abtnode/static-server": "1.16.17-beta-0213b250",
+    "@abtnode/timemachine": "1.16.17-beta-0213b250",
+    "@abtnode/util": "1.16.17-beta-0213b250",
     "@arcblock/did": "1.18.91",
     "@arcblock/did-auth": "1.18.91",
     "@arcblock/did-ext": "^1.18.91",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.91",
     "@arcblock/vc": "1.18.91",
-    "@blocklet/constant": "1.16.17-beta-7ec31a60",
-    "@blocklet/env": "1.16.17-beta-7ec31a60",
-    "@blocklet/meta": "1.16.17-beta-7ec31a60",
-    "@blocklet/resolver": "1.16.17-beta-7ec31a60",
-    "@blocklet/sdk": "1.16.17-beta-7ec31a60",
+    "@blocklet/constant": "1.16.17-beta-0213b250",
+    "@blocklet/env": "1.16.17-beta-0213b250",
+    "@blocklet/meta": "1.16.17-beta-0213b250",
+    "@blocklet/resolver": "1.16.17-beta-0213b250",
+    "@blocklet/sdk": "1.16.17-beta-0213b250",
     "@did-space/client": "^0.3.8",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.91",
@@ -101,5 +101,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "622bb131130d28c3fc554dcb5dc9d72b7da3fba2"
+  "gitHead": "46a135c2ac17e4c8e8c4d75b35fec561792a637f"
 }