bump to 0.5.11

Fixed typos

.env.example.txt

@@ -11,3 +11,5 @@ PCLOUD_CLIENT_ID=
 PCLOUD_CLIENT_SECRET=
 YANDEXDISK_CLIENT_ID=
 YANDEXDISK_CLIENT_SECRET=
+KOOFR_CLIENT_ID=
+KOOFR_CLIENT_SECRET=

.github/workflows/auto-build.yml

@@ -29,6 +29,8 @@ jobs:
       PCLOUD_CLIENT_SECRET: ${{secrets.PCLOUD_CLIENT_SECRET}}
       YANDEXDISK_CLIENT_ID: ${{secrets.YANDEXDISK_CLIENT_ID}}
       YANDEXDISK_CLIENT_SECRET: ${{secrets.YANDEXDISK_CLIENT_SECRET}}
+      KOOFR_CLIENT_ID: ${{secrets.KOOFR_CLIENT_ID}}
+      KOOFR_CLIENT_SECRET: ${{secrets.KOOFR_CLIENT_SECRET}}
 
     strategy:
       matrix:

.github/workflows/release.yml

@@ -33,6 +33,8 @@ jobs:
       PCLOUD_CLIENT_SECRET: ${{secrets.PCLOUD_CLIENT_SECRET}}
       YANDEXDISK_CLIENT_ID: ${{secrets.YANDEXDISK_CLIENT_ID}}
       YANDEXDISK_CLIENT_SECRET: ${{secrets.YANDEXDISK_CLIENT_SECRET}}
+      KOOFR_CLIENT_ID: ${{secrets.KOOFR_CLIENT_ID}}
+      KOOFR_CLIENT_SECRET: ${{secrets.KOOFR_CLIENT_SECRET}}
 
     strategy:
       matrix:

README.md

@@ -19,13 +19,16 @@ This is yet another unofficial sync plugin for Obsidian. If you like it or find
 - Supports:
   - Amazon S3 or S3-compatible (Cloudflare R2 / BackBlaze B2 / MinIO / ...)
   - Dropbox
-  - OneDrive for personal
+  - OneDrive for personal (App Folder)
+  - OneDrive for personal (Full) (PRO feature)
   - Webdav (NextCloud / InfiniCloud / Synology webdav server / ...)
   - Webdis
-  - Google Drive (PRO feature)
+  - Google Drive (GDrive) (PRO feature)
   - Box (PRO feature)
   - pCloud (PRO feature)
   - Yandex Disk (PRO feature)
+  - Koofr (PRO feature)
+  - 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.
@@ -33,7 +36,7 @@ This is yet another unofficial sync plugin for Obsidian. If you like it or find
 - **[Minimal Intrusive](./docs/minimal_intrusive_design.md).**
 - **Skip Large files** and **skip paths** by custom regex conditions!
 - **[Sync Algorithm](./docs/sync_algorithm/v3/intro.md) is provided for discussion.**
-- **[Basic Conflict Detection And Handling](./docs/sync_algorithm/v3/intro.md)** for free version. **[Advanced Conflict Handling](./pro/README.md)** for PRO version. 
+- **[Basic Conflict Detection And Handling](./docs/sync_algorithm/v3/intro.md)** for free version. **[Advanced Smart Conflict Handling](./pro/README.md)** for PRO version. 
 - Source Available. See [License](./LICENSE) for details.
 
 ## Limitations
@@ -91,11 +94,11 @@ Additionally, the plugin author may occasionally visit Obsidian official forum a
 - Password-based end-to-end encryption is also supported. But please be aware that **the vault name itself is not encrypted**.
 - If you want to sync the files across multiple devices, **your vault name should be the same** while using default settings.
 
-### OneDrive for personal
+### OneDrive for personal (App Folder)
 
 - **This plugin is NOT an official Microsoft / OneDrive product.** The plugin just uses Microsoft's [OneDrive's public API](https://docs.microsoft.com/en-us/onedrive/developer/rest-api).
 - This plugin only works for "OneDrive for personal", and not works for "OneDrive for Business" (yet). See [#11](https://github.com/fyears/remotely-save/issues/11) to further details.
-- After the authorization, the plugin can read your name and email, and read and write files in your OneDrive's `/Apps/remotely-save` folder.
+- After the authorization, the plugin can read your name and email, and read and write files in your OneDrive's `/Apps/remotely-save` folder. **The free version of Remotely Save only connects to App Folder, while the PRO version can connect to the root folder in Onedrive. See below PRO part.** 
 - If you decide to authorize this plugin to connect to OneDrive, please go to plugin's settings, and choose OneDrive then follow the instructions.
 - Password-based end-to-end encryption is also supported. But please be aware that **the vault name itself is not encrypted**.
 - If you want to sync the files across multiple devices, **your vault name should be the same** while using default settings.
@@ -111,6 +114,9 @@ Additionally, the plugin author may occasionally visit Obsidian official forum a
   - [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)
   - [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)
 - Very old version of Obsidian needs [configuring CORS](./docs/remote_services/webdav_general/webav_cors.md).
 - Your data would be synced to a `${vaultName}` sub folder on your webdav server.
 - Password-based end-to-end encryption is also supported. But please be aware that **the vault name itself is not encrypted**.
@@ -123,7 +129,11 @@ Additionally, the plugin author may occasionally visit Obsidian official forum a
 - Mostly experimental.
 - You have to setup and protect your web server by yourself.
 
-### Google Drive (PRO feature)
+### Onedrive (Full access) (PRO feature)
+
+PRO (paid) feature "sync with Onedrive (Full)" allows users to to sync with Onedrive root folder. Tutorials and limitations are documented [here](./docs/remote_services/onedrivefull/README.md).
+
+### Google Drive (GDrive) (PRO feature)
 
 PRO (paid) feature "sync with Google Drive" allows users to to sync with Google Drive. Tutorials and limitations are documented [here](./docs/remote_services/googledrive/README.md).
 
@@ -139,12 +149,33 @@ PRO (paid) feature "sync with pCloud" allows users to to sync with pCloud (using
 
 PRO (paid) feature "sync with Yandex Disk" allows users to to sync with Yandex Disk (using its native API instead of webdav). Tutorials and limitations are documented [here](./docs/remote_services/yandexdisk/README.md).
 
+### Koofr (PRO feature)
+
+PRO (paid) feature "sync with Koofr" allows users to to sync with Koofr (using its native API instead of webdav). Tutorials and limitations are documented [here](./docs/remote_services/koofr/README.md).
+
+### Azure Blob Storage (PRO feature)
+
+PRO (paid) feature "sync with Azure Blob Storage" allows users to to sync with Azure Blob Storage. Tutorials and limitations are documented [here](./docs/remote_services/azureblobstorage/README.md).
+
+## Smart Conflict (PRO feature)
+
+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.
+
+See documents [here](./docs/pro/README.md)
+
 ## Scheduled Auto Sync
 
 - You can configure auto syncing every N minutes in settings.
 - In auto sync mode, if any error occurs, the plugin would **fail silently**.
 - Auto sync only works when Obsidian is being opened. It's **technically impossible** to auto sync while Obsidian is in background, because the plugin just works in the browser environment provided by Obsidian.
 
+## Sync On Save
+
+- 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
 
 **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.

docs/pro/README.md

@@ -44,10 +44,10 @@ You need to connect your plugin to your online account. In Obsidian, in your Rem
 
 ## Why so complicated?
 
-Because we doesn't have payment method inside the plugin, so we have to:
+Because we don't have a payment method inside the plugin, so we have to:
 
 * build a website, 
 * require users having online accounts
 * and connect the plugin to the online account.
 
-Moreover, an online account allows flexibe management of subscriptions. 
+Moreover, an online account allows flexible management of subscriptions. 

docs/remote_services/azureblobstorage/README.md

@@ -0,0 +1,107 @@
+# Azure Blob Storage (GDrive) (PRO)
+
+# Intro
+
+* It's a PRO feature of Remotely Save plugin.
+* **This plugin is NOT an official Microsoft / Azure product, and just uses Azure Blob Storage's public api.**
+
+# Disclaimer
+
+I (author of Remotely Save) is **NOT** an expert of Azure products. The tutorials here are for references only. Azure products are very complex.
+
+***As far as the law allows, the software (Remotely Save) comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.***
+
+# Steps
+
+Please read through the following steps before you actually connect.
+
+## Preparation In Azure Blob Storage Side
+
+You only need to do this **once**, before the Container SAS Url expires in the future.
+
+In short, you need to: configure CORS and configure a policy and cobtain a Container SAS Url.
+
+1. Connect to the service:
+    
+    Download Microsoft's free [Azure Storage Explorer](https://azure.microsoft.com/en-us/products/storage/storage-explorer). The following tutorial uses this app. Actually you may be able to find the same settings on Azure official website.
+    
+    Use this app to connect to your Blob Storage service or account.
+    
+2. CORS:
+    
+    Right click on `Blob containers`, click "configure CORS". Add a rule, enter the following and save:
+    ```
+    Allowed Origins: *
+    Allowed Methods: DELETE,GET,HEAD,MERGE,POST,PATCH,OPTIONS,PUT
+    Allowed Headers: x-ms-*, content-type
+    Exposed Headers: x-ms-*, content-type
+    Max Age (in seconds): 5
+    ```
+
+    ![CORS screenshot](./azure_cors.png)
+
+3. Create the container:  
+    
+    Create the container if you don't have one. In this tutorial, we use `example-container`.
+
+    ![container screenshot](./azure_example_container.png)
+
+4. Generate a policy:
+    
+    * Right click on you container, click "Manage Stored Access Policies". 
+    * Choose your id, for example `example-container-0000001`.
+    * Change to Expiry time to an appropriate date. **By default it is only valid for a week.** After its expiration, you need come back and adjust the expiry date again! In this tutorial, we set it to a year.
+    * And allow these methods: Read, Add, Create, Write, Delete, List.
+    * Save
+   
+    Read Microsoft's official [doc](https://learn.microsoft.com/en-us/rest/api/storageservices/define-stored-access-policy) for more info. The main benefit of generating an access policy is easier revocation of SAS Url if anything goes bad. 
+
+    ![Manage Stored Access Policies screenshot](./azure_policy_1.png)
+    ![Add Policy screenshot](./azure_policy_3.png)
+
+5. Generate a Container SAS Url:
+
+    Then we want to create a container level SAS (shared access signature) url.
+
+    * Right click on you container, click "Get Shared Access Signature". 
+    * In access policy, choose the previous one you created: for example `example-container-0000001`.
+    * Save the setting
+    * You will see a url is generated, which starts with `https://` or `http://`. It should looks like `https://<account>.blob.core.windows.net/<container name>?sv=...&sig=...`
+    * Save the Container SAS Url somewhere, and you will need this later.
+
+    Read Microsoft's official [doc](https://learn.microsoft.com/en-us/azure/storage/common/storage-sas-overview) for more info.
+
+    ![Container SAS Url screenshot 1](./azure_sas_1.png)
+    ![Container SAS Url screenshot 2](./azure_sas_2.png)
+    
+### Why so complicated in Azure settings?
+
+Because Azure Blob Storage's api has some limitation in browser environment, so we need to configure CORS and SAS. Because we want to revoke the SAS when needed, we need to use a policy.
+
+### Revocation
+
+If you suspect someone read the resource unexpectedly, you can revoke the SAS by changing the name or expiry date of the policy. And generate the SAS Url again.
+
+## Steps of Remotely Save subscription
+
+1. Please sign up and sign in an online account, connect your plugin to your online account firstly. See [the PRO tutorial](../../pro/README.md) firstly.
+2. Subscribe to "sync with Azure Blob Storage" feature online.
+3. Go back to your Remotely Save plugin inside Obsidian, click "Check again" button in PRO settings. So that the plugin knows some features are enabled. In this case, sync with Azure Blob Storage should be detected.
+
+## Steps of Connecting to your Azure Blob Storage
+
+After you enabled the PRO feature in your Remotely Save plugin, **and prepared the Container SAS Url**, you can connect to your Azure Blob Storage account now.
+
+1. In Remotely Save settings, change your sync service to Azure Blob Storage.
+2. Input your Container SAS Url
+3. Input your container name.
+4. By default, the plugin will save your vault remotely with a prefix `<your vault name>/`. You can change the prefix. No prefix is not allowed.
+5. Check the connection. A notice will tell you that you've connected or not.
+7. Sync! The plugin will upload the fils and "folders" of your vault into your Azure Blob Storage with the preix.
+8. **Read the caveats below.**
+
+![RS setting screenshot](./azure_rs_setting.png)
+
+# The caveats
+
+* As of June 2024, this feature is in alpha stage. **Back up your vault before using this feature.**

docs/remote_services/azureblobstorage/azure_cors.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83caba9a42772f995035e3c879c6119eabcd6d3c27298cf0fb067b3676680571
+size 107057

docs/remote_services/azureblobstorage/azure_example_container.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef2d525d3ac7ecca26f7f8b6782fb1056d54f8c558a8d77586571defb7e6b5be
+size 41282

docs/remote_services/azureblobstorage/azure_policy_1.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cba5bf27e76eaf8ea21e51e43172501fc4867539c90c1758a02945477dc261ea
+size 132487

docs/remote_services/azureblobstorage/azure_policy_3.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b2add8a559eab0b7073f7ed52d4a3e4efae68b499c7b924d1ac50278758961b
+size 193894

docs/remote_services/azureblobstorage/azure_rs_setting.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:582a69a7aee2cfab72dc14324e4a864acab92c145d533e799f8ceea61a8f0102
+size 478941

docs/remote_services/azureblobstorage/azure_sas_1.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbb8863d98d8826739b5bf9fa4c7a2de3ba49fde4bbe3c4988a877ba74f89abd
+size 143007

docs/remote_services/azureblobstorage/azure_sas_2.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ddc30f97d75d7c3a6061cbb30cc991cbdf1f4039aad3547ef88998c3dd9be666
+size 132904

docs/remote_services/googledrive/README.md

@@ -1,4 +1,4 @@
-# Google Drive (PRO)
+# Google Drive (GDrive) (PRO)
 
 # Intro
 

docs/remote_services/koofr/README.md

@@ -0,0 +1,38 @@
+# Koofr (PRO)
+
+# Links
+
+<https://koofr.eu/>
+
+# Intro
+
+* It's a PRO feature of Remotely Save plugin.
+* **This plugin is NOT an official Koofr product, and just uses Koofr's public api.**
+
+# Steps
+
+## Steps of Remotely Save subscription
+
+1. Please sign up and sign in an online account, connect your plugin to your online account firstly. See [the PRO tutorial](../../pro/README.md) firstly.
+2. Subscribe to "sync with Koofr" feature online.
+3. Go back to your Remotely Save plugin inside Obsidian, click "Check again" button in PRO settings. So that the plugin knows some features are enabled. In this case, sync with Koofr should be detected.
+
+## Steps of Connecting to your Koofr
+
+After you enabled the PRO feature in your Remotely Save plugin, you can connect to your Koofr account now.
+
+1. In Remotely Save settings, change your sync service to Koofr.
+2. Click Auth, visit the link, go to Koofr website to start.
+3. Follow the instruction on Koofr, and allow Remotely Save to connect.
+4. You will be redirected back to Remotely Save plugin.
+5. A notice will tell you that you've connected or not.
+6. Sync! The plugin will create a vault folder in the root of your Koofr and upload notes into that folder.
+7. **Read the caveats below.**
+
+# The caveats
+
+* As of June 2024, this feature is in beta stage. **Back up your vault before using this feature.**
+
+# Why not use webdav?
+
+The Remotely Save PRO feture "sync with Koofr" is developed using Koofr's native API, instead of webdav interface. It brings benefits such that the last modified time can be preserved.

docs/remote_services/onedrive/README.md

@@ -1,7 +1,7 @@
-# OneDrive
+# OneDrive (App Folder)
 
 - **This plugin is NOT an official Microsoft / OneDrive product.** The plugin just uses Microsoft's [OneDrive's public API](https://docs.microsoft.com/en-us/onedrive/developer/rest-api).
-- After the authorization, the plugin can read your name and email, and read and write files in your OneDrive's `/Apps/remotely-save` folder.
+- After the authorization, the plugin can read your name and email, and read and write files in your OneDrive's `/Apps/remotely-save` folder.**The free version of Remotely Save only connects to App Folder, while the PRO version can connect to the root folder in Onedrive.** 
 - If you decide to authorize this plugin to connect to OneDrive, please go to plugin's settings, and choose OneDrive then follow the instructions.
 - Password-based end-to-end encryption is also supported. But please be aware that **the vault name itself is not encrypted**.
 - If you want to sync the files across multiple devices, **your vault name should be the same** while using default settings.
@@ -21,3 +21,11 @@ The solution is simple:
 1. Backup your vault manually.
 2. Go to onedrive website (<https://onedrive.live.com/>), and rename `/Application/Graph` to `/Application/remotely-save` (right click on the folder and you will see rename option)
 3. Come back to Obsidian and try to sync!
+
+### Empty file is not uploaded
+
+Onedrive's API does not allow uploading empty files. You can choose to skip them or raise errors in Remotely Save plugin's settings.
+
+### How to connect to root folder rather than the App Folder?
+
+As of June 2024, this is a new PRO feature. See the [doc](../onedrivefull/README.md).

docs/remote_services/onedrivefull/README.md

@@ -0,0 +1,42 @@
+# Onedrive (Full) (PRO)
+
+# Intro
+
+* It's a PRO feature of Remotely Save plugin.
+* **This plugin is NOT an official Microsoft / Onedrive product, and just uses Onedrive's public api.**
+* This still only applies to Onedrive for personal. The dev team doesn't have Onedrive for business account to develop and test on it.
+
+# Steps
+
+## Steps of Remotely Save subscription
+
+1. Please sign up and sign in an online account, connect your plugin to your online account firstly. See [the PRO tutorial](../../pro/README.md) firstly.
+2. Subscribe to "sync with Onedrive (Full)" feature online.
+3. Go back to your Remotely Save plugin inside Obsidian, click "Check again" button in PRO settings. So that the plugin knows some features are enabled. In this case, sync with Onedrive (Full) should be detected.
+
+## Steps of Connecting to your Onedrive
+
+After you enabled the PRO feature in your Remotely Save plugin, you can connect to your Onedrive account now.
+
+1. In Remotely Save settings, change your sync service to Onedrive (Full).
+2. Click Auth, visit the link, go to Onedrive website to start.
+3. Follow the instruction on Onedrive, and allow Remotely Save to connect.
+4. You will be redirected back to Remotely Save plugin.
+5. A notice will tell you that you've connected or not.
+6. Sync! The plugin will create a vault folder **in the root** of your Onedrive and upload notes into that folder.
+7. **Read the caveats below.**
+
+# The caveats
+
+* As of June 2024, this feature is in beta stage. 
+    * **Back up your vault before using this feature.**
+    * **Back up everything in your Onedrive (besides the sync sub folder) before using this feature!**
+* Onedrive's API does not allow uploading empty files. You can choose to skip them or raise errors in Remotely Save plugin's settings.
+
+# What's the difference of Onedrive (App Folder) and Onedrive (Full)?
+
+Due to history reasons, Remotely Save only supported uploading to App Folder back to year 2021. Because that greatly ensured the security and ensure not messing up with others files.
+
+However, repeatedly some users want to sync to arbitrary root folder rather than `/Apps/remotely-save/` folder. Thus as of June 2024, the new PRO feature is finally developed.
+
+As of June 2024, connecting to Onedrive (App Folder) is free, but connecting to Onedrive (Full) is a PRO feature.

docs/remote_services/webdav_apache/README.md

@@ -0,0 +1,62 @@
+# Apache Webdav 
+
+The following tutorial uses Apache with Docker in Linux, using the image [`bytemark/webdav`](https://hub.docker.com/r/bytemark/webdav/).
+
+You can also checkout the official doc from Bytemark [here](https://docs.bytemark.co.uk/article/run-your-own-webdav-server-with-docker/). The tutorial you are reading here is a little different from Bytemark's article.
+
+Assuming you want a webdav server on Linux satisfying that:
+
+1. Data is saved in your host machine's `./dav1` folder,
+2. WebDAV is accessed by a user `user1` with password `password1`,
+3. WebDAV is accessed on the host machine and port 8080: `127.0.0.1:8080`.
+4. Use Basic auth type.
+
+Install docker nd set its permission properly. Then run this in terminal:
+
+```bash
+mkdir ./dav1 # create the local folder
+
+docker container run --rm \
+  -p 127.0.0.1:8080:80 \
+  -v ./dav1:/var/lib/dav \
+  -e USERNAME=user1 \
+  -e PASSWORD=password1 \
+  -e AUTH_TYPE=Basic \
+  bytemark/webdav
+```
+
+We do not have `--detach` prameter here, so the server will be closed as soon as you terminate the program or close terminal. You might want to adjust the settings further by yourself.
+
+Then, in Remotely Save's setting, set these (auth type should always be `Basic`):
+
+```
+Server: http://127.0.0.1:8080
+User: user1
+Password: password1
+Auth Type: Basic
+Depth Header Sent To Servers: only supports depth='1'
+```
+
+![Apache RS Setting](./apache_rs_settings.png)
+
+Then the server should be connected! You can sync now!
+
+In you host machine's file system, you should find some files and folders were added into the folder `./dav1`.
+
+```
+ls ./dav1/
+## data  DavLock  DavLock.dir  DavLock.pag
+
+ls ./dav1/data/
+## <your vault name or your base dir>
+```
+
+# Auth type
+
+You can change the auth type while calling Docker, between `Basic` and `Digest`. And please rememberto adjust the Remotely Save's settings. Both works.
+
+# Notice
+
+1. **Never expose your webdav server to public networks without protections or without strong passwords!**
+2. I personally recommend using tailscale to build a LAN instead of expoing the service to public.
+3. If you want to connect to the server from iOS (iPhone / iPad), the https is required. I personally recommend using caddy as the reverse proxy. Caddy can also be combined with tailscale. 

docs/remote_services/webdav_apache/apache_rs_settings.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:264e50d3adaeb4fc4e76b00273459d7d021f1b44af7f07b00a5c40741e65194d
+size 658482

docs/remote_services/webdav_nginx/README.md

@@ -0,0 +1,51 @@
+# Nginx Webdav 
+
+The following tutorial uses Nginx with Docker in Linux, using the image [docker-nginx-webdav-nononsense](https://github.com/dgraziotin/docker-nginx-webdav-nononsense). It contains `ngx_http_dav_module` and `nginx-dav-ext-module`.
+
+The description is adapted from the pull request [`dgraziotin/docker-nginx-webdav-nononsense#123`](https://github.com/dgraziotin/docker-nginx-webdav-nononsense/pull/123) by Remotely Save author.
+
+Assuming you want a webdav server on Linux satisfying that:
+
+1. Data is saved in your host machine's `./dav1` folder,
+2. WebDAV is accessed by a user `user1` with password `password1`,
+3. WebDAV is accessed on the host machine and port 8080: `127.0.0.1:8080`.
+4. (Only Basic auth type is supported.)
+
+Install docker nd set its permission properly. Then run this in terminal:
+
+```bash
+mkdir ./dav1 # create the local folder
+
+docker container run --rm \
+  -p 127.0.0.1:8080:80 \
+  -v ./dav1:/data \
+  -e WEBDAV_USERNAME=user1 \
+  -e WEBDAV_PASSWORD=password1 \
+  -e PUID=1000 \
+  -e PGID=1000 \
+  dgraziotin/nginx-webdav-nononsense
+```
+
+We do not have `--detach` prameter here, so the server will be closed as soon as you terminate the program or close terminal. You might want to adjust the settings further by yourself.
+
+Then, in Remotely Save's setting, set these (auth type should always be `Basic`):
+
+```
+Server: http://127.0.0.1:8080
+User: user1
+Password: password1
+Auth Type: Basic
+Depth Header Sent To Servers: only supports depth='1'
+```
+
+![Nginx RS Setting](./nginx_rs_setting.png)
+
+Then the server should be connected! You can sync now!
+
+In you host machine's file system, you should find some files and folders were added into the folder `./dav1`.
+
+# Notice
+
+1. **Never expose your webdav server to public networks without protections or without strong passwords!**
+2. I personally recommend using tailscale to build a LAN instead of expoing the service to public.
+3. If you want to connect to the server from iOS (iPhone / iPad), the https is required. I personally recommend using caddy as the reverse proxy. Caddy can also be combined with tailscale. 

docs/remote_services/webdav_nginx/nginx_rs_setting.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92059e0819d25640a02d2494ba9da0bfa7a69003cdba36ced985bed9e29b0354
+size 254978

docs/remote_services/webdav_openmediavault/README.md

@@ -0,0 +1,21 @@
+# Open Media Vault WebDAV
+
+## Link 
+https://www.openmediavault.org
+
+## Steps
+
+1. In Open Media Vault's UI, install the WebDAV plugin:
+   * System → Plugins → openmediavault-webdav
+2. Create a new Shared Folder
+   * Storage → Shared Folders → Create
+3. Enable WebDAV server
+   * Services → WedDAV → Enable → Select previously created Shared Folder
+4. Make sure Group is "webdav-users"
+5. Add {your username} to "webdav-users" group
+   * Users → Groups → webdav-users → Edit → Members
+6. Set folder permissions
+   * Storage → Shared Folders select the corresponding shared folder → Permissions → Set both {your username} and "webdav-users" group to "Read/Write" permissions
+7. Back to Shared Folders, set specific Access Control List permissions
+   * Select the shared folder → Access Control List → set {your username}, "webdav-users" and "www-data" to "Read/Write" permissions
+8. Install Remotely Save in Obsidian, select WebDAV, add the URL http://[your-server-ip]/webdav, use your user credentials and connect.

docs/services_connectable_or_not.md

@@ -17,6 +17,7 @@ The list is for information purposes only.
 | [filebase](https://filebase.com/) | Yes | Yes | | |
 | QingStor 青云 | ? | ? | | |
 | [MinIO](https://min.io/) | Yes | Yes | | |
+| Azure Blob Storage | Yes (PRO) | | | Yes (PRO) |
 | [WsgiDAV](https://github.com/mar10/wsgidav) | Yes | | Yes | |
 | [Nginx `ngx_http_dav_module`](http://nginx.org/en/docs/http/ngx_http_dav_module.html) | Yes | | Yes | |
 | NextCloud | Yes | | Yes | |

docs/sync_algorithm/v3/design.md

@@ -52,7 +52,7 @@ Bidirectional:
 | local deleted   | (04) delete remote | (05) pull                 | (01) clean history | (03) pull                 |
 | local created   | (??) conflict      | (??) conflict             | (06) push          | (11/12/13/14/15) conflict |
 
-Incremental push only:
+Incremental push:
 
 | local\remote    | remote unchanged             | remote modified              | remote deleted         | remote created               |
 | --------------- | ---------------------------- | ---------------------------- | ---------------------- | ---------------------------- |
@@ -61,7 +61,7 @@ Incremental push only:
 | local deleted   | **(29) conflict do nothing** | **(30) conflict do nothing** | (01) clean history     | **(28) conflict do nothing** |
 | local created   | (??) conflict                | (??) conflict                | (06) push              | **(23) conflict push**       |
 
-Incremental pull only:
+Incremental pull:
 
 | local\remote    | remote unchanged       | remote modified        | remote deleted               | remote created         |
 | --------------- | ---------------------- | ---------------------- | ---------------------------- | ---------------------- |
@@ -69,3 +69,21 @@ Incremental pull only:
 | local modified  | **(27) conflict pull** | **(24) conflict pull** | **(34) conflict do nothing** | (??) conflict          |
 | local deleted   | **(35) conflict pull** | (05) pull              | (01) clean history           | (03) pull              |
 | local created   | (??) conflict          | (??) conflict          | **(31) conflict do nothing** | **(22) conflict pull** |
+
+Incremental push and delete (diff decisionBranch: 38):
+
+| local\remote    | remote unchanged             | remote modified              | remote deleted         | remote created               |
+| --------------- | ---------------------------- | ---------------------------- | ---------------------- | ---------------------------- |
+| local unchanged | (02/21) do nothing           | **(26) conflict push**       | **(32) conflict push** | (??) conflict                |
+| local modified  | (10) push                    | **(25) conflict push**       | (08) push              | (??) conflict                |
+| local deleted   | **(38) delete remote**       | **(30) conflict do nothing** | (01) clean history     | **(28) conflict do nothing** |
+| local created   | (??) conflict                | (??) conflict                | (06) push              | **(23) conflict push**       |
+
+Incremental pull and delete (diff decisionBranch: 39):
+
+| local\remote    | remote unchanged       | remote modified        | remote deleted               | remote created         |
+| --------------- | ---------------------- | ---------------------- | ---------------------------- | ---------------------- |
+| local unchanged | (02/21) do nothing     | (09) pull              | **(39) delete local**        | (??) conflict          |
+| local modified  | **(27) conflict pull** | **(24) conflict pull** | **(34) conflict do nothing** | (??) conflict          |
+| local deleted   | **(35) conflict pull** | (05) pull              | (01) clean history           | (03) pull              |
+| local created   | (??) conflict          | (??) conflict          | **(31) conflict do nothing** | **(22) conflict pull** |

esbuild.config.mjs

@@ -29,6 +29,8 @@ const DEFAULT_PCLOUD_CLIENT_SECRET = process.env.PCLOUD_CLIENT_SECRET || "";
 const DEFAULT_YANDEXDISK_CLIENT_ID = process.env.YANDEXDISK_CLIENT_ID || "";
 const DEFAULT_YANDEXDISK_CLIENT_SECRET =
   process.env.YANDEXDISK_CLIENT_SECRET || "";
+const DEFAULT_KOOFR_CLIENT_ID = process.env.KOOFR_CLIENT_ID || "";
+const DEFAULT_KOOFR_CLIENT_SECRET = process.env.KOOFR_CLIENT_SECRET || "";
 
 esbuild
   .context({
@@ -49,6 +51,7 @@ esbuild
       "http",
       "https",
       "vm",
+      // "process",
       // ...builtins
     ],
     inject: ["./esbuild.injecthelper.mjs"],
@@ -61,22 +64,31 @@ esbuild
     minify: prod,
     outfile: "main.js",
     define: {
-      "process.env.DEFAULT_DROPBOX_APP_KEY": `"${DEFAULT_DROPBOX_APP_KEY}"`,
-      "process.env.DEFAULT_ONEDRIVE_CLIENT_ID": `"${DEFAULT_ONEDRIVE_CLIENT_ID}"`,
-      "process.env.DEFAULT_ONEDRIVE_AUTHORITY": `"${DEFAULT_ONEDRIVE_AUTHORITY}"`,
-      "process.env.DEFAULT_REMOTELYSAVE_WEBSITE": `"${DEFAULT_REMOTELYSAVE_WEBSITE}"`,
-      "process.env.DEFAULT_REMOTELYSAVE_CLIENT_ID": `"${DEFAULT_REMOTELYSAVE_CLIENT_ID}"`,
-      "process.env.DEFAULT_GOOGLEDRIVE_CLIENT_ID": `"${DEFAULT_GOOGLEDRIVE_CLIENT_ID}"`,
-      "process.env.DEFAULT_GOOGLEDRIVE_CLIENT_SECRET": `"${DEFAULT_GOOGLEDRIVE_CLIENT_SECRET}"`,
-      "process.env.DEFAULT_BOX_CLIENT_ID": `"${DEFAULT_BOX_CLIENT_ID}"`,
-      "process.env.DEFAULT_BOX_CLIENT_SECRET": `"${DEFAULT_BOX_CLIENT_SECRET}"`,
-      "process.env.DEFAULT_PCLOUD_CLIENT_ID": `"${DEFAULT_PCLOUD_CLIENT_ID}"`,
-      "process.env.DEFAULT_PCLOUD_CLIENT_SECRET": `"${DEFAULT_PCLOUD_CLIENT_SECRET}"`,
-      "process.env.DEFAULT_YANDEXDISK_CLIENT_ID": `"${DEFAULT_YANDEXDISK_CLIENT_ID}"`,
-      "process.env.DEFAULT_YANDEXDISK_CLIENT_SECRET": `"${DEFAULT_YANDEXDISK_CLIENT_SECRET}"`,
+      "global.DEFAULT_DROPBOX_APP_KEY": `"${DEFAULT_DROPBOX_APP_KEY}"`,
+      "global.DEFAULT_ONEDRIVE_CLIENT_ID": `"${DEFAULT_ONEDRIVE_CLIENT_ID}"`,
+      "global.DEFAULT_ONEDRIVE_AUTHORITY": `"${DEFAULT_ONEDRIVE_AUTHORITY}"`,
+      "global.DEFAULT_REMOTELYSAVE_WEBSITE": `"${DEFAULT_REMOTELYSAVE_WEBSITE}"`,
+      "global.DEFAULT_REMOTELYSAVE_CLIENT_ID": `"${DEFAULT_REMOTELYSAVE_CLIENT_ID}"`,
+      "global.DEFAULT_GOOGLEDRIVE_CLIENT_ID": `"${DEFAULT_GOOGLEDRIVE_CLIENT_ID}"`,
+      "global.DEFAULT_GOOGLEDRIVE_CLIENT_SECRET": `"${DEFAULT_GOOGLEDRIVE_CLIENT_SECRET}"`,
+      "global.DEFAULT_BOX_CLIENT_ID": `"${DEFAULT_BOX_CLIENT_ID}"`,
+      "global.DEFAULT_BOX_CLIENT_SECRET": `"${DEFAULT_BOX_CLIENT_SECRET}"`,
+      "global.DEFAULT_PCLOUD_CLIENT_ID": `"${DEFAULT_PCLOUD_CLIENT_ID}"`,
+      "global.DEFAULT_PCLOUD_CLIENT_SECRET": `"${DEFAULT_PCLOUD_CLIENT_SECRET}"`,
+      "global.DEFAULT_YANDEXDISK_CLIENT_ID": `"${DEFAULT_YANDEXDISK_CLIENT_ID}"`,
+      "global.DEFAULT_YANDEXDISK_CLIENT_SECRET": `"${DEFAULT_YANDEXDISK_CLIENT_SECRET}"`,
+      "global.DEFAULT_KOOFR_CLIENT_ID": `"${DEFAULT_KOOFR_CLIENT_ID}"`,
+      "global.DEFAULT_KOOFR_CLIENT_SECRET": `"${DEFAULT_KOOFR_CLIENT_SECRET}"`,
       global: "window",
       "process.env.NODE_DEBUG": `undefined`, // ugly fix
       "process.env.DEBUG": `undefined`, // ugly fix
+      // "process.version": `"v20.10.0"`, // who's using this?
+      // "process":`undefined`,
+      // "global.process":`undefined`,
+
+      // make azure blob storage happy
+      // https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/core/core-util/src/checkEnvironment.ts
+      "globalThis.process.versions": `undefined`,
     },
     plugins: [inlineWorkerPlugin()],
   })

manifest-beta.json

@@ -1,7 +1,7 @@
 {
   "id": "remotely-save",
   "name": "Remotely Save",
-  "version": "0.5.4",
+  "version": "0.5.11",
   "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.4",
+  "version": "0.5.11",
   "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,6 +1,6 @@
 {
   "name": "remotely-save",
-  "version": "0.5.4",
+  "version": "0.5.11",
   "description": "This is yet another sync plugin for Obsidian app.",
   "scripts": {
     "dev2": "node esbuild.config.mjs --watch",
@@ -45,6 +45,7 @@
     "mocha": "^10.4.0",
     "npm-check-updates": "^16.14.20",
     "obsidian": "^1.5.7",
+    "openapi-typescript": "^7.0.0-rc.0",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "tslib": "^2.6.2",
@@ -60,6 +61,7 @@
     "@aws-sdk/signature-v4-crt": "^3.556.0",
     "@aws-sdk/types": "^3.535.0",
     "@azure/msal-node": "^2.7.0",
+    "@azure/storage-blob": "^12.23.0",
     "@fyears/rclone-crypt": "^0.0.7",
     "@fyears/tsqueue": "^1.0.1",
     "@microsoft/microsoft-graph-client": "^3.0.7",
@@ -86,6 +88,7 @@
     "mustache": "^4.2.0",
     "nanoid": "^5.0.7",
     "node-diff3": "^3.1.2",
+    "openapi-fetch": "^0.9.7",
     "p-queue": "^8.0.1",
     "path-browserify": "^1.0.1",
     "pcloud-sdk-js": "^2.0.0",

pro/README.md

@@ -6,18 +6,38 @@ Remotely Save has some "pro features", which users have to pay for using them.
 
 ## Sign Up / Sign In And Connect
 
-See the tutorial about your PRO account [here](../docs/pro/README.md).
+See the tutorial about your PRO account [here](.../docs/pro/README.md).
 
-## Smart Conflict
+## Smart Conflict (PRO feature)
 
 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.
 
-## Sync With Google Drive
+## Google Drive (GDrive) (PRO feature)
 
 PRO (paid) feature "sync with Google Drive" allows users to to sync with Google Drive. Tutorials and limitations are documented [here](../docs/remote_services/googledrive/README.md).
 
+## Box (PRO feature)
+
+PRO (paid) feature "sync with Box" allows users to to sync with Box. Tutorials and limitations are documented [here](../docs/remote_services/box/README.md).
+
+## pCloud (PRO feature)
+
+PRO (paid) feature "sync with pCloud" allows users to to sync with pCloud (using its native API instead of webdav). Tutorials and limitations are documented [here](../docs/remote_services/pcloud/README.md).
+
+## Yandex Disk (PRO feature)
+
+PRO (paid) feature "sync with Yandex Disk" allows users to to sync with Yandex Disk (using its native API instead of webdav). Tutorials and limitations are documented [here](../docs/remote_services/yandexdisk/README.md).
+
+## Koofr (PRO feature)
+
+PRO (paid) feature "sync with Koofr" allows users to to sync with Koofr (using its native API instead of webdav). Tutorials and limitations are documented [here](../docs/remote_services/koofr/README.md).
+
+### Azure Blob Storage (PRO feature)
+
+PRO (paid) feature "sync with Azure Blob Storage" allows users to to sync with Azure Blob Storage. Tutorials and limitations are documented [here](../docs/remote_services/azureblobstorage/README.md).
+
 ## License
 
 The codes or files or subfolders inside the current folder (`pro` in the repo), are released under "source available" license: "PolyForm Strict License 1.0.0".

pro/src/account.ts

@@ -278,6 +278,11 @@ export const checkProRunnableAndFixInplace = async (
       service: "googledrive",
       name: "Google Drive",
     },
+    {
+      feature: "feature-onedrive_full",
+      service: "onedrivefull",
+      name: "Onedrive (Full)",
+    },
     { feature: "feature-box", service: "box", name: "Box" },
     { feature: "feature-pcloud", service: "pcloud", name: "pCloud" },
     {
@@ -285,6 +290,16 @@ export const checkProRunnableAndFixInplace = async (
       service: "yandexdisk",
       name: "Yandex Disk",
     },
+    {
+      feature: "feature-koofr",
+      service: "koofr",
+      name: "Koofr",
+    },
+    {
+      feature: "feature-azure_blob_storage",
+      service: "azureblobstorage",
+      name: "Azure Blob Storage",
+    },
   ];
 
   for (const { feature, service, name } of toChecked) {

pro/src/baseTypesPro.ts

@@ -1,17 +1,39 @@
+////////////////////////////////////////////////////////////
+// hacks
+////////////////////////////////////////////////////////////
+
+declare global {
+  var DEFAULT_REMOTELYSAVE_WEBSITE: string;
+  var DEFAULT_REMOTELYSAVE_CLIENT_ID: string;
+  var DEFAULT_GOOGLEDRIVE_CLIENT_ID: string;
+  var DEFAULT_GOOGLEDRIVE_CLIENT_SECRET: string;
+  var DEFAULT_BOX_CLIENT_ID: string;
+  var DEFAULT_BOX_CLIENT_SECRET: string;
+  var DEFAULT_PCLOUD_CLIENT_ID: string;
+  var DEFAULT_PCLOUD_CLIENT_SECRET: string;
+  var DEFAULT_YANDEXDISK_CLIENT_ID: string;
+  var DEFAULT_YANDEXDISK_CLIENT_SECRET: string;
+  var DEFAULT_KOOFR_CLIENT_ID: string;
+  var DEFAULT_KOOFR_CLIENT_SECRET: string;
+}
+
 ///////////////////////////////////////////////////////////
 // PRO
 //////////////////////////////////////////////////////////
 
 export const COMMAND_CALLBACK_PRO = "remotely-save-cb-pro";
-export const PRO_CLIENT_ID = process.env.DEFAULT_REMOTELYSAVE_CLIENT_ID;
-export const PRO_WEBSITE = process.env.DEFAULT_REMOTELYSAVE_WEBSITE;
+export const PRO_CLIENT_ID = global.DEFAULT_REMOTELYSAVE_CLIENT_ID;
+export const PRO_WEBSITE = global.DEFAULT_REMOTELYSAVE_WEBSITE;
 
 export type PRO_FEATURE_TYPE =
   | "feature-smart_conflict"
+  | "feature-onedrive_full"
   | "feature-google_drive"
   | "feature-box"
   | "feature-pcloud"
-  | "feature-yandex_disk";
+  | "feature-yandex_disk"
+  | "feature-koofr"
+  | "feature-azure_blob_storage";
 
 export interface FeatureInfo {
   featureName: PRO_FEATURE_TYPE;
@@ -50,18 +72,17 @@ export interface GoogleDriveConfig {
   kind: "googledrive";
 }
 
-export const DEFAULT_GOOGLEDRIVE_CLIENT_ID =
-  process.env.DEFAULT_GOOGLEDRIVE_CLIENT_ID;
-export const DEFAULT_GOOGLEDRIVE_CLIENT_SECRET =
-  process.env.DEFAULT_GOOGLEDRIVE_CLIENT_SECRET;
+export const GOOGLEDRIVE_CLIENT_ID = global.DEFAULT_GOOGLEDRIVE_CLIENT_ID;
+export const GOOGLEDRIVE_CLIENT_SECRET =
+  global.DEFAULT_GOOGLEDRIVE_CLIENT_SECRET;
 
 ///////////////////////////////////////////////////////////
 // box
 //////////////////////////////////////////////////////////
 
 export const COMMAND_CALLBACK_BOX = "remotely-save-cb-box";
-export const BOX_CLIENT_ID = process.env.DEFAULT_BOX_CLIENT_ID;
-export const BOX_CLIENT_SECRET = process.env.DEFAULT_BOX_CLIENT_SECRET;
+export const BOX_CLIENT_ID = global.DEFAULT_BOX_CLIENT_ID;
+export const BOX_CLIENT_SECRET = global.DEFAULT_BOX_CLIENT_SECRET;
 
 export interface BoxConfig {
   accessToken: string;
@@ -78,8 +99,8 @@ export interface BoxConfig {
 //////////////////////////////////////////////////////////
 
 export const COMMAND_CALLBACK_PCLOUD = "remotely-save-cb-pcloud";
-export const PCLOUD_CLIENT_ID = process.env.DEFAULT_PCLOUD_CLIENT_ID;
-export const PCLOUD_CLIENT_SECRET = process.env.DEFAULT_PCLOUD_CLIENT_SECRET;
+export const PCLOUD_CLIENT_ID = global.DEFAULT_PCLOUD_CLIENT_ID;
+export const PCLOUD_CLIENT_SECRET = global.DEFAULT_PCLOUD_CLIENT_SECRET;
 
 export interface PCloudConfig {
   accessToken: string;
@@ -87,8 +108,12 @@ export interface PCloudConfig {
   locationid: 1 | 2;
   remoteBaseDir?: string;
   credentialsShouldBeDeletedAtTimeMs?: number;
-  emptyFile: "skip" | "error";
   kind: "pcloud";
+
+  /**
+   * @deprecated
+   */
+  emptyFile: "skip" | "error";
 }
 
 ///////////////////////////////////////////////////////////
@@ -96,9 +121,8 @@ export interface PCloudConfig {
 //////////////////////////////////////////////////////////
 
 export const COMMAND_CALLBACK_YANDEXDISK = "remotely-save-cb-yandexdisk";
-export const YANDEXDISK_CLIENT_ID = process.env.DEFAULT_YANDEXDISK_CLIENT_ID;
-export const YANDEXDISK_CLIENT_SECRET =
-  process.env.DEFAULT_YANDEXDISK_CLIENT_SECRET;
+export const YANDEXDISK_CLIENT_ID = global.DEFAULT_YANDEXDISK_CLIENT_ID;
+export const YANDEXDISK_CLIENT_SECRET = global.DEFAULT_YANDEXDISK_CLIENT_SECRET;
 
 export interface YandexDiskConfig {
   accessToken: string;
@@ -110,3 +134,58 @@ export interface YandexDiskConfig {
   scope: string;
   kind: "yandexdisk";
 }
+
+///////////////////////////////////////////////////////////
+// Koofr
+//////////////////////////////////////////////////////////
+
+export const COMMAND_CALLBACK_KOOFR = "remotely-save-cb-koofr";
+export const KOOFR_CLIENT_ID = global.DEFAULT_KOOFR_CLIENT_ID;
+export const KOOFR_CLIENT_SECRET = global.DEFAULT_KOOFR_CLIENT_SECRET;
+
+export interface KoofrConfig {
+  accessToken: string;
+  accessTokenExpiresInMs: number;
+  accessTokenExpiresAtTimeMs: number;
+  refreshToken: string;
+  remoteBaseDir?: string;
+  credentialsShouldBeDeletedAtTimeMs?: number;
+  scope: string;
+  api: string;
+  mountID: string;
+  kind: "koofr";
+}
+
+///////////////////////////////////////////////////////////
+// Azure Blob Storage
+//////////////////////////////////////////////////////////
+
+export interface AzureBlobStorageConfig {
+  containerSasUrl: string;
+  containerName: string;
+  remotePrefix: string;
+  generateFolderObject: boolean;
+  partsConcurrency: number;
+  kind: "azureblobstorage";
+}
+
+///////////////////////////////////////////////////////////
+// Onedrive (Full)
+//////////////////////////////////////////////////////////
+
+export const COMMAND_CALLBACK_ONEDRIVEFULL = "remotely-save-cb-onedrivefull";
+
+export interface OnedriveFullConfig {
+  accessToken: string;
+  clientID: string;
+  authority: string;
+  refreshToken: string;
+  accessTokenExpiresInSeconds: number;
+  accessTokenExpiresAtTime: number;
+  deltaLink: string;
+  username: string;
+  credentialsShouldBeDeletedAtTime?: number;
+  remoteBaseDir?: string;
+  emptyFile: "skip" | "error";
+  kind: "onedrivefull";
+}

pro/src/fsAzureBlobStorage.ts

@@ -0,0 +1,342 @@
+import * as path from "path";
+import {
+  AnonymousCredential,
+  BaseRequestPolicy,
+  type BlobGetPropertiesResponse,
+  BlobServiceClient,
+  BlobUploadCommonResponse,
+  BlockBlobClient,
+  ContainerClient,
+  newPipeline,
+} from "@azure/storage-blob";
+import type { Entity } from "../../src/baseTypes";
+import { FakeFs } from "../../src/fsAll";
+import { arrayBufferToHex, getFolderLevels } from "../../src/misc";
+import type { AzureBlobStorageConfig } from "./baseTypesPro";
+
+export const simpleTransRemotePrefix = (x: string) => {
+  if (x === undefined) {
+    return "";
+  }
+  let y = path.posix.normalize(x.trim());
+  if (y === undefined || y === "" || y === "/" || y === ".") {
+    return "";
+  }
+  if (y.startsWith("/")) {
+    y = y.slice(1);
+  }
+  if (!y.endsWith("/")) {
+    y = `${y}/`;
+  }
+  return y;
+};
+
+export const DEFAULT_AZUREBLOBSTORAGE_CONFIG: AzureBlobStorageConfig = {
+  containerSasUrl: "",
+  containerName: "",
+  remotePrefix: "",
+  generateFolderObject: false,
+  partsConcurrency: 5,
+  kind: "azureblobstorage",
+};
+
+const getNormPath = (fileOrFolderPath: string, remotePrefix: string) => {
+  if (remotePrefix.startsWith("/") || !remotePrefix.endsWith("/")) {
+    throw Error(
+      `remotePrefix should not have leading slash but should have tailing slash: ${remotePrefix}`
+    );
+  }
+  if (!fileOrFolderPath.startsWith(remotePrefix)) {
+    throw Error(`${fileOrFolderPath} does not start with ${remotePrefix}!`);
+  }
+  return fileOrFolderPath.slice(remotePrefix.length);
+};
+
+const getBlobPath = (fileOrFolderPath: string, remotePrefix: string) => {
+  if (remotePrefix.startsWith("/") || !remotePrefix.endsWith("/")) {
+    throw Error(
+      `remotePrefix should not have leading slash but should have tailing slash: ${remotePrefix}`
+    );
+  }
+  return `${remotePrefix}${fileOrFolderPath}`;
+};
+
+const fromBlobPropsToEntity = (
+  name: string,
+  props: BlobGetPropertiesResponse,
+  remotePrefix: string
+): Entity => {
+  const key = getNormPath(name, remotePrefix);
+
+  let mtimeCli = props.lastModified!.valueOf();
+  const mtimeStr = props.metadata?.mtime;
+  if (mtimeStr !== undefined && mtimeStr !== "") {
+    try {
+      mtimeCli = new Date(mtimeStr).valueOf();
+    } catch {}
+  }
+
+  let hash: undefined | string = undefined;
+  if (props.contentMD5 !== undefined) {
+    hash = arrayBufferToHex(props.contentMD5.buffer);
+  }
+
+  const entity: Entity = {
+    key: key,
+    keyRaw: key,
+    mtimeCli: mtimeCli,
+    mtimeSvr: props.lastModified!.valueOf(),
+    size: props.contentLength ?? 0,
+    sizeRaw: props.contentLength ?? 0,
+    hash: hash,
+  };
+
+  if (key.endsWith("/")) {
+    entity.synthesizedFolder = false;
+  }
+
+  return entity;
+};
+
+export class FakeFsAzureBlobStorage extends FakeFs {
+  kind: string;
+  config: AzureBlobStorageConfig;
+  vaultName: string;
+  containerClient: ContainerClient;
+  remotePrefix: string;
+  synthFoldersCache: Record<string, Entity>;
+
+  constructor(config: AzureBlobStorageConfig, vaultName: string) {
+    super();
+    this.kind = "azureblobstorage";
+    this.config = config;
+    this.vaultName = vaultName;
+    this.synthFoldersCache = {};
+
+    this.remotePrefix = `${vaultName}/`;
+    const k = simpleTransRemotePrefix(this.config.remotePrefix);
+    if (k !== "") {
+      // we have prefix
+      this.remotePrefix = k;
+    }
+
+    this.containerClient = new ContainerClient(this.config.containerSasUrl);
+  }
+
+  async walk(): Promise<Entity[]> {
+    const entities: Entity[] = [];
+    const realEntities = new Set<string>();
+    for await (const blob of this.containerClient.listBlobsFlat({
+      prefix: this.remotePrefix,
+      includeMetadata: true,
+    })) {
+      const blockBlobClient = this.containerClient.getBlockBlobClient(
+        blob.name
+      );
+      const props = await blockBlobClient.getProperties();
+
+      // console.debug(blob.name)
+
+      const entity = fromBlobPropsToEntity(blob.name, props, this.remotePrefix);
+      entities.push(entity);
+
+      // so we need to fake the folders
+      realEntities.add(entity.key!);
+      for (const f of getFolderLevels(entity.key!, true)) {
+        if (realEntities.has(f)) {
+          delete this.synthFoldersCache[f];
+          continue;
+        }
+        if (
+          !this.synthFoldersCache.hasOwnProperty(f) ||
+          entity.mtimeSvr! >= this.synthFoldersCache[f].mtimeSvr!
+        ) {
+          this.synthFoldersCache[f] = {
+            key: f,
+            keyRaw: f,
+            size: 0,
+            sizeRaw: 0,
+            sizeEnc: 0,
+            mtimeSvr: entity.mtimeSvr,
+            mtimeSvrFmt: entity.mtimeSvrFmt,
+            mtimeCli: entity.mtimeCli,
+            mtimeCliFmt: entity.mtimeCliFmt,
+            synthesizedFolder: true,
+          };
+        }
+      }
+    }
+    for (const key of Object.keys(this.synthFoldersCache)) {
+      entities.push(this.synthFoldersCache[key]);
+    }
+    return entities;
+  }
+
+  async walkPartial(): Promise<Entity[]> {
+    const entities: Entity[] = [];
+    for await (const blob of this.containerClient.listBlobsByHierarchy("/", {
+      prefix: this.remotePrefix,
+      includeMetadata: true,
+    })) {
+      if (blob.kind === "prefix") {
+        continue;
+      }
+      const blockBlobClient = this.containerClient.getBlockBlobClient(
+        blob.name
+      );
+      const props = await blockBlobClient.getProperties();
+
+      const entity = fromBlobPropsToEntity(blob.name, props, this.remotePrefix);
+      entities.push(entity);
+    }
+    return entities;
+  }
+
+  async stat(key: string): Promise<Entity> {
+    const remotePath = getBlobPath(key, this.remotePrefix);
+    const blockBlobClient = this.containerClient.getBlockBlobClient(remotePath);
+    const props = await blockBlobClient.getProperties();
+
+    const entity = fromBlobPropsToEntity(remotePath, props, this.remotePrefix);
+    return entity;
+  }
+
+  async mkdir(
+    key: string,
+    mtime?: number | undefined,
+    ctime?: number | undefined
+  ): Promise<Entity> {
+    if (!key.endsWith("/")) {
+      throw new Error(`You should not call mkdir on ${key}!`);
+    }
+
+    const generateFolderObject = this.config.generateFolderObject ?? false;
+    if (!generateFolderObject) {
+      const synth = {
+        key: key,
+        keyRaw: key,
+        size: 0,
+        sizeRaw: 0,
+        sizeEnc: 0,
+        mtimeSvr: mtime,
+        mtimeCli: mtime,
+        synthesizedFolder: true,
+      };
+      this.synthFoldersCache[key] = synth;
+      return synth;
+    }
+
+    return await this.writeFile(
+      key,
+      new ArrayBuffer(0),
+      mtime ?? Date.now(),
+      ctime ?? Date.now()
+    );
+  }
+
+  async writeFile(
+    key: string,
+    content: ArrayBuffer,
+    mtime: number,
+    ctime: number
+  ): Promise<Entity> {
+    const blobPath = getBlobPath(key, this.remotePrefix);
+
+    const blobClient = this.containerClient.getBlockBlobClient(blobPath);
+    const metadata: Record<string, string> = {
+      mtime: new Date(mtime).toISOString(),
+      ctime: new Date(ctime).toISOString(),
+    };
+
+    if (key.endsWith("/")) {
+      console.debug(`yeah we have folder upload`);
+      const generateFolderObject = this.config.generateFolderObject ?? false;
+      if (!generateFolderObject) {
+        throw Error(
+          `if not generate folder object, the func should not go here`
+        );
+      }
+      metadata["hdi_isfolder"] = "true";
+    }
+
+    const uploadResult = await blobClient.uploadData(content, {
+      metadata: metadata,
+      concurrency: this.config.partsConcurrency ?? 5,
+    });
+
+    if (key.endsWith("/")) {
+      console.debug(`yeah we have folder upload`);
+      console.debug(uploadResult);
+    }
+
+    if (uploadResult._response.status >= 300) {
+      throw Error(`upload ${key} failed with ${JSON.stringify(uploadResult)}`);
+    }
+
+    return await this.stat(key);
+  }
+
+  async readFile(key: string): Promise<ArrayBuffer> {
+    const blobPath = getBlobPath(key, this.remotePrefix);
+    const blobClient = this.containerClient.getBlockBlobClient(blobPath);
+    const rsp = await blobClient.download();
+    if (rsp._response.status >= 300) {
+      throw Error(`download ${key} failed with ${JSON.stringify(rsp)}`);
+    }
+    return await (await rsp.blobBody)!.arrayBuffer();
+  }
+
+  async rename(key1: string, key2: string): Promise<void> {
+    throw new Error("Method not implemented.");
+  }
+
+  async rm(key: string): Promise<void> {
+    const blobPath = getBlobPath(key, this.remotePrefix);
+    if (key.endsWith("/")) {
+      if (this.synthFoldersCache.hasOwnProperty(key)) {
+        delete this.synthFoldersCache[key];
+      }
+
+      // in blob the folder may not exist, so we make our best effort.
+      // do NOT read this.config.generateFolderObject
+      // because the folder might be generated by previous setting
+      try {
+        const blobClient = this.containerClient.getBlockBlobClient(blobPath);
+        await blobClient.deleteIfExists();
+      } catch (e) {}
+    } else {
+      // the file should really exist
+      const blobClient = this.containerClient.getBlockBlobClient(blobPath);
+      const rsp = await blobClient.deleteIfExists();
+      if (!rsp.succeeded) {
+        throw Error(
+          `something goes wrong while deleting ${key}: ${JSON.stringify(rsp)}`
+        );
+      }
+    }
+  }
+
+  async checkConnect(callbackFunc?: any): Promise<boolean> {
+    // if we can walk, we can connect
+    try {
+      await this.walkPartial();
+      return true;
+    } catch (err) {
+      console.debug(err);
+      callbackFunc?.(err);
+      return false;
+    }
+  }
+
+  async getUserDisplayName(): Promise<string> {
+    throw new Error("Method not implemented.");
+  }
+
+  async revokeAuth(): Promise<any> {
+    throw new Error("Method not implemented.");
+  }
+
+  allowEmptyFile(): boolean {
+    return true;
+  }
+}

pro/src/fsBox.ts

@@ -404,6 +404,8 @@ export class FakeFsBox extends FakeFs {
     this.boxConfig.accessTokenExpiresInMs = k.expires_in * 1000;
     this.boxConfig.accessTokenExpiresAtTimeMs =
       ts + k.expires_in * 1000 - 60 * 2 * 1000;
+    this.boxConfig.refreshToken =
+      k.refresh_token || this.boxConfig.refreshToken;
     await this.saveUpdatedConfigFunc();
     console.info("Box accessToken updated");
     return this.boxConfig.accessToken;

pro/src/fsGoogleDrive.ts

@@ -14,8 +14,8 @@ import {
   unixTimeToStr,
 } from "../../src/misc";
 import {
-  DEFAULT_GOOGLEDRIVE_CLIENT_ID,
-  DEFAULT_GOOGLEDRIVE_CLIENT_SECRET,
+  GOOGLEDRIVE_CLIENT_ID,
+  GOOGLEDRIVE_CLIENT_SECRET,
   type GoogleDriveConfig,
 } from "./baseTypesPro";
 
@@ -103,8 +103,8 @@ export const sendRefreshTokenReq = async (refreshToken: string) => {
       "Content-Type": "application/x-www-form-urlencoded",
     },
     body: new URLSearchParams({
-      client_id: DEFAULT_GOOGLEDRIVE_CLIENT_ID ?? "",
-      client_secret: DEFAULT_GOOGLEDRIVE_CLIENT_SECRET ?? "",
+      client_id: GOOGLEDRIVE_CLIENT_ID ?? "",
+      client_secret: GOOGLEDRIVE_CLIENT_SECRET ?? "",
       grant_type: "refresh_token",
       refresh_token: refreshToken,
     }).toString(),

pro/src/fsKoofr.ts

@@ -0,0 +1,577 @@
+import { nanoid } from "nanoid";
+import createClient, { type Middleware } from "openapi-fetch";
+import { base64 } from "rfc4648";
+import type { Entity } from "../../src/baseTypes";
+import { FakeFs } from "../../src/fsAll";
+import { getParentFolder } from "../../src/misc";
+import {
+  COMMAND_CALLBACK_KOOFR,
+  KOOFR_CLIENT_ID,
+  KOOFR_CLIENT_SECRET,
+  type KoofrConfig,
+} from "./baseTypesPro";
+import type { paths } from "./koofrApi";
+import type { components } from "./koofrApi";
+
+type FilesListRecursiveItem = components["schemas"]["FilesListRecursiveItem"];
+type FilesFile = components["schemas"]["FilesFile"];
+
+export const DEFAULT_KOOFR_CONFIG: KoofrConfig = {
+  accessToken: "",
+  accessTokenExpiresInMs: 0,
+  accessTokenExpiresAtTimeMs: 0,
+  refreshToken: "",
+  remoteBaseDir: "",
+  credentialsShouldBeDeletedAtTimeMs: 0,
+  scope: "",
+  api: "https://app.koofr.net",
+  mountID: "",
+  kind: "koofr",
+};
+
+/**
+ * https://app.koofr.net/developers
+ */
+export const generateAuthUrl = (apiAddr: string, hasCallback: boolean) => {
+  let callback = `urn:ietf:wg:oauth:2.0:oob`;
+  if (hasCallback) {
+    callback = `obsidian://${COMMAND_CALLBACK_KOOFR}`;
+  }
+
+  const params = new URLSearchParams({
+    response_type: "code",
+    client_id: KOOFR_CLIENT_ID ?? "",
+    redirect_uri: callback,
+    scope: "public",
+    state: nanoid(),
+  });
+
+  const url = `${apiAddr}/oauth2/auth?${params}`;
+  return url;
+};
+
+interface AuthResSucc {
+  token_type: "Bearer";
+  access_token: string;
+  expires_in: number;
+  refresh_token: string;
+  scope: string | undefined;
+}
+
+interface AuthResFail {
+  error: string;
+  error_description: string;
+}
+
+/**
+ * https://app.koofr.net/developers
+ */
+export const sendAuthReq = async (
+  apiAddr: string,
+  authCode: string,
+  errorCallBack: any,
+  hasCallback: boolean
+) => {
+  let callback = `urn:ietf:wg:oauth:2.0:oob`;
+  if (hasCallback) {
+    callback = `obsidian://${COMMAND_CALLBACK_KOOFR}`;
+  }
+  try {
+    const k = {
+      code: authCode,
+      grant_type: "authorization_code",
+      client_id: KOOFR_CLIENT_ID ?? "",
+      client_secret: KOOFR_CLIENT_SECRET ?? "",
+      redirect_uri: callback,
+    };
+    // console.debug(k);
+    const resp1 = await fetch(`${apiAddr}/oauth2/token`, {
+      method: "POST",
+      body: new URLSearchParams(k),
+    });
+
+    if (resp1.status !== 200) {
+      const resp2: AuthResFail = await resp1.json();
+      throw Error(JSON.stringify(resp2));
+    }
+
+    const resp2: AuthResSucc = await resp1.json();
+    return resp2;
+  } catch (e) {
+    console.error(e);
+    if (errorCallBack !== undefined) {
+      await errorCallBack(e);
+    }
+  }
+};
+
+export const sendRefreshTokenReq = async (
+  apiAddr: string,
+  refreshToken: string
+) => {
+  console.debug(`refreshing token`);
+  const x = await fetch(`${apiAddr}/oauth2/token`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded",
+    },
+    body: new URLSearchParams({
+      client_id: KOOFR_CLIENT_ID ?? "",
+      client_secret: KOOFR_CLIENT_SECRET ?? "",
+      grant_type: "refresh_token",
+      refresh_token: refreshToken,
+    }).toString(),
+  });
+
+  if (x.status === 200) {
+    const y: AuthResSucc = await x.json();
+    console.debug(`new token obtained`);
+    return y;
+  } else {
+    const y: AuthResFail = await x.json();
+    throw Error(`cannot refresh an access token: ${JSON.stringify(y)}`);
+  }
+};
+
+export const setConfigBySuccessfullAuthInplace = async (
+  config: KoofrConfig,
+  authRes: AuthResSucc,
+  saveUpdatedConfigFunc: () => Promise<any> | undefined
+) => {
+  if (authRes.access_token === undefined || authRes.access_token === "") {
+    throw Error(
+      `you should not save the setting for ${JSON.stringify(authRes)}`
+    );
+  }
+
+  config.accessToken = authRes.access_token;
+  config.accessTokenExpiresAtTimeMs =
+    Date.now() + authRes.expires_in * 1000 - 5 * 60 * 1000;
+  config.accessTokenExpiresInMs = authRes.expires_in * 1000;
+  config.refreshToken = authRes.refresh_token || config.refreshToken;
+
+  config.scope = authRes.scope || config.scope;
+
+  // manually set it expired after 60 days;
+  config.credentialsShouldBeDeletedAtTimeMs =
+    Date.now() + 1000 * 60 * 60 * 24 * 59;
+
+  await saveUpdatedConfigFunc?.();
+
+  console.info("finish updating local info of Koofr token");
+};
+
+const getNormPathFromBasedir = (x: string, type: "dir" | "file") => {
+  if (x === "/" || x === "") {
+    throw Error(`do not know how to deal with path: ${x}`);
+  }
+
+  if (!x.startsWith("/")) {
+    throw Error(`path returned by koofr should starts with slash: ${x}`);
+  }
+
+  if (type === "file") {
+    return x.slice(1);
+  } else if (type === "dir") {
+    return `${x.slice(1)}/`;
+  } else {
+    throw Error(`do not know how to deal with path and type: ${x}, ${type}`);
+  }
+};
+
+const getKoofrPath = (fileOrFolderPath: string, remoteBaseDir: string) => {
+  let key = fileOrFolderPath;
+  if (fileOrFolderPath === "/" || fileOrFolderPath === "") {
+    // special
+    key = `/${remoteBaseDir}`;
+  } else if (fileOrFolderPath.startsWith("/")) {
+    console.warn(
+      `why the path ${fileOrFolderPath} starts with '/'? but we just go on.`
+    );
+    key = `/${remoteBaseDir}${fileOrFolderPath}`;
+  } else {
+    key = `/${remoteBaseDir}/${fileOrFolderPath}`;
+  }
+  if (key.endsWith("/")) {
+    key = key.slice(0, key.length - 1);
+  }
+  return key;
+};
+
+const fromItemToEntity = (x: FilesListRecursiveItem): Entity => {
+  if (x.type === "error") {
+    throw Error(`cannot understand ${JSON.stringify(x)}`);
+  }
+
+  const key = getNormPathFromBasedir(x.path ?? "/", x.file?.type as any);
+
+  if (x.file?.type === "dir" || x.file?.type === "file") {
+    return {
+      key: key,
+      keyRaw: key,
+      mtimeCli: x.file.modified,
+      mtimeSvr: x.file.modified,
+      size: x.file.size,
+      sizeRaw: x.file.size,
+      hash: x.file.hash,
+    } as Entity;
+  } else {
+    throw Error(`cannot understand ${JSON.stringify(x)}`);
+  }
+};
+
+const fromFileToEntity = (x: FilesFile, parentPath: string): Entity => {
+  const key = getNormPathFromBasedir(`${parentPath}/${x.name}`, x.type as any);
+  if (x.type === "dir" || x.type === "file") {
+    return {
+      key: key,
+      keyRaw: key,
+      mtimeCli: x.modified,
+      mtimeSvr: x.modified,
+      size: x.size,
+      sizeRaw: x.size,
+      hash: x.hash,
+    } as Entity;
+  } else {
+    throw Error(`cannot understand ${JSON.stringify(x)}`);
+  }
+};
+
+/**
+ * https://app.koofr.net/developers
+ *
+ */
+// const getAuthHeader = (email: string, password: string) => {
+//   const x = `${email}:${password}`;
+//   const y = base64.stringify(new TextEncoder().encode(x));
+//   const z = `Basic ${y}`;
+//   return z;
+// };
+
+// const getAuthMiddleware = (email: string, password: string) => {
+//   const authMiddleware: Middleware = {
+//     async onRequest(req) {
+//       req.headers.set("Authorization", getAuthHeader(email, password));
+//       return req;
+//     },
+//   };
+//   return authMiddleware;
+// };
+
+const getAuthMiddleware = (
+  koofrConfig: KoofrConfig,
+  saveUpdatedConfigFunc: any
+) => {
+  const authMiddleware: Middleware = {
+    async onRequest(req) {
+      const getAccessToken = async () => {
+        if (koofrConfig.refreshToken === "") {
+          throw Error("The user has not manually auth yet.");
+        }
+
+        const ts = Date.now();
+        const comp = koofrConfig.accessTokenExpiresAtTimeMs > ts;
+        // console.debug(`koofrConfig.accessTokenExpiresAtTimeMs=${koofrConfig.accessTokenExpiresAtTimeMs},ts=${ts},comp=${comp}`)
+        if (comp) {
+          return koofrConfig.accessToken;
+        }
+
+        // refresh
+        const k = await sendRefreshTokenReq(
+          koofrConfig.api,
+          koofrConfig.refreshToken
+        );
+        koofrConfig.accessToken = k.access_token;
+        koofrConfig.accessTokenExpiresInMs = k.expires_in * 1000;
+        koofrConfig.accessTokenExpiresAtTimeMs =
+          ts + k.expires_in * 1000 - 60 * 2 * 1000;
+        await saveUpdatedConfigFunc();
+        console.info("Koofr accessToken updated");
+        return koofrConfig.accessToken;
+      };
+
+      const access = await getAccessToken();
+      req.headers.set("Authorization", `Bearer ${access}`);
+      return req;
+    },
+  };
+  return authMiddleware;
+};
+
+export class FakeFsKoofr extends FakeFs {
+  kind: string;
+  koofrConfig: KoofrConfig;
+  remoteBaseDir: string;
+  vaultFolderExists: boolean;
+  saveUpdatedConfigFunc: () => Promise<any>;
+  client: ReturnType<typeof createClient<paths>>;
+  placeID: string;
+
+  constructor(
+    koofrConfig: KoofrConfig,
+    vaultName: string,
+    saveUpdatedConfigFunc: () => Promise<any>
+  ) {
+    super();
+    this.kind = "koofr";
+    this.koofrConfig = koofrConfig;
+    this.remoteBaseDir = this.koofrConfig.remoteBaseDir || vaultName || "";
+    this.vaultFolderExists = false;
+    this.saveUpdatedConfigFunc = saveUpdatedConfigFunc;
+    this.placeID = this.koofrConfig.mountID;
+    const client = createClient<paths>({ baseUrl: this.koofrConfig.api });
+    client.use(getAuthMiddleware(this.koofrConfig, saveUpdatedConfigFunc));
+    this.client = client;
+  }
+
+  async _init() {
+    if (this.koofrConfig.refreshToken === "") {
+      throw Error(`You have not auth yet!`);
+    }
+
+    if (this.placeID === undefined || this.placeID === "") {
+      const { data, error } = await this.client.GET("/api/v2.1/places");
+      const primaryPlaceID = data?.places.filter((x) => x.isPrimary)[0].id;
+      this.placeID = primaryPlaceID ?? "";
+
+      if (this.placeID === "") {
+        throw Error(`cannot find primary placeID`);
+      }
+    }
+
+    if (this.vaultFolderExists) {
+      // pass
+    } else {
+      const { data, error } = await this.client.GET(
+        "/api/v2.1/mounts/{mountId}/files/list",
+        {
+          params: {
+            query: {
+              path: "/",
+            },
+            path: {
+              mountId: this.placeID,
+            },
+          },
+        }
+      );
+      const x = data?.files.filter((x) => x.name === this.remoteBaseDir);
+      if ((x?.length ?? 0) > 0) {
+        this.vaultFolderExists = true;
+      } else {
+        const { data, error } = await this.client.POST(
+          "/api/v2.1/mounts/{mountId}/files/folder",
+          {
+            params: {
+              query: { path: "/" },
+              path: { mountId: this.placeID },
+            },
+            body: {
+              name: this.remoteBaseDir,
+            },
+          }
+        );
+        if (data !== undefined) {
+          this.vaultFolderExists = true;
+        } else {
+          throw Error(JSON.stringify(error));
+        }
+      }
+    }
+  }
+
+  async walk(): Promise<Entity[]> {
+    await this._init();
+    const { data, error } = await this.client.GET(
+      "/content/api/v2.1/mounts/{mountId}/files/listrecursive",
+      {
+        params: {
+          query: { path: this.remoteBaseDir },
+          path: { mountId: this.placeID },
+        },
+        parseAs: "text",
+      }
+    );
+    if (error !== undefined) {
+      throw Error(JSON.stringify(error));
+    }
+    const items = JSON.parse(
+      `[${data.trim().split("\n").join(",")}]`
+    ) as FilesListRecursiveItem[];
+    const entities = items.filter((x) => x.path !== "/").map(fromItemToEntity);
+    return entities;
+  }
+
+  async walkPartial(): Promise<Entity[]> {
+    await this._init();
+
+    const { data, error } = await this.client.GET(
+      "/api/v2.1/mounts/{mountId}/files/list",
+      {
+        params: {
+          query: { path: this.remoteBaseDir },
+          path: { mountId: this.placeID },
+        },
+      }
+    );
+    if (error !== undefined) {
+      throw Error(JSON.stringify(error));
+    }
+    const entities = data.files.map((x) => fromFileToEntity(x, ""));
+    // console.debug(entities);
+    return entities;
+  }
+
+  async stat(key: string): Promise<Entity> {
+    await this._init();
+    const { data, error } = await this.client.GET(
+      "/api/v2.1/mounts/{mountId}/files/info",
+      {
+        params: {
+          query: { path: getKoofrPath(key, this.remoteBaseDir) },
+          path: { mountId: this.placeID },
+        },
+      }
+    );
+    if (error !== undefined) {
+      throw Error(JSON.stringify(error));
+    }
+    const entity = fromFileToEntity(
+      data,
+      getKoofrPath(getParentFolder(key), this.remoteBaseDir)
+    );
+    // console.debug(entity);
+    return entity;
+  }
+
+  async mkdir(
+    key: string,
+    mtime?: number | undefined,
+    ctime?: number | undefined
+  ): Promise<Entity> {
+    await this._init();
+
+    // "abc/efg" -> "abc/"
+    const parent = getParentFolder(key);
+    const itself = key.slice(0, -1).split("/").pop()!;
+    const { data, error } = await this.client.POST(
+      "/api/v2.1/mounts/{mountId}/files/folder",
+      {
+        params: {
+          query: { path: getKoofrPath(parent, this.remoteBaseDir) },
+          path: { mountId: this.placeID },
+        },
+        body: {
+          name: itself,
+        },
+      }
+    );
+    if (error !== undefined) {
+      throw Error(JSON.stringify(error));
+    }
+    return this.stat(key);
+  }
+
+  async writeFile(
+    key: string,
+    content: ArrayBuffer,
+    mtime: number,
+    ctime: number
+  ): Promise<Entity> {
+    await this._init();
+    const itself = key.split("/").pop()!;
+    const { data, error } = await this.client.POST(
+      "/content/api/v2.1/mounts/{mountId}/files/put",
+      {
+        params: {
+          query: {
+            path: getKoofrPath(getParentFolder(key), this.remoteBaseDir),
+            filename: itself,
+            info: true,
+            overwrite: true,
+            autorename: false,
+            modified: mtime,
+          },
+          path: { mountId: this.placeID },
+        },
+
+        body: content as any,
+        bodySerializer(body) {
+          return body;
+        },
+      }
+    );
+    if (error !== undefined) {
+      throw Error(JSON.stringify(error));
+    }
+    const entity = fromFileToEntity(
+      data,
+      getKoofrPath(getParentFolder(key), this.remoteBaseDir)
+    );
+    // console.debug(entity);
+    return entity;
+  }
+
+  async readFile(key: string): Promise<ArrayBuffer> {
+    await this._init();
+    const { data, error } = await this.client.GET(
+      "/content/api/v2.1/mounts/{mountId}/files/get",
+      {
+        params: {
+          query: { path: getKoofrPath(key, this.remoteBaseDir), force: true },
+          path: { mountId: this.placeID },
+        },
+        parseAs: "arrayBuffer",
+      }
+    );
+    if (error !== undefined) {
+      throw Error(JSON.stringify(error));
+    }
+    return data;
+  }
+
+  async rename(key1: string, key2: string): Promise<void> {
+    await this._init();
+    throw new Error("Method not implemented.");
+  }
+
+  async rm(key: string): Promise<void> {
+    await this._init();
+    const { data, error } = await this.client.DELETE(
+      "/api/v2.1/mounts/{mountId}/files/remove",
+      {
+        params: {
+          query: { path: getKoofrPath(key, this.remoteBaseDir), force: true },
+          path: { mountId: this.placeID },
+        },
+      }
+    );
+    if (error !== undefined) {
+      throw Error(JSON.stringify(error));
+    }
+  }
+
+  async checkConnect(callbackFunc?: any): Promise<boolean> {
+    // if we can init, we can connect
+    try {
+      await this._init();
+      return true;
+    } catch (err) {
+      console.debug(err);
+      callbackFunc?.(err);
+      return false;
+    }
+  }
+
+  async getUserDisplayName(): Promise<string> {
+    throw new Error("Method not implemented.");
+  }
+
+  async revokeAuth(): Promise<any> {
+    throw new Error("Method not implemented.");
+  }
+
+  allowEmptyFile(): boolean {
+    return true;
+  }
+}

pro/src/fsOnedriveFull.ts

@@ -0,0 +1,948 @@
+import { CryptoProvider, PublicClientApplication } from "@azure/msal-node";
+import type { AuthenticationProvider } from "@microsoft/microsoft-graph-client";
+import type {
+  DriveItem,
+  FileSystemInfo,
+  UploadSession,
+  User,
+} from "@microsoft/microsoft-graph-types";
+import cloneDeep from "lodash/cloneDeep";
+import { request, requestUrl } from "obsidian";
+import {
+  DEFAULT_CONTENT_TYPE,
+  type Entity,
+  OAUTH2_FORCE_EXPIRE_MILLISECONDS,
+  ONEDRIVE_AUTHORITY,
+  ONEDRIVE_CLIENT_ID,
+} from "../../src/baseTypes";
+import { VALID_REQURL } from "../../src/baseTypesObs";
+import { FakeFs } from "../../src/fsAll";
+import { bufferToArrayBuffer } from "../../src/misc";
+import {
+  COMMAND_CALLBACK_ONEDRIVEFULL,
+  type OnedriveFullConfig,
+} from "./baseTypesPro";
+
+const SCOPES = ["User.Read", "Files.ReadWrite", "offline_access"]; // not using Files.ReadWrite.All
+const REDIRECT_URI = `obsidian://${COMMAND_CALLBACK_ONEDRIVEFULL}`; // diff from Onedrive (App Folder)
+
+export const DEFAULT_ONEDRIVEFULL_CONFIG: OnedriveFullConfig = {
+  accessToken: "",
+  clientID: ONEDRIVE_CLIENT_ID ?? "",
+  authority: ONEDRIVE_AUTHORITY ?? "",
+  refreshToken: "",
+  accessTokenExpiresInSeconds: 0,
+  accessTokenExpiresAtTime: 0,
+  deltaLink: "",
+  username: "",
+  credentialsShouldBeDeletedAtTime: 0,
+  emptyFile: "skip",
+  kind: "onedrivefull",
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Onedrive authorization using PKCE
+////////////////////////////////////////////////////////////////////////////////
+
+export async function getAuthUrlAndVerifier(
+  clientID: string,
+  authority: string
+) {
+  const cryptoProvider = new CryptoProvider();
+  const { verifier, challenge } = await cryptoProvider.generatePkceCodes();
+
+  const pkceCodes = {
+    challengeMethod: "S256", // Use SHA256 Algorithm
+    verifier: verifier,
+    challenge: challenge,
+  };
+
+  const authCodeUrlParams = {
+    redirectUri: REDIRECT_URI,
+    scopes: SCOPES,
+    codeChallenge: pkceCodes.challenge, // PKCE Code Challenge
+    codeChallengeMethod: pkceCodes.challengeMethod, // PKCE Code Challenge Method
+  };
+
+  const pca = new PublicClientApplication({
+    auth: {
+      clientId: clientID,
+      authority: authority,
+    },
+  });
+  const authCodeUrl = await pca.getAuthCodeUrl(authCodeUrlParams);
+
+  return {
+    authUrl: authCodeUrl,
+    verifier: verifier,
+  };
+}
+
+/**
+ * Check doc from
+ * https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow
+ * https://docs.microsoft.com/en-us/onedrive/developer/rest-api/getting-started/graph-oauth?view=odsp-graph-online#code-flow
+ */
+export interface AccessCodeResponseSuccessfulType {
+  token_type: "Bearer" | "bearer";
+  expires_in: number;
+  ext_expires_in?: number;
+  scope: string;
+  access_token: string;
+  refresh_token?: string;
+  id_token?: string;
+}
+export interface AccessCodeResponseFailedType {
+  error: string;
+  error_description: string;
+  error_codes: number[];
+  timestamp: string;
+  trace_id: string;
+  correlation_id: string;
+}
+
+export const sendAuthReq = async (
+  clientID: string,
+  authority: string,
+  authCode: string,
+  verifier: string,
+  errorCallBack: any
+) => {
+  // // original code snippets for references
+  // const authResponse = await pca.acquireTokenByCode({
+  //   redirectUri: REDIRECT_URI,
+  //   scopes: SCOPES,
+  //   code: authCode,
+  //   codeVerifier: verifier, // PKCE Code Verifier
+  // });
+  // console.info('authResponse')
+  // console.info(authResponse)
+  // return authResponse;
+
+  // Because of the CORS problem,
+  // we need to construct raw request using Obsidian request,
+  // instead of using msal
+  // https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow
+  // https://docs.microsoft.com/en-us/onedrive/developer/rest-api/getting-started/graph-oauth?view=odsp-graph-online#code-flow
+  try {
+    const rsp1 = await request({
+      url: `${authority}/oauth2/v2.0/token`,
+      method: "POST",
+      contentType: "application/x-www-form-urlencoded",
+      body: new URLSearchParams({
+        tenant: "consumers",
+        client_id: clientID,
+        scope: SCOPES.join(" "),
+        code: authCode,
+        redirect_uri: REDIRECT_URI,
+        grant_type: "authorization_code",
+        code_verifier: verifier,
+      }).toString(),
+    });
+
+    const rsp2 = JSON.parse(rsp1);
+    // console.info(rsp2);
+
+    if (rsp2.error !== undefined) {
+      return rsp2 as AccessCodeResponseFailedType;
+    } else {
+      return rsp2 as AccessCodeResponseSuccessfulType;
+    }
+  } catch (e) {
+    console.error(e);
+    await errorCallBack(e);
+  }
+};
+
+export const sendRefreshTokenReq = async (
+  clientID: string,
+  authority: string,
+  refreshToken: string
+) => {
+  // also use Obsidian request to bypass CORS issue.
+  try {
+    const rsp1 = await request({
+      url: `${authority}/oauth2/v2.0/token`,
+      method: "POST",
+      contentType: "application/x-www-form-urlencoded",
+      body: new URLSearchParams({
+        tenant: "consumers",
+        client_id: clientID,
+        scope: SCOPES.join(" "),
+        refresh_token: refreshToken,
+        grant_type: "refresh_token",
+      }).toString(),
+    });
+
+    const rsp2 = JSON.parse(rsp1);
+    // console.info(rsp2);
+
+    if (rsp2.error !== undefined) {
+      return rsp2 as AccessCodeResponseFailedType;
+    } else {
+      return rsp2 as AccessCodeResponseSuccessfulType;
+    }
+  } catch (e) {
+    console.error(e);
+    throw e;
+  }
+};
+
+export const setConfigBySuccessfullAuthInplace = async (
+  config: OnedriveFullConfig,
+  authRes: AccessCodeResponseSuccessfulType,
+  saveUpdatedConfigFunc: () => Promise<any> | undefined
+) => {
+  console.info("start updating local info of OneDrive token");
+  config.accessToken = authRes.access_token;
+  config.accessTokenExpiresAtTime =
+    Date.now() + authRes.expires_in - 5 * 60 * 1000;
+  config.accessTokenExpiresInSeconds = authRes.expires_in;
+  config.refreshToken = authRes.refresh_token!;
+
+  // manually set it expired after 80 days;
+  config.credentialsShouldBeDeletedAtTime =
+    Date.now() + OAUTH2_FORCE_EXPIRE_MILLISECONDS;
+
+  if (saveUpdatedConfigFunc !== undefined) {
+    await saveUpdatedConfigFunc();
+  }
+
+  console.info("finish updating local info of Onedrive token");
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Other usual common methods
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * This is different from Onedrive (App Folder)
+ */
+const getOnedrivePath = (fileOrFolderPath: string, remoteBaseDir: string) => {
+  // https://learn.microsoft.com/en-us/onedrive/developer/rest-api/concepts/addressing-driveitems?view=odsp-graph-online
+  const prefix = `/drive/root:/${remoteBaseDir}`;
+
+  let key = fileOrFolderPath;
+  if (fileOrFolderPath === "/" || fileOrFolderPath === "") {
+    // special
+    return prefix;
+  }
+  if (key.endsWith("/")) {
+    key = key.slice(0, key.length - 1);
+  }
+
+  if (key.startsWith("/")) {
+    console.warn(`why the path ${key} starts with '/'? but we just go on.`);
+    key = `${prefix}${key}`;
+  } else {
+    key = `${prefix}/${key}`;
+  }
+  return key;
+};
+
+const constructFromDriveItemToEntityError = (x: DriveItem) => {
+  const fullPathOriginal = `${x.parentReference?.path}/${x.name}`;
+  return `parentPath="${
+    x.parentReference?.path ?? "(no parentReference or path)"
+  }", selfName="${x.name}"`;
+};
+
+const fromDriveItemToEntity = (x: DriveItem, remoteBaseDir: string): Entity => {
+  let key = "";
+
+  // possible prefix:
+  // pure english: /drive/root:${remoteBaseDir}
+  const FIRST_COMMON_PREFIX_RAW = `/drive/root:/${remoteBaseDir}`;
+  const SECOND_COMMON_PREFIX_RAW = `/drive/root:/${encodeURIComponent(
+    remoteBaseDir
+  )}`;
+
+  if (
+    x.parentReference === undefined ||
+    x.parentReference === null ||
+    x.parentReference.path === undefined ||
+    x.parentReference.path === null
+  ) {
+    throw Error("x.parentReference.path is undefinded or null");
+  }
+  const fullPathOriginal = `${x.parentReference?.path}/${x.name}`;
+  const matchFirstPrefixRes = fullPathOriginal.startsWith(
+    FIRST_COMMON_PREFIX_RAW
+  );
+  const matchSecondPrefixRes = fullPathOriginal.startsWith(
+    SECOND_COMMON_PREFIX_RAW
+  );
+
+  if (matchFirstPrefixRes) {
+    key = fullPathOriginal.substring(FIRST_COMMON_PREFIX_RAW.length + 1);
+  } else if (matchSecondPrefixRes) {
+    key = fullPathOriginal.substring(SECOND_COMMON_PREFIX_RAW.length + 1);
+  } else {
+    throw Error(
+      `we meet file/folder and do not know how to deal with it:\n${constructFromDriveItemToEntityError(
+        x
+      )}`
+    );
+  }
+
+  const isFolder = "folder" in x;
+  if (isFolder) {
+    key = `${key}/`;
+  }
+
+  const mtimeSvr = Date.parse(x?.fileSystemInfo!.lastModifiedDateTime!);
+  const mtimeCli = Date.parse(x?.fileSystemInfo!.lastModifiedDateTime!);
+  return {
+    key: key,
+    keyRaw: key,
+    mtimeSvr: mtimeSvr,
+    mtimeCli: mtimeCli,
+    size: isFolder ? 0 : x.size!,
+    sizeRaw: isFolder ? 0 : x.size!,
+    synthesizedFile: false,
+    // hash: ?? // TODO
+  };
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// The client.
+////////////////////////////////////////////////////////////////////////////////
+
+// to adapt to the required interface
+class MyAuthProvider implements AuthenticationProvider {
+  onedriveFullConfig: OnedriveFullConfig;
+  saveUpdatedConfigFunc: () => Promise<any>;
+  constructor(
+    onedriveFullConfig: OnedriveFullConfig,
+    saveUpdatedConfigFunc: () => Promise<any>
+  ) {
+    this.onedriveFullConfig = onedriveFullConfig;
+    this.saveUpdatedConfigFunc = saveUpdatedConfigFunc;
+  }
+
+  async getAccessToken() {
+    if (
+      this.onedriveFullConfig.accessToken === "" ||
+      this.onedriveFullConfig.refreshToken === ""
+    ) {
+      throw Error("The user has not manually auth yet.");
+    }
+
+    const currentTs = Date.now();
+    if (this.onedriveFullConfig.accessTokenExpiresAtTime > currentTs) {
+      return this.onedriveFullConfig.accessToken;
+    } else {
+      // use refreshToken to refresh
+      const r = await sendRefreshTokenReq(
+        this.onedriveFullConfig.clientID,
+        this.onedriveFullConfig.authority,
+        this.onedriveFullConfig.refreshToken
+      );
+      if ((r as any).error !== undefined) {
+        const r2 = r as AccessCodeResponseFailedType;
+        throw Error(
+          `Error while refreshing accessToken: ${r2.error}, ${r2.error_codes}: ${r2.error_description}`
+        );
+      }
+      const r2 = r as AccessCodeResponseSuccessfulType;
+      this.onedriveFullConfig.accessToken = r2.access_token;
+      this.onedriveFullConfig.refreshToken = r2.refresh_token!;
+      this.onedriveFullConfig.accessTokenExpiresInSeconds = r2.expires_in;
+      this.onedriveFullConfig.accessTokenExpiresAtTime =
+        currentTs + r2.expires_in * 1000 - 60 * 2 * 1000;
+      await this.saveUpdatedConfigFunc();
+      console.info("Onedrive accessToken updated");
+      return this.onedriveFullConfig.accessToken;
+    }
+  }
+}
+
+/**
+ * to export the settings in qrcode,
+ * we want to "trim" or "shrink" the settings
+ * @param onedriveFullConfig
+ */
+export const getShrinkedSettings = (onedriveFullConfig: OnedriveFullConfig) => {
+  const config = cloneDeep(onedriveFullConfig);
+  config.accessToken = "x";
+  config.accessTokenExpiresInSeconds = 1;
+  config.accessTokenExpiresAtTime = 1;
+  return config;
+};
+
+export class FakeFsOnedriveFull extends FakeFs {
+  kind: "onedrivefull";
+  onedriveFullConfig: OnedriveFullConfig;
+  remoteBaseDir: string;
+  vaultFolderExists: boolean;
+  authGetter: MyAuthProvider;
+  saveUpdatedConfigFunc: () => Promise<any>;
+  foldersCreatedBefore: Set<string>;
+
+  constructor(
+    onedriveFullConfig: OnedriveFullConfig,
+    vaultName: string,
+    saveUpdatedConfigFunc: () => Promise<any>
+  ) {
+    super();
+    this.kind = "onedrivefull";
+    this.onedriveFullConfig = onedriveFullConfig;
+    this.remoteBaseDir =
+      this.onedriveFullConfig.remoteBaseDir || vaultName || "";
+    this.vaultFolderExists = false;
+    this.saveUpdatedConfigFunc = saveUpdatedConfigFunc;
+    this.authGetter = new MyAuthProvider(
+      onedriveFullConfig,
+      saveUpdatedConfigFunc
+    );
+    this.foldersCreatedBefore = new Set();
+  }
+
+  async _init() {
+    // check token
+    if (
+      this.onedriveFullConfig.accessToken === "" ||
+      this.onedriveFullConfig.refreshToken === ""
+    ) {
+      throw Error("The user has not manually auth yet.");
+    }
+
+    // check vault folder
+    // console.info(`checking remote has folder /${this.remoteBaseDir}`);
+    if (this.vaultFolderExists) {
+      // console.info(`already checked, /${this.remoteBaseDir} exist before`)
+    } else {
+      const k = await this._getJson("/drive/root/children");
+      // console.debug(k);
+      this.vaultFolderExists =
+        (k.value as DriveItem[]).filter((x) => x.name === this.remoteBaseDir)
+          .length > 0;
+      if (!this.vaultFolderExists) {
+        console.info(`remote does not have folder /${this.remoteBaseDir}`);
+        await this._postJson("/drive/root/children", {
+          name: `${this.remoteBaseDir}`,
+          folder: {},
+          "@microsoft.graph.conflictBehavior": "replace",
+        });
+        console.info(`remote folder /${this.remoteBaseDir} created`);
+        this.vaultFolderExists = true;
+      } else {
+        // console.info(`remote folder /${this.remoteBaseDir} exists`);
+      }
+    }
+  }
+
+  _buildUrl(pathFragOrig: string) {
+    const API_PREFIX = "https://graph.microsoft.com/v1.0";
+    let theUrl = "";
+    if (
+      pathFragOrig.startsWith("http://") ||
+      pathFragOrig.startsWith("https://")
+    ) {
+      theUrl = pathFragOrig;
+    } else {
+      const pathFrag = encodeURI(pathFragOrig);
+      theUrl = `${API_PREFIX}${pathFrag}`;
+    }
+    // we want to support file name with hash #
+    // because every url we construct here do not contain the # symbol
+    // thus it should be safe to directly replace the character
+    theUrl = theUrl.replace(/#/g, "%23");
+    // console.debug(`building url: [${pathFragOrig}] => [${theUrl}]`)
+    return theUrl;
+  }
+
+  async _getJson(pathFragOrig: string) {
+    const theUrl = this._buildUrl(pathFragOrig);
+    console.debug(`getJson, theUrl=${theUrl}`);
+    return JSON.parse(
+      await request({
+        url: theUrl,
+        method: "GET",
+        contentType: "application/json",
+        headers: {
+          Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
+          "Cache-Control": "no-cache",
+        },
+      })
+    );
+  }
+
+  async _postJson(pathFragOrig: string, payload: any) {
+    const theUrl = this._buildUrl(pathFragOrig);
+    console.debug(`postJson, theUrl=${theUrl}`);
+    return JSON.parse(
+      await request({
+        url: theUrl,
+        method: "POST",
+        contentType: "application/json",
+        body: JSON.stringify(payload),
+        headers: {
+          Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
+        },
+      })
+    );
+  }
+
+  async _patchJson(pathFragOrig: string, payload: any) {
+    const theUrl = this._buildUrl(pathFragOrig);
+    console.debug(`patchJson, theUrl=${theUrl}`);
+    return JSON.parse(
+      await request({
+        url: theUrl,
+        method: "PATCH",
+        contentType: "application/json",
+        body: JSON.stringify(payload),
+        headers: {
+          Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
+        },
+      })
+    );
+  }
+
+  async _deleteJson(pathFragOrig: string) {
+    const theUrl = this._buildUrl(pathFragOrig);
+    console.debug(`deleteJson, theUrl=${theUrl}`);
+    if (VALID_REQURL) {
+      await requestUrl({
+        url: theUrl,
+        method: "DELETE",
+        headers: {
+          Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
+        },
+      });
+    } else {
+      await fetch(theUrl, {
+        method: "DELETE",
+        headers: {
+          Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
+        },
+      });
+    }
+  }
+
+  async _putArrayBuffer(pathFragOrig: string, payload: ArrayBuffer) {
+    const theUrl = this._buildUrl(pathFragOrig);
+    console.debug(`putArrayBuffer, theUrl=${theUrl}`);
+    // TODO:
+    // 20220401: On Android, requestUrl has issue that text becomes base64.
+    // Use fetch everywhere instead!
+    // biome-ignore lint/correctness/noConstantCondition: hard code
+    if (false /*VALID_REQURL*/) {
+      const res = await requestUrl({
+        url: theUrl,
+        method: "PUT",
+        body: payload,
+        contentType: DEFAULT_CONTENT_TYPE,
+        headers: {
+          "Content-Type": DEFAULT_CONTENT_TYPE,
+          Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
+        },
+      });
+      return res.json as DriveItem | UploadSession;
+    } else {
+      const res = await fetch(theUrl, {
+        method: "PUT",
+        body: payload,
+        headers: {
+          "Content-Type": DEFAULT_CONTENT_TYPE,
+          Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
+        },
+      });
+      return (await res.json()) as DriveItem | UploadSession;
+    }
+  }
+
+  /**
+   * A specialized function to upload large files by parts
+   * @param pathFragOrig
+   * @param payload
+   * @param rangeMin
+   * @param rangeEnd the end, exclusive
+   * @param size
+   */
+  async _putUint8ArrayByRange(
+    pathFragOrig: string,
+    payload: Uint8Array,
+    rangeStart: number,
+    rangeEnd: number,
+    size: number
+  ) {
+    const theUrl = this._buildUrl(pathFragOrig);
+    console.debug(
+      `putUint8ArrayByRange, theUrl=${theUrl}, range=${rangeStart}-${
+        rangeEnd - 1
+      }, len=${rangeEnd - rangeStart}, size=${size}`
+    );
+    // NO AUTH HEADER here!
+    // TODO:
+    // 20220401: On Android, requestUrl has issue that text becomes base64.
+    // Use fetch everywhere instead!
+    // biome-ignore lint/correctness/noConstantCondition: hard code
+    if (false /*VALID_REQURL*/) {
+      const res = await requestUrl({
+        url: theUrl,
+        method: "PUT",
+        body: bufferToArrayBuffer(payload.subarray(rangeStart, rangeEnd)),
+        contentType: DEFAULT_CONTENT_TYPE,
+        headers: {
+          // no "Content-Length" allowed here
+          "Content-Range": `bytes ${rangeStart}-${rangeEnd - 1}/${size}`,
+          /* "Cache-Control": "no-cache", not allowed here!!! */
+        },
+      });
+      return res.json as DriveItem | UploadSession;
+    } else {
+      const res = await fetch(theUrl, {
+        method: "PUT",
+        body: payload.subarray(rangeStart, rangeEnd),
+        headers: {
+          "Content-Length": `${rangeEnd - rangeStart}`,
+          "Content-Range": `bytes ${rangeStart}-${rangeEnd - 1}/${size}`,
+          "Content-Type": DEFAULT_CONTENT_TYPE,
+          /* "Cache-Control": "no-cache", not allowed here!!! */
+        },
+      });
+      return (await res.json()) as DriveItem | UploadSession;
+    }
+  }
+
+  /**
+   * Use delta api to list all files and folders
+   * https://docs.microsoft.com/en-us/onedrive/developer/rest-api/api/driveitem_delta?view=odsp-graph-online
+   */
+  async walk(): Promise<Entity[]> {
+    await this._init();
+
+    const NEXT_LINK_KEY = "@odata.nextLink";
+    const DELTA_LINK_KEY = "@odata.deltaLink";
+
+    let res = await this._getJson(`/drive/root:/${this.remoteBaseDir}:/delta`);
+    const driveItems = res.value as DriveItem[];
+    // console.debug(driveItems);
+
+    while (NEXT_LINK_KEY in res) {
+      res = await this._getJson(res[NEXT_LINK_KEY]);
+      driveItems.push(...cloneDeep(res.value as DriveItem[]));
+    }
+
+    // lastly we should have delta link?
+    if (DELTA_LINK_KEY in res) {
+      this.onedriveFullConfig.deltaLink = res[DELTA_LINK_KEY];
+      await this.saveUpdatedConfigFunc();
+    }
+
+    // unify everything to Entity
+    const unifiedContents = driveItems
+      .map((x) => fromDriveItemToEntity(x, this.remoteBaseDir))
+      .filter((x) => x.key !== "/");
+
+    return unifiedContents;
+  }
+
+  async walkPartial(): Promise<Entity[]> {
+    await this._init();
+
+    const DELTA_LINK_KEY = "@odata.deltaLink";
+
+    const res = await this._getJson(
+      `/drive/root:/${this.remoteBaseDir}:/delta`
+    );
+    const driveItems = res.value as DriveItem[];
+    // console.debug(driveItems);
+
+    // lastly we should have delta link?
+    if (DELTA_LINK_KEY in res) {
+      this.onedriveFullConfig.deltaLink = res[DELTA_LINK_KEY];
+      await this.saveUpdatedConfigFunc();
+    }
+
+    // unify everything to Entity
+    const unifiedContents = driveItems
+      .map((x) => fromDriveItemToEntity(x, this.remoteBaseDir))
+      .filter((x) => x.key !== "/");
+
+    return unifiedContents;
+  }
+
+  async stat(key: string): Promise<Entity> {
+    await this._init();
+    return await this._statFromRoot(getOnedrivePath(key, this.remoteBaseDir));
+  }
+
+  async _statFromRoot(key: string): Promise<Entity> {
+    // console.info(`remotePath=${remotePath}`);
+    const rsp = await this._getJson(
+      `${key}?$select=cTag,eTag,fileSystemInfo,folder,file,name,parentReference,size`
+    );
+    // console.info(rsp);
+    const driveItem = rsp as DriveItem;
+    const res = fromDriveItemToEntity(driveItem, this.remoteBaseDir);
+    // console.info(res);
+    return res;
+  }
+
+  async mkdir(key: string, mtime?: number, ctime?: number): Promise<Entity> {
+    if (!key.endsWith("/")) {
+      throw Error(`you should not call mkdir on ${key}`);
+    }
+    await this._init();
+    const uploadFolder = getOnedrivePath(key, this.remoteBaseDir);
+    console.debug(`mkdir uploadFolder=${uploadFolder}`);
+    return await this._mkdirFromRoot(uploadFolder, mtime, ctime);
+  }
+
+  async _mkdirFromRoot(
+    key: string,
+    mtime?: number,
+    ctime?: number
+  ): Promise<Entity> {
+    // console.debug(`foldersCreatedBefore=${Array.from(this.foldersCreatedBefore)}`);
+    if (this.foldersCreatedBefore.has(key)) {
+      // created, pass
+      // console.debug(`folder ${key} created.`)
+    } else {
+      // https://stackoverflow.com/questions/56479865/creating-nested-folders-in-one-go-onedrive-api
+      // use PATCH to create folder recursively!!!
+      const playload: any = {
+        folder: {},
+        "@microsoft.graph.conflictBehavior": "replace",
+      };
+      const fileSystemInfo: Record<string, string> = {};
+      if (mtime !== undefined && mtime !== 0) {
+        const mtimeStr = new Date(mtime).toISOString();
+        fileSystemInfo["lastModifiedDateTime"] = mtimeStr;
+      }
+      if (ctime !== undefined && ctime !== 0) {
+        const ctimeStr = new Date(ctime).toISOString();
+        fileSystemInfo["createdDateTime"] = ctimeStr;
+      }
+      if (Object.keys(fileSystemInfo).length > 0) {
+        playload["fileSystemInfo"] = fileSystemInfo;
+      }
+      await this._patchJson(key, playload);
+    }
+    const res = await this._statFromRoot(key);
+    return res;
+  }
+
+  async writeFile(
+    key: string,
+    content: ArrayBuffer,
+    mtime: number,
+    ctime: number
+  ): Promise<Entity> {
+    if (key.endsWith("/")) {
+      throw Error(`you should not call writeFile on ${key}`);
+    }
+    await this._init();
+    const uploadFile = getOnedrivePath(key, this.remoteBaseDir);
+    console.debug(`uploadFile=${uploadFile}`);
+    return await this._writeFileFromRoot(
+      uploadFile,
+      content,
+      mtime,
+      ctime,
+      key,
+      this.onedriveFullConfig.emptyFile
+    );
+  }
+
+  async _writeFileFromRoot(
+    key: string,
+    content: ArrayBuffer,
+    mtime: number,
+    ctime: number,
+    origKey: string,
+    emptyFile: "skip" | "error"
+  ): Promise<Entity> {
+    if (content.byteLength === 0) {
+      if (emptyFile === "error") {
+        throw Error(
+          `${origKey}: Empty file is not allowed in OneDrive, and please write something in it.`
+        );
+      } else {
+        return {
+          key: origKey,
+          keyRaw: origKey,
+          mtimeSvr: mtime,
+          mtimeCli: mtime,
+          size: 0,
+          sizeRaw: 0,
+          synthesizedFile: true,
+          // hash: ?? // TODO
+        };
+      }
+    }
+
+    const ctimeStr = new Date(ctime).toISOString();
+    const mtimeStr = new Date(mtime).toISOString();
+
+    // no need to create parent folders firstly, cool!
+
+    // hard code range size
+    const MIN_UNIT = 327680; // bytes in msft doc, about 0.32768 MB
+    const RANGE_SIZE = MIN_UNIT * 20; // about 6.5536 MB
+    const DIRECT_UPLOAD_MAX_SIZE = 1000 * 1000 * 4; // 4 Megabyte
+
+    if (content.byteLength < DIRECT_UPLOAD_MAX_SIZE) {
+      // directly using put!
+      await this._putArrayBuffer(
+        `${key}:/content?${new URLSearchParams({
+          "@microsoft.graph.conflictBehavior": "replace",
+        })}`,
+        content
+      );
+      if (mtime !== 0 && ctime !== 0) {
+        await this._patchJson(key, {
+          fileSystemInfo: {
+            lastModifiedDateTime: mtimeStr,
+            createdDateTime: ctimeStr,
+          } as FileSystemInfo,
+        });
+      }
+    } else {
+      // upload large files!
+      // ref: https://docs.microsoft.com/en-us/onedrive/developer/rest-api/api/driveitem_createuploadsession?view=odsp-graph-online
+
+      // 1. create uploadSession
+      // uploadFile already starts with /drive/root:/${remoteBaseDir}
+      let playload: any = {
+        item: {
+          "@microsoft.graph.conflictBehavior": "replace",
+        },
+      };
+      if (mtime !== 0 && ctime !== 0) {
+        playload = {
+          item: {
+            "@microsoft.graph.conflictBehavior": "replace",
+
+            // this is only possible using uploadSession
+            fileSystemInfo: {
+              lastModifiedDateTime: mtimeStr,
+              createdDateTime: ctimeStr,
+            } as FileSystemInfo,
+          },
+        };
+      }
+      const s: UploadSession = await this._postJson(
+        `${key}:/createUploadSession`,
+        playload
+      );
+      const uploadUrl = s.uploadUrl!;
+      console.debug("uploadSession = ");
+      console.debug(s);
+
+      // 2. upload by ranges
+      // convert to uint8
+      const uint8 = new Uint8Array(content);
+
+      // upload the ranges one by one
+      let rangeStart = 0;
+      while (rangeStart < uint8.byteLength) {
+        await this._putUint8ArrayByRange(
+          uploadUrl,
+          uint8,
+          rangeStart,
+          Math.min(rangeStart + RANGE_SIZE, uint8.byteLength),
+          uint8.byteLength
+        );
+        rangeStart += RANGE_SIZE;
+      }
+    }
+
+    const res = await this._statFromRoot(key);
+    return res;
+  }
+
+  async readFile(key: string): Promise<ArrayBuffer> {
+    await this._init();
+    if (key.endsWith("/")) {
+      throw new Error(`you should not call readFile on folder ${key}`);
+    }
+    const downloadFile = getOnedrivePath(key, this.remoteBaseDir);
+    return await this._readFileFromRoot(downloadFile);
+  }
+
+  async _readFileFromRoot(key: string): Promise<ArrayBuffer> {
+    const rsp = await this._getJson(
+      `${key}?$select=@microsoft.graph.downloadUrl`
+    );
+    const downloadUrl: string = rsp["@microsoft.graph.downloadUrl"];
+    // biome-ignore lint/correctness/noConstantCondition: <explanation>
+    if (false /*VALID_REQURL*/) {
+      const content = (
+        await requestUrl({
+          url: downloadUrl,
+          headers: { "Cache-Control": "no-cache" },
+        })
+      ).arrayBuffer;
+      return content;
+    } else {
+      // cannot set no-cache here, will have cors error
+      const content = await (
+        await fetch(downloadUrl, { cache: "no-store" })
+      ).arrayBuffer();
+      return content;
+    }
+  }
+
+  async rename(key1: string, key2: string): Promise<void> {
+    if (key1 === "" || key1 === "/" || key2 === "" || key2 === "/") {
+      return;
+    }
+    const remoteFileName1 = getOnedrivePath(key1, this.remoteBaseDir);
+    const remoteFileName2 = getOnedrivePath(key2, this.remoteBaseDir);
+    await this._init();
+    await this._patchJson(remoteFileName1, {
+      name: remoteFileName2,
+    });
+  }
+
+  async rm(key: string): Promise<void> {
+    if (key === "" || key === "/") {
+      return;
+    }
+    const remoteFileName = getOnedrivePath(key, this.remoteBaseDir);
+
+    await this._init();
+    await this._deleteJson(remoteFileName);
+  }
+
+  async checkConnect(callbackFunc?: any): Promise<boolean> {
+    try {
+      const k = await this.getUserDisplayName();
+      return k !== "<unknown display name>";
+    } catch (err) {
+      console.debug(err);
+      callbackFunc?.(err);
+      return false;
+    }
+  }
+
+  async getUserDisplayName() {
+    await this._init();
+    const res: User = await this._getJson("/me?$select=displayName");
+    return res.displayName || "<unknown display name>";
+  }
+
+  /**
+   *
+   * https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-protocols-oidc#send-a-sign-out-request
+   * https://docs.microsoft.com/en-us/graph/api/user-revokesigninsessions
+   * https://docs.microsoft.com/en-us/graph/api/user-invalidateallrefreshtokens
+   */
+  async revokeAuth() {
+    // await this._init();
+    // await this._postJson("/me/revokeSignInSessions", {});
+    throw new Error("Method not implemented.");
+  }
+
+  async getRevokeAddr() {
+    return "https://account.live.com/consent/Manage";
+  }
+
+  allowEmptyFile(): boolean {
+    return false;
+  }
+}

pro/src/fsPCloud.ts

@@ -285,6 +285,10 @@ const fromNestedFolderToEntityListAndCache = (
   };
 };
 
+const getPCloudPath = (fileOrFolderPath: string, remoteBaseDir: string) => {
+  return `/${remoteBaseDir}/${fileOrFolderPath}`;
+};
+
 export class FakeFsPCloud extends FakeFs {
   kind: string;
 
@@ -464,25 +468,6 @@ export class FakeFsPCloud extends FakeFs {
 
     await this._init();
 
-    if (content.byteLength === 0) {
-      if (this.pCloudConfig.emptyFile === "error") {
-        throw Error(
-          `${key}: Empty file is not allowed in pCloud, and please write something in it.`
-        );
-      } else {
-        return {
-          key: key,
-          keyRaw: key,
-          mtimeSvr: mtime,
-          mtimeCli: mtime,
-          size: 0,
-          sizeRaw: 0,
-          synthesizedFile: true,
-          // hash: ?? // TODO
-        };
-      }
-    }
-
     const prevCachedEntity: PCloudEntity | undefined =
       this.keyToPCloudEntity[key];
     const prevFileID: number | undefined = prevCachedEntity?.id;
@@ -522,15 +507,51 @@ export class FakeFsPCloud extends FakeFs {
     });
     const apiUrl = `https://${this.pCloudConfig.hostname}/uploadfile?${params}`;
 
-    const rsp = await fetch(apiUrl, {
-      method: "PUT",
-      body: content,
-    });
-    const f: StatRawResponse = await rsp.json();
-    const entity = fromRawResponseToEntity(f.metadata[0], parentFolderPath);
-    // console.debug(entity);
-    this.keyToPCloudEntity[key] = entity;
-    return entity;
+    if (content.byteLength > 0) {
+      const rsp = await fetch(apiUrl, {
+        method: "PUT",
+        body: content,
+      });
+      const f: StatRawResponse = await rsp.json();
+      const entity = fromRawResponseToEntity(f.metadata[0], parentFolderPath);
+      // console.debug(entity);
+      this.keyToPCloudEntity[key] = entity;
+      return entity;
+    } else {
+      // no idea why pcloud doesn't work for empty files
+      // it can be uploaded successfully but the call doesn't end
+      // we abort it and stat it manually.
+      // console.warn(`uploading empty file ${key}`);
+      const controller = new AbortController();
+      const timeoutMs = 300; // just a random reasonable number
+      const id = setTimeout(() => controller.abort(), timeoutMs);
+      try {
+        const rsp = await fetch(apiUrl, {
+          method: "PUT",
+          body: content,
+          signal: controller.signal,
+        });
+      } catch (e) {
+        // console.warn(`we abort the request of uploading empty file ${key}:`);
+        // console.warn(e);
+      } finally {
+        clearTimeout(id);
+      }
+
+      // raw stat here
+      // https://docs.pcloud.com/methods/file/stat.html
+      const params = new URLSearchParams({
+        access_token: await this._getAccessToken(),
+        path: getPCloudPath(key, this.remoteBaseDir),
+      });
+      const apiUrlStat = `https://${this.pCloudConfig.hostname}/stat?${params}`;
+      const rsp2 = await fetch(apiUrlStat);
+      const f = await rsp2.json();
+      const entity = fromRawResponseToEntity(f.metadata, parentFolderPath);
+      // console.warn(entity);
+      this.keyToPCloudEntity[key] = entity;
+      return entity;
+    }
   }
 
   async readFile(key: string): Promise<ArrayBuffer> {
@@ -602,6 +623,6 @@ export class FakeFsPCloud extends FakeFs {
   }
 
   allowEmptyFile(): boolean {
-    return false;
+    return true;
   }
 }

pro/src/langs/en.json

@@ -7,6 +7,11 @@
   "protocol_pro_connect_fail": "Something went wrong from response from Remotely Save official website. Maybe the network connection is not good. Maybe you rejected the auth?",
   "protocol_pro_connect_succ_revoke": "You've connected as user {{email}}. If you want to disconnect, click this button.",
 
+  "protocol_onedrivefull_connecting": "Connecting to OneDrive...\nPlease DO NOT close this modal.",
+  "protocol_onedrivefull_connect_succ_revoke": "You've connected as user {{username}}. If you want to disconnect, click this button.",
+  "protocol_onedrivefull_connect_fail": "Something went wrong from response from OneDrive. Maybe you rejected the auth?",
+  "protocol_onedrivefull_connect_unknown": "Do not know how to deal with the callback: {{params}}",
+
   "protocol_box_connecting": "Connectting",
   "protocol_box_connect_manualinput_succ": "You've connected",
   "protocol_box_connect_fail": "Something went wrong from response from Box official website. Maybe the network connection is not good. Maybe you rejected the auth?",
@@ -22,6 +27,23 @@
   "protocol_yandexdisk_connect_fail": "Something went wrong from response from Yandex Disk website. Maybe the network connection is not good. Maybe you rejected the auth?",
   "protocol_yandexdisk_connect_succ_revoke": "You've connected. If you want to disconnect, click this button.",
 
+  "protocol_koofr_connecting": "Connectting",
+  "protocol_koofr_connect_manualinput_succ": "You've connected",
+  "protocol_koofr_connect_fail": "Something went wrong from response from Koofr website. Maybe the network connection is not good. Maybe you rejected the auth?",
+  "protocol_koofr_connect_succ_revoke": "You've connected. If you want to disconnect, click this button.",
+
+  "modal_onedrivefullauth_shortdesc": "Currently only OneDrive for personal is supported. OneDrive for Business is NOT supported (yet).\nVisit the address in a browser, and follow the steps.\nFinally you should be redirected to Obsidian.",
+  "modal_onedrivefullauth_shortdesc_linux": "It seems that you are using Obsidian on Linux, and you might not be able to jump back here properly. Please consider <a href=\"https://github.com/remotely-save/remotely-save/issues/415\">using</a> the flatpack version of Obsidian, or creating an <a href=\"https://github.com/remotely-save/remotely-save/blob/master/docs/linux.md\"><code>obsidian.desktop</code> file</a>.",
+  "modal_onedrivefullauth_copybutton": "Click to copy the auth url",
+  "modal_onedrivefullauth_copynotice": "The auth url is copied to the clipboard!",
+  "modal_onedrivefullrevokeauth_step1": "Step 1: Go to the following address, click the \"Edit\" button for the plugin, then click \"Remove these permissions\" button on the page.",
+  "modal_onedrivefullrevokeauth_step2": "Step 2: Click the button below, to clean the locally-saved login credentials.",
+  "modal_onedrivefullrevokeauth_clean": "Clean Locally-Saved Login Credentials",
+  "modal_onedrivefullrevokeauth_clean_desc": "You need to click the button.",
+  "modal_onedrivefullrevokeauth_clean_button": "Clean",
+  "modal_onedrivefullrevokeauth_clean_notice": "Cleaned!",
+  "modal_onedrivefullrevokeauth_clean_fail": "Something goes wrong while revoking.",
+
   "modal_googledriveauth_tutorial": "<p>Please firstly go to the address, then go on the auth flow. In the end, you will see a code, please paste that code here and submit.</p>",
   "modal_googledriveauth_copybutton": "Click to copy the auth url",
   "modal_googledriveauth_copynotice": "The auth url is copied to the clipboard!",
@@ -76,6 +98,24 @@
   "modal_yandexdiskrevokeauth_clean_notice": "Cleaned!",
   "modal_yandexdiskrevokeauth_clean_fail": "Something goes wrong while revoking.",
 
+  "modal_koofrauth_tutorial": "<p>Please firstly go to the address, then go on the auth flow. In the end, you will be redirected to here.</p>",
+  "modal_koofrauth_copybutton": "Click to copy the auth url",
+  "modal_koofrauth_copynotice": "The auth url is copied to the clipboard!",
+  "modal_koofrrevokeauth_step1": "Step 1: Go to the following address, you can remove the connection there.",
+  "modal_koofrrevokeauth_step2": "Step 2: Click the button below, to clean the locally-saved login credentials.",
+  "modal_koofrrevokeauth_clean": "Clean Locally-Saved Login Credentials",
+  "modal_koofrrevokeauth_clean_desc": "You need to click the button.",
+  "modal_koofrrevokeauth_clean_button": "Clean",
+  "modal_koofrrevokeauth_clean_notice": "Cleaned!",
+  "modal_koofrrevokeauth_clean_fail": "Something goes wrong while revoking.",
+
+  "modal_remoteprefix_azureblobstorage_title": "You are changing the remote prefix config",
+  "modal_remoteprefix_azureblobstorage_shortdesc": "1. The plugin would NOT automatically move the content from the old directory to the new one directly on the remote. Everything syncs from the beginning again.\n2. If you set the string to the empty, the prefix will be the vault name.\n3. The remote directory name itself would not be encrypted even you've set an E2E password.\n4. Some special char like '?', '/', '\\' are not allowed. Spaces in the beginning or in the end are also trimmed.",
+  "modal_remoteprefix_azureblobstorage_invaliddirhint": "Your input contains special characters like '?', '/', '\\' which are not allowed.",
+  "modal_remoteprefix_azureblobstorage_tosave": "The prefix to save is \"{{{prefix}}}\"",
+  "modal_remoteprefix_azureblobstorage_secondconfirm_change": "Confirm To Change",
+  "modal_remoteprefix_azureblobstorage_notice": "New remote prefix config saved!",
+
   "modal_prorevokeauth": "Revoke auth by clicking here and follow the steps.",
   "modal_prorevokeauth_clean": "Clean",
   "modal_prorevokeauth_clean_desc": "Clean local auth record",
@@ -89,6 +129,29 @@
   "modal_proauth_maualinput_notice": "Trying to connect, wait...",
   "modal_proauth_maualinput_conn_fail": "Failed to connect",
 
+  "settings_onedrivefull": "Remote For Onedrive (for personal) (Full)",
+  "settings_chooseservice_onedrivefull": "OneDrive for personal (Full) (PRO)",
+  "settings_onedrivefull_disclaimer1": "Disclaimer: This app is NOT an official Microsoft / OneDrive product.",
+  "settings_onedrivefull_disclaimer2": "Disclaimer: The information is stored locally. Other malicious/harmful/faulty plugins could read the info. If you see any unintentional access to your Onedrive, please immediately disconnect this app on https://microsoft.com/consent .",
+  "settings_onedrivefull_folder": "We will create and sync inside the folder /{{remoteBaseDir}} on your OneDrive.",
+  "settings_onedrivefull_nobiz": "Currently only OneDrive for personal is supported. OneDrive for Business is NOT supported (yet).",
+  "settings_onedrivefull_pro_desc": "<p><strong>!!It's a PRO feature of Remotely Save! You need a Remotely Save online account for this feature!!</strong>(<a href=\"#settings-pro\">scroll down</a> for more info about PRO account.)</p>",
+  "settings_onedrivefull_notshowuphint": "OneDrive for personal (Full) Settings Not Available",
+  "settings_onedrivefull_notshowuphint_desc": "OneDrive for personal (Full) settings are not available, because you haven't subscribed to the PRO feature in your Remotely Save account.",
+  "settings_onedrivefull_notshowuphint_view_pro": "View PRO Settings",
+  "settings_onedrivefull_revoke": "Revoke Auth",
+  "settings_onedrivefull_revoke_desc": "You've connected as user {{username}}. If you want to disconnect, click this button.",
+  "settings_onedrivefull_revoke_button": "Revoke Auth",
+  "settings_onedrivefull_auth": "Auth",
+  "settings_onedrivefull_auth_desc": "Auth.",
+  "settings_onedrivefull_auth_button": "Auth",
+  "settings_onedrivefull_connect_succ": "Great! We can connect to OneDrive!",
+  "settings_onedrivefull_connect_fail": "We cannot connect to OneDrive.",
+  "settings_onedrivefull_emptyfile": "Empty File Handling",
+  "settings_onedrivefull_emptyfile_desc": "OneDrive doesn't allow uploading empty file (even in its official website). Do you want to show up errors or silently skip the empty files?",
+  "settings_onedrivefull_emptyfile_skip": "Skip",
+  "settings_onedrivefull_emptyfile_error": "Error and abort",
+
   "settings_googledrive": "Google Drive (PRO) (beta)",
   "settings_chooseservice_googledrive": "Google Drive (PRO) (beta)",
   "settings_googledrive_disclaimer1": "Disclaimer: This app is NOT an official Google product. The app just uses Google Drive's public api.",
@@ -147,7 +210,6 @@
   "settings_pcloud_connect_succ": "Great! We can connect to pCloud!",
   "settings_pcloud_connect_fail": "We cannot connect to pCloud.",
 
-  
   "settings_yandexdisk": "Yandex Disk (PRO) (beta)",
   "settings_chooseservice_yandexdisk": "Yandex Disk (PRO) (beta)",
   "settings_yandexdisk_disclaimer1": "Disclaimer: This app is NOT an official Yandex Disk product. The app just uses Yandex Disk's public api.",
@@ -166,10 +228,55 @@
   "settings_yandexdisk_connect_succ": "Great! We can connect to Yandex Disk!",
   "settings_yandexdisk_connect_fail": "We cannot connect to Yandex Disk.",
 
+  "settings_koofr": "Koofr (PRO) (beta)",
+  "settings_chooseservice_koofr": "Koofr (PRO) (beta)",
+  "settings_koofr_disclaimer1": "Disclaimer: This app is NOT an official Koofr product. The app just uses Koofr's public api.",
+  "settings_koofr_disclaimer2": "Disclaimer: The information is stored locally. Other malicious/harmful/faulty plugins could read the info. If you see any unintentional access to your Koofr, please immediately disconnect this app on https://app.koofr.net/app/admin/preferences/security .",
+  "settings_koofr_pro_desc": "<p><strong>!!It's a PRO feature of Remotely Save! You need a Remotely Save online account for this feature!!</strong>(<a href=\"#settings-pro\">scroll down</a> for more info about PRO account.)</p>",
+  "settings_koofr_notshowuphint": "Koofr Settings Not Available",
+  "settings_koofr_notshowuphint_desc": "Koofr settings are not available, because you haven't subscribed to the PRO feature in your Remotely Save account.",
+  "settings_koofr_notshowuphint_view_pro": "View PRO Settings",
+  "settings_koofr_folder": "We will create and sync inside the folder {{remoteBaseDir}} on your Koofr. DO NOT create this folder by yourself manually.",
+  "settings_koofr_revoke": "Revoke Auth",
+  "settings_koofr_revoke_desc": "You've connected. If you want to disconnect, click this button.",
+  "settings_koofr_revoke_button": "Revoke Auth",
+  "settings_koofr_auth": "Auth",
+  "settings_koofr_auth_desc": "Auth.",
+  "settings_koofr_auth_button": "Auth",
+  "settings_koofr_connect_succ": "Great! We can connect to Koofr!",
+  "settings_koofr_connect_fail": "We cannot connect to Koofr.",
+
+  "settings_azureblobstorage": "Azure Blob Storage (PRO) (alpha)",
+  "settings_chooseservice_azureblobstorage": "Azure Blob Storage (PRO) (alpha)",
+  "settings_azureblobstorage_disclaimer1": "Disclaimer: This app is NOT an official Microsoft / Azure product. The app just uses Azure Blob Storage's public api.",
+  "settings_azureblobstorage_disclaimer2": "Disclaimer: The information is stored locally. Other malicious/harmful/faulty plugins could read the info. If you see any unintentional access to your Azure Blob Storage, please immediately delete the SAS Url and <a href=\"https://github.com/remotely-save/remotely-save/blob/master/docs/remote_services/azureblobstorage/README.md\">try to change your policy</a> or account info.",
+  "settings_azureblobstorage_pro_desc": "<p><strong>!!It's a PRO feature of Remotely Save! You need a Remotely Save online account for this feature!!</strong>(<a href=\"#settings-pro\">scroll down</a> for more info about PRO account.)</p>",
+  "settings_azureblobstorage_notshowuphint": "Azure Blob Storage Settings Not Available",
+  "settings_azureblobstorage_notshowuphint_desc": "Azure Blob Storage settings are not available, because you haven't subscribed to the PRO feature in your Remotely Save account.",
+  "settings_azureblobstorage_notshowuphint_view_pro": "View PRO Settings",
+  "settings_azureblobstorage_folder": "We will create and sync inside the prefix {{remoteBaseDir}} on your Azure Blob Storage.",
+  "settings_azureblobstorage_containersasurl": "Container SAS Url",
+  "settings_azureblobstorage_containersasurl_desc": "The only connction method is providing the Container SAS Url. Remember to configure CORS as well. Please read the <a href=\"https://github.com/remotely-save/remotely-save/blob/master/docs/remote_services/azureblobstorage/README.md\">doc</a> for details.",
+  "settings_azureblobstorage_containername": "Container Name",
+  "settings_azureblobstorage_containername_desc": "Input your container name here.",
+  "settings_azureblobstorage_remoteprefix": "Remote Prefix",
+  "settings_azureblobstorage_remoteprefix_desc": "Input your remote prefix of blobs for this vault. If you set this value to empty, the <strong>vault name</strong> will be used as prefix. <strong>Empty prefix is not allowed and not settable here.</strong>",
+  "settings_azureblobstorage_parts": "Parts Concurrency",
+  "settings_azureblobstorage_parts_desc": "Large files are split into small parts to upload. How many parts do you want to upload in parallel at most?",
+  "settings_azureblobstorage_generatefolderobject": "Generate Folder Object Or Not",
+  "settings_azureblobstorage_generatefolderobject_desc": "Azure Blob Storage doesn't have \"real\" folder. If you set \"Generate\" here, the plugin will upload a zero-byte object endding with \"/\" to represent the folder. By default, the plugin skips generating folder object.",
+  "settings_azureblobstorage_generatefolderobject_notgenerate": "Not generate (default)",
+  "settings_azureblobstorage_generatefolderobject_generate": "Generate",
+  "settings_azureblobstorage_connect_succ": "Great! We can connect to Azure Blob Storage!",
+  "settings_azureblobstorage_connect_fail": "We cannot connect to Azure Blob Storage.",
+
+  "settings_export_onedrivefull_button": "Export Onedrive (Full) Part",
   "settings_export_googledrive_button": "Export Google Drive Part",
   "settings_export_box_button": "Export Box Part",
   "settings_export_pcloud_button": "Export pCloud Part",
   "settings_export_yandexdisk_button": "Export Yandex Disk Part",
+  "settings_export_koofr_button": "Export Koofr Part",
+  "settings_export_azureblobstorage_button": "Export Azure Blob Storage Part",
 
   "settings_pro": "Account (for PRO features)",
   "settings_pro_tutorial": "<p>Using <stong>basic</strong> features of Remotely Save is <strong>FREE</strong> and do <strong>NOT</strong> need an account.</p><p>However, you will <strong>need</strong> an online account and <strong>PAY</strong> for the <strong>PRO</strong> features such as smart conflict.</p><p>Firstly please click the button to sign up and sign in to the website: <a href=\"https://remotelysave.com\">https://remotelysave.com</a>. Notice: It's different from, and NOT affiliated with Obsidian account.</p><p>Secondly please \"connect\" your local device to your online account.",

pro/src/langs/zh_cn.json

@@ -7,6 +7,11 @@
   "protocol_pro_connect_fail": "Remotely Save 官网返回错误。可能是网络连接不稳定。也可能是您拒绝了授权？",
   "protocol_pro_connect_succ_revoke": "您已连接上账号 {{email}}。如果要取消连接，请点击此按钮。",
 
+  "protocol_onedrivefull_connecting": "正在连接 OneDrive……\n请不要关闭此弹窗。",
+  "protocol_onedrivefull_connect_succ_revoke": "您已作为用户 {{username}} 连接上了。如果您想取消连接，请点击此按钮。",
+  "protocol_onedrivefull_connect_fail": "OneDrive 的回调请求有点异常。您是否拒绝了鉴权？",
+  "protocol_onedrivefull_connect_unknown": "不知道如何处理此 callback：{{params}}",
+
   "protocol_box_connecting": "正在连接",
   "protocol_box_connect_manualinput_succ": "连接成功",
   "protocol_box_connect_fail": "Box 官网返回错误。可能是网络连接不稳定。也可能是您拒绝了授权？",
@@ -22,6 +27,23 @@
   "protocol_yandexdisk_connect_fail": "Yandex Disk 官网返回错误。可能是网络连接不稳定。也可能是您拒绝了授权？",
   "protocol_yandexdisk_connect_succ_revoke": "您已连接上账号。如果要取消连接，请点击此按钮。",
 
+  "protocol_koofr_connecting": "正在连接",
+  "protocol_koofr_connect_manualinput_succ": "连接成功",
+  "protocol_koofr_connect_fail": "Yandex Disk 官网返回错误。可能是网络连接不稳定。也可能是您拒绝了授权？",
+  "protocol_koofr_connect_succ_revoke": "您已连接上账号。如果要取消连接，请点击此按钮。",
+
+  "modal_onedrivefullauth_shortdesc": "现在只支持个人版 OneDrive，（暂）不支持企业版。\n在浏览器中访问以下地址，然后按照网页提示操作。\n到了最后，您应该会被自动重定向回来 Obsidian。",
+  "modal_onedrivefullauth_shortdesc_linux": "您正在用 Linux，有可能无法跳转回来。请考虑<a href=\"https://github.com/remotely-save/remotely-save/issues/415\">使用</a> flatpack 版本的 Obsidian，或创建 <a href=\"https://github.com/remotely-save/remotely-save/blob/master/docs/linux.md\"><code>obsidian.desktop</code> 文件</a>。",
+  "modal_onedrivefullauth_copybutton": "点击此按钮从而复制鉴权 url",
+  "modal_onedrivefullauth_copynotice": "鉴权 url 已复制到剪贴板！",
+  "modal_onedrivefullrevokeauth_step1": "第 1 步：用浏览器打开以下地址，点击本插件对应的“Edit”按钮，点击“Remove these permissions”按钮。",
+  "modal_onedrivefullrevokeauth_step2": "第 2 步：点击以下按钮，清理本地保存的登录信息。",
+  "modal_onedrivefullrevokeauth_clean": "清理本地保存的登录信息",
+  "modal_onedrivefullrevokeauth_clean_desc": "您需要点击“清理”按钮。",
+  "modal_onedrivefullrevokeauth_clean_button": "清理",
+  "modal_onedrivefullrevokeauth_clean_notice": "已清理！",
+  "modal_onedrivefullrevokeauth_clean_fail": "鉴权途中出错了。",
+
   "modal_googledriveauth_tutorial": "<p>请访问此网址，然后会进入授权流程。最后，您会看到一个码，请复制粘贴到这里然后提交。</p>",
   "modal_googledriveauth_copybutton": "点击以复制网址",
   "modal_googledriveauth_copynotice": "网址已复制！",
@@ -81,6 +103,30 @@
   "modal_yandexdiskrevokeauth_clean_notice": "已清理！",
   "modal_yandexdiskrevokeauth_clean_fail": "清理授权时候发生了错误。",
 
+  "modal_koofrauth_tutorial": "<p>请访问此网址，然后会进入授权流程。最后，您会被重定向回来。</p>",
+  "modal_koofrauth_copybutton": "点击以复制网址",
+  "modal_koofrauth_copynotice": "网址已复制！",
+  "modal_koofr_maualinput": "网站上的码",
+  "modal_koofr_maualinput_desc": "请粘贴授权流程最后的那个码，然后点击确认。",
+  "modal_koofr_maualinput_notice": "正在尝试连接 Yandex Disk 并更新授权信息......",
+  "modal_koofr_maualinput_succ_notice": "很好！授权信息已更新！",
+  "modal_koofr_maualinput_fail_notice": "更新授权信息失败。请稍后重试。",
+  "modal_koofrrevokeauth_step1": "第 1 步：访问以下网址，可以删除连接。",
+  "modal_koofrrevokeauth_step2": "第 2 步：点击以下按钮，从而清理本地的登录信息。",
+  "modal_koofrrevokeauth_clean": "清理本地登录信息",
+  "modal_koofrrevokeauth_clean_desc": "您需要点击此按钮。",
+  "modal_koofrrevokeauth_clean_button": "清理",
+  "modal_koofrrevokeauth_clean_notice": "已清理！",
+  "modal_koofrrevokeauth_clean_fail": "清理授权时候发生了错误。",
+
+  "modal_remoteprefix_azureblobstorage_title": "您正在修改远端路径前缀设置",
+  "modal_remoteprefix_azureblobstorage_shortdesc": "1. 本插件并不会自动在远端把内容从旧文件夹移动到新文件夹。所有内容都会重新同步。\n2. 如果你使得文本输入框为空，那么本设置为保存为空，文件将会使用 Vault 名字作为前缀。\n3. 即使您设置了端对端加密的密码，远端文件夹名称本身也不会被加密。\n4. 某些特殊字符，如“?”、“/”、“\\”是不允许的。文本前后的空格也会被自动删去。",
+  "modal_remoteprefix_azureblobstorage_invaliddirhint": "您所输入的内容含有某些特殊字符，如“?”、“/”、“\\”，它们是不允许的。",
+  "modal_remoteprefix_azureblobstorage_tosave": "您设定的新前缀为：“{{{prefix}}}”",
+  "modal_remoteprefix_azureblobstorage_secondconfirm_empty": "前缀为空，文件会保存在根目录",
+  "modal_remoteprefix_azureblobstorage_secondconfirm_change": "确认修改",
+  "modal_remoteprefix_azureblobstorage_notice": "新的远端路径前缀设置已保存！",
+
   "modal_prorevokeauth": "点击这里和按照步骤取消授权。",
   "modal_prorevokeauth_clean": "清理",
   "modal_prorevokeauth_clean_desc": "清理本地授权记录",
@@ -94,6 +140,25 @@
   "modal_proauth_maualinput_notice": "正在连接，请稍候......",
   "modal_proauth_maualinput_conn_fail": "连接失败",
 
+  "settings_onedrivefull": "Onedrive（个人版）（Full）设置",
+  "settings_chooseservice_onedrivefull": "OneDrive（个人版）（Full）",
+  "settings_onedrivefull_disclaimer1": "声明：此插件不是微软或 OneDrive 的官方产品。",
+  "settings_onedrivefull_disclaimer2": "声明：您所输入的信息存储于本地。其它有害的或者出错的插件，是有可能读取到这些信息的。如果您发现了 OneDrive 有不符合预期的访问，请立刻从 https://microsoft.com/consent 删除记录于此插件的连接鉴权。",
+  "settings_onedrivefull_folder": "我们会在您的 OneDrive 上创建此文件夹并在里面同步：/{{remoteBaseDir}}。",
+  "settings_onedrivefull_nobiz": "现在只支持个人版 OneDrive。（暂时）并不支持企业版 OneDrive。",
+  "settings_onedrivefull_revoke": "撤回鉴权",
+  "settings_onedrivefull_revoke_desc": "您现在使用了用户名 {{username}} 来连接。如果想取消连接，请点击此按钮。",
+  "settings_onedrivefull_revoke_button": "撤回鉴权",
+  "settings_onedrivefull_auth": "鉴权",
+  "settings_onedrivefull_auth_desc": "鉴权。",
+  "settings_onedrivefull_auth_button": "鉴权",
+  "settings_onedrivefull_connect_succ": "很好！我们可连接上 OneDrive！",
+  "settings_onedrivefull_connect_fail": "我们未能连接上 OneDrive。",
+  "settings_onedrivefull_emptyfile": "空文件处理",
+  "settings_onedrivefull_emptyfile_desc": "OneDrive 不允许上传空文件（即使官网也是不允许的）。那么你想跳过空文件还是返回错误？",
+  "settings_onedrivefull_emptyfile_skip": "跳过",
+  "settings_onedrivefull_emptyfile_error": "返回错误和中断",
+
   "settings_googledrive": "Google Drive (PRO) (beta)",
   "settings_chooseservice_googledrive": "Google Drive (PRO) (beta)",
   "settings_googledrive_disclaimer1": "声明：本插件不是 Google 的官方产品。只是用到了它的公开 API。",
@@ -170,10 +235,55 @@
   "settings_yandexdisk_connect_succ": "很好！我们可连接上 Yandex Disk！",
   "settings_yandexdisk_connect_fail": "我们未能连接上 Yandex Disk。",
 
+  "settings_koofr": "Koofr (PRO) (beta)",
+  "settings_chooseservice_koofr": "Koofr (PRO) (beta)",
+  "settings_koofr_disclaimer1": "声明：本插件不是 Koofr 的官方产品。只是用到了它的公开 API。",
+  "settings_koofr_disclaimer2": "声明：您所输入的信息存储于本地。其它有害的或者出错的插件，是有可能读取到这些信息的。如果您发现任何不符合预期的 Koofr 访问，请立刻在以下网站操作断开连接： https://app.koofr.net/app/admin/preferences/security 。",
+  "settings_koofr_pro_desc": "<p><strong>！！这是 PRO（付费）功能! 您需要在线账号来使用此功能！！</strong>（<a href=\"#settings-pro\">向下滑</a>可以看到 PRO 账号的更多信息。）</p>",
+  "settings_koofr_notshowuphint": "Koofr 设置不可用",
+  "settings_koofr_notshowuphint_desc": "Koofr 设置不可用，因为您没有在 Remotely Save 账号里开启这个 PRO 功能。",
+  "settings_koofr_notshowuphint_view_pro": "查看 PRO 相关设置",
+  "settings_koofr_folder": "我们会在 Koofr 创建此文件夹并同步内容进去： {{remoteBaseDir}} 。请不要手动在网站上创建。",
+  "settings_koofr_revoke": "撤回鉴权",
+  "settings_koofr_revoke_desc": "您现在已连接。如果想取消连接，请点击此按钮。",
+  "settings_koofr_revoke_button": "撤回鉴权",
+  "settings_koofr_auth": "鉴权",
+  "settings_koofr_auth_desc": "鉴权.",
+  "settings_koofr_auth_button": "鉴权",
+  "settings_koofr_connect_succ": "很好！我们可连接上 Koofr！",
+  "settings_koofr_connect_fail": "我们未能连接上 Koofr。",
+
+  "settings_azureblobstorage": "Azure Blob Storage (PRO) (alpha)",
+  "settings_chooseservice_azureblobstorage": "Azure Blob Storage (PRO) (alpha)",
+  "settings_azureblobstorage_disclaimer1": "声明：本插件不是微软或 Azure 的官方产品。只是用到了 Azure 的公开 API。",
+  "settings_azureblobstorage_disclaimer2": "声明：您所输入的信息存储于本地。其它有害的或者出错的插件，是有可能读取到这些信息的。如果您发现任何不符合预期的 Azure Blob Storage 访问，请立刻删除 SAS Url 然后<a href=\"https://github.com/remotely-save/remotely-save/blob/master/docs/remote_services/azureblobstorage/README.md\">修改预设的 policy</a> 或账号信息。",
+  "settings_azureblobstorage_pro_desc": "<p><strong>！！这是 PRO（付费）功能! 您需要在线账号来使用此功能！！</strong>（<a href=\"#settings-pro\">向下滑</a>可以看到 PRO 账号的更多信息。）</p>",
+  "settings_azureblobstorage_notshowuphint": "Azure Blob Storage 设置不可用",
+  "settings_azureblobstorage_notshowuphint_desc": "Azure Blob Storage 设置不可用，因为您没有在 Remotely Save 账号里开启这个 PRO 功能。",
+  "settings_azureblobstorage_notshowuphint_view_pro": "查看 PRO 相关设置",
+  "settings_azureblobstorage_folder": "Azure Blob Storage 里，我们会用这个前缀保存你的文件： {{remoteBaseDir}} 。",
+  "settings_azureblobstorage_containersasurl": "Container SAS Url",
+  "settings_azureblobstorage_containersasurl_desc": "目前只支持通过 Container SAS Url 进行连接。请记得同时设置 CORS。可阅读<a href=\"https://github.com/remotely-save/remotely-save/blob/master/docs/remote_services/azureblobstorage/README.md\">文档</a>获取更多说明。",
+  "settings_azureblobstorage_containername": "Container 名字",
+  "settings_azureblobstorage_containername_desc": "输入 Container 名字。",
+  "settings_azureblobstorage_remoteprefix": "修改远端前缀路径",
+  "settings_azureblobstorage_remoteprefix_desc": "您可以在这里修改路径前缀。如果设置为空，那么<strong>库（vault）名字</strong>会作为前缀。<strong>不允许设置空前缀。</strong>您需要点击“确认”。",
+  "settings_azureblobstorage_parts": "分块并行度",
+  "settings_azureblobstorage_parts_desc": "大文件会被分块上传。您希望同一时间最多有多少个分块被上传？",
+  "settings_azureblobstorage_generatefolderobject": "是否生成文件夹 Object",
+  "settings_azureblobstorage_generatefolderobject_desc": "Azure Blob Storage 不存在“真正”的文件夹。如果您设置了“生成”，那么插件会上传 0 字节的以“/”结尾的 Object 来代表文件夹。默认跳过生成这种文件夹 Object。",
+  "settings_azureblobstorage_generatefolderobject_notgenerate": "不生成（默认）",
+  "settings_azureblobstorage_generatefolderobject_generate": "生成",
+  "settings_azureblobstorage_connect_succ": "很好！我们可连接上 Azure Blob Storage！",
+  "settings_azureblobstorage_connect_fail": "我们未能连接上 Azure Blob Storage。",
+
+  "settings_export_onedrivefull_button": "导出 OneDrive (Full) 部分",
   "settings_export_googledrive_button": "导出 Google Drive 部分",
   "settings_export_box_button": "导出 Box 部分",
   "settings_export_pcloud_button": "导出 pCloud 部分",
   "settings_export_yandexdisk_button": "导出 Yandex Disk 部分",
+  "settings_export_koofr_button": "导出 Koofr 部分",
+  "settings_export_azureblobstorage_button": "导出 Azure Blob Storage 部分",
 
   "settings_pro": "账号（PRO 付费功能）",
   "settings_pro_tutorial": "<p>使用 Remotely Save 的<stong>基本</strong>功能是<strong>免费的</strong>，而且<strong>不</strong>需要注册对应账号。</p><p>但是，您<strong>需要</strong>注册账号和对<strong>PRO</strong>功能<strong>付费</strong>使用，如智能处理冲突功能。</p><p>第一步：点击按钮从而注册和登录网站：<a href=\"https://remotelysave.com\">https://remotelysave.com</a>。注意：这和 Obsidian 官方账号无关，是不同的账号。</p><p>第二部：点击“连接”按钮，从而连接本设备和在线账号。",

pro/src/langs/zh_tw.json

@@ -7,6 +7,11 @@
   "protocol_pro_connect_fail": "Remotely Save 官網返回錯誤。可能是網路連線不穩定。也可能是您拒絕了授權？",
   "protocol_pro_connect_succ_revoke": "您已連線上賬號 {{email}}。如果要取消連線，請點選此按鈕。",
 
+  "protocol_onedrivefull_connecting": "正在連線 OneDrive……\n請不要關閉此彈窗。",
+  "protocol_onedrivefull_connect_succ_revoke": "您已作為使用者 {{username}} 連線上了。如果您想取消連線，請點選此按鈕。",
+  "protocol_onedrivefull_connect_fail": "OneDrive 的回撥請求有點異常。您是否拒絕了鑑權？",
+  "protocol_onedrivefull_connect_unknown": "不知道如何處理此 callback：{{params}}",
+
   "protocol_box_connecting": "正在連線",
   "protocol_box_connect_manualinput_succ": "連線成功",
   "protocol_box_connect_fail": "Box 官網返回錯誤。可能是網路連線不穩定。也可能是您拒絕了授權？",
@@ -22,6 +27,23 @@
   "protocol_yandexdisk_connect_fail": "Yandex Disk 官網返回錯誤。可能是網路連線不穩定。也可能是您拒絕了授權？",
   "protocol_yandexdisk_connect_succ_revoke": "您已連線上賬號。如果要取消連線，請點選此按鈕。",
 
+  "protocol_koofr_connecting": "正在連線",
+  "protocol_koofr_connect_manualinput_succ": "連線成功",
+  "protocol_koofr_connect_fail": "Yandex Disk 官網返回錯誤。可能是網路連線不穩定。也可能是您拒絕了授權？",
+  "protocol_koofr_connect_succ_revoke": "您已連線上賬號。如果要取消連線，請點選此按鈕。",
+
+  "modal_onedrivefullauth_shortdesc": "現在只支援個人版 OneDrive，（暫）不支援企業版。\n在瀏覽器中訪問以下地址，然後按照網頁提示操作。\n到了最後，您應該會被自動重定向回來 Obsidian。",
+  "modal_onedrivefullauth_shortdesc_linux": "您正在用 Linux，有可能無法跳轉回來。請考慮<a href=\"https://github.com/remotely-save/remotely-save/issues/415\">使用</a> flatpack 版本的 Obsidian，或建立 <a href=\"https://github.com/remotely-save/remotely-save/blob/master/docs/linux.md\"><code>obsidian.desktop</code> 檔案</a>。",
+  "modal_onedrivefullauth_copybutton": "點選此按鈕從而複製鑑權 url",
+  "modal_onedrivefullauth_copynotice": "鑑權 url 已複製到剪貼簿！",
+  "modal_onedrivefullrevokeauth_step1": "第 1 步：用瀏覽器開啟以下地址，點選本外掛對應的“Edit”按鈕，點選“Remove these permissions”按鈕。",
+  "modal_onedrivefullrevokeauth_step2": "第 2 步：點選以下按鈕，清理本地儲存的登入資訊。",
+  "modal_onedrivefullrevokeauth_clean": "清理本地儲存的登入資訊",
+  "modal_onedrivefullrevokeauth_clean_desc": "您需要點選“清理”按鈕。",
+  "modal_onedrivefullrevokeauth_clean_button": "清理",
+  "modal_onedrivefullrevokeauth_clean_notice": "已清理！",
+  "modal_onedrivefullrevokeauth_clean_fail": "鑑權途中出錯了。",
+
   "modal_googledriveauth_tutorial": "<p>請訪問此網址，然後會進入授權流程。最後，您會看到一個碼，請複製貼上到這裡然後提交。</p>",
   "modal_googledriveauth_copybutton": "點選以複製網址",
   "modal_googledriveauth_copynotice": "網址已複製！",
@@ -81,6 +103,30 @@
   "modal_yandexdiskrevokeauth_clean_notice": "已清理！",
   "modal_yandexdiskrevokeauth_clean_fail": "清理授權時候發生了錯誤。",
 
+  "modal_koofrauth_tutorial": "<p>請訪問此網址，然後會進入授權流程。最後，您會被重定向回來。</p>",
+  "modal_koofrauth_copybutton": "點選以複製網址",
+  "modal_koofrauth_copynotice": "網址已複製！",
+  "modal_koofr_maualinput": "網站上的碼",
+  "modal_koofr_maualinput_desc": "請貼上授權流程最後的那個碼，然後點選確認。",
+  "modal_koofr_maualinput_notice": "正在嘗試連線 Yandex Disk 並更新授權資訊......",
+  "modal_koofr_maualinput_succ_notice": "很好！授權資訊已更新！",
+  "modal_koofr_maualinput_fail_notice": "更新授權資訊失敗。請稍後重試。",
+  "modal_koofrrevokeauth_step1": "第 1 步：訪問以下網址，可以刪除連線。",
+  "modal_koofrrevokeauth_step2": "第 2 步：點選以下按鈕，從而清理本地的登入資訊。",
+  "modal_koofrrevokeauth_clean": "清理本地登入資訊",
+  "modal_koofrrevokeauth_clean_desc": "您需要點選此按鈕。",
+  "modal_koofrrevokeauth_clean_button": "清理",
+  "modal_koofrrevokeauth_clean_notice": "已清理！",
+  "modal_koofrrevokeauth_clean_fail": "清理授權時候發生了錯誤。",
+
+  "modal_remoteprefix_azureblobstorage_title": "您正在修改遠端路徑字首設定",
+  "modal_remoteprefix_azureblobstorage_shortdesc": "1. 本外掛並不會自動在遠端把內容從舊資料夾移動到新資料夾。所有內容都會重新同步。\n2. 如果你使得文字輸入框為空，那麼本設定為儲存為空，檔案將會使用 Vault 名字作為字首。\n3. 即使您設定了端對端加密的密碼，遠端資料夾名稱本身也不會被加密。\n4. 某些特殊字元，如“?”、“/”、“\\”是不允許的。文字前後的空格也會被自動刪去。",
+  "modal_remoteprefix_azureblobstorage_invaliddirhint": "您所輸入的內容含有某些特殊字元，如“?”、“/”、“\\”，它們是不允許的。",
+  "modal_remoteprefix_azureblobstorage_tosave": "您設定的新字首為：“{{{prefix}}}”",
+  "modal_remoteprefix_azureblobstorage_secondconfirm_empty": "字首為空，檔案會儲存在根目錄",
+  "modal_remoteprefix_azureblobstorage_secondconfirm_change": "確認修改",
+  "modal_remoteprefix_azureblobstorage_notice": "新的遠端路徑字首設定已儲存！",
+
   "modal_prorevokeauth": "點選這裡和按照步驟取消授權。",
   "modal_prorevokeauth_clean": "清理",
   "modal_prorevokeauth_clean_desc": "清理本地授權記錄",
@@ -94,6 +140,25 @@
   "modal_proauth_maualinput_notice": "正在連線，請稍候......",
   "modal_proauth_maualinput_conn_fail": "連線失敗",
 
+  "settings_onedrivefull": "Onedrive（個人版）（Full）設定",
+  "settings_chooseservice_onedrivefull": "OneDrive（個人版）（Full）",
+  "settings_onedrivefull_disclaimer1": "宣告：此外掛不是微軟或 OneDrive 的官方產品。",
+  "settings_onedrivefull_disclaimer2": "宣告：您所輸入的資訊儲存於本地。其它有害的或者出錯的外掛，是有可能讀取到這些資訊的。如果您發現了 OneDrive 有不符合預期的訪問，請立刻從 https://microsoft.com/consent 刪除記錄於此外掛的連線鑑權。",
+  "settings_onedrivefull_folder": "我們會在您的 OneDrive 上建立此資料夾並在裡面同步：/{{remoteBaseDir}}。",
+  "settings_onedrivefull_nobiz": "現在只支援個人版 OneDrive。（暫時）並不支援企業版 OneDrive。",
+  "settings_onedrivefull_revoke": "撤回鑑權",
+  "settings_onedrivefull_revoke_desc": "您現在使用了使用者名稱 {{username}} 來連線。如果想取消連線，請點選此按鈕。",
+  "settings_onedrivefull_revoke_button": "撤回鑑權",
+  "settings_onedrivefull_auth": "鑑權",
+  "settings_onedrivefull_auth_desc": "鑑權。",
+  "settings_onedrivefull_auth_button": "鑑權",
+  "settings_onedrivefull_connect_succ": "很好！我們可連線上 OneDrive！",
+  "settings_onedrivefull_connect_fail": "我們未能連線上 OneDrive。",
+  "settings_onedrivefull_emptyfile": "空檔案處理",
+  "settings_onedrivefull_emptyfile_desc": "OneDrive 不允許上傳空檔案（即使官網也是不允許的）。那麼你想跳過空檔案還是返回錯誤？",
+  "settings_onedrivefull_emptyfile_skip": "跳過",
+  "settings_onedrivefull_emptyfile_error": "返回錯誤和中斷",
+
   "settings_googledrive": "Google Drive (PRO) (beta)",
   "settings_chooseservice_googledrive": "Google Drive (PRO) (beta)",
   "settings_googledrive_disclaimer1": "宣告：本外掛不是 Google 的官方產品。只是用到了它的公開 API。",
@@ -170,10 +235,55 @@
   "settings_yandexdisk_connect_succ": "很好！我們可連線上 Yandex Disk！",
   "settings_yandexdisk_connect_fail": "我們未能連線上 Yandex Disk。",
 
+  "settings_koofr": "Koofr (PRO) (beta)",
+  "settings_chooseservice_koofr": "Koofr (PRO) (beta)",
+  "settings_koofr_disclaimer1": "宣告：本外掛不是 Koofr 的官方產品。只是用到了它的公開 API。",
+  "settings_koofr_disclaimer2": "宣告：您所輸入的資訊儲存於本地。其它有害的或者出錯的外掛，是有可能讀取到這些資訊的。如果您發現任何不符合預期的 Koofr 訪問，請立刻在以下網站操作斷開連線： https://app.koofr.net/app/admin/preferences/security 。",
+  "settings_koofr_pro_desc": "<p><strong>！！這是 PRO（付費）功能! 您需要線上賬號來使用此功能！！</strong>（<a href=\"#settings-pro\">向下滑</a>可以看到 PRO 賬號的更多資訊。）</p>",
+  "settings_koofr_notshowuphint": "Koofr 設定不可用",
+  "settings_koofr_notshowuphint_desc": "Koofr 設定不可用，因為您沒有在 Remotely Save 賬號裡開啟這個 PRO 功能。",
+  "settings_koofr_notshowuphint_view_pro": "檢視 PRO 相關設定",
+  "settings_koofr_folder": "我們會在 Koofr 建立此資料夾並同步內容進去： {{remoteBaseDir}} 。請不要手動在網站上建立。",
+  "settings_koofr_revoke": "撤回鑑權",
+  "settings_koofr_revoke_desc": "您現在已連線。如果想取消連線，請點選此按鈕。",
+  "settings_koofr_revoke_button": "撤回鑑權",
+  "settings_koofr_auth": "鑑權",
+  "settings_koofr_auth_desc": "鑑權.",
+  "settings_koofr_auth_button": "鑑權",
+  "settings_koofr_connect_succ": "很好！我們可連線上 Koofr！",
+  "settings_koofr_connect_fail": "我們未能連線上 Koofr。",
+
+  "settings_azureblobstorage": "Azure Blob Storage (PRO) (alpha)",
+  "settings_chooseservice_azureblobstorage": "Azure Blob Storage (PRO) (alpha)",
+  "settings_azureblobstorage_disclaimer1": "宣告：本外掛不是微軟或 Azure 的官方產品。只是用到了 Azure 的公開 API。",
+  "settings_azureblobstorage_disclaimer2": "宣告：您所輸入的資訊儲存於本地。其它有害的或者出錯的外掛，是有可能讀取到這些資訊的。如果您發現任何不符合預期的 Azure Blob Storage 訪問，請立刻刪除 SAS Url 然後<a href=\"https://github.com/remotely-save/remotely-save/blob/master/docs/remote_services/azureblobstorage/README.md\">修改預設的 policy</a> 或賬號資訊。",
+  "settings_azureblobstorage_pro_desc": "<p><strong>！！這是 PRO（付費）功能! 您需要線上賬號來使用此功能！！</strong>（<a href=\"#settings-pro\">向下滑</a>可以看到 PRO 賬號的更多資訊。）</p>",
+  "settings_azureblobstorage_notshowuphint": "Azure Blob Storage 設定不可用",
+  "settings_azureblobstorage_notshowuphint_desc": "Azure Blob Storage 設定不可用，因為您沒有在 Remotely Save 賬號裡開啟這個 PRO 功能。",
+  "settings_azureblobstorage_notshowuphint_view_pro": "檢視 PRO 相關設定",
+  "settings_azureblobstorage_folder": "Azure Blob Storage 裡，我們會用這個字首儲存你的檔案： {{remoteBaseDir}} 。",
+  "settings_azureblobstorage_containersasurl": "Container SAS Url",
+  "settings_azureblobstorage_containersasurl_desc": "目前只支援透過 Container SAS Url 進行連線。請記得同時設定 CORS。可閱讀<a href=\"https://github.com/remotely-save/remotely-save/blob/master/docs/remote_services/azureblobstorage/README.md\">文件</a>獲取更多說明。",
+  "settings_azureblobstorage_containername": "Container 名字",
+  "settings_azureblobstorage_containername_desc": "輸入 Container 名字。",
+  "settings_azureblobstorage_remoteprefix": "修改遠端字首路徑",
+  "settings_azureblobstorage_remoteprefix_desc": "您可以在這裡修改路徑字首。如果設定為空，那麼<strong>庫（vault）名字</strong>會作為字首。<strong>不允許設定空字首。</strong>您需要點選“確認”。",
+  "settings_azureblobstorage_parts": "分塊並行度",
+  "settings_azureblobstorage_parts_desc": "大檔案會被分塊上傳。您希望同一時間最多有多少個分塊被上傳？",
+  "settings_azureblobstorage_generatefolderobject": "是否生成資料夾 Object",
+  "settings_azureblobstorage_generatefolderobject_desc": "Azure Blob Storage 不存在“真正”的資料夾。如果您設定了“生成”，那麼外掛會上傳 0 位元組的以“/”結尾的 Object 來代表資料夾。預設跳過生成這種資料夾 Object。",
+  "settings_azureblobstorage_generatefolderobject_notgenerate": "不生成（預設）",
+  "settings_azureblobstorage_generatefolderobject_generate": "生成",
+  "settings_azureblobstorage_connect_succ": "很好！我們可連線上 Azure Blob Storage！",
+  "settings_azureblobstorage_connect_fail": "我們未能連線上 Azure Blob Storage。",
+
+  "settings_export_onedrivefull_button": "匯出 OneDrive (Full) 部分",
   "settings_export_googledrive_button": "匯出 Google Drive 部分",
   "settings_export_box_button": "匯出 Box 部分",
   "settings_export_pcloud_button": "匯出 pCloud 部分",
   "settings_export_yandexdisk_button": "匯出 Yandex Disk 部分",
+  "settings_export_koofr_button": "匯出 Koofr 部分",
+  "settings_export_azureblobstorage_button": "匯出 Azure Blob Storage 部分",
 
   "settings_pro": "賬號（PRO 付費功能）",
   "settings_pro_tutorial": "<p>使用 Remotely Save 的<stong>基本</strong>功能是<strong>免費的</strong>，而且<strong>不</strong>需要註冊對應賬號。</p><p>但是，您<strong>需要</strong>註冊賬號和對<strong>PRO</strong>功能<strong>付費</strong>使用，如智慧處理衝突功能。</p><p>第一步：點選按鈕從而註冊和登入網站：<a href=\"https://remotelysave.com\">https://remotelysave.com</a>。注意：這和 Obsidian 官方賬號無關，是不同的賬號。</p><p>第二部：點選“連線”按鈕，從而連線本裝置和線上賬號。",

pro/src/settingsAzureBlobStorage.ts

@@ -0,0 +1,293 @@
+import cloneDeep from "lodash/cloneDeep";
+import { type App, Modal, Notice, Setting } from "obsidian";
+import { getClient } from "../../src/fsGetter";
+import type { TransItemType } from "../../src/i18n";
+import type RemotelySavePlugin from "../../src/main";
+import { stringToFragment } from "../../src/misc";
+import { wrapTextWithPasswordHide } from "../../src/settings";
+import {
+  DEFAULT_AZUREBLOBSTORAGE_CONFIG,
+  simpleTransRemotePrefix,
+} from "./fsAzureBlobStorage";
+
+class ChangeAzureBlobStorageRemotePrefixModal extends Modal {
+  readonly plugin: RemotelySavePlugin;
+  readonly newRemotePrefix: string;
+  constructor(app: App, plugin: RemotelySavePlugin, newRemotePrefix: string) {
+    super(app);
+    this.plugin = plugin;
+    this.newRemotePrefix = newRemotePrefix;
+  }
+
+  onOpen() {
+    const { contentEl } = this;
+
+    const t = (x: TransItemType, vars?: any) => {
+      return this.plugin.i18n.t(x, vars);
+    };
+
+    contentEl.createEl("h2", {
+      text: t("modal_remoteprefix_azureblobstorage_title"),
+    });
+    t("modal_remoteprefix_azureblobstorage_shortdesc")
+      .split("\n")
+      .forEach((val, idx) => {
+        contentEl.createEl("p", {
+          text: val,
+        });
+      });
+
+    contentEl.createEl("p", {
+      text: t("modal_remoteprefix_azureblobstorage_tosave", {
+        prefix: this.newRemotePrefix,
+      }),
+    });
+
+    new Setting(contentEl)
+      .addButton((button) => {
+        button.setButtonText(
+          t("modal_remoteprefix_azureblobstorage_secondconfirm_change")
+        );
+        button.onClick(async () => {
+          this.plugin.settings.azureblobstorage.remotePrefix =
+            this.newRemotePrefix;
+          await this.plugin.saveSettings();
+          new Notice(t("modal_remoteprefix_azureblobstorage_notice"));
+          this.close();
+        });
+        button.setClass("remoteprefix-azureblobstorage-second-confirm");
+      })
+      .addButton((button) => {
+        button.setButtonText(t("goback"));
+        button.onClick(() => {
+          this.close();
+        });
+      });
+  }
+
+  onClose() {
+    const { contentEl } = this;
+    contentEl.empty();
+  }
+}
+
+export const generateAzureBlobStorageSettingsPart = (
+  containerEl: HTMLElement,
+  t: (x: TransItemType, vars?: any) => string,
+  app: App,
+  plugin: RemotelySavePlugin,
+  saveUpdatedConfigFunc: () => Promise<any> | undefined
+) => {
+  const azureBlobStorageDiv = containerEl.createEl("div", {
+    cls: "azureblobstorage-hide",
+  });
+  azureBlobStorageDiv.toggleClass(
+    "azureblobstorage-hide",
+    plugin.settings.serviceType !== "azureblobstorage"
+  );
+  azureBlobStorageDiv.createEl("h2", { text: t("settings_azureblobstorage") });
+
+  const azureBlobStorageLongDescDiv = azureBlobStorageDiv.createEl("div", {
+    cls: "settings-long-desc",
+  });
+  for (const c of [
+    t("settings_azureblobstorage_disclaimer1"),
+    stringToFragment(t("settings_azureblobstorage_disclaimer2")),
+  ]) {
+    azureBlobStorageLongDescDiv.createEl("p", {
+      text: c,
+      cls: "azureblobstorage-disclaimer",
+    });
+  }
+
+  azureBlobStorageLongDescDiv.createEl("p", {
+    text: t("settings_azureblobstorage_folder", {
+      remotePrefix:
+        plugin.settings.azureblobstorage.remotePrefix ||
+        `${app.vault.getName()}/`,
+    }),
+  });
+
+  azureBlobStorageLongDescDiv.createDiv({
+    text: stringToFragment(t("settings_azureblobstorage_pro_desc")),
+    cls: "azureblobstorage-disclaimer",
+  });
+
+  const azureBlobStorageNotShowUpHintSetting = new Setting(azureBlobStorageDiv)
+    .setName(t("settings_azureblobstorage_notshowuphint"))
+    .setDesc(t("settings_azureblobstorage_notshowuphint_desc"))
+    .addButton(async (button) => {
+      button.setButtonText(
+        t("settings_azureblobstorage_notshowuphint_view_pro")
+      );
+      button.onClick(async () => {
+        window.location.href = "#settings-pro";
+      });
+    });
+
+  const azureBlobStorageAllowedToUsedDiv = azureBlobStorageDiv.createDiv();
+  // if pro enabled, show up; otherwise hide.
+  const allowAzureBlobStorage =
+    plugin.settings.pro?.enabledProFeatures.filter(
+      (x) => x.featureName === "feature-azure_blob_storage"
+    ).length === 1;
+  console.debug(
+    `allow to show up azureBlobStorage settings? ${allowAzureBlobStorage}`
+  );
+  if (allowAzureBlobStorage) {
+    azureBlobStorageAllowedToUsedDiv.removeClass(
+      "azureblobstorage-allow-to-use-hide"
+    );
+    azureBlobStorageNotShowUpHintSetting.settingEl.addClass(
+      "azureblobstorage-allow-to-use-hide"
+    );
+  } else {
+    azureBlobStorageAllowedToUsedDiv.addClass(
+      "azureblobstorage-allow-to-use-hide"
+    );
+    azureBlobStorageNotShowUpHintSetting.settingEl.removeClass(
+      "azureblobstorage-allow-to-use-hide"
+    );
+  }
+
+  new Setting(azureBlobStorageAllowedToUsedDiv)
+    .setName(t("settings_azureblobstorage_containersasurl"))
+    .setDesc(
+      stringToFragment(t("settings_azureblobstorage_containersasurl_desc"))
+    )
+    .addText((text) => {
+      wrapTextWithPasswordHide(text);
+      text
+        .setPlaceholder("")
+        .setValue(`${plugin.settings.azureblobstorage.containerSasUrl}`)
+        .onChange(async (value) => {
+          plugin.settings.azureblobstorage.containerSasUrl = value.trim();
+          await plugin.saveSettings();
+        });
+    });
+
+  new Setting(azureBlobStorageAllowedToUsedDiv)
+    .setName(t("settings_azureblobstorage_containername"))
+    .setDesc(t("settings_azureblobstorage_containername_desc"))
+    .addText((text) => {
+      wrapTextWithPasswordHide(text);
+      text
+        .setPlaceholder("")
+        .setValue(`${plugin.settings.azureblobstorage.containerName}`)
+        .onChange(async (value) => {
+          plugin.settings.azureblobstorage.containerName = value.trim();
+          await plugin.saveSettings();
+        });
+    });
+
+  let newAzureBlobStorageRemotePrefix =
+    plugin.settings.azureblobstorage.remotePrefix || "";
+  new Setting(azureBlobStorageAllowedToUsedDiv)
+    .setName(t("settings_azureblobstorage_remoteprefix"))
+    .setDesc(t("settings_azureblobstorage_remoteprefix_desc"))
+    .addText((text) =>
+      text
+        .setPlaceholder(`${app.vault.getName()}/`)
+        .setValue(newAzureBlobStorageRemotePrefix)
+        .onChange((value) => {
+          const k = simpleTransRemotePrefix(value);
+          if (k === "") {
+            newAzureBlobStorageRemotePrefix = `${app.vault.getName()}/`;
+          } else {
+            newAzureBlobStorageRemotePrefix = k;
+          }
+        })
+    )
+    .addButton((button) => {
+      button.setButtonText(t("confirm"));
+      button.onClick(() => {
+        new ChangeAzureBlobStorageRemotePrefixModal(
+          app,
+          plugin,
+          newAzureBlobStorageRemotePrefix
+        ).open();
+      });
+    });
+
+  new Setting(azureBlobStorageAllowedToUsedDiv)
+    .setName(t("settings_azureblobstorage_parts"))
+    .setDesc(t("settings_azureblobstorage_parts_desc"))
+    .addDropdown((dropdown) => {
+      dropdown.addOption("1", "1");
+      dropdown.addOption("2", "2");
+      dropdown.addOption("3", "3");
+      dropdown.addOption("5", "5");
+      dropdown.addOption("10", "10");
+      dropdown.addOption("15", "15");
+      dropdown.addOption("20", "20 (default)");
+
+      dropdown
+        .setValue(`${plugin.settings.azureblobstorage.partsConcurrency}`)
+        .onChange(async (val) => {
+          const realVal = Number.parseInt(val);
+          plugin.settings.azureblobstorage.partsConcurrency = realVal;
+          await plugin.saveSettings();
+        });
+    });
+
+  new Setting(azureBlobStorageAllowedToUsedDiv)
+    .setName(t("settings_azureblobstorage_generatefolderobject"))
+    .setDesc(t("settings_azureblobstorage_generatefolderobject_desc"))
+    .addDropdown((dropdown) => {
+      dropdown
+        .addOption(
+          "notgenerate",
+          t("settings_azureblobstorage_generatefolderobject_notgenerate")
+        )
+        .addOption(
+          "generate",
+          t("settings_azureblobstorage_generatefolderobject_generate")
+        );
+
+      dropdown
+        .setValue(
+          `${
+            plugin.settings.azureblobstorage.generateFolderObject
+              ? "generate"
+              : "notgenerate"
+          }`
+        )
+        .onChange(async (val) => {
+          if (val === "generate") {
+            plugin.settings.azureblobstorage.generateFolderObject = true;
+          } else {
+            plugin.settings.azureblobstorage.generateFolderObject = false;
+          }
+          await plugin.saveSettings();
+        });
+    });
+
+  new Setting(azureBlobStorageAllowedToUsedDiv)
+    .setName(t("settings_checkonnectivity"))
+    .setDesc(t("settings_checkonnectivity_desc"))
+    .addButton(async (button) => {
+      button.setButtonText(t("settings_checkonnectivity_button"));
+      button.onClick(async () => {
+        new Notice(t("settings_checkonnectivity_checking"));
+        const client = getClient(plugin.settings, app.vault.getName(), () =>
+          plugin.saveSettings()
+        );
+        const errors = { msg: "" };
+        const res = await client.checkConnect((err: any) => {
+          errors.msg = `${err}`;
+        });
+        if (res) {
+          new Notice(t("settings_azureblobstorage_connect_succ"));
+        } else {
+          new Notice(t("settings_azureblobstorage_connect_fail"));
+          new Notice(errors.msg);
+        }
+      });
+    });
+
+  return {
+    azureBlobStorageDiv: azureBlobStorageDiv,
+    azureBlobStorageAllowedToUsedDiv: azureBlobStorageAllowedToUsedDiv,
+    azureBlobStorageNotShowUpHintSetting: azureBlobStorageNotShowUpHintSetting,
+  };
+};

pro/src/settingsKoofr.ts

@@ -0,0 +1,367 @@
+import cloneDeep from "lodash/cloneDeep";
+import { type App, Modal, Notice, Setting } from "obsidian";
+import { getClient } from "../../src/fsGetter";
+import type { TransItemType } from "../../src/i18n";
+import type RemotelySavePlugin from "../../src/main";
+import { stringToFragment } from "../../src/misc";
+import { ChangeRemoteBaseDirModal } from "../../src/settings";
+import {
+  DEFAULT_KOOFR_CONFIG,
+  generateAuthUrl,
+  sendRefreshTokenReq,
+} from "./fsKoofr";
+
+class KoofrAuthModal extends Modal {
+  readonly plugin: RemotelySavePlugin;
+  readonly authDiv: HTMLDivElement;
+  readonly revokeAuthDiv: HTMLDivElement;
+  readonly revokeAuthSetting: Setting;
+  readonly t: (x: TransItemType, vars?: any) => string;
+  constructor(
+    app: App,
+    plugin: RemotelySavePlugin,
+    authDiv: HTMLDivElement,
+    revokeAuthDiv: HTMLDivElement,
+    revokeAuthSetting: Setting,
+    t: (x: TransItemType, vars?: any) => string
+  ) {
+    super(app);
+    this.plugin = plugin;
+    this.authDiv = authDiv;
+    this.revokeAuthDiv = revokeAuthDiv;
+    this.revokeAuthSetting = revokeAuthSetting;
+    this.t = t;
+  }
+
+  async onOpen() {
+    const { contentEl } = this;
+    const t = this.t;
+
+    const authUrl = generateAuthUrl(this.plugin.settings.koofr.api, true);
+    const div2 = contentEl.createDiv();
+    div2.createDiv({
+      text: stringToFragment(t("modal_koofrauth_tutorial")),
+    });
+    div2.createEl(
+      "button",
+      {
+        text: t("modal_koofrauth_copybutton"),
+      },
+      (el) => {
+        el.onclick = async () => {
+          await navigator.clipboard.writeText(authUrl);
+          new Notice(t("modal_koofrauth_copynotice"));
+        };
+      }
+    );
+
+    contentEl.createEl("p").createEl("a", {
+      href: authUrl,
+      text: authUrl,
+    });
+
+    // let refreshToken = "";
+    // new Setting(contentEl)
+    //   .setName(t("modal_koofr_maualinput"))
+    //   .setDesc(t("modal_koofr_maualinput_desc"))
+    //   .addText((text) =>
+    //     text
+    //       .setPlaceholder("")
+    //       .setValue("")
+    //       .onChange((val) => {
+    //         refreshToken = val.trim();
+    //       })
+    //   )
+    //   .addButton(async (button) => {
+    //     button.setButtonText(t("submit"));
+    //     button.onClick(async () => {
+    //       new Notice(t("modal_koofr_maualinput_notice"));
+
+    //       try {
+    //         if (this.plugin.settings.koofr === undefined) {
+    //           this.plugin.settings.koofr = cloneDeep(
+    //             DEFAULT_KOOFR_CONFIG
+    //           );
+    //         }
+    //         this.plugin.settings.koofr.refreshToken = refreshToken;
+    //         this.plugin.settings.koofr.accessToken = "access";
+    //         this.plugin.settings.koofr.accessTokenExpiresAtTimeMs = 1;
+    //         this.plugin.settings.koofr.accessTokenExpiresInMs = 1;
+
+    //         // TODO: abstraction leaking now, how to fix?
+    //         const k = await sendRefreshTokenReq(refreshToken);
+    //         const ts = Date.now();
+    //         this.plugin.settings.koofr.accessToken = k.access_token;
+    //         this.plugin.settings.koofr.accessTokenExpiresInMs =
+    //           k.expires_in * 1000;
+    //         this.plugin.settings.koofr.accessTokenExpiresAtTimeMs =
+    //           ts + k.expires_in * 1000 - 60 * 2 * 1000;
+    //         await this.plugin.saveSettings();
+
+    //         // try to remove data in clipboard
+    //         await navigator.clipboard.writeText("");
+
+    //         new Notice(t("modal_koofr_maualinput_succ_notice"));
+    //       } catch (e) {
+    //         console.error(e);
+    //         new Notice(t("modal_koofr_maualinput_fail_notice"));
+    //       } finally {
+    //         this.authDiv.toggleClass(
+    //           "koofr-auth-button-hide",
+    //           this.plugin.settings.koofr.refreshToken !== ""
+    //         );
+    //         this.revokeAuthDiv.toggleClass(
+    //           "koofr-revoke-auth-button-hide",
+    //           this.plugin.settings.koofr.refreshToken === ""
+    //         );
+    //         this.close();
+    //       }
+    //     });
+    //   });
+  }
+
+  onClose() {
+    const { contentEl } = this;
+    contentEl.empty();
+  }
+}
+
+class KoofrRevokeAuthModal extends Modal {
+  readonly plugin: RemotelySavePlugin;
+  readonly authDiv: HTMLDivElement;
+  readonly revokeAuthDiv: HTMLDivElement;
+  readonly t: (x: TransItemType, vars?: any) => string;
+  constructor(
+    app: App,
+    plugin: RemotelySavePlugin,
+    authDiv: HTMLDivElement,
+    revokeAuthDiv: HTMLDivElement,
+    t: (x: TransItemType, vars?: any) => string
+  ) {
+    super(app);
+    this.plugin = plugin;
+    this.authDiv = authDiv;
+    this.revokeAuthDiv = revokeAuthDiv;
+    this.t = t;
+  }
+
+  async onOpen() {
+    const t = this.t;
+    const { contentEl } = this;
+
+    contentEl.createEl("p", {
+      text: t("modal_koofrrevokeauth_step1"),
+    });
+    const consentUrl = "https://app.koofr.net/app/admin/preferences/security";
+    contentEl.createEl("p").createEl("a", {
+      href: consentUrl,
+      text: consentUrl,
+    });
+
+    contentEl.createEl("p", {
+      text: t("modal_koofrrevokeauth_step2"),
+    });
+
+    new Setting(contentEl)
+      .setName(t("modal_koofrrevokeauth_clean"))
+      .setDesc(t("modal_koofrrevokeauth_clean_desc"))
+      .addButton(async (button) => {
+        button.setButtonText(t("modal_koofrrevokeauth_clean_button"));
+        button.onClick(async () => {
+          try {
+            this.plugin.settings.koofr = cloneDeep(DEFAULT_KOOFR_CONFIG);
+
+            await this.plugin.saveSettings();
+            this.authDiv.toggleClass(
+              "koofr-auth-button-hide",
+              this.plugin.settings.koofr.refreshToken !== ""
+            );
+            this.revokeAuthDiv.toggleClass(
+              "koofr-revoke-auth-button-hide",
+              this.plugin.settings.koofr.refreshToken === ""
+            );
+            new Notice(t("modal_koofrrevokeauth_clean_notice"));
+            this.close();
+          } catch (err) {
+            console.error(err);
+            new Notice(t("modal_koofrrevokeauth_clean_fail"));
+          }
+        });
+      });
+  }
+
+  onClose() {
+    const { contentEl } = this;
+    contentEl.empty();
+  }
+}
+
+export const generateKoofrSettingsPart = (
+  containerEl: HTMLElement,
+  t: (x: TransItemType, vars?: any) => string,
+  app: App,
+  plugin: RemotelySavePlugin,
+  saveUpdatedConfigFunc: () => Promise<any> | undefined
+) => {
+  const koofrDiv = containerEl.createEl("div", {
+    cls: "koofr-hide",
+  });
+  koofrDiv.toggleClass("koofr-hide", plugin.settings.serviceType !== "koofr");
+  koofrDiv.createEl("h2", { text: t("settings_koofr") });
+
+  const koofrLongDescDiv = koofrDiv.createEl("div", {
+    cls: "settings-long-desc",
+  });
+  for (const c of [
+    t("settings_koofr_disclaimer1"),
+    t("settings_koofr_disclaimer2"),
+  ]) {
+    koofrLongDescDiv.createEl("p", {
+      text: c,
+      cls: "koofr-disclaimer",
+    });
+  }
+
+  koofrLongDescDiv.createEl("p", {
+    text: t("settings_koofr_folder", {
+      remoteBaseDir: plugin.settings.koofr.remoteBaseDir || app.vault.getName(),
+    }),
+  });
+
+  koofrLongDescDiv.createDiv({
+    text: stringToFragment(t("settings_koofr_pro_desc")),
+    cls: "koofr-disclaimer",
+  });
+
+  const koofrNotShowUpHintSetting = new Setting(koofrDiv)
+    .setName(t("settings_koofr_notshowuphint"))
+    .setDesc(t("settings_koofr_notshowuphint_desc"))
+    .addButton(async (button) => {
+      button.setButtonText(t("settings_koofr_notshowuphint_view_pro"));
+      button.onClick(async () => {
+        window.location.href = "#settings-pro";
+      });
+    });
+
+  const koofrAllowedToUsedDiv = koofrDiv.createDiv();
+  // if pro enabled, show up; otherwise hide.
+  const allowKoofr =
+    plugin.settings.pro?.enabledProFeatures.filter(
+      (x) => x.featureName === "feature-koofr"
+    ).length === 1;
+  console.debug(`allow to show up koofr settings? ${allowKoofr}`);
+  if (allowKoofr) {
+    koofrAllowedToUsedDiv.removeClass("koofr-allow-to-use-hide");
+    koofrNotShowUpHintSetting.settingEl.addClass("koofr-allow-to-use-hide");
+  } else {
+    koofrAllowedToUsedDiv.addClass("koofr-allow-to-use-hide");
+    koofrNotShowUpHintSetting.settingEl.removeClass("koofr-allow-to-use-hide");
+  }
+
+  const koofrSelectAuthDiv = koofrAllowedToUsedDiv.createDiv();
+  const koofrAuthDiv = koofrSelectAuthDiv.createDiv({
+    cls: "koofr-auth-button-hide settings-auth-related",
+  });
+  const koofrRevokeAuthDiv = koofrSelectAuthDiv.createDiv({
+    cls: "koofr-revoke-auth-button-hide settings-auth-related",
+  });
+
+  const koofrRevokeAuthSetting = new Setting(koofrRevokeAuthDiv)
+    .setName(t("settings_koofr_revoke"))
+    .setDesc(t("settings_koofr_revoke_desc"))
+    .addButton(async (button) => {
+      button.setButtonText(t("settings_koofr_revoke_button"));
+      button.onClick(async () => {
+        new KoofrRevokeAuthModal(
+          app,
+          plugin,
+          koofrAuthDiv,
+          koofrRevokeAuthDiv,
+          t
+        ).open();
+      });
+    });
+
+  new Setting(koofrAuthDiv)
+    .setName(t("settings_koofr_auth"))
+    .setDesc(t("settings_koofr_auth_desc"))
+    .addButton(async (button) => {
+      button.setButtonText(t("settings_koofr_auth_button"));
+      button.onClick(async () => {
+        const modal = new KoofrAuthModal(
+          app,
+          plugin,
+          koofrAuthDiv,
+          koofrRevokeAuthDiv,
+          koofrRevokeAuthSetting,
+          t
+        );
+        plugin.oauth2Info.helperModal = modal;
+        plugin.oauth2Info.authDiv = koofrAuthDiv;
+        plugin.oauth2Info.revokeDiv = koofrRevokeAuthDiv;
+        plugin.oauth2Info.revokeAuthSetting = koofrRevokeAuthSetting;
+        modal.open();
+      });
+    });
+
+  koofrAuthDiv.toggleClass(
+    "koofr-auth-button-hide",
+    plugin.settings.koofr.refreshToken !== ""
+  );
+  koofrRevokeAuthDiv.toggleClass(
+    "koofr-revoke-auth-button-hide",
+    plugin.settings.koofr.refreshToken === ""
+  );
+
+  let newkoofrRemoteBaseDir = plugin.settings.koofr.remoteBaseDir || "";
+  new Setting(koofrAllowedToUsedDiv)
+    .setName(t("settings_remotebasedir"))
+    .setDesc(t("settings_remotebasedir_desc"))
+    .addText((text) =>
+      text
+        .setPlaceholder(app.vault.getName())
+        .setValue(newkoofrRemoteBaseDir)
+        .onChange((value) => {
+          newkoofrRemoteBaseDir = value.trim();
+        })
+    )
+    .addButton((button) => {
+      button.setButtonText(t("confirm"));
+      button.onClick(() => {
+        new ChangeRemoteBaseDirModal(
+          app,
+          plugin,
+          newkoofrRemoteBaseDir,
+          "koofr"
+        ).open();
+      });
+    });
+  new Setting(koofrAllowedToUsedDiv)
+    .setName(t("settings_checkonnectivity"))
+    .setDesc(t("settings_checkonnectivity_desc"))
+    .addButton(async (button) => {
+      button.setButtonText(t("settings_checkonnectivity_button"));
+      button.onClick(async () => {
+        new Notice(t("settings_checkonnectivity_checking"));
+        const client = getClient(plugin.settings, app.vault.getName(), () =>
+          plugin.saveSettings()
+        );
+        const errors = { msg: "" };
+        const res = await client.checkConnect((err: any) => {
+          errors.msg = `${err}`;
+        });
+        if (res) {
+          new Notice(t("settings_koofr_connect_succ"));
+        } else {
+          new Notice(t("settings_koofr_connect_fail"));
+          new Notice(errors.msg);
+        }
+      });
+    });
+
+  return {
+    koofrDiv: koofrDiv,
+    koofrAllowedToUsedDiv: koofrAllowedToUsedDiv,
+    koofrNotShowUpHintSetting: koofrNotShowUpHintSetting,
+  };
+};

pro/src/settingsOnedriveFull.ts

@@ -0,0 +1,337 @@
+import cloneDeep from "lodash/cloneDeep";
+import { type App, Modal, Notice, Platform, Setting } from "obsidian";
+import { getClient } from "../../src/fsGetter";
+import type { TransItemType } from "../../src/i18n";
+import type RemotelySavePlugin from "../../src/main";
+import { stringToFragment } from "../../src/misc";
+import { ChangeRemoteBaseDirModal } from "../../src/settings";
+import {
+  DEFAULT_ONEDRIVEFULL_CONFIG,
+  getAuthUrlAndVerifier as getAuthUrlAndVerifierOnedriveFull,
+  sendRefreshTokenReq as sendRefreshTokenReqOnedriveFull,
+} from "./fsOnedriveFull";
+
+export class OnedriveFullAuthModal extends Modal {
+  readonly plugin: RemotelySavePlugin;
+  readonly authDiv: HTMLDivElement;
+  readonly revokeAuthDiv: HTMLDivElement;
+  readonly revokeAuthSetting: Setting;
+  constructor(
+    app: App,
+    plugin: RemotelySavePlugin,
+    authDiv: HTMLDivElement,
+    revokeAuthDiv: HTMLDivElement,
+    revokeAuthSetting: Setting
+  ) {
+    super(app);
+    this.plugin = plugin;
+    this.authDiv = authDiv;
+    this.revokeAuthDiv = revokeAuthDiv;
+    this.revokeAuthSetting = revokeAuthSetting;
+  }
+
+  async onOpen() {
+    const { contentEl } = this;
+
+    const { authUrl, verifier } = await getAuthUrlAndVerifierOnedriveFull(
+      this.plugin.settings.onedrivefull.clientID,
+      this.plugin.settings.onedrivefull.authority
+    );
+    this.plugin.oauth2Info.verifier = verifier;
+
+    const t = (x: TransItemType, vars?: any) => {
+      return this.plugin.i18n.t(x, vars);
+    };
+
+    t("modal_onedrivefullauth_shortdesc")
+      .split("\n")
+      .forEach((val) => {
+        contentEl.createEl("p", {
+          text: val,
+        });
+      });
+    if (Platform.isLinux) {
+      t("modal_onedrivefullauth_shortdesc_linux")
+        .split("\n")
+        .forEach((val) => {
+          contentEl.createEl("p", {
+            text: stringToFragment(val),
+          });
+        });
+    }
+    const div2 = contentEl.createDiv();
+    div2.createEl(
+      "button",
+      {
+        text: t("modal_onedrivefullauth_copybutton"),
+      },
+      (el) => {
+        el.onclick = async () => {
+          await navigator.clipboard.writeText(authUrl);
+          new Notice(t("modal_onedrivefullauth_copynotice"));
+        };
+      }
+    );
+
+    contentEl.createEl("p").createEl("a", {
+      href: authUrl,
+      text: authUrl,
+    });
+  }
+
+  onClose() {
+    const { contentEl } = this;
+    contentEl.empty();
+  }
+}
+
+export class OnedriveFullRevokeAuthModal extends Modal {
+  readonly plugin: RemotelySavePlugin;
+  readonly authDiv: HTMLDivElement;
+  readonly revokeAuthDiv: HTMLDivElement;
+  constructor(
+    app: App,
+    plugin: RemotelySavePlugin,
+    authDiv: HTMLDivElement,
+    revokeAuthDiv: HTMLDivElement
+  ) {
+    super(app);
+    this.plugin = plugin;
+    this.authDiv = authDiv;
+    this.revokeAuthDiv = revokeAuthDiv;
+  }
+
+  async onOpen() {
+    const { contentEl } = this;
+    const t = (x: TransItemType, vars?: any) => {
+      return this.plugin.i18n.t(x, vars);
+    };
+
+    contentEl.createEl("p", {
+      text: t("modal_onedrivefullrevokeauth_step1"),
+    });
+    const consentUrl = "https://microsoft.com/consent";
+    contentEl.createEl("p").createEl("a", {
+      href: consentUrl,
+      text: consentUrl,
+    });
+
+    contentEl.createEl("p", {
+      text: t("modal_onedrivefullrevokeauth_step2"),
+    });
+
+    new Setting(contentEl)
+      .setName(t("modal_onedrivefullrevokeauth_clean"))
+      .setDesc(t("modal_onedrivefullrevokeauth_clean_desc"))
+      .addButton(async (button) => {
+        button.setButtonText(t("modal_onedrivefullrevokeauth_clean_button"));
+        button.onClick(async () => {
+          try {
+            this.plugin.settings.onedrivefull = JSON.parse(
+              JSON.stringify(DEFAULT_ONEDRIVEFULL_CONFIG)
+            );
+            await this.plugin.saveSettings();
+            this.authDiv.toggleClass(
+              "onedrivefull-auth-button-hide",
+              this.plugin.settings.onedrivefull.username !== ""
+            );
+            this.revokeAuthDiv.toggleClass(
+              "onedrivefull-revoke-auth-button-hide",
+              this.plugin.settings.onedrivefull.username === ""
+            );
+            new Notice(t("modal_onedrivefullrevokeauth_clean_notice"));
+            this.close();
+          } catch (err) {
+            console.error(err);
+            new Notice(t("modal_onedrivefullrevokeauth_clean_fail"));
+          }
+        });
+      });
+  }
+
+  onClose() {
+    const { contentEl } = this;
+    contentEl.empty();
+  }
+}
+
+export const generateOnedriveFullSettingsPart = (
+  containerEl: HTMLElement,
+  t: (x: TransItemType, vars?: any) => string,
+  app: App,
+  plugin: RemotelySavePlugin,
+  saveUpdatedConfigFunc: () => Promise<any> | undefined
+) => {
+  const onedriveFullDiv = containerEl.createEl("div", {
+    cls: "onedrivefull-hide",
+  });
+  onedriveFullDiv.toggleClass(
+    "onedrivefull-hide",
+    plugin.settings.serviceType !== "onedrivefull"
+  );
+  onedriveFullDiv.createEl("h2", { text: t("settings_onedrivefull") });
+
+  const onedriveFullLongDescDiv = onedriveFullDiv.createEl("div", {
+    cls: "settings-long-desc",
+  });
+  for (const c of [
+    t("settings_onedrivefull_disclaimer1"),
+    t("settings_onedrivefull_disclaimer2"),
+  ]) {
+    onedriveFullLongDescDiv.createEl("p", {
+      text: c,
+      cls: "onedrivefull-disclaimer",
+    });
+  }
+
+  onedriveFullLongDescDiv.createEl("p", {
+    text: t("settings_onedrivefull_folder", {
+      remoteBaseDir:
+        plugin.settings.onedrivefull.remoteBaseDir || app.vault.getName(),
+    }),
+  });
+
+  onedriveFullLongDescDiv.createEl("p", {
+    text: t("settings_onedrivefull_nobiz"),
+  });
+
+  onedriveFullLongDescDiv.createDiv({
+    text: stringToFragment(t("settings_onedrivefull_pro_desc")),
+    cls: "onedrivefull-disclaimer",
+  });
+
+  const onedriveFullNotShowUpHintSetting = new Setting(onedriveFullDiv)
+    .setName(t("settings_onedrivefull_notshowuphint"))
+    .setDesc(t("settings_onedrivefull_notshowuphint_desc"))
+    .addButton(async (button) => {
+      button.setButtonText(t("settings_onedrivefull_notshowuphint_view_pro"));
+      button.onClick(async () => {
+        window.location.href = "#settings-pro";
+      });
+    });
+
+  const onedriveFullAllowedToUsedDiv = onedriveFullDiv.createDiv();
+  // if pro enabled, show up; otherwise hide.
+  const allowOnedriveFull =
+    plugin.settings.pro?.enabledProFeatures.filter(
+      (x) => x.featureName === "feature-onedrive_full"
+    ).length === 1;
+  console.debug(`allow to show up onedriveFull settings? ${allowOnedriveFull}`);
+  if (allowOnedriveFull) {
+    onedriveFullAllowedToUsedDiv.removeClass("onedrivefull-allow-to-use-hide");
+    onedriveFullNotShowUpHintSetting.settingEl.addClass(
+      "onedrivefull-allow-to-use-hide"
+    );
+  } else {
+    onedriveFullAllowedToUsedDiv.addClass("onedrivefull-allow-to-use-hide");
+    onedriveFullNotShowUpHintSetting.settingEl.removeClass(
+      "onedrivefull-allow-to-use-hide"
+    );
+  }
+
+  const onedriveFullSelectAuthDiv = onedriveFullAllowedToUsedDiv.createDiv();
+  const onedriveFullAuthDiv = onedriveFullSelectAuthDiv.createDiv({
+    cls: "onedrivefull-auth-button-hide settings-auth-related",
+  });
+  const onedriveFullRevokeAuthDiv = onedriveFullSelectAuthDiv.createDiv({
+    cls: "onedrivefull-revoke-auth-button-hide settings-auth-related",
+  });
+
+  const onedriveFullRevokeAuthSetting = new Setting(onedriveFullRevokeAuthDiv)
+    .setName(t("settings_onedrivefull_revoke"))
+    .setDesc(t("settings_onedrivefull_revoke_desc"))
+    .addButton(async (button) => {
+      button.setButtonText(t("settings_onedrivefull_revoke_button"));
+      button.onClick(async () => {
+        new OnedriveFullRevokeAuthModal(
+          app,
+          plugin,
+          onedriveFullAuthDiv,
+          onedriveFullRevokeAuthDiv
+        ).open();
+      });
+    });
+
+  new Setting(onedriveFullAuthDiv)
+    .setName(t("settings_onedrivefull_auth"))
+    .setDesc(t("settings_onedrivefull_auth_desc"))
+    .addButton(async (button) => {
+      button.setButtonText(t("settings_onedrivefull_auth_button"));
+      button.onClick(async () => {
+        const modal = new OnedriveFullAuthModal(
+          app,
+          plugin,
+          onedriveFullAuthDiv,
+          onedriveFullRevokeAuthDiv,
+          onedriveFullRevokeAuthSetting
+        );
+        plugin.oauth2Info.helperModal = modal;
+        plugin.oauth2Info.authDiv = onedriveFullAuthDiv;
+        plugin.oauth2Info.revokeDiv = onedriveFullRevokeAuthDiv;
+        plugin.oauth2Info.revokeAuthSetting = onedriveFullRevokeAuthSetting;
+        modal.open();
+      });
+    });
+
+  onedriveFullAuthDiv.toggleClass(
+    "onedrivefull-auth-button-hide",
+    plugin.settings.onedrivefull.refreshToken !== ""
+  );
+  onedriveFullRevokeAuthDiv.toggleClass(
+    "onedrivefull-revoke-auth-button-hide",
+    plugin.settings.onedrivefull.refreshToken === ""
+  );
+
+  let newonedriveFullRemoteBaseDir =
+    plugin.settings.onedrivefull.remoteBaseDir || "";
+  new Setting(onedriveFullAllowedToUsedDiv)
+    .setName(t("settings_remotebasedir"))
+    .setDesc(t("settings_remotebasedir_desc"))
+    .addText((text) =>
+      text
+        .setPlaceholder(app.vault.getName())
+        .setValue(newonedriveFullRemoteBaseDir)
+        .onChange((value) => {
+          newonedriveFullRemoteBaseDir = value.trim();
+        })
+    )
+    .addButton((button) => {
+      button.setButtonText(t("confirm"));
+      button.onClick(() => {
+        new ChangeRemoteBaseDirModal(
+          app,
+          plugin,
+          newonedriveFullRemoteBaseDir,
+          "onedrivefull"
+        ).open();
+      });
+    });
+  new Setting(onedriveFullAllowedToUsedDiv)
+    .setName(t("settings_checkonnectivity"))
+    .setDesc(t("settings_checkonnectivity_desc"))
+    .addButton(async (button) => {
+      button.setButtonText(t("settings_checkonnectivity_button"));
+      button.onClick(async () => {
+        new Notice(t("settings_checkonnectivity_checking"));
+        const client = getClient(plugin.settings, app.vault.getName(), () =>
+          plugin.saveSettings()
+        );
+        const errors = { msg: "" };
+        const res = await client.checkConnect((err: any) => {
+          errors.msg = `${err}`;
+        });
+        if (res) {
+          new Notice(t("settings_onedrivefull_connect_succ"));
+        } else {
+          new Notice(t("settings_onedrivefull_connect_fail"));
+          new Notice(errors.msg);
+        }
+      });
+    });
+
+  return {
+    onedriveFullDiv: onedriveFullDiv,
+    onedriveFullAllowedToUsedDiv: onedriveFullAllowedToUsedDiv,
+    onedriveFullNotShowUpHintSetting: onedriveFullNotShowUpHintSetting,
+  };
+};

pro/src/settingsPCloud.ts

@@ -280,20 +280,6 @@ export const generatePCloudSettingsPart = (
       });
     });
 
-  new Setting(pCloudAllowedToUsedDiv)
-    .setName(t("settings_pcloud_emptyfile"))
-    .setDesc(t("settings_pcloud_emptyfile_desc"))
-    .addDropdown(async (dropdown) => {
-      dropdown
-        .addOption("skip", t("settings_pcloud_emptyfile_skip"))
-        .addOption("error", t("settings_pcloud_emptyfile_error"))
-        .setValue(plugin.settings.pcloud.emptyFile)
-        .onChange(async (val) => {
-          plugin.settings.pcloud.emptyFile = val as any;
-          await saveUpdatedConfigFunc();
-        });
-    });
-
   new Setting(pCloudAllowedToUsedDiv)
     .setName(t("settings_checkonnectivity"))
     .setDesc(t("settings_checkonnectivity_desc"))

pro/src/settingsPro.ts

@@ -248,6 +248,8 @@ export const generateProSettingsPart = (
   app: App,
   plugin: RemotelySavePlugin,
   saveUpdatedConfigFunc: () => Promise<any> | undefined,
+  onedriveFullAllowedToUsedDiv: HTMLDivElement,
+  onedriveFullNotShowUpHintSetting: Setting,
   googleDriveAllowedToUsedDiv: HTMLDivElement,
   googleDriveNotShowUpHintSetting: Setting,
   boxAllowedToUsedDiv: HTMLDivElement,
@@ -255,7 +257,11 @@ export const generateProSettingsPart = (
   pCloudAllowedToUsedDiv: HTMLDivElement,
   pCloudNotShowUpHintSetting: Setting,
   yandexDiskAllowedToUsedDiv: HTMLDivElement,
-  yandexDiskNotShowUpHintSetting: Setting
+  yandexDiskNotShowUpHintSetting: Setting,
+  koofrAllowedToUsedDiv: HTMLDivElement,
+  koofrNotShowUpHintSetting: Setting,
+  azureBlobStorageAllowedToUsedDiv: HTMLDivElement,
+  azureBlobStorageNotShowUpHintSetting: Setting
 ) => {
   proDiv
     .createEl("h2", { text: t("settings_pro") })
@@ -302,6 +308,27 @@ export const generateProSettingsPart = (
         )
       );
 
+      const allowOnedriveFull =
+        plugin.settings.pro?.enabledProFeatures.filter(
+          (x) => x.featureName === "feature-box"
+        ).length === 1;
+      console.debug(
+        `allow to show up OnedriveFull settings? ${allowOnedriveFull}`
+      );
+      if (allowOnedriveFull) {
+        onedriveFullAllowedToUsedDiv.removeClass(
+          "onedrivefull-allow-to-use-hide"
+        );
+        onedriveFullNotShowUpHintSetting.settingEl.addClass(
+          "onedrivefull-allow-to-use-hide"
+        );
+      } else {
+        onedriveFullAllowedToUsedDiv.addClass("onedrivefull-allow-to-use-hide");
+        onedriveFullNotShowUpHintSetting.settingEl.removeClass(
+          "onedrivefull-allow-to-use-hide"
+        );
+      }
+
       const allowGoogleDrive =
         plugin.settings.pro?.enabledProFeatures.filter(
           (x) => x.featureName === "feature-google_drive"
@@ -372,6 +399,44 @@ export const generateProSettingsPart = (
         );
       }
 
+      const allowKoofr =
+        plugin.settings.pro?.enabledProFeatures.filter(
+          (x) => x.featureName === "feature-koofr"
+        ).length === 1;
+      console.debug(`allow to show up Koofr settings? ${allowKoofr}`);
+      if (allowKoofr) {
+        koofrAllowedToUsedDiv.removeClass("koofr-allow-to-use-hide");
+        koofrNotShowUpHintSetting.settingEl.addClass("koofr-allow-to-use-hide");
+      } else {
+        koofrAllowedToUsedDiv.addClass("koofr-allow-to-use-hide");
+        koofrNotShowUpHintSetting.settingEl.removeClass(
+          "koofr-allow-to-use-hide"
+        );
+      }
+
+      const allowAzureBlobStorage =
+        plugin.settings.pro?.enabledProFeatures.filter(
+          (x) => x.featureName === "feature-azure_blob_storage"
+        ).length === 1;
+      console.debug(
+        `allow to show up AzureBlobStorage settings? ${allowAzureBlobStorage}`
+      );
+      if (allowAzureBlobStorage) {
+        azureBlobStorageAllowedToUsedDiv.removeClass(
+          "azureblobstorage-allow-to-use-hide"
+        );
+        azureBlobStorageNotShowUpHintSetting.settingEl.addClass(
+          "azureBlobStorage-allow-to-use-hide"
+        );
+      } else {
+        azureBlobStorageAllowedToUsedDiv.addClass(
+          "azureblobstorage-allow-to-use-hide"
+        );
+        azureBlobStorageNotShowUpHintSetting.settingEl.removeClass(
+          "azureblobstorage-allow-to-use-hide"
+        );
+      }
+
       new Notice(t("settings_pro_features_refresh_succ"));
     });
   });

pro/src/sync.ts

@@ -2,13 +2,6 @@
 import AggregateError from "aggregate-error";
 import PQueue from "p-queue";
 import XRegExp from "xregexp";
-import { checkProRunnableAndFixInplace } from "../pro/src/account";
-import { duplicateFile, isMergable, mergeFile } from "../pro/src/conflictLogic";
-import {
-  clearFileContentHistoryByVaultAndProfile,
-  getFileContentHistoryByVaultAndProfile,
-  upsertFileContentHistoryByVaultAndProfile,
-} from "../pro/src/localdb";
 import type {
   ConflictActionType,
   EmptyFolderCleanType,
@@ -18,21 +11,21 @@ import type {
   SUPPORTED_SERVICES_TYPE,
   SyncDirectionType,
   SyncTriggerSourceType,
-} from "./baseTypes";
-import { copyFile, copyFileOrFolder, copyFolder } from "./copyLogic";
-import type { FakeFs } from "./fsAll";
-import type { FakeFsEncrypt } from "./fsEncrypt";
+} from "../../src/baseTypes";
+import { copyFile, copyFileOrFolder, copyFolder } from "../../src/copyLogic";
+import type { FakeFs } from "../../src/fsAll";
+import type { FakeFsEncrypt } from "../../src/fsEncrypt";
 import {
   type InternalDBs,
   clearPrevSyncRecordByVaultAndProfile,
   getAllPrevSyncRecordsByVaultAndProfile,
   insertSyncPlanRecordByVault,
   upsertPrevSyncRecordByVaultAndProfile,
-} from "./localdb";
+} from "../../src/localdb";
 import {
   DEFAULT_FILE_NAME_FOR_METADATAONREMOTE,
   DEFAULT_FILE_NAME_FOR_METADATAONREMOTE2,
-} from "./metadataOnRemote";
+} from "../../src/metadataOnRemote";
 import {
   atWhichLevel,
   getParentFolder,
@@ -40,8 +33,15 @@ import {
   isSpecialFolderNameToSkip,
   roughSizeOfObject,
   unixTimeToStr,
-} from "./misc";
-import type { Profiler } from "./profiler";
+} from "../../src/misc";
+import type { Profiler } from "../../src/profiler";
+import { checkProRunnableAndFixInplace } from "./account";
+import { duplicateFile, isMergable, mergeFile } from "./conflictLogic";
+import {
+  clearFileContentHistoryByVaultAndProfile,
+  getFileContentHistoryByVaultAndProfile,
+  upsertFileContentHistoryByVaultAndProfile,
+} from "./localdb";
 
 const copyEntityAndFixTimeFormat = (
   src: Entity,
@@ -291,7 +291,6 @@ const ensembleMixedEnties = async (
  */
 const getSyncPlanInplace = async (
   mixedEntityMappings: Record<string, MixedEntity>,
-  howToCleanEmptyFolder: EmptyFolderCleanType,
   skipSizeLargerThan: number,
   conflictAction: ConflictActionType,
   syncDirection: SyncDirectionType,
@@ -336,7 +335,10 @@ const getSyncPlanInplace = async (
           mixedEntry.decision = "folder_existed_both_then_do_nothing";
           mixedEntry.change = false;
         } else if (local !== undefined && remote === undefined) {
-          if (syncDirection === "incremental_pull_only") {
+          if (
+            syncDirection === "incremental_pull_only" ||
+            syncDirection === "incremental_pull_and_delete_only"
+          ) {
             mixedEntry.decisionBranch = 107;
             mixedEntry.decision = "folder_to_skip";
             mixedEntry.change = false;
@@ -347,7 +349,10 @@ const getSyncPlanInplace = async (
             mixedEntry.change = true;
           }
         } else if (local === undefined && remote !== undefined) {
-          if (syncDirection === "incremental_push_only") {
+          if (
+            syncDirection === "incremental_push_only" ||
+            syncDirection === "incremental_push_and_delete_only"
+          ) {
             mixedEntry.decisionBranch = 108;
             mixedEntry.decision = "folder_to_skip";
             mixedEntry.change = false;
@@ -365,57 +370,127 @@ const getSyncPlanInplace = async (
         }
         keptFolder.delete(key); // no need to save it in the Set later
       } else {
-        if (howToCleanEmptyFolder === "skip") {
-          mixedEntry.decisionBranch = 105;
-          mixedEntry.decision = "folder_to_skip";
+        if (local !== undefined && remote !== undefined) {
+          // both exist, do nothing
+          mixedEntry.decisionBranch = 121;
+          mixedEntry.decision = "folder_existed_both_then_do_nothing";
           mixedEntry.change = false;
-        } else if (howToCleanEmptyFolder === "clean_both") {
-          if (local !== undefined && remote !== undefined) {
-            if (syncDirection === "bidirectional") {
-              mixedEntry.decisionBranch = 106;
-              mixedEntry.decision = "folder_to_be_deleted_on_both";
-              mixedEntry.change = true;
-            } else {
-              // right now it does nothing because of "incremental"
-              // TODO: should we delete??
-              mixedEntry.decisionBranch = 109;
+          keptFolder.add(getParentFolder(key));
+        } else if (local !== undefined && remote === undefined) {
+          if (prevSync !== undefined) {
+            // then the folder is deleted on remote
+            if (
+              syncDirection === "incremental_push_only" ||
+              syncDirection === "incremental_push_and_delete_only"
+            ) {
+              mixedEntry.decisionBranch = 122;
+              mixedEntry.decision = "folder_to_skip";
+              keptFolder.add(getParentFolder(key));
+              mixedEntry.change = false;
+            } else if (syncDirection === "incremental_pull_only") {
+              mixedEntry.decisionBranch = 123;
               mixedEntry.decision = "folder_to_skip";
               mixedEntry.change = false;
-            }
-          } else if (local !== undefined && remote === undefined) {
-            if (syncDirection === "bidirectional") {
-              mixedEntry.decisionBranch = 110;
+              keptFolder.add(getParentFolder(key));
+            } else if (syncDirection === "incremental_pull_and_delete_only") {
+              mixedEntry.decisionBranch = 135;
               mixedEntry.decision = "folder_to_be_deleted_on_local";
               mixedEntry.change = true;
             } else {
-              // right now it does nothing because of "incremental"
-              // TODO: should we delete??
-              mixedEntry.decisionBranch = 111;
-              mixedEntry.decision = "folder_to_skip";
-              mixedEntry.change = false;
-            }
-          } else if (local === undefined && remote !== undefined) {
-            if (syncDirection === "bidirectional") {
-              mixedEntry.decisionBranch = 112;
-              mixedEntry.decision = "folder_to_be_deleted_on_remote";
+              // bidirectional
+              mixedEntry.decisionBranch = 124;
+              mixedEntry.decision = "folder_to_be_deleted_on_local";
               mixedEntry.change = true;
-            } else {
-              // right now it does nothing because of "incremental"
-              // TODO: should we delete??
-              mixedEntry.decisionBranch = 113;
-              mixedEntry.decision = "folder_to_skip";
-              mixedEntry.change = false;
             }
           } else {
-            // no folder to delete, do nothing
-            mixedEntry.decisionBranch = 114;
-            mixedEntry.decision = "folder_to_skip";
-            mixedEntry.change = false;
+            // then the folder is created on local
+
+            if (
+              syncDirection === "incremental_push_only" ||
+              syncDirection === "incremental_push_and_delete_only"
+            ) {
+              mixedEntry.decisionBranch = 125;
+              mixedEntry.decision =
+                "folder_existed_local_then_also_create_remote";
+              mixedEntry.change = true;
+              keptFolder.add(getParentFolder(key));
+            } else if (
+              syncDirection === "incremental_pull_only" ||
+              syncDirection === "incremental_pull_and_delete_only"
+            ) {
+              mixedEntry.decisionBranch = 126;
+              mixedEntry.decision = "folder_to_skip";
+              mixedEntry.change = false;
+              keptFolder.add(getParentFolder(key));
+            } else {
+              // bidirectional
+              mixedEntry.decisionBranch = 127;
+              mixedEntry.decision =
+                "folder_existed_local_then_also_create_remote";
+              mixedEntry.change = true;
+              keptFolder.add(getParentFolder(key));
+            }
+          }
+        } else if (local === undefined && remote !== undefined) {
+          if (prevSync !== undefined) {
+            // then the folder is deleted on local
+            if (syncDirection === "incremental_push_only") {
+              mixedEntry.decisionBranch = 128;
+              mixedEntry.decision = "folder_to_skip";
+              mixedEntry.change = false;
+              keptFolder.add(getParentFolder(key));
+            } else if (syncDirection === "incremental_push_and_delete_only") {
+              mixedEntry.decisionBranch = 136;
+              mixedEntry.decision = "folder_to_be_deleted_on_remote";
+              mixedEntry.change = true;
+            } else if (
+              syncDirection === "incremental_pull_only" ||
+              syncDirection === "incremental_pull_and_delete_only"
+            ) {
+              mixedEntry.decisionBranch = 129;
+              mixedEntry.decision = "folder_to_skip";
+              mixedEntry.change = false;
+              keptFolder.add(getParentFolder(key));
+            } else {
+              // bidirectional
+              mixedEntry.decisionBranch = 130;
+              mixedEntry.decision = "folder_to_be_deleted_on_remote";
+              mixedEntry.change = true;
+            }
+          } else {
+            // then the folder is created on remote
+            if (
+              syncDirection === "incremental_push_only" ||
+              syncDirection === "incremental_push_and_delete_only"
+            ) {
+              mixedEntry.decisionBranch = 131;
+              mixedEntry.decision = "folder_to_skip";
+              mixedEntry.change = false;
+              keptFolder.add(getParentFolder(key));
+            } else if (
+              syncDirection === "incremental_pull_only" ||
+              syncDirection === "incremental_pull_and_delete_only"
+            ) {
+              mixedEntry.decisionBranch = 132;
+              mixedEntry.decision =
+                "folder_existed_remote_then_also_create_local";
+              mixedEntry.change = true;
+              keptFolder.add(getParentFolder(key));
+            } else {
+              // bidirectional
+              mixedEntry.decisionBranch = 133;
+              mixedEntry.decision =
+                "folder_existed_remote_then_also_create_local";
+              mixedEntry.change = true;
+              keptFolder.add(getParentFolder(key));
+            }
           }
         } else {
-          throw Error(
-            `do not know how to deal with empty folder ${mixedEntry.key}`
-          );
+          // local === undefined && remote === undefined
+          // no folder to delete or create, do nothing
+          mixedEntry.decisionBranch = 134;
+          mixedEntry.decision = "folder_to_skip";
+          mixedEntry.change = false;
         }
       }
     } else {
@@ -454,7 +529,10 @@ const getSyncPlanInplace = async (
               skipSizeLargerThan <= 0 ||
               remote.sizeEnc! <= skipSizeLargerThan
             ) {
-              if (syncDirection === "incremental_push_only") {
+              if (
+                syncDirection === "incremental_push_only" ||
+                syncDirection === "incremental_push_and_delete_only"
+              ) {
                 mixedEntry.decisionBranch = 26;
                 mixedEntry.decision = "conflict_modified_then_keep_local";
                 mixedEntry.change = true;
@@ -478,7 +556,10 @@ const getSyncPlanInplace = async (
               skipSizeLargerThan <= 0 ||
               local.sizeEnc! <= skipSizeLargerThan
             ) {
-              if (syncDirection === "incremental_pull_only") {
+              if (
+                syncDirection === "incremental_pull_only" ||
+                syncDirection === "incremental_pull_and_delete_only"
+              ) {
                 mixedEntry.decisionBranch = 27;
                 mixedEntry.decision = "conflict_modified_then_keep_remote";
                 mixedEntry.change = true;
@@ -535,12 +616,18 @@ const getSyncPlanInplace = async (
                   mixedEntry.change = true;
                   keptFolder.add(getParentFolder(key));
                 }
-              } else if (syncDirection === "incremental_pull_only") {
+              } else if (
+                syncDirection === "incremental_pull_only" ||
+                syncDirection === "incremental_pull_and_delete_only"
+              ) {
                 mixedEntry.decisionBranch = 22;
                 mixedEntry.decision = "conflict_created_then_keep_remote";
                 mixedEntry.change = true;
                 keptFolder.add(getParentFolder(key));
-              } else if (syncDirection === "incremental_push_only") {
+              } else if (
+                syncDirection === "incremental_push_only" ||
+                syncDirection === "incremental_push_and_delete_only"
+              ) {
                 mixedEntry.decisionBranch = 23;
                 mixedEntry.decision = "conflict_created_then_keep_local";
                 mixedEntry.change = true;
@@ -587,12 +674,18 @@ const getSyncPlanInplace = async (
                   mixedEntry.change = true;
                   keptFolder.add(getParentFolder(key));
                 }
-              } else if (syncDirection === "incremental_pull_only") {
+              } else if (
+                syncDirection === "incremental_pull_only" ||
+                syncDirection === "incremental_pull_and_delete_only"
+              ) {
                 mixedEntry.decisionBranch = 24;
                 mixedEntry.decision = "conflict_modified_then_keep_remote";
                 mixedEntry.change = true;
                 keptFolder.add(getParentFolder(key));
-              } else if (syncDirection === "incremental_push_only") {
+              } else if (
+                syncDirection === "incremental_push_only" ||
+                syncDirection === "incremental_push_and_delete_only"
+              ) {
                 mixedEntry.decisionBranch = 25;
                 mixedEntry.decision = "conflict_modified_then_keep_local";
                 mixedEntry.change = true;
@@ -621,7 +714,10 @@ const getSyncPlanInplace = async (
             skipSizeLargerThan <= 0 ||
             remote.sizeEnc! <= skipSizeLargerThan
           ) {
-            if (syncDirection === "incremental_push_only") {
+            if (
+              syncDirection === "incremental_push_only" ||
+              syncDirection === "incremental_push_and_delete_only"
+            ) {
               mixedEntry.decisionBranch = 28;
               mixedEntry.decision = "conflict_created_then_do_nothing";
               mixedEntry.change = false;
@@ -649,7 +745,14 @@ const getSyncPlanInplace = async (
             mixedEntry.decision = "conflict_created_then_do_nothing";
             mixedEntry.change = false;
             keptFolder.add(getParentFolder(key));
-          } else if (syncDirection === "incremental_pull_only") {
+          } else if (syncDirection === "incremental_push_and_delete_only") {
+            mixedEntry.decisionBranch = 38;
+            mixedEntry.decision = "local_is_deleted_thus_also_delete_remote";
+            mixedEntry.change = true;
+          } else if (
+            syncDirection === "incremental_pull_only" ||
+            syncDirection === "incremental_pull_and_delete_only"
+          ) {
             mixedEntry.decisionBranch = 35;
             mixedEntry.decision = "conflict_created_then_keep_remote";
             mixedEntry.change = true;
@@ -665,7 +768,10 @@ const getSyncPlanInplace = async (
             skipSizeLargerThan <= 0 ||
             remote.sizeEnc! <= skipSizeLargerThan
           ) {
-            if (syncDirection === "incremental_push_only") {
+            if (
+              syncDirection === "incremental_push_only" ||
+              syncDirection === "incremental_push_and_delete_only"
+            ) {
               mixedEntry.decisionBranch = 30;
               mixedEntry.decision = "conflict_created_then_do_nothing";
               mixedEntry.change = false;
@@ -690,7 +796,10 @@ const getSyncPlanInplace = async (
         if (prevSync === undefined) {
           // if A is not in the previous list, A is new
           if (skipSizeLargerThan <= 0 || local.sizeEnc! <= skipSizeLargerThan) {
-            if (syncDirection === "incremental_pull_only") {
+            if (
+              syncDirection === "incremental_pull_only" ||
+              syncDirection === "incremental_pull_and_delete_only"
+            ) {
               mixedEntry.decisionBranch = 31;
               mixedEntry.decision = "conflict_created_then_do_nothing";
               mixedEntry.change = false;
@@ -713,7 +822,10 @@ const getSyncPlanInplace = async (
           prevSync.sizeEnc === local.sizeEnc
         ) {
           // if A is in the previous list and UNMODIFIED, A has been deleted by B
-          if (syncDirection === "incremental_push_only") {
+          if (
+            syncDirection === "incremental_push_only" ||
+            syncDirection === "incremental_push_and_delete_only"
+          ) {
             mixedEntry.decisionBranch = 32;
             mixedEntry.decision = "conflict_created_then_keep_local";
             mixedEntry.change = true;
@@ -721,6 +833,10 @@ const getSyncPlanInplace = async (
             mixedEntry.decisionBranch = 33;
             mixedEntry.decision = "conflict_created_then_do_nothing";
             mixedEntry.change = false;
+          } else if (syncDirection === "incremental_pull_and_delete_only") {
+            mixedEntry.decisionBranch = 39;
+            mixedEntry.decision = "remote_is_deleted_thus_also_delete_local";
+            mixedEntry.change = true;
           } else {
             mixedEntry.decisionBranch = 7;
             mixedEntry.decision = "remote_is_deleted_thus_also_delete_local";
@@ -729,7 +845,10 @@ const getSyncPlanInplace = async (
         } else {
           // if A is in the previous list and MODIFIED, A has been deleted by B but modified by A
           if (skipSizeLargerThan <= 0 || local.sizeEnc! <= skipSizeLargerThan) {
-            if (syncDirection === "incremental_pull_only") {
+            if (
+              syncDirection === "incremental_pull_only" ||
+              syncDirection === "incremental_pull_and_delete_only"
+            ) {
               mixedEntry.decisionBranch = 34;
               mixedEntry.decision = "conflict_created_then_do_nothing";
               mixedEntry.change = false;
@@ -783,7 +902,7 @@ const getSyncPlanInplace = async (
   mixedEntityMappings["/$@meta"] = {
     key: "/$@meta", // don't mess up with the types
     sideNotes: {
-      version: "20240525 fs version",
+      version: "20240616 fs version",
       generateTime: currTime,
       generateTimeFmt: currTimeFmt,
       service: settings.serviceType,
@@ -1172,7 +1291,7 @@ const dispatchOperationToActualV3 = async (
       r.key
     );
     if (conflictAction === "smart_conflict") {
-      if (isMergable(r.remote!)) {
+      if (isMergable(r.local!)) {
         await clearFileContentHistoryByVaultAndProfile(
           db,
           vaultRandomID,
@@ -1298,6 +1417,7 @@ export const doActualSync = async (
   db: InternalDBs,
   profiler: Profiler | undefined,
   conflictAction: ConflictActionType,
+  triggerSource: SyncTriggerSourceType,
   callbackSyncProcess?: any
 ) => {
   profiler?.addIndent();
@@ -1405,13 +1525,16 @@ export const doActualSync = async (
           // );
 
           await callbackSyncProcess?.(
+            triggerSource,
             realCounter,
             realTotalCount,
             key,
             val.decision
           );
 
-          realCounter += 1;
+          if (val.change === undefined || val.change) {
+            realCounter += 1;
+          }
 
           await dispatchOperationToActualV3(
             key,
@@ -1584,7 +1707,6 @@ export async function syncer(
 
     mixedEntityMappings = await getSyncPlanInplace(
       mixedEntityMappings,
-      settings.howToCleanEmptyFolder ?? "clean_both",
       settings.skipSizeLargerThan ?? -1,
       settings.conflictAction ?? "keep_newer",
       settings.syncDirection ?? "bidirectional",
@@ -1625,6 +1747,7 @@ export async function syncer(
         db,
         profiler,
         settings.conflictAction ?? "keep_newer",
+        triggerSource,
         callbackSyncProcess
       );
       profiler?.insert(`finish step${step} (actual sync)`);

src/baseTypes.ts

@@ -4,14 +4,27 @@
  */
 
 import type {
+  AzureBlobStorageConfig,
   BoxConfig,
   GoogleDriveConfig,
+  KoofrConfig,
+  OnedriveFullConfig,
   PCloudConfig,
   ProConfig,
   YandexDiskConfig,
 } from "../pro/src/baseTypesPro";
 import type { LangTypeAndAuto } from "./i18n";
 
+declare global {
+  var DEFAULT_DROPBOX_APP_KEY: string;
+  var DEFAULT_ONEDRIVE_CLIENT_ID: string;
+  var DEFAULT_ONEDRIVE_AUTHORITY: string;
+}
+
+export const DROPBOX_APP_KEY = global.DEFAULT_DROPBOX_APP_KEY;
+export const ONEDRIVE_CLIENT_ID = global.DEFAULT_ONEDRIVE_CLIENT_ID;
+export const ONEDRIVE_AUTHORITY = global.DEFAULT_ONEDRIVE_AUTHORITY;
+
 export const DEFAULT_CONTENT_TYPE = "application/octet-stream";
 
 export type SUPPORTED_SERVICES_TYPE =
@@ -19,21 +32,19 @@ export type SUPPORTED_SERVICES_TYPE =
   | "webdav"
   | "dropbox"
   | "onedrive"
+  | "onedrivefull"
   | "webdis"
   | "googledrive"
   | "box"
   | "pcloud"
-  | "yandexdisk";
+  | "yandexdisk"
+  | "koofr"
+  | "azureblobstorage";
 
-export type SUPPORTED_SERVICES_TYPE_WITH_REMOTE_BASE_DIR =
-  | "webdav"
-  | "dropbox"
-  | "onedrive"
-  | "webdis"
-  | "googledrive"
-  | "box"
-  | "pcloud"
-  | "yandexdisk";
+export type SUPPORTED_SERVICES_TYPE_WITH_REMOTE_BASE_DIR = Exclude<
+  SUPPORTED_SERVICES_TYPE,
+  "s3" | "azureblobstorage"
+>;
 
 export interface S3Config {
   s3Endpoint: string;
@@ -105,6 +116,7 @@ export interface OnedriveConfig {
   credentialsShouldBeDeletedAtTime?: number;
   remoteBaseDir?: string;
   emptyFile: "skip" | "error";
+  kind: "onedrive";
 }
 
 export interface WebdisConfig {
@@ -117,21 +129,13 @@ export interface WebdisConfig {
 export type SyncDirectionType =
   | "bidirectional"
   | "incremental_pull_only"
-  | "incremental_push_only";
+  | "incremental_push_only"
+  | "incremental_pull_and_delete_only"
+  | "incremental_push_and_delete_only";
 
 export type CipherMethodType = "rclone-base64" | "openssl-base64" | "unknown";
 
-export type QRExportType =
-  | "basic_and_advanced"
-  | "s3"
-  | "dropbox"
-  | "onedrive"
-  | "webdav"
-  | "webdis"
-  | "googledrive"
-  | "box"
-  | "pcloud"
-  | "yandexdisk";
+export type QRExportType = "basic_and_advanced" | SUPPORTED_SERVICES_TYPE;
 
 export interface ProfilerConfig {
   enablePrinting?: boolean;
@@ -143,11 +147,15 @@ export interface RemotelySavePluginSettings {
   webdav: WebdavConfig;
   dropbox: DropboxConfig;
   onedrive: OnedriveConfig;
+  onedrivefull: OnedriveFullConfig;
   webdis: WebdisConfig;
   googledrive: GoogleDriveConfig;
   box: BoxConfig;
   pcloud: PCloudConfig;
   yandexdisk: YandexDiskConfig;
+  koofr: KoofrConfig;
+  azureblobstorage: AzureBlobStorageConfig;
+
   password: string;
   serviceType: SUPPORTED_SERVICES_TYPE;
   currLogLevel?: string;
@@ -165,7 +173,6 @@ export interface RemotelySavePluginSettings {
   enableStatusBarInfo?: boolean;
   deleteToWhere?: "system" | "obsidian";
   conflictAction?: ConflictActionType;
-  howToCleanEmptyFolder?: EmptyFolderCleanType;
 
   protectModifyPercentage?: number;
   syncDirection?: SyncDirectionType;
@@ -194,6 +201,11 @@ export interface RemotelySavePluginSettings {
    * @deprecated
    */
   logToDB?: boolean;
+
+  /**
+   * @deprecated
+   */
+  howToCleanEmptyFolder?: EmptyFolderCleanType;
 }
 
 export const COMMAND_URI = "remotely-save";

src/debugMode.ts

@@ -1,5 +1,6 @@
 import type { Vault } from "obsidian";
 
+import type { SyncPlanType } from "../pro/src/sync";
 import {
   DEFAULT_DEBUG_FOLDER,
   DEFAULT_PROFILER_RESULT_FILE_PREFIX,
@@ -11,7 +12,6 @@ import {
 } from "./localdb";
 import type { InternalDBs } from "./localdb";
 import { mkdirpInVault } from "./misc";
-import type { SyncPlanType } from "./sync";
 
 const getSubsetOfSyncPlan = (x: string, onlyChange: boolean) => {
   if (!onlyChange) {

src/fsDropbox.ts

@@ -3,6 +3,7 @@ import type { DropboxResponse, DropboxResponseError, files } from "dropbox";
 import random from "lodash/random";
 import {
   COMMAND_CALLBACK_DROPBOX,
+  DROPBOX_APP_KEY,
   type DropboxConfig,
   type Entity,
   OAUTH2_FORCE_EXPIRE_MILLISECONDS,
@@ -21,7 +22,7 @@ export { Dropbox } from "dropbox";
 
 export const DEFAULT_DROPBOX_CONFIG: DropboxConfig = {
   accessToken: "",
-  clientID: process.env.DEFAULT_DROPBOX_APP_KEY ?? "",
+  clientID: DROPBOX_APP_KEY ?? "",
   refreshToken: "",
   accessTokenExpiresInSeconds: 0,
   accessTokenExpiresAtTime: 0,

src/fsEncrypt.ts

@@ -1,7 +1,7 @@
 import type { CipherMethodType, Entity } from "./baseTypes";
 import * as openssl from "./encryptOpenSSL";
 import * as rclone from "./encryptRClone";
-import { isVaildText } from "./misc";
+import { isSpecialFolderNameToSkip, isVaildText } from "./misc";
 
 import cloneDeep from "lodash/cloneDeep";
 import { FakeFs } from "./fsAll";
@@ -189,6 +189,10 @@ export class FakeFsEncrypt extends FakeFs {
       return res;
     } else {
       for (const innerEntity of innerWalkResult) {
+        if (isSpecialFolderNameToSkip(innerEntity.keyRaw, [])) {
+          continue;
+        }
+
         const key = await this._decryptName(innerEntity.keyRaw);
         const size = key.endsWith("/") ? 0 : undefined;
         res.push({

src/fsGetter.ts

@@ -1,5 +1,8 @@
+import { FakeFsAzureBlobStorage } from "../pro/src/fsAzureBlobStorage";
 import { FakeFsBox } from "../pro/src/fsBox";
 import { FakeFsGoogleDrive } from "../pro/src/fsGoogleDrive";
+import { FakeFsKoofr } from "../pro/src/fsKoofr";
+import { FakeFsOnedriveFull } from "../pro/src/fsOnedriveFull";
 import { FakeFsPCloud } from "../pro/src/fsPCloud";
 import { FakeFsYandexDisk } from "../pro/src/fsYandexDisk";
 import type { RemotelySavePluginSettings } from "./baseTypes";
@@ -39,6 +42,12 @@ export function getClient(
         vaultName,
         saveUpdatedConfigFunc
       );
+    case "onedrivefull":
+      return new FakeFsOnedriveFull(
+        settings.onedrivefull,
+        vaultName,
+        saveUpdatedConfigFunc
+      );
     case "webdis":
       return new FakeFsWebdis(
         settings.webdis,
@@ -65,6 +74,10 @@ export function getClient(
         vaultName,
         saveUpdatedConfigFunc
       );
+    case "koofr":
+      return new FakeFsKoofr(settings.koofr, vaultName, saveUpdatedConfigFunc);
+    case "azureblobstorage":
+      return new FakeFsAzureBlobStorage(settings.azureblobstorage, vaultName);
     default:
       throw Error(`cannot init client for serviceType=${settings.serviceType}`);
   }

src/fsLocal.ts

@@ -43,8 +43,13 @@ export class FakeFsLocal extends FakeFs {
     for (const entry of localTAbstractFiles) {
       let r: Entity | undefined = undefined;
       let key = entry.path;
+      if (key.startsWith("/")) {
+        // why?
+        // just remove leading slash /
+        key = key.slice(1);
+      }
 
-      if (entry.path === "/") {
+      if (entry.path === "/" || entry.path === "") {
         // ignore
         continue;
       } else if (entry instanceof TFile) {
@@ -61,15 +66,15 @@ export class FakeFsLocal extends FakeFs {
           );
         }
         r = {
-          key: entry.path, // local always unencrypted
-          keyRaw: entry.path,
+          key: key, // local always unencrypted
+          keyRaw: key,
           mtimeCli: mtimeLocal,
           mtimeSvr: mtimeLocal,
           size: entry.stat.size, // local always unencrypted
           sizeRaw: entry.stat.size,
         };
       } else if (entry instanceof TFolder) {
-        key = `${entry.path}/`;
+        key = `${key}/`;
         r = {
           key: key,
           keyRaw: key,

src/fsOnedrive.ts

@@ -13,6 +13,8 @@ import {
   DEFAULT_CONTENT_TYPE,
   type Entity,
   OAUTH2_FORCE_EXPIRE_MILLISECONDS,
+  ONEDRIVE_AUTHORITY,
+  ONEDRIVE_CLIENT_ID,
   type OnedriveConfig,
 } from "./baseTypes";
 import { VALID_REQURL } from "./baseTypesObs";
@@ -24,8 +26,8 @@ const REDIRECT_URI = `obsidian://${COMMAND_CALLBACK_ONEDRIVE}`;
 
 export const DEFAULT_ONEDRIVE_CONFIG: OnedriveConfig = {
   accessToken: "",
-  clientID: process.env.DEFAULT_ONEDRIVE_CLIENT_ID ?? "",
-  authority: process.env.DEFAULT_ONEDRIVE_AUTHORITY ?? "",
+  clientID: ONEDRIVE_CLIENT_ID ?? "",
+  authority: ONEDRIVE_AUTHORITY ?? "",
   refreshToken: "",
   accessTokenExpiresInSeconds: 0,
   accessTokenExpiresAtTime: 0,
@@ -33,6 +35,7 @@ export const DEFAULT_ONEDRIVE_CONFIG: OnedriveConfig = {
   username: "",
   credentialsShouldBeDeletedAtTime: 0,
   emptyFile: "skip",
+  kind: "onedrive",
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -913,7 +916,8 @@ export class FakeFsOnedrive extends FakeFs {
       `${key}?$select=@microsoft.graph.downloadUrl`
     );
     const downloadUrl: string = rsp["@microsoft.graph.downloadUrl"];
-    if (VALID_REQURL) {
+    // biome-ignore lint/correctness/noConstantCondition: <explanation>
+    if (false /*VALID_REQURL*/) {
       const content = (
         await requestUrl({
           url: downloadUrl,
@@ -923,7 +927,9 @@ export class FakeFsOnedrive extends FakeFs {
       return content;
     } else {
       // cannot set no-cache here, will have cors error
-      const content = await (await fetch(downloadUrl)).arrayBuffer();
+      const content = await (
+        await fetch(downloadUrl, { cache: "no-store" })
+      ).arrayBuffer();
       return content;
     }
   }

src/fsS3.ts

@@ -309,7 +309,14 @@ const fromS3ObjectToEntity = (
 ) => {
   // console.debug(`fromS3ObjectToEntity: ${x.Key!}, ${JSON.stringify(x,null,2)}`);
   // S3 officially only supports seconds precision!!!!!
-  const mtimeSvr = Math.floor(x.LastModified!.valueOf() / 1000.0) * 1000;
+  if (x.LastModified === undefined) {
+    throw Error(
+      `s3 object ${x.Key!} doesn't have LastModified value: ${JSON.stringify(
+        x
+      )}`
+    );
+  }
+  const mtimeSvr = Math.floor(x.LastModified.valueOf() / 1000.0) * 1000;
   let mtimeCli = mtimeSvr;
   if (x.Key! in mtimeRecords) {
     const m2 = mtimeRecords[x.Key!];
@@ -346,7 +353,14 @@ const fromS3HeadObjectToEntity = (
 ) => {
   // console.debug(`fromS3HeadObjectToEntity: ${fileOrFolderPathWithRemotePrefix}: ${JSON.stringify(x,null,2)}`);
   // S3 officially only supports seconds precision!!!!!
-  const mtimeSvr = Math.floor(x.LastModified!.valueOf() / 1000.0) * 1000;
+  if (x.LastModified === undefined) {
+    throw Error(
+      `s3 object ${fileOrFolderPathWithRemotePrefix} doesn't have LastModified value: ${JSON.stringify(
+        x
+      )}`
+    );
+  }
+  const mtimeSvr = Math.floor(x.LastModified.valueOf() / 1000.0) * 1000;
   let mtimeCli = mtimeSvr;
   if (useAccurateMTime && x.Metadata !== undefined) {
     const m2 = Math.floor(
@@ -755,23 +769,44 @@ export class FakeFsS3 extends FakeFs {
       return;
     }
 
-    if (this.synthFoldersCache.hasOwnProperty(key)) {
-      delete this.synthFoldersCache[key];
-      return;
+    if (key.endsWith("/")) {
+      if (this.synthFoldersCache.hasOwnProperty(key)) {
+        delete this.synthFoldersCache[key];
+        return;
+      }
+
+      // in s3 the folder may not exist, so we make our best effort.
+      // do NOT read this.s3Config.generateFolderObject
+      // because the folder might be generated by previous setting
+      try {
+        const remoteFileName = getRemoteWithPrefixPath(
+          key,
+          this.s3Config.remotePrefix ?? ""
+        );
+
+        await this.s3Client.send(
+          new DeleteObjectCommand({
+            Bucket: this.s3Config.s3BucketName,
+            Key: remoteFileName,
+          })
+        );
+      } catch (e) {
+        // pass
+      }
+    } else {
+      const remoteFileName = getRemoteWithPrefixPath(
+        key,
+        this.s3Config.remotePrefix ?? ""
+      );
+
+      await this.s3Client.send(
+        new DeleteObjectCommand({
+          Bucket: this.s3Config.s3BucketName,
+          Key: remoteFileName,
+        })
+      );
     }
 
-    const remoteFileName = getRemoteWithPrefixPath(
-      key,
-      this.s3Config.remotePrefix ?? ""
-    );
-
-    await this.s3Client.send(
-      new DeleteObjectCommand({
-        Bucket: this.s3Config.s3BucketName,
-        Key: remoteFileName,
-      })
-    );
-
     // TODO: do we need to delete folder recursively?
     // maybe we should not
     // because the outer sync algorithm should do that

src/importExport.ts

@@ -1,13 +1,14 @@
 import cloneDeep from "lodash/cloneDeep";
 import QRCode from "qrcode";
 
+import { getShrinkedSettings as getShrinkedSettingsOnedriveFull } from "../pro/src/fsOnedriveFull";
 import {
   COMMAND_URI,
   type QRExportType,
   type RemotelySavePluginSettings,
   type UriParams,
 } from "./baseTypes";
-import { getShrinkedSettings } from "./fsOnedrive";
+import { getShrinkedSettings as getShrinkedSettingsOnedrive } from "./fsOnedrive";
 
 export const exportQrCodeUri = async (
   settings: RemotelySavePluginSettings,
@@ -22,19 +23,26 @@ export const exportQrCodeUri = async (
     delete settings2.s3;
     delete settings2.dropbox;
     delete settings2.onedrive;
+    delete settings2.onedrivefull;
     delete settings2.webdav;
     delete settings2.webdis;
     delete settings2.googledrive;
     delete settings2.box;
     delete settings2.pcloud;
     delete settings2.yandexdisk;
+    delete settings2.koofr;
+    delete settings2.azureblobstorage;
     delete settings2.pro;
   } else if (exportFields === "s3") {
     settings2 = { s3: cloneDeep(settings.s3) };
   } else if (exportFields === "dropbox") {
     settings2 = { dropbox: cloneDeep(settings.dropbox) };
   } else if (exportFields === "onedrive") {
-    settings2 = { onedrive: getShrinkedSettings(settings.onedrive) };
+    settings2 = { onedrive: getShrinkedSettingsOnedrive(settings.onedrive) };
+  } else if (exportFields === "onedrivefull") {
+    settings2 = {
+      onedrivefull: getShrinkedSettingsOnedriveFull(settings.onedrivefull),
+    };
   } else if (exportFields === "webdav") {
     settings2 = { webdav: cloneDeep(settings.webdav) };
   } else if (exportFields === "webdis") {
@@ -47,6 +55,10 @@ export const exportQrCodeUri = async (
     settings2 = { pcloud: cloneDeep(settings.pcloud) };
   } else if (exportFields === "yandexdisk") {
     settings2 = { yandexdisk: cloneDeep(settings.yandexdisk) };
+  } else if (exportFields === "koofr") {
+    settings2 = { koofr: cloneDeep(settings.koofr) };
+  } else if (exportFields === "azureblobstorage") {
+    settings2 = { azureblobstorage: cloneDeep(settings.azureblobstorage) };
   }
 
   delete settings2.vaultRandomID;

src/langs/en.json

@@ -45,20 +45,26 @@
 
   "command_exportlogsindb": "export logs saved in db",
 
-  "statusbar_time_years": "Synced {{time}} years ago",
-  "statusbar_time_months": "Synced {{time}} months ago",
-  "statusbar_time_weeks": "Synced {{time}} weeks ago",
-  "statusbar_time_days": "Synced {{time}} days ago",
-  "statusbar_time_hours": "Synced {{time}} hours ago",
-  "statusbar_time_minutes": "Synced {{time}} minutes ago",
-  "statusbar_time_lessminute": "Synced last minute ago",
-  "statusbar_lastsync": "Synced {{time}} ago",
+  "statusbar_sync_source_manual": "Manual: ",
+  "statusbar_sync_source_dry": "Dry: ",
+  "statusbar_sync_source_auto": "Auto: ",
+  "statusbar_sync_source_auto_once_init": "Auto (init): ",
+  "statusbar_sync_source_auto_sync_on_save": "Auto (save): ",
+  "statusbar_sync_status_prefix_success": "Successfully synced ",
+  "statusbar_sync_status_prefix_failed": "Failed to sync ",
+  "statusbar_time_years": "{{time}} years ago",
+  "statusbar_time_months": "{{time}} months ago",
+  "statusbar_time_weeks": "{{time}} weeks ago",
+  "statusbar_time_days": "{{time}} days ago",
+  "statusbar_time_hours": "{{time}} hours ago",
+  "statusbar_time_minutes": "{{time}} minutes ago",
+  "statusbar_time_lessminute": "last minute ago",
+  "statusbar_time_now": "just now",
   "statusbar_syncing": "Syncing...",
-  "statusbar_failed": "Last sync failed",
-  "statusbar_now": "Synced just now",
-  "statusbar_lastsync_label": "Last successful Sync on {{date}}",
+  "statusbar_lastsync_label": "on {{date}}",
   "statusbar_lastsync_never": "Never Synced",
   "statusbar_lastsync_never_label": "Never Synced before",
+
   "modal_password_title": "Hold on and PLEASE READ ON...",
   "modal_password_shortdesc": "If the field is not empty, files would be encrypted locally before being uploaded.\nIf the field is empty, then files would be uploaded without encryption.",
   "modal_password_attn1": "Attention 1/5: The vault name is NOT encrypted. The plugin creates a folder with the vault name on some remote services.",
@@ -76,13 +82,13 @@
   "modal_remotebasedir_secondconfirm_vaultname": "Reset To The Default Vault Folder Name",
   "modal_remotebasedir_secondconfirm_change": "Confirm To Change",
   "modal_remotebasedir_notice": "New remote base directory config saved!",
-  "modal_remoteprefix_title": "You are changing the remote prefix config",
-  "modal_remoteprefix_shortdesc": "1. The plugin would NOT automatically move the content from the old directory to the new one directly on the remote. Everything syncs from the beginning again.\n2. If you set the string to the empty, the prefix will be empty and the files will be saved at the root of the bucket.\n3. The remote directory name itself would not be encrypted even you've set an E2E password.\n4. Some special char like '?', '/', '\\' are not allowed. Spaces in the beginning or in the end are also trimmed.",
-  "modal_remoteprefix_invaliddirhint": "Your input contains special characters like '?', '/', '\\' which are not allowed.",
-  "modal_remoteprefix_tosave": "The prefix to save is \"{{{prefix}}}\"",
-  "modal_remoteprefix_secondconfirm_empty": "The prefix is empty and the files will be saved at the root of the bucket.",
-  "modal_remoteprefix_secondconfirm_change": "Confirm To Change",
-  "modal_remoteprefix_notice": "New remote prefix config saved!",
+  "modal_remoteprefix_s3_title": "You are changing the remote prefix config",
+  "modal_remoteprefix_s3_shortdesc": "1. The plugin would NOT automatically move the content from the old directory to the new one directly on the remote. Everything syncs from the beginning again.\n2. If you set the string to the empty, the prefix will be empty and the files will be saved at the root of the bucket.\n3. The remote directory name itself would not be encrypted even you've set an E2E password.\n4. Some special char like '?', '/', '\\' are not allowed. Spaces in the beginning or in the end are also trimmed.",
+  "modal_remoteprefix_s3_invaliddirhint": "Your input contains special characters like '?', '/', '\\' which are not allowed.",
+  "modal_remoteprefix_s3_tosave": "The prefix to save is \"{{{prefix}}}\"",
+  "modal_remoteprefix_s3_secondconfirm_empty": "The prefix is empty and the files will be saved at the root of the bucket.",
+  "modal_remoteprefix_s3_secondconfirm_change": "Confirm To Change",
+  "modal_remoteprefix_s3_notice": "New remote prefix config saved!",
   "modal_dropboxauth_manualsteps": "Step 1: Visit the address in a browser, and follow the steps.\nStep 2: In the end of the web flow, you obtain a long code. Paste it here then click \"Submit\".",
   "modal_dropboxauth_autosteps": "Visit the address in a browser, and follow the steps.\nFinally you should be redirected to Obsidian.",
   "modal_dropboxauth_copybutton": "Click to copy the auth url",
@@ -157,8 +163,8 @@
   "settings_checkonnectivity_checking": "Checking...",
   "settings_remotebasedir": "Change The Remote Base Directory (experimental)",
   "settings_remotebasedir_desc": "By default the content is synced to a remote directory with the same name as the vault name. You can change the remote folder name here, or keep the input field empty to reset to the default. You need to click \"Confirm\".",
-  "settings_remoteprefix": "Change The Remote Prefix (experimental)",
-  "settings_remoteprefix_desc": "By default in s3 the files are saved at the root of the bucket. You can change the remote prefix here, or keep the input field empty to reset to the default. You need to click \"Confirm\".",
+  "settings_remoteprefix_s3": "Change The Remote Prefix (experimental)",
+  "settings_remoteprefix_s3_desc": "By default in s3 the files are saved at the root of the bucket. You can change the remote prefix here, or keep the input field empty to reset to the default. You need to click \"Confirm\".",
   "settings_s3": "Remote For S3 or compatible",
   "settings_s3_disclaimer1": "Disclaimer: This plugin is NOT an official Amazon product.",
   "settings_s3_disclaimer2": "Disclaimer: The information is stored locally. Other malicious/harmful/faulty plugins could read the info. If you see any unintentional access to your bucket, please immediately delete the access key on your AWS (or other S3-service provider) settings.",
@@ -209,7 +215,7 @@
   "settings_dropbox_auth_button": "Auth",
   "settings_dropbox_connect_succ": "Great! We can connect to Dropbox!",
   "settings_dropbox_connect_fail": "We cannot connect to Dropbox.",
-  "settings_onedrive": "Remote For Onedrive (for personal)",
+  "settings_onedrive": "Remote For Onedrive (for personal) (App Folder)",
   "settings_onedrive_disclaimer1": "Disclaimer: This app is NOT an official Microsoft / OneDrive product.",
   "settings_onedrive_disclaimer2": "Disclaimer: The information is stored locally. Other malicious/harmful/faulty plugins could read the info. If you see any unintentional access to your Onedrive, please immediately disconnect this app on https://microsoft.com/consent .",
   "settings_onedrive_folder": "We will create and sync inside the folder /Apps/{{pluginID}}/{{remoteBaseDir}} on your OneDrive.",
@@ -263,7 +269,7 @@
   "settings_chooseservice_s3": "S3 or compatible",
   "settings_chooseservice_dropbox": "Dropbox",
   "settings_chooseservice_webdav": "Webdav",
-  "settings_chooseservice_onedrive": "OneDrive for personal",
+  "settings_chooseservice_onedrive": "OneDrive for personal (App Folder)",
   "settings_chooseservice_webdis": "Webdis (HTTP for Redis®)",
   "settings_adv": "Advanced Settings",
   "settings_concurrency": "Concurrency",
@@ -292,11 +298,15 @@
   "settings_protectmodifypercentage_custom_desc": "custom",
   "settings_protectmodifypercentage_customfield": "Custom Abort Sync If Modification Above Percentage",
   "settings_protectmodifypercentage_customfield_desc": "You need to enter a number between 0 (inclusive) and 100 (inclusive). Float number is also allowed.",
-  "setting_syncdirection": "Sync Direction",
-  "setting_syncdirection_desc": "Which direction should the plugin sync to? Please be aware that only CHANGED files (based on time and size) are synced regardless any option.",
+
+  "setting_syncdirection": "Sync Direction (experimental)",
+  "setting_syncdirection_desc": "<p>Which direction should the plugin sync to? Please be aware that only CHANGED files (based on time and size) are synced regardless any option.</p><ol><li>Bidirectional: Changes on both side are synced to the other side.</li><li>Incremental Push: Locally created or modifed files are copied to remote.</li><li>Incremental Pull: Remotely created or modifed files are copied to local.</li><li>Incremental Push And Delete: Locally created or modifed files are copied to remote, <strong>and local deletion operations are run on remote too.</strong></li><li>Incremental Pull And Delete: Remotely created or modifed files are copied to local, <strong>and remote deletion operations are run on local too.</strong></li></ol>",
   "setting_syncdirection_bidirectional_desc": "Bidirectional (default)",
-  "setting_syncdirection_incremental_push_only_desc": "Incremental Push Only (aka backup mode)",
-  "setting_syncdirection_incremental_pull_only_desc": "Incremental Pull Only",
+  "setting_syncdirection_incremental_push_only_desc": "Incremental Push (aka backup mode)",
+  "setting_syncdirection_incremental_pull_only_desc": "Incremental Pull",
+  "setting_syncdirection_incremental_push_and_delete_only_desc": "Incremental Push And Delete",
+  "setting_syncdirection_incremental_pull_and_delete_only_desc": "Incremental Pull And Delete",
+
   "settings_enablemobilestatusbar": "Mobile Status Bar (experimental)",
   "settings_enablemobilestatusbar_desc": "By default Obsidian mobile hides status bar. But some users want to show it up. So here is a hack.",
   "settings_importexport": "Import and Export Partial Settings",
@@ -305,7 +315,7 @@
   "settings_export_basic_and_advanced_button": "Export Basic And Advanced Part",
   "settings_export_s3_button": "Export S3 Part",
   "settings_export_dropbox_button": "Export Dropbox Part",
-  "settings_export_onedrive_button": "Export OneDrive Part",
+  "settings_export_onedrive_button": "Export OneDrive (App Folder) Part",
   "settings_export_webdav_button": "Export Webdav Part",
   "settings_export_webdis_button": "Export Webdis Part",
   "settings_import": "Import",

src/langs/zh_cn.json

@@ -45,20 +45,26 @@
   "command_exportsyncplans_all": "导出同步计划（所有）（export sync plans (all)）",
   "command_exportlogsindb": "从数据库导出终端日志（export logs saved in db）",
 
-  "statusbar_time_years": "{{time}} 年前同步",
-  "statusbar_time_months": "{{time}} 月前同步",
-  "statusbar_time_weeks": "{{time}} 周前同步",
-  "statusbar_time_days": "{{time}} 天前同步",
-  "statusbar_time_hours": "{{time}} 小时前同步",
-  "statusbar_time_minutes": "{{time}} 分钟前同步",
-  "statusbar_time_lessminute": "一分钟之内同步",
-  "statusbar_lastsync": "上一次同步于：{{time}}",
+  "statusbar_sync_source_manual": "手动：",
+  "statusbar_sync_source_dry": "空跑：",
+  "statusbar_sync_source_auto": "自动：",
+  "statusbar_sync_source_auto_once_init": "启动时同步：",
+  "statusbar_sync_source_auto_sync_on_save": "保存时同步：",
+  "statusbar_sync_status_prefix_success": "同步成功：",
+  "statusbar_sync_status_prefix_failed": "同步失败：",
+  "statusbar_time_years": "{{time}} 年前",
+  "statusbar_time_months": "{{time}} 月前",
+  "statusbar_time_weeks": "{{time}} 周前",
+  "statusbar_time_days": "{{time}} 天前",
+  "statusbar_time_hours": "{{time}} 小时前",
+  "statusbar_time_minutes": "{{time}} 分钟前",
+  "statusbar_time_lessminute": "1 分钟之内",
+  "statusbar_time_now": "刚刚",
   "statusbar_syncing": "正在同步",
-  "statusbar_failed": "上次同步失败了",
-  "statusbar_now": "刚同步完",
-  "statusbar_lastsync_label": "上一次同步于：{{date}}",
+  "statusbar_lastsync_label": "日期：{{date}}",
   "statusbar_lastsync_never": "没触发过同步",
   "statusbar_lastsync_never_label": "没触发过同步",
+
   "modal_password_title": "稍等一下，请阅读下文：",
   "modal_password_shortdesc": "如果密码不是空的，那么文件会在上传之前，在本地先用此密码加密。\n如果密码是空的，那么文件会被非加密地上传。",
   "modal_password_attn1": "注意 1/5：库（Vault）名字是不会加密的！本插件会在一些远程存储里创建一个和库名字有着同名的文件夹。",
@@ -76,13 +82,13 @@
   "modal_remotebasedir_secondconfirm_vaultname": "重设回默认的库文件夹名",
   "modal_remotebasedir_secondconfirm_change": "确认修改",
   "modal_remotebasedir_notice": "新的远端基文件夹设置已保存！",
-  "modal_remoteprefix_title": "您正在修改远端路径前缀设置",
-  "modal_remoteprefix_shortdesc": "1. 本插件并不会自动在远端把内容从旧文件夹移动到新文件夹。所有内容都会重新同步。\n2. 如果你使得文本输入框为空，那么本设置为保存为空，文件将会被存储在桶（Bucket）的根目录。\n3. 即使您设置了端对端加密的密码，远端文件夹名称本身也不会被加密。\n4. 某些特殊字符，如“?”、“/”、“\\”是不允许的。文本前后的空格也会被自动删去。",
-  "modal_remoteprefix_invaliddirhint": "您所输入的内容含有某些特殊字符，如“?”、“/”、“\\”，它们是不允许的。",
-  "modal_remoteprefix_tosave": "您设定的新前缀为：“{{{prefix}}}”",
-  "modal_remoteprefix_secondconfirm_empty": "前缀为空，文件会保存在根目录",
-  "modal_remoteprefix_secondconfirm_change": "确认修改",
-  "modal_remoteprefix_notice": "新的远端路径前缀设置已保存！",
+  "modal_remoteprefix_s3_title": "您正在修改远端路径前缀设置",
+  "modal_remoteprefix_s3_shortdesc": "1. 本插件并不会自动在远端把内容从旧文件夹移动到新文件夹。所有内容都会重新同步。\n2. 如果你使得文本输入框为空，那么本设置为保存为空，文件将会被存储在桶（Bucket）的根目录。\n3. 即使您设置了端对端加密的密码，远端文件夹名称本身也不会被加密。\n4. 某些特殊字符，如“?”、“/”、“\\”是不允许的。文本前后的空格也会被自动删去。",
+  "modal_remoteprefix_s3_invaliddirhint": "您所输入的内容含有某些特殊字符，如“?”、“/”、“\\”，它们是不允许的。",
+  "modal_remoteprefix_s3_tosave": "您设定的新前缀为：“{{{prefix}}}”",
+  "modal_remoteprefix_s3_secondconfirm_empty": "前缀为空，文件会保存在根目录",
+  "modal_remoteprefix_s3_secondconfirm_change": "确认修改",
+  "modal_remoteprefix_s3_notice": "新的远端路径前缀设置已保存！",
   "modal_dropboxauth_manualsteps": "第 1 步：在浏览器中访问以下地址，然后按照网页提示操作。\n到了最后，您应该会获得一串很长的代码文本，请复制粘贴到下方，并点击“提交”",
   "modal_dropboxauth_autosteps": "在浏览器中访问以下地址，然后按照网页提示操作。\n到了最后，您应该会被自动重定向回来 Obsidian。",
   "modal_dropboxauth_copybutton": "点击此按钮从而复制鉴权 url",
@@ -156,8 +162,8 @@
   "settings_checkonnectivity_checking": "正在检查……",
   "settings_remotebasedir": "修改远端基文件夹（实验性质）",
   "settings_remotebasedir_desc": "默认设定，内容会被同步到远端的和资料库同名的文件夹下。您可以在此修改远端文件夹名，或删除输入框文本从而重设到默认值。您需要点击“确认”。",
-  "settings_remoteprefix": "修改远端前缀路径（实验性质）",
-  "settings_remoteprefix_desc": "默认设定 s3 保存在存储桶（Bucket）的根目录。您可以在这里修改路径前缀，或者保持为空保持默认设置。您需要点击“确认”。",
+  "settings_remoteprefix_s3": "修改远端前缀路径（实验性质）",
+  "settings_remoteprefix_s3_desc": "默认设定 s3 保存在存储桶（Bucket）的根目录。您可以在这里修改路径前缀，或者保持为空保持默认设置。您需要点击“确认”。",
   "settings_s3": "S3 或兼容 S3 的服务的设置",
   "settings_s3_disclaimer1": "声明：本插件不是 Amazon 的官方产品。",
   "settings_s3_disclaimer2": "声明：您所输入的信息存储于本地。其它有害的或者出错的插件，是有可能读取到这些信息的。如果您发现了存储桶有不符合预期的访问，请立刻从 AWS（或其它 S3 服务商）删除记录于此的 access key。",
@@ -208,7 +214,7 @@
   "settings_dropbox_auth_button": "鉴权",
   "settings_dropbox_connect_succ": "很好！我们可连接上 Dropbox！",
   "settings_dropbox_connect_fail": "我们未能连接上 Dropbox。",
-  "settings_onedrive": "Onedrive（个人版）设置",
+  "settings_onedrive": "Onedrive（个人版）（App Folder）设置",
   "settings_onedrive_disclaimer1": "声明：此插件不是微软或 OneDrive 的官方产品。",
   "settings_onedrive_disclaimer2": "声明：您所输入的信息存储于本地。其它有害的或者出错的插件，是有可能读取到这些信息的。如果您发现了 OneDrive 有不符合预期的访问，请立刻从 https://microsoft.com/consent 删除记录于此插件的连接鉴权。",
   "settings_onedrive_folder": "我们会在您的 OneDrive 上创建此文件夹并在里面同步：/Apps/{{pluginID}}/{{remoteBaseDir}}。",
@@ -262,7 +268,7 @@
   "settings_chooseservice_s3": "S3 或兼容 S3 的服务",
   "settings_chooseservice_dropbox": "Dropbox",
   "settings_chooseservice_webdav": "Webdav",
-  "settings_chooseservice_onedrive": "OneDrive（个人版）",
+  "settings_chooseservice_onedrive": "OneDrive（个人版）（App Folder）",
   "settings_chooseservice_webdis": "Webdis (an HTTP interface for Redis)",
   "settings_adv": "进阶设置",
   "settings_concurrency": "并行度",
@@ -291,11 +297,15 @@
   "settings_protectmodifypercentage_custom_desc": "自定义",
   "settings_protectmodifypercentage_customfield": "如果修改超过自定义百分比则中止同步",
   "settings_protectmodifypercentage_customfield_desc": "您需要输入 0（含）~ 100（含）的数字。小数也是可以的。",
-  "setting_syncdirection": "同步方向",
-  "setting_syncdirection_desc": "插件应该向哪里同步？注意每个选项都是只有修改了的文件（基于修改时间和大小判断）才会触发同步动作。",
+
+  "setting_syncdirection": "同步方向（实验性质）",
+  "setting_syncdirection_desc": "<p>W插件应该向哪里同步？注意每个选项都是只有修改了的文件（基于修改时间和大小判断）才会触发同步动作。</p><ol><li>双向同步：一边的变动会同步到另一边。</li><li>增量推送：本地创建或修改的文件会复制到远端。</li><li>增量拉取：远端创建或修改的文件会复制到本地。</li><li>增量推送带删除：本地创建或修改的文件会复制到远端，<strong>本地的删除也会在远端运行。</strong></li><li>增量拉取带删除：远端创建或修改的文件会复制到本地，<strong>远端的删除也会在本地运行。</strong></li></ol>",
   "setting_syncdirection_bidirectional_desc": "双向同步（默认）",
-  "setting_syncdirection_incremental_push_only_desc": "只增量推送（也即：备份模式）",
-  "setting_syncdirection_incremental_pull_only_desc": "只增量拉取",
+  "setting_syncdirection_incremental_push_only_desc": "增量推送（也即：备份模式）",
+  "setting_syncdirection_incremental_pull_only_desc": "增量拉取",
+  "setting_syncdirection_incremental_push_and_delete_only_desc": "增量推送带删除",
+  "setting_syncdirection_incremental_pull_and_delete_only_desc": "增量拉取带删除",
+
   "settings_enablemobilestatusbar": "手机的状态栏（实验性质）",
   "settings_enablemobilestatusbar_desc": "Obsidian 手机版默认隐藏了状态栏。有些用户希望展示它。这里提供了设置选项。",
   "settings_importexport": "导入导出部分设置",
@@ -304,7 +314,7 @@
   "settings_export_basic_and_advanced_button": "导出基本或进阶设置",
   "settings_export_s3_button": "导出 S3 部分",
   "settings_export_dropbox_button": "导出 Dropbox 部分",
-  "settings_export_onedrive_button": "导出 OneDrive 部分",
+  "settings_export_onedrive_button": "导出 OneDrive (App Folder) 部分",
   "settings_export_webdav_button": "导出 Webdav 部分",
   "settings_export_webdis_button": "导出 Webdis 部分",
   "settings_import": "导入",

src/langs/zh_tw.json

@@ -44,20 +44,26 @@
   "command_exportsyncplans_all": "匯出同步計劃（所有）（export sync plans (all)）",
   "command_exportlogsindb": "從資料庫匯出終端日誌（export logs saved in db）",
 
-  "statusbar_time_years": "{{time}} 年前同步",
-  "statusbar_time_months": "{{time}} 月前同步",
-  "statusbar_time_weeks": "{{time}} 周前同步",
-  "statusbar_time_days": "{{time}} 天前同步",
-  "statusbar_time_hours": "{{time}} 小時前同步",
-  "statusbar_time_minutes": "{{time}} 分鐘前同步",
-  "statusbar_time_lessminute": "一分鐘之內同步",
-  "statusbar_lastsync": "上一次同步於：{{time}}",
+  "statusbar_sync_source_manual": "手動：",
+  "statusbar_sync_source_dry": "空跑：",
+  "statusbar_sync_source_auto": "自動：",
+  "statusbar_sync_source_auto_once_init": "啟動時同步：",
+  "statusbar_sync_source_auto_sync_on_save": "儲存時同步：",
+  "statusbar_sync_status_prefix_success": "同步成功：",
+  "statusbar_sync_status_prefix_failed": "同步失敗：",
+  "statusbar_time_years": "{{time}} 年前",
+  "statusbar_time_months": "{{time}} 月前",
+  "statusbar_time_weeks": "{{time}} 周前",
+  "statusbar_time_days": "{{time}} 天前",
+  "statusbar_time_hours": "{{time}} 小時前",
+  "statusbar_time_minutes": "{{time}} 分鐘前",
+  "statusbar_time_lessminute": "1 分鐘之內",
+  "statusbar_time_now": "剛剛",
   "statusbar_syncing": "正在同步",
-  "statusbar_failed": "上次同步失敗了",
-  "statusbar_now": "剛同步完",
-  "statusbar_lastsync_label": "上一次同步於：{{date}}",
+  "statusbar_lastsync_label": "日期：{{date}}",
   "statusbar_lastsync_never": "沒觸發過同步",
   "statusbar_lastsync_never_label": "沒觸發過同步",
+
   "modal_password_title": "稍等一下，請閱讀下文：",
   "modal_password_shortdesc": "如果密碼不是空的，那麼檔案會在上傳之前，在本地先用此密碼加密。\n如果密碼是空的，那麼檔案會被非加密地上傳。",
   "modal_password_attn1": "注意 1/5：儲存庫（Vault）名字是不會加密的！本外掛會在一些遠端儲存裡建立一個和庫名字有著同名的資料夾。",
@@ -75,13 +81,13 @@
   "modal_remotebasedir_secondconfirm_vaultname": "重設回預設的庫資料夾名",
   "modal_remotebasedir_secondconfirm_change": "確認修改",
   "modal_remotebasedir_notice": "新的遠端基資料夾設定已儲存！",
-  "modal_remoteprefix_title": "您正在修改遠端路徑字首設定",
-  "modal_remoteprefix_shortdesc": "1. 本外掛並不會自動在遠端把內容從舊資料夾移動到新資料夾。所有內容都會重新同步。\n2. 如果你使得文字輸入框為空，那麼本設定為儲存為空，檔案將會被儲存在桶（Bucket）的根目錄。\n3. 即使您設定了端對端加密的密碼，遠端資料夾名稱本身也不會被加密。\n4. 某些特殊字元，如“?”、“/”、“\\”是不允許的。文字前後的空格也會被自動刪去。",
-  "modal_remoteprefix_invaliddirhint": "您所輸入的內容含有某些特殊字元，如“?”、“/”、“\\”，它們是不允許的。",
-  "modal_remoteprefix_tosave": "您設定的新字首為：“{{{prefix}}}”",
-  "modal_remoteprefix_secondconfirm_empty": "字首為空，檔案會儲存在根目錄",
-  "modal_remoteprefix_secondconfirm_change": "確認修改",
-  "modal_remoteprefix_notice": "新的遠端路徑字首設定已儲存！",
+  "modal_remoteprefix_s3_title": "您正在修改遠端路徑字首設定",
+  "modal_remoteprefix_s3_shortdesc": "1. 本外掛並不會自動在遠端把內容從舊資料夾移動到新資料夾。所有內容都會重新同步。\n2. 如果你使得文字輸入框為空，那麼本設定為儲存為空，檔案將會被儲存在桶（Bucket）的根目錄。\n3. 即使您設定了端對端加密的密碼，遠端資料夾名稱本身也不會被加密。\n4. 某些特殊字元，如“?”、“/”、“\\”是不允許的。文字前後的空格也會被自動刪去。",
+  "modal_remoteprefix_s3_invaliddirhint": "您所輸入的內容含有某些特殊字元，如“?”、“/”、“\\”，它們是不允許的。",
+  "modal_remoteprefix_s3_tosave": "您設定的新字首為：“{{{prefix}}}”",
+  "modal_remoteprefix_s3_secondconfirm_empty": "字首為空，檔案會儲存在根目錄",
+  "modal_remoteprefix_s3_secondconfirm_change": "確認修改",
+  "modal_remoteprefix_s3_notice": "新的遠端路徑字首設定已儲存！",
   "modal_dropboxauth_manualsteps": "第 1 步：在瀏覽器中訪問以下地址，然後按照網頁提示操作。\n到了最後，您應該會獲得一串很長的程式碼文字，請複製貼上到下方，並點選“提交”",
   "modal_dropboxauth_autosteps": "在瀏覽器中訪問以下地址，然後按照網頁提示操作。\n到了最後，您應該會被自動重定向回來 Obsidian。",
   "modal_dropboxauth_copybutton": "點選此按鈕從而複製鑑權 url",
@@ -155,8 +161,8 @@
   "settings_checkonnectivity_checking": "正在檢查……",
   "settings_remotebasedir": "修改遠端基資料夾（實驗性質）",
   "settings_remotebasedir_desc": "預設設定，內容會被同步到遠端的和資料庫同名的資料夾下。您可以在此修改遠端資料夾名，或刪除輸入框文字從而重設到預設值。您需要點選“確認”。",
-  "settings_remoteprefix": "修改遠端字首路徑（實驗性質）",
-  "settings_remoteprefix_desc": "預設設定 s3 儲存在儲存桶（Bucket）的根目錄。您可以在這裡修改路徑字首，或者保持為空保持預設設定。您需要點選“確認”。",
+  "settings_remoteprefix_s3": "修改遠端字首路徑（實驗性質）",
+  "settings_remoteprefix_s3_desc": "預設設定 s3 儲存在儲存桶（Bucket）的根目錄。您可以在這裡修改路徑字首，或者保持為空保持預設設定。您需要點選“確認”。",
   "settings_s3": "S3 或相容 S3 的服務的設定",
   "settings_s3_disclaimer1": "宣告：本外掛不是 Amazon 的官方產品。",
   "settings_s3_disclaimer2": "宣告：您所輸入的資訊儲存於本地。其它有害的或者出錯的外掛，是有可能讀取到這些資訊的。如果您發現了儲存桶有不符合預期的訪問，請立刻從 AWS（或其它 S3 服務商）刪除記錄於此的 access key。",
@@ -207,7 +213,7 @@
   "settings_dropbox_auth_button": "鑑權",
   "settings_dropbox_connect_succ": "很好！我們可連線上 Dropbox！",
   "settings_dropbox_connect_fail": "我們未能連線上 Dropbox。",
-  "settings_onedrive": "Onedrive（個人版）設定",
+  "settings_onedrive": "Onedrive（個人版）（App Folder）設定",
   "settings_onedrive_disclaimer1": "宣告：此外掛不是微軟或 OneDrive 的官方產品。",
   "settings_onedrive_disclaimer2": "宣告：您所輸入的資訊儲存於本地。其它有害的或者出錯的外掛，是有可能讀取到這些資訊的。如果您發現了 OneDrive 有不符合預期的訪問，請立刻從 https://microsoft.com/consent 刪除記錄於此外掛的連線鑑權。",
   "settings_onedrive_folder": "我們會在您的 OneDrive 上建立此資料夾並在裡面同步：/Apps/{{pluginID}}/{{remoteBaseDir}}。",
@@ -261,7 +267,7 @@
   "settings_chooseservice_s3": "S3 或相容 S3 的服務",
   "settings_chooseservice_dropbox": "Dropbox",
   "settings_chooseservice_webdav": "Webdav",
-  "settings_chooseservice_onedrive": "OneDrive（個人版）",
+  "settings_chooseservice_onedrive": "OneDrive（個人版）（App Folder）",
   "settings_chooseservice_webdis": "Webdis (an HTTP interface for Redis®)",
   "settings_adv": "進階設定",
   "settings_concurrency": "並行度",
@@ -290,11 +296,15 @@
   "settings_protectmodifypercentage_custom_desc": "自定義",
   "settings_protectmodifypercentage_customfield": "如果修改超過自定義百分比則中止同步",
   "settings_protectmodifypercentage_customfield_desc": "您需要輸入 0（含）~ 100（含）的數字。小數也是可以的。",
-  "setting_syncdirection": "同步方向",
-  "setting_syncdirection_desc": "外掛應該向哪裡同步？注意每個選項都是隻有修改了的檔案（基於修改時間和大小判斷）才會觸發同步動作。",
+
+  "setting_syncdirection": "同步方向（實驗性質）",
+  "setting_syncdirection_desc": "<p>W外掛應該向哪裡同步？注意每個選項都是隻有修改了的檔案（基於修改時間和大小判斷）才會觸發同步動作。</p><ol><li>雙向同步：一邊的變動會同步到另一邊。</li><li>增量推送：本地建立或修改的檔案會複製到遠端。</li><li>增量拉取：遠端建立或修改的檔案會複製到本地。</li><li>增量推送帶刪除：本地建立或修改的檔案會複製到遠端，<strong>本地的刪除也會在遠端執行。</strong></li><li>增量拉取帶刪除：遠端建立或修改的檔案會複製到本地，<strong>遠端的刪除也會在本地執行。</strong></li></ol>",
   "setting_syncdirection_bidirectional_desc": "雙向同步（預設）",
-  "setting_syncdirection_incremental_push_only_desc": "只增量推送（也即：備份模式）",
-  "setting_syncdirection_incremental_pull_only_desc": "只增量拉取",
+  "setting_syncdirection_incremental_push_only_desc": "增量推送（也即：備份模式）",
+  "setting_syncdirection_incremental_pull_only_desc": "增量拉取",
+  "setting_syncdirection_incremental_push_and_delete_only_desc": "增量推送帶刪除",
+  "setting_syncdirection_incremental_pull_and_delete_only_desc": "增量拉取帶刪除",
+
   "settings_enablemobilestatusbar": "手機的狀態列（實驗性質）",
   "settings_enablemobilestatusbar_desc": "Obsidian 手機版預設隱藏了狀態列。有些使用者希望展示它。這裡提供了設定選項。",
   "settings_importexport": "匯入匯出部分設定",
@@ -303,7 +313,7 @@
   "settings_export_basic_and_advanced_button": "匯出基本或進階設定",
   "settings_export_s3_button": "匯出 S3 部分",
   "settings_export_dropbox_button": "匯出 Dropbox 部分",
-  "settings_export_onedrive_button": "匯出 OneDrive 部分",
+  "settings_export_onedrive_button": "匯出 OneDrive (App Folder) 部分",
   "settings_export_webdav_button": "匯出 Webdav 部分",
   "settings_export_webdis_button": "匯出 Webdis 部分",
   "settings_import": "匯入",

src/localdb.ts

@@ -6,9 +6,9 @@ ep2(localforage);
 export type LocalForage = typeof localforage;
 import { nanoid } from "nanoid";
 
+import type { SyncPlanType } from "../pro/src/sync";
 import type { Entity, SUPPORTED_SERVICES_TYPE } from "./baseTypes";
 import { unixTimeToStr } from "./misc";
-import type { SyncPlanType } from "./sync";
 
 const DB_VERSION_NUMBER_IN_HISTORY = [20211114, 20220108, 20220326, 20240220];
 export const DEFAULT_DB_VERSION_NUMBER: number = 20240220;
@@ -519,7 +519,27 @@ export const getLastSuccessSyncTimeByVault = async (
 ) => {
   return (await db.simpleKVForMiscTbl.getItem(
     `${vaultRandomID}-lastSuccessSyncMillis`
-  )) as number;
+  )) as number | null | undefined;
+};
+
+export const upsertLastFailedSyncTimeByVault = async (
+  db: InternalDBs,
+  vaultRandomID: string,
+  millis: number
+) => {
+  await db.simpleKVForMiscTbl.setItem(
+    `${vaultRandomID}-lastFailedSyncMillis`,
+    millis
+  );
+};
+
+export const getLastFailedSyncTimeByVault = async (
+  db: InternalDBs,
+  vaultRandomID: string
+) => {
+  return (await db.simpleKVForMiscTbl.getItem(
+    `${vaultRandomID}-lastFailedSyncMillis`
+  )) as number | null | undefined;
 };
 
 export const upsertPluginVersionByVault = async (

src/main.ts

@@ -25,10 +25,13 @@ import {
 } from "../pro/src/account";
 import {
   COMMAND_CALLBACK_BOX,
+  COMMAND_CALLBACK_KOOFR,
+  COMMAND_CALLBACK_ONEDRIVEFULL,
   COMMAND_CALLBACK_PCLOUD,
   COMMAND_CALLBACK_PRO,
   COMMAND_CALLBACK_YANDEXDISK,
 } from "../pro/src/baseTypesPro";
+import { DEFAULT_AZUREBLOBSTORAGE_CONFIG } from "../pro/src/fsAzureBlobStorage";
 import {
   DEFAULT_BOX_CONFIG,
   FakeFsBox,
@@ -36,6 +39,17 @@ import {
   setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplaceBox,
 } from "../pro/src/fsBox";
 import { DEFAULT_GOOGLEDRIVE_CONFIG } from "../pro/src/fsGoogleDrive";
+import {
+  DEFAULT_KOOFR_CONFIG,
+  sendAuthReq as sendAuthReqKoofr,
+  setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplaceKoofr,
+} from "../pro/src/fsKoofr";
+import {
+  type AccessCodeResponseSuccessfulType as AccessCodeResponseSuccessfulTypeOnedriveFull,
+  DEFAULT_ONEDRIVEFULL_CONFIG,
+  sendAuthReq as sendAuthReqOnedriveFull,
+  setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplaceOnedriveFull,
+} from "../pro/src/fsOnedriveFull";
 import {
   type AuthAllowFirstRes as AuthAllowFirstResPCloud,
   DEFAULT_PCLOUD_CONFIG,
@@ -48,6 +62,7 @@ import {
   sendAuthReq as sendAuthReqYandexDisk,
   setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplaceYandexDisk,
 } from "../pro/src/fsYandexDisk";
+import { syncer } from "../pro/src/sync";
 import type {
   RemotelySavePluginSettings,
   SyncTriggerSourceType,
@@ -70,7 +85,7 @@ import { FakeFsEncrypt } from "./fsEncrypt";
 import { getClient } from "./fsGetter";
 import { FakeFsLocal } from "./fsLocal";
 import {
-  type AccessCodeResponseSuccessfulType,
+  type AccessCodeResponseSuccessfulType as AccessCodeResponseSuccessfulTypeOnedrive,
   DEFAULT_ONEDRIVE_CONFIG,
   sendAuthReq as sendAuthReqOnedrive,
   setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplaceOnedrive,
@@ -85,15 +100,16 @@ import {
   type InternalDBs,
   clearAllLoggerOutputRecords,
   clearExpiredSyncPlanRecords,
+  getLastFailedSyncTimeByVault,
   getLastSuccessSyncTimeByVault,
   prepareDBs,
+  upsertLastFailedSyncTimeByVault,
   upsertLastSuccessSyncTimeByVault,
   upsertPluginVersionByVault,
 } from "./localdb";
 import { changeMobileStatusBar } from "./misc";
 import { DEFAULT_PROFILER_CONFIG, type Profiler } from "./profiler";
 import { RemotelySaveSettingTab } from "./settings";
-import { syncer } from "./sync";
 import { SyncAlgoV3Modal } from "./syncAlgoV3Notice";
 
 const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
@@ -101,11 +117,14 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
   webdav: DEFAULT_WEBDAV_CONFIG,
   dropbox: DEFAULT_DROPBOX_CONFIG,
   onedrive: DEFAULT_ONEDRIVE_CONFIG,
+  onedrivefull: DEFAULT_ONEDRIVEFULL_CONFIG,
   webdis: DEFAULT_WEBDIS_CONFIG,
   googledrive: DEFAULT_GOOGLEDRIVE_CONFIG,
   box: DEFAULT_BOX_CONFIG,
   pcloud: DEFAULT_PCLOUD_CONFIG,
   yandexdisk: DEFAULT_YANDEXDISK_CONFIG,
+  koofr: DEFAULT_KOOFR_CONFIG,
+  azureblobstorage: DEFAULT_AZUREBLOBSTORAGE_CONFIG,
   password: "",
   serviceType: "s3",
   currLogLevel: "info",
@@ -169,6 +188,29 @@ const getIconSvg = () => {
   return res;
 };
 
+const getStatusBarShortMsgFromSyncSource = (
+  t: (x: TransItemType, vars?: any) => string,
+  s: SyncTriggerSourceType | undefined
+) => {
+  if (s === undefined) {
+    return "";
+  }
+  switch (s) {
+    case "manual":
+      return t("statusbar_sync_source_manual");
+    case "dry":
+      return t("statusbar_sync_source_dry");
+    case "auto":
+      return t("statusbar_sync_source_auto");
+    case "auto_once_init":
+      return t("statusbar_sync_source_auto_once_init");
+    case "auto_sync_on_save":
+      return t("statusbar_sync_source_auto_sync_on_save");
+    default:
+      throw Error(`no translate for ${s}`);
+  }
+};
+
 export default class RemotelySavePlugin extends Plugin {
   settings!: RemotelySavePluginSettings;
   db!: InternalDBs;
@@ -386,17 +428,15 @@ export default class RemotelySavePlugin extends Plugin {
     ) => {
       if (step === 1) {
         // change status to "syncing..." on statusbar
-        this.updateLastSuccessSyncMsg(-1);
+        this.updateLastSyncMsg(s, "syncing", -1, -1);
       } else if (step === 8 && everythingOk) {
-        const lastSuccessSyncMillis = Date.now();
-        await upsertLastSuccessSyncTimeByVault(
-          this.db,
-          this.vaultRandomID,
-          lastSuccessSyncMillis
-        );
-        this.updateLastSuccessSyncMsg(lastSuccessSyncMillis);
+        const ts = Date.now();
+        await upsertLastSuccessSyncTimeByVault(this.db, this.vaultRandomID, ts);
+        this.updateLastSyncMsg(s, "not_syncing", ts, null); // hack: 'not_syncing'
       } else if (!everythingOk) {
-        this.updateLastSuccessSyncMsg(-2); // magic number
+        const ts = Date.now();
+        await upsertLastFailedSyncTimeByVault(this.db, this.vaultRandomID, ts);
+        this.updateLastSyncMsg(s, "not_syncing", null, ts);
       }
     };
 
@@ -405,12 +445,15 @@ export default class RemotelySavePlugin extends Plugin {
     };
 
     const callbackSyncProcess = async (
+      s: SyncTriggerSourceType,
       realCounter: number,
       realTotalCount: number,
       pathName: string,
       decision: string
     ) => {
       this.setCurrSyncMsg(
+        t,
+        s,
         realCounter,
         realTotalCount,
         pathName,
@@ -692,7 +735,7 @@ export default class RemotelySavePlugin extends Plugin {
           const self = this;
           setConfigBySuccessfullAuthInplaceOnedrive(
             this.settings.onedrive,
-            rsp as AccessCodeResponseSuccessfulType,
+            rsp as AccessCodeResponseSuccessfulTypeOnedrive,
             () => self.saveSettings()
           );
 
@@ -736,6 +779,91 @@ export default class RemotelySavePlugin extends Plugin {
       }
     );
 
+    this.registerObsidianProtocolHandler(
+      COMMAND_CALLBACK_ONEDRIVEFULL,
+      async (inputParams) => {
+        if (
+          inputParams.code !== undefined &&
+          this.oauth2Info?.verifier !== undefined
+        ) {
+          if (this.oauth2Info.helperModal !== undefined) {
+            const k = this.oauth2Info.helperModal.contentEl;
+            k.empty();
+
+            t("protocol_onedrivefull_connecting")
+              .split("\n")
+              .forEach((val) => {
+                k.createEl("p", {
+                  text: val,
+                });
+              });
+          }
+
+          const rsp = await sendAuthReqOnedriveFull(
+            this.settings.onedrivefull.clientID,
+            this.settings.onedrivefull.authority,
+            inputParams.code,
+            this.oauth2Info.verifier,
+            async (e: any) => {
+              new Notice(t("protocol_onedrivefull_connect_fail"));
+              new Notice(`${e}`);
+              return; // throw?
+            }
+          );
+
+          if ((rsp as any).error !== undefined) {
+            new Notice(`${JSON.stringify(rsp)}`);
+            throw Error(`${JSON.stringify(rsp)}`);
+          }
+
+          const self = this;
+          setConfigBySuccessfullAuthInplaceOnedriveFull(
+            this.settings.onedrivefull,
+            rsp as AccessCodeResponseSuccessfulTypeOnedriveFull,
+            () => self.saveSettings()
+          );
+
+          const client = getClient(
+            this.settings,
+            this.app.vault.getName(),
+            () => self.saveSettings()
+          );
+          this.settings.onedrivefull.username =
+            await client.getUserDisplayName();
+          await this.saveSettings();
+
+          this.oauth2Info.verifier = ""; // reset it
+          this.oauth2Info.helperModal?.close(); // close it
+          this.oauth2Info.helperModal = undefined;
+
+          this.oauth2Info.authDiv?.toggleClass(
+            "onedrivefull-auth-button-hide",
+            this.settings.onedrivefull.username !== ""
+          );
+          this.oauth2Info.authDiv = undefined;
+
+          this.oauth2Info.revokeAuthSetting?.setDesc(
+            t("protocol_onedrivefull_connect_succ_revoke", {
+              username: this.settings.onedrivefull.username,
+            })
+          );
+          this.oauth2Info.revokeAuthSetting = undefined;
+          this.oauth2Info.revokeDiv?.toggleClass(
+            "onedrivefull-revoke-auth-button-hide",
+            this.settings.onedrivefull.username === ""
+          );
+          this.oauth2Info.revokeDiv = undefined;
+        } else {
+          new Notice(t("protocol_onedrivefull_connect_fail"));
+          throw Error(
+            t("protocol_onedrivefull_connect_unknown", {
+              params: JSON.stringify(inputParams),
+            })
+          );
+        }
+      }
+    );
+
     this.registerObsidianProtocolHandler(
       COMMAND_CALLBACK_PRO,
       async (inputParams) => {
@@ -977,6 +1105,64 @@ export default class RemotelySavePlugin extends Plugin {
       }
     );
 
+    this.registerObsidianProtocolHandler(
+      COMMAND_CALLBACK_KOOFR,
+      async (inputParams) => {
+        if (this.oauth2Info.helperModal !== undefined) {
+          const k = this.oauth2Info.helperModal.contentEl;
+          k.empty();
+
+          t("protocol_koofr_connecting")
+            .split("\n")
+            .forEach((val) => {
+              k.createEl("p", {
+                text: val,
+              });
+            });
+        }
+
+        console.debug(inputParams);
+        const authRes = await sendAuthReqKoofr(
+          this.settings.koofr.api,
+          inputParams.code,
+          async (e: any) => {
+            new Notice(t("protocol_koofr_connect_fail"));
+            new Notice(`${e}`);
+            throw e;
+          },
+          true
+        );
+        console.debug(authRes);
+
+        const self = this;
+        await setConfigBySuccessfullAuthInplaceKoofr(
+          this.settings.koofr!,
+          authRes!,
+          () => self.saveSettings()
+        );
+
+        this.oauth2Info.verifier = ""; // reset it
+        this.oauth2Info.helperModal?.close(); // close it
+        this.oauth2Info.helperModal = undefined;
+
+        this.oauth2Info.authDiv?.toggleClass(
+          "koofr-auth-button-hide",
+          this.settings.koofr?.refreshToken !== ""
+        );
+        this.oauth2Info.authDiv = undefined;
+
+        this.oauth2Info.revokeAuthSetting?.setDesc(
+          t("protocol_koofr_connect_succ_revoke")
+        );
+        this.oauth2Info.revokeAuthSetting = undefined;
+        this.oauth2Info.revokeDiv?.toggleClass(
+          "koofr-revoke-auth-button-hide",
+          this.settings.koofr?.refreshToken === ""
+        );
+        this.oauth2Info.revokeDiv = undefined;
+      }
+    );
+
     this.syncRibbon = this.addRibbonIcon(
       iconNameSyncWait,
       `${this.manifest.name}`,
@@ -995,15 +1181,25 @@ export default class RemotelySavePlugin extends Plugin {
       this.statusBarElement = statusBarItem.createEl("span");
       this.statusBarElement.setAttribute("data-tooltip-position", "top");
 
-      this.updateLastSuccessSyncMsg(
-        await getLastSuccessSyncTimeByVault(this.db, this.vaultRandomID)
-      );
+      if (!this.isSyncing) {
+        this.updateLastSyncMsg(
+          undefined,
+          "not_syncing",
+          await getLastSuccessSyncTimeByVault(this.db, this.vaultRandomID),
+          await getLastFailedSyncTimeByVault(this.db, this.vaultRandomID)
+        );
+      }
       // update statusbar text every 30 seconds
       this.registerInterval(
         window.setInterval(async () => {
-          this.updateLastSuccessSyncMsg(
-            await getLastSuccessSyncTimeByVault(this.db, this.vaultRandomID)
-          );
+          if (!this.isSyncing) {
+            this.updateLastSyncMsg(
+              undefined,
+              "not_syncing",
+              await getLastSuccessSyncTimeByVault(this.db, this.vaultRandomID),
+              await getLastFailedSyncTimeByVault(this.db, this.vaultRandomID)
+            );
+          }
         }, 1000 * 30)
       );
     }
@@ -1140,12 +1336,14 @@ export default class RemotelySavePlugin extends Plugin {
       cloneDeep(DEFAULT_SETTINGS),
       messyConfigToNormal(await this.loadData())
     );
+
     if (this.settings.dropbox.clientID === "") {
       this.settings.dropbox.clientID = DEFAULT_SETTINGS.dropbox.clientID;
     }
     if (this.settings.dropbox.remoteBaseDir === undefined) {
       this.settings.dropbox.remoteBaseDir = "";
     }
+
     if (this.settings.onedrive.clientID === "") {
       this.settings.onedrive.clientID = DEFAULT_SETTINGS.onedrive.clientID;
     }
@@ -1158,6 +1356,14 @@ export default class RemotelySavePlugin extends Plugin {
     if (this.settings.onedrive.emptyFile === undefined) {
       this.settings.onedrive.emptyFile = "skip";
     }
+    if (this.settings.onedrive.kind === undefined) {
+      this.settings.onedrive.kind = "onedrive";
+    }
+
+    if (this.settings.onedrivefull === undefined) {
+      this.settings.onedrivefull = DEFAULT_ONEDRIVEFULL_CONFIG;
+    }
+
     if (this.settings.webdav.manualRecursive === undefined) {
       this.settings.webdav.manualRecursive = true;
     }
@@ -1275,6 +1481,14 @@ export default class RemotelySavePlugin extends Plugin {
       this.settings.yandexdisk = DEFAULT_YANDEXDISK_CONFIG;
     }
 
+    if (this.settings.koofr === undefined) {
+      this.settings.koofr = DEFAULT_KOOFR_CONFIG;
+    }
+
+    if (this.settings.azureblobstorage === undefined) {
+      this.settings.azureblobstorage = DEFAULT_AZUREBLOBSTORAGE_CONFIG;
+    }
+
     await this.saveSettings();
   }
 
@@ -1343,6 +1557,16 @@ export default class RemotelySavePlugin extends Plugin {
       needSave = true;
     }
 
+    let onedriveFullExpired = false;
+    if (
+      this.settings.onedrivefull.refreshToken !== "" &&
+      current >= this.settings!.onedrivefull!.credentialsShouldBeDeletedAtTime!
+    ) {
+      onedriveFullExpired = true;
+      this.settings.onedrivefull = cloneDeep(DEFAULT_ONEDRIVEFULL_CONFIG);
+      needSave = true;
+    }
+
     let googleDriveExpired = false;
     if (
       this.settings.googledrive.refreshToken !== "" &&
@@ -1383,6 +1607,16 @@ export default class RemotelySavePlugin extends Plugin {
       needSave = true;
     }
 
+    let koofrExpired = false;
+    if (
+      this.settings.koofr.refreshToken !== "" &&
+      current >= this.settings!.koofr!.credentialsShouldBeDeletedAtTimeMs!
+    ) {
+      koofrExpired = true;
+      this.settings.koofr = cloneDeep(DEFAULT_KOOFR_CONFIG);
+      needSave = true;
+    }
+
     if (this.settings.pro === undefined) {
       this.settings.pro = cloneDeep(DEFAULT_PRO_CONFIG);
     }
@@ -1401,7 +1635,13 @@ export default class RemotelySavePlugin extends Plugin {
     }
     if (onedriveExpired) {
       new Notice(
-        `${this.manifest.name}: You haven't manually auth OneDrive for many days, you need to re-auth it again.`,
+        `${this.manifest.name}: You haven't manually auth OneDrive (App Folder) for many days, you need to re-auth it again.`,
+        6000
+      );
+    }
+    if (onedriveFullExpired) {
+      new Notice(
+        `${this.manifest.name}: You haven't manually auth OneDrive (Full) for many days, you need to re-auth it again.`,
         6000
       );
     }
@@ -1429,6 +1669,12 @@ export default class RemotelySavePlugin extends Plugin {
         6000
       );
     }
+    if (koofrExpired) {
+      new Notice(
+        `${this.manifest.name}: You haven't manually auth koofr for many days, you need to re-auth it again.`,
+        6000
+      );
+    }
   }
 
   async getVaultRandomIDFromOldConfigFile() {
@@ -1533,7 +1779,8 @@ export default class RemotelySavePlugin extends Plugin {
 
       if (
         caller === "SYNC" ||
-        (caller === "FILE_CHANGES" && lastModified > lastSuccessSyncMillis)
+        (caller === "FILE_CHANGES" &&
+          lastModified > (lastSuccessSyncMillis ?? 1))
       ) {
         console.debug(
           `so lastModified > lastSuccessSyncMillis or it's called while syncing before`
@@ -1589,12 +1836,14 @@ export default class RemotelySavePlugin extends Plugin {
         this.registerEvent(this.app.vault.on("modify", this._syncOnSaveEvent2));
         this.registerEvent(this.app.vault.on("create", this._syncOnSaveEvent2));
         this.registerEvent(this.app.vault.on("delete", this._syncOnSaveEvent2));
+        this.registerEvent(this.app.vault.on("rename", this._syncOnSaveEvent2));
       });
     } else {
       this.syncEvent?.off("SYNC_DONE", this._syncOnSaveEvent1);
       this.app.vault.off("modify", this._syncOnSaveEvent2);
       this.app.vault.off("create", this._syncOnSaveEvent2);
       this.app.vault.off("delete", this._syncOnSaveEvent2);
+      this.app.vault.off("rename", this._syncOnSaveEvent2);
     }
   }
 
@@ -1647,19 +1896,40 @@ export default class RemotelySavePlugin extends Plugin {
   }
 
   setCurrSyncMsg(
+    t: (x: TransItemType, vars?: any) => string,
+    s: SyncTriggerSourceType,
     i: number,
     totalCount: number,
     pathName: string,
     decision: string,
     triggerSource: SyncTriggerSourceType
   ) {
-    const msg = `syncing progress=${i}/${totalCount},decision=${decision},path=${pathName},source=${triggerSource}`;
-    this.currSyncMsg = msg;
+    const L = `${totalCount}`.length;
+    const iStr = `${i}`.padStart(L, "0");
+    const prefix = getStatusBarShortMsgFromSyncSource(t, s);
+    const shortMsg = prefix + `Syncing ${iStr}/${totalCount}`;
+    const longMsg =
+      prefix +
+      `Syncing progress=${iStr}/${totalCount},decision=${decision},path=${pathName},source=${triggerSource}`;
+    this.currSyncMsg = longMsg;
+
+    if (this.statusBarElement !== undefined) {
+      this.statusBarElement.setText(shortMsg);
+      this.statusBarElement.setAttribute("aria-label", longMsg);
+    }
   }
 
-  updateLastSuccessSyncMsg(lastSuccessSyncMillis?: number) {
+  updateLastSyncMsg(
+    s: SyncTriggerSourceType | undefined,
+    syncStatus: "not_syncing" | "syncing",
+    lastSuccessSyncMillis: number | null | undefined,
+    lastFailedSyncMillis: number | null | undefined
+  ) {
     if (this.statusBarElement === undefined) return;
 
+    // console.debug(lastSuccessSyncMillis);
+    // console.debug(lastFailedSyncMillis);
+
     const t = (x: TransItemType, vars?: any) => {
       return this.i18n.t(x, vars);
     };
@@ -1667,18 +1937,25 @@ export default class RemotelySavePlugin extends Plugin {
     let lastSyncMsg = t("statusbar_lastsync_never");
     let lastSyncLabelMsg = t("statusbar_lastsync_never_label");
 
-    if (lastSuccessSyncMillis !== undefined && lastSuccessSyncMillis === -1) {
-      lastSyncMsg = t("statusbar_syncing");
-    }
+    const inputTs = Math.max(
+      lastSuccessSyncMillis ?? -999,
+      lastFailedSyncMillis ?? -999
+    );
+    const isSuccess =
+      (lastSuccessSyncMillis ?? -999) >= (lastFailedSyncMillis ?? -999);
 
-    if (lastSuccessSyncMillis !== undefined && lastSuccessSyncMillis === -2) {
-      lastSyncMsg = t("statusbar_failed");
-      lastSyncLabelMsg = t("statusbar_failed");
-    }
-
-    if (lastSuccessSyncMillis !== undefined && lastSuccessSyncMillis > 0) {
-      const deltaTime = Date.now() - lastSuccessSyncMillis;
+    if (syncStatus === "syncing") {
+      lastSyncMsg =
+        getStatusBarShortMsgFromSyncSource(t, s!) + t("statusbar_syncing");
+    } else if (inputTs > 0) {
+      let prefix = "";
+      if (isSuccess) {
+        prefix = t("statusbar_sync_status_prefix_success");
+      } else {
+        prefix = t("statusbar_sync_status_prefix_failed");
+      }
 
+      const deltaTime = Date.now() - inputTs;
       // create human readable time
       const years = Math.floor(deltaTime / 31556952000);
       const months = Math.floor(deltaTime / 2629746000);
@@ -1687,9 +1964,7 @@ export default class RemotelySavePlugin extends Plugin {
       const hours = Math.floor(deltaTime / 3600000);
       const minutes = Math.floor(deltaTime / 60000);
       const seconds = Math.floor(deltaTime / 1000);
-
       let timeText = "";
-
       if (years > 0) {
         timeText = t("statusbar_time_years", { time: years });
       } else if (months > 0) {
@@ -1705,10 +1980,9 @@ export default class RemotelySavePlugin extends Plugin {
       } else if (seconds > 30) {
         timeText = t("statusbar_time_lessminute");
       } else {
-        timeText = t("statusbar_now");
+        timeText = t("statusbar_time_now");
       }
-
-      const dateText = new Date(lastSuccessSyncMillis).toLocaleTimeString(
+      const dateText = new Date(inputTs).toLocaleTimeString(
         navigator.language,
         {
           weekday: "long",
@@ -1718,8 +1992,11 @@ export default class RemotelySavePlugin extends Plugin {
         }
       );
 
-      lastSyncMsg = timeText;
-      lastSyncLabelMsg = t("statusbar_lastsync_label", { date: dateText });
+      lastSyncMsg = prefix + timeText;
+      lastSyncLabelMsg =
+        prefix + t("statusbar_lastsync_label", { date: dateText });
+    } else {
+      // TODO: no idea what happened.
     }
 
     this.statusBarElement.setText(lastSyncMsg);

src/settings.ts

@@ -21,8 +21,11 @@ import type {
 } from "./baseTypes";
 
 import cloneDeep from "lodash/cloneDeep";
+import { generateAzureBlobStorageSettingsPart } from "../pro/src/settingsAzureBlobStorage";
 import { generateBoxSettingsPart } from "../pro/src/settingsBox";
 import { generateGoogleDriveSettingsPart } from "../pro/src/settingsGoogleDrive";
+import { generateKoofrSettingsPart } from "../pro/src/settingsKoofr";
+import { generateOnedriveFullSettingsPart } from "../pro/src/settingsOnedriveFull";
 import { generatePCloudSettingsPart } from "../pro/src/settingsPCloud";
 import { generateProSettingsPart } from "../pro/src/settingsPro";
 import { generateYandexDiskSettingsPart } from "../pro/src/settingsYandexDisk";
@@ -54,6 +57,7 @@ import {
   clearAllPrevSyncRecordByVault,
   clearAllSyncPlanRecords,
   destroyDBs,
+  upsertLastFailedSyncTimeByVault,
   upsertLastSuccessSyncTimeByVault,
 } from "./localdb";
 import type RemotelySavePlugin from "./main"; // unavoidable
@@ -67,10 +71,17 @@ import { DEFAULT_PROFILER_CONFIG } from "./profiler";
 class PasswordModal extends Modal {
   plugin: RemotelySavePlugin;
   newPassword: string;
-  constructor(app: App, plugin: RemotelySavePlugin, newPassword: string) {
+  encryptionMethodSetting: Setting;
+  constructor(
+    app: App,
+    plugin: RemotelySavePlugin,
+    newPassword: string,
+    encryptionMethodSetting: Setting
+  ) {
     super(app);
     this.plugin = plugin;
     this.newPassword = newPassword;
+    this.encryptionMethodSetting = encryptionMethodSetting;
   }
 
   onOpen() {
@@ -114,6 +125,16 @@ class PasswordModal extends Modal {
         button.setButtonText(t("modal_password_secondconfirm"));
         button.onClick(async () => {
           this.plugin.settings.password = this.newPassword;
+          if (this.newPassword !== "") {
+            this.encryptionMethodSetting.settingEl.removeClass(
+              "settings-encryption-method-hide"
+            );
+          } else {
+            this.encryptionMethodSetting.settingEl.addClass(
+              "settings-encryption-method-hide"
+            );
+          }
+
           await this.plugin.saveSettings();
           new Notice(t("modal_password_notice"));
           this.close();
@@ -271,7 +292,7 @@ export class ChangeRemoteBaseDirModal extends Modal {
  * s3 is special and do not necessarily the same as others
  * thus a new Modal here
  */
-class ChangeRemotePrefixModal extends Modal {
+class ChangeS3RemotePrefixModal extends Modal {
   readonly plugin: RemotelySavePlugin;
   readonly newRemotePrefix: string;
   constructor(app: App, plugin: RemotelySavePlugin, newRemotePrefix: string) {
@@ -287,8 +308,8 @@ class ChangeRemotePrefixModal extends Modal {
       return this.plugin.i18n.t(x, vars);
     };
 
-    contentEl.createEl("h2", { text: t("modal_remoteprefix_title") });
-    t("modal_remoteprefix_shortdesc")
+    contentEl.createEl("h2", { text: t("modal_remoteprefix_s3_title") });
+    t("modal_remoteprefix_s3_shortdesc")
       .split("\n")
       .forEach((val, idx) => {
         contentEl.createEl("p", {
@@ -297,7 +318,7 @@ class ChangeRemotePrefixModal extends Modal {
       });
 
     contentEl.createEl("p", {
-      text: t("modal_remoteprefix_tosave", { prefix: this.newRemotePrefix }),
+      text: t("modal_remoteprefix_s3_tosave", { prefix: this.newRemotePrefix }),
     });
 
     if (
@@ -306,12 +327,12 @@ class ChangeRemotePrefixModal extends Modal {
     ) {
       new Setting(contentEl)
         .addButton((button) => {
-          button.setButtonText(t("modal_remoteprefix_secondconfirm_empty"));
+          button.setButtonText(t("modal_remoteprefix_s3_secondconfirm_empty"));
           button.onClick(async () => {
             // in the settings, the value is reset to the special case ""
             this.plugin.settings.s3.remotePrefix = "";
             await this.plugin.saveSettings();
-            new Notice(t("modal_remoteprefix_notice"));
+            new Notice(t("modal_remoteprefix_s3_notice"));
             this.close();
           });
           button.setClass("remoteprefix-second-confirm");
@@ -325,14 +346,14 @@ class ChangeRemotePrefixModal extends Modal {
     } else {
       new Setting(contentEl)
         .addButton((button) => {
-          button.setButtonText(t("modal_remoteprefix_secondconfirm_change"));
+          button.setButtonText(t("modal_remoteprefix_s3_secondconfirm_change"));
           button.onClick(async () => {
             this.plugin.settings.s3.remotePrefix = this.newRemotePrefix;
             await this.plugin.saveSettings();
-            new Notice(t("modal_remoteprefix_notice"));
+            new Notice(t("modal_remoteprefix_s3_notice"));
             this.close();
           });
-          button.setClass("remoteprefix-second-confirm");
+          button.setClass("remoteprefix-s3-second-confirm");
         })
         .addButton((button) => {
           button.setButtonText(t("goback"));
@@ -782,7 +803,7 @@ const getEyesElements = () => {
   };
 };
 
-const wrapTextWithPasswordHide = (text: TextComponent) => {
+export const wrapTextWithPasswordHide = (text: TextComponent) => {
   const { eye, eyeOff } = getEyesElements();
   const hider = text.inputEl.insertAdjacentElement("afterend", createSpan())!;
   // the init type of hider is "hidden" === eyeOff === password
@@ -1035,8 +1056,8 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
 
     let newS3RemotePrefix = this.plugin.settings.s3.remotePrefix || "";
     new Setting(s3Div)
-      .setName(t("settings_remoteprefix"))
-      .setDesc(t("settings_remoteprefix_desc"))
+      .setName(t("settings_remoteprefix_s3"))
+      .setDesc(t("settings_remoteprefix_s3_desc"))
       .addText((text) =>
         text
           .setPlaceholder("")
@@ -1048,7 +1069,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
       .addButton((button) => {
         button.setButtonText(t("confirm"));
         button.onClick(() => {
-          new ChangeRemotePrefixModal(
+          new ChangeS3RemotePrefixModal(
             this.app,
             this.plugin,
             simpleTransRemotePrefix(newS3RemotePrefix.trim())
@@ -1795,6 +1816,22 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
         });
       });
 
+    //////////////////////////////////////////////////
+    // below for Onedrive (Full)
+    //////////////////////////////////////////////////
+
+    const {
+      onedriveFullDiv,
+      onedriveFullAllowedToUsedDiv,
+      onedriveFullNotShowUpHintSetting,
+    } = generateOnedriveFullSettingsPart(
+      containerEl,
+      t,
+      this.app,
+      this.plugin,
+      () => this.plugin.saveSettings()
+    );
+
     //////////////////////////////////////////////////
     // below for googledrive
     //////////////////////////////////////////////////
@@ -1845,6 +1882,31 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
       () => this.plugin.saveSettings()
     );
 
+    //////////////////////////////////////////////////
+    // below for koofr
+    //////////////////////////////////////////////////
+
+    const { koofrDiv, koofrAllowedToUsedDiv, koofrNotShowUpHintSetting } =
+      generateKoofrSettingsPart(containerEl, t, this.app, this.plugin, () =>
+        this.plugin.saveSettings()
+      );
+
+    //////////////////////////////////////////////////
+    // below for Azure Blob Storage
+    //////////////////////////////////////////////////
+
+    const {
+      azureBlobStorageDiv,
+      azureBlobStorageAllowedToUsedDiv,
+      azureBlobStorageNotShowUpHintSetting,
+    } = generateAzureBlobStorageSettingsPart(
+      containerEl,
+      t,
+      this.app,
+      this.plugin,
+      () => this.plugin.saveSettings()
+    );
+
     //////////////////////////////////////////////////
     // below for general chooser (part 2/2)
     //////////////////////////////////////////////////
@@ -1859,6 +1921,10 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
         dropdown.addOption("dropbox", t("settings_chooseservice_dropbox"));
         dropdown.addOption("webdav", t("settings_chooseservice_webdav"));
         dropdown.addOption("onedrive", t("settings_chooseservice_onedrive"));
+        dropdown.addOption(
+          "onedrivefull",
+          t("settings_chooseservice_onedrivefull")
+        );
         dropdown.addOption("webdis", t("settings_chooseservice_webdis"));
         dropdown.addOption(
           "googledrive",
@@ -1870,6 +1936,11 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
           "yandexdisk",
           t("settings_chooseservice_yandexdisk")
         );
+        dropdown.addOption("koofr", t("settings_chooseservice_koofr"));
+        dropdown.addOption(
+          "azureblobstorage",
+          t("settings_chooseservice_azureblobstorage")
+        );
 
         dropdown
           .setValue(this.plugin.settings.serviceType)
@@ -1887,6 +1958,10 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
               "onedrive-hide",
               this.plugin.settings.serviceType !== "onedrive"
             );
+            onedriveFullDiv.toggleClass(
+              "onedrivefull-hide",
+              this.plugin.settings.serviceType !== "onedrivefull"
+            );
             webdavDiv.toggleClass(
               "webdav-hide",
               this.plugin.settings.serviceType !== "webdav"
@@ -1911,6 +1986,15 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
               "yandexdisk-hide",
               this.plugin.settings.serviceType !== "yandexdisk"
             );
+            koofrDiv.toggleClass(
+              "koofr-hide",
+              this.plugin.settings.serviceType !== "koofr"
+            );
+            azureBlobStorageDiv.toggleClass(
+              "azureblobstorage-hide",
+              this.plugin.settings.serviceType !== "azureblobstorage"
+            );
+
             await this.plugin.saveSettings();
           });
       });
@@ -1922,8 +2006,11 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
     const basicDiv = containerEl.createEl("div");
     basicDiv.createEl("h2", { text: t("settings_basic") });
 
+    const passwordSetting = new Setting(basicDiv);
+    const encryptionMethodSetting = new Setting(basicDiv);
+
     let newPassword = `${this.plugin.settings.password}`;
-    new Setting(basicDiv)
+    passwordSetting
       .setName(t("settings_password"))
       .setDesc(t("settings_password_desc"))
       .addText((text) => {
@@ -1938,11 +2025,21 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
       .addButton(async (button) => {
         button.setButtonText(t("confirm"));
         button.onClick(async () => {
-          new PasswordModal(this.app, this.plugin, newPassword).open();
+          new PasswordModal(
+            this.app,
+            this.plugin,
+            newPassword,
+            encryptionMethodSetting
+          ).open();
         });
       });
 
-    new Setting(basicDiv)
+    if (this.plugin.settings.password === "") {
+      encryptionMethodSetting.settingEl.addClass(
+        "settings-encryption-method-hide"
+      );
+    }
+    encryptionMethodSetting
       .setName(t("settings_encryptionmethod"))
       .setDesc(stringToFragment(t("settings_encryptionmethod_desc")))
       .addDropdown((dropdown) => {
@@ -2089,7 +2186,12 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
               this.plugin.vaultRandomID,
               -1
             );
-            this.plugin.updateLastSuccessSyncMsg(-1);
+            await upsertLastFailedSyncTimeByVault(
+              this.plugin.db,
+              this.plugin.vaultRandomID,
+              -1
+            );
+            this.plugin.updateLastSyncMsg(undefined, "not_syncing", null, null);
             new Notice(t("settings_resetstatusbar_notice"));
           });
         });
@@ -2250,24 +2352,6 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
         });
     });
 
-    new Setting(advDiv)
-      .setName(t("settings_cleanemptyfolder"))
-      .setDesc(t("settings_cleanemptyfolder_desc"))
-      .addDropdown((dropdown) => {
-        dropdown.addOption("skip", t("settings_cleanemptyfolder_skip"));
-        dropdown.addOption(
-          "clean_both",
-          t("settings_cleanemptyfolder_clean_both")
-        );
-        dropdown
-          .setValue(this.plugin.settings.howToCleanEmptyFolder ?? "clean_both")
-          .onChange(async (val) => {
-            this.plugin.settings.howToCleanEmptyFolder =
-              val as EmptyFolderCleanType;
-            await this.plugin.saveSettings();
-          });
-      });
-
     const percentage1 = new Setting(advDiv)
       .setName(t("settings_protectmodifypercentage"))
       .setDesc(t("settings_protectmodifypercentage_desc"));
@@ -2342,7 +2426,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
 
     new Setting(advDiv)
       .setName(t("setting_syncdirection"))
-      .setDesc(t("setting_syncdirection_desc"))
+      .setDesc(stringToFragment(t("setting_syncdirection_desc")))
       .addDropdown((dropdown) => {
         dropdown.addOption(
           "bidirectional",
@@ -2356,6 +2440,14 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
           "incremental_pull_only",
           t("setting_syncdirection_incremental_pull_only_desc")
         );
+        dropdown.addOption(
+          "incremental_push_and_delete_only",
+          t("setting_syncdirection_incremental_push_and_delete_only_desc")
+        );
+        dropdown.addOption(
+          "incremental_pull_and_delete_only",
+          t("setting_syncdirection_incremental_pull_and_delete_only_desc")
+        );
 
         dropdown
           .setValue(this.plugin.settings.syncDirection ?? "bidirectional")
@@ -2452,6 +2544,16 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
           ).open();
         });
       })
+      .addButton(async (button) => {
+        button.setButtonText(t("settings_export_onedrivefull_button"));
+        button.onClick(async () => {
+          new ExportSettingsQrCodeModal(
+            this.app,
+            this.plugin,
+            "onedrivefull"
+          ).open();
+        });
+      })
       .addButton(async (button) => {
         button.setButtonText(t("settings_export_webdav_button"));
         button.onClick(async () => {
@@ -2495,6 +2597,22 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
             "yandexdisk"
           ).open();
         });
+      })
+      .addButton(async (button) => {
+        button.setButtonText(t("settings_export_koofr_button"));
+        button.onClick(async () => {
+          new ExportSettingsQrCodeModal(this.app, this.plugin, "koofr").open();
+        });
+      })
+      .addButton(async (button) => {
+        button.setButtonText(t("settings_export_azureblobstorage_button"));
+        button.onClick(async () => {
+          new ExportSettingsQrCodeModal(
+            this.app,
+            this.plugin,
+            "azureblobstorage"
+          ).open();
+        });
       });
 
     let importSettingVal = "";
@@ -2560,6 +2678,8 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
       this.app,
       this.plugin,
       () => this.plugin.saveSettings(),
+      onedriveFullAllowedToUsedDiv,
+      onedriveFullNotShowUpHintSetting,
       googleDriveAllowedToUsedDiv,
       googleDriveNotShowUpHintSetting,
       boxAllowedToUsedDiv,
@@ -2567,7 +2687,11 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
       pCloudAllowedToUsedDiv,
       pCloudNotShowUpHintSetting,
       yandexDiskAllowedToUsedDiv,
-      yandexDiskNotShowUpHintSetting
+      yandexDiskNotShowUpHintSetting,
+      koofrAllowedToUsedDiv,
+      koofrNotShowUpHintSetting,
+      azureBlobStorageAllowedToUsedDiv,
+      azureBlobStorageNotShowUpHintSetting
     );
 
     //////////////////////////////////////////////////

styles.css

@@ -21,6 +21,10 @@
   display: none;
 }
 
+.settings-encryption-method-hide {
+  display: none;
+}
+
 .s3-disclaimer {
   font-weight: bold;
 }
@@ -58,6 +62,25 @@
   display: none;
 }
 
+.onedrivefull-allow-to-use-hide {
+  display: none;
+}
+
+.onedrivefull-disclaimer {
+  font-weight: bold;
+}
+.onedrivefull-hide {
+  display: none;
+}
+
+.onedrivefull-auth-button-hide {
+  display: none;
+}
+
+.onedrivefull-revoke-auth-button-hide {
+  display: none;
+}
+
 .webdav-disclaimer {
   font-weight: bold;
 }
@@ -148,6 +171,36 @@
   display: none;
 }
 
+.koofr-disclaimer {
+  font-weight: bold;
+}
+.koofr-hide {
+  display: none;
+}
+
+.koofr-allow-to-use-hide {
+  display: none;
+}
+
+.koofr-auth-button-hide {
+  display: none;
+}
+
+.koofr-revoke-auth-button-hide {
+  display: none;
+}
+
+.azureblobstorage-disclaimer {
+  font-weight: bold;
+}
+.azureblobstorage-hide {
+  display: none;
+}
+
+.azureblobstorage-allow-to-use-hide {
+  display: none;
+}
+
 .qrcode-img {
   width: 350px;
   height: 350px;

tests/configPersist.test.ts

@@ -16,6 +16,9 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
   onedrive: {
     username: "test 🍎 emoji",
   } as any,
+  onedrivefull: {
+    username: "test 🍎 emoji",
+  } as any,
   webdis: {
     address: "addr",
   } as any,
@@ -31,6 +34,12 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
   yandexdisk: {
     refreshToken: "xxx",
   } as any,
+  koofr: {
+    refreshToken: "xxx",
+  } as any,
+  azureblobstorage: {
+    containerSasUrl: "http://127.0.0.1",
+  } as any,
   password: "password",
   serviceType: "s3",
   currLogLevel: "info",

tsconfig.json

@@ -16,5 +16,5 @@
     "isolatedModules": true,
     "lib": ["dom", "es5", "scripthost", "es2015", "webworker"]
   },
-  "include": ["**/*.ts"]
+  "include": ["src/global.d.ts", "**/*.ts"]
 }

webpack.config.js

@@ -18,6 +18,8 @@ const DEFAULT_PCLOUD_CLIENT_SECRET = process.env.PCLOUD_CLIENT_SECRET || "";
 const DEFAULT_YANDEXDISK_CLIENT_ID = process.env.YANDEXDISK_CLIENT_ID || "";
 const DEFAULT_YANDEXDISK_CLIENT_SECRET =
   process.env.YANDEXDISK_CLIENT_SECRET || "";
+const DEFAULT_KOOFR_CLIENT_ID = process.env.KOOFR_CLIENT_ID || "";
+const DEFAULT_KOOFR_CLIENT_SECRET = process.env.KOOFR_CLIENT_SECRET || "";
 
 module.exports = {
   entry: "./src/main.ts",
@@ -29,19 +31,31 @@ module.exports = {
   },
   plugins: [
     new webpack.DefinePlugin({
-      "process.env.DEFAULT_DROPBOX_APP_KEY": `"${DEFAULT_DROPBOX_APP_KEY}"`,
-      "process.env.DEFAULT_ONEDRIVE_CLIENT_ID": `"${DEFAULT_ONEDRIVE_CLIENT_ID}"`,
-      "process.env.DEFAULT_ONEDRIVE_AUTHORITY": `"${DEFAULT_ONEDRIVE_AUTHORITY}"`,
-      "process.env.DEFAULT_REMOTELYSAVE_WEBSITE": `"${DEFAULT_REMOTELYSAVE_WEBSITE}"`,
-      "process.env.DEFAULT_REMOTELYSAVE_CLIENT_ID": `"${DEFAULT_REMOTELYSAVE_CLIENT_ID}"`,
-      "process.env.DEFAULT_GOOGLEDRIVE_CLIENT_ID": `"${DEFAULT_GOOGLEDRIVE_CLIENT_ID}"`,
-      "process.env.DEFAULT_GOOGLEDRIVE_CLIENT_SECRET": `"${DEFAULT_GOOGLEDRIVE_CLIENT_SECRET}"`,
-      "process.env.DEFAULT_BOX_CLIENT_ID": `"${DEFAULT_BOX_CLIENT_ID}"`,
-      "process.env.DEFAULT_BOX_CLIENT_SECRET": `"${DEFAULT_BOX_CLIENT_SECRET}"`,
-      "process.env.DEFAULT_PCLOUD_CLIENT_ID": `"${DEFAULT_PCLOUD_CLIENT_ID}"`,
-      "process.env.DEFAULT_PCLOUD_CLIENT_SECRET": `"${DEFAULT_PCLOUD_CLIENT_SECRET}"`,
-      "process.env.DEFAULT_YANDEXDISK_CLIENT_ID": `"${DEFAULT_YANDEXDISK_CLIENT_ID}"`,
-      "process.env.DEFAULT_YANDEXDISK_CLIENT_SECRET": `"${DEFAULT_YANDEXDISK_CLIENT_SECRET}"`,
+      "global.DEFAULT_DROPBOX_APP_KEY": `"${DEFAULT_DROPBOX_APP_KEY}"`,
+      "global.DEFAULT_ONEDRIVE_CLIENT_ID": `"${DEFAULT_ONEDRIVE_CLIENT_ID}"`,
+      "global.DEFAULT_ONEDRIVE_AUTHORITY": `"${DEFAULT_ONEDRIVE_AUTHORITY}"`,
+      "global.DEFAULT_REMOTELYSAVE_WEBSITE": `"${DEFAULT_REMOTELYSAVE_WEBSITE}"`,
+      "global.DEFAULT_REMOTELYSAVE_CLIENT_ID": `"${DEFAULT_REMOTELYSAVE_CLIENT_ID}"`,
+      "global.DEFAULT_GOOGLEDRIVE_CLIENT_ID": `"${DEFAULT_GOOGLEDRIVE_CLIENT_ID}"`,
+      "global.DEFAULT_GOOGLEDRIVE_CLIENT_SECRET": `"${DEFAULT_GOOGLEDRIVE_CLIENT_SECRET}"`,
+      "global.DEFAULT_BOX_CLIENT_ID": `"${DEFAULT_BOX_CLIENT_ID}"`,
+      "global.DEFAULT_BOX_CLIENT_SECRET": `"${DEFAULT_BOX_CLIENT_SECRET}"`,
+      "global.DEFAULT_PCLOUD_CLIENT_ID": `"${DEFAULT_PCLOUD_CLIENT_ID}"`,
+      "global.DEFAULT_PCLOUD_CLIENT_SECRET": `"${DEFAULT_PCLOUD_CLIENT_SECRET}"`,
+      "global.DEFAULT_YANDEXDISK_CLIENT_ID": `"${DEFAULT_YANDEXDISK_CLIENT_ID}"`,
+      "global.DEFAULT_YANDEXDISK_CLIENT_SECRET": `"${DEFAULT_YANDEXDISK_CLIENT_SECRET}"`,
+      "global.DEFAULT_KOOFR_CLIENT_ID": `"${DEFAULT_KOOFR_CLIENT_ID}"`,
+      "global.DEFAULT_KOOFR_CLIENT_SECRET": `"${DEFAULT_KOOFR_CLIENT_SECRET}"`,
+
+      "process.env.NODE_DEBUG": `undefined`, // ugly fix
+      "process.env.DEBUG": `undefined`, // ugly fix
+      // "process.version": `"v20.10.0"`, // who's using this?
+      // "process":`undefined`,
+      // "global.process":`undefined`,
+
+      // make azure blob storage happy
+      // https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/core/core-util/src/checkEnvironment.ts
+      "globalThis.process.versions": `undefined`,
     }),
     // Work around for Buffer is undefined:
     // https://github.com/webpack/changelog-v5/issues/10