bump to 0.5.3

google drive is usable now
fix build and bump to 0.5.2
2024-06-02 23:38:44 +08:00 · 2024-06-02 23:37:53 +08:00 · 2024-05-27 00:53:07 +08:00 · 2024-05-27 00:36:52 +08:00 · 2024-05-27 00:35:55 +08:00 · 2024-05-27 00:33:49 +08:00
64 changed files with 3837 additions and 417 deletions
@@ -1,3 +1,7 @@
 DROPBOX_APP_KEY=
 ONEDRIVE_CLIENT_ID=
 ONEDRIVE_AUTHORITY=https://
 REMOTELYSAVE_WEBSITE=http://127.0.0.1:46683
 REMOTELYSAVE_CLIENT_ID=cli-xxx
 GOOGLEDRIVE_CLIENT_ID=xxx.apps.googleusercontent.com
 GOOGLEDRIVE_CLIENT_SECRET=GOCSPX-sss
@@ -19,6 +19,10 @@ jobs:
      DROPBOX_APP_KEY: ${{secrets.DROPBOX_APP_KEY}}
      ONEDRIVE_CLIENT_ID: ${{secrets.ONEDRIVE_CLIENT_ID}}
      ONEDRIVE_AUTHORITY: ${{secrets.ONEDRIVE_AUTHORITY}}
      REMOTELYSAVE_WEBSITE: ${{secrets.REMOTELYSAVE_WEBSITE}}
      REMOTELYSAVE_CLIENT_ID: ${{secrets.REMOTELYSAVE_CLIENT_ID}}
      GOOGLEDRIVE_CLIENT_ID: ${{secrets.GOOGLEDRIVE_CLIENT_ID}}
      GOOGLEDRIVE_CLIENT_SECRET: ${{secrets.GOOGLEDRIVE_CLIENT_SECRET}}
    strategy:
      matrix:
@@ -23,6 +23,10 @@ jobs:
      DROPBOX_APP_KEY: ${{secrets.DROPBOX_APP_KEY}}
      ONEDRIVE_CLIENT_ID: ${{secrets.ONEDRIVE_CLIENT_ID}}
      ONEDRIVE_AUTHORITY: ${{secrets.ONEDRIVE_AUTHORITY}}
      REMOTELYSAVE_WEBSITE: ${{secrets.REMOTELYSAVE_WEBSITE}}
      REMOTELYSAVE_CLIENT_ID: ${{secrets.REMOTELYSAVE_CLIENT_ID}}
      GOOGLEDRIVE_CLIENT_ID: ${{secrets.GOOGLEDRIVE_CLIENT_ID}}
      GOOGLEDRIVE_CLIENT_SECRET: ${{secrets.GOOGLEDRIVE_CLIENT_SECRET}}
    strategy:
      matrix:
@@ -1,202 +1,3 @@
-                                 Apache License
+The codes or files or subfolders inside the folder `src`, `tests`, `docs`, `assets`, are released under the "Open Source" license: "Apache License, version 2.0", described at: https://www.apache.org/licenses/LICENSE-2.0 .
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
   1. Definitions.
      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.
      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.
      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.
      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.
      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.
      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.
      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).
      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.
      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."
      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.
   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.
   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.
   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:
      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and
      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and
      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and
      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.
      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.
   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.
   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.
   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.
   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.
   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.
   END OF TERMS AND CONDITIONS
   APPENDIX: How to apply the Apache License to your work.
      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.
   Copyright [yyyy] [name of copyright owner]
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
       http://www.apache.org/licenses/LICENSE-2.0
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 The codes or files or subfolders inside the folder `pro`, are released under the "Source Available" license: "PolyForm Strict License 1.0.0", described at: https://polyformproject.org/licenses/strict/1.0.0/ .
@@ -22,15 +22,16 @@ This is yet another unofficial sync plugin for Obsidian. If you like it or find
  - OneDrive for personal
  - Webdav
  - Webdis
  - Google Drive (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.
 - **Scheduled auto sync supported.** You can also manually trigger the sync using sidebar ribbon, or using the command from the command palette (or even bind the hot key combination to the command then press the hot key combination).
 - **[Minimal Intrusive](./docs/minimal_intrusive_design.md).**
 - **Skip Large files** and **skip paths** by custom regex conditions!
- **Fully open source under [Apache-2.0 License](./LICENSE).**
+- **[Sync Algorithm](./docs/sync_algorithm/v3/intro.md) is provided for discussion.**
- **[Sync Algorithm open](./docs/sync_algorithm/v3/intro.md) 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)** now, more to come!
+- Source Available. See [License](./LICENSE) for details.
 ## Limitations
@@ -100,6 +101,8 @@ Additionally, the plugin author may occasionally visit Obsidian official forum a
 ### webdav
 - Tutorials / Examples:
  - [Nextcloud](./docs/remote_services/webdav_nextcloud/README.md)
  - [The Good Cloud](./docs/remote_services/webdav_thegoodcloud/README.md)
  - [ownCloud](./docs/remote_services/webdav_owncloud/README.md)
  - [InfiniCloud](./docs/remote_services/webdav_infinicloud_teracloud/README.md)
  - [Synology webdav server](./docs/remote_services/webdav_synology_webdav_server/README.md) | [群晖 webdav server](./docs/remote_services/webdav_synology_webdav_server/README.zh-cn.md)
@@ -117,6 +120,10 @@ 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)
 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).
 ## Scheduled Auto Sync
 - You can configure auto syncing every N minutes in settings.
@@ -129,6 +136,10 @@ Additionally, the plugin author may occasionally visit Obsidian official forum a
 In the latest version, you can change the settings to allow syncing `_` files or folders, as well as `.obsidian` special config folder (but not any other `.` files or folders).
 ## PRO Features
 See [PRO](./docs/pro/README.md) for more details.
 ## How To Debug
 See [here](./docs/how_to_debug/README.md) for more details.
@@ -1,25 +0,0 @@
 // Importing the http module
 const http = require("http");
 const requestHandler = (req, res) => {
  const body = [];
  req
    .on("data", (chunk) => {
      body.push(chunk);
    })
    .on("end", () => {
      const parsed = JSON.parse(Buffer.concat(body).toString());
      const prettyParsed = JSON.stringify(parsed, null, 2);
      console.log(prettyParsed);
      res.setHeader("Content-Type", "application/json");
      res.end(prettyParsed);
    });
 };
 const server = http.createServer(requestHandler);
 const addr = "0.0.0.0";
 const port = 3000;
 server.listen(port, addr, undefined, () => {
  console.log(`Server is Running on ${addr}:${port}`);
 });
