admin/DeskClaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: remove duplicate IPC channel and extract error code sets (#780)

Browse Source
This commit is contained in:
phpoh
2026-04-08 15:16:01 +08:00
committed by GitHub
Unverified
parent 0b3152f7f2
commit 3b629e8db4
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
electron/preload/index.ts
View File

@@ -100,7 +100,6 @@ const electronAPI = {
'channel:listConfigured', 'channel:listConfigured',
'channel:setEnabled', 'channel:setEnabled',
'channel:validate', 'channel:validate',
'channel:validate',
'channel:validateCredentials', 'channel:validateCredentials',
// WhatsApp // WhatsApp
'channel:requestWhatsAppQr', 'channel:requestWhatsAppQr',

9
src/pages/Skills/index.tsx
View File

@@ -36,6 +36,9 @@ import type { Skill } from '@/types/skill';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import type { TFunction } from 'i18next'; import type { TFunction } from 'i18next';
const INSTALL_ERROR_CODES = new Set(['installTimeoutError', 'installRateLimitError']);
const FETCH_ERROR_CODES = new Set(['fetchTimeoutError', 'fetchRateLimitError', 'timeoutError', 'rateLimitError']);
const SEARCH_ERROR_CODES = new Set(['searchTimeoutError', 'searchRateLimitError', 'timeoutError', 'rateLimitError']);
@@ -585,7 +588,7 @@ export function Skills() {
toast.success(t('toast.installed')); toast.success(t('toast.installed'));
} catch (err) { } catch (err) {
const errorMessage = err instanceof Error ? err.message : String(err); const errorMessage = err instanceof Error ? err.message : String(err);
if (['installTimeoutError', 'installRateLimitError'].includes(errorMessage)) { if (INSTALL_ERROR_CODES.has(errorMessage)) {
toast.error(t(`toast.${errorMessage}`, { path: skillsDirPath }), { duration: 10000 }); toast.error(t(`toast.${errorMessage}`, { path: skillsDirPath }), { duration: 10000 });
} else { } else {
toast.error(t('toast.failedInstall') + ': ' + errorMessage); toast.error(t('toast.failedInstall') + ': ' + errorMessage);
@@ -739,7 +742,7 @@ export function Skills() {
<div className="mb-4 p-4 rounded-xl border border-destructive/50 bg-destructive/10 text-destructive text-sm font-medium flex items-center gap-2"> <div className="mb-4 p-4 rounded-xl border border-destructive/50 bg-destructive/10 text-destructive text-sm font-medium flex items-center gap-2">
<AlertCircle className="h-5 w-5 shrink-0" /> <AlertCircle className="h-5 w-5 shrink-0" />
<span> <span>
{['fetchTimeoutError', 'fetchRateLimitError', 'timeoutError', 'rateLimitError'].includes(error) {FETCH_ERROR_CODES.has(error)
? t(`toast.${error}`, { path: skillsDirPath }) ? t(`toast.${error}`, { path: skillsDirPath })
: error} : error}
</span> </span>
@@ -851,7 +854,7 @@ export function Skills() {
<div className="mb-4 p-4 rounded-xl border border-destructive/50 bg-destructive/10 text-destructive text-sm font-medium flex items-center gap-2"> <div className="mb-4 p-4 rounded-xl border border-destructive/50 bg-destructive/10 text-destructive text-sm font-medium flex items-center gap-2">
<AlertCircle className="h-5 w-5 shrink-0" /> <AlertCircle className="h-5 w-5 shrink-0" />
<span> <span>
{['searchTimeoutError', 'searchRateLimitError', 'timeoutError', 'rateLimitError'].includes(searchError.replace('Error: ', '')) {SEARCH_ERROR_CODES.has(searchError.replace('Error: ', ''))
? t(`toast.${searchError.replace('Error: ', '')}`, { path: skillsDirPath }) ? t(`toast.${searchError.replace('Error: ', '')}`, { path: skillsDirPath })
: t('marketplace.searchError')} : t('marketplace.searchError')}
</span> </span>