Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d9cab7b1ff | ||
|
|
5e53967e01 | ||
|
|
fb9f4a67b4 | ||
|
|
26a426dda8 | ||
|
|
de64c3c53f | ||
|
|
0cefafa491 | ||
|
|
b769becb97 | ||
|
|
7b3600a46f | ||
|
|
69e72eae1d | ||
|
|
b0acde0ba6 | ||
|
|
11b7fee80b | ||
|
|
c4c39f6b79 | ||
|
|
45578a01dd | ||
|
|
0391c42999 | ||
|
|
807eec928e | ||
|
|
3d7c4d2a4a | ||
|
|
cb779fc7bf | ||
|
|
9d8e2af7b9 | ||
|
|
a48440e60b | ||
|
|
2a84fae368 | ||
|
|
3c3426a842 | ||
|
|
74de7da89a | ||
|
|
1f33ac5d7a | ||
|
|
63c54d1956 | ||
|
|
b584f89a95 | ||
|
|
fa17ea074b | ||
|
|
cb98bae79a | ||
|
|
d1e30e3536 | ||
|
|
36079fc1d0 | ||
|
|
67467a5034 | ||
|
|
2a3df8ab53 | ||
|
|
e66b0c71c4 | ||
|
|
a081d09212 | ||
|
|
6ed6122bb6 | ||
|
|
235e346d2f | ||
|
|
084cbc8391 | ||
|
|
dc0c1db779 | ||
|
|
2645ff34e6 | ||
|
|
f25a2c2992 | ||
|
|
3d1269a9f2 | ||
|
|
ed52a8542f | ||
|
|
757eb5c801 | ||
|
|
048e7b6251 | ||
|
|
b762052da3 | ||
|
|
c61efd1367 | ||
|
|
605bffa471 | ||
|
|
895e3db4c6 | ||
|
|
ce1990a35f |
@@ -29,10 +29,18 @@ jobs:
|
||||
- name: Checkout codes
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
lfs: true
|
||||
submodules: recursive
|
||||
- name: Checkout LFS
|
||||
run: git lfs checkout
|
||||
- name: Checkout LFS file list
|
||||
run: git lfs ls-files --long | cut -d ' ' -f1 | sort > .lfs-assets-id
|
||||
- name: LFS Cache
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .git/lfs/objects
|
||||
key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-lfs-
|
||||
- name: Git LFS Pull
|
||||
run: git lfs pull
|
||||
- name: Use Node.js ${{ matrix.node-version }}
|
||||
uses: actions/setup-node@v2
|
||||
with:
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
name: "CLA Assistant"
|
||||
on:
|
||||
issue_comment:
|
||||
types: [created]
|
||||
pull_request_target:
|
||||
types: [opened,closed,synchronize]
|
||||
|
||||
# explicitly configure permissions, in case your GITHUB_TOKEN workflow permissions are set to read-only in repository settings
|
||||
permissions:
|
||||
actions: write
|
||||
contents: write
|
||||
pull-requests: write
|
||||
statuses: write
|
||||
|
||||
jobs:
|
||||
CLAAssistant:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: "CLA Assistant"
|
||||
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
|
||||
uses: contributor-assistant/github-action@v2.3.0
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
# the below token should have repo scope and must be manually added by you in the repository's secret
|
||||
# This token is required only if you have configured to store the signatures in a remote repository/organization
|
||||
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
|
||||
with:
|
||||
path-to-signatures: 'signatures/version1/cla.json'
|
||||
path-to-document: 'https://github.com/remotely-save/remotely-save/blob/master/CLA.md' # e.g. a CLA or a DCO document
|
||||
# branch should not be protected
|
||||
branch: 'main'
|
||||
allowlist: bot*
|
||||
|
||||
# the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
|
||||
remote-organization-name: remotely-save
|
||||
remote-repository-name: cla-signed
|
||||
#create-file-commit-message: 'For example: Creating file for storing CLA Signatures'
|
||||
#signed-commit-message: 'For example: $contributorName has signed the CLA in $owner/$repo#$pullRequestNo'
|
||||
custom-notsigned-prcomment: '<br/>Thank you for your submission, we really appreciate it. However, we ask that $you sign our [Contributor License Agreement](https://github.com/remotely-save/remotely-save/blob/master/CLA.md) before we can accept your contribution. You can sign the CLA by just posting a Pull Request Comment same as the below format.<br/>'
|
||||
#custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
|
||||
#custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
|
||||
#lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
|
||||
#use-dco-flag: true - If you are using DCO instead of CLA
|
||||
@@ -32,10 +32,18 @@ jobs:
|
||||
- name: Checkout codes
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
lfs: true
|
||||
submodules: recursive
|
||||
- name: Checkout LFS
|
||||
run: git lfs checkout
|
||||
- name: Checkout LFS file list
|
||||
run: git lfs ls-files --long | cut -d ' ' -f1 | sort > .lfs-assets-id
|
||||
- name: LFS Cache
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .git/lfs/objects
|
||||
key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-lfs-
|
||||
- name: Git LFS Pull
|
||||
run: git lfs pull
|
||||
- name: Use Node.js ${{ matrix.node-version }}
|
||||
uses: actions/setup-node@v2
|
||||
with:
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
node_modules/
|
||||
main.js
|
||||
data.json
|
||||
@@ -0,0 +1,23 @@
|
||||
In order to clarify the intellectual property license granted with Contributions from any person or entity, Remotely Save dev team ("Remotely Save") must have on file a signed Contributor License Agreement ("CLA") from each Contributor, indicating agreement with the license terms below. This agreement is for your protection as a Contributor as well as the protection of Remotely Save and its users. It does not change your rights to use your own Contributions for any other purpose.
|
||||
|
||||
You accept and agree to the following terms and conditions for Your Contributions (present and future) that you submit to Remotely Save. Except for the license granted herein to Remotely Save and recipients of software distributed by Remotely Save, You reserve all right, title, and interest in and to Your Contributions.
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with Remotely Save. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to Remotely Save for inclusion in, or documentation of, any of the products owned or managed by Remotely Save (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Remotely Save or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Remotely Save for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to Remotely Save and to recipients of software distributed by Remotely Save a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to Remotely Save and to recipients of software distributed by Remotely Save a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
|
||||
|
||||
4. You represent that you are legally entitled to grant the above license. If your employer(s) has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make Contributions on behalf of that employer, that your employer has waived such rights for your Contributions to Remotely Save, or that your employer has executed a separate Corporate CLA with Remotely Save.
|
||||
|
||||
5. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions.
|
||||
|
||||
6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
7. Should You wish to submit work that is not Your original creation, You may submit it to Remotely Save separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".
|
||||
|
||||
8. You agree to notify Remotely Save of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect.
|
||||
@@ -0,0 +1,22 @@
|
||||
# Contributing
|
||||
|
||||
## What
|
||||
|
||||
Starting from April 29, 2024, all individual contributors' contributions are only possibly accepted after they sign the CLA.
|
||||
|
||||
We do not accept corporate contributions at this moment.
|
||||
|
||||
You can check out [CLA](./CLA.md).
|
||||
|
||||
## Steps
|
||||
|
||||
1. Make some changes to the code. Open a pull request.
|
||||
2. A rebot will check the status.
|
||||

|
||||
3. Read the [CLA](./CLA.md) carefully and make a decision.
|
||||
4. If you decide to sign the CLA, please make a comment "I have read the CLA Document and I hereby sign the CLA".
|
||||
5. If you decide to not sign the CLA, please close the PR.
|
||||
6. The robot should recheck and pass the check automatically.
|
||||

|
||||
7. Your pr will be reviewed.
|
||||
8. If you sign the CLA and submit some more PRs, the robot should pass the test automatically.
|
||||
@@ -21,6 +21,7 @@ This is yet another unofficial sync plugin for Obsidian. If you like it or find
|
||||
- Dropbox
|
||||
- OneDrive for personal
|
||||
- Webdav
|
||||
- Webdis
|
||||
- [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".
|
||||
- **[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.
|
||||
@@ -67,11 +68,12 @@ Additionally, the plugin author may occasionally visit Obsidian official forum a
|
||||
- [腾讯云 COS](./docs/remote_services/s3_tencent_cloud_cos/README.zh-cn.md) | [Tencent Cloud COS](./docs/remote_services/s3_tencent_cloud_cos/README.md)
|
||||
- [MinIO](./docs/remote_services/s3_minio/README.md)
|
||||
- [又拍云](./docs/remote_services/s3_upyun/README.zh-cn.md)
|
||||
- Prepare your S3 (-compatible) service information: [endpoint, region](https://docs.aws.amazon.com/general/latest/gr/s3.html), [access key id, secret access key](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/getting-your-credentials.html), bucket name. The bucket should be empty and solely for syncing a vault.
|
||||
- Prepare your S3 (-compatible) service information: [endpoint, region](https://docs.aws.amazon.com/general/latest/gr/s3.html), [access key id, secret access key](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/getting-your-credentials.html), bucket name.
|
||||
- If you are using AWS S3, create [policy and user](./docs/remote_services/s3_general/s3_user_policy.md).
|
||||
- Very old version of Obsidian needs [configuring CORS](./docs/remote_services/s3_general/s3_cors_configure.md).
|
||||
- Download and enable this plugin.
|
||||
- Enter your information to the settings of this plugin.
|
||||
- If you do not set the prefix in the settings, the bucket should be empty and solely for syncing a vault. You can set the prefix in the settings so that the same bucket can store multiple vaults.
|
||||
- If you want to enable end-to-end encryption, also set a password in settings. If you do not specify a password, the files and folders are synced in plain, original content to the cloud.
|
||||
- Click the new "circle arrow" icon on the ribbon (the left sidebar), **every time** you want to sync your vault between local and remote. (Or, you could configure auto sync in the settings panel (See next chapter).) While syncing, the icon becomes "two half-circle arrows". Besides clicking the icon on the sidebar ribbon, you can also activate the corresponding command in the command palette.
|
||||
- **Be patient while syncing.** Especially in the first-time sync.
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:07fd075d0f73c708d77fd97bb31d6f185f094031e8275e8fd582e3a0145f6be8
|
||||
size 415757
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4c5754df8b5d6878a7fa58992fc7e37ddcce1ecf578a0fc2ec751b6f7bab6f13
|
||||
size 284700
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
{
|
||||
"$schema": "https://biomejs.dev/schemas/1.7.3/schema.json",
|
||||
"organizeImports": {
|
||||
"enabled": true
|
||||
},
|
||||
"files": {
|
||||
"ignore": ["main.js"]
|
||||
},
|
||||
"formatter": {
|
||||
"enabled": true,
|
||||
"formatWithErrors": false,
|
||||
"ignore": [],
|
||||
"attributePosition": "auto",
|
||||
"indentStyle": "space",
|
||||
"indentWidth": 2,
|
||||
"lineEnding": "lf",
|
||||
"lineWidth": 80
|
||||
},
|
||||
"javascript": {
|
||||
"formatter": {
|
||||
"arrowParentheses": "always",
|
||||
"bracketSameLine": false,
|
||||
"bracketSpacing": true,
|
||||
"jsxQuoteStyle": "double",
|
||||
"quoteProperties": "asNeeded",
|
||||
"semicolons": "always",
|
||||
"trailingComma": "es5"
|
||||
}
|
||||
},
|
||||
"linter": {
|
||||
"enabled": true,
|
||||
"rules": {
|
||||
"recommended": true,
|
||||
"suspicious": {
|
||||
"noExplicitAny": "off",
|
||||
"noPrototypeBuiltins": "off",
|
||||
"noControlCharactersInRegex": "off"
|
||||
},
|
||||
"style": {
|
||||
"noUselessElse": "off",
|
||||
"useNodejsImportProtocol": "off",
|
||||
"noUnusedTemplateLiteral": "off",
|
||||
"useTemplate": "off",
|
||||
"noNonNullAssertion": "off"
|
||||
},
|
||||
"performance": {
|
||||
"noDelete": "off"
|
||||
},
|
||||
"complexity": {
|
||||
"noForEach": "off",
|
||||
"useLiteralKeys": "off"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
const http = require("http");
|
||||
|
||||
const requestHandler = (req, res) => {
|
||||
let body = [];
|
||||
const body = [];
|
||||
req
|
||||
.on("data", (chunk) => {
|
||||
body.push(chunk);
|
||||
|
||||
+1
-2
@@ -1,7 +1,6 @@
|
||||
import dotenv from "dotenv/config";
|
||||
import esbuild from "esbuild";
|
||||
import process from "process";
|
||||
import inlineWorkerPlugin from "esbuild-plugin-inline-worker";
|
||||
import process from "process";
|
||||
// import builtins from 'builtin-modules'
|
||||
|
||||
const banner = `/*
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
export let Buffer = require("buffer").Buffer;
|
||||
export let process = require("process/browser");
|
||||
export const Buffer = require("buffer").Buffer;
|
||||
export const process = require("process/browser");
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"id": "remotely-save",
|
||||
"name": "Remotely Save",
|
||||
"version": "0.4.19",
|
||||
"version": "0.4.24",
|
||||
"minAppVersion": "0.13.21",
|
||||
"description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
|
||||
"author": "fyears",
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"id": "remotely-save",
|
||||
"name": "Remotely Save",
|
||||
"version": "0.4.19",
|
||||
"version": "0.4.24",
|
||||
"minAppVersion": "0.13.21",
|
||||
"description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
|
||||
"author": "fyears",
|
||||
|
||||
+4
-3
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"name": "remotely-save",
|
||||
"version": "0.4.19",
|
||||
"version": "0.4.24",
|
||||
"description": "This is yet another sync plugin for Obsidian app.",
|
||||
"scripts": {
|
||||
"dev2": "node esbuild.config.mjs --watch",
|
||||
"build2": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production",
|
||||
"build": "webpack --mode production",
|
||||
"dev": "webpack --mode development --watch",
|
||||
"format": "npx prettier --trailing-comma es5 --write .",
|
||||
"format": "npx @biomejs/biome check --apply .",
|
||||
"clean": "npx rimraf main.js",
|
||||
"test": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} mocha -r ts-node/register 'tests/**/*.ts'"
|
||||
},
|
||||
@@ -25,6 +25,7 @@
|
||||
"author": "",
|
||||
"license": "Apache-2.0",
|
||||
"devDependencies": {
|
||||
"@biomejs/biome": "1.7.3",
|
||||
"@microsoft/microsoft-graph-types": "^2.40.0",
|
||||
"@types/chai": "^4.3.14",
|
||||
"@types/chai-as-promised": "^7.1.8",
|
||||
@@ -44,7 +45,6 @@
|
||||
"mocha": "^10.4.0",
|
||||
"npm-check-updates": "^16.14.20",
|
||||
"obsidian": "^1.5.7",
|
||||
"prettier": "^3.2.5",
|
||||
"ts-loader": "^9.5.1",
|
||||
"ts-node": "^10.9.2",
|
||||
"tslib": "^2.6.2",
|
||||
@@ -77,6 +77,7 @@
|
||||
"http-status-codes": "^2.3.0",
|
||||
"localforage": "^1.10.0",
|
||||
"localforage-getitems": "^1.4.2",
|
||||
"localforage-removeitems": "^1.4.0",
|
||||
"lodash": "^4.17.21",
|
||||
"lucide": "^0.376.1",
|
||||
"mime-types": "^2.1.35",
|
||||
|
||||
+12
-1
@@ -3,7 +3,7 @@
|
||||
* To avoid circular dependency.
|
||||
*/
|
||||
|
||||
import type { LangType, LangTypeAndAuto } from "./i18n";
|
||||
import type { LangTypeAndAuto } from "./i18n";
|
||||
|
||||
export const DEFAULT_CONTENT_TYPE = "application/octet-stream";
|
||||
|
||||
@@ -89,6 +89,7 @@ export interface OnedriveConfig {
|
||||
username: string;
|
||||
credentialsShouldBeDeletedAtTime?: number;
|
||||
remoteBaseDir?: string;
|
||||
emptyFile: "skip" | "error";
|
||||
}
|
||||
|
||||
export interface WebdisConfig {
|
||||
@@ -107,6 +108,11 @@ export type CipherMethodType = "rclone-base64" | "openssl-base64" | "unknown";
|
||||
|
||||
export type QRExportType = "all_but_oauth2" | "dropbox" | "onedrive";
|
||||
|
||||
export interface ProfilerConfig {
|
||||
enablePrinting?: boolean;
|
||||
recordSize?: boolean;
|
||||
}
|
||||
|
||||
export interface RemotelySavePluginSettings {
|
||||
s3: S3Config;
|
||||
webdav: WebdavConfig;
|
||||
@@ -141,6 +147,8 @@ export interface RemotelySavePluginSettings {
|
||||
|
||||
encryptionMethod?: CipherMethodType;
|
||||
|
||||
profiler?: ProfilerConfig;
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
*/
|
||||
@@ -223,6 +231,7 @@ export interface Entity {
|
||||
hash?: string;
|
||||
etag?: string;
|
||||
synthesizedFolder?: boolean;
|
||||
synthesizedFile?: boolean;
|
||||
}
|
||||
|
||||
export interface UploadedType {
|
||||
@@ -243,6 +252,8 @@ export interface MixedEntity {
|
||||
decision?: DecisionTypeForMixedEntity;
|
||||
conflictAction?: ConflictActionType;
|
||||
|
||||
change?: boolean;
|
||||
|
||||
sideNotes?: any;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { base64, base64url } from "rfc4648";
|
||||
import { base64url } from "rfc4648";
|
||||
import { reverseString } from "./misc";
|
||||
|
||||
import type { RemotelySavePluginSettings } from "./baseTypes";
|
||||
|
||||
+34
-10
@@ -1,22 +1,40 @@
|
||||
import { TAbstractFile, TFolder, TFile, Vault } from "obsidian";
|
||||
import type { Vault } from "obsidian";
|
||||
|
||||
import {
|
||||
readAllProfilerResultsByVault,
|
||||
readAllSyncPlanRecordTextsByVault,
|
||||
} from "./localdb";
|
||||
import type { InternalDBs } from "./localdb";
|
||||
import { mkdirpInVault, unixTimeToStr } from "./misc";
|
||||
import {
|
||||
DEFAULT_DEBUG_FOLDER,
|
||||
DEFAULT_PROFILER_RESULT_FILE_PREFIX,
|
||||
DEFAULT_SYNC_PLANS_HISTORY_FILE_PREFIX,
|
||||
} from "./baseTypes";
|
||||
import {
|
||||
readAllProfilerResultsByVault,
|
||||
readAllSyncPlanRecordTextsByVault,
|
||||
} from "./localdb";
|
||||
import type { InternalDBs } from "./localdb";
|
||||
import { mkdirpInVault } from "./misc";
|
||||
import type { SyncPlanType } from "./sync";
|
||||
|
||||
const getSubsetOfSyncPlan = (x: string, onlyChange: boolean) => {
|
||||
if (!onlyChange) {
|
||||
return x;
|
||||
}
|
||||
const y: SyncPlanType = JSON.parse(x);
|
||||
const z: SyncPlanType = Object.fromEntries(
|
||||
Object.entries(y).filter(([key, val]) => {
|
||||
if (key === "/$@meta") {
|
||||
return true;
|
||||
}
|
||||
return val.change === undefined || val.change === true;
|
||||
})
|
||||
);
|
||||
return JSON.stringify(z, null, 2);
|
||||
};
|
||||
|
||||
export const exportVaultSyncPlansToFiles = async (
|
||||
db: InternalDBs,
|
||||
vault: Vault,
|
||||
vaultRandomID: string,
|
||||
howMany: number
|
||||
howMany: number,
|
||||
onlyChange: boolean
|
||||
) => {
|
||||
console.info("exporting sync plans");
|
||||
await mkdirpInVault(DEFAULT_DEBUG_FOLDER, vault);
|
||||
@@ -28,12 +46,18 @@ export const exportVaultSyncPlansToFiles = async (
|
||||
if (howMany <= 0) {
|
||||
md =
|
||||
"Sync plans found:\n\n" +
|
||||
records.map((x) => "```json\n" + x + "\n```\n").join("\n");
|
||||
records
|
||||
.map(
|
||||
(x) => "```json\n" + getSubsetOfSyncPlan(x, onlyChange) + "\n```\n"
|
||||
)
|
||||
.join("\n");
|
||||
} else {
|
||||
md =
|
||||
"Sync plans found:\n\n" +
|
||||
records
|
||||
.map((x) => "```json\n" + x + "\n```\n")
|
||||
.map(
|
||||
(x) => "```json\n" + getSubsetOfSyncPlan(x, onlyChange) + "\n```\n"
|
||||
)
|
||||
.slice(0, howMany)
|
||||
.join("\n");
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ export const encryptArrayBuffer = async (
|
||||
arrBuf: ArrayBuffer,
|
||||
password: string,
|
||||
rounds: number = DEFAULT_ITER,
|
||||
saltHex: string = ""
|
||||
saltHex = ""
|
||||
) => {
|
||||
let salt: Uint8Array;
|
||||
if (saltHex !== "") {
|
||||
@@ -109,7 +109,7 @@ export const encryptStringToBase32 = async (
|
||||
text: string,
|
||||
password: string,
|
||||
rounds: number = DEFAULT_ITER,
|
||||
saltHex: string = ""
|
||||
saltHex = ""
|
||||
) => {
|
||||
const enc = await encryptArrayBuffer(
|
||||
bufferToArrayBuffer(new TextEncoder().encode(text)),
|
||||
@@ -138,7 +138,7 @@ export const encryptStringToBase64url = async (
|
||||
text: string,
|
||||
password: string,
|
||||
rounds: number = DEFAULT_ITER,
|
||||
saltHex: string = ""
|
||||
saltHex = ""
|
||||
) => {
|
||||
const enc = await encryptArrayBuffer(
|
||||
bufferToArrayBuffer(new TextEncoder().encode(text)),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { nanoid } from "nanoid";
|
||||
import { Cipher as CipherRCloneCryptPack } from "@fyears/rclone-crypt";
|
||||
import { nanoid } from "nanoid";
|
||||
|
||||
const ctx: WorkerGlobalScope = self as any;
|
||||
|
||||
|
||||
+3
-1
@@ -1,8 +1,9 @@
|
||||
import { Entity } from "./baseTypes";
|
||||
import type { Entity } from "./baseTypes";
|
||||
|
||||
export abstract class FakeFs {
|
||||
abstract kind: string;
|
||||
abstract walk(): Promise<Entity[]>;
|
||||
abstract walkPartial(): Promise<Entity[]>;
|
||||
abstract stat(key: string): Promise<Entity>;
|
||||
abstract mkdir(key: string, mtime?: number, ctime?: number): Promise<Entity>;
|
||||
abstract writeFile(
|
||||
@@ -16,4 +17,5 @@ export abstract class FakeFs {
|
||||
abstract checkConnect(callbackFunc?: any): Promise<boolean>;
|
||||
abstract getUserDisplayName(): Promise<string>;
|
||||
abstract revokeAuth(): Promise<any>;
|
||||
abstract allowEmptyFile(): boolean;
|
||||
}
|
||||
|
||||
+31
-17
@@ -1,13 +1,13 @@
|
||||
import { FakeFs } from "./fsAll";
|
||||
import { Dropbox, DropboxAuth } from "dropbox";
|
||||
import type { files, DropboxResponseError, DropboxResponse } from "dropbox";
|
||||
import {
|
||||
DropboxConfig,
|
||||
COMMAND_CALLBACK_DROPBOX,
|
||||
OAUTH2_FORCE_EXPIRE_MILLISECONDS,
|
||||
Entity,
|
||||
} from "./baseTypes";
|
||||
import type { DropboxResponse, DropboxResponseError, files } from "dropbox";
|
||||
import random from "lodash/random";
|
||||
import {
|
||||
COMMAND_CALLBACK_DROPBOX,
|
||||
type DropboxConfig,
|
||||
type Entity,
|
||||
OAUTH2_FORCE_EXPIRE_MILLISECONDS,
|
||||
} from "./baseTypes";
|
||||
import { FakeFs } from "./fsAll";
|
||||
import {
|
||||
bufferToArrayBuffer,
|
||||
delay,
|
||||
@@ -134,7 +134,7 @@ export const fixEntityListCasesInplace = (entities: { key?: string }[]) => {
|
||||
caseMapping[newKey.toLocaleLowerCase()] = newKey;
|
||||
e.key = newKey;
|
||||
// console.log(JSON.stringify(caseMapping,null,2));
|
||||
continue;
|
||||
// continue;
|
||||
} else {
|
||||
throw Error(`${parentFolder} doesn't have cases record??`);
|
||||
}
|
||||
@@ -145,7 +145,7 @@ export const fixEntityListCasesInplace = (entities: { key?: string }[]) => {
|
||||
.slice(-1)
|
||||
.join("/")}`;
|
||||
e.key = newKey;
|
||||
continue;
|
||||
// continue;
|
||||
} else {
|
||||
throw Error(`${parentFolder} doesn't have cases record??`);
|
||||
}
|
||||
@@ -167,7 +167,7 @@ interface ErrSubType {
|
||||
|
||||
async function retryReq<T>(
|
||||
reqFunc: () => Promise<DropboxResponse<T>>,
|
||||
extraHint: string = ""
|
||||
extraHint = ""
|
||||
): Promise<DropboxResponse<T> | undefined> {
|
||||
const waitSeconds = [1, 2, 4, 8]; // hard code exponential backoff
|
||||
for (let idx = 0; idx < waitSeconds.length; ++idx) {
|
||||
@@ -205,7 +205,7 @@ async function retryReq<T>(
|
||||
const headers = headersToRecord(err.headers);
|
||||
const svrSec =
|
||||
err.error.error.retry_after ||
|
||||
parseInt(headers["retry-after"] || "1") ||
|
||||
Number.parseInt(headers["retry-after"] || "1") ||
|
||||
1;
|
||||
const fallbackSec = waitSeconds[idx];
|
||||
const secMin = Math.max(svrSec, fallbackSec);
|
||||
@@ -233,7 +233,7 @@ async function retryReq<T>(
|
||||
|
||||
export const getAuthUrlAndVerifier = async (
|
||||
appKey: string,
|
||||
needManualPatse: boolean = false
|
||||
needManualPatse = false
|
||||
) => {
|
||||
const auth = new DropboxAuth({
|
||||
clientId: appKey,
|
||||
@@ -328,9 +328,9 @@ export const setConfigBySuccessfullAuthInplace = async (
|
||||
console.info("start updating local info of Dropbox token");
|
||||
|
||||
config.accessToken = authRes.access_token;
|
||||
config.accessTokenExpiresInSeconds = parseInt(authRes.expires_in);
|
||||
config.accessTokenExpiresInSeconds = Number.parseInt(authRes.expires_in);
|
||||
config.accessTokenExpiresAtTime =
|
||||
Date.now() + parseInt(authRes.expires_in) * 1000 - 10 * 1000;
|
||||
Date.now() + Number.parseInt(authRes.expires_in) * 1000 - 10 * 1000;
|
||||
|
||||
// manually set it expired after 80 days;
|
||||
config.credentialsShouldBeDeletedAtTime =
|
||||
@@ -452,13 +452,21 @@ export class FakeFsDropbox extends FakeFs {
|
||||
}
|
||||
|
||||
async walk(): Promise<Entity[]> {
|
||||
return await this._walk(false);
|
||||
}
|
||||
|
||||
async walkPartial(): Promise<Entity[]> {
|
||||
return await this._walk(true);
|
||||
}
|
||||
|
||||
async _walk(partial: boolean): Promise<Entity[]> {
|
||||
await this._init();
|
||||
|
||||
let res = await this.dropbox.filesListFolder({
|
||||
path: `/${this.remoteBaseDir}`,
|
||||
recursive: true,
|
||||
recursive: !partial,
|
||||
include_deleted: false,
|
||||
limit: 1000,
|
||||
limit: partial ? 10 : 1000,
|
||||
});
|
||||
if (res.status !== 200) {
|
||||
throw Error(JSON.stringify(res));
|
||||
@@ -471,6 +479,7 @@ export class FakeFsDropbox extends FakeFs {
|
||||
.filter((x) => x.path_display !== `/${this.remoteBaseDir}`)
|
||||
.map((x) => fromDropboxItemToEntity(x, this.remoteBaseDir));
|
||||
|
||||
if (!partial) {
|
||||
while (res.result.has_more) {
|
||||
res = await this.dropbox.filesListFolderContinue({
|
||||
cursor: res.result.cursor,
|
||||
@@ -486,6 +495,7 @@ export class FakeFsDropbox extends FakeFs {
|
||||
.map((x) => fromDropboxItemToEntity(x, this.remoteBaseDir));
|
||||
unifiedContents.push(...unifiedContents2);
|
||||
}
|
||||
}
|
||||
|
||||
fixEntityListCasesInplace(unifiedContents);
|
||||
|
||||
@@ -736,4 +746,8 @@ export class FakeFsDropbox extends FakeFs {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
allowEmptyFile(): boolean {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
+24
-26
@@ -1,10 +1,10 @@
|
||||
import { CipherMethodType, Entity } from "./baseTypes";
|
||||
import type { CipherMethodType, Entity } from "./baseTypes";
|
||||
import * as openssl from "./encryptOpenSSL";
|
||||
import * as rclone from "./encryptRClone";
|
||||
import { isVaildText } from "./misc";
|
||||
|
||||
import { FakeFs } from "./fsAll";
|
||||
import cloneDeep from "lodash/cloneDeep";
|
||||
import { FakeFs } from "./fsAll";
|
||||
|
||||
/**
|
||||
* quick guess, no actual decryption here
|
||||
@@ -78,8 +78,6 @@ export class FakeFsEncrypt extends FakeFs {
|
||||
cacheMapOrigToEnc: Record<string, string>;
|
||||
hasCacheMap: boolean;
|
||||
kind: string;
|
||||
innerWalkResultCache?: Entity[];
|
||||
innerWalkResultCacheTime?: number;
|
||||
|
||||
constructor(innerFs: FakeFs, password: string, method: CipherMethodType) {
|
||||
super();
|
||||
@@ -89,7 +87,9 @@ export class FakeFsEncrypt extends FakeFs {
|
||||
this.cacheMapOrigToEnc = {};
|
||||
this.hasCacheMap = false;
|
||||
|
||||
this.kind = `encrypt(${this.innerFs.kind},${method})`;
|
||||
this.kind = `encrypt(${this.innerFs.kind},${
|
||||
this.password !== "" ? method : "no password"
|
||||
})`;
|
||||
|
||||
if (method === "rclone-base64") {
|
||||
this.cipherRClone = new rclone.CipherRclone(password, 5);
|
||||
@@ -110,26 +110,8 @@ export class FakeFsEncrypt extends FakeFs {
|
||||
throw Error(`no idea about isFolderAware for method=${this.method}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* we want a little caching here.
|
||||
*/
|
||||
async _getInnerWalkResult(): Promise<Entity[]> {
|
||||
let innerWalkResult: Entity[] | undefined = undefined;
|
||||
if (
|
||||
this.innerWalkResultCacheTime !== undefined &&
|
||||
this.innerWalkResultCacheTime >= Date.now() - 1000
|
||||
) {
|
||||
innerWalkResult = this.innerWalkResultCache!;
|
||||
} else {
|
||||
innerWalkResult = await this.innerFs.walk();
|
||||
this.innerWalkResultCache = innerWalkResult;
|
||||
this.innerWalkResultCacheTime = Date.now();
|
||||
}
|
||||
return innerWalkResult;
|
||||
}
|
||||
|
||||
async isPasswordOk(): Promise<PasswordCheckType> {
|
||||
const innerWalkResult = await this._getInnerWalkResult();
|
||||
const innerWalkResult = await this.walkPartial();
|
||||
|
||||
if (innerWalkResult === undefined || innerWalkResult.length === 0) {
|
||||
// remote empty
|
||||
@@ -186,8 +168,16 @@ export class FakeFsEncrypt extends FakeFs {
|
||||
}
|
||||
|
||||
async walk(): Promise<Entity[]> {
|
||||
const innerWalkResult = await this._getInnerWalkResult();
|
||||
const innerWalkResult = await this.innerFs.walk();
|
||||
return await this._dealWithWalk(innerWalkResult);
|
||||
}
|
||||
|
||||
async walkPartial(): Promise<Entity[]> {
|
||||
const innerWalkResult = await this.innerFs.walkPartial();
|
||||
return await this._dealWithWalk(innerWalkResult);
|
||||
}
|
||||
|
||||
async _dealWithWalk(innerWalkResult: Entity[]): Promise<Entity[]> {
|
||||
const res: Entity[] = [];
|
||||
|
||||
if (this.isPasswordEmpty()) {
|
||||
@@ -273,9 +263,13 @@ export class FakeFsEncrypt extends FakeFs {
|
||||
return copyEntityAndCopyKeyEncSizeEnc(innerEntity);
|
||||
} else {
|
||||
const now = Date.now();
|
||||
let content = new ArrayBuffer(0);
|
||||
if (!this.innerFs.allowEmptyFile()) {
|
||||
content = new ArrayBuffer(1);
|
||||
}
|
||||
const innerEntity = await this.innerFs.writeFile(
|
||||
keyEnc,
|
||||
new ArrayBuffer(0),
|
||||
content,
|
||||
mtime ?? now,
|
||||
ctime ?? now
|
||||
);
|
||||
@@ -554,4 +548,8 @@ export class FakeFsEncrypt extends FakeFs {
|
||||
async revokeAuth(): Promise<any> {
|
||||
return await this.innerFs.revokeAuth();
|
||||
}
|
||||
|
||||
allowEmptyFile(): boolean {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
+2
-8
@@ -1,5 +1,5 @@
|
||||
import { RemotelySavePluginSettings } from "./baseTypes";
|
||||
import { FakeFs } from "./fsAll";
|
||||
import type { RemotelySavePluginSettings } from "./baseTypes";
|
||||
import type { FakeFs } from "./fsAll";
|
||||
import { FakeFsDropbox } from "./fsDropbox";
|
||||
import { FakeFsOnedrive } from "./fsOnedrive";
|
||||
import { FakeFsS3 } from "./fsS3";
|
||||
@@ -17,37 +17,31 @@ export function getClient(
|
||||
switch (settings.serviceType) {
|
||||
case "s3":
|
||||
return new FakeFsS3(settings.s3);
|
||||
break;
|
||||
case "webdav":
|
||||
return new FakeFsWebdav(
|
||||
settings.webdav,
|
||||
vaultName,
|
||||
saveUpdatedConfigFunc
|
||||
);
|
||||
break;
|
||||
case "dropbox":
|
||||
return new FakeFsDropbox(
|
||||
settings.dropbox,
|
||||
vaultName,
|
||||
saveUpdatedConfigFunc
|
||||
);
|
||||
break;
|
||||
case "onedrive":
|
||||
return new FakeFsOnedrive(
|
||||
settings.onedrive,
|
||||
vaultName,
|
||||
saveUpdatedConfigFunc
|
||||
);
|
||||
break;
|
||||
case "webdis":
|
||||
return new FakeFsWebdis(
|
||||
settings.webdis,
|
||||
vaultName,
|
||||
saveUpdatedConfigFunc
|
||||
);
|
||||
break;
|
||||
default:
|
||||
throw Error(`cannot init client for serviceType=${settings.serviceType}`);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
+24
-14
@@ -1,17 +1,17 @@
|
||||
import { DEFAULT_DEBUG_FOLDER, Entity } from "./baseTypes";
|
||||
import { DEFAULT_DEBUG_FOLDER, type Entity } from "./baseTypes";
|
||||
import { FakeFs } from "./fsAll";
|
||||
|
||||
import { TFile, TFolder, type Vault } from "obsidian";
|
||||
import { mkdirpInVault, statFix, unixTimeToStr } from "./misc";
|
||||
import { listFilesInObsFolder } from "./obsFolderLister";
|
||||
import { Profiler } from "./profiler";
|
||||
import { getFolderLevels, mkdirpInVault, statFix } from "./misc";
|
||||
import type { Profiler } from "./profiler";
|
||||
|
||||
export class FakeFsLocal extends FakeFs {
|
||||
vault: Vault;
|
||||
syncConfigDir: boolean;
|
||||
configDir: string;
|
||||
pluginID: string;
|
||||
profiler: Profiler;
|
||||
profiler: Profiler | undefined;
|
||||
deleteToWhere: "obsidian" | "system";
|
||||
kind: "local";
|
||||
constructor(
|
||||
@@ -19,7 +19,7 @@ export class FakeFsLocal extends FakeFs {
|
||||
syncConfigDir: boolean,
|
||||
configDir: string,
|
||||
pluginID: string,
|
||||
profiler: Profiler,
|
||||
profiler: Profiler | undefined,
|
||||
deleteToWhere: "obsidian" | "system"
|
||||
) {
|
||||
super();
|
||||
@@ -34,12 +34,12 @@ export class FakeFsLocal extends FakeFs {
|
||||
}
|
||||
|
||||
async walk(): Promise<Entity[]> {
|
||||
this.profiler.addIndent();
|
||||
this.profiler.insert("enter walk for local");
|
||||
this.profiler?.addIndent();
|
||||
this.profiler?.insert("enter walk for local");
|
||||
const local: Entity[] = [];
|
||||
|
||||
const localTAbstractFiles = this.vault.getAllLoadedFiles();
|
||||
this.profiler.insert("finish getting walk for local");
|
||||
this.profiler?.insert("finish getting walk for local");
|
||||
for (const entry of localTAbstractFiles) {
|
||||
let r: Entity | undefined = undefined;
|
||||
let key = entry.path;
|
||||
@@ -83,16 +83,16 @@ export class FakeFsLocal extends FakeFs {
|
||||
if (r.keyRaw.startsWith(DEFAULT_DEBUG_FOLDER)) {
|
||||
// skip listing the debug folder,
|
||||
// which should always not involved in sync
|
||||
continue;
|
||||
// continue;
|
||||
} else {
|
||||
local.push(r);
|
||||
}
|
||||
}
|
||||
|
||||
this.profiler.insert("finish transforming walk for local");
|
||||
this.profiler?.insert("finish transforming walk for local");
|
||||
|
||||
if (this.syncConfigDir) {
|
||||
this.profiler.insert("into syncConfigDir");
|
||||
this.profiler?.insert("into syncConfigDir");
|
||||
const syncFiles = await listFilesInObsFolder(
|
||||
this.configDir,
|
||||
this.vault,
|
||||
@@ -101,14 +101,18 @@ export class FakeFsLocal extends FakeFs {
|
||||
for (const f of syncFiles) {
|
||||
local.push(f);
|
||||
}
|
||||
this.profiler.insert("finish syncConfigDir");
|
||||
this.profiler?.insert("finish syncConfigDir");
|
||||
}
|
||||
|
||||
this.profiler.insert("finish walk for local");
|
||||
this.profiler.removeIndent();
|
||||
this.profiler?.insert("finish walk for local");
|
||||
this.profiler?.removeIndent();
|
||||
return local;
|
||||
}
|
||||
|
||||
async walkPartial(): Promise<Entity[]> {
|
||||
return await this.walk();
|
||||
}
|
||||
|
||||
async stat(key: string): Promise<Entity> {
|
||||
const statRes = await statFix(this.vault, key);
|
||||
if (statRes === undefined || statRes === null) {
|
||||
@@ -120,6 +124,8 @@ export class FakeFsLocal extends FakeFs {
|
||||
keyRaw: isFolder ? `${key}/` : key,
|
||||
mtimeCli: statRes.mtime,
|
||||
mtimeSvr: statRes.mtime,
|
||||
mtimeCliFmt: unixTimeToStr(statRes.mtime),
|
||||
mtimeSvrFmt: unixTimeToStr(statRes.mtime),
|
||||
size: statRes.size, // local always unencrypted
|
||||
sizeRaw: statRes.size,
|
||||
};
|
||||
@@ -168,4 +174,8 @@ export class FakeFsLocal extends FakeFs {
|
||||
async revokeAuth(): Promise<any> {
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
|
||||
allowEmptyFile(): boolean {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
+9
-1
@@ -1,4 +1,4 @@
|
||||
import { Entity } from "./baseTypes";
|
||||
import type { Entity } from "./baseTypes";
|
||||
import { FakeFs } from "./fsAll";
|
||||
|
||||
export class FakeFsMock extends FakeFs {
|
||||
@@ -13,6 +13,10 @@ export class FakeFsMock extends FakeFs {
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
|
||||
async walkPartial(): Promise<Entity[]> {
|
||||
return await this.walk();
|
||||
}
|
||||
|
||||
async stat(key: string): Promise<Entity> {
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
@@ -49,4 +53,8 @@ export class FakeFsMock extends FakeFs {
|
||||
async revokeAuth(): Promise<any> {
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
|
||||
allowEmptyFile(): boolean {
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
}
|
||||
|
||||
+56
-8
@@ -1,19 +1,19 @@
|
||||
import { CryptoProvider, PublicClientApplication } from "@azure/msal-node";
|
||||
import type { AuthenticationProvider } from "@microsoft/microsoft-graph-client";
|
||||
import type {
|
||||
DriveItem,
|
||||
FileSystemInfo,
|
||||
UploadSession,
|
||||
User,
|
||||
} from "@microsoft/microsoft-graph-types";
|
||||
import { CryptoProvider, PublicClientApplication } from "@azure/msal-node";
|
||||
import { AuthenticationProvider } from "@microsoft/microsoft-graph-client";
|
||||
import cloneDeep from "lodash/cloneDeep";
|
||||
import { request, requestUrl } from "obsidian";
|
||||
import {
|
||||
COMMAND_CALLBACK_ONEDRIVE,
|
||||
DEFAULT_CONTENT_TYPE,
|
||||
Entity,
|
||||
type Entity,
|
||||
OAUTH2_FORCE_EXPIRE_MILLISECONDS,
|
||||
OnedriveConfig,
|
||||
type OnedriveConfig,
|
||||
} from "./baseTypes";
|
||||
import { VALID_REQURL } from "./baseTypesObs";
|
||||
import { FakeFs } from "./fsAll";
|
||||
@@ -32,6 +32,7 @@ export const DEFAULT_ONEDRIVE_CONFIG: OnedriveConfig = {
|
||||
deltaLink: "",
|
||||
username: "",
|
||||
credentialsShouldBeDeletedAtTime: 0,
|
||||
emptyFile: "skip",
|
||||
};
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
@@ -344,6 +345,7 @@ const fromDriveItemToEntity = (x: DriveItem, remoteBaseDir: string): Entity => {
|
||||
mtimeCli: mtimeCli,
|
||||
size: isFolder ? 0 : x.size!,
|
||||
sizeRaw: isFolder ? 0 : x.size!,
|
||||
synthesizedFile: false,
|
||||
// hash: ?? // TODO
|
||||
};
|
||||
};
|
||||
@@ -567,6 +569,7 @@ export class FakeFsOnedrive extends FakeFs {
|
||||
// TODO:
|
||||
// 20220401: On Android, requestUrl has issue that text becomes base64.
|
||||
// Use fetch everywhere instead!
|
||||
// biome-ignore lint/correctness/noConstantCondition: hard code
|
||||
if (false /*VALID_REQURL*/) {
|
||||
const res = await requestUrl({
|
||||
url: theUrl,
|
||||
@@ -617,6 +620,7 @@ export class FakeFsOnedrive extends FakeFs {
|
||||
// TODO:
|
||||
// 20220401: On Android, requestUrl has issue that text becomes base64.
|
||||
// Use fetch everywhere instead!
|
||||
// biome-ignore lint/correctness/noConstantCondition: hard code
|
||||
if (false /*VALID_REQURL*/) {
|
||||
const res = await requestUrl({
|
||||
url: theUrl,
|
||||
@@ -658,7 +662,7 @@ export class FakeFsOnedrive extends FakeFs {
|
||||
let res = await this._getJson(
|
||||
`/drive/special/approot:/${this.remoteBaseDir}:/delta`
|
||||
);
|
||||
let driveItems = res.value as DriveItem[];
|
||||
const driveItems = res.value as DriveItem[];
|
||||
// console.debug(driveItems);
|
||||
|
||||
while (NEXT_LINK_KEY in res) {
|
||||
@@ -680,6 +684,31 @@ export class FakeFsOnedrive extends FakeFs {
|
||||
return unifiedContents;
|
||||
}
|
||||
|
||||
async walkPartial(): Promise<Entity[]> {
|
||||
await this._init();
|
||||
|
||||
const DELTA_LINK_KEY = "@odata.deltaLink";
|
||||
|
||||
const res = await this._getJson(
|
||||
`/drive/special/approot:/${this.remoteBaseDir}:/delta`
|
||||
);
|
||||
const driveItems = res.value as DriveItem[];
|
||||
// console.debug(driveItems);
|
||||
|
||||
// lastly we should have delta link?
|
||||
if (DELTA_LINK_KEY in res) {
|
||||
this.onedriveConfig.deltaLink = res[DELTA_LINK_KEY];
|
||||
await this.saveUpdatedConfigFunc();
|
||||
}
|
||||
|
||||
// unify everything to Entity
|
||||
const unifiedContents = driveItems
|
||||
.map((x) => fromDriveItemToEntity(x, this.remoteBaseDir))
|
||||
.filter((x) => x.key !== "/");
|
||||
|
||||
return unifiedContents;
|
||||
}
|
||||
|
||||
async stat(key: string): Promise<Entity> {
|
||||
await this._init();
|
||||
return await this._statFromRoot(getOnedrivePath(key, this.remoteBaseDir));
|
||||
@@ -719,7 +748,7 @@ export class FakeFsOnedrive extends FakeFs {
|
||||
} else {
|
||||
// https://stackoverflow.com/questions/56479865/creating-nested-folders-in-one-go-onedrive-api
|
||||
// use PATCH to create folder recursively!!!
|
||||
let playload: any = {
|
||||
const playload: any = {
|
||||
folder: {},
|
||||
"@microsoft.graph.conflictBehavior": "replace",
|
||||
};
|
||||
@@ -758,7 +787,8 @@ export class FakeFsOnedrive extends FakeFs {
|
||||
content,
|
||||
mtime,
|
||||
ctime,
|
||||
key
|
||||
key,
|
||||
this.onedriveConfig.emptyFile
|
||||
);
|
||||
}
|
||||
|
||||
@@ -767,12 +797,26 @@ export class FakeFsOnedrive extends FakeFs {
|
||||
content: ArrayBuffer,
|
||||
mtime: number,
|
||||
ctime: number,
|
||||
origKey: string
|
||||
origKey: string,
|
||||
emptyFile: "skip" | "error"
|
||||
): Promise<Entity> {
|
||||
if (content.byteLength === 0) {
|
||||
if (emptyFile === "error") {
|
||||
throw Error(
|
||||
`${origKey}: Empty file is not allowed in OneDrive, and please write something in it.`
|
||||
);
|
||||
} else {
|
||||
return {
|
||||
key: origKey,
|
||||
keyRaw: origKey,
|
||||
mtimeSvr: mtime,
|
||||
mtimeCli: mtime,
|
||||
size: 0,
|
||||
sizeRaw: 0,
|
||||
synthesizedFile: true,
|
||||
// hash: ?? // TODO
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
const ctimeStr = new Date(ctime).toISOString();
|
||||
@@ -926,4 +970,8 @@ export class FakeFsOnedrive extends FakeFs {
|
||||
async getRevokeAddr() {
|
||||
return "https://account.live.com/consent/Manage";
|
||||
}
|
||||
|
||||
allowEmptyFile(): boolean {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
+53
-25
@@ -1,36 +1,37 @@
|
||||
import type { _Object, PutObjectCommandInput } from "@aws-sdk/client-s3";
|
||||
import { Buffer } from "buffer";
|
||||
import * as path from "path";
|
||||
import { Readable } from "stream";
|
||||
import type { PutObjectCommandInput, _Object } from "@aws-sdk/client-s3";
|
||||
import {
|
||||
DeleteObjectCommand,
|
||||
GetObjectCommand,
|
||||
HeadObjectCommand,
|
||||
HeadObjectCommandOutput,
|
||||
type HeadObjectCommandOutput,
|
||||
ListObjectsV2Command,
|
||||
ListObjectsV2CommandInput,
|
||||
type ListObjectsV2CommandInput,
|
||||
PutObjectCommand,
|
||||
S3Client,
|
||||
} from "@aws-sdk/client-s3";
|
||||
import { Upload } from "@aws-sdk/lib-storage";
|
||||
import { HttpRequest, HttpResponse } from "@smithy/protocol-http";
|
||||
import type { HttpHandlerOptions } from "@aws-sdk/types";
|
||||
import {
|
||||
FetchHttpHandler,
|
||||
FetchHttpHandlerOptions,
|
||||
type FetchHttpHandlerOptions,
|
||||
} from "@smithy/fetch-http-handler";
|
||||
// @ts-ignore
|
||||
import { requestTimeout } from "@smithy/fetch-http-handler/dist-es/request-timeout";
|
||||
import { type HttpRequest, HttpResponse } from "@smithy/protocol-http";
|
||||
import { buildQueryString } from "@smithy/querystring-builder";
|
||||
import { HttpHandlerOptions } from "@aws-sdk/types";
|
||||
import { Buffer } from "buffer";
|
||||
import * as mime from "mime-types";
|
||||
import { Platform, requestUrl, RequestUrlParam } from "obsidian";
|
||||
import { Readable } from "stream";
|
||||
import * as path from "path";
|
||||
// biome-ignore lint/suspicious/noShadowRestrictedNames: <explanation>
|
||||
import AggregateError from "aggregate-error";
|
||||
import { DEFAULT_CONTENT_TYPE, S3Config } from "./baseTypes";
|
||||
import * as mime from "mime-types";
|
||||
import { Platform, type RequestUrlParam, requestUrl } from "obsidian";
|
||||
import PQueue from "p-queue";
|
||||
import { DEFAULT_CONTENT_TYPE, type S3Config } from "./baseTypes";
|
||||
import { VALID_REQURL } from "./baseTypesObs";
|
||||
import { bufferToArrayBuffer, getFolderLevels } from "./misc";
|
||||
import PQueue from "p-queue";
|
||||
|
||||
import { Entity } from "./baseTypes";
|
||||
import type { Entity } from "./baseTypes";
|
||||
import { FakeFs } from "./fsAll";
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
@@ -340,15 +341,16 @@ const fromS3ObjectToEntity = (
|
||||
const fromS3HeadObjectToEntity = (
|
||||
fileOrFolderPathWithRemotePrefix: string,
|
||||
x: HeadObjectCommandOutput,
|
||||
remotePrefix: string
|
||||
remotePrefix: string,
|
||||
useAccurateMTime: boolean
|
||||
) => {
|
||||
// console.debug(`fromS3HeadObjectToEntity: ${fileOrFolderPathWithRemotePrefix}: ${JSON.stringify(x,null,2)}`);
|
||||
// S3 officially only supports seconds precision!!!!!
|
||||
const mtimeSvr = Math.floor(x.LastModified!.valueOf() / 1000.0) * 1000;
|
||||
let mtimeCli = mtimeSvr;
|
||||
if (x.Metadata !== undefined) {
|
||||
if (useAccurateMTime && x.Metadata !== undefined) {
|
||||
const m2 = Math.floor(
|
||||
parseFloat(x.Metadata.mtime || x.Metadata.MTime || "0")
|
||||
Number.parseFloat(x.Metadata.mtime || x.Metadata.MTime || "0")
|
||||
);
|
||||
if (m2 !== 0) {
|
||||
// to be compatible with RClone, we read and store the time in seconds in new version!
|
||||
@@ -397,9 +399,16 @@ export class FakeFsS3 extends FakeFs {
|
||||
}
|
||||
|
||||
async walk(): Promise<Entity[]> {
|
||||
const res = (await this._walkFromRoot(this.s3Config.remotePrefix)).filter(
|
||||
(x) => x.key !== "" && x.key !== "/"
|
||||
);
|
||||
const res = (
|
||||
await this._walkFromRoot(this.s3Config.remotePrefix, false)
|
||||
).filter((x) => x.key !== "" && x.key !== "/");
|
||||
return res;
|
||||
}
|
||||
|
||||
async walkPartial(): Promise<Entity[]> {
|
||||
const res = (
|
||||
await this._walkFromRoot(this.s3Config.remotePrefix, true)
|
||||
).filter((x) => x.key !== "" && x.key !== "/");
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -407,19 +416,23 @@ export class FakeFsS3 extends FakeFs {
|
||||
* the input key contains basedir (prefix),
|
||||
* but the result doesn't contain it.
|
||||
*/
|
||||
async _walkFromRoot(prefixOfRawKeys: string | undefined) {
|
||||
async _walkFromRoot(prefixOfRawKeys: string | undefined, partial: boolean) {
|
||||
const confCmd = {
|
||||
Bucket: this.s3Config.s3BucketName,
|
||||
} as ListObjectsV2CommandInput;
|
||||
if (prefixOfRawKeys !== undefined && prefixOfRawKeys !== "") {
|
||||
confCmd.Prefix = prefixOfRawKeys;
|
||||
}
|
||||
if (partial) {
|
||||
confCmd.MaxKeys = 10; // no need to list more!
|
||||
}
|
||||
|
||||
const contents = [] as _Object[];
|
||||
const mtimeRecords: Record<string, number> = {};
|
||||
const ctimeRecords: Record<string, number> = {};
|
||||
const partsConcurrency = partial ? 1 : this.s3Config.partsConcurrency;
|
||||
const queueHead = new PQueue({
|
||||
concurrency: this.s3Config.partsConcurrency,
|
||||
concurrency: partsConcurrency,
|
||||
autoStart: true,
|
||||
});
|
||||
queueHead.on("error", (error) => {
|
||||
@@ -457,12 +470,12 @@ export class FakeFsS3 extends FakeFs {
|
||||
// pass
|
||||
} else {
|
||||
mtimeRecords[content.Key!] = Math.floor(
|
||||
parseFloat(
|
||||
Number.parseFloat(
|
||||
rspHead.Metadata.mtime || rspHead.Metadata.MTime || "0"
|
||||
)
|
||||
);
|
||||
ctimeRecords[content.Key!] = Math.floor(
|
||||
parseFloat(
|
||||
Number.parseFloat(
|
||||
rspHead.Metadata.ctime || rspHead.Metadata.CTime || "0"
|
||||
)
|
||||
);
|
||||
@@ -471,6 +484,11 @@ export class FakeFsS3 extends FakeFs {
|
||||
}
|
||||
}
|
||||
|
||||
if (partial) {
|
||||
// do not loop over
|
||||
isTruncated = false;
|
||||
} else {
|
||||
// loop over
|
||||
isTruncated = rsp.IsTruncated ?? false;
|
||||
confCmd.ContinuationToken = rsp.NextContinuationToken;
|
||||
if (
|
||||
@@ -480,6 +498,7 @@ export class FakeFsS3 extends FakeFs {
|
||||
) {
|
||||
throw Error("isTruncated is true but no continuationToken provided");
|
||||
}
|
||||
}
|
||||
} while (isTruncated);
|
||||
|
||||
// wait for any head requests
|
||||
@@ -561,7 +580,12 @@ export class FakeFsS3 extends FakeFs {
|
||||
})
|
||||
);
|
||||
|
||||
return fromS3HeadObjectToEntity(key, res, this.s3Config.remotePrefix ?? "");
|
||||
return fromS3HeadObjectToEntity(
|
||||
key,
|
||||
res,
|
||||
this.s3Config.remotePrefix ?? "",
|
||||
this.s3Config.useAccurateMTime ?? false
|
||||
);
|
||||
}
|
||||
|
||||
async mkdir(key: string, mtime?: number, ctime?: number): Promise<Entity> {
|
||||
@@ -810,4 +834,8 @@ export class FakeFsS3 extends FakeFs {
|
||||
async revokeAuth() {
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
|
||||
allowEmptyFile(): boolean {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
+390
-35
@@ -1,21 +1,23 @@
|
||||
import { getReasonPhrase } from "http-status-codes/build/cjs/utils-functions";
|
||||
import { Buffer } from "buffer";
|
||||
import cloneDeep from "lodash/cloneDeep";
|
||||
import { Queue } from "@fyears/tsqueue";
|
||||
import { getReasonPhrase } from "http-status-codes/build/cjs/utils-functions";
|
||||
import chunk from "lodash/chunk";
|
||||
import cloneDeep from "lodash/cloneDeep";
|
||||
import flatten from "lodash/flatten";
|
||||
import { Platform, requestUrl } from "obsidian";
|
||||
import { FakeFs } from "./fsAll";
|
||||
import { bufferToArrayBuffer } from "./misc";
|
||||
import { Entity, WebdavConfig } from "./baseTypes";
|
||||
import { VALID_REQURL } from "./baseTypesObs";
|
||||
import isString from "lodash/isString";
|
||||
import { nanoid } from "nanoid";
|
||||
import { Platform, type RequestUrlParam, requestUrl } from "obsidian";
|
||||
import type {
|
||||
FileStat,
|
||||
WebDAVClient,
|
||||
RequestOptionsWithState,
|
||||
WebDAVClient,
|
||||
// Response,
|
||||
// ResponseDataDetailed,
|
||||
} from "webdav";
|
||||
import type { Entity, WebdavConfig } from "./baseTypes";
|
||||
import { VALID_REQURL } from "./baseTypesObs";
|
||||
import { FakeFs } from "./fsAll";
|
||||
import { bufferToArrayBuffer, delay, splitFileSizeToChunkRanges } from "./misc";
|
||||
|
||||
/**
|
||||
* https://stackoverflow.com/questions/32850898/how-to-check-if-a-string-has-any-non-iso-8859-1-characters-with-javascript
|
||||
@@ -55,20 +57,35 @@ if (VALID_REQURL) {
|
||||
retractedHeaders["authorization"] = "<retracted>";
|
||||
}
|
||||
|
||||
console.debug(`before request:`);
|
||||
console.debug(`url: ${options.url}`);
|
||||
console.debug(`method: ${options.method}`);
|
||||
console.debug(`headers: ${JSON.stringify(retractedHeaders, null, 2)}`);
|
||||
console.debug(`reqContentType: ${reqContentType}`);
|
||||
// console.debug(`before request:`);
|
||||
// console.debug(`url: ${options.url}`);
|
||||
// console.debug(`method: ${options.method}`);
|
||||
// console.debug(`headers: ${JSON.stringify(retractedHeaders, null, 2)}`);
|
||||
// console.debug(`reqContentType: ${reqContentType}`);
|
||||
|
||||
let r = await requestUrl({
|
||||
const p: RequestUrlParam = {
|
||||
url: options.url,
|
||||
method: options.method,
|
||||
body: options.data as string | ArrayBuffer,
|
||||
// body: options.data as string | ArrayBuffer,
|
||||
headers: transformedHeaders,
|
||||
contentType: reqContentType,
|
||||
throw: false,
|
||||
});
|
||||
};
|
||||
if (
|
||||
options.data === undefined ||
|
||||
options.data === null ||
|
||||
isString(options.data)
|
||||
) {
|
||||
p.body = options.data;
|
||||
} else {
|
||||
if (typeof (options.data as any).transfer === "function") {
|
||||
p.body = (options.data as any).transfer();
|
||||
} else {
|
||||
p.body = options.data as ArrayBuffer;
|
||||
}
|
||||
}
|
||||
|
||||
let r = await requestUrl(p);
|
||||
|
||||
if (
|
||||
r.status === 401 &&
|
||||
@@ -82,20 +99,14 @@ if (VALID_REQURL) {
|
||||
// if a folder doesn't exist without slash, the servers return 401 instead of 404
|
||||
// here is a dirty hack that works
|
||||
console.debug(`so we have 401, try appending request url with slash`);
|
||||
r = await requestUrl({
|
||||
url: `${options.url}/`,
|
||||
method: options.method,
|
||||
body: options.data as string | ArrayBuffer,
|
||||
headers: transformedHeaders,
|
||||
contentType: reqContentType,
|
||||
throw: false,
|
||||
});
|
||||
p.url = `${options.url}/`;
|
||||
r = await requestUrl(p);
|
||||
}
|
||||
|
||||
console.debug(`after request:`);
|
||||
// console.debug(`after request:`);
|
||||
const rspHeaders = objKeyToLower({ ...r.headers });
|
||||
console.debug(`rspHeaders: ${JSON.stringify(rspHeaders, null, 2)}`);
|
||||
for (let key in rspHeaders) {
|
||||
// console.debug(`rspHeaders: ${JSON.stringify(rspHeaders, null, 2)}`);
|
||||
for (const key in rspHeaders) {
|
||||
if (rspHeaders.hasOwnProperty(key)) {
|
||||
// avoid the error:
|
||||
// Failed to read the 'headers' property from 'ResponseInit': String contains non ISO-8859-1 code point.
|
||||
@@ -111,7 +122,7 @@ if (VALID_REQURL) {
|
||||
// }
|
||||
// }
|
||||
if (!onlyAscii(rspHeaders[key])) {
|
||||
console.debug(`rspHeaders[key] needs encode: ${key}`);
|
||||
// console.debug(`rspHeaders[key] needs encode: ${key}`);
|
||||
rspHeaders[key] = encodeURIComponent(rspHeaders[key]);
|
||||
}
|
||||
}
|
||||
@@ -119,7 +130,7 @@ if (VALID_REQURL) {
|
||||
|
||||
let r2: Response | undefined = undefined;
|
||||
const statusText = getReasonPhrase(r.status);
|
||||
console.debug(`statusText: ${statusText}`);
|
||||
// console.debug(`statusText: ${statusText}`);
|
||||
if ([101, 103, 204, 205, 304].includes(r.status)) {
|
||||
// A null body status is a status that is 101, 103, 204, 205, or 304.
|
||||
// https://fetch.spec.whatwg.org/#statuses
|
||||
@@ -143,6 +154,7 @@ if (VALID_REQURL) {
|
||||
}
|
||||
|
||||
// @ts-ignore
|
||||
// biome-ignore lint: we want to ts-ignore the next line
|
||||
import { AuthType, BufferLike, createClient } from "webdav/dist/web/index.js";
|
||||
|
||||
export const DEFAULT_WEBDAV_CONFIG = {
|
||||
@@ -202,6 +214,14 @@ const fromWebdavItemToEntity = (x: FileStat, remoteBaseDir: string): Entity => {
|
||||
};
|
||||
};
|
||||
|
||||
const tryEncodeURI = (x: string) => {
|
||||
if (x.includes("%")) {
|
||||
// likely encoded before!
|
||||
return x;
|
||||
}
|
||||
return encodeURI(x);
|
||||
};
|
||||
|
||||
export class FakeFsWebdav extends FakeFs {
|
||||
kind: "webdav";
|
||||
|
||||
@@ -211,6 +231,10 @@ export class FakeFsWebdav extends FakeFs {
|
||||
vaultFolderExists: boolean;
|
||||
saveUpdatedConfigFunc: () => Promise<any>;
|
||||
|
||||
supportNativePartial: boolean;
|
||||
isNextcloud: boolean;
|
||||
nextcloudUploadServerAddress: string;
|
||||
|
||||
constructor(
|
||||
webdavConfig: WebdavConfig,
|
||||
vaultName: string,
|
||||
@@ -219,10 +243,14 @@ export class FakeFsWebdav extends FakeFs {
|
||||
super();
|
||||
this.kind = "webdav";
|
||||
this.webdavConfig = cloneDeep(webdavConfig);
|
||||
this.webdavConfig.address = encodeURI(this.webdavConfig.address);
|
||||
this.webdavConfig.address = tryEncodeURI(this.webdavConfig.address);
|
||||
this.remoteBaseDir = this.webdavConfig.remoteBaseDir || vaultName || "";
|
||||
this.vaultFolderExists = false;
|
||||
this.saveUpdatedConfigFunc = saveUpdatedConfigFunc;
|
||||
|
||||
this.supportNativePartial = false;
|
||||
this.isNextcloud = false;
|
||||
this.nextcloudUploadServerAddress = "";
|
||||
}
|
||||
|
||||
async _init() {
|
||||
@@ -292,6 +320,72 @@ export class FakeFsWebdav extends FakeFs {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
await this._checkPartialSupport();
|
||||
}
|
||||
|
||||
_getnextcloudUploadServerAddress = () => {
|
||||
const s = this.webdavConfig.address.split("/");
|
||||
if (
|
||||
s.length > 3 &&
|
||||
s[s.length - 3] === "dav" &&
|
||||
s[s.length - 2] === "files" &&
|
||||
s[s.length - 1] !== ""
|
||||
) {
|
||||
s[s.length - 2] = "uploads";
|
||||
return s.join("/");
|
||||
}
|
||||
throw Error(`cannot construct upload address for ${s}`);
|
||||
};
|
||||
|
||||
async _checkPartialSupport() {
|
||||
const compliance = await this.client.getDAVCompliance(
|
||||
`/${this.remoteBaseDir}/`
|
||||
);
|
||||
|
||||
for (const c of compliance.compliance) {
|
||||
// nextcloud AND with an account
|
||||
if (
|
||||
c.toLocaleLowerCase().includes("nextcloud") &&
|
||||
this.webdavConfig.username !== "" &&
|
||||
this.webdavConfig.password !== ""
|
||||
) {
|
||||
// the address is parsable
|
||||
const s = this.webdavConfig.address.split("/");
|
||||
if (
|
||||
s.length > 3 &&
|
||||
s[s.length - 3] === "dav" &&
|
||||
s[s.length - 2] === "files" &&
|
||||
s[s.length - 1] !== ""
|
||||
) {
|
||||
this.isNextcloud = true;
|
||||
this.nextcloudUploadServerAddress =
|
||||
this._getnextcloudUploadServerAddress();
|
||||
console.debug(
|
||||
`isNextcloud=${this.isNextcloud}, uploadFolder=${this.nextcloudUploadServerAddress}`
|
||||
);
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// taken from https://github.com/perry-mitchell/webdav-client/blob/master/source/operations/partialUpdateFileContents.ts
|
||||
// which is under MIT license
|
||||
if (
|
||||
(compliance.server.includes("Apache") &&
|
||||
compliance.compliance.includes(
|
||||
"<http://apache.org/dav/propset/fs/1>"
|
||||
)) ||
|
||||
compliance.compliance.includes("sabredav-partialupdate")
|
||||
) {
|
||||
this.supportNativePartial = true;
|
||||
console.debug(`supportNativePartial=true`);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
async walk(): Promise<Entity[]> {
|
||||
@@ -328,7 +422,20 @@ export class FakeFsWebdav extends FakeFs {
|
||||
// glob: "/**" /* avoid dot files by using glob */,
|
||||
}) as Promise<FileStat[]>;
|
||||
});
|
||||
const r2 = flatten(await Promise.all(r));
|
||||
const r3 = await Promise.all(r);
|
||||
for (const r4 of r3) {
|
||||
if (
|
||||
this.webdavConfig.address.includes("jianguoyun.com") &&
|
||||
r4.length >= 749
|
||||
) {
|
||||
// https://help.jianguoyun.com/?p=2064
|
||||
// no more than 750 per request
|
||||
throw Error(
|
||||
`出错:坚果云 api 有限制,文件列表加载不全。终止同步!`
|
||||
);
|
||||
}
|
||||
}
|
||||
const r2 = flatten(r3);
|
||||
subContents.push(...r2);
|
||||
}
|
||||
for (let i = 0; i < subContents.length; ++i) {
|
||||
@@ -356,6 +463,19 @@ export class FakeFsWebdav extends FakeFs {
|
||||
return contents.map((x) => fromWebdavItemToEntity(x, this.remoteBaseDir));
|
||||
}
|
||||
|
||||
async walkPartial(): Promise<Entity[]> {
|
||||
await this._init();
|
||||
|
||||
const contents = (await this.client.getDirectoryContents(
|
||||
`/${this.remoteBaseDir}`,
|
||||
{
|
||||
deep: false, // partial, no need to recursive here
|
||||
details: false /* no need for verbose details here */,
|
||||
}
|
||||
)) as FileStat[];
|
||||
return contents.map((x) => fromWebdavItemToEntity(x, this.remoteBaseDir));
|
||||
}
|
||||
|
||||
async stat(key: string): Promise<Entity> {
|
||||
await this._init();
|
||||
const fullPath = getWebdavPath(key, this.remoteBaseDir);
|
||||
@@ -383,8 +503,10 @@ export class FakeFsWebdav extends FakeFs {
|
||||
mtime?: number,
|
||||
ctime?: number
|
||||
): Promise<Entity> {
|
||||
// the sync algorithm should do recursive manually already.
|
||||
// if we set recursive: true here, Digest auth will return some error inside the PROPFIND
|
||||
await this.client.createDirectory(key, {
|
||||
recursive: true,
|
||||
recursive: false,
|
||||
});
|
||||
return await this._statFromRoot(key);
|
||||
}
|
||||
@@ -400,22 +522,251 @@ export class FakeFsWebdav extends FakeFs {
|
||||
}
|
||||
await this._init();
|
||||
const uploadFile = getWebdavPath(key, this.remoteBaseDir);
|
||||
return await this._writeFileFromRoot(uploadFile, content, mtime, ctime);
|
||||
return await this._writeFileFromRoot(
|
||||
uploadFile,
|
||||
content,
|
||||
mtime,
|
||||
ctime,
|
||||
key
|
||||
);
|
||||
}
|
||||
|
||||
async _writeFileFromRoot(
|
||||
key: string,
|
||||
content: ArrayBuffer,
|
||||
mtime: number,
|
||||
ctime: number
|
||||
ctime: number,
|
||||
origKey: string
|
||||
): Promise<Entity> {
|
||||
// less than 10 MB
|
||||
if (content.byteLength <= 10 * 1024 * 1024) {
|
||||
return await this._writeFileFromRootFull(
|
||||
key,
|
||||
content,
|
||||
mtime,
|
||||
ctime,
|
||||
origKey
|
||||
);
|
||||
}
|
||||
|
||||
// larger than 10 MB
|
||||
if (!this.isNextcloud && !this.supportNativePartial) {
|
||||
// give up and upload by whole, and directly return
|
||||
return await this._writeFileFromRootFull(
|
||||
key,
|
||||
content,
|
||||
mtime,
|
||||
ctime,
|
||||
origKey
|
||||
);
|
||||
}
|
||||
|
||||
// try to upload by chunks
|
||||
try {
|
||||
if (this.isNextcloud) {
|
||||
return await this._writeFileFromRootNextcloud(
|
||||
key,
|
||||
content,
|
||||
mtime,
|
||||
ctime,
|
||||
origKey
|
||||
);
|
||||
} else if (this.supportNativePartial) {
|
||||
return await this._writeFileFromRootNativePartial(
|
||||
key,
|
||||
content,
|
||||
mtime,
|
||||
ctime,
|
||||
origKey
|
||||
);
|
||||
}
|
||||
throw Error(`Error: partial upload / update method is not implemented??`);
|
||||
} catch (e) {
|
||||
console.error(
|
||||
`we fail to write file partially for nextcloud or apache or sabre/dav, stop!`
|
||||
);
|
||||
console.error(e);
|
||||
throw e;
|
||||
// this.isNextcloud = false;
|
||||
// this.supportNativePartial = false;
|
||||
// return await this._writeFileFromRootFull(
|
||||
// key,
|
||||
// content,
|
||||
// mtime,
|
||||
// ctime,
|
||||
// origKey
|
||||
// );
|
||||
}
|
||||
}
|
||||
|
||||
async _writeFileFromRootFull(
|
||||
key: string,
|
||||
content: ArrayBuffer,
|
||||
mtime: number,
|
||||
ctime: number,
|
||||
origKey: string
|
||||
): Promise<Entity> {
|
||||
// console.debug(`start _writeFileFromRootFull`);
|
||||
await this.client.putFileContents(key, content, {
|
||||
overwrite: true,
|
||||
onUploadProgress: (progress: any) => {
|
||||
console.info(`Uploaded ${progress.loaded} bytes of ${progress.total}`);
|
||||
},
|
||||
});
|
||||
return await this._statFromRoot(key);
|
||||
const k = await this._statFromRoot(key);
|
||||
// console.debug(`end _writeFileFromRootFull`);
|
||||
return k;
|
||||
}
|
||||
|
||||
/**
|
||||
* https://docs.nextcloud.com/server/latest/developer_manual/client_apis/WebDAV/chunking.html
|
||||
* @param key
|
||||
* @param content
|
||||
* @param mtime
|
||||
* @param ctime
|
||||
* @returns
|
||||
*/
|
||||
async _writeFileFromRootNextcloud(
|
||||
key: string,
|
||||
content: ArrayBuffer,
|
||||
mtime: number,
|
||||
ctime: number,
|
||||
origKey: string
|
||||
): Promise<Entity> {
|
||||
if (key.endsWith("/")) {
|
||||
throw Error(
|
||||
`key=${key} should not have tailing slash in _writeFileFromRootNextcloud`
|
||||
);
|
||||
}
|
||||
const destUrl = `${this.webdavConfig.address}/${encodeURI(key)}`;
|
||||
console.debug(`destUrl=${destUrl}`);
|
||||
|
||||
const getTmpFolder = (x: string) => {
|
||||
if (x.endsWith("/")) {
|
||||
throw Error(`file to upload by chunk should not ends with /`);
|
||||
}
|
||||
const y = x.split("/");
|
||||
const z = encodeURI(`${y[y.length - 1]}`);
|
||||
return z;
|
||||
};
|
||||
|
||||
const uploadServerAddress = this.nextcloudUploadServerAddress;
|
||||
console.debug(`uploadServerAddress=${uploadServerAddress}`);
|
||||
const tmpFolderName = getTmpFolder(key);
|
||||
console.debug(`tmpFolderName=${tmpFolderName}`);
|
||||
|
||||
const clientForUpload = createClient(uploadServerAddress, {
|
||||
username: this.webdavConfig.username,
|
||||
password: this.webdavConfig.password,
|
||||
headers: {
|
||||
"Cache-Control": "no-cache",
|
||||
},
|
||||
authType:
|
||||
this.webdavConfig.authType === "digest"
|
||||
? AuthType.Digest
|
||||
: AuthType.Password,
|
||||
});
|
||||
|
||||
// create folder
|
||||
await clientForUpload.createDirectory(tmpFolderName, {
|
||||
method: "MKCOL",
|
||||
headers: {
|
||||
Destination: destUrl,
|
||||
},
|
||||
});
|
||||
console.debug(`finish creating folder`);
|
||||
|
||||
// upload by chunks
|
||||
const sizePerChunk = 5 * 1024 * 1024; // 5 mb
|
||||
const chunkRanges = splitFileSizeToChunkRanges(
|
||||
content.byteLength,
|
||||
sizePerChunk
|
||||
);
|
||||
for (let i = 0; i < chunkRanges.length; ++i) {
|
||||
const { start, end } = chunkRanges[i];
|
||||
const tmpFileName = `${i + 1}`.padStart(5, "0");
|
||||
const tmpFileNameWithFolder = `${tmpFolderName}/${tmpFileName}`;
|
||||
console.debug(
|
||||
`start to upload chunk ${
|
||||
i + 1
|
||||
} to ${tmpFileNameWithFolder} with startInclusive=${start}, endInclusive=${end}`
|
||||
);
|
||||
await clientForUpload.putFileContents(
|
||||
tmpFileNameWithFolder,
|
||||
content.slice(start, end + 1),
|
||||
{
|
||||
headers: {
|
||||
Destination: destUrl,
|
||||
"OC-Total-Length": `${content.byteLength}`,
|
||||
},
|
||||
}
|
||||
);
|
||||
}
|
||||
console.debug(`finish upload all chunks`);
|
||||
|
||||
// move to assemble
|
||||
const fakeFileToMoveUrl = `${tmpFolderName}/.file`;
|
||||
console.debug(`fakeFileToMoveUrl=${fakeFileToMoveUrl}`);
|
||||
await clientForUpload.customRequest(fakeFileToMoveUrl, {
|
||||
method: "MOVE",
|
||||
headers: {
|
||||
Destination: destUrl,
|
||||
"OC-Total-Length": `${content.byteLength}`,
|
||||
},
|
||||
});
|
||||
console.debug(`finish moving file`);
|
||||
// TODO: setting X-OC-Mtime
|
||||
|
||||
// stat
|
||||
console.debug(`before stat origKey=${origKey}`);
|
||||
const k = await this.stat(origKey);
|
||||
console.debug(`after stat`);
|
||||
if (k.sizeRaw !== content.byteLength) {
|
||||
// we failed!
|
||||
this.isNextcloud = false; // give up next time!
|
||||
const err = `unable to upload file ${key} by chunks to nextcloud`;
|
||||
console.error(err);
|
||||
throw Error(err);
|
||||
}
|
||||
console.debug(`after stat, k=${JSON.stringify(k, null, 2)}`);
|
||||
|
||||
return k;
|
||||
}
|
||||
|
||||
async _writeFileFromRootNativePartial(
|
||||
key: string,
|
||||
content: ArrayBuffer,
|
||||
mtime: number,
|
||||
ctime: number,
|
||||
origKey: string
|
||||
): Promise<Entity> {
|
||||
// firstly upload a 0-byte data
|
||||
await this._writeFileFromRootFull(
|
||||
key,
|
||||
new ArrayBuffer(0),
|
||||
mtime,
|
||||
ctime,
|
||||
origKey
|
||||
);
|
||||
|
||||
// then "update" by chunks
|
||||
const sizePerChunk = 5 * 1024 * 1024; // 5 mb
|
||||
const chunkRanges = splitFileSizeToChunkRanges(
|
||||
content.byteLength,
|
||||
sizePerChunk
|
||||
);
|
||||
for (let i = 0; i < chunkRanges.length; ++i) {
|
||||
const { start, end } = chunkRanges[i];
|
||||
await this.client.partialUpdateFileContents(
|
||||
key,
|
||||
start,
|
||||
end,
|
||||
content.slice(start, end + 1)
|
||||
);
|
||||
}
|
||||
|
||||
// lastly return
|
||||
return await this.stat(origKey);
|
||||
}
|
||||
|
||||
async readFile(key: string): Promise<ArrayBuffer> {
|
||||
@@ -492,4 +843,8 @@ export class FakeFsWebdav extends FakeFs {
|
||||
async revokeAuth() {
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
|
||||
allowEmptyFile(): boolean {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
+33
-6
@@ -1,5 +1,9 @@
|
||||
import { cloneDeep, isEqual } from "lodash";
|
||||
import { DEFAULT_CONTENT_TYPE, Entity, WebdisConfig } from "./baseTypes";
|
||||
import { isEqual } from "lodash";
|
||||
import {
|
||||
DEFAULT_CONTENT_TYPE,
|
||||
type Entity,
|
||||
type WebdisConfig,
|
||||
} from "./baseTypes";
|
||||
import { FakeFs } from "./fsAll";
|
||||
|
||||
export const DEFAULT_WEBDIS_CONFIG: WebdisConfig = {
|
||||
@@ -129,6 +133,25 @@ export class FakeFsWebdis extends FakeFs {
|
||||
return res;
|
||||
}
|
||||
|
||||
async walkPartial(): Promise<Entity[]> {
|
||||
let cursor = "0";
|
||||
const res: Entity[] = [];
|
||||
const command = `SCAN/${cursor}/MATCH/rs:fs:v1:*:meta/COUNT/10`; // fewer keys
|
||||
const rsp = (await (await this._fetchCommand("GET", command)).json())[
|
||||
"SCAN"
|
||||
];
|
||||
// console.debug(rsp);
|
||||
cursor = rsp[0];
|
||||
for (const fullKeyWithMeta of rsp[1]) {
|
||||
const realKey = getOrigPath(fullKeyWithMeta, this.remoteBaseDir);
|
||||
res.push(await this.stat(realKey));
|
||||
}
|
||||
// no need to loop over cursor
|
||||
// console.debug(`walk res:`);
|
||||
// console.debug(res);
|
||||
return res;
|
||||
}
|
||||
|
||||
async stat(key: string): Promise<Entity> {
|
||||
const fullKey = getWebdisPath(key, this.remoteBaseDir);
|
||||
return await this._statFromRaw(fullKey);
|
||||
@@ -149,10 +172,10 @@ export class FakeFsWebdis extends FakeFs {
|
||||
return {
|
||||
key: realKey,
|
||||
keyRaw: realKey,
|
||||
mtimeCli: parseInt(rsp["mtime"]),
|
||||
mtimeSvr: parseInt(rsp["mtime"]),
|
||||
size: parseInt(rsp["size"]),
|
||||
sizeRaw: parseInt(rsp["size"]),
|
||||
mtimeCli: Number.parseInt(rsp["mtime"]),
|
||||
mtimeSvr: Number.parseInt(rsp["mtime"]),
|
||||
size: Number.parseInt(rsp["size"]),
|
||||
sizeRaw: Number.parseInt(rsp["size"]),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -235,4 +258,8 @@ export class FakeFsWebdis extends FakeFs {
|
||||
async revokeAuth(): Promise<any> {
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
|
||||
allowEmptyFile(): boolean {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
+5
-5
@@ -1,11 +1,11 @@
|
||||
import QRCode from "qrcode";
|
||||
import cloneDeep from "lodash/cloneDeep";
|
||||
import QRCode from "qrcode";
|
||||
|
||||
import {
|
||||
COMMAND_URI,
|
||||
UriParams,
|
||||
RemotelySavePluginSettings,
|
||||
QRExportType,
|
||||
type QRExportType,
|
||||
type RemotelySavePluginSettings,
|
||||
type UriParams,
|
||||
} from "./baseTypes";
|
||||
import { getShrinkedSettings } from "./fsOnedrive";
|
||||
|
||||
@@ -64,7 +64,7 @@ export const importQrCodeUri = (
|
||||
inputParams: any,
|
||||
currentVaultName: string
|
||||
): ProcessQrCodeResultType => {
|
||||
let params = inputParams as UriParams;
|
||||
const params = inputParams as UriParams;
|
||||
if (
|
||||
params.func === undefined ||
|
||||
params.func !== "settings" ||
|
||||
|
||||
+22
-9
@@ -11,7 +11,7 @@
|
||||
"syncrun_step1": "1/8 Remotely Save is preparing ({{serviceType}})",
|
||||
"syncrun_step2": "2/8 Starting to fetch remote meta data and check password.",
|
||||
"syncrun_passworderr": "Something goes wrong while checking password.",
|
||||
"syncrun_step3": "3/8 Startting to process remote data.",
|
||||
"syncrun_step3": "3/8 Starting to process remote data.",
|
||||
"syncrun_step4": "4/8 Starting to fetch local meta data.",
|
||||
"syncrun_step5": "5/8 Starting to fetch local prev sync data.",
|
||||
"syncrun_step6": "6/8 Starting to generate sync plan.",
|
||||
@@ -38,6 +38,7 @@
|
||||
"protocol_onedrive_connect_unknown": "Do not know how to deal with the callback: {{params}}",
|
||||
"command_startsync": "start sync",
|
||||
"command_drynrun": "start sync (dry run only)",
|
||||
"command_exportsyncplans_1_only_change": "export sync plans (latest 1) (change part)",
|
||||
"command_exportsyncplans_1": "export sync plans (latest 1)",
|
||||
"command_exportsyncplans_5": "export sync plans (latest 5)",
|
||||
"command_exportsyncplans_all": "export sync plans (all)",
|
||||
@@ -50,9 +51,10 @@
|
||||
"statusbar_time_days": "Synced {{time}} days ago",
|
||||
"statusbar_time_hours": "Synced {{time}} hours ago",
|
||||
"statusbar_time_minutes": "Synced {{time}} minutes ago",
|
||||
"statusbar_time_lessminute": "Synced less than a minute ago",
|
||||
"statusbar_time_lessminute": "Synced last minute ago",
|
||||
"statusbar_lastsync": "Synced {{time}} ago",
|
||||
"statusbar_syncing": "Syncing...",
|
||||
"statusbar_failed": "Last sync failed",
|
||||
"statusbar_now": "Synced just now",
|
||||
"statusbar_lastsync_label": "Last successful Sync on {{date}}",
|
||||
"statusbar_lastsync_never": "Never Synced",
|
||||
@@ -114,9 +116,9 @@
|
||||
"modal_sizesconflict_copynotice": "All the sizes conflicts info have been copied to the clipboard!",
|
||||
"settings_basic": "Basic Settings",
|
||||
"settings_password": "Encryption Password",
|
||||
"settings_password_desc": "Password for E2E encryption. Empty for no password. You need to click \"Confirm\". Attention: The password and other info are saved locally. After changing the password, you need to manually delete every original files in the remote, and re-sync (so that upload) the encrypted files again.",
|
||||
"settings_password_desc": "Password for E2E encryption. Empty for no password. You need to click \"Confirm\". Attention: The password and other info are saved locally. After changing the password, you need to manually delete all files from the remote location and re-sync to upload the encrypted files again.",
|
||||
"settings_encryptionmethod": "Encryption Method",
|
||||
"settings_encryptionmethod_desc": "Encryption method for E2E encryption. RClone Crypt format is recommended but it doesn't encrypt path structure. OpenSSL enc is the legacy format of this plugin. <b>Both are not affliated with official RClone and OpenSSL product or community.</b> Attention: After switching the method, you need to manually delete every original files in the remote and re-sync (so that upload) the encrypted files again. More info in the <a href='https://github.com/remotely-save/remotely-save/tree/master/docs/encryption'>online doc</a>.",
|
||||
"settings_encryptionmethod_desc": "Encryption method for E2E encryption. The RClone Crypt format is recommended, although it does not encrypt the path structure. OpenSSL enc is the legacy format of this plugin. <b>Both are not affliated with the official RClone and OpenSSL products or communities.</b> Attention: After switching encryption methods, you need to manually delete all original files from the remote location and re-sync to upload the encrypted files again. More info is available in the <a href='https://github.com/remotely-save/remotely-save/tree/master/docs/encryption'>online doc</a>.",
|
||||
"settings_encryptionmethod_rclone": "RClone Crypt (recommended)",
|
||||
"settings_encryptionmethod_openssl": "OpenSSL enc (legacy)",
|
||||
|
||||
@@ -128,7 +130,7 @@
|
||||
"settings_autorun_10min": "every 10 minutes",
|
||||
"settings_autorun_30min": "every 30 minutes",
|
||||
"settings_runoncestartup": "Run Once On Start Up Automatically",
|
||||
"settings_runoncestartup_desc": "This settings allows setting running ONCE on start up automatically. This will take effect on NEXT start up after changing. This setting, is different from \"schedule for auto run\" which starts syncing after EVERY interval.",
|
||||
"settings_runoncestartup_desc": "This setting causes the sync to run once automatically at startup. Changes will take effect on the NEXT startup. This setting is different from the \"schedule for auto run\" setting, which initiates syncing after every specified interval.",
|
||||
"settings_runoncestartup_notset": "(not set)",
|
||||
"settings_runoncestartup_1sec": "sync once after 1 second of start up",
|
||||
"settings_runoncestartup_10sec": "sync once after 10 seconds of start up",
|
||||
@@ -218,8 +220,12 @@
|
||||
"settings_onedrive_auth": "Auth",
|
||||
"settings_onedrive_auth_desc": "Auth.",
|
||||
"settings_onedrive_auth_button": "Auth",
|
||||
"settings_onedrive_connect_succ": "Great! We can connect to Onedrive!",
|
||||
"settings_onedrive_connect_fail": "We cannot connect to Onedrive.",
|
||||
"settings_onedrive_connect_succ": "Great! We can connect to OneDrive!",
|
||||
"settings_onedrive_connect_fail": "We cannot connect to OneDrive.",
|
||||
"settings_onedrive_emptyfile": "Empty File Handling",
|
||||
"settings_onedrive_emptyfile_desc": "OneDrive doesn't allow uploading empty file (even in its official website). Do you want to show up errors or silently skip the empty files?",
|
||||
"settings_onedrive_emptyfile_skip": "Skip",
|
||||
"settings_onedrive_emptyfile_error": "Error and abort",
|
||||
"settings_webdav": "Remote For Webdav",
|
||||
"settings_webdav_disclaimer1": "Disclaimer: The information is stored locally. Other malicious/harmful/faulty plugins may read the info. If you see any unintentional access to your webdav server, please immediately change the username and password.",
|
||||
"settings_webdav_cors_os": "Obsidian desktop>=0.13.25 or iOS>=1.1.1 or Android>=1.2.1 supports bypassing CORS locally. But you are using an old version, and you're suggested to upgrade Obsidian.",
|
||||
@@ -232,7 +238,7 @@
|
||||
"settings_webdav_password": "Password",
|
||||
"settings_webdav_password_desc": "Password. Attention: the password and other info are saved locally.",
|
||||
"settings_webdav_auth": "Auth Type",
|
||||
"settings_webdav_auth_desc": "If no password, this option would be ignored.",
|
||||
"settings_webdav_auth_desc": "If no password is provided, this option will be ignored.",
|
||||
"settings_webdav_depth": "Depth Header Sent To Servers",
|
||||
"settings_webdav_depth_desc": "Webdav servers should be configured to allow requests with header Depth being '1' or 'Infinity'. If you are not sure what's this, choose \"depth='1'\". If you are sure your server supports depth='infinity', please choose that to get way better performance.",
|
||||
"settings_webdav_depth_1": "only supports depth='1'",
|
||||
@@ -313,6 +319,7 @@
|
||||
"settings_viewconsolelog_desc": "On desktop, please press \"ctrl+shift+i\" or \"cmd+shift+i\" to view the log. On mobile, please install the third-party plugin <a href='https://obsidian.md/plugins?search=Logstravaganza'>Logstravaganza</a> to export the console log to a note.",
|
||||
"settings_syncplans": "Export Sync Plans",
|
||||
"settings_syncplans_desc": "Sync plans are created every time after you trigger sync and before the actual sync. Useful to know what would actually happen in those sync. Click the button to export sync plans.",
|
||||
"settings_syncplans_button_1_only_change": "Export latest 1 (change part)",
|
||||
"settings_syncplans_button_1": "Export latest 1",
|
||||
"settings_syncplans_button_5": "Export latest 5",
|
||||
"settings_syncplans_button_all": "Export All",
|
||||
@@ -329,6 +336,10 @@
|
||||
"settings_profiler_results_desc": "The plugin records the time cost of each steps. Here you can export them to know which step is slow.",
|
||||
"settings_profiler_results_notice": "Profiler results exported.",
|
||||
"settings_profiler_results_button_all": "Export All",
|
||||
"settings_profiler_enabledebugprint": "Enable Profiler Printing",
|
||||
"settings_profiler_enabledebugprint_desc": "Print profiler result in each insertion to console or not?",
|
||||
"settings_profiler_recordsize": "Enable Profiler Recording Size",
|
||||
"settings_profiler_recordsize_desc": "Let profiler record object sizes or not?",
|
||||
"settings_outputbasepathvaultid": "Output Vault Base Path And Randomly Assigned ID",
|
||||
"settings_outputbasepathvaultid_desc": "For debugging purposes.",
|
||||
"settings_outputbasepathvaultid_button": "Output",
|
||||
@@ -342,5 +353,7 @@
|
||||
"syncalgov3_checkbox_manual_backup": "I will backup my vault manually firstly.",
|
||||
"syncalgov3_checkbox_requiremultidevupdate": "I understand I need to update the plugin ACROSS ALL DEVICES to make them work properly.",
|
||||
"syncalgov3_button_agree": "Agree",
|
||||
"syncalgov3_button_disagree": "Do Not Agree"
|
||||
"syncalgov3_button_disagree": "Do Not Agree",
|
||||
|
||||
"menu_check_file_stat": "Check file stats"
|
||||
}
|
||||
|
||||
+10
-1
@@ -39,6 +39,7 @@
|
||||
"command_startsync": "开始同步(start sync)",
|
||||
"command_drynrun": "开始同步(空跑模式)(start sync (dry run only))",
|
||||
"command_exportsyncplans_json": "导出同步计划为 json 格式(export sync plans in json format)",
|
||||
"command_exportsyncplans_1_only_change": "导出同步计划(最近 1 次)(仅修改部分)(export sync plans (latest 1) (change part))",
|
||||
"command_exportsyncplans_1": "导出同步计划(最近 1 次)(export sync plans (latest 1))",
|
||||
"command_exportsyncplans_5": "导出同步计划(最近 5 次)(export sync plans (latest 5))",
|
||||
"command_exportsyncplans_all": "导出同步计划(所有)(export sync plans (all))",
|
||||
@@ -53,6 +54,7 @@
|
||||
"statusbar_time_lessminute": "一分钟之内同步",
|
||||
"statusbar_lastsync": "上一次同步于:{{time}}",
|
||||
"statusbar_syncing": "正在同步",
|
||||
"statusbar_failed": "上次同步失败了",
|
||||
"statusbar_now": "刚同步完",
|
||||
"statusbar_lastsync_label": "上一次同步于:{{date}}",
|
||||
"statusbar_lastsync_never": "没触发过同步",
|
||||
@@ -219,6 +221,10 @@
|
||||
"settings_onedrive_auth_button": "鉴权",
|
||||
"settings_onedrive_connect_succ": "很好!我们可连接上 OneDrive!",
|
||||
"settings_onedrive_connect_fail": "我们未能连接上 OneDrive。",
|
||||
"settings_onedrive_emptyfile": "空文件处理",
|
||||
"settings_onedrive_emptyfile_desc": "OneDrive 不允许上传空文件(即使官网也是不允许的)。那么你想跳过空文件还是返回错误?",
|
||||
"settings_onedrive_emptyfile_skip": "跳过",
|
||||
"settings_onedrive_emptyfile_error": "返回错误和中断",
|
||||
"settings_webdav": "Webdav 设置",
|
||||
"settings_webdav_disclaimer1": "声明:您所输入的信息存储于本地。其它有害的或者出错的插件,是有可能读取到这些信息的。如果您发现了 Webdav 服务器有不符合预期的访问,请立刻修改用户名和密码。",
|
||||
"settings_webdav_cors_os": "Obsidian 桌面版>=0.13.25 或 iOS>=1.1.1 或 Android>=1.2.1 支持跳过 CORS 设置。但您正在使用旧版,建议升级。",
|
||||
@@ -312,6 +318,7 @@
|
||||
"settings_viewconsolelog_desc": "电脑上,输入“ctrl+shift+i”或“cmd+shift+i”来查看终端输出。手机上,安装第三方插件 <a href='https://obsidian.md/plugins?search=Logstravaganza'>Logstravaganza</a> 来导出终端输出到一篇笔记上。",
|
||||
"settings_syncplans": "导出同步计划",
|
||||
"settings_syncplans_desc": "每次您启动同步,并在实际上传下载前,插件会生成同步计划。它可以使您知道每次同步发生了什么。点击按钮可以导出同步计划。",
|
||||
"settings_syncplans_button_1_only_change": "导出最近 1 次(仅修改部分)",
|
||||
"settings_syncplans_button_1": "导出最近 1 次",
|
||||
"settings_syncplans_button_5": "导出最近 5 次",
|
||||
"settings_syncplans_button_all": "导出所有",
|
||||
@@ -341,5 +348,7 @@
|
||||
"syncalgov3_checkbox_manual_backup": "我将会首先手动备份我的库(Vault)。",
|
||||
"syncalgov3_checkbox_requiremultidevupdate": "我理解,我需要在所有设备上都更新此插件使之正常运行。",
|
||||
"syncalgov3_button_agree": "同意",
|
||||
"syncalgov3_button_disagree": "不同意"
|
||||
"syncalgov3_button_disagree": "不同意",
|
||||
|
||||
"menu_check_file_stat": "查看文件属性"
|
||||
}
|
||||
|
||||
+10
-1
@@ -38,6 +38,7 @@
|
||||
"protocol_onedrive_connect_unknown": "不知道如何處理此 callback:{{params}}",
|
||||
"command_startsync": "開始同步(start sync)",
|
||||
"command_drynrun": "開始同步(空跑模式)(start sync (dry run only))",
|
||||
"command_exportsyncplans_1_only_change": "匯出同步計劃(最近 1 次)(僅修改部分)(export sync plans (latest 1) (change part))",
|
||||
"command_exportsyncplans_1": "匯出同步計劃(最近 1 次)(export sync plans (latest 1))",
|
||||
"command_exportsyncplans_5": "匯出同步計劃(最近 5 次)(export sync plans (latest 5))",
|
||||
"command_exportsyncplans_all": "匯出同步計劃(所有)(export sync plans (all))",
|
||||
@@ -52,6 +53,7 @@
|
||||
"statusbar_time_lessminute": "一分鐘之內同步",
|
||||
"statusbar_lastsync": "上一次同步於:{{time}}",
|
||||
"statusbar_syncing": "正在同步",
|
||||
"statusbar_failed": "上次同步失敗了",
|
||||
"statusbar_now": "剛同步完",
|
||||
"statusbar_lastsync_label": "上一次同步於:{{date}}",
|
||||
"statusbar_lastsync_never": "沒觸發過同步",
|
||||
@@ -218,6 +220,10 @@
|
||||
"settings_onedrive_auth_button": "鑑權",
|
||||
"settings_onedrive_connect_succ": "很好!我們可連線上 OneDrive!",
|
||||
"settings_onedrive_connect_fail": "我們未能連線上 OneDrive。",
|
||||
"settings_onedrive_emptyfile": "空檔案處理",
|
||||
"settings_onedrive_emptyfile_desc": "OneDrive 不允許上傳空檔案(即使官網也是不允許的)。那麼你想跳過空檔案還是返回錯誤?",
|
||||
"settings_onedrive_emptyfile_skip": "跳過",
|
||||
"settings_onedrive_emptyfile_error": "返回錯誤和中斷",
|
||||
"settings_webdav": "Webdav 設定",
|
||||
"settings_webdav_disclaimer1": "宣告:您所輸入的資訊儲存於本地。其它有害的或者出錯的外掛,是有可能讀取到這些資訊的。如果您發現了 Webdav 伺服器有不符合預期的訪問,請立刻修改使用者名稱和密碼。",
|
||||
"settings_webdav_cors_os": "Obsidian 桌面版>=0.13.25 或 iOS>=1.1.1 或 Android>=1.1.1 支援跳過 CORS 設定。但您正在使用舊版,建議升級。",
|
||||
@@ -311,6 +317,7 @@
|
||||
"settings_viewconsolelog_desc": "電腦上,輸入“ctrl+shift+i”或“cmd+shift+i”來檢視終端輸出。手機上,安裝第三方外掛 <a href='https://obsidian.md/plugins?search=Logstravaganza'>Logstravaganza</a> 來匯出終端輸出到一篇筆記上。",
|
||||
"settings_syncplans": "匯出同步計劃",
|
||||
"settings_syncplans_desc": "每次您啟動同步,並在實際上傳下載前,外掛會生成同步計劃。它可以使您知道每次同步發生了什麼。點選按鈕可以匯出同步計劃。",
|
||||
"settings_syncplans_button_1_only_change": "匯出最近 1 次(僅修改部分)",
|
||||
"settings_syncplans_button_1": "匯出最近 1 次",
|
||||
"settings_syncplans_button_5": "匯出最近 5 次",
|
||||
"settings_syncplans_button_all": "匯出所有",
|
||||
@@ -340,5 +347,7 @@
|
||||
"syncalgov3_checkbox_manual_backup": "我將會首先手動備份我的庫(Vault)。",
|
||||
"syncalgov3_checkbox_requiremultidevupdate": "我理解,我需要在所有裝置上都更新此外掛使之正常執行。",
|
||||
"syncalgov3_button_agree": "同意",
|
||||
"syncalgov3_button_disagree": "不同意"
|
||||
"syncalgov3_button_disagree": "不同意",
|
||||
|
||||
"menu_check_file_stat": "檢視檔案屬性"
|
||||
}
|
||||
|
||||
+37
-30
@@ -1,12 +1,14 @@
|
||||
import localforage from "localforage";
|
||||
import { extendPrototype } from "localforage-getitems";
|
||||
extendPrototype(localforage);
|
||||
import { extendPrototype as ep1 } from "localforage-getitems";
|
||||
import { extendPrototype as ep2 } from "localforage-removeitems";
|
||||
ep1(localforage);
|
||||
ep2(localforage);
|
||||
export type LocalForage = typeof localforage;
|
||||
import { nanoid } from "nanoid";
|
||||
|
||||
import type { Entity, MixedEntity, SUPPORTED_SERVICES_TYPE } from "./baseTypes";
|
||||
import type { SyncPlanType } from "./sync";
|
||||
import type { Entity, SUPPORTED_SERVICES_TYPE } from "./baseTypes";
|
||||
import { unixTimeToStr } from "./misc";
|
||||
import type { SyncPlanType } from "./sync";
|
||||
|
||||
const DB_VERSION_NUMBER_IN_HISTORY = [20211114, 20220108, 20220326, 20240220];
|
||||
export const DEFAULT_DB_VERSION_NUMBER: number = 20240220;
|
||||
@@ -307,12 +309,15 @@ export const clearFileHistoryOfEverythingByVault = async (
|
||||
db: InternalDBs,
|
||||
vaultRandomID: string
|
||||
) => {
|
||||
const keys = await db.fileHistoryTbl.keys();
|
||||
for (const key of keys) {
|
||||
if (key.startsWith(`${vaultRandomID}\t`)) {
|
||||
await db.fileHistoryTbl.removeItem(key);
|
||||
}
|
||||
}
|
||||
const keys = (await db.fileHistoryTbl.keys()).filter((x) =>
|
||||
x.startsWith(`${vaultRandomID}\t`)
|
||||
);
|
||||
await db.fileHistoryTbl.removeItems(keys);
|
||||
// for (const key of keys) {
|
||||
// if (key.startsWith(`${vaultRandomID}\t`)) {
|
||||
// await db.fileHistoryTbl.removeItem(key);
|
||||
// }
|
||||
// }
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -339,12 +344,15 @@ export const clearAllSyncMetaMappingByVault = async (
|
||||
db: InternalDBs,
|
||||
vaultRandomID: string
|
||||
) => {
|
||||
const keys = await db.syncMappingTbl.keys();
|
||||
for (const key of keys) {
|
||||
if (key.startsWith(`${vaultRandomID}\t`)) {
|
||||
await db.syncMappingTbl.removeItem(key);
|
||||
}
|
||||
}
|
||||
const keys = (await db.syncMappingTbl.keys()).filter((x) =>
|
||||
x.startsWith(`${vaultRandomID}\t`)
|
||||
);
|
||||
await db.syncMappingTbl.removeItems(keys);
|
||||
// for (const key of keys) {
|
||||
// if (key.startsWith(`${vaultRandomID}\t`)) {
|
||||
// await db.syncMappingTbl.removeItem(key);
|
||||
// }
|
||||
// }
|
||||
};
|
||||
|
||||
export const insertSyncPlanRecordByVault = async (
|
||||
@@ -400,7 +408,7 @@ export const clearExpiredSyncPlanRecords = async (db: InternalDBs) => {
|
||||
const expiredTs = currTs - MILLISECONDS_OLD;
|
||||
|
||||
let records = (await db.syncPlansTbl.keys()).map((key) => {
|
||||
const ts = parseInt(key.split("\t")[1]);
|
||||
const ts = Number.parseInt(key.split("\t")[1]);
|
||||
const expired = ts <= expiredTs;
|
||||
return {
|
||||
ts: ts,
|
||||
@@ -422,11 +430,12 @@ export const clearExpiredSyncPlanRecords = async (db: InternalDBs) => {
|
||||
});
|
||||
}
|
||||
|
||||
const ps = [] as Promise<void>[];
|
||||
keysToRemove.forEach((element) => {
|
||||
ps.push(db.syncPlansTbl.removeItem(element));
|
||||
});
|
||||
await Promise.all(ps);
|
||||
// const ps = [] as Promise<void>[];
|
||||
// keysToRemove.forEach((element) => {
|
||||
// ps.push(db.syncPlansTbl.removeItem(element));
|
||||
// });
|
||||
// await Promise.all(ps);
|
||||
await db.syncPlansTbl.removeItems(Array.from(keysToRemove));
|
||||
};
|
||||
|
||||
export const getAllPrevSyncRecordsByVaultAndProfile = async (
|
||||
@@ -475,12 +484,10 @@ export const clearAllPrevSyncRecordByVault = async (
|
||||
db: InternalDBs,
|
||||
vaultRandomID: string
|
||||
) => {
|
||||
const keys = await db.prevSyncRecordsTbl.keys();
|
||||
for (const key of keys) {
|
||||
if (key.startsWith(`${vaultRandomID}\t`)) {
|
||||
await db.prevSyncRecordsTbl.removeItem(key);
|
||||
}
|
||||
}
|
||||
const keys = (await db.prevSyncRecordsTbl.keys()).filter((x) =>
|
||||
x.startsWith(`${vaultRandomID}\t`)
|
||||
);
|
||||
await db.prevSyncRecordsTbl.removeItems(keys);
|
||||
};
|
||||
|
||||
export const clearAllLoggerOutputRecords = async (db: InternalDBs) => {
|
||||
@@ -542,7 +549,7 @@ export const insertProfilerResultByVault = async (
|
||||
// clear older one while writing
|
||||
const records = (await db.profilerResultsTbl.keys())
|
||||
.filter((x) => x.startsWith(`${vaultRandomID}\t`))
|
||||
.map((x) => parseInt(x.split("\t")[1]));
|
||||
.map((x) => Number.parseInt(x.split("\t")[1]));
|
||||
records.sort((a, b) => -(a - b)); // descending
|
||||
while (records.length > 5) {
|
||||
const ts = records.pop()!;
|
||||
@@ -559,7 +566,7 @@ export const readAllProfilerResultsByVault = async (
|
||||
if (key.startsWith(`${vaultRandomID}\t`)) {
|
||||
records.push({
|
||||
val: value as string,
|
||||
ts: parseInt(key.split("\t")[1]),
|
||||
ts: Number.parseInt(key.split("\t")[1]),
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
+134
-47
@@ -1,67 +1,69 @@
|
||||
import {
|
||||
Modal,
|
||||
Notice,
|
||||
Plugin,
|
||||
Setting,
|
||||
addIcon,
|
||||
setIcon,
|
||||
FileSystemAdapter,
|
||||
Platform,
|
||||
requireApiVersion,
|
||||
Events,
|
||||
} from "obsidian";
|
||||
import cloneDeep from "lodash/cloneDeep";
|
||||
import { createElement, RotateCcw, RefreshCcw, FileText } from "lucide";
|
||||
import { FileText, RefreshCcw, RotateCcw, createElement } from "lucide";
|
||||
import {
|
||||
Events,
|
||||
FileSystemAdapter,
|
||||
type Modal,
|
||||
Notice,
|
||||
Platform,
|
||||
Plugin,
|
||||
type Setting,
|
||||
TFolder,
|
||||
addIcon,
|
||||
requireApiVersion,
|
||||
setIcon,
|
||||
} from "obsidian";
|
||||
import type {
|
||||
RemotelySavePluginSettings,
|
||||
SyncTriggerSourceType,
|
||||
} from "./baseTypes";
|
||||
import {
|
||||
COMMAND_CALLBACK,
|
||||
COMMAND_CALLBACK_ONEDRIVE,
|
||||
COMMAND_CALLBACK_DROPBOX,
|
||||
COMMAND_CALLBACK_ONEDRIVE,
|
||||
COMMAND_URI,
|
||||
} from "./baseTypes";
|
||||
import { API_VER_ENSURE_REQURL_OK } from "./baseTypesObs";
|
||||
import { importQrCodeUri } from "./importExport";
|
||||
import {
|
||||
prepareDBs,
|
||||
InternalDBs,
|
||||
clearExpiredSyncPlanRecords,
|
||||
upsertPluginVersionByVault,
|
||||
clearAllLoggerOutputRecords,
|
||||
upsertLastSuccessSyncTimeByVault,
|
||||
getLastSuccessSyncTimeByVault,
|
||||
} from "./localdb";
|
||||
import { messyConfigToNormal, normalConfigToMessy } from "./configPersist";
|
||||
import {
|
||||
DEFAULT_DROPBOX_CONFIG,
|
||||
sendAuthReq as sendAuthReqDropbox,
|
||||
setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplaceDropbox,
|
||||
} from "./fsDropbox";
|
||||
import {
|
||||
AccessCodeResponseSuccessfulType,
|
||||
type AccessCodeResponseSuccessfulType,
|
||||
DEFAULT_ONEDRIVE_CONFIG,
|
||||
sendAuthReq as sendAuthReqOnedrive,
|
||||
setConfigBySuccessfullAuthInplace as setConfigBySuccessfullAuthInplaceOnedrive,
|
||||
} from "./fsOnedrive";
|
||||
import { DEFAULT_S3_CONFIG } from "./fsS3";
|
||||
import { DEFAULT_WEBDAV_CONFIG } from "./fsWebdav";
|
||||
import { RemotelySaveSettingTab } from "./settings";
|
||||
import { messyConfigToNormal, normalConfigToMessy } from "./configPersist";
|
||||
import { I18n } from "./i18n";
|
||||
import type { LangTypeAndAuto, TransItemType } from "./i18n";
|
||||
import { importQrCodeUri } from "./importExport";
|
||||
import {
|
||||
type InternalDBs,
|
||||
clearAllLoggerOutputRecords,
|
||||
clearExpiredSyncPlanRecords,
|
||||
getLastSuccessSyncTimeByVault,
|
||||
prepareDBs,
|
||||
upsertLastSuccessSyncTimeByVault,
|
||||
upsertPluginVersionByVault,
|
||||
} from "./localdb";
|
||||
import { RemotelySaveSettingTab } from "./settings";
|
||||
import { SyncAlgoV3Modal } from "./syncAlgoV3Notice";
|
||||
|
||||
// biome-ignore lint/suspicious/noShadowRestrictedNames: <explanation>
|
||||
import AggregateError from "aggregate-error";
|
||||
import { exportVaultSyncPlansToFiles } from "./debugMode";
|
||||
import { changeMobileStatusBar } from "./misc";
|
||||
import { Profiler } from "./profiler";
|
||||
import { FakeFsLocal } from "./fsLocal";
|
||||
import { FakeFsEncrypt } from "./fsEncrypt";
|
||||
import { syncer } from "./sync";
|
||||
import { getClient } from "./fsGetter";
|
||||
import throttle from "lodash/throttle";
|
||||
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 { DEFAULT_PROFILER_CONFIG, type Profiler } from "./profiler";
|
||||
import { syncer } from "./sync";
|
||||
|
||||
const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
|
||||
s3: DEFAULT_S3_CONFIG,
|
||||
@@ -94,6 +96,7 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
|
||||
obfuscateSettingFile: true,
|
||||
enableMobileStatusBar: false,
|
||||
encryptionMethod: "unknown",
|
||||
profiler: DEFAULT_PROFILER_CONFIG,
|
||||
};
|
||||
|
||||
interface OAuth2Info {
|
||||
@@ -149,7 +152,12 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
appContainerObserver?: MutationObserver;
|
||||
|
||||
async syncRun(triggerSource: SyncTriggerSourceType = "manual") {
|
||||
const profiler = new Profiler();
|
||||
// const profiler = new Profiler(
|
||||
// undefined,
|
||||
// this.settings.profiler?.enablePrinting ?? false,
|
||||
// this.settings.profiler?.recordSize ?? false
|
||||
// );
|
||||
const profiler: Profiler | undefined = undefined;
|
||||
const fsLocal = new FakeFsLocal(
|
||||
this.app.vault,
|
||||
this.settings.syncConfigDir ?? false,
|
||||
@@ -299,7 +307,6 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
|
||||
default:
|
||||
throw Error(`unknown step=${step} for showing notice`);
|
||||
break;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -330,17 +337,21 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
// last step
|
||||
if (this.syncRibbon !== undefined) {
|
||||
setIcon(this.syncRibbon, iconNameSyncWait);
|
||||
let originLabel = `${this.manifest.name}`;
|
||||
const originLabel = `${this.manifest.name}`;
|
||||
this.syncRibbon.setAttribute("aria-label", originLabel);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const statusBarFunc = async (s: SyncTriggerSourceType, step: number) => {
|
||||
const statusBarFunc = async (
|
||||
s: SyncTriggerSourceType,
|
||||
step: number,
|
||||
everythingOk: boolean
|
||||
) => {
|
||||
if (step === 1) {
|
||||
// change status to "syncing..." on statusbar
|
||||
this.updateLastSuccessSyncMsg(-1);
|
||||
} else if (step === 8) {
|
||||
} else if (step === 8 && everythingOk) {
|
||||
const lastSuccessSyncMillis = Date.now();
|
||||
await upsertLastSuccessSyncTimeByVault(
|
||||
this.db,
|
||||
@@ -348,6 +359,8 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
lastSuccessSyncMillis
|
||||
);
|
||||
this.updateLastSuccessSyncMsg(lastSuccessSyncMillis);
|
||||
} else if (!everythingOk) {
|
||||
this.updateLastSuccessSyncMsg(-2); // magic number
|
||||
}
|
||||
};
|
||||
|
||||
@@ -407,7 +420,7 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
);
|
||||
|
||||
fsEncrypt.closeResources();
|
||||
profiler.clear();
|
||||
(profiler as Profiler | undefined)?.clear();
|
||||
|
||||
this.syncEvent?.trigger("SYNC_DONE");
|
||||
}
|
||||
@@ -534,7 +547,7 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
return;
|
||||
}
|
||||
|
||||
let authRes = await sendAuthReqDropbox(
|
||||
const authRes = await sendAuthReqDropbox(
|
||||
this.settings.dropbox.clientID,
|
||||
this.oauth2Info.verifier,
|
||||
inputParams.code,
|
||||
@@ -619,7 +632,7 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
});
|
||||
}
|
||||
|
||||
let rsp = await sendAuthReqOnedrive(
|
||||
const rsp = await sendAuthReqOnedrive(
|
||||
this.settings.onedrive.clientID,
|
||||
this.settings.onedrive.authority,
|
||||
inputParams.code,
|
||||
@@ -732,6 +745,22 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
},
|
||||
});
|
||||
|
||||
this.addCommand({
|
||||
id: "export-sync-plans-1-only-change",
|
||||
name: t("command_exportsyncplans_1_only_change"),
|
||||
icon: iconNameLogs,
|
||||
callback: async () => {
|
||||
await exportVaultSyncPlansToFiles(
|
||||
this.db,
|
||||
this.app.vault,
|
||||
this.vaultRandomID,
|
||||
1,
|
||||
true
|
||||
);
|
||||
new Notice(t("settings_syncplans_notice"));
|
||||
},
|
||||
});
|
||||
|
||||
this.addCommand({
|
||||
id: "export-sync-plans-1",
|
||||
name: t("command_exportsyncplans_1"),
|
||||
@@ -741,7 +770,8 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
this.db,
|
||||
this.app.vault,
|
||||
this.vaultRandomID,
|
||||
1
|
||||
1,
|
||||
false
|
||||
);
|
||||
new Notice(t("settings_syncplans_notice"));
|
||||
},
|
||||
@@ -756,7 +786,8 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
this.db,
|
||||
this.app.vault,
|
||||
this.vaultRandomID,
|
||||
5
|
||||
5,
|
||||
false
|
||||
);
|
||||
new Notice(t("settings_syncplans_notice"));
|
||||
},
|
||||
@@ -771,7 +802,8 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
this.db,
|
||||
this.app.vault,
|
||||
this.vaultRandomID,
|
||||
-1
|
||||
-1,
|
||||
false
|
||||
);
|
||||
new Notice(t("settings_syncplans_notice"));
|
||||
},
|
||||
@@ -783,6 +815,8 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
// console.info("click", evt);
|
||||
// });
|
||||
|
||||
this.enableCheckingFileStat();
|
||||
|
||||
if (!this.settings.agreeToUseSyncV3) {
|
||||
const syncAlgoV3Modal = new SyncAlgoV3Modal(this.app, this);
|
||||
syncAlgoV3Modal.open();
|
||||
@@ -840,6 +874,9 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
if (this.settings.onedrive.remoteBaseDir === undefined) {
|
||||
this.settings.onedrive.remoteBaseDir = "";
|
||||
}
|
||||
if (this.settings.onedrive.emptyFile === undefined) {
|
||||
this.settings.onedrive.emptyFile = "skip";
|
||||
}
|
||||
if (this.settings.webdav.manualRecursive === undefined) {
|
||||
this.settings.webdav.manualRecursive = true;
|
||||
}
|
||||
@@ -931,6 +968,16 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
}
|
||||
}
|
||||
|
||||
if (this.settings.profiler === undefined) {
|
||||
this.settings.profiler = DEFAULT_PROFILER_CONFIG;
|
||||
}
|
||||
if (this.settings.profiler.enablePrinting === undefined) {
|
||||
this.settings.profiler.enablePrinting = false;
|
||||
}
|
||||
if (this.settings.profiler.recordSize === undefined) {
|
||||
this.settings.profiler.recordSize = false;
|
||||
}
|
||||
|
||||
await this.saveSettings();
|
||||
}
|
||||
|
||||
@@ -954,7 +1001,7 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
}
|
||||
|
||||
async checkIfOauthExpires() {
|
||||
let needSave: boolean = false;
|
||||
let needSave = false;
|
||||
const current = Date.now();
|
||||
|
||||
// fullfill old version settings
|
||||
@@ -1198,6 +1245,41 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
});
|
||||
}
|
||||
|
||||
enableCheckingFileStat() {
|
||||
this.app.workspace.onLayoutReady(() => {
|
||||
const t = (x: TransItemType, vars?: any) => {
|
||||
return this.i18n.t(x, vars);
|
||||
};
|
||||
this.registerEvent(
|
||||
this.app.workspace.on("file-menu", (menu, file) => {
|
||||
if (file instanceof TFolder) {
|
||||
// folder not supported yet
|
||||
return;
|
||||
}
|
||||
|
||||
menu.addItem((item) => {
|
||||
item
|
||||
.setTitle(t("menu_check_file_stat"))
|
||||
.setIcon("file-cog")
|
||||
.onClick(async () => {
|
||||
const filePath = file.path;
|
||||
const fsLocal = new FakeFsLocal(
|
||||
this.app.vault,
|
||||
this.settings.syncConfigDir ?? false,
|
||||
this.app.vault.configDir,
|
||||
this.manifest.id,
|
||||
undefined,
|
||||
this.settings.deleteToWhere ?? "system"
|
||||
);
|
||||
const s = await fsLocal.stat(filePath);
|
||||
new Notice(JSON.stringify(s, null, 2), 10000);
|
||||
});
|
||||
});
|
||||
})
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
async saveAgreeToUseNewSyncAlgorithm() {
|
||||
this.settings.agreeToUseSyncV3 = true;
|
||||
await this.saveSettings();
|
||||
@@ -1228,6 +1310,11 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
lastSyncMsg = t("statusbar_syncing");
|
||||
}
|
||||
|
||||
if (lastSuccessSyncMillis !== undefined && lastSuccessSyncMillis === -2) {
|
||||
lastSyncMsg = t("statusbar_failed");
|
||||
lastSyncLabelMsg = t("statusbar_failed");
|
||||
}
|
||||
|
||||
if (lastSuccessSyncMillis !== undefined && lastSuccessSyncMillis > 0) {
|
||||
const deltaTime = Date.now() - lastSuccessSyncMillis;
|
||||
|
||||
@@ -1260,7 +1347,7 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
timeText = t("statusbar_now");
|
||||
}
|
||||
|
||||
let dateText = new Date(lastSuccessSyncMillis).toLocaleTimeString(
|
||||
const dateText = new Date(lastSuccessSyncMillis).toLocaleTimeString(
|
||||
navigator.language,
|
||||
{
|
||||
weekday: "long",
|
||||
|
||||
+90
-31
@@ -1,9 +1,9 @@
|
||||
import { Platform, Vault } from "obsidian";
|
||||
import * as path from "path";
|
||||
import type { Vault } from "obsidian";
|
||||
|
||||
import { base32, base64url } from "rfc4648";
|
||||
import XRegExp from "xregexp";
|
||||
import emojiRegex from "emoji-regex";
|
||||
import { base32 } from "rfc4648";
|
||||
import XRegExp from "xregexp";
|
||||
|
||||
declare global {
|
||||
interface Window {
|
||||
@@ -18,11 +18,7 @@ declare global {
|
||||
* @param underscore
|
||||
* @returns
|
||||
*/
|
||||
export const isHiddenPath = (
|
||||
item: string,
|
||||
dot: boolean = true,
|
||||
underscore: boolean = true
|
||||
) => {
|
||||
export const isHiddenPath = (item: string, dot = true, underscore = true) => {
|
||||
if (!(dot || underscore)) {
|
||||
throw Error("parameter error for isHiddenPath");
|
||||
}
|
||||
@@ -50,7 +46,7 @@ export const isHiddenPath = (
|
||||
* @param x string
|
||||
* @returns string[] might be empty
|
||||
*/
|
||||
export const getFolderLevels = (x: string, addEndingSlash: boolean = false) => {
|
||||
export const getFolderLevels = (x: string, addEndingSlash = false) => {
|
||||
const res: string[] = [];
|
||||
|
||||
if (x === "" || x === "/") {
|
||||
@@ -58,7 +54,7 @@ export const getFolderLevels = (x: string, addEndingSlash: boolean = false) => {
|
||||
}
|
||||
|
||||
const y1 = x.split("/");
|
||||
let i = 0;
|
||||
const i = 0;
|
||||
for (let index = 0; index + 1 < y1.length; index++) {
|
||||
let k = y1.slice(0, index + 1).join("/");
|
||||
if (k === "" || k === "/") {
|
||||
@@ -119,7 +115,7 @@ export const base64ToArrayBuffer = (b64text: string) => {
|
||||
};
|
||||
|
||||
export const copyArrayBuffer = (src: ArrayBuffer) => {
|
||||
var dst = new ArrayBuffer(src.byteLength);
|
||||
const dst = new ArrayBuffer(src.byteLength);
|
||||
new Uint8Array(dst).set(new Uint8Array(src));
|
||||
return dst;
|
||||
};
|
||||
@@ -134,18 +130,14 @@ export const hexStringToTypedArray = (hex: string) => {
|
||||
if (f === null) {
|
||||
throw Error(`input ${hex} is not hex, no way to transform`);
|
||||
}
|
||||
return new Uint8Array(
|
||||
f.map(function (h) {
|
||||
return parseInt(h, 16);
|
||||
})
|
||||
);
|
||||
return new Uint8Array(f.map((h) => Number.parseInt(h, 16)));
|
||||
};
|
||||
|
||||
export const base64ToBase32 = (a: string) => {
|
||||
return base32.stringify(Buffer.from(a, "base64"));
|
||||
};
|
||||
|
||||
export const base64ToBase64url = (a: string, pad: boolean = false) => {
|
||||
export const base64ToBase64url = (a: string, pad = false) => {
|
||||
let b = a.replace(/\+/g, "-").replace(/\//g, "_");
|
||||
if (!pad) {
|
||||
b = b.replace(/=/g, "");
|
||||
@@ -190,7 +182,7 @@ export const hasEmojiInText = (a: string) => {
|
||||
* @param toLower
|
||||
* @returns
|
||||
*/
|
||||
export const headersToRecord = (h: Headers, toLower: boolean = true) => {
|
||||
export const headersToRecord = (h: Headers, toLower = true) => {
|
||||
const res: Record<string, string> = {};
|
||||
h.forEach((v, k) => {
|
||||
if (toLower) {
|
||||
@@ -240,11 +232,11 @@ export const getParentFolder = (a: string) => {
|
||||
* @param delimiter
|
||||
* @returns
|
||||
*/
|
||||
export const setToString = (a: Set<string>, delimiter: string = ",") => {
|
||||
export const setToString = (a: Set<string>, delimiter = ",") => {
|
||||
return [...a].join(delimiter);
|
||||
};
|
||||
|
||||
export const extractSvgSub = (x: string, subEl: string = "rect") => {
|
||||
export const extractSvgSub = (x: string, subEl = "rect") => {
|
||||
const parser = new window.DOMParser();
|
||||
const dom = parser.parseFromString(x, "image/svg+xml");
|
||||
const svg = dom.querySelector("svg")!;
|
||||
@@ -261,10 +253,10 @@ export const extractSvgSub = (x: string, subEl: string = "rect") => {
|
||||
export const getRandomIntInclusive = (min: number, max: number) => {
|
||||
const randomBuffer = new Uint32Array(1);
|
||||
window.crypto.getRandomValues(randomBuffer);
|
||||
let randomNumber = randomBuffer[0] / (0xffffffff + 1);
|
||||
min = Math.ceil(min);
|
||||
max = Math.floor(max);
|
||||
return Math.floor(randomNumber * (max - min + 1)) + min;
|
||||
const randomNumber = randomBuffer[0] / (0xffffffff + 1);
|
||||
const min2 = Math.ceil(min);
|
||||
const max2 = Math.floor(max);
|
||||
return Math.floor(randomNumber * (max2 - min2 + 1)) + min2;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -353,7 +345,7 @@ export const unixTimeToStr = (x: number | undefined | null) => {
|
||||
if (x === undefined || x === null || Number.isNaN(x)) {
|
||||
return undefined;
|
||||
}
|
||||
return window.moment(x).format() as string;
|
||||
return new Date(x).toISOString();
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -397,9 +389,8 @@ export const toText = (x: any) => {
|
||||
|
||||
if (
|
||||
x instanceof Error ||
|
||||
(x &&
|
||||
x.stack &&
|
||||
x.message &&
|
||||
(x?.stack &&
|
||||
x?.message &&
|
||||
typeof x.stack === "string" &&
|
||||
typeof x.message === "string")
|
||||
) {
|
||||
@@ -446,7 +437,7 @@ export const isSpecialFolderNameToSkip = (
|
||||
x: string,
|
||||
more: string[] | undefined
|
||||
) => {
|
||||
let specialFolders = [
|
||||
const specialFolders = [
|
||||
".git",
|
||||
".github",
|
||||
".gitlab",
|
||||
@@ -595,6 +586,7 @@ export const changeMobileStatusBar = (
|
||||
if (oldAppContainerObserver !== undefined) {
|
||||
console.debug(`disconnect oldAppContainerObserver`);
|
||||
oldAppContainerObserver.disconnect();
|
||||
// biome-ignore lint/style/noParameterAssign: we want gc
|
||||
oldAppContainerObserver = undefined;
|
||||
}
|
||||
statusbar.style.removeProperty("display");
|
||||
@@ -631,7 +623,6 @@ export const fixEntityListCasesInplace = (entities: { keyRaw: string }[]) => {
|
||||
caseMapping[newKeyRaw.toLocaleLowerCase()] = newKeyRaw;
|
||||
e.keyRaw = newKeyRaw;
|
||||
// console.log(JSON.stringify(caseMapping,null,2));
|
||||
continue;
|
||||
} else {
|
||||
throw Error(`${parentFolder} doesn't have cases record??`);
|
||||
}
|
||||
@@ -642,7 +633,6 @@ export const fixEntityListCasesInplace = (entities: { keyRaw: string }[]) => {
|
||||
.slice(-1)
|
||||
.join("/")}`;
|
||||
e.keyRaw = newKeyRaw;
|
||||
continue;
|
||||
} else {
|
||||
throw Error(`${parentFolder} doesn't have cases record??`);
|
||||
}
|
||||
@@ -651,3 +641,72 @@ export const fixEntityListCasesInplace = (entities: { keyRaw: string }[]) => {
|
||||
|
||||
return entities;
|
||||
};
|
||||
|
||||
/**
|
||||
* https://stackoverflow.com/questions/1248302/how-to-get-the-size-of-a-javascript-object
|
||||
* @param object
|
||||
* @returns bytes
|
||||
*/
|
||||
export const roughSizeOfObject = (object: any) => {
|
||||
const objectList: any[] = [];
|
||||
const stack = [object];
|
||||
let bytes = 0;
|
||||
|
||||
while (stack.length) {
|
||||
const value = stack.pop();
|
||||
|
||||
switch (typeof value) {
|
||||
case "boolean":
|
||||
bytes += 4;
|
||||
break;
|
||||
case "string":
|
||||
bytes += value.length * 2;
|
||||
break;
|
||||
case "number":
|
||||
bytes += 8;
|
||||
break;
|
||||
case "object":
|
||||
if (!objectList.includes(value)) {
|
||||
objectList.push(value);
|
||||
for (const prop in value) {
|
||||
if (value.hasOwnProperty(prop)) {
|
||||
stack.push(value[prop]);
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return bytes;
|
||||
};
|
||||
|
||||
export const splitFileSizeToChunkRanges = (
|
||||
totalSize: number,
|
||||
chunkSize: number
|
||||
) => {
|
||||
if (totalSize < 0) {
|
||||
throw Error(`totalSize should not be negative`);
|
||||
}
|
||||
if (chunkSize <= 0) {
|
||||
throw Error(`chunkSize should not be negative or zero`);
|
||||
}
|
||||
|
||||
if (totalSize === 0) {
|
||||
return [];
|
||||
}
|
||||
if (totalSize <= chunkSize) {
|
||||
return [{ start: 0, end: totalSize - 1 }];
|
||||
}
|
||||
|
||||
const res: { start: number; end: number }[] = [];
|
||||
|
||||
const blocksCount = Math.ceil((totalSize * 1.0) / chunkSize);
|
||||
|
||||
for (let i = 0; i < blocksCount; ++i) {
|
||||
res.push({
|
||||
start: i * chunkSize,
|
||||
end: Math.min((i + 1) * chunkSize - 1, totalSize - 1),
|
||||
});
|
||||
}
|
||||
return res;
|
||||
};
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import type { Vault, Stat, ListedFiles } from "obsidian";
|
||||
import type { Entity, MixedEntity } from "./baseTypes";
|
||||
import type { ListedFiles, Vault } from "obsidian";
|
||||
import type { Entity } from "./baseTypes";
|
||||
|
||||
import { Queue } from "@fyears/tsqueue";
|
||||
import chunk from "lodash/chunk";
|
||||
import flatten from "lodash/flatten";
|
||||
import { statFix, isSpecialFolderNameToSkip } from "./misc";
|
||||
import { isSpecialFolderNameToSkip, statFix } from "./misc";
|
||||
|
||||
const isPluginDirItself = (x: string, pluginId: string) => {
|
||||
return (
|
||||
|
||||
+73
-18
@@ -1,29 +1,43 @@
|
||||
import { SUPPORTED_SERVICES_TYPE } from "./baseTypes";
|
||||
import { InternalDBs, insertProfilerResultByVault } from "./localdb";
|
||||
import { unixTimeToStr } from "./misc";
|
||||
import type { ProfilerConfig, SUPPORTED_SERVICES_TYPE } from "./baseTypes";
|
||||
import { type InternalDBs, insertProfilerResultByVault } from "./localdb";
|
||||
import { roughSizeOfObject, unixTimeToStr } from "./misc";
|
||||
|
||||
interface BreakPoint {
|
||||
label: string;
|
||||
fakeTimeMilli: number; // it's NOT a unix timestamp
|
||||
indent: number;
|
||||
size?: number;
|
||||
}
|
||||
|
||||
export const DEFAULT_PROFILER_CONFIG: ProfilerConfig = {
|
||||
enablePrinting: false,
|
||||
recordSize: false,
|
||||
};
|
||||
|
||||
export class Profiler {
|
||||
startTime: number;
|
||||
breakPoints: BreakPoint[];
|
||||
indent: number;
|
||||
constructor(label?: string) {
|
||||
enablePrinting: boolean;
|
||||
recordSize: boolean;
|
||||
constructor(label?: string, enablePrinting?: boolean, recordSize?: boolean) {
|
||||
this.breakPoints = [];
|
||||
this.indent = 0;
|
||||
this.startTime = 0;
|
||||
this.enablePrinting = enablePrinting ?? false;
|
||||
this.recordSize = recordSize ?? false;
|
||||
|
||||
if (label !== undefined) {
|
||||
this.startTime = Date.now();
|
||||
this.breakPoints.push({
|
||||
const p = {
|
||||
label: label,
|
||||
fakeTimeMilli: performance.now(),
|
||||
indent: this.indent,
|
||||
});
|
||||
};
|
||||
this.breakPoints.push(p);
|
||||
if (this.enablePrinting) {
|
||||
console.debug(this.toString(-1));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,11 +45,36 @@ export class Profiler {
|
||||
if (this.breakPoints.length === 0) {
|
||||
this.startTime = Date.now();
|
||||
}
|
||||
this.breakPoints.push({
|
||||
const p = {
|
||||
label: label,
|
||||
fakeTimeMilli: performance.now(),
|
||||
indent: this.indent,
|
||||
});
|
||||
};
|
||||
this.breakPoints.push(p);
|
||||
if (this.enablePrinting) {
|
||||
console.debug(this.toString(-1));
|
||||
}
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
insertSize(label: string, obj: any) {
|
||||
if (!this.recordSize) {
|
||||
return;
|
||||
}
|
||||
if (this.breakPoints.length === 0) {
|
||||
this.startTime = Date.now();
|
||||
}
|
||||
const p = {
|
||||
label: label,
|
||||
fakeTimeMilli: performance.now(),
|
||||
indent: this.indent,
|
||||
size: roughSizeOfObject(obj),
|
||||
};
|
||||
this.breakPoints.push(p);
|
||||
if (this.enablePrinting) {
|
||||
console.debug(this.toString(-1));
|
||||
}
|
||||
|
||||
return this;
|
||||
}
|
||||
@@ -57,7 +96,31 @@ export class Profiler {
|
||||
return this;
|
||||
}
|
||||
|
||||
toString() {
|
||||
toString(idx?: number) {
|
||||
if (idx !== undefined) {
|
||||
let i = idx;
|
||||
if (idx < 0) {
|
||||
i = this.breakPoints.length + idx;
|
||||
}
|
||||
const label = this.breakPoints?.[i]["label"];
|
||||
const indent = this.breakPoints?.[i]["indent"];
|
||||
let millsec = 0;
|
||||
if (i >= 1) {
|
||||
millsec =
|
||||
Math.round(
|
||||
(this.breakPoints?.[i]["fakeTimeMilli"] -
|
||||
this.breakPoints?.[i - 1]["fakeTimeMilli"]) *
|
||||
10
|
||||
) / 10.0;
|
||||
}
|
||||
let res = `${" ".repeat(indent)}[${label}]: ${millsec}ms`;
|
||||
if (this.breakPoints[i].hasOwnProperty("size")) {
|
||||
const size = this.breakPoints[i].size as number;
|
||||
res += `, size=${size}`;
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
if (this.breakPoints.length === 0) {
|
||||
return "nothing in profiler";
|
||||
}
|
||||
@@ -67,15 +130,7 @@ export class Profiler {
|
||||
if (i === 0) {
|
||||
res += `\n[${this.breakPoints[i]["label"]}]: start`;
|
||||
} else {
|
||||
const label = this.breakPoints[i]["label"];
|
||||
const indent = this.breakPoints[i]["indent"];
|
||||
const millsec =
|
||||
Math.round(
|
||||
(this.breakPoints[i]["fakeTimeMilli"] -
|
||||
this.breakPoints[i - 1]["fakeTimeMilli"]) *
|
||||
10
|
||||
) / 10.0;
|
||||
res += `\n${" ".repeat(indent)}[${label}]: ${millsec}ms`;
|
||||
res += `\n${this.toString(i)}`;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+136
-74
@@ -1,37 +1,45 @@
|
||||
import { Eye, EyeOff, createElement } from "lucide";
|
||||
import {
|
||||
App,
|
||||
type App,
|
||||
Modal,
|
||||
Notice,
|
||||
Platform,
|
||||
PluginSettingTab,
|
||||
Setting,
|
||||
Platform,
|
||||
requireApiVersion,
|
||||
requestUrl,
|
||||
} from "obsidian";
|
||||
import type { TextComponent } from "obsidian";
|
||||
import { createElement, Eye, EyeOff } from "lucide";
|
||||
import {
|
||||
import type {
|
||||
CipherMethodType,
|
||||
ConflictActionType,
|
||||
DEFAULT_DEBUG_FOLDER,
|
||||
EmptyFolderCleanType,
|
||||
QRExportType,
|
||||
SUPPORTED_SERVICES_TYPE,
|
||||
SUPPORTED_SERVICES_TYPE_WITH_REMOTE_BASE_DIR,
|
||||
SyncDirectionType,
|
||||
WebdavAuthType,
|
||||
WebdavDepthType,
|
||||
CipherMethodType,
|
||||
QRExportType,
|
||||
} from "./baseTypes";
|
||||
|
||||
import {
|
||||
API_VER_ENSURE_REQURL_OK,
|
||||
API_VER_REQURL,
|
||||
VALID_REQURL,
|
||||
} from "./baseTypesObs";
|
||||
import cloneDeep from "lodash/cloneDeep";
|
||||
import { API_VER_ENSURE_REQURL_OK, VALID_REQURL } from "./baseTypesObs";
|
||||
import { messyConfigToNormal } from "./configPersist";
|
||||
import {
|
||||
exportVaultProfilerResultsToFiles,
|
||||
exportVaultSyncPlansToFiles,
|
||||
} from "./debugMode";
|
||||
import {
|
||||
DEFAULT_DROPBOX_CONFIG,
|
||||
getAuthUrlAndVerifier as getAuthUrlAndVerifierDropbox,
|
||||
sendAuthReq as sendAuthReqDropbox,
|
||||
setConfigBySuccessfullAuthInplace,
|
||||
} from "./fsDropbox";
|
||||
import { getClient } from "./fsGetter";
|
||||
import {
|
||||
DEFAULT_ONEDRIVE_CONFIG,
|
||||
getAuthUrlAndVerifier as getAuthUrlAndVerifierOnedrive,
|
||||
} from "./fsOnedrive";
|
||||
import { simpleTransRemotePrefix } from "./fsS3";
|
||||
import type { TransItemType } from "./i18n";
|
||||
import {
|
||||
exportQrCodeUri,
|
||||
importQrCodeUri,
|
||||
@@ -44,27 +52,12 @@ import {
|
||||
upsertLastSuccessSyncTimeByVault,
|
||||
} from "./localdb";
|
||||
import type RemotelySavePlugin from "./main"; // unavoidable
|
||||
import { FakeFs } from "./fsAll";
|
||||
import {
|
||||
DEFAULT_DROPBOX_CONFIG,
|
||||
getAuthUrlAndVerifier as getAuthUrlAndVerifierDropbox,
|
||||
sendAuthReq as sendAuthReqDropbox,
|
||||
setConfigBySuccessfullAuthInplace,
|
||||
} from "./fsDropbox";
|
||||
import {
|
||||
DEFAULT_ONEDRIVE_CONFIG,
|
||||
getAuthUrlAndVerifier as getAuthUrlAndVerifierOnedrive,
|
||||
} from "./fsOnedrive";
|
||||
import { messyConfigToNormal } from "./configPersist";
|
||||
import type { TransItemType } from "./i18n";
|
||||
import {
|
||||
changeMobileStatusBar,
|
||||
checkHasSpecialCharForDir,
|
||||
stringToFragment,
|
||||
} from "./misc";
|
||||
import { simpleTransRemotePrefix } from "./fsS3";
|
||||
import cloneDeep from "lodash/cloneDeep";
|
||||
import { getClient } from "./fsGetter";
|
||||
import { DEFAULT_PROFILER_CONFIG } from "./profiler";
|
||||
|
||||
class PasswordModal extends Modal {
|
||||
plugin: RemotelySavePlugin;
|
||||
@@ -76,7 +69,7 @@ class PasswordModal extends Modal {
|
||||
}
|
||||
|
||||
onOpen() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
|
||||
const t = (x: TransItemType, vars?: any) => {
|
||||
return this.plugin.i18n.t(x, vars);
|
||||
@@ -131,7 +124,7 @@ class PasswordModal extends Modal {
|
||||
}
|
||||
|
||||
onClose() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
contentEl.empty();
|
||||
}
|
||||
}
|
||||
@@ -144,7 +137,7 @@ class EncryptionMethodModal extends Modal {
|
||||
}
|
||||
|
||||
onOpen() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
|
||||
const t = (x: TransItemType, vars?: any) => {
|
||||
return this.plugin.i18n.t(x, vars);
|
||||
@@ -170,7 +163,7 @@ class EncryptionMethodModal extends Modal {
|
||||
}
|
||||
|
||||
onClose() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
contentEl.empty();
|
||||
}
|
||||
}
|
||||
@@ -192,7 +185,7 @@ class ChangeRemoteBaseDirModal extends Modal {
|
||||
}
|
||||
|
||||
onOpen() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
|
||||
const t = (x: TransItemType, vars?: any) => {
|
||||
return this.plugin.i18n.t(x, vars);
|
||||
@@ -264,7 +257,7 @@ class ChangeRemoteBaseDirModal extends Modal {
|
||||
}
|
||||
|
||||
onClose() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
contentEl.empty();
|
||||
}
|
||||
}
|
||||
@@ -283,7 +276,7 @@ class ChangeRemotePrefixModal extends Modal {
|
||||
}
|
||||
|
||||
onOpen() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
|
||||
const t = (x: TransItemType, vars?: any) => {
|
||||
return this.plugin.i18n.t(x, vars);
|
||||
@@ -346,7 +339,7 @@ class ChangeRemotePrefixModal extends Modal {
|
||||
}
|
||||
|
||||
onClose() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
contentEl.empty();
|
||||
}
|
||||
}
|
||||
@@ -371,7 +364,7 @@ class DropboxAuthModal extends Modal {
|
||||
}
|
||||
|
||||
async onOpen() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
|
||||
const t = (x: TransItemType, vars?: any) => {
|
||||
return this.plugin.i18n.t(x, vars);
|
||||
@@ -509,7 +502,7 @@ class DropboxAuthModal extends Modal {
|
||||
}
|
||||
|
||||
onClose() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
contentEl.empty();
|
||||
}
|
||||
}
|
||||
@@ -534,7 +527,7 @@ export class OnedriveAuthModal extends Modal {
|
||||
}
|
||||
|
||||
async onOpen() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
|
||||
const { authUrl, verifier } = await getAuthUrlAndVerifierOnedrive(
|
||||
this.plugin.settings.onedrive.clientID,
|
||||
@@ -583,7 +576,7 @@ export class OnedriveAuthModal extends Modal {
|
||||
}
|
||||
|
||||
onClose() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
contentEl.empty();
|
||||
}
|
||||
}
|
||||
@@ -605,7 +598,7 @@ export class OnedriveRevokeAuthModal extends Modal {
|
||||
}
|
||||
|
||||
async onOpen() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
const t = (x: TransItemType, vars?: any) => {
|
||||
return this.plugin.i18n.t(x, vars);
|
||||
};
|
||||
@@ -653,7 +646,7 @@ export class OnedriveRevokeAuthModal extends Modal {
|
||||
}
|
||||
|
||||
onClose() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
contentEl.empty();
|
||||
}
|
||||
}
|
||||
@@ -672,7 +665,7 @@ class SyncConfigDirModal extends Modal {
|
||||
}
|
||||
|
||||
async onOpen() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
|
||||
const t = (x: TransItemType, vars?: any) => {
|
||||
return this.plugin.i18n.t(x, vars);
|
||||
@@ -706,7 +699,7 @@ class SyncConfigDirModal extends Modal {
|
||||
}
|
||||
|
||||
onClose() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
contentEl.empty();
|
||||
}
|
||||
}
|
||||
@@ -721,7 +714,7 @@ class ExportSettingsQrCodeModal extends Modal {
|
||||
}
|
||||
|
||||
async onOpen() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
|
||||
const t = (x: TransItemType, vars?: any) => {
|
||||
return this.plugin.i18n.t(x, vars);
|
||||
@@ -770,7 +763,7 @@ class ExportSettingsQrCodeModal extends Modal {
|
||||
}
|
||||
|
||||
onClose() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
contentEl.empty();
|
||||
}
|
||||
}
|
||||
@@ -810,7 +803,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
}
|
||||
|
||||
display(): void {
|
||||
let { containerEl } = this;
|
||||
const { containerEl } = this;
|
||||
containerEl.style.setProperty("overflow-wrap", "break-word");
|
||||
|
||||
containerEl.empty();
|
||||
@@ -1007,7 +1000,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
dropdown
|
||||
.setValue(`${this.plugin.settings.s3.partsConcurrency}`)
|
||||
.onChange(async (val) => {
|
||||
const realVal = parseInt(val);
|
||||
const realVal = Number.parseInt(val);
|
||||
this.plugin.settings.s3.partsConcurrency = realVal;
|
||||
await this.plugin.saveSettings();
|
||||
});
|
||||
@@ -1086,7 +1079,11 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
|
||||
dropdown
|
||||
.setValue(
|
||||
`${this.plugin.settings.s3.generateFolderObject ? "generate" : "notgenerate"}`
|
||||
`${
|
||||
this.plugin.settings.s3.generateFolderObject
|
||||
? "generate"
|
||||
: "notgenerate"
|
||||
}`
|
||||
)
|
||||
.onChange(async (val) => {
|
||||
if (val === "generate") {
|
||||
@@ -1174,7 +1171,6 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
button.setButtonText(t("settings_dropbox_revoke_button"));
|
||||
button.onClick(async () => {
|
||||
try {
|
||||
const self = this;
|
||||
const client = getClient(
|
||||
this.plugin.settings,
|
||||
this.app.vault.getName(),
|
||||
@@ -1285,7 +1281,6 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
button.setButtonText(t("settings_checkonnectivity_button"));
|
||||
button.onClick(async () => {
|
||||
new Notice(t("settings_checkonnectivity_checking"));
|
||||
const self = this;
|
||||
const client = getClient(
|
||||
this.plugin.settings,
|
||||
this.app.vault.getName(),
|
||||
@@ -1423,6 +1418,20 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
});
|
||||
});
|
||||
|
||||
new Setting(onedriveDiv)
|
||||
.setName(t("settings_onedrive_emptyfile"))
|
||||
.setDesc(t("settings_onedrive_emptyfile_desc"))
|
||||
.addDropdown(async (dropdown) => {
|
||||
dropdown
|
||||
.addOption("skip", t("settings_onedrive_emptyfile_skip"))
|
||||
.addOption("error", t("settings_onedrive_emptyfile_error"))
|
||||
.setValue(this.plugin.settings.onedrive.emptyFile)
|
||||
.onChange(async (val) => {
|
||||
this.plugin.settings.onedrive.emptyFile = val as any;
|
||||
await this.plugin.saveSettings();
|
||||
});
|
||||
});
|
||||
|
||||
new Setting(onedriveDiv)
|
||||
.setName(t("settings_checkonnectivity"))
|
||||
.setDesc(t("settings_checkonnectivity_desc"))
|
||||
@@ -1430,7 +1439,6 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
button.setButtonText(t("settings_checkonnectivity_button"));
|
||||
button.onClick(async () => {
|
||||
new Notice(t("settings_checkonnectivity_checking"));
|
||||
const self = this;
|
||||
const client = getClient(
|
||||
this.plugin.settings,
|
||||
this.app.vault.getName(),
|
||||
@@ -1635,7 +1643,6 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
button.setButtonText(t("settings_checkonnectivity_button"));
|
||||
button.onClick(async () => {
|
||||
new Notice(t("settings_checkonnectivity_checking"));
|
||||
const self = this;
|
||||
const client = getClient(
|
||||
this.plugin.settings,
|
||||
this.app.vault.getName(),
|
||||
@@ -1765,7 +1772,6 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
button.setButtonText(t("settings_checkonnectivity_button"));
|
||||
button.onClick(async () => {
|
||||
new Notice(t("settings_checkonnectivity_checking"));
|
||||
const self = this;
|
||||
const client = getClient(
|
||||
this.plugin.settings,
|
||||
this.app.vault.getName(),
|
||||
@@ -1885,7 +1891,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
dropdown
|
||||
.setValue(`${this.plugin.settings.autoRunEveryMilliseconds}`)
|
||||
.onChange(async (val: string) => {
|
||||
const realVal = parseInt(val);
|
||||
const realVal = Number.parseInt(val);
|
||||
this.plugin.settings.autoRunEveryMilliseconds = realVal;
|
||||
await this.plugin.saveSettings();
|
||||
if (
|
||||
@@ -1930,7 +1936,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
dropdown
|
||||
.setValue(`${this.plugin.settings.initRunAfterMilliseconds}`)
|
||||
.onChange(async (val: string) => {
|
||||
const realVal = parseInt(val);
|
||||
const realVal = Number.parseInt(val);
|
||||
this.plugin.settings.initRunAfterMilliseconds = realVal;
|
||||
await this.plugin.saveSettings();
|
||||
});
|
||||
@@ -1950,7 +1956,8 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
dropdown
|
||||
.setValue(`${syncOnSaveEnabled ? "1000" : "-1"}`)
|
||||
.onChange(async (val: string) => {
|
||||
this.plugin.settings.syncOnSaveAfterMilliseconds = parseInt(val);
|
||||
this.plugin.settings.syncOnSaveAfterMilliseconds =
|
||||
Number.parseInt(val);
|
||||
await this.plugin.saveSettings();
|
||||
this.plugin.toggleSyncOnSaveIfSet();
|
||||
});
|
||||
@@ -1962,14 +1969,14 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
.addDropdown((dropdown) => {
|
||||
dropdown.addOption("-1", t("settings_skiplargefiles_notset"));
|
||||
|
||||
const mbs = [1, 5, 10, 50, 100, 500, 1000];
|
||||
const mbs = [1, 5, 10, 20, 50, 100, 200, 500, 1000];
|
||||
for (const mb of mbs) {
|
||||
dropdown.addOption(`${mb * 1000 * 1000}`, `${mb} MB`);
|
||||
}
|
||||
dropdown
|
||||
.setValue(`${this.plugin.settings.skipSizeLargerThan}`)
|
||||
.onChange(async (val) => {
|
||||
this.plugin.settings.skipSizeLargerThan = parseInt(val);
|
||||
this.plugin.settings.skipSizeLargerThan = Number.parseInt(val);
|
||||
await this.plugin.saveSettings();
|
||||
});
|
||||
});
|
||||
@@ -2051,7 +2058,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
dropdown
|
||||
.setValue(`${this.plugin.settings.concurrency}`)
|
||||
.onChange(async (val) => {
|
||||
const realVal = parseInt(val);
|
||||
const realVal = Number.parseInt(val);
|
||||
this.plugin.settings.concurrency = realVal;
|
||||
await this.plugin.saveSettings();
|
||||
});
|
||||
@@ -2179,7 +2186,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
dropdown
|
||||
.setValue(`${this.plugin.settings.protectModifyPercentage ?? 50}`)
|
||||
.onChange(async (val) => {
|
||||
this.plugin.settings.protectModifyPercentage = parseInt(val);
|
||||
this.plugin.settings.protectModifyPercentage = Number.parseInt(val);
|
||||
await this.plugin.saveSettings();
|
||||
});
|
||||
});
|
||||
@@ -2254,13 +2261,12 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
importExportDiv.createEl("h2", {
|
||||
text: t("settings_importexport"),
|
||||
});
|
||||
if (Platform.isMobile) {
|
||||
importExportDiv.addClass("setting-need-wrapping-mobile");
|
||||
}
|
||||
|
||||
new Setting(importExportDiv)
|
||||
const importExportDivSetting1 = new Setting(importExportDiv)
|
||||
.setName(t("settings_export"))
|
||||
.setDesc(t("settings_export_desc"))
|
||||
.setDesc(t("settings_export_desc"));
|
||||
importExportDivSetting1.settingEl.addClass("setting-need-wrapping");
|
||||
importExportDivSetting1
|
||||
.addButton(async (button) => {
|
||||
button.setButtonText(t("settings_export_all_but_oauth2_button"));
|
||||
button.onClick(async () => {
|
||||
@@ -2406,9 +2412,24 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
.setName(t("settings_viewconsolelog"))
|
||||
.setDesc(stringToFragment(t("settings_viewconsolelog_desc")));
|
||||
|
||||
new Setting(debugDiv)
|
||||
const debugDivExportSyncPlans = new Setting(debugDiv)
|
||||
.setName(t("settings_syncplans"))
|
||||
.setDesc(t("settings_syncplans_desc"))
|
||||
.setDesc(t("settings_syncplans_desc"));
|
||||
debugDivExportSyncPlans.settingEl.addClass("setting-need-wrapping");
|
||||
debugDivExportSyncPlans
|
||||
.addButton(async (button) => {
|
||||
button.setButtonText(t("settings_syncplans_button_1_only_change"));
|
||||
button.onClick(async () => {
|
||||
await exportVaultSyncPlansToFiles(
|
||||
this.plugin.db,
|
||||
this.app.vault,
|
||||
this.plugin.vaultRandomID,
|
||||
1,
|
||||
true
|
||||
);
|
||||
new Notice(t("settings_syncplans_notice"));
|
||||
});
|
||||
})
|
||||
.addButton(async (button) => {
|
||||
button.setButtonText(t("settings_syncplans_button_1"));
|
||||
button.onClick(async () => {
|
||||
@@ -2416,7 +2437,8 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
this.plugin.db,
|
||||
this.app.vault,
|
||||
this.plugin.vaultRandomID,
|
||||
1
|
||||
1,
|
||||
false
|
||||
);
|
||||
new Notice(t("settings_syncplans_notice"));
|
||||
});
|
||||
@@ -2428,7 +2450,8 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
this.plugin.db,
|
||||
this.app.vault,
|
||||
this.plugin.vaultRandomID,
|
||||
5
|
||||
5,
|
||||
false
|
||||
);
|
||||
new Notice(t("settings_syncplans_notice"));
|
||||
});
|
||||
@@ -2440,7 +2463,8 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
this.plugin.db,
|
||||
this.app.vault,
|
||||
this.plugin.vaultRandomID,
|
||||
-1
|
||||
-1,
|
||||
false
|
||||
);
|
||||
new Notice(t("settings_syncplans_notice"));
|
||||
});
|
||||
@@ -2486,6 +2510,44 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
});
|
||||
});
|
||||
|
||||
new Setting(debugDiv)
|
||||
.setName(t("settings_profiler_enabledebugprint"))
|
||||
.setDesc(t("settings_profiler_enabledebugprint_desc"))
|
||||
.addDropdown((dropdown) => {
|
||||
dropdown.addOption("enable", t("enable"));
|
||||
dropdown.addOption("disable", t("disable"));
|
||||
dropdown
|
||||
.setValue(
|
||||
this.plugin.settings.profiler?.enablePrinting ? "enable" : "disable"
|
||||
)
|
||||
.onChange(async (val: string) => {
|
||||
if (this.plugin.settings.profiler === undefined) {
|
||||
this.plugin.settings.profiler = DEFAULT_PROFILER_CONFIG;
|
||||
}
|
||||
this.plugin.settings.profiler.enablePrinting = val === "enable";
|
||||
await this.plugin.saveSettings();
|
||||
});
|
||||
});
|
||||
|
||||
new Setting(debugDiv)
|
||||
.setName(t("settings_profiler_recordsize"))
|
||||
.setDesc(t("settings_profiler_recordsize_desc"))
|
||||
.addDropdown((dropdown) => {
|
||||
dropdown.addOption("enable", t("enable"));
|
||||
dropdown.addOption("disable", t("disable"));
|
||||
dropdown
|
||||
.setValue(
|
||||
this.plugin.settings.profiler?.recordSize ? "enable" : "disable"
|
||||
)
|
||||
.onChange(async (val: string) => {
|
||||
if (this.plugin.settings.profiler === undefined) {
|
||||
this.plugin.settings.profiler = DEFAULT_PROFILER_CONFIG;
|
||||
}
|
||||
this.plugin.settings.profiler.recordSize = val === "enable";
|
||||
await this.plugin.saveSettings();
|
||||
});
|
||||
});
|
||||
|
||||
new Setting(debugDiv)
|
||||
.setName(t("settings_outputbasepathvaultid"))
|
||||
.setDesc(t("settings_outputbasepathvaultid_desc"))
|
||||
@@ -2511,7 +2573,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
||||
}
|
||||
|
||||
hide() {
|
||||
let { containerEl } = this;
|
||||
const { containerEl } = this;
|
||||
containerEl.empty();
|
||||
super.hide();
|
||||
}
|
||||
|
||||
+179
-70
@@ -1,5 +1,8 @@
|
||||
// biome-ignore lint/suspicious/noShadowRestrictedNames: <explanation>
|
||||
import AggregateError from "aggregate-error";
|
||||
import PQueue from "p-queue";
|
||||
import XRegExp from "xregexp";
|
||||
import {
|
||||
import type {
|
||||
ConflictActionType,
|
||||
EmptyFolderCleanType,
|
||||
Entity,
|
||||
@@ -9,29 +12,28 @@ import {
|
||||
SyncDirectionType,
|
||||
SyncTriggerSourceType,
|
||||
} from "./baseTypes";
|
||||
import { FakeFs } from "./fsAll";
|
||||
import { FakeFsEncrypt } from "./fsEncrypt";
|
||||
import type { FakeFs } from "./fsAll";
|
||||
import type { FakeFsEncrypt } from "./fsEncrypt";
|
||||
import {
|
||||
InternalDBs,
|
||||
type InternalDBs,
|
||||
clearPrevSyncRecordByVaultAndProfile,
|
||||
getAllPrevSyncRecordsByVaultAndProfile,
|
||||
insertSyncPlanRecordByVault,
|
||||
upsertPrevSyncRecordByVaultAndProfile,
|
||||
} from "./localdb";
|
||||
import {
|
||||
DEFAULT_FILE_NAME_FOR_METADATAONREMOTE,
|
||||
DEFAULT_FILE_NAME_FOR_METADATAONREMOTE2,
|
||||
} from "./metadataOnRemote";
|
||||
import {
|
||||
atWhichLevel,
|
||||
getParentFolder,
|
||||
isHiddenPath,
|
||||
isSpecialFolderNameToSkip,
|
||||
roughSizeOfObject,
|
||||
unixTimeToStr,
|
||||
} from "./misc";
|
||||
import { Profiler } from "./profiler";
|
||||
import {
|
||||
DEFAULT_FILE_NAME_FOR_METADATAONREMOTE,
|
||||
DEFAULT_FILE_NAME_FOR_METADATAONREMOTE2,
|
||||
} from "./metadataOnRemote";
|
||||
import AggregateError from "aggregate-error";
|
||||
import PQueue from "p-queue";
|
||||
import type { Profiler } from "./profiler";
|
||||
|
||||
const copyEntityAndFixTimeFormat = (
|
||||
src: Entity,
|
||||
@@ -153,10 +155,13 @@ const ensembleMixedEnties = async (
|
||||
fsEncrypt: FakeFsEncrypt,
|
||||
serviceType: SUPPORTED_SERVICES_TYPE,
|
||||
|
||||
profiler: Profiler
|
||||
profiler: Profiler | undefined
|
||||
): Promise<SyncPlanType> => {
|
||||
profiler.addIndent();
|
||||
profiler.insert("ensembleMixedEnties: enter");
|
||||
profiler?.addIndent();
|
||||
profiler?.insert("ensembleMixedEnties: enter");
|
||||
profiler?.insertSize("sizeof localEntityList", localEntityList);
|
||||
profiler?.insertSize("sizeof prevSyncEntityList", prevSyncEntityList);
|
||||
profiler?.insertSize("sizeof remoteEntityList", remoteEntityList);
|
||||
|
||||
const finalMappings: SyncPlanType = {};
|
||||
|
||||
@@ -185,7 +190,8 @@ const ensembleMixedEnties = async (
|
||||
};
|
||||
}
|
||||
|
||||
profiler.insert("ensembleMixedEnties: finish remote");
|
||||
profiler?.insert("ensembleMixedEnties: finish remote");
|
||||
profiler?.insertSize("sizeof finalMappings", finalMappings);
|
||||
|
||||
if (Object.keys(finalMappings).length === 0 || localEntityList.length === 0) {
|
||||
// Special checking:
|
||||
@@ -225,7 +231,8 @@ const ensembleMixedEnties = async (
|
||||
}
|
||||
}
|
||||
|
||||
profiler.insert("ensembleMixedEnties: finish prevSync");
|
||||
profiler?.insert("ensembleMixedEnties: finish prevSync");
|
||||
profiler?.insertSize("sizeof finalMappings", finalMappings);
|
||||
|
||||
// local has to be last
|
||||
// because we want to get keyEnc based on the remote
|
||||
@@ -258,13 +265,14 @@ const ensembleMixedEnties = async (
|
||||
}
|
||||
}
|
||||
|
||||
profiler.insert("ensembleMixedEnties: finish local");
|
||||
profiler?.insert("ensembleMixedEnties: finish local");
|
||||
profiler?.insertSize("sizeof finalMappings", finalMappings);
|
||||
|
||||
// console.debug("in the end of ensembleMixedEnties, finalMappings is:");
|
||||
// console.debug(finalMappings);
|
||||
|
||||
profiler.insert("ensembleMixedEnties: exit");
|
||||
profiler.removeIndent();
|
||||
profiler?.insert("ensembleMixedEnties: exit");
|
||||
profiler?.removeIndent();
|
||||
return finalMappings;
|
||||
};
|
||||
|
||||
@@ -279,19 +287,28 @@ const getSyncPlanInplace = async (
|
||||
skipSizeLargerThan: number,
|
||||
conflictAction: ConflictActionType,
|
||||
syncDirection: SyncDirectionType,
|
||||
profiler: Profiler
|
||||
profiler: Profiler | undefined,
|
||||
settings: RemotelySavePluginSettings,
|
||||
triggerSource: SyncTriggerSourceType
|
||||
) => {
|
||||
profiler.addIndent();
|
||||
profiler.insert("getSyncPlanInplace: enter");
|
||||
profiler?.addIndent();
|
||||
profiler?.insert("getSyncPlanInplace: enter");
|
||||
// from long(deep) to short(shadow)
|
||||
const sortedKeys = Object.keys(mixedEntityMappings).sort(
|
||||
(k1, k2) => k2.length - k1.length
|
||||
);
|
||||
profiler.insert("getSyncPlanInplace: finish sorting");
|
||||
profiler?.insert("getSyncPlanInplace: finish sorting");
|
||||
profiler?.insertSize("sizeof sortedKeys", sortedKeys);
|
||||
|
||||
const keptFolder = new Set<string>();
|
||||
|
||||
for (let i = 0; i < sortedKeys.length; ++i) {
|
||||
if (i % 100 === 0) {
|
||||
profiler?.insertSize(
|
||||
`sizeof sortedKeys in the beginning of i=${i}`,
|
||||
mixedEntityMappings
|
||||
);
|
||||
}
|
||||
const key = sortedKeys[i];
|
||||
const mixedEntry = mixedEntityMappings[key];
|
||||
const { local, prevSync, remote } = mixedEntry;
|
||||
@@ -309,69 +326,83 @@ const getSyncPlanInplace = async (
|
||||
if (local !== undefined && remote !== undefined) {
|
||||
mixedEntry.decisionBranch = 101;
|
||||
mixedEntry.decision = "folder_existed_both_then_do_nothing";
|
||||
mixedEntry.change = false;
|
||||
} else if (local !== undefined && remote === undefined) {
|
||||
if (syncDirection === "incremental_pull_only") {
|
||||
mixedEntry.decisionBranch = 107;
|
||||
mixedEntry.decision = "folder_to_skip";
|
||||
mixedEntry.change = false;
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 102;
|
||||
mixedEntry.decision =
|
||||
"folder_existed_local_then_also_create_remote";
|
||||
mixedEntry.change = true;
|
||||
}
|
||||
} else if (local === undefined && remote !== undefined) {
|
||||
if (syncDirection === "incremental_push_only") {
|
||||
mixedEntry.decisionBranch = 108;
|
||||
mixedEntry.decision = "folder_to_skip";
|
||||
mixedEntry.change = false;
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 103;
|
||||
mixedEntry.decision =
|
||||
"folder_existed_remote_then_also_create_local";
|
||||
mixedEntry.change = true;
|
||||
}
|
||||
} else {
|
||||
// why?? how??
|
||||
mixedEntry.decisionBranch = 104;
|
||||
mixedEntry.decision = "folder_to_be_created";
|
||||
mixedEntry.change = true;
|
||||
}
|
||||
keptFolder.delete(key); // no need to save it in the Set later
|
||||
} else {
|
||||
if (howToCleanEmptyFolder === "skip") {
|
||||
mixedEntry.decisionBranch = 105;
|
||||
mixedEntry.decision = "folder_to_skip";
|
||||
mixedEntry.change = false;
|
||||
} else if (howToCleanEmptyFolder === "clean_both") {
|
||||
if (local !== undefined && remote !== undefined) {
|
||||
if (syncDirection === "bidirectional") {
|
||||
mixedEntry.decisionBranch = 106;
|
||||
mixedEntry.decision = "folder_to_be_deleted_on_both";
|
||||
mixedEntry.change = true;
|
||||
} else {
|
||||
// right now it does nothing because of "incremental"
|
||||
// TODO: should we delete??
|
||||
mixedEntry.decisionBranch = 109;
|
||||
mixedEntry.decision = "folder_to_skip";
|
||||
mixedEntry.change = false;
|
||||
}
|
||||
} else if (local !== undefined && remote === undefined) {
|
||||
if (syncDirection === "bidirectional") {
|
||||
mixedEntry.decisionBranch = 110;
|
||||
mixedEntry.decision = "folder_to_be_deleted_on_local";
|
||||
mixedEntry.change = true;
|
||||
} else {
|
||||
// right now it does nothing because of "incremental"
|
||||
// TODO: should we delete??
|
||||
mixedEntry.decisionBranch = 111;
|
||||
mixedEntry.decision = "folder_to_skip";
|
||||
mixedEntry.change = false;
|
||||
}
|
||||
} else if (local === undefined && remote !== undefined) {
|
||||
if (syncDirection === "bidirectional") {
|
||||
mixedEntry.decisionBranch = 112;
|
||||
mixedEntry.decision = "folder_to_be_deleted_on_remote";
|
||||
mixedEntry.change = true;
|
||||
} else {
|
||||
// right now it does nothing because of "incremental"
|
||||
// TODO: should we delete??
|
||||
mixedEntry.decisionBranch = 113;
|
||||
mixedEntry.decision = "folder_to_skip";
|
||||
mixedEntry.change = false;
|
||||
}
|
||||
} else {
|
||||
// no folder to delete, do nothing
|
||||
mixedEntry.decisionBranch = 114;
|
||||
mixedEntry.decision = "folder_to_skip";
|
||||
mixedEntry.change = false;
|
||||
}
|
||||
} else {
|
||||
throw Error(
|
||||
@@ -386,6 +417,7 @@ const getSyncPlanInplace = async (
|
||||
// both deleted, only in history
|
||||
mixedEntry.decisionBranch = 1;
|
||||
mixedEntry.decision = "only_history";
|
||||
mixedEntry.change = false;
|
||||
} else if (local !== undefined && remote !== undefined) {
|
||||
if (
|
||||
(local.mtimeCli === remote.mtimeCli ||
|
||||
@@ -395,6 +427,7 @@ const getSyncPlanInplace = async (
|
||||
// completely equal / identical
|
||||
mixedEntry.decisionBranch = 2;
|
||||
mixedEntry.decision = "equal";
|
||||
mixedEntry.change = false;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else {
|
||||
// Both exists, but modified or conflict
|
||||
@@ -417,10 +450,12 @@ const getSyncPlanInplace = async (
|
||||
if (syncDirection === "incremental_push_only") {
|
||||
mixedEntry.decisionBranch = 26;
|
||||
mixedEntry.decision = "conflict_modified_then_keep_local";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 9;
|
||||
mixedEntry.decision = "remote_is_modified_then_pull";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
} else {
|
||||
@@ -439,10 +474,12 @@ const getSyncPlanInplace = async (
|
||||
if (syncDirection === "incremental_pull_only") {
|
||||
mixedEntry.decisionBranch = 27;
|
||||
mixedEntry.decision = "conflict_modified_then_keep_remote";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 10;
|
||||
mixedEntry.decision = "local_is_modified_then_push";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
} else {
|
||||
@@ -464,34 +501,41 @@ const getSyncPlanInplace = async (
|
||||
) {
|
||||
mixedEntry.decisionBranch = 11;
|
||||
mixedEntry.decision = "conflict_created_then_keep_local";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 12;
|
||||
mixedEntry.decision = "conflict_created_then_keep_remote";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
} else if (conflictAction === "keep_larger") {
|
||||
if (local.sizeEnc! >= remote.sizeEnc!) {
|
||||
mixedEntry.decisionBranch = 13;
|
||||
mixedEntry.decision = "conflict_created_then_keep_local";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 14;
|
||||
mixedEntry.decision = "conflict_created_then_keep_remote";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 15;
|
||||
mixedEntry.decision = "conflict_created_then_keep_both";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
} else if (syncDirection === "incremental_pull_only") {
|
||||
mixedEntry.decisionBranch = 22;
|
||||
mixedEntry.decision = "conflict_created_then_keep_remote";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else if (syncDirection === "incremental_push_only") {
|
||||
mixedEntry.decisionBranch = 23;
|
||||
mixedEntry.decision = "conflict_created_then_keep_local";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else {
|
||||
throw Error(
|
||||
@@ -508,34 +552,41 @@ const getSyncPlanInplace = async (
|
||||
) {
|
||||
mixedEntry.decisionBranch = 16;
|
||||
mixedEntry.decision = "conflict_modified_then_keep_local";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 17;
|
||||
mixedEntry.decision = "conflict_modified_then_keep_remote";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
} else if (conflictAction === "keep_larger") {
|
||||
if (local.sizeEnc! >= remote.sizeEnc!) {
|
||||
mixedEntry.decisionBranch = 18;
|
||||
mixedEntry.decision = "conflict_modified_then_keep_local";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 19;
|
||||
mixedEntry.decision = "conflict_modified_then_keep_remote";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 20;
|
||||
mixedEntry.decision = "conflict_modified_then_keep_both";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
} else if (syncDirection === "incremental_pull_only") {
|
||||
mixedEntry.decisionBranch = 24;
|
||||
mixedEntry.decision = "conflict_modified_then_keep_remote";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else if (syncDirection === "incremental_push_only") {
|
||||
mixedEntry.decisionBranch = 25;
|
||||
mixedEntry.decision = "conflict_modified_then_keep_local";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else {
|
||||
throw Error(
|
||||
@@ -549,6 +600,7 @@ const getSyncPlanInplace = async (
|
||||
// The result should be equal!!!
|
||||
mixedEntry.decisionBranch = 21;
|
||||
mixedEntry.decision = "equal";
|
||||
mixedEntry.change = false;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
}
|
||||
@@ -563,15 +615,18 @@ const getSyncPlanInplace = async (
|
||||
if (syncDirection === "incremental_push_only") {
|
||||
mixedEntry.decisionBranch = 28;
|
||||
mixedEntry.decision = "conflict_created_then_do_nothing";
|
||||
mixedEntry.change = false;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 3;
|
||||
mixedEntry.decision = "remote_is_created_then_pull";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 36;
|
||||
mixedEntry.decision = "remote_is_created_too_large_then_do_nothing";
|
||||
mixedEntry.change = false;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
} else if (
|
||||
@@ -583,14 +638,17 @@ const getSyncPlanInplace = async (
|
||||
if (syncDirection === "incremental_push_only") {
|
||||
mixedEntry.decisionBranch = 29;
|
||||
mixedEntry.decision = "conflict_created_then_do_nothing";
|
||||
mixedEntry.change = false;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else if (syncDirection === "incremental_pull_only") {
|
||||
mixedEntry.decisionBranch = 35;
|
||||
mixedEntry.decision = "conflict_created_then_keep_remote";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 4;
|
||||
mixedEntry.decision = "local_is_deleted_thus_also_delete_remote";
|
||||
mixedEntry.change = true;
|
||||
}
|
||||
} else {
|
||||
// if B is in the previous list and MODIFIED, B has been deleted by A but modified by B
|
||||
@@ -601,10 +659,12 @@ const getSyncPlanInplace = async (
|
||||
if (syncDirection === "incremental_push_only") {
|
||||
mixedEntry.decisionBranch = 30;
|
||||
mixedEntry.decision = "conflict_created_then_do_nothing";
|
||||
mixedEntry.change = false;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 5;
|
||||
mixedEntry.decision = "remote_is_modified_then_pull";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
} else {
|
||||
@@ -624,15 +684,18 @@ const getSyncPlanInplace = async (
|
||||
if (syncDirection === "incremental_pull_only") {
|
||||
mixedEntry.decisionBranch = 31;
|
||||
mixedEntry.decision = "conflict_created_then_do_nothing";
|
||||
mixedEntry.change = false;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 6;
|
||||
mixedEntry.decision = "local_is_created_then_push";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 37;
|
||||
mixedEntry.decision = "local_is_created_too_large_then_do_nothing";
|
||||
mixedEntry.change = false;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
} else if (
|
||||
@@ -644,12 +707,15 @@ const getSyncPlanInplace = async (
|
||||
if (syncDirection === "incremental_push_only") {
|
||||
mixedEntry.decisionBranch = 32;
|
||||
mixedEntry.decision = "conflict_created_then_keep_local";
|
||||
mixedEntry.change = true;
|
||||
} else if (syncDirection === "incremental_pull_only") {
|
||||
mixedEntry.decisionBranch = 33;
|
||||
mixedEntry.decision = "conflict_created_then_do_nothing";
|
||||
mixedEntry.change = false;
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 7;
|
||||
mixedEntry.decision = "remote_is_deleted_thus_also_delete_local";
|
||||
mixedEntry.change = true;
|
||||
}
|
||||
} else {
|
||||
// if A is in the previous list and MODIFIED, A has been deleted by B but modified by A
|
||||
@@ -657,10 +723,12 @@ const getSyncPlanInplace = async (
|
||||
if (syncDirection === "incremental_pull_only") {
|
||||
mixedEntry.decisionBranch = 34;
|
||||
mixedEntry.decision = "conflict_created_then_do_nothing";
|
||||
mixedEntry.change = false;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
} else {
|
||||
mixedEntry.decisionBranch = 8;
|
||||
mixedEntry.decision = "local_is_modified_then_push";
|
||||
mixedEntry.change = true;
|
||||
keptFolder.add(getParentFolder(key));
|
||||
}
|
||||
} else {
|
||||
@@ -689,7 +757,7 @@ const getSyncPlanInplace = async (
|
||||
}
|
||||
}
|
||||
|
||||
profiler.insert("getSyncPlanInplace: finish looping");
|
||||
profiler?.insert("getSyncPlanInplace: finish looping");
|
||||
|
||||
keptFolder.delete("/");
|
||||
keptFolder.delete("");
|
||||
@@ -702,17 +770,29 @@ const getSyncPlanInplace = async (
|
||||
const currTimeFmt = unixTimeToStr(currTime);
|
||||
// because the path should not as / in the beginning,
|
||||
// we should be safe to add these keys:
|
||||
const sizeofmixedEntityMappings = roughSizeOfObject(mixedEntityMappings);
|
||||
mixedEntityMappings["/$@meta"] = {
|
||||
key: "/$@meta", // don't mess up with the types
|
||||
sideNotes: {
|
||||
version: "2024047 fs version",
|
||||
version: "20240508 fs version",
|
||||
generateTime: currTime,
|
||||
generateTimeFmt: currTimeFmt,
|
||||
service: settings.serviceType,
|
||||
hasPassword: settings.password !== "",
|
||||
syncConfigDir: settings.syncConfigDir,
|
||||
conflictAction: conflictAction,
|
||||
syncDirection: syncDirection,
|
||||
triggerSource: triggerSource,
|
||||
sizeof: sizeofmixedEntityMappings,
|
||||
},
|
||||
};
|
||||
|
||||
profiler.insert("getSyncPlanInplace: exit");
|
||||
profiler.removeIndent();
|
||||
profiler?.insert("getSyncPlanInplace: exit");
|
||||
profiler?.insertSize(
|
||||
"sizeof mixedEntityMappings in the end of getSyncPlanInplace",
|
||||
mixedEntityMappings
|
||||
);
|
||||
profiler?.removeIndent();
|
||||
|
||||
return mixedEntityMappings;
|
||||
};
|
||||
@@ -906,7 +986,8 @@ async function copyFile(
|
||||
const statsLeft = await left.stat(key);
|
||||
const content = await left.readFile(key);
|
||||
|
||||
if (statsLeft.size === undefined) {
|
||||
if (statsLeft.size === undefined || statsLeft.size === 0) {
|
||||
// some weird bugs on android not returning size. just ignore them
|
||||
statsLeft.size = content.byteLength;
|
||||
} else {
|
||||
if (statsLeft.size !== content.byteLength) {
|
||||
@@ -921,6 +1002,14 @@ async function copyFile(
|
||||
}
|
||||
|
||||
// console.debug(`copyFile: about to start right.writeFile`);
|
||||
if (typeof (content as any).transfer === "function") {
|
||||
return await right.writeFile(
|
||||
key,
|
||||
(content as any).transfer(),
|
||||
statsLeft.mtimeCli,
|
||||
statsLeft.mtimeCli /* TODO */
|
||||
);
|
||||
} else {
|
||||
return await right.writeFile(
|
||||
key,
|
||||
content,
|
||||
@@ -928,6 +1017,7 @@ async function copyFile(
|
||||
statsLeft.mtimeCli /* TODO */
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
async function copyFileOrFolder(
|
||||
key: string,
|
||||
@@ -1101,11 +1191,11 @@ export const doActualSync = async (
|
||||
protectModifyPercentage: number,
|
||||
getProtectModifyPercentageErrorStrFunc: any,
|
||||
db: InternalDBs,
|
||||
profiler: Profiler,
|
||||
profiler: Profiler | undefined,
|
||||
callbackSyncProcess?: any
|
||||
) => {
|
||||
profiler.addIndent();
|
||||
profiler.insert("doActualSync: enter");
|
||||
profiler?.addIndent();
|
||||
profiler?.insert("doActualSync: enter");
|
||||
console.debug(`concurrency === ${concurrency}`);
|
||||
const {
|
||||
onlyMarkSyncedOps,
|
||||
@@ -1123,7 +1213,17 @@ export const doActualSync = async (
|
||||
console.debug(`allFilesCount: ${allFilesCount}`);
|
||||
console.debug(`realModifyDeleteCount: ${realModifyDeleteCount}`);
|
||||
console.debug(`realTotalCount: ${realTotalCount}`);
|
||||
profiler.insert("doActualSync: finish splitting steps");
|
||||
profiler?.insert("doActualSync: finish splitting steps");
|
||||
|
||||
profiler?.insertSize(
|
||||
"doActualSync: sizeof onlyMarkSyncedOps",
|
||||
onlyMarkSyncedOps
|
||||
);
|
||||
profiler?.insertSize(
|
||||
"doActualSync: sizeof folderCreationOps",
|
||||
folderCreationOps
|
||||
);
|
||||
profiler?.insertSize("doActualSync: sizeof realTotalCount", deletionOps);
|
||||
|
||||
console.debug(`protectModifyPercentage: ${protectModifyPercentage}`);
|
||||
|
||||
@@ -1148,8 +1248,8 @@ export const doActualSync = async (
|
||||
allFilesCount
|
||||
);
|
||||
|
||||
profiler.insert("doActualSync: error branch");
|
||||
profiler.removeIndent();
|
||||
profiler?.insert("doActualSync: error branch");
|
||||
profiler?.removeIndent();
|
||||
throw Error(errorStr);
|
||||
}
|
||||
}
|
||||
@@ -1169,8 +1269,8 @@ export const doActualSync = async (
|
||||
|
||||
let realCounter = 0;
|
||||
for (let i = 0; i < nested.length; ++i) {
|
||||
profiler.addIndent();
|
||||
profiler.insert(`doActualSync: step ${i} start`);
|
||||
profiler?.addIndent();
|
||||
profiler?.insert(`doActualSync: step ${i} start`);
|
||||
console.debug(logTexts[i]);
|
||||
|
||||
const operations = nested[i];
|
||||
@@ -1243,12 +1343,12 @@ export const doActualSync = async (
|
||||
}
|
||||
}
|
||||
|
||||
profiler.insert(`doActualSync: step ${i} end`);
|
||||
profiler.removeIndent();
|
||||
profiler?.insert(`doActualSync: step ${i} end`);
|
||||
profiler?.removeIndent();
|
||||
}
|
||||
|
||||
profiler.insert(`doActualSync: exit`);
|
||||
profiler.removeIndent();
|
||||
profiler?.insert(`doActualSync: exit`);
|
||||
profiler?.removeIndent();
|
||||
};
|
||||
|
||||
export type SyncStatusType =
|
||||
@@ -1270,7 +1370,7 @@ export async function syncer(
|
||||
fsLocal: FakeFs,
|
||||
fsRemote: FakeFs,
|
||||
fsEncrypt: FakeFsEncrypt,
|
||||
profiler: Profiler,
|
||||
profiler: Profiler | undefined,
|
||||
db: InternalDBs,
|
||||
triggerSource: SyncTriggerSourceType,
|
||||
profileID: string,
|
||||
@@ -1282,26 +1382,32 @@ export async function syncer(
|
||||
notifyFunc?: (s: SyncTriggerSourceType, step: number) => Promise<any>,
|
||||
errNotifyFunc?: (s: SyncTriggerSourceType, error: Error) => Promise<any>,
|
||||
ribboonFunc?: (s: SyncTriggerSourceType, step: number) => Promise<any>,
|
||||
statusBarFunc?: (s: SyncTriggerSourceType, step: number) => any,
|
||||
statusBarFunc?: (
|
||||
s: SyncTriggerSourceType,
|
||||
step: number,
|
||||
everythingOk: boolean
|
||||
) => any,
|
||||
callbackSyncProcess?: any
|
||||
) {
|
||||
console.info(`startting sync.`);
|
||||
markIsSyncingFunc(true);
|
||||
|
||||
let everythingOk = true;
|
||||
|
||||
let step = 0; // dry mode only
|
||||
await notifyFunc?.(triggerSource, step);
|
||||
|
||||
step = 1;
|
||||
await notifyFunc?.(triggerSource, step);
|
||||
await ribboonFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step);
|
||||
profiler.insert("start big sync func");
|
||||
await statusBarFunc?.(triggerSource, step, everythingOk);
|
||||
profiler?.insert("start big sync func");
|
||||
|
||||
try {
|
||||
step = 2;
|
||||
await notifyFunc?.(triggerSource, step);
|
||||
await ribboonFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step, everythingOk);
|
||||
if (fsEncrypt.innerFs !== fsRemote) {
|
||||
throw Error(`your enc should has inner of the remote`);
|
||||
}
|
||||
@@ -1309,32 +1415,32 @@ export async function syncer(
|
||||
if (!passwordCheckResult.ok) {
|
||||
throw Error(passwordCheckResult.reason);
|
||||
}
|
||||
profiler.insert(
|
||||
profiler?.insert(
|
||||
`finish step${step} (list partial remote and check password)`
|
||||
);
|
||||
|
||||
step = 3;
|
||||
await notifyFunc?.(triggerSource, step);
|
||||
await ribboonFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step, everythingOk);
|
||||
const remoteEntityList = await fsEncrypt.walk();
|
||||
// console.debug(`remoteEntityList:`);
|
||||
// console.debug(remoteEntityList);
|
||||
profiler.insert(`finish step${step} (list remote)`);
|
||||
profiler?.insert(`finish step${step} (list remote)`);
|
||||
|
||||
step = 4;
|
||||
await notifyFunc?.(triggerSource, step);
|
||||
await ribboonFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step, everythingOk);
|
||||
const localEntityList = await fsLocal.walk();
|
||||
// console.debug(`localEntityList:`);
|
||||
// console.debug(localEntityList);
|
||||
profiler.insert(`finish step${step} (list local)`);
|
||||
profiler?.insert(`finish step${step} (list local)`);
|
||||
|
||||
step = 5;
|
||||
await notifyFunc?.(triggerSource, step);
|
||||
await ribboonFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step, everythingOk);
|
||||
const prevSyncEntityList = await getAllPrevSyncRecordsByVaultAndProfile(
|
||||
db,
|
||||
vaultRandomID,
|
||||
@@ -1342,12 +1448,12 @@ export async function syncer(
|
||||
);
|
||||
// console.debug(`prevSyncEntityList:`);
|
||||
// console.debug(prevSyncEntityList);
|
||||
profiler.insert(`finish step${step} (prev sync)`);
|
||||
profiler?.insert(`finish step${step} (prev sync)`);
|
||||
|
||||
step = 6;
|
||||
await notifyFunc?.(triggerSource, step);
|
||||
await ribboonFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step, everythingOk);
|
||||
let mixedEntityMappings = await ensembleMixedEnties(
|
||||
localEntityList,
|
||||
prevSyncEntityList,
|
||||
@@ -1360,7 +1466,7 @@ export async function syncer(
|
||||
settings.serviceType,
|
||||
profiler
|
||||
);
|
||||
profiler.insert(`finish step${step} (build partial mixedEntity)`);
|
||||
profiler?.insert(`finish step${step} (build partial mixedEntity)`);
|
||||
|
||||
mixedEntityMappings = await getSyncPlanInplace(
|
||||
mixedEntityMappings,
|
||||
@@ -1368,11 +1474,13 @@ export async function syncer(
|
||||
settings.skipSizeLargerThan ?? -1,
|
||||
settings.conflictAction ?? "keep_newer",
|
||||
settings.syncDirection ?? "bidirectional",
|
||||
profiler
|
||||
profiler,
|
||||
settings,
|
||||
triggerSource
|
||||
);
|
||||
console.info(`mixedEntityMappings:`);
|
||||
console.info(mixedEntityMappings); // for debugging
|
||||
profiler.insert("finish building full sync plan");
|
||||
console.debug(`mixedEntityMappings:`);
|
||||
console.debug(mixedEntityMappings); // for debugging
|
||||
profiler?.insert("finish building full sync plan");
|
||||
|
||||
await insertSyncPlanRecordByVault(
|
||||
db,
|
||||
@@ -1380,8 +1488,8 @@ export async function syncer(
|
||||
vaultRandomID,
|
||||
settings.serviceType
|
||||
);
|
||||
profiler.insert("finish writing sync plan");
|
||||
profiler.insert(`finish step${step} (make plan)`);
|
||||
profiler?.insert("finish writing sync plan");
|
||||
profiler?.insert(`finish step${step} (make plan)`);
|
||||
|
||||
// The operations above are almost read only and kind of safe.
|
||||
// The operations below begins to write or delete (!!!) something.
|
||||
@@ -1390,7 +1498,7 @@ export async function syncer(
|
||||
if (triggerSource !== "dry") {
|
||||
await notifyFunc?.(triggerSource, step);
|
||||
await ribboonFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step, everythingOk);
|
||||
await doActualSync(
|
||||
mixedEntityMappings,
|
||||
fsLocal,
|
||||
@@ -1404,31 +1512,32 @@ export async function syncer(
|
||||
profiler,
|
||||
callbackSyncProcess
|
||||
);
|
||||
profiler.insert(`finish step${step} (actual sync)`);
|
||||
profiler?.insert(`finish step${step} (actual sync)`);
|
||||
} else {
|
||||
await notifyFunc?.(triggerSource, step);
|
||||
await ribboonFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step);
|
||||
profiler.insert(
|
||||
await statusBarFunc?.(triggerSource, step, everythingOk);
|
||||
profiler?.insert(
|
||||
`finish step${step} (skip actual sync because of dry run)`
|
||||
);
|
||||
}
|
||||
} catch (error: any) {
|
||||
profiler.insert("start error branch");
|
||||
profiler?.insert("start error branch");
|
||||
everythingOk = false;
|
||||
await errNotifyFunc?.(triggerSource, error as Error);
|
||||
|
||||
profiler.insert("finish error branch");
|
||||
profiler?.insert("finish error branch");
|
||||
} finally {
|
||||
}
|
||||
|
||||
profiler.insert("finish syncRun");
|
||||
// console.debug(profiler.toString());
|
||||
await profiler.save(db, vaultRandomID, settings.serviceType);
|
||||
profiler?.insert("finish syncRun");
|
||||
// console.debug(profiler?.toString());
|
||||
await profiler?.save(db, vaultRandomID, settings.serviceType);
|
||||
|
||||
step = 8;
|
||||
await notifyFunc?.(triggerSource, step);
|
||||
await ribboonFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step);
|
||||
await statusBarFunc?.(triggerSource, step, everythingOk);
|
||||
|
||||
console.info(`endding sync.`);
|
||||
markIsSyncingFunc(false);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { App, Modal, Notice, PluginSettingTab, Setting } from "obsidian";
|
||||
import type RemotelySavePlugin from "./main"; // unavoidable
|
||||
import { type App, Modal } from "obsidian";
|
||||
import type { TransItemType } from "./i18n";
|
||||
import type RemotelySavePlugin from "./main"; // unavoidable
|
||||
|
||||
import { stringToFragment } from "./misc";
|
||||
|
||||
@@ -17,7 +17,7 @@ export class SyncAlgoV3Modal extends Modal {
|
||||
this.requireUpdateAllDev = false;
|
||||
}
|
||||
onOpen() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
const t = (x: TransItemType, vars?: any) => {
|
||||
return this.plugin.i18n.t(x, vars);
|
||||
};
|
||||
@@ -112,7 +112,7 @@ export class SyncAlgoV3Modal extends Modal {
|
||||
}
|
||||
|
||||
onClose() {
|
||||
let { contentEl } = this;
|
||||
const { contentEl } = this;
|
||||
contentEl.empty();
|
||||
if (this.agree) {
|
||||
console.info("agree to use the new algorithm");
|
||||
|
||||
+3
-2
@@ -82,6 +82,7 @@
|
||||
font-weight: bolder;
|
||||
}
|
||||
|
||||
.setting-need-wrapping-mobile .setting-item-control {
|
||||
flex-wrap: wrap;
|
||||
.setting-need-wrapping .setting-item-control {
|
||||
/* flex-wrap: wrap; */
|
||||
display: grid;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { strict as assert } from "assert";
|
||||
|
||||
import { RemotelySavePluginSettings } from "../src/baseTypes";
|
||||
import type { RemotelySavePluginSettings } from "../src/baseTypes";
|
||||
import { messyConfigToNormal, normalConfigToMessy } from "../src/configPersist";
|
||||
|
||||
const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
import { base64ToBase64url, bufferToArrayBuffer } from "../src/misc";
|
||||
|
||||
describe("Encryption OpenSSL tests", () => {
|
||||
beforeEach(function () {
|
||||
beforeEach(() => {
|
||||
global.window = {
|
||||
crypto: require("crypto").webcrypto,
|
||||
} as any;
|
||||
@@ -157,7 +157,7 @@ describe("Encryption OpenSSL tests", () => {
|
||||
|
||||
assert.throws(() => getSizeFromEncToOrig(14787231));
|
||||
|
||||
let { minSize, maxSize } = getSizeFromEncToOrig(14787232);
|
||||
const { minSize, maxSize } = getSizeFromEncToOrig(14787232);
|
||||
assert.ok(minSize <= 14787203 && 14787203 <= maxSize);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { strict as assert } from "assert";
|
||||
import {
|
||||
type MetadataOnRemote,
|
||||
isEqualMetadataOnRemote,
|
||||
MetadataOnRemote,
|
||||
} from "../src/metadataOnRemote";
|
||||
|
||||
describe("Metadata operations tests", () => {
|
||||
|
||||
+78
-1
@@ -179,7 +179,7 @@ describe("Misc: get dirname", () => {
|
||||
});
|
||||
|
||||
describe("Misc: extract svg", () => {
|
||||
beforeEach(function () {
|
||||
beforeEach(() => {
|
||||
const fakeBrowser = new JSDOM("");
|
||||
global.window = fakeBrowser.window as any;
|
||||
});
|
||||
@@ -286,6 +286,83 @@ describe("Misc: special char for dir", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("Misc: split chunk ranges", () => {
|
||||
it("should fail on negative numner", () => {
|
||||
assert.throws(() => misc.splitFileSizeToChunkRanges(-1, 2));
|
||||
assert.throws(() => misc.splitFileSizeToChunkRanges(1, -1));
|
||||
assert.throws(() => misc.splitFileSizeToChunkRanges(1, 0));
|
||||
});
|
||||
|
||||
it("should return nothing for 0 input", () => {
|
||||
let input: [number, number] = [0, 1];
|
||||
let output: any = [];
|
||||
assert.deepStrictEqual(output, misc.splitFileSizeToChunkRanges(...input));
|
||||
|
||||
input = [0, 100];
|
||||
output = [];
|
||||
assert.deepStrictEqual(output, misc.splitFileSizeToChunkRanges(...input));
|
||||
});
|
||||
|
||||
it("should return single item for 1 input", () => {
|
||||
let input: [number, number] = [1, 1];
|
||||
let output = [{ start: 0, end: 0 }];
|
||||
assert.deepStrictEqual(output, misc.splitFileSizeToChunkRanges(...input));
|
||||
|
||||
input = [1, 100];
|
||||
output = [{ start: 0, end: 0 }];
|
||||
assert.deepStrictEqual(output, misc.splitFileSizeToChunkRanges(...input));
|
||||
});
|
||||
|
||||
it("should return single item for larger or equal input", () => {
|
||||
let input: [number, number] = [10, 10];
|
||||
let output = [{ start: 0, end: 9 }];
|
||||
assert.deepStrictEqual(output, misc.splitFileSizeToChunkRanges(...input));
|
||||
|
||||
input = [10, 21];
|
||||
output = [{ start: 0, end: 9 }];
|
||||
assert.deepStrictEqual(output, misc.splitFileSizeToChunkRanges(...input));
|
||||
});
|
||||
|
||||
it("should return correct items for normal input", () => {
|
||||
let input: [number, number] = [10, 9];
|
||||
let output = [
|
||||
{ start: 0, end: 8 },
|
||||
{ start: 9, end: 9 },
|
||||
];
|
||||
assert.deepStrictEqual(output, misc.splitFileSizeToChunkRanges(...input));
|
||||
|
||||
input = [10, 5];
|
||||
output = [
|
||||
{ start: 0, end: 4 },
|
||||
{ start: 5, end: 9 },
|
||||
];
|
||||
assert.deepStrictEqual(output, misc.splitFileSizeToChunkRanges(...input));
|
||||
|
||||
input = [3, 1];
|
||||
output = [
|
||||
{ start: 0, end: 0 },
|
||||
{ start: 1, end: 1 },
|
||||
{ start: 2, end: 2 },
|
||||
];
|
||||
assert.deepStrictEqual(output, misc.splitFileSizeToChunkRanges(...input));
|
||||
|
||||
input = [15, 5];
|
||||
output = [
|
||||
{ start: 0, end: 4 },
|
||||
{ start: 5, end: 9 },
|
||||
{ start: 10, end: 14 },
|
||||
];
|
||||
assert.deepStrictEqual(output, misc.splitFileSizeToChunkRanges(...input));
|
||||
|
||||
input = [1024, 578];
|
||||
output = [
|
||||
{ start: 0, end: 577 },
|
||||
{ start: 578, end: 1023 },
|
||||
];
|
||||
assert.deepStrictEqual(output, misc.splitFileSizeToChunkRanges(...input));
|
||||
});
|
||||
});
|
||||
|
||||
describe("Misc: Dropbox: should fix the folder name cases", () => {
|
||||
it("should do nothing on empty folders", () => {
|
||||
const input: any[] = [];
|
||||
|
||||
Reference in New Issue
Block a user