An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:art: Improve desktop shutdown and restart handling https://github.com/siyuan-note/siyuan/issues/20508
Daniel09c7ea1d42c8
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.jsonindex fbcd6d7dbd..284abc6107 100644--- a/app/appearance/langs/ar.json+++ b/app/appearance/langs/ar.json@@ -1,4 +1,8 @@{+ "exitWaiting": "جارٍ الحفظ والمزامنة، يُرجى الانتظار...",+ "exitWaitFailed": "تعذّر التأكد من اكتمال الإغلاق. يمكنك إعادة المحاولة أو إغلاق مربع الحوار هذا ومتابعة الانتظار.",+ "previousExitWaiting": "في انتظار اكتمال الإغلاق السابق...",+ "previousExitWaitFailed": "تعذّر التأكد من اكتمال الإغلاق السابق. يُرجى التحقق من نافذة SiYuan الأخرى ومن الملف temp/siyuan.log في مساحة العمل، ثم إعادة المحاولة.","ocrImportModelsTitle": "استيراد نماذج PP-OCRv6","kernelUnresponsiveTitle": "النواة لا تستجيب","kernelUnresponsiveMessage": "انتهت مهلة الطلبات المحلية إلى النواة، لذا لا يستطيع SiYuan فتح النافذة الرئيسية. راجع ${log} لمزيد من التفاصيل.",diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.jsonindex b72518efc9..685b43037a 100644--- a/app/appearance/langs/de.json+++ b/app/appearance/langs/de.json@@ -1,4 +1,8 @@{+ "exitWaiting": "Speichern und Synchronisieren. Bitte warten...",+ "exitWaitFailed": "Der Abschluss des Beendens konnte nicht bestätigt werden. Versuchen Sie es erneut oder schließen Sie diesen Dialog und warten Sie weiter.",+ "previousExitWaiting": "Warten, bis der vorherige Beendigungsvorgang abgeschlossen ist...",+ "previousExitWaitFailed": "Der Abschluss des vorherigen Beendigungsvorgangs konnte nicht bestätigt werden. Prüfen Sie das andere SiYuan-Fenster und Arbeitsbereich/temp/siyuan.log und versuchen Sie es erneut.","ocrImportModelsTitle": "PP-OCRv6-Modelle importieren","kernelUnresponsiveTitle": "Der Kernel antwortet nicht","kernelUnresponsiveMessage": "Lokale Anfragen an den Kernel haben das Zeitlimit überschritten. SiYuan kann das Hauptfenster nicht öffnen. Weitere Informationen finden Sie in ${log}.",diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.jsonindex 282c3d89de..9bed42bef0 100644--- a/app/appearance/langs/en.json+++ b/app/appearance/langs/en.json@@ -1,4 +1,8 @@{+ "exitWaiting": "Saving and syncing, please wait...",+ "exitWaitFailed": "Could not confirm that shutdown has completed. You can retry or close this dialog and continue waiting.",+ "previousExitWaiting": "Waiting for the previous shutdown to finish...",+ "previousExitWaitFailed": "Could not confirm that the previous shutdown has completed. Please check the other SiYuan window and workspace/temp/siyuan.log, then try again.","ocrImportModelsTitle": "Import PP-OCRv6 models","kernelUnresponsiveTitle": "The kernel is not responding","kernelUnresponsiveMessage": "Local requests to the kernel timed out, so SiYuan cannot open the main window. Check ${log} for details.",diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.jsonindex 5aaa42c187..6dadd319a8 100644--- a/app/appearance/langs/es.json+++ b/app/appearance/langs/es.json@@ -1,4 +1,8 @@{+ "exitWaiting": "Guardando y sincronizando, espere...",+ "exitWaitFailed": "No se pudo confirmar que el cierre haya terminado. Puede reintentar o cerrar este diálogo y seguir esperando.",+ "previousExitWaiting": "Esperando a que termine el cierre anterior...",+ "previousExitWaitFailed": "No se pudo confirmar que el cierre anterior haya terminado. Revise la otra ventana de SiYuan y espacio de trabajo/temp/siyuan.log, y vuelva a intentarlo.","ocrImportModelsTitle": "Importar modelos PP-OCRv6","kernelUnresponsiveTitle": "El núcleo no responde","kernelUnresponsiveMessage": "Las solicitudes locales al núcleo agotaron el tiempo de espera, por lo que SiYuan no puede abrir la ventana principal. Consulte ${log} para obtener más detalles.",diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.jsonindex 39d7a532a6..e282136df7 100644--- a/app/appearance/langs/fr.json+++ b/app/appearance/langs/fr.json@@ -1,4 +1,8 @@{+ "exitWaiting": "Enregistrement et synchronisation en cours, veuillez patienter...",+ "exitWaitFailed": "Impossible de confirmer la fin de la fermeture. Vous pouvez réessayer ou fermer cette boîte de dialogue et continuer à patienter.",+ "previousExitWaiting": "En attente de la fin de la fermeture précédente...",+ "previousExitWaitFailed": "Impossible de confirmer la fin de la fermeture précédente. Vérifiez l’autre fenêtre SiYuan et espace de travail/temp/siyuan.log, puis réessayez.","ocrImportModelsTitle": "Importer des modèles PP-OCRv6","kernelUnresponsiveTitle": "Le noyau ne répond pas","kernelUnresponsiveMessage": "Les requêtes locales au noyau ont dépassé le délai d’attente. SiYuan ne peut donc pas ouvrir la fenêtre principale. Consultez ${log} pour plus de détails.",diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.jsonindex 28d09a6046..f5497da470 100644--- a/app/appearance/langs/he.json+++ b/app/appearance/langs/he.json@@ -1,4 +1,8 @@{+ "exitWaiting": "שומר ומסנכרן, נא להמתין...",+ "exitWaitFailed": "לא ניתן לאשר שהסגירה הושלמה. אפשר לנסות שוב או לסגור את תיבת הדו־שיח ולהמשיך להמתין.",+ "previousExitWaiting": "ממתין להשלמת הסגירה הקודמת...",+ "previousExitWaitFailed": "לא ניתן לאשר שהסגירה הקודמת הושלמה. יש לבדוק את חלון SiYuan האחר ואת הקובץ temp/siyuan.log במרחב העבודה, ואז לנסות שוב.","ocrImportModelsTitle": "ייבוא מודלי PP-OCRv6","kernelUnresponsiveTitle": "הליבה אינה מגיבה","kernelUnresponsiveMessage": "תם הזמן שהוקצב לבקשות המקומיות לליבה, ולכן SiYuan אינו יכול לפתוח את החלון הראשי. לפרטים נוספים, ראו ${log}.",diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.jsonindex 7aa515efb3..961aaf0ffd 100644--- a/app/appearance/langs/hi.json+++ b/app/appearance/langs/hi.json@@ -1,4 +1,8 @@{+ "exitWaiting": "सहेजा और सिंक किया जा रहा है, कृपया प्रतीक्षा करें...",+ "exitWaitFailed": "बंद होने की प्रक्रिया पूरी होने की पुष्टि नहीं हो सकी। आप फिर से कोशिश कर सकते हैं या इस संवाद को बंद करके प्रतीक्षा जारी रख सकते हैं।",+ "previousExitWaiting": "पिछली बंद होने की प्रक्रिया पूरी होने की प्रतीक्षा की जा रही है...",+ "previousExitWaitFailed": "पिछली बंद होने की प्रक्रिया पूरी होने की पुष्टि नहीं हो सकी। कृपया दूसरी SiYuan विंडो और कार्यस्थान में temp/siyuan.log जाँचें, फिर दोबारा कोशिश करें।","ocrImportModelsTitle": "PP-OCRv6 मॉडल आयात करें","kernelUnresponsiveTitle": "कर्नेल प्रतिक्रिया नहीं दे रहा है","kernelUnresponsiveMessage": "कर्नेल को भेजे गए स्थानीय अनुरोधों का समय समाप्त हो गया, इसलिए SiYuan मुख्य विंडो नहीं खोल सकता। विवरण के लिए ${log} देखें।",diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.jsonindex 5ad1852432..45a28196f5 100644--- a/app/appearance/langs/id.json+++ b/app/appearance/langs/id.json@@ -1,4 +1,8 @@{+ "exitWaiting": "Menyimpan dan menyinkronkan, harap tunggu...",+ "exitWaitFailed": "Tidak dapat memastikan bahwa proses penutupan telah selesai. Anda dapat mencoba lagi atau menutup dialog ini dan terus menunggu.",+ "previousExitWaiting": "Menunggu proses penutupan sebelumnya selesai...",+ "previousExitWaitFailed": "Tidak dapat memastikan bahwa proses penutupan sebelumnya telah selesai. Periksa jendela SiYuan lainnya dan ruang kerja/temp/siyuan.log, lalu coba lagi.","ocrImportModelsTitle": "Impor model PP-OCRv6","kernelUnresponsiveTitle": "Kernel tidak merespons","kernelUnresponsiveMessage": "Permintaan lokal ke kernel kehabisan waktu, sehingga SiYuan tidak dapat membuka jendela utama. Lihat ${log} untuk detailnya.",diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.jsonindex 4435c768a2..b505d8243a 100644--- a/app/appearance/langs/it.json+++ b/app/appearance/langs/it.json@@ -1,4 +1,8 @@{+ "exitWaiting": "Salvataggio e sincronizzazione in corso, attendere...",+ "exitWaitFailed": "Impossibile confermare il completamento della chiusura. Puoi riprovare oppure chiudere questa finestra di dialogo e continuare ad attendere.",+ "previousExitWaiting": "In attesa del completamento della chiusura precedente...",+ "previousExitWaitFailed": "Impossibile confermare il completamento della chiusura precedente. Controlla l’altra finestra di SiYuan e spazio di lavoro/temp/siyuan.log, quindi riprova.","ocrImportModelsTitle": "Importa modelli PP-OCRv6","kernelUnresponsiveTitle": "Il kernel non risponde","kernelUnresponsiveMessage": "Le richieste locali al kernel hanno superato il tempo limite, quindi SiYuan non può aprire la finestra principale. Consultare ${log} per i dettagli.",diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.jsonindex 653fbdd02a..1b838efe2b 100644--- a/app/appearance/langs/ja.json+++ b/app/appearance/langs/ja.json@@ -1,4 +1,8 @@{+ "exitWaiting": "保存と同期を実行しています。お待ちください...",+ "exitWaitFailed": "終了が完了したか確認できませんでした。再試行するか、このダイアログを閉じてお待ちください。",+ "previousExitWaiting": "前回の終了処理が完了するのを待っています...",+ "previousExitWaitFailed": "前回の終了処理が完了したか確認できませんでした。他の思源ウィンドウとワークスペース/temp/siyuan.log を確認してから、再試行してください。","ocrImportModelsTitle": "PP-OCRv6 モデルをインポート","kernelUnresponsiveTitle": "カーネルが応答していません","kernelUnresponsiveMessage": "ローカルのカーネルへのリクエストがタイムアウトしたため、思源はメインウィンドウを開けません。詳細は ${log} を確認してください。",diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.jsonindex a7f9819e2f..4a5d273eb2 100644--- a/app/appearance/langs/ko.json+++ b/app/appearance/langs/ko.json@@ -1,4 +1,8 @@{+ "exitWaiting": "저장 및 동기화 중입니다. 잠시 기다려 주세요...",+ "exitWaitFailed": "종료 완료 여부를 확인할 수 없습니다. 다시 시도하거나 이 대화 상자를 닫고 계속 기다려 주세요.",+ "previousExitWaiting": "이전 종료 작업이 완료되기를 기다리는 중...",+ "previousExitWaitFailed": "이전 종료 작업의 완료 여부를 확인할 수 없습니다. 다른 SiYuan 창과 작업 공간/temp/siyuan.log를 확인한 후 다시 시도해 주세요.","ocrImportModelsTitle": "PP-OCRv6 모델 가져오기","kernelUnresponsiveTitle": "커널이 응답하지 않습니다","kernelUnresponsiveMessage": "로컬 커널 요청 시간이 초과되어 SiYuan이 기본 창을 열 수 없습니다. 자세한 내용은 ${log} 파일을 확인하세요.",diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.jsonindex 9112f19199..6f962aaa92 100644--- a/app/appearance/langs/nl.json+++ b/app/appearance/langs/nl.json@@ -1,4 +1,8 @@{+ "exitWaiting": "Opslaan en synchroniseren, even geduld...",+ "exitWaitFailed": "Het is niet bevestigd dat het afsluiten is voltooid. Probeer het opnieuw of sluit dit dialoogvenster en blijf wachten.",+ "previousExitWaiting": "Wachten tot het vorige afsluitproces is voltooid...",+ "previousExitWaitFailed": "Het is niet bevestigd dat het vorige afsluitproces is voltooid. Controleer het andere SiYuan-venster en werkruimte/temp/siyuan.log en probeer het opnieuw.","ocrImportModelsTitle": "PP-OCRv6-modellen importeren","kernelUnresponsiveTitle": "De kernel reageert niet","kernelUnresponsiveMessage": "Lokale verzoeken aan de kernel hebben de tijdslimiet overschreden, waardoor SiYuan het hoofdvenster niet kan openen. Zie ${log} voor meer informatie.",diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.jsonindex 1e1459b5f5..8252e78782 100644--- a/app/appearance/langs/pl.json+++ b/app/appearance/langs/pl.json@@ -1,4 +1,8 @@{+ "exitWaiting": "Zapisywanie i synchronizacja, proszę czekać...",+ "exitWaitFailed": "Nie można potwierdzić zakończenia zamykania. Możesz spróbować ponownie lub zamknąć to okno dialogowe i nadal czekać.",+ "previousExitWaiting": "Oczekiwanie na zakończenie poprzedniego zamykania...",+ "previousExitWaitFailed": "Nie można potwierdzić zakończenia poprzedniego zamykania. Sprawdź inne okno SiYuan i obszar roboczy/temp/siyuan.log, a następnie spróbuj ponownie.","ocrImportModelsTitle": "Importuj modele PP-OCRv6","kernelUnresponsiveTitle": "Jądro nie odpowiada","kernelUnresponsiveMessage": "Upłynął limit czasu lokalnych żądań do jądra, więc SiYuan nie może otworzyć głównego okna. Szczegóły znajdują się w ${log}.",diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.jsonindex 6f12fd43eb..2d61133759 100644--- a/app/appearance/langs/pt-BR.json+++ b/app/appearance/langs/pt-BR.json@@ -1,4 +1,8 @@{+ "exitWaiting": "Salvando e sincronizando, aguarde...",+ "exitWaitFailed": "Não foi possível confirmar a conclusão do encerramento. Você pode tentar novamente ou fechar esta caixa de diálogo e continuar aguardando.",+ "previousExitWaiting": "Aguardando a conclusão do encerramento anterior...",+ "previousExitWaitFailed": "Não foi possível confirmar a conclusão do encerramento anterior. Verifique a outra janela do SiYuan e espaço de trabalho/temp/siyuan.log e tente novamente.","ocrImportModelsTitle": "Importar modelos PP-OCRv6","kernelUnresponsiveTitle": "O kernel não está respondendo","kernelUnresponsiveMessage": "As solicitações locais ao kernel excederam o tempo limite, então o SiYuan não pode abrir a janela principal. Consulte ${log} para obter detalhes.",diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.jsonindex 5296d2cb63..9addf4ac7c 100644--- a/app/appearance/langs/ru.json+++ b/app/appearance/langs/ru.json@@ -1,4 +1,8 @@{+ "exitWaiting": "Сохранение и синхронизация, подождите...",+ "exitWaitFailed": "Не удалось подтвердить завершение работы. Повторите попытку или закройте это диалоговое окно и продолжайте ждать.",+ "previousExitWaiting": "Ожидание завершения предыдущего сеанса...",+ "previousExitWaitFailed": "Не удалось подтвердить завершение предыдущего сеанса. Проверьте другое окно SiYuan и рабочее пространство/temp/siyuan.log, затем повторите попытку.","ocrImportModelsTitle": "Импорт моделей PP-OCRv6","kernelUnresponsiveTitle": "Ядро не отвечает","kernelUnresponsiveMessage": "Время ожидания локальных запросов к ядру истекло, поэтому SiYuan не может открыть главное окно. Подробности см. в ${log}.",diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.jsonindex a74cb7f494..a7d5117996 100644--- a/app/appearance/langs/sk.json+++ b/app/appearance/langs/sk.json@@ -1,4 +1,8 @@{+ "exitWaiting": "Ukladanie a synchronizácia, čakajte...",+ "exitWaitFailed": "Nepodarilo sa potvrdiť dokončenie ukončovania. Môžete to skúsiť znova alebo zavrieť toto dialógové okno a ďalej čakať.",+ "previousExitWaiting": "Čaká sa na dokončenie predchádzajúceho ukončovania...",+ "previousExitWaitFailed": "Nepodarilo sa potvrdiť dokončenie predchádzajúceho ukončovania. Skontrolujte druhé okno SiYuan a pracovný priestor/temp/siyuan.log a skúste to znova.","ocrImportModelsTitle": "Importovať modely PP-OCRv6","kernelUnresponsiveTitle": "Jadro neodpovedá","kernelUnresponsiveMessage": "Časový limit lokálnych požiadaviek na jadro uplynul, takže SiYuan nemôže otvoriť hlavné okno. Podrobnosti nájdete v ${log}.",diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.jsonindex e9970579c6..c32ea181a7 100644--- a/app/appearance/langs/sr.json+++ b/app/appearance/langs/sr.json@@ -1,4 +1,8 @@{+ "exitWaiting": "Чување и синхронизација, сачекајте...",+ "exitWaitFailed": "Није могуће потврдити да је затварање завршено. Покушајте поново или затворите овај дијалог и наставите да чекате.",+ "previousExitWaiting": "Чека се завршетак претходног затварања...",+ "previousExitWaitFailed": "Није могуће потврдити да је претходно затварање завршено. Проверите други SiYuan прозор и радни простор/temp/siyuan.log, па покушајте поново.","ocrImportModelsTitle": "Увези PP-OCRv6 моделе","kernelUnresponsiveTitle": "Језгро не одговара","kernelUnresponsiveMessage": "Истекло је време чекања за локалне захтеве језгру, па SiYuan не може да отвори главни прозор. Детаље погледајте у ${log}.",diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.jsonindex 1f736260cd..3f285939e5 100644--- a/app/appearance/langs/th.json+++ b/app/appearance/langs/th.json@@ -1,4 +1,8 @@{+ "exitWaiting": "กำลังบันทึกและซิงค์ โปรดรอสักครู่...",+ "exitWaitFailed": "ไม่สามารถยืนยันได้ว่าการปิดเสร็จสิ้นแล้ว คุณสามารถลองอีกครั้ง หรือปิดกล่องโต้ตอบนี้แล้วรอต่อไปได้",+ "previousExitWaiting": "กำลังรอให้การปิดครั้งก่อนเสร็จสิ้น...",+ "previousExitWaitFailed": "ไม่สามารถยืนยันได้ว่าการปิดครั้งก่อนเสร็จสิ้นแล้ว โปรดตรวจสอบหน้าต่าง SiYuan อื่นและไฟล์ temp/siyuan.log ในพื้นที่ทำงาน แล้วลองอีกครั้ง","ocrImportModelsTitle": "นำเข้าโมเดล PP-OCRv6","kernelUnresponsiveTitle": "เคอร์เนลไม่ตอบสนอง","kernelUnresponsiveMessage": "คำขอไปยังเคอร์เนลภายในเครื่องหมดเวลา จึงไม่สามารถเปิดหน้าต่างหลักของ SiYuan ได้ โปรดดูรายละเอียดใน ${log}",diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.jsonindex 10c06cd362..0b406376be 100644--- a/app/appearance/langs/tr.json+++ b/app/appearance/langs/tr.json@@ -1,4 +1,8 @@{+ "exitWaiting": "Kaydediliyor ve eşitleniyor, lütfen bekleyin...",+ "exitWaitFailed": "Kapanmanın tamamlandığı doğrulanamadı. Yeniden deneyebilir veya bu iletişim kutusunu kapatıp beklemeye devam edebilirsiniz.",+ "previousExitWaiting": "Önceki kapanma işleminin tamamlanması bekleniyor...",+ "previousExitWaitFailed": "Önceki kapanma işleminin tamamlandığı doğrulanamadı. Diğer SiYuan penceresini ve çalışma alanı/temp/siyuan.log dosyasını kontrol edip yeniden deneyin.","ocrImportModelsTitle": "PP-OCRv6 modellerini içe aktar","kernelUnresponsiveTitle": "Çekirdek yanıt vermiyor","kernelUnresponsiveMessage": "Çekirdeğe yapılan yerel istekler zaman aşımına uğradığı için SiYuan ana pencereyi açamıyor. Ayrıntılar için ${log} dosyasına bakın.",diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.jsonindex 127782602b..957e61e2ce 100644--- a/app/appearance/langs/uk.json+++ b/app/appearance/langs/uk.json@@ -1,4 +1,8 @@{+ "exitWaiting": "Збереження та синхронізація, зачекайте...",+ "exitWaitFailed": "Не вдалося підтвердити завершення роботи. Повторіть спробу або закрийте це діалогове вікно й продовжуйте чекати.",+ "previousExitWaiting": "Очікування завершення попереднього сеансу...",+ "previousExitWaitFailed": "Не вдалося підтвердити завершення попереднього сеансу. Перевірте інше вікно SiYuan та робочий простір/temp/siyuan.log, а потім повторіть спробу.","ocrImportModelsTitle": "Імпорт моделей PP-OCRv6","kernelUnresponsiveTitle": "Ядро не відповідає","kernelUnresponsiveMessage": "Час очікування локальних запитів до ядра вичерпано, тому SiYuan не може відкрити головне вікно. Докладніше див. у ${log}.",diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.jsonindex b6a54c063d..a06a381a36 100644--- a/app/appearance/langs/zh-CN.json+++ b/app/appearance/langs/zh-CN.json@@ -1,4 +1,8 @@{+ "exitWaiting": "正在保存并同步,请稍候...",+ "exitWaitFailed": "暂时无法确认退出是否完成。可以重试,或关闭此提示继续等待。",+ "previousExitWaiting": "正在等待上次退出完成...",+ "previousExitWaitFailed": "暂时无法确认上次退出是否完成。请检查其他思源窗口及工作空间/temp/siyuan.log,然后重试。","ocrImportModelsTitle": "导入 PP-OCRv6 模型","kernelUnresponsiveTitle": "内核无响应","kernelUnresponsiveMessage": "本机内核请求超时,思源无法进入主界面。请查看 ${log} 获取详细信息。",diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.jsonindex ce01dd60f0..3628a10171 100644--- a/app/appearance/langs/zh-TW.json+++ b/app/appearance/langs/zh-TW.json@@ -1,4 +1,8 @@{+ "exitWaiting": "正在儲存並同步,請稍候...",+ "exitWaitFailed": "暫時無法確認是否已結束。可以重試,或關閉此提示繼續等待。",+ "previousExitWaiting": "正在等待上次結束作業完成...",+ "previousExitWaitFailed": "暫時無法確認上次結束作業是否完成。請檢查其他思源視窗及工作空間/temp/siyuan.log,然後重試。","ocrImportModelsTitle": "匯入 PP-OCRv6 模型","kernelUnresponsiveTitle": "核心無回應","kernelUnresponsiveMessage": "本機核心請求逾時,思源無法進入主畫面。請查看 ${log} 取得詳細資訊。",diff --git a/app/electron/boot.html b/app/electron/boot.htmlindex 939216d32f..76c73988f8 100644--- a/app/electron/boot.html+++ b/app/electron/boot.html@@ -160,7 +160,7 @@<div id="progressWrap"><div id="progressTrack"></div><div id="progress"></div>- <div id="details"></div>+ <div id="details" role="status" aria-live="polite"></div></div><script>const getSearch = (key) => {@@ -317,6 +317,9 @@const requestID = ++bootAppearanceRequestID;const serverURL = "http://127.0.0.1:" + normalizedPort;const request = async () => {+ if (requestID !== bootAppearanceRequestID) {+ return;+ }try {const response = await fetch(serverURL + "/api/system/getBootAppearance", {cache: "no-store"});if (!response.ok) {@@ -442,8 +445,12 @@const serverURL = remoteOrigin || 'http://127.0.0.1:' + portconst progressEl = document.getElementById('progress')const detailsEl = document.getElementById('details')- detailsEl.textContent = "v" + v + (remoteOrigin ? ' Connecting to remote kernel...' : ' Booting kernel...')- loadBootAppearance(port, "desktop");+ const bootDetails = "v" + v + (remoteOrigin ? " Connecting to remote kernel..." : " Booting kernel...");+ let previousExitWaiting = getSearch("previousExitWaiting");+ detailsEl.textContent = previousExitWaiting || bootDetails;+ if (!previousExitWaiting) {+ loadBootAppearance(port, "desktop");+ }// 随机起始基数(15~25),等待内核进度时先平滑填充到此值const baseProgress = 15 + Math.random() * 10@@ -517,9 +524,18 @@})let progressing = false+ let progressSource;+ let progressRetry;const subscribe = () => {+ if (previousExitWaiting || remoteOrigin || progressing) {+ return;+ }const es = new EventSource(serverURL + '/api/system/bootProgressSSE')+ progressSource = es;es.onmessage = (event) => {+ if (previousExitWaiting || progressSource !== es) {+ return;+ }const progressData = JSON.parse(event.data)// 内核进度按比例映射到 baseProgress~100 区间,从当前显示值继续递增const display = baseProgress + progressData.progress * (100 - baseProgress) / 100@@ -549,11 +565,24 @@es.close()// 内核启动早期 HTTP 服务可能尚未就绪,EventSource 原生重连间隔较长(约 3s),// 这里主动短延迟重连,保持与原轮询一致的快速重试语义- if (!progressing) {- setTimeout(subscribe, 100)+ if (!progressing && !previousExitWaiting && progressSource === es) {+ progressRetry = setTimeout(subscribe, 100);}}}+ // 等待上次退出时保留启动页和动画,暂停依赖新内核的请求,结束后在原页继续启动。+ window.setPreviousExitWaiting = (message) => {+ previousExitWaiting = message;+ detailsEl.textContent = message || bootDetails;+ clearTimeout(progressRetry);+ progressSource?.close();+ progressSource = undefined;+ bootAppearanceRequestID++;+ if (!message) {+ loadBootAppearance(port, "desktop");+ subscribe();+ }+ };if (!remoteOrigin) {subscribe()}diff --git a/app/electron/kernelBoot.test.js b/app/electron/kernelBoot.test.jsindex e6ad3cada7..9e378df8b9 100644--- a/app/electron/kernelBoot.test.js+++ b/app/electron/kernelBoot.test.js@@ -1,6 +1,7 @@const assert = require("node:assert/strict");const {readFileSync} = require("node:fs");const path = require("node:path");+const {pathToFileURL} = require("node:url");const {test} = require("node:test");const vm = require("node:vm");@@ -21,6 +22,8 @@ const setup = (progress, options = {}) => {destroyed: false,isDestroyed() { return this.destroyed; },destroy() { this.destroyed = true; events.push("destroy"); },+ loadFile: async (file, options) => { events.push(["load-file", file, options]); },+ webContents: {executeJavaScript: async script => { events.push(["boot-script", script]); }},};const fixture = {events, waits, window, closeKernel: code => closeKernel(code, null),requests: () => requests, versionRequests: () => versionRequests,@@ -41,6 +44,7 @@ const setup = (progress, options = {}) => {});const context = vm.createContext({path,+ pathToFileURL,process: {platform: options.platform || "win32", env: {}},app: {getPreferredSystemLanguages: () => ["en"]},resolveAppLanguage: languages => languages[0],@@ -60,8 +64,11 @@ const setup = (progress, options = {}) => {fs: {existsSync: () => true},appDir: "app", confDir: "conf", lastWorkspacePath: "workspace", appVer: "3.8.6",bootWindow: window, kernelPort: 6806, isDevEnv: false, workspaces: [],+ bootIndexPath: "app/electron/boot.html",+ loadBootWindow: () => events.push("resume-boot"),kernelProcesses: new Map(), expectedKernelExitPorts: new Set(),createBootWindow: () => {}, showLocalBootWindow: () => {}, showAppleSiliconWarning: async () => true,+ waitForPreviousWorkspaceExit: options.previousExit || (async () => true),getAvailablePort: async () => 6806, getServer: port => "https://127.0.0.1:" + port,writeLog: message => events.push(message),requestKernelExit: port => events.push(["exit-kernel", port]),@@ -105,6 +112,42 @@ const setup = (progress, options = {}) => {const exits = fixture => fixture.events.filter(event => Array.isArray(event) && event[0] === "exit-kernel");+test("startup shows previous-exit waiting and spawns only after it completes", async () => {+ let finish;+ const pending = new Promise(resolve => { finish = resolve; });+ const state = setup(() => 100, {previousExit: async (_workspace, options) => {+ await options.onWaiting();+ return pending;+ }});+ const run = state.run();+ await state.settleMicrotasks();+ assert.equal(state.versionRequests(), 0);+ assert.equal(state.events.some(event => typeof event === "string" && event.startsWith("spawned kernel")), false);+ assert.equal(state.window.previousExitWaiting, "Waiting for the previous shutdown to finish...");+ assert.ok(state.events.some(event => Array.isArray(event) && event[0] === "boot-script" &&+ event[1].includes(JSON.stringify(state.window.previousExitWaiting))));+ assert.equal(state.events.some(event => Array.isArray(event) && event[0] === "load-file"), false);+ finish(true);+ assert.equal(await run, 6806);+ assert.equal(state.window.previousExitWaiting, "");+ assert.ok(state.events.some(event => Array.isArray(event) && event[0] === "boot-script" &&+ event[1] === 'window.setPreviousExitWaiting("")'));+ assert.equal(state.events.includes("resume-boot"), false);+});++test("canceled or failed previous-exit waiting never spawns or kills a kernel", async () => {+ for (const failure of [false, true]) {+ const state = setup(() => 100, {previousExit: async () => {+ if (failure) throw new Error("timeout");+ return false;+ }});+ assert.equal(await state.run(), false);+ assert.equal(state.versionRequests(), 0);+ assert.equal(exits(state).length, 0);+ assert.equal(state.events.some(event => typeof event === "string" && event.startsWith("spawned kernel")), false);+ }+});+test("boot progress recovers from certificate and network changes without exiting the kernel", async () => {for (const error of ["CERT_DATABASE_CHANGED", "CERT_VERIFIER_CHANGED", "NETWORK_CHANGED"]) {const fixture = setup(request => request === 1 ? new Error("net::ERR_" + error) : 100);diff --git a/app/electron/main.js b/app/electron/main.jsindex 6f63607b3c..7a2d5d3422 100644--- a/app/electron/main.js+++ b/app/electron/main.js@@ -38,6 +38,7 @@ const {} = require("electron");const {updateGlobalShortcutBindings} = require("./globalShortcutBindings");const {appendChromiumSwitch} = require("./chromiumSwitches");+const {waitForPreviousWorkspaceExit} = require("./workspaceExit");const path = require("path");const fs = require("fs");const {pathToFileURL} = require("url");@@ -2474,6 +2475,9 @@ const loadBootWindow = (disableAppearance = false) => {bootAppearanceFallback = true;}const query = {v: appVer, port: kernelPort, lang: getArg("--lang") || resolveAppLanguage(app.getPreferredSystemLanguages())};+ if (bootWindow.previousExitWaiting) {+ query.previousExitWaiting = bootWindow.previousExitWaiting;+ }if (remoteKernelTarget) {query.remote = remoteKernelTarget.origin;query.appearance = "0";@@ -2606,6 +2610,43 @@ const initKernel = (workspace, port, lang, safeMode, preparedBoot) => {const currentBootWindow = bootWindow;let kernelExited = false;const bootCanceled = () => kernelExited || currentBootWindow.isDestroyed() || bootWindow !== currentBootWindow;+ if (!isDevEnv || workspaces.length > 0) {+ let waiting = false;+ const language = lang || resolveAppLanguage(app.getPreferredSystemLanguages());+ const languages = loadAppMenuLanguages(language);+ try {+ const ready = await waitForPreviousWorkspaceExit(currentWorkspace, {+ canceled: bootCanceled,+ onWaiting: async () => {+ waiting = true;+ writeLog("waiting for previous workspace exit");+ currentBootWindow.previousExitWaiting = languages.previousExitWaiting;+ await currentBootWindow.webContents.executeJavaScript(+ `window.setPreviousExitWaiting(${JSON.stringify(languages.previousExitWaiting)})`);+ },+ });+ if (!ready || bootCanceled()) {+ resolve(false);+ return;+ }+ if (waiting) {+ currentBootWindow.previousExitWaiting = "";+ await currentBootWindow.webContents.executeJavaScript("window.setPreviousExitWaiting(\"\")");+ if (bootCanceled()) {+ resolve(false);+ return;+ }+ }+ } catch (error) {+ writeLog("wait for previous workspace exit failed: " + error);+ if (!bootCanceled()) {+ showErrorWindow(languages.previousExitWaiting, "", escapeHTML(languages.previousExitWaitFailed));+ currentBootWindow.destroy();+ }+ resolve(false);+ return;+ }+ }const cmds = ["serve", "--port", currentKernelPort, "--wd", appDir, "--attach-ui"];if (isDevEnv && workspaces.length === 0) {cmds.push("--mode", "dev");diff --git a/app/electron/workspaceExit.js b/app/electron/workspaceExit.jsnew file mode 100644index 0000000000..e6226ab6b8--- /dev/null+++ b/app/electron/workspaceExit.js@@ -0,0 +1,63 @@+const fs = require("node:fs");+const path = require("node:path");++const exitWaitTimeout = 10 * 60 * 1000;++const isProcessAlive = pid => {+ try {+ process.kill(pid, 0);+ return true;+ } catch (error) {+ // 无权查询不能视作进程已经退出。+ if (error.code === "EPERM") {+ return true;+ }+ if (error.code === "ESRCH") {+ return false;+ }+ throw error;+ }+};++const waitForPreviousWorkspaceExit = async (workspace, {+ canceled,+ onWaiting,+ readFile = file => fs.readFileSync(file, "utf8"),+ alive = isProcessAlive,+ now = Date.now,+ sleep = ms => new Promise(resolve => setTimeout(resolve, ms)),+}) => {+ if (!workspace || canceled()) {+ return !canceled();+ }+ let marker;+ try {+ marker = JSON.parse(readFile(path.join(workspace, "temp", "kernel-exit.json")));+ } catch (error) {+ if (error.code === "ENOENT" || error instanceof SyntaxError) {+ return true;+ }+ throw error;+ }+ // 旧版、损坏或过期的状态不作为等待依据,继续由内核检查工作空间锁。+ const started = now();+ if (marker?.version !== 1 || !Number.isSafeInteger(marker.pid) || marker.pid <= 0 ||+ !Number.isSafeInteger(marker.startedAt) || marker.startedAt > started ||+ started - marker.startedAt > exitWaitTimeout || !alive(marker.pid)) {+ return true;+ }+ await onWaiting();+ // 首次确认退出后持续等待同一进程结束,避免更新确认和后续退出请求之间的短暂空隙。+ while (alive(marker.pid)) {+ if (canceled()) {+ return false;+ }+ if (now() - started >= exitWaitTimeout) {+ throw new Error("Previous workspace exit timed out");+ }+ await sleep(200);+ }+ return !canceled();+};++module.exports = {waitForPreviousWorkspaceExit};diff --git a/app/electron/workspaceExit.test.js b/app/electron/workspaceExit.test.jsnew file mode 100644index 0000000000..fa55bd2e6a--- /dev/null+++ b/app/electron/workspaceExit.test.js@@ -0,0 +1,69 @@+const assert = require("node:assert/strict");+const {test} = require("node:test");+const {waitForPreviousWorkspaceExit} = require("./workspaceExit");++const fixture = (overrides = {}) => {+ let time = 1000;+ let waiting = 0;+ let polls = 0;+ const options = {+ canceled: () => false,+ onWaiting: () => { waiting++; },+ readFile: () => JSON.stringify({version: 1, pid: 123, startedAt: 1000}),+ alive: () => polls < 4,+ now: () => time,+ sleep: async ms => { polls++; time += ms; },+ ...overrides,+ };+ return {run: () => waitForPreviousWorkspaceExit("workspace", options), options,+ waiting: () => waiting, polls: () => polls};+};++test("waits for the exiting process before allowing a new kernel", async () => {+ const state = fixture();+ assert.equal(await state.run(), true);+ assert.equal(state.waiting(), 1);+ assert.equal(state.polls(), 4);+});++test("ordinary occupied workspaces and stale or invalid markers retain the normal lock check", async () => {+ for (const marker of [null, {}, {version: 2, pid: 123, startedAt: 1000},+ {version: 1, pid: -1, startedAt: 1000}, {version: 1, pid: "123", startedAt: 1000},+ {version: 1, pid: 123, startedAt: 1001}, {version: 1, pid: 123, startedAt: -600000}]) {+ const state = fixture({readFile: () => JSON.stringify(marker)});+ assert.equal(await state.run(), true);+ assert.equal(state.waiting(), 0);+ }+ for (const readFile of [() => "{", () => { throw Object.assign(new Error("missing"), {code: "ENOENT"}); }]) {+ const state = fixture({readFile});+ assert.equal(await state.run(), true);+ assert.equal(state.waiting(), 0);+ }+});++test("a crashed kernel does not cause a wait", async () => {+ const state = fixture({alive: () => false});+ assert.equal(await state.run(), true);+ assert.equal(state.waiting(), 0);+});++test("closing or replacing the waiting window cancels startup", async () => {+ let canceled = false;+ const state = fixture({canceled: () => canceled, sleep: async () => { canceled = true; }});+ assert.equal(await state.run(), false);+ assert.equal(state.waiting(), 1);+});++test("waiting has a deadline and does not kill the old process or remove its lock", async () => {+ let time = 1000;+ const state = fixture({alive: () => true, now: () => time, sleep: async () => { time += 600000; }});+ await assert.rejects(state.run(), /timed out/);+ assert.equal(state.waiting(), 1);+});++test("filesystem and process inspection failures do not silently authorize startup", async () => {+ for (const override of [{readFile: () => { throw new Error("permission"); }},+ {alive: () => { throw new Error("permission"); }}]) {+ await assert.rejects(fixture(override).run(), /permission/);+ }+});diff --git a/app/src/config/setting/taskBlocker.ts b/app/src/config/setting/taskBlocker.tsindex 9d7457867a..53bc3992e0 100644--- a/app/src/config/setting/taskBlocker.ts+++ b/app/src/config/setting/taskBlocker.ts@@ -1,4 +1,4 @@-import {progressLoading} from "../../dialog/processSystem";+import {progressLoading} from "../../dialog/progress";const tasks = new Set<string>();let revision = 0;diff --git a/app/src/config/setting/window.ts b/app/src/config/setting/window.tsindex 8c0b8412f0..daca6945d3 100644--- a/app/src/config/setting/window.ts+++ b/app/src/config/setting/window.ts@@ -14,7 +14,8 @@ import {loadLanguages} from "../../boot/loadLanguages";import {systemConfig} from "../systemConfig";import {loadAssets, setInlineStyle, initAssets, reloadInlineStyles, refreshThemeStyle} from "../../util/assets";import {initMessage} from "../../dialog/message";-import {progressLoading, processSync, downloadProgress} from "../../dialog/processSystem";+import {processSync, downloadProgress} from "../../dialog/processSystem";+import {progressLoading} from "../../dialog/progress";import {setSettingsWindowHost} from "./windowContext";import {refreshSettingConfig} from "./sync";import {openSettingDialog} from "../index";diff --git a/app/src/config/tabs/syncRuntime.test.ts b/app/src/config/tabs/syncRuntime.test.tsindex 9376409caf..c5c1cfc043 100644--- a/app/src/config/tabs/syncRuntime.test.ts+++ b/app/src/config/tabs/syncRuntime.test.ts@@ -41,7 +41,7 @@ const setup = () => {confirmations.push({confirm, cancel});}};}- if (name === "../../dialog/processSystem") {+ if (name === "../../dialog/progress") {return {progressLoading: (data: {code: number}) => progress.push(data.code)};}if (name === "../../dialog/message") {diff --git a/app/src/config/tabs/syncRuntime.ts b/app/src/config/tabs/syncRuntime.tsindex 0615760a8e..b82cb07313 100644--- a/app/src/config/tabs/syncRuntime.ts+++ b/app/src/config/tabs/syncRuntime.ts@@ -1,6 +1,7 @@import {config as configApi} from "../util/configApi";import {fetchSyncPost} from "../../util/fetch";-import {processSync, progressLoading} from "../../dialog/processSystem";+import {processSync} from "../../dialog/processSystem";+import {progressLoading} from "../../dialog/progress";import {confirmDialog} from "../../dialog/confirmDialog";import {updateAccountPanelVisibility} from "./accountUi";import {hideMessage, showMessage} from "../../dialog/message";diff --git a/app/src/dialog/exitRequest.test.ts b/app/src/dialog/exitRequest.test.tsnew file mode 100644index 0000000000..97f3614db8--- /dev/null+++ b/app/src/dialog/exitRequest.test.ts@@ -0,0 +1,123 @@+import * as assert from "node:assert/strict";+import {readFileSync} from "node:fs";+import {test} from "node:test";+import {runInNewContext} from "node:vm";+import {ModuleKind, ScriptTarget, transpileModule} from "typescript";++const compiled = transpileModule(readFileSync("src/dialog/exitRequest.ts", "utf8"), {+ compilerOptions: {module: ModuleKind.CommonJS, target: ScriptTarget.ES2021},+}).outputText;++const fixture = () => {+ let resolve: (value: unknown) => void;+ let reject: (error: Error) => void;+ let expire: () => void;+ const requests: unknown[][] = [];+ const activeProgress = new Set(["otherProgress"]);+ const inputListeners = new Map<string, (event: Event) => void>();+ const dialogs: {destroyed: boolean, content: {innerHTML: string}, buttons: {click?: () => void}[]}[] = [];+ const exports: any = {};+ runInNewContext(compiled, {+ exports,+ window: {siyuan: {languages: {exitWaiting: "Saving",+ exitWaitFailed: "Exit could not be confirmed", close: "Close", retry: "Retry"}},+ addEventListener: (type: string, listener: (event: Event) => void) => inputListeners.set(type, listener),+ removeEventListener: (type: string) => inputListeners.delete(type)},+ console: {warn: () => {}},+ require: (name: string) => {+ if (name === "./progress") return {progressLoading: (data: {code: number}, id: string) => {+ if (data.code === 2) activeProgress.delete(id);+ else {+ assert.equal(data.code, 1);+ activeProgress.add(id);+ }+ }};+ if (name === "../util/escape") return {escapeHtml: (value: string) => value};+ if (name === "../util/fetch") return {fetchSyncPost: (...args: unknown[]) => {+ requests.push(args);+ return new Promise((done, fail) => { resolve = done; reject = fail; });+ }};+ if (name === "../util/fetchTimeout") return {withFetchTimeout: (request: (signal: AbortSignal) => Promise<unknown>,+ signal: AbortSignal, timeout: number) => {+ assert.equal(timeout, 600000);+ return Promise.race([request(signal), new Promise((_done, fail) => {+ expire = () => fail(new Error("Timeout"));+ })]);+ }};+ if (name === "./index") return {Dialog: class {+ state = {+ destroyed: false,+ buttons: [0, 1].map(() => ({+ click: undefined as () => void,+ addEventListener(name: string, callback: () => void) {+ assert.equal(name, "click");+ this.click = callback;+ },+ focus: () => {},+ })),+ content: {innerHTML: "", querySelectorAll: () => this.state.buttons},+ };+ element = {querySelectorAll: () => this.state.buttons};+ constructor(options: {content: string, disableClose: boolean}) {+ assert.equal(options.disableClose, true);+ this.state.content.innerHTML = options.content;+ dialogs.push(this.state);+ }+ destroy() { this.state.destroyed = true; }+ }};+ throw new Error(name);+ },+ });+ return {request: exports.requestSystemExit as (options: unknown, response: (value: any) => void) => Promise<void>,+ requests, dialogs, activeProgress, inputListeners,+ resolve: (value: unknown) => resolve(value), reject: (error: Error) => reject(error),+ expire: () => expire()};+};++test("slow exit retains endless progress and delivers success, sync failure and update confirmation", async () => {+ for (const code of [0, 1, 2]) {+ const state = fixture();+ const responses: unknown[] = [];+ const options = {force: false, setCurrentWorkspace: true};+ const pending = state.request(options, response => responses.push(response));+ assert.equal(state.request(options, () => assert.fail("duplicate exit")), pending);+ await Promise.resolve();+ assert.equal(state.dialogs.length, 0);+ assert.ok(state.activeProgress.has("exitProgress"));+ assert.equal(state.inputListeners.size, 4);+ assert.deepEqual(responses, []);+ const response = {code, msg: "", data: {installPkgPath: "update.dmg"}};+ state.resolve(response);+ await pending;+ assert.deepEqual([...state.activeProgress], ["otherProgress"]);+ assert.equal(state.inputListeners.size, 0);+ assert.deepEqual(responses, [response]);+ assert.equal(state.requests[0][0], "/api/system/exit");+ assert.equal(state.requests[0][1], options);+ assert.equal(state.requests[0][3], false);+ }+});++test("network failure, timeout and invalid responses preserve the host and allow retry", async () => {+ for (const failure of ["network", "timeout", "response"]) {+ const state = fixture();+ const responses: unknown[] = [];+ const pending = state.request({force: false, setCurrentWorkspace: true}, value => responses.push(value));+ if (failure === "network") state.reject(new Error("offline"));+ else if (failure === "timeout") state.expire();+ else state.resolve({code: -1});+ await pending;+ assert.deepEqual([...state.activeProgress], ["otherProgress"]);+ assert.equal(state.inputListeners.size, 0);+ assert.equal(state.dialogs[0].destroyed, false);+ assert.match(state.dialogs[0].content.innerHTML, /Exit could not be confirmed/);+ assert.deepEqual(responses, []);+ state.dialogs[0].buttons[1].click();+ assert.equal(state.requests.length, 2);+ assert.equal(state.dialogs[0].destroyed, true);+ assert.ok(state.activeProgress.has("exitProgress"));+ state.resolve({code: 0});+ await state.request({}, () => assert.fail("duplicate retry"));+ assert.equal(responses.length, 1);+ }+});diff --git a/app/src/dialog/exitRequest.ts b/app/src/dialog/exitRequest.tsnew file mode 100644index 0000000000..0ca18451cf--- /dev/null+++ b/app/src/dialog/exitRequest.ts@@ -0,0 +1,67 @@+import {Dialog} from "./index";+import {fetchSyncPost} from "../util/fetch";+import {withFetchTimeout} from "../util/fetchTimeout";+import {escapeHtml} from "../util/escape";+import {progressLoading} from "./progress";++let pendingExit: Promise<void>;++// 保留退出结果的接收窗口,慢同步不会直接关闭宿主。+export const requestSystemExit = (options: {+ force: boolean,+ setCurrentWorkspace: boolean,+ execInstallPkg?: number,+}, onResponse: (response: IWebSocketData) => void): Promise<void> => {+ if (pendingExit) {+ return pendingExit;+ }+ const languages = window.siyuan.languages;+ const progressID = "exitProgress";+ progressLoading({code: 1, msg: languages.exitWaiting}, progressID);+ // 等待退出时阻止输入,避免遮罩下仍有编辑器保留焦点并接收修改。+ const blockInput = (event: Event) => {+ event.preventDefault();+ event.stopImmediatePropagation();+ };+ const inputEvents = ["keydown", "beforeinput", "paste", "drop"];+ inputEvents.forEach(type => window.addEventListener(type, blockInput, true));+ pendingExit = withFetchTimeout(signal => fetchSyncPost("/api/system/exit", options, undefined, false, signal),+ undefined, 10 * 60 * 1000).then(response => {+ if (!response || ![0, 1, 2].includes(response.code)) {+ throw new Error(response?.msg || languages.exitWaitFailed);+ }+ progressLoading({code: 2, msg: ""}, progressID);+ return response;+ }).catch(error => {+ console.warn("exit request failed", error);+ // 请求失败不代表内核已经停止;保留界面供用户重试,并继续接收内核退出事件。+ progressLoading({code: 2, msg: ""}, progressID);+ const errorDialog = new Dialog({+ disableClose: true,+ disableAnimation: true,+ width: "480px",+ content: `<div class="b3-dialog__content" role="alert">${escapeHtml(languages.exitWaitFailed)}</div>+<div class="b3-dialog__action">+ <button class="b3-button b3-button--cancel">${escapeHtml(languages.close)}</button>+ <div class="fn__space"></div>+ <button class="b3-button b3-button--text">${escapeHtml(languages.retry)}</button>+</div>`,+ });+ const buttons = errorDialog.element.querySelectorAll("button");+ buttons[0].addEventListener("click", () => errorDialog.destroy());+ buttons[1].addEventListener("click", () => {+ errorDialog.destroy();+ void requestSystemExit(options, onResponse);+ });+ buttons[1].focus();+ return undefined;+ }).finally(() => {+ inputEvents.forEach(type => window.removeEventListener(type, blockInput, true));+ pendingExit = undefined;+ }).then(response => {+ if (response) {+ onResponse(response);+ }+ });+ return pendingExit;+};diff --git a/app/src/dialog/processSystem.ts b/app/src/dialog/processSystem.tsindex b1e72c6c7a..596c4cbdc7 100644--- a/app/src/dialog/processSystem.ts+++ b/app/src/dialog/processSystem.ts@@ -21,6 +21,7 @@ import {saveMobileLayout} from "../mobile/util/saveLayout";import {isInAndroid, isInHarmony, isInIOS, setStorageVal} from "../protyle/util/compatibility";import {emitToPlugins} from "../plugin/EventBusCore";import {createHostQuitGuard} from "./hostQuit";+import {requestSystemExit} from "./exitRequest";import {getHostCapabilities, sanitizeKernelHTML} from "../util/hostCapabilities";/// #if MOBILEimport {getMobileBacklinkPanels} from "../mobile/util/backlinkPanels";@@ -198,7 +199,7 @@ const installNewVersion = (installPkgPath: string, setCurrentWorkspace: boolean)showMessage(window.siyuan.languages._kernel[104], 7000, "error");});/// #else- fetchPost("/api/system/exit", {+ void requestSystemExit({force: true,setCurrentWorkspace,execInstallPkg: 1,@@ -235,7 +236,7 @@ export const exitSiYuan = async (setCurrentWorkspace = true) => {forceQuit();return;}- fetchPost("/api/system/exit", {force: false, setCurrentWorkspace}, (response) => {+ await requestSystemExit({force: false, setCurrentWorkspace}, (response) => {if (response.code === 1) { // 同步执行失败const msgId = showMessage(response.msg, response.data.closeTimeout, "error");const buttonElement = document.querySelector(`#message [data-id="${msgId}"] button`);@@ -245,7 +246,7 @@ export const exitSiYuan = async (setCurrentWorkspace = true) => {installNewVersion(response.data.installPkgPath, setCurrentWorkspace);return;}- fetchPost("/api/system/exit", {force: true, setCurrentWorkspace}, forceQuit);+ void requestSystemExit({force: true, setCurrentWorkspace}, forceQuit);});}} else if (response.code === 2) { // 提示新安装包@@ -260,7 +261,7 @@ export const exitSiYuan = async (setCurrentWorkspace = true) => {confirmDialog(window.siyuan.languages.updateVersion, response.msg, () => {installNewVersion(response.data.installPkgPath, setCurrentWorkspace);}, () => {- fetchPost("/api/system/exit", {+ void requestSystemExit({force: true,setCurrentWorkspace,execInstallPkg: 1 // 0:默认检查新版本,1:不返回安装包,2:返回安装包路径并退出@@ -330,44 +331,6 @@ export const progressStatus = (data: IWebSocketData) => {}};-export const progressLoading = (data: IWebSocketData, id = "progress") => {- let progressElement = document.getElementById(id);- // 关闭时只移除对应任务的遮罩。- if (data.code === 2) {- progressElement?.remove();- return;- }- if (!progressElement) {- progressElement = document.createElement("div");- progressElement.id = id;- progressElement.style.zIndex = String(++window.siyuan.zIndex);- document.body.appendChild(progressElement);- }- // code 0: 有进度;1: 无进度;2: 关闭- if (data.code === 0) {- const current = Number(data.data.current);- const total = Number(data.data.total);- const safeCurrent = Number.isFinite(current) ? current : 0;- const safeTotal = Number.isFinite(total) && total > 0 ? total : 1;- progressElement.innerHTML = `<div class="b3-dialog__scrim" style="opacity: 1"></div>-<div class="b3-dialog__loading">- <div style="text-align: right">${safeCurrent}/${safeTotal}</div>- <div style="margin: 8px 0;height: 8px;border-radius: var(--b3-border-radius);overflow: hidden;background-color:#fff;"><div style="width: ${safeCurrent / safeTotal * 100}%;transition: var(--b3-transition);background-color: var(--b3-theme-primary);height: 8px;"></div></div>- <div class="ft__breakword">${escapeHtml(data.msg)}</div>-</div>`;- } else if (data.code === 1) {- if (progressElement.lastElementChild) {- progressElement.lastElementChild.lastElementChild.innerHTML = escapeHtml(data.msg);- } else {- progressElement.innerHTML = `<div class="b3-dialog__scrim" style="opacity: 1"></div>-<div class="b3-dialog__loading">- <div style="margin: 8px 0;height: 8px;border-radius: var(--b3-border-radius);overflow: hidden;background-color:#fff;"><div style="background-color: var(--b3-theme-primary);height: 8px;background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);animation: stripMove 450ms linear infinite;background-size: 50px 50px;"></div></div>- <div class="ft__breakword">${escapeHtml(data.msg)}</div>-</div>`;- }- }-};-export const progressBackgroundTask = (tasks: { action: string }[]) => {const backgroundTaskElement = document.querySelector(".status__backgroundtask");if (!backgroundTaskElement) {diff --git a/app/src/dialog/progress.ts b/app/src/dialog/progress.tsnew file mode 100644index 0000000000..31e4e29bf5--- /dev/null+++ b/app/src/dialog/progress.ts@@ -0,0 +1,39 @@+import {escapeHtml} from "../util/escape";++export const progressLoading = (data: IWebSocketData, id = "progress") => {+ let progressElement = document.getElementById(id);+ // 关闭时只移除对应任务的遮罩。+ if (data.code === 2) {+ progressElement?.remove();+ return;+ }+ if (!progressElement) {+ progressElement = document.createElement("div");+ progressElement.id = id;+ progressElement.style.zIndex = String(++window.siyuan.zIndex);+ document.body.appendChild(progressElement);+ }+ // code 0: 有进度;1: 无进度;2: 关闭+ if (data.code === 0) {+ const current = Number(data.data.current);+ const total = Number(data.data.total);+ const safeCurrent = Number.isFinite(current) ? current : 0;+ const safeTotal = Number.isFinite(total) && total > 0 ? total : 1;+ progressElement.innerHTML = `<div class="b3-dialog__scrim" style="opacity: 1"></div>+<div class="b3-dialog__loading">+ <div style="text-align: right">${safeCurrent}/${safeTotal}</div>+ <div style="margin: 8px 0;height: 8px;border-radius: var(--b3-border-radius);overflow: hidden;background-color:#fff;"><div style="width: ${safeCurrent / safeTotal * 100}%;transition: var(--b3-transition);background-color: var(--b3-theme-primary);height: 8px;"></div></div>+ <div class="ft__breakword">${escapeHtml(data.msg)}</div>+</div>`;+ } else if (data.code === 1) {+ if (progressElement.lastElementChild) {+ progressElement.lastElementChild.lastElementChild.innerHTML = escapeHtml(data.msg);+ } else {+ progressElement.innerHTML = `<div class="b3-dialog__scrim" style="opacity: 1"></div>+<div class="b3-dialog__loading">+ <div style="margin: 8px 0;height: 8px;border-radius: var(--b3-border-radius);overflow: hidden;background-color:#fff;"><div style="background-color: var(--b3-theme-primary);height: 8px;background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);animation: stripMove 450ms linear infinite;background-size: 50px 50px;"></div></div>+ <div class="ft__breakword">${escapeHtml(data.msg)}</div>+</div>`;+ }+ }+};diff --git a/app/src/index.ts b/app/src/index.tsindex 6373fbc42b..6b61620122 100644--- a/app/src/index.ts+++ b/app/src/index.ts@@ -34,13 +34,13 @@ import {downloadProgress,processSync,progressBackgroundTask,- progressLoading,progressStatus,processBacklinkIndexCommit,setDefRefCount,setRefDynamicText,transactionError} from "./dialog/processSystem";+import {progressLoading} from "./dialog/progress";import {initMessage, showMessage} from "./dialog/message";import {getAllModels, getAllTabs} from "./layout/getAll";import {getLocalStorage, isChromeBrowser, isInMobileApp, isIOSDevice} from "./protyle/util/compatibility";diff --git a/app/src/mobile/util/onMessage.ts b/app/src/mobile/util/onMessage.tsindex 45bc80b5ba..59f0444a12 100644--- a/app/src/mobile/util/onMessage.ts+++ b/app/src/mobile/util/onMessage.ts@@ -9,11 +9,11 @@ import {forceQuit,processBacklinkIndexCommit,processSync,- progressLoading,setDefRefCount,setRefDynamicText,transactionError} from "../../dialog/processSystem";+import {progressLoading} from "../../dialog/progress";import type {App} from "../../index";import {applyPluginReload, syncGlobalPluginConfig} from "../../plugin/globalState";import {reloadEmoji} from "../../emoji";diff --git a/app/src/mobile/util/saveLayout.integration.test.ts b/app/src/mobile/util/saveLayout.integration.test.tsindex 123934c996..af06d19eae 100644--- a/app/src/mobile/util/saveLayout.integration.test.ts+++ b/app/src/mobile/util/saveLayout.integration.test.ts@@ -66,7 +66,7 @@ test("mobile normal exit waits for save and remains open on failure", async () =saveMobileLayout: () => pending.promise,getHostCapabilities: () => ({ownsKernel}),forceQuit: () => events.push("quit"),- fetchPost: (url: string) => events.push(url),+ requestSystemExit: async () => { events.push("/api/system/exit"); },showMessage: () => events.push("error"),window: {siyuan: {languages: {mobileLayoutSaveError: "Save failed"}}},});diff --git a/app/src/util/checkBlockRef.ts b/app/src/util/checkBlockRef.tsindex 0316cae59d..d6314c8d9d 100644--- a/app/src/util/checkBlockRef.ts+++ b/app/src/util/checkBlockRef.ts@@ -1,6 +1,6 @@import {confirmDialog} from "../dialog/confirmDialog";import {showMessage} from "../dialog/message";-import {progressLoading} from "../dialog/processSystem";+import {progressLoading} from "../dialog/progress";import {waitForPendingTransactions} from "../protyle/util/transactionQueue";import {fetchSyncPost} from "./fetch";diff --git a/app/src/util/fetch.test.ts b/app/src/util/fetch.test.tsindex 71b27ddea6..7138cddf26 100644--- a/app/src/util/fetch.test.ts+++ b/app/src/util/fetch.test.ts@@ -118,8 +118,14 @@ it("preserves FormData request bodies for upload endpoints", async () => {await fetchPost("/api/file/putFile", body);});-it("falls back to desktop quit when exit or closing layout requests stall", async () => {- for (const url of ["/api/system/exit", "/api/system/setUILayout", "/api/system/setWorkspaceDir"]) {+it("keeps the desktop alive when an exit request stalls", async () => {+ const {fetchPost, sends} = loadFetchPost();+ await fetchPost("/api/system/exit", {}, () => assert.fail("unexpected success"));+ assert.deepEqual(sends, []);+});++it("retains the existing fallback for closing layout and workspace requests", async () => {+ for (const url of ["/api/system/setUILayout", "/api/system/setWorkspaceDir"]) {const {fetchPost, sends, timeouts} = loadFetchPost();await fetchPost(url, {errorExit: true}, () => assert.fail("unexpected success"));assert.deepEqual(timeouts, [30000]);diff --git a/app/src/util/fetch.ts b/app/src/util/fetch.tsindex 78227a8371..e389e061f4 100644--- a/app/src/util/fetch.ts+++ b/app/src/util/fetch.ts@@ -119,7 +119,7 @@ export const fetchPost = ((return;}/// #if !BROWSER- if (url === "/api/system/exit" || url === "/api/system/setWorkspaceDir" || (+ if (url === "/api/system/setWorkspaceDir" || (["/api/system/setUILayout"].includes(url) && data.errorExit // 内核中断,点关闭处理)) {ipcRenderer.send(Constants.SIYUAN_QUIT, location.port);diff --git a/app/src/util/iOSPurchase.ts b/app/src/util/iOSPurchase.tsindex 6316f9fa04..1b006b2fe3 100644--- a/app/src/util/iOSPurchase.ts+++ b/app/src/util/iOSPurchase.ts@@ -1,7 +1,7 @@import {showMessage} from "../dialog/message";import {fetchPost} from "./fetch";import {genUUID} from "./genID";-import {progressLoading} from "../dialog/processSystem";+import {progressLoading} from "../dialog/progress";export const processIOSPurchaseResponse = (code: number) => {progressLoading({diff --git a/app/src/window/index.ts b/app/src/window/index.tsindex 174c95278e..694f83dbc1 100644--- a/app/src/window/index.ts+++ b/app/src/window/index.ts@@ -17,13 +17,13 @@ import {openFileById} from "../editor/util";import {processSync,progressBackgroundTask,- progressLoading,progressStatus,processBacklinkIndexCommit,setDefRefCount,setRefDynamicText,transactionError} from "../dialog/processSystem";+import {progressLoading} from "../dialog/progress";import {initMessage} from "../dialog/message";import {getAllTabs} from "../layout/getAll";import {getLocalStorage} from "../protyle/util/compatibility";diff --git a/app/tests/exitWaiting.test.js b/app/tests/exitWaiting.test.jsnew file mode 100644index 0000000000..2dfcaddab6--- /dev/null+++ b/app/tests/exitWaiting.test.js@@ -0,0 +1,192 @@+const assert = require("node:assert/strict");+const fs = require("node:fs");+const os = require("node:os");+const path = require("node:path");+const {pathToFileURL} = require("node:url");++const createExitDialog = (sources, languages, mobile) => {+ const load = (source, dependencies) => {+ const exports = {};+ new Function("require", "exports", source)(name => dependencies[name] || {}, exports);+ return exports;+ };+ window.siyuan = {languages, storage: {}, dialogs: [], zIndex: 1,+ menus: {menu: {element: document.createElement("div")}}};+ const escapeHtml = value => {+ const span = document.createElement("span");+ span.textContent = value;+ return span.innerHTML;+ };+ const progress = load(sources.progress, {"../util/escape": {escapeHtml}});+ const {Dialog} = load(sources.dialog, {+ "../util/genID": {genUUID: () => "exit-test"},+ "../util/zIndex": {isAbove: () => false},+ "./moveResize": {moveResize() {}},+ "../util/functions": {isMobile: () => mobile},+ "../constants": {Constants: {TIMEOUT_DBLCLICK: 0}},+ "../block/panelOwnership": {destroyDialogBlockPanels() {}, getDialogBlockPanel() {}},+ "./anchoredInput": {getAnchoredInputMask() {}},+ });+ const {requestSystemExit} = load(sources.exit, {+ "./index": {Dialog},+ "./progress": progress,+ "../util/fetch": {fetchSyncPost: () => new Promise((resolve, reject) => {+ window.finishExit = resolve;+ window.failExit = reject;+ })},+ "../util/fetchTimeout": {withFetchTimeout: request => request()},+ "../util/escape": {escapeHtml},+ });+ window.exitResult = requestSystemExit({force: false, setCurrentWorkspace: true}, response => {+ window.exitResponse = response;+ });+};++if (process.versions.electron && process.type === "browser") {+ const {app, BrowserWindow, nativeTheme} = require("electron");+ app.disableHardwareAcceleration();+ app.setPath("userData", process.argv[2]);+ app.on("window-all-closed", () => {});+ app.whenReady().then(async () => {+ const watchdog = setTimeout(() => app.exit(1), 45000);+ const root = path.join(__dirname, "..");+ const ts = require("typescript");+ const sources = Object.fromEntries(Object.entries({dialog: "dialog/index.ts", exit: "dialog/exitRequest.ts", progress: "dialog/progress.ts"})+ .map(([key, file]) => [key, ts.transpileModule(fs.readFileSync(path.join(root, "src", file), "utf8"), {+ compilerOptions: {module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2021},+ }).outputText]));+ const css = require("sass").compile(path.join(root, "src/assets/scss/base.scss"), {logger: {warn() {}, debug() {}}}).css;+ const icons = pathToFileURL(path.join(root, "appearance/icons/litheness/icon.js")).href;+ const languages = JSON.parse(fs.readFileSync(path.join(root, "appearance/langs/zh-CN.json"), "utf8"));+ for (const mode of ["light", "dark"]) {+ nativeTheme.themeSource = mode;+ const theme = fs.readFileSync(path.join(root, "appearance/themes", mode === "light" ? "daylight" : "midnight", "theme.css"), "utf8");+ for (const width of [360, 960]) {+ const win = new BrowserWindow({show: false, width, height: 640, webPreferences: {nodeIntegration: true, contextIsolation: false}});+ win.webContents.on("console-message", event => {+ if (event.level === "error") console.error(event.message);+ });+ await win.loadFile(path.join(root, "electron/boot.html"), {query: {lang: "zh-CN", v: "test",+ previousExitWaiting: languages.previousExitWaiting}});+ const startup = await win.webContents.executeJavaScript(`new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(() => resolve({+ logo: !!document.querySelector("#bg svg"), message: document.getElementById("details").textContent,+ progress: document.getElementById("progress").style.width,+ dialog: !!document.querySelector(".b3-dialog__loading"),+ width: document.documentElement.scrollWidth, viewport: innerWidth, background: getComputedStyle(document.body).backgroundColor+ }))))`);+ assert.equal(startup.logo, true);+ assert.ok(parseFloat(startup.progress) >= 15);+ assert.equal(startup.dialog, false);+ assert.equal(startup.message, languages.previousExitWaiting);+ assert.ok(startup.width <= startup.viewport);+ assert.equal(startup.background, "rgb(30, 30, 30)");+ const capture = async name => {+ if (process.env.SIYUAN_EXIT_WAIT_SCREENSHOTS) {+ await win.webContents.executeJavaScript("new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve)))");+ fs.mkdirSync(process.env.SIYUAN_EXIT_WAIT_SCREENSHOTS, {recursive: true});+ fs.writeFileSync(path.join(process.env.SIYUAN_EXIT_WAIT_SCREENSHOTS, `${name}-${mode}-${width}.png`),+ (await win.webContents.capturePage()).toPNG());+ }+ };+ await win.webContents.executeJavaScript("new Promise(resolve => setTimeout(resolve, 2200))");+ await capture("restart");+ const resumed = await win.webContents.executeJavaScript(`(() => {+ const sources = [];+ let appearanceRequests = 0;+ window.EventSource = class {+ constructor() { sources.push(this); }+ close() { this.closed = true; }+ };+ window.fetch = () => { appearanceRequests++; return new Promise(() => {}); };+ const url = location.href;+ window.setPreviousExitWaiting("");+ const booting = document.getElementById("details").textContent;+ window.setPreviousExitWaiting(${JSON.stringify(languages.previousExitWaiting)});+ sources[0].onmessage({data: JSON.stringify({progress: 100, details: "stale"})});+ const waiting = document.getElementById("details").textContent;+ const requestsWhileWaiting = appearanceRequests;+ window.setPreviousExitWaiting("");+ sources[1].onmessage({data: JSON.stringify({progress: 100, details: "ready"})});+ return {booting, waiting, requestsWhileWaiting, appearanceRequests, sources: sources.length,+ paused: sources[0].closed, completed: sources[1].closed,+ details: document.getElementById("details").textContent,+ progress: document.getElementById("progress").style.width, samePage: location.href === url};+ })()`);+ assert.equal(resumed.booting, "vtest Booting kernel...");+ assert.equal(resumed.waiting, languages.previousExitWaiting);+ assert.equal(resumed.requestsWhileWaiting, 1);+ assert.equal(resumed.appearanceRequests, 2);+ assert.equal(resumed.sources, 2);+ assert.equal(resumed.paused, true);+ assert.equal(resumed.completed, true);+ assert.equal(resumed.details, "ready");+ assert.equal(resumed.progress, "100%");+ assert.equal(resumed.samePage, true);+ const html = `<html><head><style>${theme}\n${css}</style></head><body><script src="${icons}"></script></body></html>`;+ const file = path.join(process.argv[2], "dialog.html");+ fs.writeFileSync(file, html);+ await win.loadFile(file);+ await win.webContents.executeJavaScript(`(${createExitDialog.toString()})(${JSON.stringify(sources)}, ${JSON.stringify(languages)}, ${width === 360})`);+ await win.webContents.executeJavaScript("new Promise(resolve => setTimeout(resolve, 200))");+ const waiting = await win.webContents.executeJavaScript(`(() => {+ const container = document.querySelector("#exitProgress .b3-dialog__loading");+ const bounds = container.getBoundingClientRect();+ const status = container.lastElementChild;+ const mask = document.querySelector(".b3-dialog__scrim");+ const maskBounds = mask.getBoundingClientRect();+ const stripe = getComputedStyle(container.firstElementChild.firstElementChild);+ const key = new KeyboardEvent("keydown", {key: "a", bubbles: true, cancelable: true});+ document.body.dispatchEvent(key);+ return {visible: bounds.width > 0 && bounds.left >= 0 && bounds.right <= innerWidth,+ globalMask: maskBounds.left === 0 && maskBounds.top === 0 && maskBounds.width === innerWidth && maskBounds.height === innerHeight,+ overflow: status.scrollWidth > status.clientWidth, text: status.textContent,+ endless: stripe.animationName === "stripMove" && stripe.animationIterationCount === "infinite",+ noDialog: !document.querySelector(".b3-dialog__container"), inputBlocked: key.defaultPrevented};+ })()`);+ assert.equal(waiting.visible, true);+ assert.equal(waiting.globalMask, true);+ assert.equal(waiting.overflow, false);+ assert.equal(waiting.endless, true);+ assert.equal(waiting.noDialog, true);+ assert.equal(waiting.inputBlocked, true);+ assert.ok(waiting.text.includes(languages.exitWaiting));+ await capture("exit");+ await win.webContents.executeJavaScript("window.failExit(new Error('offline')); window.exitResult;");+ const failed = await win.webContents.executeJavaScript(`(() => {+ const buttons = [...document.querySelectorAll("button")];+ const key = new KeyboardEvent("keydown", {key: "a", bubbles: true, cancelable: true});+ document.body.dispatchEvent(key);+ return {count: buttons.length, focus: document.activeElement === buttons[1],+ waiting: !!document.getElementById("exitProgress"), inputBlocked: key.defaultPrevented,+ message: document.querySelector('[role="alert"]').textContent, response: window.exitResponse};+ })()`);+ assert.equal(failed.count, 2);+ assert.equal(failed.waiting, false);+ assert.equal(failed.inputBlocked, false);+ assert.equal(failed.focus, true);+ assert.equal(failed.message, languages.exitWaitFailed);+ assert.equal(failed.response, undefined);+ await capture("failure");+ win.destroy();+ }+ }+ clearTimeout(watchdog);+ app.exit(0);+ }).catch(error => { console.error(error); app.exit(1); });+} else {+ const {test} = require("node:test");+ const {execFile} = require("node:child_process");+ const {promisify} = require("node:util");+ test("exit uses endless progress and boot resumes in place after waiting in light, dark and narrow layouts", {timeout: 60000}, async () => {+ const profile = fs.mkdtempSync(path.join(os.tmpdir(), "siyuan-exit-wait-test-"));+ const env = {...process.env};+ delete env.ELECTRON_RUN_AS_NODE;+ try {+ await promisify(execFile)(require("electron"), [__filename, profile], {env, windowsHide: true, timeout: 55000});+ } finally {+ const relative = path.relative(os.tmpdir(), profile);+ assert.ok(!relative.startsWith("..") && !path.isAbsolute(relative) && relative.startsWith("siyuan-exit-wait-test-"));+ fs.rmSync(profile, {recursive: true, force: true});+ }+ });+}diff --git a/kernel/model/conf.go b/kernel/model/conf.goindex d655223de8..3f392aeef0 100644--- a/kernel/model/conf.go+++ b/kernel/model/conf.go@@ -663,6 +663,7 @@ func loadLangs() (ret []*conf.Lang) {}var exitLock = sync.Mutex{}+var exitFinished bool // 由 exitLock 保护,防止排队的重试请求再次关闭数据库。// Close 退出内核进程.//@@ -685,12 +686,20 @@ var exitLock = sync.Mutex{}// 当 force 为 true(强制退出)并且 execInstallPkg 为 0(默认检查更新)并且新版本安装包已经准备就绪时,将安装包路径返回给桌面宿主// https://github.com/siyuan-note/siyuan/issues/10288func Close(force, setCurrentWorkspace bool, execInstallPkg int) (exitCode int, installPkgPath string) {- confSyncSnapshot := Conf.LoadSync()-diagnostic := util.WatchOperationWithTiming("exit kernel", "wait for exit lock")defer diagnostic.Finish()exitLock.Lock()defer exitLock.Unlock()+ if exitFinished {+ return+ }+ confSyncSnapshot := Conf.LoadSync()+ clearExitMarker := util.MarkWorkspaceExiting()+ defer func() {+ if clearExitMarker != nil {+ clearExitMarker()+ }+ }()logging.LogInfof("exiting kernel [force=%v, setCurrentWorkspace=%v, execInstallPkg=%d]", force, setCurrentWorkspace, execInstallPkg)defer func() {@@ -792,12 +801,15 @@ func Close(force, setCurrentWorkspace bool, execInstallPkg int) (exitCode int, i}diagnostic.Stage("unlock workspace")+ clearExitMarker()+ clearExitMarker = nilutil.UnlockWorkspace()diagnostic.Stage("wait for frontend events")time.Sleep(500 * time.Millisecond)diagnostic.Stage("close sync websocket")closeSyncWebSocket()+ exitFinished = truego func() {diagnostic := util.WatchOperationWithTiming("exit kernel servers", "wait for exit response")diff --git a/kernel/model/desktop_ui_process.go b/kernel/model/desktop_ui_process.gonew file mode 100644index 0000000000..ca8e5cb742--- /dev/null+++ b/kernel/model/desktop_ui_process.go@@ -0,0 +1,32 @@+package model++import (+ "os"+ "strings"++ goPS "github.com/mitchellh/go-ps"+)++// 启动时保留父进程 ID,避免父进程退出后内核被系统进程接管而改变判断依据。+var desktopUILauncherPID = os.Getppid()++func isDesktopUIProcess(name string) bool {+ switch strings.ToLower(name) {+ case "siyuan", "siyuan.exe", "electron", "electron.exe":+ return true+ }+ return false+}++// desktopUILauncherAlive 仅将启动此内核的桌面主进程作为未注册 UI 的兜底。+// 其他工作空间的内核、渲染进程及其他 Electron 应用不能维持本工作空间的存活。+func desktopUILauncherAlive(find func(int) (goPS.Process, error)) bool {+ if desktopUILauncherPID <= 1 {+ return false+ }+ proc, err := find(desktopUILauncherPID)+ if err != nil {+ return true+ }+ return proc != nil && isDesktopUIProcess(proc.Executable())+}diff --git a/kernel/model/desktop_ui_process_test.go b/kernel/model/desktop_ui_process_test.gonew file mode 100644index 0000000000..888dd47b13--- /dev/null+++ b/kernel/model/desktop_ui_process_test.go@@ -0,0 +1,41 @@+package model++import (+ "errors"+ "testing"++ goPS "github.com/mitchellh/go-ps"+)++type desktopUITestProcess string++func (p desktopUITestProcess) Pid() int { return 123 }+func (p desktopUITestProcess) PPid() int { return 1 }+func (p desktopUITestProcess) Executable() string { return string(p) }++func TestDesktopUILauncher(t *testing.T) {+ oldPID := desktopUILauncherPID+ desktopUILauncherPID = 123+ t.Cleanup(func() { desktopUILauncherPID = oldPID })+ for _, name := range []string{"SiYuan", "SiYuan.exe", "Electron", "electron.exe"} {+ if !desktopUILauncherAlive(func(pid int) (goPS.Process, error) {+ if pid != 123 {+ t.Fatalf("looked up unrelated process %d", pid)+ }+ return desktopUITestProcess(name), nil+ }) {+ t.Errorf("launcher %s should keep the kernel alive", name)+ }+ }+ for _, name := range []string{"SiYuan-Kernel", "SiYuan-Kernel.exe", "SiYuan Helper", "Electron Helper", "OtherElectronApp"} {+ if desktopUILauncherAlive(func(int) (goPS.Process, error) { return desktopUITestProcess(name), nil }) {+ t.Errorf("unrelated process %s kept the kernel alive", name)+ }+ }+ if desktopUILauncherAlive(func(int) (goPS.Process, error) { return nil, nil }) {+ t.Fatal("missing launcher kept the kernel alive")+ }+ if !desktopUILauncherAlive(func(int) (goPS.Process, error) { return nil, errors.New("access denied") }) {+ t.Fatal("process inspection failure should preserve the kernel")+ }+}diff --git a/kernel/model/exit_retry_test.go b/kernel/model/exit_retry_test.gonew file mode 100644index 0000000000..f0f0b37166--- /dev/null+++ b/kernel/model/exit_retry_test.go@@ -0,0 +1,20 @@+package model++import "testing"++func TestCompletedExitRetry(t *testing.T) {+ exitLock.Lock()+ previous := exitFinished+ exitFinished = true+ exitLock.Unlock()+ t.Cleanup(func() {+ exitLock.Lock()+ exitFinished = previous+ exitLock.Unlock()+ })+ // 已经完成的退出请求不能再次访问配置、数据库或临时状态。+ code, installPackage := Close(false, true, 0)+ if code != 0 || installPackage != "" {+ t.Fatalf("unexpected completed exit response: %d %q", code, installPackage)+ }+}diff --git a/kernel/model/process.go b/kernel/model/process.goindex b9fb9eaa41..a46e7e1542 100644--- a/kernel/model/process.go+++ b/kernel/model/process.go@@ -20,7 +20,6 @@ import ("os""os/signal""strconv"- "strings""syscall""time"@@ -69,11 +68,10 @@ func HookDesktopUIProcJob() {if 0 < uiProcCount {return}- logging.LogWarnf("no active UI proc, continue to check from all processes after 15s")+ logging.LogWarnf("no active UI proc, continue to check attached UI and launcher after 15s")time.Sleep(15 * time.Second)- uiProcCount = getUIProcCount()- if 0 < uiProcCount {- logging.LogInfof("active UI proc count [%d]", uiProcCount)+ // 宽限期间可能建立新会话,退出前重新检查工作空间的连接和注册进程。+ if 0 < util.CountSessions() || 0 < getAttachedUIProcCount() || desktopUILauncherAlive(goPS.FindProcess) {return}@@ -81,8 +79,6 @@ func HookDesktopUIProcJob() {Close(false, true, 1)}-var uiProcNames = []string{"siyuan", "electron"}-// getAttachedUIProcCount 获取已经附加的 UI 进程数。func getAttachedUIProcCount() (ret int) {util.UIProcessIDs.Range(func(uiProcIDArg, _ any) bool {@@ -97,6 +93,8 @@ func getAttachedUIProcCount() (ret int) {proc, err := goPS.FindProcess(uiProcID)if err != nil {logging.LogErrorf("find UI proc [%d] failed: %s", uiProcID, err)+ // 查询失败不能证明界面已经关闭,保留内核供后续检查。+ ret++return true}@@ -106,40 +104,10 @@ func getAttachedUIProcCount() (ret int) {return true}- procName := strings.ToLower(proc.Executable())- uiProcOk := false- for _, name := range uiProcNames {- if uiProcOk = strings.Contains(procName, name); uiProcOk {- break- }- }- if uiProcOk {+ if isDesktopUIProcess(proc.Executable()) {ret++}return true})return}--// getUIProcCount 获取 UI 进程数。-func getUIProcCount() (ret int) {- pid := os.Getpid()- procs, _ := goPS.Processes()- for _, proc := range procs {- if proc.Pid() == pid {- continue- }-- procName := strings.ToLower(proc.Executable())- uiProcOk := false- for _, name := range uiProcNames {- if uiProcOk = strings.Contains(procName, name); uiProcOk {- break- }- }- if uiProcOk {- ret++- }- }- return-}diff --git a/kernel/util/working.go b/kernel/util/working.goindex 849ed50f80..59eb3b5297 100644--- a/kernel/util/working.go+++ b/kernel/util/working.go@@ -618,6 +618,7 @@ func tryLockWorkspace() {WorkspaceLock = flock.New(filepath.Join(WorkspaceDir, ".lock"))ok, err := WorkspaceLock.TryLock()if ok {+ ClearWorkspaceExitMarker()return}if err != nil {diff --git a/kernel/util/workspace_exit.go b/kernel/util/workspace_exit.gonew file mode 100644index 0000000000..f367fd4fcf--- /dev/null+++ b/kernel/util/workspace_exit.go@@ -0,0 +1,37 @@+package util++import (+ "encoding/json"+ "os"+ "path/filepath"+ "time"++ "github.com/88250/gulu"+ "github.com/siyuan-note/logging"+)++const workspaceExitFile = "kernel-exit.json"++// MarkWorkspaceExiting 记录当前退出请求,供桌面宿主在重新启动时等待旧内核结束。+// 该文件只用于提示,工作空间的独占访问仍由文件锁保证。+func MarkWorkspaceExiting() func() {+ marker := filepath.Join(TempDir, workspaceExitFile)+ data, _ := json.Marshal(struct {+ Version int `json:"version"`+ PID int `json:"pid"`+ StartedAt int64 `json:"startedAt"`+ }{1, os.Getpid(), time.Now().UnixMilli()})+ if err := gulu.File.WriteFileSafer(marker, data, 0600); err != nil {+ logging.LogWarnf("write workspace exit marker failed: %s", err)+ }+ return func() {+ ClearWorkspaceExitMarker()+ }+}++// ClearWorkspaceExitMarker 仅在持有工作空间锁时清理临时状态,避免删除下一次启动的状态。+func ClearWorkspaceExitMarker() {+ if err := os.Remove(filepath.Join(TempDir, workspaceExitFile)); err != nil && !os.IsNotExist(err) {+ logging.LogWarnf("remove workspace exit marker failed: %s", err)+ }+}diff --git a/kernel/util/workspace_exit_test.go b/kernel/util/workspace_exit_test.gonew file mode 100644index 0000000000..757b18b3cd--- /dev/null+++ b/kernel/util/workspace_exit_test.go@@ -0,0 +1,41 @@+package util++import (+ "encoding/json"+ "os"+ "path/filepath"+ "testing"+ "time"+)++func TestWorkspaceExitMarker(t *testing.T) {+ oldTempDir := TempDir+ TempDir = t.TempDir()+ t.Cleanup(func() { TempDir = oldTempDir })+ marker := filepath.Join(TempDir, workspaceExitFile)+ if err := os.WriteFile(marker, []byte("stale"), 0600); err != nil {+ t.Fatal(err)+ }+ before := time.Now().UnixMilli()+ clear := MarkWorkspaceExiting()+ data, err := os.ReadFile(marker)+ if err != nil {+ t.Fatal(err)+ }+ var state struct {+ Version int `json:"version"`+ PID int `json:"pid"`+ StartedAt int64 `json:"startedAt"`+ }+ if err = json.Unmarshal(data, &state); err != nil {+ t.Fatal(err)+ }+ if state.Version != 1 || state.PID != os.Getpid() || state.StartedAt < before {+ t.Fatalf("invalid exit marker: %s", data)+ }+ clear()+ if _, err = os.Stat(marker); !os.IsNotExist(err) {+ t.Fatalf("marker was not removed: %v", err)+ }+ ClearWorkspaceExitMarker()+}