@@ -0,0 +1,53 @@
 # PRO Features
 From version 0.5.x, Remotely Save introduces PRO (paid) features. Users need to subscribe to (pay) them to use them.
 **If you are using basic features only, you don't need an online account, and you don't need to pay for the plugin.**
 # Links
 * Remotely Save official website: <https://remotelysave.com>
 * Sign up / Sign in: <https://remotelysave.com/user/signupin>
 * User profile: <https://remotelysave.com/user/profile>
 # Disclaimer
 It's different from, and NOT affiliated with Obsidian account.
 # Steps
 ## Steps of signing up and signing in
 1. Go to the website, sign up and sign in. You can directly visit <https://remotelysave.com/user/signupin> or click the link in Remotely Save plugin setting page.
    ![pro setting](./pro_setting.png)
 2. Use an email and your password as usual. Don't need to be GMail account.
 ## Steps of connecting
 You need to connect your plugin to your online account. In Obsidian, in your Remotely Save plugin setting, you can click the button "Connect" to start the flow.
 1. You will see a special address on website. Click it and visit the website
 2. Click "allow" on the website.
 3. In the end of the auth flow on the website, you will be shown up a code, please copy it...
 4. And paste the code back to the plugin modal inside Obsidian, and confirm.
 ![connect flow](./connect_flow.png)
 ## Steps of subscribing to some features. 
 1. Firstly please visit your [profile page](https://remotelysave.com/user/profile) online.
 2. You can subscribe to some features. Prices vary.
    ![PRO features online](./pro_features_enabled_on_website.png)
 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.
    ![check again PRO features](./check_pro_features_in_settings.png)
 4. Sync and enjoy your PRO features!
 ## Why so complicated?
 Because we doesn't have 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. 
@@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:8c73da29a621d225387640b76ec0dcfb56b3ffad151dab374d3b7cc76067a1a0
 size 94377
@@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:116c2a8ec1a277a3985f4056b390574fc57145ec5635d44accf2a7445666264a
 size 626668
@@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:4c45c08e6fc487341032aac511c332e3f9978a44e9b93377a73648b56b684b62
 size 155427
@@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:08d128125dba033f5dd18a6ea8d942b284ddca6c5c3b0362c47dcb4a7153a8f9
 size 395800
@@ -0,0 +1,59 @@
 # Google Drive (PRO)
 # Intro
 * It's a PRO feature of Remotely Save plugin.
 * **This plugin is NOT an official Google product, and just uses Google Drive'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 Google Drive" 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 Google Drive should be detected.
 ## Steps of Connecting to your Google Drive
 After you enabled the PRO feature in your Remotely Save plugin, you can connect to your Google Drive account now.
 1. In Remotely Save settings, change your sync service to Google Drive.
    ![change remote to google drive](./change_remote_to_google_drive.png)
 2. Click Auth, visit the link, go to Remotely Save website to start.
    ![visit start link](./google_drive_auth_link.png)
 3. On the website, click the link to go to Google Drive auth page.
 4. Follow the instruction on Google website, and allow (continue) Remotely Save to connect.
    ![allow Remotely Save in Google website](./google_drive_auth_allow.png)
 5. You will be redirected to Remotely Save website, and you will get a code. Copy it...
    ![redirected back and get the code](./google_drive_auth_code_show.png)
 6. ... And paste the code back to the plugin inside Obsidian. Click submit.
    ![submit the code in setting](./google_drive_code_submit.png)
 7. A notice will tell you that you've connected or not.
 8. Sync! The plugin will create a vault folder in the root of your Google Drive and upload notes into that folder.
 9. **Read the caveats below.**
 # Why so complicated?
 Because Google Drive's api doesn't fit into the special envorinment of Obsidian plugin. So we need a website.
 # The credential
 The website does **NOT** store or save the credential (the code you obtian in the end of the flow). The website is just a "bridge" to help you obtain that code, and just manage your subscription to PRO features.
 But please be aware that the code is saved locally in your Obsidian. It works like a special password. So that the plugin can upload or download or modify the files for you.
 # The caveats
 * As of June 2024, this feature is in beta stage. **Back up your vault before using this feature.**
 * The plugin can **only** sees, reads or writes the files and folders created by itself! 
    It means that, you CANNOT manually create the vault folder in your Google Drive account. And if you manually upload any files using Google's official website, the plugin does **NOT** see them. All operations must go through Obsidian and uploaded by the plugin.
    You can, however, view, and download the files on Google Drive [official web page](https://drive.google.com/drive/u/0/my-drive).
    Precisely speaking, the plugin applies for the `drive.file` scope recommended by Google. See [the doc](https://developers.google.com/drive/api/guides/api-specific-auth#benefits) by Google for the scope's benefits. Basically the plugin will never (is unable to) mess up your other files or folders.
    Moreover, this scope is "not-sensitive", so that the plugin doesn't need to go through Google's complicated verification process while applying for it.
 * Google Drive, unlike other cloud storage, allows files of same name co-existing in the same folder! (hmmmmm...) It may or may not make the plugin stop working. Users might need to remove the duplicated file manually on Google's official website.
@@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:eaa9aa8ba6b066dfefdce08a8d1da1d97089f5c2de0ba4c0c026d6df9eb9ece8
 size 99896
@@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:6683a63718053603ae7dde44063a3807ba0def7e935da0b40fcc8e181afd24ae
 size 342848
@@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:310bd4c7d5fe19521ec7184b2eee749f0eecf00397f2b8e68480c23b4fd7c943
 size 153504
@@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:dcebb1f73829670883071447a8eee46c972b26fe8735c7422949cb6fe927b8ab
 size 179369
@@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:7e5a85c28f5614e4de75eacc021c2876d36596bcb77f0744a6edcff7777b9530
 size 155004
@@ -0,0 +1,13 @@
 # Nextcloud
 ## Link
 <https://nextcloud.com/>
 ## Steps
 1. Install, or find a hosted version. 
    * The docker version <https://github.com/nextcloud/docker> for internal network, and [Caddy as reverse proxy](https://caddyserver.com/docs/quick-starts/reverse-proxy) (for https), are personally recommended.
    * If you find installing Nextcloud by yourselves is difficult, you can find some "Nextcloud's trusted, certified providers" on [Nextcloud Sign up page](https://nextcloud.com/sign-up/); For example, [The Good Cloud](https://thegood.cloud/) there generously provides 2 GB free stoarage space.
    * Remotely Save is tested to be working with the docker version and The Good Cloud.
 2. Go to Nextcloud's settings. Find the webdav url (something like `https://cloud.example.com/remote.php/dav/files/USERNAME`). Use this (without tailing slash), and your account and your password, in Remotely Save.
@@ -0,0 +1,9 @@
 # The Good Cloud
 ## Link
 <https://thegood.cloud/>
 ## Steps
 It's a hosted version of Nextcloud providing 2GB free spaces. See [NextCloud](../webdav_nextcloud/README.md) for more instructions.
@@ -1,3 +1,4 @@
 import "dotenv/config";
 import esbuild from "esbuild";
 import inlineWorkerPlugin from "esbuild-plugin-inline-worker";
 import process from "process";
@@ -16,6 +17,11 @@ const prod = process.argv[2] === "production";
 const DEFAULT_DROPBOX_APP_KEY = process.env.DROPBOX_APP_KEY || "";
 const DEFAULT_ONEDRIVE_CLIENT_ID = process.env.ONEDRIVE_CLIENT_ID || "";
 const DEFAULT_ONEDRIVE_AUTHORITY = process.env.ONEDRIVE_AUTHORITY || "";
 const DEFAULT_REMOTELYSAVE_WEBSITE = process.env.REMOTELYSAVE_WEBSITE || "";
 const DEFAULT_REMOTELYSAVE_CLIENT_ID = process.env.REMOTELYSAVE_CLIENT_ID || "";
 const DEFAULT_GOOGLEDRIVE_CLIENT_ID = process.env.GOOGLEDRIVE_CLIENT_ID || "";
 const DEFAULT_GOOGLEDRIVE_CLIENT_SECRET =
  process.env.GOOGLEDRIVE_CLIENT_SECRET || "";
 esbuild
  .context({
@@ -51,6 +57,10 @@ esbuild
      "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}"`,
      global: "window",
      "process.env.NODE_DEBUG": `undefined`, // ugly fix
      "process.env.DEBUG": `undefined`, // ugly fix
@@ -1,11 +1,11 @@
 {
  "id": "remotely-save",
  "name": "Remotely Save",
-  "version": "0.4.23",
+  "version": "0.5.3",
  "minAppVersion": "0.13.21",
  "description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
  "author": "fyears",
  "authorUrl": "https://github.com/fyears",
  "isDesktopOnly": false,
-  "fundingUrl": "https://github.com/remotely-save/donation"
+  "fundingUrl": "https://remotelysave.com"
 }
@@ -1,11 +1,11 @@
 {
  "id": "remotely-save",
  "name": "Remotely Save",
-  "version": "0.4.23",
+  "version": "0.5.3",
  "minAppVersion": "0.13.21",
  "description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
  "author": "fyears",
  "authorUrl": "https://github.com/fyears",
  "isDesktopOnly": false,
-  "fundingUrl": "https://github.com/remotely-save/donation"
+  "fundingUrl": "https://remotelysave.com"
 }
@@ -1,6 +1,6 @@
 {
  "name": "remotely-save",
-  "version": "0.4.23",
+  "version": "0.5.3",
  "description": "This is yet another sync plugin for Obsidian app.",
  "scripts": {
    "dev2": "node esbuild.config.mjs --watch",
@@ -9,7 +9,7 @@
    "dev": "webpack --mode development --watch",
    "format": "npx @biomejs/biome check --apply .",
    "clean": "npx rimraf main.js",
-    "test": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} mocha -r ts-node/register 'tests/**/*.ts'"
+    "test": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} mocha -r ts-node/register 'tests/**/*.ts' 'pro/tests/**/*.ts'"
  },
  "browser": {
    "path": "path-browserify",
@@ -23,7 +23,7 @@
  "source": "main.ts",
  "keywords": [],
  "author": "",
-  "license": "Apache-2.0",
+  "license": "SEE LICENSE IN LICENSE",
  "devDependencies": {
    "@biomejs/biome": "1.7.3",
    "@microsoft/microsoft-graph-types": "^2.40.0",
@@ -63,6 +63,7 @@
    "@fyears/rclone-crypt": "^0.0.7",
    "@fyears/tsqueue": "^1.0.1",
    "@microsoft/microsoft-graph-client": "^3.0.7",
    "@sanity/diff-match-patch": "^3.1.1",
    "@smithy/fetch-http-handler": "^2.5.0",
    "@smithy/protocol-http": "^3.3.0",
    "@smithy/querystring-builder": "^2.2.0",
@@ -83,6 +84,7 @@
    "mime-types": "^2.1.35",
    "mustache": "^4.2.0",
    "nanoid": "^5.0.7",
    "node-diff3": "^3.1.2",
    "p-queue": "^8.0.1",
    "path-browserify": "^1.0.1",
    "process": "^0.11.10",
@@ -0,0 +1,104 @@
 # PolyForm Strict License 1.0.0
 <https://polyformproject.org/licenses/strict/1.0.0>
 ## Acceptance
 In order to get any license under these terms, you must agree
 to them as both strict obligations and conditions to all
 your licenses.
 ## Copyright License
 The licensor grants you a copyright license for the software
 to do everything you might do with the software that would
 otherwise infringe the licensor's copyright in it for any
 permitted purpose, other than distributing the software or
 making changes or new works based on the software.
 ## Patent License
 The licensor grants you a patent license for the software that
 covers patent claims the licensor can license, or becomes able
 to license, that you would infringe by using the software.
 ## Noncommercial Purposes
 Any noncommercial purpose is a permitted purpose.
 ## Personal Uses
 Personal use for research, experiment, and testing for
 the benefit of public knowledge, personal study, private
 entertainment, hobby projects, amateur pursuits, or religious
 observance, without any anticipated commercial application,
 is use for a permitted purpose.
 ## Noncommercial Organizations
 Use by any charitable organization, educational institution,
 public research organization, public safety or health
 organization, environmental protection organization,
 or government institution is use for a permitted purpose
 regardless of the source of funding or obligations resulting
 from the funding.
 ## Fair Use
 You may have "fair use" rights for the software under the
 law. These terms do not limit them.
 ## No Other Rights
 These terms do not allow you to sublicense or transfer any of
 your licenses to anyone else, or prevent the licensor from
 granting licenses to anyone else.  These terms do not imply
 any other licenses.
 ## Patent Defense
 If you make any written claim that the software infringes or
 contributes to infringement of any patent, your patent license
 for the software granted under these terms ends immediately. If
 your company makes such a claim, your patent license ends
 immediately for work on behalf of your company.
 ## Violations
 The first time you are notified in writing that you have
 violated any of these terms, or done anything with the software
 not covered by your licenses, your licenses can nonetheless
 continue if you come into full compliance with these terms,
 and take practical steps to correct past violations, within
 32 days of receiving notice.  Otherwise, all your licenses
 end immediately.
 ## No Liability
 ***As far as the law allows, the software 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.***
 ## Definitions
 The **licensor** is the individual or entity offering these
 terms, and the **software** is the software the licensor makes
 available under these terms.
 **You** refers to the individual or entity agreeing to these
 terms.
 **Your company** is any legal entity, sole proprietorship,
 or other kind of organization that you work for, plus all
 organizations that have control over, are under the control of,
 or are under common control with that organization.  **Control**
 means ownership of substantially all the assets of an entity,
 or the power to direct its management and policies by vote,
 contract, or otherwise.  Control can be direct or indirect.
 **Your licenses** are all the licenses granted to you for the
 software under these terms.
 **Use** means anything you do with the software requiring one
 of your licenses.
@@ -0,0 +1,25 @@
 # Pro Features
 ## What?
 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).
 ## Smart Conflict
 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
 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).
 ## 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".
 Suggestions are welcome.
@@ -0,0 +1,328 @@
 import { nanoid } from "nanoid";
 import { base64url } from "rfc4648";
 import {
  OAUTH2_FORCE_EXPIRE_MILLISECONDS,
  type RemotelySavePluginSettings,
 } from "../../src/baseTypes";
 import {
  COMMAND_CALLBACK_PRO,
  type FeatureInfo,
  PRO_CLIENT_ID,
  type PRO_FEATURE_TYPE,
  PRO_WEBSITE,
  type ProConfig,
 } from "./baseTypesPro";
 const site = PRO_WEBSITE;
 console.debug(`remotelysave official website: ${site}`);
 export const DEFAULT_PRO_CONFIG: ProConfig = {
  accessToken: "",
  accessTokenExpiresInMs: 0,
  accessTokenExpiresAtTimeMs: 0,
  refreshToken: "",
  enabledProFeatures: [],
  email: "",
 };
 /**
 * https://datatracker.ietf.org/doc/html/rfc7636
 * dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk
 * => E9Melhoa2OwvFrEMTJguCHaoeK1t8URWbuGJSstw-cM
 * @param x
 * @returns BASE64URL-ENCODE(SHA256(ASCII(code_verifier)))
 */
 async function codeVerifier2CodeChallenge(x: string) {
  if (x === undefined || x === "") {
    return "";
  }
  try {
    return base64url.stringify(
      new Uint8Array(
        await crypto.subtle.digest("SHA-256", new TextEncoder().encode(x))
      ),
      {
        pad: false,
      }
    );
  } catch (e) {
    return "";
  }
 }
 export const generateAuthUrlAndCodeVerifierChallenge = async (
  hasCallback: boolean
 ) => {
  const appKey = PRO_CLIENT_ID ?? "cli-"; // hard-code
  const codeVerifier = nanoid(128);
  const codeChallenge = await codeVerifier2CodeChallenge(codeVerifier);
  let authUrl = `${site}/oauth2/authorize?response_type=code&client_id=${appKey}&token_access_type=offline&code_challenge_method=S256&code_challenge=${codeChallenge}&scope=pro.list.read`;
  if (hasCallback) {
    authUrl += `&redirect_uri=obsidian://${COMMAND_CALLBACK_PRO}`;
  }
  return {
    authUrl,
    codeVerifier,
    codeChallenge,
  };
 };
 export const sendAuthReq = async (
  verifier: string,
  authCode: string,
  errorCallBack: any
 ) => {
  const appKey = PRO_CLIENT_ID ?? "cli-"; // hard-code
  try {
    const k = {
      code: authCode,
      grant_type: "authorization_code",
      code_verifier: verifier,
      client_id: appKey,
      // redirect_uri: `obsidian://${COMMAND_CALLBACK_PRO}`,
      scope: "pro.list.read",
    };
    // console.debug(k);
    const resp1 = await fetch(`${site}/api/v1/oauth2/token`, {
      method: "POST",
      body: new URLSearchParams(k),
    });
    const resp2 = await resp1.json();
    return resp2;
  } catch (e) {
    console.error(e);
    if (errorCallBack !== undefined) {
      await errorCallBack(e);
    }
  }
 };
 export const sendRefreshTokenReq = async (refreshToken: string) => {
  const appKey = PRO_CLIENT_ID ?? "cli-"; // hard-code
  try {
    console.info("start auto getting refreshed Remotely Save access token.");
    const resp1 = await fetch(`${site}/api/v1/oauth2/token`, {
      method: "POST",
      body: new URLSearchParams({
        grant_type: "refresh_token",
        refresh_token: refreshToken,
        client_id: appKey,
        scope: "pro.list.read",
      }),
    });
    const resp2: AuthResError | AuthResSucc = await resp1.json();
    console.info("finish auto getting refreshed Remotely Save access token.");
    return resp2;
  } catch (e) {
    console.error(e);
    throw e;
  }
 };
 interface AuthResError {
  error: "invalid_request";
 }
 interface AuthResSucc {
  error: undefined; // needed for typescript
  refresh_token?: string;
  access_token: string;
  expires_in: number;
 }
 export const setConfigBySuccessfullAuthInplace = async (
  config: ProConfig,
  authRes: AuthResError | AuthResSucc,
  saveUpdatedConfigFunc: () => Promise<any> | undefined
 ) => {
  if (authRes.error !== undefined) {
    throw Error(`you should not save the setting for ${authRes.error}`);
  }
  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;
  // manually set it expired after 80 days;
  config.credentialsShouldBeDeletedAtTimeMs =
    Date.now() + OAUTH2_FORCE_EXPIRE_MILLISECONDS;
  await saveUpdatedConfigFunc?.();
  console.info(
    "finish updating local info of Remotely Save official website token"
  );
 };
 export const getAccessToken = async (
  config: ProConfig,
  saveUpdatedConfigFunc: () => Promise<any> | undefined
 ) => {
  const ts = Date.now();
  if (
    config.accessToken !== undefined &&
    config.accessToken !== "" &&
    config.accessTokenExpiresAtTimeMs > ts &&
    (config.credentialsShouldBeDeletedAtTimeMs ?? ts + 1000 * 1000) > ts
  ) {
    return config.accessToken;
  }
  console.debug(
    `currently, accessToken=${config.accessToken}, accessTokenExpiresAtTimeMs=${
      config.accessTokenExpiresAtTimeMs
    }, credentialsShouldBeDeletedAtTimeMs=${
      config.credentialsShouldBeDeletedAtTimeMs
    },comp1=${config.accessTokenExpiresAtTimeMs > ts}, comp2=${
      (config.credentialsShouldBeDeletedAtTimeMs ?? ts + 1000 * 1000) > ts
    }`
  );
  // try to get it again??
  const res = await sendRefreshTokenReq(config.refreshToken ?? "refresh-");
  await setConfigBySuccessfullAuthInplace(config, res, saveUpdatedConfigFunc);
  if (res.error !== undefined) {
    throw Error("cannot update accessToken");
  }
  return res.access_token;
 };
 export const getAndSaveProFeatures = async (
  config: ProConfig,
  pluginVersion: string,
  saveUpdatedConfigFunc: () => Promise<any> | undefined
 ) => {
  const access = await getAccessToken(config, saveUpdatedConfigFunc);
  const resp1 = await fetch(`${site}/api/v1/pro/list`, {
    method: "GET",
    headers: {
      Authorization: `Bearer ${access}`,
      "REMOTELYSAVE-API-Plugin-Ver": pluginVersion,
    },
  });
  const rsp2: {
    proFeatures: FeatureInfo[];
  } = await resp1.json();
  config.enabledProFeatures = rsp2.proFeatures;
  await saveUpdatedConfigFunc?.();
  return rsp2;
 };
 export const getAndSaveProEmail = async (
  config: ProConfig,
  pluginVersion: string,
  saveUpdatedConfigFunc: () => Promise<any> | undefined
 ) => {
  const access = await getAccessToken(config, saveUpdatedConfigFunc);
  const resp1 = await fetch(`${site}/api/v1/profile/list`, {
    method: "GET",
    headers: {
      Authorization: `Bearer ${access}`,
      "REMOTELYSAVE-API-Plugin-Ver": pluginVersion,
    },
  });
  const rsp2: {
    email: string;
  } = await resp1.json();
  config.email = rsp2.email;
  await saveUpdatedConfigFunc?.();
  return rsp2;
 };
 /**
 * If the check doesn't pass, the function should throw the error
 * @returns
 */
 export const checkProRunnableAndFixInplace = async (
  featuresToCheck: PRO_FEATURE_TYPE[],
  config: RemotelySavePluginSettings,
  pluginVersion: string,
  saveUpdatedConfigFunc: () => Promise<any> | undefined
 ): Promise<true> => {
  console.debug(`checkProRunnableAndFixInplace`);
  // many checks if status is valid
  // no account
  if (config.pro === undefined || config.pro.refreshToken === undefined) {
    throw Error(`you need to "connect" to your account to use PRO features`);
  }
  // every features should have at most 40 days expiration dates
  // and if the time has expired, we also check
  const msIn40Days = 1000 * 60 * 60 * 24 * 40;
  for (const f of config.pro.enabledProFeatures) {
    const tooFarInTheFuture = f.expireAtTimeMs >= Date.now() + msIn40Days;
    const alreadyExpired = f.expireAtTimeMs <= Date.now();
    if (tooFarInTheFuture || alreadyExpired) {
      console.info(
        `the pro feature is too far in the future and has expired, check again.`
      );
      await getAndSaveProFeatures(
        config.pro,
        pluginVersion,
        saveUpdatedConfigFunc
      );
      break;
    }
  }
  const errorMsgs = [];
  // check for the features
  if (featuresToCheck.contains("feature-smart_conflict")) {
    if (config.conflictAction === "smart_conflict") {
      if (
        config.pro.enabledProFeatures.filter(
          (x) => x.featureName === "feature-smart_conflict"
        ).length === 1
      ) {
        // good to go
      } else {
        errorMsgs.push(
          `You're trying to use "smart conflict" PRO feature but you haven't subscribe to it.`
        );
      }
    } else {
      // good to go
    }
  }
  if (featuresToCheck.contains("feature-google_drive")) {
    console.debug(
      `checking "feature-google_drive", serviceType=${config.serviceType}`
    );
    console.debug(
      `enabledProFeatures=${JSON.stringify(config.pro.enabledProFeatures)}`
    );
    if (config.serviceType === "googledrive") {
      if (
        config.pro.enabledProFeatures.filter(
          (x) => x.featureName === "feature-google_drive"
        ).length === 1
      ) {
        // good to go
      } else {
        errorMsgs.push(
          `You're trying to use "sync with Google Drive" PRO feature but you haven't subscribe to it.`
        );
      }
    } else {
      // good to go
    }
  }
  if (errorMsgs.length !== 0) {
    throw Error(errorMsgs.join("\n\n"));
  }
  return true;
 };
@@ -0,0 +1,40 @@
 export const MERGABLE_SIZE = 1000 * 1000; // 1 MB
 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 type PRO_FEATURE_TYPE =
  | "feature-smart_conflict"
  | "feature-google_drive";
 export interface FeatureInfo {
  featureName: PRO_FEATURE_TYPE;
  enableAtTimeMs: bigint;
  expireAtTimeMs: bigint;
 }
 export interface ProConfig {
  email?: string;
  refreshToken?: string;
  accessToken: string;
  accessTokenExpiresInMs: number;
  accessTokenExpiresAtTimeMs: number;
  enabledProFeatures: FeatureInfo[];
  credentialsShouldBeDeletedAtTimeMs?: number;
 }
 export interface GoogleDriveConfig {
  accessToken: string;
  accessTokenExpiresInMs: number;
  accessTokenExpiresAtTimeMs: number;
  refreshToken: string;
  remoteBaseDir?: string;
  credentialsShouldBeDeletedAtTimeMs?: number;
  scope: "https://www.googleapis.com/auth/drive.file";
 }
 export const DEFAULT_GOOGLEDRIVE_CLIENT_ID =
  process.env.DEFAULT_GOOGLEDRIVE_CLIENT_ID;
 export const DEFAULT_GOOGLEDRIVE_CLIENT_SECRET =
  process.env.DEFAULT_GOOGLEDRIVE_CLIENT_SECRET;
@@ -0,0 +1,257 @@
 import isEqual from "lodash/isEqual";
 // import {
 //   makePatches,
 //   applyPatches,
 //   stringifyPatches,
 //   parsePatch,
 // } from "@sanity/diff-match-patch";
 import {
  LCS,
  diff3Merge,
  diffComm,
  diffPatch,
  mergeDiff3,
  mergeDigIn,
  patch,
 } from "node-diff3";
 import type { Entity } from "../../src/baseTypes";
 import { copyFile } from "../../src/copyLogic";
 import type { FakeFs } from "../../src/fsAll";
 import { MERGABLE_SIZE } from "./baseTypesPro";
 export function isMergable(a: Entity, b?: Entity) {
  if (b !== undefined && a.keyRaw !== b.keyRaw) {
    return false;
  }
  return (
    !a.keyRaw.endsWith("/") &&
    a.sizeRaw <= MERGABLE_SIZE &&
    (a.keyRaw.endsWith(".md") || a.keyRaw.endsWith(".markdown"))
  );
 }
 /**
 * slightly modify to adjust in markdown context
 * @param a
 * @param o
 * @param b
 */
 function mergeDigInModified(a: string, o: string, b: string) {
  const { conflict, result } = mergeDigIn(a, o, b);
  for (let index = 0; index < result.length; ++index) {
    if (["<<<<<<<", "=======", ">>>>>>>"].contains(result[index])) {
      result[index] = "`" + result[index] + "`";
    }
  }
  return {
    conflict,
    result,
  };
 }
 function getLCSText(a: string, b: string) {
  const aa = a.split("\n");
  const bb = b.split("\n");
  let raw = LCS(aa, bb);
  const k: string[] = [];
  do {
    k.unshift(aa[raw.buffer1index]);
    raw = raw.chain as any;
  } while (raw !== null && raw !== undefined && raw.buffer1index !== -1);
  return k.join("\n");
 }
 /**
 * It's tricky. We find LCS then pretend it's the original text
 * @param a
 * @param b
 * @returns
 */
 function twoWayMerge(a: string, b: string): string {
  // const c = getLCSText(a, b);
  // const patches = makePatches(c, a);
  // const [d] = applyPatches(patches, b);
  const c = getLCSText(a, b);
  const d = mergeDigInModified(a, c, b).result.join("\n");
  return d;
 }
 /**
 * Originally three way merge.
 * @param a
 * @param b
 * @param orig
 * @returns
 */
 function threeWayMerge(a: string, b: string, orig: string) {
  return mergeDigInModified(a, orig, b).result.join("\n");
 }
 export async function mergeFile(
  key: string,
  left: FakeFs,
  right: FakeFs,
  contentOrig: ArrayBuffer | null | undefined
 ) {
  // console.debug(
  //   `mergeFile: key=${key}, left=${left.kind}, right=${right.kind}`
  // );
  if (key.endsWith("/")) {
    throw Error(`should not call ${key} in mergeFile`);
  }
  if (!key.endsWith(".md") && !key.endsWith(".markdown")) {
    throw Error(`currently only support markdown files in mergeFile`);
  }
  const [contentLeft, contentRight] = await Promise.all([
    left.readFile(key),
    right.readFile(key),
  ]);
  let newArrayBuffer: ArrayBuffer | undefined = undefined;
  const decoder = new TextDecoder("utf-8");
  if (isEqual(contentLeft, contentRight)) {
    // we are lucky enough
    newArrayBuffer = contentLeft;
    // TODO: save the write
  } else {
    if (contentOrig === null || contentOrig === undefined) {
      const newText = twoWayMerge(
        decoder.decode(contentLeft),
        decoder.decode(contentRight)
      );
      // no need to worry about the offset here because the array is new and not sliced
      newArrayBuffer = new TextEncoder().encode(newText).buffer;
    } else {
      const newText = threeWayMerge(
        decoder.decode(contentLeft),
        decoder.decode(contentRight),
        decoder.decode(contentOrig)
      );
      newArrayBuffer = new TextEncoder().encode(newText).buffer;
    }
  }
  const mtime = Date.now();
  // left (local) must wait for the right
  // because the mtime might be different after upload
  // upload firstly
  const rightEntity = await right.writeFile(key, newArrayBuffer, mtime, mtime);
  // write local secondly
  const leftEntity = await left.writeFile(
    key,
    newArrayBuffer,
    rightEntity.mtimeCli ?? mtime,
    rightEntity.mtimeCli ?? mtime
  );
  return {
    entity: rightEntity,
    content: newArrayBuffer,
  };
 }
 export function getFileRename(key: string) {
  if (
    key === "" ||
    key === "." ||
    key === ".." ||
    key === "/" ||
    key.endsWith("/")
  ) {
    throw Error(`we cannot rename key=${key}`);
  }
  const segsPath = key.split("/");
  const name = segsPath[segsPath.length - 1];
  const segsName = name.split(".");
  if (segsName.length === 0) {
    throw Error(`we cannot rename key=${key}`);
  } else if (segsName.length === 1) {
    // name = "kkk" without any dot
    segsPath[segsPath.length - 1] = `${name}.dup`;
  } else if (segsName.length === 2) {
    if (segsName[0] === "") {
      // name = ".kkkk" with leading dot
      segsPath[segsPath.length - 1] = `${name}.dup`;
    } else if (segsName[1] === "") {
      // name = "kkkk." with tailing dot
      segsPath[segsPath.length - 1] = `${segsName[0]}.dup`;
    } else {
      // name = "aaa.bbb" normally
      segsPath[segsPath.length - 1] = `${segsName[0]}.dup.${segsName[1]}`;
    }
  } else {
    // name = "[...].bbb.ccc"
    const firstPart = segsName.slice(0, segsName.length - 1).join(".");
    const thirdPart = segsName[segsName.length - 1];
    segsPath[segsPath.length - 1] = `${firstPart}.dup.${thirdPart}`;
  }
  const res = segsPath.join("/");
  return res;
 }
 /**
 * local: x.md -> x.dup.md -> upload to remote
 * remote: x.md -> download to local -> using original name x.md
 */
 export async function duplicateFile(
  key: string,
  left: FakeFs,
  right: FakeFs,
  uploadCallback: (entity: Entity) => Promise<any>,
  downloadCallback: (entity: Entity) => Promise<any>
 ) {
  let key2 = getFileRename(key);
  let usable = false;
  do {
    try {
      const s = await left.stat(key2);
      if (s === null || s === undefined) {
        throw Error(`not exist $${key2}`);
      }
      console.debug(`key2=${key2} exists, cannot use for new file`);
      key2 = getFileRename(key2);
      console.debug(`key2=${key2} is prepared for next try`);
    } catch (e) {
      // not exists, exactly what we want
      console.debug(`key2=${key2} doesn't exist, usable for new file`);
      usable = true;
    }
  } while (!usable);
  await left.rename(key, key2);
  /**
   * x.dup.md -> upload to remote
   */
  async function f1() {
    const k = await copyFile(key2, left, right);
    await uploadCallback(k.entity);
    return k.entity;
  }
  /**
   * x.md -> download to local
   */
  async function f2() {
    const k = await copyFile(key, right, left);
    await downloadCallback(k.entity);
    return k.entity;
  }
  const [resUpload, resDownload] = await Promise.all([f1(), f2()]);
  return {
    upload: resUpload,
    download: resDownload,
  };
 }
@@ -0,0 +1,765 @@
 // https://developers.google.com/identity/protocols/oauth2/native-app
 // https://developers.google.com/identity/protocols/oauth2/javascript-implicit-flow
 // https://developers.google.com/identity/protocols/oauth2/web-server
 import { entries } from "lodash";
 import * as mime from "mime-types";
 import { requestUrl } from "obsidian";
 import PQueue from "p-queue";
 import { DEFAULT_CONTENT_TYPE, type Entity } from "../../src/baseTypes";
 import { FakeFs } from "../../src/fsAll";
 import {
  getFolderLevels,
  splitFileSizeToChunkRanges,
  unixTimeToStr,
 } from "../../src/misc";
 import {
  DEFAULT_GOOGLEDRIVE_CLIENT_ID,
  DEFAULT_GOOGLEDRIVE_CLIENT_SECRET,
  type GoogleDriveConfig,
 } from "./baseTypesPro";
 export const DEFAULT_GOOGLEDRIVE_CONFIG: GoogleDriveConfig = {
  accessToken: "",
  refreshToken: "",
  accessTokenExpiresInMs: 0,
  accessTokenExpiresAtTimeMs: 0,
  credentialsShouldBeDeletedAtTimeMs: 0,
  scope: "https://www.googleapis.com/auth/drive.file",
 };
 const FOLDER_MIME_TYPE = "application/vnd.google-apps.folder";
 /**
 * A simplified version of the type
 *
 */
 interface File {
  kind?: string;
  driveId?: string;
  fileExtension?: string;
  copyRequiresWriterPermission?: boolean;
  md5Checksum?: string;
  writersCanShare?: boolean;
  viewedByMe?: boolean;
  mimeType?: string;
  parents?: string[];
  thumbnailLink?: string;
  iconLink?: string;
  shared?: boolean;
  headRevisionId?: string;
  webViewLink?: string;
  webContentLink?: string;
  size?: string;
  viewersCanCopyContent?: boolean;
  hasThumbnail?: boolean;
  spaces?: string[];
  folderColorRgb?: string;
  id?: string;
  name?: string;
  description?: string;
  starred?: boolean;
  trashed?: boolean;
  explicitlyTrashed?: boolean;
  createdTime?: string;
  modifiedTime?: string;
  modifiedByMeTime?: string;
  viewedByMeTime?: string;
  sharedWithMeTime?: string;
  quotaBytesUsed?: string;
  version?: string;
  originalFilename?: string;
  ownedByMe?: boolean;
  fullFileExtension?: string;
  isAppAuthorized?: boolean;
  teamDriveId?: string;
  hasAugmentedPermissions?: boolean;
  thumbnailVersion?: string;
  trashedTime?: string;
  modifiedByMe?: boolean;
  permissionIds?: string[];
  resourceKey?: string;
  sha1Checksum?: string;
  sha256Checksum?: string;
 }
 interface GDEntity extends Entity {
  id: string;
  parentID: string | undefined;
  parentIDPath: string | undefined;
  isFolder: boolean;
 }
 /**
 * https://developers.google.com/identity/protocols/oauth2/web-server#httprest_7
 * @param refreshToken
 */
 export const sendRefreshTokenReq = async (refreshToken: string) => {
  console.debug(`refreshing token`);
  const x = await fetch("https://oauth2.googleapis.com/token", {
    method: "POST",
    headers: {
      "Content-Type": "application/x-www-form-urlencoded",
    },
    body: new URLSearchParams({
      client_id: DEFAULT_GOOGLEDRIVE_CLIENT_ID ?? "",
      client_secret: DEFAULT_GOOGLEDRIVE_CLIENT_SECRET ?? "",
      grant_type: "refresh_token",
      refresh_token: refreshToken,
    }).toString(),
  });
  if (x.status === 200) {
    const y = await x.json();
    console.debug(`new token obtained`);
    return y;
  } else {
    throw Error(`cannot refresh an access token`);
  }
  // {
  //   "access_token": "1/fFAGRNJru1FTz70BzhT3Zg",
  //   "expires_in": 3920,
  //   "scope": "https://www.googleapis.com/auth/drive.file",
  //   "token_type": "Bearer"
  // }
 };
 const fromFileToGDEntity = (
  file: File,
  parentID: string,
  parentFolderPath: string | undefined /* for bfs */
 ) => {
  if (parentID === undefined || parentID === "" || parentID === "root") {
    throw Error(`parentID=${parentID} should not be in fromFileToGDEntity`);
  }
  let keyRaw = file.name!;
  if (
    parentFolderPath !== undefined &&
    parentFolderPath !== "" &&
    parentFolderPath !== "/"
  ) {
    if (!parentFolderPath.endsWith("/")) {
      throw Error(
        `parentFolderPath=${parentFolderPath} should not be in fromFileToGDEntity`
      );
    }
    keyRaw = `${parentFolderPath}${file.name}`;
  }
  const isFolder = file.mimeType === FOLDER_MIME_TYPE;
  if (isFolder) {
    keyRaw = `${keyRaw}/`;
  }
  return {
    key: keyRaw,
    keyRaw: keyRaw,
    mtimeCli: Date.parse(file.modifiedTime!),
    mtimeSvr: Date.parse(file.modifiedTime!),
    size: isFolder ? 0 : Number.parseInt(file.size!),
    sizeRaw: isFolder ? 0 : Number.parseInt(file.size!),
    hash: isFolder ? undefined : file.md5Checksum!,
    id: file.id!,
    parentID: parentID,
    isFolder: isFolder,
  } as GDEntity;
 };
 export class FakeFsGoogleDrive extends FakeFs {
  kind: string;
  googleDriveConfig: GoogleDriveConfig;
  remoteBaseDir: string;
  vaultFolderExists: boolean;
  saveUpdatedConfigFunc: () => Promise<any>;
  keyToGDEntity: Record<string, GDEntity>;
  baseDirID: string;
  constructor(
    googleDriveConfig: GoogleDriveConfig,
    vaultName: string,
    saveUpdatedConfigFunc: () => Promise<any>
  ) {
    super();
    this.kind = "googledrive";
    this.googleDriveConfig = googleDriveConfig;
    this.remoteBaseDir =
      this.googleDriveConfig.remoteBaseDir || vaultName || "";
    this.vaultFolderExists = false;
    this.saveUpdatedConfigFunc = saveUpdatedConfigFunc;
    this.keyToGDEntity = {};
    this.baseDirID = "";
  }
  async _init() {
    // get accessToken
    await this._getAccessToken();
    // check vault folder exists
    if (this.vaultFolderExists) {
      // pass
    } else {
      const q = encodeURIComponent(
        `name='${this.remoteBaseDir}' and mimeType='application/vnd.google-apps.folder' and trashed=false`
      );
      const url: string = `https://www.googleapis.com/drive/v3/files?q=${q}&pageSize=1000&fields=kind,nextPageToken,files(kind,fileExtension,md5Checksum,mimeType,parents,size,spaces,id,name,trashed,createdTime,modifiedTime,quotaBytesUsed,originalFilename,fullFileExtension,sha1Checksum,sha256Checksum)`;
      const k = await fetch(url, {
        method: "GET",
        headers: {
          Authorization: `Bearer ${await this._getAccessToken()}`,
        },
      });
      const k1: { files: File[] } = await k.json();
      // console.debug(k1);
      if (k1.files.length > 0) {
        // yeah we find it
        this.baseDirID = k1.files[0].id!;
        this.vaultFolderExists = true;
      } else {
        // wait, we need to create the folder!
        console.debug(`we need to create the base dir ${this.remoteBaseDir}`);
        const meta: any = {
          mimeType: FOLDER_MIME_TYPE,
          name: this.remoteBaseDir,
        };
        const res = await fetch("https://www.googleapis.com/drive/v3/files", {
          method: "POST",
          headers: {
            Authorization: `Bearer ${await this._getAccessToken()}`,
            "Content-Type": "application/json",
          },
          body: JSON.stringify(meta),
        });
        const res2: File = await res.json();
        if (res.status === 200) {
          console.debug(`succeed to create the base dir ${this.remoteBaseDir}`);
          this.baseDirID = res2.id!;
          this.vaultFolderExists = true;
        } else {
          throw Error(
            `cannot create base dir ${this.remoteBaseDir} in init func.`
          );
        }
      }
    }
  }
  async _getAccessToken() {
    if (
      this.googleDriveConfig.accessToken === "" ||
      this.googleDriveConfig.refreshToken === ""
    ) {
      throw Error("The user has not manually auth yet.");
    }
    const ts = Date.now();
    if (this.googleDriveConfig.accessTokenExpiresAtTimeMs > ts) {
      return this.googleDriveConfig.accessToken;
    }
    // refresh
    const k = await sendRefreshTokenReq(this.googleDriveConfig.refreshToken);
    this.googleDriveConfig.accessToken = k.access_token;
    this.googleDriveConfig.accessTokenExpiresInMs = k.expires_in * 1000;
    this.googleDriveConfig.accessTokenExpiresAtTimeMs =
      ts + k.expires_in * 1000 - 60 * 2 * 1000;
    await this.saveUpdatedConfigFunc();
    console.info("Google Drive accessToken updated");
    return this.googleDriveConfig.accessToken;
  }
  /**
   * https://developers.google.com/drive/api/reference/rest/v3/files/list
   */
  async walk(): Promise<Entity[]> {
    await this._init();
    const allFiles: GDEntity[] = [];
    // bfs
    const queue = new PQueue({
      concurrency: 5, // TODO: make it configurable?
      autoStart: true,
    });
    queue.on("error", (error) => {
      queue.pause();
      queue.clear();
      throw error;
    });
    let parents = [
      {
        id: this.baseDirID, // special init, from already created root folder ID
        folderPath: "",
      },
    ];
    while (parents.length !== 0) {
      const children: typeof parents = [];
      for (const { id, folderPath } of parents) {
        queue.add(async () => {
          const filesUnderFolder = await this._walkFolder(id, folderPath);
          for (const f of filesUnderFolder) {
            allFiles.push(f);
            if (f.isFolder) {
              // keyRaw itself already has a tailing slash, no more slash here
              // keyRaw itself also already has full path
              const child = {
                id: f.id,
                folderPath: f.keyRaw,
              };
              // console.debug(
              //   `looping result of _walkFolder(${id},${folderPath}), adding child=${JSON.stringify(
              //     child
              //   )}`
              // );
              children.push(child);
            }
          }
        });
      }
      await queue.onIdle();
      parents = children;
    }
    // console.debug(`in the end of walk:`);
    // console.debug(allFiles);
    // console.debug(this.keyToGDEntity);
    return allFiles;
  }
  async _walkFolder(parentID: string, parentFolderPath: string) {
    // console.debug(
    //   `input of single level: parentID=${parentID}, parentFolderPath=${parentFolderPath}`
    // );
    const filesOneLevel: GDEntity[] = [];
    let nextPageToken: string | undefined = undefined;
    if (parentID === undefined || parentID === "" || parentID === "root") {
      // we should never start from root
      // because we encapsulate the vault inside a folder
      throw Error(`something goes wrong walking folder`);
    }
    do {
      const q = encodeURIComponent(
        `'${parentID}' in parents and trashed=false`
      );
      const pageToken =
        nextPageToken !== undefined ? `&pageToken=${nextPageToken}` : "";
      const url: string = `https://www.googleapis.com/drive/v3/files?q=${q}&pageSize=1000&fields=kind,nextPageToken,files(kind,fileExtension,md5Checksum,mimeType,parents,size,spaces,id,name,trashed,createdTime,modifiedTime,quotaBytesUsed,originalFilename,fullFileExtension,sha1Checksum,sha256Checksum)${pageToken}`;
      const k = await fetch(url, {
        method: "GET",
        headers: {
          Authorization: `Bearer ${await this._getAccessToken()}`,
        },
      });
      if (k.status !== 200) {
        throw Error(`cannot walk for parentID=${parentID}`);
      }
      const k1 = await k.json();
      // console.debug(k1);
      for (const file of k1.files as File[]) {
        const entity = fromFileToGDEntity(file, parentID, parentFolderPath);
        this.keyToGDEntity[entity.keyRaw] = entity; // build cache
        filesOneLevel.push(entity);
      }
      nextPageToken = k1.nextPageToken;
    } while (nextPageToken !== undefined);
    // console.debug(filesOneLevel);
    return filesOneLevel;
  }
  async walkPartial(): Promise<Entity[]> {
    await this._init();
    const filesInLevel = await this._walkFolder(this.baseDirID, "");
    return filesInLevel;
  }
  /**
   * https://developers.google.com/drive/api/reference/rest/v3/files/get
   * https://developers.google.com/drive/api/guides/fields-parameter
   */
  async stat(key: string): Promise<Entity> {
    await this._init();
    // TODO: we already have a cache, should we call again?
    const cachedEntity = this.keyToGDEntity[key];
    const fileID = cachedEntity?.id;
    if (cachedEntity === undefined || fileID === undefined) {
      throw Error(`no fileID found for key=${key}`);
    }
    const url: string = `https://www.googleapis.com/drive/v3/files/${fileID}?fields=kind,fileExtension,md5Checksum,mimeType,parents,size,spaces,id,name,trashed,createdTime,modifiedTime,quotaBytesUsed,originalFilename,fullFileExtension,sha1Checksum,sha256Checksum`;
    const k = await fetch(url, {
      method: "GET",
      headers: {
        Authorization: `Bearer ${await this._getAccessToken()}`,
      },
    });
    if (k.status !== 200) {
      throw Error(`cannot get file meta fileID=${fileID}, key=${key}`);
    }
    const k1: File = await k.json();
    const entity = fromFileToGDEntity(
      k1,
      cachedEntity.parentID!,
      cachedEntity.parentIDPath!
    );
    // insert back to cache?? to update it??
    this.keyToGDEntity[key] = entity;
    return entity;
  }
  /**
   * https://developers.google.com/drive/api/guides/folder
   */
  async mkdir(
    key: string,
    mtime: number | undefined,
    ctime: number | undefined
  ): Promise<Entity> {
    if (!key.endsWith("/")) {
      throw Error(`you should not mkdir on key=${key}`);
    }
    await this._init();
    // xxx/ => ["xxx"]
    // xxx/yyy/zzz/ => ["xxx", "xxx/yyy", "xxx/yyy/zzz"]
    const folderLevels = getFolderLevels(key);
    let parentFolderPath: string | undefined = undefined;
    let parentID: string | undefined = undefined;
    if (folderLevels.length === 0) {
      throw Error(`cannot getFolderLevels of ${key}`);
    } else if (folderLevels.length === 1) {
      parentID = this.baseDirID;
      parentFolderPath = ""; // ignore base dir
    } else {
      // length > 1
      parentFolderPath = `${folderLevels[folderLevels.length - 2]}/`;
      if (!(parentFolderPath in this.keyToGDEntity)) {
        throw Error(
          `parent of ${key}: ${parentFolderPath} is not created before??`
        );
      }
      parentID = this.keyToGDEntity[parentFolderPath].id;
    }
    // xxx/yyy/zzz/ => ["xxx", "xxx/yyy", "xxx/yyy/zzz"] => "xxx/yyy/zzz" => "zzz"
    let folderItselfWithoutSlash = folderLevels[folderLevels.length - 1];
    folderItselfWithoutSlash = folderItselfWithoutSlash.split("/").pop()!;
    const meta: any = {
      mimeType: FOLDER_MIME_TYPE,
      modifiedTime: unixTimeToStr(mtime, true),
      createdTime: unixTimeToStr(ctime, true),
      name: folderItselfWithoutSlash,
      parents: [parentID],
    };
    const res = await fetch("https://www.googleapis.com/drive/v3/files", {
      method: "POST",
      headers: {
        Authorization: `Bearer ${await this._getAccessToken()}`,
        "Content-Type": "application/json",
      },
      body: JSON.stringify(meta),
    });
    if (res.status !== 200 && res.status !== 201) {
      throw Error(`create folder ${key} failed! meta=${JSON.stringify(meta)}`);
    }
    const res2: File = await res.json();
    // console.debug(res2);
    const entity = fromFileToGDEntity(res2, parentID, parentFolderPath);
    // insert into cache
    this.keyToGDEntity[key] = entity;
    return entity;
  }
  /**
   * https://developers.google.com/drive/api/guides/manage-uploads
   * https://stackoverflow.com/questions/65181932/how-i-can-upload-file-to-google-drive-with-google-drive-api
   */
  async writeFile(
    key: string,
    content: ArrayBuffer,
    mtime: number,
    ctime: number
  ): Promise<Entity> {
    if (key.endsWith("/")) {
      throw Error(`should not call writeFile on ${key}`);
    }
    await this._init();
    const contentType =
      mime.contentType(mime.lookup(key) || DEFAULT_CONTENT_TYPE) ||
      DEFAULT_CONTENT_TYPE;
    let parentID: string | undefined = undefined;
    let parentFolderPath: string | undefined = undefined;
    // "xxx" => []
    // "xxx/yyy/zzz.md" => ["xxx", "xxx/yyy"]
    const folderLevels = getFolderLevels(key);
    if (folderLevels.length === 0) {
      // root
      parentID = this.baseDirID;
      parentFolderPath = "";
    } else {
      parentFolderPath = `${folderLevels[folderLevels.length - 1]}/`;
      if (!(parentFolderPath in this.keyToGDEntity)) {
        throw Error(
          `parent of ${key}: ${parentFolderPath} is not created before??`
        );
      }
      parentID = this.keyToGDEntity[parentFolderPath].id;
    }
    const fileItself = key.split("/").pop()!;
    if (content.byteLength <= 5 * 1024 * 1024) {
      const formData = new FormData();
      const meta: any = {
        name: fileItself,
        modifiedTime: unixTimeToStr(mtime, true),
        createdTime: unixTimeToStr(ctime, true),
        parents: [parentID],
      };
      formData.append(
        "metadata",
        new Blob([JSON.stringify(meta)], {
          type: "application/json; charset=UTF-8",
        })
      );
      formData.append("media", new Blob([content], { type: contentType }));
      const res = await fetch(
        "https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart&fields=kind,fileExtension,md5Checksum,mimeType,parents,size,spaces,id,name,trashed,createdTime,modifiedTime,quotaBytesUsed,originalFilename,fullFileExtension,sha1Checksum,sha256Checksum",
        {
          method: "POST",
          headers: {
            Authorization: `Bearer ${await this._getAccessToken()}`,
          },
          body: formData,
        }
      );
      if (res.status !== 200 && res.status !== 201) {
        throw Error(`create file ${key} failed! meta=${JSON.stringify(meta)}`);
      }
      const res2: File = await res.json();
      console.debug(
        `upload ${key} with ${JSON.stringify(meta)}, res2=${JSON.stringify(
          res2
        )}`
      );
      const entity = fromFileToGDEntity(res2, parentID, parentFolderPath);
      // insert into cache
      this.keyToGDEntity[key] = entity;
      return entity;
    } else {
      const meta: any = {
        name: fileItself,
        modifiedTime: unixTimeToStr(mtime, true),
        createdTime: unixTimeToStr(ctime, true),
        parents: [parentID],
      };
      const bodyStr = JSON.stringify(meta);
      const headers: HeadersInit = {
        Authorization: `Bearer ${await this._getAccessToken()}`,
        "Content-Type": "application/json",
        "Content-Length": `${bodyStr.length}`,
        "X-Upload-Content-Type": contentType,
        "X-Upload-Content-Length": `${content.byteLength}`,
      };
      const res = await fetch(
        "https://www.googleapis.com/upload/drive/v3/files?uploadType=resumable&fields=kind,fileExtension,md5Checksum,mimeType,parents,size,spaces,id,name,trashed,createdTime,modifiedTime,quotaBytesUsed,originalFilename,fullFileExtension,sha1Checksum,sha256Checksum",
        {
          method: "POST",
          headers: headers,
          body: bodyStr,
        }
      );
      if (res.status !== 200) {
        throw Error(
          `create resumable file ${key} failed! meta=${JSON.stringify(
            meta
          )}, header=${JSON.stringify(headers)}`
        );
      }
      const uploadLocation = res.headers.get("Location");
      if (uploadLocation === null || !uploadLocation.startsWith("http")) {
        throw Error(
          `create resumable file ${key} failed! meta=${JSON.stringify(
            meta
          )}, header=${JSON.stringify(headers)}`
        );
      }
      console.debug(`key=${key}, uploadLocaltion=${uploadLocation}`);
      // multiples of 256 KB (256 x 1024 bytes) in size
      const sizePerChunk = 5 * 4 * 256 * 1024; // 5.24 mb
      const chunkRanges = splitFileSizeToChunkRanges(
        content.byteLength,
        sizePerChunk
      );
      let entity: GDEntity | undefined = undefined;
      // TODO: deal with "Resume an interrupted upload"
      // currently (202405) only assume everything goes well...
      // TODO: parallel
      for (const { start, end } of chunkRanges) {
        console.debug(
          `key=${key}, start upload chunk ${start}-${end}/${content.byteLength}`
        );
        const res = await fetch(uploadLocation, {
          method: "PUT",
          headers: {
            Authorization: `Bearer ${await this._getAccessToken()}`,
            "Content-Length": `${end - start + 1}`, // the number of bytes in the current chunk
            "Content-Range": `bytes ${start}-${end}/${content.byteLength}`,
          },
          body: content.slice(start, end + 1), // TODO: slice() is a copy, may be we can optimize it
        });
        if (res.status >= 400 && res.status <= 599) {
          throw Error(
            `create resumable file ${key} failed! meta=${JSON.stringify(
              meta
            )}, header=${JSON.stringify(headers)}`
          );
        }
        if (res.status === 200 || res.status === 201) {
          const res2: File = await res.json();
          console.debug(
            `upload ${key} with ${JSON.stringify(meta)}, res2=${JSON.stringify(
              res2
            )}`
          );
          if (res2.id === undefined || res2.id === null || res2.id === "") {
            // TODO: what's this??
          } else {
            entity = fromFileToGDEntity(res2, parentID, parentFolderPath);
            // insert into cache
            this.keyToGDEntity[key] = entity;
          }
        }
      }
      if (entity === undefined) {
        throw Error(`something goes wrong while uploading large file ${key}`);
      }
      return entity;
    }
  }
  /**
   * https://developers.google.com/drive/api/reference/rest/v3/files/get
   */
  async readFile(key: string): Promise<ArrayBuffer> {
    if (key.endsWith("/")) {
      throw Error(`you should not call readFile on ${key}`);
    }
    await this._init();
    const fileID = this.keyToGDEntity[key]?.id;
    if (fileID === undefined) {
      throw Error(`no fileID found for key=${key}`);
    }
    const res1 = await fetch(
      `https://www.googleapis.com/drive/v3/files/${fileID}?alt=media`,
      {
        method: "GET",
        headers: {
          Authorization: `Bearer ${await this._getAccessToken()}`,
        },
      }
    );
    if (res1.status !== 200) {
      throw Error(`cannot download ${key} using fileID=${fileID}`);
    }
    const res2 = await res1.arrayBuffer();
    return res2;
  }
  async rename(key1: string, key2: string): Promise<void> {
    throw new Error("Method not implemented.");
  }
  /**
   * https://developers.google.com/drive/api/guides/delete
   * https://developers.google.com/drive/api/reference/rest/v3/files/update
   */
  async rm(key: string): Promise<void> {
    await this._init();
    const fileID = this.keyToGDEntity[key]?.id;
    if (fileID === undefined) {
      throw Error(`no fileID found for key=${key}`);
    }
    const res1 = await fetch(
      `https://www.googleapis.com/drive/v3/files/${fileID}`,
      {
        method: "PATCH",
        headers: {
          Authorization: `Bearer ${await this._getAccessToken()}`,
        },
        body: JSON.stringify({
          trashed: true,
        }),
      }
    );
    if (res1.status !== 200) {
      throw Error(`cannot rm ${key} using fileID=${fileID}`);
    }
  }
  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.");
  }
  /**
   * https://developers.google.com/identity/protocols/oauth2/web-server#tokenrevoke
   */
  async revokeAuth(): Promise<any> {
    const x = await fetch(
      `https://oauth2.googleapis.com/revoke?token=${this._getAccessToken()}`,
      {
        method: "POST",
        headers: {
          "Content-Type": "application/x-www-form-urlencoded",
        },
      }
    );
    if (x.status === 200) {
      return true;
    } else {
      throw Error(`cannot revoke`);
    }
  }
  allowEmptyFile(): boolean {
    return true;
  }
 }
@@ -0,0 +1,75 @@
 {
  "settings_conflictaction_smart_conflict": "Smart Conflict (PRO) (beta)",
  "settings_conflictaction_smart_conflict_desc": "<p><strong>!!It's a PRO feature! You need an online account for this feature!!</strong>(<a href=\"#settings-pro\">scroll down</a> for more info about PRO account.)</p><p><ul><li>For small markdown files, the plugin tries to merge them with diff3 algorithm.</li><li>For large files or not-markdown files, the plugin saves both files by renaming them.</li></ul></p><p><strong>Please manually backup your vaule before using this feature!</strong></p>",
  "protocol_pro_connecting": "Connectting",
  "protocol_pro_connect_manualinput_succ": "You've connected",
  "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.",
  "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!",
  "modal_googledrivce_maualinput": "The Code from the website",
  "modal_googledrivce_maualinput_desc": "Please input the code here from the end of auth flow, and press confirm.",
  "modal_googledrive_maualinput_notice": "We are trying to connect to Google and update the credentials...",
  "modal_googledrive_maualinput_succ_notice": "Great! The credentials are updated!",
  "modal_googledrive_maualinput_fail_notice": "Oops! Failed to update the credentials. Please try again later.",
  "modal_googledriverevokeauth_step1": "Step 1: Go to the following address, you can remove the connection there.",
  "modal_googledriverevokeauth_step2": "Step 2: Click the button below, to clean the locally-saved login credentials.",
  "modal_googledriverevokeauth_clean": "Clean Locally-Saved Login Credentials",
  "modal_googledriverevokeauth_clean_desc": "You need to click the button.",
  "modal_googledriverevokeauth_clean_button": "Clean",
  "modal_googledriverevokeauth_clean_notice": "Cleaned!",
  "modal_googledriverevokeauth_clean_fail": "Something goes wrong while revoking.",
  "modal_prorevokeauth": "Revoke auth by clicking here and follow the steps.",
  "modal_prorevokeauth_clean": "Clean",
  "modal_prorevokeauth_clean_desc": "Clean local auth record",
  "modal_prorevokeauth_clean_button": "Clean",
  "modal_prorevokeauth_clean_notice": "Local auth record is cleaned",
  "modal_prorevokeauth_clean_fail": "Fail to clean local auth record.",
  "modal_proauth_copybutton": "Click to copy the auth url",
  "modal_proauth_copynotice": "The auth url is copied to the clipboard!",
  "modal_proauth_maualinput": "The Code from the website",
  "modal_proauth_maualinput_desc": "Please input the code here from the end of auth flow, and press confirm.",
  "modal_proauth_maualinput_notice": "Trying to connect, wait...",
  "modal_proauth_maualinput_conn_fail": "Failed to connect",
  "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.",
  "settings_googledrive_disclaimer2": "Disclaimer: The information is stored locally. Other malicious/harmful/faulty plugins could read the info. If you see any unintentional access to your Google Drive, please immediately disconnect this app on https://myaccount.google.com/permissions .",
  "settings_googledrive_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_googledrive_notshowuphint": "Google Drive Settings Not Available",
  "settings_googledrive_notshowuphint_desc": "Google Drive settings are not available, because you haven't subscribed to the PRO feature in your Remotely Save account.",
  "settings_googledrive_notshowuphint_view_pro": "View PRO Settings",
  "settings_googledrive_folder": "We will create and sync inside the folder {{remoteBaseDir}} on your Google Drive. DO NOT create this folder by yourself manually.",
  "settings_googledrive_revoke": "Revoke Auth",
  "settings_googledrive_revoke_desc": "You've connected. If you want to disconnect, click this button.",
  "settings_googledrive_revoke_button": "Revoke Auth",
  "settings_googledrive_auth": "Auth",
  "settings_googledrive_auth_desc": "Auth.",
  "settings_googledrive_auth_button": "Auth",
  "settings_googledrive_connect_succ": "Great! We can connect to Google Drive!",
  "settings_googledrive_connect_fail": "We cannot connect to Google Drive.",
  "settings_export_googledrive_button": "Export Google Drive 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.",
  "settings_pro_features": "Features",
  "settings_pro_features_desc": "Here are features you've enabled:<br/>{{{features}}}",
  "settings_pro_features_refresh_button": "Check again",
  "settings_pro_features_refresh_fetch": "Fetching...",
  "settings_pro_features_refresh_succ": "Refreshed!",
  "settings_pro_revoke": "Disconnect",
  "settings_pro_revoke_desc": "You've connected as user {{email}}. If you want to disconnect, click this button.",
  "settings_pro_revoke_button": "Disconnect",
  "settings_pro_intro": "Remotely Save Online Account",
  "settings_pro_intro_desc": "Click the button to jump to the website to sign up or sign in.",
  "settings_pro_intro_button": "Sign Up / Sign In",
  "settings_pro_auth": "Connect",
  "settings_pro_auth_desc": "After you sign up and sign in the account on the website, you need to connect your plugin here to the online account. Please click the button to connect.",
  "settings_pro_auth_button": "Connect"
 }
@@ -0,0 +1,9 @@
 import en from "./en.json";
 import zh_cn from "./zh_cn.json";
 import zh_tw from "./zh_tw.json";
 export const LANGS = {
  en: en,
  zh_cn: zh_cn,
  zh_tw: zh_tw,
 };
@@ -0,0 +1,75 @@
 {
  "settings_conflictaction_smart_conflict": "智能处理冲突 (PRO) (beta)",
  "settings_conflictaction_smart_conflict_desc": "<p><strong>！！这是 PRO（付费）功能! 您需要在线账号来使用此功能！！</strong>（<a href=\"#settings-pro\">向下滑</a>可以看到 PRO 账号的更多信息。）</p><p><ul><li>小 markdown 文件，本插件尝试使用 diff3 算法合并它；</li><li>对于大文件或非 markdown 文件，本插件尝试改名字并均进行保存。</li></ul></p><p><strong>请注意先手动备份 vault 文件再用此功能！</strong></p>",
  "protocol_pro_connecting": "正在连接",
  "protocol_pro_connect_manualinput_succ": "连接成功",
  "protocol_pro_connect_fail": "Remotely Save 官网返回错误。可能是网络连接不稳定。也可能是您拒绝了授权？",
  "protocol_pro_connect_succ_revoke": "您已连接上账号 {{email}}。如果要取消连接，请点击此按钮。",
  "modal_googledriveauth_tutorial": "<p>请访问此网址，然后会进入授权流程。最后，您会看到一个码，请复制粘贴到这里然后提交。</p>",
  "modal_googledriveauth_copybutton": "点击以复制网址",
  "modal_googledriveauth_copynotice": "网址已复制！",
  "modal_googledrivce_maualinput": "网站上的码",
  "modal_googledrivce_maualinput_desc": "请粘贴授权流程最后的那个码，然后点击确认。",
  "modal_googledrive_maualinput_notice": "正在尝试连接 Google 并更新授权信息......",
  "modal_googledrive_maualinput_succ_notice": "很好！授权信息已更新！",
  "modal_googledrive_maualinput_fail_notice": "更新授权信息失败。请稍后重试。",
  "modal_googledriverevokeauth_step1": "第 1 步：访问以下网址，可以删除连接。",
  "modal_googledriverevokeauth_step2": "第 2 步：点击以下按钮，从而清理本地的登录信息。",
  "modal_googledriverevokeauth_clean": "清理本地登录信息",
  "modal_googledriverevokeauth_clean_desc": "您需要点击此按钮。",
  "modal_googledriverevokeauth_clean_button": "清理",
  "modal_googledriverevokeauth_clean_notice": "已清理！",
  "modal_googledriverevokeauth_clean_fail": "清理授权时候发生了错误。",
  "modal_prorevokeauth": "点击这里和按照步骤取消授权。",
  "modal_prorevokeauth_clean": "清理",
  "modal_prorevokeauth_clean_desc": "清理本地授权记录",
  "modal_prorevokeauth_clean_button": "清理",
  "modal_prorevokeauth_clean_notice": "清理本地授权记录完毕",
  "modal_prorevokeauth_clean_fail": "清理本地授权记录粗错。",
  "modal_proauth_copybutton": "点击从而复制授权网址",
  "modal_proauth_copynotice": "授权网址已复制！",
  "modal_proauth_maualinput": "网站的授权码",
  "modal_proauth_maualinput_desc": "请输入授权流程最后一步的授权码，然后点击确认。",
  "modal_proauth_maualinput_notice": "正在连接，请稍候......",
  "modal_proauth_maualinput_conn_fail": "连接失败",
  "settings_googledrive": "Google Drive (PRO) (beta)",
  "settings_chooseservice_googledrive": "Google Drive (PRO) (beta)",
  "settings_googledrive_disclaimer1": "声明：本插件不是 Google 的官方产品。只是用到了它的公开 API。",
  "settings_googledrive_disclaimer2": "声明：您所输入的信息存储于本地。其它有害的或者出错的插件，是有可能读取到这些信息的。如果您发现任何不符合预期的 Google Drive 访问，请立刻在以下网站操作断开连接： https://myaccount.google.com/permissions 。",
  "settings_googledrive_pro_desc": "<p><strong>！！这是 PRO（付费）功能! 您需要在线账号来使用此功能！！</strong>（<a href=\"#settings-pro\">向下滑</a>可以看到 PRO 账号的更多信息。）</p>",
  "settings_googledrive_notshowuphint": "Google Drive 设置不可用",
  "settings_googledrive_notshowuphint_desc": "Google Drive 设置不可用，因为您没有在 Remotely Save 账号里开启这个 PRO 功能。",
  "settings_googledrive_notshowuphint_view_pro": "查看 PRO 相关设置",
  "settings_googledrive_folder": "我们会在 Google Drive 创建此文件夹并同步内容进去： {{remoteBaseDir}} 。请不要手动在网站上创建。",
  "settings_googledrive_revoke": "撤回鉴权",
  "settings_googledrive_revoke_desc": "您现在已连接。如果想取消连接，请点击此按钮。",
  "settings_googledrive_revoke_button": "撤回鉴权",
  "settings_googledrive_auth": "鉴权",
  "settings_googledrive_auth_desc": "鉴权.",
  "settings_googledrive_auth_button": "鉴权",
  "settings_googledrive_connect_succ": "很好！我们可连接上 Google Drive！",
  "settings_googledrive_connect_fail": "我们未能连接上 Google Drive。",
  "settings_export_googledrive_button": "导出 Google Drive 部分",
  "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>第二部：点击“连接”按钮，从而连接本设备和在线账号。",
  "settings_pro_features": "功能",
  "settings_pro_features_desc": "您开通了以下功能：<br/>{{{features}}}",
  "settings_pro_features_refresh_button": "再次检查",
  "settings_pro_features_refresh_fetch": "正在获取数据......",
  "settings_pro_features_refresh_succ": "已刷新！",
  "settings_pro_revoke": "断开连接",
  "settings_pro_revoke_desc": "您已连接上账号 {{email}}。如果要取消连接，请点击此按钮。",
  "settings_pro_revoke_button": "断开连接",
  "settings_pro_intro": "Remotely Save 账号",
  "settings_pro_intro_desc": "点击此按钮，从而到网站上注册和登录。",
  "settings_pro_intro_button": "注册或登录",
  "settings_pro_auth": "连接",
  "settings_pro_auth_desc": "在网站上注册和登录后，您需要“连接”本设备和在线账号。请点击按钮开始连接。",
  "settings_pro_auth_button": "连接"
 }
@@ -0,0 +1,75 @@
 {
  "settings_conflictaction_smart_conflict": "智慧處理衝突 (PRO) (beta)",
  "settings_conflictaction_smart_conflict_desc": "<p><strong>！！這是 PRO（付費）功能! 您需要線上賬號來使用此功能！！</strong>（<a href=\"#settings-pro\">向下滑</a>可以看到 PRO 賬號的更多資訊。）</p><p><ul><li>小 markdown 檔案，本外掛嘗試使用 diff3 演算法合併它；</li><li>對於大檔案或非 markdown 檔案，本外掛嘗試改名字並均進行儲存。</li></ul></p><p><strong>請注意先手動備份 vault 檔案再用此功能！</strong></p>",
  "protocol_pro_connecting": "正在連線",
  "protocol_pro_connect_manualinput_succ": "連線成功",
  "protocol_pro_connect_fail": "Remotely Save 官網返回錯誤。可能是網路連線不穩定。也可能是您拒絕了授權？",
  "protocol_pro_connect_succ_revoke": "您已連線上賬號 {{email}}。如果要取消連線，請點選此按鈕。",
  "modal_googledriveauth_tutorial": "<p>請訪問此網址，然後會進入授權流程。最後，您會看到一個碼，請複製貼上到這裡然後提交。</p>",
  "modal_googledriveauth_copybutton": "點選以複製網址",
  "modal_googledriveauth_copynotice": "網址已複製！",
  "modal_googledrivce_maualinput": "網站上的碼",
  "modal_googledrivce_maualinput_desc": "請貼上授權流程最後的那個碼，然後點選確認。",
  "modal_googledrive_maualinput_notice": "正在嘗試連線 Google 並更新授權資訊......",
  "modal_googledrive_maualinput_succ_notice": "很好！授權資訊已更新！",
  "modal_googledrive_maualinput_fail_notice": "更新授權資訊失敗。請稍後重試。",
  "modal_googledriverevokeauth_step1": "第 1 步：訪問以下網址，可以刪除連線。",
  "modal_googledriverevokeauth_step2": "第 2 步：點選以下按鈕，從而清理本地的登入資訊。",
  "modal_googledriverevokeauth_clean": "清理本地登入資訊",
  "modal_googledriverevokeauth_clean_desc": "您需要點選此按鈕。",
  "modal_googledriverevokeauth_clean_button": "清理",
  "modal_googledriverevokeauth_clean_notice": "已清理！",
  "modal_googledriverevokeauth_clean_fail": "清理授權時候發生了錯誤。",
  "modal_prorevokeauth": "點選這裡和按照步驟取消授權。",
  "modal_prorevokeauth_clean": "清理",
  "modal_prorevokeauth_clean_desc": "清理本地授權記錄",
  "modal_prorevokeauth_clean_button": "清理",
  "modal_prorevokeauth_clean_notice": "清理本地授權記錄完畢",
  "modal_prorevokeauth_clean_fail": "清理本地授權記錄粗錯。",
  "modal_proauth_copybutton": "點選從而複製授權網址",
  "modal_proauth_copynotice": "授權網址已複製！",
  "modal_proauth_maualinput": "網站的授權碼",
  "modal_proauth_maualinput_desc": "請輸入授權流程最後一步的授權碼，然後點選確認。",
  "modal_proauth_maualinput_notice": "正在連線，請稍候......",
  "modal_proauth_maualinput_conn_fail": "連線失敗",
  "settings_googledrive": "Google Drive (PRO) (beta)",
  "settings_chooseservice_googledrive": "Google Drive (PRO) (beta)",
  "settings_googledrive_disclaimer1": "宣告：本外掛不是 Google 的官方產品。只是用到了它的公開 API。",
  "settings_googledrive_disclaimer2": "宣告：您所輸入的資訊儲存於本地。其它有害的或者出錯的外掛，是有可能讀取到這些資訊的。如果您發現任何不符合預期的 Google Drive 訪問，請立刻在以下網站操作斷開連線： https://myaccount.google.com/permissions 。",
  "settings_googledrive_pro_desc": "<p><strong>！！這是 PRO（付費）功能! 您需要線上賬號來使用此功能！！</strong>（<a href=\"#settings-pro\">向下滑</a>可以看到 PRO 賬號的更多資訊。）</p>",
  "settings_googledrive_notshowuphint": "Google Drive 設定不可用",
  "settings_googledrive_notshowuphint_desc": "Google Drive 設定不可用，因為您沒有在 Remotely Save 賬號裡開啟這個 PRO 功能。",
  "settings_googledrive_notshowuphint_view_pro": "檢視 PRO 相關設定",
  "settings_googledrive_folder": "我們會在 Google Drive 建立此資料夾並同步內容進去： {{remoteBaseDir}} 。請不要手動在網站上建立。",
  "settings_googledrive_revoke": "撤回鑑權",
  "settings_googledrive_revoke_desc": "您現在已連線。如果想取消連線，請點選此按鈕。",
  "settings_googledrive_revoke_button": "撤回鑑權",
  "settings_googledrive_auth": "鑑權",
  "settings_googledrive_auth_desc": "鑑權.",
  "settings_googledrive_auth_button": "鑑權",
  "settings_googledrive_connect_succ": "很好！我們可連線上 Google Drive！",
  "settings_googledrive_connect_fail": "我們未能連線上 Google Drive。",
  "settings_export_googledrive_button": "匯出 Google Drive 部分",
  "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>第二部：點選“連線”按鈕，從而連線本裝置和線上賬號。",
  "settings_pro_features": "功能",
  "settings_pro_features_desc": "您開通了以下功能：<br/>{{{features}}}",
  "settings_pro_features_refresh_button": "再次檢查",
  "settings_pro_features_refresh_fetch": "正在獲取資料......",
  "settings_pro_features_refresh_succ": "已重新整理！",
  "settings_pro_revoke": "斷開連線",
  "settings_pro_revoke_desc": "您已連線上賬號 {{email}}。如果要取消連線，請點選此按鈕。",
  "settings_pro_revoke_button": "斷開連線",
  "settings_pro_intro": "Remotely Save 賬號",
  "settings_pro_intro_desc": "點選此按鈕，從而到網站上註冊和登入。",
  "settings_pro_intro_button": "註冊或登入",
  "settings_pro_auth": "連線",
  "settings_pro_auth_desc": "在網站上註冊和登入後，您需要“連線”本裝置和線上賬號。請點選按鈕開始連線。",
  "settings_pro_auth_button": "連線"
 }
@@ -0,0 +1,47 @@
 import type { Entity } from "../../src/baseTypes";
 import type { InternalDBs } from "../../src/localdb";
 export const upsertFileContentHistoryByVaultAndProfile = async (
  db: InternalDBs,
  vaultRandomID: string,
  profileID: string,
  prevSync: Entity,
  prevContent: ArrayBuffer
 ) => {
  await db.fileContentHistoryTbl.setItem(
    `${vaultRandomID}\t${profileID}\t${prevSync.key}`,
    prevContent
  );
 };
 export const getFileContentHistoryByVaultAndProfile = async (
  db: InternalDBs,
  vaultRandomID: string,
  profileID: string,
  prevSync: Entity
 ) => {
  return (await db.fileContentHistoryTbl.getItem(
    `${vaultRandomID}\t${profileID}\t${prevSync.key}`
  )) as ArrayBuffer | null | undefined;
 };
 export const clearFileContentHistoryByVaultAndProfile = async (
  db: InternalDBs,
  vaultRandomID: string,
  profileID: string,
  key: string
 ) => {
  await db.fileContentHistoryTbl.removeItem(
    `${vaultRandomID}\t${profileID}\t${key}`
  );
 };
 export const clearAllFileContentHistoryByVault = async (
  db: InternalDBs,
  vaultRandomID: string
 ) => {
  const keys = (await db.fileContentHistoryTbl.keys()).filter((x) =>
    x.startsWith(`${vaultRandomID}\t`)
  );
  await db.fileContentHistoryTbl.removeItems(keys);
 };
@@ -0,0 +1,377 @@
 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_GOOGLEDRIVE_CONFIG,
  sendRefreshTokenReq,
 } from "./fsGoogleDrive";
 class GoogleDriveAuthModal 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 = "https://remotelysave.com/auth/googledrive/start";
    const div2 = contentEl.createDiv();
    div2.createDiv({
      text: stringToFragment(t("modal_googledriveauth_tutorial")),
    });
    div2.createEl(
      "button",
      {
        text: t("modal_googledriveauth_copybutton"),
      },
      (el) => {
        el.onclick = async () => {
          await navigator.clipboard.writeText(authUrl);
          new Notice(t("modal_googledriveauth_copynotice"));
        };
      }
    );
    contentEl.createEl("p").createEl("a", {
      href: authUrl,
      text: authUrl,
    });
    let refreshToken = "";
    new Setting(contentEl)
      .setName(t("modal_googledrivce_maualinput"))
      .setDesc(t("modal_googledrivce_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_googledrive_maualinput_notice"));
          try {
            if (this.plugin.settings.googledrive === undefined) {
              this.plugin.settings.googledrive = cloneDeep(
                DEFAULT_GOOGLEDRIVE_CONFIG
              );
            }
            this.plugin.settings.googledrive.refreshToken = refreshToken;
            this.plugin.settings.googledrive.accessToken = "access";
            this.plugin.settings.googledrive.accessTokenExpiresAtTimeMs = 1;
            this.plugin.settings.googledrive.accessTokenExpiresInMs = 1;
            // TODO: abstraction leaking now, how to fix?
            const k = await sendRefreshTokenReq(refreshToken);
            const ts = Date.now();
            this.plugin.settings.googledrive.accessToken = k.access_token;
            this.plugin.settings.googledrive.accessTokenExpiresInMs =
              k.expires_in * 1000;
            this.plugin.settings.googledrive.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_googledrive_maualinput_succ_notice"));
          } catch (e) {
            console.error(e);
            new Notice(t("modal_googledrive_maualinput_fail_notice"));
          } finally {
            this.authDiv.toggleClass(
              "googledrive-auth-button-hide",
              this.plugin.settings.googledrive.refreshToken !== ""
            );
            this.revokeAuthDiv.toggleClass(
              "googledrive-revoke-auth-button-hide",
              this.plugin.settings.googledrive.refreshToken === ""
            );
            this.close();
          }
        });
      });
  }
  onClose() {
    const { contentEl } = this;
    contentEl.empty();
  }
 }
 class GoogleDriveRevokeAuthModal 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_googledriverevokeauth_step1"),
    });
    const consentUrl = "https://myaccount.google.com/permissions";
    contentEl.createEl("p").createEl("a", {
      href: consentUrl,
      text: consentUrl,
    });
    contentEl.createEl("p", {
      text: t("modal_googledriverevokeauth_step2"),
    });
    new Setting(contentEl)
      .setName(t("modal_googledriverevokeauth_clean"))
      .setDesc(t("modal_googledriverevokeauth_clean_desc"))
      .addButton(async (button) => {
        button.setButtonText(t("modal_googledriverevokeauth_clean_button"));
        button.onClick(async () => {
          try {
            this.plugin.settings.googledrive = cloneDeep(
              DEFAULT_GOOGLEDRIVE_CONFIG
            );
            await this.plugin.saveSettings();
            this.authDiv.toggleClass(
              "googledrive-auth-button-hide",
              this.plugin.settings.googledrive.refreshToken !== ""
            );
            this.revokeAuthDiv.toggleClass(
              "googledrive-revoke-auth-button-hide",
              this.plugin.settings.googledrive.refreshToken === ""
            );
            new Notice(t("modal_googledriverevokeauth_clean_notice"));
            this.close();
          } catch (err) {
            console.error(err);
            new Notice(t("modal_googledriverevokeauth_clean_fail"));
          }
        });
      });
  }
  onClose() {
    const { contentEl } = this;
    contentEl.empty();
  }
 }
 export const generateGoogleDriveSettingsPart = (
  containerEl: HTMLElement,
  t: (x: TransItemType, vars?: any) => string,
  app: App,
  plugin: RemotelySavePlugin,
  saveUpdatedConfigFunc: () => Promise<any> | undefined
 ) => {
  const googleDriveDiv = containerEl.createEl("div", {
    cls: "googledrive-hide",
  });
  googleDriveDiv.toggleClass(
    "googledrive-hide",
    plugin.settings.serviceType !== "googledrive"
  );
  googleDriveDiv.createEl("h2", { text: t("settings_googledrive") });
  const googleDriveLongDescDiv = googleDriveDiv.createEl("div", {
    cls: "settings-long-desc",
  });
  for (const c of [
    t("settings_googledrive_disclaimer1"),
    t("settings_googledrive_disclaimer2"),
  ]) {
    googleDriveLongDescDiv.createEl("p", {
      text: c,
      cls: "googledrive-disclaimer",
    });
  }
  googleDriveLongDescDiv.createEl("p", {
    text: t("settings_googledrive_folder", {
      remoteBaseDir:
        plugin.settings.googledrive.remoteBaseDir || app.vault.getName(),
    }),
  });
  googleDriveLongDescDiv.createDiv({
    text: stringToFragment(t("settings_googledrive_pro_desc")),
    cls: "googledrive-disclaimer",
  });
  const googleDriveNotShowUpHintSetting = new Setting(googleDriveDiv)
    .setName(t("settings_googledrive_notshowuphint"))
    .setDesc(t("settings_googledrive_notshowuphint_desc"))
    .addButton(async (button) => {
      button.setButtonText(t("settings_googledrive_notshowuphint_view_pro"));
      button.onClick(async () => {
        window.location.href = "#settings-pro";
      });
    });
  const googleDriveAllowedToUsedDiv = googleDriveDiv.createDiv();
  // if pro enabled, show up; otherwise hide.
  const allowGoogleDrive =
    plugin.settings.pro?.enabledProFeatures.filter(
      (x) => x.featureName === "feature-google_drive"
    ).length === 1;
  console.debug(`allow to show up google drive settings? ${allowGoogleDrive}`);
  if (allowGoogleDrive) {
    googleDriveAllowedToUsedDiv.removeClass("googledrive-allow-to-use-hide");
    googleDriveNotShowUpHintSetting.settingEl.addClass(
      "googledrive-allow-to-use-hide"
    );
  } else {
    googleDriveAllowedToUsedDiv.addClass("googledrive-allow-to-use-hide");
    googleDriveNotShowUpHintSetting.settingEl.removeClass(
      "googledrive-allow-to-use-hide"
    );
  }
  const googleDriveSelectAuthDiv = googleDriveAllowedToUsedDiv.createDiv();
  const googleDriveAuthDiv = googleDriveSelectAuthDiv.createDiv({
    cls: "googledrive-auth-button-hide settings-auth-related",
  });
  const googleDriveRevokeAuthDiv = googleDriveSelectAuthDiv.createDiv({
    cls: "googledrive-revoke-auth-button-hide settings-auth-related",
  });
  const googleDriveRevokeAuthSetting = new Setting(googleDriveRevokeAuthDiv)
    .setName(t("settings_googledrive_revoke"))
    .setDesc(t("settings_googledrive_revoke_desc"))
    .addButton(async (button) => {
      button.setButtonText(t("settings_googledrive_revoke_button"));
      button.onClick(async () => {
        new GoogleDriveRevokeAuthModal(
          app,
          plugin,
          googleDriveAuthDiv,
          googleDriveRevokeAuthDiv,
          t
        ).open();
      });
    });
  new Setting(googleDriveAuthDiv)
    .setName(t("settings_googledrive_auth"))
    .setDesc(t("settings_googledrive_auth_desc"))
    .addButton(async (button) => {
      button.setButtonText(t("settings_googledrive_auth_button"));
      button.onClick(async () => {
        const modal = new GoogleDriveAuthModal(
          app,
          plugin,
          googleDriveAuthDiv,
          googleDriveRevokeAuthDiv,
          googleDriveRevokeAuthSetting,
          t
        );
        plugin.oauth2Info.helperModal = modal;
        plugin.oauth2Info.authDiv = googleDriveAuthDiv;
        plugin.oauth2Info.revokeDiv = googleDriveRevokeAuthDiv;
        plugin.oauth2Info.revokeAuthSetting = googleDriveRevokeAuthSetting;
        modal.open();
      });
    });
  googleDriveAuthDiv.toggleClass(
    "googledrive-auth-button-hide",
    plugin.settings.googledrive.refreshToken !== ""
  );
  googleDriveRevokeAuthDiv.toggleClass(
    "googledrive-revoke-auth-button-hide",
    plugin.settings.googledrive.refreshToken === ""
  );
  let newgoogleDriveRemoteBaseDir =
    plugin.settings.googledrive.remoteBaseDir || "";
  new Setting(googleDriveAllowedToUsedDiv)
    .setName(t("settings_remotebasedir"))
    .setDesc(t("settings_remotebasedir_desc"))
    .addText((text) =>
      text
        .setPlaceholder(app.vault.getName())
        .setValue(newgoogleDriveRemoteBaseDir)
        .onChange((value) => {
          newgoogleDriveRemoteBaseDir = value.trim();
        })
    )
    .addButton((button) => {
      button.setButtonText(t("confirm"));
      button.onClick(() => {
        new ChangeRemoteBaseDirModal(
          app,
          plugin,
          newgoogleDriveRemoteBaseDir,
          "googledrive"
        ).open();
      });
    });
  new Setting(googleDriveAllowedToUsedDiv)
    .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_googledrive_connect_succ"));
        } else {
          new Notice(t("settings_googledrive_connect_fail"));
          new Notice(errors.msg);
        }
      });
    });
  return {
    googleDriveDiv: googleDriveDiv,
    googleDriveAllowedToUsedDiv: googleDriveAllowedToUsedDiv,
    googleDriveNotShowUpHintSetting: googleDriveNotShowUpHintSetting,
  };
 };
