Upload 101 files

前端页面/components/用户体验_国际化.js

@@ -25,7 +25,7 @@ const translations = {
         'skill.directory_truncated': "仅显示部分子文件夹，可直接输入完整目录地址。",
         'skill.directory_ready': "核对当前目录后，点击“使用此目录”。",
         'skill.local_update_required': "本地插件尚未支持目录选择，请更新并重启 ComfyUI。",
-        'skill.invalid_package': "未找到有效的 Skill 文件，请发布者检查资源内容。",
+        'skill.invalid_package': "资源包含无法安全安装的文件，请发布者检查资源内容。",
         'skill.plan_invalid': "安装准备已失效，请重新选择目录。",
         'skill.identity_changed': "登录状态或资源权限已变化，请重新确认后安装。",
         'skill.source_changed': "资源地址已变化，请重新准备安装。",
@@ -40,6 +40,7 @@ const translations = {
         'skill.preview_shared': "共用文件",
         'skill.preparing': "正在准备 Skill 文件…",
         'skill.prepared': "文件已准备，请核对安装内容。",
+        'skill.checking_result': '正在核实安装结果...',
         'skill.cancelled': "已取消；接收目录未写入。",
         'skill.outcome_unknown': "安装结果暂时无法确认。请先检查所选接收目录，勿重复提交。",
 
@@ -1815,7 +1816,7 @@ const translations = {
         'skill.directory_truncated': "Only some subfolders are shown. You can enter the full folder path.",
         'skill.directory_ready': "Check the current folder, then select “Use this folder”.",
         'skill.local_update_required': "Update the local plugin and restart ComfyUI to enable folder selection.",
-        'skill.invalid_package': "No valid Skill files were found. Ask the publisher to check the resource.",
+        'skill.invalid_package': "The resource contains files that cannot be installed safely. Ask the publisher to check the resource.",
         'skill.plan_invalid': "The installation preparation is no longer valid. Choose the folder again.",
         'skill.identity_changed': "Your login or resource permissions changed. Check them before installing.",
         'skill.source_changed': "The resource address changed. Prepare the installation again.",
@@ -1830,6 +1831,7 @@ const translations = {
         'skill.preview_shared': "Shared files",
         'skill.preparing': "Preparing Skill files…",
         'skill.prepared': "Files are ready. Review the installation contents.",
+        'skill.checking_result': 'Checking installation result...',
         'skill.cancelled': "Cancelled; the destination was not changed.",
         'skill.outcome_unknown': "The installation outcome is unconfirmed. Check the selected destination before submitting again.",
 

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

@@ -108,11 +108,12 @@ export const SKILL_INSTALL = Object.freeze({
     PATH: '/community_hub/skill_install',
     PREFLIGHT_TIMEOUT: 30000,
     CONTROL_TIMEOUT: 45000,
+    RESULT_TIMEOUT: 5000,
     STREAM_TIMEOUT: 1200000,
     RESPONSE_MAX_BYTES: 1024 * 1024,
     PATH_MAX_BYTES: 32768,
     MAX_DIRECTORIES: 128,
-    MAX_ITEMS: 1000,
+    MAX_ITEMS: 1,
     MODAL_WIDTH: '640px'
 });
 

前端页面/market/Skill安装流程.js

@@ -45,12 +45,12 @@ export function skillErrorMessage(error) {
     return t(errorKey);
 }
 
-async function control(action, body, signal) {
+async function control(action, body, signal, timeout = SKILL_INSTALL.CONTROL_TIMEOUT) {
     const controller = new AbortController();
     const abort = () => controller.abort();
     signal?.addEventListener('abort', abort, { once: true });
     if (signal?.aborted) controller.abort();
-    const timer = setTimeout(abort, SKILL_INSTALL.CONTROL_TIMEOUT);
+    const timer = setTimeout(abort, timeout);
     try {
         if (controller.signal.aborted) throw failure('operation_cancelled');
         const response = await fetch(SKILL_INSTALL.PATH, {
@@ -59,7 +59,8 @@ async function control(action, body, signal) {
         });
         if (response.status === 404 || response.status === 405) throw failure('local_update_required');
         const value = await readLocalJSON(response, controller, SKILL_INSTALL.RESPONSE_MAX_BYTES);
-        if (!response.ok || !object(value) || value.status !== 'success' || value.installed !== false
+        if (!response.ok || !object(value) || value.status !== 'success' || !(value.installed === false
+                || action === 'status' && value.phase === 'complete' && value.installed === true)
                 || Object.hasOwn(value, 'error') || Object.hasOwn(value, 'error_code')) {
             throw failure(object(value) && typeof value.error_code === 'string' ? value.error_code : 'invalid_metadata');
         }
@@ -145,6 +146,13 @@ export function chooseSkillDirectory(scope) {
     });
 }
 
+function confirmed(result, version) {
+    return object(result) && result.status === 'success' && result.phase === 'complete'
+        && result.installed === true && (!Object.hasOwn(result, 'outcomeUnknown') || result.outcomeUnknown === false)
+        && result.installed_version === version
+        && !Object.hasOwn(result, 'error') && !Object.hasOwn(result, 'error_code');
+}
+
 function validReady(result, plan, target) {
     return object(result) && result.status === 'success' && result.phase === 'ready'
         && result.installed === false && (!Object.hasOwn(result, 'outcomeUnknown') || result.outcomeUnknown === false)
@@ -183,14 +191,18 @@ export async function runSkillInstall({ target, credentials, scope, confirm, onP
         try { result = await stream('commit'); }
         catch (error) {
             if (error?.fallbackSafe) return { status: 'error', error_code: 'local_update_required', outcomeUnknown: false };
-            return { status: 'error', outcomeUnknown: true };
         }
-        if (object(result) && result.status === 'success' && result.phase === 'complete'
-                && result.installed === true && (!Object.hasOwn(result, 'outcomeUnknown') || result.outcomeUnknown === false)
-                && result.installed_version === ready.installed_version
-                && !Object.hasOwn(result, 'error') && !Object.hasOwn(result, 'error_code')) return result;
+        if (confirmed(result, ready.installed_version)) return result;
         if (object(result) && result.status === 'error' && result.outcomeUnknown === false
                 && typeof result.error_code === 'string') return result;
+        if (scope.isCurrent() && !signal.aborted) {
+            try {
+                onProgress?.({ stage: 'validate', progress: 99, skillAction: 'status' });
+                const receipt = await control('status', parameters, signal, SKILL_INSTALL.RESULT_TIMEOUT);
+                if (scope.isCurrent() && !signal.aborted && receipt.plan_id === plan && receipt.target === target
+                        && confirmed(receipt, ready.installed_version)) return receipt;
+            } catch {}
+        }
         return { status: 'error', outcomeUnknown: true };
     } catch (error) {
         throw failure(error?.fallbackSafe ? 'local_update_required' : error?.code || 'install_failed');

前端页面/market/资源安装引擎.js

@@ -436,11 +436,12 @@ export function setupResourceInstall(btnUse, itemData, currentUser, inlineStatus
                         const data = await response.json();
                         if (!isCurrent()) return;
                         if (isSkill && !response.ok) {
-                            validationMessage = t(data?.error_code === 'invalid_skill_package' ? 'skill.invalid_package' : 'skill.source_unavailable');
+                            validationMessage = t(data?.error_code === 'invalid_repository' ? 'install.error_invalid_repository'
+                                : data?.error_code === 'invalid_skill_package' ? 'skill.invalid_package' : 'skill.source_unavailable');
                             throw new Error();
                         }
                         if (!response.ok || data?.status !== "success" || data.error) throw new Error();
-                        if (isSkill && data.skill_manifest_verified !== true) {
+                        if (isSkill && data.skill_repository_verified !== true) {
                             validationMessage = t('skill.cloud_update_required');
                             throw new Error();
                         }
@@ -534,7 +535,9 @@ export function setupResourceInstall(btnUse, itemData, currentUser, inlineStatus
                         onProgress: event => {
                             if (!isCurrent()) return;
                             const stageKey = Object.hasOwn(INSTALL_STAGE_KEYS, event.stage) ? INSTALL_STAGE_KEYS[event.stage] : 'skill.preparing';
-                            progress.update(event.progress, event.skillAction === 'prepare' && event.stage === 'complete' ? t('skill.prepared') : t(stageKey));
+                            const label = event.skillAction === 'status' ? t('skill.checking_result')
+                                : event.skillAction === 'prepare' && event.stage === 'complete' ? t('skill.prepared') : t(stageKey);
+                            progress.update(event.progress, label);
                         }
                     });
                     if (!isCurrent()) return;