Compare commits

..
7 Commits
Author SHA1 Message Date
fyears 08b68e224d bump to 0.5.4
Release A New Version / build (16.x) (push) Failing after 51s
2024-06-11 00:11:52 +08:00
fyears 2e09686675 add yandex disk pro 2024-06-11 00:01:36 +08:00
fyears 5186dcb967 add tutorials for box and pcloud 2024-06-09 23:05:08 +08:00
fyears 24b839227a pcloud 2024-06-09 22:37:55 +08:00
fyears 12e45a7f38 box sdk 2024-06-09 16:09:21 +08:00
fyears d5c2f726f9 box 2024-06-09 13:37:55 +08:00
fyears 1e4d729eb7 make the wording explict 2024-06-02 23:50:54 +08:00
39 changed files with 4708 additions and 126 deletions
+6
View File
@@ -5,3 +5,9 @@ REMOTELYSAVE_WEBSITE=http://127.0.0.1:46683
REMOTELYSAVE_CLIENT_ID=cli-xxx REMOTELYSAVE_CLIENT_ID=cli-xxx
GOOGLEDRIVE_CLIENT_ID=xxx.apps.googleusercontent.com GOOGLEDRIVE_CLIENT_ID=xxx.apps.googleusercontent.com
GOOGLEDRIVE_CLIENT_SECRET=GOCSPX-sss GOOGLEDRIVE_CLIENT_SECRET=GOCSPX-sss
BOX_CLIENT_ID=
BOX_CLIENT_SECRET=
PCLOUD_CLIENT_ID=
PCLOUD_CLIENT_SECRET=
YANDEXDISK_CLIENT_ID=
YANDEXDISK_CLIENT_SECRET=
+6
View File
@@ -23,6 +23,12 @@ jobs:
REMOTELYSAVE_CLIENT_ID: ${{secrets.REMOTELYSAVE_CLIENT_ID}} REMOTELYSAVE_CLIENT_ID: ${{secrets.REMOTELYSAVE_CLIENT_ID}}
GOOGLEDRIVE_CLIENT_ID: ${{secrets.GOOGLEDRIVE_CLIENT_ID}} GOOGLEDRIVE_CLIENT_ID: ${{secrets.GOOGLEDRIVE_CLIENT_ID}}
GOOGLEDRIVE_CLIENT_SECRET: ${{secrets.GOOGLEDRIVE_CLIENT_SECRET}} GOOGLEDRIVE_CLIENT_SECRET: ${{secrets.GOOGLEDRIVE_CLIENT_SECRET}}
BOX_CLIENT_ID: ${{secrets.BOX_CLIENT_ID}}
BOX_CLIENT_SECRET: ${{secrets.BOX_CLIENT_SECRET}}
PCLOUD_CLIENT_ID: ${{secrets.PCLOUD_CLIENT_ID}}
PCLOUD_CLIENT_SECRET: ${{secrets.PCLOUD_CLIENT_SECRET}}
YANDEXDISK_CLIENT_ID: ${{secrets.YANDEXDISK_CLIENT_ID}}
YANDEXDISK_CLIENT_SECRET: ${{secrets.YANDEXDISK_CLIENT_SECRET}}
strategy: strategy:
matrix: matrix:
+6
View File
@@ -27,6 +27,12 @@ jobs:
REMOTELYSAVE_CLIENT_ID: ${{secrets.REMOTELYSAVE_CLIENT_ID}} REMOTELYSAVE_CLIENT_ID: ${{secrets.REMOTELYSAVE_CLIENT_ID}}
GOOGLEDRIVE_CLIENT_ID: ${{secrets.GOOGLEDRIVE_CLIENT_ID}} GOOGLEDRIVE_CLIENT_ID: ${{secrets.GOOGLEDRIVE_CLIENT_ID}}
GOOGLEDRIVE_CLIENT_SECRET: ${{secrets.GOOGLEDRIVE_CLIENT_SECRET}} GOOGLEDRIVE_CLIENT_SECRET: ${{secrets.GOOGLEDRIVE_CLIENT_SECRET}}
BOX_CLIENT_ID: ${{secrets.BOX_CLIENT_ID}}
BOX_CLIENT_SECRET: ${{secrets.BOX_CLIENT_SECRET}}
PCLOUD_CLIENT_ID: ${{secrets.PCLOUD_CLIENT_ID}}
PCLOUD_CLIENT_SECRET: ${{secrets.PCLOUD_CLIENT_SECRET}}
YANDEXDISK_CLIENT_ID: ${{secrets.YANDEXDISK_CLIENT_ID}}
YANDEXDISK_CLIENT_SECRET: ${{secrets.YANDEXDISK_CLIENT_SECRET}}
strategy: strategy:
matrix: matrix:
+16 -1
View File
@@ -20,9 +20,12 @@ This is yet another unofficial sync plugin for Obsidian. If you like it or find
- Amazon S3 or S3-compatible (Cloudflare R2 / BackBlaze B2 / MinIO / ...) - Amazon S3 or S3-compatible (Cloudflare R2 / BackBlaze B2 / MinIO / ...)
- Dropbox - Dropbox
- OneDrive for personal - OneDrive for personal
- Webdav - Webdav (NextCloud / InfiniCloud / Synology webdav server / ...)
- Webdis - Webdis
- Google Drive (PRO feature) - Google Drive (PRO feature)
- Box (PRO feature)
- pCloud (PRO feature)
- Yandex Disk (PRO feature)
- [Here](./docs/services_connectable_or_not.md) shows more connectable (or not-connectable) services in details. - [Here](./docs/services_connectable_or_not.md) shows more connectable (or not-connectable) services in details.
- **Obsidian Mobile supported.** Vaults can be synced across mobile and desktop devices with the cloud service as the "broker". - **Obsidian Mobile supported.** Vaults can be synced across mobile and desktop devices with the cloud service as the "broker".
- **[End-to-end encryption](./docs/encryption/README.md) supported.** Files would be encrypted using openssl format before being sent to the cloud **if** user specify a password. - **[End-to-end encryption](./docs/encryption/README.md) supported.** Files would be encrypted using openssl format before being sent to the cloud **if** user specify a password.
@@ -124,6 +127,18 @@ Additionally, the plugin author may occasionally visit Obsidian official forum a
PRO (paid) feature "sync with Google Drive" allows users to to sync with Google Drive. Tutorials and limitations are documented [here](./docs/remote_services/googledrive/README.md). PRO (paid) feature "sync with Google Drive" allows users to to sync with Google Drive. Tutorials and limitations are documented [here](./docs/remote_services/googledrive/README.md).
### Box (PRO feature)
PRO (paid) feature "sync with Box" allows users to to sync with Box. Tutorials and limitations are documented [here](./docs/remote_services/box/README.md).
### pCloud (PRO feature)
PRO (paid) feature "sync with pCloud" allows users to to sync with pCloud (using its native API instead of webdav). Tutorials and limitations are documented [here](./docs/remote_services/pcloud/README.md).
### Yandex Disk (PRO feature)
PRO (paid) feature "sync with Yandex Disk" allows users to to sync with Yandex Disk (using its native API instead of webdav). Tutorials and limitations are documented [here](./docs/remote_services/yandexdisk/README.md).
## Scheduled Auto Sync ## Scheduled Auto Sync
- You can configure auto syncing every N minutes in settings. - You can configure auto syncing every N minutes in settings.
+34
View File
@@ -0,0 +1,34 @@
# Box (PRO)
# Links
<https://www.box.com/>
# Intro
* It's a PRO feature of Remotely Save plugin.
* **This plugin is NOT an official Box product, and just uses Box's public api.**
# Steps
## Steps of Remotely Save subscription
1. Please sign up and sign in an online account, connect your plugin to your online account firstly. See [the PRO tutorial](../../pro/README.md) firstly.
2. Subscribe to "sync with Box" feature online.
3. Go back to your Remotely Save plugin inside Obsidian, click "Check again" button in PRO settings. So that the plugin knows some features are enabled. In this case, sync with Box should be detected.
## Steps of Connecting to your Box
After you enabled the PRO feature in your Remotely Save plugin, you can connect to your Box account now.
1. In Remotely Save settings, change your sync service to Box.
2. Click Auth, visit the link, go to Box website to start.
3. Follow the instruction on Box, and allow Remotely Save to connect.
4. You will be redirected back to Remotely Save plugin.
5. A notice will tell you that you've connected or not.
6. Sync! The plugin will create a vault folder in the root of your Box and upload notes into that folder.
7. **Read the caveats below.**
# The caveats
* As of June 2024, this feature is in beta stage. **Back up your vault before using this feature.**
+1 -1
View File
@@ -38,7 +38,7 @@ Because Google Drive's api doesn't fit into the special envorinment of Obsidian
# The credential # The credential
The website does **NOT** store or save the credential (the code you obtian in the end of the flow). The website is just a "bridge" to help you obtain that code, and just manage your subscription to PRO features. The website does **NOT** store or save the Google drive credential (the code you obtian in the end of the flow). The website is just a "bridge" to help you obtain that code, and just manage your subscription to PRO features.
But please be aware that the code is saved locally in your Obsidian. It works like a special password. So that the plugin can upload or download or modify the files for you. But please be aware that the code is saved locally in your Obsidian. It works like a special password. So that the plugin can upload or download or modify the files for you.
+40
View File
@@ -0,0 +1,40 @@
# pCloud (PRO)
# Links
<https://www.pcloud.com/>
# Intro
* It's a PRO feature of Remotely Save plugin.
* **This plugin is NOT an official pCloud product, and just uses pCloud's public api.**
# Steps
## Steps of Remotely Save subscription
1. Please sign up and sign in an online account, connect your plugin to your online account firstly. See [the PRO tutorial](../../pro/README.md) firstly.
2. Subscribe to "sync with pCloud" feature online.
3. Go back to your Remotely Save plugin inside Obsidian, click "Check again" button in PRO settings. So that the plugin knows some features are enabled. In this case, sync with pCloud should be detected.
## Steps of Connecting to your pCloud
After you enabled the PRO feature in your Remotely Save plugin, you can connect to your pCloud account now.
1. In Remotely Save settings, change your sync service to pCloud.
2. Click Auth, visit the link, go to pCloud website to start.
3. Follow the instruction on pCloud, and allow Remotely Save to connect.
4. You will be redirected back to Remotely Save plugin.
5. A notice will tell you that you've connected or not.
6. Sync! The plugin will create a vault folder in the root of your pCloud and upload notes into that folder.
7. **Read the caveats below.**
# The caveats
* As of June 2024, this feature is in beta stage. **Back up your vault before using this feature.**
* pCloud's API seems to not allow uploading empty files. You can choose to skip them or raise errors in Remotely Save plugin's settings.
# Why not use webdav?
1. pCloud only provides webdav for Premium. If you are a Premium user, you can still use pCloud webdav with Remotely Save.
2. The Remotely Save PRO feture "sync with pCloud" is developed using pCloud's native API, instead of webdav interface. It brings benefits such that the last modified time can be preserved.
+44
View File
@@ -0,0 +1,44 @@
# Yandex Disk (PRO)
# Links
<https://disk.yandex.com/client/disk>
# Intro
* It's a PRO feature of Remotely Save plugin.
* **This plugin is NOT an official Yandex Disk or Yandex product, and just uses Yandex Disk's public api.**
# Steps
## Steps of Remotely Save subscription
1. Please sign up and sign in an online account, connect your plugin to your online account firstly. See [the PRO tutorial](../../pro/README.md) firstly.
2. Subscribe to "sync with Yandex Disk" feature online.
3. Go back to your Remotely Save plugin inside Obsidian, click "Check again" button in PRO settings. So that the plugin knows some features are enabled. In this case, sync with Yandex Disk should be detected.
## Steps of Connecting to your Yandex Disk
After you enabled the PRO feature in your Remotely Save plugin, you can connect to your Yandex Disk account now.
1. In Remotely Save settings, change your sync service to Yandex Disk.
2. Click Auth, visit the link, go to Yandex Disk website to start.
3. Follow the instruction on Yandex Disk, and allow Remotely Save to connect.
4. You will be redirected back to Remotely Save plugin.
5. A notice will tell you that you've connected or not.
6. Sync! The plugin will create a vault folder in the root of your Yandex Disk and upload notes into that folder.
7. **Read the caveats below.**
# The caveats
* As of June 2024, this feature is in beta stage. **Back up your vault before using this feature.**
# Why not use webdav?
1. The Remotely Save PRO feture "sync with Yandex Disk" is developed using Yandex Disk's native API, instead of webdav interface. It brings benefits such that the last modified time can be preserved.
2. Some users prefer oauth2 method to authorize themselves.
# Bonus: where to register the app
* <https://oauth.yandex.com/client/new/> or <https://oauth.yandex.ru/client/new/>
* redirect uri can be set to <https://oauth.yandex.com/verification_code> or <https://oauth.yandex.ru/verification_code>.
+38 -34
View File
@@ -6,37 +6,41 @@ The plugin works under the browser environment in Obsidian, so CORS is an issue.
The list is for information purposes only. The list is for information purposes only.
| Service | Connectable | by S3 | by WebDAV | by other protocol | can bypass CORS issue in latest Obsidian | need CORS config in old Obsidian |
| ------------------------------------------------------------------------------------- | ----------- | ----- | --------- | ---------------------------------------------------------------- | ---------------------------------------- | ------------------------------------------------ | | Service | Connectable | by S3 | by WebDAV | by other protocol |
| Amazon S3 | Yes | Yes | | | Yes | [CORS config needed.](./s3_cors_configure.md) | | ------ | ------ | ------ | ------ | ------ |
| Tencent Cloud - Cloud Object Storage (COS) 腾讯云对象存储 | Yes | Yes | | | Yes | CORS config needed. | | Amazon S3 | Yes | Yes | | |
| Alibaba Cloud - Object Storage Service 阿里云对象存储 | Yes | Yes | | | Yes | CORS config needed. | | Tencent Cloud - Cloud Object Storage (COS) 腾讯云对象存储 | Yes | Yes | | |
| Backblaze B2 Cloud Storage | Yes | Yes | | | Yes | Its CORS rules doesn't allow no-http(s) origins. | | Alibaba Cloud - Object Storage Service 阿里云对象存储 | Yes | Yes | | |
| [Wasabi](https://wasabi.com) | ? | ? | | | | | | Backblaze B2 Cloud Storage | Yes | Yes | | |
| [filebase](https://filebase.com/) | Yes | Yes | | | Yes | CORS config needed. | | [Wasabi](https://wasabi.com) | ? | ? | | |
| QingStor 青云 | ? | ? | | | | | | [filebase](https://filebase.com/) | Yes | Yes | | |
| [MinIO](https://min.io/) | ? | ? | | | | | | QingStor 青云 | ? | ? | | |
| [WsgiDAV](https://github.com/mar10/wsgidav) | Yes | | Yes | | Yes | CORS rules can be set. | | [MinIO](https://min.io/) | Yes | Yes | | |
| [Nginx `ngx_http_dav_module`](http://nginx.org/en/docs/http/ngx_http_dav_module.html) | Yes? | | Yes? | | Yes? | ? | | [WsgiDAV](https://github.com/mar10/wsgidav) | Yes | | Yes | |
| NextCloud | Yes | | Yes | | Yes? | No CORS config by default. | | [Nginx `ngx_http_dav_module`](http://nginx.org/en/docs/http/ngx_http_dav_module.html) | Yes | | Yes | |
| OwnCloud | Yes? | | Yes? | | Yes? | No CORS config by default. | | NextCloud | Yes | | Yes | |
| Seafile | Yes | | Yes | | Yes? | No CORS config by default. | | OwnCloud | Yes? | | Yes? | |
| `rclone serve webdav` | Yes | | Yes | | Yes | No CORS support. | | Seafile | Yes | | Yes | |
| [Nutstore 坚果云](https://www.jianguoyun.com/) | Yes | | Yes | | Yes | No CORS support. | | `rclone serve webdav` | Yes | | Yes | |
| [TeraCLOUD](https://teracloud.jp/en/) | Yes | | Yes | | Yes | No CORS support. | | [Nutstore 坚果云](https://www.jianguoyun.com/) | Yes (partially) | | Yes (partially) | |
| Dropbox | Yes | | | Yes | | | | [TeraCLOUD](https://teracloud.jp/en/) | Yes | | Yes | |
| OneDrive for personal | Yes | | | Yes | | | | Seafile | ? | | ? | ? |
| OneDrive for Business | Yes | | | ? | | | | Dropbox | Yes | | | Yes |
| Google Drive | In the plan | | | ? | | | | OneDrive for personal | Yes | | | Yes |
| [Box](https://www.box.com/) | ? | | | May be possible but needs further development. | | | | OneDrive for Business | Yes | | | ? |
| Google Cloud Storage | ? | | | May be possible but needs further development. | | | | Google Drive | Yes (with limitations) (PRO) | | | Yes (with limitations) (PRO) |
| Microsoft Azure Blob Storage | ? | | | May be possible but needs further development. | | | | [Box](https://www.box.com/) | Yes (PRO) | | | Yes (PRO) |
| [OpenStack Storage (Swift)](https://github.com/openstack/swift) | ? | | | May be possible but needs further development. | | | | [pCloud](https://www.pcloud.com/) | Yes (PRO) | | Yes | Yes (PRO) |
| https://put.io/ | ? | | | ? | | | | Google Cloud Storage | ? | | | May be possible but needs further development. |
| Yandex Disk | ? | | | ? | | | | Microsoft Azure Blob Storage | ? | | | May be possible but needs further development. |
| FTP / FTPS | Never | | | Technically never possible to be implemented. | | | | [OpenStack Storage (Swift)](https://github.com/openstack/swift) | ? | | | May be possible but needs further development. |
| SFTP | Never | | | Technically never possible to be implemented. | | | | <https://put.io/> | ? | | | ? |
| Jottacloud | No | | | No. It seems that no open api is available. | | | | Yandex Disk | Yes (PRO) | | Yes | Yes (PRO) |
| Mega | Never | | | No. No js api is available. | | | | FTP / FTPS | Never | | | Technically never possible to be implemented. |
| Git | Never | | | No. Technically very hard, if not impossible, to be implemented. | | | | SFTP | Never | | | Technically never possible to be implemented. |
| | | | | | | | | Jottacloud | No | | | No. It seems that no open api is available. |
| Mega | Never | | | No. No js api is available. |
| Git | Never | | | No. Technically very hard, if not impossible, to be implemented. |
| [Koofr](https://koofr.eu/) | ? | | ? | ? |
| [Blomp](https://www.blomp.com/) | ? | | | May be possible but needs further development. |
+13
View File
@@ -22,6 +22,13 @@ const DEFAULT_REMOTELYSAVE_CLIENT_ID = process.env.REMOTELYSAVE_CLIENT_ID || "";
const DEFAULT_GOOGLEDRIVE_CLIENT_ID = process.env.GOOGLEDRIVE_CLIENT_ID || ""; const DEFAULT_GOOGLEDRIVE_CLIENT_ID = process.env.GOOGLEDRIVE_CLIENT_ID || "";
const DEFAULT_GOOGLEDRIVE_CLIENT_SECRET = const DEFAULT_GOOGLEDRIVE_CLIENT_SECRET =
process.env.GOOGLEDRIVE_CLIENT_SECRET || ""; process.env.GOOGLEDRIVE_CLIENT_SECRET || "";
const DEFAULT_BOX_CLIENT_ID = process.env.BOX_CLIENT_ID || "";
const DEFAULT_BOX_CLIENT_SECRET = process.env.BOX_CLIENT_SECRET || "";
const DEFAULT_PCLOUD_CLIENT_ID = process.env.PCLOUD_CLIENT_ID || "";
const DEFAULT_PCLOUD_CLIENT_SECRET = process.env.PCLOUD_CLIENT_SECRET || "";
const DEFAULT_YANDEXDISK_CLIENT_ID = process.env.YANDEXDISK_CLIENT_ID || "";
const DEFAULT_YANDEXDISK_CLIENT_SECRET =
process.env.YANDEXDISK_CLIENT_SECRET || "";
esbuild esbuild
.context({ .context({
@@ -61,6 +68,12 @@ esbuild
"process.env.DEFAULT_REMOTELYSAVE_CLIENT_ID": `"${DEFAULT_REMOTELYSAVE_CLIENT_ID}"`, "process.env.DEFAULT_REMOTELYSAVE_CLIENT_ID": `"${DEFAULT_REMOTELYSAVE_CLIENT_ID}"`,
"process.env.DEFAULT_GOOGLEDRIVE_CLIENT_ID": `"${DEFAULT_GOOGLEDRIVE_CLIENT_ID}"`, "process.env.DEFAULT_GOOGLEDRIVE_CLIENT_ID": `"${DEFAULT_GOOGLEDRIVE_CLIENT_ID}"`,
"process.env.DEFAULT_GOOGLEDRIVE_CLIENT_SECRET": `"${DEFAULT_GOOGLEDRIVE_CLIENT_SECRET}"`, "process.env.DEFAULT_GOOGLEDRIVE_CLIENT_SECRET": `"${DEFAULT_GOOGLEDRIVE_CLIENT_SECRET}"`,
"process.env.DEFAULT_BOX_CLIENT_ID": `"${DEFAULT_BOX_CLIENT_ID}"`,
"process.env.DEFAULT_BOX_CLIENT_SECRET": `"${DEFAULT_BOX_CLIENT_SECRET}"`,
"process.env.DEFAULT_PCLOUD_CLIENT_ID": `"${DEFAULT_PCLOUD_CLIENT_ID}"`,
"process.env.DEFAULT_PCLOUD_CLIENT_SECRET": `"${DEFAULT_PCLOUD_CLIENT_SECRET}"`,
"process.env.DEFAULT_YANDEXDISK_CLIENT_ID": `"${DEFAULT_YANDEXDISK_CLIENT_ID}"`,
"process.env.DEFAULT_YANDEXDISK_CLIENT_SECRET": `"${DEFAULT_YANDEXDISK_CLIENT_SECRET}"`,
global: "window", global: "window",
"process.env.NODE_DEBUG": `undefined`, // ugly fix "process.env.NODE_DEBUG": `undefined`, // ugly fix
"process.env.DEBUG": `undefined`, // ugly fix "process.env.DEBUG": `undefined`, // ugly fix
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"id": "remotely-save", "id": "remotely-save",
"name": "Remotely Save", "name": "Remotely Save",
"version": "0.5.3", "version": "0.5.4",
"minAppVersion": "0.13.21", "minAppVersion": "0.13.21",
"description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.", "description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
"author": "fyears", "author": "fyears",
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"id": "remotely-save", "id": "remotely-save",
"name": "Remotely Save", "name": "Remotely Save",
"version": "0.5.3", "version": "0.5.4",
"minAppVersion": "0.13.21", "minAppVersion": "0.13.21",
"description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.", "description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
"author": "fyears", "author": "fyears",
+3 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "remotely-save", "name": "remotely-save",
"version": "0.5.3", "version": "0.5.4",
"description": "This is yet another sync plugin for Obsidian app.", "description": "This is yet another sync plugin for Obsidian app.",
"scripts": { "scripts": {
"dev2": "node esbuild.config.mjs --watch", "dev2": "node esbuild.config.mjs --watch",
@@ -71,6 +71,7 @@
"aggregate-error": "^5.0.0", "aggregate-error": "^5.0.0",
"assert": "^2.1.0", "assert": "^2.1.0",
"aws-crt": "^1.21.2", "aws-crt": "^1.21.2",
"box-typescript-sdk-gen": "^1.0.0",
"buffer": "^6.0.3", "buffer": "^6.0.3",
"crypto-browserify": "^3.12.0", "crypto-browserify": "^3.12.0",
"dropbox": "^10.34.0", "dropbox": "^10.34.0",
@@ -87,6 +88,7 @@
"node-diff3": "^3.1.2", "node-diff3": "^3.1.2",
"p-queue": "^8.0.1", "p-queue": "^8.0.1",
"path-browserify": "^1.0.1", "path-browserify": "^1.0.1",
"pcloud-sdk-js": "^2.0.0",
"process": "^0.11.10", "process": "^0.11.10",
"qrcode": "^1.5.3", "qrcode": "^1.5.3",
"rfc4648": "^1.5.3", "rfc4648": "^1.5.3",
+27 -42
View File
@@ -1,8 +1,8 @@
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { base64url } from "rfc4648";
import { import {
OAUTH2_FORCE_EXPIRE_MILLISECONDS, OAUTH2_FORCE_EXPIRE_MILLISECONDS,
type RemotelySavePluginSettings, type RemotelySavePluginSettings,
type SUPPORTED_SERVICES_TYPE,
} from "../../src/baseTypes"; } from "../../src/baseTypes";
import { import {
COMMAND_CALLBACK_PRO, COMMAND_CALLBACK_PRO,
@@ -12,6 +12,7 @@ import {
PRO_WEBSITE, PRO_WEBSITE,
type ProConfig, type ProConfig,
} from "./baseTypesPro"; } from "./baseTypesPro";
import { codeVerifier2CodeChallenge } from "./oauth2";
const site = PRO_WEBSITE; const site = PRO_WEBSITE;
console.debug(`remotelysave official website: ${site}`); console.debug(`remotelysave official website: ${site}`);
@@ -25,31 +26,6 @@ export const DEFAULT_PRO_CONFIG: ProConfig = {
email: "", email: "",
}; };
/**
* https://datatracker.ietf.org/doc/html/rfc7636
* dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk
* => E9Melhoa2OwvFrEMTJguCHaoeK1t8URWbuGJSstw-cM
* @param x
* @returns BASE64URL-ENCODE(SHA256(ASCII(code_verifier)))
*/
async function codeVerifier2CodeChallenge(x: string) {
if (x === undefined || x === "") {
return "";
}
try {
return base64url.stringify(
new Uint8Array(
await crypto.subtle.digest("SHA-256", new TextEncoder().encode(x))
),
{
pad: false,
}
);
} catch (e) {
return "";
}
}
export const generateAuthUrlAndCodeVerifierChallenge = async ( export const generateAuthUrlAndCodeVerifierChallenge = async (
hasCallback: boolean hasCallback: boolean
) => { ) => {
@@ -241,7 +217,6 @@ export const getAndSaveProEmail = async (
* @returns * @returns
*/ */
export const checkProRunnableAndFixInplace = async ( export const checkProRunnableAndFixInplace = async (
featuresToCheck: PRO_FEATURE_TYPE[],
config: RemotelySavePluginSettings, config: RemotelySavePluginSettings,
pluginVersion: string, pluginVersion: string,
saveUpdatedConfigFunc: () => Promise<any> | undefined saveUpdatedConfigFunc: () => Promise<any> | undefined
@@ -276,8 +251,7 @@ export const checkProRunnableAndFixInplace = async (
const errorMsgs = []; const errorMsgs = [];
// check for the features // check for smart_conflict
if (featuresToCheck.contains("feature-smart_conflict")) {
if (config.conflictAction === "smart_conflict") { if (config.conflictAction === "smart_conflict") {
if ( if (
config.pro.enabledProFeatures.filter( config.pro.enabledProFeatures.filter(
@@ -293,26 +267,37 @@ export const checkProRunnableAndFixInplace = async (
} else { } else {
// good to go // good to go
} }
}
if (featuresToCheck.contains("feature-google_drive")) { const toChecked: {
console.debug( feature: PRO_FEATURE_TYPE;
`checking "feature-google_drive", serviceType=${config.serviceType}` service: SUPPORTED_SERVICES_TYPE;
); name: string;
console.debug( }[] = [
`enabledProFeatures=${JSON.stringify(config.pro.enabledProFeatures)}` {
); feature: "feature-google_drive",
service: "googledrive",
name: "Google Drive",
},
{ feature: "feature-box", service: "box", name: "Box" },
{ feature: "feature-pcloud", service: "pcloud", name: "pCloud" },
{
feature: "feature-yandex_disk",
service: "yandexdisk",
name: "Yandex Disk",
},
];
if (config.serviceType === "googledrive") { for (const { feature, service, name } of toChecked) {
console.debug(`checking "${feature}", serviceType=${config.serviceType}`);
if (config.serviceType === service) {
if ( if (
config.pro.enabledProFeatures.filter( config.pro.enabledProFeatures.filter((x) => x.featureName === feature)
(x) => x.featureName === "feature-google_drive" .length === 1
).length === 1
) { ) {
// good to go // good to go
} else { } else {
errorMsgs.push( errorMsgs.push(
`You're trying to use "sync with Google Drive" PRO feature but you haven't subscribe to it.` `You're trying to use "sync with ${name}" PRO feature but you haven't subscribe to it.`
); );
} }
} else { } else {
+17
View File
@@ -0,0 +1,17 @@
# checklist for adding new service
1. `fsXxx.ts`
2. `settingsXxx.ts`
3. add callback and `xxxConfig` in `baseTypesPro.ts`
4. add `xxxConfig` to `DEFAULT_SETTINGS` and `RemotelySavePluginSettings` in `main.ts`
5. add `registerObsidianProtocolHandler`, if undefinded, `let xxxExpired`, expired notice in `main.ts`
6. add `langs/`
7. add css into `styles.css`
8. general `settings.ts` add: config part, chooser, import export
9. `generateProSettingsPart.ts`
10. `importExport.ts`
11. `fsGetter.ts`
12. `sync.ts` checking for PRO: `checkProRunnableAndFixInplace`
13. `configPersist.test.ts`
14. `README.md` add service at menu and detail
15. `docs/` add service
+74 -2
View File
@@ -1,4 +1,6 @@
export const MERGABLE_SIZE = 1000 * 1000; // 1 MB ///////////////////////////////////////////////////////////
// PRO
//////////////////////////////////////////////////////////
export const COMMAND_CALLBACK_PRO = "remotely-save-cb-pro"; export const COMMAND_CALLBACK_PRO = "remotely-save-cb-pro";
export const PRO_CLIENT_ID = process.env.DEFAULT_REMOTELYSAVE_CLIENT_ID; export const PRO_CLIENT_ID = process.env.DEFAULT_REMOTELYSAVE_CLIENT_ID;
@@ -6,7 +8,10 @@ export const PRO_WEBSITE = process.env.DEFAULT_REMOTELYSAVE_WEBSITE;
export type PRO_FEATURE_TYPE = export type PRO_FEATURE_TYPE =
| "feature-smart_conflict" | "feature-smart_conflict"
| "feature-google_drive"; | "feature-google_drive"
| "feature-box"
| "feature-pcloud"
| "feature-yandex_disk";
export interface FeatureInfo { export interface FeatureInfo {
featureName: PRO_FEATURE_TYPE; featureName: PRO_FEATURE_TYPE;
@@ -24,6 +29,16 @@ export interface ProConfig {
credentialsShouldBeDeletedAtTimeMs?: number; credentialsShouldBeDeletedAtTimeMs?: number;
} }
///////////////////////////////////////////////////////////
// smart conflict
//////////////////////////////////////////////////////////
export const MERGABLE_SIZE = 1000 * 1000; // 1 MB
///////////////////////////////////////////////////////////
// Google Drive
//////////////////////////////////////////////////////////
export interface GoogleDriveConfig { export interface GoogleDriveConfig {
accessToken: string; accessToken: string;
accessTokenExpiresInMs: number; accessTokenExpiresInMs: number;
@@ -32,9 +47,66 @@ export interface GoogleDriveConfig {
remoteBaseDir?: string; remoteBaseDir?: string;
credentialsShouldBeDeletedAtTimeMs?: number; credentialsShouldBeDeletedAtTimeMs?: number;
scope: "https://www.googleapis.com/auth/drive.file"; scope: "https://www.googleapis.com/auth/drive.file";
kind: "googledrive";
} }
export const DEFAULT_GOOGLEDRIVE_CLIENT_ID = export const DEFAULT_GOOGLEDRIVE_CLIENT_ID =
process.env.DEFAULT_GOOGLEDRIVE_CLIENT_ID; process.env.DEFAULT_GOOGLEDRIVE_CLIENT_ID;
export const DEFAULT_GOOGLEDRIVE_CLIENT_SECRET = export const DEFAULT_GOOGLEDRIVE_CLIENT_SECRET =
process.env.DEFAULT_GOOGLEDRIVE_CLIENT_SECRET; process.env.DEFAULT_GOOGLEDRIVE_CLIENT_SECRET;
///////////////////////////////////////////////////////////
// box
//////////////////////////////////////////////////////////
export const COMMAND_CALLBACK_BOX = "remotely-save-cb-box";
export const BOX_CLIENT_ID = process.env.DEFAULT_BOX_CLIENT_ID;
export const BOX_CLIENT_SECRET = process.env.DEFAULT_BOX_CLIENT_SECRET;
export interface BoxConfig {
accessToken: string;
accessTokenExpiresInMs: number;
accessTokenExpiresAtTimeMs: number;
refreshToken: string;
remoteBaseDir?: string;
credentialsShouldBeDeletedAtTimeMs?: number;
kind: "box";
}
///////////////////////////////////////////////////////////
// pCloud
//////////////////////////////////////////////////////////
export const COMMAND_CALLBACK_PCLOUD = "remotely-save-cb-pcloud";
export const PCLOUD_CLIENT_ID = process.env.DEFAULT_PCLOUD_CLIENT_ID;
export const PCLOUD_CLIENT_SECRET = process.env.DEFAULT_PCLOUD_CLIENT_SECRET;
export interface PCloudConfig {
accessToken: string;
hostname: "eapi.pcloud.com" | "api.pcloud.com";
locationid: 1 | 2;
remoteBaseDir?: string;
credentialsShouldBeDeletedAtTimeMs?: number;
emptyFile: "skip" | "error";
kind: "pcloud";
}
///////////////////////////////////////////////////////////
// Yandex Disk
//////////////////////////////////////////////////////////
export const COMMAND_CALLBACK_YANDEXDISK = "remotely-save-cb-yandexdisk";
export const YANDEXDISK_CLIENT_ID = process.env.DEFAULT_YANDEXDISK_CLIENT_ID;
export const YANDEXDISK_CLIENT_SECRET =
process.env.DEFAULT_YANDEXDISK_CLIENT_SECRET;
export interface YandexDiskConfig {
accessToken: string;
accessTokenExpiresInMs: number;
accessTokenExpiresAtTimeMs: number;
refreshToken: string;
remoteBaseDir?: string;
credentialsShouldBeDeletedAtTimeMs?: number;
scope: string;
kind: "yandexdisk";
}
+924
View File
@@ -0,0 +1,924 @@
import {
BoxOAuth,
OAuthConfig,
} from "box-typescript-sdk-gen/lib/box/oauth.generated";
import * as mime from "mime-types";
import { DEFAULT_CONTENT_TYPE, type Entity } from "../../src/baseTypes";
import { FakeFs } from "../../src/fsAll";
import {
BOX_CLIENT_ID,
BOX_CLIENT_SECRET,
type BoxConfig,
COMMAND_CALLBACK_BOX,
} from "./baseTypesPro";
import { BoxDeveloperTokenAuth } from "box-typescript-sdk-gen/lib/box/developerTokenAuth.generated";
import { BoxClient } from "box-typescript-sdk-gen/lib/client.generated";
import type { FileFull } from "box-typescript-sdk-gen/lib/schemas/fileFull.generated";
import type { FileFullOrFolderMiniOrWebLink } from "box-typescript-sdk-gen/lib/schemas/fileFullOrFolderMiniOrWebLink.generated";
import type { FolderFull } from "box-typescript-sdk-gen/lib/schemas/folderFull.generated";
import type { Items } from "box-typescript-sdk-gen/lib/schemas/items.generated";
import PQueue from "p-queue";
import {
delay,
getFolderLevels,
getSha1,
splitFileSizeToChunkRanges,
unixTimeToStr,
} from "../../src/misc";
export const DEFAULT_BOX_CONFIG: BoxConfig = {
accessToken: "",
refreshToken: "",
accessTokenExpiresInMs: 0,
accessTokenExpiresAtTimeMs: 0,
credentialsShouldBeDeletedAtTimeMs: 0, // 60 days https://developer.box.com/guides/authentication/tokens/refresh/
kind: "box",
};
export const generateAuthUrl = () => {
const config = new OAuthConfig({
clientId: BOX_CLIENT_ID ?? "",
clientSecret: BOX_CLIENT_SECRET ?? "",
});
const oauth = new BoxOAuth({ config: config });
// the URL to redirect the user to
const authorize_url = oauth.getAuthorizeUrl({
redirectUri: `obsidian://${COMMAND_CALLBACK_BOX}`,
});
// console.debug(authorize_url)
return authorize_url;
};
/**
* https://developer.box.com/guides/authentication/oauth2/without-sdk/
*/
export const sendAuthReq = async (authCode: string, errorCallBack: any) => {
try {
const k = {
code: authCode,
grant_type: "authorization_code",
client_id: BOX_CLIENT_ID ?? "",
client_secret: BOX_CLIENT_SECRET ?? "",
// redirect_uri: `obsidian://${COMMAND_CALLBACK_BOX}`,
};
// console.debug(k);
const resp1 = await fetch(`https://api.box.com/oauth2/token`, {
method: "POST",
body: new URLSearchParams(k),
});
const resp2 = await resp1.json();
return resp2;
} catch (e) {
console.error(e);
if (errorCallBack !== undefined) {
await errorCallBack(e);
}
}
};
/**
* https://developer.box.com/guides/authentication/tokens/refresh/
*/
export const sendRefreshTokenReq = async (refreshToken: string) => {
console.debug(`refreshing token`);
const x = await fetch("https://api.box.com/oauth2/token", {
method: "POST",
headers: {
"Content-Type": "application/x-www-form-urlencoded",
},
body: new URLSearchParams({
client_id: BOX_CLIENT_ID ?? "",
client_secret: BOX_CLIENT_SECRET ?? "",
grant_type: "refresh_token",
refresh_token: refreshToken,
}).toString(),
});
if (x.status === 200) {
const y = await x.json();
console.debug(`new token obtained`);
return y;
} else {
throw Error(`cannot refresh an access token`);
}
};
export const setConfigBySuccessfullAuthInplace = async (
config: BoxConfig,
authRes: any,
saveUpdatedConfigFunc: () => Promise<any> | undefined
) => {
if (authRes.access_token === undefined || authRes.access_token === "") {
throw Error(
`you should not save the setting for ${JSON.stringify(authRes)}`
);
}
config.accessToken = authRes.access_token;
config.accessTokenExpiresAtTimeMs =
Date.now() + authRes.expires_in * 1000 - 5 * 60 * 1000;
config.accessTokenExpiresInMs = authRes.expires_in * 1000;
config.refreshToken = authRes.refresh_token || config.refreshToken;
// manually set it expired after 60 days;
config.credentialsShouldBeDeletedAtTimeMs =
Date.now() + 1000 * 60 * 60 * 24 * 59;
await saveUpdatedConfigFunc?.();
console.info("finish updating local info of Box token");
};
interface CreateUploadSessionRawResponse {
id: string;
type: "upload_session";
num_parts_processed: number;
part_size: number;
session_endpoints: {
abort: string;
commit: string;
list_parts: string;
log_event: string;
status: string;
upload_part: string;
};
session_expires_at: string;
total_parts: number;
}
interface UploadChunkRawResponse {
part: {
offset: number;
part_id: string;
sha1: string;
size: number;
};
}
interface BoxEntity extends Entity {
id: string;
parentID: string | undefined;
parentIDPath: string | undefined;
isFolder: boolean;
hashSha1: string | undefined;
}
const fromBoxItemToEntity = (
boxItem: FileFullOrFolderMiniOrWebLink | FolderFull,
parentID: string,
parentFolderPath: string | undefined /* for bfs */
): BoxEntity => {
if (parentID === undefined || parentID === "" || parentID === "0") {
throw Error(`parentID=${parentID} should not be in fromBoxItemToEntity`);
}
let keyRaw = boxItem.name!;
if (
parentFolderPath !== undefined &&
parentFolderPath !== "" &&
parentFolderPath !== "/"
) {
if (!parentFolderPath.endsWith("/")) {
throw Error(
`parentFolderPath=${parentFolderPath} should not be in fromFileToBoxEntity`
);
}
keyRaw = `${parentFolderPath}${boxItem.name!}`;
}
if (boxItem.type === "folder") {
keyRaw = `${keyRaw}/`;
const mtime =
(boxItem as FolderFull).contentModifiedAt?.value.valueOf() ??
(boxItem as FolderFull).modifiedAt?.value.valueOf() ??
Date.now();
return {
key: keyRaw,
keyRaw: keyRaw,
mtimeCli: mtime,
mtimeSvr: mtime,
id: boxItem.id,
parentID: parentID,
isFolder: true,
size: 0,
sizeRaw: 0,
hash: undefined,
hashSha1: undefined,
parentIDPath: parentFolderPath,
};
} else if (boxItem.type === "file") {
const mtime =
boxItem.contentModifiedAt?.value.valueOf() ??
boxItem.modifiedAt?.value.valueOf() ??
Date.now();
return {
key: keyRaw,
keyRaw: keyRaw,
mtimeCli: mtime,
mtimeSvr: mtime,
id: boxItem.id,
parentID: parentID,
isFolder: false,
size: boxItem.size!,
sizeRaw: boxItem.size!,
hash: boxItem.sha1,
hashSha1: boxItem.sha1,
parentIDPath: parentFolderPath,
};
} else {
throw Error(`we do not support web link Box item`);
}
};
const fromRawResponseToEntity = (
boxItem: any,
parentID: string,
parentFolderPath: string | undefined /* for bfs */
): BoxEntity => {
if (parentID === undefined || parentID === "" || parentID === "0") {
throw Error(
`parentID=${parentID} should not be in fromRawResponseToEntity`
);
}
let keyRaw = boxItem.name!;
if (
parentFolderPath !== undefined &&
parentFolderPath !== "" &&
parentFolderPath !== "/"
) {
if (!parentFolderPath.endsWith("/")) {
throw Error(
`parentFolderPath=${parentFolderPath} should not be in fromFileToBoxEntity`
);
}
keyRaw = `${parentFolderPath}${boxItem.name!}`;
}
if (boxItem.type === "folder") {
keyRaw = `${keyRaw}/`;
} else if (boxItem.type === "file") {
// pass
} else {
throw Error(`we do not support web link Box item`);
}
const mtimeStr = boxItem.content_modified_at ?? boxItem.modified_at;
let mtime = Date.now();
if (mtimeStr !== undefined) {
mtime = new Date(mtimeStr).valueOf();
}
return {
key: keyRaw,
keyRaw: keyRaw,
mtimeCli: mtime,
mtimeSvr: mtime,
id: boxItem.id,
parentID: parentID,
isFolder: false,
size: boxItem.size ?? 0,
sizeRaw: boxItem.size ?? 0,
hash: boxItem.sha1 ?? undefined,
hashSha1: boxItem.sha1 ?? undefined,
parentIDPath: parentFolderPath,
};
};
export class FakeFsBox extends FakeFs {
kind: string;
boxConfig: BoxConfig;
remoteBaseDir: string;
vaultFolderExists: boolean;
saveUpdatedConfigFunc: () => Promise<any>;
keyToBoxEntity: Record<string, BoxEntity>;
baseDirID: string;
constructor(
boxConfig: BoxConfig,
vaultName: string,
saveUpdatedConfigFunc: () => Promise<any>
) {
super();
this.kind = "box";
this.boxConfig = boxConfig;
this.remoteBaseDir = this.boxConfig.remoteBaseDir || vaultName || "";
this.vaultFolderExists = false;
this.saveUpdatedConfigFunc = saveUpdatedConfigFunc;
this.keyToBoxEntity = {};
this.baseDirID = "";
}
async _init() {
const access = await this._getAccessToken();
if (this.vaultFolderExists) {
// pass
} else {
const auth = new BoxDeveloperTokenAuth({ token: access });
const client = new BoxClient({ auth });
// find
let itemsInRoot: Items | undefined = undefined;
let offset = 0;
const limitPerPage = 1000; // max 1000
while (!this.vaultFolderExists) {
itemsInRoot = await client.folders.getFolderItems("0", {
queryParams: {
fields: [
"id",
"type",
"name",
"sha1",
"size",
"created_at",
"modified_at",
"expires_at",
"parent",
"content_created_at",
"content_modified_at",
"etag",
],
offset: offset,
limit: limitPerPage,
},
});
// console.debug(`this.remoteBaseDir=${this.remoteBaseDir}`);
// console.debug(`itemsInRoot:`);
// console.debug(itemsInRoot);
if (
(itemsInRoot.entries?.filter((x) => x.name === this.remoteBaseDir)
.length ?? 0) > 0
) {
// we find it!
const f = itemsInRoot.entries?.filter(
(x) => x.name === this.remoteBaseDir
)[0]!;
this.baseDirID = f.id;
this.vaultFolderExists = true;
break;
}
if ((itemsInRoot.offset ?? 0) >= (itemsInRoot.totalCount ?? 0)) {
break;
}
offset += limitPerPage;
}
if (!this.vaultFolderExists) {
// create
const f = await client.folders.createFolder({
name: this.remoteBaseDir,
parent: { id: "0" },
});
this.baseDirID = f.id;
this.vaultFolderExists = true;
}
}
}
async _getAccessToken() {
if (this.boxConfig.refreshToken === "") {
throw Error("The user has not manually auth yet.");
}
const ts = Date.now();
const comp = this.boxConfig.accessTokenExpiresAtTimeMs > ts;
// console.debug(`this.boxConfig.accessTokenExpiresAtTimeMs=${this.boxConfig.accessTokenExpiresAtTimeMs},ts=${ts},comp=${comp}`)
if (comp) {
return this.boxConfig.accessToken;
}
// refresh
const k = await sendRefreshTokenReq(this.boxConfig.refreshToken);
this.boxConfig.accessToken = k.access_token;
this.boxConfig.accessTokenExpiresInMs = k.expires_in * 1000;
this.boxConfig.accessTokenExpiresAtTimeMs =
ts + k.expires_in * 1000 - 60 * 2 * 1000;
await this.saveUpdatedConfigFunc();
console.info("Box accessToken updated");
return this.boxConfig.accessToken;
}
async walk(): Promise<Entity[]> {
await this._init();
const allFiles: BoxEntity[] = [];
// bfs
const queue = new PQueue({
concurrency: 5, // TODO: make it configurable?
autoStart: true,
});
queue.on("error", (error) => {
queue.pause();
queue.clear();
throw error;
});
let parents = [
{
id: this.baseDirID, // special init, from already created root folder ID
folderPath: "",
},
];
while (parents.length !== 0) {
// console.debug('enter while loop 1 of parents array');
const children: typeof parents = [];
for (const { id, folderPath } of parents) {
queue.add(async () => {
const filesUnderFolder = await this._walkFolder(id, folderPath);
for (const f of filesUnderFolder) {
allFiles.push(f);
if (f.isFolder) {
// keyRaw itself already has a tailing slash, no more slash here
// keyRaw itself also already has full path
const child = {
id: f.id,
folderPath: f.keyRaw,
};
// console.debug(
// `looping result of _walkFolder(${id},${folderPath}), adding child=${JSON.stringify(
// child
// )}`
// );
children.push(child);
}
}
});
}
await queue.onIdle();
parents = children;
}
// console.debug(`in the end of walk:`);
// console.debug(allFiles);
// console.debug(this.keyToBoxEntity);
return allFiles;
}
async _walkFolder(
parentID: string,
parentFolderPath: string
): Promise<BoxEntity[]> {
// console.debug(
// `input of single level: parentID=${parentID}, parentFolderPath=${parentFolderPath}`
// );
const filesOneLevel: BoxEntity[] = [];
const access = await this._getAccessToken();
const auth = new BoxDeveloperTokenAuth({ token: access });
const client = new BoxClient({ auth });
if (parentID === undefined || parentID === "" || parentID === "root") {
// we should never start from root
// because we encapsulate the vault inside a folder
throw Error(`something goes wrong walking folder`);
}
let items: Items | undefined = undefined;
let offset = 0;
const limitPerPage = 1000; // max 1000
do {
// console.debug(`entering paging of parentID=${parentID}, offset=${offset}`);
items = await client.folders.getFolderItems(parentID, {
queryParams: {
fields: [
"id",
"type",
"name",
"sha1",
"size",
"created_at",
"modified_at",
"expires_at",
"parent",
"content_created_at",
"content_modified_at",
"etag",
],
offset: offset,
limit: limitPerPage,
},
});
// console.debug(`items of parentID=${parentID},offset=${offset}:`);
// console.debug(items);
for (const item of items.entries ?? []) {
const entity = fromBoxItemToEntity(item, parentID, parentFolderPath);
this.keyToBoxEntity[entity.keyRaw] = entity; // build cache
filesOneLevel.push(entity);
}
offset += limitPerPage;
// console.debug(`end of current loop parentID=${parentID}, and offset=${offset}`);
} while (offset < (items?.totalCount ?? 0));
return filesOneLevel;
}
async walkPartial(): Promise<Entity[]> {
await this._init();
const filesInLevel = await this._walkFolder(this.baseDirID, "");
return filesInLevel;
}
async stat(key: string): Promise<Entity> {
await this._init();
// TODO: we already have a cache, should we call again?
const cachedEntity = this.keyToBoxEntity[key];
const fileID = cachedEntity?.id;
if (cachedEntity === undefined || fileID === undefined) {
throw Error(`no fileID found for key=${key}`);
}
const access = await this._getAccessToken();
const auth = new BoxDeveloperTokenAuth({ token: access });
const client = new BoxClient({ auth });
let f: FileFull | FolderFull | undefined;
if (cachedEntity.isFolder) {
f = await client.folders.getFolderById(fileID);
} else {
f = await client.files.getFileById(fileID);
}
const entity = fromBoxItemToEntity(
f,
cachedEntity.parentID!,
cachedEntity.parentIDPath!
);
// insert back to cache?? to update it??
this.keyToBoxEntity[key] = entity;
return entity;
}
async mkdir(
key: string,
mtime?: number | undefined,
ctime?: number | undefined
): Promise<Entity> {
if (!key.endsWith("/")) {
throw Error(`you should not mkdir on key=${key}`);
}
await this._init();
const cachedEntity = this.keyToBoxEntity[key];
const fileID = cachedEntity?.id;
if (cachedEntity !== undefined && fileID !== undefined) {
return cachedEntity;
}
// xxx/ => ["xxx"]
// xxx/yyy/zzz/ => ["xxx", "xxx/yyy", "xxx/yyy/zzz"]
const folderLevels = getFolderLevels(key);
let parentFolderPath: string | undefined = undefined;
let parentID: string | undefined = undefined;
if (folderLevels.length === 0) {
throw Error(`cannot getFolderLevels of ${key}`);
} else if (folderLevels.length === 1) {
parentID = this.baseDirID;
parentFolderPath = ""; // ignore base dir
} else {
// length > 1
parentFolderPath = `${folderLevels[folderLevels.length - 2]}/`;
if (!(parentFolderPath in this.keyToBoxEntity)) {
throw Error(
`parent of ${key}: ${parentFolderPath} is not created before??`
);
}
parentID = this.keyToBoxEntity[parentFolderPath].id;
}
// xxx/yyy/zzz/ => ["xxx", "xxx/yyy", "xxx/yyy/zzz"] => "xxx/yyy/zzz" => "zzz"
let folderItselfWithoutSlash = folderLevels[folderLevels.length - 1];
folderItselfWithoutSlash = folderItselfWithoutSlash.split("/").pop()!;
const access = await this._getAccessToken();
const auth = new BoxDeveloperTokenAuth({ token: access });
const client = new BoxClient({ auth });
const f = await client.folders.createFolder({
name: folderItselfWithoutSlash,
parent: { id: parentID },
});
const entity = fromBoxItemToEntity(f, parentID, parentFolderPath);
// insert into cache
this.keyToBoxEntity[key] = entity;
return entity;
}
async writeFile(
key: string,
content: ArrayBuffer,
mtime: number,
ctime: number
): Promise<Entity> {
if (key.endsWith("/")) {
throw Error(`should not call writeFile on ${key}`);
}
await this._init();
const prevCachedEntity: BoxEntity | undefined = this.keyToBoxEntity[key];
const prevFileID: string | undefined = prevCachedEntity?.id;
const contentType =
mime.contentType(mime.lookup(key) || DEFAULT_CONTENT_TYPE) ||
DEFAULT_CONTENT_TYPE;
let parentID: string | undefined = undefined;
let parentFolderPath: string | undefined = undefined;
// "xxx" => []
// "xxx/yyy/zzz.md" => ["xxx", "xxx/yyy"]
const folderLevels = getFolderLevels(key);
if (folderLevels.length === 0) {
// root
parentID = this.baseDirID;
parentFolderPath = "";
} else {
parentFolderPath = `${folderLevels[folderLevels.length - 1]}/`;
if (!(parentFolderPath in this.keyToBoxEntity)) {
throw Error(
`parent of ${key}: ${parentFolderPath} is not created before??`
);
}
parentID = this.keyToBoxEntity[parentFolderPath].id;
}
const fileItself = key.split("/").pop()!;
const BIG_FILE_THRESHOLD = 20000000; // box api hard coded...
if (content.byteLength <= BIG_FILE_THRESHOLD) {
const formData = new FormData();
const attributes = {
name: fileItself,
parent: { id: parentID },
content_created_at: unixTimeToStr(ctime),
content_modified_at: unixTimeToStr(mtime),
};
formData.append("attributes", JSON.stringify(attributes));
formData.append("file", new Blob([content], { type: contentType }));
let url = "";
if (prevFileID === undefined) {
// create new file
// https://developer.box.com/reference/post-files-content/
url = `https://upload.box.com/api/2.0/files/content`;
} else {
// update new file
// https://developer.box.com/reference/post-files-id-content/
url = `https://upload.box.com/api/2.0/files/${prevFileID}/content`;
}
const res = await fetch(url, {
method: "POST",
headers: {
Authorization: `Bearer ${await this._getAccessToken()}`,
},
body: formData,
});
if (res.status !== 200 && res.status !== 201) {
throw Error(
`create file ${key} failed! attributes=${JSON.stringify(attributes)}`
);
}
const res2 = await res.json();
if (res2.entries === undefined) {
throw Error(`upload small file ${key} failed!`);
}
const entity = fromRawResponseToEntity(
res2.entries[0],
parentID,
parentFolderPath
);
this.keyToBoxEntity[key] = entity;
// console.debug(`entity after upload=${JSON.stringify(entity, null, 2)}`);
return entity;
} else {
// create session
let url = "";
if (prevFileID === undefined) {
// https://developer.box.com/reference/post-files-upload-sessions/
url = "https://upload.box.com/api/2.0/files/upload_sessions";
} else {
// https://developer.box.com/reference/post-files-id-upload-sessions/
url = `https://upload.box.com/api/2.0/files/${prevFileID}/upload_sessions`;
}
const sessionRes1 = await fetch(url, {
method: "POST",
headers: {
Authorization: `Bearer ${await this._getAccessToken()}`,
"Content-Type": "application/json",
},
body: JSON.stringify({
file_name: fileItself,
file_size: content.byteLength,
folder_id: parentID,
}),
});
if (sessionRes1.status !== 200 && sessionRes1.status !== 201) {
throw Error(
`Create upload session for ${key} failed! Response header=${JSON.stringify(
sessionRes1.headers
)}`
);
}
const sessionRes2: CreateUploadSessionRawResponse =
await sessionRes1.json();
// console.debug(sessionRes2);
// upload by chunks
const sizePerChunk = sessionRes2.part_size;
const chunkRanges = splitFileSizeToChunkRanges(
content.byteLength,
sizePerChunk
);
// TODO: parallel
const partsResult: UploadChunkRawResponse[] = [];
for (const { start, end } of chunkRanges) {
const subContent = content.slice(start, end + 1);
const sha1 = await getSha1(subContent, "base64");
const res = await fetch(sessionRes2.session_endpoints.upload_part, {
method: "PUT",
headers: {
Authorization: `Bearer ${await this._getAccessToken()}`,
// "Content-Length": `${end - start + 1}`, // the number of bytes in the current chunk
"Content-Range": `bytes ${start}-${end}/${content.byteLength}`,
"Content-Type": "application/octet-stream",
digest: `sha=${sha1}`,
},
body: subContent,
});
if (res.status !== 200 && res.status !== 201) {
throw Error(
`Upload chunk for ${key}, ${start}-${end} failed! Response header=${JSON.stringify(
res.headers
)}`
);
}
partsResult.push((await res.json()) as UploadChunkRawResponse);
}
// commit?
const sha1 = await getSha1(content, "base64");
let status = 202;
let tries = 0;
do {
// console.debug(`begin commit key=${key} for tries=${tries}`)
const commitRes1 = await fetch(sessionRes2.session_endpoints.commit, {
method: "POST",
headers: {
Authorization: `Bearer ${await this._getAccessToken()}`,
"Content-Type": "application/json",
digest: `sha=${sha1}`,
},
body: JSON.stringify({
parts: partsResult.map((p) => p.part),
attributes: {
content_modified_at: unixTimeToStr(mtime, false),
content_created_at: unixTimeToStr(ctime, false),
},
}),
});
status = commitRes1.status;
// console.debug(`status===${status} for tries=${tries},key=${key}`)
if (status === 200 || status === 201) {
const commitRes2 = await commitRes1.json();
if (commitRes2.entries === undefined) {
throw Error(`Upload big file ${key} failed!`);
}
const entity = fromRawResponseToEntity(
commitRes2.entries[0],
parentID,
parentFolderPath
);
this.keyToBoxEntity[key] = entity;
// console.debug(
// `entity after upload=${JSON.stringify(entity, null, 2)}`
// );
return entity;
} else if (status === 202) {
await delay(500);
tries += 1;
} else {
throw Error(
`Commit all chunks for ${key} failed! Response header=${JSON.stringify(
commitRes1.headers
)}`
);
}
// console.debug(`end commit key=${key}, currently status===${status}, tries===${tries} for next loop`)
} while (status === 202 && tries < 4);
throw Error(`Commit all chunks for ${key} failed! No idea what happened`);
}
}
async readFile(key: string): Promise<ArrayBuffer> {
await this._init();
const cachedEntity = this.keyToBoxEntity[key];
const fileID = cachedEntity?.id;
if (cachedEntity === undefined || fileID === undefined) {
throw Error(`no fileID found for key=${key}`);
}
const res1 = await fetch(
`https://api.box.com/2.0/files/${fileID}/content`,
{
method: "GET",
headers: {
Authorization: `Bearer ${await this._getAccessToken()}`,
},
}
);
if (res1.status !== 200) {
throw Error(
`Cannot download file ${key} with id ${fileID}. Response header=${JSON.stringify(
res1.headers
)}`
);
}
const res2 = await res1.arrayBuffer();
return res2;
}
async rename(key1: string, key2: string): Promise<void> {
throw new Error("Method not implemented.");
}
async rm(key: string): Promise<void> {
await this._init();
const cachedEntity = this.keyToBoxEntity[key];
const fileID = cachedEntity?.id;
if (cachedEntity === undefined || fileID === undefined) {
throw Error(`no fileID found for key=${key}`);
}
const access = await this._getAccessToken();
const auth = new BoxDeveloperTokenAuth({ token: access });
const client = new BoxClient({ auth });
if (cachedEntity.isFolder) {
await client.folders.deleteFolderById(fileID, {
queryParams: { recursive: true },
});
} else {
await client.files.deleteFileById(fileID);
}
}
async checkConnect(callbackFunc?: any): Promise<boolean> {
// if we can init, we can connect
try {
await this._init();
return true;
} catch (err) {
console.debug(err);
callbackFunc?.(err);
return false;
}
}
async getUserDisplayName(): Promise<string> {
throw new Error("Method not implemented.");
}
/**
* https://developer.box.com/guides/authentication/tokens/revoke/
*/
async revokeAuth(): Promise<any> {
await fetch(`https://api.box.com/oauth2/revoke`, {
method: "POST",
headers: {
"Content-Type": "application/x-www-form-urlencoded",
},
body: new URLSearchParams({
client_id: BOX_CLIENT_ID ?? "",
client_secret: BOX_CLIENT_SECRET ?? "",
token: this.boxConfig.refreshToken,
}).toString(),
});
}
allowEmptyFile(): boolean {
return true;
}
}
+1
View File
@@ -26,6 +26,7 @@ export const DEFAULT_GOOGLEDRIVE_CONFIG: GoogleDriveConfig = {
accessTokenExpiresAtTimeMs: 0, accessTokenExpiresAtTimeMs: 0,
credentialsShouldBeDeletedAtTimeMs: 0, credentialsShouldBeDeletedAtTimeMs: 0,
scope: "https://www.googleapis.com/auth/drive.file", scope: "https://www.googleapis.com/auth/drive.file",
kind: "googledrive",
}; };
const FOLDER_MIME_TYPE = "application/vnd.google-apps.folder"; const FOLDER_MIME_TYPE = "application/vnd.google-apps.folder";
+607
View File
@@ -0,0 +1,607 @@
import { nanoid } from "nanoid";
import { requestUrl } from "obsidian";
import pcloudSdk from "pcloud-sdk-js";
import {
type Entity,
OAUTH2_FORCE_EXPIRE_MILLISECONDS,
} from "../../src/baseTypes";
import { FakeFs } from "../../src/fsAll";
import { getFolderLevels } from "../../src/misc";
import {
COMMAND_CALLBACK_PCLOUD,
PCLOUD_CLIENT_ID,
PCLOUD_CLIENT_SECRET,
type PCloudConfig,
} from "./baseTypesPro";
export const DEFAULT_PCLOUD_CONFIG: PCloudConfig = {
accessToken: "",
hostname: "eapi.pcloud.com",
locationid: 2,
credentialsShouldBeDeletedAtTimeMs: 0,
emptyFile: "skip",
kind: "pcloud",
};
export interface AuthAllowFirstRes {
code: string;
state?: string;
locationid: 1 | 2;
hostname: "api.pcloud.com" | "eapi.pcloud.com";
}
/**
* https://docs.pcloud.com/methods/oauth_2.0/authorize.html
*/
export const generateAuthUrl = async (hasCallback: boolean) => {
const clientID = PCLOUD_CLIENT_ID;
const state = nanoid();
let authUrl = `https://my.pcloud.com/oauth2/authorize?response_type=code&client_id=${clientID}&state=${state}`;
if (hasCallback) {
authUrl += `&redirect_uri=obsidian://${COMMAND_CALLBACK_PCLOUD}`;
}
return {
authUrl,
state,
};
};
interface AuthResSucc {
result: number;
access_token: string;
token_type: "bearer";
uid: number;
locationid: number;
}
/**
* https://docs.pcloud.com/methods/oauth_2.0/oauth2_token.html
*/
export const sendAuthReq = async (
hostname: string,
authCode: string,
errorCallBack: any
) => {
const clientID = PCLOUD_CLIENT_ID ?? "";
const clientSecret = PCLOUD_CLIENT_SECRET ?? "";
try {
const k = {
code: authCode,
client_id: clientID,
client_secret: clientSecret,
};
// console.debug(k);
const resp1 = await fetch(`https://${hostname}/oauth2_token`, {
method: "POST",
body: new URLSearchParams(k),
});
const resp2: AuthResSucc = await resp1.json();
// console.debug(resp2);
if (resp2?.result !== 0) {
throw Error(`result is not 0 (success) in the end`);
}
if (!("access_token" in resp2)) {
throw Error(`no access_token in the end`);
}
return resp2;
} catch (e) {
console.error(e);
if (errorCallBack !== undefined) {
await errorCallBack(e);
}
}
};
export const setConfigBySuccessfullAuthInplace = async (
config: PCloudConfig,
authAllowFirstRes: AuthAllowFirstRes,
authRes: AuthResSucc | undefined,
saveUpdatedConfigFunc: () => Promise<any> | undefined
) => {
if (authRes === undefined) {
throw Error(`you should not save the setting for undefined result`);
}
config.accessToken = authRes.access_token;
config.hostname = authAllowFirstRes.hostname;
config.locationid = authAllowFirstRes.locationid;
// manually set it expired after 80 days;
config.credentialsShouldBeDeletedAtTimeMs =
Date.now() + OAUTH2_FORCE_EXPIRE_MILLISECONDS;
await saveUpdatedConfigFunc?.();
console.info("finish updating local info of pCloud token");
};
interface PCloudEntity extends Entity {
id: number;
parentID: number | undefined;
parentIDPath: string | undefined;
isFolder: boolean;
hashPCloud: number | undefined;
}
interface File {
contenttype: string;
created: string;
fileid: number;
hash: number;
id: string; // "f" + fileid
isfolder: false;
modified: string;
name: string;
parentfolderid: number;
size: number;
}
interface Folder {
contents: (Folder | File)[] | undefined;
id: string; // "d"+folderid
folderid: number;
isfolder: true;
created: string;
modified: string;
name: string;
parentfolderid: number;
}
interface StatRawResponse {
result: number;
fileids: number[];
metadata: (File | Folder)[];
checksums: { sha1: string; sha256?: string; md5?: string }[] | undefined;
}
const fromRawResponseToEntity = (
item: Folder | File,
parentFolderPath: string | undefined /* for bfs */
): PCloudEntity => {
if (item.parentfolderid === undefined || item.parentfolderid === 0) {
throw Error(
`parentfolderid=${item.parentfolderid} should not be in fromRawResponseToEntity`
);
}
let keyRaw = item.name;
let size = 0;
let hashPCloud: number | undefined = undefined;
let hash: string | undefined = undefined;
let id: number | undefined = undefined;
if (
parentFolderPath !== undefined &&
parentFolderPath !== "" &&
parentFolderPath !== "/"
) {
if (!parentFolderPath.endsWith("/")) {
throw Error(
`parentFolderPath=${parentFolderPath} should not be in fromRawResponseToEntity`
);
}
keyRaw = `${parentFolderPath}${item.name}`;
}
if (item.isfolder) {
keyRaw = `${keyRaw}/`;
id = item.folderid;
} else {
size = item.size;
hashPCloud = item.hash;
hash = `${item.hash}`;
id = item.fileid;
}
const mtime = new Date(item.modified).valueOf();
return {
key: keyRaw,
keyRaw: keyRaw,
mtimeCli: mtime,
mtimeSvr: mtime,
id: id,
parentID: item.parentfolderid,
isFolder: item.isfolder,
size: size,
sizeRaw: size,
hash: hash,
hashPCloud: hashPCloud,
parentIDPath: parentFolderPath,
};
};
const fromNestedFolderToEntityListAndCache = (
root: Folder
): { entities: PCloudEntity[]; key2Entity: Record<string, PCloudEntity> } => {
// console.debug("root:");
// console.debug(root);
const entities: PCloudEntity[] = [];
const key2Entity: Record<string, PCloudEntity> = {};
if (root.contents === undefined || root.contents.length === 0) {
// console.debug(`early return`);
return {
entities,
key2Entity,
};
}
let parents: {
folderPath: string;
itself: Folder | File;
}[] = [];
for (const f of root.contents ?? []) {
parents.push({
folderPath: "",
itself: f,
});
}
while (parents.length !== 0) {
const children: typeof parents = [];
for (const { folderPath, itself } of parents) {
if (itself.isfolder && itself.folderid === root.folderid) {
// special, ignore root folder itself
} else {
const entity = fromRawResponseToEntity(itself, folderPath);
entities.push(entity);
key2Entity[entity.keyRaw] = entity;
}
if (
itself.isfolder &&
itself.contents !== undefined &&
itself.contents.length > 0
) {
for (const f of itself.contents) {
if (folderPath === "" || folderPath === "/") {
const child = {
itself: f,
folderPath: `${itself.name}/`,
};
children.push(child);
} else {
const child = {
itself: f,
folderPath: `${folderPath}${itself.name}/`,
};
children.push(child);
}
}
}
}
parents = children;
}
// console.debug("entities:");
// console.debug(entities);
// console.debug("key2Entity:");
// console.debug(key2Entity);
return {
entities,
key2Entity,
};
};
export class FakeFsPCloud extends FakeFs {
kind: string;
pCloudConfig: PCloudConfig;
remoteBaseDir: string;
vaultFolderExists: boolean;
saveUpdatedConfigFunc: () => Promise<any>;
keyToPCloudEntity: Record<string, PCloudEntity>;
baseDirID: number;
client: pcloudSdk.Client;
constructor(
pCloudConfig: PCloudConfig,
vaultName: string,
saveUpdatedConfigFunc: () => Promise<any>
) {
super();
this.kind = "pcloud";
this.pCloudConfig = pCloudConfig;
this.remoteBaseDir = this.pCloudConfig.remoteBaseDir || vaultName || "";
this.vaultFolderExists = false;
this.saveUpdatedConfigFunc = saveUpdatedConfigFunc;
this.keyToPCloudEntity = {};
this.baseDirID = 0;
(global as any).locationid = pCloudConfig.locationid; // why?? pcloud, why??
this.client = pcloudSdk.createClient(pCloudConfig.accessToken);
}
async _init() {
if (this.vaultFolderExists) {
// pass
} else {
const root = (await this.client.listfolder(0, {
recursive: false,
})) as Folder;
// find?
if (root.contents === undefined) {
throw Error(`cannot listfolder of root!`);
}
const found = root.contents.filter(
(x) => x.isfolder && x.name === this.remoteBaseDir
);
if (found.length > 0) {
// we find it!
const f = found[0] as Folder;
this.baseDirID = f.folderid;
this.vaultFolderExists = true;
} else {
// not found, let's create it!
const f: Folder = await this.client.createfolder(this.remoteBaseDir, 0);
// console.debug(f);
this.baseDirID = f.folderid;
this.vaultFolderExists = true;
}
}
}
async _getAccessToken() {
if (this.pCloudConfig.accessToken === "") {
throw Error("The user has not manually auth yet.");
}
return this.pCloudConfig.accessToken;
// TODO: no expire date?
// https://docs.pcloud.com/methods/intro/authentication.html
}
async walk(): Promise<Entity[]> {
await this._init();
const rsp = (await this.client.listfolder(this.baseDirID, {
recursive: true,
})) as Folder;
const { entities, key2Entity } = fromNestedFolderToEntityListAndCache(rsp);
this.keyToPCloudEntity = Object.assign(this.keyToPCloudEntity, key2Entity);
return entities;
}
async walkPartial(): Promise<Entity[]> {
await this._init();
const rsp = (await this.client.listfolder(this.baseDirID, {
recursive: false,
})) as Folder;
const { entities, key2Entity } = fromNestedFolderToEntityListAndCache(rsp);
this.keyToPCloudEntity = Object.assign(this.keyToPCloudEntity, key2Entity);
return entities;
}
async stat(key: string): Promise<Entity> {
await this._init();
// TODO: we already have a cache, should we call again?
const cachedEntity = this.keyToPCloudEntity[key];
const fileID = cachedEntity?.id;
if (cachedEntity === undefined || fileID === undefined) {
throw Error(`no fileID found for key=${key}`);
}
// why? pcloud doesn't have stat api??
return cachedEntity;
}
async mkdir(
key: string,
mtime?: number | undefined,
ctime?: number | undefined
): Promise<Entity> {
if (!key.endsWith("/")) {
throw Error(`you should not mkdir on key=${key}`);
}
await this._init();
const cachedEntity = this.keyToPCloudEntity[key];
const fileID = cachedEntity?.id;
if (cachedEntity !== undefined && fileID !== undefined) {
return cachedEntity;
}
// xxx/ => ["xxx"]
// xxx/yyy/zzz/ => ["xxx", "xxx/yyy", "xxx/yyy/zzz"]
const folderLevels = getFolderLevels(key);
let parentFolderPath: string | undefined = undefined;
let parentID: number | undefined = undefined;
if (folderLevels.length === 0) {
throw Error(`cannot getFolderLevels of ${key}`);
} else if (folderLevels.length === 1) {
parentID = this.baseDirID;
parentFolderPath = ""; // ignore base dir
} else {
// length > 1
parentFolderPath = `${folderLevels[folderLevels.length - 2]}/`;
if (!(parentFolderPath in this.keyToPCloudEntity)) {
throw Error(
`parent of ${key}: ${parentFolderPath} is not created before??`
);
}
parentID = this.keyToPCloudEntity[parentFolderPath].id;
}
// xxx/yyy/zzz/ => ["xxx", "xxx/yyy", "xxx/yyy/zzz"] => "xxx/yyy/zzz" => "zzz"
let folderItselfWithoutSlash = folderLevels[folderLevels.length - 1];
folderItselfWithoutSlash = folderItselfWithoutSlash.split("/").pop()!;
const f = await this.client.createfolder(
folderItselfWithoutSlash,
parentID
);
const entity = fromRawResponseToEntity(f, parentFolderPath);
// insert into cache
this.keyToPCloudEntity[key] = entity;
return entity;
}
/**
* https://docs.pcloud.com/methods/file/uploadfile.html
*/
async writeFile(
key: string,
content: ArrayBuffer,
mtime: number,
ctime: number
): Promise<Entity> {
if (key.endsWith("/")) {
throw Error(`should not call writeFile on ${key}`);
}
await this._init();
if (content.byteLength === 0) {
if (this.pCloudConfig.emptyFile === "error") {
throw Error(
`${key}: Empty file is not allowed in pCloud, and please write something in it.`
);
} else {
return {
key: key,
keyRaw: key,
mtimeSvr: mtime,
mtimeCli: mtime,
size: 0,
sizeRaw: 0,
synthesizedFile: true,
// hash: ?? // TODO
};
}
}
const prevCachedEntity: PCloudEntity | undefined =
this.keyToPCloudEntity[key];
const prevFileID: number | undefined = prevCachedEntity?.id;
let parentID: number | undefined = undefined;
let parentFolderPath: string | undefined = undefined;
// "xxx" => []
// "xxx/yyy/zzz.md" => ["xxx", "xxx/yyy"]
const folderLevels = getFolderLevels(key);
if (folderLevels.length === 0) {
// root
parentID = this.baseDirID;
parentFolderPath = "";
} else {
parentFolderPath = `${folderLevels[folderLevels.length - 1]}/`;
if (!(parentFolderPath in this.keyToPCloudEntity)) {
throw Error(
`parent of ${key}: ${parentFolderPath} is not created before??`
);
}
parentID = this.keyToPCloudEntity[parentFolderPath].id;
}
const fileItself = key.split("/").pop()!;
// no idea how to use the sdk, let's use https here
// https://docs.pcloud.com/methods/file/uploadfile.html
const params = new URLSearchParams({
access_token: await this._getAccessToken(),
folderid: `${parentID}`,
filename: fileItself,
nopartial: `1`,
renameifexists: `0`,
mtime: `${Math.floor(mtime / 1000.0)}`,
ctime: `${Math.floor(ctime / 1000.0)}`,
});
const apiUrl = `https://${this.pCloudConfig.hostname}/uploadfile?${params}`;
const rsp = await fetch(apiUrl, {
method: "PUT",
body: content,
});
const f: StatRawResponse = await rsp.json();
const entity = fromRawResponseToEntity(f.metadata[0], parentFolderPath);
// console.debug(entity);
this.keyToPCloudEntity[key] = entity;
return entity;
}
async readFile(key: string): Promise<ArrayBuffer> {
await this._init();
const cachedEntity = this.keyToPCloudEntity[key];
const fileID = cachedEntity?.id;
if (cachedEntity === undefined || fileID === undefined) {
throw Error(`no fileID found for key=${key}`);
}
const params = new URLSearchParams({
access_token: await this._getAccessToken(),
forcedownload: `1`,
fileid: `${fileID}`,
});
const urlMeta = `https://${this.pCloudConfig.hostname}/getfilelink?${params}`;
// Referrer is restricted to pcloud.com.
// we need to bypass it
const meta = (await requestUrl(urlMeta)).json;
// console.debug(meta);
const link: string = `https://${meta.hosts[0]}${meta.path}`;
const rsp = await requestUrl(link);
const content = rsp.arrayBuffer;
return content;
}
async rename(key1: string, key2: string): Promise<void> {
await this._init();
throw new Error("Method not implemented.");
}
async rm(key: string): Promise<void> {
await this._init();
const cachedEntity = this.keyToPCloudEntity[key];
const fileID = cachedEntity?.id;
if (cachedEntity === undefined || fileID === undefined) {
throw Error(`no fileID found for key=${key}`);
}
if (key.endsWith("/")) {
await this.client.deletefolder(fileID);
} else {
await this.client.deletefile(fileID);
}
}
async checkConnect(callbackFunc?: any): Promise<boolean> {
// if we can init, we can connect
try {
await this._init();
return true;
} catch (err) {
console.debug(err);
callbackFunc?.(err);
return false;
}
}
async getUserDisplayName(): Promise<string> {
await this._init();
throw new Error("Method not implemented.");
}
async revokeAuth(): Promise<any> {
await this._init();
throw new Error("Method not implemented.");
}
allowEmptyFile(): boolean {
return false;
}
}
+516
View File
@@ -0,0 +1,516 @@
import { nanoid } from "nanoid";
import PQueue from "p-queue";
import type { Entity } from "../../src/baseTypes";
import { FakeFs } from "../../src/fsAll";
import { unixTimeToStr } from "../../src/misc";
import {
COMMAND_CALLBACK_YANDEXDISK,
YANDEXDISK_CLIENT_ID,
YANDEXDISK_CLIENT_SECRET,
type YandexDiskConfig,
} from "./baseTypesPro";
import {
type FilesResourceList,
type Resource,
type ResourceList,
YandexApi,
} from "./yandexApi";
export const DEFAULT_YANDEXDISK_CONFIG: YandexDiskConfig = {
accessToken: "",
accessTokenExpiresInMs: 0,
accessTokenExpiresAtTimeMs: 0,
refreshToken: "",
scope: "",
kind: "yandexdisk",
};
/**
* https://yandex.com/dev/id/doc/en/codes/code-url#code
*/
export const generateAuthUrl = (hasCallback: boolean) => {
let callback = `https://oauth.yandex.com/verification_code`;
if (hasCallback) {
callback = `obsidian://${COMMAND_CALLBACK_YANDEXDISK}`;
}
const params = new URLSearchParams({
response_type: "code",
client_id: YANDEXDISK_CLIENT_ID ?? "",
redirect_uri: callback,
force_confirm: "yes",
state: nanoid(),
});
const url = `https://oauth.yandex.com/authorize?${params}`;
return url;
};
interface AuthResSucc {
token_type: "bearer";
access_token: string;
expires_in: number;
refresh_token: string;
scope: string | undefined;
}
interface AuthResFail {
error: string;
error_description: string;
}
/**
* https://yandex.com/dev/id/doc/en/codes/code-url#token
*/
export const sendAuthReq = async (authCode: string, errorCallBack: any) => {
try {
const k = {
code: authCode,
grant_type: "authorization_code",
client_id: YANDEXDISK_CLIENT_ID ?? "",
client_secret: YANDEXDISK_CLIENT_SECRET ?? "",
// redirect_uri: `obsidian://${COMMAND_CALLBACK_BOX}`,
};
// console.debug(k);
const resp1 = await fetch(`https://oauth.yandex.com/token`, {
method: "POST",
body: new URLSearchParams(k),
});
if (resp1.status !== 200) {
const resp2: AuthResFail = await resp1.json();
throw Error(JSON.stringify(resp2));
}
const resp2: AuthResSucc = await resp1.json();
return resp2;
} catch (e) {
console.error(e);
if (errorCallBack !== undefined) {
await errorCallBack(e);
}
}
};
/**
* https://yandex.com/dev/id/doc/en/tokens/refresh-client
*/
export const sendRefreshTokenReq = async (refreshToken: string) => {
console.debug(`refreshing token`);
const x = await fetch("https://oauth.yandex.com/token", {
method: "POST",
headers: {
"Content-Type": "application/x-www-form-urlencoded",
},
body: new URLSearchParams({
client_id: YANDEXDISK_CLIENT_ID ?? "",
client_secret: YANDEXDISK_CLIENT_SECRET ?? "",
grant_type: "refresh_token",
refresh_token: refreshToken,
}).toString(),
});
if (x.status === 200) {
const y: AuthResSucc = await x.json();
console.debug(`new token obtained`);
return y;
} else {
const y: AuthResFail = await x.json();
throw Error(`cannot refresh an access token: ${JSON.stringify(y)}`);
}
};
export const setConfigBySuccessfullAuthInplace = async (
config: YandexDiskConfig,
authRes: any,
saveUpdatedConfigFunc: () => Promise<any> | undefined
) => {
if (authRes.access_token === undefined || authRes.access_token === "") {
throw Error(
`you should not save the setting for ${JSON.stringify(authRes)}`
);
}
config.accessToken = authRes.access_token;
config.accessTokenExpiresAtTimeMs =
Date.now() + authRes.expires_in * 1000 - 5 * 60 * 1000;
config.accessTokenExpiresInMs = authRes.expires_in * 1000;
config.refreshToken = authRes.refresh_token || config.refreshToken;
// manually set it expired after 60 days;
config.credentialsShouldBeDeletedAtTimeMs =
Date.now() + 1000 * 60 * 60 * 24 * 59;
await saveUpdatedConfigFunc?.();
console.info("finish updating local info of Yandex Disk token");
};
const getYandexDiskPath = (fileOrFolderPath: string, remoteBaseDir: string) => {
let key = fileOrFolderPath;
if (fileOrFolderPath === "/" || fileOrFolderPath === "") {
// special
key = `disk:/${remoteBaseDir}`;
} else if (fileOrFolderPath.startsWith("/")) {
console.warn(
`why the path ${fileOrFolderPath} starts with '/'? but we just go on.`
);
key = `disk:/${remoteBaseDir}${fileOrFolderPath}`;
} else {
key = `disk:/${remoteBaseDir}/${fileOrFolderPath}`;
}
if (key.endsWith("/")) {
key = key.slice(0, key.length - 1);
}
return key;
};
const getNormPath = (
fileOrFolderPath: string,
remoteBaseDir: string,
type: "dir" | "file"
) => {
if (
!(
fileOrFolderPath === `disk:/${remoteBaseDir}` ||
fileOrFolderPath.startsWith(`disk:/${remoteBaseDir}/`)
)
) {
throw Error(
`"${fileOrFolderPath}" doesn't starts with "disk:/${remoteBaseDir}/"`
);
}
let key = fileOrFolderPath.slice(`disk:/${remoteBaseDir}/`.length);
if (type === "dir") {
key = `${key}/`;
}
return key;
};
const fromResourceToEntity = (x: Resource, remoteBaseDir: string): Entity => {
const key = getNormPath(x.path!, remoteBaseDir, x.type!);
if (x.type === "dir") {
return {
key: key,
keyRaw: key,
size: 0,
sizeRaw: 0,
} as Entity;
} else {
// file
const mtimeCli = Date.parse(
x?.custom_properties?.rclone_modified ?? x.modified!
).valueOf();
const mtimeSvr = Date.parse(x.modified!).valueOf();
return {
key: key,
keyRaw: key,
mtimeCli: mtimeCli,
mtimeSvr: mtimeSvr,
size: x.size!,
sizeRaw: x.size!,
hash: x.sha256,
} as Entity;
}
};
const FIELDS_FOR_RESOURCE = [
"name",
"created",
"modified",
"path",
"type",
"size",
"sha256",
"md5",
"_embedded.limit",
"_embedded.offset",
"_embedded.total",
"_embedded.items.created",
"_embedded.items.modified",
"_embedded.items.path",
"_embedded.items.name",
"_embedded.items.type",
"_embedded.items.size",
"_embedded.items.sha256",
"_embedded.items.md5",
"_embedded.items.mime_type",
"_embedded.items.file",
"_embedded.items.custom_properties",
];
export class FakeFsYandexDisk extends FakeFs {
kind: string;
yandexDiskConfig: YandexDiskConfig;
remoteBaseDir: string;
vaultFolderExists: boolean;
saveUpdatedConfigFunc: () => Promise<any>;
constructor(
yandexDiskConfig: YandexDiskConfig,
vaultName: string,
saveUpdatedConfigFunc: () => Promise<any>
) {
super();
this.kind = "yandexdisk";
this.yandexDiskConfig = yandexDiskConfig;
this.remoteBaseDir = this.yandexDiskConfig.remoteBaseDir || vaultName || "";
this.vaultFolderExists = false;
this.saveUpdatedConfigFunc = saveUpdatedConfigFunc;
}
async _init() {
const access = await this._getAccessToken();
const client = new YandexApi(access);
if (this.vaultFolderExists) {
// pass
} else {
const res: Resource[] = [];
let offset = 0;
const limit = 100;
let total = 100;
do {
const k = await client.diskResources(
"disk:/",
FIELDS_FOR_RESOURCE,
limit,
offset
);
res.push(...(k._embedded?.items ?? []));
total = k._embedded?.total ?? 0;
offset += limit;
} while (offset < total);
if (res.filter((x) => x.name === this.remoteBaseDir).length > 0) {
// found
this.vaultFolderExists = true;
} else {
// need to create
await client.diskResourcesPut(`disk:/${this.remoteBaseDir}`);
this.vaultFolderExists = true;
}
}
}
async _getAccessToken() {
if (this.yandexDiskConfig.refreshToken === "") {
throw Error("The user has not manually auth yet.");
}
const ts = Date.now();
const comp = this.yandexDiskConfig.accessTokenExpiresAtTimeMs > ts;
// console.debug(`this.yandexDiskConfig.accessTokenExpiresAtTimeMs=${this.yandexDiskConfig.accessTokenExpiresAtTimeMs},ts=${ts},comp=${comp}`)
if (comp) {
return this.yandexDiskConfig.accessToken;
}
// refresh
const k = await sendRefreshTokenReq(this.yandexDiskConfig.refreshToken);
this.yandexDiskConfig.accessToken = k.access_token;
this.yandexDiskConfig.accessTokenExpiresInMs = k.expires_in * 1000;
this.yandexDiskConfig.accessTokenExpiresAtTimeMs =
ts + k.expires_in * 1000 - 60 * 2 * 1000;
await this.saveUpdatedConfigFunc();
console.info("Yandex Disk accessToken updated");
return this.yandexDiskConfig.accessToken;
}
async walk(): Promise<Entity[]> {
await this._init();
// bfs
const queue = new PQueue({
concurrency: 5, // TODO: make it configurable?
autoStart: true,
});
queue.on("error", (error) => {
queue.pause();
queue.clear();
throw error;
});
const entities: Entity[] = [];
let parents = ["/"];
while (parents.length !== 0) {
const children: typeof parents = [];
for (const p of parents) {
queue.add(async () => {
const entitiesOfALevel = await this._walkFolder(p);
for (const entity of entitiesOfALevel) {
entities.push(entity);
if (entity.keyRaw.endsWith("/")) {
children.push(entity.keyRaw);
}
}
});
}
await queue.onIdle();
parents = children;
}
// console.debug(entities);
return entities;
}
async walkPartial(): Promise<Entity[]> {
await this._init();
const entities = await this._walkFolder("/");
return entities;
}
async _walkFolder(key: string) {
if (!key.endsWith("/")) {
throw Error(`should not call _walkFolder on ${key}`);
}
const client = new YandexApi(await this._getAccessToken());
const p = getYandexDiskPath(key, this.remoteBaseDir);
const entities: Entity[] = [];
let offset = 0;
const limit = 100;
let total = 100;
// TODO: once we know the total in the first loop, we can run the list in parallel
do {
const k = await client.diskResources(
p,
FIELDS_FOR_RESOURCE,
limit,
offset
);
entities.push(
...(k._embedded?.items ?? []).map((x) =>
fromResourceToEntity(x, this.remoteBaseDir)
)
);
total = k._embedded?.total ?? 0;
offset += limit;
} while (offset < total);
return entities;
}
async stat(key: string): Promise<Entity> {
await this._init();
const client = new YandexApi(await this._getAccessToken());
const p = getYandexDiskPath(key, this.remoteBaseDir);
const r = await client.diskResources(p, FIELDS_FOR_RESOURCE);
const entity = fromResourceToEntity(r, this.remoteBaseDir);
return entity;
}
async mkdir(
key: string,
mtime?: number | undefined,
ctime?: number | undefined
): Promise<Entity> {
// console.debug(`mkdir ${key} begin`)
await this._init();
const client = new YandexApi(await this._getAccessToken());
const p = getYandexDiskPath(key, this.remoteBaseDir);
// create
await client.diskResourcesPut(p, FIELDS_FOR_RESOURCE);
// patch?
const custom: Record<string, string> = {};
if (mtime !== undefined) {
custom["rclone_modified"] = unixTimeToStr(mtime, true);
}
if (ctime !== undefined) {
custom["rclone_created"] = unixTimeToStr(ctime, true);
}
if (Object.keys(custom).length > 0) {
await client.diskResourcesPatch(p, custom);
}
const entity = await this.stat(key);
// console.debug(`mkdir ${key} finish, ${JSON.stringify(entity)}`)
return entity;
}
async writeFile(
key: string,
content: ArrayBuffer,
mtime: number,
ctime: number
): Promise<Entity> {
// console.debug(`writeFile ${key} begin`)
await this._init();
const client = new YandexApi(await this._getAccessToken());
const p = getYandexDiskPath(key, this.remoteBaseDir);
await client.diskResoucesUpload(p, content, true);
// console.debug(`writeFile ${key} upload succ`)
// patch?
const custom: Record<string, string> = {};
if (mtime !== undefined) {
custom["rclone_modified"] = unixTimeToStr(mtime, true);
}
if (ctime !== undefined) {
custom["rclone_created"] = unixTimeToStr(ctime, true);
}
if (Object.keys(custom).length > 0) {
await client.diskResourcesPatch(p, custom);
}
// console.debug(`writeFile ${key} patch succ`)
const entity = await this.stat(key);
// console.debug(`writeFile ${key} finish, ${JSON.stringify(entity)}`)
return entity;
}
async readFile(key: string): Promise<ArrayBuffer> {
// console.debug(`readFile ${key} begin`)
await this._init();
const client = new YandexApi(await this._getAccessToken());
const p = getYandexDiskPath(key, this.remoteBaseDir);
const content = await client.diskResoucesDownload(p);
// console.debug(`readFile ${key} finish, length=${content.byteLength}`)
return content;
}
async rename(key1: string, key2: string): Promise<void> {
await this._init();
throw new Error("Method not implemented.");
}
async rm(key: string): Promise<void> {
await this._init();
const client = new YandexApi(await this._getAccessToken());
const p = getYandexDiskPath(key, this.remoteBaseDir);
await client.diskResourcesDelete(p, false);
}
async checkConnect(callbackFunc?: any): Promise<boolean> {
// if we can init, we can connect
try {
await this._init();
return true;
} catch (err) {
console.debug(err);
callbackFunc?.(err);
return false;
}
}
async getUserDisplayName(): Promise<string> {
await this._init();
throw new Error("Method not implemented.");
}
/**
* https://yandex.com/dev/id/doc/en/tokens/token-invalidate
*/
async revokeAuth(): Promise<any> {
await fetch(`https://oauth.yandex.com/revoke_token`, {
method: "POST",
headers: {
"Content-Type": "application/x-www-form-urlencoded",
},
body: new URLSearchParams({
client_id: YANDEXDISK_CLIENT_ID ?? "",
client_secret: YANDEXDISK_CLIENT_SECRET ?? "",
access_token: this.yandexDiskConfig.refreshToken, // TODO: which token?
}).toString(),
});
}
allowEmptyFile(): boolean {
return true;
}
}
+115
View File
@@ -7,6 +7,21 @@
"protocol_pro_connect_fail": "Something went wrong from response from Remotely Save official website. Maybe the network connection is not good. Maybe you rejected the auth?", "protocol_pro_connect_fail": "Something went wrong from response from Remotely Save official website. Maybe the network connection is not good. Maybe you rejected the auth?",
"protocol_pro_connect_succ_revoke": "You've connected as user {{email}}. If you want to disconnect, click this button.", "protocol_pro_connect_succ_revoke": "You've connected as user {{email}}. If you want to disconnect, click this button.",
"protocol_box_connecting": "Connectting",
"protocol_box_connect_manualinput_succ": "You've connected",
"protocol_box_connect_fail": "Something went wrong from response from Box official website. Maybe the network connection is not good. Maybe you rejected the auth?",
"protocol_box_connect_succ_revoke": "You've connected. If you want to disconnect, click this button.",
"protocol_pcloud_connecting": "Connectting",
"protocol_pcloud_connect_manualinput_succ": "You've connected",
"protocol_pcloud_connect_fail": "Something went wrong from response from pCloud website. Maybe the network connection is not good. Maybe you rejected the auth?",
"protocol_pcloud_connect_succ_revoke": "You've connected. If you want to disconnect, click this button.",
"protocol_yandexdisk_connecting": "Connectting",
"protocol_yandexdisk_connect_manualinput_succ": "You've connected",
"protocol_yandexdisk_connect_fail": "Something went wrong from response from Yandex Disk website. Maybe the network connection is not good. Maybe you rejected the auth?",
"protocol_yandexdisk_connect_succ_revoke": "You've connected. If you want to disconnect, click this button.",
"modal_googledriveauth_tutorial": "<p>Please firstly go to the address, then go on the auth flow. In the end, you will see a code, please paste that code here and submit.</p>", "modal_googledriveauth_tutorial": "<p>Please firstly go to the address, then go on the auth flow. In the end, you will see a code, please paste that code here and submit.</p>",
"modal_googledriveauth_copybutton": "Click to copy the auth url", "modal_googledriveauth_copybutton": "Click to copy the auth url",
"modal_googledriveauth_copynotice": "The auth url is copied to the clipboard!", "modal_googledriveauth_copynotice": "The auth url is copied to the clipboard!",
@@ -23,6 +38,44 @@
"modal_googledriverevokeauth_clean_notice": "Cleaned!", "modal_googledriverevokeauth_clean_notice": "Cleaned!",
"modal_googledriverevokeauth_clean_fail": "Something goes wrong while revoking.", "modal_googledriverevokeauth_clean_fail": "Something goes wrong while revoking.",
"modal_boxauth_tutorial": "<p>Please firstly go to the address, then go on the auth flow. In the end, you will be redirected to here.</p>",
"modal_boxauth_copybutton": "Click to copy the auth url",
"modal_boxauth_copynotice": "The auth url is copied to the clipboard!",
"modal_box_maualinput": "The Code from the website",
"modal_box_maualinput_desc": "Please input the code here from the end of auth flow, and press confirm.",
"modal_box_maualinput_notice": "We are trying to connect to Box and update the credentials...",
"modal_box_maualinput_succ_notice": "Great! The credentials are updated!",
"modal_box_maualinput_fail_notice": "Oops! Failed to update the credentials. Please try again later.",
"modal_boxrevokeauth_step1": "Step 1: Go to the following address, you can remove the connection there.",
"modal_boxrevokeauth_step2": "Step 2: Click the button below, to clean the locally-saved login credentials.",
"modal_boxrevokeauth_clean": "Clean Locally-Saved Login Credentials",
"modal_boxrevokeauth_clean_desc": "You need to click the button.",
"modal_boxrevokeauth_clean_button": "Clean",
"modal_boxrevokeauth_clean_notice": "Cleaned!",
"modal_boxrevokeauth_clean_fail": "Something goes wrong while revoking.",
"modal_pcloudauth_tutorial": "<p>Please firstly go to the address, then go on the auth flow. In the end, you will be redirected to here.</p>",
"modal_pcloudauth_copybutton": "Click to copy the auth url",
"modal_pcloudauth_copynotice": "The auth url is copied to the clipboard!",
"modal_pcloudrevokeauth_step1": "Step 1: Go to the following address, you can remove the connection there.",
"modal_pcloudrevokeauth_step2": "Step 2: Click the button below, to clean the locally-saved login credentials.",
"modal_pcloudrevokeauth_clean": "Clean Locally-Saved Login Credentials",
"modal_pcloudrevokeauth_clean_desc": "You need to click the button.",
"modal_pcloudrevokeauth_clean_button": "Clean",
"modal_pcloudrevokeauth_clean_notice": "Cleaned!",
"modal_pcloudrevokeauth_clean_fail": "Something goes wrong while revoking.",
"modal_yandexdiskauth_tutorial": "<p>Please firstly go to the address, then go on the auth flow. In the end, you will be redirected to here.</p>",
"modal_yandexdiskauth_copybutton": "Click to copy the auth url",
"modal_yandexdiskauth_copynotice": "The auth url is copied to the clipboard!",
"modal_yandexdiskrevokeauth_step1": "Step 1: Go to the following address, you can remove the connection there.",
"modal_yandexdiskrevokeauth_step2": "Step 2: Click the button below, to clean the locally-saved login credentials.",
"modal_yandexdiskrevokeauth_clean": "Clean Locally-Saved Login Credentials",
"modal_yandexdiskrevokeauth_clean_desc": "You need to click the button.",
"modal_yandexdiskrevokeauth_clean_button": "Clean",
"modal_yandexdiskrevokeauth_clean_notice": "Cleaned!",
"modal_yandexdiskrevokeauth_clean_fail": "Something goes wrong while revoking.",
"modal_prorevokeauth": "Revoke auth by clicking here and follow the steps.", "modal_prorevokeauth": "Revoke auth by clicking here and follow the steps.",
"modal_prorevokeauth_clean": "Clean", "modal_prorevokeauth_clean": "Clean",
"modal_prorevokeauth_clean_desc": "Clean local auth record", "modal_prorevokeauth_clean_desc": "Clean local auth record",
@@ -54,7 +107,69 @@
"settings_googledrive_connect_succ": "Great! We can connect to Google Drive!", "settings_googledrive_connect_succ": "Great! We can connect to Google Drive!",
"settings_googledrive_connect_fail": "We cannot connect to Google Drive.", "settings_googledrive_connect_fail": "We cannot connect to Google Drive.",
"settings_box": "Box (PRO) (beta)",
"settings_chooseservice_box": "Box (PRO) (beta)",
"settings_box_disclaimer1": "Disclaimer: This app is NOT an official Box product. The app just uses Box's public api.",
"settings_box_disclaimer2": "Disclaimer: The information is stored locally. Other malicious/harmful/faulty plugins could read the info. If you see any unintentional access to your Box, please immediately disconnect this app on https://app.box.com/account/security .",
"settings_box_pro_desc": "<p><strong>!!It's a PRO feature of Remotely Save! You need a Remotely Save online account for this feature!!</strong>(<a href=\"#settings-pro\">scroll down</a> for more info about PRO account.)</p>",
"settings_box_notshowuphint": "Box Settings Not Available",
"settings_box_notshowuphint_desc": "Box settings are not available, because you haven't subscribed to the PRO feature in your Remotely Save account.",
"settings_box_notshowuphint_view_pro": "View PRO Settings",
"settings_box_folder": "We will create and sync inside the folder {{remoteBaseDir}} on your Box. DO NOT create this folder by yourself manually.",
"settings_box_revoke": "Revoke Auth",
"settings_box_revoke_desc": "You've connected. If you want to disconnect, click this button.",
"settings_box_revoke_button": "Revoke Auth",
"settings_box_auth": "Auth",
"settings_box_auth_desc": "Auth.",
"settings_box_auth_button": "Auth",
"settings_box_connect_succ": "Great! We can connect to Box!",
"settings_box_connect_fail": "We cannot connect to Box.",
"settings_pcloud": "pCloud (PRO) (beta)",
"settings_chooseservice_pcloud": "pCloud (PRO) (beta)",
"settings_pcloud_disclaimer1": "Disclaimer: This app is NOT an official pCloud product. The app just uses pCloud's public api.",
"settings_pcloud_disclaimer2": "Disclaimer: The information is stored locally. Other malicious/harmful/faulty plugins could read the info. If you see any unintentional access to your pCloud, please immediately disconnect this app on https://my.pcloud.com/#page=settings&settings=tab-apps .",
"settings_pcloud_pro_desc": "<p><strong>!!It's a PRO feature of Remotely Save! You need a Remotely Save online account for this feature!!</strong>(<a href=\"#settings-pro\">scroll down</a> for more info about PRO account.)</p>",
"settings_pcloud_notshowuphint": "pCloud Settings Not Available",
"settings_pcloud_notshowuphint_desc": "pCloud settings are not available, because you haven't subscribed to the PRO feature in your Remotely Save account.",
"settings_pcloud_notshowuphint_view_pro": "View PRO Settings",
"settings_pcloud_folder": "We will create and sync inside the folder {{remoteBaseDir}} on your pCloud. DO NOT create this folder by yourself manually.",
"settings_pcloud_revoke": "Revoke Auth",
"settings_pcloud_revoke_desc": "You've connected. If you want to disconnect, click this button.",
"settings_pcloud_revoke_button": "Revoke Auth",
"settings_pcloud_auth": "Auth",
"settings_pcloud_auth_desc": "Auth.",
"settings_pcloud_auth_button": "Auth",
"settings_pcloud_emptyfile": "Empty File",
"settings_pcloud_emptyfile_desc": "pCloud API doesn't work with empty file. How to deal with it?",
"settings_pcloud_emptyfile_skip": "Skip",
"settings_pcloud_emptyfile_error": "Error",
"settings_pcloud_connect_succ": "Great! We can connect to pCloud!",
"settings_pcloud_connect_fail": "We cannot connect to pCloud.",
"settings_yandexdisk": "Yandex Disk (PRO) (beta)",
"settings_chooseservice_yandexdisk": "Yandex Disk (PRO) (beta)",
"settings_yandexdisk_disclaimer1": "Disclaimer: This app is NOT an official Yandex Disk product. The app just uses Yandex Disk's public api.",
"settings_yandexdisk_disclaimer2": "Disclaimer: The information is stored locally. Other malicious/harmful/faulty plugins could read the info. If you see any unintentional access to your Yandex Disk, please immediately disconnect this app on https://app.yandexdisk.com/account/security .",
"settings_yandexdisk_pro_desc": "<p><strong>!!It's a PRO feature of Remotely Save! You need a Remotely Save online account for this feature!!</strong>(<a href=\"#settings-pro\">scroll down</a> for more info about PRO account.)</p>",
"settings_yandexdisk_notshowuphint": "Yandex Disk Settings Not Available",
"settings_yandexdisk_notshowuphint_desc": "Yandex Disk settings are not available, because you haven't subscribed to the PRO feature in your Remotely Save account.",
"settings_yandexdisk_notshowuphint_view_pro": "View PRO Settings",
"settings_yandexdisk_folder": "We will create and sync inside the folder {{remoteBaseDir}} on your Yandex Disk. DO NOT create this folder by yourself manually.",
"settings_yandexdisk_revoke": "Revoke Auth",
"settings_yandexdisk_revoke_desc": "You've connected. If you want to disconnect, click this button.",
"settings_yandexdisk_revoke_button": "Revoke Auth",
"settings_yandexdisk_auth": "Auth",
"settings_yandexdisk_auth_desc": "Auth.",
"settings_yandexdisk_auth_button": "Auth",
"settings_yandexdisk_connect_succ": "Great! We can connect to Yandex Disk!",
"settings_yandexdisk_connect_fail": "We cannot connect to Yandex Disk.",
"settings_export_googledrive_button": "Export Google Drive Part", "settings_export_googledrive_button": "Export Google Drive Part",
"settings_export_box_button": "Export Box Part",
"settings_export_pcloud_button": "Export pCloud Part",
"settings_export_yandexdisk_button": "Export Yandex Disk Part",
"settings_pro": "Account (for PRO features)", "settings_pro": "Account (for PRO features)",
"settings_pro_tutorial": "<p>Using <stong>basic</strong> features of Remotely Save is <strong>FREE</strong> and do <strong>NOT</strong> need an account.</p><p>However, you will <strong>need</strong> an online account and <strong>PAY</strong> for the <strong>PRO</strong> features such as smart conflict.</p><p>Firstly please click the button to sign up and sign in to the website: <a href=\"https://remotelysave.com\">https://remotelysave.com</a>. Notice: It's different from, and NOT affiliated with Obsidian account.</p><p>Secondly please \"connect\" your local device to your online account.", "settings_pro_tutorial": "<p>Using <stong>basic</strong> features of Remotely Save is <strong>FREE</strong> and do <strong>NOT</strong> need an account.</p><p>However, you will <strong>need</strong> an online account and <strong>PAY</strong> for the <strong>PRO</strong> features such as smart conflict.</p><p>Firstly please click the button to sign up and sign in to the website: <a href=\"https://remotelysave.com\">https://remotelysave.com</a>. Notice: It's different from, and NOT affiliated with Obsidian account.</p><p>Secondly please \"connect\" your local device to your online account.",
+119
View File
@@ -7,6 +7,21 @@
"protocol_pro_connect_fail": "Remotely Save 官网返回错误。可能是网络连接不稳定。也可能是您拒绝了授权?", "protocol_pro_connect_fail": "Remotely Save 官网返回错误。可能是网络连接不稳定。也可能是您拒绝了授权?",
"protocol_pro_connect_succ_revoke": "您已连接上账号 {{email}}。如果要取消连接,请点击此按钮。", "protocol_pro_connect_succ_revoke": "您已连接上账号 {{email}}。如果要取消连接,请点击此按钮。",
"protocol_box_connecting": "正在连接",
"protocol_box_connect_manualinput_succ": "连接成功",
"protocol_box_connect_fail": "Box 官网返回错误。可能是网络连接不稳定。也可能是您拒绝了授权?",
"protocol_box_connect_succ_revoke": "您已连接上账号。如果要取消连接,请点击此按钮。",
"protocol_pcloud_connecting": "正在连接",
"protocol_pcloud_connect_manualinput_succ": "连接成功",
"protocol_pcloud_connect_fail": "pCloud 官网返回错误。可能是网络连接不稳定。也可能是您拒绝了授权?",
"protocol_pcloud_connect_succ_revoke": "您已连接上账号。如果要取消连接,请点击此按钮。",
"protocol_yandexdisk_connecting": "正在连接",
"protocol_yandexdisk_connect_manualinput_succ": "连接成功",
"protocol_yandexdisk_connect_fail": "Yandex Disk 官网返回错误。可能是网络连接不稳定。也可能是您拒绝了授权?",
"protocol_yandexdisk_connect_succ_revoke": "您已连接上账号。如果要取消连接,请点击此按钮。",
"modal_googledriveauth_tutorial": "<p>请访问此网址,然后会进入授权流程。最后,您会看到一个码,请复制粘贴到这里然后提交。</p>", "modal_googledriveauth_tutorial": "<p>请访问此网址,然后会进入授权流程。最后,您会看到一个码,请复制粘贴到这里然后提交。</p>",
"modal_googledriveauth_copybutton": "点击以复制网址", "modal_googledriveauth_copybutton": "点击以复制网址",
"modal_googledriveauth_copynotice": "网址已复制!", "modal_googledriveauth_copynotice": "网址已复制!",
@@ -23,6 +38,49 @@
"modal_googledriverevokeauth_clean_notice": "已清理!", "modal_googledriverevokeauth_clean_notice": "已清理!",
"modal_googledriverevokeauth_clean_fail": "清理授权时候发生了错误。", "modal_googledriverevokeauth_clean_fail": "清理授权时候发生了错误。",
"modal_boxauth_tutorial": "<p>请访问此网址,然后会进入授权流程。最后,您会被重定向回来。</p>",
"modal_boxauth_copybutton": "点击以复制网址",
"modal_boxauth_copynotice": "网址已复制!",
"modal_box_maualinput": "网站上的码",
"modal_box_maualinput_desc": "请粘贴授权流程最后的那个码,然后点击确认。",
"modal_box_maualinput_notice": "正在尝试连接 Box 并更新授权信息......",
"modal_box_maualinput_succ_notice": "很好!授权信息已更新!",
"modal_box_maualinput_fail_notice": "更新授权信息失败。请稍后重试。",
"modal_boxrevokeauth_step1": "第 1 步:访问以下网址,可以删除连接。",
"modal_boxrevokeauth_step2": "第 2 步:点击以下按钮,从而清理本地的登录信息。",
"modal_boxrevokeauth_clean": "清理本地登录信息",
"modal_boxrevokeauth_clean_desc": "您需要点击此按钮。",
"modal_boxrevokeauth_clean_button": "清理",
"modal_boxrevokeauth_clean_notice": "已清理!",
"modal_boxrevokeauth_clean_fail": "清理授权时候发生了错误。",
"modal_pcloudauth_tutorial": "<p>请访问此网址,然后会进入授权流程。最后,您会被重定向回来。</p>",
"modal_pcloudauth_copybutton": "点击以复制网址",
"modal_pcloudauth_copynotice": "网址已复制!",
"modal_pcloudrevokeauth_step1": "第 1 步:访问以下网址,可以删除连接。",
"modal_pcloudrevokeauth_step2": "第 2 步:点击以下按钮,从而清理本地的登录信息。",
"modal_pcloudrevokeauth_clean": "清理本地登录信息",
"modal_pcloudrevokeauth_clean_desc": "您需要点击此按钮。",
"modal_pcloudrevokeauth_clean_button": "清理",
"modal_pcloudrevokeauth_clean_notice": "已清理!",
"modal_pcloudrevokeauth_clean_fail": "清理授权时候发生了错误。",
"modal_yandexdiskauth_tutorial": "<p>请访问此网址,然后会进入授权流程。最后,您会被重定向回来。</p>",
"modal_yandexdiskauth_copybutton": "点击以复制网址",
"modal_yandexdiskauth_copynotice": "网址已复制!",
"modal_yandexdisk_maualinput": "网站上的码",
"modal_yandexdisk_maualinput_desc": "请粘贴授权流程最后的那个码,然后点击确认。",
"modal_yandexdisk_maualinput_notice": "正在尝试连接 Yandex Disk 并更新授权信息......",
"modal_yandexdisk_maualinput_succ_notice": "很好!授权信息已更新!",
"modal_yandexdisk_maualinput_fail_notice": "更新授权信息失败。请稍后重试。",
"modal_yandexdiskrevokeauth_step1": "第 1 步:访问以下网址,可以删除连接。",
"modal_yandexdiskrevokeauth_step2": "第 2 步:点击以下按钮,从而清理本地的登录信息。",
"modal_yandexdiskrevokeauth_clean": "清理本地登录信息",
"modal_yandexdiskrevokeauth_clean_desc": "您需要点击此按钮。",
"modal_yandexdiskrevokeauth_clean_button": "清理",
"modal_yandexdiskrevokeauth_clean_notice": "已清理!",
"modal_yandexdiskrevokeauth_clean_fail": "清理授权时候发生了错误。",
"modal_prorevokeauth": "点击这里和按照步骤取消授权。", "modal_prorevokeauth": "点击这里和按照步骤取消授权。",
"modal_prorevokeauth_clean": "清理", "modal_prorevokeauth_clean": "清理",
"modal_prorevokeauth_clean_desc": "清理本地授权记录", "modal_prorevokeauth_clean_desc": "清理本地授权记录",
@@ -54,7 +112,68 @@
"settings_googledrive_connect_succ": "很好!我们可连接上 Google Drive", "settings_googledrive_connect_succ": "很好!我们可连接上 Google Drive",
"settings_googledrive_connect_fail": "我们未能连接上 Google Drive。", "settings_googledrive_connect_fail": "我们未能连接上 Google Drive。",
"settings_box": "Box (PRO) (beta)",
"settings_chooseservice_box": "Box (PRO) (beta)",
"settings_box_disclaimer1": "声明:本插件不是 Box 的官方产品。只是用到了它的公开 API。",
"settings_box_disclaimer2": "声明:您所输入的信息存储于本地。其它有害的或者出错的插件,是有可能读取到这些信息的。如果您发现任何不符合预期的 Box 访问,请立刻在以下网站操作断开连接: https://app.box.com/account/security 。",
"settings_box_pro_desc": "<p><strong>!!这是 PRO(付费)功能! 您需要在线账号来使用此功能!!</strong><a href=\"#settings-pro\">向下滑</a>可以看到 PRO 账号的更多信息。)</p>",
"settings_box_notshowuphint": "Box 设置不可用",
"settings_box_notshowuphint_desc": "Box 设置不可用,因为您没有在 Remotely Save 账号里开启这个 PRO 功能。",
"settings_box_notshowuphint_view_pro": "查看 PRO 相关设置",
"settings_box_folder": "我们会在 Box 创建此文件夹并同步内容进去: {{remoteBaseDir}} 。请不要手动在网站上创建。",
"settings_box_revoke": "撤回鉴权",
"settings_box_revoke_desc": "您现在已连接。如果想取消连接,请点击此按钮。",
"settings_box_revoke_button": "撤回鉴权",
"settings_box_auth": "鉴权",
"settings_box_auth_desc": "鉴权.",
"settings_box_auth_button": "鉴权",
"settings_box_connect_succ": "很好!我们可连接上 Box",
"settings_box_connect_fail": "我们未能连接上 Box。",
"settings_pcloud": "pCloud (PRO) (beta)",
"settings_chooseservice_pcloud": "pCloud (PRO) (beta)",
"settings_pcloud_disclaimer1": "声明:本插件不是 pCloud 的官方产品。只是用到了它的公开 API。",
"settings_pcloud_disclaimer2": "声明:您所输入的信息存储于本地。其它有害的或者出错的插件,是有可能读取到这些信息的。如果您发现任何不符合预期的 pCloud 访问,请立刻在以下网站操作断开连接: https://my.pcloud.com/#page=settings&settings=tab-apps 。",
"settings_pcloud_pro_desc": "<p><strong>!!这是 PRO(付费)功能! 您需要在线账号来使用此功能!!</strong><a href=\"#settings-pro\">向下滑</a>可以看到 PRO 账号的更多信息。)</p>",
"settings_pcloud_notshowuphint": "pCloud 设置不可用",
"settings_pcloud_notshowuphint_desc": "pCloud 设置不可用,因为您没有在 Remotely Save 账号里开启这个 PRO 功能。",
"settings_pcloud_notshowuphint_view_pro": "查看 PRO 相关设置",
"settings_pcloud_folder": "我们会在 pCloud 创建此文件夹并同步内容进去: {{remoteBaseDir}} 。请不要手动在网站上创建。",
"settings_pcloud_revoke": "撤回鉴权",
"settings_pcloud_revoke_desc": "您现在已连接。如果想取消连接,请点击此按钮。",
"settings_pcloud_revoke_button": "撤回鉴权",
"settings_pcloud_auth": "鉴权",
"settings_pcloud_auth_desc": "鉴权.",
"settings_pcloud_auth_button": "鉴权",
"settings_pcloud_emptyfile": "空文件",
"settings_pcloud_emptyfile_desc": "pCloud API 不支持上传空文件,怎么处理?",
"settings_pcloud_emptyfile_skip": "跳过",
"settings_pcloud_emptyfile_error": "提示错误",
"settings_pcloud_connect_succ": "很好!我们可连接上 pCloud",
"settings_pcloud_connect_fail": "我们未能连接上 pCloud。",
"settings_yandexdisk": "Yandex Disk (PRO) (beta)",
"settings_chooseservice_yandexdisk": "Yandex Disk (PRO) (beta)",
"settings_yandexdisk_disclaimer1": "声明:本插件不是 Yandex Disk 的官方产品。只是用到了它的公开 API。",
"settings_yandexdisk_disclaimer2": "声明:您所输入的信息存储于本地。其它有害的或者出错的插件,是有可能读取到这些信息的。如果您发现任何不符合预期的 Yandex Disk 访问,请立刻在以下网站操作断开连接: https://id.yandex.com/profile/devices 。",
"settings_yandexdisk_pro_desc": "<p><strong>!!这是 PRO(付费)功能! 您需要在线账号来使用此功能!!</strong><a href=\"#settings-pro\">向下滑</a>可以看到 PRO 账号的更多信息。)</p>",
"settings_yandexdisk_notshowuphint": "Yandex Disk 设置不可用",
"settings_yandexdisk_notshowuphint_desc": "Yandex Disk 设置不可用,因为您没有在 Remotely Save 账号里开启这个 PRO 功能。",
"settings_yandexdisk_notshowuphint_view_pro": "查看 PRO 相关设置",
"settings_yandexdisk_folder": "我们会在 Yandex Disk 创建此文件夹并同步内容进去: {{remoteBaseDir}} 。请不要手动在网站上创建。",
"settings_yandexdisk_revoke": "撤回鉴权",
"settings_yandexdisk_revoke_desc": "您现在已连接。如果想取消连接,请点击此按钮。",
"settings_yandexdisk_revoke_button": "撤回鉴权",
"settings_yandexdisk_auth": "鉴权",
"settings_yandexdisk_auth_desc": "鉴权.",
"settings_yandexdisk_auth_button": "鉴权",
"settings_yandexdisk_connect_succ": "很好!我们可连接上 Yandex Disk",
"settings_yandexdisk_connect_fail": "我们未能连接上 Yandex Disk。",
"settings_export_googledrive_button": "导出 Google Drive 部分", "settings_export_googledrive_button": "导出 Google Drive 部分",
"settings_export_box_button": "导出 Box 部分",
"settings_export_pcloud_button": "导出 pCloud 部分",
"settings_export_yandexdisk_button": "导出 Yandex Disk 部分",
"settings_pro": "账号(PRO 付费功能)", "settings_pro": "账号(PRO 付费功能)",
"settings_pro_tutorial": "<p>使用 Remotely Save 的<stong>基本</strong>功能是<strong>免费的</strong>,而且<strong>不</strong>需要注册对应账号。</p><p>但是,您<strong>需要</strong>注册账号和对<strong>PRO</strong>功能<strong>付费</strong>使用,如智能处理冲突功能。</p><p>第一步:点击按钮从而注册和登录网站:<a href=\"https://remotelysave.com\">https://remotelysave.com</a>。注意:这和 Obsidian 官方账号无关,是不同的账号。</p><p>第二部:点击“连接”按钮,从而连接本设备和在线账号。", "settings_pro_tutorial": "<p>使用 Remotely Save 的<stong>基本</strong>功能是<strong>免费的</strong>,而且<strong>不</strong>需要注册对应账号。</p><p>但是,您<strong>需要</strong>注册账号和对<strong>PRO</strong>功能<strong>付费</strong>使用,如智能处理冲突功能。</p><p>第一步:点击按钮从而注册和登录网站:<a href=\"https://remotelysave.com\">https://remotelysave.com</a>。注意:这和 Obsidian 官方账号无关,是不同的账号。</p><p>第二部:点击“连接”按钮,从而连接本设备和在线账号。",
+119
View File
@@ -7,6 +7,21 @@
"protocol_pro_connect_fail": "Remotely Save 官網返回錯誤。可能是網路連線不穩定。也可能是您拒絕了授權?", "protocol_pro_connect_fail": "Remotely Save 官網返回錯誤。可能是網路連線不穩定。也可能是您拒絕了授權?",
"protocol_pro_connect_succ_revoke": "您已連線上賬號 {{email}}。如果要取消連線,請點選此按鈕。", "protocol_pro_connect_succ_revoke": "您已連線上賬號 {{email}}。如果要取消連線,請點選此按鈕。",
"protocol_box_connecting": "正在連線",
"protocol_box_connect_manualinput_succ": "連線成功",
"protocol_box_connect_fail": "Box 官網返回錯誤。可能是網路連線不穩定。也可能是您拒絕了授權?",
"protocol_box_connect_succ_revoke": "您已連線上賬號。如果要取消連線,請點選此按鈕。",
"protocol_pcloud_connecting": "正在連線",
"protocol_pcloud_connect_manualinput_succ": "連線成功",
"protocol_pcloud_connect_fail": "pCloud 官網返回錯誤。可能是網路連線不穩定。也可能是您拒絕了授權?",
"protocol_pcloud_connect_succ_revoke": "您已連線上賬號。如果要取消連線,請點選此按鈕。",
"protocol_yandexdisk_connecting": "正在連線",
"protocol_yandexdisk_connect_manualinput_succ": "連線成功",
"protocol_yandexdisk_connect_fail": "Yandex Disk 官網返回錯誤。可能是網路連線不穩定。也可能是您拒絕了授權?",
"protocol_yandexdisk_connect_succ_revoke": "您已連線上賬號。如果要取消連線,請點選此按鈕。",
"modal_googledriveauth_tutorial": "<p>請訪問此網址,然後會進入授權流程。最後,您會看到一個碼,請複製貼上到這裡然後提交。</p>", "modal_googledriveauth_tutorial": "<p>請訪問此網址,然後會進入授權流程。最後,您會看到一個碼,請複製貼上到這裡然後提交。</p>",
"modal_googledriveauth_copybutton": "點選以複製網址", "modal_googledriveauth_copybutton": "點選以複製網址",
"modal_googledriveauth_copynotice": "網址已複製!", "modal_googledriveauth_copynotice": "網址已複製!",
@@ -23,6 +38,49 @@
"modal_googledriverevokeauth_clean_notice": "已清理!", "modal_googledriverevokeauth_clean_notice": "已清理!",
"modal_googledriverevokeauth_clean_fail": "清理授權時候發生了錯誤。", "modal_googledriverevokeauth_clean_fail": "清理授權時候發生了錯誤。",
"modal_boxauth_tutorial": "<p>請訪問此網址,然後會進入授權流程。最後,您會被重定向回來。</p>",
"modal_boxauth_copybutton": "點選以複製網址",
"modal_boxauth_copynotice": "網址已複製!",
"modal_box_maualinput": "網站上的碼",
"modal_box_maualinput_desc": "請貼上授權流程最後的那個碼,然後點選確認。",
"modal_box_maualinput_notice": "正在嘗試連線 Box 並更新授權資訊......",
"modal_box_maualinput_succ_notice": "很好!授權資訊已更新!",
"modal_box_maualinput_fail_notice": "更新授權資訊失敗。請稍後重試。",
"modal_boxrevokeauth_step1": "第 1 步:訪問以下網址,可以刪除連線。",
"modal_boxrevokeauth_step2": "第 2 步:點選以下按鈕,從而清理本地的登入資訊。",
"modal_boxrevokeauth_clean": "清理本地登入資訊",
"modal_boxrevokeauth_clean_desc": "您需要點選此按鈕。",
"modal_boxrevokeauth_clean_button": "清理",
"modal_boxrevokeauth_clean_notice": "已清理!",
"modal_boxrevokeauth_clean_fail": "清理授權時候發生了錯誤。",
"modal_pcloudauth_tutorial": "<p>請訪問此網址,然後會進入授權流程。最後,您會被重定向回來。</p>",
"modal_pcloudauth_copybutton": "點選以複製網址",
"modal_pcloudauth_copynotice": "網址已複製!",
"modal_pcloudrevokeauth_step1": "第 1 步:訪問以下網址,可以刪除連線。",
"modal_pcloudrevokeauth_step2": "第 2 步:點選以下按鈕,從而清理本地的登入資訊。",
"modal_pcloudrevokeauth_clean": "清理本地登入資訊",
"modal_pcloudrevokeauth_clean_desc": "您需要點選此按鈕。",
"modal_pcloudrevokeauth_clean_button": "清理",
"modal_pcloudrevokeauth_clean_notice": "已清理!",
"modal_pcloudrevokeauth_clean_fail": "清理授權時候發生了錯誤。",
"modal_yandexdiskauth_tutorial": "<p>請訪問此網址,然後會進入授權流程。最後,您會被重定向回來。</p>",
"modal_yandexdiskauth_copybutton": "點選以複製網址",
"modal_yandexdiskauth_copynotice": "網址已複製!",
"modal_yandexdisk_maualinput": "網站上的碼",
"modal_yandexdisk_maualinput_desc": "請貼上授權流程最後的那個碼,然後點選確認。",
"modal_yandexdisk_maualinput_notice": "正在嘗試連線 Yandex Disk 並更新授權資訊......",
"modal_yandexdisk_maualinput_succ_notice": "很好!授權資訊已更新!",
"modal_yandexdisk_maualinput_fail_notice": "更新授權資訊失敗。請稍後重試。",
"modal_yandexdiskrevokeauth_step1": "第 1 步:訪問以下網址,可以刪除連線。",
"modal_yandexdiskrevokeauth_step2": "第 2 步:點選以下按鈕,從而清理本地的登入資訊。",
"modal_yandexdiskrevokeauth_clean": "清理本地登入資訊",
"modal_yandexdiskrevokeauth_clean_desc": "您需要點選此按鈕。",
"modal_yandexdiskrevokeauth_clean_button": "清理",
"modal_yandexdiskrevokeauth_clean_notice": "已清理!",
"modal_yandexdiskrevokeauth_clean_fail": "清理授權時候發生了錯誤。",
"modal_prorevokeauth": "點選這裡和按照步驟取消授權。", "modal_prorevokeauth": "點選這裡和按照步驟取消授權。",
"modal_prorevokeauth_clean": "清理", "modal_prorevokeauth_clean": "清理",
"modal_prorevokeauth_clean_desc": "清理本地授權記錄", "modal_prorevokeauth_clean_desc": "清理本地授權記錄",
@@ -54,7 +112,68 @@
"settings_googledrive_connect_succ": "很好!我們可連線上 Google Drive", "settings_googledrive_connect_succ": "很好!我們可連線上 Google Drive",
"settings_googledrive_connect_fail": "我們未能連線上 Google Drive。", "settings_googledrive_connect_fail": "我們未能連線上 Google Drive。",
"settings_box": "Box (PRO) (beta)",
"settings_chooseservice_box": "Box (PRO) (beta)",
"settings_box_disclaimer1": "宣告:本外掛不是 Box 的官方產品。只是用到了它的公開 API。",
"settings_box_disclaimer2": "宣告:您所輸入的資訊儲存於本地。其它有害的或者出錯的外掛,是有可能讀取到這些資訊的。如果您發現任何不符合預期的 Box 訪問,請立刻在以下網站操作斷開連線: https://app.box.com/account/security 。",
"settings_box_pro_desc": "<p><strong>!!這是 PRO(付費)功能! 您需要線上賬號來使用此功能!!</strong><a href=\"#settings-pro\">向下滑</a>可以看到 PRO 賬號的更多資訊。)</p>",
"settings_box_notshowuphint": "Box 設定不可用",
"settings_box_notshowuphint_desc": "Box 設定不可用,因為您沒有在 Remotely Save 賬號裡開啟這個 PRO 功能。",
"settings_box_notshowuphint_view_pro": "檢視 PRO 相關設定",
"settings_box_folder": "我們會在 Box 建立此資料夾並同步內容進去: {{remoteBaseDir}} 。請不要手動在網站上建立。",
"settings_box_revoke": "撤回鑑權",
"settings_box_revoke_desc": "您現在已連線。如果想取消連線,請點選此按鈕。",
"settings_box_revoke_button": "撤回鑑權",
"settings_box_auth": "鑑權",
"settings_box_auth_desc": "鑑權.",
"settings_box_auth_button": "鑑權",
"settings_box_connect_succ": "很好!我們可連線上 Box",
"settings_box_connect_fail": "我們未能連線上 Box。",
"settings_pcloud": "pCloud (PRO) (beta)",
"settings_chooseservice_pcloud": "pCloud (PRO) (beta)",
"settings_pcloud_disclaimer1": "宣告:本外掛不是 pCloud 的官方產品。只是用到了它的公開 API。",
"settings_pcloud_disclaimer2": "宣告:您所輸入的資訊儲存於本地。其它有害的或者出錯的外掛,是有可能讀取到這些資訊的。如果您發現任何不符合預期的 pCloud 訪問,請立刻在以下網站操作斷開連線: https://my.pcloud.com/#page=settings&settings=tab-apps 。",
"settings_pcloud_pro_desc": "<p><strong>!!這是 PRO(付費)功能! 您需要線上賬號來使用此功能!!</strong><a href=\"#settings-pro\">向下滑</a>可以看到 PRO 賬號的更多資訊。)</p>",
"settings_pcloud_notshowuphint": "pCloud 設定不可用",
"settings_pcloud_notshowuphint_desc": "pCloud 設定不可用,因為您沒有在 Remotely Save 賬號裡開啟這個 PRO 功能。",
"settings_pcloud_notshowuphint_view_pro": "檢視 PRO 相關設定",
"settings_pcloud_folder": "我們會在 pCloud 建立此資料夾並同步內容進去: {{remoteBaseDir}} 。請不要手動在網站上建立。",
"settings_pcloud_revoke": "撤回鑑權",
"settings_pcloud_revoke_desc": "您現在已連線。如果想取消連線,請點選此按鈕。",
"settings_pcloud_revoke_button": "撤回鑑權",
"settings_pcloud_auth": "鑑權",
"settings_pcloud_auth_desc": "鑑權.",
"settings_pcloud_auth_button": "鑑權",
"settings_pcloud_emptyfile": "空檔案",
"settings_pcloud_emptyfile_desc": "pCloud API 不支援上傳空檔案,怎麼處理?",
"settings_pcloud_emptyfile_skip": "跳過",
"settings_pcloud_emptyfile_error": "提示錯誤",
"settings_pcloud_connect_succ": "很好!我們可連線上 pCloud",
"settings_pcloud_connect_fail": "我們未能連線上 pCloud。",
"settings_yandexdisk": "Yandex Disk (PRO) (beta)",
"settings_chooseservice_yandexdisk": "Yandex Disk (PRO) (beta)",
"settings_yandexdisk_disclaimer1": "宣告:本外掛不是 Yandex Disk 的官方產品。只是用到了它的公開 API。",
"settings_yandexdisk_disclaimer2": "宣告:您所輸入的資訊儲存於本地。其它有害的或者出錯的外掛,是有可能讀取到這些資訊的。如果您發現任何不符合預期的 Yandex Disk 訪問,請立刻在以下網站操作斷開連線: https://id.yandex.com/profile/devices 。",
"settings_yandexdisk_pro_desc": "<p><strong>!!這是 PRO(付費)功能! 您需要線上賬號來使用此功能!!</strong><a href=\"#settings-pro\">向下滑</a>可以看到 PRO 賬號的更多資訊。)</p>",
"settings_yandexdisk_notshowuphint": "Yandex Disk 設定不可用",
"settings_yandexdisk_notshowuphint_desc": "Yandex Disk 設定不可用,因為您沒有在 Remotely Save 賬號裡開啟這個 PRO 功能。",
"settings_yandexdisk_notshowuphint_view_pro": "檢視 PRO 相關設定",
"settings_yandexdisk_folder": "我們會在 Yandex Disk 建立此資料夾並同步內容進去: {{remoteBaseDir}} 。請不要手動在網站上建立。",
"settings_yandexdisk_revoke": "撤回鑑權",
"settings_yandexdisk_revoke_desc": "您現在已連線。如果想取消連線,請點選此按鈕。",
"settings_yandexdisk_revoke_button": "撤回鑑權",
"settings_yandexdisk_auth": "鑑權",
"settings_yandexdisk_auth_desc": "鑑權.",
"settings_yandexdisk_auth_button": "鑑權",
"settings_yandexdisk_connect_succ": "很好!我們可連線上 Yandex Disk",
"settings_yandexdisk_connect_fail": "我們未能連線上 Yandex Disk。",
"settings_export_googledrive_button": "匯出 Google Drive 部分", "settings_export_googledrive_button": "匯出 Google Drive 部分",
"settings_export_box_button": "匯出 Box 部分",
"settings_export_pcloud_button": "匯出 pCloud 部分",
"settings_export_yandexdisk_button": "匯出 Yandex Disk 部分",
"settings_pro": "賬號(PRO 付費功能)", "settings_pro": "賬號(PRO 付費功能)",
"settings_pro_tutorial": "<p>使用 Remotely Save 的<stong>基本</strong>功能是<strong>免費的</strong>,而且<strong>不</strong>需要註冊對應賬號。</p><p>但是,您<strong>需要</strong>註冊賬號和對<strong>PRO</strong>功能<strong>付費</strong>使用,如智慧處理衝突功能。</p><p>第一步:點選按鈕從而註冊和登入網站:<a href=\"https://remotelysave.com\">https://remotelysave.com</a>。注意:這和 Obsidian 官方賬號無關,是不同的賬號。</p><p>第二部:點選“連線”按鈕,從而連線本裝置和線上賬號。", "settings_pro_tutorial": "<p>使用 Remotely Save 的<stong>基本</strong>功能是<strong>免費的</strong>,而且<strong>不</strong>需要註冊對應賬號。</p><p>但是,您<strong>需要</strong>註冊賬號和對<strong>PRO</strong>功能<strong>付費</strong>使用,如智慧處理衝突功能。</p><p>第一步:點選按鈕從而註冊和登入網站:<a href=\"https://remotelysave.com\">https://remotelysave.com</a>。注意:這和 Obsidian 官方賬號無關,是不同的賬號。</p><p>第二部:點選“連線”按鈕,從而連線本裝置和線上賬號。",
+26
View File
@@ -0,0 +1,26 @@
import { base64url } from "rfc4648";
/**
* https://datatracker.ietf.org/doc/html/rfc7636
* dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk
* => E9Melhoa2OwvFrEMTJguCHaoeK1t8URWbuGJSstw-cM
* @param x
* @returns BASE64URL-ENCODE(SHA256(ASCII(code_verifier)))
*/
export async function codeVerifier2CodeChallenge(x: string) {
if (x === undefined || x === "") {
return "";
}
try {
return base64url.stringify(
new Uint8Array(
await crypto.subtle.digest("SHA-256", new TextEncoder().encode(x))
),
{
pad: false,
}
);
} catch (e) {
return "";
}
}
+367
View File
@@ -0,0 +1,367 @@
import cloneDeep from "lodash/cloneDeep";
import { type App, Modal, Notice, Setting } from "obsidian";
import { getClient } from "../../src/fsGetter";
import type { TransItemType } from "../../src/i18n";
import type RemotelySavePlugin from "../../src/main";
import { stringToFragment } from "../../src/misc";
import { ChangeRemoteBaseDirModal } from "../../src/settings";
import {
DEFAULT_BOX_CONFIG,
generateAuthUrl,
sendRefreshTokenReq,
} from "./fsBox";
class BoxAuthModal extends Modal {
readonly plugin: RemotelySavePlugin;
readonly authDiv: HTMLDivElement;
readonly revokeAuthDiv: HTMLDivElement;
readonly revokeAuthSetting: Setting;
readonly t: (x: TransItemType, vars?: any) => string;
constructor(
app: App,
plugin: RemotelySavePlugin,
authDiv: HTMLDivElement,
revokeAuthDiv: HTMLDivElement,
revokeAuthSetting: Setting,
t: (x: TransItemType, vars?: any) => string
) {
super(app);
this.plugin = plugin;
this.authDiv = authDiv;
this.revokeAuthDiv = revokeAuthDiv;
this.revokeAuthSetting = revokeAuthSetting;
this.t = t;
}
async onOpen() {
const { contentEl } = this;
const t = this.t;
const authUrl = generateAuthUrl();
const div2 = contentEl.createDiv();
div2.createDiv({
text: stringToFragment(t("modal_boxauth_tutorial")),
});
div2.createEl(
"button",
{
text: t("modal_boxauth_copybutton"),
},
(el) => {
el.onclick = async () => {
await navigator.clipboard.writeText(authUrl);
new Notice(t("modal_boxauth_copynotice"));
};
}
);
contentEl.createEl("p").createEl("a", {
href: authUrl,
text: authUrl,
});
// let refreshToken = "";
// new Setting(contentEl)
// .setName(t("modal_box_maualinput"))
// .setDesc(t("modal_box_maualinput_desc"))
// .addText((text) =>
// text
// .setPlaceholder("")
// .setValue("")
// .onChange((val) => {
// refreshToken = val.trim();
// })
// )
// .addButton(async (button) => {
// button.setButtonText(t("submit"));
// button.onClick(async () => {
// new Notice(t("modal_box_maualinput_notice"));
// try {
// if (this.plugin.settings.box === undefined) {
// this.plugin.settings.box = cloneDeep(
// DEFAULT_BOX_CONFIG
// );
// }
// this.plugin.settings.box.refreshToken = refreshToken;
// this.plugin.settings.box.accessToken = "access";
// this.plugin.settings.box.accessTokenExpiresAtTimeMs = 1;
// this.plugin.settings.box.accessTokenExpiresInMs = 1;
// // TODO: abstraction leaking now, how to fix?
// const k = await sendRefreshTokenReq(refreshToken);
// const ts = Date.now();
// this.plugin.settings.box.accessToken = k.access_token;
// this.plugin.settings.box.accessTokenExpiresInMs =
// k.expires_in * 1000;
// this.plugin.settings.box.accessTokenExpiresAtTimeMs =
// ts + k.expires_in * 1000 - 60 * 2 * 1000;
// await this.plugin.saveSettings();
// // try to remove data in clipboard
// await navigator.clipboard.writeText("");
// new Notice(t("modal_box_maualinput_succ_notice"));
// } catch (e) {
// console.error(e);
// new Notice(t("modal_box_maualinput_fail_notice"));
// } finally {
// this.authDiv.toggleClass(
// "box-auth-button-hide",
// this.plugin.settings.box.refreshToken !== ""
// );
// this.revokeAuthDiv.toggleClass(
// "box-revoke-auth-button-hide",
// this.plugin.settings.box.refreshToken === ""
// );
// this.close();
// }
// });
// });
}
onClose() {
const { contentEl } = this;
contentEl.empty();
}
}
class BoxRevokeAuthModal extends Modal {
readonly plugin: RemotelySavePlugin;
readonly authDiv: HTMLDivElement;
readonly revokeAuthDiv: HTMLDivElement;
readonly t: (x: TransItemType, vars?: any) => string;
constructor(
app: App,
plugin: RemotelySavePlugin,
authDiv: HTMLDivElement,
revokeAuthDiv: HTMLDivElement,
t: (x: TransItemType, vars?: any) => string
) {
super(app);
this.plugin = plugin;
this.authDiv = authDiv;
this.revokeAuthDiv = revokeAuthDiv;
this.t = t;
}
async onOpen() {
const t = this.t;
const { contentEl } = this;
contentEl.createEl("p", {
text: t("modal_boxrevokeauth_step1"),
});
const consentUrl = "https://app.box.com/account/security";
contentEl.createEl("p").createEl("a", {
href: consentUrl,
text: consentUrl,
});
contentEl.createEl("p", {
text: t("modal_boxrevokeauth_step2"),
});
new Setting(contentEl)
.setName(t("modal_boxrevokeauth_clean"))
.setDesc(t("modal_boxrevokeauth_clean_desc"))
.addButton(async (button) => {
button.setButtonText(t("modal_boxrevokeauth_clean_button"));
button.onClick(async () => {
try {
this.plugin.settings.box = cloneDeep(DEFAULT_BOX_CONFIG);
await this.plugin.saveSettings();
this.authDiv.toggleClass(
"box-auth-button-hide",
this.plugin.settings.box.refreshToken !== ""
);
this.revokeAuthDiv.toggleClass(
"box-revoke-auth-button-hide",
this.plugin.settings.box.refreshToken === ""
);
new Notice(t("modal_boxrevokeauth_clean_notice"));
this.close();
} catch (err) {
console.error(err);
new Notice(t("modal_boxrevokeauth_clean_fail"));
}
});
});
}
onClose() {
const { contentEl } = this;
contentEl.empty();
}
}
export const generateBoxSettingsPart = (
containerEl: HTMLElement,
t: (x: TransItemType, vars?: any) => string,
app: App,
plugin: RemotelySavePlugin,
saveUpdatedConfigFunc: () => Promise<any> | undefined
) => {
const boxDiv = containerEl.createEl("div", {
cls: "box-hide",
});
boxDiv.toggleClass("box-hide", plugin.settings.serviceType !== "box");
boxDiv.createEl("h2", { text: t("settings_box") });
const boxLongDescDiv = boxDiv.createEl("div", {
cls: "settings-long-desc",
});
for (const c of [
t("settings_box_disclaimer1"),
t("settings_box_disclaimer2"),
]) {
boxLongDescDiv.createEl("p", {
text: c,
cls: "box-disclaimer",
});
}
boxLongDescDiv.createEl("p", {
text: t("settings_box_folder", {
remoteBaseDir: plugin.settings.box.remoteBaseDir || app.vault.getName(),
}),
});
boxLongDescDiv.createDiv({
text: stringToFragment(t("settings_box_pro_desc")),
cls: "box-disclaimer",
});
const boxNotShowUpHintSetting = new Setting(boxDiv)
.setName(t("settings_box_notshowuphint"))
.setDesc(t("settings_box_notshowuphint_desc"))
.addButton(async (button) => {
button.setButtonText(t("settings_box_notshowuphint_view_pro"));
button.onClick(async () => {
window.location.href = "#settings-pro";
});
});
const boxAllowedToUsedDiv = boxDiv.createDiv();
// if pro enabled, show up; otherwise hide.
const allowBox =
plugin.settings.pro?.enabledProFeatures.filter(
(x) => x.featureName === "feature-box"
).length === 1;
console.debug(`allow to show up box settings? ${allowBox}`);
if (allowBox) {
boxAllowedToUsedDiv.removeClass("box-allow-to-use-hide");
boxNotShowUpHintSetting.settingEl.addClass("box-allow-to-use-hide");
} else {
boxAllowedToUsedDiv.addClass("box-allow-to-use-hide");
boxNotShowUpHintSetting.settingEl.removeClass("box-allow-to-use-hide");
}
const boxSelectAuthDiv = boxAllowedToUsedDiv.createDiv();
const boxAuthDiv = boxSelectAuthDiv.createDiv({
cls: "box-auth-button-hide settings-auth-related",
});
const boxRevokeAuthDiv = boxSelectAuthDiv.createDiv({
cls: "box-revoke-auth-button-hide settings-auth-related",
});
const boxRevokeAuthSetting = new Setting(boxRevokeAuthDiv)
.setName(t("settings_box_revoke"))
.setDesc(t("settings_box_revoke_desc"))
.addButton(async (button) => {
button.setButtonText(t("settings_box_revoke_button"));
button.onClick(async () => {
new BoxRevokeAuthModal(
app,
plugin,
boxAuthDiv,
boxRevokeAuthDiv,
t
).open();
});
});
new Setting(boxAuthDiv)
.setName(t("settings_box_auth"))
.setDesc(t("settings_box_auth_desc"))
.addButton(async (button) => {
button.setButtonText(t("settings_box_auth_button"));
button.onClick(async () => {
const modal = new BoxAuthModal(
app,
plugin,
boxAuthDiv,
boxRevokeAuthDiv,
boxRevokeAuthSetting,
t
);
plugin.oauth2Info.helperModal = modal;
plugin.oauth2Info.authDiv = boxAuthDiv;
plugin.oauth2Info.revokeDiv = boxRevokeAuthDiv;
plugin.oauth2Info.revokeAuthSetting = boxRevokeAuthSetting;
modal.open();
});
});
boxAuthDiv.toggleClass(
"box-auth-button-hide",
plugin.settings.box.refreshToken !== ""
);
boxRevokeAuthDiv.toggleClass(
"box-revoke-auth-button-hide",
plugin.settings.box.refreshToken === ""
);
let newboxRemoteBaseDir = plugin.settings.box.remoteBaseDir || "";
new Setting(boxAllowedToUsedDiv)
.setName(t("settings_remotebasedir"))
.setDesc(t("settings_remotebasedir_desc"))
.addText((text) =>
text
.setPlaceholder(app.vault.getName())
.setValue(newboxRemoteBaseDir)
.onChange((value) => {
newboxRemoteBaseDir = value.trim();
})
)
.addButton((button) => {
button.setButtonText(t("confirm"));
button.onClick(() => {
new ChangeRemoteBaseDirModal(
app,
plugin,
newboxRemoteBaseDir,
"box"
).open();
});
});
new Setting(boxAllowedToUsedDiv)
.setName(t("settings_checkonnectivity"))
.setDesc(t("settings_checkonnectivity_desc"))
.addButton(async (button) => {
button.setButtonText(t("settings_checkonnectivity_button"));
button.onClick(async () => {
new Notice(t("settings_checkonnectivity_checking"));
const client = getClient(plugin.settings, app.vault.getName(), () =>
plugin.saveSettings()
);
const errors = { msg: "" };
const res = await client.checkConnect((err: any) => {
errors.msg = `${err}`;
});
if (res) {
new Notice(t("settings_box_connect_succ"));
} else {
new Notice(t("settings_box_connect_fail"));
new Notice(errors.msg);
}
});
});
return {
boxDiv: boxDiv,
boxAllowedToUsedDiv: boxAllowedToUsedDiv,
boxNotShowUpHintSetting: boxNotShowUpHintSetting,
};
};
+325
View File
@@ -0,0 +1,325 @@
import cloneDeep from "lodash/cloneDeep";
import { type App, Modal, Notice, Setting } from "obsidian";
import { getClient } from "../../src/fsGetter";
import type { TransItemType } from "../../src/i18n";
import type RemotelySavePlugin from "../../src/main";
import { stringToFragment } from "../../src/misc";
import { ChangeRemoteBaseDirModal } from "../../src/settings";
import { DEFAULT_PCLOUD_CONFIG, generateAuthUrl } from "./fsPCloud";
class PCloudAuthModal extends Modal {
readonly plugin: RemotelySavePlugin;
readonly authDiv: HTMLDivElement;
readonly revokeAuthDiv: HTMLDivElement;
readonly revokeAuthSetting: Setting;
readonly t: (x: TransItemType, vars?: any) => string;
constructor(
app: App,
plugin: RemotelySavePlugin,
authDiv: HTMLDivElement,
revokeAuthDiv: HTMLDivElement,
revokeAuthSetting: Setting,
t: (x: TransItemType, vars?: any) => string
) {
super(app);
this.plugin = plugin;
this.authDiv = authDiv;
this.revokeAuthDiv = revokeAuthDiv;
this.revokeAuthSetting = revokeAuthSetting;
this.t = t;
}
async onOpen() {
const { contentEl } = this;
const t = this.t;
const { authUrl } = await generateAuthUrl(true);
const div2 = contentEl.createDiv();
div2.createDiv({
text: stringToFragment(t("modal_pcloudauth_tutorial")),
});
div2.createEl(
"button",
{
text: t("modal_pcloudauth_copybutton"),
},
(el) => {
el.onclick = async () => {
await navigator.clipboard.writeText(authUrl);
new Notice(t("modal_pcloudauth_copynotice"));
};
}
);
contentEl.createEl("p").createEl("a", {
href: authUrl,
text: authUrl,
});
}
onClose() {
const { contentEl } = this;
contentEl.empty();
}
}
class PCloudRevokeAuthModal extends Modal {
readonly plugin: RemotelySavePlugin;
readonly authDiv: HTMLDivElement;
readonly revokeAuthDiv: HTMLDivElement;
readonly t: (x: TransItemType, vars?: any) => string;
constructor(
app: App,
plugin: RemotelySavePlugin,
authDiv: HTMLDivElement,
revokeAuthDiv: HTMLDivElement,
t: (x: TransItemType, vars?: any) => string
) {
super(app);
this.plugin = plugin;
this.authDiv = authDiv;
this.revokeAuthDiv = revokeAuthDiv;
this.t = t;
}
async onOpen() {
const t = this.t;
const { contentEl } = this;
contentEl.createEl("p", {
text: t("modal_pcloudrevokeauth_step1"),
});
const consentUrl = "https://my.pcloud.com/#page=settings&settings=tab-apps";
contentEl.createEl("p").createEl("a", {
href: consentUrl,
text: consentUrl,
});
contentEl.createEl("p", {
text: t("modal_pcloudrevokeauth_step2"),
});
new Setting(contentEl)
.setName(t("modal_pcloudrevokeauth_clean"))
.setDesc(t("modal_pcloudrevokeauth_clean_desc"))
.addButton(async (button) => {
button.setButtonText(t("modal_pcloudrevokeauth_clean_button"));
button.onClick(async () => {
try {
this.plugin.settings.pcloud = cloneDeep(DEFAULT_PCLOUD_CONFIG);
await this.plugin.saveSettings();
this.authDiv.toggleClass(
"pcloud-auth-button-hide",
this.plugin.settings.pcloud.accessToken !== ""
);
this.revokeAuthDiv.toggleClass(
"pcloud-revoke-auth-button-hide",
this.plugin.settings.pcloud.accessToken === ""
);
new Notice(t("modal_pcloudrevokeauth_clean_notice"));
this.close();
} catch (err) {
console.error(err);
new Notice(t("modal_pcloudrevokeauth_clean_fail"));
}
});
});
}
onClose() {
const { contentEl } = this;
contentEl.empty();
}
}
export const generatePCloudSettingsPart = (
containerEl: HTMLElement,
t: (x: TransItemType, vars?: any) => string,
app: App,
plugin: RemotelySavePlugin,
saveUpdatedConfigFunc: () => Promise<any> | undefined
) => {
const pCloudDiv = containerEl.createEl("div", {
cls: "pcloud-hide",
});
pCloudDiv.toggleClass(
"pcloud-hide",
plugin.settings.serviceType !== "pcloud"
);
pCloudDiv.createEl("h2", { text: t("settings_pcloud") });
const pcloudLongDescDiv = pCloudDiv.createEl("div", {
cls: "settings-long-desc",
});
for (const c of [
t("settings_pcloud_disclaimer1"),
t("settings_pcloud_disclaimer2"),
]) {
pcloudLongDescDiv.createEl("p", {
text: c,
cls: "pcloud-disclaimer",
});
}
pcloudLongDescDiv.createEl("p", {
text: t("settings_pcloud_folder", {
remoteBaseDir:
plugin.settings.pcloud.remoteBaseDir || app.vault.getName(),
}),
});
pcloudLongDescDiv.createDiv({
text: stringToFragment(t("settings_pcloud_pro_desc")),
cls: "pcloud-disclaimer",
});
const pCloudNotShowUpHintSetting = new Setting(pCloudDiv)
.setName(t("settings_pcloud_notshowuphint"))
.setDesc(t("settings_pcloud_notshowuphint_desc"))
.addButton(async (button) => {
button.setButtonText(t("settings_pcloud_notshowuphint_view_pro"));
button.onClick(async () => {
window.location.href = "#settings-pro";
});
});
const pCloudAllowedToUsedDiv = pCloudDiv.createDiv();
// if pro enabled, show up; otherwise hide.
const allowPCloud =
plugin.settings.pro?.enabledProFeatures.filter(
(x) => x.featureName === "feature-pcloud"
).length === 1;
console.debug(`allow to show up pcloud settings? ${allowPCloud}`);
if (allowPCloud) {
pCloudAllowedToUsedDiv.removeClass("pcloud-allow-to-use-hide");
pCloudNotShowUpHintSetting.settingEl.addClass("pcloud-allow-to-use-hide");
} else {
pCloudAllowedToUsedDiv.addClass("pcloud-allow-to-use-hide");
pCloudNotShowUpHintSetting.settingEl.removeClass(
"pcloud-allow-to-use-hide"
);
}
const pcloudSelectAuthDiv = pCloudAllowedToUsedDiv.createDiv();
const pcloudAuthDiv = pcloudSelectAuthDiv.createDiv({
cls: "pcloud-auth-button-hide settings-auth-related",
});
const pcloudRevokeAuthDiv = pcloudSelectAuthDiv.createDiv({
cls: "pcloud-revoke-auth-button-hide settings-auth-related",
});
const pcloudRevokeAuthSetting = new Setting(pcloudRevokeAuthDiv)
.setName(t("settings_pcloud_revoke"))
.setDesc(t("settings_pcloud_revoke_desc"))
.addButton(async (button) => {
button.setButtonText(t("settings_pcloud_revoke_button"));
button.onClick(async () => {
new PCloudRevokeAuthModal(
app,
plugin,
pcloudAuthDiv,
pcloudRevokeAuthDiv,
t
).open();
});
});
new Setting(pcloudAuthDiv)
.setName(t("settings_pcloud_auth"))
.setDesc(t("settings_pcloud_auth_desc"))
.addButton(async (button) => {
button.setButtonText(t("settings_pcloud_auth_button"));
button.onClick(async () => {
const modal = new PCloudAuthModal(
app,
plugin,
pcloudAuthDiv,
pcloudRevokeAuthDiv,
pcloudRevokeAuthSetting,
t
);
plugin.oauth2Info.helperModal = modal;
plugin.oauth2Info.authDiv = pcloudAuthDiv;
plugin.oauth2Info.revokeDiv = pcloudRevokeAuthDiv;
plugin.oauth2Info.revokeAuthSetting = pcloudRevokeAuthSetting;
modal.open();
});
});
pcloudAuthDiv.toggleClass(
"pcloud-auth-button-hide",
plugin.settings.pcloud.accessToken !== ""
);
pcloudRevokeAuthDiv.toggleClass(
"pcloud-revoke-auth-button-hide",
plugin.settings.pcloud.accessToken === ""
);
let newpcloudRemoteBaseDir = plugin.settings.pcloud.remoteBaseDir || "";
new Setting(pCloudAllowedToUsedDiv)
.setName(t("settings_remotebasedir"))
.setDesc(t("settings_remotebasedir_desc"))
.addText((text) =>
text
.setPlaceholder(app.vault.getName())
.setValue(newpcloudRemoteBaseDir)
.onChange((value) => {
newpcloudRemoteBaseDir = value.trim();
})
)
.addButton((button) => {
button.setButtonText(t("confirm"));
button.onClick(() => {
new ChangeRemoteBaseDirModal(
app,
plugin,
newpcloudRemoteBaseDir,
"pcloud"
).open();
});
});
new Setting(pCloudAllowedToUsedDiv)
.setName(t("settings_pcloud_emptyfile"))
.setDesc(t("settings_pcloud_emptyfile_desc"))
.addDropdown(async (dropdown) => {
dropdown
.addOption("skip", t("settings_pcloud_emptyfile_skip"))
.addOption("error", t("settings_pcloud_emptyfile_error"))
.setValue(plugin.settings.pcloud.emptyFile)
.onChange(async (val) => {
plugin.settings.pcloud.emptyFile = val as any;
await saveUpdatedConfigFunc();
});
});
new Setting(pCloudAllowedToUsedDiv)
.setName(t("settings_checkonnectivity"))
.setDesc(t("settings_checkonnectivity_desc"))
.addButton(async (button) => {
button.setButtonText(t("settings_checkonnectivity_button"));
button.onClick(async () => {
new Notice(t("settings_checkonnectivity_checking"));
const client = getClient(plugin.settings, app.vault.getName(), () =>
plugin.saveSettings()
);
const errors = { msg: "" };
const res = await client.checkConnect((err: any) => {
errors.msg = `${err}`;
});
if (res) {
new Notice(t("settings_pcloud_connect_succ"));
} else {
new Notice(t("settings_pcloud_connect_fail"));
new Notice(errors.msg);
}
});
});
return {
pCloudDiv: pCloudDiv,
pCloudAllowedToUsedDiv: pCloudAllowedToUsedDiv,
pCloudNotShowUpHintSetting: pCloudNotShowUpHintSetting,
};
};
+56 -1
View File
@@ -249,7 +249,13 @@ export const generateProSettingsPart = (
plugin: RemotelySavePlugin, plugin: RemotelySavePlugin,
saveUpdatedConfigFunc: () => Promise<any> | undefined, saveUpdatedConfigFunc: () => Promise<any> | undefined,
googleDriveAllowedToUsedDiv: HTMLDivElement, googleDriveAllowedToUsedDiv: HTMLDivElement,
googleDriveNotShowUpHintSetting: Setting googleDriveNotShowUpHintSetting: Setting,
boxAllowedToUsedDiv: HTMLDivElement,
boxNotShowUpHintSetting: Setting,
pCloudAllowedToUsedDiv: HTMLDivElement,
pCloudNotShowUpHintSetting: Setting,
yandexDiskAllowedToUsedDiv: HTMLDivElement,
yandexDiskNotShowUpHintSetting: Setting
) => { ) => {
proDiv proDiv
.createEl("h2", { text: t("settings_pro") }) .createEl("h2", { text: t("settings_pro") })
@@ -317,6 +323,55 @@ export const generateProSettingsPart = (
); );
} }
const allowBox =
plugin.settings.pro?.enabledProFeatures.filter(
(x) => x.featureName === "feature-box"
).length === 1;
console.debug(`allow to show up Box settings? ${allowBox}`);
if (allowBox) {
boxAllowedToUsedDiv.removeClass("box-allow-to-use-hide");
boxNotShowUpHintSetting.settingEl.addClass("box-allow-to-use-hide");
} else {
boxAllowedToUsedDiv.addClass("box-allow-to-use-hide");
boxNotShowUpHintSetting.settingEl.removeClass("box-allow-to-use-hide");
}
const allowPCloud =
plugin.settings.pro?.enabledProFeatures.filter(
(x) => x.featureName === "feature-pcloud"
).length === 1;
console.debug(`allow to show up pCloud settings? ${allowPCloud}`);
if (allowPCloud) {
pCloudAllowedToUsedDiv.removeClass("pcloud-allow-to-use-hide");
pCloudNotShowUpHintSetting.settingEl.addClass(
"pcloud-allow-to-use-hide"
);
} else {
pCloudAllowedToUsedDiv.addClass("pcloud-allow-to-use-hide");
pCloudNotShowUpHintSetting.settingEl.removeClass(
"pcloud-allow-to-use-hide"
);
}
const allowYandexDisk =
plugin.settings.pro?.enabledProFeatures.filter(
(x) => x.featureName === "feature-yandex_disk"
).length === 1;
console.debug(
`allow to show up Yandex Disk settings? ${allowYandexDisk}`
);
if (allowYandexDisk) {
yandexDiskAllowedToUsedDiv.removeClass("yandexdisk-allow-to-use-hide");
yandexDiskNotShowUpHintSetting.settingEl.addClass(
"yandexdisk-allow-to-use-hide"
);
} else {
yandexDiskAllowedToUsedDiv.addClass("yandexdisk-allow-to-use-hide");
yandexDiskNotShowUpHintSetting.settingEl.removeClass(
"yandexdisk-allow-to-use-hide"
);
}
new Notice(t("settings_pro_features_refresh_succ")); new Notice(t("settings_pro_features_refresh_succ"));
}); });
}); });
+378
View File
@@ -0,0 +1,378 @@
import cloneDeep from "lodash/cloneDeep";
import { type App, Modal, Notice, Setting } from "obsidian";
import { getClient } from "../../src/fsGetter";
import type { TransItemType } from "../../src/i18n";
import type RemotelySavePlugin from "../../src/main";
import { stringToFragment } from "../../src/misc";
import { ChangeRemoteBaseDirModal } from "../../src/settings";
import {
DEFAULT_YANDEXDISK_CONFIG,
generateAuthUrl,
sendRefreshTokenReq,
} from "./fsYandexDisk";
class YandexDiskAuthModal extends Modal {
readonly plugin: RemotelySavePlugin;
readonly authDiv: HTMLDivElement;
readonly revokeAuthDiv: HTMLDivElement;
readonly revokeAuthSetting: Setting;
readonly t: (x: TransItemType, vars?: any) => string;
constructor(
app: App,
plugin: RemotelySavePlugin,
authDiv: HTMLDivElement,
revokeAuthDiv: HTMLDivElement,
revokeAuthSetting: Setting,
t: (x: TransItemType, vars?: any) => string
) {
super(app);
this.plugin = plugin;
this.authDiv = authDiv;
this.revokeAuthDiv = revokeAuthDiv;
this.revokeAuthSetting = revokeAuthSetting;
this.t = t;
}
async onOpen() {
const { contentEl } = this;
const t = this.t;
const authUrl = generateAuthUrl(true);
const div2 = contentEl.createDiv();
div2.createDiv({
text: stringToFragment(t("modal_yandexdiskauth_tutorial")),
});
div2.createEl(
"button",
{
text: t("modal_yandexdiskauth_copybutton"),
},
(el) => {
el.onclick = async () => {
await navigator.clipboard.writeText(authUrl);
new Notice(t("modal_yandexdiskauth_copynotice"));
};
}
);
contentEl.createEl("p").createEl("a", {
href: authUrl,
text: authUrl,
});
// let refreshToken = "";
// new Setting(contentEl)
// .setName(t("modal_yandexdisk_maualinput"))
// .setDesc(t("modal_yandexdisk_maualinput_desc"))
// .addText((text) =>
// text
// .setPlaceholder("")
// .setValue("")
// .onChange((val) => {
// refreshToken = val.trim();
// })
// )
// .addButton(async (button) => {
// button.setButtonText(t("submit"));
// button.onClick(async () => {
// new Notice(t("modal_yandexdisk_maualinput_notice"));
// try {
// if (this.plugin.settings.yandexdisk === undefined) {
// this.plugin.settings.yandexdisk = cloneDeep(
// DEFAULT_YANDEXDISK_CONFIG
// );
// }
// this.plugin.settings.yandexdisk.refreshToken = refreshToken;
// this.plugin.settings.yandexdisk.accessToken = "access";
// this.plugin.settings.yandexdisk.accessTokenExpiresAtTimeMs = 1;
// this.plugin.settings.yandexdisk.accessTokenExpiresInMs = 1;
// // TODO: abstraction leaking now, how to fix?
// const k = await sendRefreshTokenReq(refreshToken);
// const ts = Date.now();
// this.plugin.settings.yandexdisk.accessToken = k.access_token;
// this.plugin.settings.yandexdisk.accessTokenExpiresInMs =
// k.expires_in * 1000;
// this.plugin.settings.yandexdisk.accessTokenExpiresAtTimeMs =
// ts + k.expires_in * 1000 - 60 * 2 * 1000;
// await this.plugin.saveSettings();
// // try to remove data in clipboard
// await navigator.clipboard.writeText("");
// new Notice(t("modal_yandexdisk_maualinput_succ_notice"));
// } catch (e) {
// console.error(e);
// new Notice(t("modal_yandexdisk_maualinput_fail_notice"));
// } finally {
// this.authDiv.toggleClass(
// "yandexdisk-auth-button-hide",
// this.plugin.settings.yandexdisk.refreshToken !== ""
// );
// this.revokeAuthDiv.toggleClass(
// "yandexdisk-revoke-auth-button-hide",
// this.plugin.settings.yandexdisk.refreshToken === ""
// );
// this.close();
// }
// });
// });
}
onClose() {
const { contentEl } = this;
contentEl.empty();
}
}
class YandexDiskRevokeAuthModal extends Modal {
readonly plugin: RemotelySavePlugin;
readonly authDiv: HTMLDivElement;
readonly revokeAuthDiv: HTMLDivElement;
readonly t: (x: TransItemType, vars?: any) => string;
constructor(
app: App,
plugin: RemotelySavePlugin,
authDiv: HTMLDivElement,
revokeAuthDiv: HTMLDivElement,
t: (x: TransItemType, vars?: any) => string
) {
super(app);
this.plugin = plugin;
this.authDiv = authDiv;
this.revokeAuthDiv = revokeAuthDiv;
this.t = t;
}
async onOpen() {
const t = this.t;
const { contentEl } = this;
contentEl.createEl("p", {
text: t("modal_yandexdiskrevokeauth_step1"),
});
const consentUrl = "https://app.yandexDisk.com/account/security";
contentEl.createEl("p").createEl("a", {
href: consentUrl,
text: consentUrl,
});
contentEl.createEl("p", {
text: t("modal_yandexdiskrevokeauth_step2"),
});
new Setting(contentEl)
.setName(t("modal_yandexdiskrevokeauth_clean"))
.setDesc(t("modal_yandexdiskrevokeauth_clean_desc"))
.addButton(async (button) => {
button.setButtonText(t("modal_yandexdiskrevokeauth_clean_button"));
button.onClick(async () => {
try {
this.plugin.settings.yandexdisk = cloneDeep(
DEFAULT_YANDEXDISK_CONFIG
);
await this.plugin.saveSettings();
this.authDiv.toggleClass(
"yandexdisk-auth-button-hide",
this.plugin.settings.yandexdisk.refreshToken !== ""
);
this.revokeAuthDiv.toggleClass(
"yandexdisk-revoke-auth-button-hide",
this.plugin.settings.yandexdisk.refreshToken === ""
);
new Notice(t("modal_yandexdiskrevokeauth_clean_notice"));
this.close();
} catch (err) {
console.error(err);
new Notice(t("modal_yandexdiskrevokeauth_clean_fail"));
}
});
});
}
onClose() {
const { contentEl } = this;
contentEl.empty();
}
}
export const generateYandexDiskSettingsPart = (
containerEl: HTMLElement,
t: (x: TransItemType, vars?: any) => string,
app: App,
plugin: RemotelySavePlugin,
saveUpdatedConfigFunc: () => Promise<any> | undefined
) => {
const yandexDiskDiv = containerEl.createEl("div", {
cls: "yandexdisk-hide",
});
yandexDiskDiv.toggleClass(
"yandexdisk-hide",
plugin.settings.serviceType !== "yandexdisk"
);
yandexDiskDiv.createEl("h2", { text: t("settings_yandexdisk") });
const yandexDiskLongDescDiv = yandexDiskDiv.createEl("div", {
cls: "settings-long-desc",
});
for (const c of [
t("settings_yandexdisk_disclaimer1"),
t("settings_yandexdisk_disclaimer2"),
]) {
yandexDiskLongDescDiv.createEl("p", {
text: c,
cls: "yandexdisk-disclaimer",
});
}
yandexDiskLongDescDiv.createEl("p", {
text: t("settings_yandexdisk_folder", {
remoteBaseDir:
plugin.settings.yandexdisk.remoteBaseDir || app.vault.getName(),
}),
});
yandexDiskLongDescDiv.createDiv({
text: stringToFragment(t("settings_yandexdisk_pro_desc")),
cls: "yandexdisk-disclaimer",
});
const yandexDiskNotShowUpHintSetting = new Setting(yandexDiskDiv)
.setName(t("settings_yandexdisk_notshowuphint"))
.setDesc(t("settings_yandexdisk_notshowuphint_desc"))
.addButton(async (button) => {
button.setButtonText(t("settings_yandexdisk_notshowuphint_view_pro"));
button.onClick(async () => {
window.location.href = "#settings-pro";
});
});
const yandexDiskAllowedToUsedDiv = yandexDiskDiv.createDiv();
// if pro enabled, show up; otherwise hide.
const allowYandexDisk =
plugin.settings.pro?.enabledProFeatures.filter(
(x) => x.featureName === "feature-yandex_disk"
).length === 1;
console.debug(`allow to show up yandexDisk settings? ${allowYandexDisk}`);
if (allowYandexDisk) {
yandexDiskAllowedToUsedDiv.removeClass("yandexdisk-allow-to-use-hide");
yandexDiskNotShowUpHintSetting.settingEl.addClass(
"yandexdisk-allow-to-use-hide"
);
} else {
yandexDiskAllowedToUsedDiv.addClass("yandexdisk-allow-to-use-hide");
yandexDiskNotShowUpHintSetting.settingEl.removeClass(
"yandexdisk-allow-to-use-hide"
);
}
const yandexDiskSelectAuthDiv = yandexDiskAllowedToUsedDiv.createDiv();
const yandexDiskAuthDiv = yandexDiskSelectAuthDiv.createDiv({
cls: "yandexdisk-auth-button-hide settings-auth-related",
});
const yandexDiskRevokeAuthDiv = yandexDiskSelectAuthDiv.createDiv({
cls: "yandexdisk-revoke-auth-button-hide settings-auth-related",
});
const yandexDiskRevokeAuthSetting = new Setting(yandexDiskRevokeAuthDiv)
.setName(t("settings_yandexdisk_revoke"))
.setDesc(t("settings_yandexdisk_revoke_desc"))
.addButton(async (button) => {
button.setButtonText(t("settings_yandexdisk_revoke_button"));
button.onClick(async () => {
new YandexDiskRevokeAuthModal(
app,
plugin,
yandexDiskAuthDiv,
yandexDiskRevokeAuthDiv,
t
).open();
});
});
new Setting(yandexDiskAuthDiv)
.setName(t("settings_yandexdisk_auth"))
.setDesc(t("settings_yandexdisk_auth_desc"))
.addButton(async (button) => {
button.setButtonText(t("settings_yandexdisk_auth_button"));
button.onClick(async () => {
const modal = new YandexDiskAuthModal(
app,
plugin,
yandexDiskAuthDiv,
yandexDiskRevokeAuthDiv,
yandexDiskRevokeAuthSetting,
t
);
plugin.oauth2Info.helperModal = modal;
plugin.oauth2Info.authDiv = yandexDiskAuthDiv;
plugin.oauth2Info.revokeDiv = yandexDiskRevokeAuthDiv;
plugin.oauth2Info.revokeAuthSetting = yandexDiskRevokeAuthSetting;
modal.open();
});
});
yandexDiskAuthDiv.toggleClass(
"yandexdisk-auth-button-hide",
plugin.settings.yandexdisk.refreshToken !== ""
);
yandexDiskRevokeAuthDiv.toggleClass(
"yandexdisk-revoke-auth-button-hide",
plugin.settings.yandexdisk.refreshToken === ""
);
let newyandexDiskRemoteBaseDir =
plugin.settings.yandexdisk.remoteBaseDir || "";
new Setting(yandexDiskAllowedToUsedDiv)
.setName(t("settings_remotebasedir"))
.setDesc(t("settings_remotebasedir_desc"))
.addText((text) =>
text
.setPlaceholder(app.vault.getName())
.setValue(newyandexDiskRemoteBaseDir)
.onChange((value) => {
newyandexDiskRemoteBaseDir = value.trim();
})
)
.addButton((button) => {
button.setButtonText(t("confirm"));
button.onClick(() => {
new ChangeRemoteBaseDirModal(
app,
plugin,
newyandexDiskRemoteBaseDir,
"yandexdisk"
).open();
});
});
new Setting(yandexDiskAllowedToUsedDiv)
.setName(t("settings_checkonnectivity"))
.setDesc(t("settings_checkonnectivity_desc"))
.addButton(async (button) => {
button.setButtonText(t("settings_checkonnectivity_button"));
button.onClick(async () => {
new Notice(t("settings_checkonnectivity_checking"));
const client = getClient(plugin.settings, app.vault.getName(), () =>
plugin.saveSettings()
);
const errors = { msg: "" };
const res = await client.checkConnect((err: any) => {
errors.msg = `${err}`;
});
if (res) {
new Notice(t("settings_yandexdisk_connect_succ"));
} else {
new Notice(t("settings_yandexdisk_connect_fail"));
new Notice(errors.msg);
}
});
});
return {
yandexDiskDiv: yandexDiskDiv,
yandexDiskAllowedToUsedDiv: yandexDiskAllowedToUsedDiv,
yandexDiskNotShowUpHintSetting: yandexDiskNotShowUpHintSetting,
};
};
+307
View File
@@ -0,0 +1,307 @@
//////////////////////////////////////////////
// all types
// https://yandex.com/dev/disk-api/doc/en/reference/response-objects
//////////////////////////////////////////////
export interface Link {
href: string;
method: string;
templated: boolean;
}
export interface Resource {
antivirus_status?: string;
public_key?: string;
_embedded?: ResourceList;
name?: string;
created?: string;
custom_properties?: Record<string, string>;
public_url?: string;
origin_path?: string;
modified?: string;
path?: string;
md5?: string;
sha256?: string;
file?: string;
type?: "dir" | "file";
mime_type?: string;
size?: number;
exif?: Record<any, any>;
}
type SortType = string;
export interface ResourceList {
sort?: SortType;
public_key?: string;
items?: Resource[];
path?: string;
limit?: number;
offset?: number;
total?: number;
}
export interface FilesResourceList {
items: Resource[];
limit: number;
offset: number;
}
export interface LastUploadedResourceList {
items: Resource[];
limit: number;
}
export interface PublicResourcesList {
items: Resource[];
type: "dir" | "file";
limit: number;
offset: number;
}
export interface Disk {
trash_size: number;
total_space: number;
used_space: number;
system_folders: {
applications: string;
downloads: string;
};
}
export interface Operation {
status: "success" | "failed" | "in-progress";
}
export interface ErrorResponse {
error: string;
description: string;
message?: string;
}
//////////////////////////////////////////////
// api
// https://yandex.com/dev/disk-api/doc/en/
//////////////////////////////////////////////
export class YandexApi {
accessToken: string;
apiVersion: number;
host: string;
constructor(accessToken: string) {
this.accessToken = accessToken;
this.apiVersion = 1;
this.host = `https://cloud-api.yandex.net`;
}
async _api(
method: string,
endPoint: string,
returnType: "json" | "arrayBuffer" | "raw",
queryParams?: Record<string, string>,
body?: any,
requestContentType?: string
) {
let p = "";
if (queryParams !== undefined) {
p = `?${new URLSearchParams(queryParams)}`;
}
const fullUrl = `${this.host}/v${this.apiVersion}/${endPoint}${p}`;
// console.debug(`method: ${method}, fullUrl: ${fullUrl}`)
const headers: HeadersInit = {
Authorization: `OAuth ${this.accessToken}`,
};
if (requestContentType !== undefined) {
headers["Content-Type"] = requestContentType;
}
const r = await fetch(fullUrl, {
method: method,
headers: headers,
body: body,
});
// console.debug(r)
if (r.status >= 200 && r.status < 300) {
if (returnType === "json") {
return await r.json();
}
if (returnType === "arrayBuffer") {
return await r.arrayBuffer();
}
if (returnType === "raw") {
return r;
}
} else {
throw Error(JSON.stringify((await r.json()) as ErrorResponse));
}
}
async disk() {
return (await this._api("GET", "disk/", "json")) as Disk;
}
async diskResources(
path: string,
fields?: string[],
limit?: number,
offset?: number
) {
const params: Record<string, string> = {
path: path,
};
if (fields !== undefined) {
params["fields"] = fields.join(",");
}
if (limit !== undefined) {
params["limit"] = `${limit}`;
}
if (offset !== undefined) {
params["offset"] = `${offset}`;
}
return (await this._api(
"GET",
"disk/resources",
"json",
params
)) as Resource;
}
async diskResourcesFiles(fields?: string[], limit?: number, offset?: number) {
const params: Record<string, string> = {};
if (fields !== undefined) {
params["fields"] = fields.join(",");
}
if (limit !== undefined) {
params["limit"] = `${limit}`;
}
if (offset !== undefined) {
params["offset"] = `${offset}`;
}
return (await this._api(
"GET",
"disk/resources/files",
"json",
params
)) as FilesResourceList;
}
async diskResourcesPatch(
path: string,
custom_properties: Record<string, string | null>,
fields?: string[]
) {
const params: Record<string, string> = {
path: path,
};
if (fields !== undefined) {
params["fields"] = fields.join(",");
}
return (await this._api(
"PATCH",
"disk/resources",
"json",
params,
JSON.stringify({
custom_properties: custom_properties,
}),
"application/json"
)) as Resource;
}
async diskResoucesUpload(
path: string,
content: ArrayBuffer,
overwrite?: boolean
) {
const params: Record<string, string> = {
path: path,
overwrite: `${overwrite ?? false}`,
};
const link = (await this._api(
"GET",
"disk/resources/upload",
"json",
params
)) as Link;
if (link.templated) {
throw Error(
`do not know how to deal with upload link with templated: ${JSON.stringify(
link
)}`
);
}
const rsp = await fetch(link.href, {
method: link.method,
body: content,
});
if (rsp.status === 200 || rsp.status === 201 || rsp.status === 202) {
return true;
} else {
throw Error(`upload failed. status=${rsp.status}, link=${link.href}`);
}
}
async diskResoucesDownload(path: string) {
const params: Record<string, string> = {
path: path,
};
const link = (await this._api(
"GET",
"disk/resources/download",
"json",
params
)) as Link;
if (link.templated) {
throw Error(
`do not know how to deal with download link with templated: ${JSON.stringify(
link
)}`
);
}
const rsp = await fetch(link.href, {
method: link.method,
});
if (rsp.status === 200 || rsp.status === 201 || rsp.status === 202) {
return await rsp.arrayBuffer();
} else {
throw Error(`download failed. status=${rsp.status}, link=${link.href}`);
}
}
async diskResourcesDelete(path: string, permanently?: boolean) {
const params: Record<string, string> = {
path: path,
permanently: `${permanently ?? false}`,
};
const rsp = (await this._api(
"DELETE",
"disk/resources",
"raw",
params
)) as Response;
if (rsp.status === 204) {
return;
}
if (rsp.status === 202) {
return (await rsp.json()) as Link;
}
throw Error(`do not know how to deal with delete response ${rsp}`);
}
async diskResourcesPut(path: string, fields?: string[]) {
const params: Record<string, string> = {
path: path,
};
if (fields !== undefined) {
params["fields"] = fields.join(",");
}
return (await this._api("PUT", "disk/resources", "json", params)) as Link;
}
}
+22 -4
View File
@@ -3,7 +3,13 @@
* To avoid circular dependency. * To avoid circular dependency.
*/ */
import type { GoogleDriveConfig, ProConfig } from "../pro/src/baseTypesPro"; import type {
BoxConfig,
GoogleDriveConfig,
PCloudConfig,
ProConfig,
YandexDiskConfig,
} from "../pro/src/baseTypesPro";
import type { LangTypeAndAuto } from "./i18n"; import type { LangTypeAndAuto } from "./i18n";
export const DEFAULT_CONTENT_TYPE = "application/octet-stream"; export const DEFAULT_CONTENT_TYPE = "application/octet-stream";
@@ -14,14 +20,20 @@ export type SUPPORTED_SERVICES_TYPE =
| "dropbox" | "dropbox"
| "onedrive" | "onedrive"
| "webdis" | "webdis"
| "googledrive"; | "googledrive"
| "box"
| "pcloud"
| "yandexdisk";
export type SUPPORTED_SERVICES_TYPE_WITH_REMOTE_BASE_DIR = export type SUPPORTED_SERVICES_TYPE_WITH_REMOTE_BASE_DIR =
| "webdav" | "webdav"
| "dropbox" | "dropbox"
| "onedrive" | "onedrive"
| "webdis" | "webdis"
| "googledrive"; | "googledrive"
| "box"
| "pcloud"
| "yandexdisk";
export interface S3Config { export interface S3Config {
s3Endpoint: string; s3Endpoint: string;
@@ -116,7 +128,10 @@ export type QRExportType =
| "onedrive" | "onedrive"
| "webdav" | "webdav"
| "webdis" | "webdis"
| "googledrive"; | "googledrive"
| "box"
| "pcloud"
| "yandexdisk";
export interface ProfilerConfig { export interface ProfilerConfig {
enablePrinting?: boolean; enablePrinting?: boolean;
@@ -130,6 +145,9 @@ export interface RemotelySavePluginSettings {
onedrive: OnedriveConfig; onedrive: OnedriveConfig;
webdis: WebdisConfig; webdis: WebdisConfig;
googledrive: GoogleDriveConfig; googledrive: GoogleDriveConfig;
box: BoxConfig;
pcloud: PCloudConfig;
yandexdisk: YandexDiskConfig;
password: string; password: string;
serviceType: SUPPORTED_SERVICES_TYPE; serviceType: SUPPORTED_SERVICES_TYPE;
currLogLevel?: string; currLogLevel?: string;
+17
View File
@@ -1,4 +1,7 @@
import { FakeFsBox } from "../pro/src/fsBox";
import { FakeFsGoogleDrive } from "../pro/src/fsGoogleDrive"; import { FakeFsGoogleDrive } from "../pro/src/fsGoogleDrive";
import { FakeFsPCloud } from "../pro/src/fsPCloud";
import { FakeFsYandexDisk } from "../pro/src/fsYandexDisk";
import type { RemotelySavePluginSettings } from "./baseTypes"; import type { RemotelySavePluginSettings } from "./baseTypes";
import type { FakeFs } from "./fsAll"; import type { FakeFs } from "./fsAll";
import { FakeFsDropbox } from "./fsDropbox"; import { FakeFsDropbox } from "./fsDropbox";
@@ -48,6 +51,20 @@ export function getClient(
vaultName, vaultName,
saveUpdatedConfigFunc saveUpdatedConfigFunc
); );
case "box":
return new FakeFsBox(settings.box, vaultName, saveUpdatedConfigFunc);
case "pcloud":
return new FakeFsPCloud(
settings.pcloud,
vaultName,
saveUpdatedConfigFunc
);
case "yandexdisk":
return new FakeFsYandexDisk(
settings.yandexdisk,
vaultName,
saveUpdatedConfigFunc
);
default: default:
throw Error(`cannot init client for serviceType=${settings.serviceType}`); throw Error(`cannot init client for serviceType=${settings.serviceType}`);
} }
+9
View File
@@ -25,6 +25,9 @@ export const exportQrCodeUri = async (
delete settings2.webdav; delete settings2.webdav;
delete settings2.webdis; delete settings2.webdis;
delete settings2.googledrive; delete settings2.googledrive;
delete settings2.box;
delete settings2.pcloud;
delete settings2.yandexdisk;
delete settings2.pro; delete settings2.pro;
} else if (exportFields === "s3") { } else if (exportFields === "s3") {
settings2 = { s3: cloneDeep(settings.s3) }; settings2 = { s3: cloneDeep(settings.s3) };
@@ -38,6 +41,12 @@ export const exportQrCodeUri = async (
settings2 = { webdis: cloneDeep(settings.webdis) }; settings2 = { webdis: cloneDeep(settings.webdis) };
} else if (exportFields === "googledrive") { } else if (exportFields === "googledrive") {
settings2 = { googledrive: cloneDeep(settings.googledrive) }; settings2 = { googledrive: cloneDeep(settings.googledrive) };
} else if (exportFields === "box") {
settings2 = { box: cloneDeep(settings.box) };
} else if (exportFields === "pcloud") {
settings2 = { pcloud: cloneDeep(settings.pcloud) };
} else if (exportFields === "yandexdisk") {
settings2 = { yandexdisk: cloneDeep(settings.yandexdisk) };
} }
delete settings2.vaultRandomID; delete settings2.vaultRandomID;
+286 -19
View File
@@ -1,4 +1,7 @@
// biome-ignore lint/suspicious/noShadowRestrictedNames: <explanation>
import AggregateError from "aggregate-error";
import cloneDeep from "lodash/cloneDeep"; import cloneDeep from "lodash/cloneDeep";
import throttle from "lodash/throttle";
import { FileText, RefreshCcw, RotateCcw, createElement } from "lucide"; import { FileText, RefreshCcw, RotateCcw, createElement } from "lucide";
import { import {
Events, Events,
@@ -20,6 +23,31 @@ import {
sendAuthReq as sendAuthReqPro, sendAuthReq as sendAuthReqPro,
setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplacePro, setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplacePro,
} from "../pro/src/account"; } from "../pro/src/account";
import {
COMMAND_CALLBACK_BOX,
COMMAND_CALLBACK_PCLOUD,
COMMAND_CALLBACK_PRO,
COMMAND_CALLBACK_YANDEXDISK,
} from "../pro/src/baseTypesPro";
import {
DEFAULT_BOX_CONFIG,
FakeFsBox,
sendAuthReq as sendAuthReqBox,
setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplaceBox,
} from "../pro/src/fsBox";
import { DEFAULT_GOOGLEDRIVE_CONFIG } from "../pro/src/fsGoogleDrive";
import {
type AuthAllowFirstRes as AuthAllowFirstResPCloud,
DEFAULT_PCLOUD_CONFIG,
generateAuthUrl as generateAuthUrlPCloud,
sendAuthReq as sendAuthReqPCloud,
setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplacePCloud,
} from "../pro/src/fsPCloud";
import {
DEFAULT_YANDEXDISK_CONFIG,
sendAuthReq as sendAuthReqYandexDisk,
setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplaceYandexDisk,
} from "../pro/src/fsYandexDisk";
import type { import type {
RemotelySavePluginSettings, RemotelySavePluginSettings,
SyncTriggerSourceType, SyncTriggerSourceType,
@@ -32,11 +60,15 @@ import {
} from "./baseTypes"; } from "./baseTypes";
import { API_VER_ENSURE_REQURL_OK } from "./baseTypesObs"; import { API_VER_ENSURE_REQURL_OK } from "./baseTypesObs";
import { messyConfigToNormal, normalConfigToMessy } from "./configPersist"; import { messyConfigToNormal, normalConfigToMessy } from "./configPersist";
import { exportVaultSyncPlansToFiles } from "./debugMode";
import { import {
DEFAULT_DROPBOX_CONFIG, DEFAULT_DROPBOX_CONFIG,
sendAuthReq as sendAuthReqDropbox, sendAuthReq as sendAuthReqDropbox,
setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplaceDropbox, setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplaceDropbox,
} from "./fsDropbox"; } from "./fsDropbox";
import { FakeFsEncrypt } from "./fsEncrypt";
import { getClient } from "./fsGetter";
import { FakeFsLocal } from "./fsLocal";
import { import {
type AccessCodeResponseSuccessfulType, type AccessCodeResponseSuccessfulType,
DEFAULT_ONEDRIVE_CONFIG, DEFAULT_ONEDRIVE_CONFIG,
@@ -45,6 +77,7 @@ import {
} from "./fsOnedrive"; } from "./fsOnedrive";
import { DEFAULT_S3_CONFIG } from "./fsS3"; import { DEFAULT_S3_CONFIG } from "./fsS3";
import { DEFAULT_WEBDAV_CONFIG } from "./fsWebdav"; import { DEFAULT_WEBDAV_CONFIG } from "./fsWebdav";
import { DEFAULT_WEBDIS_CONFIG } from "./fsWebdis";
import { I18n } from "./i18n"; import { I18n } from "./i18n";
import type { LangTypeAndAuto, TransItemType } from "./i18n"; import type { LangTypeAndAuto, TransItemType } from "./i18n";
import { importQrCodeUri } from "./importExport"; import { importQrCodeUri } from "./importExport";
@@ -57,22 +90,11 @@ import {
upsertLastSuccessSyncTimeByVault, upsertLastSuccessSyncTimeByVault,
upsertPluginVersionByVault, upsertPluginVersionByVault,
} from "./localdb"; } from "./localdb";
import { RemotelySaveSettingTab } from "./settings";
import { SyncAlgoV3Modal } from "./syncAlgoV3Notice";
// biome-ignore lint/suspicious/noShadowRestrictedNames: <explanation>
import AggregateError from "aggregate-error";
import throttle from "lodash/throttle";
import { COMMAND_CALLBACK_PRO } from "../pro/src/baseTypesPro";
import { DEFAULT_GOOGLEDRIVE_CONFIG } from "../pro/src/fsGoogleDrive";
import { exportVaultSyncPlansToFiles } from "./debugMode";
import { FakeFsEncrypt } from "./fsEncrypt";
import { getClient } from "./fsGetter";
import { FakeFsLocal } from "./fsLocal";
import { DEFAULT_WEBDIS_CONFIG } from "./fsWebdis";
import { changeMobileStatusBar } from "./misc"; import { changeMobileStatusBar } from "./misc";
import { DEFAULT_PROFILER_CONFIG, type Profiler } from "./profiler"; import { DEFAULT_PROFILER_CONFIG, type Profiler } from "./profiler";
import { RemotelySaveSettingTab } from "./settings";
import { syncer } from "./sync"; import { syncer } from "./sync";
import { SyncAlgoV3Modal } from "./syncAlgoV3Notice";
const DEFAULT_SETTINGS: RemotelySavePluginSettings = { const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
s3: DEFAULT_S3_CONFIG, s3: DEFAULT_S3_CONFIG,
@@ -81,6 +103,9 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
onedrive: DEFAULT_ONEDRIVE_CONFIG, onedrive: DEFAULT_ONEDRIVE_CONFIG,
webdis: DEFAULT_WEBDIS_CONFIG, webdis: DEFAULT_WEBDIS_CONFIG,
googledrive: DEFAULT_GOOGLEDRIVE_CONFIG, googledrive: DEFAULT_GOOGLEDRIVE_CONFIG,
box: DEFAULT_BOX_CONFIG,
pcloud: DEFAULT_PCLOUD_CONFIG,
yandexdisk: DEFAULT_YANDEXDISK_CONFIG,
password: "", password: "",
serviceType: "s3", serviceType: "s3",
currLogLevel: "info", currLogLevel: "info",
@@ -782,6 +807,176 @@ export default class RemotelySavePlugin extends Plugin {
} }
); );
this.registerObsidianProtocolHandler(
COMMAND_CALLBACK_BOX,
async (inputParams) => {
if (this.oauth2Info.helperModal !== undefined) {
const k = this.oauth2Info.helperModal.contentEl;
k.empty();
t("protocol_box_connecting")
.split("\n")
.forEach((val) => {
k.createEl("p", {
text: val,
});
});
}
console.debug(inputParams);
const authRes = await sendAuthReqBox(
inputParams.code,
async (e: any) => {
new Notice(t("protocol_box_connect_fail"));
new Notice(`${e}`);
throw e;
}
);
console.debug(authRes);
const self = this;
await setConfigBySuccessfullAuthInplaceBox(
this.settings.box!,
authRes,
() => self.saveSettings()
);
this.oauth2Info.verifier = ""; // reset it
this.oauth2Info.helperModal?.close(); // close it
this.oauth2Info.helperModal = undefined;
this.oauth2Info.authDiv?.toggleClass(
"box-auth-button-hide",
this.settings.box?.refreshToken !== ""
);
this.oauth2Info.authDiv = undefined;
this.oauth2Info.revokeAuthSetting?.setDesc(
t("protocol_box_connect_succ_revoke")
);
this.oauth2Info.revokeAuthSetting = undefined;
this.oauth2Info.revokeDiv?.toggleClass(
"box-revoke-auth-button-hide",
this.settings.box?.refreshToken === ""
);
this.oauth2Info.revokeDiv = undefined;
}
);
this.registerObsidianProtocolHandler(
COMMAND_CALLBACK_PCLOUD,
async (inputParams) => {
if (this.oauth2Info.helperModal !== undefined) {
const k = this.oauth2Info.helperModal.contentEl;
k.empty();
t("protocol_pcloud_connecting")
.split("\n")
.forEach((val) => {
k.createEl("p", {
text: val,
});
});
}
console.debug(inputParams);
const authRes = await sendAuthReqPCloud(
inputParams.hostname,
inputParams.code,
async (e: any) => {
new Notice(t("protocol_pcloud_connect_fail"));
new Notice(`${e}`);
throw e;
}
);
console.debug(authRes);
const self = this;
await setConfigBySuccessfullAuthInplacePCloud(
this.settings.pcloud!,
inputParams as unknown as AuthAllowFirstResPCloud,
authRes,
() => self.saveSettings()
);
this.oauth2Info.verifier = ""; // reset it
this.oauth2Info.helperModal?.close(); // close it
this.oauth2Info.helperModal = undefined;
this.oauth2Info.authDiv?.toggleClass(
"pcloud-auth-button-hide",
this.settings.pcloud?.accessToken !== ""
);
this.oauth2Info.authDiv = undefined;
this.oauth2Info.revokeAuthSetting?.setDesc(
t("protocol_pcloud_connect_succ_revoke")
);
this.oauth2Info.revokeAuthSetting = undefined;
this.oauth2Info.revokeDiv?.toggleClass(
"pcloud-revoke-auth-button-hide",
this.settings.pcloud?.accessToken === ""
);
this.oauth2Info.revokeDiv = undefined;
}
);
this.registerObsidianProtocolHandler(
COMMAND_CALLBACK_YANDEXDISK,
async (inputParams) => {
if (this.oauth2Info.helperModal !== undefined) {
const k = this.oauth2Info.helperModal.contentEl;
k.empty();
t("protocol_yandexdisk_connecting")
.split("\n")
.forEach((val) => {
k.createEl("p", {
text: val,
});
});
}
console.debug(inputParams);
const authRes = await sendAuthReqYandexDisk(
inputParams.code,
async (e: any) => {
new Notice(t("protocol_yandexdisk_connect_fail"));
new Notice(`${e}`);
throw e;
}
);
console.debug(authRes);
const self = this;
await setConfigBySuccessfullAuthInplaceYandexDisk(
this.settings.yandexdisk!,
authRes,
() => self.saveSettings()
);
this.oauth2Info.verifier = ""; // reset it
this.oauth2Info.helperModal?.close(); // close it
this.oauth2Info.helperModal = undefined;
this.oauth2Info.authDiv?.toggleClass(
"yandexdisk-auth-button-hide",
this.settings.yandexdisk?.refreshToken !== ""
);
this.oauth2Info.authDiv = undefined;
this.oauth2Info.revokeAuthSetting?.setDesc(
t("protocol_yandexdisk_connect_succ_revoke")
);
this.oauth2Info.revokeAuthSetting = undefined;
this.oauth2Info.revokeDiv?.toggleClass(
"yandexdisk-revoke-auth-button-hide",
this.settings.yandexdisk?.refreshToken === ""
);
this.oauth2Info.revokeDiv = undefined;
}
);
this.syncRibbon = this.addRibbonIcon( this.syncRibbon = this.addRibbonIcon(
iconNameSyncWait, iconNameSyncWait,
`${this.manifest.name}`, `${this.manifest.name}`,
@@ -1068,6 +1263,18 @@ export default class RemotelySavePlugin extends Plugin {
this.settings.googledrive = DEFAULT_GOOGLEDRIVE_CONFIG; this.settings.googledrive = DEFAULT_GOOGLEDRIVE_CONFIG;
} }
if (this.settings.box === undefined) {
this.settings.box = DEFAULT_BOX_CONFIG;
}
if (this.settings.pcloud === undefined) {
this.settings.pcloud = DEFAULT_PCLOUD_CONFIG;
}
if (this.settings.yandexdisk === undefined) {
this.settings.yandexdisk = DEFAULT_YANDEXDISK_CONFIG;
}
await this.saveSettings(); await this.saveSettings();
} }
@@ -1136,6 +1343,46 @@ export default class RemotelySavePlugin extends Plugin {
needSave = true; needSave = true;
} }
let googleDriveExpired = false;
if (
this.settings.googledrive.refreshToken !== "" &&
current >= this.settings!.googledrive!.credentialsShouldBeDeletedAtTimeMs!
) {
googleDriveExpired = true;
this.settings.googledrive = cloneDeep(DEFAULT_GOOGLEDRIVE_CONFIG);
needSave = true;
}
let boxExpired = false;
if (
this.settings.box.refreshToken !== "" &&
current >= this.settings!.box!.credentialsShouldBeDeletedAtTimeMs!
) {
boxExpired = true;
this.settings.box = cloneDeep(DEFAULT_BOX_CONFIG);
needSave = true;
}
let pCloudExpired = false;
if (
this.settings.pcloud.accessToken !== "" &&
current >= this.settings!.pcloud!.credentialsShouldBeDeletedAtTimeMs!
) {
pCloudExpired = true;
this.settings.pcloud = cloneDeep(DEFAULT_PCLOUD_CONFIG);
needSave = true;
}
let yandexDiskExpired = false;
if (
this.settings.yandexdisk.refreshToken !== "" &&
current >= this.settings!.yandexdisk!.credentialsShouldBeDeletedAtTimeMs!
) {
yandexDiskExpired = true;
this.settings.yandexdisk = cloneDeep(DEFAULT_YANDEXDISK_CONFIG);
needSave = true;
}
if (this.settings.pro === undefined) { if (this.settings.pro === undefined) {
this.settings.pro = cloneDeep(DEFAULT_PRO_CONFIG); this.settings.pro = cloneDeep(DEFAULT_PRO_CONFIG);
} }
@@ -1146,19 +1393,39 @@ export default class RemotelySavePlugin extends Plugin {
} }
// send notice // send notice
if (dropboxExpired && onedriveExpired) { if (dropboxExpired) {
new Notice( new Notice(
`${this.manifest.name}: You haven't manually auth Dropbox and OneDrive for a while, you need to re-auth them again.`, `${this.manifest.name}: You haven't manually auth Dropbox for many days, you need to re-auth it again.`,
6000 6000
); );
} else if (dropboxExpired) { }
if (onedriveExpired) {
new Notice( new Notice(
`${this.manifest.name}: You haven't manually auth Dropbox for a while, you need to re-auth it again.`, `${this.manifest.name}: You haven't manually auth OneDrive for many days, you need to re-auth it again.`,
6000 6000
); );
} else if (onedriveExpired) { }
if (googleDriveExpired) {
new Notice( new Notice(
`${this.manifest.name}: You haven't manually auth OneDrive for a while, you need to re-auth it again.`, `${this.manifest.name}: You haven't manually auth Google Drive for many days, you need to re-auth it again.`,
6000
);
}
if (boxExpired) {
new Notice(
`${this.manifest.name}: You haven't manually auth Box for many days, you need to re-auth it again.`,
6000
);
}
if (pCloudExpired) {
new Notice(
`${this.manifest.name}: You haven't manually auth pCloud for many days, you need to re-auth it again.`,
6000
);
}
if (yandexDiskExpired) {
new Notice(
`${this.manifest.name}: You haven't manually auth Yandex Disk for many days, you need to re-auth it again.`,
6000 6000
); );
} }
+11
View File
@@ -716,3 +716,14 @@ export const splitFileSizeToChunkRanges = (
} }
return res; return res;
}; };
export const getSha1 = async (x: ArrayBuffer, stringify: "base64" | "hex") => {
const y = await window.crypto.subtle.digest("SHA-1", x);
if (stringify === "base64") {
return arrayBufferToBase64(y);
} else if (stringify === "hex") {
return arrayBufferToHex(y);
}
throw Error(`not supported stringify option = ${stringify}`);
};
+84 -1
View File
@@ -21,8 +21,11 @@ import type {
} from "./baseTypes"; } from "./baseTypes";
import cloneDeep from "lodash/cloneDeep"; import cloneDeep from "lodash/cloneDeep";
import { generateBoxSettingsPart } from "../pro/src/settingsBox";
import { generateGoogleDriveSettingsPart } from "../pro/src/settingsGoogleDrive"; import { generateGoogleDriveSettingsPart } from "../pro/src/settingsGoogleDrive";
import { generatePCloudSettingsPart } from "../pro/src/settingsPCloud";
import { generateProSettingsPart } from "../pro/src/settingsPro"; import { generateProSettingsPart } from "../pro/src/settingsPro";
import { generateYandexDiskSettingsPart } from "../pro/src/settingsYandexDisk";
import { API_VER_ENSURE_REQURL_OK, VALID_REQURL } from "./baseTypesObs"; import { API_VER_ENSURE_REQURL_OK, VALID_REQURL } from "./baseTypesObs";
import { messyConfigToNormal } from "./configPersist"; import { messyConfigToNormal } from "./configPersist";
import { import {
@@ -1808,6 +1811,40 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
() => this.plugin.saveSettings() () => this.plugin.saveSettings()
); );
//////////////////////////////////////////////////
// below for box
//////////////////////////////////////////////////
const { boxDiv, boxAllowedToUsedDiv, boxNotShowUpHintSetting } =
generateBoxSettingsPart(containerEl, t, this.app, this.plugin, () =>
this.plugin.saveSettings()
);
//////////////////////////////////////////////////
// below for pcloud
//////////////////////////////////////////////////
const { pCloudDiv, pCloudAllowedToUsedDiv, pCloudNotShowUpHintSetting } =
generatePCloudSettingsPart(containerEl, t, this.app, this.plugin, () =>
this.plugin.saveSettings()
);
//////////////////////////////////////////////////
// below for yandexdisk
//////////////////////////////////////////////////
const {
yandexDiskDiv,
yandexDiskAllowedToUsedDiv,
yandexDiskNotShowUpHintSetting,
} = generateYandexDiskSettingsPart(
containerEl,
t,
this.app,
this.plugin,
() => this.plugin.saveSettings()
);
////////////////////////////////////////////////// //////////////////////////////////////////////////
// below for general chooser (part 2/2) // below for general chooser (part 2/2)
////////////////////////////////////////////////// //////////////////////////////////////////////////
@@ -1827,6 +1864,12 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
"googledrive", "googledrive",
t("settings_chooseservice_googledrive") t("settings_chooseservice_googledrive")
); );
dropdown.addOption("box", t("settings_chooseservice_box"));
dropdown.addOption("pcloud", t("settings_chooseservice_pcloud"));
dropdown.addOption(
"yandexdisk",
t("settings_chooseservice_yandexdisk")
);
dropdown dropdown
.setValue(this.plugin.settings.serviceType) .setValue(this.plugin.settings.serviceType)
@@ -1856,6 +1899,18 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
"googledrive-hide", "googledrive-hide",
this.plugin.settings.serviceType !== "googledrive" this.plugin.settings.serviceType !== "googledrive"
); );
boxDiv.toggleClass(
"box-hide",
this.plugin.settings.serviceType !== "box"
);
pCloudDiv.toggleClass(
"pcloud-hide",
this.plugin.settings.serviceType !== "pcloud"
);
yandexDiskDiv.toggleClass(
"yandexdisk-hide",
this.plugin.settings.serviceType !== "yandexdisk"
);
await this.plugin.saveSettings(); await this.plugin.saveSettings();
}); });
}); });
@@ -2418,6 +2473,28 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
"googledrive" "googledrive"
).open(); ).open();
}); });
})
.addButton(async (button) => {
button.setButtonText(t("settings_export_box_button"));
button.onClick(async () => {
new ExportSettingsQrCodeModal(this.app, this.plugin, "box").open();
});
})
.addButton(async (button) => {
button.setButtonText(t("settings_export_pcloud_button"));
button.onClick(async () => {
new ExportSettingsQrCodeModal(this.app, this.plugin, "pcloud").open();
});
})
.addButton(async (button) => {
button.setButtonText(t("settings_export_yandexdisk_button"));
button.onClick(async () => {
new ExportSettingsQrCodeModal(
this.app,
this.plugin,
"yandexdisk"
).open();
});
}); });
let importSettingVal = ""; let importSettingVal = "";
@@ -2484,7 +2561,13 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
this.plugin, this.plugin,
() => this.plugin.saveSettings(), () => this.plugin.saveSettings(),
googleDriveAllowedToUsedDiv, googleDriveAllowedToUsedDiv,
googleDriveNotShowUpHintSetting googleDriveNotShowUpHintSetting,
boxAllowedToUsedDiv,
boxNotShowUpHintSetting,
pCloudAllowedToUsedDiv,
pCloudNotShowUpHintSetting,
yandexDiskAllowedToUsedDiv,
yandexDiskNotShowUpHintSetting
); );
////////////////////////////////////////////////// //////////////////////////////////////////////////
+1 -6
View File
@@ -1507,12 +1507,7 @@ export async function syncer(
try { try {
// check pro feature // check pro feature
// if anything goes wrong, it will throw // if anything goes wrong, it will throw
await checkProRunnableAndFixInplace( await checkProRunnableAndFixInplace(settings, pluginVersion, configSaver);
["feature-smart_conflict", "feature-google_drive"],
settings,
pluginVersion,
configSaver
);
// try mode? // try mode?
await notifyFunc?.(triggerSource, step); await notifyFunc?.(triggerSource, step);
+57
View File
@@ -91,6 +91,63 @@
display: none; display: none;
} }
.box-disclaimer {
font-weight: bold;
}
.box-hide {
display: none;
}
.box-allow-to-use-hide {
display: none;
}
.box-auth-button-hide {
display: none;
}
.box-revoke-auth-button-hide {
display: none;
}
.pcloud-disclaimer {
font-weight: bold;
}
.pcloud-hide {
display: none;
}
.pcloud-allow-to-use-hide {
display: none;
}
.pcloud-auth-button-hide {
display: none;
}
.pcloud-revoke-auth-button-hide {
display: none;
}
.yandexdisk-disclaimer {
font-weight: bold;
}
.yandexdisk-hide {
display: none;
}
.yandexdisk-allow-to-use-hide {
display: none;
}
.yandexdisk-auth-button-hide {
display: none;
}
.yandexdisk-revoke-auth-button-hide {
display: none;
}
.qrcode-img { .qrcode-img {
width: 350px; width: 350px;
height: 350px; height: 350px;
+9
View File
@@ -22,6 +22,15 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
googledrive: { googledrive: {
refreshToken: "xxx", refreshToken: "xxx",
} as any, } as any,
box: {
refreshToken: "xxx",
} as any,
pcloud: {
accessToken: "xxx",
} as any,
yandexdisk: {
refreshToken: "xxx",
} as any,
password: "password", password: "password",
serviceType: "s3", serviceType: "s3",
currLogLevel: "info", currLogLevel: "info",
+13
View File
@@ -11,6 +11,13 @@ const DEFAULT_REMOTELYSAVE_CLIENT_ID = process.env.REMOTELYSAVE_CLIENT_ID || "";
const DEFAULT_GOOGLEDRIVE_CLIENT_ID = process.env.GOOGLEDRIVE_CLIENT_ID || ""; const DEFAULT_GOOGLEDRIVE_CLIENT_ID = process.env.GOOGLEDRIVE_CLIENT_ID || "";
const DEFAULT_GOOGLEDRIVE_CLIENT_SECRET = const DEFAULT_GOOGLEDRIVE_CLIENT_SECRET =
process.env.GOOGLEDRIVE_CLIENT_SECRET || ""; process.env.GOOGLEDRIVE_CLIENT_SECRET || "";
const DEFAULT_BOX_CLIENT_ID = process.env.BOX_CLIENT_ID || "";
const DEFAULT_BOX_CLIENT_SECRET = process.env.BOX_CLIENT_SECRET || "";
const DEFAULT_PCLOUD_CLIENT_ID = process.env.PCLOUD_CLIENT_ID || "";
const DEFAULT_PCLOUD_CLIENT_SECRET = process.env.PCLOUD_CLIENT_SECRET || "";
const DEFAULT_YANDEXDISK_CLIENT_ID = process.env.YANDEXDISK_CLIENT_ID || "";
const DEFAULT_YANDEXDISK_CLIENT_SECRET =
process.env.YANDEXDISK_CLIENT_SECRET || "";
module.exports = { module.exports = {
entry: "./src/main.ts", entry: "./src/main.ts",
@@ -29,6 +36,12 @@ module.exports = {
"process.env.DEFAULT_REMOTELYSAVE_CLIENT_ID": `"${DEFAULT_REMOTELYSAVE_CLIENT_ID}"`, "process.env.DEFAULT_REMOTELYSAVE_CLIENT_ID": `"${DEFAULT_REMOTELYSAVE_CLIENT_ID}"`,
"process.env.DEFAULT_GOOGLEDRIVE_CLIENT_ID": `"${DEFAULT_GOOGLEDRIVE_CLIENT_ID}"`, "process.env.DEFAULT_GOOGLEDRIVE_CLIENT_ID": `"${DEFAULT_GOOGLEDRIVE_CLIENT_ID}"`,
"process.env.DEFAULT_GOOGLEDRIVE_CLIENT_SECRET": `"${DEFAULT_GOOGLEDRIVE_CLIENT_SECRET}"`, "process.env.DEFAULT_GOOGLEDRIVE_CLIENT_SECRET": `"${DEFAULT_GOOGLEDRIVE_CLIENT_SECRET}"`,
"process.env.DEFAULT_BOX_CLIENT_ID": `"${DEFAULT_BOX_CLIENT_ID}"`,
"process.env.DEFAULT_BOX_CLIENT_SECRET": `"${DEFAULT_BOX_CLIENT_SECRET}"`,
"process.env.DEFAULT_PCLOUD_CLIENT_ID": `"${DEFAULT_PCLOUD_CLIENT_ID}"`,
"process.env.DEFAULT_PCLOUD_CLIENT_SECRET": `"${DEFAULT_PCLOUD_CLIENT_SECRET}"`,
"process.env.DEFAULT_YANDEXDISK_CLIENT_ID": `"${DEFAULT_YANDEXDISK_CLIENT_ID}"`,
"process.env.DEFAULT_YANDEXDISK_CLIENT_SECRET": `"${DEFAULT_YANDEXDISK_CLIENT_SECRET}"`,
}), }),
// Work around for Buffer is undefined: // Work around for Buffer is undefined:
// https://github.com/webpack/changelog-v5/issues/10 // https://github.com/webpack/changelog-v5/issues/10