Compare commits

...
15 Commits
Author SHA1 Message Date
fyears d4ee07306d bump to 0.3.17
Release A New Version / build (16.x) (push) Failing after 45s
2022-04-08 09:34:29 +08:00
fyears 303f47f7c1 add hints for too many errors 2022-04-08 09:32:36 +08:00
fyears 8270a02246 finally a correct way to throw errors 2022-04-07 23:59:57 +08:00
fyears 4686d911f4 again remove unused log 2022-04-07 23:32:28 +08:00
fyears e704199da0 add more specific desc to s3 cors 2022-04-07 22:00:46 +08:00
fyears 5a4e8e51a1 more verbose for error 2022-04-06 01:27:42 +08:00
fyears 6f339583c1 remove not useful log 2022-04-06 01:26:08 +08:00
fyears f042e31643 new docs to debug 2022-04-06 01:04:11 +08:00
fyears bb21714b45 auto clean sync plans 2022-04-06 00:35:21 +08:00
fyears b3c107ce58 logtodb 2022-04-06 00:24:27 +08:00
fyears b39544b43b add human readable time 2022-04-05 13:26:46 +08:00
fyears b8c4a2bd9a explictly state the reason to create .gitignore 2022-04-05 00:48:01 +08:00
fyears c1c50cd479 only create .gitignore if not exists 2022-04-05 00:47:24 +08:00
fyears 41073d1576 add preset rules for webdav 2022-04-04 23:53:36 +08:00
fyears 429063ebd1 fix error in release action 2022-04-03 16:10:53 +08:00
29 changed files with 766 additions and 76 deletions
-2
View File
@@ -12,8 +12,6 @@ on:
push: push:
tags: tags:
- "*" # Push events to matching any tag format, i.e. 1.0, 20.15.10 - "*" # Push events to matching any tag format, i.e. 1.0, 20.15.10
branches:
- master
jobs: jobs:
build: build:
+3
View File
@@ -35,6 +35,9 @@ This is yet another unofficial sync plugin for Obsidian. If you like it or find
- **No Conflict resolution. No content-diff-and-patch algorithm.** All files and folders are compared using their local and remote "last modified time" and those with later "last modified time" wins. - **No Conflict resolution. No content-diff-and-patch algorithm.** All files and folders are compared using their local and remote "last modified time" and those with later "last modified time" wins.
- **Cloud services cost you money.** Always be aware of the costs and pricing. Specifically, all the operations, including but not limited to downloading, uploading, listing all files, calling any api, storage sizes, may or may not cost you money. - **Cloud services cost you money.** Always be aware of the costs and pricing. Specifically, all the operations, including but not limited to downloading, uploading, listing all files, calling any api, storage sizes, may or may not cost you money.
- **Some limitations from the browser environment.** More technical details are [in the doc](./docs/browser_env.md). - **Some limitations from the browser environment.** More technical details are [in the doc](./docs/browser_env.md).
- **You should protect your `data.json` file.** The file contains sensitive information.
- It's strongly advised **NOT** to share your `data.json` file to anyone.
- It's usually **NOT** a good idea to check the file into version control. By default, the plugin tries to create a `.gitignore` file inside the plugin directory if it doesn't exist, for ignoring `data.json` in the `git` version control. If you know exactly what it means and want to remove the setting, please modify the `.gitignore` file or set it to be empty.
## Questions, Suggestions, Or Bugs ## Questions, Suggestions, Or Bugs
+9 -1
View File
@@ -6,6 +6,14 @@ Ideally, users do not need to debug anything. But if something bad happened, we
See [here](./export_sync_plans.md). See [here](./export_sync_plans.md).
## Advanced: Check Console Output ## Advanced: Check Console Output Directly
...of desktop and Android.
See [here](./check_console_output.md). See [here](./check_console_output.md).
## Advanced: Save Console Output Then Read Them Later
This method works for desktop and mobile devices (iOS, Android).
See [here](./save_console_output_and_export.md).
+8 -2
View File
@@ -1,6 +1,6 @@
# Check Console Output # Check Console Output
If you are using Obsidian on desktop, you can check the Obsidian console. If you are using Obsidian on desktop or Android, you can check the Obsidian console.
## Disable Auto Sync Firstly ## Disable Auto Sync Firstly
@@ -12,6 +12,12 @@ Go to the plugin settings, scroll down to the section "Debug" -> "alter console
## Check The Output ## Check The Output
Then, press the keyboard shortcut "ctrl+shift+i" if you are on Windows or Linux, or press "cmd+shift+i" if you are on macOS. You should be able to see the console of Obsidian. - If you are on desktop
Press the keyboard shortcut "ctrl+shift+i" if you are on Windows or Linux, or press "cmd+shift+i" if you are on macOS. You should be able to see the console of Obsidian.
- If you are using Android
You need to [enable USB debugging](https://developer.android.com/studio/debug/dev-options#enable) on your Android, then connect your Android to a computer using USB, then open the **desktop** Chrome browser and go to the special web page <chrome://inspect>. You shall be able to see the "inspect" link inside the special page, then click the link to open the console. After debugging, remember to turn off USB debugging.
Trigger the sync manually (by clicking the icon on the ribbon sidebar). Something (hopefully) helpful should show up in the console. You could understand what happened and what goes wrong more explictly by checking the output. Trigger the sync manually (by clicking the icon on the ribbon sidebar). Something (hopefully) helpful should show up in the console. You could understand what happened and what goes wrong more explictly by checking the output.
@@ -0,0 +1,25 @@
# Save Console Output And Read Them Later
## Disable Auto Sync Firstly
You should disable auto sync to avoid any unexpected running.
## Set The Output Level To Debug
Go to the plugin settings, scroll down to the section "Debug" -> "alter console log level", and change it from "info" to "debug".
## Enable Saving The Output To DB
Go to the plugin settings, scroll down to the section "Debug" -> "Save Console Logs Into DB", and change it from "disable" to "enable". **This setting has some performance cost, so do NOT always turn this on when not necessary!**
## Run The Sync
Trigger the sync manually (by clicking the icon on the ribbon sidebar). Something (hopefully) helpful should show up in the console. The the console logs are also saved into DB now.
## Export The Output And Read The Logs
Go to the plugin settings, scroll down to the section "Debug" -> "Export Console Logs From DB", and click the button. A new file `log_hist_exported_on_....md` should be created inside the special folder `_debug_remotely_save/`. You could read it and hopefully find something useful.
## Disable Saving The Output To DB
After debugging, go to the plugin settings, scroll down to the section "Debug" -> "Save Console Logs Into DB", and change it from "enable" to "disable".
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"id": "remotely-save", "id": "remotely-save",
"name": "Remotely Save", "name": "Remotely Save",
"version": "0.3.16", "version": "0.3.17",
"minAppVersion": "0.13.21", "minAppVersion": "0.13.21",
"description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.", "description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
"author": "fyears", "author": "fyears",
+2 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "remotely-save", "name": "remotely-save",
"version": "0.3.16", "version": "0.3.17",
"description": "This is yet another sync plugin for Obsidian app.", "description": "This is yet another sync plugin for Obsidian app.",
"scripts": { "scripts": {
"dev2": "node esbuild.config.mjs", "dev2": "node esbuild.config.mjs",
@@ -62,6 +62,7 @@
"@fyears/tsqueue": "^1.0.1", "@fyears/tsqueue": "^1.0.1",
"@microsoft/microsoft-graph-client": "^3.0.1", "@microsoft/microsoft-graph-client": "^3.0.1",
"acorn": "^8.5.0", "acorn": "^8.5.0",
"aggregate-error": "^4.0.0",
"assert": "^2.0.0", "assert": "^2.0.0",
"aws-crt": "^1.10.1", "aws-crt": "^1.10.1",
"buffer": "^6.0.3", "buffer": "^6.0.3",
+11
View File
@@ -84,6 +84,7 @@ export interface RemotelySavePluginSettings {
syncConfigDir?: boolean; syncConfigDir?: boolean;
syncUnderscoreItems?: boolean; syncUnderscoreItems?: boolean;
lang?: LangTypeAndAuto; lang?: LangTypeAndAuto;
logToDB?: boolean;
/** /**
* @deprecated * @deprecated
@@ -145,9 +146,19 @@ export interface FileOrFolderMixedState {
decisionBranch?: number; decisionBranch?: number;
syncDone?: "done"; syncDone?: "done";
remoteEncryptedKey?: string; remoteEncryptedKey?: string;
mtimeLocalFmt?: string;
mtimeRemoteFmt?: string;
deltimeLocalFmt?: string;
deltimeRemoteFmt?: string;
} }
export const API_VER_STAT_FOLDER = "0.13.27"; export const API_VER_STAT_FOLDER = "0.13.27";
export const API_VER_REQURL = "0.13.26"; export const API_VER_REQURL = "0.13.26";
export const VALID_REQURL = export const VALID_REQURL =
requireApiVersion(API_VER_REQURL) && !Platform.isAndroidApp; requireApiVersion(API_VER_REQURL) && !Platform.isAndroidApp;
export const DEFAULT_DEBUG_FOLDER = "_debug_remotely_save/";
export const DEFAULT_SYNC_PLANS_HISTORY_FILE_PREFIX =
"sync_plans_hist_exported_on_";
export const DEFAULT_LOG_HISTORY_FILE_PREFIX = "log_hist_exported_on_";
+8 -9
View File
@@ -3,8 +3,7 @@ import { reverseString } from "./misc";
import type { RemotelySavePluginSettings } from "./baseTypes"; import type { RemotelySavePluginSettings } from "./baseTypes";
import * as origLog from "loglevel"; import { log } from "./moreOnLog";
const log = origLog.getLogger("rs-default");
const DEFAULT_README: string = const DEFAULT_README: string =
"The file contains sensitive info, so DO NOT take screenshot of, copy, or share it to anyone! It's also generated automatically, so do not edit it manually."; "The file contains sensitive info, so DO NOT take screenshot of, copy, or share it to anyone! It's also generated automatically, so do not edit it manually.";
@@ -20,8 +19,8 @@ interface MessyConfigType {
export const messyConfigToNormal = ( export const messyConfigToNormal = (
x: MessyConfigType | RemotelySavePluginSettings | null | undefined x: MessyConfigType | RemotelySavePluginSettings | null | undefined
): RemotelySavePluginSettings | null | undefined => { ): RemotelySavePluginSettings | null | undefined => {
log.debug("loading, original config on disk:"); // log.debug("loading, original config on disk:");
log.debug(x); // log.debug(x);
if (x === null || x === undefined) { if (x === null || x === undefined) {
log.debug("the messy config is null or undefined, skip"); log.debug("the messy config is null or undefined, skip");
return x as any; return x as any;
@@ -36,12 +35,12 @@ export const messyConfigToNormal = (
}) as Buffer }) as Buffer
).toString("utf-8") ).toString("utf-8")
); );
log.debug("loading, parsed config is:"); // log.debug("loading, parsed config is:");
log.debug(y); // log.debug(y);
return y; return y;
} else { } else {
// return as is // return as is
log.debug("loading, parsed config is the same"); // log.debug("loading, parsed config is the same");
return x; return x;
} }
}; };
@@ -64,7 +63,7 @@ export const normalConfigToMessy = (
}) })
), ),
}; };
log.debug("encoding, encoded config is:"); // log.debug("encoding, encoded config is:");
log.debug(y); // log.debug(y);
return y; return y;
}; };
+34 -6
View File
@@ -1,15 +1,19 @@
import { TAbstractFile, TFolder, TFile, Vault } from "obsidian"; import { TAbstractFile, TFolder, TFile, Vault } from "obsidian";
import type { SyncPlanType } from "./sync"; import type { SyncPlanType } from "./sync";
import { readAllSyncPlanRecordTextsByVault } from "./localdb"; import {
readAllSyncPlanRecordTextsByVault,
readAllLogRecordTextsByVault,
} from "./localdb";
import type { InternalDBs } from "./localdb"; import type { InternalDBs } from "./localdb";
import { mkdirpInVault } from "./misc"; import { mkdirpInVault } from "./misc";
import {
DEFAULT_DEBUG_FOLDER,
DEFAULT_LOG_HISTORY_FILE_PREFIX,
DEFAULT_SYNC_PLANS_HISTORY_FILE_PREFIX,
} from "./baseTypes";
import * as origLog from "loglevel"; import { log } from "./moreOnLog";
const log = origLog.getLogger("rs-default");
const DEFAULT_DEBUG_FOLDER = "_debug_remotely_save/";
const DEFAULT_SYNC_PLANS_HISTORY_FILE_PREFIX = "sync_plans_hist_exported_on_";
export const exportVaultSyncPlansToFiles = async ( export const exportVaultSyncPlansToFiles = async (
db: InternalDBs, db: InternalDBs,
@@ -34,3 +38,27 @@ export const exportVaultSyncPlansToFiles = async (
}); });
log.info("finish exporting"); log.info("finish exporting");
}; };
export const exportVaultLoggerOutputToFiles = async (
db: InternalDBs,
vault: Vault,
vaultRandomID: string
) => {
await mkdirpInVault(DEFAULT_DEBUG_FOLDER, vault);
const records = await readAllLogRecordTextsByVault(db, vaultRandomID);
let md = "";
if (records.length === 0) {
md = "No logger history found.";
} else {
md =
"Logger history found:\n\n" +
"```text\n" +
records.join("\n") +
"\n```\n";
}
const ts = Date.now();
const filePath = `${DEFAULT_DEBUG_FOLDER}${DEFAULT_LOG_HISTORY_FILE_PREFIX}${ts}.md`;
await vault.create(filePath, md, {
mtime: ts,
});
};
+1 -2
View File
@@ -1,8 +1,7 @@
import { base32, base64url } from "rfc4648"; import { base32, base64url } from "rfc4648";
import { bufferToArrayBuffer, hexStringToTypedArray } from "./misc"; import { bufferToArrayBuffer, hexStringToTypedArray } from "./misc";
import * as origLog from "loglevel"; import { log } from "./moreOnLog";
const log = origLog.getLogger("rs-default");
const DEFAULT_ITER = 20000; const DEFAULT_ITER = 20000;
+1 -2
View File
@@ -7,8 +7,7 @@ import {
RemotelySavePluginSettings, RemotelySavePluginSettings,
} from "./baseTypes"; } from "./baseTypes";
import * as origLog from "loglevel"; import { log } from "./moreOnLog";
const log = origLog.getLogger("rs-default");
export const exportQrCodeUri = async ( export const exportQrCodeUri = async (
settings: RemotelySavePluginSettings, settings: RemotelySavePluginSettings,
+141 -5
View File
@@ -1,14 +1,13 @@
import localforage from "localforage"; import localforage from "localforage";
export type LocalForage = typeof localforage;
import { nanoid } from "nanoid";
import { requireApiVersion, TAbstractFile, TFile, TFolder } from "obsidian"; import { requireApiVersion, TAbstractFile, TFile, TFolder } from "obsidian";
import { API_VER_STAT_FOLDER, SUPPORTED_SERVICES_TYPE } from "./baseTypes"; import { API_VER_STAT_FOLDER, SUPPORTED_SERVICES_TYPE } from "./baseTypes";
import type { SyncPlanType } from "./sync"; import type { SyncPlanType } from "./sync";
import { toText, unixTimeToStr } from "./misc";
export type LocalForage = typeof localforage; import { log } from "./moreOnLog";
import * as origLog from "loglevel";
import { nanoid } from "nanoid";
const log = origLog.getLogger("rs-default");
const DB_VERSION_NUMBER_IN_HISTORY = [20211114, 20220108, 20220326]; const DB_VERSION_NUMBER_IN_HISTORY = [20211114, 20220108, 20220326];
export const DEFAULT_DB_VERSION_NUMBER: number = 20220326; export const DEFAULT_DB_VERSION_NUMBER: number = 20220326;
@@ -18,6 +17,7 @@ export const DEFAULT_TBL_FILE_HISTORY = "filefolderoperationhistory";
export const DEFAULT_TBL_SYNC_MAPPING = "syncmetadatahistory"; export const DEFAULT_TBL_SYNC_MAPPING = "syncmetadatahistory";
export const DEFAULT_SYNC_PLANS_HISTORY = "syncplanshistory"; export const DEFAULT_SYNC_PLANS_HISTORY = "syncplanshistory";
export const DEFAULT_TBL_VAULT_RANDOM_ID_MAPPING = "vaultrandomidmapping"; export const DEFAULT_TBL_VAULT_RANDOM_ID_MAPPING = "vaultrandomidmapping";
export const DEFAULT_TBL_LOGGER_OUTPUT = "loggeroutput";
export interface FileFolderHistoryRecord { export interface FileFolderHistoryRecord {
key: string; key: string;
@@ -57,6 +57,7 @@ export interface InternalDBs {
syncMappingTbl: LocalForage; syncMappingTbl: LocalForage;
syncPlansTbl: LocalForage; syncPlansTbl: LocalForage;
vaultRandomIDMappingTbl: LocalForage; vaultRandomIDMappingTbl: LocalForage;
loggerOutputTbl: LocalForage;
} }
/** /**
@@ -211,6 +212,10 @@ export const prepareDBs = async (
name: DEFAULT_DB_NAME, name: DEFAULT_DB_NAME,
storeName: DEFAULT_TBL_VAULT_RANDOM_ID_MAPPING, storeName: DEFAULT_TBL_VAULT_RANDOM_ID_MAPPING,
}), }),
loggerOutputTbl: localforage.createInstance({
name: DEFAULT_DB_NAME,
storeName: DEFAULT_TBL_LOGGER_OUTPUT,
}),
} as InternalDBs; } as InternalDBs;
// try to get vaultRandomID firstly // try to get vaultRandomID firstly
@@ -516,6 +521,7 @@ export const insertSyncPlanRecordByVault = async (
) => { ) => {
const record = { const record = {
ts: syncPlan.ts, ts: syncPlan.ts,
tsFmt: syncPlan.tsFmt,
vaultRandomID: vaultRandomID, vaultRandomID: vaultRandomID,
remoteType: syncPlan.remoteType, remoteType: syncPlan.remoteType,
syncPlan: JSON.stringify(syncPlan /* directly stringify */, null, 2), syncPlan: JSON.stringify(syncPlan /* directly stringify */, null, 2),
@@ -545,3 +551,133 @@ export const readAllSyncPlanRecordTextsByVault = async (
return records.map((x) => x.syncPlan); return records.map((x) => x.syncPlan);
} }
}; };
/**
* We remove records that are older than 7 days or 10000 records.
* It's a heavy operation, so we shall not place it in the start up.
* @param db
*/
export const clearExpiredSyncPlanRecords = async (db: InternalDBs) => {
const MILLISECONDS_OLD = 1000 * 60 * 60 * 24 * 7; // 7 days
const COUNT_TO_MANY = 10000;
const currTs = Date.now();
const expiredTs = currTs - MILLISECONDS_OLD;
let records = (await db.syncPlansTbl.keys()).map((key) => {
const ts = parseInt(key.split("\t")[1]);
const expired = ts <= expiredTs;
return {
ts: ts,
key: key,
expired: expired,
};
});
const keysToRemove = new Set(
records.filter((x) => x.expired).map((x) => x.key)
);
if (records.length - keysToRemove.size > COUNT_TO_MANY) {
// we need to find out records beyond 10000 records
records = records.filter((x) => !x.expired); // shrink the array
records.sort((a, b) => -(a.ts - b.ts)); // descending
records.slice(COUNT_TO_MANY).forEach((element) => {
keysToRemove.add(element.key);
});
}
const ps = [] as Promise<void>[];
keysToRemove.forEach((element) => {
ps.push(db.syncPlansTbl.removeItem(element));
});
await Promise.all(ps);
};
export const readAllLogRecordTextsByVault = async (
db: InternalDBs,
vaultRandomID: string
) => {
const records = [] as { ts: number; r: string }[];
await db.loggerOutputTbl.iterate((value, key, iterationNumber) => {
if (key.startsWith(`${vaultRandomID}\t`)) {
const item = {
ts: parseInt(key.split("\t")[1]),
r: value as string,
};
records.push(item);
}
});
// while reading the logs, we want it to be ascending
records.sort((a, b) => a.ts - b.ts);
if (records === undefined) {
return [] as string[];
} else {
return records.map((x) => x.r);
}
};
export const insertLoggerOutputByVault = async (
db: InternalDBs,
vaultRandomID: string,
...msg: any[]
) => {
const ts = Date.now();
const tsFmt = unixTimeToStr(ts);
const key = `${vaultRandomID}\t${ts}`;
try {
const val = [`[${tsFmt}]`, ...msg.map((x) => toText(x))].join(" ");
db.loggerOutputTbl.setItem(key, val);
} catch (err) {
// give up, and let it pass
}
};
export const clearAllLoggerOutputRecords = async (db: InternalDBs) => {
await db.loggerOutputTbl.clear();
};
/**
* We remove records that are older than 7 days or 10000 records.
* It's a heavy operation, so we shall not place it in the start up.
* @param db
*/
export const clearExpiredLoggerOutputRecords = async (db: InternalDBs) => {
const MILLISECONDS_OLD = 1000 * 60 * 60 * 24 * 7; // 7 days
const COUNT_TO_MANY = 10000;
const currTs = Date.now();
const expiredTs = currTs - MILLISECONDS_OLD;
let records = (await db.loggerOutputTbl.keys()).map((key) => {
const ts = parseInt(key.split("\t")[1]);
const expired = ts <= expiredTs;
return {
ts: ts,
key: key,
expired: expired,
};
});
const keysToRemove = new Set(
records.filter((x) => x.expired).map((x) => x.key)
);
if (records.length - keysToRemove.size > COUNT_TO_MANY) {
// we need to find out records beyond 10000 records
records = records.filter((x) => !x.expired); // shrink the array
records.sort((a, b) => -(a.ts - b.ts)); // descending
records.slice(COUNT_TO_MANY).forEach((element) => {
keysToRemove.add(element.key);
});
}
const ps = [] as Promise<void>[];
keysToRemove.forEach((element) => {
ps.push(db.loggerOutputTbl.removeItem(element));
});
await Promise.all(ps);
};
+87 -13
View File
@@ -24,6 +24,9 @@ import {
loadFileHistoryTableByVault, loadFileHistoryTableByVault,
prepareDBs, prepareDBs,
InternalDBs, InternalDBs,
insertLoggerOutputByVault,
clearExpiredLoggerOutputRecords,
clearExpiredSyncPlanRecords,
} from "./localdb"; } from "./localdb";
import { RemoteClient } from "./remote"; import { RemoteClient } from "./remote";
import { import {
@@ -48,10 +51,12 @@ import { ObsConfigDirFileType, listFilesInObsFolder } from "./obsFolderLister";
import { I18n } from "./i18n"; import { I18n } from "./i18n";
import type { LangType, LangTypeAndAuto, TransItemType } from "./i18n"; import type { LangType, LangTypeAndAuto, TransItemType } from "./i18n";
import * as origLog from "loglevel";
import { DeletionOnRemote, MetadataOnRemote } from "./metadataOnRemote"; import { DeletionOnRemote, MetadataOnRemote } from "./metadataOnRemote";
import { SyncAlgoV2Modal } from "./syncAlgoV2Notice"; import { SyncAlgoV2Modal } from "./syncAlgoV2Notice";
const log = origLog.getLogger("rs-default"); import { applyPresetRulesInplace } from "./presetRules";
import { applyLogWriterInplace, log } from "./moreOnLog";
import AggregateError from "aggregate-error";
const DEFAULT_SETTINGS: RemotelySavePluginSettings = { const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
s3: DEFAULT_S3_CONFIG, s3: DEFAULT_S3_CONFIG,
@@ -69,6 +74,7 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
syncConfigDir: false, syncConfigDir: false,
syncUnderscoreItems: false, syncUnderscoreItems: false,
lang: "auto", lang: "auto",
logToDB: false,
}; };
interface OAuth2Info { interface OAuth2Info {
@@ -342,10 +348,16 @@ export default class RemotelySavePlugin extends Plugin {
triggerSource: triggerSource, triggerSource: triggerSource,
syncStatus: this.syncStatus, syncStatus: this.syncStatus,
}); });
log.info(msg); log.error(msg);
log.info(error); log.error(error);
getNotice(msg, 10 * 1000); getNotice(msg, 10 * 1000);
if (error instanceof AggregateError) {
for (const e of error.errors) {
getNotice(e.message, 10 * 1000);
}
} else {
getNotice(error.message, 10 * 1000); getNotice(error.message, 10 * 1000);
}
this.syncStatus = "idle"; this.syncStatus = "idle";
if (this.syncRibbon !== undefined) { if (this.syncRibbon !== undefined) {
setIcon(this.syncRibbon, iconNameSyncWait); setIcon(this.syncRibbon, iconNameSyncWait);
@@ -373,6 +385,7 @@ export default class RemotelySavePlugin extends Plugin {
this.currSyncMsg = ""; this.currSyncMsg = "";
await this.loadSettings(); await this.loadSettings();
await this.checkIfPresetRulesFollowed();
// lang should be load early, but after settings // lang should be load early, but after settings
this.i18n = new I18n(this.settings.lang, async (lang: LangTypeAndAuto) => { this.i18n = new I18n(this.settings.lang, async (lang: LangTypeAndAuto) => {
@@ -410,6 +423,13 @@ export default class RemotelySavePlugin extends Plugin {
throw err; throw err;
} }
// must AFTER preparing DB
this.addOutputToDBIfSet();
this.enableAutoClearOutputToDBHistIfSet();
// must AFTER preparing DB
this.enableAutoClearSyncPlanHist();
this.syncStatus = "idle"; this.syncStatus = "idle";
this.registerEvent( this.registerEvent(
@@ -706,6 +726,13 @@ export default class RemotelySavePlugin extends Plugin {
} }
} }
async checkIfPresetRulesFollowed() {
const res = applyPresetRulesInplace(this.settings);
if (res.changed) {
await this.saveSettings();
}
}
async saveSettings() { async saveSettings() {
await this.saveData(normalConfigToMessy(this.settings)); await this.saveData(normalConfigToMessy(this.settings));
} }
@@ -869,6 +896,13 @@ export default class RemotelySavePlugin extends Plugin {
this.currSyncMsg = msg; this.currSyncMsg = msg;
} }
/**
* Because data.json contains sensitive information,
* We usually want to ignore it in the version control.
* However, if there's already a an ignore file (even empty),
* we respect the existing configure and not add any modifications.
* @returns
*/
async tryToAddIgnoreFile() { async tryToAddIgnoreFile() {
const pluginConfigDir = const pluginConfigDir =
this.manifest.dir || this.manifest.dir ||
@@ -886,15 +920,7 @@ export default class RemotelySavePlugin extends Plugin {
const contentText = "data.json\n"; const contentText = "data.json\n";
try { try {
if (ignoreFileExists) { if (!ignoreFileExists) {
// check empty, if empty, we can write it
// if not empty, we do nothing
const content = (await this.app.vault.adapter.read(ignoreFile)).trim();
if (content === "") {
// no need to await writing
this.app.vault.adapter.write(ignoreFile, contentText);
}
} else {
// not exists, directly create // not exists, directly create
// no need to await // no need to await
this.app.vault.adapter.write(ignoreFile, contentText); this.app.vault.adapter.write(ignoreFile, contentText);
@@ -903,4 +929,52 @@ export default class RemotelySavePlugin extends Plugin {
// just skip // just skip
} }
} }
addOutputToDBIfSet() {
if (this.settings.logToDB) {
applyLogWriterInplace((...msg: any[]) => {
insertLoggerOutputByVault(this.db, this.vaultRandomID, ...msg);
});
}
}
enableAutoClearOutputToDBHistIfSet() {
const initClearOutputToDBHistAfterMilliseconds = 1000 * 45;
const autoClearOutputToDBHistAfterMilliseconds = 1000 * 60 * 5;
this.app.workspace.onLayoutReady(() => {
// init run
window.setTimeout(() => {
if (this.settings.logToDB) {
clearExpiredLoggerOutputRecords(this.db);
}
}, initClearOutputToDBHistAfterMilliseconds);
// scheduled run
const intervalID = window.setInterval(() => {
if (this.settings.logToDB) {
clearExpiredLoggerOutputRecords(this.db);
}
}, autoClearOutputToDBHistAfterMilliseconds);
this.registerInterval(intervalID);
});
}
enableAutoClearSyncPlanHist() {
const initClearSyncPlanHistAfterMilliseconds = 1000 * 45;
const autoClearSyncPlanHistAfterMilliseconds = 1000 * 60 * 5;
this.app.workspace.onLayoutReady(() => {
// init run
window.setTimeout(() => {
clearExpiredSyncPlanRecords(this.db);
}, initClearSyncPlanHistAfterMilliseconds);
// scheduled run
const intervalID = window.setInterval(() => {
clearExpiredSyncPlanRecords(this.db);
}, autoClearSyncPlanHistAfterMilliseconds);
this.registerInterval(intervalID);
});
}
} }
+78 -2
View File
@@ -4,8 +4,13 @@ import * as path from "path";
import { base32, base64url } from "rfc4648"; import { base32, base64url } from "rfc4648";
import XRegExp from "xregexp"; import XRegExp from "xregexp";
import * as origLog from "loglevel"; import { log } from "./moreOnLog";
const log = origLog.getLogger("rs-default");
declare global {
interface Window {
moment: (...data: any) => any;
}
}
/** /**
* If any part of the file starts with '.' or '_' then it's a hidden file. * If any part of the file starts with '.' or '_' then it's a hidden file.
@@ -303,3 +308,74 @@ export const atWhichLevel = (x: string) => {
export const checkHasSpecialCharForDir = (x: string) => { export const checkHasSpecialCharForDir = (x: string) => {
return /[?/\\]/.test(x); return /[?/\\]/.test(x);
}; };
export const unixTimeToStr = (x: number | undefined | null) => {
if (x === undefined) {
return undefined;
}
if (x === null) {
return null;
}
return window.moment(x).format() as string;
};
/**
* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Cyclic_object_value#examples
* @returns
*/
const getCircularReplacer = () => {
const seen = new WeakSet();
return (key: any, value: any) => {
if (typeof value === "object" && value !== null) {
if (seen.has(value)) {
return;
}
seen.add(value);
}
return value;
};
};
/**
* Convert "any" value to string.
* @param x
* @returns
*/
export const toText = (x: any) => {
if (x === undefined || x === null) {
return `${x}`;
}
if (typeof x === "string") {
return x;
}
if (
x instanceof String ||
x instanceof Date ||
typeof x === "number" ||
typeof x === "bigint" ||
typeof x === "boolean"
) {
return `${x}`;
}
if (
x instanceof Error ||
(x &&
x.stack &&
x.message &&
typeof x.stack === "string" &&
typeof x.message === "string")
) {
return `ERROR! MESSAGE: ${x.message}, STACK: ${x.stack}`;
}
try {
const y = JSON.stringify(x, getCircularReplacer(), 2);
if (y !== undefined) {
return y;
}
throw new Error("not jsonable");
} catch {
return `${x}`;
}
};
+34
View File
@@ -0,0 +1,34 @@
// It's very dangerous for this file to depend on other files in the same project.
// We should avoid this situation as much as possible.
import { TAbstractFile, TFolder, TFile, Vault } from "obsidian";
import * as origLog from "loglevel";
import type { LogLevelNumbers, Logger, LogLevel, LogLevelDesc } from "loglevel";
const log2 = origLog.getLogger("rs-default");
const originalFactory = log2.methodFactory;
export const applyLogWriterInplace = function (writer: (...msg: any[]) => any) {
log2.methodFactory = function (
methodName: string,
logLevel: LogLevelNumbers,
loggerName: string | symbol
) {
const rawMethod = originalFactory(methodName, logLevel, loggerName);
return function (...msg: any[]) {
rawMethod.apply(undefined, msg);
writer(...msg);
};
};
log2.setLevel(log2.getLevel());
};
export const restoreLogWritterInplace = () => {
log2.methodFactory = originalFactory;
log2.setLevel(log2.getLevel());
};
export const log = log2;
-3
View File
@@ -3,9 +3,6 @@ import { Queue } from "@fyears/tsqueue";
import chunk from "lodash/chunk"; import chunk from "lodash/chunk";
import flatten from "lodash/flatten"; import flatten from "lodash/flatten";
import * as origLog from "loglevel";
const log = origLog.getLogger("rs-default");
export interface ObsConfigDirFileType { export interface ObsConfigDirFileType {
key: string; key: string;
ctime: number; ctime: number;
+69
View File
@@ -0,0 +1,69 @@
import type {
RemotelySavePluginSettings,
WebdavConfig,
WebdavDepthType,
} from "./baseTypes";
const RULES = {
webdav: {
depth: [
{
url: "^https://(.+).teracloud.jp/.+",
depth: "auto_1",
manualRecursive: true,
},
{
url: "^https://dav.jianguoyun.com/dav/",
depth: "auto_1",
manualRecursive: true,
},
],
},
};
export const applyWebdavPresetRulesInplace = (
webdav: Partial<WebdavConfig> | undefined
) => {
if (webdav === undefined) {
return {
changed: false,
webdav: webdav,
};
}
for (const { url, depth, manualRecursive } of RULES.webdav.depth) {
if (
webdav.address !== undefined &&
new RegExp(url).test(webdav.address) &&
webdav.depth !== undefined &&
webdav.depth.startsWith("auto_") &&
webdav.depth !== depth
) {
webdav.depth = depth as WebdavDepthType;
webdav.manualRecursive = manualRecursive;
return {
changed: true,
webdav: webdav,
};
}
}
return {
changed: false,
webdav: webdav,
};
};
export const applyPresetRulesInplace = (
settings: RemotelySavePluginSettings | undefined
) => {
if (settings === undefined) {
return {
changed: false,
settings: settings,
};
}
const webdavRes = applyWebdavPresetRulesInplace(settings.webdav);
return {
changed: webdavRes.changed,
settings: settings,
};
};
+1 -2
View File
@@ -11,8 +11,7 @@ import * as onedrive from "./remoteForOnedrive";
import * as s3 from "./remoteForS3"; import * as s3 from "./remoteForS3";
import * as webdav from "./remoteForWebdav"; import * as webdav from "./remoteForWebdav";
import * as origLog from "loglevel"; import { log } from "./moreOnLog";
const log = origLog.getLogger("rs-default");
export class RemoteClient { export class RemoteClient {
readonly serviceType: SUPPORTED_SERVICES_TYPE; readonly serviceType: SUPPORTED_SERVICES_TYPE;
+1 -2
View File
@@ -12,8 +12,7 @@ import { bufferToArrayBuffer, getFolderLevels, mkdirpInVault } from "./misc";
export { Dropbox } from "dropbox"; export { Dropbox } from "dropbox";
import * as origLog from "loglevel"; import { log } from "./moreOnLog";
const log = origLog.getLogger("rs-default");
export const DEFAULT_DROPBOX_CONFIG: DropboxConfig = { export const DEFAULT_DROPBOX_CONFIG: DropboxConfig = {
accessToken: "", accessToken: "",
+1 -2
View File
@@ -6,7 +6,6 @@ import type {
User, User,
} from "@microsoft/microsoft-graph-types"; } from "@microsoft/microsoft-graph-types";
import cloneDeep from "lodash/cloneDeep"; import cloneDeep from "lodash/cloneDeep";
import * as origLog from "loglevel";
import { request, requestUrl, requireApiVersion, Vault } from "obsidian"; import { request, requestUrl, requireApiVersion, Vault } from "obsidian";
import { import {
API_VER_REQURL, API_VER_REQURL,
@@ -24,7 +23,7 @@ import {
mkdirpInVault, mkdirpInVault,
} from "./misc"; } from "./misc";
const log = origLog.getLogger("rs-default"); import { log } from "./moreOnLog";
const SCOPES = ["User.Read", "Files.ReadWrite.AppFolder", "offline_access"]; const SCOPES = ["User.Read", "Files.ReadWrite.AppFolder", "offline_access"];
const REDIRECT_URI = `obsidian://${COMMAND_CALLBACK_ONEDRIVE}`; const REDIRECT_URI = `obsidian://${COMMAND_CALLBACK_ONEDRIVE}`;
+1 -2
View File
@@ -39,8 +39,7 @@ import {
export { S3Client } from "@aws-sdk/client-s3"; export { S3Client } from "@aws-sdk/client-s3";
import * as origLog from "loglevel"; import { log } from "./moreOnLog";
const log = origLog.getLogger("rs-default");
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// special handler using Obsidian requestUrl // special handler using Obsidian requestUrl
+1 -2
View File
@@ -9,8 +9,7 @@ import { RemoteItem, VALID_REQURL, WebdavConfig } from "./baseTypes";
import { decryptArrayBuffer, encryptArrayBuffer } from "./encrypt"; import { decryptArrayBuffer, encryptArrayBuffer } from "./encrypt";
import { bufferToArrayBuffer, getPathFolder, mkdirpInVault } from "./misc"; import { bufferToArrayBuffer, getPathFolder, mkdirpInVault } from "./misc";
import * as origLog from "loglevel"; import { log } from "./moreOnLog";
const log = origLog.getLogger("rs-default");
import type { import type {
FileStat, FileStat,
+83 -4
View File
@@ -9,18 +9,25 @@ import {
} from "obsidian"; } from "obsidian";
import { import {
API_VER_REQURL, API_VER_REQURL,
DEFAULT_DEBUG_FOLDER,
SUPPORTED_SERVICES_TYPE, SUPPORTED_SERVICES_TYPE,
SUPPORTED_SERVICES_TYPE_WITH_REMOTE_BASE_DIR, SUPPORTED_SERVICES_TYPE_WITH_REMOTE_BASE_DIR,
VALID_REQURL, VALID_REQURL,
WebdavAuthType, WebdavAuthType,
WebdavDepthType, WebdavDepthType,
} from "./baseTypes"; } from "./baseTypes";
import { exportVaultSyncPlansToFiles } from "./debugMode"; import {
exportVaultSyncPlansToFiles,
exportVaultLoggerOutputToFiles,
} from "./debugMode";
import { exportQrCodeUri } from "./importExport"; import { exportQrCodeUri } from "./importExport";
import { import {
clearAllSyncMetaMapping, clearAllSyncMetaMapping,
clearAllSyncPlanRecords, clearAllSyncPlanRecords,
destroyDBs, destroyDBs,
clearAllLoggerOutputRecords,
insertLoggerOutputByVault,
clearExpiredLoggerOutputRecords,
} from "./localdb"; } from "./localdb";
import type RemotelySavePlugin from "./main"; // unavoidable import type RemotelySavePlugin from "./main"; // unavoidable
import { RemoteClient } from "./remote"; import { RemoteClient } from "./remote";
@@ -36,10 +43,14 @@ import {
} from "./remoteForOnedrive"; } from "./remoteForOnedrive";
import { messyConfigToNormal } from "./configPersist"; import { messyConfigToNormal } from "./configPersist";
import type { TransItemType } from "./i18n"; import type { TransItemType } from "./i18n";
import * as origLog from "loglevel";
import { checkHasSpecialCharForDir } from "./misc"; import { checkHasSpecialCharForDir } from "./misc";
const log = origLog.getLogger("rs-default"); import { applyWebdavPresetRulesInplace } from "./presetRules";
import {
applyLogWriterInplace,
log,
restoreLogWritterInplace,
} from "./moreOnLog";
class PasswordModal extends Modal { class PasswordModal extends Modal {
plugin: RemotelySavePlugin; plugin: RemotelySavePlugin;
@@ -1323,6 +1334,11 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
) { ) {
this.plugin.settings.webdav.depth = "auto_unknown"; this.plugin.settings.webdav.depth = "auto_unknown";
} }
// TODO: any more elegant way?
applyWebdavPresetRulesInplace(this.plugin.settings.webdav);
// normally saved
await this.plugin.saveSettings(); await this.plugin.saveSettings();
}) })
); );
@@ -1420,6 +1436,11 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
this.plugin.settings.webdav.depth = "manual_infinity"; this.plugin.settings.webdav.depth = "manual_infinity";
this.plugin.settings.webdav.manualRecursive = false; this.plugin.settings.webdav.manualRecursive = false;
} }
// TODO: any more elegant way?
applyWebdavPresetRulesInplace(this.plugin.settings.webdav);
// normally save
await this.plugin.saveSettings(); await this.plugin.saveSettings();
}); });
}); });
@@ -1691,6 +1712,64 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
}); });
}); });
const logToDBDiv = debugDiv.createEl("div");
new Setting(logToDBDiv)
.setName(t("settings_logtodb"))
.setDesc(t("settings_logtodb_desc"))
.addDropdown(async (dropdown) => {
dropdown.addOption("enable", t("enable"));
dropdown.addOption("disable", t("disable"));
dropdown
.setValue(this.plugin.settings.logToDB ? "enable" : "disable")
.onChange(async (val: string) => {
const logToDB = val === "enable";
if (logToDB) {
applyLogWriterInplace((...msg: any[]) => {
insertLoggerOutputByVault(
this.plugin.db,
this.plugin.vaultRandomID,
...msg
);
});
} else {
restoreLogWritterInplace();
}
clearExpiredLoggerOutputRecords(this.plugin.db);
this.plugin.settings.logToDB = logToDB;
await this.plugin.saveSettings();
});
});
new Setting(logToDBDiv)
.setName(t("settings_logtodbexport"))
.setDesc(
t("settings_logtodbexport_desc", {
debugFolder: DEFAULT_DEBUG_FOLDER,
})
)
.addButton(async (button) => {
button.setButtonText(t("settings_logtodbexport_button"));
button.onClick(async () => {
await exportVaultLoggerOutputToFiles(
this.plugin.db,
this.app.vault,
this.plugin.vaultRandomID
);
new Notice(t("settings_logtodbexport_notice"));
});
});
new Setting(logToDBDiv)
.setName(t("settings_logtodbclear"))
.setDesc(t("settings_logtodbclear_desc"))
.addButton(async (button) => {
button.setButtonText(t("settings_logtodbclear_button"));
button.onClick(async () => {
await clearAllLoggerOutputRecords(this.plugin.db);
new Notice(t("settings_logtodbclear_notice"));
});
});
const syncMappingDiv = debugDiv.createEl("div"); const syncMappingDiv = debugDiv.createEl("div");
new Setting(syncMappingDiv) new Setting(syncMappingDiv)
.setName(t("settings_delsyncmap")) .setName(t("settings_delsyncmap"))
+50 -8
View File
@@ -5,6 +5,7 @@ import {
Vault, Vault,
requireApiVersion, requireApiVersion,
} from "obsidian"; } from "obsidian";
import AggregateError from "aggregate-error";
import PQueue from "p-queue"; import PQueue from "p-queue";
import { import {
RemoteItem, RemoteItem,
@@ -33,6 +34,7 @@ import {
getFolderLevels, getFolderLevels,
getParentFolder, getParentFolder,
atWhichLevel, atWhichLevel,
unixTimeToStr,
} from "./misc"; } from "./misc";
import { RemoteClient } from "./remote"; import { RemoteClient } from "./remote";
import { import {
@@ -46,8 +48,7 @@ import {
} from "./metadataOnRemote"; } from "./metadataOnRemote";
import { isInsideObsFolder, ObsConfigDirFileType } from "./obsFolderLister"; import { isInsideObsFolder, ObsConfigDirFileType } from "./obsFolderLister";
import * as origLog from "loglevel"; import { log } from "./moreOnLog";
const log = origLog.getLogger("rs-default");
export type SyncStatusType = export type SyncStatusType =
| "idle" | "idle"
@@ -63,6 +64,7 @@ export type SyncStatusType =
export interface SyncPlanType { export interface SyncPlanType {
ts: number; ts: number;
tsFmt?: string;
remoteType: SUPPORTED_SERVICES_TYPE; remoteType: SUPPORTED_SERVICES_TYPE;
mixedStates: Record<string, FileOrFolderMixedState>; mixedStates: Record<string, FileOrFolderMixedState>;
} }
@@ -212,10 +214,12 @@ export const parseRemoteItems = async (
let r = {} as FileOrFolderMixedState; let r = {} as FileOrFolderMixedState;
if (backwardMapping !== undefined) { if (backwardMapping !== undefined) {
key = backwardMapping.localKey; key = backwardMapping.localKey;
const mtimeRemote = backwardMapping.localMtime || entry.lastModified;
r = { r = {
key: key, key: key,
existRemote: true, existRemote: true,
mtimeRemote: backwardMapping.localMtime || entry.lastModified, mtimeRemote: mtimeRemote,
mtimeRemoteFmt: unixTimeToStr(mtimeRemote),
sizeRemote: backwardMapping.localSize || entry.size, sizeRemote: backwardMapping.localSize || entry.size,
remoteEncryptedKey: remoteEncryptedKey, remoteEncryptedKey: remoteEncryptedKey,
changeRemoteMtimeUsingMapping: true, changeRemoteMtimeUsingMapping: true,
@@ -225,6 +229,7 @@ export const parseRemoteItems = async (
key: key, key: key,
existRemote: true, existRemote: true,
mtimeRemote: entry.lastModified, mtimeRemote: entry.lastModified,
mtimeRemoteFmt: unixTimeToStr(entry.lastModified),
sizeRemote: entry.size, sizeRemote: entry.size,
remoteEncryptedKey: remoteEncryptedKey, remoteEncryptedKey: remoteEncryptedKey,
changeRemoteMtimeUsingMapping: false, changeRemoteMtimeUsingMapping: false,
@@ -320,10 +325,12 @@ const ensembleMixedStates = async (
// ignore // ignore
continue; continue;
} else if (entry instanceof TFile) { } else if (entry instanceof TFile) {
const mtimeLocal = Math.max(entry.stat.mtime || 0, entry.stat.ctime || 0);
r = { r = {
key: entry.path, key: entry.path,
existLocal: true, existLocal: true,
mtimeLocal: Math.max(entry.stat.mtime || 0, entry.stat.ctime || 0), mtimeLocal: mtimeLocal,
mtimeLocalFmt: unixTimeToStr(mtimeLocal),
sizeLocal: entry.stat.size, sizeLocal: entry.stat.size,
}; };
} else if (entry instanceof TFolder) { } else if (entry instanceof TFolder) {
@@ -332,6 +339,7 @@ const ensembleMixedStates = async (
key: key, key: key,
existLocal: true, existLocal: true,
mtimeLocal: undefined, mtimeLocal: undefined,
mtimeLocalFmt: undefined,
sizeLocal: 0, sizeLocal: 0,
}; };
} else { } else {
@@ -346,6 +354,7 @@ const ensembleMixedStates = async (
results[key].key = r.key; results[key].key = r.key;
results[key].existLocal = r.existLocal; results[key].existLocal = r.existLocal;
results[key].mtimeLocal = r.mtimeLocal; results[key].mtimeLocal = r.mtimeLocal;
results[key].mtimeLocalFmt = r.mtimeLocalFmt;
results[key].sizeLocal = r.sizeLocal; results[key].sizeLocal = r.sizeLocal;
} else { } else {
results[key] = r; results[key] = r;
@@ -356,10 +365,12 @@ const ensembleMixedStates = async (
if (syncConfigDir && localConfigDirContents !== undefined) { if (syncConfigDir && localConfigDirContents !== undefined) {
for (const entry of localConfigDirContents) { for (const entry of localConfigDirContents) {
const key = entry.key; const key = entry.key;
const mtimeLocal = Math.max(entry.mtime, entry.ctime);
const r: FileOrFolderMixedState = { const r: FileOrFolderMixedState = {
key: key, key: key,
existLocal: true, existLocal: true,
mtimeLocal: Math.max(entry.mtime, entry.ctime), mtimeLocal: mtimeLocal,
mtimeLocalFmt: unixTimeToStr(mtimeLocal),
sizeLocal: entry.size, sizeLocal: entry.size,
}; };
@@ -367,6 +378,7 @@ const ensembleMixedStates = async (
results[key].key = r.key; results[key].key = r.key;
results[key].existLocal = r.existLocal; results[key].existLocal = r.existLocal;
results[key].mtimeLocal = r.mtimeLocal; results[key].mtimeLocal = r.mtimeLocal;
results[key].mtimeLocalFmt = r.mtimeLocalFmt;
results[key].sizeLocal = r.sizeLocal; results[key].sizeLocal = r.sizeLocal;
} else { } else {
results[key] = r; results[key] = r;
@@ -380,6 +392,7 @@ const ensembleMixedStates = async (
const r = { const r = {
key: key, key: key,
deltimeRemote: entry.actionWhen, deltimeRemote: entry.actionWhen,
deltimeRemoteFmt: unixTimeToStr(entry.actionWhen),
} as FileOrFolderMixedState; } as FileOrFolderMixedState;
if (isSkipItem(key, syncConfigDir, syncUnderscoreItems, configDir)) { if (isSkipItem(key, syncConfigDir, syncUnderscoreItems, configDir)) {
@@ -389,6 +402,7 @@ const ensembleMixedStates = async (
if (results.hasOwnProperty(key)) { if (results.hasOwnProperty(key)) {
results[key].key = r.key; results[key].key = r.key;
results[key].deltimeRemote = r.deltimeRemote; results[key].deltimeRemote = r.deltimeRemote;
results[key].deltimeRemoteFmt = r.deltimeRemoteFmt;
} else { } else {
results[key] = r; results[key] = r;
@@ -417,10 +431,12 @@ const ensembleMixedStates = async (
const r = { const r = {
key: key, key: key,
deltimeLocal: entry.actionWhen, deltimeLocal: entry.actionWhen,
deltimeLocalFmt: unixTimeToStr(entry.actionWhen),
} as FileOrFolderMixedState; } as FileOrFolderMixedState;
if (results.hasOwnProperty(key)) { if (results.hasOwnProperty(key)) {
results[key].deltimeLocal = r.deltimeLocal; results[key].deltimeLocal = r.deltimeLocal;
results[key].deltimeLocalFmt = r.deltimeLocalFmt;
} else { } else {
results[key] = r; results[key] = r;
results[key].existLocal = false; // we have already checked local results[key].existLocal = false; // we have already checked local
@@ -430,13 +446,16 @@ const ensembleMixedStates = async (
const r = { const r = {
key: key, key: key,
mtimeLocal: entry.actionWhen, mtimeLocal: entry.actionWhen,
mtimeLocalFmt: unixTimeToStr(entry.actionWhen),
changeLocalMtimeUsingMapping: true, changeLocalMtimeUsingMapping: true,
}; };
if (results.hasOwnProperty(key)) { if (results.hasOwnProperty(key)) {
results[key].mtimeLocal = Math.max( const mtimeLocal = Math.max(
r.mtimeLocal || 0, r.mtimeLocal || 0,
results[key].mtimeLocal || 0 results[key].mtimeLocal || 0
); );
results[key].mtimeLocal = mtimeLocal;
results[key].mtimeLocalFmt = unixTimeToStr(mtimeLocal);
results[key].changeLocalMtimeUsingMapping = results[key].changeLocalMtimeUsingMapping =
r.changeLocalMtimeUsingMapping; r.changeLocalMtimeUsingMapping;
} else { } else {
@@ -793,8 +812,11 @@ export const getSyncPlan = async (
} }
} }
const currTs = Date.now();
const currTsFmt = unixTimeToStr(currTs);
const plan = { const plan = {
ts: Date.now(), ts: currTs,
tsFmt: currTsFmt,
remoteType: remoteType, remoteType: remoteType,
mixedStates: mixedStates, mixedStates: mixedStates,
} as SyncPlanType; } as SyncPlanType;
@@ -1135,6 +1157,8 @@ export const doActualSync = async (
} }
const queue = new PQueue({ concurrency: concurrency, autoStart: true }); const queue = new PQueue({ concurrency: concurrency, autoStart: true });
const potentialErrors: Error[] = [];
let tooManyErrors = false;
for (let k = 0; k < singleLevelOps.length; ++k) { for (let k = 0; k < singleLevelOps.length; ++k) {
const val: FileOrFolderMixedState = singleLevelOps[k]; const val: FileOrFolderMixedState = singleLevelOps[k];
@@ -1167,10 +1191,28 @@ export const doActualSync = async (
log.debug(`finished ${key}`); log.debug(`finished ${key}`);
}; };
queue.add(fn);
queue.add(fn).catch((e) => {
const msg = `${key}: ${e.message}`;
potentialErrors.push(new Error(msg));
if (potentialErrors.length >= 3) {
tooManyErrors = true;
queue.pause();
queue.clear();
}
});
} }
await queue.onIdle(); await queue.onIdle();
if (potentialErrors.length > 0) {
if (tooManyErrors) {
potentialErrors.push(
new Error("too many errors, stop the remaining tasks")
);
}
throw new AggregateError(potentialErrors);
}
} }
} }
}; };
+2 -2
View File
@@ -1,8 +1,8 @@
import { App, Modal, Notice, PluginSettingTab, Setting } from "obsidian"; import { App, Modal, Notice, PluginSettingTab, Setting } from "obsidian";
import type RemotelySavePlugin from "./main"; // unavoidable import type RemotelySavePlugin from "./main"; // unavoidable
import type { TransItemType } from "./i18n"; import type { TransItemType } from "./i18n";
import * as origLog from "loglevel";
const log = origLog.getLogger("rs-default"); import { log } from "./moreOnLog";
export class SyncAlgoV2Modal extends Modal { export class SyncAlgoV2Modal extends Modal {
agree: boolean; agree: boolean;
+111
View File
@@ -0,0 +1,111 @@
import { expect } from "chai";
import type { WebdavConfig } from "../src/baseTypes";
import { applyWebdavPresetRulesInplace } from "../src/presetRules";
describe("Preset rules tests", () => {
it("should check undefined correctly", () => {
let x: Partial<WebdavConfig> | undefined = undefined;
const y = applyWebdavPresetRulesInplace(x);
expect(y.webdav === undefined);
expect(!y.changed);
});
it("should check empty object", () => {
let x: Partial<WebdavConfig> | undefined = {};
const y = applyWebdavPresetRulesInplace(x);
expect(y.webdav).deep.equals({});
expect(!y.changed);
});
it("should modify depths correctly", () => {
let x: Partial<WebdavConfig> = {
address: "https://example.teracloud.jp/dav/",
depth: "auto_unknown",
};
let y = applyWebdavPresetRulesInplace(x);
expect(x.depth === "auto_1");
expect(y.changed);
x = {
address: "https://example.teracloud.jp/dav/example",
depth: "auto_unknown",
};
y = applyWebdavPresetRulesInplace(x);
expect(x.depth === "auto_1");
expect(y.changed);
x = {
address: "https://dav.jianguoyun.com/dav/",
depth: "auto_unknown",
};
y = applyWebdavPresetRulesInplace(x);
expect(x.depth === "auto_1");
expect(y.changed);
x = {
address: "https://dav.jianguoyun.com/dav/",
depth: "auto_infinity",
};
y = applyWebdavPresetRulesInplace(x);
expect(x.depth === "auto_1");
expect(y.changed);
});
it("should not modify depths if depths is set automatically correctly", () => {
let x: Partial<WebdavConfig> = {
address: "https://dav.jianguoyun.com/dav/",
depth: "auto_1",
};
let y = applyWebdavPresetRulesInplace(x);
expect(x.depth === "auto_1");
expect(!y.changed);
});
it("should not modify depths if depths have been set manually", () => {
let x: Partial<WebdavConfig> = {
address: "https://example.teracloud.jp/dav/",
depth: "manual_infinity",
};
let y = applyWebdavPresetRulesInplace(x);
expect(x.depth === "manual_infinity");
expect(!y.changed);
x = {
address: "https://example.teracloud.jp/dav/example",
depth: "manual_1",
};
y = applyWebdavPresetRulesInplace(x);
expect(x.depth === "manual_1");
expect(!y.changed);
});
it("should not modify depths when urls are not in preset rules", () => {
let x: Partial<WebdavConfig> = {
address: "https://teracloud.jp/dav/",
depth: "auto_unknown",
};
applyWebdavPresetRulesInplace(x);
expect(x.depth === "auto_unknown");
x = {
address: "https://dav.jianguoyun.com/dav_example",
depth: "auto_unknown",
};
applyWebdavPresetRulesInplace(x);
expect(x.depth === "auto_unknown");
x = {
address: "",
depth: "auto_unknown",
};
applyWebdavPresetRulesInplace(x);
expect(x.depth === "auto_unknown");
x = {
address: "https://dav.jianguoyun.com/dav/",
depth: "what" as any,
};
applyWebdavPresetRulesInplace(x);
expect(x.depth === ("what" as any));
});
});
+1 -1
View File
@@ -1,4 +1,4 @@
{ {
"0.3.2": "0.12.15", "0.3.2": "0.12.15",
"0.3.16": "0.13.21" "0.3.17": "0.13.21"
} }