@blocklet/meta 1.16.41 → 1.16.42-beta-20250403-230303-c167c6a1

package/lib/parse-navigation-from-blocklet.js

@@ -516,6 +516,15 @@ exports.cleanOldNavigationHistory = cleanOldNavigationHistory;
 function parseNavigation(blocklet = {}, options = {}) {
     const { beforeProcess = (v) => v } = options;
     const { navigationList: builtinNavigation, components } = parseBlockletNavigationList(blocklet);
+    // 移除存在 db 中的默认导航
+    if (blocklet?.settings?.navigations) {
+        if (!Array.isArray(blocklet.settings.navigations)) {
+            blocklet.settings.navigations = [];
+        }
+        else {
+            blocklet.settings.navigations = [...blocklet.settings.navigations].filter((item) => !(item?.parent === '/team' && item.from === 'tmpl'));
+        }
+    }
     const customNavigationList = cleanOldNavigationHistory(blocklet?.settings?.navigations || []);
     const compactedNavigation = compactNavigation(beforeProcess(builtinNavigation));
     const patchedNavigation = patchBuiltinNavigation(compactedNavigation);

package/lib/util-meta.js

@@ -14,6 +14,7 @@ const did_1 = __importDefault(require("./did"));
 const validate_1 = require("./validate");
 // @ts-ignore
 const package_json_1 = require("../package.json");
+const with_cache_1 = __importDefault(require("./with-cache"));
 const { BLOCKLET_STORE_API_BLOCKLET_PREFIX } = constant_1.default;
 // HACK: copy from core/state/lib/util/request.js
 const api = axios_1.default.create({
@@ -23,7 +24,7 @@ const api = axios_1.default.create({
         'x-blocklet-server-version': package_json_1.version,
     },
 });
-const validateUrl = async (url, expectedHttpResTypes = ['application/json', 'text/plain']) => {
+const validateUrl = (0, with_cache_1.default)(async (url, expectedHttpResTypes = ['application/json', 'text/plain']) => {
     const parsed = new URL(url);
     const { protocol } = parsed;
     // file
@@ -50,13 +51,13 @@ const validateUrl = async (url, expectedHttpResTypes = ['application/json', 'tex
         return true;
     }
     throw new Error(`Invalid url protocol: ${protocol.replace(/:$/, '')}`);
-};
+}, { maxSize: 1000, maxAge: 1000 * 120 });
 exports.validateUrl = validateUrl;
 const validateBlockletMeta = (meta, opts = {}) => {
     (0, validate_1.fixAndValidateService)(meta);
     return (0, validate_1.validateMeta)(meta, opts);
 };
-const getBlockletMetaByUrl = async (url) => {
+const getBlockletMetaByUrl = (0, with_cache_1.default)(async (url) => {
     const { protocol } = new URL(url);
     if (protocol.startsWith('file')) {
         const decoded = decodeURIComponent((0, url_1.fileURLToPath)(url));
@@ -76,7 +77,7 @@ const getBlockletMetaByUrl = async (url) => {
         return meta;
     }
     throw new Error(`Invalid url protocol: ${protocol.replace(/:$/, '')}`);
-};
+}, { maxSize: 1000, maxAge: 1000 * 30 });
 exports.getBlockletMetaByUrl = getBlockletMetaByUrl;
 const getBlockletMetaFromUrl = async (url, { validateFn = validateBlockletMeta, returnUrl = false, ensureTarball = true, logger, } = {}) => {
     const meta = await getBlockletMetaByUrl(url);

package/lib/util.js

@@ -403,7 +403,20 @@ const wipeSensitiveData = (blocklet) => {
     if (!blocklet) {
         return blocklet;
     }
-    forEachBlocklet(blocklet, (d) => {
+    // Only clone the fields that need to be modified
+    const clone = {
+        ...blocklet,
+        configs: (blocklet.configs || []).map((x) => ({ ...x })),
+        environments: (blocklet.environments || []).map((x) => ({ ...x })),
+        migratedFrom: (blocklet.migratedFrom || []).map((x) => ({ ...x })),
+        settings: blocklet.settings ? { ...blocklet.settings, session: { ...blocklet.settings.session } } : undefined,
+        children: (blocklet.children || []).map((child) => ({
+            ...child,
+            configs: (child.configs || []).map((x) => ({ ...x })),
+            environments: (child.environments || []).map((x) => ({ ...x })),
+        })),
+    };
+    forEachBlocklet(clone, (d) => {
         if (d.configs) {
             d.configs = d.configs.filter((x) => !isPreferenceKey(x));
             d.configs.forEach((x) => {
@@ -421,13 +434,13 @@ const wipeSensitiveData = (blocklet) => {
             x.appSk = '__encrypted__';
         });
         // @ts-ignore
-        delete blocklet.configObj;
+        delete clone.configObj;
         // @ts-ignore
-        delete blocklet.environmentObj;
+        delete clone.environmentObj;
         // @ts-ignore
-        delete blocklet.settings?.session?.salt;
+        delete clone.settings?.session?.salt;
     }, { sync: true });
-    return blocklet;
+    return clone;
 };
 exports.wipeSensitiveData = wipeSensitiveData;
 const isDeletableBlocklet = (blocklet) => {

package/lib/with-cache.d.ts

@@ -0,0 +1,6 @@
+declare function withCache<T>(fn: T, // The function to wrap
+{ maxSize, maxAge }?: {
+    maxSize?: number;
+    maxAge?: number;
+}): T;
+export default withCache;

package/lib/with-cache.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const lru_cache_1 = require("lru-cache");
+function withCache(fn, // The function to wrap
+{ maxSize = 1000, maxAge = 1000 * 120 } = {}) {
+    if (maxAge === 0) {
+        return fn;
+    }
+    const cache = new lru_cache_1.LRUCache({ max: maxSize, ttl: maxAge });
+    return (async (...args) => {
+        const key = JSON.stringify({ v: args });
+        if (cache.has(key) && key.indexOf('file://') === -1) {
+            return cache.get(key);
+        }
+        try {
+            const result = await fn(...args);
+            cache.set(key, result);
+            return result;
+        }
+        catch (error) {
+            console.error(`[Cache Wrapper] Error during function execution for key ${key}:`, error);
+            throw error;
+        }
+    });
+}
+exports.default = withCache;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.41",
+  "version": "1.16.42-beta-20250403-230303-c167c6a1",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -25,13 +25,13 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.41",
-    "@abtnode/docker-utils": "1.16.41",
+    "@abtnode/constant": "1.16.42-beta-20250403-230303-c167c6a1",
+    "@abtnode/docker-utils": "1.16.42-beta-20250403-230303-c167c6a1",
     "@arcblock/did": "1.19.15",
     "@arcblock/did-ext": "1.19.15",
     "@arcblock/did-util": "1.19.15",
     "@arcblock/jwt": "1.19.15",
-    "@blocklet/constant": "1.16.41",
+    "@blocklet/constant": "1.16.42-beta-20250403-230303-c167c6a1",
     "@ocap/asset": "1.19.15",
     "@ocap/mcrypto": "1.19.15",
     "@ocap/types": "1.19.15",
@@ -52,6 +52,7 @@
     "js-yaml": "^4.1.0",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
+    "lru-cache": "^11.0.2",
     "p-limit": "^3.1.0",
     "promise.any": "^2.0.4",
     "slugify": "^1.6.5",
@@ -80,5 +81,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "54be9488459ae9a3544648d495e6204f9fad493a"
+  "gitHead": "34d6d981bb270af1d0ca59704715bfa82949a9fe"
 }