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/essential/ModuleInitializerFile.ts

@@ -17,10 +17,11 @@ import {
 import { isAnyNote } from "../../lib/src/common/utils.ts";
 import { stripAllPrefixes } from "../../lib/src/string_and_binary/path.ts";
 import { AbstractModule } from "../AbstractModule.ts";
-import type { ICoreModule } from "../ModuleTypes.ts";
 import { withConcurrency } from "octagonal-wheels/iterable/map";
-export class ModuleInitializerFile extends AbstractModule implements ICoreModule {
-    async $$performFullScan(showingNotice?: boolean, ignoreSuspending: boolean = false): Promise<void> {
+import type { InjectableServiceHub } from "../../lib/src/services/InjectableServices.ts";
+import type { LiveSyncCore } from "../../main.ts";
+export class ModuleInitializerFile extends AbstractModule {
+    private async _performFullScan(showingNotice?: boolean, ignoreSuspending: boolean = false): Promise<boolean> {
         this._log("Opening the key-value database", LOG_LEVEL_VERBOSE);
         const isInitialized = (await this.core.kvDB.get<boolean>("initialized")) || false;
         // synchronize all files between database and storage.
@@ -32,7 +33,7 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
                     "syncAll"
                 );
             }
-            return;
+            return false;
         }
         if (!ignoreSuspending && this.settings.suspendFileWatching) {
             if (showingNotice) {
@@ -42,7 +43,7 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
                     "syncAll"
                 );
             }
-            return;
+            return false;
         }
 
         if (showingNotice) {
@@ -59,7 +60,7 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
         const _filesStorage = [] as typeof filesStorageSrc;
 
         for (const f of filesStorageSrc) {
-            if (await this.core.$$isTargetFile(f.path, f != filesStorageSrc[0])) {
+            if (await this.services.vault.isTargetFile(f.path, f != filesStorageSrc[0])) {
                 _filesStorage.push(f);
             }
         }
@@ -103,7 +104,7 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
                 );
             const path = getPath(doc);
 
-            if (isValidPath(path) && (await this.core.$$isTargetFile(path, true))) {
+            if (isValidPath(path) && (await this.services.vault.isTargetFile(path, true))) {
                 if (!isMetaEntry(doc)) {
                     this._log(`Invalid entry: ${path}`, LOG_LEVEL_INFO);
                     continue;
@@ -133,7 +134,6 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
         this._log(`Total files in the database: ${databaseFileNames.length}`, LOG_LEVEL_VERBOSE, "syncAll");
         this._log(`Total files in the storage: ${storageFileNames.length}`, LOG_LEVEL_VERBOSE, "syncAll");
         this._log(`Total files: ${allFiles.length}`, LOG_LEVEL_VERBOSE, "syncAll");
-
         const filesExistOnlyInStorage = allFiles.filter((e) => !databaseFileNameCI2CS[e]);
         const filesExistOnlyInDatabase = allFiles.filter((e) => !storageFileNameCI2CS[e]);
         const filesExistBoth = allFiles.filter((e) => databaseFileNameCI2CS[e] && storageFileNameCI2CS[e]);
@@ -192,7 +192,7 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
             runAll("UPDATE DATABASE", filesExistOnlyInStorage, async (e) => {
                 // Exists in storage but not in database.
                 const file = storageFileNameMap[storageFileNameCI2CS[e]];
-                if (!this.core.$$isFileSizeExceeded(file.stat.size)) {
+                if (!this.services.vault.isFileSizeTooLarge(file.stat.size)) {
                     const path = file.path;
                     await this.core.fileHandler.storeFileToDB(file);
                     // fireAndForget(() => this.checkAndApplySettingFromMarkdown(path, true));
@@ -208,7 +208,7 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
                 // Exists in database but not in storage.
                 const path = getPath(w) ?? e;
                 if (w && !(w.deleted || w._deleted)) {
-                    if (!this.core.$$isFileSizeExceeded(w.size)) {
+                    if (!this.services.vault.isFileSizeTooLarge(w.size)) {
                         // Prevent applying the conflicted state to the storage.
                         if (w._conflicts?.length ?? 0 > 0) {
                             this._log(`UPDATE STORAGE: ${path} has conflicts. skipped (x)`, LOG_LEVEL_INFO);
@@ -250,7 +250,10 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
                     this._log(`SYNC DATABASE AND STORAGE: ${file.path} has conflicts. skipped`, LOG_LEVEL_INFO);
                     return;
                 }
-                if (!this.core.$$isFileSizeExceeded(file.stat.size) && !this.core.$$isFileSizeExceeded(doc.size)) {
+                if (
+                    !this.services.vault.isFileSizeTooLarge(file.stat.size) &&
+                    !this.services.vault.isFileSizeTooLarge(doc.size)
+                ) {
                     await this.syncFileBetweenDBandStorage(file, doc);
                 } else {
                     this._log(
@@ -271,6 +274,7 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
         if (showingNotice) {
             this._log("Initialize done!", LOG_LEVEL_NOTICE, "syncAll");
         }
+        return true;
     }
 
     async syncFileBetweenDBandStorage(file: UXFileInfoStub, doc: MetaEntry) {
@@ -289,7 +293,7 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
         const compareResult = compareFileFreshness(file, doc);
         switch (compareResult) {
             case BASE_IS_NEW:
-                if (!this.core.$$isFileSizeExceeded(file.stat.size)) {
+                if (!this.services.vault.isFileSizeTooLarge(file.stat.size)) {
                     this._log("STORAGE -> DB :" + file.path);
                     await this.core.fileHandler.storeFileToDB(file);
                 } else {
@@ -300,7 +304,7 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
                 }
                 break;
             case TARGET_IS_NEW:
-                if (!this.core.$$isFileSizeExceeded(doc.size)) {
+                if (!this.services.vault.isFileSizeTooLarge(doc.size)) {
                     this._log("STORAGE <- DB :" + file.path);
                     if (await this.core.fileHandler.dbToStorage(doc, stripAllPrefixes(file.path), true)) {
                         eventHub.emitEvent("event-file-changed", {
@@ -365,27 +369,31 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
         this._log(`Checking expired file history done`);
     }
 
-    async $$initializeDatabase(
+    private async _initializeDatabase(
         showingNotice: boolean = false,
         reopenDatabase = true,
         ignoreSuspending: boolean = false
     ): Promise<boolean> {
-        this.core.$$resetIsReady();
-        if (!reopenDatabase || (await this.core.$$openDatabase())) {
+        this.services.appLifecycle.resetIsReady();
+        if (!reopenDatabase || (await this.services.database.openDatabase())) {
             if (this.localDatabase.isReady) {
-                await this.core.$$performFullScan(showingNotice, ignoreSuspending);
+                await this.services.vault.scanVault(showingNotice, ignoreSuspending);
             }
-            if (!(await this.core.$everyOnDatabaseInitialized(showingNotice))) {
-                this._log(`Initializing database has been failed on some module`, LOG_LEVEL_NOTICE);
+            if (!(await this.services.databaseEvents.onDatabaseInitialised(showingNotice))) {
+                this._log(`Initializing database has been failed on some module!`, LOG_LEVEL_NOTICE);
                 return false;
             }
-            this.core.$$markIsReady();
+            this.services.appLifecycle.markIsReady();
             // run queued event once.
-            await this.core.$everyCommitPendingFileEvent();
+            await this.services.fileProcessing.commitPendingFileEvents();
             return true;
         } else {
-            this.core.$$resetIsReady();
+            this.services.appLifecycle.resetIsReady();
             return false;
         }
     }
+    onBindFunction(core: LiveSyncCore, services: InjectableServiceHub): void {
+        services.databaseEvents.handleInitialiseDatabase(this._initializeDatabase.bind(this));
+        services.vault.handleScanVault(this._performFullScan.bind(this));
+    }
 }

src/modules/essential/ModuleKeyValueDB.ts

@@ -3,9 +3,9 @@ import { OpenKeyValueDatabase } from "../../common/KeyValueDB.ts";
 import type { LiveSyncLocalDB } from "../../lib/src/pouchdb/LiveSyncLocalDB.ts";
 import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
 import { AbstractModule } from "../AbstractModule.ts";
-import type { ICoreModule } from "../ModuleTypes.ts";
+import type { LiveSyncCore } from "../../main.ts";
 
-export class ModuleKeyValueDB extends AbstractModule implements ICoreModule {
+export class ModuleKeyValueDB extends AbstractModule {
     tryCloseKvDB() {
         try {
             this.core.kvDB?.close();
@@ -22,7 +22,7 @@ export class ModuleKeyValueDB extends AbstractModule implements ICoreModule {
             this.tryCloseKvDB();
             await delay(10);
             await yieldMicrotask();
-            this.core.kvDB = await OpenKeyValueDatabase(this.core.$$getVaultName() + "-livesync-kv");
+            this.core.kvDB = await OpenKeyValueDatabase(this.services.vault.getVaultName() + "-livesync-kv");
             await yieldMicrotask();
             await delay(100);
         } catch (e) {
@@ -33,21 +33,23 @@ export class ModuleKeyValueDB extends AbstractModule implements ICoreModule {
         }
         return true;
     }
-    $allOnDBUnload(db: LiveSyncLocalDB): void {
+    _onDBUnload(db: LiveSyncLocalDB) {
         if (this.core.kvDB) this.core.kvDB.close();
+        return Promise.resolve(true);
     }
-    $allOnDBClose(db: LiveSyncLocalDB): void {
+    _onDBClose(db: LiveSyncLocalDB) {
         if (this.core.kvDB) this.core.kvDB.close();
+        return Promise.resolve(true);
     }
 
-    async $everyOnloadAfterLoadSettings(): Promise<boolean> {
+    private async _everyOnloadAfterLoadSettings(): Promise<boolean> {
         if (!(await this.openKeyValueDB())) {
             return false;
         }
-        this.core.simpleStore = this.core.$$getSimpleStore<any>("os");
+        this.core.simpleStore = this.services.database.openSimpleStore<any>("os");
         return Promise.resolve(true);
     }
-    $$getSimpleStore<T>(kind: string) {
+    _getSimpleStore<T>(kind: string) {
         const prefix = `${kind}-`;
         return {
             get: async (key: string): Promise<T> => {
@@ -75,18 +77,18 @@ export class ModuleKeyValueDB extends AbstractModule implements ICoreModule {
             },
         };
     }
-    $everyOnInitializeDatabase(db: LiveSyncLocalDB): Promise<boolean> {
+    _everyOnInitializeDatabase(db: LiveSyncLocalDB): Promise<boolean> {
         return this.openKeyValueDB();
     }
 
-    async $everyOnResetDatabase(db: LiveSyncLocalDB): Promise<boolean> {
+    async _everyOnResetDatabase(db: LiveSyncLocalDB): Promise<boolean> {
         try {
             const kvDBKey = "queued-files";
             await this.core.kvDB.del(kvDBKey);
             // localStorage.removeItem(lsKey);
             await this.core.kvDB.destroy();
             await yieldMicrotask();
-            this.core.kvDB = await OpenKeyValueDatabase(this.core.$$getVaultName() + "-livesync-kv");
+            this.core.kvDB = await OpenKeyValueDatabase(this.services.vault.getVaultName() + "-livesync-kv");
             await delay(100);
         } catch (e) {
             this.core.kvDB = undefined!;
@@ -96,4 +98,12 @@ export class ModuleKeyValueDB extends AbstractModule implements ICoreModule {
         }
         return true;
     }
+    onBindFunction(core: LiveSyncCore, services: typeof core.services): void {
+        services.databaseEvents.handleOnUnloadDatabase(this._onDBUnload.bind(this));
+        services.databaseEvents.handleOnCloseDatabase(this._onDBClose.bind(this));
+        services.databaseEvents.handleOnDatabaseInitialisation(this._everyOnInitializeDatabase.bind(this));
+        services.databaseEvents.handleOnResetDatabase(this._everyOnResetDatabase.bind(this));
+        services.database.handleOpenSimpleStore(this._getSimpleStore.bind(this));
+        services.appLifecycle.handleOnSettingLoaded(this._everyOnloadAfterLoadSettings.bind(this));
+    }
 }

src/modules/essential/ModuleMigration.ts

@@ -9,13 +9,13 @@ import {
     eventHub,
 } from "../../common/events.ts";
 import { AbstractModule } from "../AbstractModule.ts";
-import type { ICoreModule } from "../ModuleTypes.ts";
 import { $msg } from "src/lib/src/common/i18n.ts";
 import { performDoctorConsultation, RebuildOptions } from "../../lib/src/common/configForDoc.ts";
 import { getPath, isValidPath } from "../../common/utils.ts";
 import { isMetaEntry } from "../../lib/src/common/types.ts";
 import { isDeletedEntry, isDocContentSame, isLoadedEntry, readAsBlob } from "../../lib/src/common/utils.ts";
 import { countCompromisedChunks } from "../../lib/src/pouchdb/negotiation.ts";
+import type { LiveSyncCore } from "../../main.ts";
 
 type ErrorInfo = {
     path: string;
@@ -26,7 +26,7 @@ type ErrorInfo = {
     isConflicted?: boolean;
 };
 
-export class ModuleMigration extends AbstractModule implements ICoreModule {
+export class ModuleMigration extends AbstractModule {
     async migrateUsingDoctor(skipRebuild: boolean = false, activateReason = "updated", forceRescan = false) {
         const { shouldRebuild, shouldRebuildLocal, isModified, settings } = await performDoctorConsultation(
             this.core,
@@ -45,11 +45,11 @@ export class ModuleMigration extends AbstractModule implements ICoreModule {
         if (!skipRebuild) {
             if (shouldRebuild) {
                 await this.core.rebuilder.scheduleRebuild();
-                await this.core.$$performRestart();
+                this.services.appLifecycle.performRestart();
                 return false;
             } else if (shouldRebuildLocal) {
                 await this.core.rebuilder.scheduleFetch();
-                await this.core.$$performRestart();
+                this.services.appLifecycle.performRestart();
                 return false;
             }
         }
@@ -129,7 +129,7 @@ export class ModuleMigration extends AbstractModule implements ICoreModule {
             if (!isValidPath(path)) {
                 continue;
             }
-            if (!(await this.core.$$isTargetFile(path, true))) {
+            if (!(await this.services.vault.isTargetFile(path, true))) {
                 continue;
             }
             if (!isMetaEntry(metaDoc)) {
@@ -257,9 +257,9 @@ export class ModuleMigration extends AbstractModule implements ICoreModule {
         }
         // Check local database for compromised chunks
         const localCompromised = await countCompromisedChunks(this.localDatabase.localDatabase);
-        const remote = this.core.$$getReplicator();
+        const remote = this.services.replicator.getActiveReplicator();
         const remoteCompromised = this.core.managers.networkManager.isOnline
-            ? await remote.countCompromisedChunks()
+            ? await remote?.countCompromisedChunks()
             : 0;
         if (localCompromised === false) {
             Logger(`Failed to count compromised chunks in local database`, LOG_LEVEL_NOTICE);
@@ -293,12 +293,12 @@ export class ModuleMigration extends AbstractModule implements ICoreModule {
         if (result === REBUILD) {
             // Rebuild the database
             await this.core.rebuilder.scheduleRebuild();
-            await this.core.$$performRestart();
+            this.services.appLifecycle.performRestart();
             return false;
         } else if (result === FETCH) {
             // Fetch the latest data from remote
             await this.core.rebuilder.scheduleFetch();
-            await this.core.$$performRestart();
+            this.services.appLifecycle.performRestart();
             return false;
         } else {
             // User chose to dismiss the issue
@@ -307,7 +307,7 @@ export class ModuleMigration extends AbstractModule implements ICoreModule {
         return true;
     }
 
-    async $everyOnFirstInitialize(): Promise<boolean> {
+    async _everyOnFirstInitialize(): Promise<boolean> {
         if (!this.localDatabase.isReady) {
             this._log($msg("moduleMigration.logLocalDatabaseNotReady"), LOG_LEVEL_NOTICE);
             return false;
@@ -337,7 +337,7 @@ export class ModuleMigration extends AbstractModule implements ICoreModule {
         }
         return true;
     }
-    $everyOnLayoutReady(): Promise<boolean> {
+    _everyOnLayoutReady(): Promise<boolean> {
         eventHub.onEvent(EVENT_REQUEST_RUN_DOCTOR, async (reason) => {
             await this.migrateUsingDoctor(false, reason, true);
         });
@@ -346,4 +346,9 @@ export class ModuleMigration extends AbstractModule implements ICoreModule {
         });
         return Promise.resolve(true);
     }
+    onBindFunction(core: LiveSyncCore, services: typeof core.services): void {
+        super.onBindFunction(core, services);
+        services.appLifecycle.handleLayoutReady(this._everyOnLayoutReady.bind(this));
+        services.appLifecycle.handleFirstInitialise(this._everyOnFirstInitialize.bind(this));
+    }
 }