disenchanting and dispelling from the nightmarish implicit something

Indeed, even though if this changeset is mostly another nightmare. It might be in beta for a while.

src/modules/essentialObsidian/ModuleObsidianAPI.ts

@@ -1,7 +1,7 @@
-import { AbstractObsidianModule, type IObsidianModule } from "../AbstractObsidianModule.ts";
+import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
 import { LOG_LEVEL_DEBUG, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
 import { Notice, requestUrl, type RequestUrlParam, type RequestUrlResponse } from "../../deps.ts";
-import { type CouchDBCredentials, type EntryDoc, type FilePathWithPrefix } from "../../lib/src/common/types.ts";
+import { type CouchDBCredentials, type EntryDoc, type FilePath } from "../../lib/src/common/types.ts";
 import { getPathFromTFile } from "../../common/utils.ts";
 import { isCloudantURI, isValidRemoteCouchDBURI } from "../../lib/src/pouchdb/utils_couchdb.ts";
 import { replicationFilter } from "@/lib/src/pouchdb/compress.ts";
@@ -11,6 +11,7 @@ import { setNoticeClass } from "../../lib/src/mock_and_interop/wrapper.ts";
 import { ObsHttpHandler } from "./APILib/ObsHttpHandler.ts";
 import { PouchDB } from "../../lib/src/pouchdb/pouchdb-browser.ts";
 import { AuthorizationHeaderGenerator } from "../../lib/src/replication/httplib.ts";
+import type { LiveSyncCore } from "../../main.ts";
 
 setNoticeClass(Notice);
 
@@ -19,17 +20,17 @@ async function fetchByAPI(request: RequestUrlParam, errorAsResult = false): Prom
     return ret;
 }
 
