### Refactor

- Module dependency refined. (For details, please refer to updates.md)

src/modules/services/ObsidianAPIService.ts

@@ -0,0 +1,92 @@
+import { InjectableAPIService } from "@/lib/src/services/implements/injectable/InjectableAPIService";
+import type { ObsidianServiceContext } from "@/lib/src/services/implements/obsidian/ObsidianServiceContext";
+import { Platform, type Command, type ViewCreator } from "obsidian";
+import { ObsHttpHandler } from "../essentialObsidian/APILib/ObsHttpHandler";
+
+// All Services will be migrated to be based on Plain Services, not Injectable Services.
+// This is a migration step.
+
+export class ObsidianAPIService extends InjectableAPIService<ObsidianServiceContext> {
+    _customHandler: ObsHttpHandler | undefined;
+    getCustomFetchHandler(): ObsHttpHandler {
+        if (!this._customHandler) this._customHandler = new ObsHttpHandler(undefined, undefined);
+        return this._customHandler;
+    }
+
+    async showWindow(viewType: string): Promise<void> {
+        const leaves = this.app.workspace.getLeavesOfType(viewType);
+        if (leaves.length == 0) {
+            await this.app.workspace.getLeaf(true).setViewState({
+                type: viewType,
+                active: true,
+            });
+        } else {
+            await leaves[0].setViewState({
+                type: viewType,
+                active: true,
+            });
+        }
+        if (leaves.length > 0) {
+            await this.app.workspace.revealLeaf(leaves[0]);
+        }
+    }
+
+    private get app() {
+        return this.context.app;
+    }
+
+    getPlatform(): string {
+        if (Platform.isAndroidApp) {
+            return "android-app";
+        } else if (Platform.isIosApp) {
+            return "ios";
+        } else if (Platform.isMacOS) {
+            return "macos";
+        } else if (Platform.isMobileApp) {
+            return "mobile-app";
+        } else if (Platform.isMobile) {
+            return "mobile";
+        } else if (Platform.isSafari) {
+            return "safari";
+        } else if (Platform.isDesktop) {
+            return "desktop";
+        } else if (Platform.isDesktopApp) {
+            return "desktop-app";
+        } else {
+            return "unknown-obsidian";
+        }
+    }
+    override isMobile(): boolean {
+        //@ts-ignore : internal API
+        return this.app.isMobile;
+    }
+    override getAppID(): string {
+        return `${"appId" in this.app ? this.app.appId : ""}`;
+    }
+    override getAppVersion(): string {
+        const navigatorString = globalThis.navigator?.userAgent ?? "";
+        const match = navigatorString.match(/obsidian\/([0-9]+\.[0-9]+\.[0-9]+)/);
+        if (match && match.length >= 2) {
+            return match[1];
+        }
+        return "0.0.0";
+    }
+
+    override getPluginVersion(): string {
+        return this.context.plugin.manifest.version;
+    }
+
+    addCommand<TCommand extends Command>(command: TCommand): TCommand {
+        return this.context.plugin.addCommand(command) as TCommand;
+    }
+
+    registerWindow(type: string, factory: ViewCreator): void {
+        return this.context.plugin.registerView(type, factory);
+    }
+    addRibbonIcon(icon: string, title: string, callback: (evt: MouseEvent) => any): HTMLElement {
+        return this.context.plugin.addRibbonIcon(icon, title, callback);
+    }
+    registerProtocolHandler(action: string, handler: (params: Record<string, string>) => any): void {
+        return this.context.plugin.registerObsidianProtocolHandler(action, handler);
+    }
+}

src/modules/services/ObsidianDatabaseService.ts

@@ -0,0 +1,11 @@
+import { initializeStores } from "@/common/stores";
+
+import { InjectableDatabaseService } from "@/lib/src/services/implements/injectable/InjectableDatabaseService";
+import type { ObsidianServiceContext } from "@/lib/src/services/implements/obsidian/ObsidianServiceContext";
+
+export class ObsidianDatabaseService extends InjectableDatabaseService<ObsidianServiceContext> {
+    override onOpenDatabase(vaultName: string): Promise<void> {
+        initializeStores(vaultName);
+        return Promise.resolve();
+    }
+}

