diff --git a/package-lock.json b/package-lock.json index f1679bba..67ffa15c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@buttercup/importer": "^3.1.0", "@buttercup/secure-file-host": "^0.3.0", "@electron/remote": "^2.0.8", - "buttercup": "^7.6.0", + "buttercup": "^7.7.0", "debounce": "^1.2.1", "debounce-promise": "^3.1.2", "delayable-setinterval": "^0.1.1", @@ -42,7 +42,7 @@ "stacktracey": "^2.1.7", "statuses": "^2.0.1", "untildify": "^5.0.0", - "webdav": "^5.3.0", + "webdav": "^5.5.0", "zod": "^3.22.4" }, "devDependencies": { @@ -2093,14 +2093,6 @@ "url-parse": "^1.5.10" } }, - "node_modules/@buttercup/dropbox-client/node_modules/@buttercup/fetch": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz", - "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==", - "optionalDependencies": { - "node-fetch": "^3.3.0" - } - }, "node_modules/@buttercup/dropbox-client/node_modules/data-uri-to-buffer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", @@ -2139,9 +2131,9 @@ } }, "node_modules/@buttercup/fetch": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.1.1.tgz", - "integrity": "sha512-RwBiPEmPaZv3oLOPY0fcmAGYdd3A4FDoYDc7JN+qxGTXumrYAYEC1RpyCM2pHSr6RYpuaAeg4A1fJy+PiigPIA==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz", + "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==", "optionalDependencies": { "node-fetch": "^3.3.0" } @@ -2156,9 +2148,9 @@ } }, "node_modules/@buttercup/fetch/node_modules/node-fetch": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.1.tgz", - "integrity": "sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", + "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", "optional": true, "dependencies": { "data-uri-to-buffer": "^4.0.0", @@ -2204,14 +2196,6 @@ "query-string": "^8.1.0" } }, - "node_modules/@buttercup/google-oauth2-client/node_modules/@buttercup/fetch": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz", - "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==", - "optionalDependencies": { - "node-fetch": "^3.3.0" - } - }, "node_modules/@buttercup/google-oauth2-client/node_modules/data-uri-to-buffer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", @@ -2304,14 +2288,6 @@ "node": ">=16" } }, - "node_modules/@buttercup/googledrive-client/node_modules/@buttercup/fetch": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz", - "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==", - "optionalDependencies": { - "node-fetch": "^3.3.0" - } - }, "node_modules/@buttercup/googledrive-client/node_modules/data-uri-to-buffer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", @@ -5909,9 +5885,9 @@ } }, "node_modules/buttercup": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/buttercup/-/buttercup-7.6.0.tgz", - "integrity": "sha512-6HiatnPI/pqdQuWvNkxxDqHyMCFHAQqMsRx8bjIqNbSzIvFMaueuP+MPMmDnw0Wh38O1LoNKyqeJ/jeUwwbfdA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/buttercup/-/buttercup-7.7.0.tgz", + "integrity": "sha512-UCzKf9HEk09V1NnHixaGvrBqSvvc8BjzRevz92j1VRVBebhjKHWKfSj8+GBxHDA5f+maXme2IOeqJzK3+NNOww==", "dependencies": { "@buttercup/channel-queue": "^1.4.0", "@buttercup/dropbox-client": "^2.2.0", @@ -5932,7 +5908,7 @@ "pify": "^6.1.0", "url-join": "^5.0.0", "uuid": "^9.0.1", - "webdav": "^5.3.1" + "webdav": "^5.5.0" }, "engines": { "node": ">=14" @@ -6313,7 +6289,7 @@ "node_modules/charenc": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", - "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=", + "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==", "engines": { "node": "*" } @@ -7094,7 +7070,7 @@ "node_modules/crypt": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", - "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=", + "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==", "engines": { "node": "*" } @@ -9177,9 +9153,9 @@ } }, "node_modules/fast-xml-parser": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz", - "integrity": "sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.6.tgz", + "integrity": "sha512-M2SovcRxD4+vC493Uc2GZVcZaj66CCJhWurC4viynVSTvrpErCShNcDz1lAho6n9REQKvL/ll4A4/fw6Y9z8nw==", "funding": [ { "type": "github", @@ -19398,11 +19374,11 @@ } }, "node_modules/webdav": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.3.1.tgz", - "integrity": "sha512-wzZdTHtMuSIXqHGBznc8FM2L94Mc/17Tbn9ppoMybRO0bjWOSIeScdVXWX5qqHsg00EjfiOcwMqGFx6ghIhccQ==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.5.0.tgz", + "integrity": "sha512-SHSDe6n8lBuwwyX+uePB1N1Yn35ebd3locl/LbADMWpcEoowyFdIbnH3fv17T4Jf2tOa1Vwjr/Lld3t0dOio1w==", "dependencies": { - "@buttercup/fetch": "^0.1.1", + "@buttercup/fetch": "^0.2.1", "base-64": "^1.0.0", "byte-length": "^1.0.2", "fast-xml-parser": "^4.2.4", @@ -21708,14 +21684,6 @@ "url-parse": "^1.5.10" }, "dependencies": { - "@buttercup/fetch": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz", - "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==", - "requires": { - "node-fetch": "^3.3.0" - } - }, "data-uri-to-buffer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", @@ -21743,9 +21711,9 @@ } }, "@buttercup/fetch": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.1.1.tgz", - "integrity": "sha512-RwBiPEmPaZv3oLOPY0fcmAGYdd3A4FDoYDc7JN+qxGTXumrYAYEC1RpyCM2pHSr6RYpuaAeg4A1fJy+PiigPIA==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz", + "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==", "requires": { "node-fetch": "^3.3.0" }, @@ -21757,9 +21725,9 @@ "optional": true }, "node-fetch": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.1.tgz", - "integrity": "sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", + "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", "optional": true, "requires": { "data-uri-to-buffer": "^4.0.0", @@ -21800,14 +21768,6 @@ "query-string": "^8.1.0" }, "dependencies": { - "@buttercup/fetch": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz", - "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==", - "requires": { - "node-fetch": "^3.3.0" - } - }, "data-uri-to-buffer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", @@ -21868,14 +21828,6 @@ "url-parse": "^1.5.10" }, "dependencies": { - "@buttercup/fetch": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz", - "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==", - "requires": { - "node-fetch": "^3.3.0" - } - }, "data-uri-to-buffer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", @@ -24778,9 +24730,9 @@ } }, "buttercup": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/buttercup/-/buttercup-7.6.0.tgz", - "integrity": "sha512-6HiatnPI/pqdQuWvNkxxDqHyMCFHAQqMsRx8bjIqNbSzIvFMaueuP+MPMmDnw0Wh38O1LoNKyqeJ/jeUwwbfdA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/buttercup/-/buttercup-7.7.0.tgz", + "integrity": "sha512-UCzKf9HEk09V1NnHixaGvrBqSvvc8BjzRevz92j1VRVBebhjKHWKfSj8+GBxHDA5f+maXme2IOeqJzK3+NNOww==", "requires": { "@buttercup/channel-queue": "^1.4.0", "@buttercup/dropbox-client": "^2.2.0", @@ -24801,7 +24753,7 @@ "pify": "^6.1.0", "url-join": "^5.0.0", "uuid": "^9.0.1", - "webdav": "^5.3.1" + "webdav": "^5.5.0" }, "dependencies": { "eventemitter3": { @@ -25099,7 +25051,7 @@ "charenc": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", - "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=" + "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==" }, "chokidar": { "version": "3.5.3", @@ -25723,7 +25675,7 @@ "crypt": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", - "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=" + "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==" }, "crypto-random-string": { "version": "5.0.0", @@ -27307,9 +27259,9 @@ } }, "fast-xml-parser": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz", - "integrity": "sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.6.tgz", + "integrity": "sha512-M2SovcRxD4+vC493Uc2GZVcZaj66CCJhWurC4viynVSTvrpErCShNcDz1lAho6n9REQKvL/ll4A4/fw6Y9z8nw==", "requires": { "strnum": "^1.0.5" } @@ -35041,11 +34993,11 @@ "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==" }, "webdav": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.3.1.tgz", - "integrity": "sha512-wzZdTHtMuSIXqHGBznc8FM2L94Mc/17Tbn9ppoMybRO0bjWOSIeScdVXWX5qqHsg00EjfiOcwMqGFx6ghIhccQ==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.5.0.tgz", + "integrity": "sha512-SHSDe6n8lBuwwyX+uePB1N1Yn35ebd3locl/LbADMWpcEoowyFdIbnH3fv17T4Jf2tOa1Vwjr/Lld3t0dOio1w==", "requires": { - "@buttercup/fetch": "^0.1.1", + "@buttercup/fetch": "^0.2.1", "base-64": "^1.0.0", "byte-length": "^1.0.2", "fast-xml-parser": "^4.2.4", diff --git a/package.json b/package.json index 13d45351..a129103e 100644 --- a/package.json +++ b/package.json @@ -203,7 +203,7 @@ "@buttercup/importer": "^3.1.0", "@buttercup/secure-file-host": "^0.3.0", "@electron/remote": "^2.0.8", - "buttercup": "^7.6.0", + "buttercup": "^7.7.0", "debounce": "^1.2.1", "debounce-promise": "^3.1.2", "delayable-setinterval": "^0.1.1", @@ -227,7 +227,7 @@ "stacktracey": "^2.1.7", "statuses": "^2.0.1", "untildify": "^5.0.0", - "webdav": "^5.3.0", + "webdav": "^5.5.0", "zod": "^3.22.4" }, "devDependencies": { diff --git a/source/main/library/build.ts b/source/main/library/build.ts index 1b83af5e..0885aefc 100644 --- a/source/main/library/build.ts +++ b/source/main/library/build.ts @@ -1,3 +1,3 @@ // This file updated automatically: changes made here will be overwritten! -export const VERSION = "2.26.0"; +export const VERSION = "2.26.1"; diff --git a/source/renderer/actions/webdav.ts b/source/renderer/actions/webdav.ts index 8177f3a1..9a67b26f 100644 --- a/source/renderer/actions/webdav.ts +++ b/source/renderer/actions/webdav.ts @@ -1,4 +1,4 @@ -import { createClient } from "webdav"; +import { AuthType, createClient } from "webdav"; import { Layerr } from "layerr"; import { logInfo } from "../library/log"; @@ -6,6 +6,7 @@ export async function testWebDAV(url: string, username?: string, password?: stri const authentication = !!(username && password); const client = authentication ? createClient(url, { + authType: AuthType.Auto, username, password }) diff --git a/source/renderer/library/fsInterface.ts b/source/renderer/library/fsInterface.ts index 2270a482..ec7d78f9 100644 --- a/source/renderer/library/fsInterface.ts +++ b/source/renderer/library/fsInterface.ts @@ -6,7 +6,7 @@ import { } from "@buttercup/file-interface"; import { GoogleDriveClient } from "@buttercup/googledrive-client"; import { DropboxClient } from "@buttercup/dropbox-client"; -import { createClient as createWebdavClient } from "webdav"; +import { AuthType, createClient as createWebdavClient } from "webdav"; import { SourceType } from "../types"; export interface FSInstanceSettings { @@ -25,6 +25,7 @@ export function getFSInstance(type: SourceType, settings: FSInstanceSettings): F case SourceType.WebDAV: return new WebDAVInterface({ webdavClient: createWebdavClient(settings.endpoint as string, { + authType: AuthType.Auto, username: settings.username, password: settings.password })