@abtnode/blocklet-services 1.8.58 → 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/build/asset-manifest.json

@@ -1,14 +1,14 @@
 {
   "files": {
     "main.css": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css",
-    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.70a93224.js",
+    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.a359ba8b.js",
     "static/js/560.3efa5410.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/560.3efa5410.chunk.js",
     "static/js/255.d2001b91.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/255.d2001b91.chunk.js",
     "static/js/371.f9acea25.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/371.f9acea25.chunk.js",
     "static/js/737.05b818c2.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/737.05b818c2.chunk.js",
     "static/js/906.f8540d1c.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/906.f8540d1c.chunk.js",
     "static/js/868.ffa052dc.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/868.ffa052dc.chunk.js",
-    "static/js/409.5bba479c.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/409.5bba479c.chunk.js",
+    "static/js/409.fd7e8305.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/409.fd7e8305.chunk.js",
     "static/js/682.c64ae291.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/682.c64ae291.chunk.js",
     "static/js/998.92ae1f72.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/998.92ae1f72.chunk.js",
     "static/js/437.d815f0c0.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/437.d815f0c0.chunk.js",
@@ -42,14 +42,14 @@
     "router-template-styles/styles.css": "/.blocklet/proxy/blocklet-service/router-template-styles/styles.css",
     "index.html": "/.blocklet/proxy/blocklet-service/index.html",
     "main.632501d5.css.map": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css.map",
-    "main.70a93224.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.70a93224.js.map",
+    "main.a359ba8b.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.a359ba8b.js.map",
     "560.3efa5410.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/560.3efa5410.chunk.js.map",
     "255.d2001b91.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/255.d2001b91.chunk.js.map",
     "371.f9acea25.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/371.f9acea25.chunk.js.map",
     "737.05b818c2.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/737.05b818c2.chunk.js.map",
     "906.f8540d1c.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/906.f8540d1c.chunk.js.map",
     "868.ffa052dc.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/868.ffa052dc.chunk.js.map",
-    "409.5bba479c.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/409.5bba479c.chunk.js.map",
+    "409.fd7e8305.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/409.fd7e8305.chunk.js.map",
     "682.c64ae291.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/682.c64ae291.chunk.js.map",
     "998.92ae1f72.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/998.92ae1f72.chunk.js.map",
     "437.d815f0c0.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/437.d815f0c0.chunk.js.map",
@@ -64,6 +64,6 @@
   },
   "entrypoints": [
     "static/css/main.632501d5.css",
-    "static/js/main.70a93224.js"
+    "static/js/main.a359ba8b.js"
   ]
 }

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/.well-known/service/blocklet/favicon"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><script src=".well-known/service/api/env"></script><script src="__blocklet__.js"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.70a93224.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/.well-known/service/blocklet/favicon"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><script src=".well-known/service/api/env"></script><script src="__blocklet__.js"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.a359ba8b.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>