@@ -0,0 +1,386 @@
 import cloneDeep from "lodash/cloneDeep";
 import { type App, Modal, Notice, Setting } from "obsidian";
 import { features } from "process";
 import type { TransItemType } from "../../src/i18n";
 import type RemotelySavePlugin from "../../src/main";
 import { stringToFragment } from "../../src/misc";
 import {
  DEFAULT_PRO_CONFIG,
  generateAuthUrlAndCodeVerifierChallenge,
  getAndSaveProEmail,
  getAndSaveProFeatures,
  sendAuthReq,
  setConfigBySuccessfullAuthInplace,
 } from "./account";
 import {
  type FeatureInfo,
  PRO_CLIENT_ID,
  type ProConfig,
 } from "./baseTypesPro";
 export class ProAuthModal extends Modal {
  readonly plugin: RemotelySavePlugin;
  readonly authDiv: HTMLDivElement;
  readonly revokeAuthDiv: HTMLDivElement;
  readonly revokeAuthSetting: Setting;
  readonly proFeaturesListSetting: Setting;
  readonly t: (x: TransItemType, vars?: any) => string;
  constructor(
    app: App,
    plugin: RemotelySavePlugin,
    authDiv: HTMLDivElement,
    revokeAuthDiv: HTMLDivElement,
    revokeAuthSetting: Setting,
    proFeaturesListSetting: Setting,
    t: (x: TransItemType, vars?: any) => string
  ) {
    super(app);
    this.plugin = plugin;
    this.authDiv = authDiv;
    this.revokeAuthDiv = revokeAuthDiv;
    this.revokeAuthSetting = revokeAuthSetting;
    this.proFeaturesListSetting = proFeaturesListSetting;
    this.t = t;
  }
  async onOpen() {
    const { contentEl } = this;
    const { authUrl, codeVerifier, codeChallenge } =
      await generateAuthUrlAndCodeVerifierChallenge(false);
    this.plugin.oauth2Info.verifier = codeVerifier;
    const t = this.t;
    const div2 = contentEl.createDiv();
    div2.createEl(
      "button",
      {
        text: t("modal_proauth_copybutton"),
      },
      (el) => {
        el.onclick = async () => {
          await navigator.clipboard.writeText(authUrl);
          new Notice(t("modal_proauth_copynotice"));
        };
      }
    );
    contentEl.createEl("p").createEl("a", {
      href: authUrl,
      text: authUrl,
    });
    // manual paste
    let authCode = "";
    new Setting(contentEl)
      .setName(t("modal_proauth_maualinput"))
      .setDesc(t("modal_proauth_maualinput_desc"))
      .addText((text) =>
        text
          .setPlaceholder("")
          .setValue("")
          .onChange((val) => {
            authCode = val.trim();
          })
      )
      .addButton(async (button) => {
        button.setButtonText(t("submit"));
        button.onClick(async () => {
          new Notice(t("modal_proauth_maualinput_notice"));
          try {
            const authRes = await sendAuthReq(
              codeVerifier ?? "verifier",
              authCode,
              async (e: any) => {
                new Notice(t("protocol_pro_connect_fail"));
                new Notice(`${e}`);
                throw e;
              }
            );
            console.debug(authRes);
            const self = this;
            setConfigBySuccessfullAuthInplace(
              this.plugin.settings.pro!,
              authRes!,
              () => self.plugin.saveSettings()
            );
            await getAndSaveProFeatures(
              this.plugin.settings.pro!,
              this.plugin.manifest.version,
              () => self.plugin.saveSettings()
            );
            this.proFeaturesListSetting.setDesc(
              stringToFragment(
                t("settings_pro_features_desc", {
                  features: featureListToText(
                    this.plugin.settings.pro!.enabledProFeatures
                  ),
                })
              )
            );
            await getAndSaveProEmail(
              this.plugin.settings.pro!,
              this.plugin.manifest.version,
              () => self.plugin.saveSettings()
            );
            new Notice(
              t("protocol_pro_connect_manualinput_succ", {
                email: this.plugin.settings.pro!.email ?? "(no email)",
              })
            );
            this.plugin.oauth2Info.verifier = ""; // reset it
            this.plugin.oauth2Info.authDiv?.toggleClass(
              "pro-auth-button-hide",
              this.plugin.settings.pro?.refreshToken !== ""
            );
            this.plugin.oauth2Info.authDiv = undefined;
            this.plugin.oauth2Info.revokeAuthSetting?.setDesc(
              t("protocol_pro_connect_succ_revoke", {
                email: this.plugin.settings.pro?.email,
              })
            );
            this.plugin.oauth2Info.revokeAuthSetting = undefined;
            this.plugin.oauth2Info.revokeDiv?.toggleClass(
              "pro-revoke-auth-button-hide",
              this.plugin.settings.pro?.email === ""
            );
            this.plugin.oauth2Info.revokeDiv = undefined;
            // try to remove data in clipboard
            await navigator.clipboard.writeText("");
            this.close();
          } catch (err) {
            console.error(err);
            new Notice(t("modal_proauth_maualinput_conn_fail"));
          }
        });
      });
  }
  onClose() {
    const { contentEl } = this;
    contentEl.empty();
  }
 }
 export class ProRevokeAuthModal 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 { contentEl } = this;
    const t = this.t;
    contentEl.createEl("p", {
      text: t("modal_prorevokeauth"),
    });
    new Setting(contentEl)
      .setName(t("modal_prorevokeauth_clean"))
      .setDesc(t("modal_prorevokeauth_clean_desc"))
      .addButton(async (button) => {
        button.setButtonText(t("modal_prorevokeauth_clean_button"));
        button.onClick(async () => {
          try {
            this.plugin.settings.pro = cloneDeep(DEFAULT_PRO_CONFIG);
            await this.plugin.saveSettings();
            this.authDiv.toggleClass(
              "pro-auth-button-hide",
              this.plugin.settings.pro?.refreshToken !== ""
            );
            this.revokeAuthDiv.toggleClass(
              "pro-revoke-auth-button-hide",
              this.plugin.settings.pro?.refreshToken === ""
            );
            new Notice(t("modal_prorevokeauth_clean_notice"));
            this.close();
          } catch (err) {
            console.error(err);
            new Notice(t("modal_prorevokeauth_clean_fail"));
          }
        });
      });
  }
  onClose() {
    const { contentEl } = this;
    contentEl.empty();
  }
 }
 const featureListToText = (features: FeatureInfo[]) => {
  // TODO: i18n
  if (features === undefined || features.length === 0) {
    return "No features enabled.";
  }
  return features
    .map((x) => {
      return `${x.featureName} (expire: ${new Date(
        Number(x.expireAtTimeMs)
      ).toISOString()})`;
    })
    .join("<br/>");
 };
 export const generateProSettingsPart = (
  proDiv: HTMLDivElement,
  t: (x: TransItemType, vars?: any) => string,
  app: App,
  plugin: RemotelySavePlugin,
  saveUpdatedConfigFunc: () => Promise<any> | undefined,
  googleDriveAllowedToUsedDiv: HTMLDivElement,
  googleDriveNotShowUpHintSetting: Setting
 ) => {
  proDiv
    .createEl("h2", { text: t("settings_pro") })
    .setAttribute("id", "settings-pro");
  proDiv.createEl("div", {
    text: stringToFragment(t("settings_pro_tutorial")),
  });
  const proSelectAuthDiv = proDiv.createDiv();
  const proAuthDiv = proSelectAuthDiv.createDiv({
    cls: "pro-auth-button-hide settings-auth-related",
  });
  const proRevokeAuthDiv = proSelectAuthDiv.createDiv({
    cls: "pro-revoke-auth-button-hide settings-auth-related",
  });
  const proFeaturesListSetting = new Setting(proRevokeAuthDiv)
    .setName(t("settings_pro_features"))
    .setDesc(
      stringToFragment(
        t("settings_pro_features_desc", {
          features: featureListToText(plugin.settings.pro!.enabledProFeatures),
        })
      )
    );
  proFeaturesListSetting.addButton(async (button) => {
    button.setButtonText(t("settings_pro_features_refresh_button"));
    button.onClick(async () => {
      new Notice(t("settings_pro_features_refresh_fetch"));
      await getAndSaveProFeatures(
        plugin.settings.pro!,
        plugin.manifest.version,
        saveUpdatedConfigFunc
      );
      proFeaturesListSetting.setDesc(
        stringToFragment(
          t("settings_pro_features_desc", {
            features: featureListToText(
              plugin.settings.pro!.enabledProFeatures
            ),
          })
        )
      );
      const allowGoogleDrive =
        plugin.settings.pro?.enabledProFeatures.filter(
          (x) => x.featureName === "feature-google_drive"
        ).length === 1;
      console.debug(
        `allow to show up google drive settings? ${allowGoogleDrive}`
      );
      if (allowGoogleDrive) {
        googleDriveAllowedToUsedDiv.removeClass(
          "googledrive-allow-to-use-hide"
        );
        googleDriveNotShowUpHintSetting.settingEl.addClass(
          "googledrive-allow-to-use-hide"
        );
      } else {
        googleDriveAllowedToUsedDiv.addClass("googledrive-allow-to-use-hide");
        googleDriveNotShowUpHintSetting.settingEl.removeClass(
          "googledrive-allow-to-use-hide"
        );
      }
      new Notice(t("settings_pro_features_refresh_succ"));
    });
  });
  const proRevokeAuthSetting = new Setting(proRevokeAuthDiv)
    .setName(t("settings_pro_revoke"))
    .setDesc(
      t("settings_pro_revoke_desc", {
        email: plugin.settings.pro?.email,
      })
    )
    .addButton(async (button) => {
      button.setButtonText(t("settings_pro_revoke_button"));
      button.onClick(async () => {
        new ProRevokeAuthModal(
          app,
          plugin,
          proAuthDiv,
          proRevokeAuthDiv,
          t
        ).open();
      });
    });
  new Setting(proAuthDiv)
    .setName(t("settings_pro_intro"))
    .setDesc(stringToFragment(t("settings_pro_intro_desc")))
    .addButton(async (button) => {
      button.setButtonText(t("settings_pro_intro_button"));
      button.onClick(async () => {
        window.open("https://remotelysave.com/user/signupin", "_self");
      });
    });
  new Setting(proAuthDiv)
    .setName(t("settings_pro_auth"))
    .setDesc(t("settings_pro_auth_desc"))
    .addButton(async (button) => {
      button.setButtonText(t("settings_pro_auth_button"));
      button.onClick(async () => {
        const modal = new ProAuthModal(
          app,
          plugin,
          proAuthDiv,
          proRevokeAuthDiv,
          proRevokeAuthSetting,
          proFeaturesListSetting,
          t
        );
        plugin.oauth2Info.helperModal = modal;
        plugin.oauth2Info.authDiv = proAuthDiv;
        plugin.oauth2Info.revokeDiv = proRevokeAuthDiv;
        plugin.oauth2Info.revokeAuthSetting = proRevokeAuthSetting;
        modal.open();
      });
    });
  proAuthDiv.toggleClass(
    "pro-auth-button-hide",
    plugin.settings.pro?.refreshToken !== ""
  );
  proRevokeAuthDiv.toggleClass(
    "pro-revoke-auth-button-hide",
    plugin.settings.pro?.refreshToken === ""
  );
 };