src/modules/services/ObsidianServiceHub.ts

@@ -3,9 +3,7 @@ import { ObsidianServiceContext } from "@/lib/src/services/implements/obsidian/O
 import type { ServiceInstances } from "@/lib/src/services/ServiceHub";
 import type ObsidianLiveSyncPlugin from "@/main";
 import {
-    ObsidianAPIService,
     ObsidianConflictService,
-    ObsidianDatabaseService,
     ObsidianFileProcessingService,
     ObsidianReplicationService,
     ObsidianReplicatorService,
@@ -15,7 +13,10 @@ import {
     ObsidianTestService,
     ObsidianDatabaseEventService,
     ObsidianConfigService,
+    ObsidianKeyValueDBService,
 } from "./ObsidianServices";
+import { ObsidianDatabaseService } from "./ObsidianDatabaseService";
+import { ObsidianAPIService } from "./ObsidianAPIService";
 import { ObsidianAppLifecycleService } from "./ObsidianAppLifecycleService";
 import { ObsidianPathService } from "./ObsidianPathService";
 import { ObsidianVaultService } from "./ObsidianVaultService";
@@ -30,7 +31,6 @@ export class ObsidianServiceHub extends InjectableServiceHub<ObsidianServiceCont
         const API = new ObsidianAPIService(context);
         const appLifecycle = new ObsidianAppLifecycleService(context);
         const conflict = new ObsidianConflictService(context);
-        const database = new ObsidianDatabaseService(context);
         const fileProcessing = new ObsidianFileProcessingService(context);
         const replication = new ObsidianReplicationService(context);
         const replicator = new ObsidianReplicatorService(context);
@@ -45,6 +45,16 @@ export class ObsidianServiceHub extends InjectableServiceHub<ObsidianServiceCont
         const path = new ObsidianPathService(context, {
             settingService: setting,
         });
+        const database = new ObsidianDatabaseService(context, {
+            path: path,
+            vault: vault,
+            setting: setting,
+        });
+        const keyValueDB = new ObsidianKeyValueDBService(context, {
+            appLifecycle: appLifecycle,
+            databaseEvents: databaseEvents,
+            vault: vault,
+        });
         const config = new ObsidianConfigService(context, vault);
         const ui = new ObsidianUIService(context, {
             appLifecycle,
@@ -70,6 +80,7 @@ export class ObsidianServiceHub extends InjectableServiceHub<ObsidianServiceCont
             path: path,
             API: API,
             config: config,
+            keyValueDB: keyValueDB,
         } satisfies Required<ServiceInstances<ObsidianServiceContext>>;
 
         super(context, serviceInstancesToInit);

src/modules/services/ObsidianServices.ts

@@ -1,7 +1,5 @@
-import { InjectableAPIService } from "@lib/services/implements/injectable/InjectableAPIService";
 import { InjectableConflictService } from "@lib/services/implements/injectable/InjectableConflictService";
 import { InjectableDatabaseEventService } from "@lib/services/implements/injectable/InjectableDatabaseEventService";
-import { InjectableDatabaseService } from "@lib/services/implements/injectable/InjectableDatabaseService";
 import { InjectableFileProcessingService } from "@lib/services/implements/injectable/InjectableFileProcessingService";
 import { InjectableRemoteService } from "@lib/services/implements/injectable/InjectableRemoteService";
 import { InjectableReplicationService } from "@lib/services/implements/injectable/InjectableReplicationService";
@@ -11,105 +9,8 @@ import { InjectableTestService } from "@lib/services/implements/injectable/Injec
 import { InjectableTweakValueService } from "@lib/services/implements/injectable/InjectableTweakValueService";
 import { ConfigServiceBrowserCompat } from "@lib/services/implements/browser/ConfigServiceBrowserCompat";
 import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext.ts";
-import { Platform } from "@/deps";
-import type { SimpleStore } from "@/lib/src/common/utils";
-import type { IDatabaseService } from "@/lib/src/services/base/IService";
-import { handlers } from "@/lib/src/services/lib/HandlerUtils";
-import { ObsHttpHandler } from "../essentialObsidian/APILib/ObsHttpHandler";
-import type { Command, ViewCreator } from "obsidian";
+import { KeyValueDBService } from "@/lib/src/services/base/KeyValueDBService";
 
-// All Services will be migrated to be based on Plain Services, not Injectable Services.
-// This is a migration step.
-
-export class ObsidianAPIService extends InjectableAPIService<ObsidianServiceContext> {
-    _customHandler: ObsHttpHandler | undefined;
-    getCustomFetchHandler(): ObsHttpHandler {
-        if (!this._customHandler) this._customHandler = new ObsHttpHandler(undefined, undefined);
-        return this._customHandler;
-    }
-
-    async showWindow(viewType: string): Promise<void> {
-        const leaves = this.app.workspace.getLeavesOfType(viewType);
-        if (leaves.length == 0) {
-            await this.app.workspace.getLeaf(true).setViewState({
-                type: viewType,
-                active: true,
-            });
-        } else {
-            await leaves[0].setViewState({
-                type: viewType,
-                active: true,
-            });
-        }
-        if (leaves.length > 0) {
-            await this.app.workspace.revealLeaf(leaves[0]);
-        }
-    }
-
-    private get app() {
-        return this.context.app;
-    }
-
-    getPlatform(): string {
-        if (Platform.isAndroidApp) {
-            return "android-app";
-        } else if (Platform.isIosApp) {
-            return "ios";
-        } else if (Platform.isMacOS) {
-            return "macos";
-        } else if (Platform.isMobileApp) {
-            return "mobile-app";
-        } else if (Platform.isMobile) {
-            return "mobile";
-        } else if (Platform.isSafari) {
-            return "safari";
-        } else if (Platform.isDesktop) {
-            return "desktop";
-        } else if (Platform.isDesktopApp) {
-            return "desktop-app";
-        } else {
-            return "unknown-obsidian";
-        }
-    }
-    override isMobile(): boolean {
-        //@ts-ignore : internal API
-        return this.app.isMobile;
-    }
-    override getAppID(): string {
-        return `${"appId" in this.app ? this.app.appId : ""}`;
-    }
-    override getAppVersion(): string {
-        const navigatorString = globalThis.navigator?.userAgent ?? "";
-        const match = navigatorString.match(/obsidian\/([0-9]+\.[0-9]+\.[0-9]+)/);
-        if (match && match.length >= 2) {
-            return match[1];
-        }
-        return "0.0.0";
-    }
-
-    override getPluginVersion(): string {
-        return this.context.plugin.manifest.version;
-    }
-
-    addCommand<TCommand extends Command>(command: TCommand): TCommand {
-        return this.context.plugin.addCommand(command) as TCommand;
-    }
-
-    registerWindow(type: string, factory: ViewCreator): void {
-        return this.context.plugin.registerView(type, factory);
-    }
-    addRibbonIcon(icon: string, title: string, callback: (evt: MouseEvent) => any): HTMLElement {
-        return this.context.plugin.addRibbonIcon(icon, title, callback);
-    }
-    registerProtocolHandler(action: string, handler: (params: Record<string, string>) => any): void {
-        return this.context.plugin.registerObsidianProtocolHandler(action, handler);
-    }
-}
-export class ObsidianDatabaseService extends InjectableDatabaseService<ObsidianServiceContext> {
-    openSimpleStore = handlers<IDatabaseService>().binder("openSimpleStore") as (<T>(
-        kind: string
-    ) => SimpleStore<T>) & { setHandler: (handler: IDatabaseService["openSimpleStore"], override?: boolean) => void };
-}
 export class ObsidianDatabaseEventService extends InjectableDatabaseEventService<ObsidianServiceContext> {}
 
 // InjectableReplicatorService
@@ -129,3 +30,5 @@ export class ObsidianTweakValueService extends InjectableTweakValueService<Obsid
 // InjectableTestService
 export class ObsidianTestService extends InjectableTestService<ObsidianServiceContext> {}
 export class ObsidianConfigService extends ConfigServiceBrowserCompat<ObsidianServiceContext> {}
+
+export class ObsidianKeyValueDBService extends KeyValueDBService<ObsidianServiceContext> {}