0.3.28

Update services_connectable_or_not.md

README.md

@@ -31,7 +31,7 @@ This is yet another unofficial sync plugin for Obsidian. If you like it or find
 
 ## Limitations
 
-- **To support deltions sync, extra metadata will also be uploaded.** See [Minimal Intrusive](./docs/minimal_intrusive_design.md).
+- **To support deletions sync, extra metadata will also be uploaded.** See [Minimal Intrusive](./docs/minimal_intrusive_design.md).
 - **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. Specifically, all the operations, including but not limited to downloading, uploading, listing all files, calling any api, storage sizes, may or may not cost you money.
 - **Some limitations from the browser environment.** More technical details are [in the doc](./docs/browser_env.md).

docs/remote_services/webdav_infinicloud_teracloud/README.md

@@ -0,0 +1,15 @@
+# InfiniCLOUD (formally TeraCLOUD) Webdav
+
+## Link
+
+<https://infini-cloud.net/en/>
+
+## Steps
+
+1. Register an acount.
+2. Go to <https://infini-cloud.net/en/modules/mypage/usage/>, in section "Apps Connection", enable "Turn on Apps Connection". Here you get the address and account and webdav password (different from your account password):
+   ![](./infinicloud_account.png)
+3. In remotely-save setting page, select webdav type, then input the address/account/**webdav password**(not your account password).
+   ![](./infinicloud_rs_setting.png)
+4. In remotely-save setting page, click "Check Connectivity".
+5. Sync!

docs/remote_services/webdav_infinicloud_teracloud/infinicloud_account.png

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

docs/remote_services/webdav_infinicloud_teracloud/infinicloud_rs_setting.png

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

docs/services_connectable_or_not.md

@@ -18,7 +18,7 @@ The list is for information purposes only.
 | [MinIO](https://min.io/)                                                              | ?           | ?     |           |                                                                  |                                          |                                                  |
 | [WsgiDAV](https://github.com/mar10/wsgidav)                                           | Yes         |       | Yes       |                                                                  | Yes                                      | CORS rules can be set.                           |
 | [Nginx `ngx_http_dav_module`](http://nginx.org/en/docs/http/ngx_http_dav_module.html) | Yes?        |       | Yes?      |                                                                  | Yes?                                     | ?                                                |
-| NextCloud                                                                             | Yes?        |       | Yes?      |                                                                  | Yes?                                     | No CORS config by default.                       |
+| NextCloud                                                                             | Yes         |       | Yes       |                                                                  | Yes?                                     | No CORS config by default.                       |
 | OwnCloud                                                                              | Yes?        |       | Yes?      |                                                                  | Yes?                                     | No CORS config by default.                       |
 | Seafile                                                                               | Yes         |       | Yes       |                                                                  | Yes?                                     | No CORS config by default.                       |
 | `rclone serve webdav`                                                                 | Yes         |       | Yes       |                                                                  | Yes                                      | No CORS support.                                 |
@@ -26,7 +26,7 @@ The list is for information purposes only.
 | [TeraCLOUD](https://teracloud.jp/en/)                                                 | Yes         |       | Yes       |                                                                  | Yes                                      | No CORS support.                                 |
 | Dropbox                                                                               | Yes         |       |           | Yes                                                              |                                          |                                                  |
 | OneDrive for personal                                                                 | Yes         |       |           | Yes                                                              |                                          |                                                  |
-| OneDrive for Business                                                                 | In the plan |       |           | ?                                                                |                                          |                                                  |
+| OneDrive for Business                                                                 | Yes         |       |           | ?                                                                |                                          |                                                  |
 | 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.                   |                                          |                                                  |

esbuild.config.mjs

@@ -18,7 +18,7 @@ const DEFAULT_ONEDRIVE_CLIENT_ID = process.env.ONEDRIVE_CLIENT_ID || "";
 const DEFAULT_ONEDRIVE_AUTHORITY = process.env.ONEDRIVE_AUTHORITY || "";
 
 esbuild
-  .build({
+  .context({
     banner: {
       js: banner,
     },
@@ -33,11 +33,13 @@ esbuild
       "fs",
       "tls",
       "net",
+      "http",
+      "https",
       // ...builtins
     ],
     inject: ["./esbuild.injecthelper.mjs"],
     format: "cjs",
-    watch: !prod,
+    // watch: !prod, // no longer valid in esbuild 0.17
     target: "es2016",
     logLevel: "info",
     sourcemap: prod ? false : "inline",
@@ -53,4 +55,15 @@ esbuild
       "process.env.DEBUG": `undefined`, // ugly fix
     },
   })
+  .then((context) => {
+    if (process.argv.includes("--watch")) {
+      // Enable watch mode
+      context.watch();
+    } else {
+      // Build once and exit if not in watch mode
+      context.rebuild().then((result) => {
+        context.dispose();
+      });
+    }
+  })
   .catch(() => process.exit(1));

manifest-beta.json

@@ -0,0 +1,10 @@
+{
+  "id": "remotely-save",
+  "name": "Remotely Save",
+  "version": "0.3.28",
+  "minAppVersion": "0.13.21",
+  "description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
+  "author": "fyears",
+  "authorUrl": "https://github.com/fyears",
+  "isDesktopOnly": false
+}

manifest.json

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

package.json

@@ -1,13 +1,13 @@
 {
   "name": "remotely-save",
-  "version": "0.3.22",
+  "version": "0.3.25",
   "description": "This is yet another sync plugin for Obsidian app.",
   "scripts": {
-    "dev2": "node esbuild.config.mjs",
+    "dev2": "node esbuild.config.mjs --watch",
     "build2": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production",
     "build": "webpack --mode production",
     "dev": "webpack --mode development --watch",
-    "format": "npx prettier --write .",
+    "format": "npx prettier --trailing-comma es5 --write .",
     "clean": "npx rimraf main.js",
     "test": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} mocha -r ts-node/register 'tests/**/*.ts'"
   },
@@ -23,73 +23,74 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@microsoft/microsoft-graph-types": "^2.19.0",
+    "@microsoft/microsoft-graph-types": "^2.40.0",
-    "@types/chai": "^4.3.1",
+    "@types/chai": "^4.3.11",
-    "@types/chai-as-promised": "^7.1.5",
+    "@types/chai-as-promised": "^7.1.8",
-    "@types/jsdom": "^16.2.14",
+    "@types/jsdom": "^21.1.6",
-    "@types/lodash": "^4.14.182",
+    "@types/lodash": "^4.14.202",
-    "@types/mime-types": "^2.1.1",
+    "@types/mime-types": "^2.1.4",
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.6",
-    "@types/mustache": "^4.1.2",
+    "@types/mustache": "^4.2.5",
-    "@types/node": "^17.0.30",
+    "@types/node": "^20.10.4",
-    "@types/qrcode": "^1.4.2",
+    "@types/qrcode": "^1.5.5",
-    "builtin-modules": "^3.2.0",
+    "builtin-modules": "^3.3.0",
-    "chai": "^4.3.6",
+    "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
     "cross-env": "^7.0.3",
