@blocklet/resolver 1.16.23-beta-ce222a8b → 1.16.23-beta-06c3a221

package/index.js

@@ -7,6 +7,7 @@ exports.parseOptionalComponents = exports.filterRequiredComponents = exports.par
 /* eslint-disable prettier/prettier */
 /* eslint-disable no-await-in-loop */
 const semver_1 = __importDefault(require("semver"));
+const lru_cache_1 = __importDefault(require("lru-cache"));
 const did_1 = require("@arcblock/did");
 const constant_1 = require("@blocklet/constant");
 const util_1 = require("@blocklet/meta/lib/util");
@@ -184,7 +185,8 @@ const filterRequiredComponents = (component, children) => {
     return requiredChildren;
 };
 exports.filterRequiredComponents = filterRequiredComponents;
-const parseOptionalComponents = async (children) => {
+const dynamicComponentsCache = new lru_cache_1.default({ max: 300, maxAge: 60 * 60 * 1000 * 3 }); // 3 hours
+const parseOptionalComponents = async (children, logger = console) => {
     if (!children || !children.length) {
         return [];
     }
@@ -223,7 +225,12 @@ const parseOptionalComponents = async (children) => {
             continue;
         }
         try {
-            const { dynamicComponents } = await (0, exports.parseComponents)(child);
+            let dynamicComponents = dynamicComponentsCache.get(child.meta.did);
+            if (!dynamicComponents) {
+                const components = await (0, exports.parseComponents)(child);
+                dynamicComponents = components.dynamicComponents;
+                dynamicComponentsCache.set(child.meta.did, dynamicComponents);
+            }
             for (const component of dynamicComponents) {
                 const { mountPoint, bundleSource, meta } = component;
                 if (!optionalNames.has(meta.name) || appendNames.has(meta.name)) {
@@ -237,12 +244,13 @@ const parseOptionalComponents = async (children) => {
                     bundleSource,
                     meta,
                 };
-                appendNames.add(meta.name);
+                appendNames.add(optionalChild.meta.name);
                 optionalComponents.push(optionalChild);
             }
         }
         catch (err) {
-            throw new Error(`Can not parse optional child: ${child.meta.name}`);
+            // FIXME: parseComponents 有一些错误是符合预期的, 这里不应该抛出
+            logger.warn(`Can not parse optional child: ${child.meta.name}, error:`, err);
         }
     }
     return optionalComponents;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.23-beta-ce222a8b",
+  "version": "1.16.23-beta-06c3a221",
   "description": "Blocklet meta resolver",
   "main": "index.js",
   "files": [
@@ -21,12 +21,13 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@arcblock/did": "^1.18.108",
-    "@blocklet/constant": "1.16.23-beta-ce222a8b",
-    "@blocklet/meta": "1.16.23-beta-ce222a8b",
+    "@blocklet/constant": "1.16.23-beta-06c3a221",
+    "@blocklet/meta": "1.16.23-beta-06c3a221",
+    "lru-cache": "^6.0.0",
     "semver": "^7.3.8"
   },
   "devDependencies": {
-    "@abtnode/types": "1.16.23-beta-ce222a8b",
+    "@abtnode/types": "1.16.23-beta-06c3a221",
     "@arcblock/eslint-config-ts": "^0.2.4",
     "@types/jest": "^29.5.11",
     "@types/node": "^18.11.0",
@@ -38,5 +39,5 @@
     "ts-jest": "^29.1.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "12e2bb15e23b349041139ae79691312067975812"
+  "gitHead": "10d2351eb9a0a222781d803798e15390622e421b"
 }