@@ -0,0 +1,68 @@
 import { deepStrictEqual, rejects, throws } from "assert";
 import { getFileRename } from "../src/conflictLogic";
 describe("New name is generated", () => {
  it("should throw for empty file", async () => {
    for (const key of ["", "/", ".", ".."]) {
      throws(() => getFileRename(key));
    }
  });
  it("should throw for folder", async () => {
    for (const key of ["sss/", "ssss/yyy/"]) {
      throws(() => getFileRename(key));
    }
  });
  it("should correctly get no ext files renamed", async () => {
    deepStrictEqual(getFileRename("abc"), "abc.dup");
    deepStrictEqual(getFileRename("xxxx/yyyy/abc"), "xxxx/yyyy/abc.dup");
  });
  it("should correctly get dot files renamed", async () => {
    deepStrictEqual(getFileRename(".abc"), ".abc.dup");
    deepStrictEqual(getFileRename("xxxx/yyyy/.efg"), "xxxx/yyyy/.efg.dup");
    deepStrictEqual(getFileRename("xxxx/yyyy/hij."), "xxxx/yyyy/hij.dup");
  });
  it("should correctly get normal files renamed", async () => {
    deepStrictEqual(getFileRename("abc.efg"), "abc.dup.efg");
    deepStrictEqual(
      getFileRename("xxxx/yyyy/abc.efg"),
      "xxxx/yyyy/abc.dup.efg"
    );
    deepStrictEqual(
      getFileRename("xxxx/yyyy/abc.tar.gz"),
      "xxxx/yyyy/abc.tar.dup.gz"
    );
    deepStrictEqual(
      getFileRename("xxxx/yyyy/.abc.efg"),
      "xxxx/yyyy/.abc.dup.efg"
    );
  });
  it("should correctly get duplicated files renamed again", async () => {
    deepStrictEqual(getFileRename("abc.dup"), "abc.dup.dup");
    deepStrictEqual(
      getFileRename("xxxx/yyyy/.abc.dup"),
      "xxxx/yyyy/.abc.dup.dup"
    );
    deepStrictEqual(
      getFileRename("xxxx/yyyy/abc.dup.md"),
      "xxxx/yyyy/abc.dup.dup.md"
    );
    deepStrictEqual(
      getFileRename("xxxx/yyyy/.abc.dup.md"),
      "xxxx/yyyy/.abc.dup.dup.md"
    );
  });
 });
