Merge branch 'main' into pr/zeedif/1015

src/modules/services/ObsidianServices.ts

@@ -10,11 +10,32 @@ import { ConfigServiceBrowserCompat } from "@vrtmrz/livesync-commonlib/compat/se
 import type { ObsidianServiceContext } from "@/modules/services/ObsidianServiceContext";
 import { KeyValueDBService } from "@vrtmrz/livesync-commonlib/compat/services/base/KeyValueDBService";
 import { ControlService } from "@vrtmrz/livesync-commonlib/compat/services/base/ControlService";
+import { reactiveSource } from "octagonal-wheels/dataobject/reactive";
+
+type ActivityOptions = {
+    label?: string;
+};
 
 export class ObsidianDatabaseEventService extends InjectableDatabaseEventService<ObsidianServiceContext> {}
 
 // InjectableReplicatorService
-export class ObsidianReplicatorService extends InjectableReplicatorService<ObsidianServiceContext> {}
+export class ObsidianReplicatorService extends InjectableReplicatorService<ObsidianServiceContext> {
+    readonly boundedLocalApplicationActivityCount = reactiveSource(0);
+
+    async runBoundedLocalApplicationActivity<T>(
+        task: () => T | PromiseLike<T>,
+        options?: ActivityOptions
+    ): Promise<T> {
+        this.boundedLocalApplicationActivityCount.value++;
+        try {
+            return this.dependencies.activityRunner
+                ? await this.dependencies.activityRunner.run(task, options)
+                : await task();
+        } finally {
+            this.boundedLocalApplicationActivityCount.value--;
+        }
+    }
+}
 // InjectableFileProcessingService
 export class ObsidianFileProcessingService extends InjectableFileProcessingService<ObsidianServiceContext> {}
 // InjectableReplicationService

src/modules/services/ObsidianServices.unit.spec.ts

@@ -0,0 +1,35 @@
+import { promiseWithResolvers } from "octagonal-wheels/promises";
+import { describe, expect, it, vi } from "vitest";
+import { ObsidianReplicatorService } from "./ObsidianServices";
+
+function handler() {
+    return { addHandler: vi.fn() };
+}
+
+describe("ObsidianReplicatorService", () => {
+    it("tracks local application activity without extending remote activity", async () => {
+        const activity = promiseWithResolvers<void>();
+        const service = new ObsidianReplicatorService({ events: {}, translate: String } as never, {
+            settingService: { onRealiseSetting: handler() },
+            appLifecycleService: { onSuspending: handler(), getUnresolvedMessages: handler() },
+            databaseEventService: {
+                onResetDatabase: handler(),
+                onDatabaseInitialisation: handler(),
+                onDatabaseInitialised: handler(),
+                onDatabaseHasReady: handler(),
+            },
+            activityRunner: { run: vi.fn(async (task: () => Promise<void>) => await task()) },
+        } as never);
+
+        const running = service.runBoundedLocalApplicationActivity(() => activity.promise);
+
+        expect(service.boundedLocalApplicationActivityCount.value).toBe(1);
+        expect(service.boundedRemoteActivityCount.value).toBe(0);
+
+        activity.resolve();
+        await running;
+
+        expect(service.boundedLocalApplicationActivityCount.value).toBe(0);
+        expect(service.boundedRemoteActivityCount.value).toBe(0);
+    });
+});