fix(settings): Default settings data at startup.

Author: walkthunder

src/main.ts

@@ -34,7 +34,7 @@ import {
   clearExpiredSyncPlanRecords,
 } from "./localdb";
 import { RemoteClient, ServerDomain } from "./remote";
-import { InvioSettingTab, DEFAULT_SETTINGS } from "./settings";
+import { InvioSettingTab, getDEFAULT_SETTINGS } from "./settings";
 import { fetchMetadataFile, parseRemoteItems, SyncStatusType, RemoteSrcPrefix, syncAttachment, LocalConflictPrefix, RemoteConflictPrefix } from "./sync";
 import { doActualSync, getSyncPlan, isPasswordOk, fetchRemoteFileMD, pruneTouchedFiles } from "./sync";
 import { messyConfigToNormal, normalConfigToMessy } from "./configPersist";
@@ -1133,12 +1133,9 @@ export default class InvioPlugin extends Plugin {
     }
     this.settings = Object.assign(
       {},
-      cloneDeep(DEFAULT_SETTINGS),
-      rawConf ? {} : messyConfigToNormal(rawConf)
+      getDEFAULT_SETTINGS(),
+      messyConfigToNormal(rawConf) || {}
     );
-    if (!this.settings.s3) {
-      this.settings.s3 = DEFAULT_SETTINGS.s3
-    }
     if (this.settings.s3.partsConcurrency === undefined) {
       this.settings.s3.partsConcurrency = 20;
     }

src/settings.ts

@@ -9,6 +9,7 @@ import {
   requireApiVersion,
 } from "obsidian";
 import type { TextComponent } from "obsidian";
+import cloneDeep from "lodash/cloneDeep";
 import { createElement, Eye, EyeOff } from "lucide";
 import {
   InvioPluginSettings,
@@ -53,8 +54,8 @@ import { ProjectImportModal } from './components/ProjectImportModal';
 export const settingsPrefix = `Invio-Settings>`;
 export const settingsSuffix = `<&`
 
-export const DEFAULT_SETTINGS: InvioPluginSettings = {
-  s3: DEFAULT_S3_CONFIG,
+const DEFAULT_SETTINGS: InvioPluginSettings = {
+  s3: cloneDeep(DEFAULT_S3_CONFIG),
   useHost: false,
   hostConfig: {
     hostPair: null,
@@ -78,6 +79,33 @@ export const DEFAULT_SETTINGS: InvioPluginSettings = {
   skipSizeLargerThan: -1,
 };
 
+export const getDEFAULT_SETTINGS = (): InvioPluginSettings => {
+  return cloneDeep({
+    s3: cloneDeep(DEFAULT_S3_CONFIG),
+    useHost: false,
+    hostConfig: {
+      hostPair: null,
+      token: '',
+      user: null,
+    },
+    password: "",
+    remoteDomain: '',
+    serviceType: "s3",
+    currLogLevel: "info",
+    // vaultRandomID: "", // deprecated
+    autoRunEveryMilliseconds: -1,
+    initRunAfterMilliseconds: -1,
+    agreeToUploadExtraMetadata: false,
+    concurrency: 5,
+    syncConfigDir: false,
+    localWatchDir: "PublishDocs",
+    syncUnderscoreItems: true,
+    lang: "auto",
+    logToDB: false,
+    skipSizeLargerThan: -1,
+  });
+}
+
 class PasswordModal extends Modal {
   plugin: InvioPlugin;
   newPassword: string;