@@ -0,0 +1,201 @@
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
   1. Definitions.
      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.
      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.
      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.
      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.
      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.
      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.
      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).
      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.
      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."
      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.
   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.
   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.
   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:
      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and
      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and
      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and
      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.
      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.
   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.
   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.
   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.
   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.
   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.
   END OF TERMS AND CONDITIONS
   APPENDIX: How to apply the Apache License to your work.
      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.
   Copyright [yyyy] [name of copyright owner]
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
       http://www.apache.org/licenses/LICENSE-2.0
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
@@ -0,0 +1,9 @@
 # Main Basic Source
 ## What?
 The main basic source code for Remotely Save.
 ## License
 The codes or files or subfolders inside the current folder (`src` in the repo), are released under "open source" license: "Apache License, version 2.0".
@@ -3,6 +3,7 @@
 * To avoid circular dependency.
 */
 import type { GoogleDriveConfig, ProConfig } from "../pro/src/baseTypesPro";
 import type { LangTypeAndAuto } from "./i18n";
 export const DEFAULT_CONTENT_TYPE = "application/octet-stream";
@@ -12,13 +13,15 @@ export type SUPPORTED_SERVICES_TYPE =
  | "webdav"
  | "dropbox"
  | "onedrive"
-  | "webdis";
+  | "webdis"
  | "googledrive";
 export type SUPPORTED_SERVICES_TYPE_WITH_REMOTE_BASE_DIR =
  | "webdav"
  | "dropbox"
  | "onedrive"
