0.3.28

fix null body webdav
bump 0.3.27
2024-01-01 01:26:00 +08:00 · 2024-01-01 01:25:25 +08:00 · 2024-01-01 01:16:39 +08:00 · 2024-01-01 01:15:51 +08:00 · 2024-01-01 00:45:22 +08:00 · 2024-01-01 00:43:59 +08:00
23 changed files with 318 additions and 182 deletions
@@ -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).
@@ -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!
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e16bc9d86b30ab907fc176087701474f4ca2b8d887f649302f2e184f69d0cbc
+size 373845
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d707f6997df57b9c6b74d72bcfd567995d15062269761ee404e6596a266a241
+size 91012
@@ -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.                   |                                          |                                                  |
@@ -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));
@@ -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
+}
@@ -1,7 +1,7 @@
 {
  "id": "remotely-save",
  "name": "Remotely Save",
-  "version": "0.3.24",
+  "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",
@@ -1,13 +1,13 @@
 {
  "name": "remotely-save",
-  "version": "0.3.24",
+  "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",
-    "@types/chai": "^4.3.1",
-    "@types/chai-as-promised": "^7.1.5",
-    "@types/jsdom": "^16.2.14",
-    "@types/lodash": "^4.14.182",
-    "@types/mime-types": "^2.1.1",
-    "@types/mocha": "^9.1.1",
-    "@types/mustache": "^4.1.2",
-    "@types/node": "^17.0.30",
-    "@types/qrcode": "^1.4.2",
-    "builtin-modules": "^3.2.0",
-    "chai": "^4.3.6",
+    "@microsoft/microsoft-graph-types": "^2.40.0",
+    "@types/chai": "^4.3.11",
+    "@types/chai-as-promised": "^7.1.8",
+    "@types/jsdom": "^21.1.6",
+    "@types/lodash": "^4.14.202",
+    "@types/mime-types": "^2.1.4",
+    "@types/mocha": "^10.0.6",
+    "@types/mustache": "^4.2.5",
+    "@types/node": "^20.10.4",
+    "@types/qrcode": "^1.5.5",
+    "builtin-modules": "^3.3.0",
+    "chai": "^4.3.10",
    "chai-as-promised": "^7.1.1",
    "cross-env": "^7.0.3",
-    "dotenv": "^16.0.0",
-    "esbuild": "^0.14.38",
-    "jsdom": "^19.0.0",
-    "mocha": "^9.2.2",
-    "prettier": "^2.6.2",
-    "ts-loader": "^9.2.9",
-    "ts-node": "^10.7.0",
-    "tslib": "^2.4.0",
-    "typescript": "^4.6.4",
+    "dotenv": "^16.3.1",
+    "esbuild": "^0.19.9",
+    "jsdom": "^23.0.1",
+    "mocha": "^10.2.0",
+    "npm-check-updates": "^16.14.12",
+    "obsidian": "^1.4.11",
+    "prettier": "^3.1.1",
+    "ts-loader": "^9.5.1",
+    "ts-node": "^10.9.2",
+    "tslib": "^2.6.2",
+    "typescript": "^5.3.3",
    "webdav-server": "^2.6.2",
-    "webpack": "^5.72.0",
-    "webpack-cli": "^4.9.2"
+    "webpack": "^5.89.0",
+    "webpack-cli": "^5.1.4"
  },
  "dependencies": {
-    "@aws-sdk/client-s3": "^3.81.0",
-    "@aws-sdk/fetch-http-handler": "^3.78.0",
-    "@aws-sdk/lib-storage": "^3.81.0",
-    "@aws-sdk/protocol-http": "^3.78.0",
-    "@aws-sdk/querystring-builder": "^3.78.0",
-    "@aws-sdk/signature-v4-crt": "^3.78.0",
-    "@aws-sdk/types": "^3.78.0",
-    "@azure/msal-node": "^1.8.0",
+    "@aws-sdk/client-s3": "^3.474.0",
+    "@aws-sdk/lib-storage": "^3.474.0",
+    "@aws-sdk/signature-v4-crt": "^3.474.0",
+    "@aws-sdk/types": "^3.468.0",
+    "@azure/msal-node": "^2.6.0",
    "@fyears/tsqueue": "^1.0.1",
-    "@microsoft/microsoft-graph-client": "^3.0.2",
-    "acorn": "^8.7.1",
-    "aggregate-error": "^4.0.0",
-    "assert": "^2.0.0",
-    "aws-crt": "^1.12.1",
+    "@microsoft/microsoft-graph-client": "^3.0.7",
+    "@smithy/fetch-http-handler": "^2.3.1",
+    "@smithy/protocol-http": "^3.0.11",
+    "@smithy/querystring-builder": "^2.0.15",
+    "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",
-    "dropbox": "^10.28.0",
-    "emoji-regex": "^10.1.0",
-    "http-status-codes": "^2.2.0",
+    "delay": "^6.0.0",
+    "dropbox": "^10.34.0",
+    "emoji-regex": "^10.3.0",
+    "http-status-codes": "^2.3.0",
    "localforage": "^1.10.0",
    "lodash": "^4.17.21",
-    "loglevel": "^1.8.0",
-    "lucide": "^0.35.0",
+    "loglevel": "^1.8.1",
+    "lucide": "^0.298.0",
    "mime-types": "^2.1.35",
    "mustache": "^4.2.0",
-    "nanoid": "^3.3.3",
-    "obsidian": "^0.14.6",
-    "p-queue": "^7.2.0",
+    "nanoid": "^5.0.4",
+    "p-queue": "^8.0.1",
    "path-browserify": "^1.0.1",
    "process": "^0.11.10",
-    "qrcode": "^1.5.0",
-    "rfc4648": "^1.5.1",
-    "rimraf": "^3.0.2",
+    "qrcode": "^1.5.3",
+    "rfc4648": "^1.5.3",
+    "rimraf": "^5.0.5",
    "stream-browserify": "^3.0.0",
-    "url": "^0.11.0",
-    "util": "^0.12.4",
-    "webdav": "^4.9.0",
+    "url": "^0.11.3",
+    "util": "^0.12.5",
+    "webdav": "^5.3.1",
    "webdav-fs": "^4.0.1",
-    "xregexp": "^5.1.0"
+    "xregexp": "^5.1.1"
  }
 }
