@abtnode/blocklet-services 1.8.59 → 1.8.60

package/api/util/attach-shared-utils.js

@@ -1,12 +1,13 @@
 const get = require('lodash/get');
 
-const { findWebInterface, findComponentById } = require('@blocklet/meta/lib/util');
-const { getDefaultServiceConfig, findService } = require('@blocklet/meta/lib/service');
+const { findComponentById } = require('@blocklet/meta/lib/util');
+const { getDefaultServiceConfig } = require('@blocklet/meta/lib/service');
 const { WHO_CAN_ACCESS } = require('@abtnode/constant');
 const cache = require('../cache');
 
 const formatContext = require('./format-context');
 const getDynamicServiceConfig = require('./get-dynamic-service-config');
+const getStaticServiceConfig = require('./get-static-service-config');
 
 module.exports = ({ node, req, options }) => {
   req.getBlockletUrl = () => req.headers['x-blocklet-url'] || get(options, 'blockletUrl', '');
@@ -34,7 +35,7 @@ module.exports = ({ node, req, options }) => {
 
   /**
    * @return obj | null
-   * @TODO get service config from routing rule
+   * @FIXME this api should ensure high performance
    */
   req.getServiceConfig = async (serviceName, { componentId } = {}) => {
     if (!serviceName) {
@@ -66,32 +67,21 @@ module.exports = ({ node, req, options }) => {
       appDynamicConfig = null;
     }
 
-    const defaultConfigWithAppDynamic = { ...defaultConfig, ...appDynamicConfig };
-
     const _componentId = componentId || req.getBlockletComponentId();
 
+    const componentStaticConfig = getStaticServiceConfig(serviceName, app, _componentId);
+
+    const config = { ...defaultConfig, ...componentStaticConfig, ...appDynamicConfig };
+
     const component = findComponentById(app, _componentId);
 
     if (!component) {
-      return defaultConfigWithAppDynamic;
-    }
-
-    const _interface = findWebInterface(component);
-    if (!_interface) {
-      return defaultConfigWithAppDynamic;
+      return config;
     }
 
-    // find service
-    const service = findService(_interface.services, serviceName);
-    const componentStaticConfig = service?.config;
-
     const componentDynamicConfig = getDynamicServiceConfig(serviceName, component, { type: 'component' });
 
-    if (!componentStaticConfig && !componentDynamicConfig) {
-      return defaultConfigWithAppDynamic;
-    }
-
-    return { ...defaultConfig, ...componentStaticConfig, ...appDynamicConfig, ...componentDynamicConfig };
+    return { ...config, ...componentDynamicConfig };
   };
 
   req.getBlocklet = async ({ useCache = true } = {}) => {

package/api/util/get-static-service-config.js

@@ -0,0 +1,63 @@
+const omit = require('lodash/omit');
+const difference = require('lodash/difference');
+const { findWebInterface, forEachBlockletSync } = require('@blocklet/meta/lib/util');
+const { findService } = require('@blocklet/meta/lib/service');
+const { NODE_SERVICES } = require('@abtnode/constant');
+
+// [a, b], [b, c] => [a, b, c]
+const mergeProfileFields = (a = [], b = []) => a.concat(difference(b, a));
+
+const getAuthConfig = (app, componentId) => {
+  const ret = {};
+
+  let rootConfig = null;
+  let hasComponent = false;
+
+  forEachBlockletSync(app, (component, { id, level }) => {
+    if (id === componentId) {
+      hasComponent = true;
+    }
+
+    const _interface = findWebInterface(component);
+    if (_interface) {
+      const service = findService(_interface.services, NODE_SERVICES.AUTH);
+      const { config } = service || {};
+      if (config) {
+        if (level === 0) {
+          rootConfig = config;
+          // 统一使用 root component 的 allowSwitchProfile
+          if (config.allowSwitchProfile !== undefined) {
+            ret.allowSwitchProfile = config.allowSwitchProfile;
+          }
+        }
+
+        if (id === componentId) {
+          hasComponent = true;
+          // 忽略 component 的 allowSwitchProfile
+          Object.assign(ret, omit(config, ['profileFields', 'allowSwitchProfile']));
+        }
+
+        if (config.profileFields) {
+          ret.profileFields = mergeProfileFields(ret.profileFields, config.profileFields);
+        }
+      }
+    }
+  });
+
+  // 如果没找到 component 时, 使用 root component 的 config #6101
+  if (!hasComponent && rootConfig) {
+    Object.assign(ret, omit(rootConfig, ['profileFields']));
+  }
+
+  return ret;
+};
+
+const getStaticServiceConfig = (serviceName, app, componentId) => {
+  if (serviceName === NODE_SERVICES.AUTH) {
+    return getAuthConfig(app, componentId);
+  }
+
+  throw new Error(`Invalid service name: ${serviceName}`);
+};
+
+module.exports = getStaticServiceConfig;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.59",
+  "version": "1.8.60",
   "description": "Provide unified services for every blocklet",
   "main": "api/index.js",
   "files": [
@@ -31,26 +31,26 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.59",
-    "@abtnode/client": "1.8.59",
-    "@abtnode/constant": "1.8.59",
-    "@abtnode/core": "1.8.59",
-    "@abtnode/cron": "1.8.59",
-    "@abtnode/db": "1.8.59",
-    "@abtnode/logger": "1.8.59",
-    "@abtnode/router-adapter": "1.8.59",
-    "@abtnode/router-templates": "1.8.59",
-    "@abtnode/util": "1.8.59",
+    "@abtnode/auth": "1.8.60",
+    "@abtnode/client": "1.8.60",
+    "@abtnode/constant": "1.8.60",
+    "@abtnode/core": "1.8.60",
+    "@abtnode/cron": "1.8.60",
+    "@abtnode/db": "1.8.60",
+    "@abtnode/logger": "1.8.60",
+    "@abtnode/router-adapter": "1.8.60",
+    "@abtnode/router-templates": "1.8.60",
+    "@abtnode/util": "1.8.60",
     "@arcblock/did-auth": "1.18.34",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
     "@arcblock/event-hub": "1.18.34",
     "@arcblock/jwt": "1.18.34",
     "@arcblock/ws": "1.18.34",
-    "@blocklet/constant": "1.8.59",
+    "@blocklet/constant": "1.8.60",
     "@blocklet/form-builder": "^0.1.10",
     "@blocklet/form-collector": "^0.1.5",
-    "@blocklet/meta": "1.8.59",
-    "@blocklet/sdk": "1.8.59",
+    "@blocklet/meta": "1.8.60",
+    "@blocklet/sdk": "1.8.60",
     "@did-connect/authenticator": "^2.1.33",
     "@did-connect/relay-adapter-express": "^2.1.33",
     "@did-connect/storage-nedb": "^2.1.33",
@@ -83,7 +83,7 @@
     "@nedb/multi": "^2.0.5"
   },
   "devDependencies": {
-    "@abtnode/ux": "1.8.59",
+    "@abtnode/ux": "1.8.60",
     "@arcblock/did-connect": "^2.4.64",
     "@arcblock/icons": "^2.4.64",
     "@arcblock/ux": "^2.4.64",
@@ -147,5 +147,5 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues",
     "email": "shijun@arcblock.io"
   },
-  "gitHead": "2cc84bf7f971585a6cc29b566d33c0a74d1ee94a"
+  "gitHead": "0a56dc596f58d83f22d1ea0d0145d84e7151f5be"
 }