-    "dotenv": "^16.0.0",
+    "dotenv": "^16.3.1",
-    "esbuild": "^0.14.38",
+    "esbuild": "^0.19.9",
-    "jsdom": "^19.0.0",
+    "jsdom": "^23.0.1",
-    "mocha": "^9.2.2",
+    "mocha": "^10.2.0",
-    "prettier": "^2.6.2",
+    "npm-check-updates": "^16.14.12",
-    "ts-loader": "^9.2.9",
+    "obsidian": "^1.4.11",
-    "ts-node": "^10.7.0",
+    "prettier": "^3.1.1",
-    "tslib": "^2.4.0",
+    "ts-loader": "^9.5.1",
-    "typescript": "^4.6.4",
+    "ts-node": "^10.9.2",
+    "tslib": "^2.6.2",
+    "typescript": "^5.3.3",
     "webdav-server": "^2.6.2",
-    "webpack": "^5.72.0",
+    "webpack": "^5.89.0",
-    "webpack-cli": "^4.9.2"
+    "webpack-cli": "^5.1.4"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.81.0",
+    "@aws-sdk/client-s3": "^3.474.0",
-    "@aws-sdk/fetch-http-handler": "^3.78.0",
+    "@aws-sdk/lib-storage": "^3.474.0",
-    "@aws-sdk/lib-storage": "^3.81.0",
+    "@aws-sdk/signature-v4-crt": "^3.474.0",
-    "@aws-sdk/protocol-http": "^3.78.0",
+    "@aws-sdk/types": "^3.468.0",
-    "@aws-sdk/querystring-builder": "^3.78.0",
+    "@azure/msal-node": "^2.6.0",
-    "@aws-sdk/signature-v4-crt": "^3.78.0",
-    "@aws-sdk/types": "^3.78.0",
-    "@azure/msal-node": "^1.8.0",
     "@fyears/tsqueue": "^1.0.1",
-    "@microsoft/microsoft-graph-client": "^3.0.2",
+    "@microsoft/microsoft-graph-client": "^3.0.7",
-    "acorn": "^8.7.1",
+    "@smithy/fetch-http-handler": "^2.3.1",
-    "aggregate-error": "^4.0.0",
+    "@smithy/protocol-http": "^3.0.11",
-    "assert": "^2.0.0",
+    "@smithy/querystring-builder": "^2.0.15",
-    "aws-crt": "^1.12.1",
+    "acorn": "^8.11.2",
+    "aggregate-error": "^5.0.0",
+    "assert": "^2.1.0",
+    "aws-crt": "^1.20.0",
     "buffer": "^6.0.3",
     "crypto-browserify": "^3.12.0",
-    "delay": "^5.0.0",
+    "delay": "^6.0.0",
-    "dropbox": "^10.28.0",
+    "dropbox": "^10.34.0",
-    "emoji-regex": "^10.1.0",
+    "emoji-regex": "^10.3.0",
-    "http-status-codes": "^2.2.0",
+    "http-status-codes": "^2.3.0",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
-    "loglevel": "^1.8.0",
+    "loglevel": "^1.8.1",
-    "lucide": "^0.35.0",
+    "lucide": "^0.298.0",
     "mime-types": "^2.1.35",
     "mustache": "^4.2.0",
-    "nanoid": "^3.3.3",
+    "nanoid": "^5.0.4",
-    "obsidian": "^0.14.6",
+    "p-queue": "^8.0.1",
-    "p-queue": "^7.2.0",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
-    "qrcode": "^1.5.0",
+    "qrcode": "^1.5.3",
-    "rfc4648": "^1.5.1",
+    "rfc4648": "^1.5.3",
-    "rimraf": "^3.0.2",
+    "rimraf": "^5.0.5",
     "stream-browserify": "^3.0.0",
-    "url": "^0.11.0",
+    "url": "^0.11.3",
-    "util": "^0.12.4",
+    "util": "^0.12.5",
-    "webdav": "^4.9.0",
+    "webdav": "^5.3.1",
     "webdav-fs": "^4.0.1",
-    "xregexp": "^5.1.0"
+    "xregexp": "^5.1.1"
   }
 }

src/encrypt.ts

