bump to 0.4.8

manifest-beta.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "remotely-save",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "This is yet another sync plugin for Obsidian app.",
   "scripts": {
     "dev2": "node esbuild.config.mjs --watch",

src/remoteForWebdav.ts

@@ -1,5 +1,5 @@
 import { Buffer } from "buffer";
-import { Vault, requestUrl } from "obsidian";
+import { Platform, Vault, requestUrl } from "obsidian";
 
 import { Queue } from "@fyears/tsqueue";
 import chunk from "lodash/chunk";
@@ -47,34 +47,47 @@ if (VALID_REQURL) {
       delete transformedHeaders["host"];
       delete transformedHeaders["content-length"];
 
+      const reqContentType =
+        transformedHeaders["accept"] ?? transformedHeaders["content-type"];
+
       console.debug(`before request:`);
       console.debug(`url: ${options.url}`);
       console.debug(`method: ${options.method}`);
       console.debug(`headers: ${JSON.stringify(transformedHeaders, null, 2)}`);
+      console.debug(`reqContentType: ${reqContentType}`);
 
-      const r = await requestUrl({
+      let r = await requestUrl({
         url: options.url,
         method: options.method,
         body: options.data as string | ArrayBuffer,
         headers: transformedHeaders,
+        contentType: reqContentType,
         throw: false,
       });
 
-      let contentType: string | undefined =
-        r.headers["Content-Type"] || r.headers["content-type"];
-      if (options.headers !== undefined) {
-        contentType =
-          contentType ||
-          transformedHeaders["content-type"] ||
-          transformedHeaders["accept"];
-      }
-      if (contentType !== undefined) {
-        contentType = contentType.toLowerCase();
+      if (
+        r.status === 401 &&
+        Platform.isIosApp &&
+        !options.url.endsWith("/") &&
+        !options.url.endsWith(".md") &&
+        options.method.toUpperCase() === "PROPFIND"
+      ) {
+        // don't ask me why,
+        // some webdav servers have some mysterious behaviours,
+        // if a folder doesn't exist without slash, the servers return 401 instead of 404
+        // here is a dirty hack that works
+        console.debug(`so we have 401, try appending request url with slash`);
+        r = await requestUrl({
+          url: `${options.url}/`,
+          method: options.method,
+          body: options.data as string | ArrayBuffer,
+          headers: transformedHeaders,
+          contentType: reqContentType,
+          throw: false,
+        });
       }
 
       console.debug(`after request:`);
-      console.debug(`contentType: ${contentType}`);
-
       const rspHeaders = objKeyToLower({ ...r.headers });
       console.debug(`rspHeaders: ${JSON.stringify(rspHeaders, null, 2)}`);
       for (let key in rspHeaders) {
@@ -98,55 +111,6 @@ if (VALID_REQURL) {
           }
         }
       }
-      // console.info(`requesting url=${options.url}`);
-      // console.info(`contentType=${contentType}`);
-      // console.info(`rspHeaders=${JSON.stringify(rspHeaders)}`)
-
-      // let r2: Response = undefined;
-      // if (contentType.includes("xml")) {
-      //   r2 = new Response(r.text, {
-      //     status: r.status,
-      //     statusText: getReasonPhrase(r.status),
-      //     headers: rspHeaders,
-      //   });
-      // } else if (
-      //   contentType.includes("json") ||
-      //   contentType.includes("javascript")
-      // ) {
-      //   console.info('inside json branch');
-      //   // const j = r.json;
-      //   // console.info(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: rspHeaders,
-      //   });
-      // } 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: rspHeaders,
-      //   });
-      // } 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: rspHeaders,
-      //   });
-      // } else {
-      //   throw Error(
-      //     `do not know how to deal with requested content type = ${contentType}`
-      //   );
-      // }
 
       let r2: Response | undefined = undefined;
       const statusText = getReasonPhrase(r.status);
@@ -175,6 +139,7 @@ if (VALID_REQURL) {
 
 // @ts-ignore
 import { AuthType, BufferLike, createClient } from "webdav/dist/web/index.js";
+import cloneDeep from "lodash/cloneDeep";
 export type { WebDAVClient } from "webdav";
 
 export const DEFAULT_WEBDAV_CONFIG = {
@@ -246,7 +211,8 @@ export class WrappedWebdavClient {
     remoteBaseDir: string,
     saveUpdatedConfigFunc: () => Promise<any>
   ) {
-    this.webdavConfig = webdavConfig;
+    this.webdavConfig = cloneDeep(webdavConfig);
+    this.webdavConfig.address = encodeURI(this.webdavConfig.address);
     this.remoteBaseDir = remoteBaseDir;
     this.vaultFolderExists = false;
     this.saveUpdatedConfigFunc = saveUpdatedConfigFunc;