fix(backup): failed to create directory for webdav

Author: sheepzh

package.json

@@ -31,9 +31,9 @@
         "@crowdin/crowdin-api-client": "^1.48.3",
         "@emotion/babel-plugin": "^11.13.5",
         "@emotion/css": "^11.13.5",
-        "@rsdoctor/rspack-plugin": "^1.3.7",
-        "@rspack/cli": "^1.6.0",
-        "@rspack/core": "^1.6.0",
+        "@rsdoctor/rspack-plugin": "^1.3.8",
+        "@rspack/cli": "^1.6.1",
+        "@rspack/core": "^1.6.1",
         "@swc/core": "^1.15.0",
         "@swc/jest": "^0.2.39",
         "@types/chrome": "0.1.27",
@@ -54,7 +54,7 @@
         "postcss": "^8.5.6",
         "postcss-loader": "^8.2.0",
         "postcss-rtlcss": "^5.7.1",
-        "puppeteer": "^24.28.0",
+        "puppeteer": "^24.29.0",
         "ts-loader": "^9.5.4",
         "ts-node": "^10.9.2",
         "tsconfig-paths": "^4.2.0",
@@ -64,12 +64,11 @@
         "@element-plus/icons-vue": "^2.3.2",
         "echarts": "^6.0.0",
         "element-plus": "2.11.7",
-        "js-base64": "^3.7.8",
         "punycode": "^2.3.1",
-        "vue": "^3.5.22",
+        "vue": "^3.5.23",
         "vue-router": "^4.6.3"
     },
     "engines": {
         "node": ">=20"
     }
-}
+}

src/api/web-dav.ts

@@ -3,7 +3,7 @@
  *
  * Testing with server implemented by https://github.com/svtslv/webdav-cli
  */
-import { encode } from 'js-base64'
+import { encode } from '@util/base64'
 import { fetchDelete, fetchGet } from './http'
 
 // Only support password for now
@@ -49,12 +49,23 @@ export async function judgeDirExist(context: WebDAVContext, dirPath: string): Pr
     }
 }
 
-export async function makeDir(context: WebDAVContext, dirPath: string) {
+export async function makeDirs(context: WebDAVContext, dirPath: string) {
+    const normalizedPath = dirPath.startsWith('/') ? dirPath.slice(1) : dirPath
+    const pathSegments = normalizedPath.split('/').filter(segment => segment.length > 0)
+
     const { auth, endpoint } = context || {}
-    const url = `${endpoint}/${dirPath}`
-    const headers = authHeaders(auth)
-    const response = await fetch(url, { method: 'MKCOL', headers })
-    handleWriteResponse(response)
+
+    for (let i = 0; i < pathSegments.length; i++) {
+        const currentPath = pathSegments.slice(0, i + 1).join('/')
+
+        const exists = await judgeDirExist(context, currentPath)
+        if (!exists) {
+            const url = `${endpoint}/${currentPath}`
+            const headers = authHeaders(auth)
+            const response = await fetch(url, { method: 'MKCOL', headers })
+            handleWriteResponse(response)
+        }
+    }
 }
 
 export async function deleteDir(context: WebDAVContext, dirPath: string) {

src/pages/app/Layout/menu/Nav.tsx

@@ -87,7 +87,10 @@ const _default = defineComponent<{}>(() => {
             <div class={menuWrapperCls} v-show={showMenu.value}>
                 <ElMenu>
                     {NAV_MENUS.map(item => (
-                        <ElMenuItem onClick={() => handleItemClick(item)}>
+                        <ElMenuItem
+                            index={item.index ?? item.route ?? item.href}
+                            onClick={() => handleItemClick(item)}
+                        >
                             <ElIcon>
                                 {h(item.icon)}
                             </ElIcon>

src/pages/app/Layout/menu/Side.tsx

@@ -58,7 +58,7 @@ const useStyle = () => {
 
 const renderItem = (item: MenuItem, router: Router, curr: Ref<string | undefined>) => (
     <ElMenuItem
-        index={item.index ?? item.route}
+        index={item.index ?? item.route ?? item.href}
         onClick={() => handleClick(item, router, curr)}
         v-slots={{
             default: () => <ElIcon size={18}>{h(item.icon)}</ElIcon>,

src/service/backup/web-dav/coordinator.ts

@@ -1,5 +1,5 @@
 import {
-    deleteDir, judgeDirExist, makeDir, readFile, writeFile,
+    deleteDir, judgeDirExist, makeDirs, readFile, writeFile,
     type WebDAVAuth, type WebDAVContext,
 } from "@api/web-dav"
 import DateIterator from "@util/date-iterator"
@@ -84,10 +84,7 @@ export default class WebDAVCoordinator implements timer.backup.Coordinator<never
 
     private async checkClientDirExist(davContext: WebDAVContext, dirPath: string, cid: string) {
         const clientDirPath = `${dirPath}${cid}`
-        const clientExist = await judgeDirExist(davContext, clientDirPath)
-        if (!clientExist) {
-            await makeDir(davContext, clientDirPath)
-        }
+        await makeDirs(davContext, clientDirPath)
         return clientDirPath
     }
 
@@ -111,9 +108,10 @@ export default class WebDAVCoordinator implements timer.backup.Coordinator<never
         const davContext: WebDAVContext = { endpoint, auth: davAuth }
         const webDavPath = processDir(dirPath)
         try {
+            await makeDirs(davContext, webDavPath)
             const exist = await judgeDirExist(davContext, webDavPath)
             if (!exist) {
-                return "Directory not found"
+                return "Failed to create directory"
             }
         } catch (e) {
             return (e as Error)?.message ?? e?.toString?.() ?? 'Unknown error'

src/util/base64.ts

@@ -0,0 +1,23 @@
+const BASE64_CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
+
+export function encode(str: string): string {
+    const bytes = new TextEncoder().encode(str)
+    let result = ''
+
+    for (let i = 0; i < bytes.length; i += 3) {
+        const byte1 = bytes[i]
+        const byte2 = bytes[i + 1] || 0
+        const byte3 = bytes[i + 2] || 0
+
+        const char1 = byte1 >> 2
+        const char2 = ((byte1 & 0x03) << 4) | (byte2 >> 4)
+        const char3 = ((byte2 & 0x0F) << 2) | (byte3 >> 6)
+        const char4 = byte3 & 0x3F
+
+        result += BASE64_CHARS[char1] + BASE64_CHARS[char2] +
+            (i + 1 < bytes.length ? BASE64_CHARS[char3] : '=') +
+            (i + 2 < bytes.length ? BASE64_CHARS[char4] : '=')
+    }
+
+    return result
+}