@abtnode/core 1.8.26 → 1.8.28

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,
@@ -102,6 +102,7 @@ const {
   findAvailableDid,
   ensureMeta,
   getBlocklet,
+  ensureEnvDefault,
 } = require('../../util/blocklet');
 const { parseSourceUrl } = require('../../util/registry');
 const states = require('../../states');
@@ -870,6 +871,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');
@@ -3371,10 +3376,13 @@ class BlockletManager extends BaseBlockletManager {
 
     if (!childDid) {
       await forEachBlocklet(blocklet, async (b, { ancestors }) => {
-        await states.blockletExtras.setConfigs(
-          [...ancestors.map((x) => x.meta.did), b.meta.did],
-          get(b.meta, 'environments', [])
-        );
+        const environments = get(b.meta, 'environments', []);
+
+        // remove default if ancestors has a value
+        ensureEnvDefault(environments, ancestors);
+
+        // write configs to db
+        await states.blockletExtras.setConfigs([...ancestors.map((x) => x.meta.did), b.meta.did], environments);
       });
     } else {
       const child = blocklet.children.find((x) => x.meta.did === childDid);

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');
@@ -52,6 +52,7 @@ const {
   isComponentBlocklet,
   getSharedConfigObj,
   getComponentName,
+  isEnvShareable,
 } = require('@blocklet/meta/lib/util');
 const toBlockletDid = require('@blocklet/meta/lib/did');
 const { titleSchema, descriptionSchema } = require('@blocklet/meta/lib/schema');
@@ -324,6 +325,8 @@ const getComponentSystemEnvironments = (blocklet) => {
 };
 
 const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
+  const root = (ancestors || [])[0] || blocklet;
+
   // pm2 will force inject env variables of daemon process to blocklet process
   // we can only rewrite these private env variables to empty
   const safeNodeEnvironments = PRIVATE_NODE_ENVS.reduce((o, x) => {
@@ -339,7 +342,11 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
         }
       : {};
 
-  const root = (ancestors || [])[0] || blocklet;
+  // BLOCKLET_DEV_PORT should NOT in components of production mode
+  if (process.env.BLOCKLET_DEV_PORT) {
+    devEnvironments.BLOCKLET_DEV_PORT =
+      blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? process.env.BLOCKLET_DEV_PORT : '';
+  }
 
   const ports = {};
   forEachBlockletSync(root, (x) => {
@@ -1331,6 +1338,35 @@ const getBlocklet = async ({
   return blocklet;
 };
 
+/**
+ * this function has side effect on environments
+ */
+const ensureEnvDefault = (environments, ancestors) => {
+  // remove default if ancestors has a value
+  const envMap = environments.reduce((o, env) => {
+    o[env.name] = env;
+    return o;
+  }, {});
+
+  for (let i = ancestors.length - 1; i >= 0; i--) {
+    const ancestor = ancestors[i];
+    const aEnvironments = get(ancestor.meta, 'environments', []);
+    const aEnv = aEnvironments.find((x) => envMap[x.name]);
+
+    if (!isEnvShareable(aEnv)) {
+      break;
+    }
+
+    const env = envMap[aEnv.name];
+    if (isEnvShareable(env) && aEnv.default) {
+      env.default = '';
+      break;
+    }
+  }
+
+  return environments;
+};
+
 module.exports = {
   forEachBlocklet,
   getBlockletMetaFromUrl: (url) => getBlockletMetaFromUrl(url, { logger }),
@@ -1370,4 +1406,5 @@ module.exports = {
   findAvailableDid,
   ensureMeta,
   getBlocklet,
+  ensureEnvDefault,
 };

package/lib/util/chain.js

@@ -1,4 +1,4 @@
-const axios = require('axios');
+const axios = require('@abtnode/util/lib/axios');
 const get = require('lodash/get');
 
 const getFactoryState = async (endpoint, address) => {

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.28",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,55 +19,56 @@
   "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.28",
+    "@abtnode/certificate-manager": "1.8.28",
+    "@abtnode/constant": "1.8.28",
+    "@abtnode/cron": "1.8.28",
+    "@abtnode/db": "1.8.28",
+    "@abtnode/logger": "1.8.28",
+    "@abtnode/queue": "1.8.28",
+    "@abtnode/rbac": "1.8.28",
+    "@abtnode/router-provider": "1.8.28",
+    "@abtnode/static-server": "1.8.28",
+    "@abtnode/timemachine": "1.8.28",
+    "@abtnode/util": "1.8.28",
+    "@arcblock/did": "1.17.23",
     "@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.23",
+    "@arcblock/event-hub": "1.17.23",
+    "@arcblock/jwt": "^1.17.23",
     "@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.23",
+    "@blocklet/constant": "1.8.28",
+    "@blocklet/meta": "1.8.28",
+    "@blocklet/sdk": "1.8.28",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.17.19",
-    "@ocap/util": "1.17.19",
-    "@ocap/wallet": "1.17.19",
+    "@ocap/mcrypto": "1.17.23",
+    "@ocap/util": "1.17.23",
+    "@ocap/wallet": "1.17.23",
     "@slack/webhook": "^5.0.4",
     "axios": "^0.27.2",
     "axon": "^2.0.3",
     "chalk": "^4.1.2",
     "deep-diff": "^1.0.2",
-    "detect-port": "^1.3.0",
+    "detect-port": "^1.5.1",
     "flat": "^5.0.2",
     "fs-extra": "^10.1.0",
     "get-port": "^5.1.1",
     "is-base64": "^1.1.0",
     "is-ip": "^3.1.0",
     "is-url": "^1.2.4",
-    "joi": "^17.6.0",
+    "joi": "^17.6.2",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
     "pm2": "^5.2.0",
-    "semver": "^7.3.7",
+    "semver": "^7.3.8",
     "shelljs": "^0.8.5",
     "slugify": "^1.6.5",
     "ssri": "^8.0.1",
     "stream-throttle": "^0.1.3",
     "stream-to-promise": "^3.0.0",
-    "systeminformation": "^5.12.4",
+    "systeminformation": "^5.12.6",
     "tar": "^6.1.11",
     "ua-parser-js": "^1.0.2",
     "unzipper": "^0.10.11",
@@ -77,8 +78,8 @@
   "devDependencies": {
     "compression": "^1.7.4",
     "expand-tilde": "^2.0.2",
-    "express": "^4.18.1",
+    "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "71937dabc196a98a1bb514789bc32aee44a1e8c4"
+  "gitHead": "af7aacf5507177600ae563ab597cb42d7223b113"
 }