@@ -166,18 +166,20 @@ export const decryptBase64urlToString = async (
 };

 export const getSizeFromOrigToEnc = (x: number) => {
-  if (x < 0 || !Number.isInteger(x)) {
-    throw Error(`x=${x} is not a valid size`);
+  if (x < 0 || Number.isNaN(x) || !Number.isInteger(x)) {
+    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)) {
-    throw Error(`${x} is not a valid size`);
+  if (x < 32 || Number.isNaN(x) || !Number.isInteger(x)) {
+    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,
@@ -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;
  }

@@ -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(
-    fullKey
-  );
+  const item: FileFolderHistoryRecord | null =
+    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;
    }
@@ -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(
-      pluginConfigDir
-    );
+    const pluginConfigDirExists =
+      await this.app.vault.adapter.exists(pluginConfigDir);
    if (!pluginConfigDirExists) {
      // what happened?
      return;
@@ -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;
+};
@@ -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
  ) {
@@ -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) {
@@ -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);
    }
  }
 }
@@ -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 { buildQueryString } from "@aws-sdk/querystring-builder";
+import { requestTimeout } from "@smithy/fetch-http-handler/dist-es/request-timeout";
+import { buildQueryString } from "@smithy/querystring-builder";
 import { HeaderBag, HttpHandlerOptions, Provider } from "@aws-sdk/types";
 import { Buffer } from "buffer";
 import * as mime from "mime-types";