-  | "webdis";
+  | "webdis"
  | "googledrive";
 export interface S3Config {
  s3Endpoint: string;
@@ -106,7 +109,14 @@ export type SyncDirectionType =
 export type CipherMethodType = "rclone-base64" | "openssl-base64" | "unknown";
-export type QRExportType = "all_but_oauth2" | "dropbox" | "onedrive";
+export type QRExportType =
  | "basic_and_advanced"
  | "s3"
  | "dropbox"
  | "onedrive"
  | "webdav"
  | "webdis"
  | "googledrive";
 export interface ProfilerConfig {
  enablePrinting?: boolean;
@@ -119,6 +129,7 @@ export interface RemotelySavePluginSettings {
  dropbox: DropboxConfig;
  onedrive: OnedriveConfig;
  webdis: WebdisConfig;
  googledrive: GoogleDriveConfig;
  password: string;
  serviceType: SUPPORTED_SERVICES_TYPE;
  currLogLevel?: string;
@@ -149,6 +160,8 @@ export interface RemotelySavePluginSettings {
  profiler?: ProfilerConfig;
  pro?: ProConfig;
  /**
   * @deprecated
   */
@@ -182,7 +195,10 @@ export const OAUTH2_FORCE_EXPIRE_MILLISECONDS = 1000 * 60 * 60 * 24 * 80;
 export type EmptyFolderCleanType = "skip" | "clean_both";
-export type ConflictActionType = "keep_newer" | "keep_larger" | "rename_both";
+export type ConflictActionType =
  | "keep_newer"
  | "keep_larger"
  | "smart_conflict";
 export type DecisionTypeForMixedEntity =
  | "only_history"
@@ -197,11 +213,11 @@ export type DecisionTypeForMixedEntity =
  | "remote_is_deleted_thus_also_delete_local"
  | "conflict_created_then_keep_local"
  | "conflict_created_then_keep_remote"
-  | "conflict_created_then_keep_both"
+  | "conflict_created_then_smart_conflict"
  | "conflict_created_then_do_nothing"
  | "conflict_modified_then_keep_local"
  | "conflict_modified_then_keep_remote"
-  | "conflict_modified_then_keep_both"
+  | "conflict_modified_then_smart_conflict"
  | "folder_existed_both_then_do_nothing"
  | "folder_existed_local_then_also_create_remote"
  | "folder_existed_remote_then_also_create_local"
@@ -0,0 +1,60 @@
 import type { FakeFs } from "./fsAll";
 export async function copyFolder(key: string, left: FakeFs, right: FakeFs) {
  if (!key.endsWith("/")) {
    throw Error(`should not call ${key} in copyFolder`);
  }
  const statsLeft = await left.stat(key);
  const entity = await right.mkdir(key, statsLeft.mtimeCli);
  return {
    entity: entity,
    content: undefined,
  };
 }
 export async function copyFile(key: string, left: FakeFs, right: FakeFs) {
  // console.debug(`copyFile: key=${key}, left=${left.kind}, right=${right.kind}`);
  if (key.endsWith("/")) {
    throw Error(`should not call ${key} in copyFile`);
  }
  const statsLeft = await left.stat(key);
  const content = await left.readFile(key);
  if (statsLeft.size === undefined || statsLeft.size === 0) {
    // some weird bugs on android not returning size. just ignore them
    statsLeft.size = content.byteLength;
  } else {
    if (statsLeft.size !== content.byteLength) {
      throw Error(
        `error copying ${left.kind}=>${right.kind}: size not matched`
      );
    }
  }
  if (statsLeft.mtimeCli === undefined) {
    throw Error(`error copying ${left.kind}=>${right.kind}, no mtimeCli`);
  }
  // console.debug(`copyFile: about to start right.writeFile`);
  return {
    entity: await right.writeFile(
      key,
      content,
      statsLeft.mtimeCli,
      statsLeft.mtimeCli /* TODO */
    ),
    content: content,
  };
 }
 export async function copyFileOrFolder(
  key: string,
  left: FakeFs,
  right: FakeFs
 ) {
  if (key.endsWith("/")) {
    return await copyFolder(key, left, right);
  } else {
    return await copyFile(key, left, right);
  }
 }
@@ -13,6 +13,7 @@ export abstract class FakeFs {
    ctime: number
  ): Promise<Entity>;
  abstract readFile(key: string): Promise<ArrayBuffer>;
  abstract rename(key1: string, key2: string): Promise<void>;
  abstract rm(key: string): Promise<void>;
  abstract checkConnect(callbackFunc?: any): Promise<boolean>;
  abstract getUserDisplayName(): Promise<string>;
@@ -695,6 +695,25 @@ export class FakeFsDropbox extends FakeFs {
    }
  }
  async rename(key1: string, key2: string): Promise<void> {
    const remoteFileName1 = getDropboxPath(key1, this.remoteBaseDir);
    const remoteFileName2 = getDropboxPath(key2, this.remoteBaseDir);
    await this._init();
    try {
      await retryReq(
        () =>
          this.dropbox.filesMoveV2({
            from_path: remoteFileName1,
            to_path: remoteFileName2,
          }),
        `${key1}=>${key2}` // just a hint here
      );
    } catch (err) {
      console.error("some error while moving");
      console.error(err);
    }
  }
  async rm(key: string): Promise<void> {
    if (key === "/") {
      return;
@@ -87,7 +87,9 @@ export class FakeFsEncrypt extends FakeFs {
    this.cacheMapOrigToEnc = {};
    this.hasCacheMap = false;
-    this.kind = `encrypt(${this.innerFs.kind},${method})`;
+    this.kind = `encrypt(${this.innerFs.kind},${
      this.password !== "" ? method : "no password"
    })`;
    if (method === "rclone-base64") {
      this.cipherRClone = new rclone.CipherRclone(password, 5);
@@ -354,6 +356,31 @@ export class FakeFsEncrypt extends FakeFs {
    }
  }
  async rename(key1: string, key2: string): Promise<void> {
    if (!this.hasCacheMap) {
      throw new Error("You have to build the cacheMap firstly for readFile");
    }
    let key1Enc = this.cacheMapOrigToEnc[key1];
    if (key1Enc === undefined) {
      if (this.isPasswordEmpty()) {
        key1Enc = key1;
      } else {
        key1Enc = await this._encryptName(key1);
      }
      this.cacheMapOrigToEnc[key1] = key1Enc;
    }
    let key2Enc = this.cacheMapOrigToEnc[key2];
    if (key2Enc === undefined) {
      if (this.isPasswordEmpty()) {
        key2Enc = key2;
      } else {
        key2Enc = await this._encryptName(key2);
      }
      this.cacheMapOrigToEnc[key2] = key2Enc;
    }
    return await this.innerFs.rename(key1Enc, key2Enc);
  }
  async rm(key: string): Promise<void> {
    if (!this.hasCacheMap) {
      throw new Error("You have to build the cacheMap firstly for rm");
@@ -1,3 +1,4 @@
 import { FakeFsGoogleDrive } from "../pro/src/fsGoogleDrive";
 import type { RemotelySavePluginSettings } from "./baseTypes";
 import type { FakeFs } from "./fsAll";
 import { FakeFsDropbox } from "./fsDropbox";
@@ -41,6 +42,12 @@ export function getClient(
        vaultName,
        saveUpdatedConfigFunc
      );
    case "googledrive":
      return new FakeFsGoogleDrive(
        settings.googledrive,
        vaultName,
        saveUpdatedConfigFunc
      );
    default:
      throw Error(`cannot init client for serviceType=${settings.serviceType}`);
  }
@@ -145,6 +145,7 @@ export class FakeFsLocal extends FakeFs {
  ): Promise<Entity> {
    await this.vault.adapter.writeBinary(key, content, {
      mtime: mtime,
      ctime: ctime,
    });
    return await this.stat(key);
  }
@@ -153,6 +154,10 @@ export class FakeFsLocal extends FakeFs {
    return await this.vault.adapter.readBinary(key);
  }
  async rename(key1: string, key2: string): Promise<void> {
    return await this.vault.adapter.rename(key1, key2);
  }
  async rm(key: string): Promise<void> {
    if (this.deleteToWhere === "obsidian") {
      await this.vault.adapter.trashLocal(key);
@@ -38,6 +38,10 @@ export class FakeFsMock extends FakeFs {
    throw new Error("Method not implemented.");
  }
  async rename(key1: string, key2: string): Promise<void> {
    throw new Error("Method not implemented.");
  }
  async rm(key: string): Promise<void> {
    throw new Error("Method not implemented.");
  }
@@ -928,6 +928,18 @@ export class FakeFsOnedrive extends FakeFs {
    }
  }
  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;
@@ -746,6 +746,10 @@ export class FakeFsS3 extends FakeFs {
    return bodyContents;
  }
  async rename(key1: string, key2: string): Promise<void> {
    throw Error(`rename not implemented for s3`);
  }
  async rm(key: string): Promise<void> {
    if (key === "/") {
      return;
@@ -776,13 +780,6 @@ export class FakeFsS3 extends FakeFs {
  async checkConnect(callbackFunc?: any): Promise<boolean> {
    try {
      // TODO: no universal way now, just check this in connectivity
      if (Platform.isIosApp && this.s3Config.s3Endpoint.startsWith("http://")) {
        throw Error(
          `Your s3 endpoint could only be https, not http, because of the iOS restriction.`
        );
      }
      // const results = await this.s3Client.send(
      //   new HeadBucketCommand({ Bucket: this.s3Config.s3BucketName })
      // );
@@ -66,24 +66,11 @@ if (VALID_REQURL) {
      const p: RequestUrlParam = {
        url: options.url,
        method: options.method,
-        // body: options.data as string | ArrayBuffer,
+        body: options.data as string | ArrayBuffer,
        headers: transformedHeaders,
        contentType: reqContentType,
        throw: false,
      };
      if (
        options.data === undefined ||
        options.data === null ||
        isString(options.data)
      ) {
        p.body = options.data;
      } else {
        if (typeof (options.data as any).transfer === "function") {
          p.body = (options.data as any).transfer();
        } else {
          p.body = options.data as ArrayBuffer;
        }
      }
      let r = await requestUrl(p);
@@ -259,12 +246,6 @@ export class FakeFsWebdav extends FakeFs {
      return;
    }
    if (Platform.isIosApp && !this.webdavConfig.address.startsWith("https")) {
      throw Error(
        `Your webdav address could only be https, not http, because of the iOS restriction.`
      );
    }
    const headers = {
      "Cache-Control": "no-cache",
    };
@@ -324,8 +305,17 @@ export class FakeFsWebdav extends FakeFs {
    await this._checkPartialSupport();
  }
  /**
   * <server>/remote.php/dav/files/<userid>
   * => <server>/remote.php/dav/uploads/<userid>
   */
  _getnextcloudUploadServerAddress = () => {
-    const s = this.webdavConfig.address.split("/");
+    let k = this.webdavConfig.address;
    if (k.endsWith("/")) {
      // no tailing slash
      k = k.substring(0, k.length - 1);
    }
    const s = k.split("/");
    if (
      s.length > 3 &&
      s[s.length - 3] === "dav" &&
@@ -788,6 +778,16 @@ export class FakeFsWebdav extends FakeFs {
    throw Error(`unexpected file content result with type ${typeof buff}`);
  }
  async rename(key1: string, key2: string): Promise<void> {
    if (key1 === "/" || key2 === "/") {
      return;
    }
    const remoteFileName1 = getWebdavPath(key1, this.remoteBaseDir);
    const remoteFileName2 = getWebdavPath(key2, this.remoteBaseDir);
    await this._init();
    await this.client.moveFile(remoteFileName1, remoteFileName2);
  }
  async rm(key: string): Promise<void> {
    if (key === "/") {
      return;
@@ -230,6 +230,15 @@ export class FakeFsWebdis extends FakeFs {
    return rsp;
  }
  async rename(key1: string, key2: string): Promise<void> {
    const fullKey1 = getWebdisPath(key1, this.remoteBaseDir);
    const fullKey2 = getWebdisPath(key2, this.remoteBaseDir);
    const commandContent = `RENAME/${fullKey1}:content/${fullKey2}:content`;
    await this._fetchCommand("POST", commandContent);
    const commandMeta = `RENAME/${fullKey1}:meta/${fullKey2}:meta`;
    await this._fetchCommand("POST", commandMeta);
  }
  async rm(key: string): Promise<void> {
    const fullKey = getWebdisPath(key, this.remoteBaseDir);
    const command = `DEL/${fullKey}:meta/${fullKey}:content`;
@@ -1,7 +1,11 @@
 import merge from "lodash/merge";
 import Mustache from "mustache";
 import { moment } from "obsidian";
-import { LANGS } from "./langs";
+import { LANGS as LANGS_PRO } from "../pro/src/langs";
 import { LANGS as LANGS_BASIC } from "./langs";
 const LANGS = merge(LANGS_BASIC, LANGS_PRO);
 export type LangType = keyof typeof LANGS;
 export type LangTypeAndAuto = LangType | "auto";
@@ -17,14 +17,27 @@ export const exportQrCodeUri = async (
 ) => {
  let settings2: Partial<RemotelySavePluginSettings> = {};
-  if (exportFields === "all_but_oauth2") {
+  if (exportFields === "basic_and_advanced") {
    settings2 = cloneDeep(settings);
    delete settings2.s3;
    delete settings2.dropbox;
    delete settings2.onedrive;
    delete settings2.webdav;
    delete settings2.webdis;
    delete settings2.googledrive;
    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) };
  } else if (exportFields === "webdav") {
    settings2 = { webdav: cloneDeep(settings.webdav) };
  } else if (exportFields === "webdis") {
    settings2 = { webdis: cloneDeep(settings.webdis) };
  } else if (exportFields === "googledrive") {
    settings2 = { googledrive: cloneDeep(settings.googledrive) };
  }
  delete settings2.vaultRandomID;
@@ -277,7 +277,7 @@
  "settings_deletetowhere_system_trash": "system trash (default)",
  "settings_deletetowhere_obsidian_trash": "Obsidian .trash folder",
  "settings_conflictaction": "Action For Conflict",
-  "settings_conflictaction_desc": "If a file is created or modified on both side since last update, it's a conflict event. How to deal with it? This only works for bidirectional sync.",
+  "settings_conflictaction_desc": "<p>If a file is created or modified on both side since last update, it's a conflict event. How to deal with it? This only works for bidirectional sync.</p>",
  "settings_conflictaction_keep_newer": "newer version survives (default)",
  "settings_conflictaction_keep_larger": "larger size version survives",
  "settings_cleanemptyfolder": "Action For Empty Folders",
@@ -289,6 +289,9 @@
  "settings_protectmodifypercentage_000_desc": "0 (always block)",
  "settings_protectmodifypercentage_050_desc": "50 (default)",
  "settings_protectmodifypercentage_100_desc": "100 (disable the protection)",
  "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_bidirectional_desc": "Bidirectional (default)",
@@ -299,9 +302,12 @@
  "settings_importexport": "Import and Export Partial Settings",
  "settings_export": "Export",
  "settings_export_desc": "Export settings by generating a QR code or URI.",
-  "settings_export_all_but_oauth2_button": "Export Non-Oauth2 Part",
+  "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_webdav_button": "Export Webdav Part",
  "settings_export_webdis_button": "Export Webdis Part",
  "settings_import": "Import",
  "settings_import_desc": "Paste the exported URI into here and click \"Import\". Or, you can open a camera or scan-qrcode app to scan the QR code.",
  "settings_import_button": "Import",
@@ -288,6 +288,9 @@
  "settings_protectmodifypercentage_000_desc": "0（总是强制中止）",
  "settings_protectmodifypercentage_050_desc": "50（默认值）",
  "settings_protectmodifypercentage_100_desc": "100（去除此保护）",
  "settings_protectmodifypercentage_custom_desc": "自定义",
  "settings_protectmodifypercentage_customfield": "如果修改超过自定义百分比则中止同步",
  "settings_protectmodifypercentage_customfield_desc": "您需要输入 0（含）~ 100（含）的数字。小数也是可以的。",
  "setting_syncdirection": "同步方向",
  "setting_syncdirection_desc": "插件应该向哪里同步？注意每个选项都是只有修改了的文件（基于修改时间和大小判断）才会触发同步动作。",
  "setting_syncdirection_bidirectional_desc": "双向同步（默认）",
@@ -298,9 +301,12 @@
  "settings_importexport": "导入导出部分设置",
  "settings_export": "导出",
  "settings_export_desc": "用 QR 码或 URI 导出设置信息。",
-  "settings_export_all_but_oauth2_button": "导出非 Oauth2 部分",
+  "settings_export_basic_and_advanced_button": "导出基本或进阶设置",
  "settings_export_s3_button": "导出 S3 部分",
  "settings_export_dropbox_button": "导出 Dropbox 部分",
  "settings_export_onedrive_button": "导出 OneDrive 部分",
  "settings_export_webdav_button": "导出 Webdav 部分",
  "settings_export_webdis_button": "导出 Webdis 部分",
  "settings_import": "导入",
  "settings_import_desc": "粘贴之前导出的 URI 到这里然后点击“导入”。或，使用拍摄 app 或者扫描 QR 码的 app，来扫描对应的 QR 码。",
  "settings_import_button": "导入",
@@ -287,6 +287,9 @@
  "settings_protectmodifypercentage_000_desc": "0（總是強制中止）",
  "settings_protectmodifypercentage_050_desc": "50（預設值）",
  "settings_protectmodifypercentage_100_desc": "100（去除此保護）",
  "settings_protectmodifypercentage_custom_desc": "自定義",
  "settings_protectmodifypercentage_customfield": "如果修改超過自定義百分比則中止同步",
  "settings_protectmodifypercentage_customfield_desc": "您需要輸入 0（含）~ 100（含）的數字。小數也是可以的。",
  "setting_syncdirection": "同步方向",
  "setting_syncdirection_desc": "外掛應該向哪裡同步？注意每個選項都是隻有修改了的檔案（基於修改時間和大小判斷）才會觸發同步動作。",
  "setting_syncdirection_bidirectional_desc": "雙向同步（預設）",
@@ -297,9 +300,12 @@
  "settings_importexport": "匯入匯出部分設定",
  "settings_export": "匯出",
  "settings_export_desc": "用 QR 碼或 URI 匯出設定資訊。",
-  "settings_export_all_but_oauth2_button": "匯出非 Oauth2 部分",
+  "settings_export_basic_and_advanced_button": "匯出基本或進階設定",
  "settings_export_s3_button": "匯出 S3 部分",
  "settings_export_dropbox_button": "匯出 Dropbox 部分",
  "settings_export_onedrive_button": "匯出 OneDrive 部分",
  "settings_export_webdav_button": "匯出 Webdav 部分",
  "settings_export_webdis_button": "匯出 Webdis 部分",
  "settings_import": "匯入",
  "settings_import_desc": "貼上之前匯出的 URI 到這裡然後點選“匯入”。或，使用拍攝 app 或者掃描 QR 碼的 app，來掃描對應的 QR 碼。",
  "settings_import_button": "匯入",
@@ -20,6 +20,7 @@ export const DEFAULT_TBL_LOGGER_OUTPUT = "loggeroutput";
 export const DEFAULT_TBL_SIMPLE_KV_FOR_MISC = "simplekvformisc";
 export const DEFAULT_TBL_PREV_SYNC_RECORDS = "prevsyncrecords";
 export const DEFAULT_TBL_PROFILER_RESULTS = "profilerresults";
 export const DEFAULT_TBL_FILE_CONTENT_HISTORY = "filecontenthistory";
 /**
 * @deprecated
@@ -62,6 +63,7 @@ export interface InternalDBs {
  simpleKVForMiscTbl: LocalForage;
  prevSyncRecordsTbl: LocalForage;
  profilerResultsTbl: LocalForage;
  fileContentHistoryTbl: LocalForage;
  /**
   * @deprecated
@@ -221,6 +223,11 @@ export const prepareDBs = async (
      name: DEFAULT_DB_NAME,
      storeName: DEFAULT_TBL_SYNC_MAPPING,
    }),
    fileContentHistoryTbl: localforage.createInstance({
      name: DEFAULT_DB_NAME,
      storeName: DEFAULT_TBL_FILE_CONTENT_HISTORY,
    }),
  } as InternalDBs;
  // try to get vaultRandomID firstly
@@ -13,6 +13,13 @@ import {
  requireApiVersion,
  setIcon,
 } from "obsidian";
 import {
  DEFAULT_PRO_CONFIG,
  getAndSaveProEmail,
  getAndSaveProFeatures,
  sendAuthReq as sendAuthReqPro,
  setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplacePro,
 } from "../pro/src/account";
 import type {
  RemotelySavePluginSettings,
  SyncTriggerSourceType,
@@ -56,6 +63,8 @@ import { SyncAlgoV3Modal } from "./syncAlgoV3Notice";
 // biome-ignore lint/suspicious/noShadowRestrictedNames: <explanation>
 import AggregateError from "aggregate-error";
 import throttle from "lodash/throttle";
 import { COMMAND_CALLBACK_PRO } from "../pro/src/baseTypesPro";
 import { DEFAULT_GOOGLEDRIVE_CONFIG } from "../pro/src/fsGoogleDrive";
 import { exportVaultSyncPlansToFiles } from "./debugMode";
 import { FakeFsEncrypt } from "./fsEncrypt";
 import { getClient } from "./fsGetter";
@@ -71,6 +80,7 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
  dropbox: DEFAULT_DROPBOX_CONFIG,
  onedrive: DEFAULT_ONEDRIVE_CONFIG,
  webdis: DEFAULT_WEBDIS_CONFIG,
  googledrive: DEFAULT_GOOGLEDRIVE_CONFIG,
  password: "",
  serviceType: "s3",
  currLogLevel: "info",
@@ -97,6 +107,7 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
  enableMobileStatusBar: false,
  encryptionMethod: "unknown",
  profiler: DEFAULT_PROFILER_CONFIG,
  pro: DEFAULT_PRO_CONFIG,
 };
 interface OAuth2Info {
@@ -399,6 +410,8 @@ export default class RemotelySavePlugin extends Plugin {
      return;
    }
    const configSaver = async () => await this.saveSettings();
    await syncer(
      fsLocal,
      fsRemote,
@@ -410,6 +423,8 @@ export default class RemotelySavePlugin extends Plugin {
      this.vaultRandomID,
      this.app.vault.configDir,
      this.settings,
      this.manifest.version,
      configSaver,
      getProtectError,
      markIsSyncingFunc,
      notifyFunc,
@@ -696,6 +711,77 @@ export default class RemotelySavePlugin extends Plugin {
      }
    );
    this.registerObsidianProtocolHandler(
      COMMAND_CALLBACK_PRO,
      async (inputParams) => {
        if (this.oauth2Info.helperModal !== undefined) {
          const k = this.oauth2Info.helperModal.contentEl;
          k.empty();
          t("protocol_pro_connecting")
            .split("\n")
            .forEach((val) => {
              k.createEl("p", {
                text: val,
              });
            });
        }
        console.debug(inputParams);
        const authRes = await sendAuthReqPro(
          this.oauth2Info.verifier || "verifier",
          inputParams.code,
          async (e: any) => {
            new Notice(t("protocol_pro_connect_fail"));
            new Notice(`${e}`);
            throw e;
          }
        );
        console.debug(authRes);
        const self = this;
        await setConfigBySuccessfullAuthInplacePro(
          this.settings.pro!,
          authRes,
          () => self.saveSettings()
        );
        await getAndSaveProFeatures(
          this.settings.pro!,
          this.manifest.version,
          () => self.saveSettings()
        );
        await getAndSaveProEmail(
          this.settings.pro!,
          this.manifest.version,
          () => self.saveSettings()
        );
        this.oauth2Info.verifier = ""; // reset it
        this.oauth2Info.helperModal?.close(); // close it
        this.oauth2Info.helperModal = undefined;
        this.oauth2Info.authDiv?.toggleClass(
          "pro-auth-button-hide",
          this.settings.pro?.refreshToken !== ""
        );
        this.oauth2Info.authDiv = undefined;
        this.oauth2Info.revokeAuthSetting?.setDesc(
          t("protocol_pro_connect_succ_revoke", {
            email: this.settings.pro?.email,
          })
        );
        this.oauth2Info.revokeAuthSetting = undefined;
        this.oauth2Info.revokeDiv?.toggleClass(
          "pro-revoke-auth-button-hide",
          this.settings.pro?.email === ""
        );
        this.oauth2Info.revokeDiv = undefined;
      }
    );
    this.syncRibbon = this.addRibbonIcon(
      iconNameSyncWait,
      `${this.manifest.name}`,
@@ -978,6 +1064,10 @@ export default class RemotelySavePlugin extends Plugin {
      this.settings.profiler.recordSize = false;
    }
    if (this.settings.googledrive === undefined) {
      this.settings.googledrive = DEFAULT_GOOGLEDRIVE_CONFIG;
    }
    await this.saveSettings();
  }
@@ -1046,6 +1136,10 @@ export default class RemotelySavePlugin extends Plugin {
      needSave = true;
    }
    if (this.settings.pro === undefined) {
      this.settings.pro = cloneDeep(DEFAULT_PRO_CONFIG);
    }
    // save back
    if (needSave) {
      await this.saveSettings();
@@ -341,11 +341,17 @@ export const checkHasSpecialCharForDir = (x: string) => {
  return /[?/\\]/.test(x);
 };
-export const unixTimeToStr = (x: number | undefined | null) => {
+export const unixTimeToStr = (x: number | undefined | null, hasMs = false) => {
  if (x === undefined || x === null || Number.isNaN(x)) {
    return undefined;
  }
-  return new Date(x).toISOString();
+  if (hasMs) {
    // 1716712162574 => '2024-05-26T16:29:22.574+08:00'
    return window.moment(x).toISOString(true);
  } else {
    // 1716712162574 => '2024-05-26T16:29:22+08:00'
    return window.moment(x).format() as string;
  }
 };
 /**
@@ -416,7 +422,7 @@ export const toText = (x: any) => {
 export const statFix = async (vault: Vault, path: string) => {
  const s = await vault.adapter.stat(path);
  if (s === undefined || s === null) {
-    return s;
+    throw Error(`${path} doesn't exist cannot run stat`);
  }
  if (s.ctime === undefined || s.ctime === null || Number.isNaN(s.ctime)) {
    s.ctime = undefined as any; // force assignment
@@ -21,6 +21,8 @@ import type {
 } from "./baseTypes";
 import cloneDeep from "lodash/cloneDeep";
 import { generateGoogleDriveSettingsPart } from "../pro/src/settingsGoogleDrive";
 import { generateProSettingsPart } from "../pro/src/settingsPro";
 import { API_VER_ENSURE_REQURL_OK, VALID_REQURL } from "./baseTypesObs";
 import { messyConfigToNormal } from "./configPersist";
 import {
@@ -168,7 +170,7 @@ class EncryptionMethodModal extends Modal {
  }
 }
-class ChangeRemoteBaseDirModal extends Modal {
+export class ChangeRemoteBaseDirModal extends Modal {
  readonly plugin: RemotelySavePlugin;
  readonly newRemoteBaseDir: string;
  readonly service: SUPPORTED_SERVICES_TYPE_WITH_REMOTE_BASE_DIR;
@@ -1790,6 +1792,22 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
        });
      });
    //////////////////////////////////////////////////
    // below for googledrive
    //////////////////////////////////////////////////
    const {
      googleDriveDiv,
      googleDriveAllowedToUsedDiv,
      googleDriveNotShowUpHintSetting,
    } = generateGoogleDriveSettingsPart(
      containerEl,
      t,
      this.app,
      this.plugin,
      () => this.plugin.saveSettings()
    );
    //////////////////////////////////////////////////
    // below for general chooser (part 2/2)
    //////////////////////////////////////////////////
@@ -1805,6 +1823,10 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
        dropdown.addOption("webdav", t("settings_chooseservice_webdav"));
        dropdown.addOption("onedrive", t("settings_chooseservice_onedrive"));
        dropdown.addOption("webdis", t("settings_chooseservice_webdis"));
        dropdown.addOption(
          "googledrive",
          t("settings_chooseservice_googledrive")
        );
        dropdown
          .setValue(this.plugin.settings.serviceType)
@@ -1830,6 +1852,10 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
              "webdis-hide",
              this.plugin.settings.serviceType !== "webdis"
            );
            googleDriveDiv.toggleClass(
              "googledrive-hide",
              this.plugin.settings.serviceType !== "googledrive"
            );
            await this.plugin.saveSettings();
          });
      });
@@ -2130,25 +2156,44 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
          });
      });
-    new Setting(advDiv)
+    let conflictActionSettingOrigDesc = t("settings_conflictaction_desc");
    if (
      (this.plugin.settings.conflictAction ?? "keep_newer") === "smart_conflict"
    ) {
      conflictActionSettingOrigDesc += t(
        "settings_conflictaction_smart_conflict_desc"
      );
    }
    const conflictActionSetting = new Setting(advDiv)
      .setName(t("settings_conflictaction"))
-      .setDesc(t("settings_conflictaction_desc"))
+      .setDesc(stringToFragment(conflictActionSettingOrigDesc));
-      .addDropdown((dropdown) => {
+    conflictActionSetting.addDropdown((dropdown) => {
-        dropdown.addOption(
+      dropdown
-          "keep_newer",
+        .addOption("keep_newer", t("settings_conflictaction_keep_newer"))
-          t("settings_conflictaction_keep_newer")
+        .addOption("keep_larger", t("settings_conflictaction_keep_larger"))
-        );
+        .addOption(
-        dropdown.addOption(
+          "smart_conflict",
-          "keep_larger",
+          t("settings_conflictaction_smart_conflict")
-          t("settings_conflictaction_keep_larger")
+        )
-        );
+        .setValue(this.plugin.settings.conflictAction ?? "keep_newer")
-        dropdown
+        .onChange(async (val) => {
-          .setValue(this.plugin.settings.conflictAction ?? "keep_newer")
+          this.plugin.settings.conflictAction = val as ConflictActionType;
-          .onChange(async (val) => {
+          await this.plugin.saveSettings();
-            this.plugin.settings.conflictAction = val as ConflictActionType;
+
-            await this.plugin.saveSettings();
+          conflictActionSettingOrigDesc = t("settings_conflictaction_desc");
-          });
+          if (
-      });
+            (this.plugin.settings.conflictAction ?? "keep_newer") ===
            "smart_conflict"
          ) {
            conflictActionSettingOrigDesc += t(
              "settings_conflictaction_smart_conflict_desc"
            );
          }
          conflictActionSetting.setDesc(
            stringToFragment(conflictActionSettingOrigDesc)
          );
        });
    });
    new Setting(advDiv)
      .setName(t("settings_cleanemptyfolder"))
@@ -2168,28 +2213,77 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
          });
      });
-    new Setting(advDiv)
+    const percentage1 = new Setting(advDiv)
      .setName(t("settings_protectmodifypercentage"))
-      .setDesc(t("settings_protectmodifypercentage_desc"))
+      .setDesc(t("settings_protectmodifypercentage_desc"));
-      .addDropdown((dropdown) => {
+
-        for (const i of Array.from({ length: 11 }, (x, i) => i * 10)) {
+    const percentage2 = new Setting(advDiv)
-          let desc = `${i}`;
+      .setName(t("settings_protectmodifypercentage_customfield"))
-          if (i === 0) {
+      .setDesc(t("settings_protectmodifypercentage_customfield_desc"));
-            desc = t("settings_protectmodifypercentage_000_desc");
+    if ((this.plugin.settings.protectModifyPercentage ?? 50) % 10 === 0) {
-          } else if (i === 50) {
+      percentage2.settingEl.addClass("settings-percentage-custom-hide");
-            desc = t("settings_protectmodifypercentage_050_desc");
+    }
-          } else if (i === 100) {
+    let percentage2Text: TextComponent | undefined = undefined;
-            desc = t("settings_protectmodifypercentage_100_desc");
+    percentage2.addText((text) => {
-          }
+      text.inputEl.type = "number";
-          dropdown.addOption(`${i}`, desc);
+      percentage2Text = text;
-        }
+      text
-        dropdown
+        .setPlaceholder("0 ~ 100")
-          .setValue(`${this.plugin.settings.protectModifyPercentage ?? 50}`)
+        .setValue(`${this.plugin.settings.protectModifyPercentage ?? 50}`)
-          .onChange(async (val) => {
+        .onChange(async (val) => {
-            this.plugin.settings.protectModifyPercentage = Number.parseInt(val);
+          let k = Number.parseFloat(val.trim());
          if (Number.isNaN(k)) {
            // do nothing!
          } else {
            if (k < 0) {
              k = 0;
            } else if (k > 100) {
              k = 100;
            }
            this.plugin.settings.protectModifyPercentage = k;
            await this.plugin.saveSettings();
-          });
+          }
        });
    });
    percentage1.addDropdown((dropdown) => {
      for (const i of Array.from({ length: 11 }, (x, i) => i * 10)) {
        let desc = `${i}`;
        if (i === 0) {
          desc = t("settings_protectmodifypercentage_000_desc");
        } else if (i === 50) {
          desc = t("settings_protectmodifypercentage_050_desc");
        } else if (i === 100) {
          desc = t("settings_protectmodifypercentage_100_desc");
        }
        dropdown.addOption(`${i}`, desc);
      }
      dropdown.addOption(
        "custom",
        t("settings_protectmodifypercentage_custom_desc")
      );
      const p = this.plugin.settings.protectModifyPercentage ?? 50;
      let initVal = "custom";
      if (p % 10 === 0) {
        initVal = `${p}`;
      } else {
        // show custom
        percentage2.settingEl.removeClass("settings-percentage-custom");
      }
      dropdown.setValue(initVal).onChange(async (val) => {
        const k = Number.parseInt(val);
        if (val === "custom" || Number.isNaN(k)) {
          // do nothing until user changes something in custom field
          percentage2.settingEl.removeClass("settings-percentage-custom-hide");
        } else {
          this.plugin.settings.protectModifyPercentage = k;
          percentage2.settingEl.addClass("settings-percentage-custom-hide");
          percentage2Text?.setValue(`${k}`);
          await this.plugin.saveSettings();
        }
      });
    });
    new Setting(advDiv)
      .setName(t("setting_syncdirection"))
@@ -2268,15 +2362,21 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
    importExportDivSetting1.settingEl.addClass("setting-need-wrapping");
    importExportDivSetting1
      .addButton(async (button) => {
-        button.setButtonText(t("settings_export_all_but_oauth2_button"));
+        button.setButtonText(t("settings_export_basic_and_advanced_button"));
        button.onClick(async () => {
          new ExportSettingsQrCodeModal(
            this.app,
            this.plugin,
-            "all_but_oauth2"
+            "basic_and_advanced"
          ).open();
        });
      })
      .addButton(async (button) => {
        button.setButtonText(t("settings_export_s3_button"));
        button.onClick(async () => {
          new ExportSettingsQrCodeModal(this.app, this.plugin, "s3").open();
        });
      })
      .addButton(async (button) => {
        button.setButtonText(t("settings_export_dropbox_button"));
        button.onClick(async () => {
@@ -2296,6 +2396,28 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
            "onedrive"
          ).open();
        });
      })
      .addButton(async (button) => {
        button.setButtonText(t("settings_export_webdav_button"));
        button.onClick(async () => {
          new ExportSettingsQrCodeModal(this.app, this.plugin, "webdav").open();
        });
      })
      .addButton(async (button) => {
        button.setButtonText(t("settings_export_webdis_button"));
        button.onClick(async () => {
          new ExportSettingsQrCodeModal(this.app, this.plugin, "webdis").open();
        });
      })
      .addButton(async (button) => {
        button.setButtonText(t("settings_export_googledrive_button"));
        button.onClick(async () => {
          new ExportSettingsQrCodeModal(
            this.app,
            this.plugin,
            "googledrive"
          ).open();
        });
      });
    let importSettingVal = "";
@@ -2350,6 +2472,21 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
        });
      });
    //////////////////////////////////////////////////
    // below for pro
    //////////////////////////////////////////////////
    const proDiv = containerEl.createEl("div");
    generateProSettingsPart(
      proDiv,
      t,
      this.app,
      this.plugin,
      () => this.plugin.saveSettings(),
      googleDriveAllowedToUsedDiv,
      googleDriveNotShowUpHintSetting
    );
    //////////////////////////////////////////////////
    // below for debug
    //////////////////////////////////////////////////
@@ -2,6 +2,13 @@
 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,
@@ -12,6 +19,7 @@ import type {
  SyncDirectionType,
  SyncTriggerSourceType,
 } from "./baseTypes";
 import { copyFile, copyFileOrFolder, copyFolder } from "./copyLogic";
 import type { FakeFs } from "./fsAll";
 import type { FakeFsEncrypt } from "./fsEncrypt";
 import {
@@ -432,7 +440,6 @@ const getSyncPlanInplace = async (
        } else {
          // Both exists, but modified or conflict
          // Look for past files of A or B.
          const localEqualPrevSync =
            prevSync?.mtimeCli === local.mtimeCli &&
            prevSync?.sizeEnc === local.sizeEnc;
@@ -521,9 +528,10 @@ const getSyncPlanInplace = async (
                    mixedEntry.change = true;
                    keptFolder.add(getParentFolder(key));
                  }
-                } else {
+                } else if (conflictAction === "smart_conflict") {
-                  mixedEntry.decisionBranch = 15;
+                  // try merge!
-                  mixedEntry.decision = "conflict_created_then_keep_both";
+                  mixedEntry.decisionBranch = 302;
                  mixedEntry.decision = "conflict_created_then_smart_conflict";
                  mixedEntry.change = true;
                  keptFolder.add(getParentFolder(key));
                }
@@ -572,9 +580,10 @@ const getSyncPlanInplace = async (
                    mixedEntry.change = true;
                    keptFolder.add(getParentFolder(key));
                  }
-                } else {
+                } else if (conflictAction === "smart_conflict") {
-                  mixedEntry.decisionBranch = 20;
+                  // yeah, try to merge them!
-                  mixedEntry.decision = "conflict_modified_then_keep_both";
+                  mixedEntry.decisionBranch = 301;
                  mixedEntry.decision = "conflict_modified_then_smart_conflict";
                  mixedEntry.change = true;
                  keptFolder.add(getParentFolder(key));
                }
@@ -774,12 +783,16 @@ const getSyncPlanInplace = async (
  mixedEntityMappings["/$@meta"] = {
    key: "/$@meta", // don't mess up with the types
    sideNotes: {
-      version: "20240508 fs version",
+      version: "20240525 fs version",
      generateTime: currTime,
      generateTimeFmt: currTimeFmt,
      service: settings.serviceType,
      concurrency: settings.concurrency,
      hasPassword: settings.password !== "",
      syncConfigDir: settings.syncConfigDir,
      syncUnderscoreItems: settings.syncUnderscoreItems,
      skipSizeLargerThan: settings.skipSizeLargerThan,
      protectModifyPercentage: settings.protectModifyPercentage,
      conflictAction: conflictAction,
      syncDirection: syncDirection,
      triggerSource: triggerSource,
@@ -896,10 +909,10 @@ const splitFourStepsOnEntityMappings = (
      val.decision === "remote_is_created_then_pull" ||
      val.decision === "conflict_created_then_keep_local" ||
      val.decision === "conflict_created_then_keep_remote" ||
-      val.decision === "conflict_created_then_keep_both" ||
+      val.decision === "conflict_created_then_smart_conflict" ||
      val.decision === "conflict_modified_then_keep_local" ||
      val.decision === "conflict_modified_then_keep_remote" ||
-      val.decision === "conflict_modified_then_keep_both"
+      val.decision === "conflict_modified_then_smart_conflict"
    ) {
      if (
        uploadDownloads.length === 0 ||
@@ -962,74 +975,6 @@ const fullfillMTimeOfRemoteEntityInplace = (
  return remote;
 };
 async function copyFolder(
  key: string,
  left: FakeFs,
  right: FakeFs
 ): Promise<Entity> {
  if (!key.endsWith("/")) {
    throw Error(`should not call ${key} in copyFolder`);
  }
  const statsLeft = await left.stat(key);
  return await right.mkdir(key, statsLeft.mtimeCli);
 }
 async function copyFile(
  key: string,
  left: FakeFs,
  right: FakeFs
 ): Promise<Entity> {
  // console.debug(`copyFile: key=${key}, left=${left.kind}, right=${right.kind}`);
  if (key.endsWith("/")) {
    throw Error(`should not call ${key} in copyFile`);
  }
  const statsLeft = await left.stat(key);
  const content = await left.readFile(key);
  if (statsLeft.size === undefined) {
    statsLeft.size = content.byteLength;
  } else {
    if (statsLeft.size !== content.byteLength) {
      throw Error(
        `error copying ${left.kind}=>${right.kind}: size not matched`
      );
    }
  }
  if (statsLeft.mtimeCli === undefined) {
    throw Error(`error copying ${left.kind}=>${right.kind}, no mtimeCli`);
  }
  // console.debug(`copyFile: about to start right.writeFile`);
  if (typeof (content as any).transfer === "function") {
    return await right.writeFile(
      key,
      (content as any).transfer(),
      statsLeft.mtimeCli,
      statsLeft.mtimeCli /* TODO */
    );
  } else {
    return await right.writeFile(
      key,
      content,
      statsLeft.mtimeCli,
      statsLeft.mtimeCli /* TODO */
    );
  }
 }
 async function copyFileOrFolder(
  key: string,
  left: FakeFs,
  right: FakeFs
 ): Promise<Entity> {
  if (key.endsWith("/")) {
    return await copyFolder(key, left, right);
  } else {
    return await copyFile(key, left, right);
  }
 }
 const dispatchOperationToActualV3 = async (
  key: string,
  vaultRandomID: string,
@@ -1037,7 +982,8 @@ const dispatchOperationToActualV3 = async (
  r: MixedEntity,
  fsLocal: FakeFs,
  fsEncrypt: FakeFsEncrypt,
-  db: InternalDBs
+  db: InternalDBs,
  conflictAction: ConflictActionType
 ) => {
  // console.debug(
  //   `inside dispatchOperationToActualV3, key=${key}, r=${JSON.stringify(
@@ -1047,7 +993,20 @@ const dispatchOperationToActualV3 = async (
  //   )}`
  // );
  if (r.decision === "only_history") {
-    clearPrevSyncRecordByVaultAndProfile(db, vaultRandomID, profileID, key);
+    await clearPrevSyncRecordByVaultAndProfile(
      db,
      vaultRandomID,
      profileID,
      key
    );
    if (conflictAction === "smart_conflict") {
      await clearFileContentHistoryByVaultAndProfile(
        db,
        vaultRandomID,
        profileID,
        key
      );
    }
  } else if (
    r.decision === "local_is_created_too_large_then_do_nothing" ||
    r.decision === "remote_is_created_too_large_then_do_nothing" ||
@@ -1066,12 +1025,34 @@ const dispatchOperationToActualV3 = async (
    if (r.prevSync !== undefined) {
      // if we have prevSync,
-      // we don't need to do anything, because the record is already there!
+      // we don't need to update prevSync, because the record is already there!
      // but we might need to update content, because it's a new feature
      if (conflictAction === "smart_conflict") {
        if (isMergable(r.local!)) {
          const k = await getFileContentHistoryByVaultAndProfile(
            db,
            vaultRandomID,
            profileID,
            r.local!
          );
          if (k === null || k === undefined) {
            await upsertFileContentHistoryByVaultAndProfile(
              db,
              vaultRandomID,
              profileID,
              r.local!,
              await fsLocal.readFile(r.local!.keyRaw)
            );
          }
        }
      }
    } else {
      // if we don't have prevSync, we use remote entity AND local mtime
      // as if it is "uploaded"
      if (r.remote !== undefined) {
        let entity = r.remote;
        // TODO: abstract away the dirty hack
        entity = fullfillMTimeOfRemoteEntityInplace(entity, r.local?.mtimeCli);
        if (entity !== undefined) {
@@ -1081,6 +1062,17 @@ const dispatchOperationToActualV3 = async (
            profileID,
            entity
          );
          if (conflictAction === "smart_conflict") {
            if (isMergable(entity)) {
              await upsertFileContentHistoryByVaultAndProfile(
                db,
                vaultRandomID,
                profileID,
                entity,
                await fsLocal.readFile(entity.keyRaw)
              );
            }
          }
        }
      }
    }
@@ -1093,7 +1085,12 @@ const dispatchOperationToActualV3 = async (
  ) {
    // console.debug(`before upload in sync, r=${JSON.stringify(r, null, 2)}`);
    const mtimeCli = (await fsLocal.stat(r.key)).mtimeCli!;
-    const entity = await copyFileOrFolder(r.key, fsLocal, fsEncrypt);
+    const { entity, content } = await copyFileOrFolder(
      r.key,
      fsLocal,
      fsEncrypt
    );
    // TODO: abstract away the dirty hack
    fullfillMTimeOfRemoteEntityInplace(entity, mtimeCli);
    // console.debug(`after fullfill, entity=${JSON.stringify(entity,null,2)}`)
    await upsertPrevSyncRecordByVaultAndProfile(
@@ -1102,6 +1099,17 @@ const dispatchOperationToActualV3 = async (
      profileID,
      entity
    );
    if (conflictAction === "smart_conflict") {
      if (isMergable(entity)) {
        await upsertFileContentHistoryByVaultAndProfile(
          db,
          vaultRandomID,
          profileID,
          entity,
          content!
        );
      }
    }
  } else if (
    r.decision === "remote_is_modified_then_pull" ||
    r.decision === "remote_is_created_then_pull" ||
@@ -1109,10 +1117,14 @@ const dispatchOperationToActualV3 = async (
    r.decision === "conflict_modified_then_keep_remote" ||
    r.decision === "folder_existed_remote_then_also_create_local"
  ) {
    let e1: Entity | undefined = undefined;
    let c1: ArrayBuffer | undefined = undefined;
    if (r.key.endsWith("/")) {
      await fsLocal.mkdir(r.key);
    } else {
-      await copyFile(r.key, fsEncrypt, fsLocal);
+      const { entity, content } = await copyFile(r.key, fsEncrypt, fsLocal);
      e1 = entity;
      c1 = content;
    }
    await upsertPrevSyncRecordByVaultAndProfile(
      db,
@@ -1120,6 +1132,17 @@ const dispatchOperationToActualV3 = async (
      profileID,
      r.remote!
    );
    if (conflictAction === "smart_conflict") {
      if (isMergable(r.remote!)) {
        await upsertFileContentHistoryByVaultAndProfile(
          db,
          vaultRandomID,
          profileID,
          r.remote!,
          c1! // always file, always has real value
        );
      }
    }
  } else if (r.decision === "local_is_deleted_thus_also_delete_remote") {
    // local is deleted, we need to delete remote now
    await fsEncrypt.rm(r.key);
@@ -1129,6 +1152,16 @@ const dispatchOperationToActualV3 = async (
      profileID,
      r.key
    );
    if (conflictAction === "smart_conflict") {
      if (isMergable(r.remote!)) {
        await clearFileContentHistoryByVaultAndProfile(
          db,
          vaultRandomID,
          profileID,
          r.key
        );
      }
    }
  } else if (r.decision === "remote_is_deleted_thus_also_delete_local") {
    // remote is deleted, we need to delete local now
    await fsLocal.rm(r.key);
@@ -1138,20 +1171,92 @@ const dispatchOperationToActualV3 = async (
      profileID,
      r.key
    );
    if (conflictAction === "smart_conflict") {
      if (isMergable(r.remote!)) {
        await clearFileContentHistoryByVaultAndProfile(
          db,
          vaultRandomID,
          profileID,
          r.key
        );
      }
    }
  } else if (
-    r.decision === "conflict_created_then_keep_both" ||
+    r.decision === "conflict_created_then_smart_conflict" ||
-    r.decision === "conflict_modified_then_keep_both"
+    r.decision === "conflict_modified_then_smart_conflict"
  ) {
-    throw Error(`${r.decision} not implemented yet: ${JSON.stringify(r)}`);
+    // heavy lifting
    if (isMergable(r.local!, r.remote!)) {
      const origContent = await getFileContentHistoryByVaultAndProfile(
        db,
        vaultRandomID,
        profileID,
        r.local!
      );
      // console.debug(`we get origContent:`)
      // console.debug(origContent)
      const { entity, content } = await mergeFile(
        r.key,
        fsLocal,
        fsEncrypt,
        origContent
      );
      await upsertPrevSyncRecordByVaultAndProfile(
        db,
        vaultRandomID,
        profileID,
        entity
      );
      await upsertFileContentHistoryByVaultAndProfile(
        db,
        vaultRandomID,
        profileID,
        entity,
        content
      );
    } else {
      // duplicate the files
      await clearPrevSyncRecordByVaultAndProfile(
        db,
        vaultRandomID,
        profileID,
        r.key
      );
      const mtimeCli = (await fsLocal.stat(r.key)).mtimeCli!;
      const { upload, download } = await duplicateFile(
        r.key,
        fsLocal,
        fsEncrypt,
        async (upload) => {
          // TODO: abstract away the dirty hack
          fullfillMTimeOfRemoteEntityInplace(upload, mtimeCli);
          await upsertPrevSyncRecordByVaultAndProfile(
            db,
            vaultRandomID,
            profileID,
            upload
          );
        },
        async (download) => {
          await upsertPrevSyncRecordByVaultAndProfile(
            db,
            vaultRandomID,
            profileID,
            download
          );
        }
      );
    }
  } else if (r.decision === "folder_to_be_created") {
    await fsLocal.mkdir(r.key);
-    const entity = await copyFolder(r.key, fsLocal, fsEncrypt);
+    const { entity } = await copyFolder(r.key, fsLocal, fsEncrypt);
    await upsertPrevSyncRecordByVaultAndProfile(
      db,
      vaultRandomID,
      profileID,
      entity
    );
    // no need to record file content for folder here
  } else if (
    r.decision === "folder_to_be_deleted_on_both" ||
    r.decision === "folder_to_be_deleted_on_local" ||
@@ -1175,6 +1280,7 @@ const dispatchOperationToActualV3 = async (
      profileID,
      r.key
    );
    // no need to record file content for folder here
  } else {
    throw Error(`don't know how to dispatch decision: ${JSON.stringify(r)}`);
  }
@@ -1191,6 +1297,7 @@ export const doActualSync = async (
  getProtectModifyPercentageErrorStrFunc: any,
  db: InternalDBs,
  profiler: Profiler | undefined,
  conflictAction: ConflictActionType,
  callbackSyncProcess?: any
 ) => {
  profiler?.addIndent();
@@ -1313,7 +1420,8 @@ export const doActualSync = async (
            val,
            fsLocal,
            fsEncrypt,
-            db
+            db,
            conflictAction
          );
          // console.debug(`finished ${key}`);
@@ -1376,6 +1484,8 @@ export async function syncer(
  vaultRandomID: string,
  configDir: string,
  settings: RemotelySavePluginSettings,
  pluginVersion: string,
  configSaver: () => Promise<any>,
  getProtectModifyPercentageErrorStrFunc: any,
  markIsSyncingFunc: (isSyncing: boolean) => void,
  notifyFunc?: (s: SyncTriggerSourceType, step: number) => Promise<any>,
@@ -1392,17 +1502,27 @@ export async function syncer(
  markIsSyncingFunc(true);
  let everythingOk = true;
-
+  let step = 0;
  let step = 0; // dry mode only
  await notifyFunc?.(triggerSource, step);
  step = 1;
  await notifyFunc?.(triggerSource, step);
  await ribboonFunc?.(triggerSource, step);
  await statusBarFunc?.(triggerSource, step, everythingOk);
  profiler?.insert("start big sync func");
  try {
    // check pro feature
    // if anything goes wrong, it will throw
    await checkProRunnableAndFixInplace(
      ["feature-smart_conflict", "feature-google_drive"],
      settings,
      pluginVersion,
      configSaver
    );
    // try mode?
    await notifyFunc?.(triggerSource, step);
    step = 1;
    await notifyFunc?.(triggerSource, step);
    await ribboonFunc?.(triggerSource, step);
    await statusBarFunc?.(triggerSource, step, everythingOk);
    profiler?.insert("start big sync func");
    step = 2;
    await notifyFunc?.(triggerSource, step);
    await ribboonFunc?.(triggerSource, step);
@@ -1509,6 +1629,7 @@ export async function syncer(
        getProtectModifyPercentageErrorStrFunc,
        db,
        profiler,
        settings.conflictAction ?? "keep_newer",
        callbackSyncProcess
      );
      profiler?.insert(`finish step${step} (actual sync)`);
@@ -17,6 +17,10 @@
  padding-top: 18px;
 }
 .settings-percentage-custom-hide {
  display: none;
 }
 .s3-disclaimer {
  font-weight: bold;
 }
@@ -68,6 +72,25 @@
  display: none;
 }
 .googledrive-disclaimer {
  font-weight: bold;
 }
 .googledrive-hide {
  display: none;
 }
 .googledrive-allow-to-use-hide {
  display: none;
 }
 .googledrive-auth-button-hide {
  display: none;
 }
 .googledrive-revoke-auth-button-hide {
  display: none;
 }
 .qrcode-img {
  width: 350px;
  height: 350px;
@@ -86,3 +109,18 @@
  /* flex-wrap: wrap; */
  display: grid;
 }
 .pro-disclaimer {
  font-weight: bold;
 }
 .pro-hide {
  display: none;
 }
 .pro-auth-button-hide {
  display: none;
 }
 .pro-revoke-auth-button-hide {
  display: none;
 }
@@ -19,6 +19,9 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
  webdis: {
    address: "addr",
  } as any,
  googledrive: {
    refreshToken: "xxx",
  } as any,
  password: "password",
  serviceType: "s3",
  currLogLevel: "info",
@@ -6,6 +6,11 @@ const TerserPlugin = require("terser-webpack-plugin");
 const DEFAULT_DROPBOX_APP_KEY = process.env.DROPBOX_APP_KEY || "";
 const DEFAULT_ONEDRIVE_CLIENT_ID = process.env.ONEDRIVE_CLIENT_ID || "";
 const DEFAULT_ONEDRIVE_AUTHORITY = process.env.ONEDRIVE_AUTHORITY || "";
 const DEFAULT_REMOTELYSAVE_WEBSITE = process.env.REMOTELYSAVE_WEBSITE || "";
 const DEFAULT_REMOTELYSAVE_CLIENT_ID = process.env.REMOTELYSAVE_CLIENT_ID || "";
 const DEFAULT_GOOGLEDRIVE_CLIENT_ID = process.env.GOOGLEDRIVE_CLIENT_ID || "";
 const DEFAULT_GOOGLEDRIVE_CLIENT_SECRET =
  process.env.GOOGLEDRIVE_CLIENT_SECRET || "";
 module.exports = {
  entry: "./src/main.ts",
@@ -20,6 +25,10 @@ module.exports = {
      "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}"`,
    }),
    // Work around for Buffer is undefined:
    // https://github.com/webpack/changelog-v5/issues/10
Author	SHA1	Message	Date
fyears	64371b7d65	bump to 0.5.3 Release A New Version / build (16.x) (push) Failing after 44s Details	2024-06-02 23:38:44 +08:00
fyears	e116bb1deb	google drive is usable now	2024-06-02 23:37:53 +08:00
fyears	2ace90155c	fix build and bump to 0.5.2 Release A New Version / build (16.x) (push) Failing after 47s Details	2024-05-27 00:53:07 +08:00
fyears	d885a4c743	remove useless code Release A New Version / build (16.x) (push) Failing after 46s Details	2024-05-27 00:36:52 +08:00
fyears	b6d46d8b91	remove https detection	2024-05-27 00:35:55 +08:00
fyears	06dad54d4c	pro and smart conflict	2024-05-27 00:33:49 +08:00
fyears	0802767726	bump to 0.4.25 Release A New Version / build (16.x) (push) Failing after 46s Details	2024-05-25 15:58:52 +08:00
fyears	be4a2d3271	nextcloud address	2024-05-25 15:57:48 +08:00
fyears	7ca2d19255	more debug info	2024-05-25 15:53:38 +08:00
fyears	ff765d5ae7	change back to local time	2024-05-25 15:53:27 +08:00
fyears	bdbf0b1484	nextcloud is good	2024-05-25 15:39:29 +08:00
fyears	7497b5fae7	split export	2024-05-25 15:22:19 +08:00
fyears	408acb6230	add custom protection	2024-05-25 14:37:37 +08:00
fyears	d9cab7b1ff	fix kind Release A New Version / build (16.x) (push) Failing after 43s Details	2024-05-24 23:13:40 +08:00
fyears	5e53967e01	bump to 0.4.24	2024-05-24 23:11:37 +08:00
fyears	fb9f4a67b4	fix size bug	2024-05-24 23:11:01 +08:00