Compare commits

..
20 Commits
Author SHA1 Message Date
fyears 200d25de70 0.3.28
Release A New Version / build (16.x) (push) Failing after 36s
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
18 changed files with 260 additions and 159 deletions
+1 -1
View File
@@ -31,7 +31,7 @@ This is yet another unofficial sync plugin for Obsidian. If you like it or find
## Limitations ## 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. - **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. - **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). - **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
+2 -2
View File
@@ -18,7 +18,7 @@ The list is for information purposes only.
| [MinIO](https://min.io/) | ? | ? | | | | | | [MinIO](https://min.io/) | ? | ? | | | | |
| [WsgiDAV](https://github.com/mar10/wsgidav) | Yes | | Yes | | Yes | CORS rules can be set. | | [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? | ? | | [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. | | OwnCloud | Yes? | | Yes? | | Yes? | No CORS config by default. |
| Seafile | 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. | | `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. | | [TeraCLOUD](https://teracloud.jp/en/) | Yes | | Yes | | Yes | No CORS support. |
| Dropbox | Yes | | | Yes | | | | Dropbox | Yes | | | Yes | | |
| OneDrive for personal | Yes | | | Yes | | | | OneDrive for personal | Yes | | | Yes | | |
| OneDrive for Business | In the plan | | | ? | | | | OneDrive for Business | Yes | | | ? | | |
| Google Drive | In the plan | | | ? | | | | Google Drive | In the plan | | | ? | | |
| [Box](https://www.box.com/) | ? | | | May be possible but needs further development. | | | | [Box](https://www.box.com/) | ? | | | May be possible but needs further development. | | |
| Google Cloud Storage | ? | | | May be possible but needs further development. | | | | Google Cloud Storage | ? | | | May be possible but needs further development. | | |
+15 -2
View File
@@ -18,7 +18,7 @@ const DEFAULT_ONEDRIVE_CLIENT_ID = process.env.ONEDRIVE_CLIENT_ID || "";
const DEFAULT_ONEDRIVE_AUTHORITY = process.env.ONEDRIVE_AUTHORITY || ""; const DEFAULT_ONEDRIVE_AUTHORITY = process.env.ONEDRIVE_AUTHORITY || "";
esbuild esbuild
.build({ .context({
banner: { banner: {
js: banner, js: banner,
}, },
@@ -33,11 +33,13 @@ esbuild
"fs", "fs",
"tls", "tls",
"net", "net",
"http",
"https",
// ...builtins // ...builtins
], ],
inject: ["./esbuild.injecthelper.mjs"], inject: ["./esbuild.injecthelper.mjs"],
format: "cjs", format: "cjs",
watch: !prod, // watch: !prod, // no longer valid in esbuild 0.17
target: "es2016", target: "es2016",
logLevel: "info", logLevel: "info",
sourcemap: prod ? false : "inline", sourcemap: prod ? false : "inline",
@@ -53,4 +55,15 @@ esbuild
"process.env.DEBUG": `undefined`, // ugly fix "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)); .catch(() => process.exit(1));
+10
View File
@@ -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
}
+55 -54
View File
@@ -3,11 +3,11 @@
"version": "0.3.25", "version": "0.3.25",
"description": "This is yet another sync plugin for Obsidian app.", "description": "This is yet another sync plugin for Obsidian app.",
"scripts": { "scripts": {
"dev2": "node esbuild.config.mjs", "dev2": "node esbuild.config.mjs --watch",
"build2": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production", "build2": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production",
"build": "webpack --mode production", "build": "webpack --mode production",
"dev": "webpack --mode development --watch", "dev": "webpack --mode development --watch",
"format": "npx prettier --write .", "format": "npx prettier --trailing-comma es5 --write .",
"clean": "npx rimraf main.js", "clean": "npx rimraf main.js",
"test": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} mocha -r ts-node/register 'tests/**/*.ts'" "test": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} mocha -r ts-node/register 'tests/**/*.ts'"
}, },
@@ -23,73 +23,74 @@
"author": "", "author": "",
"license": "Apache-2.0", "license": "Apache-2.0",
"devDependencies": { "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", "chai-as-promised": "^7.1.1",
"cross-env": "^7.0.3", "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", "webdav-server": "^2.6.2",
"webpack": "^5.72.0", "webpack": "^5.89.0",
"webpack-cli": "^4.9.2" "webpack-cli": "^5.1.4"
}, },
"dependencies": { "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", "@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", "buffer": "^6.0.3",
"crypto-browserify": "^3.12.0", "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", "localforage": "^1.10.0",
"lodash": "^4.17.21", "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", "mime-types": "^2.1.35",
"mustache": "^4.2.0", "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", "path-browserify": "^1.0.1",
"process": "^0.11.10", "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", "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", "webdav-fs": "^4.0.1",
"xregexp": "^5.1.0" "xregexp": "^5.1.1"
} }
} }
+2 -2
View File
@@ -5,7 +5,7 @@ import { LANGS } from "./langs";
export type LangType = keyof typeof LANGS; export type LangType = keyof typeof LANGS;
export type LangTypeAndAuto = LangType | "auto"; export type LangTypeAndAuto = LangType | "auto";
export type TransItemType = keyof typeof LANGS["en"]; export type TransItemType = keyof (typeof LANGS)["en"];
export class I18n { export class I18n {
lang: LangTypeAndAuto; lang: LangTypeAndAuto;
@@ -31,7 +31,7 @@ export class I18n {
} }
const res: string = 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; return res;
} }
+2 -3
View File
@@ -312,9 +312,8 @@ export const clearDeleteRenameHistoryOfKeyAndVault = async (
vaultRandomID: string vaultRandomID: string
) => { ) => {
const fullKey = `${vaultRandomID}\t${key}`; const fullKey = `${vaultRandomID}\t${key}`;
const item: FileFolderHistoryRecord | null = await db.fileHistoryTbl.getItem( const item: FileFolderHistoryRecord | null =
fullKey await db.fileHistoryTbl.getItem(fullKey);
);
if ( if (
item !== null && item !== null &&
(item.actionType === "delete" || item.actionType === "rename") (item.actionType === "delete" || item.actionType === "rename")
+2 -3
View File
@@ -976,9 +976,8 @@ export default class RemotelySavePlugin extends Plugin {
const pluginConfigDir = const pluginConfigDir =
this.manifest.dir || this.manifest.dir ||
`${this.app.vault.configDir}/plugins/${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) { if (!pluginConfigDirExists) {
// what happened? // what happened?
return; return;
+8 -2
View File
@@ -4,14 +4,20 @@
import { TAbstractFile, TFolder, TFile, Vault } from "obsidian"; import { TAbstractFile, TFolder, TFile, Vault } from "obsidian";
import * as origLog from "loglevel"; 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 log2 = origLog.getLogger("rs-default");
const originalFactory = log2.methodFactory; const originalFactory = log2.methodFactory;
export const applyLogWriterInplace = function (writer: (...msg: any[]) => any) { export const applyLogWriterInplace = function (writer: (...msg: any[]) => any) {
log2.methodFactory = function ( log2.methodFactory = function (
methodName: string, methodName: LogLevelNames,
logLevel: LogLevelNumbers, logLevel: LogLevelNumbers,
loggerName: string | symbol loggerName: string | symbol
) { ) {
+8 -1
View File
@@ -13,7 +13,14 @@ export interface ObsConfigDirFileType {
} }
const isFolderToSkip = (x: string) => { const isFolderToSkip = (x: string) => {
let specialFolders = [".git", ".github", ".gitlab", ".svn", "node_modules"]; let specialFolders = [
".git",
".github",
".gitlab",
".svn",
"node_modules",
".DS_Store",
];
for (const iterator of specialFolders) { for (const iterator of specialFolders) {
if ( if (
x === iterator || x === iterator ||
+2 -2
View File
@@ -1,4 +1,4 @@
import delay from "delay"; import { rangeDelay } from "delay";
import { Dropbox, DropboxAuth } from "dropbox"; import { Dropbox, DropboxAuth } from "dropbox";
import type { files, DropboxResponseError, DropboxResponse } from "dropbox"; import type { files, DropboxResponseError, DropboxResponse } from "dropbox";
import { Vault } from "obsidian"; import { Vault } from "obsidian";
@@ -340,7 +340,7 @@ async function retryReq<T>(
2 2
)}` )}`
); );
await delay.range(secMin * 1000, secMax * 1000); await rangeDelay(secMin * 1000, secMax * 1000);
} }
} }
} }
+4 -4
View File
@@ -11,14 +11,14 @@ import {
S3Client, S3Client,
} from "@aws-sdk/client-s3"; } from "@aws-sdk/client-s3";
import { Upload } from "@aws-sdk/lib-storage"; 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 { import {
FetchHttpHandler, FetchHttpHandler,
FetchHttpHandlerOptions, FetchHttpHandlerOptions,
} from "@aws-sdk/fetch-http-handler"; } from "@smithy/fetch-http-handler";
// @ts-ignore // @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 { HeaderBag, HttpHandlerOptions, Provider } from "@aws-sdk/types";
import { Buffer } from "buffer"; import { Buffer } from "buffer";
import * as mime from "mime-types"; import * as mime from "mime-types";
+97 -82
View File
@@ -15,21 +15,22 @@ import type {
FileStat, FileStat,
WebDAVClient, WebDAVClient,
RequestOptionsWithState, 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) { if (VALID_REQURL) {
getPatcher().patch( getPatcher().patch(
"request", "request",
async ( async (options: RequestOptionsWithState): Promise<Response> => {
options: RequestOptionsWithState
): Promise<Response | ResponseDataDetailed<any>> => {
const transformedHeaders = { ...options.headers }; const transformedHeaders = { ...options.headers };
delete transformedHeaders["host"]; delete transformedHeaders["host"];
delete transformedHeaders["Host"]; delete transformedHeaders["Host"];
delete transformedHeaders["content-length"]; delete transformedHeaders["content-length"];
delete transformedHeaders["Content-Length"]; delete transformedHeaders["Content-Length"];
const r = await requestUrl({ const r = await requestUrl({
url: options.url, url: options.url,
method: options.method, method: options.method,
@@ -37,79 +38,90 @@ if (VALID_REQURL) {
headers: transformedHeaders, 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; 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 = { export const DEFAULT_WEBDAV_CONFIG = {
address: "", address: "",
@@ -232,9 +244,10 @@ export class WrappedWebdavClient {
method: "PROPFIND", method: "PROPFIND",
headers: { headers: {
Depth: "infinity", Depth: "infinity",
Accept: "text/plain,application/xml",
}, },
responseType: "text", // responseType: "text",
}); } as any);
if (res.status === 403) { if (res.status === 403) {
throw Error("not support Infinity, get 403"); throw Error("not support Infinity, get 403");
} else { } else {
@@ -253,9 +266,10 @@ export class WrappedWebdavClient {
method: "PROPFIND", method: "PROPFIND",
headers: { headers: {
Depth: "1", Depth: "1",
Accept: "text/plain,application/xml",
}, },
responseType: "text", // responseType: "text",
} } as any
); );
testPassed = true; testPassed = true;
this.webdavConfig.depth = "auto_1"; this.webdavConfig.depth = "auto_1";
@@ -455,9 +469,9 @@ const downloadFromRemoteRaw = async (
fileOrFolderPath: string fileOrFolderPath: string
) => { ) => {
await client.init(); 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) { if (buff instanceof ArrayBuffer) {
return buff; return buff;
} else if (buff instanceof Buffer) { } else if (buff instanceof Buffer) {
@@ -496,6 +510,7 @@ export const downloadFromRemote = async (
downloadFile = remoteEncryptedKey; downloadFile = remoteEncryptedKey;
} }
downloadFile = getWebdavPath(downloadFile, client.remoteBaseDir); downloadFile = getWebdavPath(downloadFile, client.remoteBaseDir);
// console.log(`downloadFile=${downloadFile}`);
const remoteContent = await downloadFromRemoteRaw(client, downloadFile); const remoteContent = await downloadFromRemoteRaw(client, downloadFile);
let localContent = remoteContent; let localContent = remoteContent;
if (password !== "") { if (password !== "") {
+23 -1
View File
@@ -29,6 +29,14 @@ describe("Encryption tests", () => {
expect(await encryptStringToBase32(k, password)).to.not.equal(k); 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 () => { it("should raise error using different password", async () => {
const k = "secret text"; const k = "secret text";
const password = "hey"; const password = "hey";
@@ -97,7 +105,21 @@ describe("Encryption tests", () => {
expect(Buffer.from(enc).equals(Buffer.from(opensslArrBuf))).to.be.true; 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 testFolder = path.join(__dirname, "static_assets", "mona_lisa");
const testFileName = const testFileName =
"1374px-Mona_Lisa,_by_Leonardo_da_Vinci,_from_C2RMF_retouched.jpg"; "1374px-Mona_Lisa,_by_Leonardo_da_Vinci,_from_C2RMF_retouched.jpg";
+8
View File
@@ -41,6 +41,12 @@ module.exports = {
test: /\.svg?$/, test: /\.svg?$/,
type: "asset/source", type: "asset/source",
}, },
{
test: /\.m?js$/,
resolve: {
fullySpecified: false, // process/browser returns some errors before
},
},
], ],
}, },
resolve: { resolve: {
@@ -55,7 +61,9 @@ module.exports = {
// crypto: false, // crypto: false,
// domain: require.resolve("domain-browser"), // domain: require.resolve("domain-browser"),
// events: require.resolve("events"), // events: require.resolve("events"),
http: false,
// http: require.resolve("stream-http"), // http: require.resolve("stream-http"),
https: false,
// https: require.resolve("https-browserify"), // https: require.resolve("https-browserify"),
net: false, net: false,
// os: require.resolve("os-browserify/browser"), // os: require.resolve("os-browserify/browser"),