for 0.25.43-patched-7, please refer to the updates.md

src/modules/services/ObsidianAPIService.ts

@@ -1,13 +1,20 @@
-import { InjectableAPIService } from "@/lib/src/services/implements/injectable/InjectableAPIService";
-import type { ObsidianServiceContext } from "@/lib/src/services/implements/obsidian/ObsidianServiceContext";
+import { InjectableAPIService } from "@lib/services/implements/injectable/InjectableAPIService";
+import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
 import { Platform, type Command, type ViewCreator } from "obsidian";
 import { ObsHttpHandler } from "../essentialObsidian/APILib/ObsHttpHandler";
+import { ObsidianConfirm } from "./ObsidianConfirm";
+import type { Confirm } from "@lib/interfaces/Confirm";
 
 // 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;
+    _confirmInstance: Confirm;
+    constructor(context: ObsidianServiceContext) {
+        super(context);
+        this._confirmInstance = new ObsidianConfirm(context);
+    }
     getCustomFetchHandler(): ObsHttpHandler {
         if (!this._customHandler) this._customHandler = new ObsHttpHandler(undefined, undefined);
         return this._customHandler;
@@ -63,6 +70,11 @@ export class ObsidianAPIService extends InjectableAPIService<ObsidianServiceCont
     override getAppID(): string {
         return `${"appId" in this.app ? this.app.appId : ""}`;
     }
+
+    override getSystemVaultName(): string {
+        return this.app.vault.getName();
+    }
+
     override getAppVersion(): string {
         const navigatorString = globalThis.navigator?.userAgent ?? "";
         const match = navigatorString.match(/obsidian\/([0-9]+\.[0-9]+\.[0-9]+)/);
@@ -76,6 +88,10 @@ export class ObsidianAPIService extends InjectableAPIService<ObsidianServiceCont
         return this.context.plugin.manifest.version;
     }
 
+    get confirm(): Confirm {
+        return this._confirmInstance;
+    }
+
     addCommand<TCommand extends Command>(command: TCommand): TCommand {
         return this.context.plugin.addCommand(command) as TCommand;
     }

src/modules/services/ObsidianServiceHub.ts

@@ -1,6 +1,6 @@
-import { InjectableServiceHub } from "@/lib/src/services/implements/injectable/InjectableServiceHub";
-import { ObsidianServiceContext } from "@/lib/src/services/implements/obsidian/ObsidianServiceContext";
-import type { ServiceInstances } from "@/lib/src/services/ServiceHub";
+import { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub";
+import { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
+import type { ServiceInstances } from "@lib/services/ServiceHub";
 import type ObsidianLiveSyncPlugin from "@/main";
 import {
     ObsidianConflictService,
@@ -8,13 +8,14 @@ import {
     ObsidianReplicationService,
     ObsidianReplicatorService,
     ObsidianRemoteService,
-    ObsidianSettingService,
     ObsidianTweakValueService,
     ObsidianTestService,
     ObsidianDatabaseEventService,
     ObsidianConfigService,
     ObsidianKeyValueDBService,
+    ObsidianControlService,
 } from "./ObsidianServices";
+import { ObsidianSettingService } from "./ObsidianSettingService";
 import { ObsidianDatabaseService } from "./ObsidianDatabaseService";
 import { ObsidianAPIService } from "./ObsidianAPIService";
 import { ObsidianAppLifecycleService } from "./ObsidianAppLifecycleService";
@@ -35,10 +36,14 @@ export class ObsidianServiceHub extends InjectableServiceHub<ObsidianServiceCont
         const replication = new ObsidianReplicationService(context);
 
         const remote = new ObsidianRemoteService(context);
-        const setting = new ObsidianSettingService(context);
         const tweakValue = new ObsidianTweakValueService(context);
+
+        const setting = new ObsidianSettingService(context, {
+            APIService: API,
+        });
         const vault = new ObsidianVaultService(context, {
             settingService: setting,
+            APIService: API,
         });
         const test = new ObsidianTestService(context);
         const databaseEvents = new ObsidianDatabaseEventService(context);
@@ -56,7 +61,6 @@ export class ObsidianServiceHub extends InjectableServiceHub<ObsidianServiceCont
             vault: vault,
         });
         const config = new ObsidianConfigService(context, {
-            vaultService: vault,
             settingService: setting,
             APIService: API,
         });
@@ -69,6 +73,14 @@ export class ObsidianServiceHub extends InjectableServiceHub<ObsidianServiceCont
             appLifecycle,
             config,
             replicator,
+            APIService: API,
+        });
+        const control = new ObsidianControlService(context, {
+            appLifecycleService: appLifecycle,
+            databaseService: database,
+            fileProcessingService: fileProcessing,
+            settingService: setting,
+            APIService: API,
         });
 
         // Using 'satisfies' to ensure all services are provided
@@ -90,6 +102,7 @@ export class ObsidianServiceHub extends InjectableServiceHub<ObsidianServiceCont
             API: API,
             config: config,
             keyValueDB: keyValueDB,
+            control: control,
         } satisfies Required<ServiceInstances<ObsidianServiceContext>>;
 
         super(context, serviceInstancesToInit);

src/modules/services/ObsidianServices.ts

@@ -4,12 +4,12 @@ import { InjectableFileProcessingService } from "@lib/services/implements/inject
 import { InjectableRemoteService } from "@lib/services/implements/injectable/InjectableRemoteService";
 import { InjectableReplicationService } from "@lib/services/implements/injectable/InjectableReplicationService";
 import { InjectableReplicatorService } from "@lib/services/implements/injectable/InjectableReplicatorService";
