0.3.5

add doc to debug
fix sync delete
2022-03-11 09:48:21 +08:00 · 2022-03-11 09:47:46 +08:00 · 2022-03-11 09:11:50 +08:00 · 2022-03-11 09:09:41 +08:00 · 2022-03-10 23:54:35 +08:00 · 2022-03-06 23:42:13 +08:00
37 changed files with 2786 additions and 665 deletions
@@ -0,0 +1,65 @@
 name: Bug Report
 description: File a bug report
 title: "[Bug]: "
 labels: ["bug"]
 body:
  - type: markdown
    attributes:
      value: |
        Thanks for taking the time to fill out this bug report!
  - type: textarea
    id: what-happened
    attributes:
      label: What happened?
      description: What did you expect to happen?
      placeholder: Tell us what you see!
    validations:
      required: true
  - type: dropdown
    id: os
    attributes:
      label: What OS are you using?
      multiple: true
      options:
        - Windows
        - Linux
        - macOS
        - iOS (iPhone, iPad)
        - Android
    validations:
      required: true
  - type: dropdown
    id: service
    attributes:
      label: What remote cloud services are you using?
      multiple: true
      options:
        - S3
        - OneDrive for personal
        - Dropbox
        - webdav
        - others
    validations:
      required: true
  - type: input
    id: version-plugin
    attributes:
      label: Version of the plugin
      description: What version of the plugin are you running?
    validations:
      required: false
  - type: input
    id: version-obsidian
    attributes:
      label: Version of Obsidian
      description: What version of Obsidian are you running?
    validations:
      required: false
  - type: checkboxes
    id: ensure-no-sensitive-information
    attributes:
      label: Ensure no sensitive information
      description: By submitting this issue, you ensure that no sensitive information is submitted in the issue.
      options:
        - label: I ensure that no sensitive information is submitted in the issue.
          required: true
@@ -0,0 +1 @@
 blank_issues_enabled: false
@@ -0,0 +1,37 @@
 name: Feature Request
 description: Some idea about new features
 title: "[Feature Request]: "
 labels: ["enhancement"]
 body:
  - type: markdown
    attributes:
      value: |
        Thanks for taking the time to fill out this bug report!
  - type: textarea
    id: what-are-you-expecting
    attributes:
      label: What feature are you suggesting?
      description: What feature are you suggesting?
    validations:
      required: true
  - type: dropdown
    id: service
    attributes:
      label: What remote cloud services are you using, or suggesting adding the feature to?
      multiple: true
      options:
        - S3
        - OneDrive for personal
        - Dropbox
        - webdav
        - others
    validations:
      required: false
  - type: checkboxes
    id: ensure-no-sensitive-information
    attributes:
      label: Ensure no sensitive information
      description: By submitting this issue, you ensure that no sensitive information is submitted in the issue.
      options:
        - label: I ensure that no sensitive information is submitted in the issue.
          required: true
@@ -5,7 +5,7 @@ name: BuildCI
 on:
  push:
-    branches: [master]
+    branches: ["**"]
  pull_request:
    branches: [master]
