mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-22 16:10:50 +00:00
Adds WebDAV and S3 sync provider support
Introduces encrypted cloud sync via WebDAV and S3-compatible storage, including UI for configuration, validation, and connection management. Enables selection as active sync providers alongside existing options. Updates i18n, state, and domain types to accommodate new providers, unifying connection logic and improving extensibility for future sync backends.
This commit is contained in:
13 files changed
+2827
-106
No files matched your search
@@ -645,6 +645,36 @@ const en: Messages = {
|
||||
'cloudSync.provider.s3': 'S3 Compatible',
|
||||
'cloudSync.provider.s3.desc': 'Connect to S3-compatible object storage',
|
||||
'cloudSync.provider.comingSoon': 'Coming soon',
|
||||
'cloudSync.webdav.title': 'WebDAV Settings',
|
||||
'cloudSync.webdav.desc': 'Configure a WebDAV endpoint for encrypted sync.',
|
||||
'cloudSync.webdav.endpoint': 'Endpoint URL',
|
||||
'cloudSync.webdav.authType': 'Auth Type',
|
||||
'cloudSync.webdav.auth.basic': 'Basic',
|
||||
'cloudSync.webdav.auth.digest': 'Digest',
|
||||
'cloudSync.webdav.auth.token': 'Token',
|
||||
'cloudSync.webdav.username': 'Username',
|
||||
'cloudSync.webdav.password': 'Password',
|
||||
'cloudSync.webdav.token': 'Token',
|
||||
'cloudSync.webdav.showSecret': 'Show secret',
|
||||
'cloudSync.webdav.validation.endpoint': 'Enter a valid WebDAV endpoint.',
|
||||
'cloudSync.webdav.validation.credentials': 'Username and password are required.',
|
||||
'cloudSync.webdav.validation.token': 'Token is required.',
|
||||
'cloudSync.s3.title': 'S3 Settings',
|
||||
'cloudSync.s3.desc': 'Connect to S3-compatible object storage for encrypted sync.',
|
||||
'cloudSync.s3.endpoint': 'Endpoint URL',
|
||||
'cloudSync.s3.region': 'Region',
|
||||
'cloudSync.s3.bucket': 'Bucket',
|
||||
'cloudSync.s3.accessKeyId': 'Access Key ID',
|
||||
'cloudSync.s3.secretAccessKey': 'Secret Access Key',
|
||||
'cloudSync.s3.sessionToken': 'Session Token (optional)',
|
||||
'cloudSync.s3.prefix': 'Key Prefix (optional)',
|
||||
'cloudSync.s3.forcePathStyle': 'Force path-style URLs (for MinIO/R2, etc.)',
|
||||
'cloudSync.s3.showSecret': 'Show secrets',
|
||||
'cloudSync.s3.validation.required': 'Endpoint, region, bucket, access key, and secret are required.',
|
||||
'cloudSync.connect.webdav.success': 'WebDAV connected successfully',
|
||||
'cloudSync.connect.webdav.failedTitle': 'WebDAV connection failed',
|
||||
'cloudSync.connect.s3.success': 'S3 connected successfully',
|
||||
'cloudSync.connect.s3.failedTitle': 'S3 connection failed',
|
||||
'cloudSync.lastSync.never': 'Never',
|
||||
'cloudSync.lastSync.justNow': 'Just now',
|
||||
'cloudSync.lastSync.minutesAgo': '{minutes} min ago',
|
||||
|
||||
@@ -485,6 +485,36 @@ const zhCN: Messages = {
|
||||
'cloudSync.provider.s3': 'S3 兼容存储',
|
||||
'cloudSync.provider.s3.desc': '连接到 S3 兼容对象存储',
|
||||
'cloudSync.provider.comingSoon': '即将支持',
|
||||
'cloudSync.webdav.title': 'WebDAV 设置',
|
||||
'cloudSync.webdav.desc': '配置 WebDAV 端点用于加密同步。',
|
||||
'cloudSync.webdav.endpoint': '端点地址',
|
||||
'cloudSync.webdav.authType': '认证方式',
|
||||
'cloudSync.webdav.auth.basic': 'Basic',
|
||||
'cloudSync.webdav.auth.digest': 'Digest',
|
||||
'cloudSync.webdav.auth.token': 'Token',
|
||||
'cloudSync.webdav.username': '用户名',
|
||||
'cloudSync.webdav.password': '密码',
|
||||
'cloudSync.webdav.token': 'Token',
|
||||
'cloudSync.webdav.showSecret': '显示密钥',
|
||||
'cloudSync.webdav.validation.endpoint': '请输入有效的 WebDAV 端点。',
|
||||
'cloudSync.webdav.validation.credentials': '请输入用户名和密码。',
|
||||
'cloudSync.webdav.validation.token': '请输入 Token。',
|
||||
'cloudSync.s3.title': 'S3 设置',
|
||||
'cloudSync.s3.desc': '连接到 S3 兼容对象存储以进行加密同步。',
|
||||
'cloudSync.s3.endpoint': '端点地址',
|
||||
'cloudSync.s3.region': 'Region',
|
||||
'cloudSync.s3.bucket': 'Bucket',
|
||||
'cloudSync.s3.accessKeyId': 'Access Key ID',
|
||||
'cloudSync.s3.secretAccessKey': 'Secret Access Key',
|
||||
'cloudSync.s3.sessionToken': 'Session Token(可选)',
|
||||
'cloudSync.s3.prefix': 'Key 前缀(可选)',
|
||||
'cloudSync.s3.forcePathStyle': '强制使用 path-style URL(适用于 MinIO/R2 等)',
|
||||
'cloudSync.s3.showSecret': '显示密钥',
|
||||
'cloudSync.s3.validation.required': '端点、Region、Bucket、Access Key 与 Secret 必填。',
|
||||
'cloudSync.connect.webdav.success': 'WebDAV 已连接',
|
||||
'cloudSync.connect.webdav.failedTitle': 'WebDAV 连接失败',
|
||||
'cloudSync.connect.s3.success': 'S3 已连接',
|
||||
'cloudSync.connect.s3.failedTitle': 'S3 连接失败',
|
||||
'cloudSync.lastSync.never': '从未',
|
||||
'cloudSync.lastSync.justNow': '刚刚',
|
||||
'cloudSync.lastSync.minutesAgo': '{minutes} 分钟前',
|
||||
|
||||
@@ -149,7 +149,9 @@ export const useAutoSync = (config: AutoSyncConfig) => {
|
||||
const connectedProvider =
|
||||
state.providers.github.status === 'connected' ? 'github' :
|
||||
state.providers.google.status === 'connected' ? 'google' :
|
||||
state.providers.onedrive.status === 'connected' ? 'onedrive' : null;
|
||||
state.providers.onedrive.status === 'connected' ? 'onedrive' :
|
||||
state.providers.webdav.status === 'connected' ? 'webdav' :
|
||||
state.providers.s3.status === 'connected' ? 's3' : null;
|
||||
|
||||
if (!connectedProvider) return;
|
||||
|
||||
|
||||
@@ -17,6 +17,8 @@ import {
|
||||
type SyncPayload,
|
||||
type SyncResult,
|
||||
type SyncHistoryEntry,
|
||||
type WebDAVConfig,
|
||||
type S3Config,
|
||||
formatLastSync,
|
||||
getSyncDotColor,
|
||||
} from '../../domain/sync';
|
||||
@@ -72,6 +74,8 @@ export interface CloudSyncHook {
|
||||
) => Promise<void>;
|
||||
connectGoogle: () => Promise<string>;
|
||||
connectOneDrive: () => Promise<string>;
|
||||
connectWebDAV: (config: WebDAVConfig) => Promise<void>;
|
||||
connectS3: (config: S3Config) => Promise<void>;
|
||||
completePKCEAuth: (
|
||||
provider: 'google' | 'onedrive',
|
||||
code: string,
|
||||
@@ -323,6 +327,14 @@ export const useCloudSync = (): CloudSyncHook => {
|
||||
const disconnectProvider = useCallback(async (provider: CloudProvider): Promise<void> => {
|
||||
await manager.disconnectProvider(provider);
|
||||
}, []);
|
||||
|
||||
const connectWebDAV = useCallback(async (config: WebDAVConfig): Promise<void> => {
|
||||
await manager.connectConfigProvider('webdav', config);
|
||||
}, []);
|
||||
|
||||
const connectS3 = useCallback(async (config: S3Config): Promise<void> => {
|
||||
await manager.connectConfigProvider('s3', config);
|
||||
}, []);
|
||||
|
||||
// ========== Settings ==========
|
||||
|
||||
@@ -418,6 +430,8 @@ export const useCloudSync = (): CloudSyncHook => {
|
||||
completeGitHubAuth,
|
||||
connectGoogle,
|
||||
connectOneDrive,
|
||||
connectWebDAV,
|
||||
connectS3,
|
||||
completePKCEAuth,
|
||||
disconnectProvider,
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@ import {
|
||||
Key,
|
||||
Loader2,
|
||||
RefreshCw,
|
||||
Settings,
|
||||
Server,
|
||||
Shield,
|
||||
ShieldCheck,
|
||||
@@ -30,12 +31,13 @@ import {
|
||||
} from 'lucide-react';
|
||||
import { useCloudSync } from '../application/state/useCloudSync';
|
||||
import { useI18n } from '../application/i18n/I18nProvider';
|
||||
import type { CloudProvider, ConflictInfo, SyncPayload } from '../domain/sync';
|
||||
import type { CloudProvider, ConflictInfo, SyncPayload, WebDAVAuthType, WebDAVConfig, S3Config } from '../domain/sync';
|
||||
import { cn } from '../lib/utils';
|
||||
import { Button } from './ui/button';
|
||||
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from './ui/dialog';
|
||||
import { Input } from './ui/input';
|
||||
import { Label } from './ui/label';
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from './ui/select';
|
||||
import { Tabs, TabsContent, TabsList, TabsTrigger } from './ui/tabs';
|
||||
import { toast } from './ui/toast';
|
||||
|
||||
@@ -270,6 +272,7 @@ interface ProviderCardProps {
|
||||
lastSync?: number;
|
||||
error?: string;
|
||||
disabled?: boolean; // Disable connect button when another provider is connected
|
||||
onEdit?: () => void;
|
||||
onConnect: () => void;
|
||||
onDisconnect: () => void;
|
||||
onSync: () => void;
|
||||
@@ -285,6 +288,7 @@ const ProviderCard: React.FC<ProviderCardProps> = ({
|
||||
lastSync,
|
||||
error,
|
||||
disabled,
|
||||
onEdit,
|
||||
onConnect,
|
||||
onDisconnect,
|
||||
onSync,
|
||||
@@ -365,6 +369,17 @@ const ProviderCard: React.FC<ProviderCardProps> = ({
|
||||
)}
|
||||
{t('cloudSync.provider.sync')}
|
||||
</Button>
|
||||
{onEdit && (
|
||||
<Button
|
||||
size="sm"
|
||||
variant="ghost"
|
||||
onClick={onEdit}
|
||||
className="gap-1"
|
||||
>
|
||||
<Settings size={14} />
|
||||
{t('action.edit')}
|
||||
</Button>
|
||||
)}
|
||||
<Button
|
||||
size="sm"
|
||||
variant="ghost"
|
||||
@@ -390,49 +405,6 @@ const ProviderCard: React.FC<ProviderCardProps> = ({
|
||||
);
|
||||
};
|
||||
|
||||
// ============================================================================
|
||||
// Placeholder Provider Card (Coming Soon)
|
||||
// ============================================================================
|
||||
|
||||
interface PlaceholderProviderCardProps {
|
||||
name: string;
|
||||
description: string;
|
||||
icon: React.ReactNode;
|
||||
}
|
||||
|
||||
const PlaceholderProviderCard: React.FC<PlaceholderProviderCardProps> = ({
|
||||
name,
|
||||
description,
|
||||
icon,
|
||||
}) => {
|
||||
const { t } = useI18n();
|
||||
|
||||
return (
|
||||
<div className="flex items-center gap-4 p-4 rounded-lg border bg-muted/30">
|
||||
<div className="w-12 h-12 rounded-lg flex items-center justify-center bg-muted text-muted-foreground">
|
||||
{icon}
|
||||
</div>
|
||||
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="font-medium">{name}</span>
|
||||
<span className="text-[10px] uppercase tracking-wide text-muted-foreground border border-border/60 rounded-full px-2 py-0.5">
|
||||
{t('cloudSync.provider.comingSoon')}
|
||||
</span>
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground mt-1">{description}</p>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-2">
|
||||
<Button size="sm" disabled className="gap-1">
|
||||
<Cloud size={14} />
|
||||
{t('cloudSync.provider.connect')}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
// ============================================================================
|
||||
// GitHub Device Flow Modal
|
||||
// ============================================================================
|
||||
@@ -626,11 +598,33 @@ export const SyncDashboard: React.FC<SyncDashboardProps> = ({
|
||||
const { t, resolvedLocale } = useI18n();
|
||||
const sync = useCloudSync();
|
||||
|
||||
const normalizeEndpoint = (value: string): string => {
|
||||
const trimmed = value.trim();
|
||||
if (!trimmed) return trimmed;
|
||||
if (!/^https?:\/\//i.test(trimmed)) {
|
||||
return `https://${trimmed}`;
|
||||
}
|
||||
return trimmed;
|
||||
};
|
||||
|
||||
const disconnectOtherProviders = async (current: CloudProvider) => {
|
||||
const providers: CloudProvider[] = ['github', 'google', 'onedrive', 'webdav', 's3'];
|
||||
const isActive = (status: string) => status === 'connected' || status === 'syncing';
|
||||
for (const provider of providers) {
|
||||
if (provider === current) continue;
|
||||
if (isActive(sync.providers[provider].status)) {
|
||||
await sync.disconnectProvider(provider);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Debug: log provider states
|
||||
console.log('[SyncDashboard] Provider states:', {
|
||||
github: sync.providers.github.status,
|
||||
google: sync.providers.google.status,
|
||||
onedrive: sync.providers.onedrive.status,
|
||||
webdav: sync.providers.webdav.status,
|
||||
s3: sync.providers.s3.status,
|
||||
});
|
||||
|
||||
// GitHub Device Flow state
|
||||
@@ -658,6 +652,31 @@ export const SyncDashboard: React.FC<SyncDashboardProps> = ({
|
||||
const [isUnlocking, setIsUnlocking] = useState(false);
|
||||
const [unlockError, setUnlockError] = useState<string | null>(null);
|
||||
|
||||
// WebDAV dialog state
|
||||
const [showWebdavDialog, setShowWebdavDialog] = useState(false);
|
||||
const [webdavEndpoint, setWebdavEndpoint] = useState('');
|
||||
const [webdavAuthType, setWebdavAuthType] = useState<WebDAVAuthType>('basic');
|
||||
const [webdavUsername, setWebdavUsername] = useState('');
|
||||
const [webdavPassword, setWebdavPassword] = useState('');
|
||||
const [webdavToken, setWebdavToken] = useState('');
|
||||
const [showWebdavSecret, setShowWebdavSecret] = useState(false);
|
||||
const [webdavError, setWebdavError] = useState<string | null>(null);
|
||||
const [isSavingWebdav, setIsSavingWebdav] = useState(false);
|
||||
|
||||
// S3 dialog state
|
||||
const [showS3Dialog, setShowS3Dialog] = useState(false);
|
||||
const [s3Endpoint, setS3Endpoint] = useState('');
|
||||
const [s3Region, setS3Region] = useState('');
|
||||
const [s3Bucket, setS3Bucket] = useState('');
|
||||
const [s3AccessKeyId, setS3AccessKeyId] = useState('');
|
||||
const [s3SecretAccessKey, setS3SecretAccessKey] = useState('');
|
||||
const [s3SessionToken, setS3SessionToken] = useState('');
|
||||
const [s3Prefix, setS3Prefix] = useState('');
|
||||
const [s3ForcePathStyle, setS3ForcePathStyle] = useState(true);
|
||||
const [showS3Secret, setShowS3Secret] = useState(false);
|
||||
const [s3Error, setS3Error] = useState<string | null>(null);
|
||||
const [isSavingS3, setIsSavingS3] = useState(false);
|
||||
|
||||
// Handle conflict detection
|
||||
useEffect(() => {
|
||||
if (sync.currentConflict) {
|
||||
@@ -684,13 +703,7 @@ export const SyncDashboard: React.FC<SyncDashboardProps> = ({
|
||||
const handleConnectGitHub = async () => {
|
||||
console.log('[CloudSync] handleConnectGitHub called');
|
||||
try {
|
||||
// Disconnect other providers first (single provider mode)
|
||||
if (sync.providers.google.status === 'connected') {
|
||||
await sync.disconnectProvider('google');
|
||||
}
|
||||
if (sync.providers.onedrive.status === 'connected') {
|
||||
await sync.disconnectProvider('onedrive');
|
||||
}
|
||||
await disconnectOtherProviders('github');
|
||||
console.log('[CloudSync] Calling sync.connectGitHub()...');
|
||||
const deviceFlow = await sync.connectGitHub();
|
||||
console.log('[CloudSync] Device flow received:', deviceFlow.userCode);
|
||||
@@ -721,13 +734,7 @@ export const SyncDashboard: React.FC<SyncDashboardProps> = ({
|
||||
// Connect Google (disconnect others first - single provider only)
|
||||
const handleConnectGoogle = async () => {
|
||||
try {
|
||||
// Disconnect other providers first (single provider mode)
|
||||
if (sync.providers.github.status === 'connected') {
|
||||
await sync.disconnectProvider('github');
|
||||
}
|
||||
if (sync.providers.onedrive.status === 'connected') {
|
||||
await sync.disconnectProvider('onedrive');
|
||||
}
|
||||
await disconnectOtherProviders('google');
|
||||
await sync.connectGoogle();
|
||||
// Note: Auth flow is handled automatically by oauthBridge
|
||||
toast.info(t('cloudSync.connect.browserContinue'));
|
||||
@@ -742,13 +749,7 @@ export const SyncDashboard: React.FC<SyncDashboardProps> = ({
|
||||
// Connect OneDrive (disconnect others first - single provider only)
|
||||
const handleConnectOneDrive = async () => {
|
||||
try {
|
||||
// Disconnect other providers first (single provider mode)
|
||||
if (sync.providers.github.status === 'connected') {
|
||||
await sync.disconnectProvider('github');
|
||||
}
|
||||
if (sync.providers.google.status === 'connected') {
|
||||
await sync.disconnectProvider('google');
|
||||
}
|
||||
await disconnectOtherProviders('onedrive');
|
||||
await sync.connectOneDrive();
|
||||
// Note: Auth flow is handled automatically by oauthBridge
|
||||
toast.info(t('cloudSync.connect.browserContinue'));
|
||||
@@ -760,6 +761,110 @@ export const SyncDashboard: React.FC<SyncDashboardProps> = ({
|
||||
}
|
||||
};
|
||||
|
||||
const openWebdavDialog = () => {
|
||||
const config = sync.providers.webdav.config as WebDAVConfig | undefined;
|
||||
setWebdavEndpoint(config?.endpoint || '');
|
||||
setWebdavAuthType(config?.authType || 'basic');
|
||||
setWebdavUsername(config?.username || '');
|
||||
setWebdavPassword(config?.password || '');
|
||||
setWebdavToken(config?.token || '');
|
||||
setShowWebdavSecret(false);
|
||||
setWebdavError(null);
|
||||
setShowWebdavDialog(true);
|
||||
};
|
||||
|
||||
const openS3Dialog = () => {
|
||||
const config = sync.providers.s3.config as S3Config | undefined;
|
||||
setS3Endpoint(config?.endpoint || '');
|
||||
setS3Region(config?.region || '');
|
||||
setS3Bucket(config?.bucket || '');
|
||||
setS3AccessKeyId(config?.accessKeyId || '');
|
||||
setS3SecretAccessKey(config?.secretAccessKey || '');
|
||||
setS3SessionToken(config?.sessionToken || '');
|
||||
setS3Prefix(config?.prefix || '');
|
||||
setS3ForcePathStyle(config?.forcePathStyle ?? true);
|
||||
setShowS3Secret(false);
|
||||
setS3Error(null);
|
||||
setShowS3Dialog(true);
|
||||
};
|
||||
|
||||
const handleSaveWebdav = async () => {
|
||||
const endpoint = normalizeEndpoint(webdavEndpoint);
|
||||
if (!endpoint) {
|
||||
setWebdavError(t('cloudSync.webdav.validation.endpoint'));
|
||||
return;
|
||||
}
|
||||
|
||||
if (webdavAuthType === 'token') {
|
||||
if (!webdavToken.trim()) {
|
||||
setWebdavError(t('cloudSync.webdav.validation.token'));
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
if (!webdavUsername.trim() || !webdavPassword) {
|
||||
setWebdavError(t('cloudSync.webdav.validation.credentials'));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
const config: WebDAVConfig = {
|
||||
endpoint,
|
||||
authType: webdavAuthType,
|
||||
username: webdavAuthType === 'token' ? undefined : webdavUsername.trim(),
|
||||
password: webdavAuthType === 'token' ? undefined : webdavPassword,
|
||||
token: webdavAuthType === 'token' ? webdavToken.trim() : undefined,
|
||||
};
|
||||
|
||||
setIsSavingWebdav(true);
|
||||
setWebdavError(null);
|
||||
try {
|
||||
await disconnectOtherProviders('webdav');
|
||||
await sync.connectWebDAV(config);
|
||||
toast.success(t('cloudSync.connect.webdav.success'));
|
||||
setShowWebdavDialog(false);
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : t('common.unknownError');
|
||||
setWebdavError(message);
|
||||
toast.error(message, t('cloudSync.connect.webdav.failedTitle'));
|
||||
} finally {
|
||||
setIsSavingWebdav(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleSaveS3 = async () => {
|
||||
const endpoint = normalizeEndpoint(s3Endpoint);
|
||||
if (!endpoint || !s3Region.trim() || !s3Bucket.trim() || !s3AccessKeyId.trim() || !s3SecretAccessKey) {
|
||||
setS3Error(t('cloudSync.s3.validation.required'));
|
||||
return;
|
||||
}
|
||||
|
||||
const config: S3Config = {
|
||||
endpoint,
|
||||
region: s3Region.trim(),
|
||||
bucket: s3Bucket.trim(),
|
||||
accessKeyId: s3AccessKeyId.trim(),
|
||||
secretAccessKey: s3SecretAccessKey,
|
||||
sessionToken: s3SessionToken.trim() ? s3SessionToken.trim() : undefined,
|
||||
prefix: s3Prefix.trim() ? s3Prefix.trim() : undefined,
|
||||
forcePathStyle: s3ForcePathStyle,
|
||||
};
|
||||
|
||||
setIsSavingS3(true);
|
||||
setS3Error(null);
|
||||
try {
|
||||
await disconnectOtherProviders('s3');
|
||||
await sync.connectS3(config);
|
||||
toast.success(t('cloudSync.connect.s3.success'));
|
||||
setShowS3Dialog(false);
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : t('common.unknownError');
|
||||
setS3Error(message);
|
||||
toast.error(message, t('cloudSync.connect.s3.failedTitle'));
|
||||
} finally {
|
||||
setIsSavingS3(false);
|
||||
}
|
||||
};
|
||||
|
||||
// Sync to provider
|
||||
const handleSync = async (provider: CloudProvider) => {
|
||||
try {
|
||||
@@ -892,16 +997,36 @@ export const SyncDashboard: React.FC<SyncDashboardProps> = ({
|
||||
onSync={() => handleSync('onedrive')}
|
||||
/>
|
||||
|
||||
<PlaceholderProviderCard
|
||||
<ProviderCard
|
||||
provider="webdav"
|
||||
name={t('cloudSync.provider.webdav')}
|
||||
description={t('cloudSync.provider.webdav.desc')}
|
||||
icon={<Server size={24} />}
|
||||
isConnected={sync.providers.webdav.status === 'connected' || sync.providers.webdav.status === 'syncing'}
|
||||
isSyncing={sync.providers.webdav.status === 'syncing'}
|
||||
account={sync.providers.webdav.account}
|
||||
lastSync={sync.providers.webdav.lastSync}
|
||||
error={sync.providers.webdav.error}
|
||||
disabled={sync.hasAnyConnectedProvider && sync.providers.webdav.status !== 'connected' && sync.providers.webdav.status !== 'syncing'}
|
||||
onEdit={openWebdavDialog}
|
||||
onConnect={openWebdavDialog}
|
||||
onDisconnect={() => sync.disconnectProvider('webdav')}
|
||||
onSync={() => handleSync('webdav')}
|
||||
/>
|
||||
|
||||
<PlaceholderProviderCard
|
||||
<ProviderCard
|
||||
provider="s3"
|
||||
name={t('cloudSync.provider.s3')}
|
||||
description={t('cloudSync.provider.s3.desc')}
|
||||
icon={<Database size={24} />}
|
||||
isConnected={sync.providers.s3.status === 'connected' || sync.providers.s3.status === 'syncing'}
|
||||
isSyncing={sync.providers.s3.status === 'syncing'}
|
||||
account={sync.providers.s3.account}
|
||||
lastSync={sync.providers.s3.lastSync}
|
||||
error={sync.providers.s3.error}
|
||||
disabled={sync.hasAnyConnectedProvider && sync.providers.s3.status !== 'connected' && sync.providers.s3.status !== 'syncing'}
|
||||
onEdit={openS3Dialog}
|
||||
onConnect={openS3Dialog}
|
||||
onDisconnect={() => sync.disconnectProvider('s3')}
|
||||
onSync={() => handleSync('s3')}
|
||||
/>
|
||||
</TabsContent>
|
||||
|
||||
@@ -1011,6 +1136,222 @@ export const SyncDashboard: React.FC<SyncDashboardProps> = ({
|
||||
onClose={() => setShowConflictModal(false)}
|
||||
/>
|
||||
|
||||
<Dialog open={showWebdavDialog} onOpenChange={setShowWebdavDialog}>
|
||||
<DialogContent className="sm:max-w-[460px] max-h-[80vh] overflow-y-auto z-[70]">
|
||||
<DialogHeader>
|
||||
<DialogTitle>{t('cloudSync.webdav.title')}</DialogTitle>
|
||||
<DialogDescription>{t('cloudSync.webdav.desc')}</DialogDescription>
|
||||
</DialogHeader>
|
||||
|
||||
<div className="space-y-4">
|
||||
<div className="space-y-2">
|
||||
<Label>{t('cloudSync.webdav.endpoint')}</Label>
|
||||
<Input
|
||||
value={webdavEndpoint}
|
||||
onChange={(e) => setWebdavEndpoint(e.target.value)}
|
||||
placeholder="https://dav.example.com/remote.php/webdav/"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label>{t('cloudSync.webdav.authType')}</Label>
|
||||
<Select value={webdavAuthType} onValueChange={(value) => setWebdavAuthType(value as WebDAVAuthType)}>
|
||||
<SelectTrigger>
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="basic">{t('cloudSync.webdav.auth.basic')}</SelectItem>
|
||||
<SelectItem value="digest">{t('cloudSync.webdav.auth.digest')}</SelectItem>
|
||||
<SelectItem value="token">{t('cloudSync.webdav.auth.token')}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
|
||||
{webdavAuthType !== 'token' ? (
|
||||
<>
|
||||
<div className="space-y-2">
|
||||
<Label>{t('cloudSync.webdav.username')}</Label>
|
||||
<Input
|
||||
value={webdavUsername}
|
||||
onChange={(e) => setWebdavUsername(e.target.value)}
|
||||
autoComplete="username"
|
||||
/>
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label>{t('cloudSync.webdav.password')}</Label>
|
||||
<Input
|
||||
type={showWebdavSecret ? 'text' : 'password'}
|
||||
value={webdavPassword}
|
||||
onChange={(e) => setWebdavPassword(e.target.value)}
|
||||
autoComplete="current-password"
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
) : (
|
||||
<div className="space-y-2">
|
||||
<Label>{t('cloudSync.webdav.token')}</Label>
|
||||
<Input
|
||||
type={showWebdavSecret ? 'text' : 'password'}
|
||||
value={webdavToken}
|
||||
onChange={(e) => setWebdavToken(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<label className="flex items-center gap-2 text-sm text-muted-foreground select-none">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={showWebdavSecret}
|
||||
onChange={(e) => setShowWebdavSecret(e.target.checked)}
|
||||
className="accent-primary"
|
||||
/>
|
||||
{t('cloudSync.webdav.showSecret')}
|
||||
</label>
|
||||
|
||||
{webdavError && (
|
||||
<p className="text-sm text-red-500">{webdavError}</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<DialogFooter>
|
||||
<Button
|
||||
variant="outline"
|
||||
onClick={() => setShowWebdavDialog(false)}
|
||||
disabled={isSavingWebdav}
|
||||
>
|
||||
{t('common.cancel')}
|
||||
</Button>
|
||||
<Button
|
||||
onClick={handleSaveWebdav}
|
||||
disabled={isSavingWebdav}
|
||||
className="gap-2"
|
||||
>
|
||||
{isSavingWebdav ? <Loader2 size={16} className="animate-spin" /> : <Cloud size={16} />}
|
||||
{t('common.save')}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
|
||||
<Dialog open={showS3Dialog} onOpenChange={setShowS3Dialog}>
|
||||
<DialogContent className="sm:max-w-[520px] max-h-[80vh] overflow-y-auto z-[70]">
|
||||
<DialogHeader>
|
||||
<DialogTitle>{t('cloudSync.s3.title')}</DialogTitle>
|
||||
<DialogDescription>{t('cloudSync.s3.desc')}</DialogDescription>
|
||||
</DialogHeader>
|
||||
|
||||
<div className="space-y-4">
|
||||
<div className="space-y-2">
|
||||
<Label>{t('cloudSync.s3.endpoint')}</Label>
|
||||
<Input
|
||||
value={s3Endpoint}
|
||||
onChange={(e) => setS3Endpoint(e.target.value)}
|
||||
placeholder="https://s3.example.com"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div className="space-y-2">
|
||||
<Label>{t('cloudSync.s3.region')}</Label>
|
||||
<Input
|
||||
value={s3Region}
|
||||
onChange={(e) => setS3Region(e.target.value)}
|
||||
placeholder="us-east-1"
|
||||
/>
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label>{t('cloudSync.s3.bucket')}</Label>
|
||||
<Input
|
||||
value={s3Bucket}
|
||||
onChange={(e) => setS3Bucket(e.target.value)}
|
||||
placeholder="netcatty-backups"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label>{t('cloudSync.s3.accessKeyId')}</Label>
|
||||
<Input
|
||||
value={s3AccessKeyId}
|
||||
onChange={(e) => setS3AccessKeyId(e.target.value)}
|
||||
autoComplete="off"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label>{t('cloudSync.s3.secretAccessKey')}</Label>
|
||||
<Input
|
||||
type={showS3Secret ? 'text' : 'password'}
|
||||
value={s3SecretAccessKey}
|
||||
onChange={(e) => setS3SecretAccessKey(e.target.value)}
|
||||
autoComplete="off"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label>{t('cloudSync.s3.sessionToken')}</Label>
|
||||
<Input
|
||||
type={showS3Secret ? 'text' : 'password'}
|
||||
value={s3SessionToken}
|
||||
onChange={(e) => setS3SessionToken(e.target.value)}
|
||||
autoComplete="off"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label>{t('cloudSync.s3.prefix')}</Label>
|
||||
<Input
|
||||
value={s3Prefix}
|
||||
onChange={(e) => setS3Prefix(e.target.value)}
|
||||
placeholder="backups/netcatty"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<label className="flex items-center gap-2 text-sm text-muted-foreground select-none">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={s3ForcePathStyle}
|
||||
onChange={(e) => setS3ForcePathStyle(e.target.checked)}
|
||||
className="accent-primary"
|
||||
/>
|
||||
{t('cloudSync.s3.forcePathStyle')}
|
||||
</label>
|
||||
|
||||
<label className="flex items-center gap-2 text-sm text-muted-foreground select-none">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={showS3Secret}
|
||||
onChange={(e) => setShowS3Secret(e.target.checked)}
|
||||
className="accent-primary"
|
||||
/>
|
||||
{t('cloudSync.s3.showSecret')}
|
||||
</label>
|
||||
|
||||
{s3Error && (
|
||||
<p className="text-sm text-red-500">{s3Error}</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<DialogFooter>
|
||||
<Button
|
||||
variant="outline"
|
||||
onClick={() => setShowS3Dialog(false)}
|
||||
disabled={isSavingS3}
|
||||
>
|
||||
{t('common.cancel')}
|
||||
</Button>
|
||||
<Button
|
||||
onClick={handleSaveS3}
|
||||
disabled={isSavingS3}
|
||||
className="gap-2"
|
||||
>
|
||||
{isSavingS3 ? <Loader2 size={16} className="animate-spin" /> : <Database size={16} />}
|
||||
{t('common.save')}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
|
||||
<Dialog open={showChangeKeyDialog} onOpenChange={setShowChangeKeyDialog}>
|
||||
<DialogContent className="sm:max-w-[420px]">
|
||||
<DialogHeader>
|
||||
|
||||
@@ -21,6 +21,8 @@ import {
|
||||
X,
|
||||
ArrowUp,
|
||||
ArrowDown,
|
||||
Database,
|
||||
Server,
|
||||
} from 'lucide-react';
|
||||
import { useCloudSync } from '../application/state/useCloudSync';
|
||||
import type { CloudProvider } from '../domain/sync';
|
||||
@@ -54,12 +56,16 @@ const providerIcons: Record<CloudProvider, React.ReactNode> = {
|
||||
github: <Github size={16} />,
|
||||
google: <GoogleDriveIcon className="w-4 h-4" />,
|
||||
onedrive: <OneDriveIcon className="w-4 h-4" />,
|
||||
webdav: <Server size={16} />,
|
||||
s3: <Database size={16} />,
|
||||
};
|
||||
|
||||
const providerNames: Record<CloudProvider, string> = {
|
||||
github: 'GitHub Gist',
|
||||
google: 'Google Drive',
|
||||
onedrive: 'OneDrive',
|
||||
webdav: 'WebDAV',
|
||||
s3: 'S3 Compatible',
|
||||
};
|
||||
|
||||
// ============================================================================
|
||||
@@ -120,6 +126,8 @@ export const SyncStatusButton: React.FC<SyncStatusButtonProps> = ({
|
||||
if (isProviderActive(sync.providers.github.status)) return 'github';
|
||||
if (isProviderActive(sync.providers.google.status)) return 'google';
|
||||
if (isProviderActive(sync.providers.onedrive.status)) return 'onedrive';
|
||||
if (isProviderActive(sync.providers.webdav.status)) return 'webdav';
|
||||
if (isProviderActive(sync.providers.s3.status)) return 's3';
|
||||
return null;
|
||||
};
|
||||
|
||||
|
||||
+26
-2
@@ -2,7 +2,7 @@
|
||||
* Cloud Sync Domain Types & Interfaces
|
||||
*
|
||||
* Zero-Knowledge Encrypted Multi-Cloud Sync System
|
||||
* Supports: GitHub Gist, Google Drive, Microsoft OneDrive
|
||||
* Supports: GitHub Gist, Google Drive, Microsoft OneDrive, WebDAV, S3 Compatible
|
||||
*/
|
||||
|
||||
// ============================================================================
|
||||
@@ -42,7 +42,28 @@ export type ConflictResolution =
|
||||
/**
|
||||
* Supported cloud storage providers
|
||||
*/
|
||||
export type CloudProvider = 'github' | 'google' | 'onedrive';
|
||||
export type CloudProvider = 'github' | 'google' | 'onedrive' | 'webdav' | 's3';
|
||||
|
||||
export type WebDAVAuthType = 'basic' | 'digest' | 'token';
|
||||
|
||||
export interface WebDAVConfig {
|
||||
endpoint: string;
|
||||
authType: WebDAVAuthType;
|
||||
username?: string;
|
||||
password?: string;
|
||||
token?: string;
|
||||
}
|
||||
|
||||
export interface S3Config {
|
||||
endpoint: string;
|
||||
region: string;
|
||||
bucket: string;
|
||||
accessKeyId: string;
|
||||
secretAccessKey: string;
|
||||
sessionToken?: string;
|
||||
prefix?: string;
|
||||
forcePathStyle?: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* Provider-specific connection status
|
||||
@@ -83,6 +104,7 @@ export interface ProviderConnection {
|
||||
status: ProviderConnectionStatus;
|
||||
account?: ProviderAccount;
|
||||
tokens?: OAuthTokens;
|
||||
config?: WebDAVConfig | S3Config;
|
||||
lastSync?: number; // Unix timestamp
|
||||
lastSyncVersion?: number;
|
||||
resourceId?: string; // gistId / fileId / itemId
|
||||
@@ -349,6 +371,8 @@ export const SYNC_STORAGE_KEYS = {
|
||||
PROVIDER_GITHUB: 'netcatty_provider_github_v1',
|
||||
PROVIDER_GOOGLE: 'netcatty_provider_google_v1',
|
||||
PROVIDER_ONEDRIVE: 'netcatty_provider_onedrive_v1',
|
||||
PROVIDER_WEBDAV: 'netcatty_provider_webdav_v1',
|
||||
PROVIDER_S3: 'netcatty_provider_s3_v1',
|
||||
LOCAL_SYNC_META: 'netcatty_local_sync_meta_v1',
|
||||
} as const;
|
||||
|
||||
|
||||
@@ -20,9 +20,12 @@ import {
|
||||
type MasterKeyConfig,
|
||||
type UnlockedMasterKey,
|
||||
type ProviderConnection,
|
||||
type ProviderAccount,
|
||||
type SyncEvent,
|
||||
type OAuthTokens,
|
||||
type SyncHistoryEntry,
|
||||
type WebDAVConfig,
|
||||
type S3Config,
|
||||
SYNC_CONSTANTS,
|
||||
SYNC_STORAGE_KEYS,
|
||||
generateDeviceId,
|
||||
@@ -117,6 +120,8 @@ export class CloudSyncManager {
|
||||
github: this.loadProviderConnection('github'),
|
||||
google: this.loadProviderConnection('google'),
|
||||
onedrive: this.loadProviderConnection('onedrive'),
|
||||
webdav: this.loadProviderConnection('webdav'),
|
||||
s3: this.loadProviderConnection('s3'),
|
||||
};
|
||||
|
||||
// Save device ID if new
|
||||
@@ -147,10 +152,10 @@ export class CloudSyncManager {
|
||||
const key = SYNC_STORAGE_KEYS[`PROVIDER_${provider.toUpperCase()}` as keyof typeof SYNC_STORAGE_KEYS];
|
||||
const stored = this.loadFromStorage<Partial<ProviderConnection>>(key);
|
||||
|
||||
// Determine the correct status: if tokens exist, should be 'connected'
|
||||
// Determine the correct status: if tokens or config exist, should be 'connected'
|
||||
// Never restore 'syncing' or 'error' status - those are transient
|
||||
const status: ProviderConnection['status'] = stored?.tokens
|
||||
? 'connected'
|
||||
const status: ProviderConnection['status'] = (stored?.tokens || stored?.config)
|
||||
? 'connected'
|
||||
: 'disconnected';
|
||||
|
||||
return {
|
||||
@@ -164,7 +169,7 @@ export class CloudSyncManager {
|
||||
const key = SYNC_STORAGE_KEYS[`PROVIDER_${provider.toUpperCase()}` as keyof typeof SYNC_STORAGE_KEYS];
|
||||
// Don't persist sensitive tokens directly - use safeStorage in production
|
||||
const { tokens, ...safeData } = connection;
|
||||
this.saveToStorage(key, { ...safeData, tokens }); // In production, encrypt tokens
|
||||
this.saveToStorage(key, { ...safeData, tokens }); // In production, encrypt tokens/config
|
||||
}
|
||||
|
||||
private loadFromStorage<T>(key: string): T | null {
|
||||
@@ -260,6 +265,8 @@ export class CloudSyncManager {
|
||||
[SYNC_STORAGE_KEYS.PROVIDER_GITHUB]: 'github',
|
||||
[SYNC_STORAGE_KEYS.PROVIDER_GOOGLE]: 'google',
|
||||
[SYNC_STORAGE_KEYS.PROVIDER_ONEDRIVE]: 'onedrive',
|
||||
[SYNC_STORAGE_KEYS.PROVIDER_WEBDAV]: 'webdav',
|
||||
[SYNC_STORAGE_KEYS.PROVIDER_S3]: 's3',
|
||||
};
|
||||
const provider = providerByKey[key];
|
||||
if (provider) {
|
||||
@@ -276,8 +283,9 @@ export class CloudSyncManager {
|
||||
};
|
||||
|
||||
const nextTokens = next.tokens;
|
||||
const nextConfig = next.config;
|
||||
const adapter = this.adapters.get(provider);
|
||||
if (!nextTokens) {
|
||||
if (!nextTokens && !nextConfig) {
|
||||
if (adapter) {
|
||||
adapter.signOut();
|
||||
this.adapters.delete(provider);
|
||||
@@ -287,15 +295,18 @@ export class CloudSyncManager {
|
||||
}
|
||||
|
||||
const tokenChanged =
|
||||
prev.tokens?.accessToken !== nextTokens.accessToken ||
|
||||
prev.tokens?.refreshToken !== nextTokens.refreshToken ||
|
||||
prev.tokens?.expiresAt !== nextTokens.expiresAt ||
|
||||
prev.tokens?.tokenType !== nextTokens.tokenType ||
|
||||
prev.tokens?.scope !== nextTokens.scope;
|
||||
(prev.tokens?.accessToken || null) !== (nextTokens?.accessToken || null) ||
|
||||
(prev.tokens?.refreshToken || null) !== (nextTokens?.refreshToken || null) ||
|
||||
(prev.tokens?.expiresAt || null) !== (nextTokens?.expiresAt || null) ||
|
||||
(prev.tokens?.tokenType || null) !== (nextTokens?.tokenType || null) ||
|
||||
(prev.tokens?.scope || null) !== (nextTokens?.scope || null);
|
||||
|
||||
const configChanged =
|
||||
JSON.stringify(prev.config || null) !== JSON.stringify(nextConfig || null);
|
||||
|
||||
const resourceChanged = (adapter?.resourceId || null) !== (next.resourceId || null);
|
||||
|
||||
if (adapter && (tokenChanged || resourceChanged)) {
|
||||
if (adapter && (tokenChanged || configChanged || resourceChanged)) {
|
||||
adapter.signOut();
|
||||
this.adapters.delete(provider);
|
||||
}
|
||||
@@ -307,7 +318,8 @@ export class CloudSyncManager {
|
||||
private async getConnectedAdapter(provider: CloudProvider): Promise<CloudAdapter> {
|
||||
const connection = this.state.providers[provider];
|
||||
const tokens = connection?.tokens;
|
||||
if (!tokens) {
|
||||
const config = connection?.config;
|
||||
if (!tokens && !config) {
|
||||
throw new Error('Provider not connected');
|
||||
}
|
||||
|
||||
@@ -316,7 +328,7 @@ export class CloudSyncManager {
|
||||
return existing;
|
||||
}
|
||||
|
||||
const adapter = await createAdapter(provider, tokens, connection.resourceId);
|
||||
const adapter = await createAdapter(provider, tokens, connection.resourceId, config);
|
||||
this.adapters.set(provider, adapter);
|
||||
return adapter;
|
||||
}
|
||||
@@ -359,6 +371,8 @@ export class CloudSyncManager {
|
||||
github: { ...this.state.providers.github },
|
||||
google: { ...this.state.providers.google },
|
||||
onedrive: { ...this.state.providers.onedrive },
|
||||
webdav: { ...this.state.providers.webdav },
|
||||
s3: { ...this.state.providers.s3 },
|
||||
},
|
||||
syncHistory: [...this.state.syncHistory],
|
||||
currentConflict: this.state.currentConflict ? { ...this.state.currentConflict } : null,
|
||||
@@ -541,6 +555,9 @@ export class CloudSyncManager {
|
||||
type: 'device_code' | 'url';
|
||||
data: unknown;
|
||||
}> {
|
||||
if (provider === 'webdav' || provider === 's3') {
|
||||
throw new Error('Provider requires manual configuration');
|
||||
}
|
||||
const adapter = await createAdapter(provider);
|
||||
this.adapters.set(provider, adapter);
|
||||
|
||||
@@ -667,6 +684,41 @@ export class CloudSyncManager {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Connect config-based providers (WebDAV/S3)
|
||||
*/
|
||||
async connectConfigProvider(
|
||||
provider: 'webdav' | 's3',
|
||||
config: WebDAVConfig | S3Config
|
||||
): Promise<void> {
|
||||
const adapter = await createAdapter(provider, undefined, undefined, config);
|
||||
this.adapters.set(provider, adapter);
|
||||
this.updateProviderStatus(provider, 'connecting');
|
||||
|
||||
try {
|
||||
const resourceId = await adapter.initializeSync();
|
||||
const account = adapter.accountInfo || this.buildAccountFromConfig(provider, config);
|
||||
|
||||
this.state.providers[provider] = {
|
||||
provider,
|
||||
status: 'connected',
|
||||
config,
|
||||
account,
|
||||
resourceId: resourceId || undefined,
|
||||
};
|
||||
|
||||
this.saveProviderConnection(provider, this.state.providers[provider]);
|
||||
this.emit({
|
||||
type: 'AUTH_COMPLETED',
|
||||
provider,
|
||||
account,
|
||||
});
|
||||
} catch (error) {
|
||||
this.updateProviderStatus(provider, 'error', String(error));
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Disconnect a provider
|
||||
*/
|
||||
@@ -699,6 +751,18 @@ export class CloudSyncManager {
|
||||
this.notifyStateChange(); // Notify UI of status change
|
||||
}
|
||||
|
||||
private buildAccountFromConfig(
|
||||
provider: 'webdav' | 's3',
|
||||
config: WebDAVConfig | S3Config
|
||||
): ProviderAccount {
|
||||
if (provider === 'webdav') {
|
||||
const endpoint = (config as WebDAVConfig).endpoint;
|
||||
return { id: endpoint, name: endpoint };
|
||||
}
|
||||
const s3 = config as S3Config;
|
||||
return { id: `${s3.bucket}@${s3.endpoint}`, name: `${s3.bucket} (${s3.region})` };
|
||||
}
|
||||
|
||||
// ==========================================================================
|
||||
// Sync Operations
|
||||
// ==========================================================================
|
||||
|
||||
@@ -0,0 +1,209 @@
|
||||
/**
|
||||
* S3 Compatible Adapter - AWS SDK v3
|
||||
*/
|
||||
|
||||
import {
|
||||
S3Client,
|
||||
HeadObjectCommand,
|
||||
PutObjectCommand,
|
||||
GetObjectCommand,
|
||||
DeleteObjectCommand,
|
||||
} from '@aws-sdk/client-s3';
|
||||
import {
|
||||
SYNC_CONSTANTS,
|
||||
type S3Config,
|
||||
type SyncedFile,
|
||||
type ProviderAccount,
|
||||
type OAuthTokens,
|
||||
} from '../../../domain/sync';
|
||||
|
||||
const normalizeEndpoint = (endpoint: string): string => {
|
||||
const trimmed = endpoint.trim();
|
||||
if (!/^https?:\/\//i.test(trimmed)) {
|
||||
return `https://${trimmed}`;
|
||||
}
|
||||
return trimmed;
|
||||
};
|
||||
|
||||
const toBodyString = async (body: unknown): Promise<string> => {
|
||||
if (!body) return '';
|
||||
if (typeof body === 'string') return body;
|
||||
if (body instanceof Uint8Array) {
|
||||
return new TextDecoder().decode(body);
|
||||
}
|
||||
if (body instanceof Blob) {
|
||||
return await body.text();
|
||||
}
|
||||
if (typeof ReadableStream !== 'undefined' && body instanceof ReadableStream) {
|
||||
return await new Response(body).text();
|
||||
}
|
||||
if (typeof (body as { transformToString?: () => Promise<string> }).transformToString === 'function') {
|
||||
return await (body as { transformToString: () => Promise<string> }).transformToString();
|
||||
}
|
||||
throw new Error('Unsupported S3 response body');
|
||||
};
|
||||
|
||||
export class S3Adapter {
|
||||
private config: S3Config | null;
|
||||
private resource: string | null;
|
||||
private account: ProviderAccount | null;
|
||||
private client: S3Client | null;
|
||||
|
||||
constructor(config?: S3Config, resourceId?: string) {
|
||||
this.config = config
|
||||
? { ...config, endpoint: normalizeEndpoint(config.endpoint) }
|
||||
: null;
|
||||
this.resource = resourceId || null;
|
||||
this.account = this.buildAccountInfo(this.config);
|
||||
this.client = this.config ? this.createClient(this.config) : null;
|
||||
}
|
||||
|
||||
get isAuthenticated(): boolean {
|
||||
return !!this.config;
|
||||
}
|
||||
|
||||
get accountInfo(): ProviderAccount | null {
|
||||
return this.account;
|
||||
}
|
||||
|
||||
get resourceId(): string | null {
|
||||
return this.resource;
|
||||
}
|
||||
|
||||
signOut(): void {
|
||||
this.config = null;
|
||||
this.resource = null;
|
||||
this.account = null;
|
||||
this.client = null;
|
||||
}
|
||||
|
||||
async initializeSync(): Promise<string | null> {
|
||||
if (!this.config) {
|
||||
throw new Error('Missing S3 config');
|
||||
}
|
||||
const client = this.getClient();
|
||||
try {
|
||||
await client.send(new HeadObjectCommand({
|
||||
Bucket: this.config.bucket,
|
||||
Key: this.getObjectKey(),
|
||||
}));
|
||||
} catch (error) {
|
||||
if (this.isNotFound(error)) {
|
||||
// File doesn't exist yet.
|
||||
} else if (this.isAccessDenied(error)) {
|
||||
throw new Error('S3 access denied');
|
||||
} else {
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
this.resource = this.getObjectKey();
|
||||
return this.resource;
|
||||
}
|
||||
|
||||
async upload(syncedFile: SyncedFile): Promise<string> {
|
||||
if (!this.config) {
|
||||
throw new Error('Missing S3 config');
|
||||
}
|
||||
const body = JSON.stringify(syncedFile);
|
||||
const client = this.getClient();
|
||||
await client.send(new PutObjectCommand({
|
||||
Bucket: this.config.bucket,
|
||||
Key: this.getObjectKey(),
|
||||
Body: body,
|
||||
ContentType: 'application/json',
|
||||
}));
|
||||
this.resource = this.getObjectKey();
|
||||
return this.resource;
|
||||
}
|
||||
|
||||
async download(): Promise<SyncedFile | null> {
|
||||
if (!this.config) {
|
||||
throw new Error('Missing S3 config');
|
||||
}
|
||||
const client = this.getClient();
|
||||
try {
|
||||
const response = await client.send(new GetObjectCommand({
|
||||
Bucket: this.config.bucket,
|
||||
Key: this.getObjectKey(),
|
||||
}));
|
||||
const text = await toBodyString(response.Body);
|
||||
if (!text) return null;
|
||||
return JSON.parse(text) as SyncedFile;
|
||||
} catch (error) {
|
||||
if (this.isNotFound(error)) {
|
||||
return null;
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async deleteSync(): Promise<void> {
|
||||
if (!this.config) {
|
||||
return;
|
||||
}
|
||||
const client = this.getClient();
|
||||
try {
|
||||
await client.send(new DeleteObjectCommand({
|
||||
Bucket: this.config.bucket,
|
||||
Key: this.getObjectKey(),
|
||||
}));
|
||||
} catch (error) {
|
||||
if (this.isNotFound(error)) {
|
||||
return;
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
getTokens(): OAuthTokens | null {
|
||||
return null;
|
||||
}
|
||||
|
||||
private getClient(): S3Client {
|
||||
if (!this.config || !this.client) {
|
||||
throw new Error('Missing S3 config');
|
||||
}
|
||||
return this.client;
|
||||
}
|
||||
|
||||
private createClient(config: S3Config): S3Client {
|
||||
return new S3Client({
|
||||
region: config.region,
|
||||
endpoint: config.endpoint,
|
||||
forcePathStyle: config.forcePathStyle ?? true,
|
||||
credentials: {
|
||||
accessKeyId: config.accessKeyId,
|
||||
secretAccessKey: config.secretAccessKey,
|
||||
sessionToken: config.sessionToken,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
private isNotFound(error: unknown): boolean {
|
||||
return Boolean((error as { $metadata?: { httpStatusCode?: number } })?.$metadata?.httpStatusCode === 404);
|
||||
}
|
||||
|
||||
private isAccessDenied(error: unknown): boolean {
|
||||
return Boolean((error as { $metadata?: { httpStatusCode?: number } })?.$metadata?.httpStatusCode === 403);
|
||||
}
|
||||
|
||||
private getObjectKey(): string {
|
||||
if (!this.config) {
|
||||
throw new Error('Missing S3 config');
|
||||
}
|
||||
const prefix = (this.config.prefix || '').trim().replace(/^\/+|\/+$/g, '');
|
||||
if (!prefix) {
|
||||
return SYNC_CONSTANTS.SYNC_FILE_NAME;
|
||||
}
|
||||
return `${prefix}/${SYNC_CONSTANTS.SYNC_FILE_NAME}`;
|
||||
}
|
||||
|
||||
private buildAccountInfo(config: S3Config | null): ProviderAccount | null {
|
||||
if (!config) return null;
|
||||
const name = `${config.bucket} (${config.region})`;
|
||||
const id = `${config.bucket}@${config.endpoint}`;
|
||||
return { id, name };
|
||||
}
|
||||
}
|
||||
|
||||
export default S3Adapter;
|
||||
@@ -0,0 +1,149 @@
|
||||
/**
|
||||
* WebDAV Adapter - webdav client library
|
||||
*/
|
||||
|
||||
import { AuthType, createClient } from 'webdav';
|
||||
import {
|
||||
SYNC_CONSTANTS,
|
||||
type WebDAVConfig,
|
||||
type SyncedFile,
|
||||
type ProviderAccount,
|
||||
type OAuthTokens,
|
||||
} from '../../../domain/sync';
|
||||
|
||||
type WebDAVClient = ReturnType<typeof createClient>;
|
||||
|
||||
const normalizeEndpoint = (endpoint: string): string => {
|
||||
const trimmed = endpoint.trim();
|
||||
if (!/^https?:\/\//i.test(trimmed)) {
|
||||
return `https://${trimmed}`;
|
||||
}
|
||||
return trimmed;
|
||||
};
|
||||
|
||||
const ensureLeadingSlash = (value: string): string =>
|
||||
value.startsWith('/') ? value : `/${value}`;
|
||||
|
||||
export class WebDAVAdapter {
|
||||
private config: WebDAVConfig | null;
|
||||
private resource: string | null;
|
||||
private account: ProviderAccount | null;
|
||||
private client: WebDAVClient | null;
|
||||
|
||||
constructor(config?: WebDAVConfig, resourceId?: string) {
|
||||
this.config = config
|
||||
? { ...config, endpoint: normalizeEndpoint(config.endpoint) }
|
||||
: null;
|
||||
this.resource = resourceId || null;
|
||||
this.account = this.buildAccountInfo(this.config);
|
||||
this.client = this.config ? this.createClient(this.config) : null;
|
||||
}
|
||||
|
||||
get isAuthenticated(): boolean {
|
||||
return !!this.config;
|
||||
}
|
||||
|
||||
get accountInfo(): ProviderAccount | null {
|
||||
return this.account;
|
||||
}
|
||||
|
||||
get resourceId(): string | null {
|
||||
return this.resource;
|
||||
}
|
||||
|
||||
signOut(): void {
|
||||
this.config = null;
|
||||
this.resource = null;
|
||||
this.account = null;
|
||||
this.client = null;
|
||||
}
|
||||
|
||||
async initializeSync(): Promise<string | null> {
|
||||
const client = this.getClient();
|
||||
const path = this.getSyncPath();
|
||||
await client.exists(path);
|
||||
this.resource = path;
|
||||
return this.resource;
|
||||
}
|
||||
|
||||
async upload(syncedFile: SyncedFile): Promise<string> {
|
||||
const client = this.getClient();
|
||||
const path = this.getSyncPath();
|
||||
await client.putFileContents(path, JSON.stringify(syncedFile), { overwrite: true });
|
||||
this.resource = path;
|
||||
return path;
|
||||
}
|
||||
|
||||
async download(): Promise<SyncedFile | null> {
|
||||
const client = this.getClient();
|
||||
const path = this.getSyncPath();
|
||||
const exists = await client.exists(path);
|
||||
if (!exists) return null;
|
||||
const data = await client.getFileContents(path, { format: 'text' });
|
||||
if (!data) return null;
|
||||
return JSON.parse(data as string) as SyncedFile;
|
||||
}
|
||||
|
||||
async deleteSync(): Promise<void> {
|
||||
const client = this.getClient();
|
||||
const path = this.getSyncPath();
|
||||
const exists = await client.exists(path);
|
||||
if (!exists) return;
|
||||
await client.deleteFile(path);
|
||||
}
|
||||
|
||||
getTokens(): OAuthTokens | null {
|
||||
return null;
|
||||
}
|
||||
|
||||
private getClient(): WebDAVClient {
|
||||
if (!this.config || !this.client) {
|
||||
throw new Error('Missing WebDAV config');
|
||||
}
|
||||
return this.client;
|
||||
}
|
||||
|
||||
private createClient(config: WebDAVConfig): WebDAVClient {
|
||||
if (config.authType === 'token') {
|
||||
return createClient(config.endpoint, {
|
||||
authType: AuthType.Token,
|
||||
token: {
|
||||
access_token: config.token || '',
|
||||
token_type: 'Bearer',
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
if (config.authType === 'digest') {
|
||||
return createClient(config.endpoint, {
|
||||
authType: AuthType.Digest,
|
||||
username: config.username || '',
|
||||
password: config.password || '',
|
||||
});
|
||||
}
|
||||
|
||||
return createClient(config.endpoint, {
|
||||
authType: AuthType.Password,
|
||||
username: config.username || '',
|
||||
password: config.password || '',
|
||||
});
|
||||
}
|
||||
|
||||
private getSyncPath(): string {
|
||||
return ensureLeadingSlash(SYNC_CONSTANTS.SYNC_FILE_NAME);
|
||||
}
|
||||
|
||||
private buildAccountInfo(config: WebDAVConfig | null): ProviderAccount | null {
|
||||
if (!config) return null;
|
||||
try {
|
||||
const url = new URL(config.endpoint);
|
||||
const host = url.host;
|
||||
const name = config.username ? `${config.username}@${host}` : host;
|
||||
return { id: host, name };
|
||||
} catch {
|
||||
return { id: config.endpoint, name: config.endpoint };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export default WebDAVAdapter;
|
||||
@@ -2,7 +2,14 @@
|
||||
* Cloud Sync Adapters - Unified Export
|
||||
*/
|
||||
|
||||
import type { CloudProvider, SyncedFile, OAuthTokens, ProviderAccount } from '../../../domain/sync';
|
||||
import type {
|
||||
CloudProvider,
|
||||
SyncedFile,
|
||||
OAuthTokens,
|
||||
ProviderAccount,
|
||||
WebDAVConfig,
|
||||
S3Config,
|
||||
} from '../../../domain/sync';
|
||||
|
||||
/**
|
||||
* Unified adapter interface
|
||||
@@ -26,7 +33,8 @@ export interface CloudAdapter {
|
||||
export const createAdapter = async (
|
||||
provider: CloudProvider,
|
||||
tokens?: OAuthTokens,
|
||||
resourceId?: string
|
||||
resourceId?: string,
|
||||
config?: WebDAVConfig | S3Config
|
||||
): Promise<CloudAdapter> => {
|
||||
switch (provider) {
|
||||
case 'github': {
|
||||
@@ -41,6 +49,14 @@ export const createAdapter = async (
|
||||
const { OneDriveAdapter } = await import('./OneDriveAdapter');
|
||||
return new OneDriveAdapter(tokens, resourceId);
|
||||
}
|
||||
case 'webdav': {
|
||||
const { WebDAVAdapter } = await import('./WebDAVAdapter');
|
||||
return new WebDAVAdapter(config as WebDAVConfig | undefined, resourceId);
|
||||
}
|
||||
case 's3': {
|
||||
const { S3Adapter } = await import('./S3Adapter');
|
||||
return new S3Adapter(config as S3Config | undefined, resourceId);
|
||||
}
|
||||
default:
|
||||
throw new Error(`Unknown provider: ${provider}`);
|
||||
}
|
||||
|
||||
Generated
+1850
-18
File diff suppressed because it is too large.
Load diff
+3
-1
@@ -23,6 +23,7 @@
|
||||
"lint:fix": "eslint . --fix"
|
||||
},
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-s3": "^3.956.0",
|
||||
"@fontsource/jetbrains-mono": "^5.2.8",
|
||||
"@fontsource/space-grotesk": "^5.2.10",
|
||||
"@google/genai": "1.33.0",
|
||||
@@ -47,7 +48,8 @@
|
||||
"react-dom": "^19.2.1",
|
||||
"ssh2-sftp-client": "^12.0.1",
|
||||
"tailwind-merge": "3.4.0",
|
||||
"uuid": "^13.0.0"
|
||||
"uuid": "^13.0.0",
|
||||
"webdav": "^5.8.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.39.1",
|
||||
|
||||
Reference in new issue
Block a user