@abtnode/core 1.16.30-beta-2876881d → 1.16.30-beta-cd65989e

package/lib/blocklet/manager/helper/install-application-from-general.js

@@ -1,11 +1,10 @@
-const joi = require('joi');
-
 const { isInServerlessMode } = require('@abtnode/util/lib/serverless');
 const { BLOCKLET_INSTALL_TYPE, INSTALL_ACTIONS } = require('@abtnode/constant');
 const { BlockletStatus, BlockletEvents, BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/constant');
 
 const logger = require('@abtnode/logger')('@abtnode/core:install-app-general');
 const getApplicationWallet = require('@blocklet/meta/lib/wallet');
+const { installBlockletTitleSchema, installBlockletDescriptionSchema } = require('@blocklet/meta/lib/schema');
 
 const StoreUtil = require('../../../util/store');
 const { getBlockletMetaFromUrl, ensureMeta, validateStore, validateInServerless } = require('../../../util/blocklet');
@@ -48,8 +47,8 @@ const installApplicationFromGeneral = async ({
     componentSourceUrl = inputUrl;
     await validateStore(nodeInfo, componentSourceUrl);
   } else if (type === BLOCKLET_INSTALL_TYPE.CREATE) {
-    await joi.string().label('title').max(20).required().validateAsync(title);
-    await joi.string().label('description').max(80).required().validateAsync(description);
+    await installBlockletTitleSchema.validateAsync(title);
+    await installBlockletDescriptionSchema.validateAsync(description);
   } else {
     throw new Error(`Should not be here: unknown type ${type}`);
   }

package/lib/blocklet/manager/helper/upgrade-components.js

@@ -5,6 +5,7 @@ const logger = require('@abtnode/logger')('@abtnode/core:upgrade-component');
 
 const { BlockletStatus, BlockletEvents } = require('@blocklet/constant');
 const { INSTALL_ACTIONS } = require('@abtnode/constant');
+const { parseOptionalComponents } = require('@blocklet/resolver');
 const {
   getUpdateMetaList,
   parseComponents,
@@ -105,9 +106,11 @@ const upgrade = async ({ updateId, componentDids, context, states, manager }) =>
     return oldComponent;
   });
 
+  const optionalComponentDids = new Set((await parseOptionalComponents(oldBlocklet)).map((x) => x.meta.did));
   dynamicComponents = filterDuplicateComponents(dynamicComponents, children);
-  children.push(...dynamicComponents);
+  dynamicComponents = dynamicComponents.filter((x) => !optionalComponentDids.has(x.meta.did));
 
+  children.push(...dynamicComponents);
   // componentDids
   componentDids.push(...dynamicComponents.map((x) => x.meta.did));
 

package/lib/blocklet/storage/backup/spaces.js

@@ -252,7 +252,7 @@ class SpacesBackup extends BaseBackup {
 
         source: this.syncObjects,
         debug: true,
-        concurrency: 8,
+        concurrency: 2,
         retryCount: 10,
         filter: (object) => {
           // FIXME: @yejianchao 这里需要更完整的黑名单,这一层应该内置于 @did-space/client

package/lib/router/helper.js

@@ -33,8 +33,6 @@ const {
   USER_AVATAR_PATH_PREFIX,
   DOMAIN_FOR_IP_SITE,
   NAME_FOR_WELLKNOWN_SITE,
-  DEFAULT_HTTP_PORT,
-  DEFAULT_HTTPS_PORT,
   ROUTING_RULE_TYPES,
   CERTIFICATE_EXPIRES_OFFSET,
   DEFAULT_SERVICE_PATH,
@@ -76,7 +74,7 @@ const { getFromCache: getAccessibleExternalNodeIp } = require('../util/get-acces
 
 const Router = require('./index');
 const states = require('../states');
-const { getBlockletDomainGroupName, getDidFromDomainGroupName } = require('../util/router');
+const { getBlockletDomainGroupName, getDidFromDomainGroupName, createProviderInstance } = require('../util/router');
 const {
   getBlockletDidDomainList,
   updateDidDocument: updateBlockletDocument,
@@ -1258,12 +1256,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       await providers[providerName].reload();
     } else {
       providers[providerName] = new Router({
-        provider: new Provider({
-          configDir: path.join(dataDirs.router, providerName),
-          httpPort: nodeInfo.routing.httpPort || DEFAULT_HTTP_PORT,
-          httpsPort: nodeInfo.routing.httpsPort || DEFAULT_HTTPS_PORT,
-          cacheEnabled: isGatewayCacheEnabled(nodeInfo),
-        }),
+        provider: createProviderInstance({ nodeInfo, routerDataDir: dataDirs.router }),
         getRoutingParams: async () => {
           try {
             const info = await nodeState.read();
@@ -1434,12 +1427,11 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       const Provider = getProvider(info.routing.provider);
       if (Provider) {
         try {
-          const providerInstance = new Provider({
-            configDir: path.join(dataDirs.router, info.routing.provider),
-            httpPort: info.routing.httpPort || DEFAULT_HTTP_PORT,
-            httpsPort: info.routing.httpsPort || DEFAULT_HTTPS_PORT,
-            cacheEnabled: isGatewayCacheEnabled(info),
+          const providerInstance = createProviderInstance({
+            nodeInfo: info,
+            routerDataDir: dataDirs.router,
           });
+
           await providerInstance.stop();
           logger.info('original router stopped:', { provider: info.routing.provider });
         } catch (err) {

package/lib/router/manager.js

@@ -47,7 +47,12 @@ const { findWebInterface } = require('../util/blocklet');
 const { attachRuntimeDomainAliases, ensureLatestInfo } = require('./helper');
 const Router = require('./index');
 const states = require('../states');
-const { getDidFromDomainGroupName, updateNFTDomainRecord, revokeAndDeleteNFTDomainRecord } = require('../util/router');
+const {
+  getDidFromDomainGroupName,
+  updateNFTDomainRecord,
+  revokeAndDeleteNFTDomainRecord,
+  getGatewayPorts,
+} = require('../util/router');
 
 const checkPathPrefixInBlackList = (pathPrefix, extraBlackList = []) => {
   const blacklist = [
@@ -644,8 +649,15 @@ class RouterManager extends EventEmitter {
     const providerName = getProviderFromNodeInfo(info);
     const Provider = getProvider(providerName);
     const tmpDir = path.join(os.tmpdir(), `${providerName}-${Date.now()}`);
+
+    const { httpPort, httpsPort } = getGatewayPorts(info);
     // disable cache to reduce nginx reload time and memory consumption
-    const provider = new Provider({ configDir: tmpDir, cacheEnabled: false });
+    const provider = new Provider({
+      configDir: tmpDir,
+      cacheEnabled: false,
+      httpPort,
+      httpsPort,
+    });
     const tempRouter = new Router({
       provider,
       getRoutingParams: async () => ({

package/lib/util/get-dynamic-components.js

@@ -1,4 +1,4 @@
-const { default: axios } = require('axios');
+const request = require('./request');
 const { filterDuplicateComponents, parseComponents } = require('./blocklet');
 
 /**
@@ -6,7 +6,7 @@ const { filterDuplicateComponents, parseComponents } = require('./blocklet');
  * @returns {Promise<import('@abtnode/types').TComponentState[]>}
  */
 async function getDynamicComponents({ url }) {
-  const rawMeta = await axios.get(url).then((res) => res.data);
+  const rawMeta = await request.get(url).then((res) => res.data);
   const { dynamicComponents } = await parseComponents({ meta: rawMeta });
 
   const components = filterDuplicateComponents(dynamicComponents);

package/lib/util/router.js

@@ -1,11 +1,15 @@
-const { BLOCKLET_SITE_GROUP_SUFFIX } = require('@abtnode/constant');
+const path = require('path');
+const { BLOCKLET_SITE_GROUP_SUFFIX, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT } = require('@abtnode/constant');
 const axios = require('@abtnode/util/lib/axios');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const { stableStringify } = require('@arcblock/vc');
 const { toBase58 } = require('@ocap/util');
 const { getDidDomainServiceURL } = require('@abtnode/util/lib/did-domain');
+const { getProvider } = require('@abtnode/router-provider');
 const logger = require('@abtnode/logger')('@abtnode/core:router:util');
 
+const { isGatewayCacheEnabled } = require('.');
+
 const getBlockletDomainGroupName = (did) => `${did}${BLOCKLET_SITE_GROUP_SUFFIX}`;
 
 const getDidFromDomainGroupName = (name) => {
@@ -86,9 +90,33 @@ const revokeAndDeleteNFTDomainRecord = async ({ name, blocklet, nodeInfo }) => {
   }
 };
 
+const getGatewayPorts = (info) => {
+  return {
+    httpPort: info.routing?.httpPort || DEFAULT_HTTP_PORT,
+    httpsPort: info.routing?.httpsPort || DEFAULT_HTTPS_PORT,
+  };
+};
+
+const createProviderInstance = ({ nodeInfo, routerDataDir }) => {
+  const providerName = nodeInfo.routing.provider;
+  const Provider = getProvider(providerName);
+  const { httpPort, httpsPort } = getGatewayPorts(nodeInfo);
+
+  logger.info('create router instance', { providerName, httpPort, httpsPort });
+
+  return new Provider({
+    configDir: path.join(routerDataDir, providerName),
+    httpPort,
+    httpsPort,
+    cacheEnabled: isGatewayCacheEnabled(nodeInfo),
+  });
+};
+
 module.exports = {
   getBlockletDomainGroupName,
   getDidFromDomainGroupName,
+  getGatewayPorts,
   updateNFTDomainRecord,
   revokeAndDeleteNFTDomainRecord,
+  createProviderInstance,
 };

package/lib/util/store.js

@@ -49,11 +49,8 @@ const fixAndVerifyMetaFromStore = (meta) => {
 // Note: registry should contain the store endpoint
 const getStoreMeta = async (registry) => {
   try {
-    const url = withQuery(joinURL(registry, BLOCKLET_STORE_META_PATH), {
-      __t__: Date.now(),
-    });
+    const url = withQuery(joinURL(registry, BLOCKLET_STORE_META_PATH), { t: Date.now() });
     const { data } = await request.get(url);
-
     if (!data) {
       return {};
     }
@@ -78,6 +75,7 @@ const getStoreMeta = async (registry) => {
 
     return result;
   } catch (err) {
+    logger.error('Failed to getStoreMeta', err);
     throw new Error(`Can not get meta info for store [${registry}]: ${err.message}`);
   }
 };
@@ -88,12 +86,11 @@ async function getStoreUrl(url) {
   try {
     const { data: meta } = await request.get(joinURL(origin, '__blocklet__.js?type=json&nocache=1'));
     const component = meta.componentMountPoints?.find((item) => item.did === BLOCKLET_STORE_DID);
-
     if (component) {
       mountPoint = component.mountPoint;
     }
-  } catch {
-    // Do nothing
+  } catch (err) {
+    logger.error('Failed to getStoreUrl', err);
   }
 
   return joinURL(origin, mountPoint);
@@ -115,8 +112,8 @@ async function getStoreInfo(url) {
           registryMeta: meta,
         };
       }
-    } catch {
-      // meta is not in store, do nothing
+    } catch (err) {
+      logger.error('Failed to getStoreInfo', err);
     }
   }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.30-beta-2876881d",
+  "version": "1.16.30-beta-cd65989e",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,40 +19,40 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.30-beta-2876881d",
-    "@abtnode/auth": "1.16.30-beta-2876881d",
-    "@abtnode/certificate-manager": "1.16.30-beta-2876881d",
-    "@abtnode/constant": "1.16.30-beta-2876881d",
-    "@abtnode/cron": "1.16.30-beta-2876881d",
-    "@abtnode/logger": "1.16.30-beta-2876881d",
-    "@abtnode/models": "1.16.30-beta-2876881d",
-    "@abtnode/queue": "1.16.30-beta-2876881d",
-    "@abtnode/rbac": "1.16.30-beta-2876881d",
-    "@abtnode/router-provider": "1.16.30-beta-2876881d",
-    "@abtnode/static-server": "1.16.30-beta-2876881d",
-    "@abtnode/timemachine": "1.16.30-beta-2876881d",
-    "@abtnode/util": "1.16.30-beta-2876881d",
-    "@arcblock/did": "1.18.128",
-    "@arcblock/did-auth": "1.18.128",
-    "@arcblock/did-ext": "^1.18.128",
+    "@abtnode/analytics": "1.16.30-beta-cd65989e",
+    "@abtnode/auth": "1.16.30-beta-cd65989e",
+    "@abtnode/certificate-manager": "1.16.30-beta-cd65989e",
+    "@abtnode/constant": "1.16.30-beta-cd65989e",
+    "@abtnode/cron": "1.16.30-beta-cd65989e",
+    "@abtnode/logger": "1.16.30-beta-cd65989e",
+    "@abtnode/models": "1.16.30-beta-cd65989e",
+    "@abtnode/queue": "1.16.30-beta-cd65989e",
+    "@abtnode/rbac": "1.16.30-beta-cd65989e",
+    "@abtnode/router-provider": "1.16.30-beta-cd65989e",
+    "@abtnode/static-server": "1.16.30-beta-cd65989e",
+    "@abtnode/timemachine": "1.16.30-beta-cd65989e",
+    "@abtnode/util": "1.16.30-beta-cd65989e",
+    "@arcblock/did": "1.18.131",
+    "@arcblock/did-auth": "1.18.131",
+    "@arcblock/did-ext": "^1.18.131",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.18.128",
-    "@arcblock/event-hub": "1.18.128",
-    "@arcblock/jwt": "^1.18.128",
+    "@arcblock/did-util": "1.18.131",
+    "@arcblock/event-hub": "1.18.131",
+    "@arcblock/jwt": "^1.18.131",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.128",
-    "@arcblock/vc": "1.18.128",
-    "@blocklet/constant": "1.16.30-beta-2876881d",
-    "@blocklet/env": "1.16.30-beta-2876881d",
-    "@blocklet/meta": "1.16.30-beta-2876881d",
-    "@blocklet/resolver": "1.16.30-beta-2876881d",
-    "@blocklet/sdk": "1.16.30-beta-2876881d",
-    "@blocklet/store": "1.16.30-beta-2876881d",
-    "@did-space/client": "^0.5.17",
+    "@arcblock/validator": "^1.18.131",
+    "@arcblock/vc": "1.18.131",
+    "@blocklet/constant": "1.16.30-beta-cd65989e",
+    "@blocklet/env": "1.16.30-beta-cd65989e",
+    "@blocklet/meta": "1.16.30-beta-cd65989e",
+    "@blocklet/resolver": "1.16.30-beta-cd65989e",
+    "@blocklet/sdk": "1.16.30-beta-cd65989e",
+    "@blocklet/store": "1.16.30-beta-cd65989e",
+    "@did-space/client": "^0.5.27",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.128",
-    "@ocap/util": "1.18.128",
-    "@ocap/wallet": "1.18.128",
+    "@ocap/mcrypto": "1.18.131",
+    "@ocap/util": "1.18.131",
+    "@ocap/wallet": "1.18.131",
     "@slack/webhook": "^5.0.4",
     "archiver": "^7.0.1",
     "axios": "^1.7.2",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "331c97e9bab7380af18616a1053d78b1654b307a"
+  "gitHead": "8646768b8ac83cdb8c213ab17fe8030f3d5dc6fc"
 }