@abtnode/core 1.8.26 → 1.8.27

package/lib/api/team.js

@@ -12,7 +12,7 @@ const {
   WELLKNOWN_SERVICE_PATH_PREFIX,
 } = require('@abtnode/constant');
 const { isValid: isValidDid } = require('@arcblock/did');
-const { BlockletEvents } = require('@blocklet/meta/lib/constants');
+const { BlockletEvents } = require('@blocklet/constant');
 const { sendToUser } = require('@blocklet/sdk/lib/util/send-notification');
 const {
   createPassportVC,

package/lib/blocklet/extras.js

@@ -1,7 +1,7 @@
 const uniqBy = require('lodash/uniqBy');
 const cloneDeep = require('lodash/cloneDeep');
 const security = require('@abtnode/util/lib/security');
-const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/meta/lib/constants');
+const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/constant');
 
 const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '' }) => {
   const metaConfigs = (oldConfigs || []).filter((x) => !x.custom);

package/lib/blocklet/manager/disk.js

@@ -43,7 +43,7 @@ const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const toBlockletDid = require('@blocklet/meta/lib/did');
 const { validateMeta } = require('@blocklet/meta/lib/validate');
 const { update: updateMetaFile } = require('@blocklet/meta/lib/file');
-const { titleSchema, descriptionSchema, mountPointSchema } = require('@blocklet/meta/lib/schema');
+const { titleSchema, descriptionSchema, mountPointSchema, logoSchema } = require('@blocklet/meta/lib/schema');
 const hasReservedKey = require('@blocklet/meta/lib/has-reserved-key');
 
 const {
@@ -65,7 +65,7 @@ const {
   BLOCKLET_LATEST_SPEC_VERSION,
   BLOCKLET_META_FILE,
   BLOCKLET_CONFIGURABLE_KEY,
-} = require('@blocklet/meta/lib/constants');
+} = require('@blocklet/constant');
 const util = require('../../util');
 const {
   refresh: refreshAccessibleExternalNodeIp,
@@ -870,6 +870,10 @@ class BlockletManager extends BaseBlockletManager {
         x.value = await descriptionSchema.validateAsync(x.value);
       }
 
+      if (x.key === 'BLOCKLET_APP_LOGO') {
+        x.value = await logoSchema.validateAsync(x.value);
+      }
+
       if (x.key === 'BLOCKLET_WALLET_TYPE') {
         if (['default', 'eth'].includes(x.value) === false) {
           throw new Error('Invalid blocklet wallet type, only "default" and "eth" are supported');

package/lib/event.js

@@ -3,7 +3,7 @@ const cloneDeep = require('lodash/cloneDeep');
 const { EventEmitter } = require('events');
 const { wipeSensitiveData } = require('@blocklet/meta/lib/util');
 const logger = require('@abtnode/logger')('@abtnode/core:event');
-const { BLOCKLET_MODES, BlockletStatus, BlockletSource, BlockletEvents } = require('@blocklet/meta/lib/constants');
+const { BLOCKLET_MODES, BlockletStatus, BlockletSource, BlockletEvents } = require('@blocklet/constant');
 const { EVENTS } = require('@abtnode/constant');
 const handleInstanceInStore = require('./util/public-to-store');
 

package/lib/index.js

@@ -5,12 +5,7 @@ const formatContext = require('@abtnode/util/lib/format-context');
 const Cron = require('@abtnode/cron');
 
 const logger = require('@abtnode/logger')('@abtnode/core');
-const {
-  fromBlockletStatus,
-  toBlockletStatus,
-  fromBlockletSource,
-  toBlockletSource,
-} = require('@blocklet/meta/lib/constants');
+const { fromBlockletStatus, toBlockletStatus, fromBlockletSource, toBlockletSource } = require('@blocklet/constant');
 const { getServiceMetas } = require('@blocklet/meta/lib/service');
 const { listProviders } = require('@abtnode/router-provider');
 const { DEFAULT_CERTIFICATE_EMAIL, EVENTS } = require('@abtnode/constant');

package/lib/migrations/1.0.33-blocklets.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-underscore-dangle */
-const { BLOCKLET_DEFAULT_PORT_NAME } = require('@blocklet/meta/lib/constants');
+const { BLOCKLET_DEFAULT_PORT_NAME } = require('@blocklet/constant');
 
 module.exports = async ({ states, printInfo }) => {
   printInfo('Try to update node config to 1.0.33...');

package/lib/router/helper.js

@@ -37,7 +37,7 @@ const {
   BLOCKLET_INTERFACE_TYPE_WEB,
   BLOCKLET_INTERFACE_WELLKNOWN,
   BLOCKLET_INTERFACE_TYPE_WELLKNOWN,
-} = require('@blocklet/meta/lib/constants');
+} = require('@blocklet/constant');
 
 // eslint-disable-next-line global-require
 const logger = require('@abtnode/logger')(`${require('../../package.json').name}:router:helper`);

package/lib/router/index.js

@@ -10,7 +10,7 @@ const {
   BLOCKLET_SITE_GROUP_SUFFIX,
   GATEWAY_REQ_LIMIT,
 } = require('@abtnode/constant');
-const { BLOCKLET_UI_INTERFACES } = require('@blocklet/meta/lib/constants');
+const { BLOCKLET_UI_INTERFACES } = require('@blocklet/constant');
 const logger = require('@abtnode/logger')('@abtnode/core:router');
 
 const expandSites = (sites = []) => {
@@ -191,7 +191,7 @@ Router.formatSites = (sites = []) => {
         if (daemonRule) {
           // Serve meta js: both prefix and suffix do not contain trailing slash
           // NOTICE: 这里隐含了一个约定
-          //   如果安装的 blockletA 和 blockletB 都需要 __meta__.js
+          //   如果安装的 blockletA 和 blockletB 都需要 __blocklet__.js
           //   则不可以将 blockletA mount 在 /a, 将 blockletB mount 在 /a/b (实际上也不会有这种需求)
           site.rules.push({
             from: {
@@ -206,6 +206,19 @@ Router.formatSites = (sites = []) => {
               componentId: rule.to.componentId,
             },
           });
+          site.rules.push({
+            from: {
+              pathPrefix: rule.from.pathPrefix.replace(/\/$/, ''),
+              groupPathPrefix: (rule.from.groupPathPrefix || '').replace(/\/$/, ''),
+              pathSuffix: '/__blocklet__.js',
+            },
+            to: {
+              type: ROUTING_RULE_TYPES.DAEMON,
+              port: daemonRule.to.port,
+              did: rule.to.did,
+              componentId: rule.to.componentId,
+            },
+          });
 
           site.rules.push({
             from: {

package/lib/router/manager.js

@@ -27,7 +27,7 @@ const {
   BLOCKLET_DYNAMIC_PATH_PREFIX,
   BLOCKLET_INTERFACE_TYPE_WEB,
   BlockletGroup,
-} = require('@blocklet/meta/lib/constants');
+} = require('@blocklet/constant');
 const { forEachChildSync } = require('@blocklet/meta/lib/util');
 
 const {

package/lib/states/blocklet.js

@@ -16,7 +16,7 @@ const {
   BLOCKLET_MODES,
   BLOCKLET_DEFAULT_PORT_NAME,
   BLOCKLET_INTERFACE_TYPE_SERVICE,
-} = require('@blocklet/meta/lib/constants');
+} = require('@blocklet/constant');
 
 const logger = require('@abtnode/logger')('state-blocklet');
 

package/lib/util/blocklet.js

@@ -36,7 +36,7 @@ const {
   BLOCKLET_CONFIGURABLE_KEY,
   BLOCKLET_DYNAMIC_PATH_PREFIX,
   fromBlockletStatus,
-} = require('@blocklet/meta/lib/constants');
+} = require('@blocklet/constant');
 const verifyMultiSig = require('@blocklet/meta/lib/verify-multi-sig');
 const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const getBlockletEngine = require('@blocklet/meta/lib/engine');

package/lib/util/index.js

@@ -17,7 +17,7 @@ const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const axios = require('@abtnode/util/lib/axios');
 const parseBlockletMeta = require('@blocklet/meta/lib/parse');
 const { validateMeta, fixAndValidateService } = require('@blocklet/meta/lib/validate');
-const { BlockletStatus, BLOCKLET_INTERFACE_WELLKNOWN } = require('@blocklet/meta/lib/constants');
+const { BlockletStatus, BLOCKLET_INTERFACE_WELLKNOWN } = require('@blocklet/constant');
 const { replaceSlotToIp } = require('@blocklet/meta/lib/util');
 const {
   StatusCode,

package/lib/util/public-to-store.js

@@ -1,5 +1,5 @@
 const { sign } = require('@arcblock/jwt');
-const { BlockletSource } = require('@blocklet/meta/lib/constants');
+const { BlockletSource } = require('@blocklet/constant');
 const { WHO_CAN_ACCESS } = require('@abtnode/constant');
 const logger = require('@abtnode/logger')('@abtnode/util:public-to-store');
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.26",
+  "version": "1.8.27",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,31 +19,32 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.26",
-    "@abtnode/certificate-manager": "1.8.26",
-    "@abtnode/constant": "1.8.26",
-    "@abtnode/cron": "1.8.26",
-    "@abtnode/db": "1.8.26",
-    "@abtnode/logger": "1.8.26",
-    "@abtnode/queue": "1.8.26",
-    "@abtnode/rbac": "1.8.26",
-    "@abtnode/router-provider": "1.8.26",
-    "@abtnode/static-server": "1.8.26",
-    "@abtnode/timemachine": "1.8.26",
-    "@abtnode/util": "1.8.26",
-    "@arcblock/did": "1.17.19",
+    "@abtnode/auth": "1.8.27",
+    "@abtnode/certificate-manager": "1.8.27",
+    "@abtnode/constant": "1.8.27",
+    "@abtnode/cron": "1.8.27",
+    "@abtnode/db": "1.8.27",
+    "@abtnode/logger": "1.8.27",
+    "@abtnode/queue": "1.8.27",
+    "@abtnode/rbac": "1.8.27",
+    "@abtnode/router-provider": "1.8.27",
+    "@abtnode/static-server": "1.8.27",
+    "@abtnode/timemachine": "1.8.27",
+    "@abtnode/util": "1.8.27",
+    "@arcblock/did": "1.17.20",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.17.19",
-    "@arcblock/event-hub": "1.17.19",
-    "@arcblock/jwt": "^1.17.19",
+    "@arcblock/did-util": "1.17.20",
+    "@arcblock/event-hub": "1.17.20",
+    "@arcblock/jwt": "^1.17.20",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.17.19",
-    "@blocklet/meta": "1.8.26",
-    "@blocklet/sdk": "1.8.26",
+    "@arcblock/vc": "1.17.20",
+    "@blocklet/constant": "1.8.27",
+    "@blocklet/meta": "1.8.27",
+    "@blocklet/sdk": "1.8.27",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.17.19",
-    "@ocap/util": "1.17.19",
-    "@ocap/wallet": "1.17.19",
+    "@ocap/mcrypto": "1.17.20",
+    "@ocap/util": "1.17.20",
+    "@ocap/wallet": "1.17.20",
     "@slack/webhook": "^5.0.4",
     "axios": "^0.27.2",
     "axon": "^2.0.3",
@@ -80,5 +81,5 @@
     "express": "^4.18.1",
     "jest": "^27.5.1"
   },
-  "gitHead": "71937dabc196a98a1bb514789bc32aee44a1e8c4"
+  "gitHead": "84b2cb3ee703479f17e88c91650ecf3015cbf6af"
 }