-import { InjectableSettingService } from "@lib/services/implements/injectable/InjectableSettingService";
 import { InjectableTestService } from "@lib/services/implements/injectable/InjectableTestService";
 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 { KeyValueDBService } from "@/lib/src/services/base/KeyValueDBService";
+import { KeyValueDBService } from "@lib/services/base/KeyValueDBService";
+import { ControlService } from "@lib/services/base/ControlService";
 
 export class ObsidianDatabaseEventService extends InjectableDatabaseEventService<ObsidianServiceContext> {}
 
@@ -23,8 +23,6 @@ export class ObsidianReplicationService extends InjectableReplicationService<Obs
 export class ObsidianRemoteService extends InjectableRemoteService<ObsidianServiceContext> {}
 // InjectableConflictService
 export class ObsidianConflictService extends InjectableConflictService<ObsidianServiceContext> {}
-// InjectableSettingService
-export class ObsidianSettingService extends InjectableSettingService<ObsidianServiceContext> {}
 // InjectableTweakValueService
 export class ObsidianTweakValueService extends InjectableTweakValueService<ObsidianServiceContext> {}
 // InjectableTestService
@@ -32,3 +30,5 @@ export class ObsidianTestService extends InjectableTestService<ObsidianServiceCo
 export class ObsidianConfigService extends ConfigServiceBrowserCompat<ObsidianServiceContext> {}
 
 export class ObsidianKeyValueDBService extends KeyValueDBService<ObsidianServiceContext> {}
+
+export class ObsidianControlService extends ControlService<ObsidianServiceContext> {}

src/modules/services/ObsidianSettingService.ts

@@ -0,0 +1,35 @@
+import { type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { EVENT_REQUEST_RELOAD_SETTING_TAB, EVENT_SETTING_SAVED } from "@lib/events/coreEvents";
+import { eventHub } from "@lib/hub/hub";
+import { SettingService, type SettingServiceDependencies } from "@lib/services/base/SettingService";
+import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
+
+export class ObsidianSettingService<T extends ObsidianServiceContext> extends SettingService<T> {
+    constructor(context: T, dependencies: SettingServiceDependencies) {
+        super(context, dependencies);
+        this.onSettingSaved.addHandler((settings) => {
+            eventHub.emitEvent(EVENT_SETTING_SAVED, settings);
+            return Promise.resolve(true);
+        });
+        this.onSettingLoaded.addHandler((settings) => {
+            eventHub.emitEvent(EVENT_REQUEST_RELOAD_SETTING_TAB);
+            return Promise.resolve(true);
+        });
+    }
+    protected setItem(key: string, value: string) {
+        return localStorage.setItem(key, value);
+    }
+    protected getItem(key: string): string {
+        return localStorage.getItem(key) ?? "";
+    }
+    protected deleteItem(key: string): void {
+        localStorage.removeItem(key);
+    }
+
+    protected override async saveData(data: ObsidianLiveSyncSettings): Promise<void> {
+        return await this.context.liveSyncPlugin.saveData(data);
+    }
+    protected override async loadData(): Promise<ObsidianLiveSyncSettings | undefined> {
+        return await this.context.liveSyncPlugin.loadData();
+    }
+}

src/modules/services/ObsidianUIService.ts

@@ -2,14 +2,15 @@ import type { ConfigService } from "@lib/services/base/ConfigService";
 import type { AppLifecycleService } from "@lib/services/base/AppLifecycleService";
 import type { ReplicatorService } from "@lib/services/base/ReplicatorService";
 import { UIService } from "@lib/services//implements/base/UIService";
-import { ObsidianServiceContext } from "@/lib/src/services/implements/obsidian/ObsidianServiceContext";
+import { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
 import { ObsidianSvelteDialogManager } from "./SvelteDialogObsidian";
-import { ObsidianConfirm } from "./ObsidianConfirm";
-import DialogToCopy from "@/lib/src/UI/dialogues/DialogueToCopy.svelte";
+import DialogToCopy from "@lib/UI/dialogues/DialogueToCopy.svelte";
+import type { IAPIService } from "@lib/services/base/IService";
 export type ObsidianUIServiceDependencies<T extends ObsidianServiceContext = ObsidianServiceContext> = {
     appLifecycle: AppLifecycleService<T>;
     config: ConfigService<T>;
     replicator: ReplicatorService<T>;
+    APIService: IAPIService;
 };
 
 export class ObsidianUIService extends UIService<ObsidianServiceContext> {
@@ -17,7 +18,7 @@ export class ObsidianUIService extends UIService<ObsidianServiceContext> {
         return DialogToCopy;
     }
     constructor(context: ObsidianServiceContext, dependents: ObsidianUIServiceDependencies<ObsidianServiceContext>) {
-        const obsidianConfirm = new ObsidianConfirm(context);
+        const obsidianConfirm = dependents.APIService.confirm;
         const obsidianSvelteDialogManager = new ObsidianSvelteDialogManager<ObsidianServiceContext>(context, {
             appLifecycle: dependents.appLifecycle,
             config: dependents.config,
@@ -27,7 +28,7 @@ export class ObsidianUIService extends UIService<ObsidianServiceContext> {
         super(context, {
             appLifecycle: dependents.appLifecycle,
             dialogManager: obsidianSvelteDialogManager,
-            confirm: obsidianConfirm,
+            APIService: dependents.APIService,
         });
     }
 }