@@ -4,7 +4,9 @@ This is yet another unofficial sync plugin for Obsidian. If you like it or find
 [![BuildCI](https://github.com/fyears/remotely-save/actions/workflows/auto-build.yml/badge.svg)](https://github.com/fyears/remotely-save/actions/workflows/auto-build.yml)
-[![total downloads auto count)](https://remotely-save.github.io/auto-download-stats/totalDownloads.svg)](https://github.com/fyears/remotely-save/releases)
+[![total downloads auto count](https://remotely-save.github.io/auto-download-stats/totalDownloads.svg)](https://github.com/fyears/remotely-save/releases)
 [![downloads of latest version](https://remotely-save.github.io/auto-download-stats/latestVersionDownloads.svg)](https://github.com/fyears/remotely-save/releases)
 ## Disclaimer
@@ -21,20 +23,21 @@ As of Jan 2022, the plugin is considered in BETA stage. **DO NOT USE IT for any
  - Dropbox
  - OneDrive for personal
  - Webdav
- **Obsidiain Mobile supported.** Vaults can be synced across mobile and desktop devices with the cloud service as the "broker".
+  - A list of connectable / not-connectable / in-the-plan / never-possible services are noted down [here](./docs/services_connectable_or_not.md).
 - **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.md) supported.** Files would be encrypted using openssl format before being sent to the cloud **if** user specify a password.
- **Scheduled auto sync supported.**
+- **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).**
 - **Fully open source under [Apache-2.0 License](./LICENSE).**
- **[Sync Algorithm open](./docs/sync_algorithm.md) for discussion.**
+- **[Sync Algorithm open](./docs/sync_algorithm_v2.md) for discussion.**
 ## Limitations
- **Users have to trigger the sync manually.** This design is intentional because the plugin is in beta, and it's better for users to be exactly aware of the running of this plugin.
+- **To support deltions sync, extra metadata will also be uploaded.** See [Minimal Intrusive](./docs/minimal_intrusive_design.md).
 - **"deletion" operation can only be triggered from local device.** It's because of the "[minimal intrusive design](./docs/minimal_intrusive_design.md)". May be changed in the future.
 - **No Conflict resolution. No content-diff-and-patch algorithm.** All files and folders are compared using their local and remote "last modified time" and those with later "last modified time" wins.
 - **Cloud services cost you money.** Always be aware of the costs and pricing.
 - **All files or folder starting with `.` (dot) or `_` (underscore) are treated as hidden files, and would NOT be synced.** It's useful if you have some files just staying locally. But this strategy also means that themes / other plugins / settings of this plugin would neither be synced.
 - **Some limitations from the browser environment.** More technical details are [in the doc](./docs/browser_env.md).
 ## Questions, Suggestions, Or Bugs
@@ -48,7 +51,7 @@ Additionally, the plugin author may occasionally visit Obsidian official forum a
 ## Download and Install
- Option #1: Search in the official "community plugin list", or click [obsidian://show-plugin?id=remotely-save](obsidian://show-plugin?id=remotely-save), then install the plugin.
+- Option #1: Search in the official "community plugin list", or visit this: [https://obsidian.md/plugins?id=remotely-save](https://obsidian.md/plugins?id=remotely-save) (which should redirect you into Obsidian app), then install the plugin.
 - Option #2: You can also use [Obsidian42 - BRAT](https://github.com/TfTHacker/obsidian42-brat) to install this plugin. Input `fyears/remotely-save` in the configuration of BRAT.
 - Option #3: [![GitHub release (latest by SemVer and asset including pre-releases)](https://img.shields.io/github/downloads-pre/fyears/remotely-save/latest/main.js?sort=semver)](https://github.com/fyears/remotely-save/releases) Manually download assets (`main.js`, `manifest.json`, `styles.css`) from the latest release.
 - Option #4: [![BuildCI](https://github.com/fyears/remotely-save/actions/workflows/auto-build.yml/badge.svg)](https://github.com/fyears/remotely-save/actions/workflows/auto-build.yml) Every artifacts are placed in the "Summary" under every successful builds. It's automatically generated by every commit, may break something.
@@ -58,11 +61,11 @@ Additionally, the plugin author may occasionally visit Obsidian official forum a
 ### S3
 - Prepare your S3 (-compatible) service information: [endpoint, region](https://docs.aws.amazon.com/general/latest/gr/s3.html), [access key id, secret access key](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/getting-your-credentials.html), bucket name. The bucket should be empty and solely for syncing a vault.
- Configure (enable) [CORS](https://docs.aws.amazon.com/AmazonS3/latest/userguide/enabling-cors-examples.html) for requests from `app://obsidian.md` and `capacitor://localhost` and `http://localhost`. It's unfortunately required, because the plugin sends requests from a browser-like envirement. And those addresses are tested and found on desktop and ios and android.
+- Configure (enable) [CORS](https://docs.aws.amazon.com/AmazonS3/latest/userguide/enabling-cors-examples.html) for requests from `app://obsidian.md` and `capacitor://localhost` and `http://localhost`. Full example is [here](./docs/s3_cors_configure.md). It's unfortunately required, because the plugin sends requests from a browser-like envirement. And those addresses are tested and found on desktop and ios and android.
 - Download and enable this plugin.
 - Enter your information to the settings of this plugin.
 - If you want to enable end-to-end encryption, also set a password in settings. If you do not specify a password, the files and folders are synced in plain, original content to the cloud.
- Click the new "circle arrow" icon on the ribbon (the left sidebar), **every time** you want to sync your vault between local and remote. (Or, you could configure auto sync in the settings panel (See next chapter).) While syncing, the icon becomes "two half-circle arrows".
+- Click the new "circle arrow" icon on the ribbon (the left sidebar), **every time** you want to sync your vault between local and remote. (Or, you could configure auto sync in the settings panel (See next chapter).) While syncing, the icon becomes "two half-circle arrows". Besides clicking the icon on the sidebar ribbon, you can also activate the corresponding command in the command palette.
 - **Be patient while syncing.** Especially in the first-time sync.
 ### Dropbox
@@ -98,6 +101,10 @@ Additionally, the plugin author may occasionally visit Obsidian official forum a
 - In auto sync mode, if any error occurs, the plugin would **fail silently**.
 - Auto sync only works when Obsidian is being opened. It's **technically impossible** to auto sync while Obsidian is in background, because the plugin just works in the browser environment provided by Obsidian.
 ## How To Debug
 See [here](./docs/how_to_debug/README.md) for more details.
 ## Bonus: Import And Export Not-Oauth2 Plugin Settings By QR Code
 See [here](./docs/import_export_some_settings.md) for more details.
@@ -0,0 +1,12 @@
 # Limitations From The Browser Environment
 Obsidian desktop is developed by using [Electron](https://www.electronjs.org/). And Obsidian mobile is developed by using [Capacitor](https://capacitorjs.com/)
 Technically, the plugin (or any plugin?) runs in the js environment provided by Obsidian. And to support the mobile Obsidian, the plugin is limited to be developed for the browser environment, instead of the Node.js environment.
 Then some limitations are applied:
 1. [The CORS policy.](./browser_env_cors.md)
 2. [No Node.js environment.](./browser_env_no_nodejs.md)
 3. If the cloud service uses OAuth flow, it needs to support PKCE. More details are [here](./browser_env_oauth2_pkce.md).
 4. [No background running after Obsidian is closes.](./browser_env_no_background_after_closing.md)
@@ -0,0 +1,21 @@
 # Limitations From The Browser Environment: CORS Issue
 The plugin is developed for the browser environment. The "fake" browser behind the scenes also follows the CORS policy.
 [MDN has a doc about CORS.](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS)
 To solve the issue, we have some options:
 1. The server side needs to return the header `Access-Control-Allow-Origin` allowing the origins `app://obsidian.md` and `capacitor://localhost` and `http://localhost`. Sometimes in the future, the header `Access-Control-Expose-Headers` with some values being set might be also needed.
   [Here is an example configuration for Amazon S3.](./s3_cors_configure.md)
   However, some cloud services do not allow configuring or exposing these headers. (Notably most public WebDAV services.)
   It's of course possible if the users build the services by themselves.
 2. Obsidian implements and exposes a new api helping developers to bypass the CORS policy.
   Currently (as of Feb 2022), an api `request()` indeed exists, but it only deals with text-like data, and does not support binary data or response headers reading yet.
   Because this plugin allows uploading and downloading binary data, so a more feature-rich api is needed.
@@ -0,0 +1,3 @@
 # Limitations From The Browser Environment: No Background Running After Obsidian Is Closed
 The plugin treats Obsidian as a special browser, and is in fact some js codes. So if Obsidian is closed, then the browser environment stops, then the plugin will be stopped.
@@ -0,0 +1,9 @@
 # Limitations From The Browser Environment: No Node.js
 To support the mobile Obsidian, the plugin is limited to be developed for the browser environment, instead of the Node.js environment.
 Many js libraries are designed to work in both the browser and the Node.js environments. But some are not, because the browser doesn't provide the corresponding abilities.
 For example, there is a popular npm package [`ssh2-sftp-client`](https://www.npmjs.com/package/ssh2-sftp-client) for SFTP. But it relies on the modules (e.g. `http`) from Node.js which cannot be "translated" to the browser environment. So it's impossible to make this plugin support SFTP. The same status applies to FTP / FTPS.
 Likewise, [MEGA](https://mega.nz/) provides a SDK, but the SDK is [for C++ only](https://mega.nz/doc), so it's also impossible to make this plugin support MEGA.
@@ -0,0 +1,7 @@
 # Limitations From The Browser Environment: OAuth2 PKCE
 If the cloud service uses OAuth flow, it needs to support PKCE, because the plugin is released to the public, and no real secrets can be statically kept in the client.
 Luckily, Dropbox and OneDrive supports PKCE, making it possible for this plugin to connect to them easily.
 Dropbox has an excellent [article](https://dropbox.tech/developers/pkce--what-and-why-) explaining what is and how to use PKCE.
@@ -0,0 +1,11 @@
 # How To Debug
 Ideally, users do not need to debug anything. But if something bad happened, we have to dig into details.
 ## Easy: Export Sync Plans
 See [here](./export_sync_plans.md).
 ## Advanced: Check Console Output
 See [here](./check_console_output.md).
@@ -0,0 +1,17 @@
 # Check Console Output
 If you are using Obsidian on desktop, you can check the Obsidian console.
 ## Disable Auto Sync Firstly
 You should disable auto sync to avoid any unexpected running.
 ## Set The Output Level To Debug
 Go to the plugin settings, scroll down to the section "Debug" -> "alter console log level", and change it from "info" to "debug".
 ## Check The Output
 Then, press the keyboard shortcut "ctrl+shift+i" if you are on Windows or Linux, or press "cmd+shift+i" if you are on macOS. You should be able to see the console of Obsidian.
 Trigger the sync manually (by clicking the icon on the ribbon sidebar). Something (hopefully) helpful should show up in the console. You could understand what happened and what goes wrong more explictly by checking the output.
@@ -0,0 +1,95 @@
 # Export Sync Plans
 ## What's this?
 Everytime the plugin starts a sync, it gathers all required information together, generates a "sync plan" of every operations to every files and folders, and assign the corresponding actual operations.
 Thus, if something goes wrong, we should check the sync plan firstly.
 ## How To Export The Plans?
 Please read through the following instructions.
 ### Disable Auto Sync Firstly
 You should disable auto sync to avoid any unexpected running.
 ### Manual Sync If Not Yet
 You should at least sync once, so that at least one sync plan is generated and saved. If you have synced the vualt before, there should be some sync plans already saved.
 ### Export To The File
 Go to the plugin settings, scroll down to the section "Debug" -> "export sync plans", and click the button "Export". \*\*It would generate a new folder `_debug_remotely_save/` in your vault, and generate a file `sync_plans_hist_exported_on_{a_timestamp},md.` inside that folder.
 ## How To Read The Plans
 Open the genrated `sync_plans_hist_exported_on_{a_timestamp},md.`. You should see a json, or multiple jsons. Every json represents a sync plan.
 A sync plan looks like this:
 ```json
 {
  "ts": 1646960867560,
  "remoteType": "onedrive",
  "mixedStates": {
    "abc.md": {
      "key": "abc.md",
      "existRemote": true,
      "mtimeRemote": 1646566632000,
      "sizeRemote": 56797,
      "remoteEncryptedKey": "abc.md",
      "changeMtimeUsingMapping": true,
      "existLocal": true,
      "mtimeLocal": 1646566632000,
      "sizeLocal": 56797,
      "decision": "skipUploading",
      "decisionBranch": 1
    },
    "New folder/": {
      "key": "New folder/",
      "deltimeRemote": 1646925354372,
      "existLocal": false,
      "existRemote": false,
      "decision": "keepRemoteDelHistFolder",
      "decisionBranch": 9
    }
  }
 }
 ```
 We usually care about the `mixedStates` property. As you may guess, every item in `mixedStates` represent a file or a folder.
 We should find out the file/folder we are interested in (or we believe something goes wrong), then checkout the following properties:
 ```
 decision
  What decision is made.
 decisionBranch
  It's a mark of the actual logic in the sync code. Useful to debug.
 existRemote
  Does the file/folder exist on the remote service?
 mtimeRemote
  The "last modeified time" on the remote service.
 deltimeRemote
  The "deletion time" on the remote record.
 existLocal
  Does the file/folder exist locally?
 mtimeLocal
  The max of "last modeified time" and "creation time" locally.
 deltimeLocal
  The "deletion time" locally.
 ```
 The `decision` SHOULD be determined by the modified times and deletion times, by the logic described in [the doc of sync alogorithm](../sync_algorithm_v2.md). In short, we collect four timestamps (`mtimeRemote`, `deltimeRemote`, `mtimeLocal`, `deltimeLocal`), and respect the max timestamp and its corresponding operation.
 ## Common Issues
 Some users report that their "last modeified time"s or "creation time"s are not set correctly by the operating system. In this case, the plugin cannot do anything because it determines the sync plan by comparing the timestamps. It's suggested to check the settings of the operating system or check whether other programs are doing something to the files.
@@ -1,36 +1,21 @@
 # Minimal Intrusive Design
-The plugin tries to avoid saving additional meta data remotely.
+Before version 0.3.0, the plugin did not upload additional meta data to the remote.
 From and after version 0.3.0, the plugin just upload minimal extra necessary meta data to the remote.
 ## Benefits
-Then the plugin doesn't make any assumptions about information on the remote endpoint.
+Then the plugin doesn't make more-than-necessary assumptions about information on the remote endpoint.
 For example, it's possbile for a uses to manually upload a file to s3, and next time the plugin can download that file to the local device.
 And it's also possible to combine another "sync-to-s3" solution (like, another software) on desktops, and this plugin on mobile devices, together.
-## Flaws
+## Necessarity Of Uploading Extra Metadata
 The main issue comes from deletions (and renamings which is actually interpreted as "deletion-then-creation").
-Consider this:
+If we don't upload any extra info to the remote, there's usually no way for the second device to know what files / folders have been deleted on the first device.
-1. The user create and sync a file to the cloud on the 1st device.
+To overcome this issue, from and after version 0.3.0, the plugin uploads extra metadata files `_remotely-save-metadata-on-remote.{json,bin}` to users' configured cloud services. Those files contain some info about what has been deleted on the first device, so that the second device can read the list to apply the deletions to itself. Some other necessary meta info would also be written into the extra files.
 2. Then download this file to the 2nd device.
 3. And then delete this file on the 1st device.
 4. And sync on the 1st device. The file on the cloud is also deleted.
 5. And sync on the 2nd device. **The 2nd device would upload the file again to the cloud.**
 In step 4, the file is marked "deleted" on the 1st device, and the 1st device send the command "delete this file on the cloud" to the cloud sevice (e.g. s3). Then the file on the cloud is also deleted. So far so good.
 But, in step 5, because no meta data are saved on the cloud, the 2nd device doesn't know that the file are deleted. Instead, it thinks "the file was not synced to the cloud last time, so it's uploaded this time". So an unintentional upload occurs.
 Currently no way to fix this if no meta data are saved remotely. The only workarounds are:
 1. Delete the file on the 1st device, **before** syncing it to the cloud. Then the file never show up on the cloud or on the 2nd device.
 2. Or, manually delete the file on 2nd device **before** step 5 in above situation.
 ## Future
 This design may be changed in the feature, considering the flaws described above.
@@ -0,0 +1,31 @@
 # How To Configure S3 CORS Rules
 Thanks to [@NAL100 in the Discussion](https://github.com/fyears/remotely-save/discussions/28).
 Please try this config:
 ```json
 [
  {
    "AllowedHeaders": ["*"],
    "AllowedMethods": ["GET", "PUT", "POST", "DELETE", "HEAD"],
    "AllowedOrigins": [
      "app://obsidian.md",
      "capacitor://localhost",
      "http://localhost"
    ],
    "ExposeHeaders": [
      "Content-Length",
      "Content-Type",
      "Connection",
      "Date",
      "ETag",
      "Server",
      "x-amz-delete-marker",
      "x-amz-id-2",
      "x-amz-request-id",
      "x-amz-version-id"
    ]
  }
 ]
 ```
@@ -0,0 +1,40 @@
 # services connectability
 Here is an overview of the connectability ("connectable" or "not connectable" or "in the plan" or "never") to some services by this plugin.
 The list is for information purposes only.
 | Service                                                                               | Connectable | by S3 | by WebDAV | by other protocol | More Info                                                    |
 | ------------------------------------------------------------------------------------- | ----------- | ----- | --------- | ----------------- | ------------------------------------------------------------ |
 | Amazon S3                                                                             | Yes         | Yes   |           |                   | [CORS config needed.](./s3_cors_configure.md)                |
 | Tencent Cloud - Cloud Object Storage (COS) 腾讯云对象存储                             | Yes         | Yes   |           |                   | CORS config needed.                                          |
 | Alibaba Cloud - Object Storage Service 阿里云对象存储                                 | Yes         | Yes   |           |                   | CORS config needed.                                          |
 | Backblaze B2 Cloud Storage                                                            | No          | No    |           |                   | Its CORS rules doesn't allow no-http(s) origins.             |
 | [Wasabi](https://wasabi.com)                                                          | ?           | ?     |           |                   |                                                              |
 | [filebase](https://filebase.com/)                                                     | Yes         | Yes   |           |                   | CORS config needed.                                          |
 | QingStor 青云                                                                         | ?           | ?     |           |                   |                                                              |
 | [MinIO](https://min.io/)                                                              | ?           | ?     |           |                   |                                                              |
 | [WsgiDAV](https://github.com/mar10/wsgidav)                                           | Yes         |       | Yes       |                   | CORS rules can be set.                                       |
 | [Nginx `ngx_http_dav_module`](http://nginx.org/en/docs/http/ngx_http_dav_module.html) | ?           |       | ?         |                   | Should be possible?                                          |
 | NextCloud                                                                             | No?         |       | No?       |                   | No CORS config by default.                                   |
 | OwnCloud                                                                              | No?         |       | No?       |                   | No CORS config by default.                                   |
 | Seafile                                                                               | ?           |       | ?         |                   |                                                              |
 | `rclone serve webdav`                                                                 | No          |       | No        |                   | No CORS support.                                             |
 | [Nutstore 坚果云](https://www.jianguoyun.com/)                                        | No          |       | No        |                   | No CORS support.                                             |
 | [TeraCLOUD](https://teracloud.jp/en/)                                                 | No          |       | No        |                   | No CORS support.                                             |
 | Dropbox                                                                               | Yes         |       |           | Yes               |                                                              |
 | OneDrive for personal                                                                 | Yes         |       |           | Yes               |                                                              |
 | OneDrive for Business                                                                 | In the plan |       |           | ?                 |                                                              |
 | Google Drive                                                                          | In the plan |       |           | ?                 |                                                              |
 | [Box](https://www.box.com/)                                                           | ?           |       |           | ?                 | May be possible but needs further development.               |
 | Google Cloud Storage                                                                  | ?           |       |           | ?                 | May be possible but needs further development.               |
 | Microsoft Azure Blob Storage                                                          | ?           |       |           | ?                 | May be possible but needs further development.               |
 | [OpenStack Storage (Swift)](https://github.com/openstack/swift)                       | ?           |       |           | ?                 | May be possible but needs further development.               |
 | https://put.io/                                                                       | ?           |       |           | ?                 |                                                              |
 | Yandex Disk                                                                           | ?           |       |           | ?                 |                                                              |
 | FTP / FTPS                                                                            | Never       |       |           | No                | Technically never possible to be implemented.                |
 | SFTP                                                                                  | Never       |       |           | No                | Technically never possible to be implemented.                |
 | Jottacloud                                                                            | No          |       |           | No                | It seems that no open api is available.                      |
 | Mega                                                                                  | Never       |       |           | No                | No js api is available.                                      |
 | Git                                                                                   | Never       |       |           | No                | Technically very hard, if not impossible, to be implemented. |
 |                                                                                       |             |       |           |                   |                                                              |
@@ -4,9 +4,9 @@
 We have three record sources:
-1. Local files
+1. Local files. By scanning all files in the vault locally. Actually Obsidian provides an api directly returning this.
-2. Remote files
+2. Remote files. By scanning all files on the remote service. Some services provide an api directly returning this, and some other services require the plugin scanning the folders recursively.
-3. Local "delete-or-rename" history.
+3. Local "delete-or-rename" history. It's recorded by using Obsidian's tracking api. So if users delete or rename files/folders outside Obsidian, we could do nothing.
 Assuming all sources are reliable.
@@ -0,0 +1,63 @@
 # Sync Algorithm V2
 ## Sources
 We have 4 record sources:
 1. Local files. By scanning all files in the vault locally. Actually Obsidian provides an api directly returning this.
 2. Remote files. By scanning all files on the remote service. Some services provide an api directly returning this, and some other services require the plugin scanning the folders recursively.
 3. Local "delete-or-rename" history. It's recorded by using Obsidian's tracking api. So if users delete or rename files/folders outside Obsidian, we could do nothing.
 4. Remote "delete" history. It's uploaded by the plugin in each sync.
 Assuming all sources are reliable.
 ## Deal with them
 We list all combinations mutually exclusive and collectively exhaustive.
 ### Files
 In short, we collect four timestamps, and respect the max timestamp and its corresponding operation.
 | t1             | t2             | t3             | t4             | local file to do | remote file to do | local del history to do | remote del history to do | equal to sync v2 branch |
 | -------------- | -------------- | -------------- | -------------- | ---------------- | ----------------- | ----------------------- | ------------------------ | ----------------------- |
 | mtime_remote   | mtime_local    | deltime_remote | deltime_local  | del_if_exists    | del_if_exists     | clean                   | upload_local_del_history |                         |
 | mtime_local    | mtime_remote   | deltime_remote | deltime_local  | del_if_exists    | del_if_exists     | clean                   | upload_local_del_history |                         |
 | mtime_remote   | deltime_remote | mtime_local    | deltime_local  | del_if_exists    | del_if_exists     | clean                   | upload_local_del_history |                         |
 | deltime_remote | mtime_remote   | mtime_local    | deltime_local  | del_if_exists    | del_if_exists     | clean                   | upload_local_del_history |                         |
 | mtime_local    | deltime_remote | mtime_remote   | deltime_local  | del_if_exists    | del_if_exists     | clean                   | upload_local_del_history |                         |
 | deltime_remote | mtime_local    | mtime_remote   | deltime_local  | del_if_exists    | del_if_exists     | clean                   | upload_local_del_history | 8                       |
 | mtime_remote   | mtime_local    | deltime_local  | deltime_remote | del_if_exists    | del_if_exists     | clean                   | keep                     |                         |
 | mtime_local    | mtime_remote   | deltime_local  | deltime_remote | del_if_exists    | del_if_exists     | clean                   | keep                     |                         |
 | mtime_remote   | deltime_local  | mtime_local    | deltime_remote | del_if_exists    | del_if_exists     | clean                   | keep                     |                         |
 | deltime_local  | mtime_remote   | mtime_local    | deltime_remote | del_if_exists    | del_if_exists     | clean                   | keep                     |                         |
 | mtime_local    | deltime_local  | mtime_remote   | deltime_remote | del_if_exists    | del_if_exists     | clean                   | keep                     |                         |
 | deltime_local  | mtime_local    | mtime_remote   | deltime_remote | del_if_exists    | del_if_exists     | clean                   | keep                     |                         |
 | mtime_remote   | deltime_remote | deltime_local  | mtime_local    | skip             | upload_local      | clean                   | clean                    |                         |
 | deltime_remote | mtime_remote   | deltime_local  | mtime_local    | skip             | upload_local      | clean                   | clean                    | 10                      |
 | mtime_remote   | deltime_local  | deltime_remote | mtime_local    | skip             | upload_local      | clean                   | clean                    |                         |
 | deltime_local  | mtime_remote   | deltime_remote | mtime_local    | skip             | upload_local      | clean                   | clean                    |                         |
 | deltime_remote | deltime_local  | mtime_remote   | mtime_local    | skip             | upload_local      | clean                   | clean                    | 2;3;4;5;6               |
 | deltime_local  | deltime_remote | mtime_remote   | mtime_local    | skip             | upload_local      | clean                   | clean                    |                         |
 | mtime_local    | deltime_remote | deltime_local  | mtime_remote   | download_remote  | skip              | clean                   | clean                    |                         |
 | deltime_remote | mtime_local    | deltime_local  | mtime_remote   | download_remote  | skip              | clean                   | clean                    | 7;9                     |
 | mtime_local    | deltime_local  | deltime_remote | mtime_remote   | download_remote  | skip              | clean                   | clean                    |                         |
 | deltime_local  | mtime_local    | deltime_remote | mtime_remote   | download_remote  | skip              | clean                   | clean                    |                         |
 | deltime_remote | deltime_local  | mtime_local    | mtime_remote   | download_remote  | skip              | clean                   | clean                    | 1;9                     |
 | deltime_local  | deltime_remote | mtime_local    | mtime_remote   | download_remote  | skip              | clean                   | clean                    |                         |
 ### Folders
 We actually do not use any folders' metadata. Thus the only relevent info is their names, while the mtime is actually ignorable.
 1. Firstly generate all the files' plan. If any files exist, then it's parent folders all should exist. If the should-exist folder doesn't exist locally, the local should create it recursively. If the should-exist folder doesn't exist remotely, the remote should create it recursively.
 2. Then, a folder is deletable, if and only if all the following conditions meet:
   - it shows up in the remote deletion history
   - it's empty, or all its sub-folders are deletable
   Some examples:
   - A user deletes the folder in device 1, then syncs from the device 1, then creates the same-name folder in device 2, then syncs from the device 2. The folder is deleted (again), on device 2.
   - A user deletes the folder in device 1, then syncs from the device 1, then creates the same-name folder in device 2, **then create a new file inside it,** then syncs from the device 2. The folder is **kept** instead of deleted because of the new file, on device 2.
   - A user deletes the folder in device 1, then syncs from the device 1, then do not touch the same-name folder in device 2, then syncs from the device 2. The folder and its untouched sub-files should be deleted on device 2.
@@ -32,6 +32,8 @@ esbuild
      "electron",
      "fs",
      "crypto",
      "tls",
      "net",
      // ...builtins
    ],
    format: "cjs",
@@ -1,8 +1,8 @@
 {
  "id": "remotely-save",
  "name": "Remotely Save",
-  "version": "0.2.11",
+  "version": "0.3.5",
-  "minAppVersion": "0.12.15",
+  "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",
@@ -1,6 +1,6 @@
 {
  "name": "remotely-save",
-  "version": "0.2.11",
+  "version": "0.3.5",
  "description": "This is yet another sync plugin for Obsidian app.",
  "scripts": {
    "dev2": "node esbuild.config.mjs",
@@ -15,7 +15,8 @@
    "path": "path-browserify",
    "process": "process/browser",
    "stream": "stream-browserify",
-    "crypto": "crypto-browserify"
+    "crypto": "crypto-browserify",
    "url": "url/"
  },
  "source": "main.ts",
  "keywords": [],
@@ -51,9 +52,14 @@
  },
  "dependencies": {
    "@aws-sdk/client-s3": "^3.37.0",
-    "@aws-sdk/lib-storage": "^3.40.1",
+    "@aws-sdk/fetch-http-handler": "^3.53.0",
    "@aws-sdk/lib-storage": "^3.53.1",
    "@aws-sdk/protocol-http": "^3.53.0",
    "@aws-sdk/querystring-builder": "^3.53.0",
    "@aws-sdk/signature-v4-crt": "^3.37.0",
-    "@azure/msal-node": "^1.4.0",
+    "@aws-sdk/types": "^3.53.0",
    "@azure/msal-node": "^1.6.0",
    "@fyears/tsqueue": "^1.0.1",
    "@microsoft/microsoft-graph-client": "^3.0.1",
    "acorn": "^8.5.0",
    "assert": "^2.0.0",
@@ -63,18 +69,21 @@
    "crypto-browserify": "^3.12.0",
    "dropbox": "^10.22.0",
    "feather-icons": "^4.28.0",
    "http-status-codes": "^2.2.0",
    "localforage": "^1.10.0",
    "lodash": "^4.17.21",
    "loglevel": "^1.8.0",
    "mime-types": "^2.1.33",
    "nanoid": "^3.1.30",
-    "obsidian": "^0.12.0",
+    "obsidian": "^0.13.26",
    "p-queue": "^7.2.0",
    "path-browserify": "^1.0.1",
    "process": "^0.11.10",
    "qrcode": "^1.5.0",
    "rfc4648": "^1.5.0",
    "rimraf": "^3.0.2",
    "stream-browserify": "^3.0.0",
    "url": "^0.11.0",
    "util": "^0.12.4",
    "webdav": "^4.7.0",
    "webdav-fs": "^4.0.0",
@@ -11,6 +11,7 @@ export interface S3Config {
  s3AccessKeyID: string;
  s3SecretAccessKey: string;
  s3BucketName: string;
  bypassCorsLocally?: boolean;
 }
 export interface DropboxConfig {
@@ -31,6 +32,7 @@ export interface WebdavConfig {
  username: string;
  password: string;
  authType: WebdavAuthType;
  manualRecursive: boolean;
 }
 export interface OnedriveConfig {
@@ -55,6 +57,9 @@ export interface RemotelySavePluginSettings {
  currLogLevel?: string;
  vaultRandomID?: string;
  autoRunEveryMilliseconds?: number;
  initRunAfterMilliseconds?: number;
  agreeToUploadExtraMetadata?: boolean;
  concurrency?: number;
 }
 export interface RemoteItem {
@@ -79,3 +84,38 @@ export interface UriParams {
 // 80 days
 export const OAUTH2_FORCE_EXPIRE_MILLISECONDS = 1000 * 60 * 60 * 24 * 80;
 type DecisionTypeForFile =
  | "skipUploading" // special, mtimeLocal === mtimeRemote
  | "uploadLocalDelHistToRemote" // "delLocalIfExists && delRemoteIfExists && cleanLocalDelHist && uploadLocalDelHistToRemote"
  | "keepRemoteDelHist" // "delLocalIfExists && delRemoteIfExists && cleanLocalDelHist && keepRemoteDelHist"
  | "uploadLocalToRemote" // "skipLocal && uploadLocalToRemote && cleanLocalDelHist && cleanRemoteDelHist"
  | "downloadRemoteToLocal"; // "downloadRemoteToLocal && skipRemote && cleanLocalDelHist && cleanRemoteDelHist"
 type DecisionTypeForFolder =
  | "createFolder"
  | "uploadLocalDelHistToRemoteFolder"
  | "keepRemoteDelHistFolder"
  | "skipFolder";
 export type DecisionType = DecisionTypeForFile | DecisionTypeForFolder;
 export interface FileOrFolderMixedState {
  key: string;
  existLocal?: boolean;
  existRemote?: boolean;
  mtimeLocal?: number;
  mtimeRemote?: number;
  deltimeLocal?: number;
  deltimeRemote?: number;
  sizeLocal?: number;
  sizeRemote?: number;
  changeMtimeUsingMapping?: boolean;
  decision?: DecisionType;
  decisionBranch?: number;
  syncDone?: "done";
  remoteEncryptedKey?: string;
 }
 export const API_VER_STAT_FOLDER = "0.13.27";
 export const API_VER_REQURL = "0.13.26";
@@ -34,11 +34,13 @@ import {
 import { DEFAULT_S3_CONFIG } from "./remoteForS3";
 import { DEFAULT_WEBDAV_CONFIG } from "./remoteForWebdav";
 import { RemotelySaveSettingTab } from "./settings";
-import type { SyncStatusType } from "./sync";
+import { fetchMetadataFile, parseRemoteItems, SyncStatusType } from "./sync";
 import { doActualSync, getSyncPlan, isPasswordOk } from "./sync";
 import { messyConfigToNormal, normalConfigToMessy } from "./configPersist";
 import * as origLog from "loglevel";
 import { DeletionOnRemote, MetadataOnRemote } from "./metadataOnRemote";
 import { SyncAlgoV2Modal } from "./syncAlgoV2Notice";
 const log = origLog.getLogger("rs-default");
 const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
@@ -51,6 +53,9 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
  currLogLevel: "info",
  vaultRandomID: "",
  autoRunEveryMilliseconds: -1,
  initRunAfterMilliseconds: -1,
  agreeToUploadExtraMetadata: false,
  concurrency: 5,
 };
 interface OAuth2Info {
@@ -61,7 +66,7 @@ interface OAuth2Info {
  revokeAuthSetting?: Setting;
 }
-type SyncTriggerSourceType = "manual" | "auto";
+type SyncTriggerSourceType = "manual" | "auto" | "dry" | "autoOnceInit";
 const iconNameSyncWait = `remotely-save-sync-wait`;
 const iconNameSyncRunning = `remotely-save-sync-running`;
@@ -89,7 +94,7 @@ export default class RemotelySavePlugin extends Plugin {
    const getNotice = (x: string) => {
      // only show notices in manual mode
      // no notice in auto mode
-      if (triggerSource === "manual") {
+      if (triggerSource === "manual" || triggerSource === "dry") {
        new Notice(x);
      }
    };
@@ -122,14 +127,22 @@ export default class RemotelySavePlugin extends Plugin {
        );
      }
      const MAX_STEPS = 8;
      if (triggerSource === "dry") {
        getNotice(
          `0/${MAX_STEPS} Remotely Save running in dry mode, not actual file changes would happen.`
        );
      }
      //log.info(`huh ${this.settings.password}`)
      getNotice(
-        `1/7 Remotely Save Sync Preparing (${this.settings.serviceType})`
+        `1/${MAX_STEPS} Remotely Save Sync Preparing (${this.settings.serviceType})`
      );
      this.syncStatus = "preparing";
-      getNotice("2/7 Starting to fetch remote meta data.");
+      getNotice(`2/${MAX_STEPS} Starting to fetch remote meta data.`);
-      this.syncStatus = "getting_remote_meta";
+      this.syncStatus = "getting_remote_files_list";
      const self = this;
      const client = new RemoteClient(
        this.settings.serviceType,
@@ -141,19 +154,9 @@ export default class RemotelySavePlugin extends Plugin {
        () => self.saveSettings()
      );
      const remoteRsp = await client.listFromRemote();
-      // log.info(remoteRsp);
+      log.debug(remoteRsp);
-      getNotice("3/7 Starting to fetch local meta data.");
+      getNotice(`3/${MAX_STEPS} Checking password correct or not.`);
      this.syncStatus = "getting_local_meta";
      const local = this.app.vault.getAllLoadedFiles();
      const localHistory = await loadDeleteRenameHistoryTableByVault(
        this.db,
        this.settings.vaultRandomID
      );
      // log.info(local);
      // log.info(localHistory);
      getNotice("4/7 Checking password correct or not.");
      this.syncStatus = "checking_password";
      const passwordCheckResult = await isPasswordOk(
        remoteRsp.Contents,
@@ -164,43 +167,83 @@ export default class RemotelySavePlugin extends Plugin {
        throw Error(passwordCheckResult.reason);
      }
-      getNotice("5/7 Starting to generate sync plan.");
+      getNotice(`4/${MAX_STEPS} Trying to fetch extra meta data from remote.`);
-      this.syncStatus = "generating_plan";
+      this.syncStatus = "getting_remote_extra_meta";
-      const syncPlan = await getSyncPlan(
+      const { remoteStates, metadataFile } = await parseRemoteItems(
        remoteRsp.Contents,
        local,
        localHistory,
        this.db,
        this.settings.vaultRandomID,
        client.serviceType,
        this.settings.password
      );
-      log.info(syncPlan.mixedStates); // for debugging
+      const origMetadataOnRemote = await fetchMetadataFile(
-      await insertSyncPlanRecordByVault(
+        metadataFile,
        client,
        this.app.vault,
        this.settings.password
      );
      getNotice(`5/${MAX_STEPS} Starting to fetch local meta data.`);
      this.syncStatus = "getting_local_meta";
      const local = this.app.vault.getAllLoadedFiles();
      const localHistory = await loadDeleteRenameHistoryTableByVault(
        this.db,
        syncPlan,
        this.settings.vaultRandomID
      );
      // log.info(local);
      // log.info(localHistory);
-      // The operations above are read only and kind of safe.
+      getNotice(`6/${MAX_STEPS} Starting to generate sync plan.`);
      this.syncStatus = "generating_plan";
      const { plan, sortedKeys, deletions } = await getSyncPlan(
        remoteStates,
        local,
        origMetadataOnRemote.deletions,
        localHistory,
        client.serviceType,
        this.app.vault,
        this.settings.password
      );
      log.info(plan.mixedStates); // for debugging
      if (triggerSource !== "dry") {
        await insertSyncPlanRecordByVault(
          this.db,
          plan,
          this.settings.vaultRandomID
        );
      }
      // The operations above are almost read only and kind of safe.
      // The operations below begins to write or delete (!!!) something.
-      getNotice("6/7 Remotely Save Sync data exchanging!");
+      if (triggerSource !== "dry") {
        getNotice(`7/${MAX_STEPS} Remotely Save Sync data exchanging!`);
-      this.syncStatus = "syncing";
+        this.syncStatus = "syncing";
-      await doActualSync(
+        await doActualSync(
-        client,
+          client,
-        this.db,
+          this.db,
-        this.settings.vaultRandomID,
+          this.settings.vaultRandomID,
-        this.app.vault,
+          this.app.vault,
-        syncPlan,
+          plan,
-        this.settings.password,
+          sortedKeys,
-        (i: number, totalCount: number, pathName: string, decision: string) =>
+          metadataFile,
-          self.setCurrSyncMsg(i, totalCount, pathName, decision)
+          origMetadataOnRemote,
-      );
+          deletions,
          (key: string) => self.trash(key),
          this.settings.password,
          this.settings.concurrency,
          (i: number, totalCount: number, pathName: string, decision: string) =>
            self.setCurrSyncMsg(i, totalCount, pathName, decision)
        );
      } else {
        this.syncStatus = "syncing";
        getNotice(
          `7/${MAX_STEPS} Remotely Save real sync is skipped in dry run mode.`
        );
      }
-      getNotice("7/7 Remotely Save finish!");
+      getNotice(`8/${MAX_STEPS} Remotely Save finish!`);
      this.currSyncMsg = "";
      this.syncStatus = "finish";
      this.syncStatus = "idle";
@@ -465,22 +508,36 @@ export default class RemotelySavePlugin extends Plugin {
      async () => this.syncRun("manual")
    );
    this.addCommand({
      id: "start-sync",
      name: "start sync",
      icon: iconNameSyncWait,
      callback: async () => {
        this.syncRun("manual");
      },
    });
    this.addCommand({
      id: "start-sync-dry-run",
      name: "start sync (dry run only)",
      icon: iconNameSyncWait,
      callback: async () => {
        this.syncRun("dry");
      },
    });
    this.addSettingTab(new RemotelySaveSettingTab(this.app, this));
    // this.registerDomEvent(document, "click", (evt: MouseEvent) => {
    //   log.info("click", evt);
    // });
-    if (
+    if (!this.settings.agreeToUploadExtraMetadata) {
-      this.settings.autoRunEveryMilliseconds !== undefined &&
+      const syncAlgoV2Modal = new SyncAlgoV2Modal(this.app, this);
-      this.settings.autoRunEveryMilliseconds !== null &&
+      syncAlgoV2Modal.open();
-      this.settings.autoRunEveryMilliseconds > 0
+    } else {
-    ) {
+      this.enableAutoSyncIfSet();
-      const intervalID = window.setInterval(() => {
+      this.enableInitSyncIfSet();
        this.syncRun("auto");
      }, this.settings.autoRunEveryMilliseconds);
      this.autoRunIntervalID = intervalID;
      this.registerInterval(intervalID);
    }
  }
@@ -504,6 +561,9 @@ export default class RemotelySavePlugin extends Plugin {
    if (this.settings.onedrive.authority === "") {
      this.settings.onedrive.authority = DEFAULT_SETTINGS.onedrive.authority;
    }
    if (this.settings.webdav.manualRecursive === undefined) {
      this.settings.webdav.manualRecursive = false;
    }
  }
  async saveSettings() {
@@ -590,10 +650,51 @@ export default class RemotelySavePlugin extends Plugin {
    }
  }
  async trash(x: string) {
    if (!(await this.app.vault.adapter.trashSystem(x))) {
      await this.app.vault.adapter.trashLocal(x);
    }
  }
  async prepareDB() {
    this.db = await prepareDBs(this.settings.vaultRandomID);
  }
  enableAutoSyncIfSet() {
    if (
      this.settings.autoRunEveryMilliseconds !== undefined &&
      this.settings.autoRunEveryMilliseconds !== null &&
      this.settings.autoRunEveryMilliseconds > 0
    ) {
      this.app.workspace.onLayoutReady(() => {
        const intervalID = window.setInterval(() => {
          this.syncRun("auto");
        }, this.settings.autoRunEveryMilliseconds);
        this.autoRunIntervalID = intervalID;
        this.registerInterval(intervalID);
      });
    }
  }
  enableInitSyncIfSet() {
    if (
      this.settings.initRunAfterMilliseconds !== undefined &&
      this.settings.initRunAfterMilliseconds !== null &&
      this.settings.initRunAfterMilliseconds > 0
    ) {
      this.app.workspace.onLayoutReady(() => {
        window.setTimeout(() => {
          this.syncRun("autoOnceInit");
        }, this.settings.initRunAfterMilliseconds);
      });
    }
  }
  async saveAgreeToUseNewSyncAlgorithm() {
    this.settings.agreeToUploadExtraMetadata = true;
    await this.saveSettings();
  }
  destroyDBs() {
    /* destroyDBs(this.db); */
  }
@@ -0,0 +1,87 @@
 import isEqual from "lodash/isEqual";
 import { base64url } from "rfc4648";
 import { reverseString } from "./misc";
 const DEFAULT_README_FOR_METADATAONREMOTE =
  "Do NOT edit or delete the file manually. This file is for the plugin remotely-save to store some necessary meta data on the remote services. Its content is slightly obfuscated.";
 const DEFAULT_VERSION_FOR_METADATAONREMOTE = "20220220";
 export const DEFAULT_FILE_NAME_FOR_METADATAONREMOTE =
  "_remotely-save-metadata-on-remote.json";
 export const DEFAULT_FILE_NAME_FOR_METADATAONREMOTE2 =
  "_remotely-save-metadata-on-remote.bin";
 export interface DeletionOnRemote {
  key: string;
  actionWhen: number;
 }
 export interface MetadataOnRemote {
  version?: string;
  generatedWhen?: number;
  deletions?: DeletionOnRemote[];
 }
 export const isEqualMetadataOnRemote = (
  a: MetadataOnRemote,
  b: MetadataOnRemote
 ) => {
  const m1 = a === undefined ? { deletions: [] } : a;
  const m2 = b === undefined ? { deletions: [] } : b;
  // we only need to compare deletions
  const d1 = m1.deletions === undefined ? [] : m1.deletions;
  const d2 = m2.deletions === undefined ? [] : m2.deletions;
  return isEqual(d1, d2);
 };
 export const serializeMetadataOnRemote = (x: MetadataOnRemote) => {
  const y = x;
  if (y["version"] === undefined) {
    y["version"] === DEFAULT_VERSION_FOR_METADATAONREMOTE;
  }
  if (y["generatedWhen"] === undefined) {
    y["generatedWhen"] = Date.now();
  }
  if (y["deletions"] === undefined) {
    y["deletions"] = [];
  }
  const z = {
    readme: DEFAULT_README_FOR_METADATAONREMOTE,
    d: reverseString(
      base64url.stringify(Buffer.from(JSON.stringify(x), "utf-8"), {
        pad: false,
      })
    ),
  };
  return JSON.stringify(z, null, 2);
 };
 export const deserializeMetadataOnRemote = (x: string | ArrayBuffer) => {
  let y1 = "";
  if (typeof x === "string") {
    y1 = x;
  } else {
    y1 = new TextDecoder().decode(x);
  }
  const y2: any = JSON.parse(y1);
  if (!("readme" in y2 && "d" in y2)) {
    throw Error("invalid remote meta data file!");
  }
  const y3 = JSON.parse(
    (
      base64url.parse(reverseString(y2["d"]), {
        out: Buffer.allocUnsafe as any,
        loose: true,
      }) as Buffer
    ).toString("utf-8")
  ) as MetadataOnRemote;
  return y3;
 };
@@ -38,7 +38,7 @@ export const isHiddenPath = (item: string, loose: boolean = true) => {
 * @param x string
 * @returns string[] might be empty
 */
-export const getFolderLevels = (x: string) => {
+export const getFolderLevels = (x: string, addEndingSlash: boolean = false) => {
  const res: string[] = [];
  if (x === "" || x === "/") {
@@ -48,10 +48,14 @@ export const getFolderLevels = (x: string) => {
  const y1 = x.split("/");
  let i = 0;
  for (let index = 0; index + 1 < y1.length; index++) {
-    const k = y1.slice(0, index + 1).join("/");
+    let k = y1.slice(0, index + 1).join("/");
-    if (k !== "" && k !== "/") {
+    if (k === "" || k === "/") {
-      res.push(k);
+      continue;
    }
    if (addEndingSlash) {
      k = `${k}/`;
    }
    res.push(k);
  }
  return res;
 };
@@ -75,7 +79,9 @@ export const mkdirpInVault = async (thePath: string, vault: Vault) => {
 * @param b Buffer
 * @returns ArrayBuffer
 */
-export const bufferToArrayBuffer = (b: Buffer | Uint8Array) => {
+export const bufferToArrayBuffer = (
  b: Buffer | Uint8Array | ArrayBufferView
 ) => {
  return b.buffer.slice(b.byteOffset, b.byteOffset + b.byteLength);
 };
@@ -157,6 +163,24 @@ export const getPathFolder = (a: string) => {
  return b.endsWith("/") ? b : `${b}/`;
 };
 /**
 * If input is already a folder, returns its folder;
 * And if input is a file, returns its direname.
 * @param a
 * @returns
 */
 export const getParentFolder = (a: string) => {
  const b = path.posix.dirname(a);
  if (b === "." || b === "/") {
    // the root
    return "/";
  }
  if (b.endsWith("/")) {
    return b;
  }
  return `${b}/`;
 };
 /**
 * https://stackoverflow.com/questions/54511144
 * @param a
@@ -208,3 +232,31 @@ export const getRandomArrayBuffer = (byteLength: number) => {
 export const reverseString = (x: string) => {
  return [...x].reverse().join("");
 };
 export interface SplitRange {
  partNum: number; // startting from 1
  start: number;
  end: number; // exclusive
 }
 export const getSplitRanges = (bytesTotal: number, bytesEachPart: number) => {
  const res: SplitRange[] = [];
  if (bytesEachPart >= bytesTotal) {
    res.push({
      partNum: 1,
      start: 0,
      end: bytesTotal,
    });
    return res;
  }
  const remainder = bytesTotal % bytesEachPart;
  const howMany =
    Math.floor(bytesTotal / bytesEachPart) + (remainder === 0 ? 0 : 1);
  for (let i = 0; i < howMany; ++i) {
    res.push({
      partNum: i + 1,
      start: bytesEachPart * i,
      end: Math.min(bytesEachPart * (i + 1), bytesTotal),
    });
  }
  return res;
 };
@@ -102,7 +102,9 @@ export class RemoteClient {
    isRecursively: boolean = false,
    password: string = "",
    remoteEncryptedKey: string = "",
-    foldersCreatedBefore: Set<string> | undefined = undefined
+    foldersCreatedBefore: Set<string> | undefined = undefined,
    uploadRaw: boolean = false,
    rawContent: string | ArrayBuffer = ""
  ) => {
    if (this.serviceType === "s3") {
      return await s3.uploadToRemote(
@@ -112,7 +114,9 @@ export class RemoteClient {
        vault,
        isRecursively,
        password,
-        remoteEncryptedKey
+        remoteEncryptedKey,
        uploadRaw,
        rawContent
      );
    } else if (this.serviceType === "webdav") {
      return await webdav.uploadToRemote(
@@ -121,7 +125,9 @@ export class RemoteClient {
        vault,
        isRecursively,
        password,
-        remoteEncryptedKey
+        remoteEncryptedKey,
        uploadRaw,
        rawContent
      );
    } else if (this.serviceType === "dropbox") {
      return await dropbox.uploadToRemote(
@@ -131,7 +137,9 @@ export class RemoteClient {
        isRecursively,
        password,
        remoteEncryptedKey,
-        foldersCreatedBefore
+        foldersCreatedBefore,
        uploadRaw,
        rawContent
      );
    } else if (this.serviceType === "onedrive") {
      return await onedrive.uploadToRemote(
@@ -141,7 +149,9 @@ export class RemoteClient {
        isRecursively,
        password,
        remoteEncryptedKey,
-        foldersCreatedBefore
+        foldersCreatedBefore,
        uploadRaw,
        rawContent
      );
    } else {
      throw Error(`not supported service type ${this.serviceType}`);
@@ -167,7 +177,8 @@ export class RemoteClient {
    vault: Vault,
    mtime: number,
    password: string = "",
-    remoteEncryptedKey: string = ""
+    remoteEncryptedKey: string = "",
    skipSaving: boolean = false
  ) => {
    if (this.serviceType === "s3") {
      return await s3.downloadFromRemote(
@@ -177,7 +188,8 @@ export class RemoteClient {
        vault,
        mtime,
        password,
-        remoteEncryptedKey
+        remoteEncryptedKey,
        skipSaving
      );
    } else if (this.serviceType === "webdav") {
      return await webdav.downloadFromRemote(
@@ -186,7 +198,8 @@ export class RemoteClient {
        vault,
        mtime,
        password,
-        remoteEncryptedKey
+        remoteEncryptedKey,
        skipSaving
      );
    } else if (this.serviceType === "dropbox") {
      return await dropbox.downloadFromRemote(
@@ -195,7 +208,8 @@ export class RemoteClient {
        vault,
        mtime,
        password,
-        remoteEncryptedKey
+        remoteEncryptedKey,
        skipSaving
      );
    } else if (this.serviceType === "onedrive") {
      return await onedrive.downloadFromRemote(
@@ -204,7 +218,8 @@ export class RemoteClient {
        vault,
        mtime,
        password,
-        remoteEncryptedKey
+        remoteEncryptedKey,
        skipSaving
      );
    } else {
      throw Error(`not supported service type ${this.serviceType}`);
@@ -156,13 +156,20 @@ const fixLastModifiedTimeInplace = (allFilesFolders: RemoteItem[]) => {
 // see https://dropbox.tech/developers/pkce--what-and-why-
 ////////////////////////////////////////////////////////////////////////////////
-export const getAuthUrlAndVerifier = async (appKey: string) => {
+export const getAuthUrlAndVerifier = async (
  appKey: string,
  needManualPatse: boolean = false
 ) => {
  const auth = new DropboxAuth({
    clientId: appKey,
  });
  const callback = needManualPatse
    ? undefined
    : `obsidian://${COMMAND_CALLBACK_DROPBOX}`;
  const authUrl = (
    await auth.getAuthenticationUrl(
-      `obsidian://${COMMAND_CALLBACK_DROPBOX}`,
+      callback,
      undefined,
      "code",
      "offline",
@@ -400,7 +407,9 @@ export const uploadToRemote = async (
  isRecursively: boolean = false,
  password: string = "",
  remoteEncryptedKey: string = "",
-  foldersCreatedBefore: Set<string> | undefined = undefined
+  foldersCreatedBefore: Set<string> | undefined = undefined,
  uploadRaw: boolean = false,
  rawContent: string | ArrayBuffer = ""
 ) => {
  await client.init();
@@ -415,6 +424,9 @@ export const uploadToRemote = async (
  if (isFolder && isRecursively) {
    throw Error("upload function doesn't implement recursive function yet!");
  } else if (isFolder && !isRecursively) {
    if (uploadRaw) {
      throw Error(`you specify uploadRaw, but you also provide a folder key!`);
    }
    // folder
    if (password === "") {
      // if not encrypted, mkdir a remote folder
@@ -448,7 +460,16 @@ export const uploadToRemote = async (
  } else {
    // file
    // we ignore isRecursively parameter here
-    const localContent = await vault.adapter.readBinary(fileOrFolderPath);
+    let localContent = undefined;
    if (uploadRaw) {
      if (typeof rawContent === "string") {
        localContent = new TextEncoder().encode(rawContent).buffer;
      } else {
        localContent = rawContent;
      }
    } else {
      localContent = await vault.adapter.readBinary(fileOrFolderPath);
    }
    let remoteContent = localContent;
    if (password !== "") {
      remoteContent = await encryptArrayBuffer(localContent, password);
@@ -551,13 +572,16 @@ export const downloadFromRemote = async (
  vault: Vault,
  mtime: number,
  password: string = "",
-  remoteEncryptedKey: string = ""
+  remoteEncryptedKey: string = "",
  skipSaving: boolean = false
 ) => {
  await client.init();
  const isFolder = fileOrFolderPath.endsWith("/");
-  await mkdirpInVault(fileOrFolderPath, vault);
+  if (!skipSaving) {
    await mkdirpInVault(fileOrFolderPath, vault);
  }
  // the file is always local file
  // we need to encrypt it
@@ -565,6 +589,7 @@ export const downloadFromRemote = async (
  if (isFolder) {
    // mkdirp locally is enough
    // do nothing here
    return new ArrayBuffer(0);
  } else {
    let downloadFile = fileOrFolderPath;
    if (password !== "") {
@@ -576,9 +601,12 @@ export const downloadFromRemote = async (
    if (password !== "") {
      localContent = await decryptArrayBuffer(remoteContent, password);
    }
-    await vault.adapter.writeBinary(fileOrFolderPath, localContent, {
+    if (!skipSaving) {
-      mtime: mtime,
+      await vault.adapter.writeBinary(fileOrFolderPath, localContent, {
-    });
+        mtime: mtime,
      });
    }
    return localContent;
  }
 };
@@ -1,34 +1,28 @@
 import { CryptoProvider, PublicClientApplication } from "@azure/msal-node";
-import {
+import { AuthenticationProvider } from "@microsoft/microsoft-graph-client";
-  AuthenticationProvider,
+import type {
-  Client,
+  DriveItem,
-  FileUpload,
+  UploadSession,
-  LargeFileUploadSession,
+  User,
-  LargeFileUploadTask,
+} from "@microsoft/microsoft-graph-types";
  LargeFileUploadTaskOptions,
  Range,
  UploadEventHandlers,
  UploadResult,
 } from "@microsoft/microsoft-graph-client";
 import type { DriveItem, User } from "@microsoft/microsoft-graph-types";
 import cloneDeep from "lodash/cloneDeep";
-import { request, Vault } from "obsidian";
+import * as origLog from "loglevel";
-import * as path from "path";
+import { request, requestUrl, requireApiVersion, Vault } from "obsidian";
 import {
-  DropboxConfig,
+  API_VER_REQURL,
  COMMAND_CALLBACK_ONEDRIVE,
  OAUTH2_FORCE_EXPIRE_MILLISECONDS,
  OnedriveConfig,
  RemoteItem,
 } from "./baseTypes";
 import { COMMAND_CALLBACK_ONEDRIVE } from "./baseTypes";
 import { decryptArrayBuffer, encryptArrayBuffer } from "./encrypt";
 import {
  bufferToArrayBuffer,
  getRandomArrayBuffer,
  getRandomIntInclusive,
  mkdirpInVault,
 } from "./misc";
 import * as origLog from "loglevel";
 const log = origLog.getLogger("rs-default");
 const SCOPES = ["User.Read", "Files.ReadWrite.AppFolder", "offline_access"];
@@ -262,19 +256,31 @@ const fromDriveItemToRemoteItem = (
  // pure english: /drive/root:/Apps/remotely-save/${vaultName}
  // or localized, e.g.: /drive/root:/应用/remotely-save/${vaultName}
  const FIRST_COMMON_PREFIX_REGEX = /^\/drive\/root:\/[^\/]+\/remotely-save\//g;
  // or the root is absolute path /Livefolders,
  // e.g.: /Livefolders/应用/remotely-save/${vaultName}
  const SECOND_COMMON_PREFIX_REGEX = /^\/Livefolders\/[^\/]+\/remotely-save\//g;
  // another possibile prefix
-  const SECOND_COMMON_PREFIX_RAW = `/drive/items/`;
+  const THIRD_COMMON_PREFIX_RAW = `/drive/items/`;
  const fullPathOriginal = `${x.parentReference.path}/${x.name}`;
  const matchFirstPrefixRes = fullPathOriginal.match(FIRST_COMMON_PREFIX_REGEX);
  const matchSecondPrefixRes = fullPathOriginal.match(
    SECOND_COMMON_PREFIX_REGEX
  );
  if (
    matchFirstPrefixRes !== null &&
    fullPathOriginal.startsWith(`${matchFirstPrefixRes[0]}${vaultName}`)
  ) {
    const foundPrefix = `${matchFirstPrefixRes[0]}${vaultName}`;
    key = fullPathOriginal.substring(foundPrefix.length + 1);
-  } else if (x.parentReference.path.startsWith(SECOND_COMMON_PREFIX_RAW)) {
+  } else if (
    matchSecondPrefixRes !== null &&
    fullPathOriginal.startsWith(`${matchSecondPrefixRes[0]}${vaultName}`)
  ) {
    const foundPrefix = `${matchSecondPrefixRes[0]}${vaultName}`;
    key = fullPathOriginal.substring(foundPrefix.length + 1);
  } else if (x.parentReference.path.startsWith(THIRD_COMMON_PREFIX_RAW)) {
    // it's something like
    // /drive/items/<some_id>!<another_id>:/${vaultName}/<subfolder>
    // with uri encoded!
@@ -309,7 +315,7 @@ const fromDriveItemToRemoteItem = (
    lastModified: Date.parse(x.fileSystemInfo.lastModifiedDateTime),
    size: isFolder ? 0 : x.size,
    remoteType: "onedrive",
-    etag: x.eTag || x.cTag || "",
+    etag: x.cTag || "", // do NOT use x.eTag because it changes if meta changes
  };
 };
@@ -364,8 +370,8 @@ class MyAuthProvider implements AuthenticationProvider {
 export class WrappedOnedriveClient {
  onedriveConfig: OnedriveConfig;
  vaultName: string;
  client: Client;
  vaultFolderExists: boolean;
  authGetter: MyAuthProvider;
  saveUpdatedConfigFunc: () => Promise<any>;
  constructor(
    onedriveConfig: OnedriveConfig,
@@ -376,9 +382,7 @@ export class WrappedOnedriveClient {
    this.vaultName = vaultName;
    this.vaultFolderExists = false;
    this.saveUpdatedConfigFunc = saveUpdatedConfigFunc;
-    this.client = Client.initWithMiddleware({
+    this.authGetter = new MyAuthProvider(onedriveConfig, saveUpdatedConfigFunc);
      authProvider: new MyAuthProvider(onedriveConfig, saveUpdatedConfigFunc),
    });
  }
  init = async () => {
@@ -395,14 +399,14 @@ export class WrappedOnedriveClient {
    if (this.vaultFolderExists) {
      // log.info(`already checked, /${this.vaultName} exist before`)
    } else {
-      const k = await this.client.api("/drive/special/approot/children").get();
+      const k = await this.getJson("/drive/special/approot/children");
-      // log.info(k);
+      log.debug(k);
      this.vaultFolderExists =
        (k.value as DriveItem[]).filter((x) => x.name === this.vaultName)
          .length > 0;
      if (!this.vaultFolderExists) {
        log.info(`remote does not have folder /${this.vaultName}`);
-        await this.client.api("/drive/special/approot/children").post({
+        await this.postJson("/drive/special/approot/children", {
          name: `${this.vaultName}`,
          folder: {},
          "@microsoft.graph.conflictBehavior": "replace",
@@ -414,6 +418,160 @@ export class WrappedOnedriveClient {
      }
    }
  };
  buildUrl = (pathFragOrig: string) => {
    const API_PREFIX = "https://graph.microsoft.com/v1.0";
    let theUrl = "";
    if (
      pathFragOrig.startsWith("http://") ||
      pathFragOrig.startsWith("https://")
    ) {
      theUrl = pathFragOrig;
    } else {
      const pathFrag = encodeURI(pathFragOrig);
      theUrl = `${API_PREFIX}${pathFrag}`;
    }
    return theUrl;
  };
  getJson = async (pathFragOrig: string) => {
    const theUrl = this.buildUrl(pathFragOrig);
    log.debug(`getJson, theUrl=${theUrl}`);
    return JSON.parse(
      await request({
        url: theUrl,
        method: "GET",
        contentType: "application/json",
        headers: {
          Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
        },
      })
    );
  };
  postJson = async (pathFragOrig: string, payload: any) => {
    const theUrl = this.buildUrl(pathFragOrig);
    log.debug(`postJson, theUrl=${theUrl}`);
    return JSON.parse(
      await request({
        url: theUrl,
        method: "POST",
        contentType: "application/json",
        body: JSON.stringify(payload),
        headers: {
          Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
        },
      })
    );
  };
  patchJson = async (pathFragOrig: string, payload: any) => {
    const theUrl = this.buildUrl(pathFragOrig);
    log.debug(`patchJson, theUrl=${theUrl}`);
    return JSON.parse(
      await request({
        url: theUrl,
        method: "PATCH",
        contentType: "application/json",
        body: JSON.stringify(payload),
        headers: {
          Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
        },
      })
    );
  };
  deleteJson = async (pathFragOrig: string) => {
    const theUrl = this.buildUrl(pathFragOrig);
    log.debug(`deleteJson, theUrl=${theUrl}`);
    if (requireApiVersion(API_VER_REQURL)) {
      await requestUrl({
        url: theUrl,
        method: "DELETE",
        headers: {
          Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
        },
      });
    } else {
      await fetch(theUrl, {
        method: "DELETE",
        headers: {
          Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
        },
      });
    }
  };
  putArrayBuffer = async (pathFragOrig: string, payload: ArrayBuffer) => {
    const theUrl = this.buildUrl(pathFragOrig);
    log.debug(`putArrayBuffer, theUrl=${theUrl}`);
    if (requireApiVersion(API_VER_REQURL)) {
      await requestUrl({
        url: theUrl,
        method: "PUT",
        body: payload,
        headers: {
          Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
        },
      });
    } else {
      await fetch(theUrl, {
        method: "PUT",
        body: payload,
        headers: {
          Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
        },
      });
    }
  };
  /**
   * A specialized function to upload large files by parts
   * @param pathFragOrig
   * @param payload
   * @param rangeMin
   * @param rangeEnd the end, exclusive
   * @param size
   */
  putUint8ArrayByRange = async (
    pathFragOrig: string,
    payload: Uint8Array,
    rangeStart: number,
    rangeEnd: number,
    size: number
  ) => {
    const theUrl = this.buildUrl(pathFragOrig);
    log.debug(
      `putUint8ArrayByRange, theUrl=${theUrl}, range=${rangeStart}-${
        rangeEnd - 1
      }, len=${rangeEnd - rangeStart}, size=${size}`
    );
    // NO AUTH HEADER here!
    if (requireApiVersion(API_VER_REQURL)) {
      const res = await requestUrl({
        url: theUrl,
        method: "PUT",
        body: bufferToArrayBuffer(payload.subarray(rangeStart, rangeEnd)),
        headers: {
          // no "Content-Length" allowed here
          "Content-Range": `bytes ${rangeStart}-${rangeEnd - 1}/${size}`,
          "Content-Type": "application/octet-stream",
        },
      });
      return res.json as DriveItem | UploadSession;
    } else {
      const res = await fetch(theUrl, {
        method: "PUT",
        body: payload.subarray(rangeStart, rangeEnd),
        headers: {
          "Content-Length": `${rangeEnd - rangeStart}`,
          "Content-Range": `bytes ${rangeStart}-${rangeEnd - 1}/${size}`,
          "Content-Type": "application/octet-stream",
        },
      });
      return (await res.json()) as DriveItem | UploadSession;
    }
  };
 }
 export const getOnedriveClient = (
@@ -445,13 +603,14 @@ export const listFromRemote = async (
  const NEXT_LINK_KEY = "@odata.nextLink";
  const DELTA_LINK_KEY = "@odata.deltaLink";
-  let res = await client.client
+
-    .api(`/drive/special/approot:/${client.vaultName}:/delta`)
+  let res = await client.getJson(
-    .get();
+    `/drive/special/approot:/${client.vaultName}:/delta`
  );
  let driveItems = res.value as DriveItem[];
  while (NEXT_LINK_KEY in res) {
-    res = await client.client.api(res[NEXT_LINK_KEY]).get();
+    res = await client.getJson(res[NEXT_LINK_KEY]);
    driveItems.push(...cloneDeep(res.value as DriveItem[]));
  }
@@ -461,16 +620,11 @@ export const listFromRemote = async (
    await client.saveUpdatedConfigFunc();
  }
  driveItems = driveItems.map((x) => {
    const y = cloneDeep(x);
    y.parentReference.path = y.parentReference.path.replace("/Apps", "/应用");
    return y;
  });
  // unify everything to RemoteItem
  const unifiedContents = driveItems
    .map((x) => fromDriveItemToRemoteItem(x, client.vaultName))
    .filter((x) => x.key !== "/");
  return {
    Contents: unifiedContents,
  };
@@ -483,10 +637,9 @@ export const getRemoteMeta = async (
  await client.init();
  const remotePath = getOnedrivePath(fileOrFolderPath, client.vaultName);
  // log.info(`remotePath=${remotePath}`);
-  const rsp = await client.client
+  const rsp = await client.getJson(
-    .api(remotePath)
+    `${remotePath}?$select=cTag,eTag,fileSystemInfo,folder,file,name,parentReference,size`
-    .select("cTag,eTag,fileSystemInfo,folder,file,name,parentReference,size")
+  );
    .get();
  // log.info(rsp);
  const driveItem = rsp as DriveItem;
  const res = fromDriveItemToRemoteItem(driveItem, client.vaultName);
@@ -501,7 +654,9 @@ export const uploadToRemote = async (
  isRecursively: boolean = false,
  password: string = "",
  remoteEncryptedKey: string = "",
-  foldersCreatedBefore: Set<string> | undefined = undefined
+  foldersCreatedBefore: Set<string> | undefined = undefined,
  uploadRaw: boolean = false,
  rawContent: string | ArrayBuffer = ""
 ) => {
  await client.init();
@@ -510,13 +665,16 @@ export const uploadToRemote = async (
    uploadFile = remoteEncryptedKey;
  }
  uploadFile = getOnedrivePath(uploadFile, client.vaultName);
-  // log.info(`uploadFile=${uploadFile}`);
+  log.debug(`uploadFile=${uploadFile}`);
  const isFolder = fileOrFolderPath.endsWith("/");
  if (isFolder && isRecursively) {
    throw Error("upload function doesn't implement recursive function yet!");
  } else if (isFolder && !isRecursively) {
    if (uploadRaw) {
      throw Error(`you specify uploadRaw, but you also provide a folder key!`);
    }
    // folder
    if (password === "") {
      // if not encrypted, mkdir a remote folder
@@ -525,7 +683,7 @@ export const uploadToRemote = async (
      } else {
        // https://stackoverflow.com/questions/56479865/creating-nested-folders-in-one-go-onedrive-api
        // use PATCH to create folder recursively!!!
-        await client.client.api(uploadFile).patch({
+        await client.patchJson(uploadFile, {
          folder: {},
          "@microsoft.graph.conflictBehavior": "replace",
        });
@@ -545,39 +703,13 @@ export const uploadToRemote = async (
        password
      );
-      const uploadSession: LargeFileUploadSession =
+      // an encrypted folder is always small, we just use put here
-        await LargeFileUploadTask.createUploadSession(
+      await client.putArrayBuffer(
-          client.client,
+        `${uploadFile}:/content?${new URLSearchParams({
-          `https://graph.microsoft.com/v1.0/me${encodeURIComponent(
+          "@microsoft.graph.conflictBehavior": "replace",
-            uploadFile
+        })}`,
-          )}:/createUploadSession`,
+        arrBufRandom
          {
            item: {
              "@microsoft.graph.conflictBehavior": "replace",
            },
          }
        );
      const task = new LargeFileUploadTask(
        client.client,
        new FileUpload(
          arrBufRandom,
          path.posix.basename(uploadFile),
          arrBufRandom.byteLength
        ),
        uploadSession,
        {
          rangeSize: 1024 * 1024,
          uploadEventHandlers: {
            progress: (range?: Range) => {
              // Handle progress event
              // log.info(
              //   `uploading ${range.minValue}-${range.maxValue} of ${fileOrFolderPath}`
              // );
            },
          } as UploadEventHandlers,
        } as LargeFileUploadTaskOptions
      );
      const uploadResult: UploadResult = await task.upload();
      // log.info(uploadResult)
      const res = await getRemoteMeta(client, uploadFile);
      return res;
@@ -585,7 +717,16 @@ export const uploadToRemote = async (
  } else {
    // file
    // we ignore isRecursively parameter here
-    const localContent = await vault.adapter.readBinary(fileOrFolderPath);
+    let localContent = undefined;
    if (uploadRaw) {
      if (typeof rawContent === "string") {
        localContent = new TextEncoder().encode(rawContent).buffer;
      } else {
        localContent = rawContent;
      }
    } else {
      localContent = await vault.adapter.readBinary(fileOrFolderPath);
    }
    let remoteContent = localContent;
    if (password !== "") {
      remoteContent = await encryptArrayBuffer(localContent, password);
@@ -593,48 +734,54 @@ export const uploadToRemote = async (
    // no need to create parent folders firstly, cool!
-    // we need to customize the special root folder,
+    // hard code range size
-    // so use LargeFileUploadTask instead of OneDriveLargeFileUploadTask
+    const MIN_UNIT = 327680; // bytes in msft doc, about 0.32768 MB
-    const progress = (range?: Range) => {
+    const RANGE_SIZE = MIN_UNIT * 20; // about 6.5536 MB
-      // Handle progress event
+
-      // log.info(
+    if (remoteContent.byteLength <= RANGE_SIZE) {
-      //   `uploading ${range.minValue}-${range.maxValue} of ${fileOrFolderPath}`
+      // directly using put!
-      // );
+      await client.putArrayBuffer(
-    };
+        `${uploadFile}:/content?${new URLSearchParams({
-    const uploadEventHandlers: UploadEventHandlers = {
+          "@microsoft.graph.conflictBehavior": "replace",
-      progress: progress,
+        })}`,
-    };
+        remoteContent
    const options: LargeFileUploadTaskOptions = {
      rangeSize: 1024 * 1024,
      uploadEventHandlers: uploadEventHandlers,
    };
    const payload = {
      item: {
        "@microsoft.graph.conflictBehavior": "replace",
      },
    };
    // uploadFile already starts with /drive/special/approot:/${vaultName}
    const uploadSession: LargeFileUploadSession =
      await LargeFileUploadTask.createUploadSession(
        client.client,
        `https://graph.microsoft.com/v1.0/me${encodeURIComponent(
          uploadFile
        )}:/createUploadSession`,
        payload
      );
-    const fileObject = new FileUpload(
+    } else {
-      remoteContent,
+      // upload large files!
-      path.posix.basename(uploadFile),
+      // ref: https://docs.microsoft.com/en-us/onedrive/developer/rest-api/api/driveitem_createuploadsession?view=odsp-graph-online
-      remoteContent.byteLength
+
-    );
+      // 1. create uploadSession
-    const task = new LargeFileUploadTask(
+      // uploadFile already starts with /drive/special/approot:/${vaultName}
-      client.client,
+      const s: UploadSession = await client.postJson(
-      fileObject,
+        `${uploadFile}:/createUploadSession`,
-      uploadSession,
+        {
-      options
+          item: {
-    );
+            "@microsoft.graph.conflictBehavior": "replace",
-    const uploadResult: UploadResult = await task.upload();
+          },
-    // log.info(uploadResult)
+        }
      );
      const uploadUrl = s.uploadUrl;
      log.debug("uploadSession = ");
      log.debug(s);
      // 2. upload by ranges
      // convert to uint8
      const uint8 = new Uint8Array(remoteContent);
      // upload the ranges one by one
      let rangeStart = 0;
      while (rangeStart < uint8.byteLength) {
        await client.putUint8ArrayByRange(
          uploadUrl,
          uint8,
          rangeStart,
          Math.min(rangeStart + RANGE_SIZE, uint8.byteLength),
          uint8.byteLength
        );
        rangeStart += RANGE_SIZE;
      }
    }
    const res = await getRemoteMeta(client, uploadFile);
    return res;
  }
@@ -646,13 +793,17 @@ const downloadFromRemoteRaw = async (
 ): Promise<ArrayBuffer> => {
  await client.init();
  const key = getOnedrivePath(fileOrFolderPath, client.vaultName);
-  const rsp = await client.client
+  const rsp = await client.getJson(
-    .api(key)
+    `${key}?$select=@microsoft.graph.downloadUrl`
-    .select("@microsoft.graph.downloadUrl")
+  );
    .get();
  const downloadUrl: string = rsp["@microsoft.graph.downloadUrl"];
-  const content = await (await fetch(downloadUrl)).arrayBuffer();
+  if (requireApiVersion(API_VER_REQURL)) {
-  return content;
+    const content = (await requestUrl({ url: downloadUrl })).arrayBuffer;
    return content;
  } else {
    const content = await (await fetch(downloadUrl)).arrayBuffer();
    return content;
  }
 };
 export const downloadFromRemote = async (
@@ -661,17 +812,21 @@ export const downloadFromRemote = async (
  vault: Vault,
  mtime: number,
  password: string = "",
-  remoteEncryptedKey: string = ""
+  remoteEncryptedKey: string = "",
  skipSaving: boolean = false
 ) => {
  await client.init();
  const isFolder = fileOrFolderPath.endsWith("/");
-  await mkdirpInVault(fileOrFolderPath, vault);
+  if (!skipSaving) {
    await mkdirpInVault(fileOrFolderPath, vault);
  }
  if (isFolder) {
    // mkdirp locally is enough
    // do nothing here
    return new ArrayBuffer(0);
  } else {
    let downloadFile = fileOrFolderPath;
    if (password !== "") {
@@ -683,9 +838,12 @@ export const downloadFromRemote = async (
    if (password !== "") {
      localContent = await decryptArrayBuffer(remoteContent, password);
    }
-    await vault.adapter.writeBinary(fileOrFolderPath, localContent, {
+    if (!skipSaving) {
-      mtime: mtime,
+      await vault.adapter.writeBinary(fileOrFolderPath, localContent, {
-    });
+        mtime: mtime,
      });
    }
    return localContent;
  }
 };
@@ -705,7 +863,7 @@ export const deleteFromRemote = async (
  remoteFileName = getOnedrivePath(remoteFileName, client.vaultName);
  await client.init();
-  await client.client.api(remoteFileName).delete();
+  await client.deleteJson(remoteFileName);
 };
 export const checkConnectivity = async (client: WrappedOnedriveClient) => {
@@ -719,7 +877,7 @@ export const checkConnectivity = async (client: WrappedOnedriveClient) => {
 export const getUserDisplayName = async (client: WrappedOnedriveClient) => {
  await client.init();
-  const res: User = await client.client.api("/me").select("displayName").get();
+  const res: User = await client.getJson("/me?$select=displayName");
  return res.displayName || "<unknown display name>";
 };
@@ -732,7 +890,7 @@ export const getUserDisplayName = async (client: WrappedOnedriveClient) => {
 */
 // export const revokeAuth = async (client: WrappedOnedriveClient) => {
 //   await client.init();
-//   await client.client.api('/me/revokeSignInSessions').post(undefined);
+//   await client.postJson('/me/revokeSignInSessions', {});
 // };
 export const getRevokeAddr = async () => {
@@ -11,11 +11,26 @@ import {
  S3Client,
 } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
 import { HttpHandler, HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
 import {
  FetchHttpHandler,
  FetchHttpHandlerOptions,
 } from "@aws-sdk/fetch-http-handler";
 // @ts-ignore
 import { requestTimeout } from "@aws-sdk/fetch-http-handler/dist-es/request-timeout";
 import { buildQueryString } from "@aws-sdk/querystring-builder";
 import { HeaderBag, HttpHandlerOptions, Provider } from "@aws-sdk/types";
 import { Buffer } from "buffer";
 import * as mime from "mime-types";
-import { Vault } from "obsidian";
+import {
  Vault,
  requestUrl,
  RequestUrlParam,
  RequestUrlResponse,
  requireApiVersion,
 } from "obsidian";
 import { Readable } from "stream";
-import { RemoteItem, S3Config } from "./baseTypes";
+import { API_VER_REQURL, RemoteItem, S3Config } from "./baseTypes";
 import { decryptArrayBuffer, encryptArrayBuffer } from "./encrypt";
 import {
  arrayBufferToBuffer,
@@ -28,12 +43,117 @@ export { S3Client } from "@aws-sdk/client-s3";
 import * as origLog from "loglevel";
 const log = origLog.getLogger("rs-default");
 ////////////////////////////////////////////////////////////////////////////////
 // special handler using Obsidian requestUrl
 ////////////////////////////////////////////////////////////////////////////////
 /**
 * This is close to origin implementation of FetchHttpHandler
 * https://github.com/aws/aws-sdk-js-v3/blob/main/packages/fetch-http-handler/src/fetch-http-handler.ts
 * that is released under Apache 2 License.
 * But this uses Obsidian requestUrl instead.
 */
 class ObsHttpHandler extends FetchHttpHandler {
  requestTimeoutInMs: number;
  constructor(options?: FetchHttpHandlerOptions) {
    super(options);
    this.requestTimeoutInMs =
      options === undefined ? undefined : options.requestTimeout;
  }
  async handle(
    request: HttpRequest,
    { abortSignal }: HttpHandlerOptions = {}
  ): Promise<{ response: HttpResponse }> {
    if (abortSignal?.aborted) {
      const abortError = new Error("Request aborted");
      abortError.name = "AbortError";
      return Promise.reject(abortError);
    }
    let path = request.path;
    if (request.query) {
      const queryString = buildQueryString(request.query);
      if (queryString) {
        path += `?${queryString}`;
      }
    }
    const { port, method } = request;
    const url = `${request.protocol}//${request.hostname}${
      port ? `:${port}` : ""
    }${path}`;
    const body =
      method === "GET" || method === "HEAD" ? undefined : request.body;
    const transformedHeaders = { ...request.headers };
    delete transformedHeaders["host"];
    delete transformedHeaders["Host"];
    delete transformedHeaders["content-length"];
    delete transformedHeaders["Content-Length"];
    let contentType: string = undefined;
    if (transformedHeaders["content-type"] !== undefined) {
      contentType = transformedHeaders["content-type"];
    }
    let transformedBody: any = body;
    if (ArrayBuffer.isView(body)) {
      transformedBody = bufferToArrayBuffer(body);
    }
    const param: RequestUrlParam = {
      body: transformedBody,
      headers: transformedHeaders,
      method: method,
      url: url,
      contentType: contentType,
    };
    const raceOfPromises = [
      requestUrl(param).then((rsp) => {
        const stream = new ReadableStream<Uint8Array>({
          start(controller) {
            controller.enqueue(new Uint8Array(rsp.arrayBuffer));
            controller.close();
          },
        });
        return {
          response: new HttpResponse({
            headers: rsp.headers,
            statusCode: rsp.status,
            body: stream,
          }),
        };
      }),
      requestTimeout(this.requestTimeoutInMs),
    ];
    if (abortSignal) {
      raceOfPromises.push(
        new Promise<never>((resolve, reject) => {
          abortSignal.onabort = () => {
            const abortError = new Error("Request aborted");
            abortError.name = "AbortError";
            reject(abortError);
          };
        })
      );
    }
    return Promise.race(raceOfPromises);
  }
 }
 ////////////////////////////////////////////////////////////////////////////////
 // other stuffs
 ////////////////////////////////////////////////////////////////////////////////
 export const DEFAULT_S3_CONFIG = {
  s3Endpoint: "",
  s3Region: "",
  s3AccessKeyID: "",
  s3SecretAccessKey: "",
  s3BucketName: "",
  bypassCorsLocally: true,
 };
 export type S3ObjectType = _Object;
@@ -66,15 +186,29 @@ export const getS3Client = (s3Config: S3Config) => {
  if (!(endpoint.startsWith("http://") || endpoint.startsWith("https://"))) {
    endpoint = `https://${endpoint}`;
  }
-  const s3Client = new S3Client({
+
-    region: s3Config.s3Region,
+  if (requireApiVersion(API_VER_REQURL) && s3Config.bypassCorsLocally) {
-    endpoint: endpoint,
+    const s3Client = new S3Client({
-    credentials: {
+      region: s3Config.s3Region,
-      accessKeyId: s3Config.s3AccessKeyID,
+      endpoint: endpoint,
-      secretAccessKey: s3Config.s3SecretAccessKey,
+      credentials: {
-    },
+        accessKeyId: s3Config.s3AccessKeyID,
-  });
+        secretAccessKey: s3Config.s3SecretAccessKey,
-  return s3Client;
+      },
      requestHandler: new ObsHttpHandler(),
    });
    return s3Client;
  } else {
    const s3Client = new S3Client({
      region: s3Config.s3Region,
      endpoint: endpoint,
      credentials: {
        accessKeyId: s3Config.s3AccessKeyID,
        secretAccessKey: s3Config.s3SecretAccessKey,
      },
    });
    return s3Client;
  }
 };
 export const getRemoteMeta = async (
@@ -99,7 +233,9 @@ export const uploadToRemote = async (
  vault: Vault,
  isRecursively: boolean = false,
  password: string = "",
-  remoteEncryptedKey: string = ""
+  remoteEncryptedKey: string = "",
  uploadRaw: boolean = false,
  rawContent: string | ArrayBuffer = ""
 ) => {
  let uploadFile = fileOrFolderPath;
  if (password !== "") {
@@ -112,6 +248,9 @@ export const uploadToRemote = async (
  if (isFolder && isRecursively) {
    throw Error("upload function doesn't implement recursive function yet!");
  } else if (isFolder && !isRecursively) {
    if (uploadRaw) {
      throw Error(`you specify uploadRaw, but you also provide a folder key!`);
    }
    // folder
    const contentType = DEFAULT_CONTENT_TYPE;
    await s3Client.send(
@@ -133,17 +272,27 @@ export const uploadToRemote = async (
          mime.lookup(fileOrFolderPath) || DEFAULT_CONTENT_TYPE
        ) || DEFAULT_CONTENT_TYPE;
    }
-    const localContent = await vault.adapter.readBinary(fileOrFolderPath);
+    let localContent = undefined;
    if (uploadRaw) {
      if (typeof rawContent === "string") {
        localContent = new TextEncoder().encode(rawContent).buffer;
      } else {
        localContent = rawContent;
      }
    } else {
      localContent = await vault.adapter.readBinary(fileOrFolderPath);
    }
    let remoteContent = localContent;
    if (password !== "") {
      remoteContent = await encryptArrayBuffer(localContent, password);
    }
    const body = arrayBufferToBuffer(remoteContent);
    const bytesIn5MB = 5242880;
    const body = new Uint8Array(remoteContent);
    const upload = new Upload({
      client: s3Client,
      queueSize: 20, // concurrency
-      partSize: 5242880, // minimal 5MB by default
+      partSize: bytesIn5MB, // minimal 5MB by default
      leavePartsOnError: false,
      params: {
        Bucket: s3Config.s3BucketName,
@@ -176,7 +325,6 @@ export const listFromRemote = async (
  const contents = [] as _Object[];
  let isTruncated = true;
  let continuationToken = "";
  do {
    const rsp = await s3Client.send(new ListObjectsV2Command(confCmd));
@@ -192,7 +340,8 @@ export const listFromRemote = async (
    confCmd.ContinuationToken = rsp.NextContinuationToken;
    if (
      isTruncated &&
-      (continuationToken === undefined || continuationToken === "")
+      (confCmd.ContinuationToken === undefined ||
        confCmd.ContinuationToken === "")
    ) {
      throw Error("isTruncated is true but no continuationToken provided");
    }
@@ -252,11 +401,14 @@ export const downloadFromRemote = async (
  vault: Vault,
  mtime: number,
  password: string = "",
-  remoteEncryptedKey: string = ""
+  remoteEncryptedKey: string = "",
  skipSaving: boolean = false
 ) => {
  const isFolder = fileOrFolderPath.endsWith("/");
-  await mkdirpInVault(fileOrFolderPath, vault);
+  if (!skipSaving) {
    await mkdirpInVault(fileOrFolderPath, vault);
  }
  // the file is always local file
  // we need to encrypt it
@@ -264,6 +416,7 @@ export const downloadFromRemote = async (
  if (isFolder) {
    // mkdirp locally is enough
    // do nothing here
    return new ArrayBuffer(0);
  } else {
    let downloadFile = fileOrFolderPath;
    if (password !== "") {
@@ -278,9 +431,12 @@ export const downloadFromRemote = async (
    if (password !== "") {
      localContent = await decryptArrayBuffer(remoteContent, password);
    }
-    await vault.adapter.writeBinary(fileOrFolderPath, localContent, {
+    if (!skipSaving) {
-      mtime: mtime,
+      await vault.adapter.writeBinary(fileOrFolderPath, localContent, {
-    });
+        mtime: mtime,
      });
    }
    return localContent;
  }
 };
@@ -1,20 +1,123 @@
 import { Buffer } from "buffer";
-import { Vault } from "obsidian";
+import { Vault, request, requestUrl, requireApiVersion } from "obsidian";
-import type { FileStat, WebDAVClient } from "webdav/web";
+
-import { AuthType, BufferLike, createClient } from "webdav/web";
+import { Queue } from "@fyears/tsqueue";
-import type { RemoteItem, WebdavConfig } from "./baseTypes";
+import chunk from "lodash/chunk";
 import flatten from "lodash/flatten";
 import { getReasonPhrase } from "http-status-codes";
 import { API_VER_REQURL, RemoteItem, WebdavConfig } from "./baseTypes";
 import { decryptArrayBuffer, encryptArrayBuffer } from "./encrypt";
 import { bufferToArrayBuffer, getPathFolder, mkdirpInVault } from "./misc";
 export type { WebDAVClient } from "webdav/web";
 import * as origLog from "loglevel";
 const log = origLog.getLogger("rs-default");
 import type {
  FileStat,
  WebDAVClient,
  RequestOptionsWithState,
  Response,
  ResponseDataDetailed,
 } from "webdav/web";
 import { getPatcher } from "webdav/web";
 if (requireApiVersion(API_VER_REQURL)) {
  getPatcher().patch(
    "request",
    async (
      options: RequestOptionsWithState
    ): Promise<Response | ResponseDataDetailed<any>> => {
      const transformedHeaders = { ...options.headers };
      delete transformedHeaders["host"];
      delete transformedHeaders["Host"];
      delete transformedHeaders["content-length"];
      delete transformedHeaders["Content-Length"];
      const r = await requestUrl({
        url: options.url,
        method: options.method,
        body: options.data as string | ArrayBuffer,
        headers: transformedHeaders,
      });
      let r2: Response | ResponseDataDetailed<any> = undefined;
      if (options.responseType === undefined) {
        r2 = {
          data: undefined,
          status: r.status,
          statusText: getReasonPhrase(r.status),
          headers: r.headers,
        };
      } else if (options.responseType === "json") {
        r2 = {
          data: r.json,
          status: r.status,
          statusText: getReasonPhrase(r.status),
          headers: r.headers,
        };
      } else if (options.responseType === "text") {
        r2 = {
          data: r.text,
          status: r.status,
          statusText: getReasonPhrase(r.status),
          headers: r.headers,
        };
      } else if (options.responseType === "arraybuffer") {
        r2 = {
          data: r.arrayBuffer,
          status: r.status,
          statusText: getReasonPhrase(r.status),
          headers: r.headers,
        };
      } else {
        throw Error(
          `do not know how to deal with responseType = ${options.responseType}`
        );
      }
      return r2;
    }
  );
 }
 // getPatcher().patch("request", (options: any) => {
 //   // console.log("using fetch");
 //   const r = fetch(options.url, {
 //     method: options.method,
 //     body: options.data as any,
 //     headers: options.headers,
 //     signal: options.signal,
 //   })
 //     .then((rsp) => {
 //       if (options.responseType === undefined) {
 //         return Promise.all([undefined, rsp]);
 //       }
 //       if (options.responseType === "json") {
 //         return Promise.all([rsp.json(), rsp]);
 //       }
 //       if (options.responseType === "text") {
 //         return Promise.all([rsp.text(), rsp]);
 //       }
 //       if (options.responseType === "arraybuffer") {
 //         return Promise.all([rsp.arrayBuffer(), rsp]);
 //       }
 //     })
 //     .then(([d, r]) => {
 //       return {
 //         data: d,
 //         status: r.status,
 //         statusText: r.statusText,
 //         headers: r.headers,
 //       };
 //     });
 //   // console.log("using fetch");
 //   return r;
 // });
 import { AuthType, BufferLike, createClient } from "webdav/web";
 export type { WebDAVClient } from "webdav/web";
 export const DEFAULT_WEBDAV_CONFIG = {
  address: "",
  username: "",
  password: "",
  authType: "basic",
  manualRecursive: false,
 } as WebdavConfig;
 const getWebdavPath = (fileOrFolderPath: string, vaultName: string) => {
@@ -134,7 +237,9 @@ export const uploadToRemote = async (
  vault: Vault,
  isRecursively: boolean = false,
  password: string = "",
-  remoteEncryptedKey: string = ""
+  remoteEncryptedKey: string = "",
  uploadRaw: boolean = false,
  rawContent: string | ArrayBuffer = ""
 ) => {
  await client.init();
  let uploadFile = fileOrFolderPath;
@@ -148,6 +253,9 @@ export const uploadToRemote = async (
  if (isFolder && isRecursively) {
    throw Error("upload function doesn't implement recursive function yet!");
  } else if (isFolder && !isRecursively) {
    if (uploadRaw) {
      throw Error(`you specify uploadRaw, but you also provide a folder key!`);
    }
    // folder
    if (password === "") {
      // if not encrypted, mkdir a remote folder
@@ -160,7 +268,7 @@ export const uploadToRemote = async (
      // if encrypted, upload a fake file with the encrypted file name
      await client.client.putFileContents(uploadFile, "", {
        overwrite: true,
-        onUploadProgress: (progress) => {
+        onUploadProgress: (progress: any) => {
          // log.info(`Uploaded ${progress.loaded} bytes of ${progress.total}`);
        },
      });
@@ -170,7 +278,16 @@ export const uploadToRemote = async (
  } else {
    // file
    // we ignore isRecursively parameter here
-    const localContent = await vault.adapter.readBinary(fileOrFolderPath);
+    let localContent = undefined;
    if (uploadRaw) {
      if (typeof rawContent === "string") {
        localContent = new TextEncoder().encode(rawContent).buffer;
      } else {
        localContent = rawContent;
      }
    } else {
      localContent = await vault.adapter.readBinary(fileOrFolderPath);
    }
    let remoteContent = localContent;
    if (password !== "") {
      remoteContent = await encryptArrayBuffer(localContent, password);
@@ -182,7 +299,7 @@ export const uploadToRemote = async (
    }
    await client.client.putFileContents(uploadFile, remoteContent, {
      overwrite: true,
-      onUploadProgress: (progress) => {
+      onUploadProgress: (progress: any) => {
        log.info(`Uploaded ${progress.loaded} bytes of ${progress.total}`);
      },
    });
@@ -199,14 +316,51 @@ export const listFromRemote = async (
    throw Error("prefix not supported");
  }
  await client.init();
-  const contents = (await client.client.getDirectoryContents(
+
-    `/${client.vaultName}`,
+  let contents = [] as FileStat[];
-    {
+  if (client.webdavConfig.manualRecursive) {
-      deep: true,
+    // the remote doesn't support infinity propfind,
-      details: false /* no need for verbose details here */,
+    // we need to do a bfs here
-      glob: "/**" /* avoid dot files by using glob */,
+    const q = new Queue([`/${client.vaultName}`]);
    const CHUNK_SIZE = 10;
    while (q.length > 0) {
      const itemsToFetch = [];
      while (q.length > 0) {
        itemsToFetch.push(q.pop());
      }
      const itemsToFetchChunks = chunk(itemsToFetch, CHUNK_SIZE);
      // log.debug(itemsToFetchChunks);
      const subContents = [] as FileStat[];
      for (const singleChunk of itemsToFetchChunks) {
        const r = singleChunk.map((x) => {
          return client.client.getDirectoryContents(x, {
            deep: false,
            details: false /* no need for verbose details here */,
            glob: "/**" /* avoid dot files by using glob */,
          }) as Promise<FileStat[]>;
        });
        const r2 = flatten(await Promise.all(r));
        subContents.push(...r2);
      }
      for (let i = 0; i < subContents.length; ++i) {
        const f = subContents[i];
        contents.push(f);
        if (f.type === "directory") {
          q.push(f.filename);
        }
      }
    }
-  )) as FileStat[];
+  } else {
    // the remote supports infinity propfind
    contents = (await client.client.getDirectoryContents(
      `/${client.vaultName}`,
      {
        deep: true,
        details: false /* no need for verbose details here */,
        glob: "/**" /* avoid dot files by using glob */,
      }
    )) as FileStat[];
  }
  return {
    Contents: contents.map((x) =>
      fromWebdavItemToRemoteItem(x, client.vaultName)
@@ -236,13 +390,16 @@ export const downloadFromRemote = async (
  vault: Vault,
  mtime: number,
  password: string = "",
-  remoteEncryptedKey: string = ""
+  remoteEncryptedKey: string = "",
  skipSaving: boolean = false
 ) => {
  await client.init();
  const isFolder = fileOrFolderPath.endsWith("/");
-  await mkdirpInVault(fileOrFolderPath, vault);
+  if (!skipSaving) {
    await mkdirpInVault(fileOrFolderPath, vault);
  }
  // the file is always local file
  // we need to encrypt it
@@ -250,6 +407,7 @@ export const downloadFromRemote = async (
  if (isFolder) {
    // mkdirp locally is enough
    // do nothing here
    return new ArrayBuffer(0);
  } else {
    let downloadFile = fileOrFolderPath;
    if (password !== "") {
@@ -261,9 +419,12 @@ export const downloadFromRemote = async (
    if (password !== "") {
      localContent = await decryptArrayBuffer(remoteContent, password);
    }
-    await vault.adapter.writeBinary(fileOrFolderPath, localContent, {
+    if (!skipSaving) {
-      mtime: mtime,
+      await vault.adapter.writeBinary(fileOrFolderPath, localContent, {
-    });
+        mtime: mtime,
      });
    }
    return localContent;
  }
 };
@@ -1,5 +1,17 @@
-import { App, Modal, Notice, PluginSettingTab, Setting } from "obsidian";
+import {
-import type { SUPPORTED_SERVICES_TYPE, WebdavAuthType } from "./baseTypes";
+  App,
  Modal,
  Notice,
  PluginSettingTab,
  Setting,
  Platform,
  requireApiVersion,
 } from "obsidian";
 import {
  API_VER_REQURL,
  SUPPORTED_SERVICES_TYPE,
  WebdavAuthType,
 } from "./baseTypes";
 import { exportVaultSyncPlansToFiles } from "./debugMode";
 import { exportQrCodeUri } from "./importExport";
 import {
@@ -110,17 +122,45 @@ class DropboxAuthModal extends Modal {
  async onOpen() {
    let { contentEl } = this;
-    const { authUrl, verifier } = await getAuthUrlAndVerifierDropbox(
+    let needManualPatse = false;
-      this.plugin.settings.dropbox.clientID
+    const userAgent = window.navigator.userAgent.toLocaleLowerCase() || "";
-    );
+    // some users report that,
-    this.plugin.oauth2Info.verifier = verifier;
+    // the Linux would open another instance Obsidian if jumping back,
    // so fallback to manual paste on Linux
    if (
      Platform.isDesktopApp &&
      !Platform.isMacOS &&
      (/linux/.test(userAgent) ||
        /ubuntu/.test(userAgent) ||
        /debian/.test(userAgent) ||
        /fedora/.test(userAgent) ||
        /centos/.test(userAgent))
    ) {
      needManualPatse = true;
    }
-    contentEl.createEl("p", {
+    const { authUrl, verifier } = await getAuthUrlAndVerifierDropbox(
-      text: "Visit the address in a browser, and follow the steps.",
+      this.plugin.settings.dropbox.clientID,
-    });
+      needManualPatse
-    contentEl.createEl("p", {
+    );
-      text: "Finally you should be redirected to Obsidian.",
+
-    });
+    if (needManualPatse) {
      contentEl.createEl("p", {
        text: "Step 1: Visit the address in a browser, and follow the steps.",
      });
      contentEl.createEl("p", {
        text: 'Step 2: In the end of the web flow, you obtain a long code. Paste it here then click "Submit".',
      });
    } else {
      this.plugin.oauth2Info.verifier = verifier;
      contentEl.createEl("p", {
        text: "Visit the address in a browser, and follow the steps.",
      });
      contentEl.createEl("p", {
        text: "Finally you should be redirected to Obsidian.",
      });
    }
    const div2 = contentEl.createDiv();
    div2.createEl(
@@ -140,6 +180,70 @@ class DropboxAuthModal extends Modal {
      href: authUrl,
      text: authUrl,
    });
    if (needManualPatse) {
      let authCode = "";
      new Setting(contentEl)
        .setName("Auth Code from web page")
        .setDesc('You need to click "Confirm".')
        .addText((text) =>
          text
            .setPlaceholder("")
            .setValue("")
            .onChange((val) => {
              authCode = val.trim();
            })
        )
        .addButton(async (button) => {
          button.setButtonText("Confirm");
          button.onClick(async () => {
            new Notice("Trying to connect to Dropbox");
            try {
              const authRes = await sendAuthReqDropbox(
                this.plugin.settings.dropbox.clientID,
                verifier,
                authCode
              );
              const self = this;
              setConfigBySuccessfullAuthInplace(
                this.plugin.settings.dropbox,
                authRes,
                () => self.plugin.saveSettings()
              );
              const client = new RemoteClient(
                "dropbox",
                undefined,
                undefined,
                this.plugin.settings.dropbox,
                undefined,
                this.app.vault.getName(),
                () => self.plugin.saveSettings()
              );
              const username = await client.getUser();
              this.plugin.settings.dropbox.username = username;
              await this.plugin.saveSettings();
              new Notice(
                `Good! We've connected to Dropbox as user ${username}!`
              );
              this.authDiv.toggleClass(
                "dropbox-auth-button-hide",
                this.plugin.settings.dropbox.username !== ""
              );
              this.revokeAuthDiv.toggleClass(
                "dropbox-revoke-auth-button-hide",
                this.plugin.settings.dropbox.username === ""
              );
              this.revokeAuthSetting.setDesc(
                `You've connected as user ${this.plugin.settings.dropbox.username}. If you want to disconnect, click this button.`
              );
              this.close();
            } catch (err) {
              console.error(err);
              new Notice("Something goes wrong while connecting to Dropbox.");
            }
          });
        });
    }
  }
  onClose() {
@@ -422,6 +526,55 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
          });
      });
    const runOnceStartUpDiv = generalDiv.createEl("div");
    new Setting(runOnceStartUpDiv)
      .setName("run once on start up automatically")
      .setDesc(
        `This settings allows setting running ONCE on start up automatically. This will take effect on NEXT start up after changing. This setting, is different from "schedule for auto run" which starts syncing after EVERY interval.`
      )
      .addDropdown((dropdown) => {
        dropdown.addOption("-1", "(not set)");
        dropdown.addOption(
          `${1000 * 10 * 1}`,
          "sync once after 10 seconds of start up"
        );
        dropdown.addOption(
          `${1000 * 30 * 1}`,
          "sync once after 30 seconds of start up"
        );
        dropdown
          .setValue(`${this.plugin.settings.initRunAfterMilliseconds}`)
          .onChange(async (val: string) => {
            const realVal = parseInt(val);
            this.plugin.settings.initRunAfterMilliseconds = realVal;
            await this.plugin.saveSettings();
          });
      });
    const concurrencyDiv = generalDiv.createEl("div");
    new Setting(concurrencyDiv)
      .setName("Concurrency")
      .setDesc(
        "How many files do you want to download or upload in parallel at most? By default it's set to 5. If you meet any problems such as rate limit, you can reduce the concurrency to a lower value."
      )
      .addDropdown((dropdown) => {
        dropdown.addOption("1", "1");
        dropdown.addOption("2", "2");
        dropdown.addOption("3", "3");
        dropdown.addOption("5", "5 (default)");
        dropdown.addOption("10", "10");
        dropdown.addOption("15", "15");
        dropdown.addOption("20", "20");
        dropdown
          .setValue(`${this.plugin.settings.concurrency}`)
          .onChange(async (val) => {
            const realVal = parseInt(val);
            this.plugin.settings.concurrency = realVal;
            await this.plugin.saveSettings();
          });
      });
    //////////////////////////////////////////////////
    // below for general chooser (part 1/2)
    //////////////////////////////////////////////////
@@ -447,9 +600,11 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
      cls: "s3-disclaimer",
    });
-    s3Div.createEl("p", {
+    if (!requireApiVersion(API_VER_REQURL)) {
-      text: "You need to configure CORS to allow requests from origin app://obsidian.md and capacitor://localhost and http://localhost",
+      s3Div.createEl("p", {
-    });
+        text: "You need to configure CORS to allow requests from origin app://obsidian.md and capacitor://localhost and http://localhost",
      });
    }
    s3Div.createEl("p", {
      text: "Some Amazon S3 official docs for references:",
@@ -467,10 +622,12 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
      text: "Access key ID and Secret access key info",
    });
-    s3LinksUl.createEl("li").createEl("a", {
+    if (!requireApiVersion(API_VER_REQURL)) {
-      href: "https://docs.aws.amazon.com/AmazonS3/latest/userguide/enabling-cors-examples.html",
+      s3LinksUl.createEl("li").createEl("a", {
-      text: "Configuring CORS",
+        href: "https://docs.aws.amazon.com/AmazonS3/latest/userguide/enabling-cors-examples.html",
-    });
+        text: "Configuring CORS",
      });
    }
    new Setting(s3Div)
      .setName("s3Endpoint")
@@ -487,7 +644,9 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
    new Setting(s3Div)
      .setName("s3Region")
-      .setDesc("s3Region")
+      .setDesc(
        "s3Region: If you are not sure what to enter, you could try the vaule: us-east-1"
      )
      .addText((text) =>
        text
          .setPlaceholder("")
@@ -537,6 +696,34 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
          })
      );
    if (requireApiVersion(API_VER_REQURL)) {
      new Setting(s3Div)
        .setName("bypass CORS issue locally")
        .setDesc(
          `The plugin allows skipping server CORS config in new version (Obsidian>=${API_VER_REQURL}). If you encounter any issues, please disable this setting and config CORS (app://obsidian.md and capacitor://localhost and http://localhost) on server.`
        )
        .addDropdown((dropdown) => {
          dropdown
            .addOption("disable", "disable")
            .addOption("enable", "enable");
          dropdown
            .setValue(
              `${
                this.plugin.settings.s3.bypassCorsLocally ? "enable" : "disable"
              }`
            )
            .onChange(async (value) => {
              if (value === "enable") {
                this.plugin.settings.s3.bypassCorsLocally = true;
              } else {
                this.plugin.settings.s3.bypassCorsLocally = false;
              }
              await this.plugin.saveSettings();
            });
        });
    }
    new Setting(s3Div)
      .setName("check connectivity")
      .setDesc("check connectivity")
@@ -810,9 +997,11 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
      cls: "webdav-disclaimer",
    });
-    webdavDiv.createEl("p", {
+    if (!requireApiVersion(API_VER_REQURL)) {
-      text: "You need to configure CORS to allow requests from origin app://obsidian.md and capacitor://localhost and http://localhost",
+      webdavDiv.createEl("p", {
-    });
+        text: "You need to configure CORS to allow requests from origin app://obsidian.md and capacitor://localhost and http://localhost",
      });
    }
    webdavDiv.createEl("p", {
      text: `We will create and sync inside the folder /${this.app.vault.getName()} on your server.`,
@@ -860,9 +1049,20 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
    new Setting(webdavDiv)
      .setName("server auth type")
      .setDesc("If no password, this option would be ignored.")
-      .addDropdown((dropdown) => {
+      .addDropdown(async (dropdown) => {
        dropdown.addOption("basic", "basic");
-        // dropdown.addOption("digest", "digest");
+        if (requireApiVersion(API_VER_REQURL)) {
          dropdown.addOption("digest", "digest");
        }
        // new version config, copied to old version, we need to reset it
        if (
          !requireApiVersion(API_VER_REQURL) &&
          this.plugin.settings.webdav.authType !== "basic"
        ) {
          this.plugin.settings.webdav.authType = "basic";
          await this.plugin.saveSettings();
        }
        dropdown
          .setValue(this.plugin.settings.webdav.authType)
@@ -872,6 +1072,32 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
          });
      });
    new Setting(webdavDiv)
      .setName("server supports infinity propfind or not")
      .setDesc(
        "The plugin needs to get all files and folders recursively using probfind. If your webdav server only supports depth='1' (such as NGINX), you need to adjust the setting here, then the plugin consumes more network requests, but better than not working."
      )
      .addDropdown((dropdown) => {
        dropdown.addOption("infinity", "supports depth='infinity'");
        dropdown.addOption("1", "only supports depth='1'");
        type Depth = "1" | "infinity";
        dropdown
          .setValue(
            this.plugin.settings.webdav.manualRecursive === false
              ? "infinity"
              : "1"
          )
          .onChange(async (val: Depth) => {
            if (val === "1") {
              this.plugin.settings.webdav.manualRecursive = true;
            } else if (val === "infinity") {
              this.plugin.settings.webdav.manualRecursive = false;
            }
            await this.plugin.saveSettings();
          });
      });
    new Setting(webdavDiv)
      .setName("check connectivity")
      .setDesc("check connectivity")
@@ -891,8 +1117,13 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
          if (res) {
            new Notice("Great! The webdav server can be accessed.");
          } else {
            let corsErrMsg = "/CORS";
            if (requireApiVersion(API_VER_REQURL)) {
              corsErrMsg = "";
            }
            new Notice(
-              "The webdav server cannot be reached (possible to be any of address/username/password/authtype/CORS errors)."
+              `The webdav server cannot be reached (possible to be any of address/username/password/authtype${corsErrMsg} errors).`
            );
          }
        });
@@ -0,0 +1,69 @@
 import { App, Modal, Notice, PluginSettingTab, Setting } from "obsidian";
 import type RemotelySavePlugin from "./main"; // unavoidable
 import * as origLog from "loglevel";
 const log = origLog.getLogger("rs-default");
 export class SyncAlgoV2Modal extends Modal {
  agree: boolean;
  readonly plugin: RemotelySavePlugin;
  constructor(app: App, plugin: RemotelySavePlugin) {
    super(app);
    this.plugin = plugin;
    this.agree = false;
  }
  onOpen() {
    let { contentEl } = this;
    contentEl.createEl("h2", {
      text: "Remotely Save has a better sync algorithm",
    });
    const texts = [
      "Welcome to use Remotely Save!",
      "From version 0.3.0, a new algorithm has been developed, but it needs uploading extra meta data files _remotely-save-metadata-on-remote.{json,bin} to YOUR configured cloud destinations, besides your notes.",
      "So that, for example, the second device can know that what files/folders have been deleted on the first device by reading those files.",
      'If you agree, plase click the button "agree", and enjoy the plugin! AND PLEASE REMEMBER TO BACKUP YOUR VAULT FIRSTLY!',
      'If you do not agree, you should stop using the current and later versions of Remotely Save. You could consider manually install the old version 0.2.14 which uses old algorithm and does not upload any extra meta data files. By clicking the "Do not agree" button, the plugin will unload itself, and you need to manually disable it in Obsidian settings.',
    ];
    const ul = contentEl.createEl("ul");
    for (const t of texts) {
      ul.createEl("li", {
        text: t,
      });
    }
    new Setting(contentEl)
      .addButton((button) => {
        button.setButtonText("Agree");
        button.onClick(async () => {
          this.agree = true;
          this.close();
        });
      })
      .addButton((button) => {
        button.setButtonText("Do not agree");
        button.onClick(() => {
          this.close();
        });
      });
  }
  onClose() {
    let { contentEl } = this;
    contentEl.empty();
    if (this.agree) {
      log.info("agree to use the new algorithm");
      this.plugin.saveAgreeToUseNewSyncAlgorithm();
      this.plugin.enableAutoSyncIfSet();
      this.plugin.enableInitSyncIfSet();
    } else {
      log.info("do not agree to use the new algorithm");
      this.plugin.unload();
    }
  }
 }
@@ -0,0 +1,86 @@
 import * as chai from "chai";
 import chaiAsPromised from "chai-as-promised";
 import {
  isEqualMetadataOnRemote,
  MetadataOnRemote,
 } from "../src/metadataOnRemote";
 chai.use(chaiAsPromised);
 const expect = chai.expect;
 describe("Metadata operations tests", () => {
  it("should compare objects deeply", async () => {
    const a: MetadataOnRemote = {
      deletions: [
        { key: "xxx", actionWhen: 1 },
        { key: "yyy", actionWhen: 2 },
      ],
    };
    const b: MetadataOnRemote = {
      deletions: [
        { key: "xxx", actionWhen: 1 },
        { key: "yyy", actionWhen: 2 },
      ],
    };
    expect(isEqualMetadataOnRemote(a, b));
  });
  it("should find diff", async () => {
    const a: MetadataOnRemote = {
      deletions: [
        { key: "xxxx", actionWhen: 1 },
        { key: "yyy", actionWhen: 2 },
      ],
    };
    const b: MetadataOnRemote = {
      deletions: [
        { key: "xxx", actionWhen: 1 },
        { key: "yyy", actionWhen: 2 },
      ],
    };
    expect(!isEqualMetadataOnRemote(a, b));
  });
  it("should treat undefined correctly", async () => {
    const a: MetadataOnRemote = undefined;
    let b: MetadataOnRemote = {
      deletions: [
        { key: "xxx", actionWhen: 1 },
        { key: "yyy", actionWhen: 2 },
      ],
    };
    expect(!isEqualMetadataOnRemote(a, b));
    b = { deletions: [] };
    expect(isEqualMetadataOnRemote(a, b));
    b = { deletions: undefined };
    expect(isEqualMetadataOnRemote(a, b));
    b = undefined;
    expect(isEqualMetadataOnRemote(a, b));
  });
  it("should ignore generated at fields", async () => {
    const a: MetadataOnRemote = {
      deletions: [
        { key: "xxxx", actionWhen: 1 },
        { key: "yyy", actionWhen: 2 },
      ],
      generatedWhen: 1,
    };
    const b: MetadataOnRemote = {
      deletions: [
        { key: "xxx", actionWhen: 1 },
        { key: "yyy", actionWhen: 2 },
      ],
      generatedWhen: 2,
    };
    expect(isEqualMetadataOnRemote(a, b));
  });
 });
@@ -68,6 +68,20 @@ describe("Misc: get folder levels", () => {
    expect(misc.getFolderLevels(item3)).to.deep.equal(res3);
  });
  it("should correctly add ending slash if required", () => {
    const item = "xxx/yyy/zzz.md";
    const res = ["xxx/", "xxx/yyy/"];
    expect(misc.getFolderLevels(item, true)).to.deep.equal(res);
    const item2 = "xxx/yyy/zzz";
    const res2 = ["xxx/", "xxx/yyy/"];
    expect(misc.getFolderLevels(item2, true)).to.deep.equal(res2);
    const item3 = "xxx/yyy/zzz/";
    const res3 = ["xxx/", "xxx/yyy/", "xxx/yyy/zzz/"];
    expect(misc.getFolderLevels(item3, true)).to.deep.equal(res3);
  });
  it("should treat path starting with / correctly", () => {
    const item = "/xxx/yyy/zzz.md";
    const res = ["/xxx", "/xxx/yyy"];
@@ -91,6 +105,27 @@ describe("Misc: get folder levels", () => {
  });
 });
 describe("Misc: get parent folder", () => {
  it("should treat empty path correctly", () => {
    const item = "";
    expect(misc.getParentFolder(item)).equals("/");
  });
  it("should treat one level path correctly", () => {
    let item = "abc/";
    expect(misc.getParentFolder(item)).equals("/");
    item = "/efg/";
    expect(misc.getParentFolder(item)).equals("/");
  });
  it("should treat more levels path correctly", () => {
    let item = "abc/efg";
    expect(misc.getParentFolder(item)).equals("abc/");
    item = "/hij/klm/";
    expect(misc.getParentFolder(item)).equals("/hij/");
  });
 });
 describe("Misc: vaild file name tests", () => {
  it("should treat no ascii correctly", async () => {
    const x = misc.isVaildText("😄🍎 apple 苹果");
@@ -145,3 +180,56 @@ describe("Misc: extract svg", () => {
    expect(y).to.equal("<rect/><g/>");
  });
 });
 describe("Misc: get split ranges", () => {
  it("should deal with big parts", () => {
    const k = misc.getSplitRanges(10, 20);
    const k2: misc.SplitRange[] = [
      {
        partNum: 1,
        start: 0,
        end: 10,
      },
    ];
    expect(k).to.deep.equal(k2);
  });
  it("should deal with 0 remainder", () => {
    const k = misc.getSplitRanges(20, 10);
    const k2: misc.SplitRange[] = [
      {
        partNum: 1,
        start: 0,
        end: 10,
      },
      {
        partNum: 2,
        start: 10,
        end: 20,
      },
    ];
    expect(k).to.deep.equal(k2);
  });
  it("should deal with not-0 remainder", () => {
    const k = misc.getSplitRanges(25, 10);
    const k2: misc.SplitRange[] = [
      {
        partNum: 1,
        start: 0,
        end: 10,
      },
      {
        partNum: 2,
        start: 10,
        end: 20,
      },
      {
        partNum: 3,
        start: 20,
        end: 25,
      },
    ];
    expect(k).to.deep.equal(k2);
  });
 });
@@ -1,3 +1,4 @@
 {
-  "0.2.11": "0.12.15"
+  "0.3.2": "0.12.15",
  "0.3.5": "0.13.21"
 }
@@ -57,6 +57,7 @@ module.exports = {
      // events: require.resolve("events"),
      // http: require.resolve("stream-http"),
      // https: require.resolve("https-browserify"),
      net: false,
      // os: require.resolve("os-browserify/browser"),
      path: require.resolve("path-browserify"),
      // punycode: require.resolve("punycode"),
@@ -66,8 +67,9 @@ module.exports = {
      // string_decoder: require.resolve("string_decoder"),
      // sys: require.resolve("util"),
      // timers: require.resolve("timers-browserify"),
      tls: false,
      // tty: require.resolve("tty-browserify"),
-      // url: require.resolve("url"),
+      url: require.resolve("url/"),
      // util: require.resolve("util"),
      // vm: require.resolve("vm-browserify"),
      // zlib: require.resolve("browserify-zlib"),
Author	SHA1	Message	Date
fyears	5481316b83	0.3.5	2022-03-11 09:48:21 +08:00
fyears	6586c2a43e	add doc to debug	2022-03-11 09:47:46 +08:00
fyears	e1d9fc1e9c	fix sync delete	2022-03-11 09:11:50 +08:00
fyears	ecc46f2ea1	fully bypass cors for onedrive!	2022-03-11 09:09:41 +08:00
fyears	c04876e0c5	A big commit Squashed commit of CORS: commit 8cffa38ebae2a46b7c8e855c7b21a124e35adc89 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Thu Mar 10 23:52:56 2022 +0800 bypass more cors for onedrive commit 1b59ac1e58032099068aab55d22ef96c6396f203 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Wed Mar 9 23:58:28 2022 +0800 change wordings for webdav cors commit 73142eb18b59fff20839680e866f51cfcb0a6226 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Wed Mar 9 23:38:58 2022 +0800 remove cors hint for webdav commit 7dbb0b49d50e529b2b72e55ea2c8503ba7fa9268 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Wed Mar 9 23:31:54 2022 +0800 fix webdav commit c28c4e19720a56230d483acf306463d42e619fa4 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Wed Mar 9 23:31:35 2022 +0800 remove more headers commit 4eeae7043fa68d669a5c23c5549c14c1260ce638 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Wed Mar 9 23:18:32 2022 +0800 polish cors hints for s3 commit d9e55a91a1c413e9419cd6b30a3a6e3b403d483b Author: fyears <1142836+fyears@users.noreply.github.com> Date: Wed Mar 9 22:40:37 2022 +0800 fix format commit b780a3eb4e37b05b8e8b92d6a2f9283b3459d738 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Wed Mar 9 22:37:02 2022 +0800 finally correctly inject requestUrl into s3 commit 6a55a1a43d7653d65579ab88aa816e5d54cd276a Author: fyears <1142836+fyears@users.noreply.github.com> Date: Wed Mar 9 22:33:18 2022 +0800 to arraybuffer from view commit 2f2607b4f0a3d9db5943528ced57cb2fdb419607 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Wed Mar 9 13:31:22 2022 +0800 add split ranges commit ea24da24dea83fdb770e7e391cf8a2e4fea78d0d Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sun Mar 6 22:57:50 2022 +0800 add settings of bypassing for s3 commit 2f099dc8ca1e66ea137b28dd329be50968734ba6 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sun Mar 6 22:38:07 2022 +0800 use api ver var commit 74c7ce2449a88cbe7c7f50cbb687b36ff3732c04 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sun Mar 6 22:37:25 2022 +0800 correct way to inject s3 commit f29945d73132d21b2c44472ec2cafc06b9d71e8f Author: fyears <1142836+fyears@users.noreply.github.com> Date: Tue Mar 1 00:09:57 2022 +0800 add new http handler commit d55104cb08e168cbcc243cf901cbd7f46f2e324b Author: fyears <1142836+fyears@users.noreply.github.com> Date: Mon Feb 28 22:59:55 2022 +0800 add types for patch commit 50b79ade7188ee7dfab9c1d03119585db358ba6f Author: fyears <1142836+fyears@users.noreply.github.com> Date: Mon Feb 28 08:25:19 2022 +0800 remove verbose commit 83f0e71aa15aa7586f6d4e105cd77c25c2e113ce Author: fyears <1142836+fyears@users.noreply.github.com> Date: Mon Feb 28 08:25:04 2022 +0800 patch webdav!	2022-03-10 23:54:35 +08:00
fyears	5402baed0a	update link	2022-03-06 23:42:13 +08:00
fyears	5aa96a4ddb	0.3.4	2022-03-06 23:16:34 +08:00
fyears	2e6848f901	combine mtime and ctime	2022-03-06 23:15:59 +08:00
fyears	9c830c2c14	check for undefined decision	2022-03-06 19:03:24 +08:00
fyears	3574b56acb	add more options to concurrency	2022-03-06 18:52:56 +08:00
fyears	18cb8ba413	add sync once after start up	2022-03-06 18:49:15 +08:00
fyears	76e61b6ebf	upload and download in parallel	2022-03-06 18:12:49 +08:00
fyears	3dfe215103	better sync operations for folders	2022-03-06 13:22:24 +08:00
fyears	94c7a4a874	0.3.2	2022-03-05 22:33:45 +08:00
fyears	b573b2859c	add fallback for dropbox	2022-03-05 22:32:58 +08:00
fyears	e2c4d158b1	fix format	2022-03-05 22:31:01 +08:00
fyears	55890611e2	fix s3 pagnation	2022-03-05 12:55:33 +08:00
fyears	5acd1551c9	change wording	2022-02-27 21:48:28 +08:00
fyears	ef2c45a11d	to 0.3.1	2022-02-27 21:45:38 +08:00
fyears	c1771bb117	use arraybuffer instead of uint8array	2022-02-27 21:45:00 +08:00
fyears	ddb86745dd	add tmpl for fr	2022-02-27 21:14:20 +08:00
fyears	971719b710	add issue tmpl	2022-02-27 21:09:05 +08:00
fyears	b6e943a244	add base types	2022-02-27 18:01:52 +08:00
fyears	82742cb53b	update link	2022-02-27 17:57:20 +08:00
fyears	df2d98272c	new sync algo, squashed commit of the following: commit 692bb794aea5609b9e9abf5228620f4479e50983 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sun Feb 27 17:52:43 2022 +0800 bump to 0.3.0 commit 77335412ad2da2b5bd1ed5075061a5af006e3c36 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sun Feb 27 17:50:57 2022 +0800 change titles for minimal intrusive design commit 2812adebb84344d384749a62acb63fd0c6fd509d Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sun Feb 27 17:30:53 2022 +0800 remove syncv1 commit 22fc24a76c9851740bbc7c0177d1cb2526e15d8b Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sun Feb 27 17:30:27 2022 +0800 full notice to any one commit d56ea24a78f6dc1fbea2740011ee1cea9c403d4c Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sat Feb 26 23:11:14 2022 +0800 fix test commit 759f82593bbfb9b49079cfd80dbadbbafc0287e5 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sat Feb 26 21:59:25 2022 +0800 obfuscate metadata on remote commit 9b6bf05288af0e52d0f02468e5ac8757f4f896df Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sat Feb 26 21:33:52 2022 +0800 avoid re-uploading if meta not changed commit 03be1453764e48e99207f44467ee4d5801072ed8 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sat Feb 26 00:35:52 2022 +0800 add password condition commit 7f899f7c2572df3e2a35e16cbdaab94db113f366 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sat Feb 26 00:22:58 2022 +0800 add decision branch for easier debugging commit cf4071bf3156356ae6ec3a9cb187c2cb541d1b17 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Fri Feb 25 23:40:52 2022 +0800 change folder error commit 964493dd998699a1d53018a201637bda192c4baa Author: fyears <1142836+fyears@users.noreply.github.com> Date: Fri Feb 25 23:09:44 2022 +0800 finnaly remote remove should be working commit 2888e65452f9c0e1dde6005f012c3ee0a6313c3f Author: fyears <1142836+fyears@users.noreply.github.com> Date: Fri Feb 25 01:18:15 2022 +0800 optimize comparation commit 024936951d6180b1296c2a5d56c5bf5d468e9ae7 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Fri Feb 25 01:14:44 2022 +0800 allow uploading extra meta commit 007006701d536da2b4b46389941980579bbc4e67 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Thu Feb 24 01:08:58 2022 +0800 add logic to fetch extra meta commit c9d3a05ca1bf45c06f22233124670e5e45b5f5f1 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Thu Feb 24 00:29:16 2022 +0800 another way to deal with trash commit 82d455f8bf60f7bac8eb4e299a2ca44c331a6d7f Author: fyears <1142836+fyears@users.noreply.github.com> Date: Thu Feb 24 00:28:51 2022 +0800 add return buffer for downloading commit b8e6b79bc078def2854bc73578b7f520cc39ab34 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Wed Feb 23 00:16:06 2022 +0800 half way to actual sync commit 90cceb1411b46af9741f2caa3ab8beafaf69c1b2 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Tue Feb 22 23:36:09 2022 +0800 cleaner way to remember the folder being kept commit c1afb763cc4e0f7905c83e0a8eb20f8ed969a279 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Tue Feb 22 00:03:21 2022 +0800 simplified way to get plans for sync algo v2 commit 5c5ecce39eb3854900f1f5b79c7beb189e78a6a7 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Mon Feb 21 23:13:58 2022 +0800 archive the old sync algo v1 doc commit 75cdfa1ee9834600f83ded6672b102de2c5f9616 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Mon Feb 21 23:13:14 2022 +0800 simplify sync algo v2 commit dc9275835d961de07efcbaa81657e4745242e72a Author: fyears <1142836+fyears@users.noreply.github.com> Date: Mon Feb 21 22:58:57 2022 +0800 add way to skip recording removing commit f9712ef96021dfed4ae33e6c649f78e940b7e530 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Mon Feb 21 09:38:09 2022 +0800 fix sync commit 9007dcf22ef317dde36ac4f1dd589d05cc8d5cf6 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Mon Feb 21 00:54:21 2022 +0800 fix assignment commit 77abee6ad443b62353ed3913e0945ea7d1314f87 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Mon Feb 21 00:28:43 2022 +0800 draft of sync v2 commit a0c26238bf60692e095cfd8527abf937255b56d4 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Mon Feb 21 00:23:19 2022 +0800 how to deal with folders commit c10f92a7e8d3c4a4f4c585e39e0abad1a5376c02 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sun Feb 20 23:39:16 2022 +0800 helper func to get parents commit f903c98b3b7b9d1e785d04b9fc0cfcafdc6e5661 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sun Feb 20 23:31:21 2022 +0800 add optional ending slash to getFolderLevels commit 2d67c9b2b941e676588fa43ab289fab79f567e5e Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sun Feb 20 14:44:44 2022 +0800 update sync algo v2 commit 491ed1bb85759df2411706fd02d740acb5598ce6 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sun Feb 20 14:34:51 2022 +0800 dry run mode commit dfd588dcef512ba7dfe760008bcf97138b97e339 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sat Feb 19 23:14:32 2022 +0800 prettier commit eae580f882a045ae9df799b816e68c3500704131 Author: fyears <1142836+fyears@users.noreply.github.com> Date: Sat Feb 19 23:12:29 2022 +0800 draft design for sync algo v2	2022-02-27 17:54:31 +08:00
fyears	6045155fbb	action for all branches	2022-02-22 00:10:25 +08:00
fyears	be7d111f70	Update sync_algorithm.md	2022-02-16 09:17:02 +08:00
fyears	3e12e05e26	Merge branch 'master' of https://github.com/fyears/remotely-save	2022-02-12 12:29:52 +08:00
fyears	ba1e07d768	upgrad msal again	2022-02-12 12:28:47 +08:00
fyears	29d059aed5	fix typo	2022-02-12 02:23:47 +08:00
fyears	6541923d3d	downgrade msal-node	2022-02-12 02:17:47 +08:00
fyears	daa341843d	fix typo	2022-02-12 02:11:00 +08:00
fyears	05c40f17e5	add some hints of s3	2022-02-12 02:04:01 +08:00
fyears	15e9161d53	browser env limit	2022-02-12 02:00:32 +08:00
fyears	44170602f6	add services list	2022-02-12 01:42:43 +08:00
fyears	84df2d683f	add s3 example	2022-02-12 00:37:22 +08:00
fyears	eafab8c5cc	Merge pull request #24 from HammyHavoc/patch-1 Fixed a typo	2022-01-31 03:27:32 +08:00
fyears	553a1f7bed	0.2.14	2022-01-31 03:23:16 +08:00
fyears	da837ec7af	fix onedrive ctag / etag issue	2022-01-31 03:22:16 +08:00
fyears	d250e676a2	avoid cors for onedrive as much as possible	2022-01-31 02:22:44 +08:00
Hammy Havoc	53cb38059a	Fixed a typo :- )	2022-01-26 20:31:05 +00:00
fyears	7b78f19ca1	add latest ver downloads	2022-01-23 00:34:51 +08:00
fyears	f7082616aa	0.2.13	2022-01-22 22:20:11 +08:00
fyears	d9f926e376	add command	2022-01-22 22:19:31 +08:00
fyears	13a2d6f53a	0.2.12	2022-01-22 18:02:15 +08:00
fyears	5092c59ed3	skip empty file for onedrive	2022-01-22 18:01:21 +08:00
fyears	fc9ab2e63f	add support for Livefolders	2022-01-22 17:39:45 +08:00
fyears	91af2c849f	revert main.ts after debugging	2022-01-22 17:17:53 +08:00
fyears	fafe74526d	Merge branch 'master' of https://github.com/fyears/remotely-save	2022-01-22 17:13:15 +08:00
fyears	320f91f1a5	add webdav depth=1	2022-01-22 17:11:12 +08:00
fyears	ea7c9ae203	remove manual sync limit in readme	2022-01-20 13:11:30 +08:00
		`@@ -0,0 +1,3 @@`
							`# Limitations From The Browser Environment: No Background Running After Obsidian Is Closed`

							`The plugin treats Obsidian as a special browser, and is in fact some js codes. So if Obsidian is closed, then the browser environment stops, then the plugin will be stopped.`