@@ -166,18 +166,20 @@ export const decryptBase64urlToString = async (
 };
 
 export const getSizeFromOrigToEnc = (x: number) => {
-  if (x < 0 || !Number.isInteger(x)) {
+  if (x < 0 || Number.isNaN(x) || !Number.isInteger(x)) {
-    throw Error(`x=${x} is not a valid size`);
+    throw Error(`getSizeFromOrigToEnc: x=${x} is not a valid size`);
   }
   return (Math.floor(x / 16) + 1) * 16 + 16;
 };
 
 export const getSizeFromEncToOrig = (x: number) => {
-  if (x < 32 || !Number.isInteger(x)) {
+  if (x < 32 || Number.isNaN(x) || !Number.isInteger(x)) {
-    throw Error(`${x} is not a valid size`);
+    throw Error(`getSizeFromEncToOrig: ${x} is not a valid size`);
   }
   if (x % 16 !== 0) {
-    throw Error(`${x} is not a valid encrypted file size`);
+    throw Error(
+      `getSizeFromEncToOrig: ${x} is not a valid encrypted file size`
+    );
   }
   return {
     minSize: ((x - 16) / 16 - 1) * 16,

src/i18n.ts

@@ -5,7 +5,7 @@ import { LANGS } from "./langs";
 
 export type LangType = keyof typeof LANGS;
 export type LangTypeAndAuto = LangType | "auto";
-export type TransItemType = keyof typeof LANGS["en"];
+export type TransItemType = keyof (typeof LANGS)["en"];
 
 export class I18n {
   lang: LangTypeAndAuto;
@@ -31,7 +31,7 @@ export class I18n {
     }
 
     const res: string =
-      (LANGS[realLang] as typeof LANGS["en"])[key] || LANGS["en"][key] || key;
+      (LANGS[realLang] as (typeof LANGS)["en"])[key] || LANGS["en"][key] || key;
     return res;
   }
 

src/localdb.ts

@@ -5,7 +5,7 @@ import { requireApiVersion, TAbstractFile, TFile, TFolder } from "obsidian";
 
 import { API_VER_STAT_FOLDER, SUPPORTED_SERVICES_TYPE } from "./baseTypes";
 import type { SyncPlanType } from "./sync";
-import { toText, unixTimeToStr } from "./misc";
+import { statFix, toText, unixTimeToStr } from "./misc";
 
 import { log } from "./moreOnLog";
 
@@ -312,9 +312,8 @@ export const clearDeleteRenameHistoryOfKeyAndVault = async (
   vaultRandomID: string
 ) => {
   const fullKey = `${vaultRandomID}\t${key}`;
-  const item: FileFolderHistoryRecord | null = await db.fileHistoryTbl.getItem(
+  const item: FileFolderHistoryRecord | null =
-    fullKey
+    await db.fileHistoryTbl.getItem(fullKey);
-  );
   if (
     item !== null &&
     (item.actionType === "delete" || item.actionType === "rename")
@@ -417,7 +416,7 @@ export const insertRenameRecordByVault = async (
     if (requireApiVersion(API_VER_STAT_FOLDER)) {
       // TAbstractFile does not contain these info
       // but from API_VER_STAT_FOLDER we can manually stat them by path.
-      const s = await fileOrFolder.vault.adapter.stat(fileOrFolder.path);
+      const s = await statFix(fileOrFolder.vault, fileOrFolder.path);
       ctime = s.ctime;
       mtime = s.mtime;
     }

src/main.ts

@@ -976,9 +976,8 @@ export default class RemotelySavePlugin extends Plugin {
     const pluginConfigDir =
       this.manifest.dir ||
       `${this.app.vault.configDir}/plugins/${this.manifest.dir}`;
-    const pluginConfigDirExists = await this.app.vault.adapter.exists(
+    const pluginConfigDirExists =
-      pluginConfigDir
+      await this.app.vault.adapter.exists(pluginConfigDir);
-    );
     if (!pluginConfigDirExists) {
       // what happened?
       return;

src/misc.ts

@@ -339,12 +339,9 @@ export const checkHasSpecialCharForDir = (x: string) => {
 };
 
 export const unixTimeToStr = (x: number | undefined | null) => {
-  if (x === undefined) {
+  if (x === undefined || x === null || Number.isNaN(x)) {
     return undefined;
   }
-  if (x === null) {
-    return null;
-  }
   return window.moment(x).format() as string;
 };
 
@@ -408,3 +405,25 @@ export const toText = (x: any) => {
     return `${x}`;
   }
 };
+
+/**
+ * On Android the stat has bugs for folders. So we need a fixed version.
+ * @param vault
+ * @param path
+ */
+export const statFix = async (vault: Vault, path: string) => {
+  const s = await vault.adapter.stat(path);
+  if (s.ctime === undefined || s.ctime === null || Number.isNaN(s.ctime)) {
+    s.ctime = undefined;
+  }
+  if (s.mtime === undefined || s.mtime === null || Number.isNaN(s.mtime)) {
+    s.mtime = undefined;
+  }
+  if (
+    (s.size === undefined || s.size === null || Number.isNaN(s.size)) &&
+    s.type === "folder"
+  ) {
+    s.size = 0;
+  }
+  return s;
+};

src/moreOnLog.ts

@@ -4,14 +4,20 @@
 import { TAbstractFile, TFolder, TFile, Vault } from "obsidian";
 
 import * as origLog from "loglevel";
-import type { LogLevelNumbers, Logger, LogLevel, LogLevelDesc } from "loglevel";
+import type {
+  LogLevelNumbers,
+  Logger,
+  LogLevel,
+  LogLevelDesc,
+  LogLevelNames,
+} from "loglevel";
 const log2 = origLog.getLogger("rs-default");
 
 const originalFactory = log2.methodFactory;
 
 export const applyLogWriterInplace = function (writer: (...msg: any[]) => any) {
   log2.methodFactory = function (
-    methodName: string,
+    methodName: LogLevelNames,
     logLevel: LogLevelNumbers,
     loggerName: string | symbol
   ) {

src/obsFolderLister.ts

@@ -2,6 +2,7 @@ import { Vault, Stat, ListedFiles } from "obsidian";
 import { Queue } from "@fyears/tsqueue";
 import chunk from "lodash/chunk";
 import flatten from "lodash/flatten";
+import { statFix } from "./misc";
 
 export interface ObsConfigDirFileType {
   key: string;
@@ -12,7 +13,14 @@ export interface ObsConfigDirFileType {
 }
 
 const isFolderToSkip = (x: string) => {
-  let specialFolders = [".git", ".svn", "node_modules"];
+  let specialFolders = [
+    ".git",
+    ".github",
+    ".gitlab",
+    ".svn",
+    "node_modules",
+    ".DS_Store",
+  ];
   for (const iterator of specialFolders) {
     if (
       x === iterator ||
@@ -75,7 +83,8 @@ export const listFilesInObsFolder = async (
     const itemsToFetchChunks = chunk(itemsToFetch, CHUNK_SIZE);
     for (const singleChunk of itemsToFetchChunks) {
       const r = singleChunk.map(async (x) => {
-        const statRes = await vault.adapter.stat(x);
+        const statRes = await statFix(vault, x);
+
         const isFolder = statRes.type === "folder";
         let children: ListedFiles = undefined;
         if (isFolder) {

src/remoteForDropbox.ts

@@ -1,4 +1,4 @@
-import delay from "delay";
+import { rangeDelay } from "delay";
 import { Dropbox, DropboxAuth } from "dropbox";
 import type { files, DropboxResponseError, DropboxResponse } from "dropbox";
 import { Vault } from "obsidian";
@@ -340,7 +340,7 @@ async function retryReq<T>(
           2
         )}`
       );
-      await delay.range(secMin * 1000, secMax * 1000);
+      await rangeDelay(secMin * 1000, secMax * 1000);
     }
   }
 }

src/remoteForOnedrive.ts

@@ -461,7 +461,6 @@ export class WrappedOnedriveClient {
         body: JSON.stringify(payload),
         headers: {
           Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
-          "Cache-Control": "no-cache",
         },
       })
     );
@@ -478,7 +477,6 @@ export class WrappedOnedriveClient {
         body: JSON.stringify(payload),
         headers: {
           Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
-          "Cache-Control": "no-cache",
         },
       })
     );
@@ -493,7 +491,6 @@ export class WrappedOnedriveClient {
         method: "DELETE",
         headers: {
           Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
-          "Cache-Control": "no-cache",
         },
       });
     } else {
@@ -501,7 +498,6 @@ export class WrappedOnedriveClient {
         method: "DELETE",
         headers: {
           Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
-          "Cache-Control": "no-cache",
         },
       });
     }
@@ -522,7 +518,6 @@ export class WrappedOnedriveClient {
         headers: {
           "Content-Type": DEFAULT_CONTENT_TYPE,
           Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
-          "Cache-Control": "no-cache",
         },
       });
     } else {
@@ -532,7 +527,6 @@ export class WrappedOnedriveClient {
         headers: {
           "Content-Type": DEFAULT_CONTENT_TYPE,
           Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
-          "Cache-Control": "no-cache",
         },
       });
     }
@@ -826,13 +820,8 @@ const downloadFromRemoteRaw = async (
     ).arrayBuffer;
     return content;
   } else {
-    const content = await (
+    const content = await // cannot set no-cache here, will have cors error
-      await fetch(downloadUrl, {
+    (await fetch(downloadUrl)).arrayBuffer();
-        headers: {
-          "Cache-Control": "no-cache",
-        },
-      })
-    ).arrayBuffer();
     return content;
   }
 };

src/remoteForS3.ts

@@ -11,14 +11,14 @@ import {
   S3Client,
 } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
-import { HttpHandler, HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
+import { HttpHandler, HttpRequest, HttpResponse } from "@smithy/protocol-http";
 import {
   FetchHttpHandler,
   FetchHttpHandlerOptions,
-} from "@aws-sdk/fetch-http-handler";
+} from "@smithy/fetch-http-handler";
 // @ts-ignore
-import { requestTimeout } from "@aws-sdk/fetch-http-handler/dist-es/request-timeout";
+import { requestTimeout } from "@smithy/fetch-http-handler/dist-es/request-timeout";
-import { buildQueryString } from "@aws-sdk/querystring-builder";
+import { buildQueryString } from "@smithy/querystring-builder";
 import { HeaderBag, HttpHandlerOptions, Provider } from "@aws-sdk/types";
 import { Buffer } from "buffer";
 import * as mime from "mime-types";

src/remoteForWebdav.ts

@@ -15,21 +15,22 @@ import type {
   FileStat,
   WebDAVClient,
   RequestOptionsWithState,
-  Response,
+  // Response,
-  ResponseDataDetailed,
+  // ResponseDataDetailed,
-} from "webdav/web";
+} from "webdav";
-import { getPatcher } from "webdav/web";
+
+// @ts-ignore
+import { getPatcher } from "webdav/dist/web/index.js";
 if (VALID_REQURL) {
   getPatcher().patch(
     "request",
-    async (
+    async (options: RequestOptionsWithState): Promise<Response> => {
-      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,
@@ -37,79 +38,90 @@ if (VALID_REQURL) {
         headers: transformedHeaders,
       });
 
-      let r2: Response | ResponseDataDetailed<any> = undefined;
+      let contentType: string | undefined =
-      if (options.responseType === undefined) {
+        r.headers["Content-Type"] ||
-        r2 = {
+        r.headers["content-type"] ||
-          data: undefined,
+        options.headers["Content-Type"] ||
-          status: r.status,
+        options.headers["content-type"] ||
-          statusText: getReasonPhrase(r.status),
+        options.headers["Accept"] ||
-          headers: r.headers,
+        options.headers["accept"];
-        };
+      if (contentType !== undefined) {
-      } else if (options.responseType === "json") {
+        contentType = contentType.toLowerCase();
-        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}`
-        );
       }
+      // console.log(`requesting url=${options.url}`);
+      // console.log(`contentType=${contentType}`);
+
+      // let r2: Response = undefined;
+      // if (contentType.includes("xml")) {
+      //   r2 = new Response(r.text, {
+      //     status: r.status,
+      //     statusText: getReasonPhrase(r.status),
+      //     headers: r.headers,
+      //   });
+      // } else if (
+      //   contentType.includes("json") ||
+      //   contentType.includes("javascript")
+      // ) {
+      //   console.log('inside json branch');
+      //   // const j = r.json;
+      //   // console.log(j);
+      //   r2 = new Response(
+      //     r.text,  // yea, here is the text because Response constructor expects a text
+      //     {
+      //     status: r.status,
+      //     statusText: getReasonPhrase(r.status),
+      //     headers: r.headers,
+      //   });
+      // } else if (contentType.includes("text")) {
+      //   // avoid text/json,
+      //   // so we split this out from the above xml or json branch
+      //   r2 = new Response(r.text, {
+      //     status: r.status,
+      //     statusText: getReasonPhrase(r.status),
+      //     headers: r.headers,
+      //   });
+      // } else if (
+      //   contentType.includes("octet-stream") ||
+      //   contentType.includes("binary") ||
+      //   contentType.includes("buffer")
+      // ) {
+      //   // application/octet-stream
+      //   r2 = new Response(r.arrayBuffer, {
+      //     status: r.status,
+      //     statusText: getReasonPhrase(r.status),
+      //     headers: r.headers,
+      //   });
+      // } else {
+      //   throw Error(
+      //     `do not know how to deal with requested content type = ${contentType}`
+      //   );
+      // }
+
+      let r2: Response = undefined;
+      if ([101, 103, 204, 205, 304].includes(r.status)) {
+        // A null body status is a status that is 101, 103, 204, 205, or 304.
+        // fix this: Failed to construct 'Response': Response with null body status cannot have body
+        r2 = new Response(null, {
+          status: r.status,
+          statusText: getReasonPhrase(r.status),
+          headers: r.headers,
+        });
+      } else {
+        r2 = new Response(r.arrayBuffer, {
+          status: r.status,
+          statusText: getReasonPhrase(r.status),
+          headers: r.headers,
+        });
+      }
+
       return r2;
     }
   );
 }
-// getPatcher().patch("request", (options: any) => {
+
-//   // console.log("using fetch");
+// @ts-ignore
-//   const r = fetch(options.url, {
+import { AuthType, BufferLike, createClient } from "webdav/dist/web/index.js";
-//     method: options.method,
+export type { WebDAVClient } from "webdav";
-//     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: "",
@@ -232,9 +244,10 @@ export class WrappedWebdavClient {
           method: "PROPFIND",
           headers: {
             Depth: "infinity",
+            Accept: "text/plain,application/xml",
           },
-          responseType: "text",
+          // responseType: "text",
-        });
+        } as any);
         if (res.status === 403) {
           throw Error("not support Infinity, get 403");
         } else {
@@ -253,9 +266,10 @@ export class WrappedWebdavClient {
               method: "PROPFIND",
               headers: {
                 Depth: "1",
+                Accept: "text/plain,application/xml",
               },
-              responseType: "text",
+              // responseType: "text",
-            }
+            } as any
           );
           testPassed = true;
           this.webdavConfig.depth = "auto_1";
@@ -455,9 +469,9 @@ const downloadFromRemoteRaw = async (
   fileOrFolderPath: string
 ) => {
   await client.init();
-  const buff = (await client.client.getFileContents(
+  const p = getWebdavPath(fileOrFolderPath, client.remoteBaseDir);
-    getWebdavPath(fileOrFolderPath, client.remoteBaseDir)
+  // console.log(`getWebdavPath=${p}`);
-  )) as BufferLike;
+  const buff = (await client.client.getFileContents(p)) as BufferLike;
   if (buff instanceof ArrayBuffer) {
     return buff;
   } else if (buff instanceof Buffer) {
@@ -496,6 +510,7 @@ export const downloadFromRemote = async (
       downloadFile = remoteEncryptedKey;
     }
     downloadFile = getWebdavPath(downloadFile, client.remoteBaseDir);
+    // console.log(`downloadFile=${downloadFile}`);
     const remoteContent = await downloadFromRemoteRaw(client, downloadFile);
     let localContent = remoteContent;
     if (password !== "") {

src/settings.ts

@@ -675,123 +675,12 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
     containerEl.createEl("h1", { text: "Remotely Save" });
 
     //////////////////////////////////////////////////
-    // below for general
+    // below for service chooser (part 1/2)
-    //////////////////////////////////////////////////
-
-    const generalDiv = containerEl.createEl("div");
-    generalDiv.createEl("h2", { text: t("settings_general") });
-
-    const passwordDiv = generalDiv.createEl("div");
-    let newPassword = `${this.plugin.settings.password}`;
-    new Setting(passwordDiv)
-      .setName(t("settings_password"))
-      .setDesc(t("settings_password_desc"))
-      .addText((text) => {
-        wrapTextWithPasswordHide(text);
-        text
-          .setPlaceholder("")
-          .setValue(`${this.plugin.settings.password}`)
-          .onChange(async (value) => {
-            newPassword = value.trim();
-          });
-      })
-      .addButton(async (button) => {
-        button.setButtonText(t("confirm"));
-        button.onClick(async () => {
-          new PasswordModal(this.app, this.plugin, newPassword).open();
-        });
-      });
-
-    const scheduleDiv = generalDiv.createEl("div");
-    new Setting(scheduleDiv)
-      .setName(t("settings_autorun"))
-      .setDesc(t("settings_autorun_desc"))
-      .addDropdown((dropdown) => {
-        dropdown.addOption("-1", t("settings_autorun_notset"));
-        dropdown.addOption(`${1000 * 60 * 1}`, t("settings_autorun_1min"));
-        dropdown.addOption(`${1000 * 60 * 5}`, t("settings_autorun_5min"));
-        dropdown.addOption(`${1000 * 60 * 10}`, t("settings_autorun_10min"));
-        dropdown.addOption(`${1000 * 60 * 30}`, t("settings_autorun_30min"));
-
-        dropdown
-          .setValue(`${this.plugin.settings.autoRunEveryMilliseconds}`)
-          .onChange(async (val: string) => {
-            const realVal = parseInt(val);
-            this.plugin.settings.autoRunEveryMilliseconds = realVal;
-            await this.plugin.saveSettings();
-            if (
-              (realVal === undefined || realVal === null || realVal <= 0) &&
-              this.plugin.autoRunIntervalID !== undefined
-            ) {
-              // clear
-              window.clearInterval(this.plugin.autoRunIntervalID);
-              this.plugin.autoRunIntervalID = undefined;
-            } else if (
-              realVal !== undefined &&
-              realVal !== null &&
-              realVal > 0
-            ) {
-              const intervalID = window.setInterval(() => {
-                this.plugin.syncRun("auto");
-              }, realVal);
-              this.plugin.autoRunIntervalID = intervalID;
-              this.plugin.registerInterval(intervalID);
-            }
-          });
-      });
-
-    const runOnceStartUpDiv = generalDiv.createEl("div");
-    new Setting(runOnceStartUpDiv)
-      .setName(t("settings_runoncestartup"))
-      .setDesc(t("settings_runoncestartup_desc"))
-      .addDropdown((dropdown) => {
-        dropdown.addOption("-1", t("settings_runoncestartup_notset"));
-        dropdown.addOption(
-          `${1000 * 1 * 1}`,
-          t("settings_runoncestartup_1sec")
-        );
-        dropdown.addOption(
-          `${1000 * 10 * 1}`,
-          t("settings_runoncestartup_10sec")
-        );
-        dropdown.addOption(
-          `${1000 * 30 * 1}`,
-          t("settings_runoncestartup_30sec")
-        );
-        dropdown
-          .setValue(`${this.plugin.settings.initRunAfterMilliseconds}`)
-          .onChange(async (val: string) => {
-            const realVal = parseInt(val);
-            this.plugin.settings.initRunAfterMilliseconds = realVal;
-            await this.plugin.saveSettings();
-          });
-      });
-
-    const skipLargeFilesDiv = generalDiv.createEl("div");
-    new Setting(skipLargeFilesDiv)
-      .setName(t("settings_skiplargefiles"))
-      .setDesc(t("settings_skiplargefiles_desc"))
-      .addDropdown((dropdown) => {
-        dropdown.addOption("-1", t("settings_skiplargefiles_notset"));
-
-        const mbs = [1, 5, 10, 50, 100, 500, 1000];
-        for (const mb of mbs) {
-          dropdown.addOption(`${mb * 1000 * 1000}`, `${mb} MB`);
-        }
-        dropdown
-          .setValue(`${this.plugin.settings.skipSizeLargerThan}`)
-          .onChange(async (val) => {
-            this.plugin.settings.skipSizeLargerThan = parseInt(val);
-            await this.plugin.saveSettings();
-          });
-      });
-
-    //////////////////////////////////////////////////
-    // below for general chooser (part 1/2)
     //////////////////////////////////////////////////
 
     // we need to create the div in advance of any other service divs
-    const serviceChooserDiv = generalDiv.createEl("div");
+    const serviceChooserDiv = containerEl.createDiv();
+    serviceChooserDiv.createEl("h2", { text: t("settings_chooseservice") });
 
     //////////////////////////////////////////////////
     // below for s3
@@ -801,27 +690,29 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
     s3Div.toggleClass("s3-hide", this.plugin.settings.serviceType !== "s3");
     s3Div.createEl("h2", { text: t("settings_s3") });
 
+    const s3LongDescDiv = s3Div.createEl("div", { cls: "settings-long-desc" });
+
     for (const c of [
       t("settings_s3_disclaimer1"),
       t("settings_s3_disclaimer2"),
     ]) {
-      s3Div.createEl("p", {
+      s3LongDescDiv.createEl("p", {
         text: c,
         cls: "s3-disclaimer",
       });
     }
 
     if (!VALID_REQURL) {
-      s3Div.createEl("p", {
+      s3LongDescDiv.createEl("p", {
         text: t("settings_s3_cors"),
       });
     }
 
-    s3Div.createEl("p", {
+    s3LongDescDiv.createEl("p", {
       text: t("settings_s3_prod"),
     });
 
-    const s3LinksUl = s3Div.createEl("div").createEl("ul");
+    const s3LinksUl = s3LongDescDiv.createEl("ul");
 
     s3LinksUl.createEl("li").createEl("a", {
       href: "https://docs.aws.amazon.com/general/latest/gr/s3.html",
@@ -954,8 +845,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
         });
     }
 
-    const partsConcurrencyDiv = s3Div.createEl("div");
+    new Setting(s3Div)
-    new Setting(partsConcurrencyDiv)
       .setName(t("settings_s3_parts"))
       .setDesc(t("settings_s3_parts_desc"))
       .addDropdown((dropdown) => {
@@ -1007,16 +897,20 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
       this.plugin.settings.serviceType !== "dropbox"
     );
     dropboxDiv.createEl("h2", { text: t("settings_dropbox") });
+
+    const dropboxLongDescDiv = dropboxDiv.createEl("div", {
+      cls: "settings-long-desc",
+    });
     for (const c of [
       t("settings_dropbox_disclaimer1"),
       t("settings_dropbox_disclaimer2"),
     ]) {
-      dropboxDiv.createEl("p", {
+      dropboxLongDescDiv.createEl("p", {
         text: c,
         cls: "dropbox-disclaimer",
       });
     }
-    dropboxDiv.createEl("p", {
+    dropboxLongDescDiv.createEl("p", {
       text: t("settings_dropbox_folder", {
         pluginID: this.plugin.manifest.id,
         remoteBaseDir:
@@ -1027,10 +921,10 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
 
     const dropboxSelectAuthDiv = dropboxDiv.createDiv();
     const dropboxAuthDiv = dropboxSelectAuthDiv.createDiv({
-      cls: "dropbox-auth-button-hide",
+      cls: "dropbox-auth-button-hide settings-auth-related",
     });
     const dropboxRevokeAuthDiv = dropboxSelectAuthDiv.createDiv({
-      cls: "dropbox-revoke-auth-button-hide",
+      cls: "dropbox-revoke-auth-button-hide settings-auth-related",
     });
 
     const dropboxRevokeAuthSetting = new Setting(dropboxRevokeAuthDiv)
@@ -1193,17 +1087,20 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
       this.plugin.settings.serviceType !== "onedrive"
     );
     onedriveDiv.createEl("h2", { text: t("settings_onedrive") });
+    const onedriveLongDescDiv = onedriveDiv.createEl("div", {
+      cls: "settings-long-desc",
+    });
     for (const c of [
       t("settings_onedrive_disclaimer1"),
       t("settings_onedrive_disclaimer2"),
     ]) {
-      onedriveDiv.createEl("p", {
+      onedriveLongDescDiv.createEl("p", {
         text: c,
         cls: "onedrive-disclaimer",
       });
     }
 
-    onedriveDiv.createEl("p", {
+    onedriveLongDescDiv.createEl("p", {
       text: t("settings_onedrive_folder", {
         pluginID: this.plugin.manifest.id,
         remoteBaseDir:
@@ -1212,16 +1109,16 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
       }),
     });
 
-    onedriveDiv.createEl("p", {
+    onedriveLongDescDiv.createEl("p", {
       text: t("settings_onedrive_nobiz"),
     });
 
     const onedriveSelectAuthDiv = onedriveDiv.createDiv();
     const onedriveAuthDiv = onedriveSelectAuthDiv.createDiv({
-      cls: "onedrive-auth-button-hide",
+      cls: "onedrive-auth-button-hide settings-auth-related",
     });
     const onedriveRevokeAuthDiv = onedriveSelectAuthDiv.createDiv({
-      cls: "onedrive-revoke-auth-button-hide",
+      cls: "onedrive-revoke-auth-button-hide settings-auth-related",
     });
 
     const onedriveRevokeAuthSetting = new Setting(onedriveRevokeAuthDiv)
@@ -1341,22 +1238,26 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
 
     webdavDiv.createEl("h2", { text: t("settings_webdav") });
 
-    webdavDiv.createEl("p", {
+    const webdavLongDescDiv = webdavDiv.createEl("div", {
+      cls: "settings-long-desc",
+    });
+
+    webdavLongDescDiv.createEl("p", {
       text: t("settings_webdav_disclaimer1"),
       cls: "webdav-disclaimer",
     });
 
     if (!VALID_REQURL) {
-      webdavDiv.createEl("p", {
+      webdavLongDescDiv.createEl("p", {
         text: t("settings_webdav_cors_os"),
       });
 
-      webdavDiv.createEl("p", {
+      webdavLongDescDiv.createEl("p", {
         text: t("settings_webdav_cors"),
       });
     }
 
-    webdavDiv.createEl("p", {
+    webdavLongDescDiv.createEl("p", {
       text: t("settings_webdav_folder", {
         remoteBaseDir:
           this.plugin.settings.webdav.remoteBaseDir || this.app.vault.getName(),
@@ -1588,6 +1489,113 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
           });
       });
 
+    //////////////////////////////////////////////////
+    // below for basic settings
+    //////////////////////////////////////////////////
+
+    const basicDiv = containerEl.createEl("div");
+    basicDiv.createEl("h2", { text: t("settings_basic") });
+
+    let newPassword = `${this.plugin.settings.password}`;
+    new Setting(basicDiv)
+      .setName(t("settings_password"))
+      .setDesc(t("settings_password_desc"))
+      .addText((text) => {
+        wrapTextWithPasswordHide(text);
+        text
+          .setPlaceholder("")
+          .setValue(`${this.plugin.settings.password}`)
+          .onChange(async (value) => {
+            newPassword = value.trim();
+          });
+      })
+      .addButton(async (button) => {
+        button.setButtonText(t("confirm"));
+        button.onClick(async () => {
+          new PasswordModal(this.app, this.plugin, newPassword).open();
+        });
+      });
+
+    new Setting(basicDiv)
+      .setName(t("settings_autorun"))
+      .setDesc(t("settings_autorun_desc"))
+      .addDropdown((dropdown) => {
+        dropdown.addOption("-1", t("settings_autorun_notset"));
+        dropdown.addOption(`${1000 * 60 * 1}`, t("settings_autorun_1min"));
+        dropdown.addOption(`${1000 * 60 * 5}`, t("settings_autorun_5min"));
+        dropdown.addOption(`${1000 * 60 * 10}`, t("settings_autorun_10min"));
+        dropdown.addOption(`${1000 * 60 * 30}`, t("settings_autorun_30min"));
+
+        dropdown
+          .setValue(`${this.plugin.settings.autoRunEveryMilliseconds}`)
+          .onChange(async (val: string) => {
+            const realVal = parseInt(val);
+            this.plugin.settings.autoRunEveryMilliseconds = realVal;
+            await this.plugin.saveSettings();
+            if (
+              (realVal === undefined || realVal === null || realVal <= 0) &&
+              this.plugin.autoRunIntervalID !== undefined
+            ) {
+              // clear
+              window.clearInterval(this.plugin.autoRunIntervalID);
+              this.plugin.autoRunIntervalID = undefined;
+            } else if (
+              realVal !== undefined &&
+              realVal !== null &&
+              realVal > 0
+            ) {
+              const intervalID = window.setInterval(() => {
+                this.plugin.syncRun("auto");
+              }, realVal);
+              this.plugin.autoRunIntervalID = intervalID;
+              this.plugin.registerInterval(intervalID);
+            }
+          });
+      });
+
+    new Setting(basicDiv)
+      .setName(t("settings_runoncestartup"))
+      .setDesc(t("settings_runoncestartup_desc"))
+      .addDropdown((dropdown) => {
+        dropdown.addOption("-1", t("settings_runoncestartup_notset"));
+        dropdown.addOption(
+          `${1000 * 1 * 1}`,
+          t("settings_runoncestartup_1sec")
+        );
+        dropdown.addOption(
+          `${1000 * 10 * 1}`,
+          t("settings_runoncestartup_10sec")
+        );
+        dropdown.addOption(
+          `${1000 * 30 * 1}`,
+          t("settings_runoncestartup_30sec")
+        );
+        dropdown
+          .setValue(`${this.plugin.settings.initRunAfterMilliseconds}`)
+          .onChange(async (val: string) => {
+            const realVal = parseInt(val);
+            this.plugin.settings.initRunAfterMilliseconds = realVal;
+            await this.plugin.saveSettings();
+          });
+      });
+    new Setting(basicDiv)
+      .setName(t("settings_skiplargefiles"))
+      .setDesc(t("settings_skiplargefiles_desc"))
+      .addDropdown((dropdown) => {
+        dropdown.addOption("-1", t("settings_skiplargefiles_notset"));
+
+        const mbs = [1, 5, 10, 50, 100, 500, 1000];
+        for (const mb of mbs) {
+          dropdown.addOption(`${mb * 1000 * 1000}`, `${mb} MB`);
+        }
+        dropdown
+          .setValue(`${this.plugin.settings.skipSizeLargerThan}`)
+          .onChange(async (val) => {
+            this.plugin.settings.skipSizeLargerThan = parseInt(val);
+            await this.plugin.saveSettings();
+          });
+      });
+
     //////////////////////////////////////////////////
     // below for advanced settings
     //////////////////////////////////////////////////
@@ -1596,8 +1604,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
       text: t("settings_adv"),
     });
 
-    const concurrencyDiv = advDiv.createEl("div");
+    new Setting(advDiv)
-    new Setting(concurrencyDiv)
       .setName(t("settings_concurrency"))
       .setDesc(t("settings_concurrency_desc"))
       .addDropdown((dropdown) => {
@@ -1618,8 +1625,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
           });
       });
 
-    const syncUnderscoreItemsDiv = advDiv.createEl("div");
+    new Setting(advDiv)
-    new Setting(syncUnderscoreItemsDiv)
       .setName(t("settings_syncunderscore"))
       .setDesc(t("settings_syncunderscore_desc"))
       .addDropdown((dropdown) => {
@@ -1635,8 +1641,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
           });
       });
 
-    const syncConfigDirDiv = advDiv.createEl("div");
+    new Setting(advDiv)
-    new Setting(syncConfigDirDiv)
       .setName(t("settings_configdir"))
       .setDesc(
         t("settings_configdir_desc", {
@@ -1700,8 +1705,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
     const debugDiv = containerEl.createEl("div");
     debugDiv.createEl("h2", { text: t("settings_debug") });
 
-    const setConsoleLogLevelDiv = debugDiv.createDiv("div");
+    new Setting(debugDiv)
-    new Setting(setConsoleLogLevelDiv)
       .setName(t("settings_debuglevel"))
       .setDesc(t("settings_debuglevel_desc"))
       .addDropdown(async (dropdown) => {
@@ -1716,8 +1720,8 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
             log.info(`the log level is changed to ${val}`);
           });
       });
-    const outputCurrSettingsDiv = debugDiv.createDiv("div");
+
-    new Setting(outputCurrSettingsDiv)
+    new Setting(debugDiv)
       .setName(t("settings_outputsettingsconsole"))
       .setDesc(t("settings_outputsettingsconsole_desc"))
       .addButton(async (button) => {
@@ -1728,8 +1732,8 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
           new Notice(t("settings_outputsettingsconsole_notice"));
         });
       });
-    const syncPlanDiv = debugDiv.createEl("div");
+
-    new Setting(syncPlanDiv)
+    new Setting(debugDiv)
       .setName(t("settings_syncplans"))
       .setDesc(t("settings_syncplans_desc"))
       .addButton(async (button) => {
@@ -1756,7 +1760,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
           new Notice(t("settings_syncplans_notice"));
         });
       });
-    new Setting(syncPlanDiv)
+    new Setting(debugDiv)
       .setName(t("settings_delsyncplans"))
       .setDesc(t("settings_delsyncplans_desc"))
       .addButton(async (button) => {
@@ -1767,8 +1771,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
         });
       });
 
-    const logToDBDiv = debugDiv.createEl("div");
+    new Setting(debugDiv)
-    new Setting(logToDBDiv)
       .setName(t("settings_logtodb"))
       .setDesc(t("settings_logtodb_desc"))
       .addDropdown(async (dropdown) => {
@@ -1795,7 +1798,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
           });
       });
 
-    new Setting(logToDBDiv)
+    new Setting(debugDiv)
       .setName(t("settings_logtodbexport"))
       .setDesc(
         t("settings_logtodbexport_desc", {
@@ -1814,7 +1817,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
         });
       });
 
-    new Setting(logToDBDiv)
+    new Setting(debugDiv)
       .setName(t("settings_logtodbclear"))
       .setDesc(t("settings_logtodbclear_desc"))
       .addButton(async (button) => {
@@ -1825,8 +1828,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
         });
       });
 
-    const syncMappingDiv = debugDiv.createEl("div");
+    new Setting(debugDiv)
-    new Setting(syncMappingDiv)
       .setName(t("settings_delsyncmap"))
       .setDesc(t("settings_delsyncmap_desc"))
       .addButton(async (button) => {
@@ -1837,8 +1839,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
         });
       });
 
-    const outputCurrBasePathVaultIDDiv = debugDiv.createDiv("div");
+    new Setting(debugDiv)
-    new Setting(outputCurrBasePathVaultIDDiv)
       .setName(t("settings_outputbasepathvaultid"))
       .setDesc(t("settings_outputbasepathvaultid_desc"))
       .addButton(async (button) => {
@@ -1849,8 +1850,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
         });
       });
 
-    const dbsResetDiv = debugDiv.createEl("div");
+    new Setting(debugDiv)
-    new Setting(dbsResetDiv)
       .setName(t("settings_resetcache"))
       .setDesc(t("settings_resetcache_desc"))
       .addButton(async (button) => {

src/sync.ts

@@ -37,6 +37,7 @@ import {
   getParentFolder,
   atWhichLevel,
   unixTimeToStr,
+  statFix,
 } from "./misc";
 import { RemoteClient } from "./remote";
 import {
@@ -336,7 +337,7 @@ const ensembleMixedStates = async (
       // ignore
       continue;
     } else if (entry instanceof TFile) {
-      const mtimeLocal = Math.max(entry.stat.mtime || 0, entry.stat.ctime || 0);
+      const mtimeLocal = Math.max(entry.stat.mtime ?? 0, entry.stat.ctime ?? 0);
       r = {
         key: entry.path,
         existLocal: true,
@@ -380,7 +381,10 @@ const ensembleMixedStates = async (
   if (syncConfigDir && localConfigDirContents !== undefined) {
     for (const entry of localConfigDirContents) {
       const key = entry.key;
-      const mtimeLocal = Math.max(entry.mtime, entry.ctime);
+      let mtimeLocal = Math.max(entry.mtime ?? 0, entry.ctime ?? 0);
+      if (Number.isNaN(mtimeLocal) || mtimeLocal === 0) {
+        mtimeLocal = undefined;
+      }
       const r: FileOrFolderMixedState = {
         key: key,
         existLocal: true,
@@ -468,10 +472,13 @@ const ensembleMixedStates = async (
         changeLocalMtimeUsingMapping: true,
       };
       if (results.hasOwnProperty(key)) {
-        const mtimeLocal = Math.max(
+        let mtimeLocal = Math.max(
-          r.mtimeLocal || 0,
+          r.mtimeLocal ?? 0,
-          results[key].mtimeLocal || 0
+          results[key].mtimeLocal ?? 0
         );
+        if (Number.isNaN(mtimeLocal) || mtimeLocal === 0) {
+          mtimeLocal = undefined;
+        }
         results[key].mtimeLocal = mtimeLocal;
         results[key].mtimeLocalFmt = unixTimeToStr(mtimeLocal);
         results[key].changeLocalMtimeUsingMapping =
@@ -838,9 +845,14 @@ const assignOperationToFolderInplace = async (
       // if it was created after deletion, we should keep it as is
       if (requireApiVersion(API_VER_STAT_FOLDER)) {
         if (r.existLocal) {
-          const { ctime, mtime } = await vault.adapter.stat(r.key);
+          const { ctime, mtime } = await statFix(vault, r.key);
-          const cmtime = Math.max(ctime, mtime);
+          const cmtime = Math.max(ctime ?? 0, mtime ?? 0);
-          if (cmtime > 0 && cmtime >= deltimeLocal && cmtime >= deltimeRemote) {
+          if (
+            !Number.isNaN(cmtime) &&
+            cmtime > 0 &&
+            cmtime >= deltimeLocal &&
+            cmtime >= deltimeRemote
+          ) {
             keptFolder.add(getParentFolder(r.key));
             if (r.existLocal && r.existRemote) {
               r.decision = "skipFolder";

styles.css

@@ -8,6 +8,11 @@
   font-weight: bold;
 }
 
+.settings-auth-related {
+  border-top: 1px solid var(--background-modifier-border);
+  padding-top: 18px;
+}
+
 .s3-disclaimer {
   font-weight: bold;
 }

tests/encrypt.test.ts

@@ -29,6 +29,14 @@ describe("Encryption tests", () => {
     expect(await encryptStringToBase32(k, password)).to.not.equal(k);
   });
 
+  it("should encrypt string and return different results each time", async () => {
+    const k = "dkjdhkfhdkjgsdklxxd";
+    const password = "hey";
+    const res1 = await encryptStringToBase32(k, password);
+    const res2 = await encryptStringToBase32(k, password);
+    expect(res1).to.not.equal(res2);
+  });
+
   it("should raise error using different password", async () => {
     const k = "secret text";
     const password = "hey";
@@ -97,7 +105,21 @@ describe("Encryption tests", () => {
     expect(Buffer.from(enc).equals(Buffer.from(opensslArrBuf))).to.be.true;
   });
 
-  it("should descypt binary file and get the same result as openssl", async () => {
+  it("should encrypt binary file not deterministically", async () => {
+    const testFolder = path.join(__dirname, "static_assets", "mona_lisa");
+    const testFileName =
+      "1374px-Mona_Lisa,_by_Leonardo_da_Vinci,_from_C2RMF_retouched.jpg";
+    const fileArrBuf = bufferToArrayBuffer(
+      await fs.readFileSync(path.join(testFolder, testFileName))
+    );
+    const password = "somepassword";
+    const res1 = await encryptArrayBuffer(fileArrBuf, password);
+    const res2 = await encryptArrayBuffer(fileArrBuf, password);
+
+    expect(Buffer.from(res1).equals(Buffer.from(res2))).to.be.false;
+  });
+
+  it("should decrypt binary file and get the same result as openssl", async () => {
     const testFolder = path.join(__dirname, "static_assets", "mona_lisa");
     const testFileName =
       "1374px-Mona_Lisa,_by_Leonardo_da_Vinci,_from_C2RMF_retouched.jpg";

versions.json

@@ -1,4 +1,4 @@
 {
   "0.3.2": "0.12.15",
-  "0.3.22": "0.13.21"
+  "0.3.25": "0.13.21"
 }

webpack.config.js

@@ -41,6 +41,12 @@ module.exports = {
         test: /\.svg?$/,
         type: "asset/source",
       },
+      {
+        test: /\.m?js$/,
+        resolve: {
+          fullySpecified: false, // process/browser returns some errors before
+        },
+      },
     ],
   },
   resolve: {
@@ -55,7 +61,9 @@ module.exports = {
       // crypto: false,
       // domain: require.resolve("domain-browser"),
       // events: require.resolve("events"),
+      http: false,
       // http: require.resolve("stream-http"),
+      https: false,
       // https: require.resolve("https-browserify"),
       net: false,
       // os: require.resolve("os-browserify/browser"),