public/obsidian-livesync
1
0 Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-11-03 23:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make remote and log resource ownership explicit

Browse Source
This commit is contained in:
vorotamoroz committed 2026-10-29 14:56:06 +00:00
1 parent db95f420b9
commit 28bc6e87a1
17 files changed
+987 -71
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/serviceFeatures/useJoinedDevices.ts
+7 -10
View File
@@ -9,6 +9,7 @@ import {
import { REMOTE_RESOURCE_KINDS, type JoinedDevicesSnapshot } from "@vrtmrz/livesync-commonlib/replication";
import type { ObsidianNoticeGroups } from "@/modules/services/ObsidianNoticeGroups";
import JoinedDevicesDialog from "@/modules/services/LiveSyncUI/dialogues/JoinedDevicesDialog.svelte";
import { withOwnedRemoteResource } from "@/common/ownedRemoteResource";
import {
getCouchDBReplicatorConfigurationIdentity,
getObjectStorageReplicatorConfigurationIdentity,
@@ -119,9 +120,9 @@ export function useJoinedDevicesFeature(host: JoinedDevicesHost, notices: Obsidi
settings
);
if (!resource) throw new Error("Joined devices are unavailable");
try {
return withOwnedRemoteResource(resource, async (ownedResource) => {
assertCurrent();
const snapshot = await resource.read();
const snapshot = await ownedResource.read();
assertCurrent();
notify(snapshot, id, identity!);
return joinedDevicesView(snapshot, {
@@ -130,9 +131,7 @@ export function useJoinedDevicesFeature(host: JoinedDevicesHost, notices: Obsidi
pluginVersion: services.API.getPluginVersion(),
appVersion: services.API.getAppVersion(),
});
} finally {
await resource.dispose();
}
});
},
forget: async (id) => {
if (id === (await ownId())) throw new Error("This device cannot be forgotten");
@@ -141,14 +140,12 @@ export function useJoinedDevicesFeature(host: JoinedDevicesHost, notices: Obsidi
settings
);
if (!resource) throw new Error("Joined devices are unavailable");
try {
return withOwnedRemoteResource(resource, async (ownedResource) => {
assertCurrent();
const result = await resource.forget(id);
const result = await ownedResource.forget(id);
assertCurrent();
return result;
} finally {
await resource.dispose();
}
});
},
cancel: () => controller.abort(),
};