@@ -15,21 +15,22 @@ import type {
  FileStat,
  WebDAVClient,
  RequestOptionsWithState,
-  Response,
-  ResponseDataDetailed,
-} from "webdav/web";
-import { getPatcher } from "webdav/web";
+  // Response,
+  // ResponseDataDetailed,
+} from "webdav";
+
+// @ts-ignore
+import { getPatcher } from "webdav/dist/web/index.js";
 if (VALID_REQURL) {
  getPatcher().patch(
    "request",
-    async (
-      options: RequestOptionsWithState
-    ): Promise<Response | ResponseDataDetailed<any>> => {
+    async (options: RequestOptionsWithState): Promise<Response> => {
      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;
-      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}`
-        );
+      let contentType: string | undefined =
+        r.headers["Content-Type"] ||
+        r.headers["content-type"] ||
+        options.headers["Content-Type"] ||
+        options.headers["content-type"] ||
+        options.headers["Accept"] ||
+        options.headers["accept"];
+      if (contentType !== undefined) {
+        contentType = contentType.toLowerCase();
      }
+      // 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");
-//   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";
+
+// @ts-ignore
+import { AuthType, BufferLike, createClient } from "webdav/dist/web/index.js";
+export type { WebDAVClient } from "webdav";

 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(
-    getWebdavPath(fileOrFolderPath, client.remoteBaseDir)
-  )) as BufferLike;
+  const p = getWebdavPath(fileOrFolderPath, client.remoteBaseDir);
+  // console.log(`getWebdavPath=${p}`);
+  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 !== "") {
@@ -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(
-          r.mtimeLocal || 0,
-          results[key].mtimeLocal || 0
+        let mtimeLocal = Math.max(
+          r.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 cmtime = Math.max(ctime, mtime);
-          if (cmtime > 0 && cmtime >= deltimeLocal && cmtime >= deltimeRemote) {
+          const { ctime, mtime } = await statFix(vault, r.key);
+          const cmtime = Math.max(ctime ?? 0, mtime ?? 0);
+          if (
+            !Number.isNaN(cmtime) &&
+            cmtime > 0 &&
+            cmtime >= deltimeLocal &&
+            cmtime >= deltimeRemote
+          ) {
            keptFolder.add(getParentFolder(r.key));
            if (r.existLocal && r.existRemote) {
              r.decision = "skipFolder";
@@ -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";
@@ -1,4 +1,4 @@
 {
  "0.3.2": "0.12.15",
-  "0.3.24": "0.13.21"
+  "0.3.25": "0.13.21"
 }
@@ -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"),
Author	SHA1	Message	Date
fyears	200d25de70	0.3.28 Release A New Version / build (16.x) (push) Failing after 36s Details	2024-01-01 01:26:00 +08:00
fyears	cd0a9a395f	fix null body webdav	2024-01-01 01:25:25 +08:00
fyears	2deb3be8eb	bump 0.3.27	2024-01-01 01:16:39 +08:00
fyears	9519793860	finally a real working compat for webdav	2024-01-01 01:15:51 +08:00
fyears	2d7c33fb1a	add docs for webdav infinicloud	2024-01-01 00:45:22 +08:00
fyears	6a009b93cb	fix webdav for new er	2024-01-01 00:43:59 +08:00
fyears	ce8d8d1c62	beta	2023-12-31 22:41:48 +08:00
fyears	881147e91a	format doc	2023-12-17 23:51:03 +08:00
fyears	6e282c86af	skip .DS_Store	2023-12-17 23:50:52 +08:00
fyears	c689235ff0	ensure the encryption generate 'random' results	2023-12-17 23:50:32 +08:00
fyears	b238988012	Merge pull request #346 from GryphonIs/master Update services_connectable_or_not.md	2023-12-17 15:32:44 +08:00
fyears	24fb9e1675	Merge branch 'master' into master	2023-12-17 15:32:20 +08:00
fyears	f6a1a7c032	Merge pull request #241 from PassionPenguin/patch-1 Update services_connectable_or_not.md	2023-12-17 15:30:38 +08:00
fyears	cfe7ae9826	Merge pull request #270 from Flectomancer/patch-1 Update services_connectable_or_not.md	2023-12-17 15:23:33 +08:00
fyears	186cff9c36	Merge pull request #214 from davidangel/patch-1 Fix typo in docs	2023-12-17 15:22:42 +08:00
fyears	44dbec175b	update all the npm after 2 years	2023-12-17 15:18:23 +08:00
GryphonIs	7ecddf29fa	Update services_connectable_or_not.md Tested With NextCloud WebDAV and it works fine.	2023-07-10 16:38:26 -04:00
Flectomancer	d23183395c	Update services_connectable_or_not.md nginx access tested	2022-12-12 18:59:28 +01:00
Hoarfroster	8dd7879c5d	Update services_connectable_or_not.md	2022-11-08 22:24:19 +08:00
David Angel	f0d2766f48	Fix typo in docs	2022-10-10 22:06:27 -04:00
fyears	92183e0fb6	bump to 0.3.25 Release A New Version / build (16.x) (push) Failing after 43s Details	2022-05-10 21:25:20 +08:00
fyears	28bd861c9e	fix stat on Android, add operations to nan ctime mtime and undefined size	2022-05-10 21:15:30 +08:00