An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:sparkles: Add an S3 connection test and widen the endpoint key-prefix warning
Jeffrey Chena78c0bb640aa
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.jsonindex d6e83dc225..55a4182164 100644--- a/app/appearance/langs/ar.json+++ b/app/appearance/langs/ar.json@@ -294,7 +294,7 @@"entryResetAllOrders": "إعادة تعيين جميع الترتيبات","displayImgAlt": "إظهار نص تلميحات الصور","displayImgName": "إظهار أسماء ملفات الصور",- "s3EndpointBucketWarning": "قد يحتوي Endpoint بالفعل على اسم الحاوية، مما قد يعطل عرض لقطات السحابة وتنظيفها. تحقق من الإعدادات؛ إذا كانت هناك بيانات متزامنة، فانسخها احتياطيًا وتحقق من مسار تخزينها قبل تغيير الإعدادات",+ "s3EndpointBucketWarning": "يحتوي Endpoint على مسار أو يحتوي اسم الحاوية على مسار أو يبدأ اسم المضيف باسم الحاوية، مما قد يعطل عرض لقطات السحابة وتنظيفها. إذا لم يكن هذا الجزء من نقطة نهاية الخدمة، فاستخدم نقطة نهاية بدون اسم الحاوية؛ وإذا كانت هناك بيانات متزامنة، فانسخها احتياطيًا وتحقق من مسار تخزينها قبل تغيير الإعدادات، ثم أكد ذلك باختبار الاتصال","embedHTMLFileBelow": "تضمين ملف HTML أدناه","horizontalSuperBlock": "كتلة خارقة أفقية","verticalSuperBlock": "كتلة خارقة عمودية",diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.jsonindex 8c255d4f7b..ec26ef3b7d 100644--- a/app/appearance/langs/de.json+++ b/app/appearance/langs/de.json@@ -294,7 +294,7 @@"entryResetAllOrders": "Alle Reihenfolgen zurücksetzen","displayImgAlt": "Bildhinweistext anzeigen","displayImgName": "Bilddateinamen anzeigen",- "s3EndpointBucketWarning": "Endpoint enthält möglicherweise bereits den Bucket-Namen, was das Auflisten und Bereinigen von Cloud-Snapshots beeinträchtigen kann. Prüfen Sie die Konfiguration; sichern Sie vorhandene synchronisierte Daten und prüfen Sie deren Speicherpfad, bevor Sie die Konfiguration ändern",+ "s3EndpointBucketWarning": "Endpoint enthält einen Pfad, der Bucket-Name enthält einen Pfad oder der Hostname beginnt mit dem Bucket-Namen; dies kann das Auflisten und Bereinigen von Cloud-Snapshots beeinträchtigen. Gehört dieser Teil nicht zum Dienst-Endpunkt, verwenden Sie einen Endpunkt ohne Bucket-Namen; sichern Sie vorhandene synchronisierte Daten und prüfen Sie deren Speicherpfad, bevor Sie die Konfiguration ändern, und bestätigen Sie sie mit dem Verbindungstest","embedHTMLFileBelow": "HTML-Datei darunter einbetten","horizontalSuperBlock": "Horizontaler Superblock","verticalSuperBlock": "Vertikaler Superblock",diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.jsonindex de5b09b566..6c8617c426 100644--- a/app/appearance/langs/en.json+++ b/app/appearance/langs/en.json@@ -294,7 +294,7 @@"entryResetAllOrders": "Reset all orders","displayImgAlt": "Show image tooltip text","displayImgName": "Show image file names",- "s3EndpointBucketWarning": "Endpoint may already contain the bucket name, which can disrupt cloud snapshot listing and cleanup. Check the configuration; if synced data already exists, back it up and verify its storage path before changing the configuration",+ "s3EndpointBucketWarning": "Endpoint contains a path, the bucket name contains a path, or the hostname starts with the bucket name, which can disrupt cloud snapshot listing and cleanup. If that part is not part of the service endpoint, use an endpoint without the bucket name; if synced data already exists, back it up and verify its storage path before changing the configuration, and confirm with a connection test","embedHTMLFileBelow": "Embed HTML file below","horizontalSuperBlock": "Horizontal super block","verticalSuperBlock": "Vertical super block",diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.jsonindex 24987080cd..89acced963 100644--- a/app/appearance/langs/es.json+++ b/app/appearance/langs/es.json@@ -294,7 +294,7 @@"entryResetAllOrders": "Restablecer todos los órdenes","displayImgAlt": "Mostrar el texto de ayuda de las imágenes","displayImgName": "Mostrar nombres de archivos de imagen",- "s3EndpointBucketWarning": "Endpoint puede contener ya el nombre del bucket, lo que puede afectar al listado y la limpieza de instantáneas en la nube. Revise la configuración; si ya hay datos sincronizados, haga una copia de seguridad y compruebe su ruta de almacenamiento antes de cambiarla",+ "s3EndpointBucketWarning": "Endpoint contiene una ruta, el nombre del bucket contiene una ruta o el nombre de host empieza por el nombre del bucket, lo que puede afectar al listado y la limpieza de instantáneas en la nube. Si esa parte no forma parte del endpoint del servicio, use un endpoint sin el nombre del bucket; si ya hay datos sincronizados, haga una copia de seguridad y compruebe su ruta de almacenamiento antes de cambiar la configuración, y confirme con la prueba de conexión","embedHTMLFileBelow": "Incrustar archivo HTML debajo","horizontalSuperBlock": "Superbloque horizontal","verticalSuperBlock": "Superbloque vertical",diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.jsonindex 4109faab9c..2d373f78e0 100644--- a/app/appearance/langs/fr.json+++ b/app/appearance/langs/fr.json@@ -294,7 +294,7 @@"entryResetAllOrders": "Réinitialiser tous les ordres","displayImgAlt": "Afficher le texte d’infobulle des images","displayImgName": "Afficher les noms des fichiers image",- "s3EndpointBucketWarning": "Endpoint contient peut-être déjà le nom du bucket, ce qui peut perturber la liste et le nettoyage des instantanés cloud. Vérifiez la configuration ; si des données sont déjà synchronisées, sauvegardez-les et vérifiez leur chemin de stockage avant de modifier la configuration",+ "s3EndpointBucketWarning": "Endpoint contient un chemin, le nom du bucket contient un chemin ou le nom d'hôte commence par le nom du bucket, ce qui peut perturber la liste et le nettoyage des instantanés cloud. Si cette partie ne fait pas partie du point de terminaison du service, utilisez un point de terminaison sans nom de bucket ; si des données sont déjà synchronisées, sauvegardez-les et vérifiez leur chemin de stockage avant de modifier la configuration, puis confirmez avec le test de connexion","embedHTMLFileBelow": "Intégrer le fichier HTML en dessous","horizontalSuperBlock": "Superblock horizontal","verticalSuperBlock": "Superblock vertical",diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.jsonindex 3a6b553e00..907b2db867 100644--- a/app/appearance/langs/he.json+++ b/app/appearance/langs/he.json@@ -294,7 +294,7 @@"entryResetAllOrders": "איפוס כל הסדרים","displayImgAlt": "הצגת טקסט תיאור של תמונות","displayImgName": "הצגת שמות קובצי תמונות",- "s3EndpointBucketWarning": "ייתכן ש-Endpoint כבר מכיל את שם דלי האחסון, דבר שעלול לשבש הצגה וניקוי של תמונות מצב בענן. יש לבדוק את ההגדרות; אם קיימים נתונים מסונכרנים, יש לגבות אותם ולוודא את נתיב האחסון לפני שינוי ההגדרות",+ "s3EndpointBucketWarning": "ה-Endpoint מכיל נתיב, שם דלי האחסון מכיל נתיב או ששם המארח מתחיל בשם דלי האחסון, דבר שעלול לשבש הצגה וניקוי של תמונות מצב בענן. אם חלק זה אינו חלק מקצה השירות, השתמשו בקצה ללא שם דלי האחסון; אם קיימים נתונים מסונכרנים, גיבו אותם וודאו את נתיב האחסון לפני שינוי ההגדרות, ואשרו בבדיקת חיבור","embedHTMLFileBelow": "הטמעת קובץ HTML מתחת","horizontalSuperBlock": "בלוק עליון אופקי","verticalSuperBlock": "בלוק עליון אנכי",diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.jsonindex ba99843ea4..831fff6f57 100644--- a/app/appearance/langs/hi.json+++ b/app/appearance/langs/hi.json@@ -294,7 +294,7 @@"entryResetAllOrders": "सभी क्रम रीसेट करें","displayImgAlt": "चित्रों का टूलटिप पाठ दिखाएँ","displayImgName": "चित्र फ़ाइलों के नाम दिखाएँ",- "s3EndpointBucketWarning": "Endpoint में बकेट का नाम पहले से शामिल हो सकता है, जिससे क्लाउड स्नैपशॉट की सूची और सफ़ाई में समस्या आ सकती है। कॉन्फ़िगरेशन जाँचें; यदि सिंक किया गया डेटा मौजूद है, तो कॉन्फ़िगरेशन बदलने से पहले उसका बैकअप लें और संग्रहण पथ की पुष्टि करें",+ "s3EndpointBucketWarning": "Endpoint में पाथ है, बकेट नाम में पाथ है या होस्टनाम बकेट नाम से शुरू होता है, जिससे क्लाउड स्नैपशॉट की सूची और सफ़ाई प्रभावित हो सकती है। यदि यह भाग सेवा एंडपॉइंट का नहीं है, तो बिना बकेट नाम वाला एंडपॉइंट उपयोग करें; यदि सिंक किया गया डेटा मौजूद है, तो कॉन्फ़िगरेशन बदलने से पहले उसका बैकअप लें और संग्रहण पाथ की पुष्टि करें, फिर कनेक्शन परीक्षण से पुष्टि करें","embedHTMLFileBelow": "नीचे HTML फ़ाइल एम्बेड करें","horizontalSuperBlock": "क्षैतिज सुपर ब्लॉक","verticalSuperBlock": "लंबवत सुपर ब्लॉक",diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.jsonindex 93e2e7598d..68c5a5fae3 100644--- a/app/appearance/langs/id.json+++ b/app/appearance/langs/id.json@@ -294,7 +294,7 @@"entryResetAllOrders": "Atur ulang semua urutan","displayImgAlt": "Tampilkan teks keterangan gambar","displayImgName": "Tampilkan nama berkas gambar",- "s3EndpointBucketWarning": "Endpoint mungkin sudah memuat nama bucket, sehingga daftar dan pembersihan snapshot cloud dapat terganggu. Periksa konfigurasi; jika sudah ada data tersinkron, cadangkan dan pastikan jalur penyimpanannya sebelum mengubah konfigurasi",+ "s3EndpointBucketWarning": "Endpoint memuat jalur, nama bucket memuat jalur, atau nama host diawali nama bucket, sehingga daftar dan pembersihan snapshot cloud dapat terganggu. Jika bagian itu bukan bagian dari endpoint layanan, gunakan endpoint tanpa nama bucket; jika data sudah tersinkron, cadangkan dan pastikan jalur penyimpanannya sebelum mengubah konfigurasi, lalu konfirmasi dengan uji koneksi","embedHTMLFileBelow": "Sematkan berkas HTML di bawah","horizontalSuperBlock": "Super blok horizontal","verticalSuperBlock": "Super blok vertikal",diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.jsonindex 9d7c13df49..0090eec555 100644--- a/app/appearance/langs/it.json+++ b/app/appearance/langs/it.json@@ -294,7 +294,7 @@"entryResetAllOrders": "Reimposta tutti gli ordini","displayImgAlt": "Mostra il testo dei suggerimenti delle immagini","displayImgName": "Mostra i nomi dei file immagine",- "s3EndpointBucketWarning": "Endpoint potrebbe già contenere il nome del bucket, causando problemi nell'elenco e nella pulizia delle istantanee nel cloud. Controlla la configurazione; se esistono già dati sincronizzati, esegui un backup e verifica il percorso di archiviazione prima di modificarla",+ "s3EndpointBucketWarning": "Endpoint contiene un percorso, il nome del bucket contiene un percorso o il nome host inizia con il nome del bucket, il che può disturbare l'elenco e la pulizia delle istantanee nel cloud. Se questa parte non appartiene all'endpoint del servizio, usare un endpoint senza nome del bucket; se esistono già dati sincronizzati, eseguire un backup e verificare il percorso di archiviazione prima di modificare la configurazione, quindi confermare con il test di connessione","embedHTMLFileBelow": "Incorpora file HTML sotto","horizontalSuperBlock": "Super blocco orizzontale","verticalSuperBlock": "Super blocco verticale",diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.jsonindex 1a36ae6cf4..c30a0f71a3 100644--- a/app/appearance/langs/ja.json+++ b/app/appearance/langs/ja.json@@ -294,7 +294,7 @@"entryResetAllOrders": "すべての並び順をリセット","displayImgAlt": "画像のツールチップのテキストを表示","displayImgName": "画像のファイル名を表示",- "s3EndpointBucketWarning": "Endpoint にバケット名が既に含まれている可能性があり、クラウドスナップショットの一覧取得やクリーンアップに支障が出る場合があります。設定を確認し、同期済みデータがある場合は、変更前にバックアップして保存先のパスを確認してください",+ "s3EndpointBucketWarning": "Endpoint にパスが含まれる、バケット名にパスが含まれる、またはホスト名がバケット名で始まるため、クラウドスナップショットの一覧取得やクリーンアップに支障が出る場合があります。その部分がサービスのエンドポイントでない場合は、バケット名を含まないエンドポイントに変更してください。同期済みデータがある場合は、変更前にバックアップして保存先のパスを確認し、接続テストで確認してください","embedHTMLFileBelow": "下に HTML ファイルを埋め込む","horizontalSuperBlock": "横向きスーパーブロック","verticalSuperBlock": "縦向きスーパーブロック",diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.jsonindex f46b728a8f..9deeb1261a 100644--- a/app/appearance/langs/ko.json+++ b/app/appearance/langs/ko.json@@ -294,7 +294,7 @@"entryResetAllOrders": "모든 순서 초기화","displayImgAlt": "이미지 도움말 텍스트 표시","displayImgName": "이미지 파일 이름 표시",- "s3EndpointBucketWarning": "Endpoint에 버킷 이름이 이미 포함되어 있으면 클라우드 스냅샷 목록 조회와 정리에 문제가 생길 수 있습니다. 설정을 확인하고, 동기화된 데이터가 있다면 설정을 변경하기 전에 백업하고 저장 경로를 확인하세요",+ "s3EndpointBucketWarning": "Endpoint에 경로가 포함되어 있거나 버킷 이름에 경로가 포함되어 있거나 호스트 이름이 버킷 이름으로 시작합니다. 이 경우 클라우드 스냅샷 목록 조회와 정리에 문제가 생길 수 있습니다. 해당 부분이 서비스 엔드포인트가 아니라면 버킷 이름이 없는 엔드포인트를 사용하고, 동기화된 데이터가 있다면 설정을 변경하기 전에 백업하고 저장 경로를 확인한 뒤 연결 테스트로 확인하세요","embedHTMLFileBelow": "아래에 HTML 파일 삽입","horizontalSuperBlock": "가로 슈퍼 블록","verticalSuperBlock": "세로 슈퍼 블록",diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.jsonindex 8652cf75b5..d3fa8c3e7d 100644--- a/app/appearance/langs/nl.json+++ b/app/appearance/langs/nl.json@@ -294,7 +294,7 @@"entryResetAllOrders": "Alle volgordes herstellen","displayImgAlt": "Tooltiptekst van afbeeldingen tonen","displayImgName": "Bestandsnamen van afbeeldingen tonen",- "s3EndpointBucketWarning": "Endpoint bevat mogelijk al de bucketnaam, wat het weergeven en opruimen van cloudsnapshots kan verstoren. Controleer de configuratie; maak een back-up van bestaande gesynchroniseerde gegevens en controleer hun opslagpad voordat u de configuratie wijzigt",+ "s3EndpointBucketWarning": "Endpoint bevat een pad, de bucketnaam bevat een pad of de hostnaam begint met de bucketnaam, wat het weergeven en opruimen van cloudsnapshots kan verstoren. Hoort dat deel niet bij het service-eindpunt, gebruik dan een eindpunt zonder bucketnaam; maak een back-up van bestaande gesynchroniseerde gegevens en controleer het opslagpad voordat u de configuratie wijzigt, en bevestig met een verbindingstest","embedHTMLFileBelow": "HTML-bestand hieronder insluiten","horizontalSuperBlock": "Horizontaal superblok","verticalSuperBlock": "Verticaal superblok",diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.jsonindex 5fb624aca2..593fff31e5 100644--- a/app/appearance/langs/pl.json+++ b/app/appearance/langs/pl.json@@ -294,7 +294,7 @@"entryResetAllOrders": "Resetuj wszystkie kolejności","displayImgAlt": "Pokazuj tekst podpowiedzi obrazów","displayImgName": "Pokazuj nazwy plików obrazów",- "s3EndpointBucketWarning": "Endpoint może już zawierać nazwę zasobnika, co może zakłócać wyświetlanie i czyszczenie migawek w chmurze. Sprawdź konfigurację; jeśli istnieją już zsynchronizowane dane, wykonaj ich kopię zapasową i sprawdź ścieżkę przechowywania przed zmianą konfiguracji",+ "s3EndpointBucketWarning": "Endpoint zawiera ścieżkę, nazwa zasobnika zawiera ścieżkę lub nazwa hosta zaczyna się od nazwy zasobnika, co może zakłócać wyświetlanie i czyszczenie migawek w chmurze. Jeśli ta część nie należy do punktu końcowego usługi, użyj punktu końcowego bez nazwy zasobnika; jeśli istnieją już zsynchronizowane dane, wykonaj kopię zapasową i sprawdź ścieżkę przechowywania przed zmianą konfiguracji, a następnie potwierdź testem połączenia","embedHTMLFileBelow": "Osadź plik HTML poniżej","horizontalSuperBlock": "Poziomy super blok","verticalSuperBlock": "Pionowy super blok",diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.jsonindex 323ddbdf9c..f3a3a70111 100644--- a/app/appearance/langs/pt-BR.json+++ b/app/appearance/langs/pt-BR.json@@ -294,7 +294,7 @@"entryResetAllOrders": "Redefinir todas as ordens","displayImgAlt": "Mostrar o texto de dica das imagens","displayImgName": "Mostrar nomes dos arquivos de imagem",- "s3EndpointBucketWarning": "Endpoint pode já conter o nome do bucket, o que pode prejudicar a listagem e a limpeza de snapshots na nuvem. Verifique a configuração; se já houver dados sincronizados, faça um backup e confirme o caminho de armazenamento antes de alterá-la",+ "s3EndpointBucketWarning": "Endpoint contém um caminho, o nome do bucket contém um caminho ou o nome do host começa com o nome do bucket, o que pode prejudicar a listagem e a limpeza de snapshots na nuvem. Se essa parte não faz parte do endpoint do serviço, use um endpoint sem o nome do bucket; se já houver dados sincronizados, faça um backup e confirme o caminho de armazenamento antes de alterar a configuração, e confirme com o teste de conexão","embedHTMLFileBelow": "Incorporar arquivo HTML abaixo","horizontalSuperBlock": "Super bloco horizontal","verticalSuperBlock": "Super bloco vertical",diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.jsonindex b448b09455..ba67ade309 100644--- a/app/appearance/langs/ru.json+++ b/app/appearance/langs/ru.json@@ -294,7 +294,7 @@"entryResetAllOrders": "Сбросить весь порядок","displayImgAlt": "Показывать текст подсказок изображений","displayImgName": "Показывать имена файлов изображений",- "s3EndpointBucketWarning": "Endpoint может уже содержать имя бакета, что может нарушить получение списка и очистку облачных снимков. Проверьте настройки; если данные уже синхронизированы, создайте резервную копию и проверьте путь хранения перед изменением настроек",+ "s3EndpointBucketWarning": "Endpoint содержит путь, имя бакета содержит путь или имя хоста начинается с имени бакета, что может нарушить получение списка и очистку облачных снимков. Если эта часть не относится к адресу сервиса, используйте адрес без имени бакета; если данные уже синхронизированы, создайте резервную копию и проверьте путь хранения перед изменением настроек, затем подтвердите проверкой подключения","embedHTMLFileBelow": "Встроить HTML-файл ниже","horizontalSuperBlock": "Горизонтальный супер блок","verticalSuperBlock": "Вертикальный супер блок",diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.jsonindex 2e7385efe5..682edf162d 100644--- a/app/appearance/langs/sk.json+++ b/app/appearance/langs/sk.json@@ -294,7 +294,7 @@"entryResetAllOrders": "Obnoviť všetky poradia","displayImgAlt": "Zobraziť text popisu obrázkov","displayImgName": "Zobraziť názvy súborov obrázkov",- "s3EndpointBucketWarning": "Endpoint už môže obsahovať názov bucketu, čo môže narušiť zobrazovanie a čistenie cloudových snímok. Skontrolujte nastavenia; ak už existujú synchronizované údaje, pred zmenou nastavení ich zálohujte a overte cestu uloženia",+ "s3EndpointBucketWarning": "Endpoint obsahuje cestu, názov bucketu obsahuje cestu alebo názov hostiteľa začína názvom bucketu, čo môže narušiť zobrazovanie a čistenie cloudových snímok. Ak táto časť nie je súčasťou koncového bodu služby, použite koncový bod bez názvu bucketu; ak už existujú synchronizované údaje, pred zmenou nastavení ich zálohujte a overte cestu uloženia, potom to potvrďte testom pripojenia","embedHTMLFileBelow": "Vložiť súbor HTML nižšie","horizontalSuperBlock": "Horizontálny super blok","verticalSuperBlock": "Vertikálny super blok",diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.jsonindex 5ab10c266f..cf4f268af1 100644--- a/app/appearance/langs/sr.json+++ b/app/appearance/langs/sr.json@@ -294,7 +294,7 @@"entryResetAllOrders": "Ресетуј све редоследе","displayImgAlt": "Прикажи текст објашњења слика","displayImgName": "Прикажи називе датотека слика",- "s3EndpointBucketWarning": "Endpoint можда већ садржи назив складишног контејнера, што може ометати приказ и чишћење снимака у облаку. Проверите подешавања; ако већ постоје синхронизовани подаци, направите резервну копију и проверите путању складиштења пре промене подешавања",+ "s3EndpointBucketWarning": "Endpoint садржи путању, назив складишног контејнера садржи путању или име хоста почиње називом контејнера, што може ометати приказ и чишћење снимака у облаку. Ако тај део није део сервисне адресе, користите адресу без назива контејнера; ако већ постоје синхронизовани подаци, направите резервну копију и проверите путању складиштења пре промене подешавања, а затим то потврдите тестом везе","embedHTMLFileBelow": "Угради HTML датотеку испод","horizontalSuperBlock": "Horizontalni superblok","verticalSuperBlock": "Vertikalni superblok",diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.jsonindex 36748cae97..4fe7851a0f 100644--- a/app/appearance/langs/th.json+++ b/app/appearance/langs/th.json@@ -294,7 +294,7 @@"entryResetAllOrders": "รีเซ็ตลำดับทั้งหมด","displayImgAlt": "แสดงข้อความคำแนะนำรูปภาพ","displayImgName": "แสดงชื่อไฟล์รูปภาพ",- "s3EndpointBucketWarning": "Endpoint อาจมีชื่อบักเก็ตอยู่แล้ว ซึ่งอาจทำให้การแสดงรายการและล้างสแนปช็อตบนคลาวด์ผิดปกติ โปรดตรวจสอบการตั้งค่า หากมีข้อมูลที่ซิงค์แล้ว ให้สำรองข้อมูลและตรวจสอบเส้นทางจัดเก็บก่อนเปลี่ยนการตั้งค่า",+ "s3EndpointBucketWarning": "Endpoint มีพาธ ชื่อบักเก็ตมีพาธ หรือชื่อโฮสต์ขึ้นต้นด้วยชื่อบักเก็ต ซึ่งอาจทำให้การแสดงรายการและล้างสแนปช็อตบนคลาวด์ผิดปกติ หากส่วนนั้นไม่ใช่ส่วนของปลายทางบริการ ให้ใช้ปลายทางที่ไม่มีชื่อบักเก็ต หากมีข้อมูลที่ซิงค์แล้ว ให้สำรองข้อมูลและตรวจสอบเส้นทางจัดเก็บก่อนเปลี่ยนการตั้งค่า แล้วยืนยันด้วยการทดสอบการเชื่อมต่อ","embedHTMLFileBelow": "ฝังไฟล์ HTML ด้านล่าง","horizontalSuperBlock": "ซูเปอร์บล็อกแนวนอน","verticalSuperBlock": "ซูเปอร์บล็อกแนวตั้ง",diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.jsonindex 8add2fc8b7..bc2ee527b9 100644--- a/app/appearance/langs/tr.json+++ b/app/appearance/langs/tr.json@@ -294,7 +294,7 @@"entryResetAllOrders": "Tüm sıralamaları sıfırla","displayImgAlt": "Görsel ipucu metnini göster","displayImgName": "Görsel dosya adlarını göster",- "s3EndpointBucketWarning": "Endpoint zaten kova adını içeriyor olabilir; bu durum bulut anlık görüntülerinin listelenmesini ve temizlenmesini aksatabilir. Yapılandırmayı kontrol edin; eşitlenmiş veriler varsa yapılandırmayı değiştirmeden önce yedekleyin ve depolama yolunu doğrulayın",+ "s3EndpointBucketWarning": "Endpoint bir yol içeriyor, kova adı bir yol içeriyor veya ana makine adı kova adıyla başlıyor; bu durum bulut anlık görüntülerinin listelenmesini ve temizlenmesini aksatabilir. Bu bölüm hizmet uç noktasına ait değilse kova adı içermeyen bir uç nokta kullanın; eşitlenmiş veriler varsa yapılandırmayı değiştirmeden önce yedekleyin ve depolama yolunu doğrulayın, ardından bağlantı testiyle onaylayın","embedHTMLFileBelow": "HTML dosyasını aşağıya göm","horizontalSuperBlock": "Yatay süper blok","verticalSuperBlock": "Dikey süper blok",diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.jsonindex 1fa8666596..9c30b63817 100644--- a/app/appearance/langs/uk.json+++ b/app/appearance/langs/uk.json@@ -294,7 +294,7 @@"entryResetAllOrders": "Скинути всі порядки","displayImgAlt": "Показувати текст підказок зображень","displayImgName": "Показувати назви файлів зображень",- "s3EndpointBucketWarning": "Endpoint може вже містити назву бакета, що може порушити отримання списку та очищення хмарних знімків. Перевірте налаштування; якщо дані вже синхронізовано, створіть резервну копію та перевірте шлях зберігання перед зміною налаштувань",+ "s3EndpointBucketWarning": "Endpoint містить шлях, назва бакета містить шлях або ім'я хоста починається з назви бакета, що може порушити отримання списку та очищення хмарних знімків. Якщо ця частина не належить до адреси сервісу, використовуйте адресу без назви бакета; якщо дані вже синхронізовано, створіть резервну копію та перевірте шлях зберігання перед зміною налаштувань, а потім підтвердьте перевіркою з'єднання","embedHTMLFileBelow": "Вбудувати HTML-файл нижче","horizontalSuperBlock": "Горизонтальний суперблок","verticalSuperBlock": "Вертикальний суперблок",diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.jsonindex 98a8a9ef12..a8db306b43 100644--- a/app/appearance/langs/zh-CN.json+++ b/app/appearance/langs/zh-CN.json@@ -294,7 +294,7 @@"entryResetAllOrders": "重置全部排序","displayImgAlt": "显示图片提示文本","displayImgName": "显示图片文件名",- "s3EndpointBucketWarning": "Endpoint 可能重复包含桶名,导致云端快照列举和清理异常。请核对配置;已有同步数据时,请先备份并确认存储路径,再修改配置",+ "s3EndpointBucketWarning": "Endpoint 包含路径、Bucket 含路径或主机名以桶名开头,云端快照列举和清理可能异常。若该部分不属于服务端地址本身,请改为不带桶名的服务端地址;已有同步数据时,请先备份并确认存储路径,再修改配置,并可用测试连接确认","embedHTMLFileBelow": "在下方嵌入 HTML 文件","horizontalSuperBlock": "横向超级块","verticalSuperBlock": "纵向超级块",diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.jsonindex 0e0b389ae8..ef8a0b28db 100644--- a/app/appearance/langs/zh-TW.json+++ b/app/appearance/langs/zh-TW.json@@ -294,7 +294,7 @@"entryResetAllOrders": "重設全部排序","displayImgAlt": "顯示圖片提示文字","displayImgName": "顯示圖片檔名",- "s3EndpointBucketWarning": "Endpoint 可能重複包含儲存桶名稱,導致雲端快照列舉與清理異常。請核對設定;若已有同步資料,請先備份並確認儲存路徑,再修改設定",+ "s3EndpointBucketWarning": "Endpoint 包含路徑、Bucket 含路徑或主機名以儲存桶名稱開頭,雲端快照列舉與清理可能異常。若該部分不屬於伺服器位址本身,請改為不帶儲存桶名稱的伺服器位址;若已有同步資料,請先備份並確認儲存路徑,再修改設定,並可用測試連線確認","embedHTMLFileBelow": "在下方嵌入 HTML 檔案","horizontalSuperBlock": "橫向超級區塊","verticalSuperBlock": "縱向超級區塊",diff --git a/app/src/config/tabs/syncUi.test.ts b/app/src/config/tabs/syncUi.test.tsindex 5218fcce15..debaf06544 100644--- a/app/src/config/tabs/syncUi.test.ts+++ b/app/src/config/tabs/syncUi.test.ts@@ -37,9 +37,10 @@ const setup = (provider = 2, mobile = false, manualRules = false) => {const status = {textContent: "", classList: {toggle() {} }};let warningHidden = true;const warning = {classList: {toggle: (_name: string, hidden: boolean) => { warningHidden = hidden; }}};- const buttons = Object.fromEntries(["save", "cancel", "clear"].map(action => [action, {+ const buttons = Object.fromEntries(["save", "cancel", "clear", "test"].map(action => [action, {disabled: false, callback: () => {}, addEventListener(_event: string, callback: () => void) {this.callback = callback;},getAttribute(name: string) { return name === "data-action" ? action : null; },+ querySelector: (selector: string) => selector === "span" ? {textContent: ""} : null,}]));const element = {querySelector(selector: string) {@@ -70,9 +71,11 @@ const setup = (provider = 2, mobile = false, manualRules = false) => {URL, CSS: {escape: (value: string) => value}, exports,setTimeout: (callback: () => void) => {rulesTimer = callback; return 1;},clearTimeout: () => {rulesTimer = undefined;},- document: {querySelector: () => ({closest: () => replacement})},window: {siyuan: {config, languages: {syncConfigNotSaved: "Required fields missing", syncConfigSaveFailed: "Not confirmed",- loadingError: "Loading failed", _kernel: {142: "Input cannot be empty"}}}},+ loadingError: "Loading failed", testConnection: "Test connection", testConnectionTesting: "Testing...",+ testConnectionSuccess: "Connection successful", testConnectionFail: "Connection failed",+ testConnectionFailMsg: "Connection failed: ${msg}", _kernel: {142: "Input cannot be empty"}}}},+ document: {querySelector: () => ({closest: () => replacement})},require(name: string) {if (name === "../../dialog") {return {Dialog: class {@@ -252,6 +255,62 @@ test("read-only transitions do not re-enable writes after a pending save", asyncassert.equal(ui.confirmations.length, 0);});+test("test connection probes the draft without saving the configuration", async () => {+ const ui = setup();+ ui.inputs.endpoint.value = "https://s3.example.com/notes/";+ ui.click("test");+ await settle();+ assert.equal(ui.requests.length, 1);+ assert.equal(ui.requests[0].url, "/api/sync/testSyncProviderS3");+ assert.equal(ui.requests[0].data.s3.endpoint, "https://s3.example.com/notes/");+ assert.equal(ui.requests[0].data.s3.bucket, "notes");+ ui.requests[0].resolve({code: 0, data: {kind: "config", msg: "probe object was not listed"}});+ await settle();+ assert.equal(ui.status.textContent, "Connection failed: probe object was not listed");+ assert.equal(ui.inputs.endpoint.disabled, false);+ assert.equal(ui.buttons.test.disabled, false);+ assert.equal(ui.closed(), 0);+});++test("test connection reports success and clears the result when the draft changes", async () => {+ const ui = setup();+ ui.click("test");+ await settle();+ ui.requests[0].resolve({code: 0, data: {kind: "ok", msg: ""}});+ await settle();+ assert.equal(ui.status.textContent, "Connection successful");+ ui.input();+ assert.equal(ui.status.textContent, "");+});++test("test connection waits for kernel rules before validating the draft", async () => {+ const ui = setup(2, false, true);+ ui.inputs.endpoint.value = "";+ ui.click("test");+ await settle();+ // 打开对话框时的规则请求被暂停,点击测试会另起一次并等它返回+ assert.equal(ui.ruleRequests.length, 2);+ assert.equal(ui.requests.length, 0);+ ui.ruleRequests[1].resolve({code: 0, data: ui.rules});+ await settle();+ // 规则返回后空字段才由内核必填清单拦住,不会把空值交给探测接口+ assert.equal(ui.requests.length, 0);+ assert.equal(ui.inputs.endpoint.attributes["aria-invalid"], "true");+ assert.equal(ui.status.textContent, "Required fields missing");+ assert.equal(ui.buttons.test.disabled, false);+});++test("test connection reports a rule loading failure without probing", async () => {+ const ui = setup(2, false, true);+ ui.click("test");+ await settle();+ ui.ruleRequests[1].reject();+ await settle();+ assert.equal(ui.requests.length, 0);+ assert.equal(ui.status.textContent, "Loading failed");+ assert.equal(ui.buttons.test.disabled, false);+});+test("draft stays bound to the opened provider even if another window changes the provider", async () => {const ui = setup();ui.sync.provider = 3;diff --git a/app/src/config/tabs/syncUi.ts b/app/src/config/tabs/syncUi.tsindex 7e3c39b04f..f8e3b48020 100644--- a/app/src/config/tabs/syncUi.ts+++ b/app/src/config/tabs/syncUi.ts@@ -464,6 +464,9 @@ const openSyncProviderConfigDialog = (root: Element) => {}const L = window.siyuan.languages;const warning = def.configKey === "s3" ? L.s3EndpointBucketWarning : "";+ // 测试连接仅用于 S3:探测会写入并删除探针对象,WebDAV 与本地目录没有等价的列举语义+ const testButton = def.configKey === "s3" ? `<div class="fn__space"></div>+ <button class="b3-button b3-button--outline" data-action="test"><svg class="b3-button__icon"><use xlink:href="#iconPlugZap"></use></svg><span>${L.testConnection}</span></button>` : "";let closed = false;let rulesVersion = 0;let rulesTimer: ReturnType<typeof setTimeout>;@@ -474,7 +477,7 @@ const openSyncProviderConfigDialog = (root: Element) => {content: `<div class="b3-dialog__content config-sync-form">${def.fields.map(field => genProviderField(field, field.id === "endpoint" ? warning : "")).join("")}<div data-type="sync-config-error" class="ft__error fn__none" role="status"></div></div><div class="b3-dialog__action">- <button class="b3-button b3-button--remove" data-action="clear">${L.clearSyncConfig}</button><div class="fn__flex-1"></div><div class="fn__space"></div>+ <button class="b3-button b3-button--remove" data-action="clear">${L.clearSyncConfig}</button>${testButton}<div class="fn__flex-1"></div><div class="fn__space"></div><button class="b3-button b3-button--cancel" data-action="cancel">${L.cancel}</button><div class="fn__space"></div><button class="b3-button b3-button--text" data-action="save">${L.save}</button></div>`,@@ -491,6 +494,8 @@ const openSyncProviderConfigDialog = (root: Element) => {const configElement = dialog.element;const template = {...def.getConfig()};fillSyncProviderConfigValues(configElement, template);+ const testElement = configElement.querySelector<HTMLButtonElement>('[data-action="test"]');+ const testLabel = testElement?.querySelector("span");const fields = def.fields.map(field => configElement.querySelector<HTMLInputElement | HTMLSelectElement>(`#${field.id}`));const initialValues = fields.map(field => field.value);const destroy = dialog.destroy.bind(dialog);@@ -511,11 +516,14 @@ const openSyncProviderConfigDialog = (root: Element) => {});configElement.setAttribute("aria-busy", String(value));};- const setError = (message: string) => {+ const setStatus = (message: string, success = false) => {const error = configElement.querySelector<HTMLElement>('[data-type="sync-config-error"]');error.textContent = message;error.classList.toggle("fn__none", !message);+ error.classList.toggle("ft__success", !!message && success);+ error.classList.toggle("ft__error", !!message && !success);};+ const setError = (message: string) => setStatus(message);const loadRules = async () => {const version = ++rulesVersion;const response = await fetchSyncPost("/api/sync/getSyncProviderConfigRules", {@@ -605,6 +613,66 @@ const openSyncProviderConfigDialog = (root: Element) => {};configElement.querySelector('[data-action="save"]').addEventListener("click", () => { void save(); });configElement.querySelector('[data-action="cancel"]').addEventListener("click", () => dialog.destroy());+ // 测试连接只探测当前草稿,不保存配置;失败分为确定错误与网络未知,避免把无法判定的情况报成配置问题+ const testConnection = async () => {+ if (pending || confirming || window.siyuan.config.readonly || !testElement || !testLabel) {+ return;+ }+ validationShown = true;+ if (!validateSyncProviderFields(configElement, def, requiredFields)) {+ setError(L.syncConfigNotSaved);+ configElement.querySelector<HTMLElement>('[aria-invalid="true"]')?.focus();+ return;+ }+ setError("");+ setPending(true);+ testLabel.textContent = L.testConnectionTesting;+ try {+ // 必填清单来自内核,规则尚未返回时它是空的,空值会漏过本地校验并被内核报成配置错误,因此先取规则+ let rules: Awaited<ReturnType<typeof loadRules>>;+ try {+ rules = await loadRules();+ } catch {+ if (!closed) {+ setError(L.loadingError);+ }+ return;+ }+ if (closed) {+ return;+ }+ if (!rules) {+ setError(L.loadingError);+ return;+ }+ if (!validateSyncProviderFields(configElement, def, rules.requiredFields)) {+ setError(L.syncConfigNotSaved);+ configElement.querySelector<HTMLElement>('[aria-invalid="true"]')?.focus();+ return;+ }+ const response = await fetchSyncPost("/api/sync/testSyncProviderS3", {+ s3: readProviderConfigFields(configElement, template),+ });+ if (closed) {+ return;+ }+ if (response.code !== 0) {+ setError(response.msg || L.testConnectionFail);+ } else if ("ok" === response.data.kind) {+ setStatus(L.testConnectionSuccess, true);+ } else {+ setStatus(response.data.msg ? L.testConnectionFailMsg.replace("${msg}", response.data.msg) : L.testConnectionFail);+ }+ } catch {+ if (!closed) {+ setError(L.testConnectionFail);+ }+ } finally {+ testLabel.textContent = L.testConnection;+ setPending(false);+ }+ };+ testElement?.addEventListener("click", () => { void testConnection(); });configElement.querySelector('[data-action="clear"]').addEventListener("click", () => {if (pending || confirming || window.siyuan.config.readonly) {return;@@ -641,6 +709,8 @@ const openSyncProviderConfigDialog = (root: Element) => {rulesVersion++;clearTimeout(rulesTimer);configElement.querySelector("#sync-endpoint-warning")?.classList.toggle("fn__none", true);+ // 配置已改变,旧的测试结果不再对应当前草稿+ setStatus("");rulesTimer = setTimeout(refreshRules, 300);if (validationShown) {validateSyncProviderFields(configElement, def, requiredFields);diff --git a/app/src/types/api/index.d.ts b/app/src/types/api/index.d.tsindex 0930ac5666..5de8924fc0 100644--- a/app/src/types/api/index.d.ts+++ b/app/src/types/api/index.d.ts@@ -2392,6 +2392,10 @@ export type TemplatePlan = { "count": number; "id": string; "nodes": Array<Templexport type TemplatePlanNode = { "depth": number; "hPath": string; "id": string; "parentID": string; "title": string; };+export type TestSyncProviderS3Data = { "kind": string; "msg": string; };++export type TestSyncProviderS3RequestInput = { "s3": SyncS3Input; };+export type Transaction = { "doOperations": Array<TransactionOperation | null> | null; "templateDocTreePlanID"?: string; "timestamp": number; "undoOperations": Array<TransactionOperation | null> | null; };export type TransactionAttributeChangeInput = { "data-av-type"?: string | null; "new"?: Record<string, string> | null; "old"?: Record<string, string> | null; };@@ -7175,7 +7179,7 @@ export interface APIPOSTRoutes {};/*** 返回服务类型 2(S3)、3(WebDAV)或 4(本地文件系统)的共用必填清单。- * endpoint、bucket 可省略;仅 S3 返回地址主机名重复包含桶名的提示,提示不阻断保存或同步。+ * endpoint、bucket 可省略;仅 S3 返回 Endpoint 可能让对象键多出前缀的提示,提示不阻断保存或同步。* 此接口只做内存中的静态判定,不读取或保存用户配置,不接收凭据,不访问云端或文件系统。* 未知服务返回 code -1;规则提示不替代保存时的完整校验和资源来源保护。只读模式下也可调用。*/@@ -7323,6 +7327,19 @@ export interface APIPOSTRoutes {/** 服务器路由要求;资源权限与笔记本租约仍由内核校验 */authorization?: readonly ["authenticated","admin","writable"];};+ /**+ * 使用请求中的候选配置探测云端:写入探针对象、按前缀列举并比对、尽力删除探针,不读取或保存用户配置。+ * 请求字段与保存接口一致;缺少必填项或地址无效时同样返回 code 0,由 kind 为 config 表示,避免与网络故障混淆。+ * kind 为 ok 表示写入与列举指向同一个对象键;config 表示可确定的配置错误;network 表示网络或服务端不可达,无法判定配置。+ * 探测会在桶内创建再删除 repo/objects/.siyuan-probe-<随机值>/probe,需要该前缀的写入与列举权限;未删除的探针会作为未引用对象被云端清理回收。只读模式下也可调用。+ */+ "/api/sync/testSyncProviderS3": {+ request: TestSyncProviderS3RequestInput;+ response: { "code": 0; "data": TestSyncProviderS3Data; "msg": string; } | { "code": -1; "data": { "closeTimeout": number; } | null; "msg": string; };+ body: "json";+ /** 服务器路由要求;资源权限与笔记本租约仍由内核校验 */+ authorization?: readonly ["authenticated","admin"];+ };"/api/system/addCustomEmoji": {request: SystemCustomEmojiRequestInput;response: { "code": 0; "data": SystemPathData; "msg": string; } | { "code": -1 | 400 | 413; "data": { "closeTimeout": number; } | null; "msg": string; };diff --git a/kernel/api/contract_sync_rules_test.go b/kernel/api/contract_sync_rules_test.goindex 50c970c54e..f51269a4b5 100644--- a/kernel/api/contract_sync_rules_test.go+++ b/kernel/api/contract_sync_rules_test.go@@ -25,6 +25,10 @@ func TestAPIContractSyncProviderConfigRules(t *testing.T) {warning bool}{{`{"provider":2,"endpoint":"https://notes.example.com","bucket":"notes"}`, conf.ProviderS3, 0, true},+ {`{"provider":2,"endpoint":"https://s3.example.com/notes/","bucket":"notes"}`, conf.ProviderS3, 0, true},+ {`{"provider":2,"endpoint":"https://s3.example.com/proxy/","bucket":"notes"}`, conf.ProviderS3, 0, true},+ {`{"provider":2,"endpoint":"https://s3.example.com/","bucket":"notes/sub"}`, conf.ProviderS3, 0, true},+ {`{"provider":2,"endpoint":"https://s3.example.com/","bucket":"notes"}`, conf.ProviderS3, 0, false},{`{"provider":2}`, conf.ProviderS3, 0, false},{`{"provider":3,"endpoint":"https://notes.example.com","bucket":"notes"}`, conf.ProviderWebDAV, 0, false},{`{"provider":4}`, conf.ProviderLocal, 0, false},diff --git a/kernel/api/router.go b/kernel/api/router.goindex d59b713eca..4cee8e4354 100644--- a/kernel/api/router.go+++ b/kernel/api/router.go@@ -540,6 +540,7 @@ func registerSyncRoutes(ginServer *gin.Engine) {ginServer.Handle("POST", "/api/sync/setSyncProviderLocal", contractRouteHandlers(apicontract.SetSyncProviderLocal, setSyncProviderLocal)...)ginServer.Handle("POST", "/api/sync/clearSyncProviderConfig", contractRouteHandlers(apicontract.ClearSyncProviderConfig, clearSyncProviderConfig)...)ginServer.Handle("POST", "/api/sync/getSyncProviderConfigRules", contractRouteHandlers(apicontract.GetSyncProviderConfigRules, getSyncProviderConfigRules)...)+ ginServer.Handle("POST", "/api/sync/testSyncProviderS3", contractRouteHandlers(apicontract.TestSyncProviderS3, testSyncProviderS3)...)ginServer.Handle("POST", "/api/sync/setCloudSyncDir", contractRouteHandlers(apicontract.SetCloudSyncDir, setCloudSyncDir)...)ginServer.Handle("POST", "/api/sync/setSyncAssetDownloadMode", contractRouteHandlers(apicontract.SetSyncAssetDownloadMode, setSyncAssetDownloadMode)...)ginServer.Handle("POST", "/api/sync/createCloudSyncDir", contractRouteHandlers(apicontract.CreateCloudSyncDir, createCloudSyncDir)...)diff --git a/kernel/api/sync_rules.go b/kernel/api/sync_rules.goindex dc231f11ad..d8f5124ba0 100644--- a/kernel/api/sync_rules.go+++ b/kernel/api/sync_rules.go@@ -4,6 +4,7 @@ import ("github.com/gin-gonic/gin""github.com/siyuan-note/siyuan/kernel/apicontract""github.com/siyuan-note/siyuan/kernel/conf"+ "github.com/siyuan-note/siyuan/kernel/model")var getSyncProviderConfigRules = contractHandler(apicontract.GetSyncProviderConfigRules, getSyncProviderConfigRulesContract)@@ -15,6 +16,13 @@ func getSyncProviderConfigRulesContract(_ *gin.Context, request apicontract.Sync}return apicontract.Success(apicontract.SyncProviderConfigRulesData{RequiredFields: fields,- EndpointBucketWarning: request.Provider == conf.ProviderS3 && conf.S3EndpointIncludesBucket(request.Endpoint, request.Bucket),+ EndpointBucketWarning: request.Provider == conf.ProviderS3 && conf.S3EndpointIncludesBucketOrPath(request.Endpoint, request.Bucket),})}++var testSyncProviderS3 = contractHandler(apicontract.TestSyncProviderS3, testSyncProviderS3Contract)++func testSyncProviderS3Contract(_ *gin.Context, request apicontract.TestSyncProviderS3Request) apicontract.Response[apicontract.TestSyncProviderS3Data] {+ kind, msg := model.TestSyncProviderS3((*conf.S3)(&request.S3))+ return apicontract.Success(apicontract.TestSyncProviderS3Data{Kind: kind, Msg: msg})+}diff --git a/kernel/apicontract/contracts.go b/kernel/apicontract/contracts.goindex f969454796..0b0f219921 100644--- a/kernel/apicontract/contracts.go+++ b/kernel/apicontract/contracts.go@@ -843,11 +843,17 @@ var SetSyncProviderLocal = define[SetSyncLocalRequest, SyncLocalData]("setSyncPrvar ClearSyncProviderConfig = define[ClearSyncProviderConfigRequest, ClearSyncProviderConfigData]("clearSyncProviderConfig", "/api/sync/clearSyncProviderConfig", AuthenticatedAccess|AdminAccess|WritableAccess, JSONBody, ResponseOptions{Setting: SettingWrite{Namespace: "sync"}}, "POST")// GetSyncProviderConfigRules 返回服务类型 2(S3)、3(WebDAV)或 4(本地文件系统)的共用必填清单。-// endpoint、bucket 可省略;仅 S3 返回地址主机名重复包含桶名的提示,提示不阻断保存或同步。+// endpoint、bucket 可省略;仅 S3 返回 Endpoint 可能让对象键多出前缀的提示,提示不阻断保存或同步。// 此接口只做内存中的静态判定,不读取或保存用户配置,不接收凭据,不访问云端或文件系统。// 未知服务返回 code -1;规则提示不替代保存时的完整校验和资源来源保护。只读模式下也可调用。var GetSyncProviderConfigRules = define[SyncProviderConfigRulesRequest, SyncProviderConfigRulesData]("getSyncProviderConfigRules", "/api/sync/getSyncProviderConfigRules", AuthenticatedAccess|AdminAccess, JSONBody, ResponseOptions{}, "POST")+// TestSyncProviderS3 使用请求中的候选配置探测云端:写入探针对象、按前缀列举并比对、尽力删除探针,不读取或保存用户配置。+// 请求字段与保存接口一致;缺少必填项或地址无效时同样返回 code 0,由 kind 为 config 表示,避免与网络故障混淆。+// kind 为 ok 表示写入与列举指向同一个对象键;config 表示可确定的配置错误;network 表示网络或服务端不可达,无法判定配置。+// 探测会在桶内创建再删除 repo/objects/.siyuan-probe-<随机值>/probe,需要该前缀的写入与列举权限;未删除的探针会作为未引用对象被云端清理回收。只读模式下也可调用。+var TestSyncProviderS3 = define[TestSyncProviderS3Request, TestSyncProviderS3Data]("testSyncProviderS3", "/api/sync/testSyncProviderS3", AuthenticatedAccess|AdminAccess, JSONBody, ResponseOptions{}, "POST")+var SetCloudSyncDir = define[SyncNameRequest, Null]("setCloudSyncDir", "/api/sync/setCloudSyncDir", AuthenticatedAccess|AdminAccess|WritableAccess, JSONBody, ResponseOptions{Setting: SettingWrite{Namespace: "sync"}}, "POST")var SetSyncAssetDownloadMode = define[SyncModeRequest, SyncAssetDownloadModeData]("setSyncAssetDownloadMode", "/api/sync/setSyncAssetDownloadMode", AuthenticatedAccess|AdminAccess|WritableAccess, JSONBody, ResponseOptions{Setting: SettingWrite{Namespace: "sync"}}, "POST")var CreateCloudSyncDir = define[SyncNameRequest, Null]("createCloudSyncDir", "/api/sync/createCloudSyncDir", AuthenticatedAccess|AdminAccess|WritableAccess, JSONBody, ResponseOptions{}, "POST")diff --git a/kernel/apicontract/schema.json b/kernel/apicontract/schema.jsonindex fed4396150..90d452365c 100644--- a/kernel/apicontract/schema.json+++ b/kernel/apicontract/schema.json@@ -53226,6 +53226,34 @@],"additionalProperties": false},+ "TestSyncProviderS3Data": {+ "type": "object",+ "properties": {+ "kind": {+ "type": "string"+ },+ "msg": {+ "type": "string"+ }+ },+ "required": [+ "kind",+ "msg"+ ],+ "additionalProperties": false+ },+ "TestSyncProviderS3RequestInput": {+ "type": "object",+ "properties": {+ "s3": {+ "$ref": "#/$defs/SyncS3Input"+ }+ },+ "required": [+ "s3"+ ],+ "additionalProperties": false+ },"Transaction": {"type": "object","properties": {@@ -168324,6 +168352,85 @@]}},+ {+ "method": "POST",+ "path": "/api/sync/testSyncProviderS3",+ "handler": "testSyncProviderS3",+ "authorization": [+ "authenticated",+ "admin"+ ],+ "body": "json",+ "request": {+ "$ref": "#/$defs/TestSyncProviderS3RequestInput"+ },+ "response": {+ "anyOf": [+ {+ "type": "object",+ "properties": {+ "code": {+ "type": "integer",+ "enum": [+ 0+ ]+ },+ "data": {+ "$ref": "#/$defs/TestSyncProviderS3Data"+ },+ "msg": {+ "type": "string"+ }+ },+ "required": [+ "code",+ "msg",+ "data"+ ],+ "additionalProperties": false+ },+ {+ "type": "object",+ "properties": {+ "code": {+ "type": "integer",+ "enum": [+ -1+ ]+ },+ "data": {+ "anyOf": [+ {+ "type": "object",+ "properties": {+ "closeTimeout": {+ "type": "number"+ }+ },+ "required": [+ "closeTimeout"+ ],+ "additionalProperties": false+ },+ {+ "type": "null"+ }+ ]+ },+ "msg": {+ "type": "string"+ }+ },+ "required": [+ "code",+ "msg",+ "data"+ ],+ "additionalProperties": true+ }+ ]+ }+ },{"method": "POST","path": "/api/system/addCustomEmoji",diff --git a/kernel/apicontract/sync.go b/kernel/apicontract/sync.goindex 0ba718287b..a4fe0ff743 100644--- a/kernel/apicontract/sync.go+++ b/kernel/apicontract/sync.go@@ -39,6 +39,15 @@ type SyncProviderConfigRulesData struct {EndpointBucketWarning bool `json:"endpointBucketWarning"`}+type TestSyncProviderS3Request struct {+ S3 SyncS3 `json:"s3"`+}++type TestSyncProviderS3Data struct {+ Kind string `json:"kind"`+ Msg string `json:"msg"`+}+type ClearSyncProviderConfigData struct {Enabled bool `json:"enabled"`S3 *SyncS3 `json:"s3,omitempty"`diff --git a/kernel/conf/sync_rules.go b/kernel/conf/sync_rules.goindex 5211b221a4..1a39b72906 100644--- a/kernel/conf/sync_rules.go+++ b/kernel/conf/sync_rules.go@@ -29,13 +29,31 @@ func MissingSyncProviderField(provider int, values map[string]string) bool {return false}-// S3EndpointIncludesBucket 仅提示主机名已包含桶名,不阻止保存,也不探测云端。-func S3EndpointIncludesBucket(endpoint, bucket string) bool {+// S3EndpointIncludesBucketOrPath 提示会让仓库对象键多出前缀的 Endpoint 写法:主机名以桶名开头、地址带路径,或桶名自身含路径。+// 该判断只用于提醒,不阻止保存,也不探测云端。+func S3EndpointIncludesBucketOrPath(endpoint, bucket string) bool {bucket = strings.ToLower(strings.TrimSpace(bucket))- if bucket == "" || strings.TrimSpace(endpoint) == "" {+ raw := strings.TrimSpace(endpoint)+ if "" == raw {return false}- address, err := url.Parse(util.NormalizeEndpoint(strings.TrimSpace(endpoint)))- return err == nil && (address.Scheme == "http" || address.Scheme == "https") &&- strings.HasPrefix(strings.ToLower(address.Hostname()), bucket+".")+ // 非 HTTP(S) 协议属于地址错误,由保存校验处理,不在此提示+ raw = strings.Replace(raw, "http://http(s)://", "https://", 1)+ raw = strings.Replace(raw, "http(s)://", "https://", 1)+ if strings.Contains(raw, "://") && !strings.HasPrefix(raw, "http://") && !strings.HasPrefix(raw, "https://") {+ return false+ }+ address, err := url.Parse(util.NormalizeEndpoint(raw))+ if err != nil || (address.Scheme != "http" && address.Scheme != "https") || address.Hostname() == "" {+ return false+ }+ // 地址路径会排在桶名之前,非空即可能改变对象键+ if "" != strings.Trim(address.Path, "/") {+ return true+ }+ // 桶名自带路径时,对象键同样会多出该前缀+ if strings.Contains(strings.Trim(bucket, "/"), "/") {+ return true+ }+ return "" != bucket && strings.HasPrefix(strings.ToLower(address.Hostname()), bucket+".")}diff --git a/kernel/conf/sync_rules_test.go b/kernel/conf/sync_rules_test.goindex ebae339f40..a858c3ae55 100644--- a/kernel/conf/sync_rules_test.go+++ b/kernel/conf/sync_rules_test.go@@ -25,7 +25,7 @@ func TestSyncProviderRequiredFields(t *testing.T) {}}-func TestS3EndpointIncludesBucket(t *testing.T) {+func TestS3EndpointIncludesBucketOrPath(t *testing.T) {for _, tc := range []struct {endpoint, bucket stringwant bool@@ -36,15 +36,21 @@ func TestS3EndpointIncludesBucket(t *testing.T) {{"http://notes.storage.example:9000", "notes", true},{"https://my.notes.storage.example", "my.notes", true},{"https://notebook.storage.example", "notes", false},- {"https://storage.example/notes", "notes", false},+ {"https://storage.example/notes", "notes", true},+ {"https://s3.example.com/proxy/", "notes", true},+ {"https://s3.example.com/%6eotes/", "notes", true},+ {"https://s3.example.com", "notes/sub", true},+ {"https://s3.example.com/", "notes", false},+ {"https://s3.example.com", "notes/", false},{"https://notes", "notes", false},{"https://storage.example?notes.storage.example", "notes", false},{"ftp://notes.storage.example", "notes", false},{"https://bad host", "bad", false},+ {"https://", "notes", false},{"", "notes", false},{"https://notes.storage.example", "", false},} {- if got := S3EndpointIncludesBucket(tc.endpoint, tc.bucket); got != tc.want {+ if got := S3EndpointIncludesBucketOrPath(tc.endpoint, tc.bucket); got != tc.want {t.Errorf("%q, %q: got %v, want %v", tc.endpoint, tc.bucket, got, tc.want)}}diff --git a/kernel/model/sync_probe.go b/kernel/model/sync_probe.gonew file mode 100644index 0000000000..623c6b775f--- /dev/null+++ b/kernel/model/sync_probe.go@@ -0,0 +1,117 @@+package model++import (+ "errors"+ "fmt"+ "strings"+ "time"++ "github.com/siyuan-note/dejavu/cloud"+ "github.com/siyuan-note/httpclient"+ "github.com/siyuan-note/siyuan/kernel/conf"+ "github.com/siyuan-note/siyuan/kernel/util"+)++const (+ // SyncProbeOK 表示写入与列举指向同一个对象键+ SyncProbeOK = "ok"+ // SyncProbeConfig 表示可以确定的配置错误+ SyncProbeConfig = "config"+ // SyncProbeNetwork 表示网络或服务端不可达,无法判定配置+ SyncProbeNetwork = "network"+)++// syncProbeListAttempts 与 syncProbeListRetryDelay 在「刚写入却列不到」时重试,兼容列举结果短暂滞后于写入的服务端实现。+var (+ syncProbeListAttempts = 3+ syncProbeListRetryDelay = 300 * time.Millisecond+)++// TestSyncProviderS3 用候选配置写入、列举并删除探针对象,确认读写与列举落在同一个对象键上。+// 只访问云端,不读取或保存用户配置;云端为空(首次配置)时同样适用,写入先于列举,不依赖任何已有对象。+func TestSyncProviderS3(s3 *conf.S3) (kind, msg string) {+ if err := validateSyncS3(s3); nil != err {+ return SyncProbeConfig, err.Error()+ }++ candidate := &conf.S3{+ Endpoint: util.NormalizeEndpoint(strings.TrimSpace(s3.Endpoint)),+ AccessKey: strings.TrimSpace(s3.AccessKey),+ SecretKey: strings.TrimSpace(s3.SecretKey),+ Bucket: strings.TrimSpace(s3.Bucket),+ Region: strings.TrimSpace(s3.Region),+ PathStyle: s3.PathStyle,+ SkipTlsVerify: s3.SkipTlsVerify,+ Timeout: util.NormalizeTimeout(s3.Timeout),+ ConcurrentReqs: util.NormalizeConcurrentReqs(s3.ConcurrentReqs, conf.ProviderS3),+ }++ client := newS3ProbeClient(candidate)+ // 探针放在数据分块前缀下:同步每次都会写入与列举该前缀,权限判定更有代表性;+ // 随机子目录不会与 40 位十六进制对象 ID 冲突,未引用时也会被云端清理回收。+ probeDir := "objects/.siyuan-probe-" + util.RandString(8) + "/"+ probeKey := probeDir + "probe"+ if _, err := client.UploadBytes(probeKey, []byte("siyuan"), true); nil != err {+ return syncProbeFailure(err)+ }+ defer func() {+ // 探针删除失败只会留下一个可忽略的小对象,不作为探测结论+ _ = client.RemoveObject(probeKey)+ }()++ objects, err := client.ListObjects(probeDir)+ if nil != err {+ return syncProbeFailure(err)+ }+ if _, listed := objects["probe"]; listed {+ return SyncProbeOK, ""+ }+ // 部分兼容实现在写入后短时间内列不到新对象,重试后再判定,避免把可用配置报成错误+ for attempt := 1; attempt < syncProbeListAttempts; attempt++ {+ time.Sleep(syncProbeListRetryDelay)+ objects, err = client.ListObjects(probeDir)+ if nil != err {+ return syncProbeFailure(err)+ }+ if _, listed := objects["probe"]; listed {+ return SyncProbeOK, ""+ }+ }+ return SyncProbeConfig, fmt.Sprintf("probe object [repo/%s] was not listed by its own prefix", probeKey)+}++// newS3ProbeClient 使用候选配置构造独立客户端,复用同步路径的 SDK 选项与 HTTP 传输。+func newS3ProbeClient(s3 *conf.S3) cloud.Cloud {+ httpClient := httpclient.NewUserAgentClient(httpclient.NewTransport(s3.SkipTlsVerify))+ httpClient.Timeout = time.Duration(s3.Timeout) * time.Second+ return cloud.NewS3(&cloud.BaseCloud{Conf: &cloud.Conf{S3: &cloud.ConfS3{+ Endpoint: s3.Endpoint,+ AccessKey: s3.AccessKey,+ SecretKey: s3.SecretKey,+ Region: s3.Region,+ Bucket: s3.Bucket,+ PathStyle: s3.PathStyle,+ SkipTlsVerify: s3.SkipTlsVerify,+ Timeout: s3.Timeout,+ ConcurrentReqs: s3.ConcurrentReqs,+ }}}, httpClient)+}++// syncProbeFailure 区分可确定的配置错误与网络、服务端不可达,无法判定时归为后者以免误报配置问题。+func syncProbeFailure(err error) (kind, msg string) {+ if errors.Is(err, cloud.ErrCloudAuthFailed) || errors.Is(err, cloud.ErrCloudForbidden) ||+ errors.Is(err, cloud.ErrCloudObjectNotFound) {+ return SyncProbeConfig, err.Error()+ }+ lower := strings.ToLower(err.Error())+ for _, hint := range []string{+ "no such host", "hostname resolution", "no address associated with hostname", "connection failed",+ "timeout", "context deadline exceeded", "connection refused", "connection reset",+ "broken pipe", "network is unreachable",+ } {+ if strings.Contains(lower, hint) {+ return SyncProbeNetwork, err.Error()+ }+ }+ return SyncProbeConfig, err.Error()+}diff --git a/kernel/model/sync_probe_test.go b/kernel/model/sync_probe_test.gonew file mode 100644index 0000000000..7de75a1cf7--- /dev/null+++ b/kernel/model/sync_probe_test.go@@ -0,0 +1,175 @@+package model++import (+ "fmt"+ "io"+ "net/http"+ "net/http/httptest"+ "strings"+ "sync"+ "testing"++ "github.com/siyuan-note/siyuan/kernel/conf"+)++// probeServer 是最小的 S3 兼容端点:记录写入、列举与删除,用于验证探测结论。+type probeServer struct {+ mu sync.Mutex+ objects map[string][]byte+ written []string+ listKeyFn func(prefix string) string+ listFails bool+ bucketMiss bool+ listLag int+}++func (server *probeServer) ServeHTTP(writer http.ResponseWriter, request *http.Request) {+ server.mu.Lock()+ defer server.mu.Unlock()+ if server.bucketMiss {+ writer.Header().Set("Content-Type", "application/xml")+ writer.WriteHeader(http.StatusNotFound)+ _, _ = writer.Write([]byte(`<?xml version="1.0" encoding="UTF-8"?><Error><Code>NoSuchBucket</Code><Message>The specified bucket does not exist</Message></Error>`))+ return+ }+ key := strings.TrimPrefix(request.URL.Path, "/notes/")+ switch request.Method {+ case http.MethodPut:+ data, _ := io.ReadAll(request.Body)+ server.objects[key] = data+ server.written = append(server.written, key)+ writer.WriteHeader(http.StatusOK)+ case http.MethodDelete:+ delete(server.objects, key)+ writer.WriteHeader(http.StatusNoContent)+ case http.MethodGet:+ if server.listFails {+ writer.Header().Set("Content-Type", "application/xml")+ writer.WriteHeader(http.StatusNotFound)+ _, _ = writer.Write([]byte(`<?xml version="1.0" encoding="UTF-8"?><Error><Code>NoSuchKey</Code><Message>missing</Message></Error>`))+ return+ }+ // 模拟列举结果滞后于写入:前 listLag 次列举看不到已写入的对象+ visible := server.objects+ if 0 < server.listLag {+ server.listLag--+ visible = map[string][]byte{}+ }+ prefix := request.URL.Query().Get("prefix")+ var contents strings.Builder+ for objectKey := range visible {+ if !strings.HasPrefix(objectKey, prefix) {+ continue+ }+ listed := objectKey+ if nil != server.listKeyFn {+ listed = server.listKeyFn(objectKey)+ }+ contents.WriteString(fmt.Sprintf("<Contents><Key>%s</Key><Size>6</Size><LastModified>2026-01-01T00:00:00.000Z</LastModified><ETag>\"etag\"</ETag><StorageClass>STANDARD</StorageClass></Contents>", listed))+ }+ writer.Header().Set("Content-Type", "application/xml")+ _, _ = writer.Write([]byte(fmt.Sprintf(`<?xml version="1.0" encoding="UTF-8"?><ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>notes</Name><Prefix>%s</Prefix><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated>%s</ListBucketResult>`, prefix, contents.String())))+ default:+ writer.WriteHeader(http.StatusMethodNotAllowed)+ }+}++func probeConfig(endpoint string) *conf.S3 {+ return &conf.S3{+ Endpoint: endpoint, AccessKey: "key", SecretKey: "secret", Bucket: "notes", Region: "auto",+ PathStyle: true, Timeout: 30, ConcurrentReqs: 4,+ }+}++func TestTestSyncProviderS3(t *testing.T) {+ originalDelay := syncProbeListRetryDelay+ syncProbeListRetryDelay = 0+ t.Cleanup(func() { syncProbeListRetryDelay = originalDelay })++ healthy := &probeServer{objects: map[string][]byte{}}+ server := httptest.NewServer(healthy)+ defer server.Close()+ if kind, msg := TestSyncProviderS3(probeConfig(server.URL)); kind != SyncProbeOK || "" != msg {+ t.Fatalf("healthy endpoint returned %q: %s", kind, msg)+ }+ if 0 != len(healthy.objects) {+ t.Fatalf("probe object was left behind: %v", healthy.objects)+ }+ // 探针位于数据分块前缀下,才能覆盖同步所需的写入与列举权限,并随未引用对象一起被清理+ if 1 != len(healthy.written) || !strings.HasPrefix(healthy.written[0], "repo/objects/.siyuan-probe-") ||+ !strings.HasSuffix(healthy.written[0], "/probe") {+ t.Fatalf("probe key is outside the object prefix: %v", healthy.written)+ }++ // 列举被路由成取对象:写入成功但按前缀列举失败+ brokenListing := &probeServer{objects: map[string][]byte{}, listFails: true}+ brokenServer := httptest.NewServer(brokenListing)+ defer brokenServer.Close()+ if kind, _ := TestSyncProviderS3(probeConfig(brokenServer.URL)); kind != SyncProbeConfig {+ t.Fatalf("failing listing returned %q", kind)+ }++ // 对象键多出一层前缀:写入与列举都成功,但列举结果与写入的键不一致+ offset := &probeServer{objects: map[string][]byte{}, listKeyFn: func(key string) string {+ return "notes/" + key+ }}+ offsetServer := httptest.NewServer(offset)+ defer offsetServer.Close()+ if kind, msg := TestSyncProviderS3(probeConfig(offsetServer.URL)); kind != SyncProbeConfig || !strings.Contains(msg, "not listed") {+ t.Fatalf("offset keys returned %q: %s", kind, msg)+ }+}++// TestTestSyncProviderS3FreshBucket 覆盖首次配置:桶中没有任何对象时,探测只依赖自己写入的探针。+func TestTestSyncProviderS3FreshBucket(t *testing.T) {+ originalDelay := syncProbeListRetryDelay+ syncProbeListRetryDelay = 0+ t.Cleanup(func() { syncProbeListRetryDelay = originalDelay })++ fresh := &probeServer{objects: map[string][]byte{}}+ server := httptest.NewServer(fresh)+ defer server.Close()+ kind, msg := TestSyncProviderS3(probeConfig(server.URL))+ if kind != SyncProbeOK || "" != msg {+ t.Fatalf("empty bucket returned %q: %s", kind, msg)+ }+ // 探测结束后桶应恢复为空,不留下会影响首次同步的对象+ if 0 != len(fresh.objects) {+ t.Fatalf("probe left objects in the empty bucket: %v", fresh.objects)+ }+}++// TestTestSyncProviderS3MissingBucket 确认桶未创建时归为可确定的配置错误,且给出可读原因。+func TestTestSyncProviderS3MissingBucket(t *testing.T) {+ originalDelay := syncProbeListRetryDelay+ syncProbeListRetryDelay = 0+ t.Cleanup(func() { syncProbeListRetryDelay = originalDelay })++ missing := &probeServer{objects: map[string][]byte{}, bucketMiss: true}+ server := httptest.NewServer(missing)+ defer server.Close()+ kind, msg := TestSyncProviderS3(probeConfig(server.URL))+ if kind != SyncProbeConfig {+ t.Fatalf("missing bucket returned %q: %s", kind, msg)+ }+ if !strings.Contains(strings.ToLower(msg), "nosuchbucket") && !strings.Contains(strings.ToLower(msg), "does not exist") {+ t.Fatalf("missing bucket reason is not diagnostic: %s", msg)+ }+}++// TestTestSyncProviderS3ListingLag 确认新写入对象尚未出现在列举结果时,重试仍能得出可用结论。+func TestTestSyncProviderS3ListingLag(t *testing.T) {+ originalDelay := syncProbeListRetryDelay+ syncProbeListRetryDelay = 0+ t.Cleanup(func() { syncProbeListRetryDelay = originalDelay })++ lagging := &probeServer{objects: map[string][]byte{}, listLag: syncProbeListAttempts - 1}+ server := httptest.NewServer(lagging)+ defer server.Close()+ if kind, msg := TestSyncProviderS3(probeConfig(server.URL)); kind != SyncProbeOK || "" != msg {+ t.Fatalf("listing lag returned %q: %s", kind, msg)+ }+ if 0 != lagging.listLag {+ t.Fatalf("listing lag was not exercised: %d", lagging.listLag)+ }+}