bump to 0.5.19

.github/workflows/auto-build.yml

@@ -34,7 +34,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [20.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -54,7 +54,7 @@ jobs:
       - name: Git LFS Pull
         run: git lfs pull
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm install

.github/workflows/release.yml

@@ -38,7 +38,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [20.x]
 
     steps:
       - name: Checkout codes
@@ -57,7 +57,7 @@ jobs:
       - name: Git LFS Pull
         run: git lfs pull
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm install

README.md

@@ -1,5 +1,7 @@
 # Remotely Save
 
+English | [中文](./README.zh-cn.md)
+
 This is yet another unofficial sync plugin for Obsidian. If you like it or find it useful, please consider give it a [star ![GitHub Repo stars](https://img.shields.io/github/stars/fyears/remotely-save?style=social)](https://github.com/fyears/remotely-save) on Github.
 
 [![BuildCI](https://github.com/fyears/remotely-save/actions/workflows/auto-build.yml/badge.svg)](https://github.com/fyears/remotely-save/actions/workflows/auto-build.yml)
@@ -31,7 +33,7 @@ This is yet another unofficial sync plugin for Obsidian. If you like it or find
   - Azure Blob Storage (PRO feature)
   - [Here](./docs/services_connectable_or_not.md) shows more connectable (or not-connectable) services in details.
 - **Obsidian Mobile supported.** Vaults can be synced across mobile and desktop devices with the cloud service as the "broker".
-- **[End-to-end encryption](./docs/encryption/README.md) supported.** Files would be encrypted using openssl format before being sent to the cloud **if** user specify a password.
+- **[End-to-end encryption](./docs/encryption/README.md) supported.** Files would be encrypted using openssl / rclone crypt format before being sent to the cloud **if** user specify a password.
 - **Scheduled auto sync supported.** You can also manually trigger the sync using sidebar ribbon, or using the command from the command palette (or even bind the hot key combination to the command then press the hot key combination).
 - **[Minimal Intrusive](./docs/minimal_intrusive_design.md).**
 - **Skip Large files** and **skip paths** by custom regex conditions!
@@ -46,21 +48,23 @@ This is yet another unofficial sync plugin for Obsidian. If you like it or find
 - **You should protect your `data.json` file.** The file contains sensitive information.
   - It's strongly advised **NOT** to share your `data.json` file to anyone.
   - It's usually **NOT** a good idea to check the file into version control. By default, the plugin tries to create a `.gitignore` file inside the plugin directory if it doesn't exist, for ignoring `data.json` in the `git` version control. If you know exactly what it means and want to remove the setting, please modify the `.gitignore` file or set it to be empty.
+- **Obsidian API on Mobile has performance issues syncing large files (>= 50 MB).**
+  - Setting the "Skip Large Files" option can help resolve issues related to syncing large files.
 
 ## Questions, Suggestions, Or Bugs
 
 You are greatly welcome to ask questions, post any suggestions, or report any bugs! The project is mainly maintained on GitHub:
 
-- Questions: [GitHub repo Discussions](https://github.com/fyears/remotely-save/discussions)
+- Questions: [GitHub repo Discussions](https://github.com/remotely-save/remotely-save/discussions)
-- Suggestions: also in [GitHub repo Discussions](https://github.com/fyears/remotely-save/discussions)
+- Suggestions: also in [GitHub repo Discussions](https://github.com/remotely-save/remotely-save/discussions)
-- Bugs: [GitHub repo Issues](https://github.com/fyears/remotely-save/issues) (NOT Discussion)
+- Bugs: [GitHub repo Issues](https://github.com/remotely-save/remotely-save/issues) (NOT Discussion)
 
 Additionally, the plugin author may occasionally visit Obsidian official forum and official Discord server, and pay attention to this-plugin-related information there.
 
 ## Download and Install
 
 - Option #1: Search in the official "community plugin list", or visit this: [https://obsidian.md/plugins?id=remotely-save](https://obsidian.md/plugins?id=remotely-save) (which should redirect you into Obsidian app), then install the plugin.
-- Option #2: You can also use [Obsidian42 - BRAT](https://github.com/TfTHacker/obsidian42-brat) to install this plugin. Input `fyears/remotely-save` in the configuration of BRAT.
+- Option #2: You can also use [Obsidian42 - BRAT](https://github.com/TfTHacker/obsidian42-brat) to install this plugin. Input `remotely-save/remotely-save` in the configuration of BRAT.
 - Option #3: [![GitHub release (latest by SemVer and asset including pre-releases)](https://img.shields.io/github/downloads-pre/fyears/remotely-save/latest/main.js?sort=semver)](https://github.com/fyears/remotely-save/releases) Manually download assets (`main.js`, `manifest.json`, `styles.css`) from the latest release.
 - Option #4: [![BuildCI](https://github.com/fyears/remotely-save/actions/workflows/auto-build.yml/badge.svg)](https://github.com/fyears/remotely-save/actions/workflows/auto-build.yml) Every artifacts are placed in the "Summary" under every successful builds. It's automatically generated by every commit, may break something.
 
@@ -112,6 +116,7 @@ Additionally, the plugin author may occasionally visit Obsidian official forum a
   - [ownCloud](./docs/remote_services/webdav_owncloud/README.md)
   - [InfiniCloud](./docs/remote_services/webdav_infinicloud_teracloud/README.md)
   - [Synology webdav server](./docs/remote_services/webdav_synology_webdav_server/README.md) | [群晖 webdav server](./docs/remote_services/webdav_synology_webdav_server/README.zh-cn.md)
+  - [dufs](./docs/remote_services/webdav_dufs/README.md)
   - [AList（中文）](./docs/remote_services/webdav_alist/README.zh-cn.md) | [AList (English)](./docs/remote_services/webdav_alist/README.md)
   - [坚果云](./docs/remote_services/webdav_jianguoyun/README.zh-cn.md) | [JianGuoYun/NutStore](./docs/remote_services/webdav_jianguoyun/README.md)
   - [Open Media Vault](./docs/remote_services/webdav_openmediavault/README.md)
@@ -161,7 +166,7 @@ PRO (paid) feature "sync with Azure Blob Storage" allows users to to sync with A
 
 Basic (free) version can detect conflicts, but users have to choose to keep newer version or larger version of the files.
 
-PRO (paid) feature "Smart Conflict" gives users one more option: merge small markdown files, or duplicate large markdown files or non-markdown files.
+PRO (paid) feature "Smart Conflict" gives users one more option: merge small markdown files, or duplicate large markdown files or any-size non-markdown files.
 
 See documents [here](./docs/pro/README.md)
 
@@ -176,13 +181,21 @@ See documents [here](./docs/pro/README.md)
 - You can configure sync on save in settings.
 - In sync on save mode, if any error occurs, the plugin would **fail silently**.
 
-## How To Deal With Hidden Files Or Folders
+## Config Folder / Files and Bookmarks
+
+By default, the plugin doesn't sync config folder / files of obsidian (normally `.obsidian` folder) because it's one of the hidden files. 
+
+However, in the latest version, you can enable syncing config folder in settings. Please be aware that it's an experimental feature. Notably some config files' modified times are changed everytime when Obsidian is opened, and this destroys the assumptions of the plugin, so some information may not be synced properly.
+
+Moreover, the bookmarks of Obsidian are actually stored in `.obsidian/bookmarks.json` file. You can also set syncing this file (instead of the whole config folder) in settings. The plugin will keep the latest modified one across devices.
+
+## Hidden Files Or Folders
 
 **By default, all files or folder starting with `.` (dot) or `_` (underscore) are treated as hidden files, and would NOT be synced.** It's useful if you have some files just staying locally. But this strategy also means that themes / other plugins / settings of this plugin would neither be synced.
 
-In the latest version, you can change the settings to allow syncing `_` files or folders, as well as `.obsidian` special config folder (but not any other `.` files or folders).
+In the latest version, you can change the settings to allow syncing `_` files or folders, as well as `.obsidian` special config folder as described above (but not any other `.` files or folders).
 
-## PRO Features
+## PRO (paid) Features
 
 See [PRO](./docs/pro/README.md) for more details.
 

README.zh-cn.md

@@ -0,0 +1,209 @@
+# Remotely Save
+
+[English](./README.md) | 中文
+
+这是Obsidian的一个非官方同步插件。如果你喜欢它或觉得它帮到了你，请考虑在Github上给它一颗[星星 ![GitHub Repo stars](https://img.shields.io/github/stars/fyears/remotely-save?style=social)](https://github.com/fyears/remotely-save)。
+
+[![BuildCI](https://github.com/fyears/remotely-save/actions/workflows/auto-build.yml/badge.svg)](https://github.com/fyears/remotely-save/actions/workflows/auto-build.yml)
+
+[![最新版本的下载量](https://img.shields.io/github/downloads-pre/remotely-save/remotely-save/latest/main.js?sort=semver)](https://github.com/fyears/remotely-save/releases)
+
+## 免责声明
+
+- **这不是 Obsidian 提供的[官方同步服务](https://obsidian.md/sync)。**
+
+## !!!警告!!!
+
+**在使用此插件之前，一定，一定要记得备份你的 vault。**
+
+## 功能
+
+- 支持：
+  - Amazon S3 或兼容 S3 的服务（Cloudflare R2 / BackBlaze B2 / MinIO / ...）
+  - Dropbox
+  - 个人版本 OneDrive（应用文件夹）
+  - 个人版本 OneDrive（根目录）（PRO 功能）
+  - Webdav（NextCloud / InfiniCloud / Synology webdav 服务器 / ...）
+  - Webdis
+  - Google Drive（GDrive）（PRO 功能）
+  - Box（PRO 功能）
+  - pCloud（PRO 功能）
+  - Yandex Disk（PRO 功能）
+  - Koofr（PRO 功能）
+  - Azure Blob Storage（PRO 功能）
+  - [这里](./docs/services_connectable_or_not.md)详细展示了更多可连接（或不可连接）的服务。
+- **支持 Obsidian 移动版。**  vault 可以通过云服务作为“中介”在移动和桌面设备之间同步。
+- **支持[端到端加密](./docs/encryption/README.md)。** 如果用户指定密码，文件在发送到云之前会使用 openssl / rclone crypt 格式加密。
+- **支持计划自动同步。** 你也可以使用侧边栏按钮，或者或命令面板中的命令，来手动触发同步（又或者绑定热键组合然后触发）。
+- **[最小侵入性](./docs/minimal_intrusive_design.md)。**
+- 通过自定义正则表达式条件**跳过大文件和路径！**
+- **[同步算法](./docs/sync_algorithm/v3/intro.md)文档公开。**
+- 免费版本支持 **[基本冲突检测和处理](./docs/sync_algorithm/v3/intro.md)**。PRO 版本支持 **[高级智能冲突处理](./pro/README.md)**。
+- 源代码可阅。详见[许可证](./LICENSE)。
+
+## 限制
+
+- **云服务会产生费用。** 始终记得注意成本和定价。具体来说，所有操作，包括但不限于下载、上传、列出所有文件、调用任何 api、存储大小，可能会或可能不会产生费用。
+- **来自浏览器环境的一些限制。** 更多技术细节在[文档](./docs/browser_env.md)中。
+- **记得保护你的 `data.json` 文件。** 该文件包含敏感信息。
+  - 强烈建议**不要**与任何人共享你的 `data.json` 文件。
+  - 通常**不要**将此文件检入版本控制。默认情况下，插件会尝试在插件目录中创建一个 `.gitignore` 文件（如果不存在），以忽略 `git` 版本控制中的 `data.json`。如果你确切知道这意味着什么并想移除设置，请修改 `.gitignore` 文件或将其设置为空。
+- **Obsidian 移动版 API 在同步大文件（>= 50 MB）时存在性能问题。**
+  - 设置“跳过大文件”选项可以帮助解决同步大文件的问题。
+
+## 问题、建议或错误
+
+非常欢迎你提出问题、发布任何建议或报告任何错误！该项目主要在GitHub上维护：
+
+- 问题：[GitHub 仓库讨论](https://github.com/remotely-save/remotely-save/discussions)
+- 建议：也在[GitHub 仓库讨论](https://github.com/remotely-save/remotely-save/discussions)
+- 错误：[GitHub 仓库 Issue](https://github.com/remotely-save/remotely-save/issues)（注意这里是 bug 反馈，不是讨论）
+
+此外，插件作者可能会偶尔访问 Obsidian 官方论坛和官方 Discord 服务器，并关注与该插件相关的信息。
+
+## 下载和安装
+
+- 选项 #1：在官方“社区插件列表”中搜索，或访问此链接：[https://obsidian.md/plugins?id=remotely-save](https://obsidian.md/plugins?id=remotely-save)（应该会重定向到 Obsidian app），然后安装插件。
+- 选项 #2：你也可以使用 [Obsidian42 - BRAT](https://github.com/TfTHacker/obsidian42-brat) 来安装此插件。在 BRAT 的配置中输入 `remotely-save/remotely-save`。
+- 选项 #3：[![GitHub release (latest by SemVer and asset including pre-releases)](https://img.shields.io/github/downloads-pre/fyears/remotely-save/latest/main.js?sort=semver)](https://github.com/fyears/remotely-save/releases) 从最新发布中手动下载文件（`main.js`，`manifest.json`，`styles.css`）。
+- 选项 #4：[![BuildCI](https://github.com/fyears/remotely-save/actions/workflows/auto-build.yml/badge.svg)](https://github.com/fyears/remotely-save/actions/workflows/auto-build.yml) 每个成功的构建的“摘要”下都有构建文件。它是由每个提交自动生成的，可能不会正常工作。
+
+## 使用方法
+
+### S3
+
+- 教程/示例：
+  - [Cloudflare R2](./docs/remote_services/s3_cloudflare_r2/README.md)
+  - [BackBlaze B2](./docs/remote_services/s3_backblaze_b2/README.md)
+  - [Storj](./docs/remote_services/s3_storj_io/README.md)
+  - [腾讯云 COS](./docs/remote_services/s3_tencent_cloud_cos/README.zh-cn.md) | [Tencent Cloud COS](./docs/remote_services/s3_tencent_cloud_cos/README.md)
+  - [MinIO](./docs/remote_services/s3_minio/README.md)
+  - [又拍云](./docs/remote_services/s3_upyun/README.zh-cn.md)
+- 准备你的 S3（兼容）服务信息：[端点，区域](https://docs.aws.amazon.com/general/latest/gr/s3.html)，[访问密钥 ID ，密钥](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/getting-your-credentials.html)，存储桶名称。
+- 如果你使用 AWS S3，还要创建[策略和用户](./docs/remote_services/s3_general/s3_user_policy.md)。
+- 非常旧版本的 Obsidian 需要[配置 CORS](./docs/remote_services/s3_general/s3_cors_configure.md)。
+- 下载并启用此插件。
+- 在插件的设置中输入你的信息。
+- 如果你没有在设置中设置前缀，存储桶应该是空的，并且仅用于同步一个 vault。你可以在设置中设置前缀，以便同一个存储桶可以存储多个 vault。
+- 如果你想启用端到端加密，也要在设置中设置一个密码。如果你没有指定密码，文件和文件夹将以明文、原始内容同步到云。
+- **每次**你想在本地和远程之间同步你的 vault 的时候，点击侧边栏上的新“圆形箭头”图标。（或者，你可以在设置面板中配置自动同步（见下一章）。）在同步过程中，图标变成“两个半圆形箭头”。除了点击侧边栏上的图标，你还可以在命令面板中激活相应的命令。
+- **同步时要有耐心。** 尤其是在第一次同步时。
+- 如果你想在多个设备之间同步文件，**在使用默认设置时，你的 vault 名称应该相同**。
+
+### Dropbox
+
+- **此插件不是官方Dropbox产品。** 插件只是使用 Dropbox 的公共API。
+- 授权后，插件可以读取你的姓名和电子邮件（在 Dropbox api 上无法取消选择），并读取和写入你的 Dropbox 的 `/Apps/remotely-save` 文件夹中的文件。
+- 如果你决定授权此插件连接到 Dropbox，请访问插件的设置页，选择Dropbox 然后按照说明操作。[更多带截图的信息在这里](./docs/dropbox_review_material/README.md)。
+- 基于密码的端到端加密也是可以的。但请注意，**vault 名称本身未加密**。
+- 如果你想在多个设备之间同步文件，**在使用默认设置时，你的 vault 名称应该相同**。
+
+### 个人 OneDrive（应用文件夹）
+
+- **此插件不是官方 Microsoft / OneDrive 产品。** 插件只是使用 Microsoft 的 [OneDrive 公共 API](https://docs.microsoft.com/en-us/onedrive/developer/rest-api) 而已。
+- 此插件仅适用于“个人 OneDrive”，不适用于“OneDrive for Business。详见 [#11](https://github.com/fyears/remotely-save/issues/11)。
+- 授权后，插件可以读取你的姓名和电子邮件，并读取和写入你的OneDrive的 `/Apps/remotely-save` 文件夹中的文件。**Remotely Save 的免费版本仅连接到应用文件夹，而 PRO 版本可以连接到 Onedrive 的根文件夹。见下面的 PRO 部分。**
+- 如果你决定授权此插件连接到 OneDrive，请访问插件的设置页，选择OneDrive 然后按照说明操作。
+- 基于密码的端到端加密也是可以的。但请注意，**vault 名称本身未加密**。
+- 如果你想在多个设备之间同步文件，**在使用默认设置时，你的 vault 名称应该相同**。
+- 你可能还想查看 [OneDrive 的常见问题](./docs/remote_services/onedrive/README.md)。
+
+### webdav
+
+- 教程/示例：
+  - [Nextcloud](./docs/remote_services/webdav_nextcloud/README.md)
+  - [The Good Cloud](./docs/remote_services/webdav_thegoodcloud/README.md)
+  - [ownCloud](./docs/remote_services/webdav_owncloud/README.md)
+  - [InfiniCloud](./docs/remote_services/webdav_infinicloud_teracloud/README.md)
+  - [Synology webdav 服务器](./docs/remote_services/webdav_synology_webdav_server/README.md) | [群晖 webdav 服务器](./docs/remote_services/webdav_synology_webdav_server/README.zh-cn.md)
+  - [dufs](./docs/remote_services/webdav_dufs/README.md)
+  - [AList（中文）](./docs/remote_services/webdav_alist/README.zh-cn.md) | [AList (English)](./docs/remote_services/webdav_alist/README.md)
+  - [坚果云](./docs/remote_services/webdav_jianguoyun/README.zh-cn.md) | [JianGuoYun/NutStore](./docs/remote_services/webdav_jianguoyun/README.md)
+  - [Open Media Vault](./docs/remote_services/webdav_openmediavault/README.md)
+  - [Nginx (`ngx_http_dav_module`, `nginx-dav-ext-module`, with Docker)](./docs/remote_services/webdav_nginx/README.md)
+  - [Apache (with Docker)](./docs/remote_services/webdav_apache/README.md)
+- 非常旧版本的Obsidian需要[配置 CORS](./docs/remote_services/webdav_general/webav_cors.md)。
+- 你的数据会同步到你的webdav服务器上的 `${vaultName}` 子文件夹。
+- 基于密码的端到端加密也是可以的。但请注意，**vault 名称本身未加密**。
+- 如果你想在多个设备之间同步文件，**在使用默认设置时，你的 vault 名称应该相同**。
+
+### Webdis
+
+- 教程：
+  - [Webdis](./docs/remote_services/webdis/README.md)
+- 实验性质。
+- 你必须自己设置和保护你的 web 服务器。
+
+### Onedrive（完整访问）（PRO 功能）
+
+PRO（付费）功能“与 Onedrive（完整）同步”允许用户与 Onedrive 根文件夹进行同步。教程和限制在[这里](./docs/remote_services/onedrivefull/README.md)。
+
+### Google Drive（GDrive）（PRO 功能）
+
+PRO（付费）功能“与 Google Drive 同步”允许用户与 Google Drive 进行同步。教程和限制在[这里](./docs/remote_services/googledrive/README.md)。
+
+### Box（PRO 功能）
+
+PRO（付费）功能“与 Box 同步”允许用户与 Box 同步。教程和限制在[这里](./docs/remote_services/box/README.md)。
+
+### pCloud（PRO 功能）
+
+PRO（付费）功能“与 pCloud 同步”允许用户与 pCloud 同步（使用其原生 API 而不是 webdav）。教程和限制在[这里](./docs/remote_services/pcloud/README.md)。
+
+### Yandex Disk（PRO 功能）
+
+PRO（付费）功能“与 Yandex Disk 同步”允许用户与 Yandex Disk 同步（使用其原生 API 而不是 webdav）。教程和限制在[这里](./docs/remote_services/yandexdisk/README.md)。
+
+### Koofr（PRO 功能）
+
+PRO（付费）功能“与 Koofr 同步”允许用户与 Koofr 同步（使用其原生 API 而不是 webdav）。教程和限制在[这里](./docs/remote_services/koofr/README.md)。
+
+### Azure Blob Storage（PRO 功能）
+
+PRO（付费）功能“与 Azure Blob Storage 同步”允许用户与 Azure Blob Storage 同步。教程和限制在[这里](./docs/remote_services/azureblobstorage/README.md)。
+
+## 智能冲突（PRO功能）
+
+基本（免费）版本可以检测冲突，但用户必须选择保留较新版本或较大版本的文件两种选项之一。
+
+PRO（付费）功能“智能冲突”为用户提供了另一个选项：合并小的 markdown 文件，或复制大的 markdown 文件或任何大小的非 markdown 文件。
+
+文档见[这里](./docs/pro/README.md)。
+
+## 定时自动同步
+
+- 你可以在设置中配置每 N 分钟自动同步。
+- 在自动同步模式下，如果发生任何错误，插件会**静默失败**。
+- 自动同步仅在 Obsidian 打开时有效。由于插件仅在 Obsidian 提供的浏览器环境中工作，因此**技术上不可能**在 Obsidian 后台自动同步。
+
+## 保存时同步
+
+- 你可以在设置中配置保存时同步。
+- 在保存时同步模式下，如果发生任何错误，插件会**静默失败**。
+
+## 配置文件夹/文件和书签
+
+默认情况下，插件不同步 obsidian 的配置文件夹/文件（通常是 `.obsidian` 文件夹），因为它是隐藏文件之一。
+
+然而，在最新版本中，你可以在设置中启用同步配置文件夹。请注意，这是一个实验性功能。特别是一些配置文件的修改时间每次 Obsidian 打开时都会改变，这破坏了插件的假设，因此某些信息可能无法正确同步。
+
+此外，Obsidian的书签实际上存储在 `.obsidian/bookmarks.json` 文件中的。你也可以在设置中设置同步这个文件（而不是整个配置文件夹）。插件将保持跨设备最新修改的文件。
+
+## 隐藏文件或文件夹
+
+**默认情况下，所有以 `.`（点）或 `_`（下划线）开头的文件或文件夹都被视为隐藏文件，不会被同步。** 如果你有一些文件只是本地保留，这很有用。但这种策略也意味着主题/其他插件/此插件的设置也不会被同步。
+
+在最新版本中，你可以更改设置以允许同步 `_` 文件或文件夹，以及如上所述的 `.obsidian` 特殊配置文件夹（但不包括其他任何 `.` 文件或文件夹）。
+
+## PRO（付费）功能
+
+详见[PRO](./docs/pro/README.md)了解更多详情。
+
+## 如何调试
+
+详见[这里](./docs/how_to_debug/README.md)了解更多详情。
+
+## 额外功能：通过 QR 码导入和导出非 OAuth2 插件设置
+
+详见[这里](./docs/import_export_some_settings.md)了解更多详情。
+

biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.7.3/schema.json",
+  "$schema": "https://biomejs.dev/schemas/1.8.3/schema.json",
   "organizeImports": {
     "enabled": true
   },
@@ -24,7 +24,7 @@
       "jsxQuoteStyle": "double",
       "quoteProperties": "asNeeded",
       "semicolons": "always",
-      "trailingComma": "es5"
+      "trailingCommas": "es5"
     }
   },
   "linter": {

docs/how_to_debug/README.md

@@ -6,12 +6,18 @@ Ideally, users do not need to debug anything. But if something bad happened, we
 
 See [here](./export_sync_plans.md).
 
-## Advanced: Check Console Output Directly
+## Medium: Desktop: Check Console Output Directly
 
 ...of desktop and Android.
 
 See [here](./check_console_output.md).
 
+## Medium: Mobile: Use `Obsidian vConsole` to Check Console Ouput Directly
+
+...of mobile (iOS and Android).
+
+See [here](./check_vconsole_output.md).
+
 ## Advanced: Use `Logstravaganza` to export logs
 
 This method works for desktop and mobile devices (iOS, Android), especially useful for iOS.

docs/how_to_debug/check_console_output.md

@@ -18,6 +18,8 @@ Go to the plugin settings, scroll down to the section "Debug" -> "alter console
 
 - If you are using Android
 
-  You need to [enable USB debugging](https://developer.android.com/studio/debug/dev-options#enable) on your Android, then connect your Android to a computer using USB, then open the **desktop** Chrome browser and go to the special web page <chrome://inspect>. You shall be able to see the "inspect" link inside the special page, then click the link to open the console. After debugging, remember to turn off USB debugging.
+  If you want to check the console **with the help of desktop Chrome**, you need to [enable USB debugging](https://developer.android.com/studio/debug/dev-options#enable) on your Android, then connect your Android to a computer using USB, then open the **desktop** Chrome browser and go to the special web page <chrome://inspect>. You shall be able to see the "inspect" link inside the special page, then click the link to open the console. After debugging, remember to turn off USB debugging.
+
+  If you want to check the console **directly on the mobile device**, check out [this doc](./check_vconsole_output.md).
 
 Trigger the sync manually (by clicking the icon on the ribbon sidebar). Something (hopefully) helpful should show up in the console. You could understand what happened and what goes wrong more explictly by checking the output.

docs/how_to_debug/check_vconsole_output.md

@@ -0,0 +1,21 @@
+# Check "Obsidian vConsole" Output
+
+It's quite hard to debug on mobile. But fortunately you can use another plugin to rescue!
+
+This applies to both iOS (iPhone / iPad) and Android.
+
+## Disable Auto Sync Firstly
+
+You should disable auto sync to avoid any unexpected running.
+
+## Set The Output Level To Debug
+
+Go to the plugin settings, scroll down to the section "Debug" -> "alter console log level", and change it from "info" to "debug".
+
+## Use "Obsidian vConsole"
+
+1. Install the third-party plugin ["Obsidian vConsole"](https://github.com/zhouhua/obsidian-vconsole).
+2. Enable "Obsidian vConsole". You shall see a green button in the right buttom corner of the interface of your mobile Obsidian. You can drag this green button to where you like.
+3. Sync! And quickly click the vConsole green button, you will see the console logs in its panel! Moreover, you can check browser network and Storage (LocalStorage) in the panel! 
+4. You can copy (by clicking the small "disk" icon beside each line of the log) or take a screenshot of the logs, and report bugs in Remotely Save GitHub. You can click "Hide" in the panel to hide the panel.
+5. If you don't need to debug any more, you can disable Obsidian vConsole plugin, then the green button should disappear.

docs/remote_services/webdav_dufs/README.md

@@ -0,0 +1,17 @@
+# dufs webdav
+
+## Link
+
+<https://github.com/sigoden/dufs>
+
+## Steps
+
+1. Download the latest version: <https://github.com/sigoden/dufs/releases> and save it to a folder
+2. Add the path environment variable.
+3. Start the server in terminal, you can change the address (`127.0.0.1`) and username (`user1`) and password (`pass1`) accordingly:
+    ```bash
+    dufs -A --enable-cors --bind 127.0.0.1 --port 8080 --auth user1:pass1@/:rw
+    ```
+4. In remotely-save setting page, select webdav type, then input the address/account/**webdav password**(not your account password).
+5. In remotely-save setting page, click "Check Connectivity".
+6. Sync!

manifest-beta.json

@@ -1,7 +1,7 @@
 {
   "id": "remotely-save",
   "name": "Remotely Save",
-  "version": "0.5.13",
+  "version": "0.5.19",
   "minAppVersion": "0.13.21",
   "description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
   "author": "fyears",

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "remotely-save",
   "name": "Remotely Save",
-  "version": "0.5.13",
+  "version": "0.5.19",
   "minAppVersion": "0.13.21",
   "description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
   "author": "fyears",

package.json

@@ -1,15 +1,15 @@
 {
   "name": "remotely-save",
-  "version": "0.5.13",
+  "version": "0.5.19",
   "description": "This is yet another sync plugin for Obsidian app.",
   "scripts": {
     "dev2": "node esbuild.config.mjs --watch",
     "build2": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production",
     "build": "webpack --mode production",
     "dev": "webpack --mode development --watch",
-    "format": "npx @biomejs/biome check --apply .",
+    "format": "npx @biomejs/biome check --write .",
     "clean": "npx rimraf main.js",
-    "test": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} mocha -r ts-node/register 'tests/**/*.ts' 'pro/tests/**/*.ts'"
+    "test": "mocha --import=tsx 'tests/**/*.ts' 'pro/tests/**/*.ts'"
   },
   "browser": {
     "path": "path-browserify",
@@ -25,55 +25,55 @@
   "author": "",
   "license": "SEE LICENSE IN LICENSE",
   "devDependencies": {
-    "@biomejs/biome": "1.7.3",
+    "@biomejs/biome": "1.8.3",
     "@microsoft/microsoft-graph-types": "^2.40.0",
-    "@types/chai": "^4.3.14",
+    "@types/chai": "^4.3.16",
     "@types/chai-as-promised": "^7.1.8",
-    "@types/jsdom": "^21.1.6",
+    "@types/jsdom": "^21.1.7",
-    "@types/lodash": "^4.17.0",
+    "@types/lodash": "^4.17.7",
     "@types/mime-types": "^2.1.4",
-    "@types/mocha": "^10.0.6",
+    "@types/mocha": "^10.0.7",
     "@types/mustache": "^4.2.5",
-    "@types/node": "^20.12.7",
+    "@types/node": "^20.14.12",
     "@types/qrcode": "^1.5.5",
-    "builtin-modules": "^3.3.0",
+    "builtin-modules": "^4.0.0",
     "cross-env": "^7.0.3",
     "dotenv": "^16.4.5",
-    "esbuild": "^0.20.2",
+    "esbuild": "^0.23.0",
     "esbuild-plugin-inline-worker": "^0.1.1",
-    "jsdom": "^24.0.0",
+    "jsdom": "^24.1.1",
-    "mocha": "^10.4.0",
+    "mocha": "^10.7.0",
     "npm-check-updates": "^16.14.20",
     "obsidian": "^1.5.7",
-    "openapi-typescript": "^7.0.0-rc.0",
+    "openapi-typescript": "^7.1.0",
     "ts-loader": "^9.5.1",
-    "ts-node": "^10.9.2",
+    "tslib": "^2.6.3",
-    "tslib": "^2.6.2",
+    "tsx": "^4.16.2",
-    "typescript": "^5.4.5",
+    "typescript": "^5.5.4",
     "webdav-server": "^2.6.2",
-    "webpack": "^5.91.0",
+    "webpack": "^5.93.0",
     "webpack-cli": "^5.1.4",
     "worker-loader": "^3.0.8"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.563.0",
+    "@aws-sdk/client-s3": "^3.620.0",
-    "@aws-sdk/lib-storage": "^3.563.0",
+    "@aws-sdk/lib-storage": "^3.620.0",
-    "@aws-sdk/signature-v4-crt": "^3.556.0",
+    "@aws-sdk/signature-v4-crt": "^3.620.0",
-    "@aws-sdk/types": "^3.535.0",
+    "@aws-sdk/types": "^3.609.0",
-    "@azure/msal-node": "^2.7.0",
+    "@azure/msal-node": "^2.12.0",
-    "@azure/storage-blob": "^12.23.0",
+    "@azure/storage-blob": "^12.24.0",
     "@fyears/rclone-crypt": "^0.0.7",
     "@fyears/tsqueue": "^1.0.1",
     "@microsoft/microsoft-graph-client": "^3.0.7",
     "@sanity/diff-match-patch": "^3.1.1",
-    "@smithy/fetch-http-handler": "^2.5.0",
+    "@smithy/fetch-http-handler": "^3.2.4",
-    "@smithy/protocol-http": "^3.3.0",
+    "@smithy/protocol-http": "^4.1.0",
-    "@smithy/querystring-builder": "^2.2.0",
+    "@smithy/querystring-builder": "^3.0.3",
-    "acorn": "^8.11.3",
+    "acorn": "^8.12.1",
     "aggregate-error": "^5.0.0",
     "assert": "^2.1.0",
-    "aws-crt": "^1.21.2",
+    "aws-crt": "^1.21.3",
-    "box-typescript-sdk-gen": "^1.0.0",
+    "box-typescript-sdk-gen": "^1.3.0",
     "buffer": "^6.0.3",
     "crypto-browserify": "^3.12.0",
     "dropbox": "^10.34.0",
@@ -83,21 +83,21 @@
     "localforage-getitems": "^1.4.2",
     "localforage-removeitems": "^1.4.0",
     "lodash": "^4.17.21",
-    "lucide": "^0.376.1",
+    "lucide": "^0.416.0",
     "mime-types": "^2.1.35",
     "mustache": "^4.2.0",
     "nanoid": "^5.0.7",
     "node-diff3": "^3.1.2",
-    "openapi-fetch": "^0.9.7",
+    "openapi-fetch": "^0.10.2",
     "p-queue": "^8.0.1",
     "path-browserify": "^1.0.1",
     "pcloud-sdk-js": "^2.0.0",
     "process": "^0.11.10",
     "qrcode": "^1.5.3",
     "rfc4648": "^1.5.3",
-    "rimraf": "^5.0.5",
+    "rimraf": "^6.0.1",
     "stream-browserify": "^3.0.0",
-    "url": "^0.11.3",
+    "url": "^0.11.4",
     "util": "^0.12.5",
     "webdav": "^5.6.0",
     "xregexp": "^5.1.1"

pro/src/account.ts

@@ -112,7 +112,9 @@ export const setConfigBySuccessfullAuthInplace = async (
   saveUpdatedConfigFunc: () => Promise<any> | undefined
 ) => {
   if (authRes.error !== undefined) {
-    throw Error(`you should not save the setting for ${authRes.error}`);
+    throw Error(
+      `remotely save account auth failed, please auth again: ${authRes.error}`
+    );
   }
 
   config.accessToken = authRes.access_token;

pro/src/conflictLogic.ts

@@ -38,9 +38,11 @@ export function isMergable(a: Entity, b?: Entity) {
  * @param b
  */
 function mergeDigInModified(a: string, o: string, b: string) {
-  const { conflict, result } = mergeDigIn(a, o, b);
+  const { conflict, result } = mergeDigIn(a, o, b, {
+    stringSeparator: /\n/,
+  });
   for (let index = 0; index < result.length; ++index) {
-    if (["<<<<<<<", "=======", ">>>>>>>"].contains(result[index])) {
+    if (["<<<<<<<", "=======", ">>>>>>>"].includes(result[index])) {
       result[index] = "`" + result[index] + "`";
     }
   }
@@ -72,7 +74,7 @@ function getLCSText(a: string, b: string) {
  * @param b
  * @returns
  */
-function twoWayMerge(a: string, b: string): string {
+export function twoWayMerge(a: string, b: string): string {
   const aa = a.trim();
   const bb = b.trim();
   if (aa === "" && bb === "") {
@@ -88,7 +90,10 @@ function twoWayMerge(a: string, b: string): string {
   // const c = getLCSText(a, b);
   // const patches = makePatches(c, a);
   // const [d] = applyPatches(patches, b);
-  const c = getLCSText(a, b);
+  const c = getLCSText(a, b); //.trim();
+  // console.debug(`(start) LCS Text:`);
+  // console.debug(c);
+  // console.debug(`(end) LCS Text.`);
   const d = mergeDigInModified(a, c, b).result.join("\n");
   return d;
 }
@@ -100,7 +105,7 @@ function twoWayMerge(a: string, b: string): string {
  * @param orig
  * @returns
  */
-function threeWayMerge(a: string, b: string, orig: string) {
+export function threeWayMerge(a: string, b: string, orig: string) {
   return mergeDigInModified(a, orig, b).result.join("\n");
 }
 
@@ -162,7 +167,7 @@ export async function mergeFile(
     key,
     newArrayBuffer,
     rightEntity.mtimeCli ?? mtime,
-    rightEntity.mtimeCli ?? mtime
+    rightEntity.ctimeCli ?? rightEntity.mtimeCli ?? mtime
   );
 
   return {

pro/src/fsAzureBlobStorage.ts

@@ -320,12 +320,12 @@ export class FakeFsAzureBlobStorage extends FakeFs {
     // if we can walk, we can connect
     try {
       await this.walkPartial();
-      return true;
     } catch (err) {
       console.debug(err);
       callbackFunc?.(err);
       return false;
     }
+    return await this.checkConnectCommonOps(callbackFunc);
   }
 
   async getUserDisplayName(): Promise<string> {

pro/src/fsBox.ts

@@ -112,7 +112,7 @@ export const setConfigBySuccessfullAuthInplace = async (
 ) => {
   if (authRes.access_token === undefined || authRes.access_token === "") {
     throw Error(
-      `you should not save the setting for ${JSON.stringify(authRes)}`
+      `remotely save account auth failed, please auth again: ${JSON.stringify(authRes)}`
     );
   }
 
@@ -892,12 +892,12 @@ export class FakeFsBox extends FakeFs {
     // if we can init, we can connect
     try {
       await this._init();
-      return true;
     } catch (err) {
       console.debug(err);
       callbackFunc?.(err);
       return false;
     }
+    return await this.checkConnectCommonOps(callbackFunc);
   }
   async getUserDisplayName(): Promise<string> {
     throw new Error("Method not implemented.");

pro/src/fsGoogleDrive.ts

@@ -728,12 +728,12 @@ export class FakeFsGoogleDrive extends FakeFs {
     // if we can init, we can connect
     try {
       await this._init();
-      return true;
     } catch (err) {
       console.debug(err);
       callbackFunc?.(err);
       return false;
     }
+    return await this.checkConnectCommonOps(callbackFunc);
   }
 
   async getUserDisplayName(): Promise<string> {

pro/src/fsKoofr.ts

@@ -140,7 +140,7 @@ export const setConfigBySuccessfullAuthInplace = async (
 ) => {
   if (authRes.access_token === undefined || authRes.access_token === "") {
     throw Error(
-      `you should not save the setting for ${JSON.stringify(authRes)}`
+      `remotely save account auth failed, please auth again: ${JSON.stringify(authRes)}`
     );
   }
 
@@ -263,7 +263,7 @@ const getAuthMiddleware = (
   saveUpdatedConfigFunc: any
 ) => {
   const authMiddleware: Middleware = {
-    async onRequest(req) {
+    async onRequest({ request }) {
       const getAccessToken = async () => {
         if (koofrConfig.refreshToken === "") {
           throw Error("The user has not manually auth yet.");
@@ -291,8 +291,8 @@ const getAuthMiddleware = (
       };
 
       const access = await getAccessToken();
-      req.headers.set("Authorization", `Bearer ${access}`);
+      request.headers.set("Authorization", `Bearer ${access}`);
-      return req;
+      return request;
     },
   };
   return authMiddleware;
@@ -555,12 +555,12 @@ export class FakeFsKoofr extends FakeFs {
     // if we can init, we can connect
     try {
       await this._init();
-      return true;
     } catch (err) {
       console.debug(err);
       callbackFunc?.(err);
       return false;
     }
+    return await this.checkConnectCommonOps(callbackFunc);
   }
 
   async getUserDisplayName(): Promise<string> {

pro/src/fsOnedriveFull.ts

@@ -290,13 +290,25 @@ const fromDriveItemToEntity = (x: DriveItem, remoteBaseDir: string): Entity => {
     key = `${key}/`;
   }
 
-  const mtimeSvr = Date.parse(x?.fileSystemInfo!.lastModifiedDateTime!);
+  const mtimeTry = x?.fileSystemInfo?.lastModifiedDateTime;
-  const mtimeCli = Date.parse(x?.fileSystemInfo!.lastModifiedDateTime!);
+  if (mtimeTry === undefined || mtimeTry === null) {
+    throw Error(`onedrive cannot parse mtime: ${JSON.stringify(x, null, 2)}`);
+  }
+  let ctimeTry = x?.fileSystemInfo?.createdDateTime;
+  if (ctimeTry === undefined || ctimeTry === null) {
+    // throw Error(`onedrive cannot parse ctime: ${JSON.stringify(x, null, 2)}`);
+    // it doesn't hurt, we just use mtimeTry to fullfill
+    ctimeTry = mtimeTry;
+  }
+  const mtimeSvr = Date.parse(mtimeTry);
+  const mtimeCli = Date.parse(mtimeTry);
+  const ctimeCli = Date.parse(ctimeTry);
   return {
     key: key,
     keyRaw: key,
     mtimeSvr: mtimeSvr,
     mtimeCli: mtimeCli,
+    ctimeCli: ctimeCli,
     size: isFolder ? 0 : x.size!,
     sizeRaw: isFolder ? 0 : x.size!,
     synthesizedFile: false,
@@ -767,6 +779,7 @@ export class FakeFsOnedriveFull extends FakeFs {
           keyRaw: origKey,
           mtimeSvr: mtime,
           mtimeCli: mtime,
+          ctimeCli: ctime,
           size: 0,
           sizeRaw: 0,
           synthesizedFile: true,
@@ -912,12 +925,15 @@ export class FakeFsOnedriveFull extends FakeFs {
   async checkConnect(callbackFunc?: any): Promise<boolean> {
     try {
       const k = await this.getUserDisplayName();
-      return k !== "<unknown display name>";
+      if (k === "<unknown display name>") {
+        throw Error(`unknown display name!`);
+      }
     } catch (err) {
       console.debug(err);
       callbackFunc?.(err);
       return false;
     }
+    return await this.checkConnectCommonOps(callbackFunc);
   }
 
   async getUserDisplayName() {

pro/src/fsPCloud.ts

@@ -99,7 +99,9 @@ export const setConfigBySuccessfullAuthInplace = async (
   saveUpdatedConfigFunc: () => Promise<any> | undefined
 ) => {
   if (authRes === undefined) {
-    throw Error(`you should not save the setting for undefined result`);
+    throw Error(
+      `remotely save account auth failed, please auth again: undefined result`
+    );
   }
 
   config.accessToken = authRes.access_token;
@@ -604,12 +606,12 @@ export class FakeFsPCloud extends FakeFs {
     // if we can init, we can connect
     try {
       await this._init();
-      return true;
     } catch (err) {
       console.debug(err);
       callbackFunc?.(err);
       return false;
     }
+    return await this.checkConnectCommonOps(callbackFunc);
   }
 
   async getUserDisplayName(): Promise<string> {

pro/src/fsYandexDisk.ts

@@ -127,7 +127,7 @@ export const setConfigBySuccessfullAuthInplace = async (
 ) => {
   if (authRes.access_token === undefined || authRes.access_token === "") {
     throw Error(
-      `you should not save the setting for ${JSON.stringify(authRes)}`
+      `remotely save account auth failed, please auth again: ${JSON.stringify(authRes)}`
     );
   }
 
@@ -480,12 +480,12 @@ export class FakeFsYandexDisk extends FakeFs {
     // if we can init, we can connect
     try {
       await this._init();
-      return true;
     } catch (err) {
       console.debug(err);
       callbackFunc?.(err);
       return false;
     }
+    return await this.checkConnectCommonOps(callbackFunc);
   }
 
   async getUserDisplayName(): Promise<string> {

pro/src/settingsClearDupFiles.ts

@@ -74,6 +74,7 @@ export const generateClearDupFilesSettingsPart = (
         const fsLocal = new FakeFsLocal(
           app.vault,
           plugin.settings.syncConfigDir ?? false,
+          plugin.settings.syncBookmarks ?? false,
           app.vault.configDir,
           plugin.manifest.id,
           undefined,

pro/src/sync.ts

@@ -28,6 +28,7 @@ import {
 } from "../../src/metadataOnRemote";
 import {
   atWhichLevel,
+  checkValidName,
   getParentFolder,
   isHiddenPath,
   isSpecialFolderNameToSkip,
@@ -59,6 +60,17 @@ const copyEntityAndFixTimeFormat = (
       result.mtimeCliFmt = unixTimeToStr(result.mtimeCli);
     }
   }
+  if (result.ctimeCli !== undefined) {
+    if (result.ctimeCli === 0) {
+      result.ctimeCli = undefined;
+    } else {
+      if (serviceType === "s3" || serviceType === "dropbox") {
+        // round to second instead of millisecond
+        result.ctimeCli = Math.floor(result.ctimeCli / 1000.0) * 1000;
+      }
+      result.ctimeCliFmt = unixTimeToStr(result.ctimeCli);
+    }
+  }
   if (result.mtimeSvr !== undefined) {
     if (result.mtimeSvr === 0) {
       result.mtimeSvr = undefined;
@@ -116,18 +128,61 @@ const isInsideObsFolder = (x: string, configDir: string) => {
   return x === configDir || x.startsWith(`${configDir}/`);
 };
 
+const isBookmarksFile = (x: string, configDir: string) => {
+  if (!configDir.startsWith(".")) {
+    throw Error(`configDir should starts with . but we get ${configDir}`);
+  }
+  return (
+    x === configDir ||
+    x === `${configDir}/` ||
+    x === `${configDir}/bookmarks.json`
+  );
+};
+
 const isSkipItemByName = (
   key: string,
   syncConfigDir: boolean,
+  syncBookmarks: boolean,
   syncUnderscoreItems: boolean,
   configDir: string,
-  ignorePaths: string[]
+  ignorePaths: string[],
+  onlyAllowPaths: string[]
 ) => {
   if (key === undefined) {
     throw Error(`isSkipItemByName meets undefinded key!`);
   }
+
+  let enableAllowMode = false;
+  let isInAllowList = false;
+  if (onlyAllowPaths !== undefined && onlyAllowPaths.length > 0) {
+    for (const r of onlyAllowPaths) {
+      if (r.trim() === "") {
+        // ignore empty lines
+        continue;
+      }
+      enableAllowMode = true; // we really want to check the allow list
+
+      if (XRegExp(r, "A").test(key)) {
+        isInAllowList = true;
+      }
+    }
+  }
+  // we want to determine "is skippable or not".
+  // if the key meets the allow list,
+  //     it may or may not be skippable,
+  //     and is deferred to next checking steps
+  // if the key doesn't meet the allow list,
+  //     it must be skippable.
+  if (enableAllowMode && !isInAllowList) {
+    return true; // must be skippable
+  }
+
   if (ignorePaths !== undefined && ignorePaths.length > 0) {
     for (const r of ignorePaths) {
+      if (r.trim() === "") {
+        // ignore empty lines
+        continue;
+      }
       if (XRegExp(r, "A").test(key)) {
         return true;
       }
@@ -136,6 +191,11 @@ const isSkipItemByName = (
   if (syncConfigDir && isInsideObsFolder(key, configDir)) {
     return false;
   }
+
+  if (syncBookmarks && isBookmarksFile(key, configDir)) {
+    return false;
+  }
+
   if (isSpecialFolderNameToSkip(key, [])) {
     // some special dirs and files are always skipped
     return true;
@@ -157,9 +217,11 @@ const ensembleMixedEnties = async (
   remoteEntityList: Entity[],
 
   syncConfigDir: boolean,
+  syncBookmarks: boolean,
   configDir: string,
   syncUnderscoreItems: boolean,
   ignorePaths: string[],
+  onlyAllowPaths: string[],
   fsEncrypt: FakeFsEncrypt,
   serviceType: SUPPORTED_SERVICES_TYPE,
 
@@ -184,14 +246,23 @@ const ensembleMixedEnties = async (
       isSkipItemByName(
         key,
         syncConfigDir,
+        syncBookmarks,
         syncUnderscoreItems,
         configDir,
-        ignorePaths
+        ignorePaths,
+        onlyAllowPaths
       )
     ) {
       continue;
     }
 
+    const checkValidNameResult = checkValidName(key);
+    if (!checkValidNameResult.result) {
+      throw Error(
+        `your remote folder/file name is invalid: ${checkValidNameResult.reason}`
+      );
+    }
+
     finalMappings[key] = {
       key: key,
       remote: remoteCopied,
@@ -216,9 +287,11 @@ const ensembleMixedEnties = async (
         isSkipItemByName(
           key,
           syncConfigDir,
+          syncBookmarks,
           syncUnderscoreItems,
           configDir,
-          ignorePaths
+          ignorePaths,
+          onlyAllowPaths
         )
       ) {
         continue;
@@ -251,14 +324,23 @@ const ensembleMixedEnties = async (
       isSkipItemByName(
         key,
         syncConfigDir,
+        syncBookmarks,
         syncUnderscoreItems,
         configDir,
-        ignorePaths
+        ignorePaths,
+        onlyAllowPaths
       )
     ) {
       continue;
     }
 
+    const checkValidNameResult = checkValidName(key);
+    if (!checkValidNameResult.result) {
+      throw Error(
+        `your local folder/file name is invalid: ${checkValidNameResult.reason}`
+      );
+    }
+
     // TODO: abstraction leaking?
     const localCopied = await fsEncrypt.encryptEntity(
       copyEntityAndFixTimeFormat(local, serviceType)
@@ -899,6 +981,8 @@ const getSyncPlanInplace = async (
   keptFolder.delete("/");
   keptFolder.delete("");
   if (keptFolder.size > 0) {
+    console.error(sortedKeys);
+    console.error(mixedEntityMappings);
     throw Error(`unexpectedly keptFolder no decisions: ${[...keptFolder]}`);
   }
 
@@ -911,13 +995,14 @@ const getSyncPlanInplace = async (
   mixedEntityMappings["/$@meta"] = {
     key: "/$@meta", // don't mess up with the types
     sideNotes: {
-      version: "20240616 fs version",
+      version: "20240714 fs version",
       generateTime: currTime,
       generateTimeFmt: currTimeFmt,
       service: settings.serviceType,
       concurrency: settings.concurrency,
       hasPassword: settings.password !== "",
       syncConfigDir: settings.syncConfigDir,
+      syncBookmarks: settings.syncBookmarks,
       syncUnderscoreItems: settings.syncUnderscoreItems,
       skipSizeLargerThan: settings.skipSizeLargerThan,
       protectModifyPercentage: settings.protectModifyPercentage,
@@ -1709,9 +1794,11 @@ export async function syncer(
       prevSyncEntityList,
       remoteEntityList,
       settings.syncConfigDir ?? false,
+      settings.syncBookmarks ?? false,
       configDir,
       settings.syncUnderscoreItems ?? false,
       settings.ignorePaths ?? [],
+      settings.onlyAllowPaths ?? [],
       fsEncrypt,
       settings.serviceType,
       profiler

pro/tests/conflictLogic.test.ts

@@ -1,5 +1,9 @@
 import { deepStrictEqual, rejects, throws } from "assert";
-import { getFileRenameForDup } from "../src/conflictLogic";
+import {
+  getFileRenameForDup,
+  threeWayMerge,
+  twoWayMerge,
+} from "../src/conflictLogic";
 
 describe("New name is generated", () => {
   it("should throw for empty file", async () => {
@@ -69,3 +73,224 @@ describe("New name is generated", () => {
     );
   });
 });
+
+describe("Two way merge", () => {
+  it("should correctly merge from zero files", async () => {
+    const a = "aaa";
+    const b = "bbb";
+    const res = twoWayMerge(a, b);
+    const expected = `\`<<<<<<<\`
+aaa
+\`=======\`
+bbb
+\`>>>>>>>\``;
+    deepStrictEqual(expected, res);
+  });
+
+  it("should correctly merge from common lines", async () => {
+    const a = `
+Something is cool. 中文1
+Other thing is cooler. 哈哈！
+`;
+    const b = `
+Anything is cool. 中文2
+Other thing is cooler. 哈哈！
+`;
+    const res = twoWayMerge(a, b);
+    // console.log(res);
+    const expected = `
+\`<<<<<<<\`
+Something is cool. 中文1
+\`=======\`
+Anything is cool. 中文2
+\`>>>>>>>\`
+Other thing is cooler. 哈哈！
+`;
+    deepStrictEqual(expected, res);
+  });
+
+  it("should merge by lines", async () => {
+    const a = `
+Something is cool. 中文1
+`;
+    const b = `
+Something is cooler. 中文2
+`;
+    const res = twoWayMerge(a, b);
+    // console.log(res);
+    const expected = `
+\`<<<<<<<\`
+Something is cool. 中文1
+\`=======\`
+Something is cooler. 中文2
+\`>>>>>>>\`
+`;
+    deepStrictEqual(expected, res);
+  });
+});
+
+describe("Three way merge", () => {
+  it("should correctly merge from zero files", async () => {
+    const orig = "";
+    const a = "aaa";
+    const b = "bbb";
+    const res = threeWayMerge(a, b, orig);
+    const expected = `\`<<<<<<<\`
+aaa
+\`=======\`
+bbb
+\`>>>>>>>\``;
+    deepStrictEqual(expected, res);
+  });
+
+  it("should correctly merge after adding lines on both sides", async () => {
+    const orig = `
+* [ ] A1
+* [ ] A2
+* [ ] A3
+`;
+    const a = `
+* [ ] A1
+* [ ] new line after A1
+* [ ] A2
+* [ ] A3
+`;
+    const b = `
+* [ ] A1
+* [ ] A2
+* [ ] New line after A2
+* [ ] A3
+`;
+    const res = threeWayMerge(a, b, orig);
+    // console.log(res);
+    const expected = `
+* [ ] A1
+* [ ] new line after A1
+* [ ] A2
+* [ ] New line after A2
+* [ ] A3
+`;
+    deepStrictEqual(expected, res);
+  });
+
+  it("should correctly merge after adding lines on both sides (again)", async () => {
+    const orig = `
+* [ ] 中文
+* [ ] にほんご／にっぽんご
+* [ ] A3
+`;
+    const a = `
+* [ ] 中文
+* [ ] new line after 中文
+* [ ] にほんご／にっぽんご
+* [ ] A3
+`;
+    const b = `
+* [ ] 中文
+* [ ] にほんご／にっぽんご
+* [ ] New line after にほんご／にっぽんご
+* [ ] A3
+`;
+    const res = threeWayMerge(a, b, orig);
+    // console.log(res);
+    const expected = `
+* [ ] 中文
+* [ ] new line after 中文
+* [ ] にほんご／にっぽんご
+* [ ] New line after にほんご／にっぽんご
+* [ ] A3
+`;
+    deepStrictEqual(expected, res);
+  });
+
+  it("should correctly merge after deleting lines on both sides", async () => {
+    const orig = `
+* [ ] 中文
+* [ ] にほんご／にっぽんご
+* [ ] A3
+* [ ] A4
+`;
+    const a = `
+* [ ] にほんご／にっぽんご
+* [ ] A3
+* [ ] A4
+`;
+    const b = `
+* [ ] 中文
+* [ ] A3
+* [ ] A4
+`;
+    const res = threeWayMerge(a, b, orig);
+    // console.log(res);
+    const expected = `
+\`<<<<<<<\`
+* [ ] にほんご／にっぽんご
+\`=======\`
+* [ ] 中文
+\`>>>>>>>\`
+* [ ] A3
+* [ ] A4
+`;
+    deepStrictEqual(expected, res);
+  });
+
+  it("should correctly merge after adding on one side and deleting on other side", async () => {
+    const orig = `
+* [ ] 中文
+* [ ] A3
+* [ ] A4
+`;
+    const a = `
+* [ ] 中文
+* [ ] にほんご／にっぽんご
+* [ ] A3
+* [ ] A4
+`;
+    const b = `
+* [ ] A3
+* [ ] A4
+`;
+    const res = threeWayMerge(a, b, orig);
+    // console.log(res);
+    const expected = `
+\`<<<<<<<\`
+* [ ] 中文
+* [ ] にほんご／にっぽんご
+\`=======\`
+\`>>>>>>>\`
+* [ ] A3
+* [ ] A4
+`;
+    deepStrictEqual(expected, res);
+  });
+
+  it("should correctly merge after adding on one side and deleting on other side (again)", async () => {
+    const orig = `
+* [ ] 中文
+* [ ] A3
+* [ ] A4
+`;
+    const a = `
+* [ ] A3
+* [ ] A4
+`;
+    const b = `
+* [ ] 中文
+* [ ] にほんご／にっぽんご
+* [ ] A3
+* [ ] A4
+`;
+    const res = threeWayMerge(a, b, orig);
+    // console.log(res);
+    const expected = `
+\`<<<<<<<\`
+\`=======\`
+* [ ] 中文
+* [ ] にほんご／にっぽんご
+\`>>>>>>>\`
+* [ ] A3
+* [ ] A4
+`;
+    deepStrictEqual(expected, res);
+  });
+});

src/baseTypes.ts

@@ -167,11 +167,13 @@ export interface RemotelySavePluginSettings {
 
   concurrency?: number;
   syncConfigDir?: boolean;
+  syncBookmarks?: boolean;
   syncUnderscoreItems?: boolean;
   lang?: LangTypeAndAuto;
   agreeToUseSyncV3?: boolean;
   skipSizeLargerThan?: number;
   ignorePaths?: string[];
+  onlyAllowPaths?: string[];
   enableStatusBarInfo?: boolean;
   deleteToWhere?: "system" | "obsidian";
   conflictAction?: ConflictActionType;
@@ -269,6 +271,8 @@ export interface Entity {
   keyRaw: string;
   mtimeCli?: number;
   mtimeCliFmt?: string;
+  ctimeCli?: number;
+  ctimeCliFmt?: string;
   mtimeSvr?: number;
   mtimeSvrFmt?: string;
   prevSyncTime?: number;

src/copyLogic.ts

@@ -41,7 +41,7 @@ export async function copyFile(key: string, left: FakeFs, right: FakeFs) {
       key,
       content,
       statsLeft.mtimeCli,
-      statsLeft.mtimeCli /* TODO */
+      statsLeft.ctimeCli ?? statsLeft.mtimeCli
     ),
     content: content,
   };

src/encryptRClone.ts

@@ -202,7 +202,7 @@ export class CipherRclone {
         },
         [
           channel.port1,
-          // input // the array buffer might be re-used later, so we CANNOT transform here
+          // input // the array buffer might be re-used later, so we CANNOT transfer here
         ]
       );
     });
@@ -247,8 +247,10 @@ export class CipherRclone {
           action: "decryptContent",
           inputContent: input,
         },
-        // the decrypted result is not used later in worker, so it's save to transfer
+        [
-        [channel.port1, input]
+          channel.port1,
+          input, // not transfer for safety
+        ]
       );
     });
   }

src/encryptRClone.worker.ts

@@ -141,7 +141,7 @@ ctx.addEventListener("message", async (event: any) => {
           status: "ok",
           outputContent: outputContent,
         },
-        [outputContent]
+        [outputContent] // on worker side, we don't reuse anything so it's safe to transfer
       );
     } catch (error) {
       console.error(error);
@@ -166,7 +166,7 @@ ctx.addEventListener("message", async (event: any) => {
           status: "ok",
           outputContent: outputContent,
         },
-        [outputContent]
+        [outputContent] // on worker side, we don't reuse anything so it's safe to transfer
       );
     } catch (error) {
       console.error(error);

src/fsAll.ts

@@ -1,3 +1,5 @@
+import isEqual from "lodash/isEqual";
+import { nanoid } from "nanoid";
 import type { Entity } from "./baseTypes";
 
 export abstract class FakeFs {
@@ -16,6 +18,49 @@ export abstract class FakeFs {
   abstract rename(key1: string, key2: string): Promise<void>;
   abstract rm(key: string): Promise<void>;
   abstract checkConnect(callbackFunc?: any): Promise<boolean>;
+  async checkConnectCommonOps(callbackFunc?: any) {
+    try {
+      console.info(`check connect: create folder`);
+      const folderName = `rs-test-folder-${nanoid()}/`;
+      await this.mkdir(folderName);
+      // await delay(3000);
+
+      console.info(`check connect: upload file`);
+      const filename = `${folderName}rs-test-file-${nanoid()}`;
+      const ctime = Date.now();
+      const mtime1 = Date.now();
+      const content1 = new ArrayBuffer(100);
+      await this.writeFile(filename, content1, mtime1, ctime);
+      // await delay(3000);
+
+      console.info(`check connect: overwrite file`);
+      const mtime2 = Date.now();
+      const content2 = new ArrayBuffer(200);
+      await this.writeFile(filename, content2, mtime2, ctime);
+      // await delay(3000);
+
+      console.info(`check connect: download file`);
+      const content3 = await this.readFile(filename);
+      if (!isEqual(content2, content3)) {
+        throw Error(`downloaded file is not equal with uploaded file!`);
+      }
+      // await delay(3000);
+
+      console.info(`check connect: delete file`);
+      await this.rm(filename);
+      // await delay(3000);
+
+      console.info(`check connect: delete folder`);
+      await this.rm(folderName);
+      // await delay(3000);
+
+      return true;
+    } catch (err) {
+      console.error(err);
+      callbackFunc?.(err);
+      return false;
+    }
+  }
   abstract getUserDisplayName(): Promise<string>;
   abstract revokeAuth(): Promise<any>;
   abstract allowEmptyFile(): boolean;

src/fsDropbox.ts

@@ -741,14 +741,15 @@ export class FakeFsDropbox extends FakeFs {
       await this._init();
       const results = await this._statFromRoot(`/${this.remoteBaseDir}`);
       if (results === undefined) {
-        return false;
+        throw Error(`cannot check root vault folder!`);
       }
-      return true;
     } catch (err) {
       console.debug(err);
       callbackFunc?.(err);
       return false;
     }
+
+    return await this.checkConnectCommonOps(callbackFunc);
   }
 
   async getUserDisplayName() {

src/fsLocal.ts

@@ -9,6 +9,7 @@ import type { Profiler } from "./profiler";
 export class FakeFsLocal extends FakeFs {
   vault: Vault;
   syncConfigDir: boolean;
+  syncBookmarks: boolean;
   configDir: string;
   pluginID: string;
   profiler: Profiler | undefined;
@@ -17,6 +18,7 @@ export class FakeFsLocal extends FakeFs {
   constructor(
     vault: Vault,
     syncConfigDir: boolean,
+    syncBookmarks: boolean,
     configDir: string,
     pluginID: string,
     profiler: Profiler | undefined,
@@ -26,6 +28,7 @@ export class FakeFsLocal extends FakeFs {
 
     this.vault = vault;
     this.syncConfigDir = syncConfigDir;
+    this.syncBookmarks = syncBookmarks;
     this.configDir = configDir;
     this.pluginID = pluginID;
     this.profiler = profiler;
@@ -96,13 +99,16 @@ export class FakeFsLocal extends FakeFs {
 
     this.profiler?.insert("finish transforming walk for local");
 
-    if (this.syncConfigDir) {
+    if (this.syncConfigDir || this.syncBookmarks) {
-      this.profiler?.insert("into syncConfigDir");
+      this.profiler?.insert("into syncConfigDir or syncBookmarks");
+      const bookmarksOnly = !this.syncConfigDir;
       const syncFiles = await listFilesInObsFolder(
         this.configDir,
         this.vault,
-        this.pluginID
+        this.pluginID,
+        bookmarksOnly
       );
+      // console.debug(`syncFiles in obs: ${JSON.stringify(syncFiles, null, 2)}`);
       for (const f of syncFiles) {
         local.push(f);
       }
@@ -127,8 +133,10 @@ export class FakeFsLocal extends FakeFs {
     return {
       key: isFolder ? `${key}/` : key, // local always unencrypted
       keyRaw: isFolder ? `${key}/` : key,
+      ctimeCli: statRes.ctime,
       mtimeCli: statRes.mtime,
       mtimeSvr: statRes.mtime,
+      ctimeCliFmt: unixTimeToStr(statRes.ctime),
       mtimeCliFmt: unixTimeToStr(statRes.mtime),
       mtimeSvrFmt: unixTimeToStr(statRes.mtime),
       size: statRes.size, // local always unencrypted

src/fsMock.ts

@@ -47,7 +47,7 @@ export class FakeFsMock extends FakeFs {
   }
 
   async checkConnect(callbackFunc?: any): Promise<boolean> {
-    return true;
+    return await this.checkConnectCommonOps(callbackFunc);
   }
 
   async getUserDisplayName(): Promise<string> {

src/fsOnedrive.ts

@@ -399,13 +399,27 @@ ${constructFromDriveItemToEntityError(x)}`
     key = `${key}/`;
   }
 
-  const mtimeSvr = Date.parse(x?.fileSystemInfo!.lastModifiedDateTime!);
+  const mtimeTry = x?.fileSystemInfo?.lastModifiedDateTime;
-  const mtimeCli = Date.parse(x?.fileSystemInfo!.lastModifiedDateTime!);
+  if (mtimeTry === undefined || mtimeTry === null) {
+    throw Error(`onedrive cannot parse mtime: ${JSON.stringify(x, null, 2)}`);
+  }
+
+  let ctimeTry = x?.fileSystemInfo?.createdDateTime;
+  if (ctimeTry === undefined || ctimeTry === null) {
+    // throw Error(`onedrive cannot parse ctime: ${JSON.stringify(x, null, 2)}`);
+    // it doesn't hurt, we just use mtimeTry to fullfill
+    ctimeTry = mtimeTry;
+  }
+
+  const mtimeSvr = Date.parse(mtimeTry);
+  const mtimeCli = Date.parse(mtimeTry);
+  const ctimeCli = Date.parse(ctimeTry);
   return {
     key: key,
     keyRaw: key,
     mtimeSvr: mtimeSvr,
     mtimeCli: mtimeCli,
+    ctimeCli: ctimeCli,
     size: isFolder ? 0 : x.size!,
     sizeRaw: isFolder ? 0 : x.size!,
     synthesizedFile: false,
@@ -874,6 +888,7 @@ export class FakeFsOnedrive extends FakeFs {
           keyRaw: origKey,
           mtimeSvr: mtime,
           mtimeCli: mtime,
+          ctimeCli: ctime,
           size: 0,
           sizeRaw: 0,
           synthesizedFile: true,
@@ -1032,12 +1047,16 @@ export class FakeFsOnedrive extends FakeFs {
   async checkConnect(callbackFunc?: any): Promise<boolean> {
     try {
       const k = await this.getUserDisplayName();
-      return k !== "<unknown display name>";
+      if (k === "<unknown display name>") {
+        throw Error(`unknown display name!`);
+      }
     } catch (err) {
       console.debug(err);
       callbackFunc?.(err);
       return false;
     }
+
+    return await this.checkConnectCommonOps(callbackFunc);
   }
 
   async getUserDisplayName() {

src/fsS3.ts

@@ -831,14 +831,11 @@ export class FakeFsS3 extends FakeFs {
         results.$metadata === undefined ||
         results.$metadata.httpStatusCode === undefined
       ) {
-        const err = "results or $metadata or httStatusCode is undefined";
+        throw Error("results or $metadata or httStatusCode is undefined");
-        console.debug(err);
-        if (callbackFunc !== undefined) {
-          callbackFunc(err);
       }
-        return false;
+      if (results.$metadata.httpStatusCode !== 200) {
+        throw Error(`not 200 httpStatusCode`);
       }
-      return results.$metadata.httpStatusCode === 200;
     } catch (err: any) {
       console.debug(err);
       if (callbackFunc !== undefined) {
@@ -854,9 +851,10 @@ export class FakeFsS3 extends FakeFs {
           callbackFunc(err);
         }
       }
-
       return false;
     }
+
+    return await this.checkConnectCommonOps(callbackFunc);
   }
 
   async getUserDisplayName(): Promise<string> {

src/fsWebdav.ts

@@ -4,8 +4,6 @@ import { getReasonPhrase } from "http-status-codes/build/cjs/utils-functions";
 import chunk from "lodash/chunk";
 import cloneDeep from "lodash/cloneDeep";
 import flatten from "lodash/flatten";
-import isString from "lodash/isString";
-import { nanoid } from "nanoid";
 import { Platform, type RequestUrlParam, requestUrl } from "obsidian";
 import type {
   FileStat,
@@ -140,6 +138,7 @@ if (VALID_REQURL) {
   );
 }
 
+import isEqual from "lodash/isEqual";
 // @ts-ignore
 // biome-ignore lint: we want to ts-ignore the next line
 import { AuthType, BufferLike, createClient } from "webdav/dist/web/index.js";
@@ -209,6 +208,13 @@ const tryEncodeURI = (x: string) => {
   return encodeURI(x);
 };
 
+const tryEncodeUsernamePassword = (x: string) => {
+  if (onlyAscii(x)) {
+    return x;
+  }
+  return unescape(encodeURIComponent(x));
+};
+
 const parseCustomHeaders = (x: string): Record<string, string> => {
   const y = x.trim();
   if (y === "") {
@@ -241,7 +247,8 @@ export class FakeFsWebdav extends FakeFs {
   vaultFolderExists: boolean;
   saveUpdatedConfigFunc: () => Promise<any>;
 
-  supportNativePartial: boolean;
+  supportApachePartial: boolean;
+  supportSabrePartial: boolean;
   isNextcloud: boolean;
   nextcloudUploadServerAddress: string;
 
@@ -258,7 +265,8 @@ export class FakeFsWebdav extends FakeFs {
     this.vaultFolderExists = false;
     this.saveUpdatedConfigFunc = saveUpdatedConfigFunc;
 
-    this.supportNativePartial = false;
+    this.supportApachePartial = false;
+    this.supportSabrePartial = false;
     this.isNextcloud = false;
     this.nextcloudUploadServerAddress = "";
   }
@@ -282,8 +290,8 @@ export class FakeFsWebdav extends FakeFs {
       this.webdavConfig.password !== ""
     ) {
       this.client = createClient(this.webdavConfig.address, {
-        username: this.webdavConfig.username,
+        username: tryEncodeUsernamePassword(this.webdavConfig.username),
-        password: this.webdavConfig.password,
+        password: tryEncodeUsernamePassword(this.webdavConfig.password),
         headers: headers,
         authType:
           this.webdavConfig.authType === "digest"
@@ -392,15 +400,20 @@ export class FakeFsWebdav extends FakeFs {
     // taken from https://github.com/perry-mitchell/webdav-client/blob/master/source/operations/partialUpdateFileContents.ts
     // which is under MIT license
     if (
-      (compliance.server.includes("Apache") &&
+      compliance.server.includes("Apache") &&
-        compliance.compliance.includes(
+      compliance.compliance.includes("<http://apache.org/dav/propset/fs/1>")
-          "<http://apache.org/dav/propset/fs/1>"
-        )) ||
-      compliance.compliance.includes("sabredav-partialupdate")
     ) {
-      this.supportNativePartial = true;
+      this.supportApachePartial = true;
       console.debug(
-        `supportNativePartial=true, compliance=${JSON.stringify(compliance)}`
+        `supportApachePartial=true, compliance=${JSON.stringify(compliance)}`
+      );
+      return true;
+    }
+
+    if (compliance.compliance.includes("sabredav-partialupdate")) {
+      this.supportSabrePartial = true;
+      console.debug(
+        `supportSabrePartial=true, compliance=${JSON.stringify(compliance)}`
       );
       return true;
     }
@@ -417,7 +430,9 @@ export class FakeFsWebdav extends FakeFs {
       this.webdavConfig.depth === "auto_unknown" ||
       this.webdavConfig.depth === "auto_1" ||
       this.webdavConfig.depth === "auto_infinity" /* don't trust auto now */ ||
-      this.webdavConfig.depth === "manual_1"
+      this.webdavConfig.depth === "manual_1" ||
+      this.webdavConfig.address.includes("jianguoyun.com") ||
+      this.webdavConfig.address.includes("teracloud.jp")
     ) {
       // the remote doesn't support infinity propfind,
       // we need to do a bfs here
@@ -570,7 +585,11 @@ export class FakeFsWebdav extends FakeFs {
     }
 
     // larger than 10 MB
-    if (!this.isNextcloud && !this.supportNativePartial) {
+    if (
+      !this.isNextcloud &&
+      !this.supportApachePartial &&
+      !this.supportSabrePartial
+    ) {
       // give up and upload by whole, and directly return
       return await this._writeFileFromRootFull(
         key,
@@ -591,8 +610,16 @@ export class FakeFsWebdav extends FakeFs {
           ctime,
           origKey
         );
-      } else if (this.supportNativePartial) {
+      } else if (this.supportApachePartial) {
-        return await this._writeFileFromRootNativePartial(
+        return await this._writeFileFromRootApachePartial(
+          key,
+          content,
+          mtime,
+          ctime,
+          origKey
+        );
+      } else if (this.supportSabrePartial) {
+        return await this._writeFileFromRootSabrePartial(
           key,
           content,
           mtime,
@@ -608,7 +635,7 @@ export class FakeFsWebdav extends FakeFs {
       console.error(e);
       throw e;
       // this.isNextcloud = false;
-      // this.supportNativePartial = false;
+      // this.supportApachePartial = false;
       // return await this._writeFileFromRootFull(
       //   key,
       //   content,
@@ -676,8 +703,8 @@ export class FakeFsWebdav extends FakeFs {
     console.debug(`tmpFolderName=${tmpFolderName}`);
 
     const clientForUpload = createClient(uploadServerAddress, {
-      username: this.webdavConfig.username,
+      username: tryEncodeUsernamePassword(this.webdavConfig.username),
-      password: this.webdavConfig.password,
+      password: tryEncodeUsernamePassword(this.webdavConfig.password),
       headers: {
         "Cache-Control": "no-cache",
       },
@@ -753,7 +780,7 @@ export class FakeFsWebdav extends FakeFs {
     return k;
   }
 
-  async _writeFileFromRootNativePartial(
+  async _writeFileFromRootApachePartial(
     key: string,
     content: ArrayBuffer,
     mtime: number,
@@ -775,6 +802,8 @@ export class FakeFsWebdav extends FakeFs {
       content.byteLength,
       sizePerChunk
     );
+
+    // TODO: parallel
     for (let i = 0; i < chunkRanges.length; ++i) {
       const { start, end } = chunkRanges[i];
       await this.client.partialUpdateFileContents(
@@ -789,6 +818,47 @@ export class FakeFsWebdav extends FakeFs {
     return await this.stat(origKey);
   }
 
+  async _writeFileFromRootSabrePartial(
+    key: string,
+    content: ArrayBuffer,
+    mtime: number,
+    ctime: number,
+    origKey: string
+  ): Promise<Entity> {
+    // firstly upload a 0-byte data
+    await this._writeFileFromRootFull(
+      key,
+      new ArrayBuffer(0),
+      mtime,
+      ctime,
+      origKey
+    );
+
+    // then "update" by chunks
+    const sizePerChunk = 5 * 1024 * 1024; // 5 mb
+    const chunkRanges = splitFileSizeToChunkRanges(
+      content.byteLength,
+      sizePerChunk
+    );
+
+    // diff from apachePartial: we use "append" header here for dufs...
+    // we cannot parallel here
+    for (let i = 0; i < chunkRanges.length; ++i) {
+      const { start, end } = chunkRanges[i];
+      await this.client.customRequest(key, {
+        method: "PATCH",
+        headers: {
+          "X-Update-Range": "append",
+          "Content-Type": "application/x-sabredav-partialupdate",
+        },
+        data: content.slice(start, end + 1),
+      });
+    }
+
+    // lastly return
+    return await this.stat(origKey);
+  }
+
   async readFile(key: string): Promise<ArrayBuffer> {
     if (key.endsWith("/")) {
       throw Error(`you should not call readFile on ${key}`);
@@ -853,17 +923,15 @@ export class FakeFsWebdav extends FakeFs {
       await this._init();
       const results = await this._statFromRoot(`/${this.remoteBaseDir}/`);
       if (results === undefined) {
-        const err = "results is undefined";
+        throw Error("cannot stat root vault folder!");
-        console.error(err);
-        callbackFunc?.(err);
-        return false;
       }
-      return true;
     } catch (err) {
       console.error(err);
       callbackFunc?.(err);
       return false;
     }
+
+    return await this.checkConnectCommonOps(callbackFunc);
   }
 
   async getUserDisplayName(): Promise<string> {

src/fsWebdis.ts

@@ -117,7 +117,7 @@ export class FakeFsWebdis extends FakeFs {
     let cursor = "0";
     const res: Entity[] = [];
     do {
-      const command = `SCAN/${cursor}/MATCH/rs:fs:v1:*:meta/COUNT/1000`;
+      const command = `SCAN/${cursor}/MATCH/rs:fs:v1:${encodeURIComponent(this.remoteBaseDir + "/")}*:meta/COUNT/1000`;
       const rsp = (await (await this._fetchCommand("GET", command)).json())[
         "SCAN"
       ];
@@ -136,7 +136,7 @@ export class FakeFsWebdis extends FakeFs {
   async walkPartial(): Promise<Entity[]> {
     let cursor = "0";
     const res: Entity[] = [];
-    const command = `SCAN/${cursor}/MATCH/rs:fs:v1:*:meta/COUNT/10`; // fewer keys
+    const command = `SCAN/${cursor}/MATCH/rs:fs:v1:${encodeURIComponent(this.remoteBaseDir + "/")}*:meta/COUNT/10`; // fewer keys
     const rsp = (await (await this._fetchCommand("GET", command)).json())[
       "SCAN"
     ];
@@ -252,12 +252,16 @@ export class FakeFsWebdis extends FakeFs {
       const k = await (
         await this._fetchCommand("GET", "PING/helloworld")
       ).json();
-      return isEqual(k, { PING: "helloworld" });
+      if (!isEqual(k, { PING: "helloworld" })) {
+        throw Error(`no correct ping response`);
+      }
     } catch (err: any) {
       console.error(err);
       callbackFunc?.(err);
       return false;
     }
+    return await this.checkConnectCommonOps(callbackFunc);
+    // return true;
   }
 
   async getUserDisplayName(): Promise<string> {

src/langs/en.json

@@ -149,7 +149,9 @@
   "settings_skiplargefiles_desc": "Skip files with sizes larger than the threshold. Here 1 MB = 10^6 bytes.",
   "settings_skiplargefiles_notset": "(not set)",
   "settings_ignorepaths": "Regex Of Paths To Ignore",
-  "settings_ignorepaths_desc": "Regex of paths of folders or files to ignore. One regex per line. The path is relative to the vault root without leading slash.",
+  "settings_ignorepaths_desc": "Regex of paths of folders or files to ignore. One regex per line. The path is relative to the vault root without leading slash. Non-empty allow paths and non-empty ignore paths are effective together.",
+  "settings_onlyallowpaths": "Regex Of Paths To Allow",
+  "settings_onlyallowpaths_desc": "Regex of paths of folders or files to allow to sync. One regex per line. The path is relative to the vault root without leading slash. If this setting is not empty, all paths you want to sync including config dirs must be explicitly set here. Non-empty allow paths and non-empty ignore paths are effective together.",
   "settings_enablestatusbar_info": "Show Last Successful Sync In Status Bar",
   "settings_enablestatusbar_info_desc": "Show the time of the last successful sync in the status bar.",
   "settings_enablestatusbar_reloadrequired_notice": "Reload the plugin for the changes to take effect.",
@@ -282,6 +284,8 @@
   "settings_syncunderscore_desc": "Sync files or folders starting with _ (\"underscore\") or not",
   "settings_configdir": "Sync Config Dir (experimental)",
   "settings_configdir_desc": "Sync config dir {{configDir}} or not (inner folder .git and node_modules would be ignored). Please be aware that this may impact all your plugins' or Obsidian's settings, and may require you restart Obsidian after sync. Enable this at your own risk.",
+  "settings_bookmarks": "Sync Bookmarks (experimental)",
+  "settings_bookmarks_desc": "Sync {{configDir}}/bookmarks.json or not. If you sync config dir, this option will be ignore and treated as \"enabled\".",
   "settings_deletetowhere": "Deletion Destination",
   "settings_deletetowhere_desc": "Which trash should the plugin put the files into while deleting?",
   "settings_deletetowhere_system_trash": "system trash (default)",

src/langs/zh_cn.json

@@ -148,7 +148,9 @@
   "settings_skiplargefiles_desc": "跳过大于某一个阈值的文件。这里 1 MB = 10^6 bytes。",
   "settings_skiplargefiles_notset": "（不设置）",
   "settings_ignorepaths": "忽略的文件或文件夹的正则表达式",
-  "settings_ignorepaths_desc": "忽略的文件或文件夹的正则表达式。每行一条。路径是相对于库（Vault）根目录的，没有前置 / 符号。",
+  "settings_ignorepaths_desc": "忽略的文件或文件夹的正则表达式。每行一条。路径是相对于库（Vault）根目录的，没有前置 / 符号。非空的忽略列表和非空的允许列表会一起生效。",
+  "settings_onlyallowpaths": "允许同步的文件或文件夹的正则表达式",
+  "settings_onlyallowpaths_desc": "允许同步的文件或文件夹的正则表达式。每行一条。路径是相对于库（Vault）根目录的，没有前置 / 符号。如果这个设置非空，那么所有您想同步的路径（包括隐藏的设置文件夹）都要明确地列出到这里。非空的忽略列表和非空的允许列表会一起生效。",
   "settings_enablestatusbar_info": "在状态栏显示上一次成功的同步",
   "settings_enablestatusbar_info_desc": "在状态栏显示上一次成功的同步的时间。",
   "settings_enablestatusbar_reloadrequired_notice": "需要重新载入此插件才生效。",
@@ -281,6 +283,8 @@
   "settings_syncunderscore_desc": "是否同步“_”（下划线）开始的文件或文件夹。",
   "settings_configdir": "同步配置文件夹（实验性质）",
   "settings_configdir_desc": "是否同步 Obsidian 的配置文件夹 {{configDir}}（其中的 .git 和 node_modules 依然会被忽略）。请注意，此设置可能会影响到您 Obsidian 或者所有的插件设置，也可能需要您同步完毕后重启 Obsidian。如果您同意自行承受其风险，则可以开启本设置。",
+  "settings_bookmarks": "同步书签（实验性质）",
+  "settings_bookmarks_desc": "是否同步书签 {{configDir}}/bookmarks.json 。如果您设置了同步配置文件夹，此选项会被忽略并设为“开启”。",
   "settings_deletetowhere": "删除文件到哪里",
   "settings_deletetowhere_desc": "插件触发删除操作时候，删除到哪里？",
   "settings_deletetowhere_system_trash": "系统回收站（默认）",

src/langs/zh_tw.json

@@ -147,7 +147,9 @@
   "settings_skiplargefiles_desc": "跳過大於某一個閾值的檔案。這裡 1 MB = 10^6 bytes。",
   "settings_skiplargefiles_notset": "（不設定）",
   "settings_ignorepaths": "忽略的檔案或資料夾的正則表示式",
-  "settings_ignorepaths_desc": "忽略的檔案或資料夾的正則表示式。每行一條。路徑是相對於庫（Vault）根目錄的，沒有前置 / 符號。",
+  "settings_ignorepaths_desc": "忽略的檔案或資料夾的正則表示式。每行一條。路徑是相對於庫（Vault）根目錄的，沒有前置 / 符號。非空的忽略列表和非空的允許列表會一起生效。",
+  "settings_onlyallowpaths": "允許同步的檔案或資料夾的正則表示式",
+  "settings_onlyallowpaths_desc": "允許同步的檔案或資料夾的正則表示式。每行一條。路徑是相對於庫（Vault）根目錄的，沒有前置 / 符號。如果這個設定非空，那麼所有您想同步的路徑（包括隱藏的設定資料夾）都要明確地列出到這裡。非空的忽略列表和非空的允許列表會一起生效。",
   "settings_enablestatusbar_info": "在狀態列顯示上一次成功的同步",
   "settings_enablestatusbar_info_desc": "在狀態列顯示上一次成功的同步的時間。",
   "settings_enablestatusbar_reloadrequired_notice": "需要重新載入此外掛才生效。",
@@ -280,6 +282,8 @@
   "settings_syncunderscore_desc": "是否同步“_”（下劃線）開始的檔案或資料夾。",
   "settings_configdir": "同步配置資料夾（實驗性質）",
   "settings_configdir_desc": "是否同步 Obsidian 的配置資料夾 {{configDir}}（其中的 .git 和 node_modules 依然會被忽略）。請注意，此設定可能會影響到您 Obsidian 或者所有的外掛設定，也可能需要您同步完畢後重啟 Obsidian。如果您同意自行承受其風險，則可以開啟本設定。",
+  "settings_bookmarks": "同步書籤（實驗性質）",
+  "settings_bookmarks_desc": "是否同步書籤 {{configDir}}/bookmarks.json 。如果您設定了同步配置資料夾，此選項會被忽略並設為“開啟”。",
   "settings_deletetowhere": "刪除檔案到哪裡",
   "settings_deletetowhere_desc": "外掛觸發刪除操作時候，刪除到哪裡？",
   "settings_deletetowhere_system_trash": "系統回收站（預設）",

src/main.ts

@@ -135,11 +135,13 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
   agreeToUploadExtraMetadata: true, // as of 20240106, it's safe to assume every new user agrees with this
   concurrency: 5,
   syncConfigDir: false,
+  syncBookmarks: false,
   syncUnderscoreItems: false,
   lang: "auto",
   logToDB: false,
   skipSizeLargerThan: -1,
   ignorePaths: [],
+  onlyAllowPaths: [],
   enableStatusBarInfo: true,
   deleteToWhere: "system",
   agreeToUseSyncV3: false,
@@ -239,6 +241,7 @@ export default class RemotelySavePlugin extends Plugin {
     const fsLocal = new FakeFsLocal(
       this.app.vault,
       this.settings.syncConfigDir ?? false,
+      this.settings.syncBookmarks ?? false,
       this.app.vault.configDir,
       this.manifest.id,
       profiler,
@@ -1337,6 +1340,10 @@ export default class RemotelySavePlugin extends Plugin {
       messyConfigToNormal(await this.loadData())
     );
 
+    if (this.settings.syncBookmarks === undefined) {
+      this.settings.syncBookmarks = false;
+    }
+
     if (this.settings.dropbox.clientID === "") {
       this.settings.dropbox.clientID = DEFAULT_SETTINGS.dropbox.clientID;
     }
@@ -1403,6 +1410,9 @@ export default class RemotelySavePlugin extends Plugin {
     if (this.settings.ignorePaths === undefined) {
       this.settings.ignorePaths = [];
     }
+    if (this.settings.onlyAllowPaths === undefined) {
+      this.settings.onlyAllowPaths = [];
+    }
     if (this.settings.enableStatusBarInfo === undefined) {
       this.settings.enableStatusBarInfo = true;
     }
@@ -1879,6 +1889,7 @@ export default class RemotelySavePlugin extends Plugin {
                 const fsLocal = new FakeFsLocal(
                   this.app.vault,
                   this.settings.syncConfigDir ?? false,
+                  this.settings.syncBookmarks ?? false,
                   this.app.vault.configDir,
                   this.manifest.id,
                   undefined,

src/misc.ts

@@ -742,3 +742,110 @@ export const getSha1 = async (x: ArrayBuffer, stringify: "base64" | "hex") => {
   }
   throw Error(`not supported stringify option = ${stringify}`);
 };
+
+/**
+ * https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file#naming-conventions
+ * https://support.microsoft.com/en-us/office/restrictions-and-limitations-in-onedrive-and-sharepoint-64883a5d-228e-48f5-b3d2-eb39e07630fa#invalidcharacters
+ */
+export const checkValidName = (x: string) => {
+  if (x === undefined || x === "") {
+    // what??
+    return {
+      reason: "empty",
+      result: false,
+    };
+  }
+
+  // The following reserved characters:
+  const invalidChars = '*"<>:|?'.split("");
+  for (const c of invalidChars) {
+    if (x.includes(c)) {
+      return {
+        reason: `reserved character: ${c}`,
+        result: false,
+      };
+    }
+  }
+
+  // directory component
+  for (const c of [".", ".."]) {
+    if (
+      x === c ||
+      x.endsWith(`/${c}`) ||
+      x.startsWith(`${c}/`) ||
+      x.includes(`/${c}/`)
+    ) {
+      return {
+        reason: `directory being ${c}`,
+        result: false,
+      };
+    }
+  }
+
+  // reserved file names
+  const reservedNames = [
+    "CON",
+    "PRN",
+    "AUX",
+    "NUL",
+    "COM0",
+    "COM1",
+    "COM2",
+    "COM3",
+    "COM4",
+    "COM5",
+    "COM6",
+    "COM7",
+    "COM8",
+    "COM9",
+    "COM¹",
+    "COM²",
+    "COM³",
+    "LPT0",
+    "LPT1",
+    "LPT2",
+    "LPT3",
+    "LPT4",
+    "LPT5",
+    "LPT6",
+    "LPT7",
+    "LPT8",
+    "LPT9",
+    "LPT¹",
+    "LPT²",
+    "LPT³",
+  ];
+  for (const f of reservedNames) {
+    if (
+      x === f ||
+      x.startsWith(`${f}.`) ||
+      x.startsWith(`${f}/`) ||
+      x.includes(`/${f}/`) ||
+      x.endsWith(`/${f}`) ||
+      x.includes(`/${f}.`)
+    ) {
+      return {
+        reason: `reserved folder/file name: ${f}`,
+        result: false,
+      };
+    }
+  }
+
+  // Do not end a file or directory name with a space or a period.
+  if (
+    x.endsWith(" ") ||
+    x.endsWith(".") ||
+    x.includes(" /") ||
+    x.includes("./")
+  ) {
+    return {
+      reason: `folder/file name ending with a space or a period`,
+      result: false,
+    };
+  }
+
+  return {
+    reason: "ok",
+    result: true,
+  };
+};

src/obsFolderLister.ts

@@ -34,11 +34,15 @@ const isLikelyPluginSubFiles = (x: string) => {
 export const listFilesInObsFolder = async (
   configDir: string,
   vault: Vault,
-  pluginId: string
+  pluginId: string,
+  bookmarksOnly: boolean
 ): Promise<Entity[]> => {
   const q = new Queue([configDir]);
   const CHUNK_SIZE = 10;
-  const contents: Entity[] = [];
+  let contents: Entity[] = [];
+
+  let iterRound = 0;
+
   while (q.length > 0) {
     const itemsToFetch: string[] = [];
     while (q.length > 0) {
@@ -115,6 +119,23 @@ export const listFilesInObsFolder = async (
         }
       }
     }
+
+    if (bookmarksOnly && iterRound > 1) {
+      // list until bookmarks.json is found or next level is arrived.
+      break;
     }
+
+    iterRound += 1;
+  }
+
+  // console.debug(`contents in obs config: ${JSON.stringify(contents)}`);
+
+  if (bookmarksOnly) {
+    contents = contents.filter(
+      (e) =>
+        e.key === `${configDir}/` || e.key === `${configDir}/bookmarks.json`
+    );
+  }
+
   return contents;
 };

src/settings.ts

@@ -2247,6 +2247,27 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
         textArea.inputEl.addClass("ignorepaths-textarea");
       });
 
+    new Setting(basicDiv)
+      .setName(t("settings_onlyallowpaths"))
+      .setDesc(t("settings_onlyallowpaths_desc"))
+      .setClass("onlyallowpaths-settings")
+
+      .addTextArea((textArea) => {
+        textArea
+          .setValue(`${(this.plugin.settings.onlyAllowPaths ?? []).join("\n")}`)
+          .onChange(async (value) => {
+            this.plugin.settings.onlyAllowPaths = value
+              .trim()
+              .split("\n")
+              .filter((x) => x.trim() !== "");
+            await this.plugin.saveSettings();
+          });
+        textArea.inputEl.rows = 10;
+        textArea.inputEl.cols = 30;
+
+        textArea.inputEl.addClass("onlyallowpaths-textarea");
+      });
+
     //////////////////////////////////////////////////
     // below for advanced settings
     //////////////////////////////////////////////////
@@ -2325,6 +2346,27 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
           });
       });
 
+    new Setting(advDiv)
+      .setName(t("settings_bookmarks"))
+      .setDesc(
+        t("settings_bookmarks_desc", {
+          configDir: this.app.vault.configDir,
+        })
+      )
+      .addDropdown((dropdown) => {
+        dropdown.addOption("disable", t("disable"));
+        dropdown.addOption("enable", t("enable"));
+
+        dropdown
+          .setValue(
+            `${this.plugin.settings.syncBookmarks ? "enable" : "disable"}`
+          )
+          .onChange(async (val) => {
+            this.plugin.settings.syncBookmarks = val === "enable";
+            await this.plugin.saveSettings();
+          });
+      });
+
     new Setting(advDiv)
       .setName(t("settings_deletetowhere"))
       .setDesc(t("settings_deletetowhere_desc"))

styles.css

@@ -214,6 +214,10 @@
   font-family: monospace;
 }
 
+.onlyallowpaths-textarea {
+  font-family: monospace;
+}
+
 .logtohttpserver-warning {
   color: red;
   font-weight: bolder;

tests/misc.test.ts

@@ -363,6 +363,82 @@ describe("Misc: split chunk ranges", () => {
   });
 });
 
+describe("Misc: check valid file names", () => {
+  it("should be ok for normal file nmes", () => {
+    let item = "what/.hidden/what/what/what";
+    assert.ok(misc.checkValidName(item).result);
+
+    item = "ssss/%%%^^^$xxxx.md";
+    assert.ok(misc.checkValidName(item).result);
+  });
+
+  it("should be not ok for reserved characters", () => {
+    let item = "a**";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "a?*";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "<>:";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "<>:/ssss";
+    assert.ok(!misc.checkValidName(item).result);
+  });
+
+  it("should be not ok for reserved names", () => {
+    let item = "CON";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "CON.txt";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "CON.md";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "con"; // lower case is ok
+    assert.ok(misc.checkValidName(item).result);
+
+    item = "CON/";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "CON.dir/";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "CON.dir.folder/";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "xxx/CON";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "xxx/CON.txt";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "xxx/CON.txt.md";
+    assert.ok(!misc.checkValidName(item).result);
+  });
+
+  it("should be not ok for invalid endings", () => {
+    let item = "xxx ";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "/xxx ";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "xxx.yyy.";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "xxx.yyy.";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "xxx /";
+    assert.ok(!misc.checkValidName(item).result);
+
+    item = "xxx.yyy./";
+    assert.ok(!misc.checkValidName(item).result);
+  });
+});
+
 describe("Misc: Dropbox: should fix the folder name cases", () => {
   it("should do nothing on empty folders", () => {
     const input: any[] = [];