mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-08-11 14:15:46 +00:00
Continues the source-key migration inside the application boundary introduced in 1.0.0, where LiveSync owns its catalogue and consumes Commonlib as a published package. - Replace hardcoded user-visible strings in the Obsidian UI (Setup Wizard dialogues, P2P panes, Customisation Sync panes, Global History, the JSON conflict pane and the remote-configuration menu) with `$msg` calls, keeping the English source string as the key. - Wire up strings whose translations already existed in the catalogue but were still rendered as literals, for example the whole Intro dialogue. - Add the new entries to `src/common/messagesYAML/en.yaml` and `es.yaml`, then regenerate `messagesJson/` and `combinedMessages.prod.ts` through the documented `i18n:bake` pipeline. - No Commonlib gitlink or catalogue is involved; every change is LiveSync-owned. Regenerating the catalogue also normalises three pre-existing entries each in `ko.json` and `zh.json`, where the committed JSON kept a trailing space before a newline that YAML cannot represent. Verified with tsc-check, tsc-check:apps, svelte-check and lint. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
334 lines
13 KiB
Svelte
334 lines
13 KiB
Svelte
<script lang="ts">
|
|
import DialogHeader from "@/modules/services/LiveSyncUI/components/DialogHeader.svelte";
|
|
import Guidance from "@/modules/services/LiveSyncUI/components/Guidance.svelte";
|
|
import Decision from "@/modules/services/LiveSyncUI/components/Decision.svelte";
|
|
import UserDecisions from "@/modules/services/LiveSyncUI/components/UserDecisions.svelte";
|
|
import InfoNote from "@/modules/services/LiveSyncUI/components/InfoNote.svelte";
|
|
import ExtraItems from "@/modules/services/LiveSyncUI/components/ExtraItems.svelte";
|
|
import InputRow from "@/modules/services/LiveSyncUI/components/InputRow.svelte";
|
|
import Password from "@/modules/services/LiveSyncUI/components/Password.svelte";
|
|
import {
|
|
DEFAULT_SETTINGS,
|
|
PREFERRED_SETTING_CLOUDANT,
|
|
PREFERRED_SETTING_SELF_HOSTED,
|
|
RemoteTypes,
|
|
type CouchDBConnection,
|
|
type ObsidianLiveSyncSettings,
|
|
} from "@vrtmrz/livesync-commonlib/compat/common/types";
|
|
import { isCloudantURI } from "@vrtmrz/livesync-commonlib/compat/pouchdb/utils_couchdb";
|
|
|
|
import { onMount } from "svelte";
|
|
import { getDialogContext, type GuestDialogProps } from "@/modules/services/LiveSyncUI/svelteDialog";
|
|
import { copyTo, pickCouchDBSyncSettings } from "@vrtmrz/livesync-commonlib/compat/common/utils";
|
|
import PanelCouchDBCheck from "./PanelCouchDBCheck.svelte";
|
|
import {
|
|
TYPE_CANCELLED,
|
|
type CouchDBSetupMode,
|
|
type SetupRemoteCouchDBInitialData,
|
|
type SetupRemoteCouchDBResultType,
|
|
} from "./setupDialogTypes";
|
|
import { isValidCouchDBServerURL, probeCouchDBConnection } from "./couchDBConnectionProbe";
|
|
import { $msg as translateMessage } from "@/common/translation";
|
|
|
|
const default_setting = pickCouchDBSyncSettings(DEFAULT_SETTINGS);
|
|
|
|
let syncSetting = $state<CouchDBConnection>({ ...default_setting });
|
|
let setupMode = $state<CouchDBSetupMode>("settings");
|
|
type Props = GuestDialogProps<SetupRemoteCouchDBResultType, SetupRemoteCouchDBInitialData>;
|
|
const { setResult, getInitialData }: Props = $props();
|
|
onMount(() => {
|
|
if (getInitialData) {
|
|
const initialData = getInitialData();
|
|
if (initialData) {
|
|
setupMode = initialData.mode;
|
|
copyTo(initialData.settings, syncSetting);
|
|
}
|
|
}
|
|
});
|
|
|
|
let error = $state("");
|
|
const context = getDialogContext();
|
|
|
|
function generateSetting() {
|
|
const connSetting: CouchDBConnection = {
|
|
...syncSetting,
|
|
};
|
|
const trialSettings: CouchDBConnection = {
|
|
...connSetting,
|
|
// ...encryptionSettings,
|
|
};
|
|
const preferredSetting = isCloudantURI(syncSetting.couchDB_URI)
|
|
? PREFERRED_SETTING_CLOUDANT
|
|
: PREFERRED_SETTING_SELF_HOSTED;
|
|
const trialRemoteSetting: ObsidianLiveSyncSettings = {
|
|
...DEFAULT_SETTINGS,
|
|
...preferredSetting,
|
|
remoteType: RemoteTypes.REMOTE_COUCHDB,
|
|
...trialSettings,
|
|
};
|
|
return trialRemoteSetting;
|
|
}
|
|
let processing = $state(false);
|
|
async function checkConnection() {
|
|
try {
|
|
processing = true;
|
|
const trialRemoteSetting = generateSetting();
|
|
const replicator = await context.services.replicator.getNewReplicator(trialRemoteSetting);
|
|
if (!replicator) {
|
|
return translateMessage("Failed to create replicator instance.");
|
|
}
|
|
try {
|
|
const result = await probeCouchDBConnection(
|
|
replicator,
|
|
trialRemoteSetting,
|
|
setupMode === "create-or-connect"
|
|
);
|
|
if (result.ok) {
|
|
return "";
|
|
} else {
|
|
return translateMessage("Failed to connect to the server: ${reason}", {
|
|
reason: `${result.reason}`,
|
|
});
|
|
}
|
|
} catch (e) {
|
|
return translateMessage("Failed to connect to the server: ${reason}", { reason: `${e}` });
|
|
}
|
|
} finally {
|
|
processing = false;
|
|
}
|
|
}
|
|
|
|
async function checkAndCommit() {
|
|
error = "";
|
|
try {
|
|
error = (await checkConnection()) || "";
|
|
if (!error) {
|
|
const setting = generateSetting();
|
|
setResult(pickCouchDBSyncSettings(setting));
|
|
return;
|
|
}
|
|
} catch (e) {
|
|
error = translateMessage("Error during connection test: ${reason}", { reason: `${e}` });
|
|
return;
|
|
}
|
|
}
|
|
function commit() {
|
|
const setting = pickCouchDBSyncSettings(generateSetting());
|
|
setResult(setting);
|
|
}
|
|
function cancel() {
|
|
setResult(TYPE_CANCELLED);
|
|
}
|
|
|
|
// const isURICloudant = $derived.by(() => {
|
|
// return syncSetting.couchDB_URI && isCloudantURI(syncSetting.couchDB_URI);
|
|
// });
|
|
// const isURISelfHosted = $derived.by(() => {
|
|
// return syncSetting.couchDB_URI && !isCloudantURI(syncSetting.couchDB_URI);
|
|
// });
|
|
// const isURISecure = $derived.by(() => {
|
|
// return syncSetting.couchDB_URI && syncSetting.couchDB_URI.startsWith("https://");
|
|
// });
|
|
const isURIInsecure = $derived.by(() => {
|
|
return !!(syncSetting.couchDB_URI && syncSetting.couchDB_URI.startsWith("http://"));
|
|
});
|
|
const isUseJWT = $derived.by(() => {
|
|
return syncSetting.useJWT;
|
|
});
|
|
const canProceed = $derived.by(() => {
|
|
return (
|
|
isValidCouchDBServerURL(syncSetting.couchDB_URI.trim()) &&
|
|
syncSetting.couchDB_USER.trim().length > 0 &&
|
|
syncSetting.couchDB_PASSWORD.trim().length > 0 &&
|
|
syncSetting.couchDB_DBNAME.trim().length > 0 &&
|
|
(isUseJWT ? syncSetting.jwtKey.trim().length > 0 : true)
|
|
);
|
|
});
|
|
const testSettings = $derived.by(() => {
|
|
return generateSetting();
|
|
});
|
|
const isURLInvalid = $derived.by(
|
|
() => syncSetting.couchDB_URI.trim() !== "" && !isValidCouchDBServerURL(syncSetting.couchDB_URI.trim())
|
|
);
|
|
const primaryActionTitle = $derived.by(() => {
|
|
if (setupMode === "create-or-connect") {
|
|
return translateMessage("Create or connect to database and continue");
|
|
}
|
|
if (setupMode === "connect-existing") {
|
|
return translateMessage("Connect to existing database and continue");
|
|
}
|
|
return translateMessage("Test connection and save");
|
|
});
|
|
</script>
|
|
|
|
<DialogHeader title={translateMessage("CouchDB Configuration")} />
|
|
<Guidance>{translateMessage("Please enter the CouchDB server information below.")}</Guidance>
|
|
<InputRow label={translateMessage("URL")}>
|
|
<input
|
|
type="text"
|
|
name="couchdb-url"
|
|
placeholder="https://example.com"
|
|
autocorrect="off"
|
|
autocapitalize="off"
|
|
spellcheck="false"
|
|
bind:value={syncSetting.couchDB_URI}
|
|
required
|
|
pattern="^https?://.+"
|
|
/>
|
|
</InputRow>
|
|
<InfoNote warning visible={isURIInsecure}
|
|
>{translateMessage("We can use only Secure (HTTPS) connections on Obsidian Mobile.")}</InfoNote
|
|
>
|
|
<InfoNote warning visible={isURLInvalid}>{translateMessage("Enter a complete HTTP or HTTPS URL.")}</InfoNote>
|
|
<InputRow label={translateMessage("Username")}>
|
|
<input
|
|
type="text"
|
|
name="couchdb-username"
|
|
placeholder={translateMessage("Enter your username")}
|
|
autocorrect="off"
|
|
autocapitalize="off"
|
|
spellcheck="false"
|
|
required
|
|
bind:value={syncSetting.couchDB_USER}
|
|
/>
|
|
</InputRow>
|
|
<InputRow label={translateMessage("Password")}>
|
|
<Password
|
|
name="couchdb-password"
|
|
placeholder={translateMessage("Enter your password")}
|
|
bind:value={syncSetting.couchDB_PASSWORD}
|
|
required
|
|
/>
|
|
</InputRow>
|
|
|
|
<InputRow label={translateMessage("Database Name")}>
|
|
<input
|
|
type="text"
|
|
name="couchdb-database"
|
|
placeholder={translateMessage("Enter your database name")}
|
|
autocorrect="off"
|
|
autocapitalize="off"
|
|
spellcheck="false"
|
|
required
|
|
bind:value={syncSetting.couchDB_DBNAME}
|
|
/>
|
|
</InputRow>
|
|
<InfoNote>
|
|
{translateMessage("CouchDB validates the database name when you connect. The name must not be empty.")}
|
|
</InfoNote>
|
|
<InputRow label={translateMessage("Use Internal API")}>
|
|
<input type="checkbox" name="couchdb-use-internal-api" bind:checked={syncSetting.useRequestAPI} />
|
|
</InputRow>
|
|
<InfoNote>
|
|
{translateMessage(
|
|
"If you cannot avoid CORS issues, you might want to try this option. It uses Obsidian's internal API to communicate with the CouchDB server. Not compliant with web standards, but works. Note that this might break in future Obsidian versions."
|
|
)}
|
|
</InfoNote>
|
|
|
|
<ExtraItems title={translateMessage("Advanced Settings")}>
|
|
<InputRow label={translateMessage("Custom Headers")}>
|
|
<textarea
|
|
name="couchdb-custom-headers"
|
|
placeholder="e.g., x-example-header: value\n another-header: value2"
|
|
bind:value={syncSetting.couchDB_CustomHeaders}
|
|
autocapitalize="off"
|
|
spellcheck="false"
|
|
rows="4"
|
|
></textarea>
|
|
</InputRow>
|
|
</ExtraItems>
|
|
<ExtraItems title={translateMessage("Experimental Settings")}>
|
|
<InputRow label={translateMessage("Use JWT Authentication")}>
|
|
<input type="checkbox" name="couchdb-use-jwt" bind:checked={syncSetting.useJWT} />
|
|
</InputRow>
|
|
<InputRow label={translateMessage("JWT Algorithm")}>
|
|
<select bind:value={syncSetting.jwtAlgorithm} disabled={!isUseJWT}>
|
|
<option value="HS256">HS256</option>
|
|
<option value="HS512">HS512</option>
|
|
<option value="ES256">ES256</option>
|
|
<option value="ES512">ES512</option>
|
|
</select>
|
|
</InputRow>
|
|
<InputRow label={translateMessage("JWT Expiration Duration (minutes)")}>
|
|
<input
|
|
type="text"
|
|
name="couchdb-jwt-exp-duration"
|
|
placeholder="0"
|
|
bind:value={() => `${syncSetting.jwtExpDuration}`, (v) => (syncSetting.jwtExpDuration = parseInt(v) || 0)}
|
|
disabled={!isUseJWT}
|
|
/>
|
|
</InputRow>
|
|
<InputRow label={translateMessage("JWT Key")}>
|
|
<textarea
|
|
name="couchdb-jwt-key"
|
|
rows="5"
|
|
autocapitalize="off"
|
|
spellcheck="false"
|
|
placeholder={translateMessage("Enter your JWT secret or private key")}
|
|
bind:value={syncSetting.jwtKey}
|
|
disabled={!isUseJWT}
|
|
></textarea>
|
|
</InputRow>
|
|
<InfoNote>
|
|
{translateMessage(
|
|
"For HS256/HS512 algorithms, provide the shared secret key. For ES256/ES512 algorithms, provide the pkcs8 PEM-formatted private key."
|
|
)}
|
|
</InfoNote>
|
|
<InputRow label={translateMessage("JWT Key ID (kid)")}>
|
|
<input
|
|
type="text"
|
|
name="couchdb-jwt-kid"
|
|
placeholder={translateMessage("Enter your JWT Key ID")}
|
|
bind:value={syncSetting.jwtKid}
|
|
disabled={!isUseJWT}
|
|
/>
|
|
</InputRow>
|
|
<InputRow label={translateMessage("JWT Subject (sub)")}>
|
|
<input
|
|
type="text"
|
|
name="couchdb-jwt-sub"
|
|
placeholder={translateMessage("Enter your JWT Subject (CouchDB Username)")}
|
|
bind:value={syncSetting.jwtSub}
|
|
disabled={!isUseJWT}
|
|
/>
|
|
</InputRow>
|
|
<InfoNote warning>
|
|
{translateMessage(
|
|
"JWT (JSON Web Token) authentication allows you to securely authenticate with the CouchDB server using tokens. Ensure that your CouchDB server is configured to accept JWTs and that the provided key and settings match the server's configuration. Incidentally, I have not verified it very thoroughly."
|
|
)}
|
|
</InfoNote>
|
|
</ExtraItems>
|
|
|
|
<InfoNote warning>
|
|
{translateMessage(
|
|
"This optional check uses Obsidian's internal request API and sends the credentials above to the CouchDB server. Use it only with a server you trust; administrator access may be required."
|
|
)}
|
|
</InfoNote>
|
|
<PanelCouchDBCheck trialRemoteSetting={testSettings}></PanelCouchDBCheck>
|
|
<hr />
|
|
|
|
<InfoNote error visible={error !== ""}>
|
|
{error}
|
|
</InfoNote>
|
|
|
|
{#if processing}
|
|
{translateMessage("Checking connection... Please wait.")}
|
|
{:else}
|
|
<UserDecisions>
|
|
<Decision title={primaryActionTitle} important disabled={!canProceed} commit={() => checkAndCommit()} />
|
|
{#if setupMode === "settings"}
|
|
<InfoNote warning>
|
|
{translateMessage(
|
|
"Saving without a successful connection test keeps this profile, but automatic synchronisation may fail until the connection is corrected."
|
|
)}
|
|
</InfoNote>
|
|
<Decision
|
|
title={translateMessage("Save without connecting")}
|
|
disabled={!canProceed}
|
|
commit={() => commit()}
|
|
/>
|
|
{/if}
|
|
<Decision title={translateMessage("Cancel")} commit={() => cancel()} />
|
|
</UserDecisions>
|
|
{/if}
|