public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-10-06 01:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge main and verify ID keys through Setup URI and QR

Browse Source
This commit is contained in:
vorotamoroz
2026-09-29 14:28:51 +00:00
parent d4247e9039 b3208f2aaf
commit a511b51d2c
51 changed files with 2823 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/e2e-obsidian/runner/setupUri.ts
+51 -6
View File
@@ -73,7 +73,8 @@ export async function enterSetupURI(
port: number,
mode: "new" | "existing",
artifact: SetupArtifact,
captures: SetupCaptureNames
captures: SetupCaptureNames,
rejectedArtifacts: readonly SetupArtifact[] = []
): Promise<string> {
await withObsidianPage(port, async (page) => {
const invitation = page.locator(".notice").filter({ hasText: "Welcome to Self-hosted LiveSync" });
@@ -101,6 +102,40 @@ export async function enterSetupURI(
const setup = modalByTitle(page, "Enter Setup URI");
await setup.waitFor({ state: "visible", timeout: uiTimeoutMs });
const settingsSnapshot = () =>
page.evaluate(async () => {
const obsidian = globalThis as typeof globalThis & {
app: {
plugins: {
plugins: Record<
string,
{
core: { services: { setting: { currentSettings(): unknown } } };
loadData(): Promise<unknown>;
}
>;
};
};
};
const plugin = obsidian.app.plugins.plugins["obsidian-livesync"];
return JSON.stringify({
current: plugin.core.services.setting.currentSettings(),
persisted: await plugin.loadData(),
});
});
const before = rejectedArtifacts.length > 0 ? await settingsSnapshot() : undefined;
for (const rejected of rejectedArtifacts) {
await setup.locator('input[placeholder^="obsidian://setuplivesync"]').fill(rejected.setupURI);
await setup.locator('input[name="password"]').fill(rejected.setupPassphrase);
await setup.getByRole("button", { name: "Test Settings and Continue" }).click({ timeout: uiTimeoutMs });
await setup.getByText($msg("Failed to parse Setup-URI."), { exact: false }).waitFor({
state: "visible",
timeout: uiTimeoutMs,
});
if ((await settingsSnapshot()) !== before) {
throw new Error("A rejected Setup URI changed the receiving device's settings.");
}
}
await setup.locator('input[placeholder^="obsidian://setuplivesync"]').fill(artifact.setupURI);
await setup.locator('input[name="password"]').fill(artifact.setupPassphrase);
});
@@ -120,7 +155,8 @@ export async function enterSetupURI(
export async function generateSetupURIFromDevice(
port: number,
setupPassphrase: string,
captures: SetupCaptureNames
captures: SetupCaptureNames,
mode: "ephemeral" | "persistent" = "ephemeral"
): Promise<{ artifact: SetupArtifact; screenshots: string[] }> {
const opened = await withObsidianPage(port, async (page) => {
return await page.evaluate(
@@ -153,9 +189,15 @@ export async function generateSetupURIFromDevice(
const choice = modalByTitle(page, "Setup URI availability");
await choice.waitFor({ state: "visible", timeout: uiTimeoutMs });
await choice.getByText("Time-bound Setup URIs can be opened until", { exact: false }).waitFor({
state: "visible", timeout: uiTimeoutMs,
state: "visible",
timeout: uiTimeoutMs,
});
await choice.getByRole("button", { name: "Time-bound", exact: true }).click({ timeout: uiTimeoutMs });
await choice
.getByRole("button", {
name: mode === "ephemeral" ? "Time-bound" : "Compatible (no time limit)",
exact: true,
})
.click({ timeout: uiTimeoutMs });
});
const resultTitle = "Your Setup URI is ready to be copied";
@@ -407,10 +449,13 @@ export async function finishInitialisation(
while (Date.now() < deadline) {
const resumeVisible = await withObsidianPage(port, async (page) => {
const alignedSettingsNotice = page.locator(".modal-container").filter({
hasText: "Your settings differed slightly from the server's. The plug-in has supplemented the incompatible parts with the server settings!",
hasText:
"Your settings differed slightly from the server's. The plug-in has supplemented the incompatible parts with the server settings!",
});
if (await alignedSettingsNotice.isVisible()) {
await alignedSettingsNotice.getByRole("button", { name: "OK", exact: true }).click({ timeout: uiTimeoutMs });
await alignedSettingsNotice
.getByRole("button", { name: "OK", exact: true })
.click({ timeout: uiTimeoutMs });
}
return await modalByTitle(page, "Confirmation").filter({ hasText: message }).isVisible();
}).catch(() => false);