Upload 104 files

前端页面/core/全局配置.js

@@ -263,6 +263,7 @@ export const CACHE = {
         ...RESOURCE_LIST_PREFIXES
     ],
     RESOURCE_LIST_PREFIXES,
+    CREATOR_DETAILS_CACHE_PREFIX: "api_/api/creators/",
     PUBLIC_LISTS: {
         tasks: { prefix: "TasksCache_", endpoint: "/api/tasks" },
         posts: { prefix: "PostsCache_", endpoint: "/api/posts" },
@@ -628,6 +629,43 @@ export function getTipLevelConfig() {
 // 缓存键：ComfyCommunity_ProfileCache_{account}
 
 const PROFILE_CACHE_PREFIX = "ComfyCommunity_ProfileCache_";
+let profileCacheDefault = { readable: true };
+const profileCacheStates = new Map();
+const profileCacheState = account => profileCacheStates.get(account) || profileCacheDefault;
+function rememberProfileCacheState(account, readable) {
+    if (!profileCacheStates.has(account) && profileCacheStates.size >= CACHE.MAX_MEMORY_ITEMS) {
+        profileCacheStates.clear();
+        profileCacheDefault = { readable: false };
+        for (const pending of _pendingProfileRequests.values()) {
+            clearTimeout(pending.timer);
+            pending.listeners.clear();
+        }
+        _pendingProfileRequests.clear();
+    }
+    const state = { readable };
+    profileCacheStates.set(account, state);
+    return state;
+}
+
+export function captureProfileRead(account) {
+    const state = profileCacheStates.get(account) || rememberProfileCacheState(account, profileCacheDefault.readable);
+    return () => profileCacheState(account) === state;
+}
+
+export function invalidateCachedProfiles(accounts) {
+    for (const account of new Set(accounts)) {
+        if (typeof account !== 'string' || !account.trim()) continue;
+        rememberProfileCacheState(account, false);
+        const pending = _pendingProfileRequests.get(account);
+        if (pending) {
+            _pendingProfileRequests.delete(account);
+            clearTimeout(pending.timer);
+            pending.listeners.clear();
+        }
+        try { localStorage.removeItem(PROFILE_CACHE_PREFIX + account); } catch {}
+    }
+}
+
 const _pendingProfileRequests = new Map();  // 每账号共享请求与全部订阅者
 const PENDING_TIMEOUT = 30000;  // 挂起请求超时清理时间（毫秒）
 let nextAvatarRenderId = 0;
@@ -734,12 +772,16 @@ function _mapAvatarField(profile) {
 }
 
 const PUBLIC_PROFILE_FIELDS = ["account", "name", "avatar", "avatarDataUrl", "intro", "gender", "age",
-    "country", "region", "created_at", "followers", "following", "privacy", "is_admin", "bannerUrl",
+    "country", "region", "created_at", "followers", "following", "following_count", "privacy", "is_admin", "bannerUrl",
     "receivedLikes", "receivedFavorites", "receivedUses"];
 function _publicProfile(profile) {
-    return Object.fromEntries(PUBLIC_PROFILE_FIELDS.filter(key => Object.prototype.hasOwnProperty.call(profile, key))
+    const result = Object.fromEntries(PUBLIC_PROFILE_FIELDS.filter(key => Object.prototype.hasOwnProperty.call(profile, key))
         .map(key => [key, ['avatar', 'avatarDataUrl', 'bannerUrl'].includes(key)
             ? normalizeProfileImageUrl(profile[key]) : profile[key]]));
+    result.following_count = Number.isSafeInteger(result.following_count) && result.following_count >= 0
+        ? result.following_count : (Array.isArray(result.following) ? result.following.length : 0);
+    if (result.privacy?.follows === true) result.following = [];
+    return result;
 }
 
 function _validProfile(profile) {
@@ -753,7 +795,7 @@ function _validProfile(profile) {
  * @returns {Object|null} 缓存的用户资料
  */
 export function getCachedProfile(account) {
-    if (!account) return null;
+    if (!account || !profileCacheState(account).readable) return null;
     try {
         const cached = localStorage.getItem(PROFILE_CACHE_PREFIX + account);
         if (!cached) return null;
@@ -780,6 +822,9 @@ export function setCachedProfile(account, profile) {
     if (!account || !_validProfile(profile)) return;
     try {
         localStorage.setItem(PROFILE_CACHE_PREFIX + account, JSON.stringify(_publicProfile(profile)));
+        const state = profileCacheStates.get(account);
+        if (state) state.readable = true;
+        else rememberProfileCacheState(account, true);
     } catch {}
 }
 
@@ -799,6 +844,7 @@ export function getProfileWithSWR(account, apiFn, onUpdate) {
     // 第二轨：同账号只取一次，但每个视图都订阅结果。
     let entry = _pendingProfileRequests.get(account);
     if (!entry && typeof apiFn === 'function') {
+        const isCurrent = captureProfileRead(account);
         entry = { listeners: new Set(), timer: null };
         _pendingProfileRequests.set(account, entry);
         const release = () => {
@@ -809,7 +855,7 @@ export function getProfileWithSWR(account, apiFn, onUpdate) {
         entry.timer = setTimeout(release, PENDING_TIMEOUT);
         Promise.resolve().then(() => apiFn(account)).then(res => {
             // 超时后的旧结果不能覆盖新请求，也不能重新写入旧资料。
-            if (_pendingProfileRequests.get(account) !== entry) return;
+            if (_pendingProfileRequests.get(account) !== entry || !isCurrent()) return;
             if (res?.status && res.status !== 'success') return;
             const data = res && Object.hasOwn(res, 'data') ? res.data : res;
             if (!_validProfile(data)) return;

前端页面/core/榜单数据来源.js

@@ -2,7 +2,7 @@ import { api, requestCancelManager } from './网络请求API.js';
 import { API, CACHE, PAGINATION } from './全局配置.js';
 import { requireListResponseData, getCacheWithMeta, removeCache, writeListCache } from '../components/性能优化工具.js';
 
-import { captureCacheWrite } from './网络请求_缓存管理.js';
+import { captureCacheWrite, isCreatorsSessionCacheCurrent, markCreatorsSessionCacheCurrent } from './网络请求_缓存管理.js';
 import { getResponseCacheSource } from './网络请求_基础设施.js';
 
 
@@ -99,6 +99,7 @@ export function readSidebarListCache(key, { creators = false } = {}) {
 }
 
 export function readCreatorsSessionCache() {
+    if (!isCreatorsSessionCacheCurrent()) return null;
     let raw;
     try { raw = sessionStorage.getItem(CACHE.LOCAL_KEYS.CREATORS_SESSION); }
     catch { return null; } // 无法读取不等于损坏，保留未知内容。
@@ -116,6 +117,7 @@ export function writeCreatorsSessionCache(data) {
     if (!validCreatorList(data)) return false;
     try {
         sessionStorage.setItem(CACHE.LOCAL_KEYS.CREATORS_SESSION, JSON.stringify(data));
+        markCreatorsSessionCacheCurrent();
         return true;
     } catch { return false; }
 }

前端页面/core/类型定义.js

@@ -29,6 +29,7 @@
  * @property {number} [created_at] - 注册时间戳
  * @property {string[]} [followers] - 粉丝列表
  * @property {string[]} [following] - 关注列表
+ * @property {number} [following_count] - 关注人数
  * @property {PrivacySettings} [privacy] - 隐私设置
  */
 

前端页面/core/网络请求_业务API.js

@@ -8,9 +8,9 @@
 // ==========================================
 
 import { request } from "./网络请求_基础设施.js";
-import { API } from "./全局配置.js";
+import { API, CACHE, invalidateCachedProfiles } from "./全局配置.js";
 import { t } from "../components/用户体验_国际化.js";
-import { removeCache } from "./网络请求_缓存管理.js";
+import { removeCache, invalidateFollowCaches, captureCacheWrite } from "./网络请求_缓存管理.js";
 import { requireListResponseData } from "../components/性能优化工具.js";
 
 function requestPublicList(endpoint, options = {}) {
@@ -63,15 +63,36 @@ const api = {
     },
 
     async getUserProfile(account, options = {}) { return request(`/api/users/${account}`, options); },
-    async updateUserProfile(account, data) { return request(`/api/users/${account}`, { method: "PUT", body: data }); },
-    async updateUserSettings(account, data) { return request(`/api/users/${account}/settings`, { method: "PUT", body: data }); },
-    async updatePrivacy(account, privacy) { return request(`/api/users/${account}/privacy`, { method: "PUT", body: privacy }); },
-    async toggleFollow(userId, targetAccount, isActive) { return request("/api/users/follow", { method: "POST", body: { user_id: userId, target_account: targetAccount, is_active: isActive } }); },
+    async updateUserProfile(account, data) {
+        const response = await request(`/api/users/${account}`, { method: "PUT", body: data });
+        if (response?.status === 'success') invalidateCachedProfiles([account]);
+        return response;
+    },
+    async updateUserSettings(account, data) {
+        const response = await request(`/api/users/${account}/settings`, { method: "PUT", body: data });
+        if (response?.status === 'success') invalidateCachedProfiles([account]);
+        return response;
+    },
+    async updatePrivacy(account, privacy) {
+        const response = await request(`/api/users/${account}/privacy`, { method: "PUT", body: privacy });
+        if (response?.status === 'success') invalidateCachedProfiles([account]);
+        return response;
+    },
+    async toggleFollow(userId, targetAccount, isActive) {
+        const response = await request("/api/users/follow", { method: "POST", body: { user_id: userId, target_account: targetAccount, is_active: isActive } });
+        if (response?.status === 'success') invalidateFollowCaches(userId, targetAccount);
+        return response;
+    },
     async getCreators(sort, limit, options = {}) { return requestPublicList(`/api/creators?sort=${sort}&limit=${limit}`, options); },
     // 🔍 带上取消分组 ID：用户继续输入时，上一次仍在途的搜索请求可被 requestCancelManager 撤销，
     // 不再占用并发额度与超时预算（调用时机见 侧边栏数据引擎.js 的创作者搜索分支）
     async searchCreators(keyword, sort, limit = 50, options = {}) { return requestPublicList(`/api/creators/search?keyword=${encodeURIComponent(keyword)}&sort=${sort}&limit=${limit}`, { componentId: API.SEARCH_COMPONENT_ID, ...options }); },
-    async getCreatorDetails(account, options = {}) { return request(`/api/creators/${account}/details`, options); },
+    async getCreatorDetails(account, options = {}) {
+        const current = captureCacheWrite(`${CACHE.CREATOR_DETAILS_CACHE_PREFIX}${account}/details`);
+        const response = await request(`/api/creators/${account}/details`, options);
+        if (!current()) throw new Error(t('feedback.list_changed_retry'));
+        return response;
+    },
     async uploadFile(file, fileType, timeout = 120000) {
         const formData = new FormData();
         formData.append("file", file);

前端页面/core/网络请求_缓存管理.js

@@ -9,7 +9,7 @@
 //   - 性能优化工具.js (重导出缓存函数，保持向后兼容)
 // ==========================================
 
-import { API, CACHE, getSidebarListCacheKey } from "./全局配置.js";
+import { API, CACHE, getSidebarListCacheKey, invalidateCachedProfiles } from "./全局配置.js";
 
 // ==========================================
 // 📦 缓存底层实现
@@ -40,7 +40,12 @@ const cacheWriteScopes = [
     ...API.PUBLIC_CONDITIONAL_GET_PATHS.map(path => {
         const prefix = `api_${path}`;
         return { prefix, matches: key => key.split(/[?#]/)[0] === prefix, token: {} };
-    })
+    }),
+    { prefix: CACHE.CREATOR_DETAILS_CACHE_PREFIX, matches: key => {
+        const path = key.split(/[?#]/)[0];
+        return path.startsWith(CACHE.CREATOR_DETAILS_CACHE_PREFIX)
+            && /^[^/]+\/details$/.test(path.slice(CACHE.CREATOR_DETAILS_CACHE_PREFIX.length));
+    }, token: {} }
 ];
 
 function _cacheScopeKey(key) {
@@ -54,6 +59,25 @@ export function captureCacheWrite(key) {
     return () => cacheClearToken === clearToken && (!scope || scope.token === token);
 }
 
+let creatorsSessionCurrent = true;
+export function isCreatorsSessionCacheCurrent() {
+    return creatorsSessionCurrent;
+}
+export function markCreatorsSessionCacheCurrent() {
+    creatorsSessionCurrent = true;
+}
+
+function invalidateCreatorsSession() {
+    creatorsSessionCurrent = false;
+    try { sessionStorage.removeItem(CACHE.LOCAL_KEYS.CREATORS_SESSION); } catch {}
+}
+
+export function invalidateFollowCaches(account, targetAccount) {
+    _removeCacheByPrefixes(['api_/api/creators', getSidebarListCacheKey('creators', '')]);
+    invalidateCachedProfiles([account, targetAccount]);
+    invalidateCreatorsSession();
+}
+
 function _revokeCacheWrites(keys, prefix = false) {
     const normalized = (prefix ? keys.map(_cacheScopeKey) : keys).filter(key => typeof key === 'string' && key.length > 0);
     for (const scope of cacheWriteScopes) {
@@ -698,6 +722,12 @@ const CACHE_CONFIG = {
 
 // 🚀 P1优化：精确缓存失效映射（按 HTTP 方法细分）
 // 根据修改的 endpoint 和 HTTP 方法精确清除相关缓存
+const COMMENT_CACHE_PREFIXES = [
+    "api_/api/comments", "api_/api/items", "api_/api/creators", "api_/api/posts", "api_/api/tasks",
+    ...CACHE.RESOURCE_LIST_PREFIXES, getSidebarListCacheKey('creators', ''),
+    CACHE.PUBLIC_LISTS.posts.prefix, CACHE.PUBLIC_LISTS.tasks.prefix, CACHE.LOCAL_KEYS.PROFILE_LIST_PREFIX
+];
+
 const CACHE_INVALIDATION_MAP = {
     // 任务相关
     "/api/tasks": {
@@ -715,8 +745,8 @@ const CACHE_INVALIDATION_MAP = {
     },
     // 评论相关
     "/api/comments": {
-        "POST": ["api_/api/comments", "api_/api/posts", "api_/api/items"],  // 创建评论，清除评论和相关内容缓存
-        "DELETE": ["api_/api/comments", "api_/api/posts", "api_/api/items"] // 删除评论，清除评论和相关内容缓存
+        "POST": COMMENT_CACHE_PREFIXES,
+        "DELETE": COMMENT_CACHE_PREFIXES
     },
     // 商品相关
     "/api/items": {
@@ -792,6 +822,10 @@ export function invalidateRelatedCache(endpoint, method = null) {
         patterns = ["ComfyRanking_ListCache_"];
     }
     
+    if (method === "POST" && /^\/api\/items\/[^/]+\/rating$/.test(endpoint.split(/[?#]/)[0])) {
+        patterns = [...patterns, ...CACHE.RESOURCE_LIST_PREFIXES];
+    }
+
     // 🔧 修复：原实现只遍历 localStorage，漏清 memoryCache —— 而 getCache/getCacheWithMeta
     // 都优先读内存 Map，POST 成功后内存里的旧列表仍会命中并被直接返回（连请求都不发），
     // 表现为「发布/点赞已成功但界面还是旧数据」，要等内存条目 TTL 到期才自愈。
@@ -800,6 +834,8 @@ export function invalidateRelatedCache(endpoint, method = null) {
     // ComfyRanking_ComfyCommunity_ProfileCache_，永远匹配不到，改头像/昵称后该缓存清不掉。
     // 复用两级前缀删除逻辑；同次失效合并为一次存储遍历，兼容带前缀与裸键。
     const cleared = _removeCacheByPrefixes(patterns);
+    if ((method === "POST" || method === "DELETE")
+        && /^\/api\/comments(?:\/|[?#]|$)/.test(endpoint)) invalidateCreatorsSession();
     
     if (cleared > 0) {
         console.log(`🗑️ 精确清除缓存: ${cleared} 个项`);

前端页面/market/资源详情页面组件.js

@@ -10,7 +10,7 @@
 // ==========================================
 
 import { api, proxyImages } from "../core/网络请求API.js";
-import { IS_WEB_MODE, getCachedProfile, setCachedProfile } from "../core/全局配置.js";
+import { IS_WEB_MODE, getCachedProfile, setCachedProfile, captureProfileRead } from "../core/全局配置.js";
 import { normalizeProfileData } from "../profile/个人资料工具.js";
 import { openTipModal } from "../profile/个人中心_赞赏组件.js";
 import { getInstalledVersionStatus, setupResourceInstall } from "./资源安装引擎.js";
@@ -265,8 +265,9 @@ export function createItemDetailView(itemData, currentUser) {
     // 🐛 Bug修复：跳过系统页面的作者信息查询（如关于页面）
     if (!itemData.isSystemPage && itemData.author && scope.isCurrent()) {
         const originalNameEl = container.querySelector("#detail-author-name");
+        const profileCurrent = captureProfileRead(itemData.author);
         api.getUserProfile(itemData.author, scope.readOptions).then(res => {
-            if (!scope.isCurrent() || !originalNameEl?.isConnected || container.querySelector("#detail-author-name") !== originalNameEl) return;
+            if (!profileCurrent() || !scope.isCurrent() || !originalNameEl?.isConnected || container.querySelector("#detail-author-name") !== originalNameEl) return;
             if (res?.status !== 'success') return;
             const profile = normalizeProfileData(res.data, itemData.author);
             setCachedProfile(itemData.author, profile);

前端页面/profile/个人中心_UI模板.js

@@ -68,7 +68,7 @@ export function buildProfileHTML(userData, isMe, isSettingsView, isFollowing, fo
                 <span>👍 ${t('profile.received_likes')}: <strong class="profile-count">${escapeHtml(userData.receivedLikes || 0)}</strong></span>
                 <span>🔖 ${t('profile.received_favorites')}: <strong class="profile-count">${escapeHtml(userData.receivedFavorites || 0)}</strong></span>
                 <button type="button" class="profile-count-link" id="btn-followers">👥 ${t('profile.followers_count')}: <strong class="profile-count">${userData.followers ? userData.followers.length : 0}</strong></button>
-                <button type="button" class="profile-count-link" id="btn-following">🏃 ${t('profile.following_count')}: <strong class="profile-count">${escapeHtml(followingCount)}</strong></button>
+                <button type="button" class="profile-count-link" id="btn-following"${!isMe && userData.privacy?.follows === true ? ' disabled' : ''}>🏃 ${t('profile.following_count')}: <strong class="profile-count">${escapeHtml(followingCount)}</strong></button>
             </div>
         </div>
     `;

前端页面/profile/个人中心视图.js

@@ -12,7 +12,7 @@ import { openRechargeModal } from "../market/资金与钱包_充值组件.js";
 import { openWithdrawModal } from "../market/资金与钱包_提现组件.js";
 import { buildProfileHTML } from "./个人中心_UI模板.js";
 import { openTipModal } from "./个人中心_赞赏组件.js";
-import { getBannerCacheKey, getCurrentAccount, IS_WEB_MODE, CACHE, UI, API, getCachedProfile, setCachedProfile, normalizeProfileImageUrl } from "../core/全局配置.js";
+import { getBannerCacheKey, getCurrentAccount, IS_WEB_MODE, CACHE, UI, API, getCachedProfile, setCachedProfile, captureProfileRead, normalizeProfileImageUrl } from "../core/全局配置.js";
 import { logoutAndClearUserData, eventBus, EVENTS } from "../core/状态管理.js";
 
 
@@ -152,7 +152,7 @@ export function showUserProfile(initialUserData, currentUser = null, isMe = true
         if (currentUser && userData.followers) { isFollowing = userData.followers.includes(currentUser.account); }
 
         const privacy = userData.privacy || {};
-        const followingCount = (!isMe && privacy.follows) ? "***" : (userData.following ? userData.following.length : 0);
+        const followingCount = userData.following_count;
 
         const tabs = [{ id: "published", label: isMe ? t('profile.my_published') : t('profile.their_published') }];
         if (isMe) tabs.push({ id: "acquired", label: t('profile.my_purchased') });
@@ -317,8 +317,9 @@ export function openUserProfileModal(userData) {
     ++profileNavigation;
     const view = showUserProfile(userData, userData, true);
     window.dispatchEvent(new CustomEvent("comfy-route-view", { detail: { view } }));
+    const profileCurrent = captureProfileRead(userData.account);
     _fetchProfileAndWallet(userData.account, { own: true, options: view._profileReadOptions }).then(freshData => {
-        if (!view._profileScope.isCurrent()) return;
+        if (!view._profileScope.isCurrent() || !profileCurrent()) return;
         mergeStoredProfile(userData.account, freshData, sessionStorages(), CACHE.LEGACY_KEYS.USER);
         view.updateData(freshData);
         if (freshData.bannerUrl) syncBannerCache(userData.account, freshData.bannerUrl, view._profileScope,
@@ -329,6 +330,7 @@ export function openUserProfileModal(userData) {
 export async function openOtherUserProfileModal(targetAccount, currentUser) {
     if (currentUser && currentUser.account === targetAccount) return openUserProfileModal(currentUser);
     const generation = ++profileNavigation;
+    const profileCurrent = captureProfileRead(targetAccount);
     const sessionMatches = captureRequestSession();
     const componentId = `profile-open-${++profileSequence}`;
     let activeContainer = null;
@@ -347,7 +349,7 @@ export async function openOtherUserProfileModal(targetAccount, currentUser) {
     const unsubscribe = subscribeTaskSessionChanges(force => { if (force || !sessionMatches()) cancel(); }, {
         target: window, eventBus, events: EVENTS, userKey: CACHE.LEGACY_KEYS.USER, tokenKey: CACHE.LEGACY_KEYS.TOKEN
     });
-    const current = () => !obsolete && generation === profileNavigation && sessionMatches()
+    const current = () => !obsolete && generation === profileNavigation && sessionMatches() && profileCurrent()
         && (!activeContainer || activeContainer._profileScope.isCurrent());
     try {
         const freshData = await _fetchProfileAndWallet(targetAccount, {

前端页面/profile/个人资料工具.js

@@ -20,6 +20,9 @@ export function normalizeProfileData(value, account, own = false) {
     }
     result.privacy = Object.fromEntries(['follows', 'followers', 'likes', 'favorites', 'downloads']
         .map(key => [key, value.privacy?.[key] === true]));
+    result.following_count = !own && Number.isSafeInteger(value.following_count) && value.following_count >= 0
+        ? value.following_count : result.following.length;
+    if (!own && result.privacy.follows) result.following = [];
     result.is_admin = value.is_admin === true || (own && value.isAdmin === true);
     if (own) Object.assign(result, normalizeWalletData({ ...value, status: 'success' }));
     return result;