Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e8bec9511 | ||
|
|
c98d91ab60 | ||
|
|
8bd456b08e | ||
|
|
a5c25aecd0 | ||
|
|
806438964c | ||
|
|
069e993fb0 | ||
|
|
7c2a17c404 | ||
|
|
f26e491922 | ||
|
|
dbf80c3359 | ||
|
|
9ddb840077 | ||
|
|
17135abbd4 | ||
|
|
af8357ba6e | ||
|
|
bfa23eb8a5 | ||
|
|
d3d26bfe49 | ||
|
|
f6f7d83a35 | ||
|
|
9e29405103 | ||
|
|
3e7e05fc3d | ||
|
|
391df3ed2d | ||
|
|
c542789c93 | ||
|
|
48e5601a52 | ||
|
|
054a9a3c01 | ||
|
|
66dcaf4e4c | ||
|
|
6d29554033 | ||
|
|
4ed0d735a2 | ||
|
|
26dff02daa | ||
|
|
1b1083d746 | ||
|
|
6db005018d | ||
|
|
8d25ddb636 | ||
|
|
b0d41478a3 | ||
|
|
f69adf273a | ||
|
|
4b4a9b0989 | ||
|
|
bfe11f44dc | ||
|
|
d25303cfac | ||
|
|
ebd62b1581 | ||
|
|
13537d1481 | ||
|
|
6fce079481 | ||
|
|
baf4e6b369 | ||
|
|
dd39e229d8 | ||
|
|
ba6e8be304 | ||
|
|
cb7a372b69 | ||
|
|
9a4dd0186d | ||
|
|
f9cdf323b8 | ||
|
|
474216b9ab | ||
|
|
99f143115b | ||
|
|
39940deb3f | ||
|
|
df53ea957f | ||
|
|
0cf8023278 | ||
|
|
be1386b345 | ||
|
|
9a189d63c9 | ||
|
|
00d0c557df | ||
|
|
a70a53eeec | ||
|
|
8cec2b00eb | ||
|
|
6efe52b26e | ||
|
|
d4ee07306d | ||
|
|
303f47f7c1 | ||
|
|
8270a02246 | ||
|
|
4686d911f4 | ||
|
|
e704199da0 | ||
|
|
5a4e8e51a1 | ||
|
|
6f339583c1 | ||
|
|
f042e31643 | ||
|
|
bb21714b45 | ||
|
|
b3c107ce58 | ||
|
|
b39544b43b | ||
|
|
b8c4a2bd9a | ||
|
|
c1c50cd479 | ||
|
|
41073d1576 | ||
|
|
429063ebd1 | ||
|
|
2eda5618df |
@@ -12,8 +12,6 @@ on:
|
||||
push:
|
||||
tags:
|
||||
- "*" # Push events to matching any tag format, i.e. 1.0, 20.15.10
|
||||
branches:
|
||||
- master
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
@@ -35,6 +35,9 @@ This is yet another unofficial sync plugin for Obsidian. If you like it or find
|
||||
- **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).
|
||||
- **You should protect your `data.json` file.** The file contains sensitive information.
|
||||
- It's strongly advised **NOT** to share your `data.json` file to anyone.
|
||||
- It's usually **NOT** a good idea to check the file into version control. By default, the plugin tries to create a `.gitignore` file inside the plugin directory if it doesn't exist, for ignoring `data.json` in the `git` version control. If you know exactly what it means and want to remove the setting, please modify the `.gitignore` file or set it to be empty.
|
||||
|
||||
## Questions, Suggestions, Or Bugs
|
||||
|
||||
@@ -89,6 +92,8 @@ Additionally, the plugin author may occasionally visit Obsidian official forum a
|
||||
- If you are using Obsidian desktop < 0.13.25 or iOS < 1.1.1 or any Android version:
|
||||
- The webdav server has to be enabled CORS for requests from `app://obsidian.md` and `capacitor://localhost` and `http://localhost`, **AND** all webdav HTTP methods, **AND** all webdav headers. These are required, because Obsidian mobile works like a browser and mobile plugins are limited by CORS policies unless under a upgraded Obsidian version.
|
||||
- Popular software NextCloud, OwnCloud, `rclone serve webdav` do **NOT** enable CORS by default. If you are using any of them, you should evaluate the risk, and find a way to enable CORS, before using this plugin, or use a upgraded Obsidian version.
|
||||
- **Unofficial** workaround: NextCloud users can **evaluate the risk by themselves**, and if decide to accept the risk, they can install [WebAppPassword](https://apps.nextcloud.com/apps/webapppassword) app, and add `app://obsidian.md`, `capacitor://localhost`, `http://localhost` to `Allowed origins`
|
||||
- **Unofficial** workaround: OwnCloud users can **evaluate the risk by themselves**, and if decide to accept the risk, they can download `.tar.gz` of `WebAppPassword` above and manually install and configure it on their instances.
|
||||
- The plugin is tested successfully under python package [`wsgidav` (version 4.0)](https://github.com/mar10/wsgidav). See [this issue](https://github.com/mar10/wsgidav/issues/239) for some details.
|
||||
- Your data would be synced to a `${vaultName}` sub folder on your webdav server.
|
||||
- Password-based end-to-end encryption is also supported. But please be aware that **the vault name itself is not encrypted**.
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
# How To Configure Apache CORS Rules for Webdav
|
||||
|
||||
This method is [contributed by community](https://github.com/remotely-save/remotely-save/pull/31).
|
||||
|
||||
You should evaluate the risk by yourself before trying this method.
|
||||
|
||||
**You are strongly advised to backup your original Apache configuration files before making any changes.**
|
||||
|
||||
```apacheconf
|
||||
<IfModule mod_headers.c>
|
||||
# Obsidian webdav
|
||||
SetEnvIf Origin "^app://obsidian.md$" IS_OBSIDIAN
|
||||
SetEnvIf Origin "^capacitor://localhost$" IS_OBSIDIAN
|
||||
SetEnvIf Origin "^http://localhost$" IS_OBSIDIAN
|
||||
Header always set Access-Control-Allow-Origin "*" env=IS_OBSIDIAN
|
||||
Header always set Access-Control-Allow-Methods "GET, HEAD, POST, PUT, OPTIONS, MOVE, DELETE, COPY, LOCK, UNLOCK, PROPFIND" env=IS_OBSIDIAN
|
||||
Header always set Access-Control-Allow-Headers "Authorization, Depth, DNT, User-Agent, Keep-Alive, Content-Type, accept, origin, X-Requested-With" env=IS_OBSIDIAN
|
||||
Header always set Access-Control-Expose-Headers "etag, dav" env=IS_OBSIDIAN
|
||||
|
||||
# Allow OPTION request without authentication and respond with status 200
|
||||
RewriteCond %{ENV:IS_OBSIDIAN} 1
|
||||
RewriteCond %{REQUEST_METHOD} OPTIONS
|
||||
RewriteRule ^(.*)$ $1 [R=200,L]
|
||||
</IfModule>
|
||||
```
|
||||
@@ -4,6 +4,11 @@ The plugin is developed for the browser environment. The "fake" browser behind t
|
||||
|
||||
[MDN has a doc about CORS.](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS)
|
||||
|
||||
From Obsidian desktop >= 0.13.25 or mobile >= 1.1.1, Obsidian [provides a new API `requiestUrl`](https://forum.obsidian.md/t/obsidian-release-v0-13-25-insider-build/32701), that allows the plugin to fully bypass the CORS issue. As of Mar 2022, the latest public-released Obsidian desktop has supported this API, but the Obsidian mobile still stays in insider.
|
||||
1. From Obsidian desktop >= 0.13.25 or mobile >= 1.1.1, Obsidian [provides a new API `requiestUrl`](https://forum.obsidian.md/t/obsidian-release-v0-13-25-insider-build/32701), that allows the plugin to fully bypass the CORS issue. As of Mar 2022, the latest public-released Obsidian desktop has supported this API, but the Obsidian mobile still stays in insider.
|
||||
|
||||
For using this plugin in Obsidian desktop < 0.13.25 or mobile < 1.1.1, we need to configure the server side to return the header `Access-Control-Allow-Origin` allowing the origins `app://obsidian.md` and `capacitor://localhost` and `http://localhost`. Here is an example [configuration for Amazon S3](./s3_cors_configure.md).
|
||||
2. For using this plugin in Obsidian desktop < 0.13.25 or mobile < 1.1.1, we need to configure the server side to return the header `Access-Control-Allow-Origin` allowing the origins `app://obsidian.md` and `capacitor://localhost` and `http://localhost`.
|
||||
|
||||
Example configurations:
|
||||
|
||||
- [Amazon S3](./s3_cors_configure.md)
|
||||
- [Apache](./apache_cors_configure.md) ([contributed by community](https://github.com/remotely-save/remotely-save/pull/31))
|
||||
|
||||
@@ -6,6 +6,14 @@ Ideally, users do not need to debug anything. But if something bad happened, we
|
||||
|
||||
See [here](./export_sync_plans.md).
|
||||
|
||||
## Advanced: Check Console Output
|
||||
## Advanced: Check Console Output Directly
|
||||
|
||||
...of desktop and Android.
|
||||
|
||||
See [here](./check_console_output.md).
|
||||
|
||||
## Advanced: Save Console Output Then Read Them Later
|
||||
|
||||
This method works for desktop and mobile devices (iOS, Android).
|
||||
|
||||
See [here](./save_console_output_and_export.md).
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Check Console Output
|
||||
|
||||
If you are using Obsidian on desktop, you can check the Obsidian console.
|
||||
If you are using Obsidian on desktop or Android, you can check the Obsidian console.
|
||||
|
||||
## Disable Auto Sync Firstly
|
||||
|
||||
@@ -12,6 +12,12 @@ Go to the plugin settings, scroll down to the section "Debug" -> "alter console
|
||||
|
||||
## Check The Output
|
||||
|
||||
Then, press the keyboard shortcut "ctrl+shift+i" if you are on Windows or Linux, or press "cmd+shift+i" if you are on macOS. You should be able to see the console of Obsidian.
|
||||
- If you are on desktop
|
||||
|
||||
Press the keyboard shortcut "ctrl+shift+i" if you are on Windows or Linux, or press "cmd+shift+i" if you are on macOS. You should be able to see the console of Obsidian.
|
||||
|
||||
- If you are using Android
|
||||
|
||||
You need to [enable USB debugging](https://developer.android.com/studio/debug/dev-options#enable) on your Android, then connect your Android to a computer using USB, then open the **desktop** Chrome browser and go to the special web page <chrome://inspect>. You shall be able to see the "inspect" link inside the special page, then click the link to open the console. After debugging, remember to turn off USB debugging.
|
||||
|
||||
Trigger the sync manually (by clicking the icon on the ribbon sidebar). Something (hopefully) helpful should show up in the console. You could understand what happened and what goes wrong more explictly by checking the output.
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
# Save Console Output And Read Them Later
|
||||
|
||||
## Disable Auto Sync Firstly
|
||||
|
||||
You should disable auto sync to avoid any unexpected running.
|
||||
|
||||
## Set The Output Level To Debug
|
||||
|
||||
Go to the plugin settings, scroll down to the section "Debug" -> "alter console log level", and change it from "info" to "debug".
|
||||
|
||||
## Enable Saving The Output To DB
|
||||
|
||||
Go to the plugin settings, scroll down to the section "Debug" -> "Save Console Logs Into DB", and change it from "disable" to "enable". **This setting has some performance cost, so do NOT always turn this on when not necessary!**
|
||||
|
||||
## Run The Sync
|
||||
|
||||
Trigger the sync manually (by clicking the icon on the ribbon sidebar). Something (hopefully) helpful should show up in the console. The the console logs are also saved into DB now.
|
||||
|
||||
## Export The Output And Read The Logs
|
||||
|
||||
Go to the plugin settings, scroll down to the section "Debug" -> "Export Console Logs From DB", and click the button. A new file `log_hist_exported_on_....md` should be created inside the special folder `_debug_remotely_save/`. You could read it and hopefully find something useful.
|
||||
|
||||
## Disable Saving The Output To DB
|
||||
|
||||
After debugging, go to the plugin settings, scroll down to the section "Debug" -> "Save Console Logs Into DB", and change it from "enable" to "disable".
|
||||
@@ -20,7 +20,7 @@ The list is for information purposes only.
|
||||
| [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. |
|
||||
| OwnCloud | Yes? | | Yes? | | Yes? | No CORS config by default. |
|
||||
| Seafile | Yes? | | Yes? | | Yes? | |
|
||||
| Seafile | Yes | | Yes | | Yes? | No CORS config by default. |
|
||||
| `rclone serve webdav` | Yes | | Yes | | Yes | No CORS support. |
|
||||
| [Nutstore 坚果云](https://www.jianguoyun.com/) | Yes | | Yes | | Yes | No CORS support. |
|
||||
| [TeraCLOUD](https://teracloud.jp/en/) | Yes | | Yes | | Yes | No CORS support. |
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
# Sync Ignoring Large Files
|
||||
|
||||
Initially, the plugin does not ignore large files.
|
||||
|
||||
From the new version in May 2022, it can ignore all files with some sizes. But we need some rules to make the function compatible with existing conditions.
|
||||
|
||||
1. If users are using E2E password mode, then the file sizes are compared on the **encrypted sizes**, rather than the original unencripted file sizes. The reasons are: the encrypted ones are in transferations, and the encrypted sizes can be computed from unencrypted sizes but not the reverse.
|
||||
|
||||
2. Assuming the file A, is already synced between local device and remote service before.
|
||||
|
||||
- If the local size and remote size are both below the threshold, then the file can be synced normally.
|
||||
- If the local size and remote size are both above the threshold, then the file will be ignored normally.
|
||||
- If the local size is below the threshold, and the remote size is above the threshold, then the plugin **rejects** the sync, and throws the error to the user.
|
||||
- If the local size is above the threshold, and the remote size is below the threshold, then the plugin **rejects** the sync, and throws the error to the user.
|
||||
- When it somes to deletions, the same rules apply.
|
||||
|
||||
The main point is that, if the file sizes "cross the line", the plugin does not introduce any further trouble and just reject to work for this file.
|
||||
+4
-1
@@ -31,11 +31,11 @@ esbuild
|
||||
"obsidian",
|
||||
"electron",
|
||||
"fs",
|
||||
"crypto",
|
||||
"tls",
|
||||
"net",
|
||||
// ...builtins
|
||||
],
|
||||
inject: ["./esbuild.injecthelper.mjs"],
|
||||
format: "cjs",
|
||||
watch: !prod,
|
||||
target: "es2016",
|
||||
@@ -48,6 +48,9 @@ esbuild
|
||||
"process.env.DEFAULT_DROPBOX_APP_KEY": `"${DEFAULT_DROPBOX_APP_KEY}"`,
|
||||
"process.env.DEFAULT_ONEDRIVE_CLIENT_ID": `"${DEFAULT_ONEDRIVE_CLIENT_ID}"`,
|
||||
"process.env.DEFAULT_ONEDRIVE_AUTHORITY": `"${DEFAULT_ONEDRIVE_AUTHORITY}"`,
|
||||
global: "window",
|
||||
"process.env.NODE_DEBUG": `undefined`, // ugly fix
|
||||
"process.env.DEBUG": `undefined`, // ugly fix
|
||||
},
|
||||
})
|
||||
.catch(() => process.exit(1));
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
export let Buffer = require("buffer").Buffer;
|
||||
export let process = require("process/browser");
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"id": "remotely-save",
|
||||
"name": "Remotely Save",
|
||||
"version": "0.3.16",
|
||||
"version": "0.3.24",
|
||||
"minAppVersion": "0.13.21",
|
||||
"description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
|
||||
"author": "fyears",
|
||||
|
||||
+42
-39
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "remotely-save",
|
||||
"version": "0.3.16",
|
||||
"version": "0.3.24",
|
||||
"description": "This is yet another sync plugin for Obsidian app.",
|
||||
"scripts": {
|
||||
"dev2": "node esbuild.config.mjs",
|
||||
@@ -23,70 +23,73 @@
|
||||
"author": "",
|
||||
"license": "Apache-2.0",
|
||||
"devDependencies": {
|
||||
"@microsoft/microsoft-graph-types": "^2.11.0",
|
||||
"@types/chai": "^4.2.22",
|
||||
"@types/chai-as-promised": "^7.1.4",
|
||||
"@types/jsdom": "^16.2.13",
|
||||
"@types/lodash": "^4.14.178",
|
||||
"@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.0.0",
|
||||
"@types/mocha": "^9.1.1",
|
||||
"@types/mustache": "^4.1.2",
|
||||
"@types/node": "^14.14.37",
|
||||
"@types/qrcode": "^1.4.1",
|
||||
"@types/node": "^17.0.30",
|
||||
"@types/qrcode": "^1.4.2",
|
||||
"builtin-modules": "^3.2.0",
|
||||
"chai": "^4.3.4",
|
||||
"chai": "^4.3.6",
|
||||
"chai-as-promised": "^7.1.1",
|
||||
"cross-env": "^7.0.3",
|
||||
"dotenv": "^10.0.0",
|
||||
"esbuild": "^0.14.27",
|
||||
"dotenv": "^16.0.0",
|
||||
"esbuild": "^0.14.38",
|
||||
"jsdom": "^19.0.0",
|
||||
"mocha": "^9.1.3",
|
||||
"prettier": "^2.4.1",
|
||||
"ts-loader": "^9.2.6",
|
||||
"ts-node": "^10.4.0",
|
||||
"tslib": "^2.2.0",
|
||||
"typescript": "^4.4.4",
|
||||
"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",
|
||||
"webdav-server": "^2.6.2",
|
||||
"webpack": "^5.64.4",
|
||||
"webpack-cli": "^4.9.1"
|
||||
"webpack": "^5.72.0",
|
||||
"webpack-cli": "^4.9.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-s3": "^3.54.0",
|
||||
"@aws-sdk/fetch-http-handler": "^3.54.0",
|
||||
"@aws-sdk/lib-storage": "^3.54.0",
|
||||
"@aws-sdk/protocol-http": "^3.54.0",
|
||||
"@aws-sdk/querystring-builder": "^3.54.0",
|
||||
"@aws-sdk/signature-v4-crt": "^3.54.0",
|
||||
"@aws-sdk/types": "^3.54.0",
|
||||
"@azure/msal-node": "^1.6.0",
|
||||
"@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",
|
||||
"@fyears/tsqueue": "^1.0.1",
|
||||
"@microsoft/microsoft-graph-client": "^3.0.1",
|
||||
"acorn": "^8.5.0",
|
||||
"@microsoft/microsoft-graph-client": "^3.0.2",
|
||||
"acorn": "^8.7.1",
|
||||
"aggregate-error": "^4.0.0",
|
||||
"assert": "^2.0.0",
|
||||
"aws-crt": "^1.10.1",
|
||||
"aws-crt": "^1.12.1",
|
||||
"buffer": "^6.0.3",
|
||||
"crypto-browserify": "^3.12.0",
|
||||
"dropbox": "^10.22.0",
|
||||
"delay": "^5.0.0",
|
||||
"dropbox": "^10.28.0",
|
||||
"emoji-regex": "^10.1.0",
|
||||
"http-status-codes": "^2.2.0",
|
||||
"localforage": "^1.10.0",
|
||||
"lodash": "^4.17.21",
|
||||
"loglevel": "^1.8.0",
|
||||
"lucide": "^0.17.12",
|
||||
"mime-types": "^2.1.33",
|
||||
"lucide": "^0.35.0",
|
||||
"mime-types": "^2.1.35",
|
||||
"mustache": "^4.2.0",
|
||||
"nanoid": "^3.1.30",
|
||||
"obsidian": "^0.13.26",
|
||||
"nanoid": "^3.3.3",
|
||||
"obsidian": "^0.14.6",
|
||||
"p-queue": "^7.2.0",
|
||||
"path-browserify": "^1.0.1",
|
||||
"process": "^0.11.10",
|
||||
"qrcode": "^1.5.0",
|
||||
"rfc4648": "^1.5.0",
|
||||
"rfc4648": "^1.5.1",
|
||||
"rimraf": "^3.0.2",
|
||||
"stream-browserify": "^3.0.0",
|
||||
"url": "^0.11.0",
|
||||
"util": "^0.12.4",
|
||||
"webdav": "^4.7.0",
|
||||
"webdav-fs": "^4.0.0",
|
||||
"webdav": "^4.9.0",
|
||||
"webdav-fs": "^4.0.1",
|
||||
"xregexp": "^5.1.0"
|
||||
}
|
||||
}
|
||||
|
||||
+33
-3
@@ -84,6 +84,8 @@ export interface RemotelySavePluginSettings {
|
||||
syncConfigDir?: boolean;
|
||||
syncUnderscoreItems?: boolean;
|
||||
lang?: LangTypeAndAuto;
|
||||
logToDB?: boolean;
|
||||
skipSizeLargerThan?: number;
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
@@ -121,13 +123,24 @@ type DecisionTypeForFile =
|
||||
| "uploadLocalToRemote" // "skipLocal && uploadLocalToRemote && cleanLocalDelHist && cleanRemoteDelHist"
|
||||
| "downloadRemoteToLocal"; // "downloadRemoteToLocal && skipRemote && cleanLocalDelHist && cleanRemoteDelHist"
|
||||
|
||||
type DecisionTypeForFileSize =
|
||||
| "skipUploadingTooLarge"
|
||||
| "skipDownloadingTooLarge"
|
||||
| "skipUsingLocalDelTooLarge"
|
||||
| "skipUsingRemoteDelTooLarge"
|
||||
| "errorLocalTooLargeConflictRemote"
|
||||
| "errorRemoteTooLargeConflictLocal";
|
||||
|
||||
type DecisionTypeForFolder =
|
||||
| "createFolder"
|
||||
| "uploadLocalDelHistToRemoteFolder"
|
||||
| "keepRemoteDelHistFolder"
|
||||
| "skipFolder";
|
||||
|
||||
export type DecisionType = DecisionTypeForFile | DecisionTypeForFolder;
|
||||
export type DecisionType =
|
||||
| DecisionTypeForFile
|
||||
| DecisionTypeForFileSize
|
||||
| DecisionTypeForFolder;
|
||||
|
||||
export interface FileOrFolderMixedState {
|
||||
key: string;
|
||||
@@ -138,16 +151,33 @@ export interface FileOrFolderMixedState {
|
||||
deltimeLocal?: number;
|
||||
deltimeRemote?: number;
|
||||
sizeLocal?: number;
|
||||
sizeLocalEnc?: number;
|
||||
sizeRemote?: number;
|
||||
sizeRemoteEnc?: number;
|
||||
changeRemoteMtimeUsingMapping?: boolean;
|
||||
changeLocalMtimeUsingMapping?: boolean;
|
||||
decision?: DecisionType;
|
||||
decisionBranch?: number;
|
||||
syncDone?: "done";
|
||||
remoteEncryptedKey?: string;
|
||||
|
||||
mtimeLocalFmt?: string;
|
||||
mtimeRemoteFmt?: string;
|
||||
deltimeLocalFmt?: string;
|
||||
deltimeRemoteFmt?: string;
|
||||
}
|
||||
|
||||
export const API_VER_STAT_FOLDER = "0.13.27";
|
||||
export const API_VER_REQURL = "0.13.26";
|
||||
export const API_VER_REQURL = "0.13.26"; // desktop ver 0.13.26, iOS ver 1.1.1
|
||||
export const API_VER_REQURL_ANDROID = "0.14.6"; // Android ver 1.2.1
|
||||
|
||||
export const VALID_REQURL =
|
||||
requireApiVersion(API_VER_REQURL) && !Platform.isAndroidApp;
|
||||
(!Platform.isAndroidApp && requireApiVersion(API_VER_REQURL)) ||
|
||||
(Platform.isAndroidApp && requireApiVersion(API_VER_REQURL_ANDROID));
|
||||
|
||||
export const DEFAULT_DEBUG_FOLDER = "_debug_remotely_save/";
|
||||
export const DEFAULT_SYNC_PLANS_HISTORY_FILE_PREFIX =
|
||||
"sync_plans_hist_exported_on_";
|
||||
export const DEFAULT_LOG_HISTORY_FILE_PREFIX = "log_hist_exported_on_";
|
||||
|
||||
export type SyncTriggerSourceType = "manual" | "auto" | "dry" | "autoOnceInit";
|
||||
|
||||
@@ -3,8 +3,7 @@ import { reverseString } from "./misc";
|
||||
|
||||
import type { RemotelySavePluginSettings } from "./baseTypes";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
const DEFAULT_README: string =
|
||||
"The file contains sensitive info, so DO NOT take screenshot of, copy, or share it to anyone! It's also generated automatically, so do not edit it manually.";
|
||||
@@ -20,8 +19,8 @@ interface MessyConfigType {
|
||||
export const messyConfigToNormal = (
|
||||
x: MessyConfigType | RemotelySavePluginSettings | null | undefined
|
||||
): RemotelySavePluginSettings | null | undefined => {
|
||||
log.debug("loading, original config on disk:");
|
||||
log.debug(x);
|
||||
// log.debug("loading, original config on disk:");
|
||||
// log.debug(x);
|
||||
if (x === null || x === undefined) {
|
||||
log.debug("the messy config is null or undefined, skip");
|
||||
return x as any;
|
||||
@@ -36,12 +35,12 @@ export const messyConfigToNormal = (
|
||||
}) as Buffer
|
||||
).toString("utf-8")
|
||||
);
|
||||
log.debug("loading, parsed config is:");
|
||||
log.debug(y);
|
||||
// log.debug("loading, parsed config is:");
|
||||
// log.debug(y);
|
||||
return y;
|
||||
} else {
|
||||
// return as is
|
||||
log.debug("loading, parsed config is the same");
|
||||
// log.debug("loading, parsed config is the same");
|
||||
return x;
|
||||
}
|
||||
};
|
||||
@@ -64,7 +63,7 @@ export const normalConfigToMessy = (
|
||||
})
|
||||
),
|
||||
};
|
||||
log.debug("encoding, encoded config is:");
|
||||
log.debug(y);
|
||||
// log.debug("encoding, encoded config is:");
|
||||
// log.debug(y);
|
||||
return y;
|
||||
};
|
||||
|
||||
+105
-9
@@ -1,20 +1,85 @@
|
||||
import { TAbstractFile, TFolder, TFile, Vault } from "obsidian";
|
||||
|
||||
import type { SyncPlanType } from "./sync";
|
||||
import { readAllSyncPlanRecordTextsByVault } from "./localdb";
|
||||
import {
|
||||
readAllSyncPlanRecordTextsByVault,
|
||||
readAllLogRecordTextsByVault,
|
||||
} from "./localdb";
|
||||
import type { InternalDBs } from "./localdb";
|
||||
import { mkdirpInVault } from "./misc";
|
||||
import {
|
||||
DEFAULT_DEBUG_FOLDER,
|
||||
DEFAULT_LOG_HISTORY_FILE_PREFIX,
|
||||
DEFAULT_SYNC_PLANS_HISTORY_FILE_PREFIX,
|
||||
FileOrFolderMixedState,
|
||||
} from "./baseTypes";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
const DEFAULT_DEBUG_FOLDER = "_debug_remotely_save/";
|
||||
const DEFAULT_SYNC_PLANS_HISTORY_FILE_PREFIX = "sync_plans_hist_exported_on_";
|
||||
const turnSyncPlanToTable = (record: string) => {
|
||||
const syncPlan: SyncPlanType = JSON.parse(record);
|
||||
const { ts, tsFmt, remoteType, mixedStates } = syncPlan;
|
||||
|
||||
type allowedHeadersType = keyof FileOrFolderMixedState;
|
||||
const headers: allowedHeadersType[] = [
|
||||
"key",
|
||||
"remoteEncryptedKey",
|
||||
"existLocal",
|
||||
"sizeLocal",
|
||||
"sizeLocalEnc",
|
||||
"mtimeLocal",
|
||||
"deltimeLocal",
|
||||
"changeLocalMtimeUsingMapping",
|
||||
"existRemote",
|
||||
"sizeRemote",
|
||||
"sizeRemoteEnc",
|
||||
"mtimeRemote",
|
||||
"deltimeRemote",
|
||||
"changeRemoteMtimeUsingMapping",
|
||||
"decision",
|
||||
"decisionBranch",
|
||||
];
|
||||
|
||||
const lines = [
|
||||
`ts: ${ts}${tsFmt !== undefined ? " / " + tsFmt : ""}`,
|
||||
`remoteType: ${remoteType}`,
|
||||
`| ${headers.join(" | ")} |`,
|
||||
`| ${headers.map((x) => "---").join(" | ")} |`,
|
||||
];
|
||||
for (const [k1, v1] of Object.entries(syncPlan.mixedStates)) {
|
||||
const k = k1 as string;
|
||||
const v = v1 as FileOrFolderMixedState;
|
||||
const singleLine = [];
|
||||
for (const h of headers) {
|
||||
const field = v[h];
|
||||
if (field === undefined) {
|
||||
singleLine.push("");
|
||||
continue;
|
||||
}
|
||||
if (
|
||||
h === "mtimeLocal" ||
|
||||
h === "deltimeLocal" ||
|
||||
h === "mtimeRemote" ||
|
||||
h === "deltimeRemote"
|
||||
) {
|
||||
const fmt = v[(h + "Fmt") as allowedHeadersType] as string;
|
||||
const s = `${field}${fmt !== undefined ? " / " + fmt : ""}`;
|
||||
singleLine.push(s);
|
||||
} else {
|
||||
singleLine.push(field);
|
||||
}
|
||||
}
|
||||
lines.push(`| ${singleLine.join(" | ")} |`);
|
||||
}
|
||||
|
||||
return lines.join("\n");
|
||||
};
|
||||
|
||||
export const exportVaultSyncPlansToFiles = async (
|
||||
db: InternalDBs,
|
||||
vault: Vault,
|
||||
vaultRandomID: string
|
||||
vaultRandomID: string,
|
||||
toFormat: "table" | "json" = "json"
|
||||
) => {
|
||||
log.info("exporting");
|
||||
await mkdirpInVault(DEFAULT_DEBUG_FOLDER, vault);
|
||||
@@ -23,9 +88,16 @@ export const exportVaultSyncPlansToFiles = async (
|
||||
if (records.length === 0) {
|
||||
md = "No sync plans history found";
|
||||
} else {
|
||||
md =
|
||||
"Sync plans found:\n\n" +
|
||||
records.map((x) => "```json\n" + x + "\n```\n").join("\n");
|
||||
if (toFormat === "json") {
|
||||
md =
|
||||
"Sync plans found:\n\n" +
|
||||
records.map((x) => "```json\n" + x + "\n```\n").join("\n");
|
||||
} else if (toFormat === "table") {
|
||||
md =
|
||||
"Sync plans found:\n\n" + records.map(turnSyncPlanToTable).join("\n\n");
|
||||
} else {
|
||||
const _: never = toFormat;
|
||||
}
|
||||
}
|
||||
const ts = Date.now();
|
||||
const filePath = `${DEFAULT_DEBUG_FOLDER}${DEFAULT_SYNC_PLANS_HISTORY_FILE_PREFIX}${ts}.md`;
|
||||
@@ -34,3 +106,27 @@ export const exportVaultSyncPlansToFiles = async (
|
||||
});
|
||||
log.info("finish exporting");
|
||||
};
|
||||
|
||||
export const exportVaultLoggerOutputToFiles = async (
|
||||
db: InternalDBs,
|
||||
vault: Vault,
|
||||
vaultRandomID: string
|
||||
) => {
|
||||
await mkdirpInVault(DEFAULT_DEBUG_FOLDER, vault);
|
||||
const records = await readAllLogRecordTextsByVault(db, vaultRandomID);
|
||||
let md = "";
|
||||
if (records.length === 0) {
|
||||
md = "No logger history found.";
|
||||
} else {
|
||||
md =
|
||||
"Logger history found:\n\n" +
|
||||
"```text\n" +
|
||||
records.join("\n") +
|
||||
"\n```\n";
|
||||
}
|
||||
const ts = Date.now();
|
||||
const filePath = `${DEFAULT_DEBUG_FOLDER}${DEFAULT_LOG_HISTORY_FILE_PREFIX}${ts}.md`;
|
||||
await vault.create(filePath, md, {
|
||||
mtime: ts,
|
||||
});
|
||||
};
|
||||
|
||||
+1
-2
@@ -1,8 +1,7 @@
|
||||
import { base32, base64url } from "rfc4648";
|
||||
import { bufferToArrayBuffer, hexStringToTypedArray } from "./misc";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
const DEFAULT_ITER = 20000;
|
||||
|
||||
|
||||
+1
-2
@@ -7,8 +7,7 @@ import {
|
||||
RemotelySavePluginSettings,
|
||||
} from "./baseTypes";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
export const exportQrCodeUri = async (
|
||||
settings: RemotelySavePluginSettings,
|
||||
|
||||
+1
-1
Submodule src/langs updated: 75a3b2a830...42eab5d544
+141
-5
@@ -1,14 +1,13 @@
|
||||
import localforage from "localforage";
|
||||
export type LocalForage = typeof localforage;
|
||||
import { nanoid } from "nanoid";
|
||||
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";
|
||||
|
||||
export type LocalForage = typeof localforage;
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
import { nanoid } from "nanoid";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
const DB_VERSION_NUMBER_IN_HISTORY = [20211114, 20220108, 20220326];
|
||||
export const DEFAULT_DB_VERSION_NUMBER: number = 20220326;
|
||||
@@ -18,6 +17,7 @@ export const DEFAULT_TBL_FILE_HISTORY = "filefolderoperationhistory";
|
||||
export const DEFAULT_TBL_SYNC_MAPPING = "syncmetadatahistory";
|
||||
export const DEFAULT_SYNC_PLANS_HISTORY = "syncplanshistory";
|
||||
export const DEFAULT_TBL_VAULT_RANDOM_ID_MAPPING = "vaultrandomidmapping";
|
||||
export const DEFAULT_TBL_LOGGER_OUTPUT = "loggeroutput";
|
||||
|
||||
export interface FileFolderHistoryRecord {
|
||||
key: string;
|
||||
@@ -57,6 +57,7 @@ export interface InternalDBs {
|
||||
syncMappingTbl: LocalForage;
|
||||
syncPlansTbl: LocalForage;
|
||||
vaultRandomIDMappingTbl: LocalForage;
|
||||
loggerOutputTbl: LocalForage;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -211,6 +212,10 @@ export const prepareDBs = async (
|
||||
name: DEFAULT_DB_NAME,
|
||||
storeName: DEFAULT_TBL_VAULT_RANDOM_ID_MAPPING,
|
||||
}),
|
||||
loggerOutputTbl: localforage.createInstance({
|
||||
name: DEFAULT_DB_NAME,
|
||||
storeName: DEFAULT_TBL_LOGGER_OUTPUT,
|
||||
}),
|
||||
} as InternalDBs;
|
||||
|
||||
// try to get vaultRandomID firstly
|
||||
@@ -516,6 +521,7 @@ export const insertSyncPlanRecordByVault = async (
|
||||
) => {
|
||||
const record = {
|
||||
ts: syncPlan.ts,
|
||||
tsFmt: syncPlan.tsFmt,
|
||||
vaultRandomID: vaultRandomID,
|
||||
remoteType: syncPlan.remoteType,
|
||||
syncPlan: JSON.stringify(syncPlan /* directly stringify */, null, 2),
|
||||
@@ -545,3 +551,133 @@ export const readAllSyncPlanRecordTextsByVault = async (
|
||||
return records.map((x) => x.syncPlan);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* We remove records that are older than 7 days or 10000 records.
|
||||
* It's a heavy operation, so we shall not place it in the start up.
|
||||
* @param db
|
||||
*/
|
||||
export const clearExpiredSyncPlanRecords = async (db: InternalDBs) => {
|
||||
const MILLISECONDS_OLD = 1000 * 60 * 60 * 24 * 7; // 7 days
|
||||
const COUNT_TO_MANY = 10000;
|
||||
|
||||
const currTs = Date.now();
|
||||
const expiredTs = currTs - MILLISECONDS_OLD;
|
||||
|
||||
let records = (await db.syncPlansTbl.keys()).map((key) => {
|
||||
const ts = parseInt(key.split("\t")[1]);
|
||||
const expired = ts <= expiredTs;
|
||||
return {
|
||||
ts: ts,
|
||||
key: key,
|
||||
expired: expired,
|
||||
};
|
||||
});
|
||||
|
||||
const keysToRemove = new Set(
|
||||
records.filter((x) => x.expired).map((x) => x.key)
|
||||
);
|
||||
|
||||
if (records.length - keysToRemove.size > COUNT_TO_MANY) {
|
||||
// we need to find out records beyond 10000 records
|
||||
records = records.filter((x) => !x.expired); // shrink the array
|
||||
records.sort((a, b) => -(a.ts - b.ts)); // descending
|
||||
records.slice(COUNT_TO_MANY).forEach((element) => {
|
||||
keysToRemove.add(element.key);
|
||||
});
|
||||
}
|
||||
|
||||
const ps = [] as Promise<void>[];
|
||||
keysToRemove.forEach((element) => {
|
||||
ps.push(db.syncPlansTbl.removeItem(element));
|
||||
});
|
||||
await Promise.all(ps);
|
||||
};
|
||||
|
||||
export const readAllLogRecordTextsByVault = async (
|
||||
db: InternalDBs,
|
||||
vaultRandomID: string
|
||||
) => {
|
||||
const records = [] as { ts: number; r: string }[];
|
||||
await db.loggerOutputTbl.iterate((value, key, iterationNumber) => {
|
||||
if (key.startsWith(`${vaultRandomID}\t`)) {
|
||||
const item = {
|
||||
ts: parseInt(key.split("\t")[1]),
|
||||
r: value as string,
|
||||
};
|
||||
records.push(item);
|
||||
}
|
||||
});
|
||||
|
||||
// while reading the logs, we want it to be ascending
|
||||
records.sort((a, b) => a.ts - b.ts);
|
||||
|
||||
if (records === undefined) {
|
||||
return [] as string[];
|
||||
} else {
|
||||
return records.map((x) => x.r);
|
||||
}
|
||||
};
|
||||
|
||||
export const insertLoggerOutputByVault = async (
|
||||
db: InternalDBs,
|
||||
vaultRandomID: string,
|
||||
...msg: any[]
|
||||
) => {
|
||||
const ts = Date.now();
|
||||
const tsFmt = unixTimeToStr(ts);
|
||||
const key = `${vaultRandomID}\t${ts}`;
|
||||
|
||||
try {
|
||||
const val = [`[${tsFmt}]`, ...msg.map((x) => toText(x))].join(" ");
|
||||
db.loggerOutputTbl.setItem(key, val);
|
||||
} catch (err) {
|
||||
// give up, and let it pass
|
||||
}
|
||||
};
|
||||
|
||||
export const clearAllLoggerOutputRecords = async (db: InternalDBs) => {
|
||||
await db.loggerOutputTbl.clear();
|
||||
};
|
||||
|
||||
/**
|
||||
* We remove records that are older than 7 days or 10000 records.
|
||||
* It's a heavy operation, so we shall not place it in the start up.
|
||||
* @param db
|
||||
*/
|
||||
export const clearExpiredLoggerOutputRecords = async (db: InternalDBs) => {
|
||||
const MILLISECONDS_OLD = 1000 * 60 * 60 * 24 * 7; // 7 days
|
||||
const COUNT_TO_MANY = 10000;
|
||||
|
||||
const currTs = Date.now();
|
||||
const expiredTs = currTs - MILLISECONDS_OLD;
|
||||
|
||||
let records = (await db.loggerOutputTbl.keys()).map((key) => {
|
||||
const ts = parseInt(key.split("\t")[1]);
|
||||
const expired = ts <= expiredTs;
|
||||
return {
|
||||
ts: ts,
|
||||
key: key,
|
||||
expired: expired,
|
||||
};
|
||||
});
|
||||
|
||||
const keysToRemove = new Set(
|
||||
records.filter((x) => x.expired).map((x) => x.key)
|
||||
);
|
||||
|
||||
if (records.length - keysToRemove.size > COUNT_TO_MANY) {
|
||||
// we need to find out records beyond 10000 records
|
||||
records = records.filter((x) => !x.expired); // shrink the array
|
||||
records.sort((a, b) => -(a.ts - b.ts)); // descending
|
||||
records.slice(COUNT_TO_MANY).forEach((element) => {
|
||||
keysToRemove.add(element.key);
|
||||
});
|
||||
}
|
||||
|
||||
const ps = [] as Promise<void>[];
|
||||
keysToRemove.forEach((element) => {
|
||||
ps.push(db.loggerOutputTbl.removeItem(element));
|
||||
});
|
||||
await Promise.all(ps);
|
||||
};
|
||||
|
||||
+167
-24
@@ -8,8 +8,12 @@ import {
|
||||
FileSystemAdapter,
|
||||
} from "obsidian";
|
||||
import cloneDeep from "lodash/cloneDeep";
|
||||
import { createElement, RotateCcw, RefreshCcw } from "lucide";
|
||||
import type { RemotelySavePluginSettings } from "./baseTypes";
|
||||
import { createElement, RotateCcw, RefreshCcw, FileText } from "lucide";
|
||||
import type {
|
||||
FileOrFolderMixedState,
|
||||
RemotelySavePluginSettings,
|
||||
SyncTriggerSourceType,
|
||||
} from "./baseTypes";
|
||||
import {
|
||||
COMMAND_CALLBACK,
|
||||
COMMAND_CALLBACK_ONEDRIVE,
|
||||
@@ -24,6 +28,9 @@ import {
|
||||
loadFileHistoryTableByVault,
|
||||
prepareDBs,
|
||||
InternalDBs,
|
||||
insertLoggerOutputByVault,
|
||||
clearExpiredLoggerOutputRecords,
|
||||
clearExpiredSyncPlanRecords,
|
||||
} from "./localdb";
|
||||
import { RemoteClient } from "./remote";
|
||||
import {
|
||||
@@ -48,10 +55,17 @@ import { ObsConfigDirFileType, listFilesInObsFolder } from "./obsFolderLister";
|
||||
import { I18n } from "./i18n";
|
||||
import type { LangType, LangTypeAndAuto, TransItemType } from "./i18n";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
import { DeletionOnRemote, MetadataOnRemote } from "./metadataOnRemote";
|
||||
import { SyncAlgoV2Modal } from "./syncAlgoV2Notice";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
import { applyPresetRulesInplace } from "./presetRules";
|
||||
|
||||
import { applyLogWriterInplace, log } from "./moreOnLog";
|
||||
import AggregateError from "aggregate-error";
|
||||
import {
|
||||
exportVaultLoggerOutputToFiles,
|
||||
exportVaultSyncPlansToFiles,
|
||||
} from "./debugMode";
|
||||
import { SizesConflictModal } from "./syncSizesConflictNotice";
|
||||
|
||||
const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
|
||||
s3: DEFAULT_S3_CONFIG,
|
||||
@@ -69,6 +83,8 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
|
||||
syncConfigDir: false,
|
||||
syncUnderscoreItems: false,
|
||||
lang: "auto",
|
||||
logToDB: false,
|
||||
skipSizeLargerThan: -1,
|
||||
};
|
||||
|
||||
interface OAuth2Info {
|
||||
@@ -79,10 +95,9 @@ interface OAuth2Info {
|
||||
revokeAuthSetting?: Setting;
|
||||
}
|
||||
|
||||
type SyncTriggerSourceType = "manual" | "auto" | "dry" | "autoOnceInit";
|
||||
|
||||
const iconNameSyncWait = `remotely-save-sync-wait`;
|
||||
const iconNameSyncRunning = `remotely-save-sync-running`;
|
||||
const iconNameLogs = `remotely-save-logs`;
|
||||
|
||||
const getIconSvg = () => {
|
||||
const iconSvgSyncWait = createElement(RotateCcw);
|
||||
@@ -91,13 +106,18 @@ const getIconSvg = () => {
|
||||
const iconSvgSyncRunning = createElement(RefreshCcw);
|
||||
iconSvgSyncRunning.setAttribute("width", "100");
|
||||
iconSvgSyncRunning.setAttribute("height", "100");
|
||||
const iconSvgLogs = createElement(FileText);
|
||||
iconSvgLogs.setAttribute("width", "100");
|
||||
iconSvgLogs.setAttribute("height", "100");
|
||||
const res = {
|
||||
iconSvgSyncWait: iconSvgSyncWait.outerHTML,
|
||||
iconSvgSyncRunning: iconSvgSyncRunning.outerHTML,
|
||||
iconSvgLogs: iconSvgLogs.outerHTML,
|
||||
};
|
||||
|
||||
iconSvgSyncWait.empty();
|
||||
iconSvgSyncRunning.empty();
|
||||
iconSvgLogs.empty();
|
||||
return res;
|
||||
};
|
||||
|
||||
@@ -198,7 +218,7 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
() => self.saveSettings()
|
||||
);
|
||||
const remoteRsp = await client.listFromRemote();
|
||||
log.debug(remoteRsp);
|
||||
// log.debug(remoteRsp);
|
||||
|
||||
getNotice(
|
||||
t("syncrun_step3", {
|
||||
@@ -263,23 +283,23 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
})
|
||||
);
|
||||
this.syncStatus = "generating_plan";
|
||||
const { plan, sortedKeys, deletions } = await getSyncPlan(
|
||||
const { plan, sortedKeys, deletions, sizesGoWrong } = await getSyncPlan(
|
||||
remoteStates,
|
||||
local,
|
||||
localConfigDirContents,
|
||||
origMetadataOnRemote.deletions,
|
||||
localHistory,
|
||||
client.serviceType,
|
||||
triggerSource,
|
||||
this.app.vault,
|
||||
this.settings.syncConfigDir,
|
||||
this.app.vault.configDir,
|
||||
this.settings.syncUnderscoreItems,
|
||||
this.settings.skipSizeLargerThan,
|
||||
this.settings.password
|
||||
);
|
||||
log.info(plan.mixedStates); // for debugging
|
||||
if (triggerSource !== "dry") {
|
||||
await insertSyncPlanRecordByVault(this.db, plan, this.vaultRandomID);
|
||||
}
|
||||
await insertSyncPlanRecordByVault(this.db, plan, this.vaultRandomID);
|
||||
|
||||
// The operations above are almost read only and kind of safe.
|
||||
// The operations below begins to write or delete (!!!) something.
|
||||
@@ -301,10 +321,20 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
sortedKeys,
|
||||
metadataFile,
|
||||
origMetadataOnRemote,
|
||||
sizesGoWrong,
|
||||
deletions,
|
||||
(key: string) => self.trash(key),
|
||||
this.settings.password,
|
||||
this.settings.concurrency,
|
||||
(ss: FileOrFolderMixedState[]) => {
|
||||
new SizesConflictModal(
|
||||
self.app,
|
||||
self,
|
||||
this.settings.skipSizeLargerThan,
|
||||
ss,
|
||||
this.settings.password !== ""
|
||||
).open();
|
||||
},
|
||||
(i: number, totalCount: number, pathName: string, decision: string) =>
|
||||
self.setCurrSyncMsg(i, totalCount, pathName, decision)
|
||||
);
|
||||
@@ -342,10 +372,16 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
triggerSource: triggerSource,
|
||||
syncStatus: this.syncStatus,
|
||||
});
|
||||
log.info(msg);
|
||||
log.info(error);
|
||||
log.error(msg);
|
||||
log.error(error);
|
||||
getNotice(msg, 10 * 1000);
|
||||
getNotice(error.message, 10 * 1000);
|
||||
if (error instanceof AggregateError) {
|
||||
for (const e of error.errors) {
|
||||
getNotice(e.message, 10 * 1000);
|
||||
}
|
||||
} else {
|
||||
getNotice(error.message, 10 * 1000);
|
||||
}
|
||||
this.syncStatus = "idle";
|
||||
if (this.syncRibbon !== undefined) {
|
||||
setIcon(this.syncRibbon, iconNameSyncWait);
|
||||
@@ -357,10 +393,11 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
async onload() {
|
||||
log.info(`loading plugin ${this.manifest.id}`);
|
||||
|
||||
const { iconSvgSyncWait, iconSvgSyncRunning } = getIconSvg();
|
||||
const { iconSvgSyncWait, iconSvgSyncRunning, iconSvgLogs } = getIconSvg();
|
||||
|
||||
addIcon(iconNameSyncWait, iconSvgSyncWait);
|
||||
addIcon(iconNameSyncRunning, iconSvgSyncRunning);
|
||||
addIcon(iconNameLogs, iconSvgLogs);
|
||||
|
||||
this.oauth2Info = {
|
||||
verifier: "",
|
||||
@@ -373,6 +410,7 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
this.currSyncMsg = "";
|
||||
|
||||
await this.loadSettings();
|
||||
await this.checkIfPresetRulesFollowed();
|
||||
|
||||
// lang should be load early, but after settings
|
||||
this.i18n = new I18n(this.settings.lang, async (lang: LangTypeAndAuto) => {
|
||||
@@ -410,6 +448,13 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
throw err;
|
||||
}
|
||||
|
||||
// must AFTER preparing DB
|
||||
this.addOutputToDBIfSet();
|
||||
this.enableAutoClearOutputToDBHistIfSet();
|
||||
|
||||
// must AFTER preparing DB
|
||||
this.enableAutoClearSyncPlanHist();
|
||||
|
||||
this.syncStatus = "idle";
|
||||
|
||||
this.registerEvent(
|
||||
@@ -644,6 +689,50 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
},
|
||||
});
|
||||
|
||||
this.addCommand({
|
||||
id: "export-sync-plans-json",
|
||||
name: t("command_exportsyncplans_json"),
|
||||
icon: iconNameLogs,
|
||||
callback: async () => {
|
||||
await exportVaultSyncPlansToFiles(
|
||||
this.db,
|
||||
this.app.vault,
|
||||
this.vaultRandomID,
|
||||
"json"
|
||||
);
|
||||
new Notice(t("settings_syncplans_notice"));
|
||||
},
|
||||
});
|
||||
|
||||
this.addCommand({
|
||||
id: "export-sync-plans-table",
|
||||
name: t("command_exportsyncplans_table"),
|
||||
icon: iconNameLogs,
|
||||
callback: async () => {
|
||||
await exportVaultSyncPlansToFiles(
|
||||
this.db,
|
||||
this.app.vault,
|
||||
this.vaultRandomID,
|
||||
"table"
|
||||
);
|
||||
new Notice(t("settings_syncplans_notice"));
|
||||
},
|
||||
});
|
||||
|
||||
this.addCommand({
|
||||
id: "export-logs-in-db",
|
||||
name: t("command_exportlogsindb"),
|
||||
icon: iconNameLogs,
|
||||
callback: async () => {
|
||||
await exportVaultLoggerOutputToFiles(
|
||||
this.db,
|
||||
this.app.vault,
|
||||
this.vaultRandomID
|
||||
);
|
||||
new Notice(t("settings_logtodbexport_notice"));
|
||||
},
|
||||
});
|
||||
|
||||
this.addSettingTab(new RemotelySaveSettingTab(this.app, this));
|
||||
|
||||
// this.registerDomEvent(document, "click", (evt: MouseEvent) => {
|
||||
@@ -706,6 +795,13 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
}
|
||||
}
|
||||
|
||||
async checkIfPresetRulesFollowed() {
|
||||
const res = applyPresetRulesInplace(this.settings);
|
||||
if (res.changed) {
|
||||
await this.saveSettings();
|
||||
}
|
||||
}
|
||||
|
||||
async saveSettings() {
|
||||
await this.saveData(normalConfigToMessy(this.settings));
|
||||
}
|
||||
@@ -869,6 +965,13 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
this.currSyncMsg = msg;
|
||||
}
|
||||
|
||||
/**
|
||||
* Because data.json contains sensitive information,
|
||||
* We usually want to ignore it in the version control.
|
||||
* However, if there's already a an ignore file (even empty),
|
||||
* we respect the existing configure and not add any modifications.
|
||||
* @returns
|
||||
*/
|
||||
async tryToAddIgnoreFile() {
|
||||
const pluginConfigDir =
|
||||
this.manifest.dir ||
|
||||
@@ -886,15 +989,7 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
const contentText = "data.json\n";
|
||||
|
||||
try {
|
||||
if (ignoreFileExists) {
|
||||
// check empty, if empty, we can write it
|
||||
// if not empty, we do nothing
|
||||
const content = (await this.app.vault.adapter.read(ignoreFile)).trim();
|
||||
if (content === "") {
|
||||
// no need to await writing
|
||||
this.app.vault.adapter.write(ignoreFile, contentText);
|
||||
}
|
||||
} else {
|
||||
if (!ignoreFileExists) {
|
||||
// not exists, directly create
|
||||
// no need to await
|
||||
this.app.vault.adapter.write(ignoreFile, contentText);
|
||||
@@ -903,4 +998,52 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
// just skip
|
||||
}
|
||||
}
|
||||
|
||||
addOutputToDBIfSet() {
|
||||
if (this.settings.logToDB) {
|
||||
applyLogWriterInplace((...msg: any[]) => {
|
||||
insertLoggerOutputByVault(this.db, this.vaultRandomID, ...msg);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
enableAutoClearOutputToDBHistIfSet() {
|
||||
const initClearOutputToDBHistAfterMilliseconds = 1000 * 45;
|
||||
const autoClearOutputToDBHistAfterMilliseconds = 1000 * 60 * 5;
|
||||
|
||||
this.app.workspace.onLayoutReady(() => {
|
||||
// init run
|
||||
window.setTimeout(() => {
|
||||
if (this.settings.logToDB) {
|
||||
clearExpiredLoggerOutputRecords(this.db);
|
||||
}
|
||||
}, initClearOutputToDBHistAfterMilliseconds);
|
||||
|
||||
// scheduled run
|
||||
const intervalID = window.setInterval(() => {
|
||||
if (this.settings.logToDB) {
|
||||
clearExpiredLoggerOutputRecords(this.db);
|
||||
}
|
||||
}, autoClearOutputToDBHistAfterMilliseconds);
|
||||
this.registerInterval(intervalID);
|
||||
});
|
||||
}
|
||||
|
||||
enableAutoClearSyncPlanHist() {
|
||||
const initClearSyncPlanHistAfterMilliseconds = 1000 * 45;
|
||||
const autoClearSyncPlanHistAfterMilliseconds = 1000 * 60 * 5;
|
||||
|
||||
this.app.workspace.onLayoutReady(() => {
|
||||
// init run
|
||||
window.setTimeout(() => {
|
||||
clearExpiredSyncPlanRecords(this.db);
|
||||
}, initClearSyncPlanHistAfterMilliseconds);
|
||||
|
||||
// scheduled run
|
||||
const intervalID = window.setInterval(() => {
|
||||
clearExpiredSyncPlanRecords(this.db);
|
||||
}, autoClearSyncPlanHistAfterMilliseconds);
|
||||
this.registerInterval(intervalID);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
+34
-8
@@ -1,6 +1,7 @@
|
||||
import isEqual from "lodash/isEqual";
|
||||
import { base64url } from "rfc4648";
|
||||
import { reverseString } from "./misc";
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
const DEFAULT_README_FOR_METADATAONREMOTE =
|
||||
"Do NOT edit or delete the file manually. This file is for the plugin remotely-save to store some necessary meta data on the remote services. Its content is slightly obfuscated.";
|
||||
@@ -69,19 +70,44 @@ export const deserializeMetadataOnRemote = (x: string | ArrayBuffer) => {
|
||||
} else {
|
||||
y1 = new TextDecoder().decode(x);
|
||||
}
|
||||
const y2: any = JSON.parse(y1);
|
||||
|
||||
if (!("readme" in y2 && "d" in y2)) {
|
||||
throw Error("invalid remote meta data file!");
|
||||
let y2: any;
|
||||
try {
|
||||
y2 = JSON.parse(y1);
|
||||
} catch (e) {
|
||||
throw new Error(
|
||||
`invalid remote meta data file with first few chars: ${y1.slice(0, 5)}`
|
||||
);
|
||||
}
|
||||
|
||||
const y3 = JSON.parse(
|
||||
(
|
||||
if (!("readme" in y2 && "d" in y2)) {
|
||||
throw new Error(
|
||||
'invalid remote meta data file (no "readme" or "d" fields)!'
|
||||
);
|
||||
}
|
||||
|
||||
let y3: string;
|
||||
try {
|
||||
y3 = (
|
||||
base64url.parse(reverseString(y2["d"]), {
|
||||
out: Buffer.allocUnsafe as any,
|
||||
loose: true,
|
||||
}) as Buffer
|
||||
).toString("utf-8")
|
||||
) as MetadataOnRemote;
|
||||
return y3;
|
||||
).toString("utf-8");
|
||||
} catch (e) {
|
||||
throw new Error('invalid remote meta data file (invalid "d" field)!');
|
||||
}
|
||||
|
||||
let y4: MetadataOnRemote;
|
||||
try {
|
||||
y4 = JSON.parse(y3) as MetadataOnRemote;
|
||||
} catch (e) {
|
||||
throw new Error(
|
||||
`invalid remote meta data file with \"d\" field with first few chars: ${y3.slice(
|
||||
0,
|
||||
5
|
||||
)}`
|
||||
);
|
||||
}
|
||||
return y4;
|
||||
};
|
||||
|
||||
+107
-2
@@ -3,9 +3,15 @@ import * as path from "path";
|
||||
|
||||
import { base32, base64url } from "rfc4648";
|
||||
import XRegExp from "xregexp";
|
||||
import emojiRegex from "emoji-regex";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
declare global {
|
||||
interface Window {
|
||||
moment: (...data: any) => any;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* If any part of the file starts with '.' or '_' then it's a hidden file.
|
||||
@@ -157,6 +163,34 @@ export const isVaildText = (a: string) => {
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
* Use regex to detect a text contains emoji or not.
|
||||
* @param a
|
||||
* @returns
|
||||
*/
|
||||
export const hasEmojiInText = (a: string) => {
|
||||
const regex = emojiRegex();
|
||||
return regex.test(a);
|
||||
};
|
||||
|
||||
/**
|
||||
* Convert the headers to a normal object.
|
||||
* @param h
|
||||
* @param toLower
|
||||
* @returns
|
||||
*/
|
||||
export const headersToRecord = (h: Headers, toLower: boolean = true) => {
|
||||
const res: Record<string, string> = {};
|
||||
h.forEach((v, k) => {
|
||||
if (toLower) {
|
||||
res[k.toLowerCase()] = v;
|
||||
} else {
|
||||
res[k] = v;
|
||||
}
|
||||
});
|
||||
return res;
|
||||
};
|
||||
|
||||
/**
|
||||
* If input is already a folder, returns it as is;
|
||||
* And if input is a file, returns its direname.
|
||||
@@ -303,3 +337,74 @@ export const atWhichLevel = (x: string) => {
|
||||
export const checkHasSpecialCharForDir = (x: string) => {
|
||||
return /[?/\\]/.test(x);
|
||||
};
|
||||
|
||||
export const unixTimeToStr = (x: number | undefined | null) => {
|
||||
if (x === undefined) {
|
||||
return undefined;
|
||||
}
|
||||
if (x === null) {
|
||||
return null;
|
||||
}
|
||||
return window.moment(x).format() as string;
|
||||
};
|
||||
|
||||
/**
|
||||
* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Cyclic_object_value#examples
|
||||
* @returns
|
||||
*/
|
||||
const getCircularReplacer = () => {
|
||||
const seen = new WeakSet();
|
||||
return (key: any, value: any) => {
|
||||
if (typeof value === "object" && value !== null) {
|
||||
if (seen.has(value)) {
|
||||
return;
|
||||
}
|
||||
seen.add(value);
|
||||
}
|
||||
return value;
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
* Convert "any" value to string.
|
||||
* @param x
|
||||
* @returns
|
||||
*/
|
||||
export const toText = (x: any) => {
|
||||
if (x === undefined || x === null) {
|
||||
return `${x}`;
|
||||
}
|
||||
if (typeof x === "string") {
|
||||
return x;
|
||||
}
|
||||
if (
|
||||
x instanceof String ||
|
||||
x instanceof Date ||
|
||||
typeof x === "number" ||
|
||||
typeof x === "bigint" ||
|
||||
typeof x === "boolean"
|
||||
) {
|
||||
return `${x}`;
|
||||
}
|
||||
|
||||
if (
|
||||
x instanceof Error ||
|
||||
(x &&
|
||||
x.stack &&
|
||||
x.message &&
|
||||
typeof x.stack === "string" &&
|
||||
typeof x.message === "string")
|
||||
) {
|
||||
return `ERROR! MESSAGE: ${x.message}, STACK: ${x.stack}`;
|
||||
}
|
||||
|
||||
try {
|
||||
const y = JSON.stringify(x, getCircularReplacer(), 2);
|
||||
if (y !== undefined) {
|
||||
return y;
|
||||
}
|
||||
throw new Error("not jsonable");
|
||||
} catch {
|
||||
return `${x}`;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
// It's very dangerous for this file to depend on other files in the same project.
|
||||
// We should avoid this situation as much as possible.
|
||||
|
||||
import { TAbstractFile, TFolder, TFile, Vault } from "obsidian";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
import type { LogLevelNumbers, Logger, LogLevel, LogLevelDesc } 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,
|
||||
logLevel: LogLevelNumbers,
|
||||
loggerName: string | symbol
|
||||
) {
|
||||
const rawMethod = originalFactory(methodName, logLevel, loggerName);
|
||||
|
||||
return function (...msg: any[]) {
|
||||
rawMethod.apply(undefined, msg);
|
||||
writer(...msg);
|
||||
};
|
||||
};
|
||||
|
||||
log2.setLevel(log2.getLevel());
|
||||
};
|
||||
|
||||
export const restoreLogWritterInplace = () => {
|
||||
log2.methodFactory = originalFactory;
|
||||
log2.setLevel(log2.getLevel());
|
||||
};
|
||||
|
||||
export const log = log2;
|
||||
@@ -3,9 +3,6 @@ import { Queue } from "@fyears/tsqueue";
|
||||
import chunk from "lodash/chunk";
|
||||
import flatten from "lodash/flatten";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
|
||||
export interface ObsConfigDirFileType {
|
||||
key: string;
|
||||
ctime: number;
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
import type {
|
||||
RemotelySavePluginSettings,
|
||||
WebdavConfig,
|
||||
WebdavDepthType,
|
||||
} from "./baseTypes";
|
||||
|
||||
const RULES = {
|
||||
webdav: {
|
||||
depth: [
|
||||
{
|
||||
url: "^https://(.+).teracloud.jp/.+",
|
||||
depth: "auto_1",
|
||||
manualRecursive: true,
|
||||
},
|
||||
{
|
||||
url: "^https://dav.jianguoyun.com/dav/",
|
||||
depth: "auto_1",
|
||||
manualRecursive: true,
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
|
||||
export const applyWebdavPresetRulesInplace = (
|
||||
webdav: Partial<WebdavConfig> | undefined
|
||||
) => {
|
||||
if (webdav === undefined) {
|
||||
return {
|
||||
changed: false,
|
||||
webdav: webdav,
|
||||
};
|
||||
}
|
||||
for (const { url, depth, manualRecursive } of RULES.webdav.depth) {
|
||||
if (
|
||||
webdav.address !== undefined &&
|
||||
new RegExp(url).test(webdav.address) &&
|
||||
webdav.depth !== undefined &&
|
||||
webdav.depth.startsWith("auto_") &&
|
||||
webdav.depth !== depth
|
||||
) {
|
||||
webdav.depth = depth as WebdavDepthType;
|
||||
webdav.manualRecursive = manualRecursive;
|
||||
return {
|
||||
changed: true,
|
||||
webdav: webdav,
|
||||
};
|
||||
}
|
||||
}
|
||||
return {
|
||||
changed: false,
|
||||
webdav: webdav,
|
||||
};
|
||||
};
|
||||
|
||||
export const applyPresetRulesInplace = (
|
||||
settings: RemotelySavePluginSettings | undefined
|
||||
) => {
|
||||
if (settings === undefined) {
|
||||
return {
|
||||
changed: false,
|
||||
settings: settings,
|
||||
};
|
||||
}
|
||||
const webdavRes = applyWebdavPresetRulesInplace(settings.webdav);
|
||||
return {
|
||||
changed: webdavRes.changed,
|
||||
settings: settings,
|
||||
};
|
||||
};
|
||||
+11
-10
@@ -11,12 +11,10 @@ import * as onedrive from "./remoteForOnedrive";
|
||||
import * as s3 from "./remoteForS3";
|
||||
import * as webdav from "./remoteForWebdav";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
export class RemoteClient {
|
||||
readonly serviceType: SUPPORTED_SERVICES_TYPE;
|
||||
readonly s3Client?: s3.S3Client;
|
||||
readonly s3Config?: S3Config;
|
||||
readonly webdavClient?: webdav.WrappedWebdavClient;
|
||||
readonly webdavConfig?: WebdavConfig;
|
||||
@@ -39,7 +37,6 @@ export class RemoteClient {
|
||||
// so we use a ref not copy of config here
|
||||
if (serviceType === "s3") {
|
||||
this.s3Config = s3Config;
|
||||
this.s3Client = s3.getS3Client(this.s3Config);
|
||||
} else if (serviceType === "webdav") {
|
||||
if (vaultName === undefined || saveUpdatedConfigFunc === undefined) {
|
||||
throw Error(
|
||||
@@ -87,7 +84,7 @@ export class RemoteClient {
|
||||
getRemoteMeta = async (fileOrFolderPath: string) => {
|
||||
if (this.serviceType === "s3") {
|
||||
return await s3.getRemoteMeta(
|
||||
this.s3Client,
|
||||
s3.getS3Client(this.s3Config),
|
||||
this.s3Config,
|
||||
fileOrFolderPath
|
||||
);
|
||||
@@ -117,7 +114,7 @@ export class RemoteClient {
|
||||
) => {
|
||||
if (this.serviceType === "s3") {
|
||||
return await s3.uploadToRemote(
|
||||
this.s3Client,
|
||||
s3.getS3Client(this.s3Config),
|
||||
this.s3Config,
|
||||
fileOrFolderPath,
|
||||
vault,
|
||||
@@ -169,7 +166,11 @@ export class RemoteClient {
|
||||
|
||||
listFromRemote = async (prefix?: string) => {
|
||||
if (this.serviceType === "s3") {
|
||||
return await s3.listFromRemote(this.s3Client, this.s3Config, prefix);
|
||||
return await s3.listFromRemote(
|
||||
s3.getS3Client(this.s3Config),
|
||||
this.s3Config,
|
||||
prefix
|
||||
);
|
||||
} else if (this.serviceType === "webdav") {
|
||||
return await webdav.listFromRemote(this.webdavClient, prefix);
|
||||
} else if (this.serviceType === "dropbox") {
|
||||
@@ -191,7 +192,7 @@ export class RemoteClient {
|
||||
) => {
|
||||
if (this.serviceType === "s3") {
|
||||
return await s3.downloadFromRemote(
|
||||
this.s3Client,
|
||||
s3.getS3Client(this.s3Config),
|
||||
this.s3Config,
|
||||
fileOrFolderPath,
|
||||
vault,
|
||||
@@ -242,7 +243,7 @@ export class RemoteClient {
|
||||
) => {
|
||||
if (this.serviceType === "s3") {
|
||||
return await s3.deleteFromRemote(
|
||||
this.s3Client,
|
||||
s3.getS3Client(this.s3Config),
|
||||
this.s3Config,
|
||||
fileOrFolderPath,
|
||||
password,
|
||||
@@ -277,7 +278,7 @@ export class RemoteClient {
|
||||
checkConnectivity = async (callbackFunc?: any) => {
|
||||
if (this.serviceType === "s3") {
|
||||
return await s3.checkConnectivity(
|
||||
this.s3Client,
|
||||
s3.getS3Client(this.s3Config),
|
||||
this.s3Config,
|
||||
callbackFunc
|
||||
);
|
||||
|
||||
+154
-32
@@ -1,4 +1,6 @@
|
||||
import { Dropbox, DropboxAuth, files } from "dropbox";
|
||||
import delay from "delay";
|
||||
import { Dropbox, DropboxAuth } from "dropbox";
|
||||
import type { files, DropboxResponseError, DropboxResponse } from "dropbox";
|
||||
import { Vault } from "obsidian";
|
||||
import * as path from "path";
|
||||
import {
|
||||
@@ -8,12 +10,17 @@ import {
|
||||
OAUTH2_FORCE_EXPIRE_MILLISECONDS,
|
||||
} from "./baseTypes";
|
||||
import { decryptArrayBuffer, encryptArrayBuffer } from "./encrypt";
|
||||
import { bufferToArrayBuffer, getFolderLevels, mkdirpInVault } from "./misc";
|
||||
import {
|
||||
bufferToArrayBuffer,
|
||||
getFolderLevels,
|
||||
hasEmojiInText,
|
||||
headersToRecord,
|
||||
mkdirpInVault,
|
||||
} from "./misc";
|
||||
|
||||
export { Dropbox } from "dropbox";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
export const DEFAULT_DROPBOX_CONFIG: DropboxConfig = {
|
||||
accessToken: "",
|
||||
@@ -271,6 +278,73 @@ export const setConfigBySuccessfullAuthInplace = async (
|
||||
// Other usual common methods
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
interface ErrSubType {
|
||||
error: {
|
||||
retry_after: number;
|
||||
};
|
||||
}
|
||||
|
||||
async function retryReq<T>(
|
||||
reqFunc: () => Promise<DropboxResponse<T>>,
|
||||
extraHint: string = ""
|
||||
): Promise<DropboxResponse<T>> {
|
||||
const waitSeconds = [1, 2, 4, 8]; // hard code exponential backoff
|
||||
for (let idx = 0; idx < waitSeconds.length; ++idx) {
|
||||
try {
|
||||
if (idx !== 0) {
|
||||
log.warn(
|
||||
`${extraHint === "" ? "" : extraHint + ": "}The ${
|
||||
idx + 1
|
||||
}-th try starts at time ${Date.now()}`
|
||||
);
|
||||
}
|
||||
return await reqFunc();
|
||||
} catch (e: unknown) {
|
||||
const err = e as DropboxResponseError<ErrSubType>;
|
||||
if (err.status === undefined) {
|
||||
// then the err is not DropboxResponseError
|
||||
throw err;
|
||||
}
|
||||
if (err.status !== 429) {
|
||||
// then the err is not "too many requests", give up
|
||||
throw err;
|
||||
}
|
||||
|
||||
if (idx === waitSeconds.length - 1) {
|
||||
// the last retry also failed, give up
|
||||
throw new Error(
|
||||
`${
|
||||
extraHint === "" ? "" : extraHint + ": "
|
||||
}"429 too many requests", after retrying for ${
|
||||
idx + 1
|
||||
} times still failed.`
|
||||
);
|
||||
}
|
||||
|
||||
const headers = headersToRecord(err.headers);
|
||||
const svrSec =
|
||||
err.error.error.retry_after ||
|
||||
parseInt(headers["retry-after"] || "1") ||
|
||||
1;
|
||||
const fallbackSec = waitSeconds[idx];
|
||||
const secMin = Math.max(svrSec, fallbackSec);
|
||||
const secMax = Math.max(secMin * 1.8, 2);
|
||||
log.warn(
|
||||
`${
|
||||
extraHint === "" ? "" : extraHint + ": "
|
||||
}We have "429 too many requests" error of ${
|
||||
idx + 1
|
||||
}-th try, at time ${Date.now()}, and wait for ${secMin} ~ ${secMax} seconds to retry. Original info: ${JSON.stringify(
|
||||
err.error,
|
||||
null,
|
||||
2
|
||||
)}`
|
||||
);
|
||||
await delay.range(secMin * 1000, secMax * 1000);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export class WrappedDropboxClient {
|
||||
dropboxConfig: DropboxConfig;
|
||||
remoteBaseDir: string;
|
||||
@@ -297,9 +371,13 @@ export class WrappedDropboxClient {
|
||||
throw Error("The user has not manually auth yet.");
|
||||
}
|
||||
const currentTs = Date.now();
|
||||
const customHeaders = {
|
||||
"Cache-Control": "no-cache",
|
||||
};
|
||||
if (this.dropboxConfig.accessTokenExpiresAtTime > currentTs) {
|
||||
this.dropbox = new Dropbox({
|
||||
accessToken: this.dropboxConfig.accessToken,
|
||||
customHeaders: customHeaders,
|
||||
});
|
||||
} else {
|
||||
if (this.dropboxConfig.refreshToken === "") {
|
||||
@@ -319,6 +397,7 @@ export class WrappedDropboxClient {
|
||||
);
|
||||
this.dropbox = new Dropbox({
|
||||
accessToken: this.dropboxConfig.accessToken,
|
||||
customHeaders: customHeaders,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -339,6 +418,13 @@ export class WrappedDropboxClient {
|
||||
}
|
||||
if (!this.vaultFolderExists) {
|
||||
log.info(`remote does not have folder /${this.remoteBaseDir}`);
|
||||
|
||||
if (hasEmojiInText(`/${this.remoteBaseDir}`)) {
|
||||
throw new Error(
|
||||
`/${this.remoteBaseDir}: Error: Dropbox does not support emoji in folder names.`
|
||||
);
|
||||
}
|
||||
|
||||
await this.dropbox.filesCreateFolderV2({
|
||||
path: `/${this.remoteBaseDir}`,
|
||||
});
|
||||
@@ -378,10 +464,12 @@ export const getRemoteMeta = async (
|
||||
// filesGetMetadata doesn't support root folder
|
||||
// we instead try to list files
|
||||
// if no error occurs, we ensemble a fake result.
|
||||
const rsp = await client.dropbox.filesListFolder({
|
||||
path: `/${client.remoteBaseDir}`,
|
||||
recursive: false, // don't need to recursive here
|
||||
});
|
||||
const rsp = await retryReq(() =>
|
||||
client.dropbox.filesListFolder({
|
||||
path: `/${client.remoteBaseDir}`,
|
||||
recursive: false, // don't need to recursive here
|
||||
})
|
||||
);
|
||||
if (rsp.status !== 200) {
|
||||
throw Error(JSON.stringify(rsp));
|
||||
}
|
||||
@@ -396,9 +484,11 @@ export const getRemoteMeta = async (
|
||||
|
||||
const key = getDropboxPath(fileOrFolderPath, client.remoteBaseDir);
|
||||
|
||||
const rsp = await client.dropbox.filesGetMetadata({
|
||||
path: key,
|
||||
});
|
||||
const rsp = await retryReq(() =>
|
||||
client.dropbox.filesGetMetadata({
|
||||
path: key,
|
||||
})
|
||||
);
|
||||
if (rsp.status !== 200) {
|
||||
throw Error(JSON.stringify(rsp));
|
||||
}
|
||||
@@ -424,6 +514,12 @@ export const uploadToRemote = async (
|
||||
}
|
||||
uploadFile = getDropboxPath(uploadFile, client.remoteBaseDir);
|
||||
|
||||
if (hasEmojiInText(uploadFile)) {
|
||||
throw new Error(
|
||||
`${uploadFile}: Error: Dropbox does not support emoji in file / folder names.`
|
||||
);
|
||||
}
|
||||
|
||||
const isFolder = fileOrFolderPath.endsWith("/");
|
||||
|
||||
if (isFolder && isRecursively) {
|
||||
@@ -439,11 +535,19 @@ export const uploadToRemote = async (
|
||||
// created, pass
|
||||
} else {
|
||||
try {
|
||||
await client.dropbox.filesCreateFolderV2({
|
||||
path: uploadFile,
|
||||
});
|
||||
await retryReq(
|
||||
() =>
|
||||
client.dropbox.filesCreateFolderV2({
|
||||
path: uploadFile,
|
||||
}),
|
||||
fileOrFolderPath
|
||||
);
|
||||
foldersCreatedBefore?.add(uploadFile);
|
||||
} catch (err) {
|
||||
} catch (e: unknown) {
|
||||
const err = e as DropboxResponseError<files.CreateFolderError>;
|
||||
if (err.status === undefined) {
|
||||
throw err;
|
||||
}
|
||||
if (err.status === 409) {
|
||||
// pass
|
||||
foldersCreatedBefore?.add(uploadFile);
|
||||
@@ -456,10 +560,14 @@ export const uploadToRemote = async (
|
||||
return res;
|
||||
} else {
|
||||
// if encrypted, upload a fake file with the encrypted file name
|
||||
await client.dropbox.filesUpload({
|
||||
path: uploadFile,
|
||||
contents: "",
|
||||
});
|
||||
await retryReq(
|
||||
() =>
|
||||
client.dropbox.filesUpload({
|
||||
path: uploadFile,
|
||||
contents: "",
|
||||
}),
|
||||
fileOrFolderPath
|
||||
);
|
||||
return await getRemoteMeta(client, uploadFile);
|
||||
}
|
||||
} else {
|
||||
@@ -481,13 +589,19 @@ export const uploadToRemote = async (
|
||||
}
|
||||
// in dropbox, we don't need to create folders before uploading! cool!
|
||||
// TODO: filesUploadSession for larger files (>=150 MB)
|
||||
await client.dropbox.filesUpload({
|
||||
path: uploadFile,
|
||||
contents: remoteContent,
|
||||
mode: {
|
||||
".tag": "overwrite",
|
||||
},
|
||||
});
|
||||
|
||||
await retryReq(
|
||||
() =>
|
||||
client.dropbox.filesUpload({
|
||||
path: uploadFile,
|
||||
contents: remoteContent,
|
||||
mode: {
|
||||
".tag": "overwrite",
|
||||
},
|
||||
}),
|
||||
fileOrFolderPath
|
||||
);
|
||||
|
||||
// we want to mark that parent folders are created
|
||||
if (foldersCreatedBefore !== undefined) {
|
||||
const dirs = getFolderLevels(uploadFile).map((x) =>
|
||||
@@ -555,9 +669,13 @@ const downloadFromRemoteRaw = async (
|
||||
) => {
|
||||
await client.init();
|
||||
const key = getDropboxPath(fileOrFolderPath, client.remoteBaseDir);
|
||||
const rsp = await client.dropbox.filesDownload({
|
||||
path: key,
|
||||
});
|
||||
const rsp = await retryReq(
|
||||
() =>
|
||||
client.dropbox.filesDownload({
|
||||
path: key,
|
||||
}),
|
||||
fileOrFolderPath
|
||||
);
|
||||
if ((rsp.result as any).fileBlob !== undefined) {
|
||||
// we get a Blob
|
||||
const content = (rsp.result as any).fileBlob as Blob;
|
||||
@@ -632,9 +750,13 @@ export const deleteFromRemote = async (
|
||||
|
||||
await client.init();
|
||||
try {
|
||||
await client.dropbox.filesDeleteV2({
|
||||
path: remoteFileName,
|
||||
});
|
||||
await retryReq(
|
||||
() =>
|
||||
client.dropbox.filesDeleteV2({
|
||||
path: remoteFileName,
|
||||
}),
|
||||
fileOrFolderPath
|
||||
);
|
||||
} catch (err) {
|
||||
console.error("some error while deleting");
|
||||
console.error(err);
|
||||
|
||||
+19
-10
@@ -6,10 +6,9 @@ import type {
|
||||
User,
|
||||
} from "@microsoft/microsoft-graph-types";
|
||||
import cloneDeep from "lodash/cloneDeep";
|
||||
import * as origLog from "loglevel";
|
||||
import { request, requestUrl, requireApiVersion, Vault } from "obsidian";
|
||||
import {
|
||||
API_VER_REQURL,
|
||||
VALID_REQURL,
|
||||
COMMAND_CALLBACK_ONEDRIVE,
|
||||
DEFAULT_CONTENT_TYPE,
|
||||
OAUTH2_FORCE_EXPIRE_MILLISECONDS,
|
||||
@@ -24,7 +23,7 @@ import {
|
||||
mkdirpInVault,
|
||||
} from "./misc";
|
||||
|
||||
const log = origLog.getLogger("rs-default");
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
const SCOPES = ["User.Read", "Files.ReadWrite.AppFolder", "offline_access"];
|
||||
const REDIRECT_URI = `obsidian://${COMMAND_CALLBACK_ONEDRIVE}`;
|
||||
@@ -401,7 +400,7 @@ export class WrappedOnedriveClient {
|
||||
// log.info(`already checked, /${this.remoteBaseDir} exist before`)
|
||||
} else {
|
||||
const k = await this.getJson("/drive/special/approot/children");
|
||||
log.debug(k);
|
||||
// log.debug(k);
|
||||
this.vaultFolderExists =
|
||||
(k.value as DriveItem[]).filter((x) => x.name === this.remoteBaseDir)
|
||||
.length > 0;
|
||||
@@ -445,6 +444,7 @@ export class WrappedOnedriveClient {
|
||||
contentType: "application/json",
|
||||
headers: {
|
||||
Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
|
||||
"Cache-Control": "no-cache",
|
||||
},
|
||||
})
|
||||
);
|
||||
@@ -485,7 +485,7 @@ export class WrappedOnedriveClient {
|
||||
deleteJson = async (pathFragOrig: string) => {
|
||||
const theUrl = this.buildUrl(pathFragOrig);
|
||||
log.debug(`deleteJson, theUrl=${theUrl}`);
|
||||
if (requireApiVersion(API_VER_REQURL)) {
|
||||
if (VALID_REQURL) {
|
||||
await requestUrl({
|
||||
url: theUrl,
|
||||
method: "DELETE",
|
||||
@@ -509,7 +509,7 @@ export class WrappedOnedriveClient {
|
||||
// TODO:
|
||||
// 20220401: On Android, requestUrl has issue that text becomes base64.
|
||||
// Use fetch everywhere instead!
|
||||
if (false /*requireApiVersion(API_VER_REQURL)*/) {
|
||||
if (false /*VALID_REQURL*/) {
|
||||
await requestUrl({
|
||||
url: theUrl,
|
||||
method: "PUT",
|
||||
@@ -557,7 +557,7 @@ export class WrappedOnedriveClient {
|
||||
// TODO:
|
||||
// 20220401: On Android, requestUrl has issue that text becomes base64.
|
||||
// Use fetch everywhere instead!
|
||||
if (false /*requireApiVersion(API_VER_REQURL)*/) {
|
||||
if (false /*VALID_REQURL*/) {
|
||||
const res = await requestUrl({
|
||||
url: theUrl,
|
||||
method: "PUT",
|
||||
@@ -566,6 +566,7 @@ export class WrappedOnedriveClient {
|
||||
headers: {
|
||||
// no "Content-Length" allowed here
|
||||
"Content-Range": `bytes ${rangeStart}-${rangeEnd - 1}/${size}`,
|
||||
/* "Cache-Control": "no-cache", not allowed here!!! */
|
||||
},
|
||||
});
|
||||
return res.json as DriveItem | UploadSession;
|
||||
@@ -577,6 +578,7 @@ export class WrappedOnedriveClient {
|
||||
"Content-Length": `${rangeEnd - rangeStart}`,
|
||||
"Content-Range": `bytes ${rangeStart}-${rangeEnd - 1}/${size}`,
|
||||
"Content-Type": DEFAULT_CONTENT_TYPE,
|
||||
/* "Cache-Control": "no-cache", not allowed here!!! */
|
||||
},
|
||||
});
|
||||
return (await res.json()) as DriveItem | UploadSession;
|
||||
@@ -618,6 +620,7 @@ export const listFromRemote = async (
|
||||
`/drive/special/approot:/${client.remoteBaseDir}:/delta`
|
||||
);
|
||||
let driveItems = res.value as DriveItem[];
|
||||
// log.debug(driveItems);
|
||||
|
||||
while (NEXT_LINK_KEY in res) {
|
||||
res = await client.getJson(res[NEXT_LINK_KEY]);
|
||||
@@ -808,11 +811,17 @@ const downloadFromRemoteRaw = async (
|
||||
`${key}?$select=@microsoft.graph.downloadUrl`
|
||||
);
|
||||
const downloadUrl: string = rsp["@microsoft.graph.downloadUrl"];
|
||||
if (requireApiVersion(API_VER_REQURL)) {
|
||||
const content = (await requestUrl({ url: downloadUrl })).arrayBuffer;
|
||||
if (VALID_REQURL) {
|
||||
const content = (
|
||||
await requestUrl({
|
||||
url: downloadUrl,
|
||||
headers: { "Cache-Control": "no-cache" },
|
||||
})
|
||||
).arrayBuffer;
|
||||
return content;
|
||||
} else {
|
||||
const content = await (await fetch(downloadUrl)).arrayBuffer();
|
||||
const content = await // cannot set no-cache here, will have cors error
|
||||
(await fetch(downloadUrl)).arrayBuffer();
|
||||
return content;
|
||||
}
|
||||
};
|
||||
|
||||
+44
-13
@@ -24,6 +24,7 @@ import { Buffer } from "buffer";
|
||||
import * as mime from "mime-types";
|
||||
import { Vault, requestUrl, RequestUrlParam } from "obsidian";
|
||||
import { Readable } from "stream";
|
||||
import AggregateError from "aggregate-error";
|
||||
import {
|
||||
DEFAULT_CONTENT_TYPE,
|
||||
RemoteItem,
|
||||
@@ -39,8 +40,7 @@ import {
|
||||
|
||||
export { S3Client } from "@aws-sdk/client-s3";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// special handler using Obsidian requestUrl
|
||||
@@ -84,11 +84,14 @@ class ObsHttpHandler extends FetchHttpHandler {
|
||||
const body =
|
||||
method === "GET" || method === "HEAD" ? undefined : request.body;
|
||||
|
||||
const transformedHeaders = { ...request.headers };
|
||||
delete transformedHeaders["host"];
|
||||
delete transformedHeaders["Host"];
|
||||
delete transformedHeaders["content-length"];
|
||||
delete transformedHeaders["Content-Length"];
|
||||
const transformedHeaders: Record<string, string> = {};
|
||||
for (const key of Object.keys(request.headers)) {
|
||||
const keyLower = key.toLowerCase();
|
||||
if (keyLower === "host" || keyLower === "content-length") {
|
||||
continue;
|
||||
}
|
||||
transformedHeaders[keyLower] = request.headers[key];
|
||||
}
|
||||
|
||||
let contentType: string = undefined;
|
||||
if (transformedHeaders["content-type"] !== undefined) {
|
||||
@@ -110,6 +113,11 @@ class ObsHttpHandler extends FetchHttpHandler {
|
||||
|
||||
const raceOfPromises = [
|
||||
requestUrl(param).then((rsp) => {
|
||||
const headers = rsp.headers;
|
||||
const headersLower: Record<string, string> = {};
|
||||
for (const key of Object.keys(headers)) {
|
||||
headersLower[key.toLowerCase()] = headers[key];
|
||||
}
|
||||
const stream = new ReadableStream<Uint8Array>({
|
||||
start(controller) {
|
||||
controller.enqueue(new Uint8Array(rsp.arrayBuffer));
|
||||
@@ -118,7 +126,7 @@ class ObsHttpHandler extends FetchHttpHandler {
|
||||
});
|
||||
return {
|
||||
response: new HttpResponse({
|
||||
headers: rsp.headers,
|
||||
headers: headersLower,
|
||||
statusCode: rsp.status,
|
||||
body: stream,
|
||||
}),
|
||||
@@ -188,8 +196,10 @@ export const getS3Client = (s3Config: S3Config) => {
|
||||
endpoint = `https://${endpoint}`;
|
||||
}
|
||||
|
||||
let s3Client: S3Client;
|
||||
|
||||
if (VALID_REQURL && s3Config.bypassCorsLocally) {
|
||||
const s3Client = new S3Client({
|
||||
s3Client = new S3Client({
|
||||
region: s3Config.s3Region,
|
||||
endpoint: endpoint,
|
||||
forcePathStyle: s3Config.forcePathStyle,
|
||||
@@ -199,9 +209,8 @@ export const getS3Client = (s3Config: S3Config) => {
|
||||
},
|
||||
requestHandler: new ObsHttpHandler(),
|
||||
});
|
||||
return s3Client;
|
||||
} else {
|
||||
const s3Client = new S3Client({
|
||||
s3Client = new S3Client({
|
||||
region: s3Config.s3Region,
|
||||
endpoint: endpoint,
|
||||
forcePathStyle: s3Config.forcePathStyle,
|
||||
@@ -210,8 +219,19 @@ export const getS3Client = (s3Config: S3Config) => {
|
||||
secretAccessKey: s3Config.s3SecretAccessKey,
|
||||
},
|
||||
});
|
||||
return s3Client;
|
||||
}
|
||||
|
||||
s3Client.middlewareStack.add(
|
||||
(next, context) => (args) => {
|
||||
(args.request as any).headers["cache-control"] = "no-cache";
|
||||
return next(args);
|
||||
},
|
||||
{
|
||||
step: "build",
|
||||
}
|
||||
);
|
||||
|
||||
return s3Client;
|
||||
};
|
||||
|
||||
export const getRemoteMeta = async (
|
||||
@@ -518,8 +538,19 @@ export const checkConnectivity = async (
|
||||
} catch (err) {
|
||||
log.debug(err);
|
||||
if (callbackFunc !== undefined) {
|
||||
callbackFunc(err);
|
||||
if (s3Config.s3Endpoint.contains(s3Config.s3BucketName)) {
|
||||
const err2 = new AggregateError([
|
||||
err,
|
||||
new Error(
|
||||
"Maybe you've included the bucket name inside the endpoint setting. Please remove the bucket name and try again."
|
||||
),
|
||||
]);
|
||||
callbackFunc(err2);
|
||||
} else {
|
||||
callbackFunc(err);
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -9,8 +9,7 @@ import { RemoteItem, VALID_REQURL, WebdavConfig } from "./baseTypes";
|
||||
import { decryptArrayBuffer, encryptArrayBuffer } from "./encrypt";
|
||||
import { bufferToArrayBuffer, getPathFolder, mkdirpInVault } from "./misc";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
import type {
|
||||
FileStat,
|
||||
@@ -184,6 +183,9 @@ export class WrappedWebdavClient {
|
||||
|
||||
init = async () => {
|
||||
// init client if not inited
|
||||
const headers = {
|
||||
"Cache-Control": "no-cache",
|
||||
};
|
||||
if (this.client === undefined) {
|
||||
if (
|
||||
this.webdavConfig.username !== "" &&
|
||||
@@ -192,6 +194,7 @@ export class WrappedWebdavClient {
|
||||
this.client = createClient(this.webdavConfig.address, {
|
||||
username: this.webdavConfig.username,
|
||||
password: this.webdavConfig.password,
|
||||
headers: headers,
|
||||
authType:
|
||||
this.webdavConfig.authType === "digest"
|
||||
? AuthType.Digest
|
||||
@@ -199,7 +202,9 @@ export class WrappedWebdavClient {
|
||||
});
|
||||
} else {
|
||||
log.info("no password");
|
||||
this.client = createClient(this.webdavConfig.address);
|
||||
this.client = createClient(this.webdavConfig.address, {
|
||||
headers: headers,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+301
-167
@@ -7,20 +7,29 @@ import {
|
||||
Platform,
|
||||
requireApiVersion,
|
||||
} from "obsidian";
|
||||
import type { TextComponent } from "obsidian";
|
||||
import { createElement, Eye, EyeOff } from "lucide";
|
||||
import {
|
||||
API_VER_REQURL,
|
||||
DEFAULT_DEBUG_FOLDER,
|
||||
SUPPORTED_SERVICES_TYPE,
|
||||
SUPPORTED_SERVICES_TYPE_WITH_REMOTE_BASE_DIR,
|
||||
VALID_REQURL,
|
||||
WebdavAuthType,
|
||||
WebdavDepthType,
|
||||
} from "./baseTypes";
|
||||
import { exportVaultSyncPlansToFiles } from "./debugMode";
|
||||
import {
|
||||
exportVaultSyncPlansToFiles,
|
||||
exportVaultLoggerOutputToFiles,
|
||||
} from "./debugMode";
|
||||
import { exportQrCodeUri } from "./importExport";
|
||||
import {
|
||||
clearAllSyncMetaMapping,
|
||||
clearAllSyncPlanRecords,
|
||||
destroyDBs,
|
||||
clearAllLoggerOutputRecords,
|
||||
insertLoggerOutputByVault,
|
||||
clearExpiredLoggerOutputRecords,
|
||||
} from "./localdb";
|
||||
import type RemotelySavePlugin from "./main"; // unavoidable
|
||||
import { RemoteClient } from "./remote";
|
||||
@@ -36,10 +45,14 @@ import {
|
||||
} from "./remoteForOnedrive";
|
||||
import { messyConfigToNormal } from "./configPersist";
|
||||
import type { TransItemType } from "./i18n";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
import { checkHasSpecialCharForDir } from "./misc";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
import { applyWebdavPresetRulesInplace } from "./presetRules";
|
||||
|
||||
import {
|
||||
applyLogWriterInplace,
|
||||
log,
|
||||
restoreLogWritterInplace,
|
||||
} from "./moreOnLog";
|
||||
|
||||
class PasswordModal extends Modal {
|
||||
plugin: RemotelySavePlugin;
|
||||
@@ -616,8 +629,34 @@ class ExportSettingsQrCodeModal extends Modal {
|
||||
}
|
||||
}
|
||||
|
||||
const getEyesElements = () => {
|
||||
const eyeEl = createElement(Eye);
|
||||
const eyeOffEl = createElement(EyeOff);
|
||||
return {
|
||||
eye: eyeEl.outerHTML,
|
||||
eyeOff: eyeOffEl.outerHTML,
|
||||
};
|
||||
};
|
||||
|
||||
const wrapTextWithPasswordHide = (text: TextComponent) => {
|
||||
const { eye, eyeOff } = getEyesElements();
|
||||
const hider = text.inputEl.insertAdjacentElement("afterend", createSpan());
|
||||
// the init type of hider is "hidden" === eyeOff === password
|
||||
hider.innerHTML = eyeOff;
|
||||
hider.addEventListener("click", (e) => {
|
||||
const isText = text.inputEl.getAttribute("type") === "text";
|
||||
hider.innerHTML = isText ? eyeOff : eye;
|
||||
text.inputEl.setAttribute("type", isText ? "password" : "text");
|
||||
text.inputEl.focus();
|
||||
});
|
||||
|
||||
// the init type of text el is password
|
||||
text.inputEl.setAttribute("type", "password");
|
||||
return text;
|
||||
};
|
||||
|
||||
export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
plugin: RemotelySavePlugin;
|
||||
readonly plugin: RemotelySavePlugin;
|
||||
|
||||
constructor(app: App, plugin: RemotelySavePlugin) {
|
||||
super(app, plugin);
|
||||
@@ -636,99 +675,12 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
containerEl.createEl("h1", { text: "Remotely Save" });
|
||||
|
||||
//////////////////////////////////////////////////
|
||||
// below for general
|
||||
//////////////////////////////////////////////////
|
||||
|
||||
const generalDiv = containerEl.createEl("div");
|
||||
generalDiv.createEl("h2", { text: t("settings_general") });
|
||||
|
||||
const passwordDiv = generalDiv.createEl("div");
|
||||
let newPassword = `${this.plugin.settings.password}`;
|
||||
new Setting(passwordDiv)
|
||||
.setName(t("settings_password"))
|
||||
.setDesc(t("settings_password_desc"))
|
||||
.addText((text) =>
|
||||
text
|
||||
.setPlaceholder("")
|
||||
.setValue(`${this.plugin.settings.password}`)
|
||||
.onChange(async (value) => {
|
||||
newPassword = value.trim();
|
||||
})
|
||||
)
|
||||
.addButton(async (button) => {
|
||||
button.setButtonText(t("confirm"));
|
||||
button.onClick(async () => {
|
||||
new PasswordModal(this.app, this.plugin, newPassword).open();
|
||||
});
|
||||
});
|
||||
|
||||
const scheduleDiv = generalDiv.createEl("div");
|
||||
new Setting(scheduleDiv)
|
||||
.setName(t("settings_autorun"))
|
||||
.setDesc(t("settings_autorun_desc"))
|
||||
.addDropdown((dropdown) => {
|
||||
dropdown.addOption("-1", t("settings_autorun_notset"));
|
||||
dropdown.addOption(`${1000 * 60 * 1}`, t("settings_autorun_1min"));
|
||||
dropdown.addOption(`${1000 * 60 * 5}`, t("settings_autorun_5min"));
|
||||
dropdown.addOption(`${1000 * 60 * 10}`, t("settings_autorun_10min"));
|
||||
dropdown.addOption(`${1000 * 60 * 30}`, t("settings_autorun_30min"));
|
||||
|
||||
dropdown
|
||||
.setValue(`${this.plugin.settings.autoRunEveryMilliseconds}`)
|
||||
.onChange(async (val: string) => {
|
||||
const realVal = parseInt(val);
|
||||
this.plugin.settings.autoRunEveryMilliseconds = realVal;
|
||||
await this.plugin.saveSettings();
|
||||
if (
|
||||
(realVal === undefined || realVal === null || realVal <= 0) &&
|
||||
this.plugin.autoRunIntervalID !== undefined
|
||||
) {
|
||||
// clear
|
||||
window.clearInterval(this.plugin.autoRunIntervalID);
|
||||
this.plugin.autoRunIntervalID = undefined;
|
||||
} else if (
|
||||
realVal !== undefined &&
|
||||
realVal !== null &&
|
||||
realVal > 0
|
||||
) {
|
||||
const intervalID = window.setInterval(() => {
|
||||
this.plugin.syncRun("auto");
|
||||
}, realVal);
|
||||
this.plugin.autoRunIntervalID = intervalID;
|
||||
this.plugin.registerInterval(intervalID);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
const runOnceStartUpDiv = generalDiv.createEl("div");
|
||||
new Setting(runOnceStartUpDiv)
|
||||
.setName(t("settings_runoncestartup"))
|
||||
.setDesc(t("settings_runoncestartup_desc"))
|
||||
.addDropdown((dropdown) => {
|
||||
dropdown.addOption("-1", t("settings_runoncestartup_notset"));
|
||||
dropdown.addOption(
|
||||
`${1000 * 10 * 1}`,
|
||||
t("settings_runoncestartup_10sec")
|
||||
);
|
||||
dropdown.addOption(
|
||||
`${1000 * 30 * 1}`,
|
||||
t("settings_runoncestartup_30sec")
|
||||
);
|
||||
dropdown
|
||||
.setValue(`${this.plugin.settings.initRunAfterMilliseconds}`)
|
||||
.onChange(async (val: string) => {
|
||||
const realVal = parseInt(val);
|
||||
this.plugin.settings.initRunAfterMilliseconds = realVal;
|
||||
await this.plugin.saveSettings();
|
||||
});
|
||||
});
|
||||
|
||||
//////////////////////////////////////////////////
|
||||
// below for general chooser (part 1/2)
|
||||
// below for service chooser (part 1/2)
|
||||
//////////////////////////////////////////////////
|
||||
|
||||
// we need to create the div in advance of any other service divs
|
||||
const serviceChooserDiv = generalDiv.createEl("div");
|
||||
const serviceChooserDiv = containerEl.createDiv();
|
||||
serviceChooserDiv.createEl("h2", { text: t("settings_chooseservice") });
|
||||
|
||||
//////////////////////////////////////////////////
|
||||
// below for s3
|
||||
@@ -738,27 +690,29 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
s3Div.toggleClass("s3-hide", this.plugin.settings.serviceType !== "s3");
|
||||
s3Div.createEl("h2", { text: t("settings_s3") });
|
||||
|
||||
const s3LongDescDiv = s3Div.createEl("div", { cls: "settings-long-desc" });
|
||||
|
||||
for (const c of [
|
||||
t("settings_s3_disclaimer1"),
|
||||
t("settings_s3_disclaimer2"),
|
||||
]) {
|
||||
s3Div.createEl("p", {
|
||||
s3LongDescDiv.createEl("p", {
|
||||
text: c,
|
||||
cls: "s3-disclaimer",
|
||||
});
|
||||
}
|
||||
|
||||
if (!VALID_REQURL) {
|
||||
s3Div.createEl("p", {
|
||||
s3LongDescDiv.createEl("p", {
|
||||
text: t("settings_s3_cors"),
|
||||
});
|
||||
}
|
||||
|
||||
s3Div.createEl("p", {
|
||||
s3LongDescDiv.createEl("p", {
|
||||
text: t("settings_s3_prod"),
|
||||
});
|
||||
|
||||
const s3LinksUl = s3Div.createEl("div").createEl("ul");
|
||||
const s3LinksUl = s3LongDescDiv.createEl("ul");
|
||||
|
||||
s3LinksUl.createEl("li").createEl("a", {
|
||||
href: "https://docs.aws.amazon.com/general/latest/gr/s3.html",
|
||||
@@ -805,29 +759,31 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
|
||||
new Setting(s3Div)
|
||||
.setName(t("settings_s3_accesskeyid"))
|
||||
.setDesc(t("settings_s3_accesskeyid"))
|
||||
.addText((text) =>
|
||||
.setDesc(t("settings_s3_accesskeyid_desc"))
|
||||
.addText((text) => {
|
||||
wrapTextWithPasswordHide(text);
|
||||
text
|
||||
.setPlaceholder("")
|
||||
.setValue(`${this.plugin.settings.s3.s3AccessKeyID}`)
|
||||
.onChange(async (value) => {
|
||||
this.plugin.settings.s3.s3AccessKeyID = value.trim();
|
||||
await this.plugin.saveSettings();
|
||||
})
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
new Setting(s3Div)
|
||||
.setName(t("settings_s3_secretaccesskey"))
|
||||
.setDesc(t("settings_s3_secretaccesskey"))
|
||||
.addText((text) =>
|
||||
.setDesc(t("settings_s3_secretaccesskey_desc"))
|
||||
.addText((text) => {
|
||||
wrapTextWithPasswordHide(text);
|
||||
text
|
||||
.setPlaceholder("")
|
||||
.setValue(`${this.plugin.settings.s3.s3SecretAccessKey}`)
|
||||
.onChange(async (value) => {
|
||||
this.plugin.settings.s3.s3SecretAccessKey = value.trim();
|
||||
await this.plugin.saveSettings();
|
||||
})
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
new Setting(s3Div)
|
||||
.setName(t("settings_s3_bucketname"))
|
||||
@@ -866,11 +822,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
if (VALID_REQURL) {
|
||||
new Setting(s3Div)
|
||||
.setName(t("settings_s3_bypasscorslocally"))
|
||||
.setDesc(
|
||||
t("settings_s3_bypasscorslocally_desc", {
|
||||
ver: API_VER_REQURL,
|
||||
})
|
||||
)
|
||||
.setDesc(t("settings_s3_bypasscorslocally_desc"))
|
||||
.addDropdown((dropdown) => {
|
||||
dropdown
|
||||
.addOption("disable", t("disable"))
|
||||
@@ -893,8 +845,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
});
|
||||
}
|
||||
|
||||
const partsConcurrencyDiv = s3Div.createEl("div");
|
||||
new Setting(partsConcurrencyDiv)
|
||||
new Setting(s3Div)
|
||||
.setName(t("settings_s3_parts"))
|
||||
.setDesc(t("settings_s3_parts_desc"))
|
||||
.addDropdown((dropdown) => {
|
||||
@@ -946,16 +897,20 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
this.plugin.settings.serviceType !== "dropbox"
|
||||
);
|
||||
dropboxDiv.createEl("h2", { text: t("settings_dropbox") });
|
||||
|
||||
const dropboxLongDescDiv = dropboxDiv.createEl("div", {
|
||||
cls: "settings-long-desc",
|
||||
});
|
||||
for (const c of [
|
||||
t("settings_dropbox_disclaimer1"),
|
||||
t("settings_dropbox_disclaimer2"),
|
||||
]) {
|
||||
dropboxDiv.createEl("p", {
|
||||
dropboxLongDescDiv.createEl("p", {
|
||||
text: c,
|
||||
cls: "dropbox-disclaimer",
|
||||
});
|
||||
}
|
||||
dropboxDiv.createEl("p", {
|
||||
dropboxLongDescDiv.createEl("p", {
|
||||
text: t("settings_dropbox_folder", {
|
||||
pluginID: this.plugin.manifest.id,
|
||||
remoteBaseDir:
|
||||
@@ -966,10 +921,10 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
|
||||
const dropboxSelectAuthDiv = dropboxDiv.createDiv();
|
||||
const dropboxAuthDiv = dropboxSelectAuthDiv.createDiv({
|
||||
cls: "dropbox-auth-button-hide",
|
||||
cls: "dropbox-auth-button-hide settings-auth-related",
|
||||
});
|
||||
const dropboxRevokeAuthDiv = dropboxSelectAuthDiv.createDiv({
|
||||
cls: "dropbox-revoke-auth-button-hide",
|
||||
cls: "dropbox-revoke-auth-button-hide settings-auth-related",
|
||||
});
|
||||
|
||||
const dropboxRevokeAuthSetting = new Setting(dropboxRevokeAuthDiv)
|
||||
@@ -1132,17 +1087,20 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
this.plugin.settings.serviceType !== "onedrive"
|
||||
);
|
||||
onedriveDiv.createEl("h2", { text: t("settings_onedrive") });
|
||||
const onedriveLongDescDiv = onedriveDiv.createEl("div", {
|
||||
cls: "settings-long-desc",
|
||||
});
|
||||
for (const c of [
|
||||
t("settings_onedrive_disclaimer1"),
|
||||
t("settings_onedrive_disclaimer2"),
|
||||
]) {
|
||||
onedriveDiv.createEl("p", {
|
||||
onedriveLongDescDiv.createEl("p", {
|
||||
text: c,
|
||||
cls: "onedrive-disclaimer",
|
||||
});
|
||||
}
|
||||
|
||||
onedriveDiv.createEl("p", {
|
||||
onedriveLongDescDiv.createEl("p", {
|
||||
text: t("settings_onedrive_folder", {
|
||||
pluginID: this.plugin.manifest.id,
|
||||
remoteBaseDir:
|
||||
@@ -1151,16 +1109,16 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
}),
|
||||
});
|
||||
|
||||
onedriveDiv.createEl("p", {
|
||||
onedriveLongDescDiv.createEl("p", {
|
||||
text: t("settings_onedrive_nobiz"),
|
||||
});
|
||||
|
||||
const onedriveSelectAuthDiv = onedriveDiv.createDiv();
|
||||
const onedriveAuthDiv = onedriveSelectAuthDiv.createDiv({
|
||||
cls: "onedrive-auth-button-hide",
|
||||
cls: "onedrive-auth-button-hide settings-auth-related",
|
||||
});
|
||||
const onedriveRevokeAuthDiv = onedriveSelectAuthDiv.createDiv({
|
||||
cls: "onedrive-revoke-auth-button-hide",
|
||||
cls: "onedrive-revoke-auth-button-hide settings-auth-related",
|
||||
});
|
||||
|
||||
const onedriveRevokeAuthSetting = new Setting(onedriveRevokeAuthDiv)
|
||||
@@ -1280,28 +1238,26 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
|
||||
webdavDiv.createEl("h2", { text: t("settings_webdav") });
|
||||
|
||||
webdavDiv.createEl("p", {
|
||||
const webdavLongDescDiv = webdavDiv.createEl("div", {
|
||||
cls: "settings-long-desc",
|
||||
});
|
||||
|
||||
webdavLongDescDiv.createEl("p", {
|
||||
text: t("settings_webdav_disclaimer1"),
|
||||
cls: "webdav-disclaimer",
|
||||
});
|
||||
|
||||
if (!VALID_REQURL) {
|
||||
if (Platform.isAndroidApp) {
|
||||
webdavDiv.createEl("p", {
|
||||
text: t("settings_webdav_cors_android"),
|
||||
});
|
||||
} else {
|
||||
webdavDiv.createEl("p", {
|
||||
text: t("settings_webdav_cors_otheros"),
|
||||
});
|
||||
}
|
||||
webdavLongDescDiv.createEl("p", {
|
||||
text: t("settings_webdav_cors_os"),
|
||||
});
|
||||
|
||||
webdavDiv.createEl("p", {
|
||||
webdavLongDescDiv.createEl("p", {
|
||||
text: t("settings_webdav_cors"),
|
||||
});
|
||||
}
|
||||
|
||||
webdavDiv.createEl("p", {
|
||||
webdavLongDescDiv.createEl("p", {
|
||||
text: t("settings_webdav_folder", {
|
||||
remoteBaseDir:
|
||||
this.plugin.settings.webdav.remoteBaseDir || this.app.vault.getName(),
|
||||
@@ -1323,6 +1279,11 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
) {
|
||||
this.plugin.settings.webdav.depth = "auto_unknown";
|
||||
}
|
||||
|
||||
// TODO: any more elegant way?
|
||||
applyWebdavPresetRulesInplace(this.plugin.settings.webdav);
|
||||
|
||||
// normally saved
|
||||
await this.plugin.saveSettings();
|
||||
})
|
||||
);
|
||||
@@ -1330,7 +1291,8 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
new Setting(webdavDiv)
|
||||
.setName(t("settings_webdav_user"))
|
||||
.setDesc(t("settings_webdav_user_desc"))
|
||||
.addText((text) =>
|
||||
.addText((text) => {
|
||||
wrapTextWithPasswordHide(text);
|
||||
text
|
||||
.setPlaceholder("")
|
||||
.setValue(this.plugin.settings.webdav.username)
|
||||
@@ -1343,13 +1305,14 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
this.plugin.settings.webdav.depth = "auto_unknown";
|
||||
}
|
||||
await this.plugin.saveSettings();
|
||||
})
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
new Setting(webdavDiv)
|
||||
.setName(t("settings_webdav_password"))
|
||||
.setDesc(t("settings_webdav_password_desc"))
|
||||
.addText((text) =>
|
||||
.addText((text) => {
|
||||
wrapTextWithPasswordHide(text);
|
||||
text
|
||||
.setPlaceholder("")
|
||||
.setValue(this.plugin.settings.webdav.password)
|
||||
@@ -1362,8 +1325,8 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
this.plugin.settings.webdav.depth = "auto_unknown";
|
||||
}
|
||||
await this.plugin.saveSettings();
|
||||
})
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
new Setting(webdavDiv)
|
||||
.setName(t("settings_webdav_auth"))
|
||||
@@ -1420,6 +1383,11 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
this.plugin.settings.webdav.depth = "manual_infinity";
|
||||
this.plugin.settings.webdav.manualRecursive = false;
|
||||
}
|
||||
|
||||
// TODO: any more elegant way?
|
||||
applyWebdavPresetRulesInplace(this.plugin.settings.webdav);
|
||||
|
||||
// normally save
|
||||
await this.plugin.saveSettings();
|
||||
});
|
||||
});
|
||||
@@ -1521,6 +1489,113 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
});
|
||||
});
|
||||
|
||||
//////////////////////////////////////////////////
|
||||
// below for basic settings
|
||||
//////////////////////////////////////////////////
|
||||
|
||||
const basicDiv = containerEl.createEl("div");
|
||||
basicDiv.createEl("h2", { text: t("settings_basic") });
|
||||
|
||||
let newPassword = `${this.plugin.settings.password}`;
|
||||
new Setting(basicDiv)
|
||||
.setName(t("settings_password"))
|
||||
.setDesc(t("settings_password_desc"))
|
||||
.addText((text) => {
|
||||
wrapTextWithPasswordHide(text);
|
||||
text
|
||||
.setPlaceholder("")
|
||||
.setValue(`${this.plugin.settings.password}`)
|
||||
.onChange(async (value) => {
|
||||
newPassword = value.trim();
|
||||
});
|
||||
})
|
||||
.addButton(async (button) => {
|
||||
button.setButtonText(t("confirm"));
|
||||
button.onClick(async () => {
|
||||
new PasswordModal(this.app, this.plugin, newPassword).open();
|
||||
});
|
||||
});
|
||||
|
||||
new Setting(basicDiv)
|
||||
.setName(t("settings_autorun"))
|
||||
.setDesc(t("settings_autorun_desc"))
|
||||
.addDropdown((dropdown) => {
|
||||
dropdown.addOption("-1", t("settings_autorun_notset"));
|
||||
dropdown.addOption(`${1000 * 60 * 1}`, t("settings_autorun_1min"));
|
||||
dropdown.addOption(`${1000 * 60 * 5}`, t("settings_autorun_5min"));
|
||||
dropdown.addOption(`${1000 * 60 * 10}`, t("settings_autorun_10min"));
|
||||
dropdown.addOption(`${1000 * 60 * 30}`, t("settings_autorun_30min"));
|
||||
|
||||
dropdown
|
||||
.setValue(`${this.plugin.settings.autoRunEveryMilliseconds}`)
|
||||
.onChange(async (val: string) => {
|
||||
const realVal = parseInt(val);
|
||||
this.plugin.settings.autoRunEveryMilliseconds = realVal;
|
||||
await this.plugin.saveSettings();
|
||||
if (
|
||||
(realVal === undefined || realVal === null || realVal <= 0) &&
|
||||
this.plugin.autoRunIntervalID !== undefined
|
||||
) {
|
||||
// clear
|
||||
window.clearInterval(this.plugin.autoRunIntervalID);
|
||||
this.plugin.autoRunIntervalID = undefined;
|
||||
} else if (
|
||||
realVal !== undefined &&
|
||||
realVal !== null &&
|
||||
realVal > 0
|
||||
) {
|
||||
const intervalID = window.setInterval(() => {
|
||||
this.plugin.syncRun("auto");
|
||||
}, realVal);
|
||||
this.plugin.autoRunIntervalID = intervalID;
|
||||
this.plugin.registerInterval(intervalID);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
new Setting(basicDiv)
|
||||
.setName(t("settings_runoncestartup"))
|
||||
.setDesc(t("settings_runoncestartup_desc"))
|
||||
.addDropdown((dropdown) => {
|
||||
dropdown.addOption("-1", t("settings_runoncestartup_notset"));
|
||||
dropdown.addOption(
|
||||
`${1000 * 1 * 1}`,
|
||||
t("settings_runoncestartup_1sec")
|
||||
);
|
||||
dropdown.addOption(
|
||||
`${1000 * 10 * 1}`,
|
||||
t("settings_runoncestartup_10sec")
|
||||
);
|
||||
dropdown.addOption(
|
||||
`${1000 * 30 * 1}`,
|
||||
t("settings_runoncestartup_30sec")
|
||||
);
|
||||
dropdown
|
||||
.setValue(`${this.plugin.settings.initRunAfterMilliseconds}`)
|
||||
.onChange(async (val: string) => {
|
||||
const realVal = parseInt(val);
|
||||
this.plugin.settings.initRunAfterMilliseconds = realVal;
|
||||
await this.plugin.saveSettings();
|
||||
});
|
||||
});
|
||||
new Setting(basicDiv)
|
||||
.setName(t("settings_skiplargefiles"))
|
||||
.setDesc(t("settings_skiplargefiles_desc"))
|
||||
.addDropdown((dropdown) => {
|
||||
dropdown.addOption("-1", t("settings_skiplargefiles_notset"));
|
||||
|
||||
const mbs = [1, 5, 10, 50, 100, 500, 1000];
|
||||
for (const mb of mbs) {
|
||||
dropdown.addOption(`${mb * 1000 * 1000}`, `${mb} MB`);
|
||||
}
|
||||
dropdown
|
||||
.setValue(`${this.plugin.settings.skipSizeLargerThan}`)
|
||||
.onChange(async (val) => {
|
||||
this.plugin.settings.skipSizeLargerThan = parseInt(val);
|
||||
await this.plugin.saveSettings();
|
||||
});
|
||||
});
|
||||
|
||||
//////////////////////////////////////////////////
|
||||
// below for advanced settings
|
||||
//////////////////////////////////////////////////
|
||||
@@ -1529,8 +1604,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
text: t("settings_adv"),
|
||||
});
|
||||
|
||||
const concurrencyDiv = advDiv.createEl("div");
|
||||
new Setting(concurrencyDiv)
|
||||
new Setting(advDiv)
|
||||
.setName(t("settings_concurrency"))
|
||||
.setDesc(t("settings_concurrency_desc"))
|
||||
.addDropdown((dropdown) => {
|
||||
@@ -1551,8 +1625,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
});
|
||||
});
|
||||
|
||||
const syncUnderscoreItemsDiv = advDiv.createEl("div");
|
||||
new Setting(syncUnderscoreItemsDiv)
|
||||
new Setting(advDiv)
|
||||
.setName(t("settings_syncunderscore"))
|
||||
.setDesc(t("settings_syncunderscore_desc"))
|
||||
.addDropdown((dropdown) => {
|
||||
@@ -1568,8 +1641,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
});
|
||||
});
|
||||
|
||||
const syncConfigDirDiv = advDiv.createEl("div");
|
||||
new Setting(syncConfigDirDiv)
|
||||
new Setting(advDiv)
|
||||
.setName(t("settings_configdir"))
|
||||
.setDesc(
|
||||
t("settings_configdir_desc", {
|
||||
@@ -1633,8 +1705,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
const debugDiv = containerEl.createEl("div");
|
||||
debugDiv.createEl("h2", { text: t("settings_debug") });
|
||||
|
||||
const setConsoleLogLevelDiv = debugDiv.createDiv("div");
|
||||
new Setting(setConsoleLogLevelDiv)
|
||||
new Setting(debugDiv)
|
||||
.setName(t("settings_debuglevel"))
|
||||
.setDesc(t("settings_debuglevel_desc"))
|
||||
.addDropdown(async (dropdown) => {
|
||||
@@ -1649,38 +1720,47 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
log.info(`the log level is changed to ${val}`);
|
||||
});
|
||||
});
|
||||
const outputCurrSettingsDiv = debugDiv.createDiv("div");
|
||||
new Setting(outputCurrSettingsDiv)
|
||||
|
||||
new Setting(debugDiv)
|
||||
.setName(t("settings_outputsettingsconsole"))
|
||||
.setDesc(t("settings_outputsettingsconsole_desc"))
|
||||
.addButton(async (button) => {
|
||||
button.setButtonText(t("settings_outputsettingsconsole_button"));
|
||||
button.onClick(async () => {
|
||||
const c = messyConfigToNormal(await this.plugin.loadData());
|
||||
if (c.currLogLevel === "debug") {
|
||||
// no need to ouput it again because debug mode already output it
|
||||
} else {
|
||||
log.info(c);
|
||||
}
|
||||
log.info(c);
|
||||
new Notice(t("settings_outputsettingsconsole_notice"));
|
||||
});
|
||||
});
|
||||
const syncPlanDiv = debugDiv.createEl("div");
|
||||
new Setting(syncPlanDiv)
|
||||
|
||||
new Setting(debugDiv)
|
||||
.setName(t("settings_syncplans"))
|
||||
.setDesc(t("settings_syncplans_desc"))
|
||||
.addButton(async (button) => {
|
||||
button.setButtonText(t("settings_syncplans_button"));
|
||||
button.setButtonText(t("settings_syncplans_button_json"));
|
||||
button.onClick(async () => {
|
||||
await exportVaultSyncPlansToFiles(
|
||||
this.plugin.db,
|
||||
this.app.vault,
|
||||
this.plugin.vaultRandomID
|
||||
this.plugin.vaultRandomID,
|
||||
"json"
|
||||
);
|
||||
new Notice(t("settings_syncplans_notice"));
|
||||
});
|
||||
})
|
||||
.addButton(async (button) => {
|
||||
button.setButtonText(t("settings_syncplans_button_table"));
|
||||
button.onClick(async () => {
|
||||
await exportVaultSyncPlansToFiles(
|
||||
this.plugin.db,
|
||||
this.app.vault,
|
||||
this.plugin.vaultRandomID,
|
||||
"table"
|
||||
);
|
||||
new Notice(t("settings_syncplans_notice"));
|
||||
});
|
||||
});
|
||||
new Setting(syncPlanDiv)
|
||||
new Setting(debugDiv)
|
||||
.setName(t("settings_delsyncplans"))
|
||||
.setDesc(t("settings_delsyncplans_desc"))
|
||||
.addButton(async (button) => {
|
||||
@@ -1691,8 +1771,64 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
});
|
||||
});
|
||||
|
||||
const syncMappingDiv = debugDiv.createEl("div");
|
||||
new Setting(syncMappingDiv)
|
||||
new Setting(debugDiv)
|
||||
.setName(t("settings_logtodb"))
|
||||
.setDesc(t("settings_logtodb_desc"))
|
||||
.addDropdown(async (dropdown) => {
|
||||
dropdown.addOption("enable", t("enable"));
|
||||
dropdown.addOption("disable", t("disable"));
|
||||
dropdown
|
||||
.setValue(this.plugin.settings.logToDB ? "enable" : "disable")
|
||||
.onChange(async (val: string) => {
|
||||
const logToDB = val === "enable";
|
||||
if (logToDB) {
|
||||
applyLogWriterInplace((...msg: any[]) => {
|
||||
insertLoggerOutputByVault(
|
||||
this.plugin.db,
|
||||
this.plugin.vaultRandomID,
|
||||
...msg
|
||||
);
|
||||
});
|
||||
} else {
|
||||
restoreLogWritterInplace();
|
||||
}
|
||||
clearExpiredLoggerOutputRecords(this.plugin.db);
|
||||
this.plugin.settings.logToDB = logToDB;
|
||||
await this.plugin.saveSettings();
|
||||
});
|
||||
});
|
||||
|
||||
new Setting(debugDiv)
|
||||
.setName(t("settings_logtodbexport"))
|
||||
.setDesc(
|
||||
t("settings_logtodbexport_desc", {
|
||||
debugFolder: DEFAULT_DEBUG_FOLDER,
|
||||
})
|
||||
)
|
||||
.addButton(async (button) => {
|
||||
button.setButtonText(t("settings_logtodbexport_button"));
|
||||
button.onClick(async () => {
|
||||
await exportVaultLoggerOutputToFiles(
|
||||
this.plugin.db,
|
||||
this.app.vault,
|
||||
this.plugin.vaultRandomID
|
||||
);
|
||||
new Notice(t("settings_logtodbexport_notice"));
|
||||
});
|
||||
});
|
||||
|
||||
new Setting(debugDiv)
|
||||
.setName(t("settings_logtodbclear"))
|
||||
.setDesc(t("settings_logtodbclear_desc"))
|
||||
.addButton(async (button) => {
|
||||
button.setButtonText(t("settings_logtodbclear_button"));
|
||||
button.onClick(async () => {
|
||||
await clearAllLoggerOutputRecords(this.plugin.db);
|
||||
new Notice(t("settings_logtodbclear_notice"));
|
||||
});
|
||||
});
|
||||
|
||||
new Setting(debugDiv)
|
||||
.setName(t("settings_delsyncmap"))
|
||||
.setDesc(t("settings_delsyncmap_desc"))
|
||||
.addButton(async (button) => {
|
||||
@@ -1703,8 +1839,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
});
|
||||
});
|
||||
|
||||
const outputCurrBasePathVaultIDDiv = debugDiv.createDiv("div");
|
||||
new Setting(outputCurrBasePathVaultIDDiv)
|
||||
new Setting(debugDiv)
|
||||
.setName(t("settings_outputbasepathvaultid"))
|
||||
.setDesc(t("settings_outputbasepathvaultid_desc"))
|
||||
.addButton(async (button) => {
|
||||
@@ -1715,8 +1850,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
});
|
||||
});
|
||||
|
||||
const dbsResetDiv = debugDiv.createEl("div");
|
||||
new Setting(dbsResetDiv)
|
||||
new Setting(debugDiv)
|
||||
.setName(t("settings_resetcache"))
|
||||
.setDesc(t("settings_resetcache_desc"))
|
||||
.addButton(async (button) => {
|
||||
|
||||
+327
-44
@@ -5,18 +5,21 @@ import {
|
||||
Vault,
|
||||
requireApiVersion,
|
||||
} from "obsidian";
|
||||
import AggregateError from "aggregate-error";
|
||||
import PQueue from "p-queue";
|
||||
import {
|
||||
import type {
|
||||
RemoteItem,
|
||||
SUPPORTED_SERVICES_TYPE,
|
||||
SyncTriggerSourceType,
|
||||
DecisionType,
|
||||
FileOrFolderMixedState,
|
||||
API_VER_STAT_FOLDER,
|
||||
SUPPORTED_SERVICES_TYPE,
|
||||
} from "./baseTypes";
|
||||
import { API_VER_STAT_FOLDER } from "./baseTypes";
|
||||
import {
|
||||
decryptBase32ToString,
|
||||
decryptBase64urlToString,
|
||||
encryptStringToBase64url,
|
||||
getSizeFromOrigToEnc,
|
||||
MAGIC_ENCRYPTED_PREFIX_BASE32,
|
||||
MAGIC_ENCRYPTED_PREFIX_BASE64URL,
|
||||
} from "./encrypt";
|
||||
@@ -33,6 +36,7 @@ import {
|
||||
getFolderLevels,
|
||||
getParentFolder,
|
||||
atWhichLevel,
|
||||
unixTimeToStr,
|
||||
} from "./misc";
|
||||
import { RemoteClient } from "./remote";
|
||||
import {
|
||||
@@ -46,8 +50,7 @@ import {
|
||||
} from "./metadataOnRemote";
|
||||
import { isInsideObsFolder, ObsConfigDirFileType } from "./obsFolderLister";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
export type SyncStatusType =
|
||||
| "idle"
|
||||
@@ -63,6 +66,8 @@ export type SyncStatusType =
|
||||
|
||||
export interface SyncPlanType {
|
||||
ts: number;
|
||||
tsFmt?: string;
|
||||
syncTriggerSource?: SyncTriggerSourceType;
|
||||
remoteType: SUPPORTED_SERVICES_TYPE;
|
||||
mixedStates: Record<string, FileOrFolderMixedState>;
|
||||
}
|
||||
@@ -212,20 +217,30 @@ export const parseRemoteItems = async (
|
||||
let r = {} as FileOrFolderMixedState;
|
||||
if (backwardMapping !== undefined) {
|
||||
key = backwardMapping.localKey;
|
||||
const mtimeRemote = backwardMapping.localMtime || entry.lastModified;
|
||||
|
||||
// the backwardMapping.localSize is the file BEFORE encryption
|
||||
// we want to split two sizes for comparation later
|
||||
|
||||
r = {
|
||||
key: key,
|
||||
existRemote: true,
|
||||
mtimeRemote: backwardMapping.localMtime || entry.lastModified,
|
||||
sizeRemote: backwardMapping.localSize || entry.size,
|
||||
mtimeRemote: mtimeRemote,
|
||||
mtimeRemoteFmt: unixTimeToStr(mtimeRemote),
|
||||
sizeRemote: backwardMapping.localSize,
|
||||
sizeRemoteEnc: password === "" ? undefined : entry.size,
|
||||
remoteEncryptedKey: remoteEncryptedKey,
|
||||
changeRemoteMtimeUsingMapping: true,
|
||||
};
|
||||
} else {
|
||||
// do not have backwardMapping
|
||||
r = {
|
||||
key: key,
|
||||
existRemote: true,
|
||||
mtimeRemote: entry.lastModified,
|
||||
sizeRemote: entry.size,
|
||||
mtimeRemoteFmt: unixTimeToStr(entry.lastModified),
|
||||
sizeRemote: password === "" ? entry.size : undefined,
|
||||
sizeRemoteEnc: password === "" ? undefined : entry.size,
|
||||
remoteEncryptedKey: remoteEncryptedKey,
|
||||
changeRemoteMtimeUsingMapping: false,
|
||||
};
|
||||
@@ -298,7 +313,8 @@ const ensembleMixedStates = async (
|
||||
localFileHistory: FileFolderHistoryRecord[],
|
||||
syncConfigDir: boolean,
|
||||
configDir: string,
|
||||
syncUnderscoreItems: boolean
|
||||
syncUnderscoreItems: boolean,
|
||||
password: string
|
||||
) => {
|
||||
const results = {} as Record<string, FileOrFolderMixedState>;
|
||||
|
||||
@@ -320,11 +336,15 @@ const ensembleMixedStates = async (
|
||||
// ignore
|
||||
continue;
|
||||
} else if (entry instanceof TFile) {
|
||||
const mtimeLocal = Math.max(entry.stat.mtime || 0, entry.stat.ctime || 0);
|
||||
r = {
|
||||
key: entry.path,
|
||||
existLocal: true,
|
||||
mtimeLocal: Math.max(entry.stat.mtime || 0, entry.stat.ctime || 0),
|
||||
mtimeLocal: mtimeLocal,
|
||||
mtimeLocalFmt: unixTimeToStr(mtimeLocal),
|
||||
sizeLocal: entry.stat.size,
|
||||
sizeLocalEnc:
|
||||
password === "" ? undefined : getSizeFromOrigToEnc(entry.stat.size),
|
||||
};
|
||||
} else if (entry instanceof TFolder) {
|
||||
key = `${entry.path}/`;
|
||||
@@ -332,7 +352,9 @@ const ensembleMixedStates = async (
|
||||
key: key,
|
||||
existLocal: true,
|
||||
mtimeLocal: undefined,
|
||||
mtimeLocalFmt: undefined,
|
||||
sizeLocal: 0,
|
||||
sizeLocalEnc: password === "" ? undefined : getSizeFromOrigToEnc(0),
|
||||
};
|
||||
} else {
|
||||
throw Error(`unexpected ${entry}`);
|
||||
@@ -346,7 +368,9 @@ const ensembleMixedStates = async (
|
||||
results[key].key = r.key;
|
||||
results[key].existLocal = r.existLocal;
|
||||
results[key].mtimeLocal = r.mtimeLocal;
|
||||
results[key].mtimeLocalFmt = r.mtimeLocalFmt;
|
||||
results[key].sizeLocal = r.sizeLocal;
|
||||
results[key].sizeLocalEnc = r.sizeLocalEnc;
|
||||
} else {
|
||||
results[key] = r;
|
||||
results[key].existRemote = false;
|
||||
@@ -356,18 +380,24 @@ const ensembleMixedStates = async (
|
||||
if (syncConfigDir && localConfigDirContents !== undefined) {
|
||||
for (const entry of localConfigDirContents) {
|
||||
const key = entry.key;
|
||||
const mtimeLocal = Math.max(entry.mtime, entry.ctime);
|
||||
const r: FileOrFolderMixedState = {
|
||||
key: key,
|
||||
existLocal: true,
|
||||
mtimeLocal: Math.max(entry.mtime, entry.ctime),
|
||||
mtimeLocal: mtimeLocal,
|
||||
mtimeLocalFmt: unixTimeToStr(mtimeLocal),
|
||||
sizeLocal: entry.size,
|
||||
sizeLocalEnc:
|
||||
password === "" ? undefined : getSizeFromOrigToEnc(entry.size),
|
||||
};
|
||||
|
||||
if (results.hasOwnProperty(key)) {
|
||||
results[key].key = r.key;
|
||||
results[key].existLocal = r.existLocal;
|
||||
results[key].mtimeLocal = r.mtimeLocal;
|
||||
results[key].mtimeLocalFmt = r.mtimeLocalFmt;
|
||||
results[key].sizeLocal = r.sizeLocal;
|
||||
results[key].sizeLocalEnc = r.sizeLocalEnc;
|
||||
} else {
|
||||
results[key] = r;
|
||||
results[key].existRemote = false;
|
||||
@@ -380,6 +410,7 @@ const ensembleMixedStates = async (
|
||||
const r = {
|
||||
key: key,
|
||||
deltimeRemote: entry.actionWhen,
|
||||
deltimeRemoteFmt: unixTimeToStr(entry.actionWhen),
|
||||
} as FileOrFolderMixedState;
|
||||
|
||||
if (isSkipItem(key, syncConfigDir, syncUnderscoreItems, configDir)) {
|
||||
@@ -389,6 +420,7 @@ const ensembleMixedStates = async (
|
||||
if (results.hasOwnProperty(key)) {
|
||||
results[key].key = r.key;
|
||||
results[key].deltimeRemote = r.deltimeRemote;
|
||||
results[key].deltimeRemoteFmt = r.deltimeRemoteFmt;
|
||||
} else {
|
||||
results[key] = r;
|
||||
|
||||
@@ -417,10 +449,12 @@ const ensembleMixedStates = async (
|
||||
const r = {
|
||||
key: key,
|
||||
deltimeLocal: entry.actionWhen,
|
||||
deltimeLocalFmt: unixTimeToStr(entry.actionWhen),
|
||||
} as FileOrFolderMixedState;
|
||||
|
||||
if (results.hasOwnProperty(key)) {
|
||||
results[key].deltimeLocal = r.deltimeLocal;
|
||||
results[key].deltimeLocalFmt = r.deltimeLocalFmt;
|
||||
} else {
|
||||
results[key] = r;
|
||||
results[key].existLocal = false; // we have already checked local
|
||||
@@ -430,19 +464,28 @@ const ensembleMixedStates = async (
|
||||
const r = {
|
||||
key: key,
|
||||
mtimeLocal: entry.actionWhen,
|
||||
mtimeLocalFmt: unixTimeToStr(entry.actionWhen),
|
||||
changeLocalMtimeUsingMapping: true,
|
||||
};
|
||||
if (results.hasOwnProperty(key)) {
|
||||
results[key].mtimeLocal = Math.max(
|
||||
const mtimeLocal = Math.max(
|
||||
r.mtimeLocal || 0,
|
||||
results[key].mtimeLocal || 0
|
||||
);
|
||||
results[key].mtimeLocal = mtimeLocal;
|
||||
results[key].mtimeLocalFmt = unixTimeToStr(mtimeLocal);
|
||||
results[key].changeLocalMtimeUsingMapping =
|
||||
r.changeLocalMtimeUsingMapping;
|
||||
} else {
|
||||
results[key] = r;
|
||||
results[key].existLocal = false; // we have already checked local
|
||||
results[key].existRemote = false; // we have already checked remote
|
||||
// So, the file doesn't exist,
|
||||
// except that it existed in the "renamed to" history records.
|
||||
// Most likely because that the user deleted the file while Obsidian was closed,
|
||||
// so Obsidian could not track the deletions.
|
||||
// We are not sure how to deal with this, so do not generate anything here!
|
||||
// // // The following 3 lines are of old logic, and have been removed:
|
||||
// // results[key] = r;
|
||||
// // results[key].existLocal = false; // we have already checked local
|
||||
// // results[key].existRemote = false; // we have already checked remote
|
||||
}
|
||||
} else {
|
||||
throw Error(
|
||||
@@ -457,6 +500,7 @@ const ensembleMixedStates = async (
|
||||
const assignOperationToFileInplace = (
|
||||
origRecord: FileOrFolderMixedState,
|
||||
keptFolder: Set<string>,
|
||||
skipSizeLargerThan: number,
|
||||
password: string = ""
|
||||
) => {
|
||||
let r = origRecord;
|
||||
@@ -499,6 +543,18 @@ const assignOperationToFileInplace = (
|
||||
);
|
||||
}
|
||||
|
||||
if (
|
||||
(r.existLocal && password !== "" && r.sizeLocalEnc === undefined) ||
|
||||
(r.existRemote && password !== "" && r.sizeRemoteEnc === undefined)
|
||||
) {
|
||||
throw new Error(
|
||||
`Error: No encryption sizes: ${JSON.stringify(r, null, 2)}`
|
||||
);
|
||||
}
|
||||
|
||||
const sizeLocalComp = password === "" ? r.sizeLocal : r.sizeLocalEnc;
|
||||
const sizeRemoteComp = password === "" ? r.sizeRemote : r.sizeRemoteEnc;
|
||||
|
||||
// 1. mtimeLocal
|
||||
if (r.existLocal) {
|
||||
const mtimeRemote = r.existRemote ? r.mtimeRemote : -1;
|
||||
@@ -509,26 +565,79 @@ const assignOperationToFileInplace = (
|
||||
r.mtimeLocal >= deltimeLocal &&
|
||||
r.mtimeLocal >= deltimeRemote
|
||||
) {
|
||||
if (sizeLocalComp === undefined) {
|
||||
throw new Error(
|
||||
`Error: no local size but has local mtime: ${JSON.stringify(
|
||||
r,
|
||||
null,
|
||||
2
|
||||
)}`
|
||||
);
|
||||
}
|
||||
if (r.mtimeLocal === r.mtimeRemote) {
|
||||
// mtime the same
|
||||
if (password === "") {
|
||||
// no password, we can also compare the sizes!
|
||||
if (r.sizeLocal === r.sizeRemote) {
|
||||
r.decision = "skipUploading";
|
||||
r.decisionBranch = 1;
|
||||
} else {
|
||||
// local and remote both exist and mtimes are the same
|
||||
if (sizeLocalComp === sizeRemoteComp) {
|
||||
// do not need to consider skipSizeLargerThan in this case
|
||||
r.decision = "skipUploading";
|
||||
r.decisionBranch = 1;
|
||||
} else {
|
||||
if (skipSizeLargerThan <= 0) {
|
||||
r.decision = "uploadLocalToRemote";
|
||||
r.decisionBranch = 2;
|
||||
} else {
|
||||
// limit the sizes
|
||||
if (sizeLocalComp <= skipSizeLargerThan) {
|
||||
if (sizeRemoteComp <= skipSizeLargerThan) {
|
||||
r.decision = "uploadLocalToRemote";
|
||||
r.decisionBranch = 18;
|
||||
} else {
|
||||
r.decision = "errorRemoteTooLargeConflictLocal";
|
||||
r.decisionBranch = 19;
|
||||
}
|
||||
} else {
|
||||
if (sizeRemoteComp <= skipSizeLargerThan) {
|
||||
r.decision = "errorLocalTooLargeConflictRemote";
|
||||
r.decisionBranch = 20;
|
||||
} else {
|
||||
r.decision = "skipUploadingTooLarge";
|
||||
r.decisionBranch = 21;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// we have password, then the sizes are always unequal
|
||||
// we can only rely on mtime
|
||||
r.decision = "skipUploading";
|
||||
r.decisionBranch = 3;
|
||||
}
|
||||
} else {
|
||||
r.decision = "uploadLocalToRemote";
|
||||
r.decisionBranch = 4;
|
||||
// we have local laregest mtime,
|
||||
// and the remote not existing or smaller mtime
|
||||
if (skipSizeLargerThan <= 0) {
|
||||
// no need to consider sizes
|
||||
r.decision = "uploadLocalToRemote";
|
||||
r.decisionBranch = 4;
|
||||
} else {
|
||||
// need to consider sizes
|
||||
if (sizeLocalComp <= skipSizeLargerThan) {
|
||||
if (sizeRemoteComp === undefined) {
|
||||
r.decision = "uploadLocalToRemote";
|
||||
r.decisionBranch = 22;
|
||||
} else if (sizeRemoteComp <= skipSizeLargerThan) {
|
||||
r.decision = "uploadLocalToRemote";
|
||||
r.decisionBranch = 23;
|
||||
} else {
|
||||
r.decision = "errorRemoteTooLargeConflictLocal";
|
||||
r.decisionBranch = 24;
|
||||
}
|
||||
} else {
|
||||
if (sizeRemoteComp === undefined) {
|
||||
r.decision = "skipUploadingTooLarge";
|
||||
r.decisionBranch = 25;
|
||||
} else if (sizeRemoteComp <= skipSizeLargerThan) {
|
||||
r.decision = "errorLocalTooLargeConflictRemote";
|
||||
r.decisionBranch = 26;
|
||||
} else {
|
||||
r.decision = "skipUploadingTooLarge";
|
||||
r.decisionBranch = 27;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
keptFolder.add(getParentFolder(r.key));
|
||||
return r;
|
||||
@@ -545,8 +654,49 @@ const assignOperationToFileInplace = (
|
||||
r.mtimeRemote >= deltimeLocal &&
|
||||
r.mtimeRemote >= deltimeRemote
|
||||
) {
|
||||
r.decision = "downloadRemoteToLocal";
|
||||
r.decisionBranch = 5;
|
||||
// we have remote laregest mtime,
|
||||
// and the local not existing or smaller mtime
|
||||
if (sizeRemoteComp === undefined) {
|
||||
throw new Error(
|
||||
`Error: no remote size but has remote mtime: ${JSON.stringify(
|
||||
r,
|
||||
null,
|
||||
2
|
||||
)}`
|
||||
);
|
||||
}
|
||||
|
||||
if (skipSizeLargerThan <= 0) {
|
||||
// no need to consider sizes
|
||||
r.decision = "downloadRemoteToLocal";
|
||||
r.decisionBranch = 5;
|
||||
} else {
|
||||
// need to consider sizes
|
||||
if (sizeRemoteComp <= skipSizeLargerThan) {
|
||||
if (sizeLocalComp === undefined) {
|
||||
r.decision = "downloadRemoteToLocal";
|
||||
r.decisionBranch = 28;
|
||||
} else if (sizeLocalComp <= skipSizeLargerThan) {
|
||||
r.decision = "downloadRemoteToLocal";
|
||||
r.decisionBranch = 29;
|
||||
} else {
|
||||
r.decision = "errorLocalTooLargeConflictRemote";
|
||||
r.decisionBranch = 30;
|
||||
}
|
||||
} else {
|
||||
if (sizeLocalComp === undefined) {
|
||||
r.decision = "skipDownloadingTooLarge";
|
||||
r.decisionBranch = 31;
|
||||
} else if (sizeLocalComp <= skipSizeLargerThan) {
|
||||
r.decision = "errorRemoteTooLargeConflictLocal";
|
||||
r.decisionBranch = 32;
|
||||
} else {
|
||||
r.decision = "skipDownloadingTooLarge";
|
||||
r.decisionBranch = 33;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
keptFolder.add(getParentFolder(r.key));
|
||||
return r;
|
||||
}
|
||||
@@ -562,10 +712,44 @@ const assignOperationToFileInplace = (
|
||||
r.deltimeLocal >= mtimeRemote &&
|
||||
r.deltimeLocal >= deltimeRemote
|
||||
) {
|
||||
r.decision = "uploadLocalDelHistToRemote";
|
||||
r.decisionBranch = 6;
|
||||
if (r.existLocal || r.existRemote) {
|
||||
// actual deletion would happen
|
||||
if (skipSizeLargerThan <= 0) {
|
||||
r.decision = "uploadLocalDelHistToRemote";
|
||||
r.decisionBranch = 6;
|
||||
if (r.existLocal || r.existRemote) {
|
||||
// actual deletion would happen
|
||||
}
|
||||
} else {
|
||||
const localTooLargeToDelete =
|
||||
r.existLocal && sizeLocalComp > skipSizeLargerThan;
|
||||
const remoteTooLargeToDelete =
|
||||
r.existRemote && sizeRemoteComp > skipSizeLargerThan;
|
||||
if (localTooLargeToDelete) {
|
||||
if (remoteTooLargeToDelete) {
|
||||
r.decision = "skipUsingLocalDelTooLarge";
|
||||
r.decisionBranch = 34;
|
||||
} else {
|
||||
if (r.existRemote) {
|
||||
r.decision = "errorLocalTooLargeConflictRemote";
|
||||
r.decisionBranch = 35;
|
||||
} else {
|
||||
r.decision = "skipUsingLocalDelTooLarge";
|
||||
r.decisionBranch = 36;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (remoteTooLargeToDelete) {
|
||||
if (r.existLocal) {
|
||||
r.decision = "errorLocalTooLargeConflictRemote";
|
||||
r.decisionBranch = 37;
|
||||
} else {
|
||||
r.decision = "skipUsingLocalDelTooLarge";
|
||||
r.decisionBranch = 38;
|
||||
}
|
||||
} else {
|
||||
r.decision = "uploadLocalDelHistToRemote";
|
||||
r.decisionBranch = 39;
|
||||
}
|
||||
}
|
||||
}
|
||||
return r;
|
||||
}
|
||||
@@ -581,10 +765,44 @@ const assignOperationToFileInplace = (
|
||||
r.deltimeRemote >= mtimeRemote &&
|
||||
r.deltimeRemote >= deltimeLocal
|
||||
) {
|
||||
r.decision = "keepRemoteDelHist";
|
||||
r.decisionBranch = 7;
|
||||
if (r.existLocal || r.existRemote) {
|
||||
// actual deletion would happen
|
||||
if (skipSizeLargerThan <= 0) {
|
||||
r.decision = "keepRemoteDelHist";
|
||||
r.decisionBranch = 7;
|
||||
if (r.existLocal || r.existRemote) {
|
||||
// actual deletion would happen
|
||||
}
|
||||
} else {
|
||||
const localTooLargeToDelete =
|
||||
r.existLocal && sizeLocalComp > skipSizeLargerThan;
|
||||
const remoteTooLargeToDelete =
|
||||
r.existRemote && sizeRemoteComp > skipSizeLargerThan;
|
||||
if (localTooLargeToDelete) {
|
||||
if (remoteTooLargeToDelete) {
|
||||
r.decision = "skipUsingRemoteDelTooLarge";
|
||||
r.decisionBranch = 40;
|
||||
} else {
|
||||
if (r.existRemote) {
|
||||
r.decision = "errorLocalTooLargeConflictRemote";
|
||||
r.decisionBranch = 41;
|
||||
} else {
|
||||
r.decision = "skipUsingRemoteDelTooLarge";
|
||||
r.decisionBranch = 42;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (remoteTooLargeToDelete) {
|
||||
if (r.existLocal) {
|
||||
r.decision = "errorLocalTooLargeConflictRemote";
|
||||
r.decisionBranch = 43;
|
||||
} else {
|
||||
r.decision = "skipUsingRemoteDelTooLarge";
|
||||
r.decisionBranch = 44;
|
||||
}
|
||||
} else {
|
||||
r.decision = "keepRemoteDelHist";
|
||||
r.decisionBranch = 45;
|
||||
}
|
||||
}
|
||||
}
|
||||
return r;
|
||||
}
|
||||
@@ -719,6 +937,10 @@ const DELETION_DECISIONS: Set<DecisionType> = new Set([
|
||||
"uploadLocalDelHistToRemoteFolder",
|
||||
"keepRemoteDelHistFolder",
|
||||
]);
|
||||
const SIZES_GO_WRONG_DECISIONS: Set<DecisionType> = new Set([
|
||||
"errorLocalTooLargeConflictRemote",
|
||||
"errorRemoteTooLargeConflictLocal",
|
||||
]);
|
||||
|
||||
export const getSyncPlan = async (
|
||||
remoteStates: FileOrFolderMixedState[],
|
||||
@@ -727,10 +949,12 @@ export const getSyncPlan = async (
|
||||
remoteDeleteHistory: DeletionOnRemote[],
|
||||
localFileHistory: FileFolderHistoryRecord[],
|
||||
remoteType: SUPPORTED_SERVICES_TYPE,
|
||||
triggerSource: SyncTriggerSourceType,
|
||||
vault: Vault,
|
||||
syncConfigDir: boolean,
|
||||
configDir: string,
|
||||
syncUnderscoreItems: boolean,
|
||||
skipSizeLargerThan: number,
|
||||
password: string = ""
|
||||
) => {
|
||||
const mixedStates = await ensembleMixedStates(
|
||||
@@ -741,13 +965,15 @@ export const getSyncPlan = async (
|
||||
localFileHistory,
|
||||
syncConfigDir,
|
||||
configDir,
|
||||
syncUnderscoreItems
|
||||
syncUnderscoreItems,
|
||||
password
|
||||
);
|
||||
|
||||
const sortedKeys = Object.keys(mixedStates).sort(
|
||||
(k1, k2) => k2.length - k1.length
|
||||
);
|
||||
|
||||
const sizesGoWrong: FileOrFolderMixedState[] = [];
|
||||
const deletions: DeletionOnRemote[] = [];
|
||||
|
||||
const keptFolder = new Set<string>();
|
||||
@@ -763,7 +989,16 @@ export const getSyncPlan = async (
|
||||
} else {
|
||||
// get all operations of files
|
||||
// and at the same time get some helper info for folders
|
||||
assignOperationToFileInplace(val, keptFolder, password);
|
||||
assignOperationToFileInplace(
|
||||
val,
|
||||
keptFolder,
|
||||
skipSizeLargerThan,
|
||||
password
|
||||
);
|
||||
}
|
||||
|
||||
if (SIZES_GO_WRONG_DECISIONS.has(val.decision)) {
|
||||
sizesGoWrong.push(val);
|
||||
}
|
||||
|
||||
if (DELETION_DECISIONS.has(val.decision)) {
|
||||
@@ -793,15 +1028,20 @@ export const getSyncPlan = async (
|
||||
}
|
||||
}
|
||||
|
||||
const currTs = Date.now();
|
||||
const currTsFmt = unixTimeToStr(currTs);
|
||||
const plan = {
|
||||
ts: Date.now(),
|
||||
ts: currTs,
|
||||
tsFmt: currTsFmt,
|
||||
remoteType: remoteType,
|
||||
syncTriggerSource: triggerSource,
|
||||
mixedStates: mixedStates,
|
||||
} as SyncPlanType;
|
||||
return {
|
||||
plan: plan,
|
||||
sortedKeys: sortedKeys,
|
||||
deletions: deletions,
|
||||
sizesGoWrong: sizesGoWrong,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -983,6 +1223,14 @@ const dispatchOperationToActual = async (
|
||||
await clearDeleteRenameHistoryOfKeyAndVault(db, r.key, vaultRandomID);
|
||||
} else if (r.decision === "skipFolder") {
|
||||
// do nothing!
|
||||
} else if (r.decision === "skipUploadingTooLarge") {
|
||||
// do nothing!
|
||||
} else if (r.decision === "skipDownloadingTooLarge") {
|
||||
// do nothing!
|
||||
} else if (r.decision === "skipUsingLocalDelTooLarge") {
|
||||
// do nothing!
|
||||
} else if (r.decision === "skipUsingRemoteDelTooLarge") {
|
||||
// do nothing!
|
||||
} else {
|
||||
throw Error(`unknown decision in ${JSON.stringify(r)}`);
|
||||
}
|
||||
@@ -1001,7 +1249,14 @@ const splitThreeSteps = (syncPlan: SyncPlanType, sortedKeys: string[]) => {
|
||||
const key = sortedKeys[i];
|
||||
const val: FileOrFolderMixedState = Object.assign({}, mixedStates[key]); // copy to avoid issue
|
||||
|
||||
if (val.decision === "skipFolder" || val.decision === "skipUploading") {
|
||||
if (
|
||||
val.decision === "skipFolder" ||
|
||||
val.decision === "skipUploading" ||
|
||||
val.decision === "skipDownloadingTooLarge" ||
|
||||
val.decision === "skipUploadingTooLarge" ||
|
||||
val.decision === "skipUsingLocalDelTooLarge" ||
|
||||
val.decision === "skipUsingRemoteDelTooLarge"
|
||||
) {
|
||||
// pass
|
||||
} else if (val.decision === "createFolder") {
|
||||
const level = atWhichLevel(key);
|
||||
@@ -1061,15 +1316,23 @@ export const doActualSync = async (
|
||||
sortedKeys: string[],
|
||||
metadataFile: FileOrFolderMixedState,
|
||||
origMetadata: MetadataOnRemote,
|
||||
sizesGoWrong: FileOrFolderMixedState[],
|
||||
deletions: DeletionOnRemote[],
|
||||
localDeleteFunc: any,
|
||||
password: string = "",
|
||||
concurrency: number = 1,
|
||||
callbackSizesGoWrong?: any,
|
||||
callbackSyncProcess?: any
|
||||
) => {
|
||||
const mixedStates = syncPlan.mixedStates;
|
||||
const totalCount = sortedKeys.length || 0;
|
||||
|
||||
if (sizesGoWrong.length > 0) {
|
||||
log.debug(`some sizes are larger than the threshold, abort and show hints`);
|
||||
callbackSizesGoWrong(sizesGoWrong);
|
||||
return;
|
||||
}
|
||||
|
||||
log.debug(`start syncing extra data firstly`);
|
||||
await uploadExtraMeta(
|
||||
client,
|
||||
@@ -1135,6 +1398,8 @@ export const doActualSync = async (
|
||||
}
|
||||
|
||||
const queue = new PQueue({ concurrency: concurrency, autoStart: true });
|
||||
const potentialErrors: Error[] = [];
|
||||
let tooManyErrors = false;
|
||||
|
||||
for (let k = 0; k < singleLevelOps.length; ++k) {
|
||||
const val: FileOrFolderMixedState = singleLevelOps[k];
|
||||
@@ -1167,10 +1432,28 @@ export const doActualSync = async (
|
||||
|
||||
log.debug(`finished ${key}`);
|
||||
};
|
||||
queue.add(fn);
|
||||
|
||||
queue.add(fn).catch((e) => {
|
||||
const msg = `${key}: ${e.message}`;
|
||||
potentialErrors.push(new Error(msg));
|
||||
if (potentialErrors.length >= 3) {
|
||||
tooManyErrors = true;
|
||||
queue.pause();
|
||||
queue.clear();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
await queue.onIdle();
|
||||
|
||||
if (potentialErrors.length > 0) {
|
||||
if (tooManyErrors) {
|
||||
potentialErrors.push(
|
||||
new Error("too many errors, stop the remaining tasks")
|
||||
);
|
||||
}
|
||||
throw new AggregateError(potentialErrors);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { App, Modal, Notice, PluginSettingTab, Setting } from "obsidian";
|
||||
import type RemotelySavePlugin from "./main"; // unavoidable
|
||||
import type { TransItemType } from "./i18n";
|
||||
import * as origLog from "loglevel";
|
||||
const log = origLog.getLogger("rs-default");
|
||||
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
export class SyncAlgoV2Modal extends Modal {
|
||||
agree: boolean;
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
import { App, Modal, Notice, PluginSettingTab, Setting } from "obsidian";
|
||||
import type RemotelySavePlugin from "./main"; // unavoidable
|
||||
import type { TransItemType } from "./i18n";
|
||||
import type { FileOrFolderMixedState } from "./baseTypes";
|
||||
|
||||
import { log } from "./moreOnLog";
|
||||
|
||||
export class SizesConflictModal extends Modal {
|
||||
readonly plugin: RemotelySavePlugin;
|
||||
readonly skipSizeLargerThan: number;
|
||||
readonly sizesGoWrong: FileOrFolderMixedState[];
|
||||
readonly hasPassword: boolean;
|
||||
constructor(
|
||||
app: App,
|
||||
plugin: RemotelySavePlugin,
|
||||
skipSizeLargerThan: number,
|
||||
sizesGoWrong: FileOrFolderMixedState[],
|
||||
hasPassword: boolean
|
||||
) {
|
||||
super(app);
|
||||
this.plugin = plugin;
|
||||
this.skipSizeLargerThan = skipSizeLargerThan;
|
||||
this.sizesGoWrong = sizesGoWrong;
|
||||
this.hasPassword = hasPassword;
|
||||
}
|
||||
onOpen() {
|
||||
let { contentEl } = this;
|
||||
const t = (x: TransItemType, vars?: any) => {
|
||||
return this.plugin.i18n.t(x, vars);
|
||||
};
|
||||
|
||||
contentEl.createEl("h2", {
|
||||
text: t("modal_sizesconflict_title"),
|
||||
});
|
||||
|
||||
t("modal_sizesconflict_desc", {
|
||||
thresholdMB: `${this.skipSizeLargerThan / 1000 / 1000}`,
|
||||
thresholdBytes: `${this.skipSizeLargerThan}`,
|
||||
})
|
||||
.split("\n")
|
||||
.forEach((val) => {
|
||||
contentEl.createEl("p", { text: val });
|
||||
});
|
||||
|
||||
const info = this.serialize();
|
||||
|
||||
contentEl.createDiv().createEl(
|
||||
"button",
|
||||
{
|
||||
text: t("modal_sizesconflict_copybutton"),
|
||||
},
|
||||
(el) => {
|
||||
el.onclick = async () => {
|
||||
await navigator.clipboard.writeText(info);
|
||||
new Notice(t("modal_sizesconflict_copynotice"));
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
contentEl.createEl("pre", {
|
||||
text: info,
|
||||
});
|
||||
}
|
||||
|
||||
serialize() {
|
||||
return this.sizesGoWrong
|
||||
.map((x) => {
|
||||
return [
|
||||
x.key,
|
||||
this.hasPassword
|
||||
? `encrypted name: ${x.remoteEncryptedKey}`
|
||||
: undefined,
|
||||
`local ${this.hasPassword ? "encrypted " : ""}bytes: ${
|
||||
this.hasPassword ? x.sizeLocalEnc : x.sizeLocal
|
||||
}`,
|
||||
`remote ${this.hasPassword ? "encrypted " : ""}bytes: ${
|
||||
this.hasPassword ? x.sizeRemoteEnc : x.sizeRemote
|
||||
}`,
|
||||
]
|
||||
.filter((tmp) => tmp !== undefined)
|
||||
.join("\n");
|
||||
})
|
||||
.join("\n\n");
|
||||
}
|
||||
|
||||
onClose() {
|
||||
let { contentEl } = this;
|
||||
contentEl.empty();
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,11 @@
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.settings-auth-related {
|
||||
border-top: 1px solid var(--background-modifier-border);
|
||||
padding-top: 18px;
|
||||
}
|
||||
|
||||
.s3-disclaimer {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,111 @@
|
||||
import { expect } from "chai";
|
||||
import type { WebdavConfig } from "../src/baseTypes";
|
||||
import { applyWebdavPresetRulesInplace } from "../src/presetRules";
|
||||
|
||||
describe("Preset rules tests", () => {
|
||||
it("should check undefined correctly", () => {
|
||||
let x: Partial<WebdavConfig> | undefined = undefined;
|
||||
const y = applyWebdavPresetRulesInplace(x);
|
||||
expect(y.webdav === undefined);
|
||||
expect(!y.changed);
|
||||
});
|
||||
|
||||
it("should check empty object", () => {
|
||||
let x: Partial<WebdavConfig> | undefined = {};
|
||||
const y = applyWebdavPresetRulesInplace(x);
|
||||
expect(y.webdav).deep.equals({});
|
||||
expect(!y.changed);
|
||||
});
|
||||
|
||||
it("should modify depths correctly", () => {
|
||||
let x: Partial<WebdavConfig> = {
|
||||
address: "https://example.teracloud.jp/dav/",
|
||||
depth: "auto_unknown",
|
||||
};
|
||||
let y = applyWebdavPresetRulesInplace(x);
|
||||
expect(x.depth === "auto_1");
|
||||
expect(y.changed);
|
||||
|
||||
x = {
|
||||
address: "https://example.teracloud.jp/dav/example",
|
||||
depth: "auto_unknown",
|
||||
};
|
||||
y = applyWebdavPresetRulesInplace(x);
|
||||
expect(x.depth === "auto_1");
|
||||
expect(y.changed);
|
||||
|
||||
x = {
|
||||
address: "https://dav.jianguoyun.com/dav/",
|
||||
depth: "auto_unknown",
|
||||
};
|
||||
y = applyWebdavPresetRulesInplace(x);
|
||||
expect(x.depth === "auto_1");
|
||||
expect(y.changed);
|
||||
|
||||
x = {
|
||||
address: "https://dav.jianguoyun.com/dav/",
|
||||
depth: "auto_infinity",
|
||||
};
|
||||
y = applyWebdavPresetRulesInplace(x);
|
||||
expect(x.depth === "auto_1");
|
||||
expect(y.changed);
|
||||
});
|
||||
|
||||
it("should not modify depths if depths is set automatically correctly", () => {
|
||||
let x: Partial<WebdavConfig> = {
|
||||
address: "https://dav.jianguoyun.com/dav/",
|
||||
depth: "auto_1",
|
||||
};
|
||||
let y = applyWebdavPresetRulesInplace(x);
|
||||
expect(x.depth === "auto_1");
|
||||
expect(!y.changed);
|
||||
});
|
||||
|
||||
it("should not modify depths if depths have been set manually", () => {
|
||||
let x: Partial<WebdavConfig> = {
|
||||
address: "https://example.teracloud.jp/dav/",
|
||||
depth: "manual_infinity",
|
||||
};
|
||||
let y = applyWebdavPresetRulesInplace(x);
|
||||
expect(x.depth === "manual_infinity");
|
||||
expect(!y.changed);
|
||||
|
||||
x = {
|
||||
address: "https://example.teracloud.jp/dav/example",
|
||||
depth: "manual_1",
|
||||
};
|
||||
y = applyWebdavPresetRulesInplace(x);
|
||||
expect(x.depth === "manual_1");
|
||||
expect(!y.changed);
|
||||
});
|
||||
|
||||
it("should not modify depths when urls are not in preset rules", () => {
|
||||
let x: Partial<WebdavConfig> = {
|
||||
address: "https://teracloud.jp/dav/",
|
||||
depth: "auto_unknown",
|
||||
};
|
||||
applyWebdavPresetRulesInplace(x);
|
||||
expect(x.depth === "auto_unknown");
|
||||
|
||||
x = {
|
||||
address: "https://dav.jianguoyun.com/dav_example",
|
||||
depth: "auto_unknown",
|
||||
};
|
||||
applyWebdavPresetRulesInplace(x);
|
||||
expect(x.depth === "auto_unknown");
|
||||
|
||||
x = {
|
||||
address: "",
|
||||
depth: "auto_unknown",
|
||||
};
|
||||
applyWebdavPresetRulesInplace(x);
|
||||
expect(x.depth === "auto_unknown");
|
||||
|
||||
x = {
|
||||
address: "https://dav.jianguoyun.com/dav/",
|
||||
depth: "what" as any,
|
||||
};
|
||||
applyWebdavPresetRulesInplace(x);
|
||||
expect(x.depth === ("what" as any));
|
||||
});
|
||||
});
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"0.3.2": "0.12.15",
|
||||
"0.3.16": "0.13.21"
|
||||
"0.3.24": "0.13.21"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user