-export class ModuleObsidianAPI extends AbstractObsidianModule implements IObsidianModule {
+export class ModuleObsidianAPI extends AbstractObsidianModule {
     _customHandler!: ObsHttpHandler;
 
     _authHeader = new AuthorizationHeaderGenerator();
 
     last_successful_post = false;
-    $$customFetchHandler(): ObsHttpHandler {
+    _customFetchHandler(): ObsHttpHandler {
         if (!this._customHandler) this._customHandler = new ObsHttpHandler(undefined, undefined);
         return this._customHandler;
     }
-    $$getLastPostFailedBySize(): boolean {
+    _getLastPostFailedBySize(): boolean {
         return !this.last_successful_post;
     }
 
@@ -90,7 +91,7 @@ export class ModuleObsidianAPI extends AbstractObsidianModule implements IObsidi
         }
     }
 
-    async $$connectRemoteCouchDB(
+    async _connectRemoteCouchDB(
         uri: string,
         auth: CouchDBCredentials,
         disableRequestURI: boolean,
@@ -252,21 +253,21 @@ export class ModuleObsidianAPI extends AbstractObsidianModule implements IObsidi
         }
     }
 
-    $$isMobile(): boolean {
+    _isMobile(): boolean {
         //@ts-ignore : internal API
         return this.app.isMobile;
     }
 
-    $$vaultName(): string {
+    _vaultName(): string {
         return this.app.vault.getName();
     }
-    $$getVaultName(): string {
+    _getVaultName(): string {
         return (
-            this.core.$$vaultName() +
+            this.services.vault.vaultName() +
             (this.settings?.additionalSuffixOfDatabaseName ? "-" + this.settings.additionalSuffixOfDatabaseName : "")
         );
     }
-    $$getActiveFilePath(): FilePathWithPrefix | undefined {
+    _getActiveFilePath(): FilePath | undefined {
         const file = this.app.workspace.getActiveFile();
         if (file) {
             return getPathFromTFile(file);
@@ -274,7 +275,18 @@ export class ModuleObsidianAPI extends AbstractObsidianModule implements IObsidi
         return undefined;
     }
 
-    $anyGetAppId(): Promise<string | undefined> {
-        return Promise.resolve(`${"appId" in this.app ? this.app.appId : ""}`);
+    _anyGetAppId(): string {
+        return `${"appId" in this.app ? this.app.appId : ""}`;
+    }
+
+    onBindFunction(core: LiveSyncCore, services: typeof core.services) {
+        services.API.handleGetCustomFetchHandler(this._customFetchHandler.bind(this));
+        services.API.handleIsLastPostFailedDueToPayloadSize(this._getLastPostFailedBySize.bind(this));
+        services.remote.handleConnect(this._connectRemoteCouchDB.bind(this));
+        services.API.handleIsMobile(this._isMobile.bind(this));
+        services.vault.handleGetVaultName(this._getVaultName.bind(this));
+        services.vault.handleVaultName(this._vaultName.bind(this));
+        services.vault.handleGetActiveFilePath(this._getActiveFilePath.bind(this));
+        services.API.handleGetAppID(this._anyGetAppId.bind(this));
     }
 }

src/modules/essentialObsidian/ModuleObsidianEvents.ts

@@ -1,4 +1,4 @@
-import { AbstractObsidianModule, type IObsidianModule } from "../AbstractObsidianModule.ts";
+import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
 import { EVENT_FILE_RENAMED, EVENT_LEAF_ACTIVE_CHANGED, eventHub } from "../../common/events.js";
 import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
 import { scheduleTask } from "octagonal-wheels/concurrency/task";
@@ -12,9 +12,10 @@ import {
     hiddenFilesEventCount,
     hiddenFilesProcessingCount,
 } from "../../lib/src/mock_and_interop/stores.ts";
+import type { LiveSyncCore } from "../../main.ts";
 
-export class ModuleObsidianEvents extends AbstractObsidianModule implements IObsidianModule {
-    $everyOnloadStart(): Promise<boolean> {
+export class ModuleObsidianEvents extends AbstractObsidianModule {
+    _everyOnloadStart(): Promise<boolean> {
         // this.registerEvent(this.app.workspace.on("editor-change", ));
         this.plugin.registerEvent(
             this.app.vault.on("rename", (file, oldPath) => {
@@ -30,7 +31,7 @@ export class ModuleObsidianEvents extends AbstractObsidianModule implements IObs
         return Promise.resolve(true);
     }
 
-    $$performRestart(): void {
+    private _performRestart(): void {
         this._performAppReload();
     }
 
@@ -49,14 +50,14 @@ export class ModuleObsidianEvents extends AbstractObsidianModule implements IObs
             this.initialCallback = save;
             saveCommandDefinition.callback = () => {
                 scheduleTask("syncOnEditorSave", 250, () => {
-                    if (this.core.$$isUnloaded()) {
+                    if (this.services.appLifecycle.hasUnloaded()) {
                         this._log("Unload and remove the handler.", LOG_LEVEL_VERBOSE);
                         saveCommandDefinition.callback = this.initialCallback;
                         this.initialCallback = undefined;
                     } else {
                         if (this.settings.syncOnEditorSave) {
                             this._log("Sync on Editor Save.", LOG_LEVEL_VERBOSE);
-                            fireAndForget(() => this.core.$$replicateByEvent());
+                            fireAndForget(() => this.services.replication.replicateByEvent());
                         }
                     }
                 });
@@ -106,14 +107,14 @@ export class ModuleObsidianEvents extends AbstractObsidianModule implements IObs
         // TODO:FIXME AT V0.17.31, this logic has been disabled.
         if (navigator.onLine && this.localDatabase.needScanning) {
             this.localDatabase.needScanning = false;
-            await this.core.$$performFullScan();
+            await this.services.vault.scanVault();
         }
     }
 
     async watchWindowVisibilityAsync() {
         if (this.settings.suspendFileWatching) return;
         if (!this.settings.isConfigured) return;
-        if (!this.core.$$isReady()) return;
+        if (!this.services.appLifecycle.isReady()) return;
 
         if (this.isLastHidden && !this.hasFocus) {
             // NO OP while non-focused after made hidden;
@@ -126,22 +127,22 @@ export class ModuleObsidianEvents extends AbstractObsidianModule implements IObs
         }
         this.isLastHidden = isHidden;
 
-        await this.core.$everyCommitPendingFileEvent();
+        await this.services.fileProcessing.commitPendingFileEvents();
 
         if (isHidden) {
-            await this.core.$everyBeforeSuspendProcess();
+            await this.services.appLifecycle.onSuspending();
         } else {
             // suspend all temporary.
-            if (this.core.$$isSuspended()) return;
+            if (this.services.appLifecycle.isSuspended()) return;
             if (!this.hasFocus) return;
-            await this.core.$everyOnResumeProcess();
-            await this.core.$everyAfterResumeProcess();
+            await this.services.appLifecycle.onResuming();
+            await this.services.appLifecycle.onResumed();
         }
     }
     watchWorkspaceOpen(file: TFile | null) {
         if (this.settings.suspendFileWatching) return;
         if (!this.settings.isConfigured) return;
-        if (!this.core.$$isReady()) return;
+        if (!this.services.appLifecycle.isReady()) return;
         if (!file) return;
         scheduleTask("watch-workspace-open", 500, () => fireAndForget(() => this.watchWorkspaceOpenAsync(file)));
     }
@@ -149,25 +150,25 @@ export class ModuleObsidianEvents extends AbstractObsidianModule implements IObs
     async watchWorkspaceOpenAsync(file: TFile) {
         if (this.settings.suspendFileWatching) return;
         if (!this.settings.isConfigured) return;
-        if (!this.core.$$isReady()) return;
-        await this.core.$everyCommitPendingFileEvent();
+        if (!this.services.appLifecycle.isReady()) return;
+        await this.services.fileProcessing.commitPendingFileEvents();
         if (file == null) {
             return;
         }
-        if (this.settings.syncOnFileOpen && !this.core.$$isSuspended()) {
-            await this.core.$$replicateByEvent();
+        if (this.settings.syncOnFileOpen && !this.services.appLifecycle.isSuspended()) {
+            await this.services.replication.replicateByEvent();
         }
-        await this.core.$$queueConflictCheckIfOpen(file.path as FilePathWithPrefix);
+        await this.services.conflict.queueCheckForIfOpen(file.path as FilePathWithPrefix);
     }
 
-    $everyOnLayoutReady(): Promise<boolean> {
+    _everyOnLayoutReady(): Promise<boolean> {
         this.swapSaveCommand();
         this.registerWatchEvents();
         return Promise.resolve(true);
     }
 
-    $$askReload(message?: string) {
-        if (this.core.$$isReloadingScheduled()) {
+    private _askReload(message?: string) {
+        if (this.services.appLifecycle.isReloadingScheduled()) {
             this._log(`Reloading is already scheduled`, LOG_LEVEL_VERBOSE);
             return;
         }
@@ -183,11 +184,11 @@ export class ModuleObsidianEvents extends AbstractObsidianModule implements IObs
             if (ret == RESTART_NOW) {
                 this._performAppReload();
             } else if (ret == RESTART_AFTER_STABLE) {
-                this.core.$$scheduleAppReload();
+                this.services.appLifecycle.scheduleRestart();
             }
         });
     }
-    $$scheduleAppReload() {
+    private _scheduleAppReload() {
         if (!this.core._totalProcessingCount) {
             const __tick = reactiveSource(0);
             this.core._totalProcessingCount = reactive(() => {
@@ -237,4 +238,11 @@ export class ModuleObsidianEvents extends AbstractObsidianModule implements IObs
             });
         }
     }
+    onBindFunction(core: LiveSyncCore, services: typeof core.services): void {
+        services.appLifecycle.handleLayoutReady(this._everyOnLayoutReady.bind(this));
+        services.appLifecycle.handleOnInitialise(this._everyOnloadStart.bind(this));
+        services.appLifecycle.handlePerformRestart(this._performRestart.bind(this));
+        services.appLifecycle.handleAskRestart(this._askReload.bind(this));
+        services.appLifecycle.handleScheduleRestart(this._scheduleAppReload.bind(this));
+    }
 }

src/modules/essentialObsidian/ModuleObsidianMenu.ts

@@ -1,11 +1,12 @@
 import { fireAndForget } from "octagonal-wheels/promises";
 import { addIcon, type Editor, type MarkdownFileInfo, type MarkdownView } from "../../deps.ts";
 import { LOG_LEVEL_NOTICE, type FilePathWithPrefix } from "../../lib/src/common/types.ts";
-import { AbstractObsidianModule, type IObsidianModule } from "../AbstractObsidianModule.ts";
+import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
 import { $msg } from "src/lib/src/common/i18n.ts";
+import type { LiveSyncCore } from "../../main.ts";
 
-export class ModuleObsidianMenu extends AbstractObsidianModule implements IObsidianModule {
-    $everyOnloadStart(): Promise<boolean> {
+export class ModuleObsidianMenu extends AbstractObsidianModule {
+    _everyOnloadStart(): Promise<boolean> {
         // UI
         addIcon(
             "replicate",
@@ -18,21 +19,21 @@ export class ModuleObsidianMenu extends AbstractObsidianModule implements IObsid
         );
 
         this.addRibbonIcon("replicate", $msg("moduleObsidianMenu.replicate"), async () => {
-            await this.core.$$replicate(true);
+            await this.services.replication.replicate(true);
         }).addClass("livesync-ribbon-replicate");
 
         this.addCommand({
             id: "livesync-replicate",
             name: "Replicate now",
             callback: async () => {
-                await this.core.$$replicate();
+                await this.services.replication.replicate();
             },
         });
         this.addCommand({
             id: "livesync-dump",
             name: "Dump information of this doc ",
             callback: () => {
-                const file = this.core.$$getActiveFilePath();
+                const file = this.services.vault.getActiveFilePath();
                 if (!file) return;
                 fireAndForget(() => this.localDatabase.getDBEntry(file, {}, true, false));
             },
@@ -43,7 +44,7 @@ export class ModuleObsidianMenu extends AbstractObsidianModule implements IObsid
             editorCallback: (editor: Editor, view: MarkdownView | MarkdownFileInfo) => {
                 const file = view.file;
                 if (!file) return;
-                void this.core.$$queueConflictCheckIfOpen(file.path as FilePathWithPrefix);
+                void this.services.conflict.queueCheckForIfOpen(file.path as FilePathWithPrefix);
             },
         });
 
@@ -58,23 +59,23 @@ export class ModuleObsidianMenu extends AbstractObsidianModule implements IObsid
                     this.settings.liveSync = true;
                     this._log("LiveSync Enabled.", LOG_LEVEL_NOTICE);
                 }
-                await this.core.$$realizeSettingSyncMode();
-                await this.core.$$saveSettingData();
+                await this.services.setting.onRealiseSetting();
+                await this.services.setting.saveSettingData();
             },
         });
         this.addCommand({
             id: "livesync-suspendall",
             name: "Toggle All Sync.",
             callback: async () => {
-                if (this.core.$$isSuspended()) {
-                    this.core.$$setSuspended(false);
+                if (this.services.appLifecycle.isSuspended()) {
+                    this.services.appLifecycle.setSuspended(false);
                     this._log("Self-hosted LiveSync resumed", LOG_LEVEL_NOTICE);
                 } else {
-                    this.core.$$setSuspended(true);
+                    this.services.appLifecycle.setSuspended(true);
                     this._log("Self-hosted LiveSync suspended", LOG_LEVEL_NOTICE);
                 }
-                await this.core.$$realizeSettingSyncMode();
-                await this.core.$$saveSettingData();
+                await this.services.setting.onRealiseSetting();
+                await this.services.setting.saveSettingData();
             },
         });
 
@@ -82,7 +83,7 @@ export class ModuleObsidianMenu extends AbstractObsidianModule implements IObsid
             id: "livesync-scan-files",
             name: "Scan storage and database again",
             callback: async () => {
-                await this.core.$$performFullScan(true);
+                await this.services.vault.scanVault(true);
             },
         });
 
@@ -90,7 +91,7 @@ export class ModuleObsidianMenu extends AbstractObsidianModule implements IObsid
             id: "livesync-runbatch",
             name: "Run pended batch processes",
             callback: async () => {
-                await this.core.$everyCommitPendingFileEvent();
+                await this.services.fileProcessing.commitPendingFileEvents();
             },
         });
 
@@ -104,12 +105,15 @@ export class ModuleObsidianMenu extends AbstractObsidianModule implements IObsid
         });
         return Promise.resolve(true);
     }
-    $everyOnload(): Promise<boolean> {
-        this.app.workspace.onLayoutReady(this.core.$$onLiveSyncReady.bind(this.core));
+    _onWorkspaceReady() {
+        void this.services.appLifecycle.onReady();
+    }
+    private _everyOnload(): Promise<boolean> {
+        this.app.workspace.onLayoutReady(this._onWorkspaceReady.bind(this));
         return Promise.resolve(true);
     }
 
-    async $$showView(viewType: string) {
+    private async _showView(viewType: string) {
         const leaves = this.app.workspace.getLeavesOfType(viewType);
         if (leaves.length == 0) {
             await this.app.workspace.getLeaf(true).setViewState({
@@ -126,4 +130,9 @@ export class ModuleObsidianMenu extends AbstractObsidianModule implements IObsid
             await this.app.workspace.revealLeaf(leaves[0]);
         }
     }
+    onBindFunction(core: LiveSyncCore, services: typeof core.services): void {
+        services.appLifecycle.handleOnInitialise(this._everyOnloadStart.bind(this));
+        services.appLifecycle.handleOnLoaded(this._everyOnload.bind(this));
+        services.API.handleShowWindow(this._showView.bind(this));
+    }
 }