mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-07-31 17:01:23 +00:00
Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b700c631ca | |||
| 00152523db | |||
| fbfb77440d | |||
| 89d4667d95 | |||
| 21dd24682b | |||
| 5c52d69d66 | |||
| a251648e48 | |||
| 57c9726ae5 | |||
| a6977da9e8 | |||
| 397a9b69c8 | |||
| ce573f18a6 | |||
| 0df1f57f3b | |||
| 0518fab62a | |||
| e296708845 | |||
| b6746be73e | |||
| c385bd7ce7 | |||
| 17fe6c1518 | |||
| 93bbab4253 | |||
| 8b7d410327 | |||
| c4d6b768da |
@@ -1,90 +0,0 @@
|
||||
# Architectural Decision Record: Use Native Batch CAS for Adaptive PostgREST
|
||||
|
||||
## Status
|
||||
|
||||
Proposed as the final experimental provider, after the S3 and WebDAV delivery sequences have established the common
|
||||
protocol, CLI, host, and end-to-end boundaries.
|
||||
|
||||
## Context
|
||||
|
||||
PostgREST can expose PostgreSQL uniqueness, row-level security, bounded set operations, and transactions. Treating it
|
||||
as another opaque object store works, but leaves Metadata and Chunks combined and cannot use a multi-key Chunk query.
|
||||
Using one HTTP request per logical Chunk would make latency dominate synchronisation.
|
||||
|
||||
The common protocol decision is recorded in
|
||||
[Adaptive Journal as an explicit protocol](2026_07_adaptive_journal_protocol.md). The tables, binary RPC framing,
|
||||
transaction rules, and privacy model are specified in the
|
||||
[Adaptive Journal Sync design](../design_docs/adaptive_journal_sync.md).
|
||||
|
||||
## Decision
|
||||
|
||||
Adaptive PostgREST separates Metadata publication from immutable Chunk storage physically as well as logically.
|
||||
|
||||
- Vault- and repository-scoped Chunk rows use the Remote Chunk key as an insert-only unique address.
|
||||
- Bounded binary RPCs implement `hasMany`, `getMany`, and `putMany` while preserving input order and per-entry status.
|
||||
- Writer descriptors, Metadata batches, and commits remain small append-only records.
|
||||
- A transactional commit verifies the sorted required-Chunk-key digest and the existence of every referenced Chunk
|
||||
before making Metadata visible.
|
||||
- Concurrent insertion of a different encrypted frame for the same logical Chunk reads, validates, and accepts the
|
||||
winning plaintext only when it represents the same logical value.
|
||||
- Row-level security scopes every operation to the configured Vault. Server-visible Remote Chunk keys reveal equality
|
||||
within that repository but do not reveal plaintext Chunk IDs.
|
||||
|
||||
PostgREST does not use object packs, catalogue deltas, or Range retrieval for native Chunk rows. The shared binary Chunk
|
||||
record remains independently verifiable, but PostgreSQL supplies the batch index and uniqueness boundary.
|
||||
|
||||
The SQL schema and RPC contract are versioned together with the Adaptive format. A missing or incompatible schema is
|
||||
detected before publication and requires applying the reviewed schema or rebuilding the remote. The client does not
|
||||
perform an implicit data-format migration.
|
||||
|
||||
## Staged acceptance
|
||||
|
||||
### Adapter and Commonlib integration
|
||||
|
||||
Unit tests own binary-envelope limits, ordering, status decoding, insert conflicts, rollback, error classification,
|
||||
Vault isolation, and malformed responses. Disposable PostgreSQL and PostgREST integration tests own the real SQL
|
||||
schema, row-level security, RPC transactions, and two-client Metadata and Chunk synchronisation.
|
||||
|
||||
### CLI end-to-end acceptance
|
||||
|
||||
The built CLI applies an Adaptive PostgREST Setup URI to a second independent database and synchronises text and binary
|
||||
Chunk-backed files through disposable PostgreSQL and PostgREST services. The scenario proves bounded native batching at
|
||||
the headless product boundary without repeating the SQL failure matrix.
|
||||
|
||||
### Host settings and UI
|
||||
|
||||
The PostgREST dialogue persists the endpoint, Vault identifier, authentication configuration, Adaptive format, and
|
||||
expected repository ID. Focused tests own connection-string and Setup URI preservation, validation, and format-mismatch
|
||||
guidance; they do not execute SQL.
|
||||
|
||||
### Real-host end-to-end acceptance
|
||||
|
||||
One real-Obsidian workflow applies the reviewed schema and performs a representative Chunk-backed transfer. The
|
||||
disposable Commonlib integration remains authoritative for RLS, transaction rollback, and the complete RPC matrix.
|
||||
|
||||
## Alternatives rejected
|
||||
|
||||
### Reuse immutable object packs in PostgreSQL
|
||||
|
||||
This would preserve portability at the cost of native multi-key lookup and transaction guarantees. The repository
|
||||
contract already permits a different physical representation.
|
||||
|
||||
### Store raw file content with Metadata
|
||||
|
||||
Metadata must remain small and must continue to refer to immutable logical Chunks. Combining content with Metadata
|
||||
would break the maintained PouchDB model and duplicate unchanged content across revisions.
|
||||
|
||||
### Encode Chunk bodies as JSON values
|
||||
|
||||
Base64 and large JSON arrays add framing and memory overhead and make limits harder to enforce. Bounded binary `bytea`
|
||||
RPC envelopes provide deterministic lengths and status ordering.
|
||||
|
||||
## Consequences
|
||||
|
||||
- PostgREST has the largest provider-specific implementation because it includes reviewed SQL, RLS, RPC framing, and
|
||||
transaction behaviour.
|
||||
- Placing it last lets the common protocol, CLI, and host boundaries stabilise before introducing that larger surface.
|
||||
- Native batching can reduce request count substantially relative to object-per-Chunk storage, but actual speed still
|
||||
depends on database, proxy, network, and workload measurements.
|
||||
- PostgREST and object stores share logical records and correctness rules without pretending to share a physical
|
||||
layout.
|
||||
@@ -1,98 +0,0 @@
|
||||
# Architectural Decision Record: Introduce Adaptive Journal as an Explicit Protocol
|
||||
|
||||
## Status
|
||||
|
||||
Proposed for staged implementation. This decision does not change the current default Journal format or promise a
|
||||
compatible in-place migration.
|
||||
|
||||
## Context
|
||||
|
||||
The existing Journal protocol publishes PouchDB Metadata and Chunk documents together in opaque immutable objects.
|
||||
That representation is portable and remains the compatibility baseline, but it prevents a remote from answering a
|
||||
bounded multi-key Chunk query or amortising object-store requests independently from Metadata publication.
|
||||
|
||||
S3-compatible Object Storage, WebDAV, and PostgREST have materially different physical capabilities. Making each one
|
||||
implement a separate replication algorithm would duplicate ordering, encryption, recovery, and Chunk-delivery rules.
|
||||
Making every one use an identical physical layout would discard useful native batching and transactions.
|
||||
|
||||
The detailed binary formats, state machines, privacy properties, and recovery rules are specified in the
|
||||
[Adaptive Journal Sync design](../design_docs/adaptive_journal_sync.md).
|
||||
|
||||
## Decision
|
||||
|
||||
Adaptive Journal is a second, explicit Journal protocol version owned by Commonlib. It keeps one logical repository
|
||||
contract while allowing provider-specific physical storage.
|
||||
|
||||
- Metadata events and raw Chunk records remain separate throughout publication.
|
||||
- Logical Chunks are immutable and content-addressable. A changed value has a new logical Chunk ID.
|
||||
- A repository-scoped Remote Chunk key is derived locally from the exact logical Chunk ID after accepting the
|
||||
repository manifest.
|
||||
- Chunks become durable before a commit makes Metadata references visible.
|
||||
- Ordinary publication creates immutable records. Catalogue snapshots, caches, and indexes are derived and
|
||||
reconstructible.
|
||||
- Each writer publishes a dense sequence identified by a stable host ID and a persisted random writer epoch. A reader
|
||||
tracks one frontier per writer stream; it does not depend on a remote `startAfter` ordering contract.
|
||||
- Remote operations return typed outcomes which distinguish absence, conflict, permanent rejection, retryable failure,
|
||||
and an ambiguous mutation which must be verified before retrying.
|
||||
|
||||
The adaptive repository exposes batched Chunk availability, publication, and retrieval even when its implementation
|
||||
uses immutable packs internally. The caller does not issue one remote request per Chunk.
|
||||
|
||||
### Repository identity and compatibility
|
||||
|
||||
A new repository has one immutable, conditionally created manifest. The first device generates its candidate locally,
|
||||
and the winning manifest fixes the repository ID, Security Seed, protocol parameters, and required capabilities.
|
||||
Every client pins the accepted repository ID in local repository state. A Setup URI exported from an accepted binding
|
||||
should carry that non-secret expected ID.
|
||||
|
||||
`opaque-v1` and `adaptive-v1` are separate remote formats. Format selection is explicit in the remote configuration,
|
||||
and a mismatch fails before publication. The implementation detects incompatible remote data, but it does not migrate
|
||||
it. Changing format requires an explicit remote rebuild or a new remote namespace.
|
||||
|
||||
Deprecated data formats do not enlarge the Adaptive protocol. Compatibility remains at the existing decoding
|
||||
boundaries, and rebuilding the remote is the recovery path for an unsupported Adaptive layout.
|
||||
|
||||
### Provider delivery sequence
|
||||
|
||||
Each provider is delivered and reviewed through four boundaries, in order:
|
||||
|
||||
1. **Adapter and Commonlib integration.** Implement semantic capabilities, typed failure handling, format detection,
|
||||
unit tests, and disposable real-service integration tests.
|
||||
2. **CLI end-to-end acceptance.** Use the built CLI and a real disposable service to apply a Setup URI, synchronise two
|
||||
independent local databases, and restore text and binary Chunk content. This proves the headless product boundary
|
||||
without Obsidian or Svelte.
|
||||
3. **Host settings and UI.** Add only provider-specific controls, validation, profile persistence, Setup URI transport,
|
||||
and focused host tests.
|
||||
4. **Real-host end-to-end acceptance.** Exercise one representative setup and synchronisation path in a real Obsidian
|
||||
instance. This test verifies host composition and does not repeat the adapter capability matrix or the complete CLI
|
||||
conflict suite.
|
||||
|
||||
The initial order is S3-compatible Object Storage, WebDAV, then PostgREST. A provider completes these boundaries before
|
||||
the next provider is presented for integration review. The sequence keeps each review independently attributable and
|
||||
keeps the real-host tests small.
|
||||
|
||||
## Alternatives rejected
|
||||
|
||||
### One cross-provider implementation change
|
||||
|
||||
This hides which provider requires a shared-core change, makes failures difficult to attribute, and forces reviewers to
|
||||
understand SQL RPCs, object packs, WebDAV behaviour, CLI composition, and Obsidian UI in one change.
|
||||
|
||||
### Add the Host UI before headless acceptance
|
||||
|
||||
This makes an application-level failure ambiguous between the protocol, adapter, CLI-independent host composition, and
|
||||
presentation. The CLI provides the smaller executable boundary first.
|
||||
|
||||
### Use one physical representation for every provider
|
||||
|
||||
One-object-per-Chunk storage causes excessive object requests, while forcing packs into PostgreSQL discards bounded
|
||||
multi-key RPCs and transactions. Common semantics do not require common physical storage.
|
||||
|
||||
## Consequences
|
||||
|
||||
- Commonlib owns protocol correctness and provider adapters; Self-hosted LiveSync owns CLI composition, Obsidian host
|
||||
integration, and presentation.
|
||||
- Provider reviews can stop at the first failed boundary without involving later UI or real-host tests.
|
||||
- The final end-to-end suite remains an acceptance layer rather than a duplicate protocol test suite.
|
||||
- Adding another provider requires the same semantic contract and staged evidence, not another replication algorithm.
|
||||
- Remote rebuild remains an explicit operational requirement while Adaptive Journal is evolving.
|
||||
@@ -1,96 +0,0 @@
|
||||
# Architectural Decision Record: Use S3 as the Reference Adaptive Object Store
|
||||
|
||||
## Status
|
||||
|
||||
Proposed as an improvement to the maintained S3-compatible Journal path. Adaptive Journal remains explicit and
|
||||
opt-in; the existing opaque format remains the compatibility default.
|
||||
|
||||
## Context
|
||||
|
||||
S3-compatible Object Storage already supplies the maintained Journal object model and is the smallest provider on
|
||||
which to prove Adaptive immutable packs. It has a standard conditional-create request, paginated listing, binary
|
||||
objects, and optional byte-range retrieval, but compatible endpoints can still differ in consistency, proxy behaviour,
|
||||
and Range handling.
|
||||
|
||||
The common protocol decision is recorded in
|
||||
[Adaptive Journal as an explicit protocol](2026_07_adaptive_journal_protocol.md). The complete object-pack and catalogue
|
||||
formats are specified in the [Adaptive Journal Sync design](../design_docs/adaptive_journal_sync.md).
|
||||
|
||||
## Decision
|
||||
|
||||
S3-compatible storage is the reference implementation of the Adaptive object-store strategy.
|
||||
|
||||
- It stores the manifest, writer control records, Metadata batches, commits, Chunk packs, indexes, and catalogue records
|
||||
as immutable objects under the configured bucket namespace.
|
||||
- Manifest and every immutable publication use conditional create. A successful create response is sufficient; the
|
||||
client does not add a confirmation request solely for caution.
|
||||
- A lost or ambiguous mutation response returns `verify-first`. The caller reads the exact key before retrying.
|
||||
- A conditional-request conflict which does not establish an existing immutable value remains retryable and is not
|
||||
reported as a successful create.
|
||||
- Listing follows every continuation token and proves complete prefix enumeration. Folder marker objects and stale
|
||||
capability-probe objects are not repository data.
|
||||
- Format inspection distinguishes empty, `opaque-v1`, `adaptive-v1`, and mixed repositories. Mixed or mismatched data
|
||||
fails closed, and reset remains an explicit batched operation.
|
||||
|
||||
The portable retrieval policy is `whole-pack`. A user may select `range` when the endpoint capability probe has
|
||||
confirmed exact byte-range behaviour. Range responses must use `206`, carry a matching `Content-Range`, and return the
|
||||
requested number of bytes. Loss of optional Range support falls back to whole-pack retrieval after reporting the
|
||||
capability change; it does not make valid packs unreadable.
|
||||
|
||||
Capability results which prove support or lack of support may be cached for the endpoint identity. A transient probe
|
||||
failure is not cached as a permanent result. Probe objects use a reserved random prefix and are removed when possible;
|
||||
incomplete cleanup is reported and ignored by format detection.
|
||||
|
||||
## Staged acceptance
|
||||
|
||||
### Adapter and Commonlib integration
|
||||
|
||||
Focused tests cover conditional creation, ambiguous responses, binary fidelity, read-after-write visibility, paginated
|
||||
listing, deletion visibility, Range validation, format detection, reset batching, and probe cleanup. A disposable
|
||||
MinIO integration proves two-client Adaptive Metadata and Chunk synchronisation and both retrieval paths.
|
||||
|
||||
### CLI end-to-end acceptance
|
||||
|
||||
One real-MinIO scenario uses two independent CLI databases. Device A uses whole-pack retrieval. Device B receives an
|
||||
Adaptive S3 Setup URI selecting Range retrieval. The scenario verifies that the URI preserves the format and policy,
|
||||
that both devices can publish and receive more than one synchronisation round, and that text and binary content are
|
||||
reconstructed from Chunks.
|
||||
|
||||
This test owns the built CLI, settings persistence, Setup URI decoding, and headless composition. It does not repeat
|
||||
every S3 error classification already owned by Commonlib.
|
||||
|
||||
### Host settings and UI
|
||||
|
||||
The Object Storage dialogue exposes `opaque-v1` and `adaptive-v1`, with whole-pack as the Adaptive default and Range as
|
||||
an explicit preference. It preserves the expected repository ID and read policy through saved profiles and Setup URI
|
||||
handling. Focused host tests own normalisation, validation, persistence, and warnings; they do not contact S3.
|
||||
|
||||
### Real-host end-to-end acceptance
|
||||
|
||||
One real-Obsidian workflow applies an Adaptive S3 configuration and proves a representative Chunk-backed file transfer
|
||||
against disposable MinIO. It verifies the Obsidian composition boundary only. The CLI suite remains the broader
|
||||
headless synchronisation acceptance test.
|
||||
|
||||
## Alternatives rejected
|
||||
|
||||
### Re-upload a mutable pack when one Chunk changes
|
||||
|
||||
Packs are immutable publication units. A changed logical Chunk is added to a new pack, and a new catalogue delta makes
|
||||
that location discoverable. Existing packs are replaced only by a separately protected compaction process.
|
||||
|
||||
### Require Range for Adaptive S3
|
||||
|
||||
Whole-pack reads often provide better throughput and work on more endpoints. Range is a deployment preference, not a
|
||||
correctness requirement.
|
||||
|
||||
### Confirm every successful mutation with another request
|
||||
|
||||
This doubles request count in the ordinary success path. Exact-key verification is reserved for ambiguous outcomes and
|
||||
explicit diagnostics.
|
||||
|
||||
## Consequences
|
||||
|
||||
- S3 establishes the object-store contract before the more variable WebDAV implementation.
|
||||
- The two retrieval policies are exercised without duplicating the complete CLI scenario.
|
||||
- Existing opaque S3 repositories remain readable and never become Adaptive implicitly.
|
||||
- Endpoint capability evidence, rather than the S3-compatible label alone, controls optional behaviour.
|
||||
@@ -1,96 +0,0 @@
|
||||
# Architectural Decision Record: Gate Adaptive WebDAV with an Endpoint Safety Check
|
||||
|
||||
## Status
|
||||
|
||||
Proposed as an experimental provider after the S3 Adaptive path has completed adapter, CLI, host, and real-host
|
||||
acceptance.
|
||||
|
||||
## Context
|
||||
|
||||
WebDAV exposes an object-shaped interface suitable for immutable packs, but method support and conditional semantics
|
||||
vary across servers, gateways, reverse proxies, and authentication layers. A server can advertise WebDAV while failing
|
||||
binary fidelity, replacing an object despite `If-None-Match: *`, returning incomplete listings, or ignoring Range.
|
||||
|
||||
The common protocol decision is recorded in
|
||||
[Adaptive Journal as an explicit protocol](2026_07_adaptive_journal_protocol.md). The pack format, flat object mapping,
|
||||
and detailed safety-check sequence are specified in the
|
||||
[Adaptive Journal Sync design](../design_docs/adaptive_journal_sync.md).
|
||||
|
||||
## Decision
|
||||
|
||||
Adaptive WebDAV uses the same immutable pack and catalogue semantics proven by S3, with a WebDAV-specific flat object
|
||||
mapping inside the configured collection. Logical writer ordering comes from the host ID, writer epoch, and dense
|
||||
sequence embedded in authenticated records. Correctness does not depend on a server-provided `startAfter` order.
|
||||
|
||||
Before a new Adaptive repository becomes writable, a non-destructive endpoint safety checker exercises random reserved
|
||||
probe keys and reports observed semantic capabilities:
|
||||
|
||||
- binary write and exact read-back;
|
||||
- read-after-write visibility;
|
||||
- complete collection listing for the probe keys;
|
||||
- `If-None-Match: *` preventing replacement;
|
||||
- delete visibility; and
|
||||
- exact byte-range behaviour, reported separately as optional.
|
||||
|
||||
The checker is an implementation acceptance target for compatible servers, not a claim that every WebDAV server must
|
||||
support Adaptive Journal. It touches no repository objects, attempts to remove every probe, reports incomplete cleanup,
|
||||
and never interprets authentication, permission, timeout, malformed response, or server failure as absence.
|
||||
|
||||
Conditional create, binary fidelity, complete listing, read-after-write visibility, and delete visibility are required.
|
||||
Range remains optional. The user selects whole-pack or Range retrieval based on their endpoint and own latency and
|
||||
throughput preference; the checker does not benchmark or recommend a policy.
|
||||
|
||||
Successful mutations do not receive unconditional confirmation requests. An ambiguous response is classified as
|
||||
`verify-first`, and the exact immutable key is read before retrying. The existing opaque WebDAV layout and Adaptive
|
||||
layout are detected separately; a mismatch requires a remote rebuild or another namespace.
|
||||
|
||||
## Staged acceptance
|
||||
|
||||
### Adapter and Commonlib integration
|
||||
|
||||
Unit tests own HTTP status classification, conditional-create verification, flat-name round trips, complete listing,
|
||||
probe isolation, cleanup reporting, Range validation, and whole-pack fallback. A disposable WebDAV integration runs
|
||||
the safety checker before exercising Adaptive Metadata and Chunk synchronisation.
|
||||
|
||||
### CLI end-to-end acceptance
|
||||
|
||||
The built CLI applies an Adaptive WebDAV Setup URI to a second independent database and synchronises text and binary
|
||||
Chunk-backed files through a real disposable server. One client uses whole-pack retrieval; Range is added to this layer
|
||||
only when the selected test server proves it. The CLI test does not repeat the complete endpoint capability matrix.
|
||||
|
||||
### Host settings and UI
|
||||
|
||||
The WebDAV dialogue exposes Adaptive mode only with clear capability-check results. It persists the expected repository
|
||||
ID and the selected retrieval policy, defaults to whole-pack, and reports that Range is optional. Focused tests own
|
||||
profile and Setup URI preservation without contacting a server.
|
||||
|
||||
### Real-host end-to-end acceptance
|
||||
|
||||
One real-Obsidian workflow uses the same known disposable WebDAV implementation, runs the safety gate, and proves a
|
||||
representative Chunk-backed transfer. Servers outside that fixture are diagnosed by the checker rather than added to a
|
||||
large real-host matrix.
|
||||
|
||||
## Alternatives rejected
|
||||
|
||||
### Trust advertised WebDAV methods
|
||||
|
||||
Method advertisement does not prove the conditional, listing, visibility, and byte semantics required for immutable
|
||||
publication.
|
||||
|
||||
### Treat Range as mandatory
|
||||
|
||||
Whole-pack retrieval is correct and often competitive for throughput. Requiring Range would exclude otherwise safe
|
||||
servers for an optional optimisation.
|
||||
|
||||
### Add server-specific compatibility branches
|
||||
|
||||
The remote may be any implementation or proxy composition. Semantic checks produce a maintainable contract, while a
|
||||
growing server-name table would remain incomplete and become stale.
|
||||
|
||||
## Consequences
|
||||
|
||||
- WebDAV remains experimental because suitability is endpoint-specific.
|
||||
- The safety checker gives a concrete reason when a server cannot host Adaptive Journal.
|
||||
- Common object-pack behaviour is inherited from the earlier S3 boundary, keeping WebDAV-specific tests focused on HTTP
|
||||
semantics and name mapping.
|
||||
- Optional Range support can improve request efficiency without becoming a data-availability requirement.
|
||||
@@ -37,9 +37,9 @@ The Obsidian host injects the screen wake-lock manager from the `octagonal-wheel
|
||||
|
||||
Finite replication enters both counts only after readiness checks have succeeded and leaves them after `openReplication(..., continuous: false, ...)` settles. A successful completion has reached the latest sequence in that operation's scope and is therefore an authoritative quiescence boundary for chunk retrieval. A failed operation does not prove latest state, but can no longer deliver documents from that attempt. Failure handling runs afterwards so a mismatch or recovery dialogue does not retain the activity. This includes the direct start-up synchronisation path as well as manual, event-driven, and periodic calls through `ReplicationService`. The unbounded continuous channel does not enter either boundary, but its finite initial pull-only catch-up does; the one-shot parameter fallback chain remains inside that boundary.
|
||||
|
||||
Delivery into the local database and application to the Obsidian Vault are deliberately separate lifetimes. A mobile device can have only a short opportunity to obtain remote data, while applying a large downloaded batch to the Vault is durable, offline-capable work which can continue or resume later. The replication-result queue and its recovery snapshot therefore remain outside `boundedRemoteActivityCount`. Finite remote activity ends when the transfer operation settles, even when the `📥` queue still contains documents awaiting Vault application.
|
||||
Delivery into the local database and application to the Obsidian Vault are deliberately separate lifetimes. Finite remote activity ends when the transfer operation settles, even when the `📥` queue still contains documents awaiting Vault application. The Obsidian host tracks that queue through a separate `boundedLocalApplicationActivityCount`, so local Vault writes do not increment either remote-activity count or keep the `📲` indicator visible.
|
||||
|
||||
This separation also keeps the activity indicators truthful: `📲` describes a finite remote operation and must not remain active solely because local Vault writes are pending. The existing replication-result count continues to describe that local queue. If a future feature offers screen-awake protection while applying downloaded documents, it must use a separately typed local-application activity or power-policy boundary, preserve the current behaviour by default, and avoid incrementing either remote-activity count.
|
||||
Applying downloaded document changes enters one local-application boundary from the first queued document until the queue and its in-progress set are both empty. The final empty recovery snapshot is attempted before the boundary settles; snapshot failure is logged and still releases the boundary. Additional batches share the existing boundary. Suspending replication-result processing releases it, and resuming reacquires it while work remains. The same host activity runner supplies best-effort Wake Lock protection, while the visibility lifecycle waits for both remote and local bounded activity to finish.
|
||||
|
||||
Manual P2P commands which bypass `ReplicationService` enter the broad boundary. Direct P2P pull and push entry points are therefore both protected as finite remote work, covering the Obsidian panes, CLI, and Webapp. A pull or bidirectional synchronisation also enters the narrower finite-replication boundary because it can place documents in the local database. A push-only request remains broad-only: it cannot satisfy a local missing-chunk read and must not present itself as a delivery source. Automatic synchronisation on peer discovery, a pull requested by a remote peer, and a watched pull following a peer progress notification enter both boundaries because each can deliver local documents. A normal P2P peer-selection dialogue represents one broad finite session: it remains inside the boundary while waiting for a peer and while the person may perform repeated synchronisations, then settles when the dialogue closes and any in-flight synchronisation has finished. Closing without synchronising returns a failed result and releases the boundary. The 'Start Sync & Close' action completes its synchronisation before closing. This deliberately protects peer discovery and selection, because display sleep can interrupt discovery or connection establishment and require the person to start detection again. It may therefore retain a Wake Lock longer than the network transfer alone. A transfer performed inside that session temporarily adds a nested activity; the count remains a logical-operation count rather than a connection total.
|
||||
|
||||
@@ -76,6 +76,8 @@ P2P does not yet contribute to the physical-request count because it does not ha
|
||||
|
||||
The platform activity runner remains injected. Common library and headless consumers can omit it while retaining the same bounded activity count and operation semantics.
|
||||
|
||||
The Obsidian-specific `ObsidianReplicatorService` owns `boundedLocalApplicationActivityCount` and reuses the injected activity runner. It is deliberately absent from the common service contract: CLI and Webapp processing continue directly, while the Obsidian host uses the count for Wake Lock and visibility-lifecycle policy without changing remote-operation reporting.
|
||||
|
||||
## Non-Goals
|
||||
|
||||
- Do not count continuous replication as a bounded activity.
|
||||
@@ -85,11 +87,11 @@ The platform activity runner remains injected. Common library and headless consu
|
||||
- Do not guarantee protection against operating-system suspension, closing a laptop lid, forced termination, network loss, or a user-initiated sleep action.
|
||||
- Do not add a lifecycle timeout which would abort an unusually slow rebuild. A genuinely stalled operation may postpone LiveSync's visibility suspension until it settles, but the platform may still suspend or terminate background work.
|
||||
- Do not broaden `keepReplicationActiveInBackground`; it remains an opt-in desktop policy for continuous and periodic operation after finite work has ended.
|
||||
- Do not include offline scans, unrelated local storage reflection, or the durable replication-result queue in this boundary. They are offline-capable and require a separate decision if activity reporting or power policy is added later.
|
||||
- Do not include offline scans, unrelated local storage reflection, or the durable replication-result queue in either remote-activity count. The queue uses its separate local-application boundary.
|
||||
|
||||
## Verification
|
||||
|
||||
Before changing the transfer/application separation, add a deterministic regression scenario which leaves downloaded documents queued after finite transfer settles, verifies that remote activity has ended, persists the queued state, and resumes Vault application after suspension or restart. An optional local-application Wake Lock feature requires its own enabled and disabled cases; existing remote-operation E2E is not evidence for that separate policy.
|
||||
Before changing the transfer/application separation, keep deterministic coverage which leaves downloaded documents queued after finite transfer settles, verifies that remote activity has ended, and retains the separate local-application boundary until Vault application and the final recovery snapshot settle.
|
||||
|
||||
Unit tests cover:
|
||||
|
||||
@@ -106,6 +108,8 @@ Unit tests cover:
|
||||
- remote chunk fetching remaining inside the shared boundary from synchronous queue acceptance through local persistence and terminal notification;
|
||||
- missing-chunk waiters rechecking local storage when observed per-identifier claims and finite replication have settled;
|
||||
- the finite-replication count excluding other bounded work;
|
||||
- replicated document application sharing one local boundary, settling after the final recovery snapshot, and releasing around processing suspension;
|
||||
- local application activity leaving both remote-activity counts unchanged;
|
||||
- standard, fast, remote, and combined rebuild activity boundaries;
|
||||
- Rebuilder-owned confirmation and completion dialogues remaining outside rebuild activity;
|
||||
- fallback from fast fetch avoiding a nested activity boundary;
|
||||
@@ -125,5 +129,5 @@ The exact Fancy Kit screen wake-lock behaviour is covered by its package and Har
|
||||
- One finite activity definition drives Wake Lock, lifecycle protection, and status UI without coupling common library code to Obsidian or browser globals.
|
||||
- Callers can observe accurate logical activity even in CLI and Webapp hosts which do not inject a Wake Lock implementation.
|
||||
- Rebuild operations now retain Wake Lock and lifecycle protection across their longest interruption-sensitive phases without retaining them for Rebuilder-owned pre-operation or completion dialogues. Post-reset P2P discovery and selection remain protected as an intentional part of completing the rebuild.
|
||||
- Downloaded documents may remain in the durable Vault-application queue after remote activity has ended, allowing transfer and offline application to follow different mobile lifetimes without presenting local writes as communication.
|
||||
- Downloaded documents may remain in the durable Vault-application queue after remote activity has ended, while a separate local-application boundary retains best-effort Wake Lock and lifecycle protection without presenting local writes as communication.
|
||||
- Users can now distinguish the lifetime of a finite remote operation from approximate request activity within it.
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"id": "obsidian-livesync",
|
||||
"name": "Self-hosted LiveSync",
|
||||
"version": "1.0.1",
|
||||
"version": "1.0.2",
|
||||
"minAppVersion": "1.7.2",
|
||||
"description": "Community implementation of self-hosted livesync. Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
|
||||
"author": "vorotamoroz",
|
||||
|
||||
Generated
+12
-12
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "obsidian-livesync",
|
||||
"version": "1.0.1",
|
||||
"version": "1.0.2",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "obsidian-livesync",
|
||||
"version": "1.0.1",
|
||||
"version": "1.0.2",
|
||||
"license": "MIT",
|
||||
"workspaces": [
|
||||
"src/apps/cli",
|
||||
@@ -32,7 +32,7 @@
|
||||
"markdown-it": "^14.2.0",
|
||||
"minimatch": "^10.2.5",
|
||||
"obsidian": "^1.13.1",
|
||||
"octagonal-wheels": "^0.1.51",
|
||||
"octagonal-wheels": "^0.1.52",
|
||||
"qrcode-generator": "^1.4.4",
|
||||
"xxhash-wasm-102": "npm:xxhash-wasm@^1.0.2"
|
||||
},
|
||||
@@ -11532,9 +11532,9 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/octagonal-wheels": {
|
||||
"version": "0.1.51",
|
||||
"resolved": "https://registry.npmjs.org/octagonal-wheels/-/octagonal-wheels-0.1.51.tgz",
|
||||
"integrity": "sha512-KTlfqKPjobHJg/t3A539srnFf+VHr1aXkHSmsNDDpiI5UFC7FamZ95dWpJfGE2EI/HULR5hveQDgkazmz8SAcg==",
|
||||
"version": "0.1.52",
|
||||
"resolved": "https://registry.npmjs.org/octagonal-wheels/-/octagonal-wheels-0.1.52.tgz",
|
||||
"integrity": "sha512-9WJN2UveNh90Op1S07cIso1WyNrQbO/unibDLfUGnpomIcU4g6F+p8reZHW0Ed8sGzKF5qGnQp991Y9MB1TwNg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"idb": "^8.0.3"
|
||||
@@ -15924,11 +15924,11 @@
|
||||
},
|
||||
"src/apps/cli": {
|
||||
"name": "self-hosted-livesync-cli",
|
||||
"version": "1.0.1-cli",
|
||||
"version": "1.0.2-cli",
|
||||
"dependencies": {
|
||||
"chokidar": "^4.0.0",
|
||||
"minimatch": "^10.2.5",
|
||||
"octagonal-wheels": "^0.1.51",
|
||||
"octagonal-wheels": "^0.1.52",
|
||||
"pouchdb-adapter-http": "^9.0.0",
|
||||
"pouchdb-adapter-leveldb": "^9.0.0",
|
||||
"pouchdb-core": "^9.0.0",
|
||||
@@ -15949,9 +15949,9 @@
|
||||
},
|
||||
"src/apps/webapp": {
|
||||
"name": "livesync-webapp",
|
||||
"version": "1.0.1-webapp",
|
||||
"version": "1.0.2-webapp",
|
||||
"dependencies": {
|
||||
"octagonal-wheels": "^0.1.51"
|
||||
"octagonal-wheels": "^0.1.52"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@sveltejs/vite-plugin-svelte": "^7.1.2",
|
||||
@@ -15961,9 +15961,9 @@
|
||||
}
|
||||
},
|
||||
"src/apps/webpeer": {
|
||||
"version": "1.0.1-webpeer",
|
||||
"version": "1.0.2-webpeer",
|
||||
"dependencies": {
|
||||
"octagonal-wheels": "^0.1.51"
|
||||
"octagonal-wheels": "^0.1.52"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@sveltejs/vite-plugin-svelte": "^7.1.2",
|
||||
|
||||
+3
-2
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "obsidian-livesync",
|
||||
"version": "1.0.1",
|
||||
"version": "1.0.2",
|
||||
"description": "Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
|
||||
"main": "main.js",
|
||||
"type": "module",
|
||||
@@ -58,6 +58,7 @@
|
||||
"test:e2e:obsidian:dialog-mounts": "tsx test/e2e-obsidian/scripts/dialog-mounts.ts",
|
||||
"test:e2e:obsidian:conflict-dialog-policy": "tsx test/e2e-obsidian/scripts/conflict-dialog-policy.ts",
|
||||
"test:e2e:obsidian:revision-repair": "tsx test/e2e-obsidian/scripts/revision-repair.ts",
|
||||
"test:e2e:obsidian:document-history-nav": "tsx test/e2e-obsidian/scripts/document-history-nav.ts",
|
||||
"test:e2e:obsidian:settings-ui": "tsx test/e2e-obsidian/scripts/settings-ui.ts",
|
||||
"test:e2e:obsidian:review-harness": "tsx test/e2e-obsidian/scripts/review-harness.ts",
|
||||
"test:e2e:obsidian:p2p-pane": "tsx test/e2e-obsidian/scripts/p2p-pane.ts",
|
||||
@@ -182,7 +183,7 @@
|
||||
"markdown-it": "^14.2.0",
|
||||
"minimatch": "^10.2.5",
|
||||
"obsidian": "^1.13.1",
|
||||
"octagonal-wheels": "^0.1.51",
|
||||
"octagonal-wheels": "^0.1.52",
|
||||
"qrcode-generator": "^1.4.4",
|
||||
"xxhash-wasm-102": "npm:xxhash-wasm@^1.0.2"
|
||||
},
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "self-hosted-livesync-cli",
|
||||
"private": true,
|
||||
"version": "1.0.1-cli",
|
||||
"version": "1.0.2-cli",
|
||||
"main": "dist/index.cjs",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
@@ -37,7 +37,7 @@
|
||||
"dependencies": {
|
||||
"chokidar": "^4.0.0",
|
||||
"minimatch": "^10.2.5",
|
||||
"octagonal-wheels": "^0.1.51",
|
||||
"octagonal-wheels": "^0.1.52",
|
||||
"pouchdb-adapter-http": "^9.0.0",
|
||||
"pouchdb-adapter-leveldb": "^9.0.0",
|
||||
"pouchdb-core": "^9.0.0",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "livesync-webapp",
|
||||
"private": true,
|
||||
"version": "1.0.1-webapp",
|
||||
"version": "1.0.2-webapp",
|
||||
"type": "module",
|
||||
"description": "Browser-based Self-hosted LiveSync using FileSystem API",
|
||||
"scripts": {
|
||||
@@ -15,7 +15,7 @@
|
||||
"test:browser": "deno test -A --no-check --frozen --config ../../../test/browser-apps/deno.json --lock ../../../test/browser-apps/deno.lock ../../../test/browser-apps/webapp/browser-smoke.test.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"octagonal-wheels": "^0.1.51"
|
||||
"octagonal-wheels": "^0.1.52"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@sveltejs/vite-plugin-svelte": "^7.1.2",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "webpeer",
|
||||
"private": true,
|
||||
"version": "1.0.1-webpeer",
|
||||
"version": "1.0.2-webpeer",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
@@ -15,7 +15,7 @@
|
||||
"test:browser": "deno test -A --no-check --frozen --config ../../../test/browser-apps/deno.json --lock ../../../test/browser-apps/deno.lock ../../../test/browser-apps/webpeer/browser-smoke.test.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"octagonal-wheels": "^0.1.51"
|
||||
"octagonal-wheels": "^0.1.52"
|
||||
},
|
||||
"devDependencies": {
|
||||
"eslint-plugin-svelte": "^3.19.0",
|
||||
|
||||
@@ -94,10 +94,8 @@ export const liveSyncProvisionalEnglishMessages = {
|
||||
"🧩 Missing chunks: ${COUNT}": "🧩 Missing chunks: ${COUNT}",
|
||||
"📦 DB: recorded ${RECORDED} B · decoded ${DECODED} B · Δsize ${DIFFERENCE} B":
|
||||
"📦 DB: recorded ${RECORDED} B · decoded ${DECODED} B · Δsize ${DIFFERENCE} B",
|
||||
"📦 DB: recorded ${RECORDED} B · decoded unavailable":
|
||||
"📦 DB: recorded ${RECORDED} B · decoded unavailable",
|
||||
"📁 Vault: ${VAULT} B · Δsize vs DB ${DIFFERENCE} B":
|
||||
"📁 Vault: ${VAULT} B · Δsize vs DB ${DIFFERENCE} B",
|
||||
"📦 DB: recorded ${RECORDED} B · decoded unavailable": "📦 DB: recorded ${RECORDED} B · decoded unavailable",
|
||||
"📁 Vault: ${VAULT} B · Δsize vs DB ${DIFFERENCE} B": "📁 Vault: ${VAULT} B · Δsize vs DB ${DIFFERENCE} B",
|
||||
"🕒 DB ${DATABASE_TIME} · Vault ${VAULT_TIME} · Δtime ${DIFFERENCE} ms (${RELATION})":
|
||||
"🕒 DB ${DATABASE_TIME} · Vault ${VAULT_TIME} · Δtime ${DIFFERENCE} ms (${RELATION})",
|
||||
"✅ Matches Vault": "✅ Matches Vault",
|
||||
@@ -130,8 +128,7 @@ export const liveSyncProvisionalEnglishMessages = {
|
||||
"More actions for revision ${REVISION}": "More actions for revision ${REVISION}",
|
||||
"More actions for ${FILE}": "More actions for ${FILE}",
|
||||
"Show revision history": "Show revision history",
|
||||
"Store Vault file as a new local database document":
|
||||
"Store Vault file as a new local database document",
|
||||
"Store Vault file as a new local database document": "Store Vault file as a new local database document",
|
||||
"Copy database information": "Copy database information",
|
||||
"Recreate chunks for current Vault files": "Recreate chunks for current Vault files",
|
||||
"Recreate chunks from the files currently present in this Vault. This cannot reconstruct unavailable historical or conflict content.":
|
||||
@@ -140,8 +137,7 @@ export const liveSyncProvisionalEnglishMessages = {
|
||||
"Resolve every conflict by modification time? This logically deletes every version except the newest one and cannot recover content which is already unavailable.":
|
||||
"Resolve every conflict by modification time? This logically deletes every version except the newest one and cannot recover content which is already unavailable.",
|
||||
"Resolve all conflicts by the newest version": "Resolve all conflicts by the newest version",
|
||||
"Inspect conflicts and file/database differences":
|
||||
"Inspect conflicts and file/database differences",
|
||||
"Inspect conflicts and file/database differences": "Inspect conflicts and file/database differences",
|
||||
"Scan every Vault file and live local-database revision for conflicts, missing chunks, and differences. Each result provides actions for the exact revision.":
|
||||
"Scan every Vault file and live local-database revision for conflicts, missing chunks, and differences. Each result provides actions for the exact revision.",
|
||||
"Begin inspection": "Begin inspection",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,33 +1,78 @@
|
||||
{
|
||||
", please select the option that best describes the current state of your Vault. The application will then check your files in the most appropriate way based on your selection.": ", please select the option that best describes the current state of your Vault. The application will then check your files in the most appropriate way based on your selection.",
|
||||
"(Active)": "(Active)",
|
||||
"(BETA) Always overwrite with a newer file": "(BETA) Always overwrite with a newer file",
|
||||
"(Beta) Use ignore files": "(Beta) Use ignore files",
|
||||
"(Days passed, 0 to disable automatic-deletion)": "(Days passed, 0 to disable automatic-deletion)",
|
||||
"(e.g., after editing many files whilst offline)": "(e.g., after editing many files whilst offline)",
|
||||
"(e.g., immediately after restoring on another computer, or having recovered from a backup)": "(e.g., immediately after restoring on another computer, or having recovered from a backup)",
|
||||
"(e.g., setting up for the first time on a new smartphone, starting from a clean slate)": "(e.g., setting up for the first time on a new smartphone, starting from a clean slate)",
|
||||
"(ex. Read chunks online) If this option is enabled, LiveSync reads chunks online directly instead of replicating them locally. Increasing Custom chunk size is recommended.": "(ex. Read chunks online) If this option is enabled, LiveSync reads chunks online directly instead of replicating them locally. Increasing Custom chunk size is recommended.",
|
||||
"(MB) If this is set, changes to local and remote files that are larger than this will be skipped. If the file becomes smaller again, a newer one will be used.": "(MB) If this is set, changes to local and remote files that are larger than this will be skipped. If the file becomes smaller again, a newer one will be used.",
|
||||
"(Mega chars)": "(Mega chars)",
|
||||
"(Missing)": "(Missing)",
|
||||
"(Not recommended) If set, credentials will be stored in the file.": "(Not recommended) If set, credentials will be stored in the file.",
|
||||
"(Obsolete) Use an old adapter for compatibility": "(Obsolete) Use an old adapter for compatibility",
|
||||
"(RegExp) Empty to sync all files. Set filter as a regular expression to limit synchronising files.": "(RegExp) Empty to sync all files. Set filter as a regular expression to limit synchronising files.",
|
||||
"(RegExp) If this is set, any changes to local and remote files that match this will be skipped.": "(RegExp) If this is set, any changes to local and remote files that match this will be skipped.",
|
||||
"(Select this if you are already using synchronisation on another computer or smartphone.) This option is suitable if you are new to LiveSync and want to set it up from scratch.": "(Select this if you are already using synchronisation on another computer or smartphone.) This option is suitable if you are new to LiveSync and want to set it up from scratch.",
|
||||
"(Select this if you are configuring this device as the first synchronisation device.) This option is suitable if you are new to LiveSync and want to set it up from scratch.": "(Select this if you are configuring this device as the first synchronisation device.) This option is suitable if you are new to LiveSync and want to set it up from scratch.",
|
||||
"↑: Overwrite Remote": "↑: Overwrite Remote",
|
||||
"↓: Overwrite Local": "↓: Overwrite Local",
|
||||
"⇅: Use newer": "⇅: Use newer",
|
||||
"+1 week": "+1 week",
|
||||
"> [!INFO]- The connected devices have been detected as follows:\n${devices}": "> [!INFO]- The connected devices have been detected as follows:\n${devices}",
|
||||
"⚠️ Important Notice": "⚠️ Important Notice",
|
||||
"⚠️ Please Confirm the Following": "⚠️ Please Confirm the Following",
|
||||
"✔ SELECT": "✔ SELECT",
|
||||
"✔ SYNC": "✔ SYNC",
|
||||
"✔ WATCH": "✔ WATCH",
|
||||
"📡 Off": "📡 Off",
|
||||
"📡 On": "📡 On",
|
||||
"🔴 Disconnected": "🔴 Disconnected",
|
||||
"🕵️ Diag": "🕵️ Diag",
|
||||
"🗑 Delete": "🗑 Delete",
|
||||
"🟢 Connected": "🟢 Connected",
|
||||
"${count} issue(s) detected!": "${count} issue(s) detected!",
|
||||
"A Setup URI is a single string of text containing your server address and authentication details. Using a URI, if one was generated by your server installation script, provides a simple and secure configuration.": "A Setup URI is a single string of text containing your server address and authentication details. Using a URI, if one was generated by your server installation script, provides a simple and secure configuration.",
|
||||
"Accept": "Accept",
|
||||
"Accept in session": "Accept in session",
|
||||
"ACCEPTED": "ACCEPTED",
|
||||
"ACCEPTED (in session)": "ACCEPTED (in session)",
|
||||
"Access Key": "Access Key",
|
||||
"Access Key ID": "Access Key ID",
|
||||
"Action": "Action",
|
||||
"Activate": "Activate",
|
||||
"Active Remote Configuration": "Active Remote Configuration",
|
||||
"Add default patterns": "Add default patterns",
|
||||
"Add new connection": "Add new connection",
|
||||
"AddOn Module (ConfigSync) has not been loaded. This is very unexpected situation. Please report this issue.": "AddOn Module (ConfigSync) has not been loaded. This is very unexpected situation. Please report this issue.",
|
||||
"AddOn Module (HiddenFileSync) has not been loaded. This is very unexpected situation. Please report this issue.": "AddOn Module (HiddenFileSync) has not been loaded. This is very unexpected situation. Please report this issue.",
|
||||
"Advanced": "Advanced",
|
||||
"Advanced Settings": "Advanced Settings",
|
||||
"After restarting, the data on this device will be uploaded to the server as the 'master copy'. Please be aware that any unintended data currently on the server will be completely overwritten.": "After restarting, the data on this device will be uploaded to the server as the 'master copy'. Please be aware that any unintended data currently on the server will be completely overwritten.",
|
||||
"After restarting, the database on this device will be rebuilt using data from the server. If there are any unsynchronised files in this vault, conflicts may occur with the server data.": "After restarting, the database on this device will be rebuilt using data from the server. If there are any unsynchronised files in this vault, conflicts may occur with the server data.",
|
||||
"After that, synchronise to a brand new vault on each other device with the new remote one by one.": "After that, synchronise to a brand new vault on each other device with the new remote one by one.",
|
||||
"All checks passed successfully!": "All checks passed successfully!",
|
||||
"All devices have the same progress value (${progress}). Your devices seem to be synchronised. And be able to proceed with Garbage Collection.": "All devices have the same progress value (${progress}). Your devices seem to be synchronised. And be able to proceed with Garbage Collection.",
|
||||
"All the same or non-existent": "All the same or non-existent",
|
||||
"Allow in session": "Allow in session",
|
||||
"Allow permanently": "Allow permanently",
|
||||
"Also, please note that if you are using Peer-to-Peer synchronization, this configuration will be used when you switch to other methods and connect to a remote server in the future.": "Also, please note that if you are using Peer-to-Peer synchronization, this configuration will be used when you switch to other methods and connect to a remote server in the future.",
|
||||
"Always prompt merge conflicts": "Always prompt merge conflicts",
|
||||
"Analyse": "Analyse",
|
||||
"Analyse database usage": "Analyse database usage",
|
||||
"Analyse database usage and generate a TSV report for diagnosis yourself. You can paste the generated report with any spreadsheet you like.": "Analyse database usage and generate a TSV report for diagnosis yourself. You can paste the generated report with any spreadsheet you like.",
|
||||
"Apply All Selected": "Apply All Selected",
|
||||
"Apply Latest Change if Conflicting": "Apply Latest Change if Conflicting",
|
||||
"Apply preset configuration": "Apply preset configuration",
|
||||
"Apply the settings": "Apply the settings",
|
||||
"Ask a passphrase at every launch": "Ask a passphrase at every launch",
|
||||
"Auto Connect": "Auto Connect",
|
||||
"Auto Start P2P Connection": "Auto Start P2P Connection",
|
||||
"Automatic": "Automatic",
|
||||
"Automatically Sync all files when opening Obsidian.": "Automatically Sync all files when opening Obsidian.",
|
||||
"Available Peers": "Available Peers",
|
||||
"Back": "Back",
|
||||
"Back to non-configured": "Back to non-configured",
|
||||
"Batch database update": "Batch database update",
|
||||
@@ -35,19 +80,31 @@
|
||||
"Batch size": "Batch size",
|
||||
"Batch size of on-demand fetching": "Batch size of on-demand fetching",
|
||||
"Before v0.17.16, we used an old adapter for the local database. Now the new adapter is preferred. However, it needs local database rebuilding. Please disable this toggle when you have enough time. If leave it enabled, also while fetching from the remote database, you will be asked to disable this.": "Before v0.17.16, we used an old adapter for the local database. Now the new adapter is preferred. However, it needs local database rebuilding. Please disable this toggle when you have enough time. If leave it enabled, also while fetching from the remote database, you will be asked to disable this.",
|
||||
"Broadcasting?": "Broadcasting?",
|
||||
"Bucket Name": "Bucket Name",
|
||||
"by resetting the remote, you will be informed on other devices.": "by resetting the remote, you will be informed on other devices.",
|
||||
"Cancel": "Cancel",
|
||||
"Cancel Garbage Collection": "Cancel Garbage Collection",
|
||||
"Changing the encryption algorithm will prevent access to any data previously encrypted with a different algorithm. Ensure that all your devices are configured to use the same algorithm to maintain access to your data.": "Changing the encryption algorithm will prevent access to any data previously encrypted with a different algorithm. Ensure that all your devices are configured to use the same algorithm to maintain access to your data.",
|
||||
"Changing this setting requires migrating existing data (a bit time may be taken) and restarting Obsidian. Please make sure to back up your data before proceeding.": "Changing this setting requires migrating existing data (a bit time may be taken) and restarting Obsidian. Please make sure to back up your data before proceeding.",
|
||||
"Check": "Check",
|
||||
"Check and convert non-path-obfuscated files": "Check and convert non-path-obfuscated files",
|
||||
"Check for documents that have not been converted to path-obfuscated IDs and convert them if necessary.": "Check for documents that have not been converted to path-obfuscated IDs and convert them if necessary.",
|
||||
"Checking connection... Please wait.": "Checking connection... Please wait.",
|
||||
"Chunks": "Chunks",
|
||||
"Close": "Close",
|
||||
"Close & Disconnect": "Close & Disconnect",
|
||||
"Close this dialog": "Close this dialog",
|
||||
"Closed:": "Closed:",
|
||||
"cmdConfigSync.showCustomizationSync": "Show Customization sync",
|
||||
"Comma separated `.gitignore, .dockerignore`": "Comma separated `.gitignore, .dockerignore`",
|
||||
"Command": "Command",
|
||||
"Communicating": "Communicating",
|
||||
"Compaction in progress on remote database...": "Compaction in progress on remote database...",
|
||||
"Compaction on remote database completed successfully.": "Compaction on remote database completed successfully.",
|
||||
"Compaction on remote database failed.": "Compaction on remote database failed.",
|
||||
"Compaction on remote database timed out.": "Compaction on remote database timed out.",
|
||||
"Compare file": "Compare file",
|
||||
"Compare the content of files between on local database and storage. If not matched, you will be asked which one you want to keep.": "Compare the content of files between on local database and storage. If not matched, you will be asked which one you want to keep.",
|
||||
"Compatibility (Conflict Behaviour)": "Compatibility (Conflict Behaviour)",
|
||||
"Compatibility (Database structure)": "Compatibility (Database structure)",
|
||||
@@ -56,48 +113,78 @@
|
||||
"Compatibility (Remote Database)": "Compatibility (Remote Database)",
|
||||
"Compatibility (Trouble addressed)": "Compatibility (Trouble addressed)",
|
||||
"Compute revisions for chunks": "Compute revisions for chunks",
|
||||
"Configuration": "Configuration",
|
||||
"Configuration Encryption": "Configuration Encryption",
|
||||
"Configure": "Configure",
|
||||
"Configure And Change Remote": "Configure And Change Remote",
|
||||
"Configure E2EE": "Configure E2EE",
|
||||
"Configure Remote": "Configure Remote",
|
||||
"Configure the same server information as your other devices again, manually, very advanced users only.": "Configure the same server information as your other devices again, manually, very advanced users only.",
|
||||
"Connect": "Connect",
|
||||
"Connected to Signaling Server (as Peer ID: ${peerId})": "Connected to Signaling Server (as Peer ID: ${peerId})",
|
||||
"Connected:": "Connected:",
|
||||
"Connection Method": "Connection Method",
|
||||
"Connection Settings": "Connection Settings",
|
||||
"Connection:": "Connection:",
|
||||
"Continue anyway": "Continue anyway",
|
||||
"Continue to CouchDB setup": "Continue to CouchDB setup",
|
||||
"Continue to Peer-to-Peer only setup": "Continue to Peer-to-Peer only setup",
|
||||
"Continue to S3/MinIO/R2 setup": "Continue to S3/MinIO/R2 setup",
|
||||
"Copy": "Copy",
|
||||
"Copy Report to clipboard": "Copy Report to clipboard",
|
||||
"CouchDB Configuration": "CouchDB Configuration",
|
||||
"CouchDB Connection Tweak": "CouchDB Connection Tweak",
|
||||
"Create P2P remote": "Create P2P remote",
|
||||
"Cross-platform": "Cross-platform",
|
||||
"Current adapter: {adapter}": "Current adapter: {adapter}",
|
||||
"Custom Headers": "Custom Headers",
|
||||
"Customization Sync": "Customization Sync",
|
||||
"Customization Sync (Beta3)": "Customization Sync (Beta3)",
|
||||
"Data Compression": "Data Compression",
|
||||
"Data to Copy": "Data to Copy",
|
||||
"Database -> Storage": "Database -> Storage",
|
||||
"Database Adapter": "Database Adapter",
|
||||
"Database Name": "Database Name",
|
||||
"Database suffix": "Database suffix",
|
||||
"Date": "Date",
|
||||
"Default": "Default",
|
||||
"Delay conflict resolution of inactive files": "Delay conflict resolution of inactive files",
|
||||
"Delay merge conflict prompt for inactive files.": "Delay merge conflict prompt for inactive files.",
|
||||
"Delete": "Delete",
|
||||
"Delete all customization sync data": "Delete all customization sync data",
|
||||
"Delete all data on the remote server.": "Delete all data on the remote server.",
|
||||
"Delete All of": "Delete All of",
|
||||
"Delete local database to reset or uninstall Self-hosted LiveSync": "Delete local database to reset or uninstall Self-hosted LiveSync",
|
||||
"Delete old metadata of deleted files on start-up": "Delete old metadata of deleted files on start-up",
|
||||
"Delete Remote Configuration": "Delete Remote Configuration",
|
||||
"Delete remote configuration '{name}'?": "Delete remote configuration '{name}'?",
|
||||
"Delete remote configuration '${name}'?": "Delete remote configuration '${name}'?",
|
||||
"DENIED": "DENIED",
|
||||
"DENIED (in session)": "DENIED (in session)",
|
||||
"Deny": "Deny",
|
||||
"Deny in session": "Deny in session",
|
||||
"Deny permanently": "Deny permanently",
|
||||
"Deselect all": "Deselect all",
|
||||
"desktop": "desktop",
|
||||
"Detected Peers": "Detected Peers",
|
||||
"Developer": "Developer",
|
||||
"Device": "Device",
|
||||
"device name": "device name",
|
||||
"Device name": "Device name",
|
||||
"Device name to identify the device. Please use shorter one for the stable peer detection, i.e., \"iphone-16\" or \"macbook-2021\".": "Device name to identify the device. Please use shorter one for the stable peer detection, i.e., \"iphone-16\" or \"macbook-2021\".",
|
||||
"Device Peer ID": "Device Peer ID",
|
||||
"Device Setup Method": "Device Setup Method",
|
||||
"Devices:": "Devices:",
|
||||
"Diagnostic RTCPeerConnection is enabled": "Diagnostic RTCPeerConnection is enabled",
|
||||
"dialog.yourLanguageAvailable": "Self-hosted LiveSync had translations for your language, so the %{Display language} setting was enabled.\n\nNote: Not all messages are translated. We are waiting for your contributions!\nNote 2: If you create an Issue, **please revert to %{lang-def}** and then take screenshots, messages and logs. This can be done in the setting dialogue.\nMay you find it easy to use!",
|
||||
"dialog.yourLanguageAvailable.btnRevertToDefault": "Keep %{lang-def}",
|
||||
"dialog.yourLanguageAvailable.Title": " Translation is available!",
|
||||
"Diff": "Diff",
|
||||
"Different": "Different",
|
||||
"Disables all synchronization and restart.": "Disables all synchronization and restart.",
|
||||
"Disables logging, only shows notifications. Please disable if you report an issue.": "Disables logging, only shows notifications. Please disable if you report an issue.",
|
||||
"Disconnect": "Disconnect",
|
||||
"Dismiss": "Dismiss",
|
||||
"Display Language": "Display Language",
|
||||
"Display name": "Display name",
|
||||
"Do not check configuration mismatch before replication": "Do not check configuration mismatch before replication",
|
||||
@@ -136,33 +223,70 @@
|
||||
"Enable customization sync": "Enable customization sync",
|
||||
"Enable Developers' Debug Tools.": "Enable Developers' Debug Tools.",
|
||||
"Enable edge case treatment features": "Enable edge case treatment features",
|
||||
"Enable P2P Replicator": "Enable P2P Replicator",
|
||||
"Enable poweruser features": "Enable poweruser features",
|
||||
"Enable this if your Object Storage doesn't support CORS": "Enable this if your Object Storage doesn't support CORS",
|
||||
"Enable this option to automatically apply the most recent change to documents even when it conflicts": "Enable this option to automatically apply the most recent change to documents even when it conflicts",
|
||||
"Enabled": "Enabled",
|
||||
"Enabling end-to-end encryption ensures that your data is encrypted on your device before being sent to the remote server. This means that even if someone gains access to the server, they won't be able to read your data without the passphrase. Make sure to remember your passphrase, as it will be required to decrypt your data on other devices.": "Enabling end-to-end encryption ensures that your data is encrypted on your device before being sent to the remote server. This means that even if someone gains access to the server, they won't be able to read your data without the passphrase. Make sure to remember your passphrase, as it will be required to decrypt your data on other devices.",
|
||||
"Encrypt contents on the remote database. If you use the plugin's synchronization feature, enabling this is recommended.": "Encrypt contents on the remote database. If you use the plugin's synchronization feature, enabling this is recommended.",
|
||||
"Encrypting sensitive configuration items": "Encrypting sensitive configuration items",
|
||||
"Encryption Algorithm": "Encryption Algorithm",
|
||||
"Encryption phassphrase. If changed, you should overwrite the server's database with the new (encrypted) files.": "Encryption phassphrase. If changed, you should overwrite the server's database with the new (encrypted) files.",
|
||||
"End-to-End Encryption": "End-to-End Encryption",
|
||||
"Endpoint URL": "Endpoint URL",
|
||||
"Enhance chunk size": "Enhance chunk size",
|
||||
"Enter a folder prefix (optional)": "Enter a folder prefix (optional)",
|
||||
"Enter Server Information": "Enter Server Information",
|
||||
"Enter Setup URI": "Enter Setup URI",
|
||||
"Enter the server information manually": "Enter the server information manually",
|
||||
"Enter TURN credential": "Enter TURN credential",
|
||||
"Enter TURN username": "Enter TURN username",
|
||||
"Enter your Access Key ID": "Enter your Access Key ID",
|
||||
"Enter your Bucket Name": "Enter your Bucket Name",
|
||||
"Enter your database name": "Enter your database name",
|
||||
"Enter your JWT Key ID": "Enter your JWT Key ID",
|
||||
"Enter your JWT secret or private key": "Enter your JWT secret or private key",
|
||||
"Enter your JWT Subject (CouchDB Username)": "Enter your JWT Subject (CouchDB Username)",
|
||||
"Enter your passphrase": "Enter your passphrase",
|
||||
"Enter your password": "Enter your password",
|
||||
"Enter your Region (e.g., us-east-1, auto for R2)": "Enter your Region (e.g., us-east-1, auto for R2)",
|
||||
"Enter your Secret Access Key": "Enter your Secret Access Key",
|
||||
"Enter your username": "Enter your username",
|
||||
"Error during connection test: ${reason}": "Error during connection test: ${reason}",
|
||||
"Error during testAndFixSettings: ${reason}": "Error during testAndFixSettings: ${reason}",
|
||||
"Experimental Settings": "Experimental Settings",
|
||||
"Export": "Export",
|
||||
"Failed to connect to remote for compaction.": "Failed to connect to remote for compaction.",
|
||||
"Failed to connect to remote for compaction. ${reason}": "Failed to connect to remote for compaction. ${reason}",
|
||||
"Failed to connect to the server: ${reason}": "Failed to connect to the server: ${reason}",
|
||||
"Failed to connect to the server. Please check your settings.": "Failed to connect to the server. Please check your settings.",
|
||||
"Failed to connect to the signalling relay: ${reason}": "Failed to connect to the signalling relay: ${reason}",
|
||||
"Failed to create replicator instance.": "Failed to create replicator instance.",
|
||||
"Failed to parse Setup-URI.": "Failed to parse Setup-URI.",
|
||||
"Failed to start one-shot replication before Garbage Collection. Garbage Collection Cancelled.": "Failed to start one-shot replication before Garbage Collection. Garbage Collection Cancelled.",
|
||||
"Failed to start replication after Garbage Collection.": "Failed to start replication after Garbage Collection.",
|
||||
"Failed:": "Failed:",
|
||||
"Fetch": "Fetch",
|
||||
"Fetch chunks on demand": "Fetch chunks on demand",
|
||||
"Fetch database with previous behaviour": "Fetch database with previous behaviour",
|
||||
"Fetch remote settings": "Fetch remote settings",
|
||||
"FETCHING": "FETCHING",
|
||||
"Fetching status...": "Fetching status...",
|
||||
"File integrity": "File integrity",
|
||||
"File to resolve conflict": "File to resolve conflict",
|
||||
"File to view History": "File to view History",
|
||||
"Filename": "Filename",
|
||||
"Final Confirmation: Overwrite Server Data with This Device's Files": "Final Confirmation: Overwrite Server Data with This Device's Files",
|
||||
"First, please select the option that best describes your current situation.": "First, please select the option that best describes your current situation.",
|
||||
"Fix": "Fix",
|
||||
"Flag and restart": "Flag and restart",
|
||||
"Flagged Selective": "Flagged Selective",
|
||||
"Folder Prefix": "Folder Prefix",
|
||||
"For HS256/HS512 algorithms, provide the shared secret key. For ES256/ES512 algorithms, provide the pkcs8 PEM-formatted private key.": "For HS256/HS512 algorithms, provide the shared secret key. For ES256/ES512 algorithms, provide the pkcs8 PEM-formatted private key.",
|
||||
"Forces the file to be synced when opened.": "Forces the file to be synced when opened.",
|
||||
"Fresh Start Wipe": "Fresh Start Wipe",
|
||||
"Furthermore, if conflicts are already present in the server data, they will be synchronised to this device as they are, and you will need to resolve them locally.": "Furthermore, if conflicts are already present in the server data, they will be synchronised to this device as they are, and you will need to resolve them locally.",
|
||||
"Garbage Collection cancelled by user.": "Garbage Collection cancelled by user.",
|
||||
"Garbage Collection completed. Deleted chunks: ${deletedChunks} / ${totalChunks}. Time taken: ${seconds} seconds.": "Garbage Collection completed. Deleted chunks: ${deletedChunks} / ${totalChunks}. Time taken: ${seconds} seconds.",
|
||||
"Garbage Collection Confirmation": "Garbage Collection Confirmation",
|
||||
@@ -170,15 +294,33 @@
|
||||
"Garbage Collection: Found ${unusedChunks} unused chunks to delete.": "Garbage Collection: Found ${unusedChunks} unused chunks to delete.",
|
||||
"Garbage Collection: Scanned ${scanned} / ~${docCount}": "Garbage Collection: Scanned ${scanned} / ~${docCount}",
|
||||
"Garbage Collection: Scanning completed. Total chunks: ${totalChunks}, Used chunks: ${usedChunks}": "Garbage Collection: Scanning completed. Total chunks: ${totalChunks}, Used chunks: ${usedChunks}",
|
||||
"Gathering information...": "Gathering information...",
|
||||
"Generate Random ID": "Generate Random ID",
|
||||
"Group ID": "Group ID",
|
||||
"Handle files as Case-Sensitive": "Handle files as Case-Sensitive",
|
||||
"Have you created a backup before proceeding?": "Have you created a backup before proceeding?",
|
||||
"Hidden file synchronization have been temporarily disabled. Please enable them after the fetching, if you need them.": "Hidden file synchronization have been temporarily disabled. Please enable them after the fetching, if you need them.",
|
||||
"Hidden Files": "Hidden Files",
|
||||
"Hide completely": "Hide completely",
|
||||
"Hide not applicable items": "Hide not applicable items",
|
||||
"Higher (${local} > ${remote})": "Higher (${local} > ${remote})",
|
||||
"Highlight diff": "Highlight diff",
|
||||
"How to display network errors when the sync server is unreachable.": "How to display network errors when the sync server is unreachable.",
|
||||
"How would you like to configure the connection to your server?": "How would you like to configure the connection to your server?",
|
||||
"However, This should not be enabled if you want to increase your secrecy more.": "However, This should not be enabled if you want to increase your secrecy more.",
|
||||
"I am adding a device to an existing synchronisation setup": "I am adding a device to an existing synchronisation setup",
|
||||
"I am setting this up for the first time": "I am setting this up for the first time",
|
||||
"I am setting up a new server for the first time / I want to reset my existing server.": "I am setting up a new server for the first time / I want to reset my existing server.",
|
||||
"I am unable to create a backup of my Vault.": "I am unable to create a backup of my Vault.",
|
||||
"I am unable to create a backup of my Vaults.": "I am unable to create a backup of my Vaults.",
|
||||
"I have created a backup of my Vault.": "I have created a backup of my Vault.",
|
||||
"I know my server details, let me enter them": "I know my server details, let me enter them",
|
||||
"I understand that all changes made on other smartphones or computers possibly could be lost.": "I understand that all changes made on other smartphones or computers possibly could be lost.",
|
||||
"I understand that other devices will no longer be able to synchronise, and will need to be reset the synchronisation information.": "I understand that other devices will no longer be able to synchronise, and will need to be reset the synchronisation information.",
|
||||
"I understand that this action is irreversible once performed.": "I understand that this action is irreversible once performed.",
|
||||
"I understand the risks and will proceed without a backup.": "I understand the risks and will proceed without a backup.",
|
||||
"I Understand, Overwrite Server": "I Understand, Overwrite Server",
|
||||
"If \"Auto Start P2P Connection\" is enabled, the P2P connection will be started automatically when the plug-in launches.": "If \"Auto Start P2P Connection\" is enabled, the P2P connection will be started automatically when the plug-in launches.",
|
||||
"If disabled(toggled), chunks will be split on the UI thread (Previous behaviour).": "If disabled(toggled), chunks will be split on the UI thread (Previous behaviour).",
|
||||
"If enabled per-filed efficient customization sync will be used. We need a small migration when enabling this. And all devices should be updated to v0.23.18. Once we enabled this, we lost a compatibility with old versions.": "If enabled per-filed efficient customization sync will be used. We need a small migration when enabling this. And all devices should be updated to v0.23.18. Once we enabled this, we lost a compatibility with old versions.",
|
||||
"If enabled, chunks will be split into no more than 100 items. However, dedupe is slightly weaker.": "If enabled, chunks will be split into no more than 100 items. However, dedupe is slightly weaker.",
|
||||
@@ -191,16 +333,38 @@
|
||||
"If this enabled, chunks will be split into semantically meaningful segments. Not all platforms support this feature.": "If this enabled, chunks will be split into semantically meaningful segments. Not all platforms support this feature.",
|
||||
"If this is set, changes to local files which are matched by the ignore files will be skipped. Remote changes are determined using local ignore files.": "If this is set, changes to local files which are matched by the ignore files will be skipped. Remote changes are determined using local ignore files.",
|
||||
"If this option is enabled, PouchDB will hold the connection open for 60 seconds, and if no change arrives in that time, close and reopen the socket, instead of holding it open indefinitely. Useful when a proxy limits request duration but can increase resource usage.": "If this option is enabled, PouchDB will hold the connection open for 60 seconds, and if no change arrives in that time, close and reopen the socket, instead of holding it open indefinitely. Useful when a proxy limits request duration but can increase resource usage.",
|
||||
"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.": "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.",
|
||||
"If you cannot avoid CORS issues, you might want to try this option. It uses Obsidian's internal API to communicate with the S3 server. Not compliant with web standards, but works. Note that this might break in future Obsidian versions.": "If you cannot avoid CORS issues, you might want to try this option. It uses Obsidian's internal API to communicate with the S3 server. Not compliant with web standards, but works. Note that this might break in future Obsidian versions.",
|
||||
"If you have unsynchronised changes in your Vault on this device, they will likely diverge from the server's versions after the reset. This may result in a large number of file conflicts.": "If you have unsynchronised changes in your Vault on this device, they will likely diverge from the server's versions after the reset. This may result in a large number of file conflicts.",
|
||||
"If you reached the payload size limit when using IBM Cloudant, please decrease batch size and batch limit to a lower value.": "If you reached the payload size limit when using IBM Cloudant, please decrease batch size and batch limit to a lower value.",
|
||||
"If you understand the risks and still wish to proceed, select so.": "If you understand the risks and still wish to proceed, select so.",
|
||||
"If you want to store the data in a specific folder within the bucket, you can specify a folder prefix here. Otherwise, leave it blank to store data at the root of the bucket.": "If you want to store the data in a specific folder within the bucket, you can specify a folder prefix here. Otherwise, leave it blank to store data at the root of the bucket.",
|
||||
"If you want to use `LiveSync`, you should broadcast changes. All `watching` peers which detects this will start the replication for fetching.": "If you want to use `LiveSync`, you should broadcast changes. All `watching` peers which detects this will start the replication for fetching.",
|
||||
"Ignore": "Ignore",
|
||||
"Ignore and Proceed": "Ignore and Proceed",
|
||||
"Ignore files": "Ignore files",
|
||||
"Ignore patterns": "Ignore patterns",
|
||||
"Import connection": "Import connection",
|
||||
"IMPORTANT": "IMPORTANT",
|
||||
"In most cases, you should stick with the default algorithm (${algorithm}), This setting is only required if you have an existing Vault encrypted in a different format.": "In most cases, you should stick with the default algorithm (${algorithm}), This setting is only required if you have an existing Vault encrypted in a different format.",
|
||||
"In this scenario, Self-hosted LiveSync will recreate metadata for every file and deliberately generate conflicts. Where the file content is identical, these conflicts will be resolved automatically.": "In this scenario, Self-hosted LiveSync will recreate metadata for every file and deliberately generate conflicts. Where the file content is identical, these conflicts will be resolved automatically.",
|
||||
"Incoming:": "Incoming:",
|
||||
"Incubate Chunks in Document": "Incubate Chunks in Document",
|
||||
"Initial Action": "Initial Action",
|
||||
"Initialise all journal history, On the next sync, every item will be received and sent.": "Initialise all journal history, On the next sync, every item will be received and sent.",
|
||||
"Initialise journal received history. On the next sync, every item except this device sent will be downloaded again.": "Initialise journal received history. On the next sync, every item except this device sent will be downloaded again.",
|
||||
"Initialise journal sent history. On the next sync, every item except this device received will be sent again.": "Initialise journal sent history. On the next sync, every item except this device received will be sent again.",
|
||||
"Interval (sec)": "Interval (sec)",
|
||||
"INVERTED": "INVERTED",
|
||||
"Issue detection log:": "Issue detection log:",
|
||||
"It is strongly advised to create a backup before proceeding. Continuing without a backup may lead to data loss.": "It is strongly advised to create a backup before proceeding. Continuing without a backup may lead to data loss.",
|
||||
"Just for a minute, please!": "Just for a minute, please!",
|
||||
"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.": "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.",
|
||||
"JWT Algorithm": "JWT Algorithm",
|
||||
"JWT Expiration Duration (minutes)": "JWT Expiration Duration (minutes)",
|
||||
"JWT Key": "JWT Key",
|
||||
"JWT Key ID (kid)": "JWT Key ID (kid)",
|
||||
"JWT Subject (sub)": "JWT Subject (sub)",
|
||||
"K.exp": "Experimental",
|
||||
"K.long_p2p_sync": "%{title_p2p_sync}",
|
||||
"K.P2P": "%{Peer}-to-%{Peer}",
|
||||
@@ -222,6 +386,7 @@
|
||||
"lang-zh-tw": "繁體中文",
|
||||
"Later": "Later",
|
||||
"Limit: {datetime} ({timestamp})": "Limit: {datetime} ({timestamp})",
|
||||
"live": "live",
|
||||
"LiveSync could not handle multiple vaults which have same name without different prefix, This should be automatically configured.": "LiveSync could not handle multiple vaults which have same name without different prefix, This should be automatically configured.",
|
||||
"liveSyncReplicator.beforeLiveSync": "Before LiveSync, start OneShot once...",
|
||||
"liveSyncReplicator.cantReplicateLowerValue": "We can't replicate more lower value.",
|
||||
@@ -250,6 +415,7 @@
|
||||
"liveSyncSetting.valueShouldBeInRange": "The value should ${min} < value < ${max}",
|
||||
"liveSyncSettings.btnApply": "Apply",
|
||||
"Local Database Tweak": "Local Database Tweak",
|
||||
"Local only": "Local only",
|
||||
"Lock": "Lock",
|
||||
"Lock Server": "Lock Server",
|
||||
"Lock the remote server to prevent synchronization with other devices.": "Lock the remote server to prevent synchronization with other devices.",
|
||||
@@ -258,6 +424,9 @@
|
||||
"logPane.pause": "Pause",
|
||||
"logPane.title": "Self-hosted LiveSync Log",
|
||||
"logPane.wrap": "Wrap",
|
||||
"Lower (${local} < ${remote})": "Lower (${local} < ${remote})",
|
||||
"Maintenance Commands": "Maintenance Commands",
|
||||
"Maintenance mode": "Maintenance mode",
|
||||
"Maximum delay for batch database updating": "Maximum delay for batch database updating",
|
||||
"Maximum file size": "Maximum file size",
|
||||
"Maximum Incubating Chunk Size": "Maximum Incubating Chunk Size",
|
||||
@@ -270,6 +439,7 @@
|
||||
"Merge": "Merge",
|
||||
"Minimum delay for batch database updating": "Minimum delay for batch database updating",
|
||||
"Minimum interval for syncing": "Minimum interval for syncing",
|
||||
"Mixed": "Mixed",
|
||||
"moduleCheckRemoteSize.logCheckingStorageSizes": "Checking storage sizes",
|
||||
"moduleCheckRemoteSize.logCurrentStorageSize": "Remote storage size: ${measuredSize}",
|
||||
"moduleCheckRemoteSize.logExceededWarning": "Remote storage size: ${measuredSize} exceeded ${notifySize}",
|
||||
@@ -352,23 +522,39 @@
|
||||
"moduleMigration.titleWelcome": "Welcome to Self-hosted LiveSync",
|
||||
"moduleObsidianMenu.replicate": "Replicate",
|
||||
"More actions": "More actions",
|
||||
"Mostly Complete: Decision Required": "Mostly Complete: Decision Required",
|
||||
"Move remotely deleted files to the trash, instead of deleting.": "Move remotely deleted files to the trash, instead of deleting.",
|
||||
"My remote server is already set up. I want to join this device.": "My remote server is already set up. I want to join this device.",
|
||||
"Name": "Name",
|
||||
"Network warning style": "Network warning style",
|
||||
"NEW": "NEW",
|
||||
"New Remote": "New Remote",
|
||||
"Newer (${diff})": "Newer (${diff})",
|
||||
"No checks have been performed yet.": "No checks have been performed yet.",
|
||||
"No connected device information found. Cancelling Garbage Collection.": "No connected device information found. Cancelling Garbage Collection.",
|
||||
"No Connection": "No Connection",
|
||||
"No devices available. Waiting for other devices to connect...": "No devices available. Waiting for other devices to connect...",
|
||||
"No Items.": "No Items.",
|
||||
"No limit configured": "No limit configured",
|
||||
"NO PREVIEW": "NO PREVIEW",
|
||||
"No, please take me back": "No, please take me back",
|
||||
"Node ID": "Node ID",
|
||||
"Node Information Missing": "Node Information Missing",
|
||||
"Non-Synchronising files": "Non-Synchronising files",
|
||||
"Normal Files": "Normal Files",
|
||||
"Not all messages have been translated. And, please revert to \"Default\" when reporting errors.": "Not all messages have been translated. And, please revert to \"Default\" when reporting errors.",
|
||||
"Not configured": "Not configured",
|
||||
"Not now": "Not now",
|
||||
"Note that the Group ID is not limited to the generated format; you can use any string as the Group ID.": "Note that the Group ID is not limited to the generated format; you can use any string as the Group ID.",
|
||||
"Note that you can generate a new Setup URI by running the \"Copy settings as a new Setup URI\" command in the command palette.": "Note that you can generate a new Setup URI by running the \"Copy settings as a new Setup URI\" command in the command palette.",
|
||||
"Notify all setting files": "Notify all setting files",
|
||||
"Notify customized": "Notify customized",
|
||||
"Notify when other device has newly customized.": "Notify when other device has newly customized.",
|
||||
"Notify when the estimated remote storage size exceeds on start up": "Notify when the estimated remote storage size exceeds on start up",
|
||||
"Number of batches to process at a time. Defaults to 40. Minimum is 2. This along with batch size controls how many docs are kept in memory at a time.": "Number of batches to process at a time. Defaults to 40. Minimum is 2. This along with batch size controls how many docs are kept in memory at a time.",
|
||||
"Number of changes to sync at a time. Defaults to 50. Minimum is 2.": "Number of changes to sync at a time. Defaults to 50. Minimum is 2.",
|
||||
"Obfuscate Properties": "Obfuscate Properties",
|
||||
"Obfuscating properties (e.g., path of file, size, creation and modification dates) adds an additional layer of security by making it harder to identify the structure and names of your files and folders on the remote server. This helps protect your privacy and makes it more difficult for unauthorized users to infer information about your data.": "Obfuscating properties (e.g., path of file, size, creation and modification dates) adds an additional layer of security by making it harder to identify the structure and names of your files and folders on the remote server. This helps protect your privacy and makes it more difficult for unauthorized users to infer information about your data.",
|
||||
"Obsidian version": "Obsidian version",
|
||||
"obsidianLiveSyncSettingTab.btnApply": "Apply",
|
||||
"obsidianLiveSyncSettingTab.btnCheck": "Check",
|
||||
@@ -541,16 +727,29 @@
|
||||
"obsidianLiveSyncSettingTab.titleUpdateThinning": "Update Thinning",
|
||||
"obsidianLiveSyncSettingTab.warnCorsOriginUnmatched": "⚠ CORS Origin is unmatched ${from}->${to}",
|
||||
"obsidianLiveSyncSettingTab.warnNoAdmin": "⚠ You do not have administrator privileges.",
|
||||
"Of course, we can back up the data before proceeding.": "Of course, we can back up the data before proceeding.",
|
||||
"Off": "Off",
|
||||
"Ok": "Ok",
|
||||
"Old Algorithm": "Old Algorithm",
|
||||
"Older (${diff})": "Older (${diff})",
|
||||
"Older fallback (Slow, W/O WebAssembly)": "Older fallback (Slow, W/O WebAssembly)",
|
||||
"On": "On",
|
||||
"On the source device, from the command palette, run the 'Show settings as a QR code' command.": "On the source device, from the command palette, run the 'Show settings as a QR code' command.",
|
||||
"On the source device, open Obsidian.": "On the source device, open Obsidian.",
|
||||
"On this device, please keep this Vault open.": "On this device, please keep this Vault open.",
|
||||
"On this device, switch to the camera app or use a QR code scanner to scan the displayed QR code.": "On this device, switch to the camera app or use a QR code scanner to scan the displayed QR code.",
|
||||
"Open": "Open",
|
||||
"Open connection": "Open connection",
|
||||
"Open P2P Setup...": "Open P2P Setup...",
|
||||
"Open the dialog": "Open the dialog",
|
||||
"Other files": "Other files",
|
||||
"Overwrite": "Overwrite",
|
||||
"Overwrite patterns": "Overwrite patterns",
|
||||
"Overwrite remote": "Overwrite remote",
|
||||
"Overwrite remote with local DB and passphrase.": "Overwrite remote with local DB and passphrase.",
|
||||
"Overwrite Server Data with This Device's Files": "Overwrite Server Data with This Device's Files",
|
||||
"P2P Configuration": "P2P Configuration",
|
||||
"P2P Status": "P2P Status",
|
||||
"P2P.AskPassphraseForDecrypt": "The remote peer shared the configuration. Please input the passphrase to decrypt the configuration.",
|
||||
"P2P.AskPassphraseForShare": "The remote peer requested this device configuration. Please input the passphrase to share the configuration. You can ignore the request by cancelling this dialogue.",
|
||||
"P2P.DisabledButNeed": "%{title_p2p_sync} is disabled. Do you really want to enable it?",
|
||||
@@ -574,36 +773,59 @@
|
||||
"paneMaintenance.remoteLockedResolvedDevice": "paneMaintenance.remoteLockedResolvedDevice",
|
||||
"paneMaintenance.unlockDatabaseReady": "paneMaintenance.unlockDatabaseReady",
|
||||
"Passphrase": "Passphrase",
|
||||
"Passphrase is required.": "Passphrase is required.",
|
||||
"Passphrase of sensitive configuration items": "Passphrase of sensitive configuration items",
|
||||
"password": "password",
|
||||
"Password": "Password",
|
||||
"Paste a connection string": "Paste a connection string",
|
||||
"Paste the Setup URI generated from one of your active devices.": "Paste the Setup URI generated from one of your active devices.",
|
||||
"Path": "Path",
|
||||
"Path Obfuscation": "Path Obfuscation",
|
||||
"Patterns to match files for overwriting instead of merging": "Patterns to match files for overwriting instead of merging",
|
||||
"Patterns to match files for syncing": "Patterns to match files for syncing",
|
||||
"Peer ID:": "Peer ID:",
|
||||
"Peer to Peer Replicator": "Peer to Peer Replicator",
|
||||
"Peer-to-Peer only": "Peer-to-Peer only",
|
||||
"Peer-to-Peer Synchronisation": "Peer-to-Peer Synchronisation",
|
||||
"Peers": "Peers",
|
||||
"Per-file-saved customization sync": "Per-file-saved customization sync",
|
||||
"Perform": "Perform",
|
||||
"Perform cleanup": "Perform cleanup",
|
||||
"Perform Garbage Collection": "Perform Garbage Collection",
|
||||
"Perform Garbage Collection to remove unused chunks and reduce database size.": "Perform Garbage Collection to remove unused chunks and reduce database size.",
|
||||
"Periodic Sync interval": "Periodic Sync interval",
|
||||
"PERMANENT": "PERMANENT",
|
||||
"Pick a file to resolve conflict": "Pick a file to resolve conflict",
|
||||
"Pick a file to show history": "Pick a file to show history",
|
||||
"Please be aware that the End-to-End Encryption passphrase is not validated until the synchronisation process actually commences. This is a security measure designed to protect your data.": "Please be aware that the End-to-End Encryption passphrase is not validated until the synchronisation process actually commences. This is a security measure designed to protect your data.",
|
||||
"Please configure your end-to-end encryption settings.": "Please configure your end-to-end encryption settings.",
|
||||
"Please disable 'Read chunks online' in settings to use Garbage Collection.": "Please disable 'Read chunks online' in settings to use Garbage Collection.",
|
||||
"Please enable 'Compute revisions for chunks' in settings to use Garbage Collection.": "Please enable 'Compute revisions for chunks' in settings to use Garbage Collection.",
|
||||
"Please enter the CouchDB server information below.": "Please enter the CouchDB server information below.",
|
||||
"Please enter the details required to connect to your S3/MinIO/R2 compatible object storage service.": "Please enter the details required to connect to your S3/MinIO/R2 compatible object storage service.",
|
||||
"Please enter the Peer-to-Peer Synchronisation information below.": "Please enter the Peer-to-Peer Synchronisation information below.",
|
||||
"Please enter the Setup URI that was generated during server installation or on another device, along with the vault passphrase.": "Please enter the Setup URI that was generated during server installation or on another device, along with the vault passphrase.",
|
||||
"Please follow the steps below to import settings from your existing device.": "Please follow the steps below to import settings from your existing device.",
|
||||
"PLEASE NOTE": "PLEASE NOTE",
|
||||
"Please select 'Cancel' explicitly to cancel this operation.": "Please select 'Cancel' explicitly to cancel this operation.",
|
||||
"Please select a method to import the settings from another device.": "Please select a method to import the settings from another device.",
|
||||
"Please select an active P2P remote configuration to change P2P sync targets.": "Please select an active P2P remote configuration to change P2P sync targets.",
|
||||
"Please select an option to proceed": "Please select an option to proceed",
|
||||
"Please select the button below to restart and proceed to the data fetching confirmation.": "Please select the button below to restart and proceed to the data fetching confirmation.",
|
||||
"Please select the button below to restart and proceed to the final confirmation.": "Please select the button below to restart and proceed to the final confirmation.",
|
||||
"Please select the type of server to which you are connecting.": "Please select the type of server to which you are connecting.",
|
||||
"Please select your situation.": "Please select your situation.",
|
||||
"Please set device name to identify this device. This name should be unique among your devices. While not configured, we cannot enable this feature.": "Please set device name to identify this device. This name should be unique among your devices. While not configured, we cannot enable this feature.",
|
||||
"Please set this device name": "Please set this device name",
|
||||
"Please understand that this is intended behaviour.": "Please understand that this is intended behaviour.",
|
||||
"Plug-in version": "Plug-in version",
|
||||
"Plugins": "Plugins",
|
||||
"Prepare the 'report' to create an issue": "Prepare the 'report' to create an issue",
|
||||
"Presets": "Presets",
|
||||
"Prevent fetching configuration from server": "Prevent fetching configuration from server",
|
||||
"Proceed": "Proceed",
|
||||
"Proceed Garbage Collection": "Proceed Garbage Collection",
|
||||
"Proceed to the next step.": "Proceed to the next step.",
|
||||
"Proceed with Setup URI": "Proceed with Setup URI",
|
||||
"Proceeding with Garbage Collection, ignoring missing nodes.": "Proceeding with Garbage Collection, ignoring missing nodes.",
|
||||
"Proceeding with Garbage Collection.": "Proceeding with Garbage Collection.",
|
||||
@@ -629,15 +851,22 @@
|
||||
"RedFlag.FetchRemoteConfig.Title": "Fetch Remote Configuration",
|
||||
"Reduces storage space by discarding all non-latest revisions. This requires the same amount of free space on the remote server and the local client.": "Reduces storage space by discarding all non-latest revisions. This requires the same amount of free space on the remote server and the local client.",
|
||||
"Reducing the frequency with which on-disk changes are reflected into the DB": "Reducing the frequency with which on-disk changes are reflected into the DB",
|
||||
"Refresh": "Refresh",
|
||||
"Region": "Region",
|
||||
"Relay settings": "Relay settings",
|
||||
"Reload": "Reload",
|
||||
"Remediation": "Remediation",
|
||||
"Remediation Setting Changed": "Remediation Setting Changed",
|
||||
"Remote Database Tweak (In sunset)": "Remote Database Tweak (In sunset)",
|
||||
"Remote Databases": "Remote Databases",
|
||||
"Remote name": "Remote name",
|
||||
"Remote only": "Remote only",
|
||||
"Remote server type": "Remote server type",
|
||||
"Remote Type": "Remote Type",
|
||||
"Rename": "Rename",
|
||||
"Replicate now": "Replicate now",
|
||||
"Replicating": "Replicating",
|
||||
"Replicating...": "Replicating...",
|
||||
"Replicator.Dialogue.Locked.Action.Dismiss": "Cancel for reconfirmation",
|
||||
"Replicator.Dialogue.Locked.Action.Fetch": "Reset Synchronisation on This Device",
|
||||
"Replicator.Dialogue.Locked.Action.Unlock": "Unlock the remote database",
|
||||
@@ -660,6 +889,7 @@
|
||||
"Reset": "Reset",
|
||||
"Reset all": "Reset all",
|
||||
"Reset all journal counter": "Reset all journal counter",
|
||||
"Reset and Resume Synchronisation": "Reset and Resume Synchronisation",
|
||||
"Reset journal received history": "Reset journal received history",
|
||||
"Reset journal sent history": "Reset journal sent history",
|
||||
"Reset notification threshold and check the remote database usage": "Reset notification threshold and check the remote database usage",
|
||||
@@ -672,14 +902,26 @@
|
||||
"Resolve all conflicted files": "Resolve all conflicted files",
|
||||
"Resolve All conflicted files by the newer one": "Resolve All conflicted files by the newer one",
|
||||
"Resolve all conflicted files by the newer one. Caution: This will overwrite the older one, and cannot resurrect the overwritten one.": "Resolve all conflicted files by the newer one. Caution: This will overwrite the older one, and cannot resurrect the overwritten one.",
|
||||
"Restart and Fetch Data": "Restart and Fetch Data",
|
||||
"Restart and Initialise Server": "Restart and Initialise Server",
|
||||
"Restart Now": "Restart Now",
|
||||
"Restarting Obsidian is strongly recommended. Until restart, some changes may not take effect, and display may be inconsistent. Are you sure to restart now?": "Restarting Obsidian is strongly recommended. Until restart, some changes may not take effect, and display may be inconsistent. Are you sure to restart now?",
|
||||
"Restore or reconstruct local database from remote.": "Restore or reconstruct local database from remote.",
|
||||
"Rev": "Rev",
|
||||
"Revert changes": "Revert changes",
|
||||
"Revoke": "Revoke",
|
||||
"Room ID": "Room ID",
|
||||
"Room ID suffix:": "Room ID suffix:",
|
||||
"Run Doctor": "Run Doctor",
|
||||
"S3/MinIO/R2 Configuration": "S3/MinIO/R2 Configuration",
|
||||
"S3/MinIO/R2 Object Storage": "S3/MinIO/R2 Object Storage",
|
||||
"Same": "Same",
|
||||
"Same or local only": "Same or local only",
|
||||
"Save and Apply": "Save and Apply",
|
||||
"Save settings to a markdown file. You will be notified when new settings arrive. You can set different files by the platform.": "Save settings to a markdown file. You will be notified when new settings arrive. You can set different files by the platform.",
|
||||
"Saving will be performed forcefully after this number of seconds.": "Saving will be performed forcefully after this number of seconds.",
|
||||
"Scan a QR Code (Recommended for mobile)": "Scan a QR Code (Recommended for mobile)",
|
||||
"Scan changes": "Scan changes",
|
||||
"Scan changes on customization sync": "Scan changes on customization sync",
|
||||
"Scan customization automatically": "Scan customization automatically",
|
||||
"Scan customization before replicating.": "Scan customization before replicating.",
|
||||
@@ -688,17 +930,28 @@
|
||||
"Scan for Broken files": "Scan for Broken files",
|
||||
"Scan for hidden files before replication": "Scan for hidden files before replication",
|
||||
"Scan hidden files periodically": "Scan hidden files periodically",
|
||||
"Scan QR Code": "Scan QR Code",
|
||||
"Scan the QR code displayed on an active device using this device's camera.": "Scan the QR code displayed on an active device using this device's camera.",
|
||||
"Schedule and Restart": "Schedule and Restart",
|
||||
"Scram Switches": "Scram Switches",
|
||||
"Scram!": "Scram!",
|
||||
"Seconds, 0 to disable": "Seconds, 0 to disable",
|
||||
"Seconds. Saving to the local database will be delayed until this value after we stop typing or saving.": "Seconds. Saving to the local database will be delayed until this value after we stop typing or saving.",
|
||||
"Secret Access Key": "Secret Access Key",
|
||||
"Secret Key": "Secret Key",
|
||||
"Select active P2P remote": "Select active P2P remote",
|
||||
"Select All Shiny": "Select All Shiny",
|
||||
"Select Flagged Shiny": "Select Flagged Shiny",
|
||||
"Select P2P remote...": "Select P2P remote...",
|
||||
"Select the database adapter to use.": "Select the database adapter to use.",
|
||||
"Selecting this option will result in the current data on this device being used to initialise the server. Any existing data on the server will be completely overwritten.": "Selecting this option will result in the current data on this device being used to initialise the server. Any existing data on the server will be completely overwritten.",
|
||||
"Selecting this option will result in this device joining the existing server. You need to fetching the existing synchronisation data from the server to this device.": "Selecting this option will result in this device joining the existing server. You need to fetching the existing synchronisation data from the server to this device.",
|
||||
"Selective": "Selective",
|
||||
"Send": "Send",
|
||||
"Send chunks": "Send chunks",
|
||||
"SENDING": "SENDING",
|
||||
"Server URI": "Server URI",
|
||||
"SESSION": "SESSION",
|
||||
"Setting.GenerateKeyPair.Desc": "We have generated a key pair!\n\nNote: This key pair will never be shown again. Please save it in a safe place. If you have lost it, you need to generate a new key pair.\nNote 2: The public key is in spki format, and the Private key is in pkcs8 format. For the sake of convenience, newlines are converted to `\\n` in public key.\nNote 3: The public key should be configured in the remote database, and the private key should be configured in local devices.\n\n>[!FOR YOUR EYES ONLY]-\n> <div class=\"sls-keypair\">\n>\n> ### Public Key\n> ```\n${public_key}\n> ```\n>\n> ### Private Key\n> ```\n${private_key}\n> ```\n>\n> </div>\n\n>[!Both for copying]-\n>\n> <div class=\"sls-keypair\">\n>\n> ```\n${public_key}\n${private_key}\n> ```\n>\n> </div>\n\n",
|
||||
"Setting.GenerateKeyPair.Title": "New key pair has been generated!",
|
||||
"Setting.TroubleShooting": "TroubleShooting",
|
||||
@@ -707,7 +960,10 @@
|
||||
"Setting.TroubleShooting.ScanBrokenFiles": "Scan for broken files",
|
||||
"Setting.TroubleShooting.ScanBrokenFiles.Desc": "Scans for files that are not stored correctly in the database.",
|
||||
"SettingTab.Message.AskRebuild": "Your changes require fetching from the remote database. Do you want to proceed?",
|
||||
"Setup Complete: Preparing to Fetch Synchronisation Data": "Setup Complete: Preparing to Fetch Synchronisation Data",
|
||||
"Setup Complete: Preparing to Initialise Server": "Setup Complete: Preparing to Initialise Server",
|
||||
"Setup URI dialog cancelled.": "Setup URI dialog cancelled.",
|
||||
"Setup-URI": "Setup-URI",
|
||||
"Setup.Apply.Buttons.ApplyAndFetch": "Apply and Fetch",
|
||||
"Setup.Apply.Buttons.ApplyAndMerge": "Apply and Merge",
|
||||
"Setup.Apply.Buttons.ApplyAndRebuild": "Apply and Rebuild",
|
||||
@@ -777,16 +1033,29 @@
|
||||
"Show status inside the editor": "Show status inside the editor",
|
||||
"Show status on the status bar": "Show status on the status bar",
|
||||
"Show verbose log. Please enable if you report an issue.": "Show verbose log. Please enable if you report an issue.",
|
||||
"Signaling Server Connection": "Signaling Server Connection",
|
||||
"Signalling Status": "Signalling Status",
|
||||
"Skip and close": "Skip and close",
|
||||
"Snippets": "Snippets",
|
||||
"Some devices have differing progress values (max: ${maxProgress}, min: ${minProgress}).\nThis may indicate that some devices have not completed synchronisation, which could lead to conflicts. Strongly recommend confirming that all devices are synchronised before proceeding.": "Some devices have differing progress values (max: ${maxProgress}, min: ${minProgress}).\nThis may indicate that some devices have not completed synchronisation, which could lead to conflicts. Strongly recommend confirming that all devices are synchronised before proceeding.",
|
||||
"Start Broadcasting": "Start Broadcasting",
|
||||
"Start change-broadcasting on Connect": "Start change-broadcasting on Connect",
|
||||
"Start Sync & Close": "Start Sync & Close",
|
||||
"Starts synchronisation when a file is saved.": "Starts synchronisation when a file is saved.",
|
||||
"Stat": "Stat",
|
||||
"Stats": "Stats",
|
||||
"Stop ⚡": "Stop ⚡",
|
||||
"Stop Broadcasting": "Stop Broadcasting",
|
||||
"Stop reflecting database changes to storage files.": "Stop reflecting database changes to storage files.",
|
||||
"Stop watching for file changes.": "Stop watching for file changes.",
|
||||
"Storage -> Database": "Storage -> Database",
|
||||
"Strongly Recommended": "Strongly Recommended",
|
||||
"Suppress notification of hidden files change": "Suppress notification of hidden files change",
|
||||
"Suspend database reflecting": "Suspend database reflecting",
|
||||
"Suspend file watching": "Suspend file watching",
|
||||
"Switch to IDB": "Switch to IDB",
|
||||
"Switch to IndexedDB": "Switch to IndexedDB",
|
||||
"Sync": "Sync",
|
||||
"Sync after merging file": "Sync after merging file",
|
||||
"Sync automatically after merging files": "Sync automatically after merging files",
|
||||
"Sync Mode": "Sync Mode",
|
||||
@@ -794,25 +1063,56 @@
|
||||
"Sync on File Open": "Sync on File Open",
|
||||
"Sync on Save": "Sync on Save",
|
||||
"Sync on Startup": "Sync on Startup",
|
||||
"Sync once": "Sync once",
|
||||
"Synchronisation utilising journal files. You must have set up an S3/MinIO/R2 compatible object storage.": "Synchronisation utilising journal files. You must have set up an S3/MinIO/R2 compatible object storage.",
|
||||
"Synchronising files": "Synchronising files",
|
||||
"Syncing": "Syncing",
|
||||
"Syncing...": "Syncing...",
|
||||
"Target patterns": "Target patterns",
|
||||
"Test Settings and Continue": "Test Settings and Continue",
|
||||
"Testing only - Resolve file conflicts by syncing newer copies of the file, this can overwrite modified files. Be Warned.": "Testing only - Resolve file conflicts by syncing newer copies of the file, this can overwrite modified files. Be Warned.",
|
||||
"The connection to the server has been configured successfully. As the next step,": "The connection to the server has been configured successfully. As the next step,",
|
||||
"The delay for consecutive on-demand fetches": "The delay for consecutive on-demand fetches",
|
||||
"The files in this Vault are almost identical to the server's.": "The files in this Vault are almost identical to the server's.",
|
||||
"The following accepted nodes are missing its node information:\n- ${missingNodes}\n\nThis indicates that they have not been connected for some time or have been left on an older version.\nIt is preferable to update all devices if possible. If you have any devices that are no longer in use, you can clear all accepted nodes by locking the remote once.": "The following accepted nodes are missing its node information:\n- ${missingNodes}\n\nThis indicates that they have not been connected for some time or have been left on an older version.\nIt is preferable to update all devices if possible. If you have any devices that are no longer in use, you can clear all accepted nodes by locking the remote once.",
|
||||
"The Group ID and passphrase are used to identify your group of devices. Make sure to use the same Group ID and passphrase on all devices you want to synchronise.": "The Group ID and passphrase are used to identify your group of devices. Make sure to use the same Group ID and passphrase on all devices you want to synchronise.",
|
||||
"The Hash algorithm for chunk IDs": "The Hash algorithm for chunk IDs",
|
||||
"The IndexedDB adapter often offers superior performance in certain scenarios, but it has been found to cause memory leaks when used with LiveSync mode. When using LiveSync mode, please use IDB adapter instead.": "The IndexedDB adapter often offers superior performance in certain scenarios, but it has been found to cause memory leaks when used with LiveSync mode. When using LiveSync mode, please use IDB adapter instead.",
|
||||
"the latest synchronisation data will be downloaded from the server to this device.": "the latest synchronisation data will be downloaded from the server to this device.",
|
||||
"the local database, that is to say the synchronisation information, must be reconstituted.": "the local database, that is to say the synchronisation information, must be reconstituted.",
|
||||
"The maximum duration for which chunks can be incubated within the document. Chunks exceeding this period will graduate to independent chunks.": "The maximum duration for which chunks can be incubated within the document. Chunks exceeding this period will graduate to independent chunks.",
|
||||
"The maximum number of chunks that can be incubated within the document. Chunks exceeding this number will immediately graduate to independent chunks.": "The maximum number of chunks that can be incubated within the document. Chunks exceeding this number will immediately graduate to independent chunks.",
|
||||
"The maximum total size of chunks that can be incubated within the document. Chunks exceeding this size will immediately graduate to independent chunks.": "The maximum total size of chunks that can be incubated within the document. Chunks exceeding this size will immediately graduate to independent chunks.",
|
||||
"The minimum interval for automatic synchronisation on event.": "The minimum interval for automatic synchronisation on event.",
|
||||
"The remote is already set up, and the configuration is compatible (or got compatible by this operation).": "The remote is already set up, and the configuration is compatible (or got compatible by this operation).",
|
||||
"The Setup-URI does not appear to be valid. Please check that you have copied it correctly.": "The Setup-URI does not appear to be valid. Please check that you have copied it correctly.",
|
||||
"The Setup-URI is valid and ready to use.": "The Setup-URI is valid and ready to use.",
|
||||
"the single, authoritative master copy": "the single, authoritative master copy",
|
||||
"the synchronisation data on the server will be built based on the current data on this device.": "the synchronisation data on the server will be built based on the current data on this device.",
|
||||
"Themes": "Themes",
|
||||
"There is a way to resolve this on other devices.": "There is a way to resolve this on other devices.",
|
||||
"There may be differences between the files in this Vault and the server.": "There may be differences between the files in this Vault and the server.",
|
||||
"Therefore, we ask that you exercise extreme caution when configuring server information manually. If an incorrect passphrase is entered, the data on the server will become corrupted.": "Therefore, we ask that you exercise extreme caution when configuring server information manually. If an incorrect passphrase is entered, the data on the server will become corrupted.",
|
||||
"This can isolate your connections between devices. Use the same Room ID for the same devices.": "This can isolate your connections between devices. Use the same Room ID for the same devices.",
|
||||
"This device": "This device",
|
||||
"This device name": "This device name",
|
||||
"This feature enables direct synchronisation between devices. No server is required, but both devices must be online at the same time for synchronisation to occur, and some features may be limited. Internet connection is only required to signalling (detecting peers) and not for data transfer.": "This feature enables direct synchronisation between devices. No server is required, but both devices must be online at the same time for synchronisation to occur, and some features may be limited. Internet connection is only required to signalling (detecting peers) and not for data transfer.",
|
||||
"This is an advanced option for users who do not have a URI or who wish to configure detailed settings.": "This is an advanced option for users who do not have a URI or who wish to configure detailed settings.",
|
||||
"This is an extremely powerful operation. We strongly recommend that you copy your Vault folder to a safe location.": "This is an extremely powerful operation. We strongly recommend that you copy your Vault folder to a safe location.",
|
||||
"This is the most suitable synchronisation method for the design. All functions are available. You must have set up a CouchDB instance.": "This is the most suitable synchronisation method for the design. All functions are available. You must have set up a CouchDB instance.",
|
||||
"This passphrase will not be copied to another device. It will be set to `Default` until you configure it again.": "This passphrase will not be copied to another device. It will be set to `Default` until you configure it again.",
|
||||
"This password is used to encrypt the connection. Use something long enough.": "This password is used to encrypt the connection. Use something long enough.",
|
||||
"This procedure will first delete all existing synchronisation data from the server. Following this, the server data will be completely rebuilt, using the current state of your Vault on this device (including its local database) as": "This procedure will first delete all existing synchronisation data from the server. Following this, the server data will be completely rebuilt, using the current state of your Vault on this device (including its local database) as",
|
||||
"This setting must be the same even when connecting to multiple synchronisation destinations.": "This setting must be the same even when connecting to multiple synchronisation destinations.",
|
||||
"This Vault is empty, or contains only new files that are not on the server.": "This Vault is empty, or contains only new files that are not on the server.",
|
||||
"This will rebuild the local database on this device using the most recent data from the server. This action is designed to resolve synchronisation inconsistencies and restore correct functionality.": "This will rebuild the local database on this device using the most recent data from the server. This action is designed to resolve synchronisation inconsistencies and restore correct functionality.",
|
||||
"This will recreate chunks for all files. If there were missing chunks, this may fix the errors.": "This will recreate chunks for all files. If there were missing chunks, this may fix the errors.",
|
||||
"To minimise the creation of new conflicts": "To minimise the creation of new conflicts",
|
||||
"Transfer Tweak": "Transfer Tweak",
|
||||
"TURN Credential": "TURN Credential",
|
||||
"TURN server settings are only necessary if you are behind a strict NAT or firewall that prevents direct P2P connections. In most cases, you can leave these fields blank.": "TURN server settings are only necessary if you are behind a strict NAT or firewall that prevents direct P2P connections. In most cases, you can leave these fields blank.",
|
||||
"TURN Server URLs (comma-separated)": "TURN Server URLs (comma-separated)",
|
||||
"TURN Username": "TURN Username",
|
||||
"TweakMismatchResolve.Action.DisableAutoAcceptCompatible": "Disable auto-accept",
|
||||
"TweakMismatchResolve.Action.Dismiss": "Dismiss",
|
||||
"TweakMismatchResolve.Action.EnableAutoAcceptCompatible": "Enable auto-accept",
|
||||
@@ -1105,21 +1405,36 @@
|
||||
"Ui.SetupWizard.SetupRemote.ProceedP2P": "Continue to P2P setup",
|
||||
"Ui.SetupWizard.SetupRemote.Title": "Choose a synchronisation remote",
|
||||
"Unique name between all synchronized devices. To edit this setting, please disable customization sync once.": "Unique name between all synchronized devices. To edit this setting, please disable customization sync once.",
|
||||
"Unless you are certain, selecting this options is bit dangerous. It assumes that the server configuration is compatible with this device. If this is not the case, data loss may occur. Please ensure you know what you are doing.": "Unless you are certain, selecting this options is bit dangerous. It assumes that the server configuration is compatible with this device. If this is not the case, data loss may occur. Please ensure you know what you are doing.",
|
||||
"Updating list...": "Updating list...",
|
||||
"URL": "URL",
|
||||
"Use a custom passphrase": "Use a custom passphrase",
|
||||
"Use a Setup URI (Recommended)": "Use a Setup URI (Recommended)",
|
||||
"Use Custom HTTP Handler": "Use Custom HTTP Handler",
|
||||
"Use Diagnostic RTCPeerConnection for statistics": "Use Diagnostic RTCPeerConnection for statistics",
|
||||
"Use dynamic iteration count": "Use dynamic iteration count",
|
||||
"Use internal API": "Use internal API",
|
||||
"Use Internal API": "Use Internal API",
|
||||
"Use JWT Authentication": "Use JWT Authentication",
|
||||
"Use Path-Style Access": "Use Path-Style Access",
|
||||
"Use Random Number": "Use Random Number",
|
||||
"Use Segmented-splitter": "Use Segmented-splitter",
|
||||
"Use splitting-limit-capped chunk splitter": "Use splitting-limit-capped chunk splitter",
|
||||
"Use the trash bin": "Use the trash bin",
|
||||
"Use timeouts instead of heartbeats": "Use timeouts instead of heartbeats",
|
||||
"Use vrtmrz's relay": "Use vrtmrz's relay",
|
||||
"username": "username",
|
||||
"Username": "Username",
|
||||
"Verbose Log": "Verbose Log",
|
||||
"Verify all": "Verify all",
|
||||
"Verify and repair all files": "Verify and repair all files",
|
||||
"Warning! This will have a serious impact on performance. And the logs will not be synchronised under the default name. Please be careful with logs; they often contain your confidential information.": "Warning! This will have a serious impact on performance. And the logs will not be synchronised under the default name. Please be careful with logs; they often contain your confidential information.",
|
||||
"WATCHING": "WATCHING",
|
||||
"We can not use \"/\" to the device name": "We can not use \"/\" to the device name",
|
||||
"We can use only Secure (HTTPS) connections on Obsidian Mobile.": "We can use only Secure (HTTPS) connections on Obsidian Mobile.",
|
||||
"We cannot change the device name while this feature is enabled. Please disable this feature to change the device name.": "We cannot change the device name while this feature is enabled. Please disable this feature to change the device name.",
|
||||
"We have to configure the device name": "We have to configure the device name",
|
||||
"We recommend that you copy your Vault folder to a safe location. This will provide a safeguard in case a large number of conflicts arise, or if you accidentally synchronise with an incorrect destination.": "We recommend that you copy your Vault folder to a safe location. This will provide a safeguard in case a large number of conflicts arise, or if you accidentally synchronise with an incorrect destination.",
|
||||
"We will now guide you through a few questions to simplify the synchronisation setup.": "We will now guide you through a few questions to simplify the synchronisation setup.",
|
||||
"We will now proceed with the server configuration.": "We will now proceed with the server configuration.",
|
||||
"Welcome to Self-hosted LiveSync": "Welcome to Self-hosted LiveSync",
|
||||
@@ -1130,5 +1445,8 @@
|
||||
"xxhash64 (Fastest)": "xxhash64 (Fastest)",
|
||||
"Yes, I want to add this device to my existing synchronisation": "Yes, I want to add this device to my existing synchronisation",
|
||||
"Yes, I want to set up a new synchronisation": "Yes, I want to set up a new synchronisation",
|
||||
"You are adding this device to an existing synchronisation setup.": "You are adding this device to an existing synchronisation setup."
|
||||
"You are adding this device to an existing synchronisation setup.": "You are adding this device to an existing synchronisation setup.",
|
||||
"You can configure in the Obsidian Plugin Settings.": "You can configure in the Obsidian Plugin Settings.",
|
||||
"You should create a new synchronisation destination and rebuild your data there.": "You should create a new synchronisation destination and rebuild your data there.",
|
||||
"You should perform this operation only in exceptional circumstances, such as when the server data is completely corrupted, when changes on all other devices are no longer needed, or when the database size has become unusually large in comparison to the Vault size.": "You should perform this operation only in exceptional circumstances, such as when the server data is completely corrupted, when changes on all other devices are no longer needed, or when the database size has become unusually large in comparison to the Vault size."
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+471
-135
File diff suppressed because it is too large
Load Diff
@@ -263,7 +263,7 @@
|
||||
"moduleCheckRemoteSize.logExceededWarning": "远程存储大小:${measuredSize} 超过 ${notifySize}",
|
||||
"moduleCheckRemoteSize.logThresholdEnlarged": "阈值已扩大到 ${size}MB",
|
||||
"moduleCheckRemoteSize.msgConfirmRebuild": "这可能需要一些时间。您真的想现在重建所有内容吗?",
|
||||
"moduleCheckRemoteSize.msgDatabaseGrowing": "**您的数据库正在变大!** 但别担心,我们现在可以解决它。在远程存储空间用完之前还有时间。\n\n| 测量大小 | 配置大小 |\n| --- | --- |\n| ${estimatedSize} | ${maxSize} |\n\n> [!MORE]-\n> 如果您已经使用了很多年,数据库中可能会积累未引用的 chunks——也就是垃圾。因此,我们建议重建所有内容。它可能会变得小得多。\n> \n> 如果您的库容量只是在增加,最好在整理文件后重建所有内容。即使您为了加速过程删除了文件,Self-hosted LiveSync 也不会删除实际数据。这大致[有文档记录](https://github.com/vrtmrz/obsidian-livesync/blob/main/docs/tech_info.md)。\n> \n> 如果您不介意增加,可以将通知限制增加 100MB。如果您在自己的服务器上运行,就是这种情况。但是,最好还是不时地重建所有内容。\n> \n\n> [!WARNING]\n> 如果您执行重建所有内容,请确保所有设备都已同步。尽管如此,插件会尽可能地合并\n",
|
||||
"moduleCheckRemoteSize.msgDatabaseGrowing": "**您的数据库正在变大!** 但别担心,我们现在可以解决它。在远程存储空间用完之前还有时间。\n\n| 测量大小 | 配置大小 |\n| --- | --- |\n| ${estimatedSize} | ${maxSize} |\n\n> [!MORE]-\n> 如果您已经使用了很多年,数据库中可能会积累未引用的 chunks——也就是垃圾。因此,我们建议重建所有内容。它可能会变得小得多。\n>\n> 如果您的库容量只是在增加,最好在整理文件后重建所有内容。即使您为了加速过程删除了文件,Self-hosted LiveSync 也不会删除实际数据。这大致[有文档记录](https://github.com/vrtmrz/obsidian-livesync/blob/main/docs/tech_info.md)。\n>\n> 如果您不介意增加,可以将通知限制增加 100MB。如果您在自己的服务器上运行,就是这种情况。但是,最好还是不时地重建所有内容。\n>\n\n> [!WARNING]\n> 如果您执行重建所有内容,请确保所有设备都已同步。尽管如此,插件会尽可能地合并\n",
|
||||
"moduleCheckRemoteSize.msgSetDBCapacity": "我们可以设置一个最大数据库容量警告,**以便在远程存储空间耗尽前采取行动**。\n您想启用这个功能吗?\n\n> [!MORE]-\n> - 0: 不警告存储大小。\n> 如果您在远程存储(尤其是自托管)上有足够的空间,则推荐此选项。您可以手动检查存储大小并重建。\n> - 800: 如果远程存储大小超过 800MB 则发出警告。\n> 如果您使用的是 fly.io(1GB 限制) 或 IBM Cloudant,则推荐此选项。\n> - 2000: 如果远程存储大小超过 2GB 则发出警告。\n\n如果达到限制,系统会要求我们逐步增大限制\n",
|
||||
"moduleCheckRemoteSize.option2GB": "2GB (标准)",
|
||||
"moduleCheckRemoteSize.option800MB": "800MB (Cloudant, fly.io)",
|
||||
@@ -317,7 +317,7 @@
|
||||
"moduleMigration.msgFetchRemoteAgain": "您可能已经知道,Self-hosted LiveSync 更改了其默认行为和数据库结构。\n\n值得庆幸的是,在您的时间和努力下,远程数据库似乎已经迁移完成。恭喜!\n\n但是,我们还需要一点点操作。此设备的配置与远程数据库不兼容。我们需要再次从远程数据库获取。我们现在应该再次从远程获取吗?\n\n___注意:在更改配置并再次获取数据库之前,我们无法进行同步。___\n___注意2:chunks 是完全不可变的,我们只能获取元数据和差异",
|
||||
"moduleMigration.msgInitialSetup": "您的设备**尚未设置**。让我引导您完成设置过程。\n\n请记住,每个对话框内容都可以复制到剪贴板。如果以后需要参考,可以将其粘贴到 Obsidian 的笔记中。您也可以使用翻译工具将其翻译成您的语言。\n\n首先,您有**设置 URI** 吗?\n\n注意:如果您不知道这是什么,请参阅[文档](${URI_DOC})",
|
||||
"moduleMigration.msgRecommendSetupUri": "我们强烈建议您生成一个设置 URI 并使用它。\n如果您对此不了解,请参阅[文档](${URI_DOC})(再次抱歉,但这很重要)。\n\n您想如何手动设置?",
|
||||
"moduleMigration.msgSinceV02321": "自 v0.23.21 起,Self-hosted LiveSync 更改了默认行为和数据库结构。进行了以下更改:\n\n1. **文件名的区分大小写** \n现在处理文件名时不区分大小写。这对于大多数平台来说是一个有益的更改,除了 Linux 和 iOS,它们不能有效地管理文件名的大小写敏感性。\n(在这些平台上,对于名称相同但大小写不同的文件将显示警告)。\n\n2. **chunks 的版本处理** \nchunks 是不可变的,这使得它们的版本可以固定。此更改将提高文件保存的性能。\n\n___然而,要启用这些更改中的任何一个,都需要重建远程和本地数据库。这个过程需要几分钟,我们建议您在有充足时间时进行。___\n\n- 如果您希望保持以前的行为,可以使用 `${KEEP}` 跳过此过程。\n- 如果您没有足够的时间,请选择 `${DISMISS}`。稍后会再次提示您。\n- 如果您已在另一台设备上重建了数据库,请选择 `${DISMISS}` 并尝试再次同步。由于检测到差异,系统会再次提示您",
|
||||
"moduleMigration.msgSinceV02321": "自 v0.23.21 起,Self-hosted LiveSync 更改了默认行为和数据库结构。进行了以下更改:\n\n1. **文件名的区分大小写**\n现在处理文件名时不区分大小写。这对于大多数平台来说是一个有益的更改,除了 Linux 和 iOS,它们不能有效地管理文件名的大小写敏感性。\n(在这些平台上,对于名称相同但大小写不同的文件将显示警告)。\n\n2. **chunks 的版本处理**\nchunks 是不可变的,这使得它们的版本可以固定。此更改将提高文件保存的性能。\n\n___然而,要启用这些更改中的任何一个,都需要重建远程和本地数据库。这个过程需要几分钟,我们建议您在有充足时间时进行。___\n\n- 如果您希望保持以前的行为,可以使用 `${KEEP}` 跳过此过程。\n- 如果您没有足够的时间,请选择 `${DISMISS}`。稍后会再次提示您。\n- 如果您已在另一台设备上重建了数据库,请选择 `${DISMISS}` 并尝试再次同步。由于检测到差异,系统会再次提示您",
|
||||
"moduleMigration.optionAdjustRemote": "调整到远程设置",
|
||||
"moduleMigration.optionDecideLater": "稍后决定",
|
||||
"moduleMigration.optionEnableBoth": "启用两者",
|
||||
@@ -402,7 +402,7 @@
|
||||
"obsidianLiveSyncSettingTab.logCheckingConfigDone": "配置检查完成",
|
||||
"obsidianLiveSyncSettingTab.logCheckingConfigFailed": "配置检查失败",
|
||||
"obsidianLiveSyncSettingTab.logCheckingDbConfig": "正在检查数据库配置",
|
||||
"obsidianLiveSyncSettingTab.logCheckPassphraseFailed": "错误:无法使用远程服务器检查密码:\n${db} ",
|
||||
"obsidianLiveSyncSettingTab.logCheckPassphraseFailed": "错误:无法使用远程服务器检查密码:\n${db}",
|
||||
"obsidianLiveSyncSettingTab.logConfiguredDisabled": "已配置的同步模式:已禁用",
|
||||
"obsidianLiveSyncSettingTab.logConfiguredLiveSync": "已配置的同步模式:LiveSync",
|
||||
"obsidianLiveSyncSettingTab.logConfiguredPeriodic": "已配置的同步模式:定期同步",
|
||||
|
||||
@@ -1,7 +1,18 @@
|
||||
", please select the option that best describes the current state of your Vault. The application will then check your files in the most appropriate way based on your selection.":
|
||||
", please select the option that best describes the current state of your
|
||||
Vault. The application will then check your files in the most appropriate
|
||||
way based on your selection."
|
||||
(Active): (Active)
|
||||
(BETA) Always overwrite with a newer file: (BETA) Always overwrite with a newer file
|
||||
(Beta) Use ignore files: (Beta) Use ignore files
|
||||
(Days passed, 0 to disable automatic-deletion): (Days passed, 0 to disable automatic-deletion)
|
||||
(e.g., after editing many files whilst offline): (e.g., after editing many files whilst offline)
|
||||
(e.g., immediately after restoring on another computer, or having recovered from a backup):
|
||||
(e.g., immediately after restoring on another computer, or having recovered
|
||||
from a backup)
|
||||
(e.g., setting up for the first time on a new smartphone, starting from a clean slate):
|
||||
(e.g., setting up for the first time on a new smartphone, starting from a
|
||||
clean slate)
|
||||
(ex. Read chunks online) If this option is enabled, LiveSync reads chunks online directly instead of replicating them locally. Increasing Custom chunk size is recommended.:
|
||||
(ex. Read chunks online) If this option is enabled, LiveSync reads chunks
|
||||
online directly instead of replicating them locally. Increasing Custom chunk
|
||||
@@ -11,6 +22,7 @@
|
||||
this will be skipped. If the file becomes smaller again, a newer one will be
|
||||
used.
|
||||
(Mega chars): (Mega chars)
|
||||
(Missing): (Missing)
|
||||
(Not recommended) If set, credentials will be stored in the file.: (Not recommended) If set, credentials will be stored in the file.
|
||||
(Obsolete) Use an old adapter for compatibility: (Obsolete) Use an old adapter for compatibility
|
||||
(RegExp) Empty to sync all files. Set filter as a regular expression to limit synchronising files.:
|
||||
@@ -19,21 +31,76 @@
|
||||
(RegExp) If this is set, any changes to local and remote files that match this will be skipped.:
|
||||
(RegExp) If this is set, any changes to local and remote files that match this
|
||||
will be skipped.
|
||||
"↑: Overwrite Remote": "↑: Overwrite Remote"
|
||||
"↓: Overwrite Local": "↓: Overwrite Local"
|
||||
"⇅: Use newer": "⇅: Use newer"
|
||||
+1 week: +1 week
|
||||
⚠️ Important Notice: ⚠️ Important Notice
|
||||
⚠️ Please Confirm the Following: ⚠️ Please Confirm the Following
|
||||
✔ SELECT: ✔ SELECT
|
||||
✔ SYNC: ✔ SYNC
|
||||
✔ WATCH: ✔ WATCH
|
||||
📡 Off: 📡 Off
|
||||
📡 On: 📡 On
|
||||
🔴 Disconnected: 🔴 Disconnected
|
||||
🕵️ Diag: 🕵️ Diag
|
||||
🗑 Delete: 🗑 Delete
|
||||
🟢 Connected: 🟢 Connected
|
||||
${count} issue(s) detected!: ${count} issue(s) detected!
|
||||
Accept: Accept
|
||||
Accept in session: Accept in session
|
||||
ACCEPTED: ACCEPTED
|
||||
ACCEPTED (in session): ACCEPTED (in session)
|
||||
Access Key: Access Key
|
||||
Access Key ID: Access Key ID
|
||||
Action: Action
|
||||
Activate: Activate
|
||||
Active Remote Configuration: Active Remote Configuration
|
||||
Add default patterns: Add default patterns
|
||||
Add new connection: Add new connection
|
||||
AddOn Module (ConfigSync) has not been loaded. This is very unexpected situation. Please report this issue.:
|
||||
AddOn Module (ConfigSync) has not been loaded. This is very unexpected
|
||||
situation. Please report this issue.
|
||||
AddOn Module (HiddenFileSync) has not been loaded. This is very unexpected situation. Please report this issue.:
|
||||
AddOn Module (HiddenFileSync) has not been loaded. This is very unexpected
|
||||
situation. Please report this issue.
|
||||
Advanced: Advanced
|
||||
Advanced Settings: Advanced Settings
|
||||
After restarting, the data on this device will be uploaded to the server as the 'master copy'. Please be aware that any unintended data currently on the server will be completely overwritten.:
|
||||
After restarting, the data on this device will be uploaded to the server as
|
||||
the 'master copy'. Please be aware that any unintended data currently on the
|
||||
server will be completely overwritten.
|
||||
After restarting, the database on this device will be rebuilt using data from the server. If there are any unsynchronised files in this vault, conflicts may occur with the server data.:
|
||||
After restarting, the database on this device will be rebuilt using data
|
||||
from the server. If there are any unsynchronised files in this vault,
|
||||
conflicts may occur with the server data.
|
||||
After that, synchronise to a brand new vault on each other device with the new remote one by one.:
|
||||
After that, synchronise to a brand new vault on each other device with the
|
||||
new remote one by one.
|
||||
All checks passed successfully!: All checks passed successfully!
|
||||
All the same or non-existent: All the same or non-existent
|
||||
Allow in session: Allow in session
|
||||
Allow permanently: Allow permanently
|
||||
Also, please note that if you are using Peer-to-Peer synchronization, this configuration will be used when you switch to other methods and connect to a remote server in the future.:
|
||||
Also, please note that if you are using Peer-to-Peer synchronization, this
|
||||
configuration will be used when you switch to other methods and connect to a
|
||||
remote server in the future.
|
||||
Always prompt merge conflicts: Always prompt merge conflicts
|
||||
Analyse: Analyse
|
||||
Analyse database usage: Analyse database usage
|
||||
Analyse database usage and generate a TSV report for diagnosis yourself. You can paste the generated report with any spreadsheet you like.:
|
||||
Analyse database usage and generate a TSV report for diagnosis yourself. You
|
||||
can paste the generated report with any spreadsheet you like.
|
||||
Apply All Selected: Apply All Selected
|
||||
Apply Latest Change if Conflicting: Apply Latest Change if Conflicting
|
||||
Apply preset configuration: Apply preset configuration
|
||||
Apply the settings: Apply the settings
|
||||
Ask a passphrase at every launch: Ask a passphrase at every launch
|
||||
Auto Connect: Auto Connect
|
||||
Auto Start P2P Connection: Auto Start P2P Connection
|
||||
Automatic: Automatic
|
||||
Automatically Sync all files when opening Obsidian.: Automatically Sync all files when opening Obsidian.
|
||||
Available Peers: Available Peers
|
||||
Back: Back
|
||||
Back to non-configured: Back to non-configured
|
||||
Batch database update: Batch database update
|
||||
@@ -45,8 +112,14 @@ Before v0.17.16, we used an old adapter for the local database. Now the new adap
|
||||
adapter is preferred. However, it needs local database rebuilding. Please
|
||||
disable this toggle when you have enough time. If leave it enabled, also while
|
||||
fetching from the remote database, you will be asked to disable this.
|
||||
Broadcasting?: Broadcasting?
|
||||
Bucket Name: Bucket Name
|
||||
by resetting the remote, you will be informed on other devices.: by resetting the remote, you will be informed on other devices.
|
||||
Cancel: Cancel
|
||||
Changing the encryption algorithm will prevent access to any data previously encrypted with a different algorithm. Ensure that all your devices are configured to use the same algorithm to maintain access to your data.:
|
||||
Changing the encryption algorithm will prevent access to any data previously
|
||||
encrypted with a different algorithm. Ensure that all your devices are
|
||||
configured to use the same algorithm to maintain access to your data.
|
||||
Changing this setting requires migrating existing data (a bit time may be taken) and restarting Obsidian. Please make sure to back up your data before proceeding.:
|
||||
Changing this setting requires migrating existing data (a bit time may be
|
||||
taken) and restarting Obsidian. Please make sure to back up your data before
|
||||
@@ -56,9 +129,18 @@ Check and convert non-path-obfuscated files: Check and convert non-path-obfuscat
|
||||
Check for documents that have not been converted to path-obfuscated IDs and convert them if necessary.:
|
||||
Check for documents that have not been converted to path-obfuscated IDs and
|
||||
convert them if necessary.
|
||||
Checking connection... Please wait.: Checking connection... Please wait.
|
||||
Chunks: Chunks
|
||||
Close: Close
|
||||
Close & Disconnect: Close & Disconnect
|
||||
Close this dialog: Close this dialog
|
||||
"Closed:": "Closed:"
|
||||
cmdConfigSync:
|
||||
showCustomizationSync: Show Customization sync
|
||||
Comma separated `.gitignore, .dockerignore`: Comma separated `.gitignore, .dockerignore`
|
||||
Command: Command
|
||||
Communicating: Communicating
|
||||
Compare file: Compare file
|
||||
Compare the content of files between on local database and storage. If not matched, you will be asked which one you want to keep.:
|
||||
Compare the content of files between on local database and storage. If not
|
||||
matched, you will be asked which one you want to keep.
|
||||
@@ -69,36 +151,64 @@ Compatibility (Metadata): Compatibility (Metadata)
|
||||
Compatibility (Remote Database): Compatibility (Remote Database)
|
||||
Compatibility (Trouble addressed): Compatibility (Trouble addressed)
|
||||
Compute revisions for chunks: Compute revisions for chunks
|
||||
Configuration: Configuration
|
||||
Configuration Encryption: Configuration Encryption
|
||||
Configure: Configure
|
||||
Configure And Change Remote: Configure And Change Remote
|
||||
Configure E2EE: Configure E2EE
|
||||
Configure Remote: Configure Remote
|
||||
Connect: Connect
|
||||
"Connected to Signaling Server (as Peer ID: ${peerId})": "Connected to Signaling Server (as Peer ID: ${peerId})"
|
||||
"Connected:": "Connected:"
|
||||
Connection Settings: Connection Settings
|
||||
"Connection:": "Connection:"
|
||||
Continue anyway: Continue anyway
|
||||
Copy: Copy
|
||||
Copy Report to clipboard: Copy Report to clipboard
|
||||
CouchDB Configuration: CouchDB Configuration
|
||||
CouchDB Connection Tweak: CouchDB Connection Tweak
|
||||
Create P2P remote: Create P2P remote
|
||||
Cross-platform: Cross-platform
|
||||
"Current adapter: {adapter}": "Current adapter: {adapter}"
|
||||
Custom Headers: Custom Headers
|
||||
Customization Sync: Customization Sync
|
||||
Customization Sync (Beta3): Customization Sync (Beta3)
|
||||
Data Compression: Data Compression
|
||||
Data to Copy: Data to Copy
|
||||
Database -> Storage: Database -> Storage
|
||||
Database Adapter: Database Adapter
|
||||
Database Name: Database Name
|
||||
Database suffix: Database suffix
|
||||
Date: Date
|
||||
Default: Default
|
||||
Delay conflict resolution of inactive files: Delay conflict resolution of inactive files
|
||||
Delay merge conflict prompt for inactive files.: Delay merge conflict prompt for inactive files.
|
||||
Delete: Delete
|
||||
Delete all customization sync data: Delete all customization sync data
|
||||
Delete all data on the remote server.: Delete all data on the remote server.
|
||||
Delete All of: Delete All of
|
||||
Delete local database to reset or uninstall Self-hosted LiveSync: Delete local database to reset or uninstall Self-hosted LiveSync
|
||||
Delete old metadata of deleted files on start-up: Delete old metadata of deleted files on start-up
|
||||
Delete Remote Configuration: Delete Remote Configuration
|
||||
Delete remote configuration '{name}'?: Delete remote configuration '{name}'?
|
||||
Delete remote configuration '${name}'?: Delete remote configuration '${name}'?
|
||||
DENIED: DENIED
|
||||
DENIED (in session): DENIED (in session)
|
||||
Deny: Deny
|
||||
Deny in session: Deny in session
|
||||
Deny permanently: Deny permanently
|
||||
Deselect all: Deselect all
|
||||
desktop: desktop
|
||||
Detected Peers: Detected Peers
|
||||
Developer: Developer
|
||||
device name: device name
|
||||
Device name: Device name
|
||||
Device name to identify the device. Please use shorter one for the stable peer detection, i.e., "iphone-16" or "macbook-2021".:
|
||||
Device name to identify the device. Please use shorter one for the stable
|
||||
peer detection, i.e., "iphone-16" or "macbook-2021".
|
||||
Device Peer ID: Device Peer ID
|
||||
"Devices:": "Devices:"
|
||||
Diagnostic RTCPeerConnection is enabled: Diagnostic RTCPeerConnection is enabled
|
||||
dialog:
|
||||
yourLanguageAvailable:
|
||||
_value: >-
|
||||
@@ -116,10 +226,14 @@ dialog:
|
||||
May you find it easy to use!
|
||||
btnRevertToDefault: Keep %{lang-def}
|
||||
Title: " Translation is available!"
|
||||
Diff: Diff
|
||||
Different: Different
|
||||
Disables all synchronization and restart.: Disables all synchronization and restart.
|
||||
Disables logging, only shows notifications. Please disable if you report an issue.:
|
||||
Disables logging, only shows notifications. Please disable if you report an
|
||||
issue.
|
||||
Disconnect: Disconnect
|
||||
Dismiss: Dismiss
|
||||
Display Language: Display Language
|
||||
Display name: Display name
|
||||
Do not check configuration mismatch before replication: Do not check configuration mismatch before replication
|
||||
@@ -202,38 +316,115 @@ Enable advanced features: Enable advanced features
|
||||
Enable customization sync: Enable customization sync
|
||||
Enable Developers' Debug Tools.: Enable Developers' Debug Tools.
|
||||
Enable edge case treatment features: Enable edge case treatment features
|
||||
Enable P2P Replicator: Enable P2P Replicator
|
||||
Enable poweruser features: Enable poweruser features
|
||||
Enable this if your Object Storage doesn't support CORS: Enable this if your Object Storage doesn't support CORS
|
||||
Enable this option to automatically apply the most recent change to documents even when it conflicts:
|
||||
Enable this option to automatically apply the most recent change to documents
|
||||
even when it conflicts
|
||||
Enabled: Enabled
|
||||
Enabling end-to-end encryption ensures that your data is encrypted on your device before being sent to the remote server. This means that even if someone gains access to the server, they won't be able to read your data without the passphrase. Make sure to remember your passphrase, as it will be required to decrypt your data on other devices.:
|
||||
Enabling end-to-end encryption ensures that your data is encrypted on your
|
||||
device before being sent to the remote server. This means that even if
|
||||
someone gains access to the server, they won't be able to read your data
|
||||
without the passphrase. Make sure to remember your passphrase, as it will be
|
||||
required to decrypt your data on other devices.
|
||||
Encrypt contents on the remote database. If you use the plugin's synchronization feature, enabling this is recommended.:
|
||||
Encrypt contents on the remote database. If you use the plugin's
|
||||
synchronization feature, enabling this is recommended.
|
||||
Encrypting sensitive configuration items: Encrypting sensitive configuration items
|
||||
Encryption Algorithm: Encryption Algorithm
|
||||
Encryption phassphrase. If changed, you should overwrite the server's database with the new (encrypted) files.:
|
||||
Encryption phassphrase. If changed, you should overwrite the server's database
|
||||
with the new (encrypted) files.
|
||||
End-to-End Encryption: End-to-End Encryption
|
||||
Endpoint URL: Endpoint URL
|
||||
Enhance chunk size: Enhance chunk size
|
||||
Enter a folder prefix (optional): Enter a folder prefix (optional)
|
||||
Enter Setup URI: Enter Setup URI
|
||||
Enter TURN credential: Enter TURN credential
|
||||
Enter TURN username: Enter TURN username
|
||||
Enter your Access Key ID: Enter your Access Key ID
|
||||
Enter your Bucket Name: Enter your Bucket Name
|
||||
Enter your database name: Enter your database name
|
||||
Enter your JWT Key ID: Enter your JWT Key ID
|
||||
Enter your JWT secret or private key: Enter your JWT secret or private key
|
||||
Enter your JWT Subject (CouchDB Username): Enter your JWT Subject (CouchDB Username)
|
||||
Enter your passphrase: Enter your passphrase
|
||||
Enter your password: Enter your password
|
||||
Enter your Region (e.g., us-east-1, auto for R2): Enter your Region (e.g., us-east-1, auto for R2)
|
||||
Enter your Secret Access Key: Enter your Secret Access Key
|
||||
Enter your username: Enter your username
|
||||
"Error during connection test: ${reason}": "Error during connection test: ${reason}"
|
||||
"Error during testAndFixSettings: ${reason}": "Error during testAndFixSettings: ${reason}"
|
||||
Experimental Settings: Experimental Settings
|
||||
Export: Export
|
||||
"Failed to connect to the server: ${reason}": "Failed to connect to the server: ${reason}"
|
||||
Failed to connect to the server. Please check your settings.: Failed to connect to the server. Please check your settings.
|
||||
"Failed to connect to the signalling relay: ${reason}": "Failed to connect to the signalling relay: ${reason}"
|
||||
Failed to create replicator instance.: Failed to create replicator instance.
|
||||
Failed to parse Setup-URI.: Failed to parse Setup-URI.
|
||||
"Failed:": "Failed:"
|
||||
Fetch: Fetch
|
||||
Fetch chunks on demand: Fetch chunks on demand
|
||||
Fetch database with previous behaviour: Fetch database with previous behaviour
|
||||
Fetch remote settings: Fetch remote settings
|
||||
FETCHING: FETCHING
|
||||
Fetching status...: Fetching status...
|
||||
File integrity: File integrity
|
||||
File to resolve conflict: File to resolve conflict
|
||||
File to view History: File to view History
|
||||
Filename: Filename
|
||||
"Final Confirmation: Overwrite Server Data with This Device's Files": "Final Confirmation: Overwrite Server Data with This Device's Files"
|
||||
Fix: Fix
|
||||
Flag and restart: Flag and restart
|
||||
Flagged Selective: Flagged Selective
|
||||
Folder Prefix: Folder Prefix
|
||||
For HS256/HS512 algorithms, provide the shared secret key. For ES256/ES512 algorithms, provide the pkcs8 PEM-formatted private key.:
|
||||
For HS256/HS512 algorithms, provide the shared secret key. For ES256/ES512
|
||||
algorithms, provide the pkcs8 PEM-formatted private key.
|
||||
Forces the file to be synced when opened.: Forces the file to be synced when opened.
|
||||
Fresh Start Wipe: Fresh Start Wipe
|
||||
Furthermore, if conflicts are already present in the server data, they will be synchronised to this device as they are, and you will need to resolve them locally.:
|
||||
Furthermore, if conflicts are already present in the server data, they will
|
||||
be synchronised to this device as they are, and you will need to resolve
|
||||
them locally.
|
||||
Garbage Collection V3 (Beta): Garbage Collection V3 (Beta)
|
||||
Gathering information...: Gathering information...
|
||||
Generate Random ID: Generate Random ID
|
||||
Group ID: Group ID
|
||||
Handle files as Case-Sensitive: Handle files as Case-Sensitive
|
||||
Have you created a backup before proceeding?: Have you created a backup before proceeding?
|
||||
Hidden file synchronization have been temporarily disabled. Please enable them after the fetching, if you need them.:
|
||||
Hidden file synchronization have been temporarily disabled. Please enable
|
||||
them after the fetching, if you need them.
|
||||
Hidden Files: Hidden Files
|
||||
Hide completely: Hide completely
|
||||
Hide not applicable items: Hide not applicable items
|
||||
Higher (${local} > ${remote}): Higher (${local} > ${remote})
|
||||
Highlight diff: Highlight diff
|
||||
How to display network errors when the sync server is unreachable.: How to display network errors when the sync server is unreachable.
|
||||
However, This should not be enabled if you want to increase your secrecy more.:
|
||||
However, This should not be enabled if you want to increase your secrecy
|
||||
more.
|
||||
I am setting up a new server for the first time / I want to reset my existing server.:
|
||||
I am setting up a new server for the first time / I want to reset my
|
||||
existing server.
|
||||
I am unable to create a backup of my Vault.: I am unable to create a backup of my Vault.
|
||||
I am unable to create a backup of my Vaults.: I am unable to create a backup of my Vaults.
|
||||
I have created a backup of my Vault.: I have created a backup of my Vault.
|
||||
I understand that all changes made on other smartphones or computers possibly could be lost.:
|
||||
I understand that all changes made on other smartphones or computers
|
||||
possibly could be lost.
|
||||
I understand that other devices will no longer be able to synchronise, and will need to be reset the synchronisation information.:
|
||||
I understand that other devices will no longer be able to synchronise, and
|
||||
will need to be reset the synchronisation information.
|
||||
I understand that this action is irreversible once performed.: I understand that this action is irreversible once performed.
|
||||
I understand the risks and will proceed without a backup.: I understand the risks and will proceed without a backup.
|
||||
I Understand, Overwrite Server: I Understand, Overwrite Server
|
||||
If "Auto Start P2P Connection" is enabled, the P2P connection will be started automatically when the plug-in launches.:
|
||||
If "Auto Start P2P Connection" is enabled, the P2P connection will be
|
||||
started automatically when the plug-in launches.
|
||||
If disabled(toggled), chunks will be split on the UI thread (Previous behaviour).:
|
||||
If disabled(toggled), chunks will be split on the UI thread (Previous
|
||||
behaviour).
|
||||
@@ -267,13 +458,47 @@ If this option is enabled, PouchDB will hold the connection open for 60 seconds,
|
||||
seconds, and if no change arrives in that time, close and reopen the socket,
|
||||
instead of holding it open indefinitely. Useful when a proxy limits request
|
||||
duration but can increase resource usage.
|
||||
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.:
|
||||
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.
|
||||
If you cannot avoid CORS issues, you might want to try this option. It uses Obsidian's internal API to communicate with the S3 server. Not compliant with web standards, but works. Note that this might break in future Obsidian versions.:
|
||||
If you cannot avoid CORS issues, you might want to try this option. It uses
|
||||
Obsidian's internal API to communicate with the S3 server. Not compliant
|
||||
with web standards, but works. Note that this might break in future Obsidian
|
||||
versions.
|
||||
If you have unsynchronised changes in your Vault on this device, they will likely diverge from the server's versions after the reset. This may result in a large number of file conflicts.:
|
||||
If you have unsynchronised changes in your Vault on this device, they will
|
||||
likely diverge from the server's versions after the reset. This may result
|
||||
in a large number of file conflicts.
|
||||
If you reached the payload size limit when using IBM Cloudant, please decrease batch size and batch limit to a lower value.:
|
||||
If you reached the payload size limit when using IBM Cloudant, please decrease
|
||||
batch size and batch limit to a lower value.
|
||||
If you understand the risks and still wish to proceed, select so.: If you understand the risks and still wish to proceed, select so.
|
||||
If you want to store the data in a specific folder within the bucket, you can specify a folder prefix here. Otherwise, leave it blank to store data at the root of the bucket.:
|
||||
If you want to store the data in a specific folder within the bucket, you
|
||||
can specify a folder prefix here. Otherwise, leave it blank to store data at
|
||||
the root of the bucket.
|
||||
If you want to use `LiveSync`, you should broadcast changes. All `watching` peers which detects this will start the replication for fetching.:
|
||||
If you want to use `LiveSync`, you should broadcast changes. All `watching`
|
||||
peers which detects this will start the replication for fetching.
|
||||
Ignore: Ignore
|
||||
Ignore files: Ignore files
|
||||
Ignore patterns: Ignore patterns
|
||||
Import connection: Import connection
|
||||
IMPORTANT: IMPORTANT
|
||||
In most cases, you should stick with the default algorithm (${algorithm}), This setting is only required if you have an existing Vault encrypted in a different format.:
|
||||
In most cases, you should stick with the default algorithm (${algorithm}),
|
||||
This setting is only required if you have an existing Vault encrypted in a
|
||||
different format.
|
||||
In this scenario, Self-hosted LiveSync will recreate metadata for every file and deliberately generate conflicts. Where the file content is identical, these conflicts will be resolved automatically.:
|
||||
In this scenario, Self-hosted LiveSync will recreate metadata for every file
|
||||
and deliberately generate conflicts. Where the file content is identical,
|
||||
these conflicts will be resolved automatically.
|
||||
"Incoming:": "Incoming:"
|
||||
Incubate Chunks in Document: Incubate Chunks in Document
|
||||
Initial Action: Initial Action
|
||||
Initialise all journal history, On the next sync, every item will be received and sent.:
|
||||
Initialise all journal history, On the next sync, every item will be received
|
||||
and sent.
|
||||
@@ -284,6 +509,23 @@ Initialise journal sent history. On the next sync, every item except this device
|
||||
Initialise journal sent history. On the next sync, every item except this
|
||||
device received will be sent again.
|
||||
Interval (sec): Interval (sec)
|
||||
INVERTED: INVERTED
|
||||
"Issue detection log:": "Issue detection log:"
|
||||
It is strongly advised to create a backup before proceeding. Continuing without a backup may lead to data loss.:
|
||||
It is strongly advised to create a backup before proceeding. Continuing
|
||||
without a backup may lead to data loss.
|
||||
Just for a minute, please!: Just for a minute, please!
|
||||
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.:
|
||||
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.
|
||||
JWT Algorithm: JWT Algorithm
|
||||
JWT Expiration Duration (minutes): JWT Expiration Duration (minutes)
|
||||
JWT Key: JWT Key
|
||||
JWT Key ID (kid): JWT Key ID (kid)
|
||||
JWT Subject (sub): JWT Subject (sub)
|
||||
K:
|
||||
exp: Experimental
|
||||
long_p2p_sync: "%{title_p2p_sync}"
|
||||
@@ -306,6 +548,7 @@ lang-zh: 简体中文
|
||||
lang-zh-tw: 繁體中文
|
||||
Later: Later
|
||||
"Limit: {datetime} ({timestamp})": "Limit: {datetime} ({timestamp})"
|
||||
live: live
|
||||
LiveSync could not handle multiple vaults which have same name without different prefix, This should be automatically configured.:
|
||||
LiveSync could not handle multiple vaults which have same name without
|
||||
different prefix, This should be automatically configured.
|
||||
@@ -342,6 +585,7 @@ liveSyncSetting:
|
||||
liveSyncSettings:
|
||||
btnApply: Apply
|
||||
Local Database Tweak: Local Database Tweak
|
||||
Local only: Local only
|
||||
Lock: Lock
|
||||
Lock Server: Lock Server
|
||||
Lock the remote server to prevent synchronization with other devices.: Lock the remote server to prevent synchronization with other devices.
|
||||
@@ -351,6 +595,9 @@ logPane:
|
||||
pause: Pause
|
||||
title: Self-hosted LiveSync Log
|
||||
wrap: Wrap
|
||||
Lower (${local} < ${remote}): Lower (${local} < ${remote})
|
||||
Maintenance Commands: Maintenance Commands
|
||||
Maintenance mode: Maintenance mode
|
||||
Maximum delay for batch database updating: Maximum delay for batch database updating
|
||||
Maximum file size: Maximum file size
|
||||
Maximum Incubating Chunk Size: Maximum Incubating Chunk Size
|
||||
@@ -363,6 +610,7 @@ Memory cache size (by total items): Memory cache size (by total items)
|
||||
Merge: Merge
|
||||
Minimum delay for batch database updating: Minimum delay for batch database updating
|
||||
Minimum interval for syncing: Minimum interval for syncing
|
||||
Mixed: Mixed
|
||||
moduleCheckRemoteSize:
|
||||
logCheckingStorageSizes: Checking storage sizes
|
||||
logCurrentStorageSize: "Remote storage size: ${measuredSize}"
|
||||
@@ -641,15 +889,33 @@ moduleMigration:
|
||||
moduleObsidianMenu:
|
||||
replicate: Replicate
|
||||
More actions: More actions
|
||||
"Mostly Complete: Decision Required": "Mostly Complete: Decision Required"
|
||||
Move remotely deleted files to the trash, instead of deleting.: Move remotely deleted files to the trash, instead of deleting.
|
||||
My remote server is already set up. I want to join this device.: My remote server is already set up. I want to join this device.
|
||||
Name: Name
|
||||
Network warning style: Network warning style
|
||||
NEW: NEW
|
||||
New Remote: New Remote
|
||||
Newer (${diff}): Newer (${diff})
|
||||
No checks have been performed yet.: No checks have been performed yet.
|
||||
No Connection: No Connection
|
||||
No devices available. Waiting for other devices to connect...: No devices available. Waiting for other devices to connect...
|
||||
No Items.: No Items.
|
||||
No limit configured: No limit configured
|
||||
NO PREVIEW: NO PREVIEW
|
||||
Non-Synchronising files: Non-Synchronising files
|
||||
Normal Files: Normal Files
|
||||
Not all messages have been translated. And, please revert to "Default" when reporting errors.:
|
||||
Not all messages have been translated. And, please revert to "Default" when
|
||||
reporting errors.
|
||||
Not configured: Not configured
|
||||
Not now: Not now
|
||||
Note that the Group ID is not limited to the generated format; you can use any string as the Group ID.:
|
||||
Note that the Group ID is not limited to the generated format; you can use
|
||||
any string as the Group ID.
|
||||
Note that you can generate a new Setup URI by running the "Copy settings as a new Setup URI" command in the command palette.:
|
||||
Note that you can generate a new Setup URI by running the "Copy settings as
|
||||
a new Setup URI" command in the command palette.
|
||||
Notify all setting files: Notify all setting files
|
||||
Notify customized: Notify customized
|
||||
Notify when other device has newly customized.: Notify when other device has newly customized.
|
||||
@@ -658,6 +924,13 @@ Number of batches to process at a time. Defaults to 40. Minimum is 2. This along
|
||||
Number of batches to process at a time. Defaults to 40. Minimum is 2. This
|
||||
along with batch size controls how many docs are kept in memory at a time.
|
||||
Number of changes to sync at a time. Defaults to 50. Minimum is 2.: Number of changes to sync at a time. Defaults to 50. Minimum is 2.
|
||||
Obfuscate Properties: Obfuscate Properties
|
||||
Obfuscating properties (e.g., path of file, size, creation and modification dates) adds an additional layer of security by making it harder to identify the structure and names of your files and folders on the remote server. This helps protect your privacy and makes it more difficult for unauthorized users to infer information about your data.:
|
||||
Obfuscating properties (e.g., path of file, size, creation and modification
|
||||
dates) adds an additional layer of security by making it harder to identify
|
||||
the structure and names of your files and folders on the remote server. This
|
||||
helps protect your privacy and makes it more difficult for unauthorized
|
||||
users to infer information about your data.
|
||||
obsidianLiveSyncSettingTab:
|
||||
btnApply: Apply
|
||||
btnCheck: Check
|
||||
@@ -912,11 +1185,26 @@ obsidianLiveSyncSettingTab:
|
||||
titleUpdateThinning: Update Thinning
|
||||
warnCorsOriginUnmatched: ⚠ CORS Origin is unmatched ${from}->${to}
|
||||
warnNoAdmin: ⚠ You do not have administrator privileges.
|
||||
Of course, we can back up the data before proceeding.: Of course, we can back up the data before proceeding.
|
||||
Off: Off
|
||||
Ok: Ok
|
||||
Old Algorithm: Old Algorithm
|
||||
Older (${diff}): Older (${diff})
|
||||
Older fallback (Slow, W/O WebAssembly): Older fallback (Slow, W/O WebAssembly)
|
||||
On: On
|
||||
On the source device, from the command palette, run the 'Show settings as a QR code' command.:
|
||||
On the source device, from the command palette, run the 'Show settings as a
|
||||
QR code' command.
|
||||
On the source device, open Obsidian.: On the source device, open Obsidian.
|
||||
On this device, please keep this Vault open.: On this device, please keep this Vault open.
|
||||
On this device, switch to the camera app or use a QR code scanner to scan the displayed QR code.:
|
||||
On this device, switch to the camera app or use a QR code scanner to scan
|
||||
the displayed QR code.
|
||||
Open: Open
|
||||
Open connection: Open connection
|
||||
Open P2P Setup...: Open P2P Setup...
|
||||
Open the dialog: Open the dialog
|
||||
Other files: Other files
|
||||
Overwrite: Overwrite
|
||||
Overwrite patterns: Overwrite patterns
|
||||
Overwrite remote: Overwrite remote
|
||||
@@ -968,34 +1256,70 @@ P2P:
|
||||
SyncAlreadyRunning: P2P Sync is already running.
|
||||
SyncCompleted: P2P Sync completed.
|
||||
SyncStartedWith: P2P Sync with ${name} have been started.
|
||||
P2P Configuration: P2P Configuration
|
||||
P2P Status: P2P Status
|
||||
paneMaintenance:
|
||||
markDeviceResolvedAfterBackup: paneMaintenance.markDeviceResolvedAfterBackup
|
||||
remoteLockedAndDeviceNotAccepted: paneMaintenance.remoteLockedAndDeviceNotAccepted
|
||||
remoteLockedResolvedDevice: paneMaintenance.remoteLockedResolvedDevice
|
||||
unlockDatabaseReady: paneMaintenance.unlockDatabaseReady
|
||||
Passphrase: Passphrase
|
||||
Passphrase is required.: Passphrase is required.
|
||||
Passphrase of sensitive configuration items: Passphrase of sensitive configuration items
|
||||
password: password
|
||||
Password: Password
|
||||
Paste a connection string: Paste a connection string
|
||||
Path: Path
|
||||
Path Obfuscation: Path Obfuscation
|
||||
Patterns to match files for overwriting instead of merging: Patterns to match files for overwriting instead of merging
|
||||
Patterns to match files for syncing: Patterns to match files for syncing
|
||||
"Peer ID:": "Peer ID:"
|
||||
Peer to Peer Replicator: Peer to Peer Replicator
|
||||
Peer-to-Peer Synchronisation: Peer-to-Peer Synchronisation
|
||||
Peers: Peers
|
||||
Per-file-saved customization sync: Per-file-saved customization sync
|
||||
Perform: Perform
|
||||
Perform cleanup: Perform cleanup
|
||||
Perform Garbage Collection: Perform Garbage Collection
|
||||
Perform Garbage Collection to remove unused chunks and reduce database size.: Perform Garbage Collection to remove unused chunks and reduce database size.
|
||||
Periodic Sync interval: Periodic Sync interval
|
||||
PERMANENT: PERMANENT
|
||||
Pick a file to resolve conflict: Pick a file to resolve conflict
|
||||
Pick a file to show history: Pick a file to show history
|
||||
Please be aware that the End-to-End Encryption passphrase is not validated until the synchronisation process actually commences. This is a security measure designed to protect your data.:
|
||||
Please be aware that the End-to-End Encryption passphrase is not validated
|
||||
until the synchronisation process actually commences. This is a security
|
||||
measure designed to protect your data.
|
||||
Please configure your end-to-end encryption settings.: Please configure your end-to-end encryption settings.
|
||||
Please enter the CouchDB server information below.: Please enter the CouchDB server information below.
|
||||
Please enter the details required to connect to your S3/MinIO/R2 compatible object storage service.:
|
||||
Please enter the details required to connect to your S3/MinIO/R2 compatible
|
||||
object storage service.
|
||||
Please enter the Peer-to-Peer Synchronisation information below.: Please enter the Peer-to-Peer Synchronisation information below.
|
||||
Please enter the Setup URI that was generated during server installation or on another device, along with the vault passphrase.:
|
||||
Please enter the Setup URI that was generated during server installation or
|
||||
on another device, along with the vault passphrase.
|
||||
Please follow the steps below to import settings from your existing device.: Please follow the steps below to import settings from your existing device.
|
||||
PLEASE NOTE: PLEASE NOTE
|
||||
Please select an active P2P remote configuration to change P2P sync targets.: Please select an active P2P remote configuration to change P2P sync targets.
|
||||
Please select the button below to restart and proceed to the data fetching confirmation.:
|
||||
Please select the button below to restart and proceed to the data fetching
|
||||
confirmation.
|
||||
Please select the button below to restart and proceed to the final confirmation.:
|
||||
Please select the button below to restart and proceed to the final
|
||||
confirmation.
|
||||
Please select your situation.: Please select your situation.
|
||||
Please set device name to identify this device. This name should be unique among your devices. While not configured, we cannot enable this feature.:
|
||||
Please set device name to identify this device. This name should be unique
|
||||
among your devices. While not configured, we cannot enable this feature.
|
||||
Please set this device name: Please set this device name
|
||||
Please understand that this is intended behaviour.: Please understand that this is intended behaviour.
|
||||
Plugins: Plugins
|
||||
Prepare the 'report' to create an issue: Prepare the 'report' to create an issue
|
||||
Presets: Presets
|
||||
Prevent fetching configuration from server: Prevent fetching configuration from server
|
||||
Proceed: Proceed
|
||||
Proceed to the next step.: Proceed to the next step.
|
||||
Process small files in the foreground: Process small files in the foreground
|
||||
Property Encryption: Property Encryption
|
||||
PureJS fallback (Fast, W/O WebAssembly): PureJS fallback (Fast, W/O WebAssembly)
|
||||
@@ -1096,15 +1420,22 @@ Reduces storage space by discarding all non-latest revisions. This requires the
|
||||
Reduces storage space by discarding all non-latest revisions. This requires
|
||||
the same amount of free space on the remote server and the local client.
|
||||
Reducing the frequency with which on-disk changes are reflected into the DB: Reducing the frequency with which on-disk changes are reflected into the DB
|
||||
Refresh: Refresh
|
||||
Region: Region
|
||||
Relay settings: Relay settings
|
||||
Reload: Reload
|
||||
Remediation: Remediation
|
||||
Remediation Setting Changed: Remediation Setting Changed
|
||||
Remote Database Tweak (In sunset): Remote Database Tweak (In sunset)
|
||||
Remote Databases: Remote Databases
|
||||
Remote name: Remote name
|
||||
Remote only: Remote only
|
||||
Remote server type: Remote server type
|
||||
Remote Type: Remote Type
|
||||
Rename: Rename
|
||||
Replicate now: Replicate now
|
||||
Replicating: Replicating
|
||||
Replicating...: Replicating...
|
||||
Replicator:
|
||||
Dialogue:
|
||||
Locked:
|
||||
@@ -1150,6 +1481,7 @@ Resend all chunks to the remote.: Resend all chunks to the remote.
|
||||
Reset: Reset
|
||||
Reset all: Reset all
|
||||
Reset all journal counter: Reset all journal counter
|
||||
Reset and Resume Synchronisation: Reset and Resume Synchronisation
|
||||
Reset journal received history: Reset journal received history
|
||||
Reset journal sent history: Reset journal sent history
|
||||
Reset notification threshold and check the remote database usage: Reset notification threshold and check the remote database usage
|
||||
@@ -1166,16 +1498,28 @@ Resolve All conflicted files by the newer one: Resolve All conflicted files by t
|
||||
"Resolve all conflicted files by the newer one. Caution: This will overwrite the older one, and cannot resurrect the overwritten one.":
|
||||
"Resolve all conflicted files by the newer one. Caution: This will overwrite
|
||||
the older one, and cannot resurrect the overwritten one."
|
||||
Restart and Fetch Data: Restart and Fetch Data
|
||||
Restart and Initialise Server: Restart and Initialise Server
|
||||
Restart Now: Restart Now
|
||||
Restarting Obsidian is strongly recommended. Until restart, some changes may not take effect, and display may be inconsistent. Are you sure to restart now?:
|
||||
Restarting Obsidian is strongly recommended. Until restart, some changes may
|
||||
not take effect, and display may be inconsistent. Are you sure to restart now?
|
||||
Restore or reconstruct local database from remote.: Restore or reconstruct local database from remote.
|
||||
Rev: Rev
|
||||
Revert changes: Revert changes
|
||||
Revoke: Revoke
|
||||
Room ID: Room ID
|
||||
"Room ID suffix:": "Room ID suffix:"
|
||||
Run Doctor: Run Doctor
|
||||
S3/MinIO/R2 Configuration: S3/MinIO/R2 Configuration
|
||||
Same: Same
|
||||
Same or local only: Same or local only
|
||||
Save and Apply: Save and Apply
|
||||
Save settings to a markdown file. You will be notified when new settings arrive. You can set different files by the platform.:
|
||||
Save settings to a markdown file. You will be notified when new settings
|
||||
arrive. You can set different files by the platform.
|
||||
Saving will be performed forcefully after this number of seconds.: Saving will be performed forcefully after this number of seconds.
|
||||
Scan changes: Scan changes
|
||||
Scan changes on customization sync: Scan changes on customization sync
|
||||
Scan customization automatically: Scan customization automatically
|
||||
Scan customization before replicating.: Scan customization before replicating.
|
||||
@@ -1184,6 +1528,7 @@ Scan customization periodically: Scan customization periodically
|
||||
Scan for Broken files: Scan for Broken files
|
||||
Scan for hidden files before replication: Scan for hidden files before replication
|
||||
Scan hidden files periodically: Scan hidden files periodically
|
||||
Scan QR Code: Scan QR Code
|
||||
Schedule and Restart: Schedule and Restart
|
||||
Scram Switches: Scram Switches
|
||||
Scram!: Scram!
|
||||
@@ -1191,11 +1536,27 @@ Seconds, 0 to disable: Seconds, 0 to disable
|
||||
Seconds. Saving to the local database will be delayed until this value after we stop typing or saving.:
|
||||
Seconds. Saving to the local database will be delayed until this value after
|
||||
we stop typing or saving.
|
||||
Secret Access Key: Secret Access Key
|
||||
Secret Key: Secret Key
|
||||
Select active P2P remote: Select active P2P remote
|
||||
Select All Shiny: Select All Shiny
|
||||
Select Flagged Shiny: Select Flagged Shiny
|
||||
Select P2P remote...: Select P2P remote...
|
||||
Select the database adapter to use.: Select the database adapter to use.
|
||||
Selecting this option will result in the current data on this device being used to initialise the server. Any existing data on the server will be completely overwritten.:
|
||||
Selecting this option will result in the current data on this device being
|
||||
used to initialise the server. Any existing data on the server will be
|
||||
completely overwritten.
|
||||
Selecting this option will result in this device joining the existing server. You need to fetching the existing synchronisation data from the server to this device.:
|
||||
Selecting this option will result in this device joining the existing
|
||||
server. You need to fetching the existing synchronisation data from the
|
||||
server to this device.
|
||||
Selective: Selective
|
||||
Send: Send
|
||||
Send chunks: Send chunks
|
||||
SENDING: SENDING
|
||||
Server URI: Server URI
|
||||
SESSION: SESSION
|
||||
Setting:
|
||||
GenerateKeyPair:
|
||||
Desc: >+
|
||||
@@ -1389,6 +1750,8 @@ Setup:
|
||||
ButtonClose: Close this dialog
|
||||
"Please enable 'Compute revisions for chunks' in settings to use Garbage Collection.": Please enable 'Compute revisions for chunks' in settings to use Garbage Collection.
|
||||
"Please disable 'Read chunks online' in settings to use Garbage Collection.": Please disable 'Read chunks online' in settings to use Garbage Collection.
|
||||
"Setup Complete: Preparing to Fetch Synchronisation Data": "Setup Complete: Preparing to Fetch Synchronisation Data"
|
||||
"Setup Complete: Preparing to Initialise Server": "Setup Complete: Preparing to Initialise Server"
|
||||
"Setup URI dialog cancelled.": Setup URI dialog cancelled.
|
||||
"Please select 'Cancel' explicitly to cancel this operation.": Please select 'Cancel' explicitly to cancel this operation.
|
||||
"Failed to connect to remote for compaction.": Failed to connect to remote for compaction.
|
||||
@@ -1400,6 +1763,27 @@ Setup:
|
||||
"Failed to start one-shot replication before Garbage Collection. Garbage Collection Cancelled.": Failed to start one-shot replication before Garbage Collection. Garbage Collection Cancelled.
|
||||
"Cancel Garbage Collection": Cancel Garbage Collection
|
||||
"No connected device information found. Cancelling Garbage Collection.": No connected device information found. Cancelling Garbage Collection.
|
||||
Setup-URI: Setup-URI
|
||||
Signaling Server Connection: Signaling Server Connection
|
||||
Signalling Status: Signalling Status
|
||||
Skip and close: Skip and close
|
||||
Snippets: Snippets
|
||||
Start Broadcasting: Start Broadcasting
|
||||
Start change-broadcasting on Connect: Start change-broadcasting on Connect
|
||||
Start Sync & Close: Start Sync & Close
|
||||
Stat: Stat
|
||||
Stats: Stats
|
||||
Stop ⚡: Stop ⚡
|
||||
Stop Broadcasting: Stop Broadcasting
|
||||
Strongly Recommended: Strongly Recommended
|
||||
Sync: Sync
|
||||
Sync once: Sync once
|
||||
Syncing...: Syncing...
|
||||
Test Settings and Continue: Test Settings and Continue
|
||||
The connection to the server has been configured successfully. As the next step,:
|
||||
The connection to the server has been configured successfully. As the next
|
||||
step,
|
||||
The files in this Vault are almost identical to the server's.: The files in this Vault are almost identical to the server's.
|
||||
"The following accepted nodes are missing its node information:\n- ${missingNodes}\n\nThis indicates that they have not been connected for some time or have been left on an older version.\nIt is preferable to update all devices if possible. If you have any devices that are no longer in use, you can clear all accepted nodes by locking the remote once.":
|
||||
|-
|
||||
The following accepted nodes are missing its node information:
|
||||
@@ -1474,11 +1858,21 @@ Testing only - Resolve file conflicts by syncing newer copies of the file, this
|
||||
Testing only - Resolve file conflicts by syncing newer copies of the file,
|
||||
this can overwrite modified files. Be Warned.
|
||||
The delay for consecutive on-demand fetches: The delay for consecutive on-demand fetches
|
||||
The Group ID and passphrase are used to identify your group of devices. Make sure to use the same Group ID and passphrase on all devices you want to synchronise.:
|
||||
The Group ID and passphrase are used to identify your group of devices. Make
|
||||
sure to use the same Group ID and passphrase on all devices you want to
|
||||
synchronise.
|
||||
The Hash algorithm for chunk IDs: The Hash algorithm for chunk IDs
|
||||
The IndexedDB adapter often offers superior performance in certain scenarios, but it has been found to cause memory leaks when used with LiveSync mode. When using LiveSync mode, please use IDB adapter instead.:
|
||||
The IndexedDB adapter often offers superior performance in certain scenarios,
|
||||
but it has been found to cause memory leaks when used with LiveSync mode. When
|
||||
using LiveSync mode, please use IDB adapter instead.
|
||||
the latest synchronisation data will be downloaded from the server to this device.:
|
||||
the latest synchronisation data will be downloaded from the server to this
|
||||
device.
|
||||
the local database, that is to say the synchronisation information, must be reconstituted.:
|
||||
the local database, that is to say the synchronisation information, must be
|
||||
reconstituted.
|
||||
The maximum duration for which chunks can be incubated within the document. Chunks exceeding this period will graduate to independent chunks.:
|
||||
The maximum duration for which chunks can be incubated within the document.
|
||||
Chunks exceeding this period will graduate to independent chunks.
|
||||
@@ -1489,13 +1883,61 @@ The maximum total size of chunks that can be incubated within the document. Chun
|
||||
The maximum total size of chunks that can be incubated within the document.
|
||||
Chunks exceeding this size will immediately graduate to independent chunks.
|
||||
The minimum interval for automatic synchronisation on event.: The minimum interval for automatic synchronisation on event.
|
||||
The remote is already set up, and the configuration is compatible (or got compatible by this operation).:
|
||||
The remote is already set up, and the configuration is compatible (or got
|
||||
compatible by this operation).
|
||||
The Setup-URI does not appear to be valid. Please check that you have copied it correctly.:
|
||||
The Setup-URI does not appear to be valid. Please check that you have copied
|
||||
it correctly.
|
||||
The Setup-URI is valid and ready to use.: The Setup-URI is valid and ready to use.
|
||||
the single, authoritative master copy: the single, authoritative master copy
|
||||
the synchronisation data on the server will be built based on the current data on this device.:
|
||||
the synchronisation data on the server will be built based on the current
|
||||
data on this device.
|
||||
Themes: Themes
|
||||
There is a way to resolve this on other devices.: There is a way to resolve this on other devices.
|
||||
There may be differences between the files in this Vault and the server.: There may be differences between the files in this Vault and the server.
|
||||
Therefore, we ask that you exercise extreme caution when configuring server information manually. If an incorrect passphrase is entered, the data on the server will become corrupted.:
|
||||
Therefore, we ask that you exercise extreme caution when configuring server
|
||||
information manually. If an incorrect passphrase is entered, the data on the
|
||||
server will become corrupted.
|
||||
This can isolate your connections between devices. Use the same Room ID for the same devices.:
|
||||
This can isolate your connections between devices. Use the same Room ID for
|
||||
the same devices.
|
||||
This device: This device
|
||||
This device name: This device name
|
||||
This is an extremely powerful operation. We strongly recommend that you copy your Vault folder to a safe location.:
|
||||
This is an extremely powerful operation. We strongly recommend that you copy
|
||||
your Vault folder to a safe location.
|
||||
This passphrase will not be copied to another device. It will be set to `Default` until you configure it again.:
|
||||
This passphrase will not be copied to another device. It will be set to
|
||||
`Default` until you configure it again.
|
||||
This password is used to encrypt the connection. Use something long enough.: This password is used to encrypt the connection. Use something long enough.
|
||||
This procedure will first delete all existing synchronisation data from the server. Following this, the server data will be completely rebuilt, using the current state of your Vault on this device (including its local database) as:
|
||||
This procedure will first delete all existing synchronisation data from the
|
||||
server. Following this, the server data will be completely rebuilt, using
|
||||
the current state of your Vault on this device (including its local
|
||||
database) as
|
||||
This setting must be the same even when connecting to multiple synchronisation destinations.:
|
||||
This setting must be the same even when connecting to multiple
|
||||
synchronisation destinations.
|
||||
This Vault is empty, or contains only new files that are not on the server.: This Vault is empty, or contains only new files that are not on the server.
|
||||
This will rebuild the local database on this device using the most recent data from the server. This action is designed to resolve synchronisation inconsistencies and restore correct functionality.:
|
||||
This will rebuild the local database on this device using the most recent
|
||||
data from the server. This action is designed to resolve synchronisation
|
||||
inconsistencies and restore correct functionality.
|
||||
This will recreate chunks for all files. If there were missing chunks, this may fix the errors.:
|
||||
This will recreate chunks for all files. If there were missing chunks, this
|
||||
may fix the errors.
|
||||
To minimise the creation of new conflicts: To minimise the creation of new conflicts
|
||||
Transfer Tweak: Transfer Tweak
|
||||
TURN Credential: TURN Credential
|
||||
TURN server settings are only necessary if you are behind a strict NAT or firewall that prevents direct P2P connections. In most cases, you can leave these fields blank.:
|
||||
TURN server settings are only necessary if you are behind a strict NAT or
|
||||
firewall that prevents direct P2P connections. In most cases, you can leave
|
||||
these fields blank.
|
||||
TURN Server URLs (comma-separated): TURN Server URLs (comma-separated)
|
||||
TURN Username: TURN Username
|
||||
TweakMismatchResolve:
|
||||
Action:
|
||||
Dismiss: Dismiss
|
||||
@@ -1608,13 +2050,26 @@ TweakMismatchResolve:
|
||||
Unique name between all synchronized devices. To edit this setting, please disable customization sync once.:
|
||||
Unique name between all synchronized devices. To edit this setting, please
|
||||
disable customization sync once.
|
||||
Unless you are certain, selecting this options is bit dangerous. It assumes that the server configuration is compatible with this device. If this is not the case, data loss may occur. Please ensure you know what you are doing.:
|
||||
Unless you are certain, selecting this options is bit dangerous. It assumes
|
||||
that the server configuration is compatible with this device. If this is not
|
||||
the case, data loss may occur. Please ensure you know what you are doing.
|
||||
Updating list...: Updating list...
|
||||
URL: URL
|
||||
Use a custom passphrase: Use a custom passphrase
|
||||
Use Custom HTTP Handler: Use Custom HTTP Handler
|
||||
Use Diagnostic RTCPeerConnection for statistics: Use Diagnostic RTCPeerConnection for statistics
|
||||
Use dynamic iteration count: Use dynamic iteration count
|
||||
Use internal API: Use internal API
|
||||
Use Internal API: Use Internal API
|
||||
Use JWT Authentication: Use JWT Authentication
|
||||
Use Path-Style Access: Use Path-Style Access
|
||||
Use Random Number: Use Random Number
|
||||
Use Segmented-splitter: Use Segmented-splitter
|
||||
Use splitting-limit-capped chunk splitter: Use splitting-limit-capped chunk splitter
|
||||
Use the trash bin: Use the trash bin
|
||||
Use timeouts instead of heartbeats: Use timeouts instead of heartbeats
|
||||
Use vrtmrz's relay: Use vrtmrz's relay
|
||||
username: username
|
||||
Username: Username
|
||||
Verbose Log: Verbose Log
|
||||
@@ -1624,9 +2079,17 @@ Warning! This will have a serious impact on performance. And the logs will not b
|
||||
Warning! This will have a serious impact on performance. And the logs will not
|
||||
be synchronised under the default name. Please be careful with logs; they
|
||||
often contain your confidential information.
|
||||
WATCHING: WATCHING
|
||||
We can not use "/" to the device name: We can not use "/" to the device name
|
||||
We can use only Secure (HTTPS) connections on Obsidian Mobile.: We can use only Secure (HTTPS) connections on Obsidian Mobile.
|
||||
We cannot change the device name while this feature is enabled. Please disable this feature to change the device name.:
|
||||
We cannot change the device name while this feature is enabled. Please disable
|
||||
this feature to change the device name.
|
||||
We have to configure the device name: We have to configure the device name
|
||||
We recommend that you copy your Vault folder to a safe location. This will provide a safeguard in case a large number of conflicts arise, or if you accidentally synchronise with an incorrect destination.:
|
||||
We recommend that you copy your Vault folder to a safe location. This will
|
||||
provide a safeguard in case a large number of conflicts arise, or if you
|
||||
accidentally synchronise with an incorrect destination.
|
||||
When you save a file in the editor, start a sync automatically: When you save a file in the editor, start a sync automatically
|
||||
Write credentials in the file: Write credentials in the file
|
||||
Write logs into the file: Write logs into the file
|
||||
@@ -1961,3 +2424,14 @@ Ui:
|
||||
ProceedCouchDb: Continue to CouchDB setup
|
||||
ProceedP2P: Continue to P2P setup
|
||||
Title: Choose a synchronisation remote
|
||||
|
||||
You can configure in the Obsidian Plugin Settings.: You can configure in the Obsidian Plugin Settings.
|
||||
|
||||
You should create a new synchronisation destination and rebuild your data there.:
|
||||
You should create a new synchronisation destination and rebuild your data
|
||||
there.
|
||||
You should perform this operation only in exceptional circumstances, such as when the server data is completely corrupted, when changes on all other devices are no longer needed, or when the database size has become unusually large in comparison to the Vault size.:
|
||||
You should perform this operation only in exceptional circumstances, such as
|
||||
when the server data is completely corrupted, when changes on all other
|
||||
devices are no longer needed, or when the database size has become unusually
|
||||
large in comparison to the Vault size.
|
||||
|
||||
+1695
-68
File diff suppressed because it is too large
Load Diff
+742
-402
File diff suppressed because it is too large
Load Diff
@@ -1362,7 +1362,7 @@ export class ConfigSync extends LiveSyncCommands {
|
||||
async storeCustomizationFiles(path: FilePath, termOverRide?: string) {
|
||||
const term = termOverRide || this.services.setting.getDeviceAndVaultName();
|
||||
if (term == "") {
|
||||
this._log("We have to configure the device name", LOG_LEVEL_NOTICE);
|
||||
this._log($msg("We have to configure the device name"), LOG_LEVEL_NOTICE);
|
||||
return;
|
||||
}
|
||||
if (this.useV2) {
|
||||
@@ -1552,7 +1552,7 @@ export class ConfigSync extends LiveSyncCommands {
|
||||
this._log("Scanning customizing files.", logLevel, "scan-all-config");
|
||||
const term = this.services.setting.getDeviceAndVaultName();
|
||||
if (term == "") {
|
||||
this._log("We have to configure the device name", LOG_LEVEL_NOTICE);
|
||||
this._log($msg("We have to configure the device name"), LOG_LEVEL_NOTICE);
|
||||
return;
|
||||
}
|
||||
const filesAll = await this.scanInternalFiles();
|
||||
@@ -1729,7 +1729,11 @@ export class ConfigSync extends LiveSyncCommands {
|
||||
|
||||
if (mode == "CUSTOMIZE") {
|
||||
if (!this.services.setting.getDeviceAndVaultName()) {
|
||||
let name = await this.core.confirm.askString("Device name", "Please set this device name", `desktop`);
|
||||
let name = await this.core.confirm.askString(
|
||||
$msg("Device name"),
|
||||
$msg("Please set this device name"),
|
||||
`desktop`
|
||||
);
|
||||
if (!name) {
|
||||
if (Platform.isAndroidApp) {
|
||||
name = "android-app";
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
import type ObsidianLiveSyncPlugin from "@/main";
|
||||
// import { askString } from "../../common/utils";
|
||||
import { Menu } from "@/deps.ts";
|
||||
import { $msg as translateMessage } from "@/common/translation";
|
||||
|
||||
export let list: IPluginDataExDisplay[] = [];
|
||||
export let thisTerm = "";
|
||||
@@ -61,25 +62,25 @@
|
||||
// NO OP. what's happened?
|
||||
freshness = "";
|
||||
} else if (local && !remote) {
|
||||
freshness = "Local only";
|
||||
freshness = translateMessage("Local only");
|
||||
} else if (remote && !local) {
|
||||
freshness = "Remote only";
|
||||
freshness = translateMessage("Remote only");
|
||||
canApply = true;
|
||||
} else {
|
||||
const dtDiff = (local?.mtime ?? 0) - (remote?.mtime ?? 0);
|
||||
const diff = timeDeltaToHumanReadable(Math.abs(dtDiff));
|
||||
if (dtDiff / 1000 < -10) {
|
||||
// freshness = "✓ Newer";
|
||||
freshness = `Newer (${diff})`;
|
||||
freshness = translateMessage("Newer (${diff})", { diff });
|
||||
canApply = true;
|
||||
contentCheck = true;
|
||||
} else if (dtDiff / 1000 > 10) {
|
||||
// freshness = "⚠ Older";
|
||||
freshness = `Older (${diff})`;
|
||||
freshness = translateMessage("Older (${diff})", { diff });
|
||||
canApply = true;
|
||||
contentCheck = true;
|
||||
} else {
|
||||
freshness = "Same";
|
||||
freshness = translateMessage("Same");
|
||||
canApply = false;
|
||||
contentCheck = true;
|
||||
}
|
||||
@@ -89,11 +90,17 @@
|
||||
if (local?.version || remote?.version) {
|
||||
const compare = `${localVersionStr}`.localeCompare(remoteVersionStr, undefined, { numeric: true });
|
||||
if (compare == 0) {
|
||||
version = "Same";
|
||||
version = translateMessage("Same");
|
||||
} else if (compare < 0) {
|
||||
version = `Lower (${localVersionStr} < ${remoteVersionStr})`;
|
||||
version = translateMessage("Lower (${local} < ${remote})", {
|
||||
local: localVersionStr,
|
||||
remote: remoteVersionStr,
|
||||
});
|
||||
} else if (compare > 0) {
|
||||
version = `Higher (${localVersionStr} > ${remoteVersionStr})`;
|
||||
version = translateMessage("Higher (${local} > ${remote})", {
|
||||
local: localVersionStr,
|
||||
remote: remoteVersionStr,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -135,19 +142,19 @@
|
||||
})
|
||||
.reduce((p, c) => p | (c as number), 0 as number);
|
||||
if (matchingStatus == 0b0000100) {
|
||||
equivalency = "Same";
|
||||
equivalency = translateMessage("Same");
|
||||
canApply = false;
|
||||
} else if (matchingStatus <= 0b0000100) {
|
||||
equivalency = "Same or local only";
|
||||
equivalency = translateMessage("Same or local only");
|
||||
canApply = false;
|
||||
} else if (matchingStatus == 0b0010000) {
|
||||
canApply = true;
|
||||
canCompare = true;
|
||||
equivalency = "Different";
|
||||
equivalency = translateMessage("Different");
|
||||
} else {
|
||||
canApply = true;
|
||||
canCompare = true;
|
||||
equivalency = "Mixed";
|
||||
equivalency = translateMessage("Mixed");
|
||||
}
|
||||
return { equivalency, canApply, canCompare };
|
||||
}
|
||||
@@ -244,7 +251,7 @@
|
||||
if (selected == "") {
|
||||
// NO OP.
|
||||
} else if (selected == thisTerm) {
|
||||
freshness = "This device";
|
||||
freshness = translateMessage("This device");
|
||||
canApply = false;
|
||||
} else {
|
||||
const local = list.find((e) => e.term == thisTerm);
|
||||
@@ -304,11 +311,11 @@
|
||||
if (!local) return;
|
||||
if (!selectedItem) return;
|
||||
const menu = new Menu();
|
||||
menu.addItem((item) => item.setTitle("Compare file").setIsLabel(true));
|
||||
menu.addItem((item) => item.setTitle(translateMessage("Compare file")).setIsLabel(true));
|
||||
menu.addSeparator();
|
||||
const files = unique(local.files.map((e) => e.filename).concat(selectedItem.files.map((e) => e.filename)));
|
||||
const convDate = (dt: PluginDataExFile | undefined) => {
|
||||
if (!dt) return "(Missing)";
|
||||
if (!dt) return translateMessage("(Missing)");
|
||||
const d = new Date(dt.mtime);
|
||||
return d.toLocaleString();
|
||||
};
|
||||
@@ -335,10 +342,14 @@
|
||||
Logger(`Could not find local item`, LOG_LEVEL_VERBOSE);
|
||||
return;
|
||||
}
|
||||
const duplicateTermName = await core.confirm.askString("Duplicate", "device name", "");
|
||||
const duplicateTermName = await core.confirm.askString(
|
||||
translateMessage("Duplicate"),
|
||||
translateMessage("device name"),
|
||||
""
|
||||
);
|
||||
if (duplicateTermName) {
|
||||
if (duplicateTermName.contains("/")) {
|
||||
Logger(`We can not use "/" to the device name`, LOG_LEVEL_NOTICE);
|
||||
Logger(translateMessage('We can not use "/" to the device name'), LOG_LEVEL_NOTICE);
|
||||
return;
|
||||
}
|
||||
const key = `${plugin.core.services.API.getSystemConfigDir()}/${local.files[0].filename}`;
|
||||
@@ -391,7 +402,7 @@
|
||||
{/if}
|
||||
{:else}
|
||||
<span class="spacer"></span>
|
||||
<span class="message even">All the same or non-existent</span>
|
||||
<span class="message even">{translateMessage("All the same or non-existent")}</span>
|
||||
<!-- svelte-ignore a11y_consider_explicit_label -->
|
||||
<button disabled></button>
|
||||
<!-- svelte-ignore a11y_consider_explicit_label -->
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
import { HiddenFileSync } from "@/features/HiddenFileSync/CmdHiddenFileSync.ts";
|
||||
import { LOG_LEVEL_NOTICE, Logger } from "octagonal-wheels/common/logger";
|
||||
import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore.ts";
|
||||
import { $msg as translateMessage } from "@/common/translation";
|
||||
export let plugin: ObsidianLiveSyncPlugin;
|
||||
export let core :LiveSyncBaseCore;
|
||||
// $: core = plugin.core;
|
||||
@@ -32,15 +33,17 @@
|
||||
|
||||
const addOn = core.getAddOn<ConfigSync>(ConfigSync.name)!;
|
||||
if (!addOn) {
|
||||
const msg =
|
||||
"AddOn Module (ConfigSync) has not been loaded. This is very unexpected situation. Please report this issue.";
|
||||
const msg = translateMessage(
|
||||
"AddOn Module (ConfigSync) has not been loaded. This is very unexpected situation. Please report this issue."
|
||||
);
|
||||
Logger(msg, LOG_LEVEL_NOTICE);
|
||||
throw new Error(msg);
|
||||
}
|
||||
const addOnHiddenFileSync = core.getAddOn<HiddenFileSync>(HiddenFileSync.name) as HiddenFileSync;
|
||||
if (!addOnHiddenFileSync) {
|
||||
const msg =
|
||||
"AddOn Module (HiddenFileSync) has not been loaded. This is very unexpected situation. Please report this issue.";
|
||||
const msg = translateMessage(
|
||||
"AddOn Module (HiddenFileSync) has not been loaded. This is very unexpected situation. Please report this issue."
|
||||
);
|
||||
Logger(msg, LOG_LEVEL_NOTICE);
|
||||
throw new Error(msg);
|
||||
}
|
||||
@@ -92,9 +95,9 @@
|
||||
}
|
||||
|
||||
const displays = {
|
||||
CONFIG: "Configuration",
|
||||
THEME: "Themes",
|
||||
SNIPPET: "Snippets",
|
||||
CONFIG: translateMessage("Configuration"),
|
||||
THEME: translateMessage("Themes"),
|
||||
SNIPPET: translateMessage("Snippets"),
|
||||
};
|
||||
async function scanAgain() {
|
||||
await addOn.scanAllConfigFiles(true);
|
||||
@@ -156,20 +159,20 @@
|
||||
}
|
||||
function askOverwriteModeForAutomatic(evt: MouseEvent, key: string) {
|
||||
const menu = new Menu();
|
||||
menu.addItem((item) => item.setTitle("Initial Action").setIsLabel(true));
|
||||
menu.addItem((item) => item.setTitle(translateMessage("Initial Action")).setIsLabel(true));
|
||||
menu.addSeparator();
|
||||
menu.addItem((item) => {
|
||||
item.setTitle(`↑: Overwrite Remote`).onClick((e) => {
|
||||
item.setTitle(translateMessage("↑: Overwrite Remote")).onClick((e) => {
|
||||
applyAutomaticSync(key, "pushForce");
|
||||
});
|
||||
})
|
||||
.addItem((item) => {
|
||||
item.setTitle(`↓: Overwrite Local`).onClick((e) => {
|
||||
item.setTitle(translateMessage("↓: Overwrite Local")).onClick((e) => {
|
||||
applyAutomaticSync(key, "pullForce");
|
||||
});
|
||||
})
|
||||
.addItem((item) => {
|
||||
item.setTitle(`⇅: Use newer`).onClick((e) => {
|
||||
item.setTitle(translateMessage("⇅: Use newer")).onClick((e) => {
|
||||
applyAutomaticSync(key, "safe");
|
||||
});
|
||||
});
|
||||
@@ -201,10 +204,10 @@
|
||||
[MODE_SHINY]: ICON_EMOJI_FLAGGED,
|
||||
};
|
||||
const TITLES: { [key: number]: string } = {
|
||||
[MODE_SELECTIVE]: "Selective",
|
||||
[MODE_PAUSED]: "Ignore",
|
||||
[MODE_AUTOMATIC]: "Automatic",
|
||||
[MODE_SHINY]: "Flagged Selective",
|
||||
[MODE_SELECTIVE]: translateMessage("Selective"),
|
||||
[MODE_PAUSED]: translateMessage("Ignore"),
|
||||
[MODE_AUTOMATIC]: translateMessage("Automatic"),
|
||||
[MODE_SHINY]: translateMessage("Flagged Selective"),
|
||||
};
|
||||
const PREFIX_PLUGIN_ALL = "PLUGIN_ALL";
|
||||
const PREFIX_PLUGIN_DATA = "PLUGIN_DATA";
|
||||
@@ -329,28 +332,30 @@
|
||||
|
||||
<div class="buttonsWrap">
|
||||
<div class="buttons">
|
||||
<button on:click={() => scanAgain()}>Scan changes</button>
|
||||
<button on:click={() => replicate()}>Sync once</button>
|
||||
<button on:click={() => requestUpdate()}>Refresh</button>
|
||||
<button on:click={() => scanAgain()}>{translateMessage("Scan changes")}</button>
|
||||
<button on:click={() => replicate()}>{translateMessage("Sync once")}</button>
|
||||
<button on:click={() => requestUpdate()}>{translateMessage("Refresh")}</button>
|
||||
{#if isMaintenanceMode}
|
||||
<button on:click={() => requestReload()}>Reload</button>
|
||||
<button on:click={() => requestReload()}>{translateMessage("Reload")}</button>
|
||||
{/if}
|
||||
</div>
|
||||
<div class="buttons">
|
||||
<button on:click={() => selectAllNewest(true)}>Select All Shiny</button>
|
||||
<button on:click={() => selectAllNewest(false)}>{ICON_EMOJI_FLAGGED} Select Flagged Shiny</button>
|
||||
<button on:click={() => resetSelectNewest()}>Deselect all</button>
|
||||
<button on:click={() => applyAll()} class="mod-cta">Apply All Selected</button>
|
||||
<button on:click={() => selectAllNewest(true)}>{translateMessage("Select All Shiny")}</button>
|
||||
<button on:click={() => selectAllNewest(false)}
|
||||
>{ICON_EMOJI_FLAGGED} {translateMessage("Select Flagged Shiny")}</button
|
||||
>
|
||||
<button on:click={() => resetSelectNewest()}>{translateMessage("Deselect all")}</button>
|
||||
<button on:click={() => applyAll()} class="mod-cta">{translateMessage("Apply All Selected")}</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="loading">
|
||||
{#if loading || $pluginV2Progress !== 0}
|
||||
<span>Updating list...{$pluginV2Progress == 0 ? "" : ` (${$pluginV2Progress})`}</span>
|
||||
<span>{translateMessage("Updating list...")}{$pluginV2Progress == 0 ? "" : ` (${$pluginV2Progress})`}</span>
|
||||
{/if}
|
||||
</div>
|
||||
<div class="list">
|
||||
{#if list.length == 0}
|
||||
<div class="center">No Items.</div>
|
||||
<div class="center">{translateMessage("No Items.")}</div>
|
||||
{:else}
|
||||
{#each displayEntries as [key, label]}
|
||||
<div>
|
||||
@@ -382,7 +387,7 @@
|
||||
</div>
|
||||
{/each}
|
||||
<div>
|
||||
<h3>Plugins</h3>
|
||||
<h3>{translateMessage("Plugins")}</h3>
|
||||
{#each pluginEntries as [name, listX]}
|
||||
{@const bindKeyAll = `${PREFIX_PLUGIN_ALL}/${name}`}
|
||||
{@const modeAll = automaticListDisp.get(bindKeyAll) ?? MODE_SELECTIVE}
|
||||
@@ -464,7 +469,7 @@
|
||||
>
|
||||
{getIcon(modeEtc)}
|
||||
</button>
|
||||
<span class="name">Other files</span>
|
||||
<span class="name">{translateMessage("Other files")}</span>
|
||||
</div>
|
||||
<div class="body">
|
||||
{#if modeEtc == MODE_SELECTIVE || modeEtc == MODE_SHINY}
|
||||
@@ -492,9 +497,9 @@
|
||||
{#if isMaintenanceMode}
|
||||
<div class="buttons">
|
||||
<div>
|
||||
<h3>Maintenance Commands</h3>
|
||||
<h3>{translateMessage("Maintenance Commands")}</h3>
|
||||
<div class="maintenancerow">
|
||||
<label for="">Delete All of </label>
|
||||
<label for="">{translateMessage("Delete All of")} </label>
|
||||
<select bind:value={deleteTerm}>
|
||||
{#each allTerms as term}
|
||||
<option value={term}>{term}</option>
|
||||
@@ -513,10 +518,20 @@
|
||||
</div>
|
||||
{/if}
|
||||
<div class="buttons">
|
||||
<label><span>Hide not applicable items</span><input type="checkbox" bind:checked={hideEven} /></label>
|
||||
<label
|
||||
><span>{translateMessage("Hide not applicable items")}</span><input
|
||||
type="checkbox"
|
||||
bind:checked={hideEven}
|
||||
/></label
|
||||
>
|
||||
</div>
|
||||
<div class="buttons">
|
||||
<label><span>Maintenance mode</span><input type="checkbox" bind:checked={isMaintenanceMode} /></label>
|
||||
<label
|
||||
><span>{translateMessage("Maintenance mode")}</span><input
|
||||
type="checkbox"
|
||||
bind:checked={isMaintenanceMode}
|
||||
/></label
|
||||
>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import type { FilePath, LoadedEntry } from "@vrtmrz/livesync-commonlib/compat/common/types";
|
||||
import { decodeBinary, readString } from "@vrtmrz/livesync-commonlib/compat/string_and_binary/convert";
|
||||
import { getDocData, isObjectDifferent, mergeObject } from "@vrtmrz/livesync-commonlib/compat/common/utils";
|
||||
import { $msg as translateMessage } from "@/common/translation";
|
||||
|
||||
interface Props {
|
||||
docs?: LoadedEntry[];
|
||||
@@ -115,7 +116,7 @@
|
||||
let newModes = [] as typeof modesSrc;
|
||||
|
||||
if (!hideLocal) {
|
||||
newModes.push(["", "Not now"]);
|
||||
newModes.push(["", translateMessage("Not now")]);
|
||||
newModes.push(["A", nameA || "A"]);
|
||||
}
|
||||
newModes.push(["B", nameB || "B"]);
|
||||
@@ -127,9 +128,9 @@
|
||||
|
||||
<h2>{filename}</h2>
|
||||
{#if !docA || !docB}
|
||||
<div class="message">Just for a minute, please!</div>
|
||||
<div class="message">{translateMessage("Just for a minute, please!")}</div>
|
||||
<div class="buttons">
|
||||
<button onclick={apply}>Dismiss</button>
|
||||
<button onclick={apply}>{translateMessage("Dismiss")}</button>
|
||||
</div>
|
||||
{:else}
|
||||
<div class="options">
|
||||
@@ -152,7 +153,7 @@
|
||||
{/each}
|
||||
</div>
|
||||
{:else}
|
||||
NO PREVIEW
|
||||
{translateMessage("NO PREVIEW")}
|
||||
{/if}
|
||||
|
||||
<div class="infos">
|
||||
|
||||
@@ -57,6 +57,7 @@ import { tryGetFilePath } from "@vrtmrz/livesync-commonlib/compat/common/utils.d
|
||||
import { configureHiddenFileSyncMode, type ConfigureHiddenFileSyncResult } from "./configureHiddenFileSyncMode.ts";
|
||||
import type { OptionalSyncFeatureMode } from "@/features/optionalSyncFeatures.ts";
|
||||
import { getObsidianCommunityPluginManager } from "@/common/obsidianCommunityPlugins.ts";
|
||||
import { $msg } from "@/common/translation";
|
||||
type SyncDirection = "push" | "pull" | "safe" | "pullForce" | "pushForce";
|
||||
|
||||
type HiddenFileInitialisationProgress = {
|
||||
@@ -1539,10 +1540,7 @@ Offline Changed files: ${files.length}`;
|
||||
this.core.databaseFileAccess.fetchEntryMeta(prefixedFileName, undefined, true),
|
||||
this.core.databaseFileAccess.getConflictedRevs(prefixedFileName),
|
||||
]);
|
||||
const liveRevisions = new Set([
|
||||
...(current && current._rev ? [current._rev] : []),
|
||||
...conflicts,
|
||||
]);
|
||||
const liveRevisions = new Set([...(current && current._rev ? [current._rev] : []), ...conflicts]);
|
||||
if (!selected || selected._rev !== revision || !liveRevisions.has(revision)) {
|
||||
this._log(
|
||||
`Could not use hidden-file revision ${revision} of ${stripAllPrefixes(prefixedFileName)}; the selected revision is no longer live`,
|
||||
@@ -1834,15 +1832,7 @@ Offline Changed files: ${files.length}`;
|
||||
force = false
|
||||
): Promise<boolean> {
|
||||
return Boolean(
|
||||
await this.extractInternalFileFromDatabase(
|
||||
storageFilePath,
|
||||
force,
|
||||
undefined,
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
revision
|
||||
)
|
||||
await this.extractInternalFileFromDatabase(storageFilePath, force, undefined, true, false, true, revision)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1917,7 +1907,9 @@ Offline Changed files: ${files.length}`;
|
||||
private _allSuspendExtraSync(): Promise<boolean> {
|
||||
if (this.core.settings.syncInternalFiles) {
|
||||
this._log(
|
||||
"Hidden file synchronization have been temporarily disabled. Please enable them after the fetching, if you need them.",
|
||||
$msg(
|
||||
"Hidden file synchronization have been temporarily disabled. Please enable them after the fetching, if you need them."
|
||||
),
|
||||
LOG_LEVEL_NOTICE
|
||||
);
|
||||
this.core.settings.syncInternalFiles = false;
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
import type { LiveSyncTrysteroReplicator } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/LiveSyncTrysteroReplicator";
|
||||
import { delay, fireAndForget } from "octagonal-wheels/promises";
|
||||
import P2PServerStatusCard from "./P2PServerStatusCard.svelte";
|
||||
import { $msg as translateMessage } from "@/common/translation";
|
||||
|
||||
interface Props {
|
||||
liveSyncReplicator: LiveSyncTrysteroReplicator;
|
||||
@@ -84,11 +85,11 @@
|
||||
}
|
||||
|
||||
function getAcceptanceStatus(peer: P2PServerInfo["knownAdvertisements"][number]) {
|
||||
if (peer.isTemporaryAccepted === true) return "ACCEPTED (in session)";
|
||||
if (peer.isAccepted === true) return "ACCEPTED";
|
||||
if (peer.isTemporaryAccepted === false) return "DENIED (in session)";
|
||||
if (peer.isAccepted === false) return "DENIED";
|
||||
return "NEW";
|
||||
if (peer.isTemporaryAccepted === true) return translateMessage("ACCEPTED (in session)");
|
||||
if (peer.isAccepted === true) return translateMessage("ACCEPTED");
|
||||
if (peer.isTemporaryAccepted === false) return translateMessage("DENIED (in session)");
|
||||
if (peer.isAccepted === false) return translateMessage("DENIED");
|
||||
return translateMessage("NEW");
|
||||
}
|
||||
|
||||
function getAcceptanceStatusClass(peer: P2PServerInfo["knownAdvertisements"][number]) {
|
||||
@@ -102,7 +103,7 @@
|
||||
<P2PServerStatusCard {getLiveSyncReplicator} showBroadcastToggle={false} />
|
||||
|
||||
<div class="peers-section">
|
||||
<h3>Available Peers</h3>
|
||||
<h3>{translateMessage("Available Peers")}</h3>
|
||||
{#if serverInfo && serverInfo.knownAdvertisements.length > 0}
|
||||
<div class="peers-list">
|
||||
{#each serverInfo.knownAdvertisements as peer (peer.peerId)}
|
||||
@@ -126,14 +127,18 @@
|
||||
disabled={syncingPeerId !== null}
|
||||
onclick={() => handleSync(peer.peerId)}
|
||||
>
|
||||
{syncingPeerId === peer.peerId ? "Syncing..." : "Sync"}
|
||||
{syncingPeerId === peer.peerId
|
||||
? translateMessage("Syncing...")
|
||||
: translateMessage("Sync")}
|
||||
</button>
|
||||
<button
|
||||
class="btn {rebuildMode ? 'btn-primary' : 'btn-secondary'}"
|
||||
disabled={syncingPeerId !== null}
|
||||
onclick={() => handleSyncThenClose(peer.peerId)}
|
||||
>
|
||||
{syncingPeerId === peer.peerId ? "Syncing..." : "Start Sync & Close"}
|
||||
{syncingPeerId === peer.peerId
|
||||
? translateMessage("Syncing...")
|
||||
: translateMessage("Start Sync & Close")}
|
||||
</button>
|
||||
{:else}
|
||||
<button
|
||||
@@ -141,7 +146,9 @@
|
||||
disabled={syncingPeerId !== null}
|
||||
onclick={() => handleSyncThenClose(peer.peerId)}
|
||||
>
|
||||
{syncingPeerId === peer.peerId ? "Syncing..." : "Sync"}
|
||||
{syncingPeerId === peer.peerId
|
||||
? translateMessage("Syncing...")
|
||||
: translateMessage("Sync")}
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
@@ -149,16 +156,22 @@
|
||||
{/each}
|
||||
</div>
|
||||
{:else if serverInfo}
|
||||
<p class="no-peers">No devices available. Waiting for other devices to connect...</p>
|
||||
<p class="no-peers">
|
||||
{translateMessage("No devices available. Waiting for other devices to connect...")}
|
||||
</p>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
{#if rebuildMode}
|
||||
<button class="btn btn-cancel" onclick={onClose} disabled={syncingPeerId !== null}>Skip and close</button>
|
||||
<button class="btn btn-cancel" onclick={onClose} disabled={syncingPeerId !== null}
|
||||
>{translateMessage("Skip and close")}</button
|
||||
>
|
||||
{:else}
|
||||
<button class="btn btn-cancel" onclick={onClose}>Close</button>
|
||||
<button class="btn btn-cancel" onclick={onCloseAndDisconnect}>Close & Disconnect</button>
|
||||
<button class="btn btn-cancel" onclick={onClose}>{translateMessage("Close")}</button>
|
||||
<button class="btn btn-cancel" onclick={onCloseAndDisconnect}
|
||||
>{translateMessage("Close & Disconnect")}</button
|
||||
>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -263,7 +263,7 @@
|
||||
</script>
|
||||
|
||||
<article>
|
||||
<h1>Peer to Peer Replicator</h1>
|
||||
<h1>{_msg("Peer to Peer Replicator")}</h1>
|
||||
<details bind:open={isNoticeOpened}>
|
||||
<summary>{_msg("P2P.Note.Summary")}</summary>
|
||||
<p class="important">{_msg("P2P.Note.important_note")}</p>
|
||||
@@ -274,23 +274,23 @@
|
||||
<p>{paragraph}</p>
|
||||
{/each}
|
||||
</details>
|
||||
<h2>Connection Settings</h2>
|
||||
<h2>{_msg("Connection Settings")}</h2>
|
||||
{#if isObsidian}
|
||||
You can configure in the Obsidian Plugin Settings.
|
||||
{_msg("You can configure in the Obsidian Plugin Settings.")}
|
||||
{:else}
|
||||
<details bind:open={isSettingOpened}>
|
||||
<summary>{eRelay}</summary>
|
||||
<table class="settings">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th> Enable P2P Replicator </th>
|
||||
<th>{_msg("Enable P2P Replicator")}</th>
|
||||
<td>
|
||||
<label class={{ "is-dirty": isP2PEnabledModified }}>
|
||||
<input type="checkbox" bind:checked={eP2PEnabled} />
|
||||
</label>
|
||||
</td>
|
||||
</tr><tr>
|
||||
<th> Relay settings </th>
|
||||
<th>{_msg("Relay settings")}</th>
|
||||
<td>
|
||||
<label class={{ "is-dirty": isRelayModified }}>
|
||||
<input
|
||||
@@ -299,12 +299,12 @@
|
||||
bind:value={eRelay}
|
||||
autocomplete="off"
|
||||
/>
|
||||
<button onclick={() => useDefaultRelay()}> Use vrtmrz's relay </button>
|
||||
<button onclick={() => useDefaultRelay()}>{_msg("Use vrtmrz's relay")}</button>
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th> Room ID </th>
|
||||
<th>{_msg("Room ID")}</th>
|
||||
<td>
|
||||
<label class={{ "is-dirty": isRoomIdModified }}>
|
||||
<input
|
||||
@@ -315,31 +315,32 @@
|
||||
spellcheck="false"
|
||||
autocorrect="off"
|
||||
/>
|
||||
<button onclick={() => chooseRandom()}> Use Random Number </button>
|
||||
<button onclick={() => chooseRandom()}>{_msg("Use Random Number")}</button>
|
||||
</label>
|
||||
<span>
|
||||
<small>
|
||||
This can isolate your connections between devices. Use the same Room ID for the same
|
||||
devices.</small
|
||||
<small
|
||||
>{_msg(
|
||||
"This can isolate your connections between devices. Use the same Room ID for the same devices."
|
||||
)}</small
|
||||
>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th> Password </th>
|
||||
<th>{_msg("Password")}</th>
|
||||
<td>
|
||||
<label class={{ "is-dirty": isPasswordModified }}>
|
||||
<input type="password" placeholder="password" bind:value={ePassword} />
|
||||
</label>
|
||||
<span>
|
||||
<small>
|
||||
This password is used to encrypt the connection. Use something long enough.
|
||||
{_msg("This password is used to encrypt the connection. Use something long enough.")}
|
||||
</small>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th> This device name </th>
|
||||
<th>{_msg("This device name")}</th>
|
||||
<td>
|
||||
<label class={{ "is-dirty": isDeviceNameModified }}>
|
||||
<input
|
||||
@@ -351,14 +352,15 @@
|
||||
</label>
|
||||
<span>
|
||||
<small>
|
||||
Device name to identify the device. Please use shorter one for the stable peer
|
||||
detection, i.e., "iphone-16" or "macbook-2021".
|
||||
{_msg(
|
||||
'Device name to identify the device. Please use shorter one for the stable peer detection, i.e., "iphone-16" or "macbook-2021".'
|
||||
)}
|
||||
</small>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th> Auto Connect </th>
|
||||
<th>{_msg("Auto Connect")}</th>
|
||||
<td>
|
||||
<label class={{ "is-dirty": isAutoStartModified }}>
|
||||
<input type="checkbox" bind:checked={eAutoStart} />
|
||||
@@ -366,7 +368,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th> Start change-broadcasting on Connect </th>
|
||||
<th>{_msg("Start change-broadcasting on Connect")}</th>
|
||||
<td>
|
||||
<label class={{ "is-dirty": isAutoBroadcastModified }}>
|
||||
<input type="checkbox" bind:checked={eAutoBroadcast} />
|
||||
@@ -383,39 +385,43 @@
|
||||
</tr> -->
|
||||
</tbody>
|
||||
</table>
|
||||
<button disabled={!isAnyModified} class="button mod-cta" onclick={saveAndApply}>Save and Apply</button>
|
||||
<button disabled={!isAnyModified} class="button" onclick={revert}>Revert changes</button>
|
||||
<button disabled={!isAnyModified} class="button mod-cta" onclick={saveAndApply}
|
||||
>{_msg("Save and Apply")}</button
|
||||
>
|
||||
<button disabled={!isAnyModified} class="button" onclick={revert}>{_msg("Revert changes")}</button>
|
||||
</details>
|
||||
{/if}
|
||||
|
||||
<div>
|
||||
<h2>Signaling Server Connection</h2>
|
||||
<h2>{_msg("Signaling Server Connection")}</h2>
|
||||
<div>
|
||||
{#if !isConnected}
|
||||
<p>No Connection</p>
|
||||
<p>{_msg("No Connection")}</p>
|
||||
{:else}
|
||||
<p>Connected to Signaling Server (as Peer ID: {serverPeerId})</p>
|
||||
<p>{_msg("Connected to Signaling Server (as Peer ID: ${peerId})", { peerId: serverPeerId })}</p>
|
||||
{/if}
|
||||
</div>
|
||||
<div>
|
||||
{#if !isConnected}
|
||||
<button onclick={openServer}>Connect</button>
|
||||
<button onclick={openServer}>{_msg("Connect")}</button>
|
||||
{:else}
|
||||
<button onclick={closeServer}>Disconnect</button>
|
||||
<button onclick={closeServer}>{_msg("Disconnect")}</button>
|
||||
{#if replicatorInfo?.isBroadcasting !== undefined}
|
||||
{#if replicatorInfo?.isBroadcasting}
|
||||
<button onclick={stopBroadcasting}>Stop Broadcasting</button>
|
||||
<button onclick={stopBroadcasting}>{_msg("Stop Broadcasting")}</button>
|
||||
{:else}
|
||||
<button onclick={startBroadcasting}>Start Broadcasting</button>
|
||||
<button onclick={startBroadcasting}>{_msg("Start Broadcasting")}</button>
|
||||
{/if}
|
||||
{/if}
|
||||
<details>
|
||||
<summary>Broadcasting?</summary>
|
||||
<summary>{_msg("Broadcasting?")}</summary>
|
||||
<p>
|
||||
<small>
|
||||
If you want to use `LiveSync`, you should broadcast changes. All `watching` peers which
|
||||
detects this will start the replication for fetching. <br />
|
||||
However, This should not be enabled if you want to increase your secrecy more.
|
||||
{_msg(
|
||||
"If you want to use `LiveSync`, you should broadcast changes. All `watching` peers which detects this will start the replication for fetching."
|
||||
)}
|
||||
<br />
|
||||
{_msg("However, This should not be enabled if you want to increase your secrecy more.")}
|
||||
</small>
|
||||
</p>
|
||||
</details>
|
||||
@@ -424,13 +430,13 @@
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<h2>Peers</h2>
|
||||
<h2>{_msg("Peers")}</h2>
|
||||
<table class="peers">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Action</th>
|
||||
<th>Command</th>
|
||||
<th>{_msg("Name")}</th>
|
||||
<th>{_msg("Action")}</th>
|
||||
<th>{_msg("Command")}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@@ -95,40 +95,40 @@
|
||||
</script>
|
||||
|
||||
<div class="server-status">
|
||||
<h3>Signalling Status</h3>
|
||||
<h3>{translateMessage("Signalling Status")}</h3>
|
||||
|
||||
<div class="status-item">
|
||||
<span>Connection:</span>
|
||||
<span>{translateMessage("Connection:")}</span>
|
||||
<span class="status-value {isConnected ? 'connected' : 'disconnected'}">
|
||||
{isConnected ? "🟢 Connected" : "🔴 Disconnected"}
|
||||
{isConnected ? translateMessage("🟢 Connected") : translateMessage("🔴 Disconnected")}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="status-item status-action">
|
||||
{#if !isConnected}
|
||||
<button onclick={onOpenConnection}>Open connection</button>
|
||||
<button onclick={onOpenConnection}>{translateMessage("Open connection")}</button>
|
||||
{:else}
|
||||
<button onclick={onDisconnect}>Disconnect</button>
|
||||
<button onclick={onDisconnect}>{translateMessage("Disconnect")}</button>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
{#if serverInfo}
|
||||
<div class="status-item">
|
||||
<span>Room ID suffix:</span>
|
||||
<span class="room-suffix-display" title={roomSuffix || "Not configured"}>
|
||||
<span>{translateMessage("Room ID suffix:")}</span>
|
||||
<span class="room-suffix-display" title={roomSuffix || translateMessage("Not configured")}>
|
||||
{roomSuffix || "-"}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="status-item">
|
||||
<span>Peer ID:</span>
|
||||
<span>{translateMessage("Peer ID:")}</span>
|
||||
<span class="peer-id-display" title={serverInfo.serverPeerId}>
|
||||
{serverInfo.serverPeerId.slice(0, 12)}...
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="status-item">
|
||||
<span>Devices:</span>
|
||||
<span>{translateMessage("Devices:")}</span>
|
||||
<span>{serverInfo.knownAdvertisements.length}</span>
|
||||
</div>
|
||||
{/if}
|
||||
@@ -146,7 +146,7 @@
|
||||
? translateMessage("Stop announcing changes")
|
||||
: translateMessage("Start announcing changes")}
|
||||
>
|
||||
{isBroadcasting ? '📡 On' : '📡 Off'}
|
||||
{isBroadcasting ? translateMessage("📡 On") : translateMessage("📡 Off")}
|
||||
</button>
|
||||
</div>
|
||||
{/if}
|
||||
@@ -154,39 +154,39 @@
|
||||
{#if core}
|
||||
<div class="status-item status-action diag-toggle-row">
|
||||
<label class="broadcast-label" for="diag-toggle">
|
||||
🕵️ Diag
|
||||
{translateMessage("🕵️ Diag")}
|
||||
</label>
|
||||
<button
|
||||
id="diag-toggle"
|
||||
class="broadcast-button {useDiagRTC ? 'is-on' : 'is-off'}"
|
||||
onclick={toggleDiagRTC}
|
||||
title={useDiagRTC
|
||||
? 'Diagnostic RTCPeerConnection is enabled'
|
||||
: 'Use Diagnostic RTCPeerConnection for statistics'}
|
||||
? translateMessage("Diagnostic RTCPeerConnection is enabled")
|
||||
: translateMessage("Use Diagnostic RTCPeerConnection for statistics")}
|
||||
>
|
||||
{useDiagRTC ? 'On' : 'Off'}
|
||||
{useDiagRTC ? translateMessage("On") : translateMessage("Off")}
|
||||
</button>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{#if serverInfo}
|
||||
<div class="diag-section">
|
||||
<h4>Stats</h4>
|
||||
<h4>{translateMessage("Stats")}</h4>
|
||||
<div class="diag-grid">
|
||||
<div class="diag-item">
|
||||
<span>Incoming:</span>
|
||||
<span>{translateMessage("Incoming:")}</span>
|
||||
<span>{serverInfo.diag.totalNewConnections}</span>
|
||||
</div>
|
||||
<div class="diag-item">
|
||||
<span>Connected:</span>
|
||||
<span>{translateMessage("Connected:")}</span>
|
||||
<span>{serverInfo.diag.totalSuccessfulConnections}</span>
|
||||
</div>
|
||||
<div class="diag-item">
|
||||
<span>Failed:</span>
|
||||
<span>{translateMessage("Failed:")}</span>
|
||||
<span>{serverInfo.diag.totalFailedConnections}</span>
|
||||
</div>
|
||||
<div class="diag-item">
|
||||
<span>Closed:</span>
|
||||
<span>{translateMessage("Closed:")}</span>
|
||||
<span>{serverInfo.diag.totalClosedConnections}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -170,11 +170,11 @@
|
||||
});
|
||||
|
||||
function getAcceptanceStatus(peer: P2PServerInfo["knownAdvertisements"][number]) {
|
||||
if (peer.isTemporaryAccepted === true) return "ACCEPTED (in session)";
|
||||
if (peer.isAccepted === true) return "ACCEPTED";
|
||||
if (peer.isTemporaryAccepted === false) return "DENIED (in session)";
|
||||
if (peer.isAccepted === false) return "DENIED";
|
||||
return "NEW";
|
||||
if (peer.isTemporaryAccepted === true) return translateMessage("ACCEPTED (in session)");
|
||||
if (peer.isAccepted === true) return translateMessage("ACCEPTED");
|
||||
if (peer.isTemporaryAccepted === false) return translateMessage("DENIED (in session)");
|
||||
if (peer.isAccepted === false) return translateMessage("DENIED");
|
||||
return translateMessage("NEW");
|
||||
}
|
||||
|
||||
function getAcceptanceStatusClass(peer: P2PServerInfo["knownAdvertisements"][number]) {
|
||||
@@ -409,7 +409,7 @@
|
||||
|
||||
<div class="p2p-container">
|
||||
<div class="pane-header">
|
||||
<h2>P2P Status</h2>
|
||||
<h2>{translateMessage("P2P Status")}</h2>
|
||||
<div class="pane-header-actions">
|
||||
<div class="remote-picker-wrap">
|
||||
<select
|
||||
@@ -417,11 +417,11 @@
|
||||
value={selectedP2PRemoteConfigurationId}
|
||||
onchange={onP2PRemoteSelected}
|
||||
disabled={selectingP2PRemote}
|
||||
aria-label="Select active P2P remote"
|
||||
title="Select active P2P remote"
|
||||
aria-label={translateMessage("Select active P2P remote")}
|
||||
title={translateMessage("Select active P2P remote")}
|
||||
>
|
||||
{#if p2pRemoteOptions.length === 0}
|
||||
<option value="">Select P2P remote...</option>
|
||||
<option value="">{translateMessage("Select P2P remote...")}</option>
|
||||
{/if}
|
||||
{#each p2pRemoteOptions as option}
|
||||
<option value={option.id}>
|
||||
@@ -432,8 +432,8 @@
|
||||
<button
|
||||
class="icon-button"
|
||||
onclick={() => createAndSelectP2PRemote()}
|
||||
title="Create P2P remote"
|
||||
aria-label="Create P2P remote"
|
||||
title={translateMessage("Create P2P remote")}
|
||||
aria-label={translateMessage("Create P2P remote")}
|
||||
>
|
||||
+
|
||||
</button>
|
||||
@@ -441,8 +441,8 @@
|
||||
<button
|
||||
class="icon-button"
|
||||
onclick={openConnectionSettings}
|
||||
title="Open P2P Setup..."
|
||||
aria-label="Open P2P Setup..."
|
||||
title={translateMessage("Open P2P Setup...")}
|
||||
aria-label={translateMessage("Open P2P Setup...")}
|
||||
>
|
||||
⚙
|
||||
</button>
|
||||
@@ -450,15 +450,17 @@
|
||||
</div>
|
||||
|
||||
{#if !canEditP2PSettings()}
|
||||
<p class="warning-line">Please select an active P2P remote configuration to change P2P sync targets.</p>
|
||||
<p class="warning-line">
|
||||
{translateMessage("Please select an active P2P remote configuration to change P2P sync targets.")}
|
||||
</p>
|
||||
{/if}
|
||||
|
||||
<P2PServerStatusCard {getLiveSyncReplicator} {core} />
|
||||
|
||||
<div class="peers-section">
|
||||
<div class="peers-header">
|
||||
<h3>Detected Peers</h3>
|
||||
<button class="refresh" onclick={requestServerStatus}>Refresh</button>
|
||||
<h3>{translateMessage("Detected Peers")}</h3>
|
||||
<button class="refresh" onclick={requestServerStatus}>{translateMessage("Refresh")}</button>
|
||||
</div>
|
||||
|
||||
{#if serverInfo && serverInfo.knownAdvertisements.length > 0}
|
||||
@@ -470,7 +472,11 @@
|
||||
{peer.name} :
|
||||
<span class="peer-id-mini" title={peer.peerId}>({peer.peerId.slice(0, 8)})</span>
|
||||
{#if isCommunicating(peer.peerId)}
|
||||
<span class="comm-icon" title="Communicating" aria-label="Communicating">📡</span>
|
||||
<span
|
||||
class="comm-icon"
|
||||
title={translateMessage("Communicating")}
|
||||
aria-label={translateMessage("Communicating")}>📡</span
|
||||
>
|
||||
{/if}
|
||||
</div>
|
||||
<div class="peer-meta">
|
||||
@@ -486,8 +492,12 @@
|
||||
<button
|
||||
class="emoji-button"
|
||||
disabled={replicatingPeerId !== null}
|
||||
title={replicatingPeerId === peer.peerId ? "Replicating..." : "Replicate now"}
|
||||
aria-label={replicatingPeerId === peer.peerId ? "Replicating" : "Replicate now"}
|
||||
title={replicatingPeerId === peer.peerId
|
||||
? translateMessage("Replicating...")
|
||||
: translateMessage("Replicate now")}
|
||||
aria-label={replicatingPeerId === peer.peerId
|
||||
? translateMessage("Replicating")
|
||||
: translateMessage("Replicate now")}
|
||||
onclick={() => startReplication(peer)}
|
||||
>
|
||||
{replicatingPeerId === peer.peerId ? "⏳" : "🔄"}
|
||||
@@ -497,7 +507,7 @@
|
||||
disabled={decidingPeerId !== null}
|
||||
onclick={() => revokeDecision(peer)}
|
||||
>
|
||||
Revoke
|
||||
{translateMessage("Revoke")}
|
||||
</button>
|
||||
<button
|
||||
class="emoji-button"
|
||||
@@ -534,11 +544,11 @@
|
||||
</span>
|
||||
</div>
|
||||
<div class="decision-row">
|
||||
<span class="decision-label">PERMANENT</span>
|
||||
<span class="decision-label">{translateMessage("PERMANENT")}</span>
|
||||
<button
|
||||
class="emoji-button"
|
||||
title="Allow permanently"
|
||||
aria-label="Allow permanently"
|
||||
title={translateMessage("Allow permanently")}
|
||||
aria-label={translateMessage("Allow permanently")}
|
||||
disabled={decidingPeerId !== null}
|
||||
onclick={() => makeDecision(peer, true, false)}
|
||||
>
|
||||
@@ -546,8 +556,8 @@
|
||||
</button>
|
||||
<button
|
||||
class="emoji-button mod-warning"
|
||||
title="Deny permanently"
|
||||
aria-label="Deny permanently"
|
||||
title={translateMessage("Deny permanently")}
|
||||
aria-label={translateMessage("Deny permanently")}
|
||||
disabled={decidingPeerId !== null}
|
||||
onclick={() => makeDecision(peer, false, false)}
|
||||
>
|
||||
@@ -555,11 +565,11 @@
|
||||
</button>
|
||||
</div>
|
||||
<div class="decision-row">
|
||||
<span class="decision-label">SESSION</span>
|
||||
<span class="decision-label">{translateMessage("SESSION")}</span>
|
||||
<button
|
||||
class="emoji-button"
|
||||
title="Allow in session"
|
||||
aria-label="Allow in session"
|
||||
title={translateMessage("Allow in session")}
|
||||
aria-label={translateMessage("Allow in session")}
|
||||
disabled={decidingPeerId !== null}
|
||||
onclick={() => makeDecision(peer, true, true)}
|
||||
>
|
||||
@@ -567,8 +577,8 @@
|
||||
</button>
|
||||
<button
|
||||
class="emoji-button mod-warning"
|
||||
title="Deny in session"
|
||||
aria-label="Deny in session"
|
||||
title={translateMessage("Deny in session")}
|
||||
aria-label={translateMessage("Deny in session")}
|
||||
disabled={decidingPeerId !== null}
|
||||
onclick={() => makeDecision(peer, false, true)}
|
||||
>
|
||||
@@ -582,7 +592,7 @@
|
||||
disabled={decidingPeerId !== null}
|
||||
onclick={() => revokeDecision(peer)}
|
||||
>
|
||||
Revoke
|
||||
{translateMessage("Revoke")}
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
@@ -590,9 +600,11 @@
|
||||
{/each}
|
||||
</div>
|
||||
{:else if serverInfo}
|
||||
<p class="no-peers">No devices available. Waiting for other devices to connect...</p>
|
||||
<p class="no-peers">
|
||||
{translateMessage("No devices available. Waiting for other devices to connect...")}
|
||||
</p>
|
||||
{:else}
|
||||
<p class="no-peers">Fetching status...</p>
|
||||
<p class="no-peers">{translateMessage("Fetching status...")}</p>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { AcceptedStatus, type PeerStatus } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/P2PReplicatorPaneCommon";
|
||||
import type { P2PReplicatorHandle } from "./P2PReplicatorPaneHost";
|
||||
import { $msg as translateMessage } from "@/common/translation";
|
||||
|
||||
interface Props {
|
||||
peerStatus: PeerStatus;
|
||||
@@ -27,6 +28,11 @@
|
||||
peer.isSending ? ["SENDING"] : [],
|
||||
].flat()
|
||||
);
|
||||
const chipLabels: Record<string, string> = {
|
||||
WATCHING: translateMessage("WATCHING"),
|
||||
FETCHING: translateMessage("FETCHING"),
|
||||
SENDING: translateMessage("SENDING"),
|
||||
};
|
||||
let acceptedStatusChip = $derived.by(() =>
|
||||
select(
|
||||
peer.accepted.toString(),
|
||||
@@ -40,6 +46,13 @@
|
||||
""
|
||||
) ?? ""
|
||||
);
|
||||
const acceptedStatusLabels: Record<string, string> = {
|
||||
ACCEPTED: translateMessage("ACCEPTED"),
|
||||
"ACCEPTED (in session)": translateMessage("ACCEPTED (in session)"),
|
||||
"DENIED (in session)": translateMessage("DENIED (in session)"),
|
||||
DENIED: translateMessage("DENIED"),
|
||||
NEW: translateMessage("NEW"),
|
||||
};
|
||||
const classList = {
|
||||
["SENDING"]: "connected",
|
||||
["FETCHING"]: "connected",
|
||||
@@ -75,13 +88,13 @@
|
||||
const peerAttrLabels = $derived.by(() => {
|
||||
const attrs = [];
|
||||
if (peer.syncOnConnect) {
|
||||
attrs.push("✔ SYNC");
|
||||
attrs.push(translateMessage("✔ SYNC"));
|
||||
}
|
||||
if (peer.watchOnConnect) {
|
||||
attrs.push("✔ WATCH");
|
||||
attrs.push(translateMessage("✔ WATCH"));
|
||||
}
|
||||
if (peer.syncOnReplicationCommand) {
|
||||
attrs.push("✔ SELECT");
|
||||
attrs.push(translateMessage("✔ SELECT"));
|
||||
}
|
||||
return attrs;
|
||||
});
|
||||
@@ -113,12 +126,14 @@
|
||||
</div>
|
||||
<div class="status-chips">
|
||||
<div class="row">
|
||||
<span class="chip {select(acceptedStatusChip, classList)}">{acceptedStatusChip}</span>
|
||||
<span class="chip {select(acceptedStatusChip, classList)}"
|
||||
>{acceptedStatusLabels[acceptedStatusChip] ?? acceptedStatusChip}</span
|
||||
>
|
||||
</div>
|
||||
{#if isAccepted}
|
||||
<div class="row">
|
||||
{#each statusChips as chip}
|
||||
<span class="chip {select(chip, classList)}">{chip}</span>
|
||||
<span class="chip {select(chip, classList)}">{chipLabels[chip] ?? chip}</span>
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
@@ -134,15 +149,25 @@
|
||||
<div class="row">
|
||||
{#if isNew}
|
||||
{#if !isAccepted}
|
||||
<button class="button" onclick={() => makeDecision(true, true)}>Accept in session</button>
|
||||
<button class="button mod-cta" onclick={() => makeDecision(true, false)}>Accept</button>
|
||||
<button class="button" onclick={() => makeDecision(true, true)}
|
||||
>{translateMessage("Accept in session")}</button
|
||||
>
|
||||
<button class="button mod-cta" onclick={() => makeDecision(true, false)}
|
||||
>{translateMessage("Accept")}</button
|
||||
>
|
||||
{/if}
|
||||
{#if !isDenied}
|
||||
<button class="button" onclick={() => makeDecision(false, true)}>Deny in session</button>
|
||||
<button class="button mod-warning" onclick={() => makeDecision(false, false)}>Deny</button>
|
||||
<button class="button" onclick={() => makeDecision(false, true)}
|
||||
>{translateMessage("Deny in session")}</button
|
||||
>
|
||||
<button class="button mod-warning" onclick={() => makeDecision(false, false)}
|
||||
>{translateMessage("Deny")}</button
|
||||
>
|
||||
{/if}
|
||||
{:else}
|
||||
<button class="button mod-warning" onclick={() => revokeDecision()}>Revoke</button>
|
||||
<button class="button mod-warning" onclick={() => revokeDecision()}
|
||||
>{translateMessage("Revoke")}</button
|
||||
>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
@@ -155,9 +180,9 @@
|
||||
<!-- <button class="button" onclick={replicateFrom} disabled={peer.isFetching}>📥</button>
|
||||
<button class="button" onclick={replicateTo} disabled={peer.isSending}>📤</button> -->
|
||||
{#if peer.isWatching}
|
||||
<button class="button" onclick={stopWatching}>Stop ⚡</button>
|
||||
<button class="button" onclick={stopWatching}>{translateMessage("Stop ⚡")}</button>
|
||||
{:else}
|
||||
<button class="button" onclick={startWatching} title="live">⚡</button>
|
||||
<button class="button" onclick={startWatching} title={translateMessage("live")}>⚡</button>
|
||||
{/if}
|
||||
{#if showPeerMenu}
|
||||
<button class="button" onclick={moreMenu}>...</button>
|
||||
|
||||
@@ -24,9 +24,16 @@ import type { ReactiveSource } from "octagonal-wheels/dataobject/reactive_v2";
|
||||
import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore";
|
||||
import { isNotFoundError } from "@vrtmrz/livesync-commonlib/compat/common/utils.doc";
|
||||
import type PouchDB from "pouchdb-core";
|
||||
import { promiseWithResolvers, type PromiseWithResolvers } from "octagonal-wheels/promises";
|
||||
|
||||
const KV_KEY_REPLICATION_RESULT_PROCESSOR_SNAPSHOT = "replicationResultProcessorSnapshot";
|
||||
const REPROCESS_BATCH_SIZE = 100;
|
||||
type LocalApplicationActivityOwner = {
|
||||
runBoundedLocalApplicationActivity<T>(
|
||||
task: () => T | PromiseLike<T>,
|
||||
options?: { label?: string }
|
||||
): Promise<T>;
|
||||
};
|
||||
type ReplicateResultProcessorState = {
|
||||
queued: PouchDB.Core.ExistingDocument<EntryDoc>[];
|
||||
processing: PouchDB.Core.ExistingDocument<EntryDoc>[];
|
||||
@@ -67,9 +74,11 @@ export class ReplicateResultProcessor {
|
||||
|
||||
public suspend() {
|
||||
this._suspended = true;
|
||||
this.updateProcessingActivity();
|
||||
}
|
||||
public resume() {
|
||||
this._suspended = false;
|
||||
this.updateProcessingActivity();
|
||||
fireAndForget(() => this.runProcessQueue());
|
||||
}
|
||||
|
||||
@@ -251,6 +260,40 @@ export class ReplicateResultProcessor {
|
||||
*/
|
||||
private _processingChanges: PouchDB.Core.ExistingDocument<EntryDoc>[] = [];
|
||||
|
||||
private _processingActivity?: Promise<void>;
|
||||
private _processingActivityDone?: PromiseWithResolvers<void>;
|
||||
|
||||
private updateProcessingActivity() {
|
||||
if (this.isSuspended) {
|
||||
this._processingActivityDone?.resolve();
|
||||
return;
|
||||
}
|
||||
const hasPendingDocuments = this._queuedChanges.length > 0 || this._processingChanges.length > 0;
|
||||
if (!hasPendingDocuments) {
|
||||
this._processingActivityDone?.resolve();
|
||||
return;
|
||||
}
|
||||
if (this._processingActivity) return;
|
||||
|
||||
const activityDone = promiseWithResolvers<void>();
|
||||
this._processingActivityDone = activityDone;
|
||||
const activityOwner = this.services.replicator as typeof this.services.replicator &
|
||||
Partial<LocalApplicationActivityOwner>;
|
||||
this._processingActivity = (
|
||||
activityOwner.runBoundedLocalApplicationActivity
|
||||
? activityOwner.runBoundedLocalApplicationActivity(() => activityDone.promise, {
|
||||
label: "replicated-document-application",
|
||||
})
|
||||
: activityDone.promise
|
||||
)
|
||||
.catch((error) => this.logError(error))
|
||||
.finally(() => {
|
||||
if (this._processingActivityDone === activityDone) this._processingActivityDone = undefined;
|
||||
this._processingActivity = undefined;
|
||||
this.updateProcessingActivity();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Enqueue the given document change for processing.
|
||||
* @param doc Document change to enqueue
|
||||
@@ -278,6 +321,7 @@ export class ReplicateResultProcessor {
|
||||
}
|
||||
// Enqueue the change
|
||||
this._queuedChanges.push(doc);
|
||||
this.updateProcessingActivity();
|
||||
this.triggerTakeSnapshot();
|
||||
this.triggerProcessQueue();
|
||||
}
|
||||
@@ -385,7 +429,19 @@ export class ReplicateResultProcessor {
|
||||
} finally {
|
||||
// Remove from processing queue
|
||||
this._processingChanges = this._processingChanges.filter((e) => e !== change);
|
||||
this.triggerTakeSnapshot();
|
||||
try {
|
||||
if (this._queuedChanges.length === 0 && this._processingChanges.length === 0) {
|
||||
try {
|
||||
await this._takeSnapshot();
|
||||
} catch (error) {
|
||||
this.logError(error);
|
||||
}
|
||||
} else {
|
||||
this.triggerTakeSnapshot();
|
||||
}
|
||||
} finally {
|
||||
this.updateProcessingActivity();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,67 @@
|
||||
import { promiseWithResolvers } from "octagonal-wheels/promises";
|
||||
import { reactiveSource } from "octagonal-wheels/dataobject/reactive";
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import type { EntryDoc } from "@vrtmrz/livesync-commonlib/compat/common/types";
|
||||
import { ReplicateResultProcessor } from "./ReplicateResultProcessor";
|
||||
|
||||
describe("ReplicateResultProcessor target-filter reprocessing", () => {
|
||||
function note(id: string): PouchDB.Core.ExistingDocument<EntryDoc> {
|
||||
return {
|
||||
_id: id,
|
||||
_rev: "1-test",
|
||||
path: `${id}.md`,
|
||||
ctime: 1,
|
||||
mtime: 2,
|
||||
size: 1,
|
||||
children: [],
|
||||
datatype: "plain",
|
||||
type: "plain",
|
||||
eden: {},
|
||||
} as unknown as PouchDB.Core.ExistingDocument<EntryDoc>;
|
||||
}
|
||||
|
||||
type SetupOptions = {
|
||||
processSynchroniseResult?: (entry: unknown) => Promise<void>;
|
||||
setSnapshot?: (key: string, value: unknown) => Promise<unknown>;
|
||||
};
|
||||
|
||||
function setup(options: SetupOptions = {}) {
|
||||
const processSynchroniseResult = vi.fn(options.processSynchroniseResult ?? (async () => undefined));
|
||||
const setSnapshot = vi.fn(options.setSnapshot ?? (async () => undefined));
|
||||
const runBoundedLocalApplicationActivity = vi.fn(async (task: () => Promise<void>) => await task());
|
||||
const core = {
|
||||
services: {
|
||||
appLifecycle: { isReady: true, isSuspended: () => false },
|
||||
path: { getPath: (entry: { path: string }) => entry.path },
|
||||
replication: {
|
||||
databaseQueueCount: reactiveSource(0),
|
||||
storageApplyingCount: reactiveSource(0),
|
||||
replicationResultCount: reactiveSource(0),
|
||||
processVirtualDocument: vi.fn(async () => false),
|
||||
processOptionalSynchroniseResult: vi.fn(async () => false),
|
||||
processSynchroniseResult,
|
||||
},
|
||||
replicator: { runBoundedLocalApplicationActivity },
|
||||
vault: {
|
||||
isTargetFile: vi.fn(async () => true),
|
||||
isFileSizeTooLarge: vi.fn(() => false),
|
||||
isValidPath: vi.fn(() => true),
|
||||
},
|
||||
},
|
||||
kvDB: { set: setSnapshot },
|
||||
localDatabase: {
|
||||
getRaw: vi.fn(async (id: string) => ({ _id: id, _rev: "1-test" })),
|
||||
getDBEntryFromMeta: vi.fn(async (entry: object) => ({ ...entry, data: "x" })),
|
||||
},
|
||||
replicator: { closeReplication: vi.fn() },
|
||||
};
|
||||
const processor = new ReplicateResultProcessor({
|
||||
core,
|
||||
settings: { maxMTimeForReflectEvents: 0, suspendParseReplicationResult: false },
|
||||
} as never);
|
||||
return { processor, processSynchroniseResult, runBoundedLocalApplicationActivity };
|
||||
}
|
||||
|
||||
describe("ReplicateResultProcessor", () => {
|
||||
it("scans normal-file metadata without loading chunk documents and requeues it", async () => {
|
||||
const documents = [
|
||||
{ _id: "first", _rev: "1-a", type: "plain", path: "first.md" },
|
||||
@@ -22,4 +81,67 @@ describe("ReplicateResultProcessor target-filter reprocessing", () => {
|
||||
expect(enqueueAll).toHaveBeenCalledOnce();
|
||||
expect(enqueueAll).toHaveBeenCalledWith(documents);
|
||||
});
|
||||
|
||||
it("keeps one local application activity until every replicated document has been applied", async () => {
|
||||
const applying = promiseWithResolvers<void>();
|
||||
let activityFinished = false;
|
||||
const { processor, processSynchroniseResult, runBoundedLocalApplicationActivity } = setup({
|
||||
processSynchroniseResult: async () => applying.promise,
|
||||
});
|
||||
runBoundedLocalApplicationActivity.mockImplementation(async (task: () => Promise<void>) => {
|
||||
await task();
|
||||
activityFinished = true;
|
||||
});
|
||||
|
||||
processor.enqueueAll([note("one"), note("two")]);
|
||||
|
||||
await vi.waitFor(() => expect(processSynchroniseResult).toHaveBeenCalledTimes(2));
|
||||
expect(runBoundedLocalApplicationActivity).toHaveBeenCalledTimes(1);
|
||||
expect(runBoundedLocalApplicationActivity).toHaveBeenCalledWith(expect.any(Function), {
|
||||
label: "replicated-document-application",
|
||||
});
|
||||
expect(activityFinished).toBe(false);
|
||||
|
||||
applying.resolve();
|
||||
|
||||
await vi.waitFor(() => expect(activityFinished).toBe(true));
|
||||
});
|
||||
|
||||
it("settles local application activity when the final recovery snapshot fails", async () => {
|
||||
let activityFinished = false;
|
||||
const { processor, runBoundedLocalApplicationActivity } = setup({
|
||||
setSnapshot: async () => Promise.reject(new Error("snapshot failed")),
|
||||
});
|
||||
runBoundedLocalApplicationActivity.mockImplementation(async (task: () => Promise<void>) => {
|
||||
await task();
|
||||
activityFinished = true;
|
||||
});
|
||||
|
||||
processor.enqueueAll([note("one")]);
|
||||
|
||||
await vi.waitFor(() => expect(activityFinished).toBe(true));
|
||||
});
|
||||
|
||||
it("releases and reacquires local application activity around processing suspension", async () => {
|
||||
const applying = promiseWithResolvers<void>();
|
||||
let completedActivities = 0;
|
||||
const { processor, processSynchroniseResult, runBoundedLocalApplicationActivity } = setup({
|
||||
processSynchroniseResult: async () => applying.promise,
|
||||
});
|
||||
runBoundedLocalApplicationActivity.mockImplementation(async (task: () => Promise<void>) => {
|
||||
await task();
|
||||
completedActivities++;
|
||||
});
|
||||
processor.enqueueAll([note("one")]);
|
||||
await vi.waitFor(() => expect(processSynchroniseResult).toHaveBeenCalledOnce());
|
||||
|
||||
processor.suspend();
|
||||
await vi.waitFor(() => expect(completedActivities).toBe(1));
|
||||
|
||||
processor.resume();
|
||||
await vi.waitFor(() => expect(runBoundedLocalApplicationActivity).toHaveBeenCalledTimes(2));
|
||||
|
||||
applying.resolve();
|
||||
await vi.waitFor(() => expect(completedActivities).toBe(2));
|
||||
});
|
||||
});
|
||||
|
||||
@@ -113,9 +113,20 @@ export class ModuleObsidianEvents extends AbstractObsidianModule {
|
||||
|
||||
hasFocus = true;
|
||||
isLastHidden = false;
|
||||
private boundedRemoteActivityEndHandler?: (value: { readonly value: number }) => unknown;
|
||||
private boundedActivityEndHandler?: (value: { readonly value: number }) => unknown;
|
||||
private deferredBoundedLifecycle?: "suspend-if-hidden" | "restart-continuous-if-visible";
|
||||
|
||||
private get boundedActivityCounts(): ReactiveSource<number>[] {
|
||||
const replicator = this.services.replicator as typeof this.services.replicator & {
|
||||
boundedLocalApplicationActivityCount: ReactiveSource<number>;
|
||||
};
|
||||
return [replicator.boundedRemoteActivityCount, replicator.boundedLocalApplicationActivityCount];
|
||||
}
|
||||
|
||||
private hasBoundedActivity() {
|
||||
return this.boundedActivityCounts.some((count) => count.value > 0);
|
||||
}
|
||||
|
||||
private keepReplicationActiveInBackground() {
|
||||
return (
|
||||
this.settings.keepReplicationActiveInBackground &&
|
||||
@@ -125,9 +136,8 @@ export class ModuleObsidianEvents extends AbstractObsidianModule {
|
||||
}
|
||||
|
||||
private async applyDeferredBoundedActivityLifecycle() {
|
||||
const count = this.services.replicator.boundedRemoteActivityCount;
|
||||
if (count.value !== 0) {
|
||||
this.deferLifecycleUntilBoundedRemoteActivityEnds();
|
||||
if (this.hasBoundedActivity()) {
|
||||
this.deferLifecycleUntilBoundedActivityEnds();
|
||||
return;
|
||||
}
|
||||
const deferredLifecycle = this.deferredBoundedLifecycle;
|
||||
@@ -149,17 +159,17 @@ export class ModuleObsidianEvents extends AbstractObsidianModule {
|
||||
}
|
||||
}
|
||||
|
||||
private deferLifecycleUntilBoundedRemoteActivityEnds() {
|
||||
if (this.boundedRemoteActivityEndHandler) return;
|
||||
const count = this.services.replicator.boundedRemoteActivityCount;
|
||||
const handler = (value: { readonly value: number }) => {
|
||||
if (value.value !== 0) return;
|
||||
count.offChanged(handler);
|
||||
this.boundedRemoteActivityEndHandler = undefined;
|
||||
private deferLifecycleUntilBoundedActivityEnds() {
|
||||
if (this.boundedActivityEndHandler) return;
|
||||
const counts = this.boundedActivityCounts;
|
||||
const handler = () => {
|
||||
if (this.hasBoundedActivity()) return;
|
||||
for (const count of counts) count.offChanged(handler);
|
||||
this.boundedActivityEndHandler = undefined;
|
||||
fireAndForget(() => this.applyDeferredBoundedActivityLifecycle());
|
||||
};
|
||||
this.boundedRemoteActivityEndHandler = handler;
|
||||
count.onChanged(handler);
|
||||
this.boundedActivityEndHandler = handler;
|
||||
for (const count of counts) count.onChanged(handler);
|
||||
}
|
||||
|
||||
setHasFocus(hasFocus: boolean) {
|
||||
@@ -188,12 +198,12 @@ export class ModuleObsidianEvents extends AbstractObsidianModule {
|
||||
if (
|
||||
this.settings.isConfigured &&
|
||||
this.services.appLifecycle.isReady() &&
|
||||
this.services.replicator.boundedRemoteActivityCount.value > 0
|
||||
this.hasBoundedActivity()
|
||||
) {
|
||||
const isHidden = activeWindow.document.hidden;
|
||||
this.isLastHidden = isHidden;
|
||||
this.deferredBoundedLifecycle = isHidden ? "suspend-if-hidden" : undefined;
|
||||
this.deferLifecycleUntilBoundedRemoteActivityEnds();
|
||||
this.deferLifecycleUntilBoundedActivityEnds();
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -210,8 +220,8 @@ export class ModuleObsidianEvents extends AbstractObsidianModule {
|
||||
return;
|
||||
}
|
||||
|
||||
const boundedRemoteActivityInProgress = this.services.replicator.boundedRemoteActivityCount.value > 0;
|
||||
if (!isHidden && boundedRemoteActivityInProgress && this.deferredBoundedLifecycle === "suspend-if-hidden") {
|
||||
const boundedActivityInProgress = this.hasBoundedActivity();
|
||||
if (!isHidden && boundedActivityInProgress && this.deferredBoundedLifecycle === "suspend-if-hidden") {
|
||||
this.isLastHidden = false;
|
||||
this.deferredBoundedLifecycle = undefined;
|
||||
return;
|
||||
@@ -228,18 +238,18 @@ export class ModuleObsidianEvents extends AbstractObsidianModule {
|
||||
const keepActiveInBackground = this.keepReplicationActiveInBackground();
|
||||
|
||||
if (isHidden) {
|
||||
if (boundedRemoteActivityInProgress && !keepActiveInBackground) {
|
||||
if (boundedActivityInProgress && !keepActiveInBackground) {
|
||||
this.deferredBoundedLifecycle = "suspend-if-hidden";
|
||||
this.deferLifecycleUntilBoundedRemoteActivityEnds();
|
||||
this.deferLifecycleUntilBoundedActivityEnds();
|
||||
} else if (!keepActiveInBackground) {
|
||||
await this.services.appLifecycle.onSuspending();
|
||||
}
|
||||
} else {
|
||||
// suspend all temporary.
|
||||
if (this.services.appLifecycle.isSuspended()) return;
|
||||
if (boundedRemoteActivityInProgress && keepActiveInBackground && this.settings.liveSync) {
|
||||
if (boundedActivityInProgress && keepActiveInBackground && this.settings.liveSync) {
|
||||
this.deferredBoundedLifecycle = "restart-continuous-if-visible";
|
||||
this.deferLifecycleUntilBoundedRemoteActivityEnds();
|
||||
this.deferLifecycleUntilBoundedActivityEnds();
|
||||
return;
|
||||
}
|
||||
// Only the continuous (LiveSync) channel can go stalled-but-not-terminated: PouchDB
|
||||
|
||||
@@ -24,6 +24,7 @@ function setup(opts: SetupOptions) {
|
||||
};
|
||||
const fileProcessing = { commitPendingFileEvents: vi.fn(async () => true) };
|
||||
const boundedRemoteActivityCount = reactiveSource(0);
|
||||
const boundedLocalApplicationActivityCount = reactiveSource(0);
|
||||
|
||||
const core = {
|
||||
_services: {
|
||||
@@ -38,7 +39,7 @@ function setup(opts: SetupOptions) {
|
||||
setting: { saveSettingData: vi.fn(async () => undefined) },
|
||||
appLifecycle,
|
||||
fileProcessing,
|
||||
replicator: { boundedRemoteActivityCount },
|
||||
replicator: { boundedRemoteActivityCount, boundedLocalApplicationActivityCount },
|
||||
},
|
||||
settings: {
|
||||
...DEFAULT_SETTINGS,
|
||||
@@ -56,7 +57,13 @@ function setup(opts: SetupOptions) {
|
||||
// The handler reads `activeWindow.document.hidden`.
|
||||
(globalThis as any).activeWindow = { document: { hidden: opts.hidden } };
|
||||
|
||||
return { module, appLifecycle, fileProcessing, boundedRemoteActivityCount };
|
||||
return {
|
||||
module,
|
||||
appLifecycle,
|
||||
fileProcessing,
|
||||
boundedRemoteActivityCount,
|
||||
boundedLocalApplicationActivityCount,
|
||||
};
|
||||
}
|
||||
|
||||
describe("watchWindowVisibilityAsync — keepReplicationActiveInBackground", () => {
|
||||
@@ -109,6 +116,21 @@ describe("watchWindowVisibilityAsync — keepReplicationActiveInBackground", ()
|
||||
await vi.waitFor(() => expect(appLifecycle.onSuspending).toHaveBeenCalledTimes(1));
|
||||
});
|
||||
|
||||
it("defers suspension while local document application is active", async () => {
|
||||
const { module, appLifecycle, boundedLocalApplicationActivityCount } = setup({
|
||||
settings: { keepReplicationActiveInBackground: false, liveSync: false },
|
||||
hidden: true,
|
||||
});
|
||||
boundedLocalApplicationActivityCount.value = 1;
|
||||
|
||||
await module.watchWindowVisibilityAsync();
|
||||
|
||||
expect(appLifecycle.onSuspending).not.toHaveBeenCalled();
|
||||
|
||||
boundedLocalApplicationActivityCount.value = 0;
|
||||
await vi.waitFor(() => expect(appLifecycle.onSuspending).toHaveBeenCalledTimes(1));
|
||||
});
|
||||
|
||||
it("defers mobile suspension while bounded remote activity is running", async () => {
|
||||
const { module, appLifecycle, boundedRemoteActivityCount } = setup({
|
||||
settings: { keepReplicationActiveInBackground: false, liveSync: false },
|
||||
|
||||
@@ -74,6 +74,11 @@ export class DocumentHistoryModal extends Modal {
|
||||
currentDeleted = false;
|
||||
initialRev?: string;
|
||||
|
||||
// Revision navigation state (◀/▶ beside the range slider)
|
||||
revPrevBtn!: HTMLButtonElement;
|
||||
revNextBtn!: HTMLButtonElement;
|
||||
revNavIndicator!: HTMLSpanElement;
|
||||
|
||||
// Diff navigation state
|
||||
currentDiffIndex = -1;
|
||||
diffNavContainer!: HTMLDivElement;
|
||||
@@ -84,6 +89,8 @@ export class DocumentHistoryModal extends Modal {
|
||||
searchKeyword = "";
|
||||
searchResults: { rev: string; index: number; matchType: "Content" | "Diff" }[] = [];
|
||||
currentSearchIndex = -1;
|
||||
searchPrevBtn!: HTMLButtonElement;
|
||||
searchNextBtn!: HTMLButtonElement;
|
||||
searchResultIndicator!: HTMLSpanElement;
|
||||
searchProgressIndicator!: HTMLSpanElement;
|
||||
searchTimeout: number | null = null;
|
||||
@@ -125,12 +132,14 @@ export class DocumentHistoryModal extends Modal {
|
||||
this.range.value = this.range.max;
|
||||
this.fileInfo.setText(`${this.file} / ${this.revs_info.length} revisions`);
|
||||
await this.loadRevs(initialRev);
|
||||
this.updateRevisionNavUI();
|
||||
} catch (ex) {
|
||||
if (isErrorOfMissingDoc(ex)) {
|
||||
this.range.max = "0";
|
||||
this.range.value = "";
|
||||
this.range.disabled = true;
|
||||
this.contentView.setText(`We don't have any history for this note.`);
|
||||
this.updateRevisionNavUI();
|
||||
} else {
|
||||
this.contentView.setText(`Error while loading file.`);
|
||||
Logger(ex, LOG_LEVEL_VERBOSE);
|
||||
@@ -148,6 +157,37 @@ export class DocumentHistoryModal extends Modal {
|
||||
const index = this.revs_info.length - 1 - (Number(this.range.value) || 0);
|
||||
const rev = this.revs_info[index];
|
||||
await this.showExactRev(rev.rev);
|
||||
this.updateRevisionNavUI();
|
||||
}
|
||||
|
||||
navigateVersion(direction: "older" | "newer") {
|
||||
const current = Number(this.range.value) || 0;
|
||||
const max = Number(this.range.max) || 0;
|
||||
|
||||
if (direction === "older" && current > 0) {
|
||||
this.range.value = `${current - 1}`;
|
||||
} else if (direction === "newer" && current < max) {
|
||||
this.range.value = `${current + 1}`;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
this.updateRevisionNavUI();
|
||||
void scheduleOnceIfDuplicated("loadRevs", () => this.loadRevs());
|
||||
}
|
||||
|
||||
updateRevisionNavUI() {
|
||||
if (!this.revNavIndicator) return;
|
||||
|
||||
const total = this.revs_info.length;
|
||||
const max = Number(this.range.max) || 0;
|
||||
const current = Number(this.range.value) || 0;
|
||||
|
||||
this.revNavIndicator.setText(total > 0 ? `Rev ${current + 1}/${total}` : "\u2014");
|
||||
|
||||
const disabled = !!this.range.disabled || total <= 1;
|
||||
this.revPrevBtn.disabled = disabled || current <= 0;
|
||||
this.revNextBtn.disabled = disabled || current >= max;
|
||||
}
|
||||
BlobURLs = new Map<string, string>();
|
||||
|
||||
@@ -391,6 +431,7 @@ export class DocumentHistoryModal extends Modal {
|
||||
if (!keyword) {
|
||||
this.searchResultIndicator.setText("");
|
||||
this.searchProgressIndicator.setText("");
|
||||
this.updateSearchUI();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -464,6 +505,10 @@ export class DocumentHistoryModal extends Modal {
|
||||
const current = this.currentSearchIndex >= 0 ? this.currentSearchIndex + 1 : 0;
|
||||
this.searchResultIndicator.setText(`${current}/${this.searchResults.length} matches`);
|
||||
}
|
||||
|
||||
const hasResults = this.searchResults.length > 0;
|
||||
this.searchPrevBtn.disabled = !hasResults;
|
||||
this.searchNextBtn.disabled = !hasResults;
|
||||
}
|
||||
|
||||
navigateSearch(direction: "prev" | "next") {
|
||||
@@ -515,12 +560,14 @@ export class DocumentHistoryModal extends Modal {
|
||||
}, 500);
|
||||
});
|
||||
|
||||
searchRow.createEl("button", { text: "\u25B2" }, (e) => {
|
||||
this.searchPrevBtn = searchRow.createEl("button", { text: "\u25B2" }, (e) => {
|
||||
e.title = "Previous match";
|
||||
e.disabled = true;
|
||||
e.addEventListener("click", () => this.navigateSearch("prev"));
|
||||
});
|
||||
searchRow.createEl("button", { text: "\u25BC" }, (e) => {
|
||||
this.searchNextBtn = searchRow.createEl("button", { text: "\u25BC" }, (e) => {
|
||||
e.title = "Next match";
|
||||
e.disabled = true;
|
||||
e.addEventListener("click", () => this.navigateSearch("next"));
|
||||
});
|
||||
|
||||
@@ -530,18 +577,37 @@ export class DocumentHistoryModal extends Modal {
|
||||
this.searchProgressIndicator = searchRow.createSpan({ text: "" });
|
||||
this.searchProgressIndicator.addClass("history-search-progress-indicator");
|
||||
|
||||
const divView = contentEl.createDiv("");
|
||||
divView.addClass("op-flex");
|
||||
const revNavRow = contentEl.createDiv({ cls: "history-rev-nav-row" });
|
||||
|
||||
divView.createEl("input", { type: "range" }, (e) => {
|
||||
this.revPrevBtn = revNavRow.createEl("button", { text: "\u25C0" }, (e) => {
|
||||
e.addClass("history-rev-nav-btn");
|
||||
e.title = "Older revision";
|
||||
e.disabled = true;
|
||||
e.addEventListener("click", () => this.navigateVersion("older"));
|
||||
});
|
||||
|
||||
revNavRow.createEl("input", { type: "range" }, (e) => {
|
||||
this.range = e;
|
||||
e.addEventListener("change", (e) => {
|
||||
e.addEventListener("change", () => {
|
||||
this.updateRevisionNavUI();
|
||||
void scheduleOnceIfDuplicated("loadRevs", () => this.loadRevs());
|
||||
});
|
||||
e.addEventListener("input", (e) => {
|
||||
e.addEventListener("input", () => {
|
||||
this.updateRevisionNavUI();
|
||||
void scheduleOnceIfDuplicated("loadRevs", () => this.loadRevs());
|
||||
});
|
||||
});
|
||||
|
||||
this.revNextBtn = revNavRow.createEl("button", { text: "\u25B6" }, (e) => {
|
||||
e.addClass("history-rev-nav-btn");
|
||||
e.title = "Newer revision";
|
||||
e.disabled = true;
|
||||
e.addEventListener("click", () => this.navigateVersion("newer"));
|
||||
});
|
||||
|
||||
this.revNavIndicator = revNavRow.createSpan({ text: "\u2014" }, (e) => {
|
||||
e.addClass("history-rev-indicator");
|
||||
});
|
||||
const diffOptionsRow = contentEl.createDiv("");
|
||||
diffOptionsRow.addClass("op-info");
|
||||
diffOptionsRow.addClass("diff-options-row");
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
import { DocumentHistoryModal } from "@/modules/features/DocumentHistory/DocumentHistoryModal.ts";
|
||||
import { isPlainText, stripAllPrefixes } from "@vrtmrz/livesync-commonlib/compat/string_and_binary/path";
|
||||
import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore.ts";
|
||||
import { $msg as translateMessage } from "@/common/translation";
|
||||
export let plugin: ObsidianLiveSyncPlugin;
|
||||
export let core: LiveSyncBaseCore;
|
||||
|
||||
@@ -207,29 +208,35 @@
|
||||
<div class="row"><label for="">To:</label><input type="date" bind:value={dispDateTo} disabled={loading} /></div>
|
||||
<div class="row">
|
||||
<label for="">Info:</label>
|
||||
<label><input type="checkbox" bind:checked={showDiffInfo} disabled={loading} /><span>Diff</span></label>
|
||||
<label
|
||||
><input type="checkbox" bind:checked={showChunkCorrected} disabled={loading} /><span>Chunks</span
|
||||
><input type="checkbox" bind:checked={showDiffInfo} disabled={loading} /><span
|
||||
>{translateMessage("Diff")}</span
|
||||
></label
|
||||
>
|
||||
<label
|
||||
><input type="checkbox" bind:checked={checkStorageDiff} disabled={loading} /><span>File integrity</span
|
||||
><input type="checkbox" bind:checked={showChunkCorrected} disabled={loading} /><span
|
||||
>{translateMessage("Chunks")}</span
|
||||
></label
|
||||
>
|
||||
<label
|
||||
><input type="checkbox" bind:checked={checkStorageDiff} disabled={loading} /><span
|
||||
>{translateMessage("File integrity")}</span
|
||||
></label
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
{#if loading}
|
||||
<div class="">Gathering information...</div>
|
||||
<div class="">{translateMessage("Gathering information...")}</div>
|
||||
{/if}
|
||||
<table>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th> Date </th>
|
||||
<th> Path </th>
|
||||
<th> Rev </th>
|
||||
<th> Stat </th>
|
||||
<th> {translateMessage("Date")} </th>
|
||||
<th> {translateMessage("Path")} </th>
|
||||
<th> {translateMessage("Rev")} </th>
|
||||
<th> {translateMessage("Stat")} </th>
|
||||
{#if showChunkCorrected}
|
||||
<th> Chunks </th>
|
||||
<th> {translateMessage("Chunks")} </th>
|
||||
{/if}
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -237,7 +244,7 @@
|
||||
{#if loading}
|
||||
<div class=""></div>
|
||||
{:else}
|
||||
<div><button on:click={() => nextWeek()}>+1 week</button></div>
|
||||
<div><button on:click={() => nextWeek()}>{translateMessage("+1 week")}</button></div>
|
||||
{/if}
|
||||
</td>
|
||||
</tr>
|
||||
@@ -286,7 +293,7 @@
|
||||
{#if loading}
|
||||
<div class=""></div>
|
||||
{:else}
|
||||
<div><button on:click={() => prevWeek()}>+1 week</button></div>
|
||||
<div><button on:click={() => prevWeek()}>{translateMessage("+1 week")}</button></div>
|
||||
{/if}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import type { CustomRegExpSource } from "@vrtmrz/livesync-commonlib/compat/common/types";
|
||||
import { isInvertedRegExp, isValidRegExp } from "@vrtmrz/livesync-commonlib/compat/common/utils";
|
||||
import { $msg as translateMessage } from "@/common/translation";
|
||||
|
||||
export let patterns = [] as CustomRegExpSource[];
|
||||
export let originals = [] as CustomRegExpSource[];
|
||||
@@ -31,7 +32,7 @@
|
||||
<!-- svelte-ignore a11y-label-has-associated-control -->
|
||||
<li>
|
||||
<label>{modified[idx]}{statusName[idx]}</label>
|
||||
<span class="chip">{isInvertedExp[idx] ? "INVERTED" : ""}</span>
|
||||
<span class="chip">{isInvertedExp[idx] ? translateMessage("INVERTED") : ""}</span>
|
||||
<input type="text" bind:value={pattern} class={modified[idx]} />
|
||||
<button class="iconbutton" on:click={() => remove(idx)}>🗑</button>
|
||||
</li>
|
||||
|
||||
@@ -479,10 +479,10 @@ export function paneRemoteConfig(
|
||||
})
|
||||
.addSeparator()
|
||||
.addItem((item) => {
|
||||
item.setTitle("🗑 Delete").onClick(async () => {
|
||||
item.setTitle($msg("🗑 Delete")).onClick(async () => {
|
||||
const confirmed = await this.services.UI.confirm.askYesNoDialog(
|
||||
`Delete remote configuration '${config.name}'?`,
|
||||
{ title: "Delete Remote Configuration", defaultOption: "No" }
|
||||
$msg("Delete remote configuration '${name}'?", { name: config.name }),
|
||||
{ title: $msg("Delete Remote Configuration"), defaultOption: "No" }
|
||||
);
|
||||
if (confirmed !== "yes") {
|
||||
return;
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
import InfoNote from "@/modules/services/LiveSyncUI/components/InfoNote.svelte";
|
||||
import ExtraItems from "@/modules/services/LiveSyncUI/components/ExtraItems.svelte";
|
||||
import Check from "@/modules/services/LiveSyncUI/components/Check.svelte";
|
||||
import { $msg as translateMessage } from "@/common/translation";
|
||||
import {
|
||||
TYPE_BACKUP_DONE,
|
||||
TYPE_BACKUP_SKIPPED,
|
||||
@@ -48,90 +49,110 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
<DialogHeader title="Reset Synchronisation on This Device" />
|
||||
<DialogHeader title={translateMessage("Reset Synchronisation on This Device")} />
|
||||
<Guidance
|
||||
>This will rebuild the local database on this device using the most recent data from the server. This action is
|
||||
designed to resolve synchronisation inconsistencies and restore correct functionality.</Guidance
|
||||
>{translateMessage(
|
||||
"This will rebuild the local database on this device using the most recent data from the server. This action is designed to resolve synchronisation inconsistencies and restore correct functionality."
|
||||
)}</Guidance
|
||||
>
|
||||
<Guidance important title="⚠️ Important Notice">
|
||||
<Guidance important title={translateMessage("⚠️ Important Notice")}>
|
||||
<strong
|
||||
>If you have unsynchronised changes in your Vault on this device, they will likely diverge from the server's
|
||||
versions after the reset. This may result in a large number of file conflicts.</strong
|
||||
>{translateMessage(
|
||||
"If you have unsynchronised changes in your Vault on this device, they will likely diverge from the server's versions after the reset. This may result in a large number of file conflicts."
|
||||
)}</strong
|
||||
><br />
|
||||
Furthermore, if conflicts are already present in the server data, they will be synchronised to this device as they are,
|
||||
and you will need to resolve them locally.
|
||||
{translateMessage(
|
||||
"Furthermore, if conflicts are already present in the server data, they will be synchronised to this device as they are, and you will need to resolve them locally."
|
||||
)}
|
||||
</Guidance>
|
||||
<hr />
|
||||
<Instruction>
|
||||
<Question
|
||||
><strong>To minimise the creation of new conflicts</strong>, please select the option that best describes the
|
||||
current state of your Vault. The application will then check your files in the most appropriate way based on
|
||||
your selection.</Question
|
||||
><strong>{translateMessage("To minimise the creation of new conflicts")}</strong>{translateMessage(
|
||||
", please select the option that best describes the current state of your Vault. The application will then check your files in the most appropriate way based on your selection."
|
||||
)}</Question
|
||||
>
|
||||
<Options>
|
||||
<Option
|
||||
selectedValue={TYPE_IDENTICAL}
|
||||
title="The files in this Vault are almost identical to the server's."
|
||||
title={translateMessage("The files in this Vault are almost identical to the server's.")}
|
||||
bind:value={vaultType}
|
||||
>
|
||||
(e.g., immediately after restoring on another computer, or having recovered from a backup)
|
||||
{translateMessage(
|
||||
"(e.g., immediately after restoring on another computer, or having recovered from a backup)"
|
||||
)}
|
||||
</Option>
|
||||
<Option
|
||||
selectedValue={TYPE_INDEPENDENT}
|
||||
title="This Vault is empty, or contains only new files that are not on the server."
|
||||
title={translateMessage("This Vault is empty, or contains only new files that are not on the server.")}
|
||||
bind:value={vaultType}
|
||||
>
|
||||
(e.g., setting up for the first time on a new smartphone, starting from a clean slate)
|
||||
{translateMessage("(e.g., setting up for the first time on a new smartphone, starting from a clean slate)")}
|
||||
</Option>
|
||||
<Option
|
||||
selectedValue={TYPE_UNBALANCED}
|
||||
title="There may be differences between the files in this Vault and the server."
|
||||
title={translateMessage("There may be differences between the files in this Vault and the server.")}
|
||||
bind:value={vaultType}
|
||||
>
|
||||
(e.g., after editing many files whilst offline)
|
||||
{translateMessage("(e.g., after editing many files whilst offline)")}
|
||||
<InfoNote info>
|
||||
In this scenario, Self-hosted LiveSync will recreate metadata for every file and deliberately generate
|
||||
conflicts. Where the file content is identical, these conflicts will be resolved automatically.
|
||||
{translateMessage(
|
||||
"In this scenario, Self-hosted LiveSync will recreate metadata for every file and deliberately generate conflicts. Where the file content is identical, these conflicts will be resolved automatically."
|
||||
)}
|
||||
</InfoNote>
|
||||
</Option>
|
||||
</Options>
|
||||
</Instruction>
|
||||
<hr />
|
||||
<Instruction>
|
||||
<Question>Have you created a backup before proceeding?</Question>
|
||||
<Question>{translateMessage("Have you created a backup before proceeding?")}</Question>
|
||||
<InfoNote>
|
||||
We recommend that you copy your Vault folder to a safe location. This will provide a safeguard in case a large
|
||||
number of conflicts arise, or if you accidentally synchronise with an incorrect destination.
|
||||
{translateMessage(
|
||||
"We recommend that you copy your Vault folder to a safe location. This will provide a safeguard in case a large number of conflicts arise, or if you accidentally synchronise with an incorrect destination."
|
||||
)}
|
||||
</InfoNote>
|
||||
<Options>
|
||||
<Option selectedValue={TYPE_BACKUP_DONE} title="I have created a backup of my Vault." bind:value={backupType} />
|
||||
<Option
|
||||
selectedValue={TYPE_BACKUP_DONE}
|
||||
title={translateMessage("I have created a backup of my Vault.")}
|
||||
bind:value={backupType}
|
||||
/>
|
||||
<Option
|
||||
selectedValue={TYPE_BACKUP_SKIPPED}
|
||||
title="I understand the risks and will proceed without a backup."
|
||||
title={translateMessage("I understand the risks and will proceed without a backup.")}
|
||||
bind:value={backupType}
|
||||
/>
|
||||
<Option
|
||||
selectedValue={TYPE_UNABLE_TO_BACKUP}
|
||||
title="I am unable to create a backup of my Vault."
|
||||
title={translateMessage("I am unable to create a backup of my Vault.")}
|
||||
bind:value={backupType}
|
||||
>
|
||||
<InfoNote error visible={backupType === TYPE_UNABLE_TO_BACKUP}>
|
||||
<strong
|
||||
>It is strongly advised to create a backup before proceeding. Continuing without a backup may lead
|
||||
to data loss.
|
||||
>{translateMessage(
|
||||
"It is strongly advised to create a backup before proceeding. Continuing without a backup may lead to data loss."
|
||||
)}
|
||||
</strong>
|
||||
<br />
|
||||
If you understand the risks and still wish to proceed, select so.
|
||||
{translateMessage("If you understand the risks and still wish to proceed, select so.")}
|
||||
</InfoNote>
|
||||
</Option>
|
||||
</Options>
|
||||
</Instruction>
|
||||
<Instruction>
|
||||
<ExtraItems title="Advanced">
|
||||
<Check title="Prevent fetching configuration from server" bind:value={preventFetchingConfig} />
|
||||
<ExtraItems title={translateMessage("Advanced")}>
|
||||
<Check
|
||||
title={translateMessage("Prevent fetching configuration from server")}
|
||||
bind:value={preventFetchingConfig}
|
||||
/>
|
||||
</ExtraItems>
|
||||
</Instruction>
|
||||
<UserDecisions>
|
||||
<Decision title="Reset and Resume Synchronisation" important disabled={!canProceed} commit={() => commit()} />
|
||||
<Decision title="Cancel" commit={() => setResult(TYPE_CANCEL)} />
|
||||
<Decision
|
||||
title={translateMessage("Reset and Resume Synchronisation")}
|
||||
important
|
||||
disabled={!canProceed}
|
||||
commit={() => commit()}
|
||||
/>
|
||||
<Decision title={translateMessage("Cancel")} commit={() => setResult(TYPE_CANCEL)} />
|
||||
</UserDecisions>
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
let userType = $state<IntroResultType>(TYPE_CANCELLED);
|
||||
let proceedTitle = $derived.by(() => {
|
||||
if (userType === TYPE_NEW_USER) {
|
||||
return "Yes, I want to set up a new synchronisation";
|
||||
return translateMessage("Yes, I want to set up a new synchronisation");
|
||||
} else if (userType === TYPE_EXISTING_USER) {
|
||||
return "Yes, I want to add this device to my existing synchronisation";
|
||||
return translateMessage("Yes, I want to add this device to my existing synchronisation");
|
||||
} else {
|
||||
return "Please select an option to proceed";
|
||||
return translateMessage("Please select an option to proceed");
|
||||
}
|
||||
});
|
||||
const canProceed = $derived.by(() => {
|
||||
@@ -30,31 +30,41 @@
|
||||
});
|
||||
</script>
|
||||
|
||||
<DialogHeader title="Welcome to Self-hosted LiveSync" />
|
||||
<Guidance>We will now guide you through a few questions to simplify the synchronisation setup.</Guidance>
|
||||
<DialogHeader title={translateMessage("Welcome to Self-hosted LiveSync")} />
|
||||
<Guidance
|
||||
>{translateMessage(
|
||||
"We will now guide you through a few questions to simplify the synchronisation setup."
|
||||
)}</Guidance
|
||||
>
|
||||
<InfoNote>
|
||||
{translateMessage(
|
||||
"This first setup has several short steps because it confirms encryption, the connection method, and which device provides the initial data. Once it is complete, additional devices can reuse a Setup URI."
|
||||
)}
|
||||
</InfoNote>
|
||||
<Instruction>
|
||||
<Question>First, please select the option that best describes your current situation.</Question>
|
||||
<Question>{translateMessage("First, please select the option that best describes your current situation.")}</Question>
|
||||
<Options>
|
||||
<Option selectedValue={TYPE_NEW_USER} title="I am setting this up for the first time" bind:value={userType}>
|
||||
(Select this if you are configuring this device as the first synchronisation device.) This option is
|
||||
suitable if you are new to LiveSync and want to set it up from scratch.
|
||||
<Option
|
||||
selectedValue={TYPE_NEW_USER}
|
||||
title={translateMessage("I am setting this up for the first time")}
|
||||
bind:value={userType}
|
||||
>
|
||||
{translateMessage(
|
||||
"(Select this if you are configuring this device as the first synchronisation device.) This option is suitable if you are new to LiveSync and want to set it up from scratch."
|
||||
)}
|
||||
</Option>
|
||||
<Option
|
||||
selectedValue={TYPE_EXISTING_USER}
|
||||
title="I am adding a device to an existing synchronisation setup"
|
||||
title={translateMessage("I am adding a device to an existing synchronisation setup")}
|
||||
bind:value={userType}
|
||||
>
|
||||
(Select this if you are already using synchronisation on another computer or smartphone.) This option is
|
||||
suitable if you are new to LiveSync and want to set it up from scratch.
|
||||
{translateMessage(
|
||||
"(Select this if you are already using synchronisation on another computer or smartphone.) This option is suitable if you are new to LiveSync and want to set it up from scratch."
|
||||
)}
|
||||
</Option>
|
||||
</Options>
|
||||
</Instruction>
|
||||
<UserDecisions>
|
||||
<Decision title={proceedTitle} important={canProceed} disabled={!canProceed} commit={() => setResult(userType)} />
|
||||
<Decision title="No, please take me back" commit={() => setResult(TYPE_CANCELLED)} />
|
||||
<Decision title={translateMessage("No, please take me back")} commit={() => setResult(TYPE_CANCELLED)} />
|
||||
</UserDecisions>
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
TYPE_NEW,
|
||||
TYPE_COMPATIBLE_EXISTING,
|
||||
} from "./setupDialogTypes";
|
||||
import { $msg as translateMessage } from "@/common/translation";
|
||||
|
||||
type Props = {
|
||||
setResult: (result: OutroAskUserModeResultType) => void;
|
||||
@@ -25,58 +26,66 @@
|
||||
});
|
||||
const proceedMessage = $derived.by(() => {
|
||||
if (userType === TYPE_NEW) {
|
||||
return "Proceed to the next step.";
|
||||
return translateMessage("Proceed to the next step.");
|
||||
} else if (userType === TYPE_EXISTING) {
|
||||
return "Proceed to the next step.";
|
||||
return translateMessage("Proceed to the next step.");
|
||||
} else if (userType === TYPE_COMPATIBLE_EXISTING) {
|
||||
return "Apply the settings";
|
||||
return translateMessage("Apply the settings");
|
||||
} else {
|
||||
return "Please select an option to proceed";
|
||||
return translateMessage("Please select an option to proceed");
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<DialogHeader title="Mostly Complete: Decision Required" />
|
||||
<DialogHeader title={translateMessage("Mostly Complete: Decision Required")} />
|
||||
<Guidance>
|
||||
The connection to the server has been configured successfully. As the next step, <strong
|
||||
>the local database, that is to say the synchronisation information, must be reconstituted.</strong
|
||||
{translateMessage("The connection to the server has been configured successfully. As the next step,")} <strong
|
||||
>{translateMessage(
|
||||
"the local database, that is to say the synchronisation information, must be reconstituted."
|
||||
)}</strong
|
||||
>
|
||||
</Guidance>
|
||||
<Instruction>
|
||||
<Question>Please select your situation.</Question>
|
||||
<Question>{translateMessage("Please select your situation.")}</Question>
|
||||
<Option
|
||||
title="I am setting up a new server for the first time / I want to reset my existing server."
|
||||
title={translateMessage(
|
||||
"I am setting up a new server for the first time / I want to reset my existing server."
|
||||
)}
|
||||
bind:value={userType}
|
||||
selectedValue={TYPE_NEW}
|
||||
>
|
||||
<InfoNote>
|
||||
Selecting this option will result in the current data on this device being used to initialise the server.
|
||||
Any existing data on the server will be completely overwritten.
|
||||
{translateMessage(
|
||||
"Selecting this option will result in the current data on this device being used to initialise the server. Any existing data on the server will be completely overwritten."
|
||||
)}
|
||||
</InfoNote>
|
||||
</Option>
|
||||
<Option
|
||||
title="My remote server is already set up. I want to join this device."
|
||||
title={translateMessage("My remote server is already set up. I want to join this device.")}
|
||||
bind:value={userType}
|
||||
selectedValue={TYPE_EXISTING}
|
||||
>
|
||||
<InfoNote>
|
||||
Selecting this option will result in this device joining the existing server. You need to fetching the
|
||||
existing synchronisation data from the server to this device.
|
||||
{translateMessage(
|
||||
"Selecting this option will result in this device joining the existing server. You need to fetching the existing synchronisation data from the server to this device."
|
||||
)}
|
||||
</InfoNote>
|
||||
</Option>
|
||||
<Option
|
||||
title="The remote is already set up, and the configuration is compatible (or got compatible by this operation)."
|
||||
title={translateMessage(
|
||||
"The remote is already set up, and the configuration is compatible (or got compatible by this operation)."
|
||||
)}
|
||||
bind:value={userType}
|
||||
selectedValue={TYPE_COMPATIBLE_EXISTING}
|
||||
>
|
||||
<InfoNote warning>
|
||||
Unless you are certain, selecting this options is bit dangerous. It assumes that the server configuration is
|
||||
compatible with this device. If this is not the case, data loss may occur. Please ensure you know what you
|
||||
are doing.
|
||||
{translateMessage(
|
||||
"Unless you are certain, selecting this options is bit dangerous. It assumes that the server configuration is compatible with this device. If this is not the case, data loss may occur. Please ensure you know what you are doing."
|
||||
)}
|
||||
</InfoNote>
|
||||
</Option>
|
||||
</Instruction>
|
||||
<UserDecisions>
|
||||
<Decision title={proceedMessage} important={true} disabled={!canProceed} commit={() => setResult(userType)} />
|
||||
<Decision title="No, please take me back" commit={() => setResult(TYPE_CANCELLED)} />
|
||||
<Decision title={translateMessage("No, please take me back")} commit={() => setResult(TYPE_CANCELLED)} />
|
||||
</UserDecisions>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
)}
|
||||
</p>
|
||||
<p>
|
||||
<strong>PLEASE NOTE</strong>
|
||||
<strong>{translateMessage("PLEASE NOTE")}</strong>
|
||||
<br />
|
||||
{translateMessage(
|
||||
"After restarting, select an online source device for the initial Fetch. The local LiveSync database on this device will be rebuilt from that source. Unsynchronised files in this Vault may conflict with the fetched data."
|
||||
@@ -43,28 +43,40 @@
|
||||
important={true}
|
||||
commit={() => setResult(TYPE_APPLY)}
|
||||
/>
|
||||
<Decision title="No, please take me back" commit={() => setResult(TYPE_CANCELLED)} />
|
||||
<Decision title={translateMessage("No, please take me back")} commit={() => setResult(TYPE_CANCELLED)} />
|
||||
</UserDecisions>
|
||||
{:else}
|
||||
<DialogHeader title="Setup Complete: Preparing to Fetch Synchronisation Data" />
|
||||
<DialogHeader title={translateMessage("Setup Complete: Preparing to Fetch Synchronisation Data")} />
|
||||
<Guidance>
|
||||
<p>
|
||||
The connection to the server has been configured successfully. As the next step, <strong
|
||||
>the latest synchronisation data will be downloaded from the server to this device.</strong
|
||||
{translateMessage("The connection to the server has been configured successfully. As the next step,")}
|
||||
<strong
|
||||
>{translateMessage(
|
||||
"the latest synchronisation data will be downloaded from the server to this device."
|
||||
)}</strong
|
||||
>
|
||||
</p>
|
||||
<p>
|
||||
<strong>PLEASE NOTE</strong>
|
||||
<strong>{translateMessage("PLEASE NOTE")}</strong>
|
||||
<br />
|
||||
After restarting, the database on this device will be rebuilt using data from the server. If there are any unsynchronised
|
||||
files in this vault, conflicts may occur with the server data.
|
||||
{translateMessage(
|
||||
"After restarting, the database on this device will be rebuilt using data from the server. If there are any unsynchronised files in this vault, conflicts may occur with the server data."
|
||||
)}
|
||||
</p>
|
||||
</Guidance>
|
||||
<Instruction>
|
||||
<Question>Please select the button below to restart and proceed to the data fetching confirmation.</Question>
|
||||
<Question
|
||||
>{translateMessage(
|
||||
"Please select the button below to restart and proceed to the data fetching confirmation."
|
||||
)}</Question
|
||||
>
|
||||
</Instruction>
|
||||
<UserDecisions>
|
||||
<Decision title="Restart and Fetch Data" important={true} commit={() => setResult(TYPE_APPLY)} />
|
||||
<Decision title="No, please take me back" commit={() => setResult(TYPE_CANCELLED)} />
|
||||
<Decision
|
||||
title={translateMessage("Restart and Fetch Data")}
|
||||
important={true}
|
||||
commit={() => setResult(TYPE_APPLY)}
|
||||
/>
|
||||
<Decision title={translateMessage("No, please take me back")} commit={() => setResult(TYPE_CANCELLED)} />
|
||||
</UserDecisions>
|
||||
{/if}
|
||||
|
||||
@@ -36,28 +36,35 @@
|
||||
important={true}
|
||||
commit={() => setResult(TYPE_APPLY)}
|
||||
/>
|
||||
<Decision title="No, please take me back" commit={() => setResult(TYPE_CANCELLED)} />
|
||||
<Decision title={msg("No, please take me back")} commit={() => setResult(TYPE_CANCELLED)} />
|
||||
</UserDecisions>
|
||||
{:else}
|
||||
<DialogHeader title="Setup Complete: Preparing to Initialise Server" />
|
||||
<DialogHeader title={msg("Setup Complete: Preparing to Initialise Server")} />
|
||||
<Guidance>
|
||||
<p>
|
||||
The connection to the server has been configured successfully. As the next step, <strong
|
||||
>the synchronisation data on the server will be built based on the current data on this device.</strong
|
||||
{msg("The connection to the server has been configured successfully. As the next step,")} <strong
|
||||
>{msg(
|
||||
"the synchronisation data on the server will be built based on the current data on this device."
|
||||
)}</strong
|
||||
>
|
||||
</p>
|
||||
<p>
|
||||
<strong>IMPORTANT</strong>
|
||||
<strong>{msg("IMPORTANT")}</strong>
|
||||
<br />
|
||||
After restarting, the data on this device will be uploaded to the server as the 'master copy'. Please be aware
|
||||
that any unintended data currently on the server will be completely overwritten.
|
||||
{msg(
|
||||
"After restarting, the data on this device will be uploaded to the server as the 'master copy'. Please be aware that any unintended data currently on the server will be completely overwritten."
|
||||
)}
|
||||
</p>
|
||||
</Guidance>
|
||||
<Instruction>
|
||||
<Question>Please select the button below to restart and proceed to the final confirmation.</Question>
|
||||
<Question>{msg("Please select the button below to restart and proceed to the final confirmation.")}</Question>
|
||||
</Instruction>
|
||||
<UserDecisions>
|
||||
<Decision title="Restart and Initialise Server" important={true} commit={() => setResult(TYPE_APPLY)} />
|
||||
<Decision title="No, please take me back" commit={() => setResult(TYPE_CANCELLED)} />
|
||||
<Decision
|
||||
title={msg("Restart and Initialise Server")}
|
||||
important={true}
|
||||
commit={() => setResult(TYPE_APPLY)}
|
||||
/>
|
||||
<Decision title={msg("No, please take me back")} commit={() => setResult(TYPE_CANCELLED)} />
|
||||
</UserDecisions>
|
||||
{/if}
|
||||
|
||||
@@ -23,7 +23,11 @@
|
||||
detectedIssues = fixResults;
|
||||
} catch (e) {
|
||||
Logger(e, LOG_LEVEL_VERBOSE, "setup-couchdb-check");
|
||||
detectedIssues.push({ message: `Error during testAndFixSettings: ${e}`, result: "error", classes: [] });
|
||||
detectedIssues.push({
|
||||
message: translateMessage("Error during testAndFixSettings: ${reason}", { reason: `${e}` }),
|
||||
result: "error",
|
||||
classes: [],
|
||||
});
|
||||
}
|
||||
}
|
||||
function isErrorResult(result: ConfigCheckResult): result is ResultError<unknown> | ResultErrorMessage {
|
||||
@@ -71,7 +75,9 @@
|
||||
</div>
|
||||
{#if isFixableError(issue)}
|
||||
<div class="operations">
|
||||
<button onclick={() => fixIssue(issue)} class="mod-cta" disabled={processing}>Fix</button>
|
||||
<button onclick={() => fixIssue(issue)} class="mod-cta" disabled={processing}
|
||||
>{translateMessage("Fix")}</button
|
||||
>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
@@ -83,15 +89,15 @@
|
||||
<details open={!isAllSuccess}>
|
||||
<summary>
|
||||
{#if detectedIssues.length === 0}
|
||||
No checks have been performed yet.
|
||||
{translateMessage("No checks have been performed yet.")}
|
||||
{:else if isAllSuccess}
|
||||
All checks passed successfully!
|
||||
{translateMessage("All checks passed successfully!")}
|
||||
{:else}
|
||||
{errorIssueCount} issue(s) detected!
|
||||
{translateMessage("${count} issue(s) detected!", { count: `${errorIssueCount}` })}
|
||||
{/if}
|
||||
</summary>
|
||||
{#if detectedIssues.length > 0}
|
||||
<h3>Issue detection log:</h3>
|
||||
<h3>{translateMessage("Issue detection log:")}</h3>
|
||||
{#each detectedIssues as issue}
|
||||
{@render result(issue)}
|
||||
{/each}
|
||||
|
||||
@@ -58,57 +58,69 @@
|
||||
</Check>
|
||||
</Guidance>
|
||||
{:else}
|
||||
<DialogHeader title="Final Confirmation: Overwrite Server Data with This Device's Files" />
|
||||
<DialogHeader title={msg("Final Confirmation: Overwrite Server Data with This Device's Files")} />
|
||||
<Guidance
|
||||
>This procedure will first delete all existing synchronisation data from the server. Following this, the server
|
||||
data will be completely rebuilt, using the current state of your Vault on this device (including its local
|
||||
database) as <strong>the single, authoritative master copy</strong>.</Guidance
|
||||
>{msg(
|
||||
"This procedure will first delete all existing synchronisation data from the server. Following this, the server data will be completely rebuilt, using the current state of your Vault on this device (including its local database) as"
|
||||
)} <strong>{msg("the single, authoritative master copy")}</strong>.</Guidance
|
||||
>
|
||||
<InfoNote>
|
||||
You should perform this operation only in exceptional circumstances, such as when the server data is completely
|
||||
corrupted, when changes on all other devices are no longer needed, or when the database size has become unusually
|
||||
large in comparison to the Vault size.
|
||||
{msg(
|
||||
"You should perform this operation only in exceptional circumstances, such as when the server data is completely corrupted, when changes on all other devices are no longer needed, or when the database size has become unusually large in comparison to the Vault size."
|
||||
)}
|
||||
</InfoNote>
|
||||
<Guidance important title="⚠️ Please Confirm the Following">
|
||||
<Guidance important title={msg("⚠️ Please Confirm the Following")}>
|
||||
<Check
|
||||
title="I understand that all changes made on other smartphones or computers possibly could be lost."
|
||||
title={msg("I understand that all changes made on other smartphones or computers possibly could be lost.")}
|
||||
bind:value={confirmationCheck1}
|
||||
>
|
||||
<InfoNote>There is a way to resolve this on other devices.</InfoNote>
|
||||
<InfoNote>Of course, we can back up the data before proceeding.</InfoNote>
|
||||
<InfoNote>{msg("There is a way to resolve this on other devices.")}</InfoNote>
|
||||
<InfoNote>{msg("Of course, we can back up the data before proceeding.")}</InfoNote>
|
||||
</Check>
|
||||
<Check
|
||||
title="I understand that other devices will no longer be able to synchronise, and will need to be reset the synchronisation information."
|
||||
title={msg(
|
||||
"I understand that other devices will no longer be able to synchronise, and will need to be reset the synchronisation information."
|
||||
)}
|
||||
bind:value={confirmationCheck2}
|
||||
>
|
||||
<InfoNote>by resetting the remote, you will be informed on other devices.</InfoNote>
|
||||
<InfoNote>{msg("by resetting the remote, you will be informed on other devices.")}</InfoNote>
|
||||
</Check>
|
||||
<Check title="I understand that this action is irreversible once performed." bind:value={confirmationCheck3} />
|
||||
<Check
|
||||
title={msg("I understand that this action is irreversible once performed.")}
|
||||
bind:value={confirmationCheck3}
|
||||
/>
|
||||
</Guidance>
|
||||
{/if}
|
||||
<hr />
|
||||
<Instruction>
|
||||
<Question>Have you created a backup before proceeding?</Question>
|
||||
<Question>{msg("Have you created a backup before proceeding?")}</Question>
|
||||
<InfoNote warning>
|
||||
This is an extremely powerful operation. We strongly recommend that you copy your Vault folder to a safe
|
||||
location.
|
||||
{msg(
|
||||
"This is an extremely powerful operation. We strongly recommend that you copy your Vault folder to a safe location."
|
||||
)}
|
||||
</InfoNote>
|
||||
<Options>
|
||||
<Option selectedValue={TYPE_BACKUP_DONE} title="I have created a backup of my Vault." bind:value={backupType} />
|
||||
<Option
|
||||
selectedValue={TYPE_BACKUP_DONE}
|
||||
title={msg("I have created a backup of my Vault.")}
|
||||
bind:value={backupType}
|
||||
/>
|
||||
<Option
|
||||
selectedValue={TYPE_BACKUP_SKIPPED}
|
||||
title="I understand the risks and will proceed without a backup."
|
||||
title={msg("I understand the risks and will proceed without a backup.")}
|
||||
bind:value={backupType}
|
||||
/>
|
||||
<Option
|
||||
selectedValue={TYPE_UNABLE_TO_BACKUP}
|
||||
title="I am unable to create a backup of my Vaults."
|
||||
title={msg("I am unable to create a backup of my Vaults.")}
|
||||
bind:value={backupType}
|
||||
>
|
||||
<InfoNote error visible={backupType === TYPE_UNABLE_TO_BACKUP}>
|
||||
<strong
|
||||
>You should create a new synchronisation destination and rebuild your data there. <br /> After that,
|
||||
synchronise to a brand new vault on each other device with the new remote one by one.</strong
|
||||
>{msg("You should create a new synchronisation destination and rebuild your data there.")} <br />
|
||||
{msg(
|
||||
"After that, synchronise to a brand new vault on each other device with the new remote one by one."
|
||||
)}</strong
|
||||
>
|
||||
</InfoNote>
|
||||
</Option>
|
||||
@@ -116,17 +128,19 @@
|
||||
</Instruction>
|
||||
{#if !isP2P}
|
||||
<Instruction>
|
||||
<ExtraItems title="Advanced">
|
||||
<Check title="Prevent fetching configuration from server" bind:value={preventFetchingConfig} />
|
||||
<ExtraItems title={msg("Advanced")}>
|
||||
<Check title={msg("Prevent fetching configuration from server")} bind:value={preventFetchingConfig} />
|
||||
</ExtraItems>
|
||||
</Instruction>
|
||||
{/if}
|
||||
<UserDecisions>
|
||||
<Decision
|
||||
title={isP2P ? msg("Ui.SetupWizard.RebuildEverythingP2P.Proceed") : "I Understand, Overwrite Server"}
|
||||
title={isP2P
|
||||
? msg("Ui.SetupWizard.RebuildEverythingP2P.Proceed")
|
||||
: msg("I Understand, Overwrite Server")}
|
||||
important
|
||||
disabled={!canProceed}
|
||||
commit={() => commit()}
|
||||
/>
|
||||
<Decision title="Cancel" commit={() => setResult(TYPE_CANCEL)} />
|
||||
<Decision title={msg("Cancel")} commit={() => setResult(TYPE_CANCEL)} />
|
||||
</UserDecisions>
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
import Instruction from "@/modules/services/LiveSyncUI/components/Instruction.svelte";
|
||||
import UserDecisions from "@/modules/services/LiveSyncUI/components/UserDecisions.svelte";
|
||||
import { TYPE_CLOSE, type ScanQRCodeResultType } from "./setupDialogTypes";
|
||||
import { $msg as translateMessage } from "@/common/translation";
|
||||
|
||||
type Props = {
|
||||
setResult: (_result: ScanQRCodeResultType) => void;
|
||||
@@ -12,17 +13,25 @@
|
||||
const { setResult }: Props = $props();
|
||||
</script>
|
||||
|
||||
<DialogHeader title="Scan QR Code" />
|
||||
<Guidance>Please follow the steps below to import settings from your existing device.</Guidance>
|
||||
<DialogHeader title={translateMessage("Scan QR Code")} />
|
||||
<Guidance>{translateMessage("Please follow the steps below to import settings from your existing device.")}</Guidance>
|
||||
<Instruction>
|
||||
<!-- <Question>How would you like to configure the connection to your server?</Question> -->
|
||||
<ol>
|
||||
<li>On this device, please keep this Vault open.</li>
|
||||
<li>On the source device, open Obsidian.</li>
|
||||
<li>On the source device, from the command palette, run the 'Show settings as a QR code' command.</li>
|
||||
<li>On this device, switch to the camera app or use a QR code scanner to scan the displayed QR code.</li>
|
||||
<li>{translateMessage("On this device, please keep this Vault open.")}</li>
|
||||
<li>{translateMessage("On the source device, open Obsidian.")}</li>
|
||||
<li>
|
||||
{translateMessage(
|
||||
"On the source device, from the command palette, run the 'Show settings as a QR code' command."
|
||||
)}
|
||||
</li>
|
||||
<li>
|
||||
{translateMessage(
|
||||
"On this device, switch to the camera app or use a QR code scanner to scan the displayed QR code."
|
||||
)}
|
||||
</li>
|
||||
</ol>
|
||||
</Instruction>
|
||||
<UserDecisions>
|
||||
<Decision title="Close this dialog" important={true} commit={() => setResult(TYPE_CLOSE)} />
|
||||
<Decision title={translateMessage("Close this dialog")} important={true} commit={() => setResult(TYPE_CLOSE)} />
|
||||
</UserDecisions>
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
let userType = $state<SelectMethodExistingResultType>(TYPE_CANCELLED);
|
||||
let proceedTitle = $derived.by(() => {
|
||||
if (userType === TYPE_USE_SETUP_URI) {
|
||||
return "Proceed with Setup URI";
|
||||
return translateMessage("Proceed with Setup URI");
|
||||
} else if (userType === TYPE_CONFIGURE_MANUALLY) {
|
||||
return translateMessage("Ui.SetupWizard.SelectExisting.ProceedManual");
|
||||
} else if (userType === TYPE_SCAN_QR_CODE) {
|
||||
return "Scan the QR code displayed on an active device using this device's camera.";
|
||||
return translateMessage("Scan the QR code displayed on an active device using this device's camera.");
|
||||
} else {
|
||||
return "Please select an option to proceed";
|
||||
return translateMessage("Please select an option to proceed");
|
||||
}
|
||||
});
|
||||
const canProceed = $derived.by(() => {
|
||||
@@ -37,16 +37,24 @@
|
||||
});
|
||||
</script>
|
||||
|
||||
<DialogHeader title="Device Setup Method" />
|
||||
<Guidance>You are adding this device to an existing synchronisation setup.</Guidance>
|
||||
<DialogHeader title={translateMessage("Device Setup Method")} />
|
||||
<Guidance>{translateMessage("You are adding this device to an existing synchronisation setup.")}</Guidance>
|
||||
<Instruction>
|
||||
<Question>Please select a method to import the settings from another device.</Question>
|
||||
<Question>{translateMessage("Please select a method to import the settings from another device.")}</Question>
|
||||
<Options>
|
||||
<Option selectedValue={TYPE_USE_SETUP_URI} title="Use a Setup URI (Recommended)" bind:value={userType}>
|
||||
Paste the Setup URI generated from one of your active devices.
|
||||
<Option
|
||||
selectedValue={TYPE_USE_SETUP_URI}
|
||||
title={translateMessage("Use a Setup URI (Recommended)")}
|
||||
bind:value={userType}
|
||||
>
|
||||
{translateMessage("Paste the Setup URI generated from one of your active devices.")}
|
||||
</Option>
|
||||
<Option selectedValue={TYPE_SCAN_QR_CODE} title="Scan a QR Code (Recommended for mobile)" bind:value={userType}>
|
||||
Scan the QR code displayed on an active device using this device's camera.
|
||||
<Option
|
||||
selectedValue={TYPE_SCAN_QR_CODE}
|
||||
title={translateMessage("Scan a QR Code (Recommended for mobile)")}
|
||||
bind:value={userType}
|
||||
>
|
||||
{translateMessage("Scan the QR code displayed on an active device using this device's camera.")}
|
||||
</Option>
|
||||
<Option
|
||||
selectedValue={TYPE_CONFIGURE_MANUALLY}
|
||||
@@ -59,5 +67,5 @@
|
||||
</Instruction>
|
||||
<UserDecisions>
|
||||
<Decision title={proceedTitle} important={canProceed} disabled={!canProceed} commit={() => setResult(userType)} />
|
||||
<Decision title="Cancel" commit={() => setResult(TYPE_CANCELLED)} />
|
||||
<Decision title={translateMessage("Cancel")} commit={() => setResult(TYPE_CANCELLED)} />
|
||||
</UserDecisions>
|
||||
|
||||
@@ -22,11 +22,11 @@
|
||||
let userType = $state<SelectMethodNewUserResultType>(TYPE_CANCELLED);
|
||||
let proceedTitle = $derived.by(() => {
|
||||
if (userType === TYPE_USE_SETUP_URI) {
|
||||
return "Proceed with Setup URI";
|
||||
return translateMessage("Proceed with Setup URI");
|
||||
} else if (userType === TYPE_CONFIGURE_MANUALLY) {
|
||||
return translateMessage("Ui.SetupWizard.SelectNew.ProceedManual");
|
||||
} else {
|
||||
return "Please select an option to proceed";
|
||||
return translateMessage("Please select an option to proceed");
|
||||
}
|
||||
});
|
||||
const canProceed = $derived.by(() => {
|
||||
@@ -34,12 +34,16 @@
|
||||
});
|
||||
</script>
|
||||
|
||||
<DialogHeader title="Connection Method" />
|
||||
<DialogHeader title={translateMessage("Connection Method")} />
|
||||
<Guidance>{translateMessage("Ui.SetupWizard.SelectNew.Guidance")}</Guidance>
|
||||
<Instruction>
|
||||
<Question>{translateMessage("Ui.SetupWizard.SelectNew.Question")}</Question>
|
||||
<Options>
|
||||
<Option selectedValue={TYPE_USE_SETUP_URI} title="Use a Setup URI (Recommended)" bind:value={userType}>
|
||||
<Option
|
||||
selectedValue={TYPE_USE_SETUP_URI}
|
||||
title={translateMessage("Use a Setup URI (Recommended)")}
|
||||
bind:value={userType}
|
||||
>
|
||||
{translateMessage("Ui.SetupWizard.SelectNew.SetupUriOptionDesc")}
|
||||
</Option>
|
||||
<Option
|
||||
@@ -56,5 +60,5 @@
|
||||
</Instruction>
|
||||
<UserDecisions>
|
||||
<Decision title={proceedTitle} important={canProceed} disabled={!canProceed} commit={() => setResult(userType)} />
|
||||
<Decision title="Cancel" commit={() => setResult(TYPE_CANCELLED)} />
|
||||
<Decision title={translateMessage("Cancel")} commit={() => setResult(TYPE_CANCELLED)} />
|
||||
</UserDecisions>
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
let userType = $state<SetupRemoteResultType>(TYPE_CANCELLED);
|
||||
let proceedTitle = $derived.by(() => {
|
||||
if (userType === TYPE_COUCHDB) {
|
||||
return "Continue to CouchDB setup";
|
||||
return translateMessage("Continue to CouchDB setup");
|
||||
} else if (userType === TYPE_BUCKET) {
|
||||
return translateMessage("Ui.SetupWizard.SetupRemote.ProceedBucket");
|
||||
} else if (userType === TYPE_P2P) {
|
||||
return translateMessage("Ui.SetupWizard.SetupRemote.ProceedP2P");
|
||||
} else {
|
||||
return "Please select an option to proceed";
|
||||
return translateMessage("Please select an option to proceed");
|
||||
}
|
||||
});
|
||||
const canProceed = $derived.by(() => {
|
||||
@@ -63,5 +63,5 @@
|
||||
</Instruction>
|
||||
<UserDecisions>
|
||||
<Decision title={proceedTitle} important={canProceed} disabled={!canProceed} commit={() => setResult(userType)} />
|
||||
<Decision title="No, please take me back" commit={() => setResult(TYPE_CANCELLED)} />
|
||||
<Decision title={translateMessage("No, please take me back")} commit={() => setResult(TYPE_CANCELLED)} />
|
||||
</UserDecisions>
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
import { getDialogContext, type GuestDialogProps } from "@/modules/services/LiveSyncUI/svelteDialog";
|
||||
import { copyTo, pickBucketSyncSettings } from "@vrtmrz/livesync-commonlib/compat/common/utils";
|
||||
import { TYPE_CANCELLED, type SetupRemoteBucketResultType } from "./setupDialogTypes";
|
||||
import { $msg as translateMessage } from "@/common/translation";
|
||||
|
||||
const default_setting = pickBucketSyncSettings(DEFAULT_SETTINGS);
|
||||
|
||||
@@ -82,17 +83,17 @@
|
||||
const trialRemoteSetting = generateSetting();
|
||||
const replicator = await context.services.replicator.getNewReplicator(trialRemoteSetting);
|
||||
if (!replicator) {
|
||||
return "Failed to create replicator instance.";
|
||||
return translateMessage("Failed to create replicator instance.");
|
||||
}
|
||||
try {
|
||||
const result = await replicator.tryConnectRemote(trialRemoteSetting, false);
|
||||
if (result) {
|
||||
return "";
|
||||
} else {
|
||||
return "Failed to connect to the server. Please check your settings.";
|
||||
return translateMessage("Failed to connect to the server. Please check your settings.");
|
||||
}
|
||||
} catch (e) {
|
||||
return `Failed to connect to the server: ${e}`;
|
||||
return translateMessage("Failed to connect to the server: ${reason}", { reason: `${e}` });
|
||||
}
|
||||
} finally {
|
||||
processing = false;
|
||||
@@ -109,7 +110,7 @@
|
||||
return;
|
||||
}
|
||||
} catch (e) {
|
||||
error = `Error during connection test: ${e}`;
|
||||
error = translateMessage("Error during connection test: ${reason}", { reason: `${e}` });
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -122,9 +123,13 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
<DialogHeader title="S3/MinIO/R2 Configuration" />
|
||||
<Guidance>Please enter the details required to connect to your S3/MinIO/R2 compatible object storage service.</Guidance>
|
||||
<InputRow label="Endpoint URL">
|
||||
<DialogHeader title={translateMessage("S3/MinIO/R2 Configuration")} />
|
||||
<Guidance
|
||||
>{translateMessage(
|
||||
"Please enter the details required to connect to your S3/MinIO/R2 compatible object storage service."
|
||||
)}</Guidance
|
||||
>
|
||||
<InputRow label={translateMessage("Endpoint URL")}>
|
||||
<input
|
||||
type="text"
|
||||
name="s3-endpoint"
|
||||
@@ -137,13 +142,15 @@
|
||||
bind:value={syncSetting.endpoint}
|
||||
/>
|
||||
</InputRow>
|
||||
<InfoNote warning visible={isEndpointInsecure}>We can use only Secure (HTTPS) connections on Obsidian Mobile.</InfoNote>
|
||||
<InfoNote warning visible={isEndpointInsecure}
|
||||
>{translateMessage("We can use only Secure (HTTPS) connections on Obsidian Mobile.")}</InfoNote
|
||||
>
|
||||
|
||||
<InputRow label="Access Key ID">
|
||||
<InputRow label={translateMessage("Access Key ID")}>
|
||||
<input
|
||||
type="text"
|
||||
name="s3-access-key-id"
|
||||
placeholder="Enter your Access Key ID"
|
||||
placeholder={translateMessage("Enter your Access Key ID")}
|
||||
autocorrect="off"
|
||||
autocapitalize="off"
|
||||
spellcheck="false"
|
||||
@@ -152,19 +159,19 @@
|
||||
/>
|
||||
</InputRow>
|
||||
|
||||
<InputRow label="Secret Access Key">
|
||||
<InputRow label={translateMessage("Secret Access Key")}>
|
||||
<Password
|
||||
name="s3-secret-access-key"
|
||||
placeholder="Enter your Secret Access Key"
|
||||
placeholder={translateMessage("Enter your Secret Access Key")}
|
||||
required
|
||||
bind:value={syncSetting.secretKey}
|
||||
/>
|
||||
</InputRow>
|
||||
<InputRow label="Bucket Name">
|
||||
<InputRow label={translateMessage("Bucket Name")}>
|
||||
<input
|
||||
type="text"
|
||||
name="s3-bucket-name"
|
||||
placeholder="Enter your Bucket Name"
|
||||
placeholder={translateMessage("Enter your Bucket Name")}
|
||||
autocorrect="off"
|
||||
autocapitalize="off"
|
||||
spellcheck="false"
|
||||
@@ -172,26 +179,26 @@
|
||||
bind:value={syncSetting.bucket}
|
||||
/></InputRow
|
||||
>
|
||||
<InputRow label="Region">
|
||||
<InputRow label={translateMessage("Region")}>
|
||||
<input
|
||||
type="text"
|
||||
name="s3-region"
|
||||
placeholder="Enter your Region (e.g., us-east-1, auto for R2)"
|
||||
placeholder={translateMessage("Enter your Region (e.g., us-east-1, auto for R2)")}
|
||||
autocorrect="off"
|
||||
autocapitalize="off"
|
||||
spellcheck="false"
|
||||
bind:value={syncSetting.region}
|
||||
/>
|
||||
</InputRow>
|
||||
<InputRow label="Use Path-Style Access">
|
||||
<InputRow label={translateMessage("Use Path-Style Access")}>
|
||||
<input type="checkbox" name="s3-use-path-style" bind:checked={syncSetting.forcePathStyle} />
|
||||
</InputRow>
|
||||
|
||||
<InputRow label="Folder Prefix">
|
||||
<InputRow label={translateMessage("Folder Prefix")}>
|
||||
<input
|
||||
type="text"
|
||||
name="s3-folder-prefix"
|
||||
placeholder="Enter a folder prefix (optional)"
|
||||
placeholder={translateMessage("Enter a folder prefix (optional)")}
|
||||
autocorrect="off"
|
||||
autocapitalize="off"
|
||||
spellcheck="false"
|
||||
@@ -199,20 +206,21 @@
|
||||
/>
|
||||
</InputRow>
|
||||
<InfoNote>
|
||||
If you want to store the data in a specific folder within the bucket, you can specify a folder prefix here.
|
||||
Otherwise, leave it blank to store data at the root of the bucket.
|
||||
{translateMessage(
|
||||
"If you want to store the data in a specific folder within the bucket, you can specify a folder prefix here. Otherwise, leave it blank to store data at the root of the bucket."
|
||||
)}
|
||||
</InfoNote>
|
||||
<InputRow label="Use internal API">
|
||||
<InputRow label={translateMessage("Use internal API")}>
|
||||
<input type="checkbox" name="s3-use-internal-api" bind:checked={syncSetting.useCustomRequestHandler} />
|
||||
</InputRow>
|
||||
<InfoNote>
|
||||
If you cannot avoid CORS issues, you might want to try this option. It uses Obsidian's internal API to communicate
|
||||
with the S3 server. Not compliant with web standards, but works. Note that this might break in future Obsidian
|
||||
versions.
|
||||
{translateMessage(
|
||||
"If you cannot avoid CORS issues, you might want to try this option. It uses Obsidian's internal API to communicate with the S3 server. Not compliant with web standards, but works. Note that this might break in future Obsidian versions."
|
||||
)}
|
||||
</InfoNote>
|
||||
|
||||
<ExtraItems title="Advanced Settings">
|
||||
<InputRow label="Custom Headers">
|
||||
<ExtraItems title={translateMessage("Advanced Settings")}>
|
||||
<InputRow label={translateMessage("Custom Headers")}>
|
||||
<textarea
|
||||
name="bucket-custom-headers"
|
||||
placeholder="e.g., x-example-header: value\n another-header: value2"
|
||||
@@ -229,11 +237,16 @@
|
||||
</InfoNote>
|
||||
|
||||
{#if processing}
|
||||
Checking connection... Please wait.
|
||||
{translateMessage("Checking connection... Please wait.")}
|
||||
{:else}
|
||||
<UserDecisions>
|
||||
<Decision title="Test Settings and Continue" important disabled={!canProceed} commit={() => checkAndCommit()} />
|
||||
<Decision title="Continue anyway" commit={() => commit()} />
|
||||
<Decision title="Cancel" commit={() => cancel()} />
|
||||
<Decision
|
||||
title={translateMessage("Test Settings and Continue")}
|
||||
important
|
||||
disabled={!canProceed}
|
||||
commit={() => checkAndCommit()}
|
||||
/>
|
||||
<Decision title={translateMessage("Continue anyway")} commit={() => commit()} />
|
||||
<Decision title={translateMessage("Cancel")} commit={() => cancel()} />
|
||||
</UserDecisions>
|
||||
{/if}
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
const trialRemoteSetting = generateSetting();
|
||||
const replicator = await context.services.replicator.getNewReplicator(trialRemoteSetting);
|
||||
if (!replicator) {
|
||||
return "Failed to create replicator instance.";
|
||||
return translateMessage("Failed to create replicator instance.");
|
||||
}
|
||||
try {
|
||||
const result = await probeCouchDBConnection(
|
||||
@@ -86,10 +86,12 @@
|
||||
if (result.ok) {
|
||||
return "";
|
||||
} else {
|
||||
return `Failed to connect to the server: ${result.reason}`;
|
||||
return translateMessage("Failed to connect to the server: ${reason}", {
|
||||
reason: `${result.reason}`,
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
return `Failed to connect to the server: ${e}`;
|
||||
return translateMessage("Failed to connect to the server: ${reason}", { reason: `${e}` });
|
||||
}
|
||||
} finally {
|
||||
processing = false;
|
||||
@@ -106,7 +108,7 @@
|
||||
return;
|
||||
}
|
||||
} catch (e) {
|
||||
error = `Error during connection test: ${e}`;
|
||||
error = translateMessage("Error during connection test: ${reason}", { reason: `${e}` });
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -159,9 +161,9 @@
|
||||
});
|
||||
</script>
|
||||
|
||||
<DialogHeader title="CouchDB Configuration" />
|
||||
<Guidance>Please enter the CouchDB server information below.</Guidance>
|
||||
<InputRow label="URL">
|
||||
<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"
|
||||
@@ -174,13 +176,15 @@
|
||||
pattern="^https?://.+"
|
||||
/>
|
||||
</InputRow>
|
||||
<InfoNote warning visible={isURIInsecure}>We can use only Secure (HTTPS) connections on Obsidian Mobile.</InfoNote>
|
||||
<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="Username">
|
||||
<InputRow label={translateMessage("Username")}>
|
||||
<input
|
||||
type="text"
|
||||
name="couchdb-username"
|
||||
placeholder="Enter your username"
|
||||
placeholder={translateMessage("Enter your username")}
|
||||
autocorrect="off"
|
||||
autocapitalize="off"
|
||||
spellcheck="false"
|
||||
@@ -188,20 +192,20 @@
|
||||
bind:value={syncSetting.couchDB_USER}
|
||||
/>
|
||||
</InputRow>
|
||||
<InputRow label="Password">
|
||||
<InputRow label={translateMessage("Password")}>
|
||||
<Password
|
||||
name="couchdb-password"
|
||||
placeholder="Enter your password"
|
||||
placeholder={translateMessage("Enter your password")}
|
||||
bind:value={syncSetting.couchDB_PASSWORD}
|
||||
required
|
||||
/>
|
||||
</InputRow>
|
||||
|
||||
<InputRow label="Database Name">
|
||||
<InputRow label={translateMessage("Database Name")}>
|
||||
<input
|
||||
type="text"
|
||||
name="couchdb-database"
|
||||
placeholder="Enter your database name"
|
||||
placeholder={translateMessage("Enter your database name")}
|
||||
autocorrect="off"
|
||||
autocapitalize="off"
|
||||
spellcheck="false"
|
||||
@@ -212,17 +216,17 @@
|
||||
<InfoNote>
|
||||
{translateMessage("CouchDB validates the database name when you connect. The name must not be empty.")}
|
||||
</InfoNote>
|
||||
<InputRow label="Use Internal API">
|
||||
<InputRow label={translateMessage("Use Internal API")}>
|
||||
<input type="checkbox" name="couchdb-use-internal-api" bind:checked={syncSetting.useRequestAPI} />
|
||||
</InputRow>
|
||||
<InfoNote>
|
||||
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.
|
||||
{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="Advanced Settings">
|
||||
<InputRow label="Custom Headers">
|
||||
<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"
|
||||
@@ -233,11 +237,11 @@
|
||||
></textarea>
|
||||
</InputRow>
|
||||
</ExtraItems>
|
||||
<ExtraItems title="Experimental Settings">
|
||||
<InputRow label="Use JWT Authentication">
|
||||
<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="JWT Algorithm">
|
||||
<InputRow label={translateMessage("JWT Algorithm")}>
|
||||
<select bind:value={syncSetting.jwtAlgorithm} disabled={!isUseJWT}>
|
||||
<option value="HS256">HS256</option>
|
||||
<option value="HS512">HS512</option>
|
||||
@@ -245,7 +249,7 @@
|
||||
<option value="ES512">ES512</option>
|
||||
</select>
|
||||
</InputRow>
|
||||
<InputRow label="JWT Expiration Duration (minutes)">
|
||||
<InputRow label={translateMessage("JWT Expiration Duration (minutes)")}>
|
||||
<input
|
||||
type="text"
|
||||
name="couchdb-jwt-exp-duration"
|
||||
@@ -254,43 +258,44 @@
|
||||
disabled={!isUseJWT}
|
||||
/>
|
||||
</InputRow>
|
||||
<InputRow label="JWT Key">
|
||||
<InputRow label={translateMessage("JWT Key")}>
|
||||
<textarea
|
||||
name="couchdb-jwt-key"
|
||||
rows="5"
|
||||
autocapitalize="off"
|
||||
spellcheck="false"
|
||||
placeholder="Enter your JWT secret or private key"
|
||||
placeholder={translateMessage("Enter your JWT secret or private key")}
|
||||
bind:value={syncSetting.jwtKey}
|
||||
disabled={!isUseJWT}
|
||||
></textarea>
|
||||
</InputRow>
|
||||
<InfoNote>
|
||||
For HS256/HS512 algorithms, provide the shared secret key. For ES256/ES512 algorithms, provide the pkcs8
|
||||
PEM-formatted private key.
|
||||
{translateMessage(
|
||||
"For HS256/HS512 algorithms, provide the shared secret key. For ES256/ES512 algorithms, provide the pkcs8 PEM-formatted private key."
|
||||
)}
|
||||
</InfoNote>
|
||||
<InputRow label="JWT Key ID (kid)">
|
||||
<InputRow label={translateMessage("JWT Key ID (kid)")}>
|
||||
<input
|
||||
type="text"
|
||||
name="couchdb-jwt-kid"
|
||||
placeholder="Enter your JWT Key ID"
|
||||
placeholder={translateMessage("Enter your JWT Key ID")}
|
||||
bind:value={syncSetting.jwtKid}
|
||||
disabled={!isUseJWT}
|
||||
/>
|
||||
</InputRow>
|
||||
<InputRow label="JWT Subject (sub)">
|
||||
<InputRow label={translateMessage("JWT Subject (sub)")}>
|
||||
<input
|
||||
type="text"
|
||||
name="couchdb-jwt-sub"
|
||||
placeholder="Enter your JWT Subject (CouchDB Username)"
|
||||
placeholder={translateMessage("Enter your JWT Subject (CouchDB Username)")}
|
||||
bind:value={syncSetting.jwtSub}
|
||||
disabled={!isUseJWT}
|
||||
/>
|
||||
</InputRow>
|
||||
<InfoNote warning>
|
||||
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.
|
||||
{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>
|
||||
|
||||
@@ -307,7 +312,7 @@
|
||||
</InfoNote>
|
||||
|
||||
{#if processing}
|
||||
Checking connection... Please wait.
|
||||
{translateMessage("Checking connection... Please wait.")}
|
||||
{:else}
|
||||
<UserDecisions>
|
||||
<Decision title={primaryActionTitle} important disabled={!canProceed} commit={() => checkAndCommit()} />
|
||||
@@ -323,6 +328,6 @@
|
||||
commit={() => commit()}
|
||||
/>
|
||||
{/if}
|
||||
<Decision title="Cancel" commit={() => cancel()} />
|
||||
<Decision title={translateMessage("Cancel")} commit={() => cancel()} />
|
||||
</UserDecisions>
|
||||
{/if}
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
import type { GuestDialogProps } from "@/modules/services/LiveSyncUI/svelteDialog";
|
||||
import { copyTo, pickEncryptionSettings } from "@vrtmrz/livesync-commonlib/compat/common/utils";
|
||||
import { TYPE_CANCELLED, type SetupRemoteE2EEResultType } from "./setupDialogTypes";
|
||||
import { $msg as translateMessage } from "@/common/translation";
|
||||
|
||||
type Props = GuestDialogProps<SetupRemoteE2EEResultType, EncryptionSettings>;
|
||||
const { setResult, getInitialData }: Props = $props();
|
||||
@@ -47,30 +48,31 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
<DialogHeader title="End-to-End Encryption" />
|
||||
<Guidance>Please configure your end-to-end encryption settings.</Guidance>
|
||||
<InputRow label="End-to-End Encryption">
|
||||
<DialogHeader title={translateMessage("End-to-End Encryption")} />
|
||||
<Guidance>{translateMessage("Please configure your end-to-end encryption settings.")}</Guidance>
|
||||
<InputRow label={translateMessage("End-to-End Encryption")}>
|
||||
<input type="checkbox" bind:checked={encryptionSettings.encrypt} />
|
||||
<Password
|
||||
name="e2ee-passphrase"
|
||||
placeholder="Enter your passphrase"
|
||||
placeholder={translateMessage("Enter your passphrase")}
|
||||
bind:value={encryptionSettings.passphrase}
|
||||
disabled={!encryptionSettings.encrypt}
|
||||
required={encryptionSettings.encrypt}
|
||||
/>
|
||||
</InputRow>
|
||||
<InfoNote title="Strongly Recommended">
|
||||
Enabling end-to-end encryption ensures that your data is encrypted on your device before being sent to the remote
|
||||
server. This means that even if someone gains access to the server, they won't be able to read your data without the
|
||||
passphrase. Make sure to remember your passphrase, as it will be required to decrypt your data on other devices.
|
||||
<InfoNote title={translateMessage("Strongly Recommended")}>
|
||||
{translateMessage(
|
||||
"Enabling end-to-end encryption ensures that your data is encrypted on your device before being sent to the remote server. This means that even if someone gains access to the server, they won't be able to read your data without the passphrase. Make sure to remember your passphrase, as it will be required to decrypt your data on other devices."
|
||||
)}
|
||||
<br />
|
||||
Also, please note that if you are using Peer-to-Peer synchronization, this configuration will be used when you switch
|
||||
to other methods and connect to a remote server in the future.
|
||||
{translateMessage(
|
||||
"Also, please note that if you are using Peer-to-Peer synchronization, this configuration will be used when you switch to other methods and connect to a remote server in the future."
|
||||
)}
|
||||
</InfoNote>
|
||||
<InfoNote warning>
|
||||
This setting must be the same even when connecting to multiple synchronisation destinations.
|
||||
{translateMessage("This setting must be the same even when connecting to multiple synchronisation destinations.")}
|
||||
</InfoNote>
|
||||
<InputRow label="Obfuscate Properties">
|
||||
<InputRow label={translateMessage("Obfuscate Properties")}>
|
||||
<input
|
||||
type="checkbox"
|
||||
bind:checked={encryptionSettings.usePathObfuscation}
|
||||
@@ -79,14 +81,13 @@
|
||||
</InputRow>
|
||||
|
||||
<InfoNote>
|
||||
Obfuscating properties (e.g., path of file, size, creation and modification dates) adds an additional layer of
|
||||
security by making it harder to identify the structure and names of your files and folders on the remote server.
|
||||
This helps protect your privacy and makes it more difficult for unauthorized users to infer information about your
|
||||
data.
|
||||
{translateMessage(
|
||||
"Obfuscating properties (e.g., path of file, size, creation and modification dates) adds an additional layer of security by making it harder to identify the structure and names of your files and folders on the remote server. This helps protect your privacy and makes it more difficult for unauthorized users to infer information about your data."
|
||||
)}
|
||||
</InfoNote>
|
||||
|
||||
<ExtraItems title="Advanced">
|
||||
<InputRow label="Encryption Algorithm">
|
||||
<ExtraItems title={translateMessage("Advanced")}>
|
||||
<InputRow label={translateMessage("Encryption Algorithm")}>
|
||||
<select bind:value={encryptionSettings.E2EEAlgorithm} disabled={!encryptionSettings.encrypt}>
|
||||
{#each Object.values(E2EEAlgorithms) as alg}
|
||||
<option value={alg}>{E2EEAlgorithmNames[alg] ?? alg}</option>
|
||||
@@ -94,30 +95,33 @@
|
||||
</select>
|
||||
</InputRow>
|
||||
<InfoNote>
|
||||
In most cases, you should stick with the default algorithm ({E2EEAlgorithmNames[
|
||||
DEFAULT_SETTINGS.E2EEAlgorithm
|
||||
]}), This setting is only required if you have an existing Vault encrypted in a different format.
|
||||
{translateMessage(
|
||||
"In most cases, you should stick with the default algorithm (${algorithm}), This setting is only required if you have an existing Vault encrypted in a different format.",
|
||||
{ algorithm: E2EEAlgorithmNames[DEFAULT_SETTINGS.E2EEAlgorithm] }
|
||||
)}
|
||||
</InfoNote>
|
||||
<InfoNote warning>
|
||||
Changing the encryption algorithm will prevent access to any data previously encrypted with a different
|
||||
algorithm. Ensure that all your devices are configured to use the same algorithm to maintain access to your
|
||||
data.
|
||||
{translateMessage(
|
||||
"Changing the encryption algorithm will prevent access to any data previously encrypted with a different algorithm. Ensure that all your devices are configured to use the same algorithm to maintain access to your data."
|
||||
)}
|
||||
</InfoNote>
|
||||
</ExtraItems>
|
||||
|
||||
<InfoNote warning>
|
||||
<p>
|
||||
Please be aware that the End-to-End Encryption passphrase is not validated until the synchronisation process
|
||||
actually commences. This is a security measure designed to protect your data.
|
||||
{translateMessage(
|
||||
"Please be aware that the End-to-End Encryption passphrase is not validated until the synchronisation process actually commences. This is a security measure designed to protect your data."
|
||||
)}
|
||||
</p>
|
||||
<p>
|
||||
Therefore, we ask that you exercise extreme caution when configuring server information manually. If an
|
||||
incorrect passphrase is entered, the data on the server will become corrupted. <br /><br />
|
||||
Please understand that this is intended behaviour.
|
||||
{translateMessage(
|
||||
"Therefore, we ask that you exercise extreme caution when configuring server information manually. If an incorrect passphrase is entered, the data on the server will become corrupted."
|
||||
)} <br /><br />
|
||||
{translateMessage("Please understand that this is intended behaviour.")}
|
||||
</p>
|
||||
</InfoNote>
|
||||
|
||||
<UserDecisions>
|
||||
<Decision title="Proceed" important disabled={!e2eeValid} commit={() => commit()} />
|
||||
<Decision title="Cancel" commit={() => setResult(TYPE_CANCELLED)} />
|
||||
<Decision title={translateMessage("Proceed")} important disabled={!e2eeValid} commit={() => commit()} />
|
||||
<Decision title={translateMessage("Cancel")} commit={() => setResult(TYPE_CANCELLED)} />
|
||||
</UserDecisions>
|
||||
|
||||
@@ -123,7 +123,9 @@
|
||||
try {
|
||||
const result = await probeP2PSetupConnection(replicator);
|
||||
if (!result.ok) {
|
||||
return `Failed to connect to the signalling relay: ${result.reason}`;
|
||||
return translateMessage("Failed to connect to the signalling relay: ${reason}", {
|
||||
reason: `${result.reason}`,
|
||||
});
|
||||
}
|
||||
return "";
|
||||
} finally {
|
||||
@@ -157,7 +159,7 @@
|
||||
return;
|
||||
}
|
||||
} catch (e) {
|
||||
error = `Error during connection test: ${e}`;
|
||||
error = translateMessage("Error during connection test: ${reason}", { reason: `${e}` });
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -178,9 +180,9 @@
|
||||
});
|
||||
</script>
|
||||
|
||||
<DialogHeader title="P2P Configuration" />
|
||||
<Guidance>Please enter the Peer-to-Peer Synchronisation information below.</Guidance>
|
||||
<InputRow label="Enabled">
|
||||
<DialogHeader title={translateMessage("P2P Configuration")} />
|
||||
<Guidance>{translateMessage("Please enter the Peer-to-Peer Synchronisation information below.")}</Guidance>
|
||||
<InputRow label={translateMessage("Enabled")}>
|
||||
<input type="checkbox" name="p2p-enabled" bind:checked={syncSetting.P2P_Enabled} />
|
||||
</InputRow>
|
||||
<InputRow label={translateMessage("Signalling relay URLs")}>
|
||||
@@ -208,7 +210,7 @@
|
||||
rel="noopener noreferrer">{translateMessage("Learn more about P2P connections")}</a
|
||||
>.
|
||||
</InfoNote>
|
||||
<InputRow label="Group ID">
|
||||
<InputRow label={translateMessage("Group ID")}>
|
||||
<input
|
||||
type="text"
|
||||
name="p2p-room-id"
|
||||
@@ -218,17 +220,24 @@
|
||||
spellcheck="false"
|
||||
bind:value={syncSetting.P2P_roomID}
|
||||
/>
|
||||
<button class="button" onclick={() => generateDefaultGroupId()}>Generate Random ID</button>
|
||||
<button class="button" onclick={() => generateDefaultGroupId()}>{translateMessage("Generate Random ID")}</button>
|
||||
</InputRow>
|
||||
<InputRow label="Passphrase">
|
||||
<Password name="p2p-password" placeholder="Enter your passphrase" bind:value={syncSetting.P2P_passphrase} />
|
||||
<InputRow label={translateMessage("Passphrase")}>
|
||||
<Password
|
||||
name="p2p-password"
|
||||
placeholder={translateMessage("Enter your passphrase")}
|
||||
bind:value={syncSetting.P2P_passphrase}
|
||||
/>
|
||||
</InputRow>
|
||||
<InfoNote>
|
||||
The Group ID and passphrase are used to identify your group of devices. Make sure to use the same Group ID and
|
||||
passphrase on all devices you want to synchronise.<br />
|
||||
Note that the Group ID is not limited to the generated format; you can use any string as the Group ID.
|
||||
{translateMessage(
|
||||
"The Group ID and passphrase are used to identify your group of devices. Make sure to use the same Group ID and passphrase on all devices you want to synchronise."
|
||||
)}<br />
|
||||
{translateMessage(
|
||||
"Note that the Group ID is not limited to the generated format; you can use any string as the Group ID."
|
||||
)}
|
||||
</InfoNote>
|
||||
<InputRow label="Device Peer ID">
|
||||
<InputRow label={translateMessage("Device Peer ID")}>
|
||||
<input
|
||||
type="text"
|
||||
name="p2p-device-peer-id"
|
||||
@@ -239,12 +248,13 @@
|
||||
bind:value={syncSetting.P2P_DevicePeerName}
|
||||
/>
|
||||
</InputRow>
|
||||
<InputRow label="Auto Start P2P Connection">
|
||||
<InputRow label={translateMessage("Auto Start P2P Connection")}>
|
||||
<input type="checkbox" name="p2p-auto-start" bind:checked={syncSetting.P2P_AutoStart} />
|
||||
</InputRow>
|
||||
<InfoNote>
|
||||
If "Auto Start P2P Connection" is enabled, the P2P connection will be started automatically when the plug-in
|
||||
launches.
|
||||
{translateMessage(
|
||||
'If "Auto Start P2P Connection" is enabled, the P2P connection will be started automatically when the plug-in launches.'
|
||||
)}
|
||||
</InfoNote>
|
||||
<InputRow label={translateMessage("Announce changes automatically after connecting")}>
|
||||
<input type="checkbox" name="p2p-auto-broadcast" bind:checked={syncSetting.P2P_AutoBroadcast} />
|
||||
@@ -254,10 +264,11 @@
|
||||
"When enabled, this device notifies connected peers after a local change. The notification contains no Vault data; a peer which follows this device then fetches the change through the encrypted P2P connection."
|
||||
)}
|
||||
</InfoNote>
|
||||
<ExtraItems title="Advanced Settings">
|
||||
<ExtraItems title={translateMessage("Advanced Settings")}>
|
||||
<InfoNote>
|
||||
TURN server settings are only necessary if you are behind a strict NAT or firewall that prevents direct P2P
|
||||
connections. In most cases, you can leave these fields blank.
|
||||
{translateMessage(
|
||||
"TURN server settings are only necessary if you are behind a strict NAT or firewall that prevents direct P2P connections. In most cases, you can leave these fields blank."
|
||||
)}
|
||||
</InfoNote>
|
||||
<InfoNote warning>
|
||||
{translateMessage(
|
||||
@@ -269,7 +280,7 @@
|
||||
rel="noopener noreferrer">{translateMessage("Learn more about signalling and TURN")}</a
|
||||
>.
|
||||
</InfoNote>
|
||||
<InputRow label="TURN Server URLs (comma-separated)">
|
||||
<InputRow label={translateMessage("TURN Server URLs (comma-separated)")}>
|
||||
<textarea
|
||||
name="p2p-turn-servers"
|
||||
placeholder="turn:turn.example.com:3478,turn:turn.example.com:443"
|
||||
@@ -279,21 +290,21 @@
|
||||
rows="5"
|
||||
></textarea>
|
||||
</InputRow>
|
||||
<InputRow label="TURN Username">
|
||||
<InputRow label={translateMessage("TURN Username")}>
|
||||
<input
|
||||
type="text"
|
||||
name="p2p-turn-username"
|
||||
placeholder="Enter TURN username"
|
||||
placeholder={translateMessage("Enter TURN username")}
|
||||
autocorrect="off"
|
||||
autocapitalize="off"
|
||||
spellcheck="false"
|
||||
bind:value={syncSetting.P2P_turnUsername}
|
||||
/>
|
||||
</InputRow>
|
||||
<InputRow label="TURN Credential">
|
||||
<InputRow label={translateMessage("TURN Credential")}>
|
||||
<Password
|
||||
name="p2p-turn-credential"
|
||||
placeholder="Enter TURN credential"
|
||||
placeholder={translateMessage("Enter TURN credential")}
|
||||
bind:value={syncSetting.P2P_turnCredential}
|
||||
/>
|
||||
</InputRow>
|
||||
@@ -302,11 +313,16 @@
|
||||
{error}
|
||||
</InfoNote>
|
||||
{#if processing}
|
||||
Checking connection... Please wait.
|
||||
{translateMessage("Checking connection... Please wait.")}
|
||||
{:else}
|
||||
<UserDecisions>
|
||||
<Decision title="Test Settings and Continue" important disabled={!canProceed} commit={() => checkAndCommit()} />
|
||||
<Decision title="Continue anyway" commit={() => commit()} />
|
||||
<Decision title="Cancel" commit={() => cancel()} />
|
||||
<Decision
|
||||
title={translateMessage("Test Settings and Continue")}
|
||||
important
|
||||
disabled={!canProceed}
|
||||
commit={() => checkAndCommit()}
|
||||
/>
|
||||
<Decision title={translateMessage("Continue anyway")} commit={() => commit()} />
|
||||
<Decision title={translateMessage("Cancel")} commit={() => cancel()} />
|
||||
</UserDecisions>
|
||||
{/if}
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
import { decryptString } from "@vrtmrz/livesync-commonlib/compat/encryption/stringEncryption";
|
||||
import type { GuestDialogProps } from "@/modules/services/LiveSyncUI/svelteDialog";
|
||||
import { TYPE_CANCELLED, type UseSetupURIResultType } from "./setupDialogTypes";
|
||||
import { $msg as translateMessage } from "@/common/translation";
|
||||
|
||||
type Props = GuestDialogProps<UseSetupURIResultType, string>;
|
||||
const { setResult, getInitialData }: Props = $props();
|
||||
@@ -34,7 +35,7 @@
|
||||
error = "";
|
||||
if (!seemsValid) return;
|
||||
if (!passphrase) {
|
||||
error = "Passphrase is required.";
|
||||
error = translateMessage("Passphrase is required.");
|
||||
return;
|
||||
}
|
||||
try {
|
||||
@@ -47,7 +48,7 @@
|
||||
// Logger("Settings imported successfully", LOG_LEVEL_NOTICE);
|
||||
return;
|
||||
} catch (e) {
|
||||
error = "Failed to parse Setup-URI.";
|
||||
error = translateMessage("Failed to parse Setup-URI.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -56,14 +57,17 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
<DialogHeader title="Enter Setup URI" />
|
||||
<DialogHeader title={translateMessage("Enter Setup URI")} />
|
||||
<Guidance
|
||||
>Please enter the Setup URI that was generated during server installation or on another device, along with the vault
|
||||
passphrase.<br />
|
||||
Note that you can generate a new Setup URI by running the "Copy settings as a new Setup URI" command in the command palette.</Guidance
|
||||
>{translateMessage(
|
||||
"Please enter the Setup URI that was generated during server installation or on another device, along with the vault passphrase."
|
||||
)}<br />
|
||||
{translateMessage(
|
||||
'Note that you can generate a new Setup URI by running the "Copy settings as a new Setup URI" command in the command palette.'
|
||||
)}</Guidance
|
||||
>
|
||||
|
||||
<InputRow label="Setup-URI">
|
||||
<InputRow label={translateMessage("Setup-URI")}>
|
||||
<input
|
||||
type="text"
|
||||
placeholder="obsidian://setuplivesync?settings=...."
|
||||
@@ -74,12 +78,12 @@
|
||||
required
|
||||
/>
|
||||
</InputRow>
|
||||
<InfoNote visible={seemsValid}>The Setup-URI is valid and ready to use.</InfoNote>
|
||||
<InfoNote visible={seemsValid}>{translateMessage("The Setup-URI is valid and ready to use.")}</InfoNote>
|
||||
<InfoNote warning visible={!seemsValid && setupURI.trim() != ""}>
|
||||
The Setup-URI does not appear to be valid. Please check that you have copied it correctly.
|
||||
{translateMessage("The Setup-URI does not appear to be valid. Please check that you have copied it correctly.")}
|
||||
</InfoNote>
|
||||
<InputRow label="Passphrase">
|
||||
<Password placeholder="Enter your passphrase" bind:value={passphrase} required />
|
||||
<InputRow label={translateMessage("Passphrase")}>
|
||||
<Password placeholder={translateMessage("Enter your passphrase")} bind:value={passphrase} required />
|
||||
</InputRow>
|
||||
<InfoNote error visible={error.trim() != ""}>
|
||||
{error}
|
||||
@@ -87,10 +91,10 @@
|
||||
|
||||
<UserDecisions>
|
||||
<Decision
|
||||
title="Test Settings and Continue"
|
||||
title={translateMessage("Test Settings and Continue")}
|
||||
important={true}
|
||||
disabled={!canProceed}
|
||||
commit={() => processSetupURI()}
|
||||
/>
|
||||
<Decision title="Cancel" commit={() => setResult(TYPE_CANCELLED)} />
|
||||
<Decision title={translateMessage("Cancel")} commit={() => setResult(TYPE_CANCELLED)} />
|
||||
</UserDecisions>
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
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 { $msg as translateMessage } from "@/common/translation";
|
||||
const TYPE_OK = "ok";
|
||||
type ResultType = typeof TYPE_OK;
|
||||
type Options = {
|
||||
@@ -38,7 +39,7 @@
|
||||
|
||||
<DialogHeader title="Your {title || 'Data'} is ready to be copied" />
|
||||
<Instruction>
|
||||
<InputRow label={title || "Data to Copy"}>
|
||||
<InputRow label={title || translateMessage("Data to Copy")}>
|
||||
<textarea readonly rows="4">{dataToCopy}</textarea>
|
||||
<button onclick={() => copyToClipboard()}
|
||||
>{#if !copied}📋{:else}✔️{/if}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
});
|
||||
});
|
||||
@@ -10,7 +10,8 @@ export class ObsidianVaultAdapter implements IVaultAdapter<TFile, TFolder> {
|
||||
constructor(private app: App) {}
|
||||
|
||||
async read(file: TFile): Promise<string> {
|
||||
return await this.app.vault.read(file);
|
||||
// Vault.read strips a leading UTF-8 BOM, leaving the content size inconsistent with TFile.stat.
|
||||
return await this.app.vault.adapter.read(file.path);
|
||||
}
|
||||
|
||||
async cachedRead(file: TFile): Promise<string> {
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import type { App, TFile } from "obsidian";
|
||||
import { ObsidianVaultAdapter } from "./ObsidianVaultAdapter";
|
||||
|
||||
describe("ObsidianVaultAdapter.read", () => {
|
||||
it("preserves a UTF-8 BOM so the content size matches the file stat", async () => {
|
||||
const path = "Transcripts/字幕.md";
|
||||
const contentWithoutBom = "字幕の検証行です。\n";
|
||||
const contentWithBom = `\ufeff${contentWithoutBom}`;
|
||||
const read = vi.fn().mockResolvedValue(contentWithoutBom);
|
||||
const adapterRead = vi.fn().mockResolvedValue(contentWithBom);
|
||||
const app = {
|
||||
vault: {
|
||||
read,
|
||||
adapter: {
|
||||
read: adapterRead,
|
||||
},
|
||||
},
|
||||
} as unknown as App;
|
||||
const file = {
|
||||
path,
|
||||
stat: {
|
||||
ctime: 1,
|
||||
mtime: 2,
|
||||
size: new Blob([contentWithBom]).size,
|
||||
},
|
||||
} as TFile;
|
||||
const adapter = new ObsidianVaultAdapter(app);
|
||||
|
||||
const result = await adapter.read(file);
|
||||
|
||||
expect(new Blob([result]).size).toBe(file.stat.size);
|
||||
expect(result.charCodeAt(0)).toBe(0xfeff);
|
||||
expect(adapterRead).toHaveBeenCalledWith(path);
|
||||
expect(read).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
+45
@@ -748,6 +748,51 @@ body.is-mobile .livesync-compatibility-review-notice {
|
||||
color: var(--text-muted);
|
||||
}
|
||||
|
||||
.history-search-row button:disabled {
|
||||
opacity: 0.4;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.history-rev-nav-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.history-rev-nav-row input[type="range"] {
|
||||
flex-grow: 1;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.history-rev-nav-btn {
|
||||
flex-shrink: 0;
|
||||
padding: 2px 10px;
|
||||
font-size: 0.9em;
|
||||
cursor: pointer;
|
||||
border: 1px solid var(--background-modifier-border);
|
||||
border-radius: 4px;
|
||||
background-color: var(--background-secondary);
|
||||
color: var(--text-normal);
|
||||
}
|
||||
|
||||
.history-rev-nav-btn:hover:not(:disabled) {
|
||||
background-color: var(--background-modifier-hover);
|
||||
}
|
||||
|
||||
.history-rev-nav-btn:disabled {
|
||||
opacity: 0.4;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.history-rev-indicator {
|
||||
flex-shrink: 0;
|
||||
font-size: 0.85em;
|
||||
color: var(--text-muted);
|
||||
min-width: 4.5em;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.history-diff-options-row {
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,293 @@
|
||||
import { mkdir, writeFile } from "node:fs/promises";
|
||||
import { join } from "node:path";
|
||||
import { evalObsidianJson } from "../runner/cli.ts";
|
||||
import { discoverObsidianCli, requireObsidianBinary } from "../runner/environment.ts";
|
||||
import { createE2eObsidianDeviceLocalState, waitForLiveSyncCoreReady } from "../runner/liveSyncWorkflow.ts";
|
||||
import { startObsidianLiveSyncSession, type ObsidianLiveSyncSession } from "../runner/session.ts";
|
||||
import { withObsidianPage } from "../runner/ui.ts";
|
||||
import { createTemporaryVault } from "../runner/vault.ts";
|
||||
|
||||
process.env.E2E_OBSIDIAN_CLI_TIMEOUT_MS ??= "60000";
|
||||
process.env.E2E_OBSIDIAN_CORE_READY_TIMEOUT_MS ??= "60000";
|
||||
process.env.E2E_OBSIDIAN_LOCAL_DB_TIMEOUT_MS ??= "30000";
|
||||
|
||||
const notePath = "E2E/document-history-nav.md";
|
||||
const revisions = ["Version one alpha", "Version two beta keyword", "Version three gamma"];
|
||||
|
||||
type RevisionInfo = {
|
||||
revCount: number;
|
||||
id: string;
|
||||
};
|
||||
|
||||
type OpenHistoryResult = {
|
||||
opened: boolean;
|
||||
modalTitle: string | null;
|
||||
};
|
||||
|
||||
function assertEqual(actual: unknown, expected: unknown, message: string): void {
|
||||
if (actual !== expected) {
|
||||
throw new Error(`${message}\nExpected: ${String(expected)}\nActual: ${String(actual)}`);
|
||||
}
|
||||
}
|
||||
|
||||
function assertTrue(value: boolean, message: string): void {
|
||||
if (!value) {
|
||||
throw new Error(message);
|
||||
}
|
||||
}
|
||||
|
||||
async function dismissWelcomeWizard(port: number): Promise<void> {
|
||||
await withObsidianPage(port, async (page) => {
|
||||
const cancel = page.getByText("No, please take me back");
|
||||
if (await cancel.isVisible({ timeout: 5000 }).catch(() => false)) {
|
||||
await cancel.click();
|
||||
await page.waitForTimeout(500);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
async function seedRevisions(cliBinary: string, env: NodeJS.ProcessEnv): Promise<RevisionInfo> {
|
||||
return await evalObsidianJson<RevisionInfo>(
|
||||
cliBinary,
|
||||
[
|
||||
"(async()=>{",
|
||||
`const path=${JSON.stringify(notePath)};`,
|
||||
`const revisions=${JSON.stringify(revisions)};`,
|
||||
"const core=app.plugins.plugins['obsidian-livesync'].core;",
|
||||
"const sleep=(ms)=>new Promise((resolve)=>setTimeout(resolve,ms));",
|
||||
"if(!(await app.vault.adapter.exists('E2E'))) await app.vault.createFolder('E2E');",
|
||||
"const existing=app.vault.getAbstractFileByPath(path);",
|
||||
"if(existing) await app.vault.delete(existing);",
|
||||
"const id=await core.services.path.path2id(path);",
|
||||
"let baseRev='';",
|
||||
"for(const content of revisions){",
|
||||
" const blob=new Blob([content],{type:'text/plain'});",
|
||||
" const now=Date.now();",
|
||||
" const result=await core.localDatabase.putDBEntry({",
|
||||
" _id:id,",
|
||||
" path,",
|
||||
" data:blob,",
|
||||
" ctime:now,",
|
||||
" mtime:now,",
|
||||
" size:(await blob.arrayBuffer()).byteLength,",
|
||||
" children:[],",
|
||||
" datatype:'plain',",
|
||||
" type:'plain',",
|
||||
" eden:{},",
|
||||
" },false,baseRev||undefined);",
|
||||
" if(!result?.ok) throw new Error(`Could not store revision for ${path}`);",
|
||||
" baseRev=result.rev;",
|
||||
" await sleep(100);",
|
||||
"}",
|
||||
`await app.vault.create(path,revisions[revisions.length-1]);`,
|
||||
"await core.services.fileProcessing.commitPendingFileEvents();",
|
||||
"const raw=await core.localDatabase.getRaw(id,{revs_info:true});",
|
||||
"const revCount=(raw._revs_info||[]).filter((e)=>e&&e.status==='available').length;",
|
||||
"return JSON.stringify({revCount,id});",
|
||||
"})()",
|
||||
].join(""),
|
||||
env
|
||||
);
|
||||
}
|
||||
|
||||
async function openDocumentHistory(cliBinary: string, env: NodeJS.ProcessEnv): Promise<OpenHistoryResult> {
|
||||
return await evalObsidianJson<OpenHistoryResult>(
|
||||
cliBinary,
|
||||
[
|
||||
"(async()=>{",
|
||||
`const path=${JSON.stringify(notePath)};`,
|
||||
"const file=app.vault.getAbstractFileByPath(path);",
|
||||
"if(!file) throw new Error('Note missing before opening history');",
|
||||
"document.querySelectorAll('.modal-close-button').forEach((btn)=>btn.click());",
|
||||
"await new Promise((resolve)=>setTimeout(resolve,300));",
|
||||
"const leaf=app.workspace.getLeaf(false);",
|
||||
"await leaf.openFile(file);",
|
||||
"await new Promise((resolve)=>setTimeout(resolve,300));",
|
||||
"await app.commands.executeCommandById('obsidian-livesync:livesync-history');",
|
||||
"await new Promise((resolve)=>setTimeout(resolve,500));",
|
||||
"const modal=document.querySelector('.modal-container .modal-title');",
|
||||
"return JSON.stringify({opened:!!modal,modalTitle:modal?modal.textContent:null});",
|
||||
"})()",
|
||||
].join(""),
|
||||
env
|
||||
);
|
||||
}
|
||||
|
||||
async function main(): Promise<void> {
|
||||
const binary = requireObsidianBinary();
|
||||
const cli = discoverObsidianCli();
|
||||
if (!cli.binary) throw new Error(`Could not find obsidian-cli. Checked paths: ${cli.checked.join(", ")}`);
|
||||
|
||||
const vault = await createTemporaryVault();
|
||||
let session: ObsidianLiveSyncSession | undefined;
|
||||
|
||||
const screenshotDir =
|
||||
process.env.E2E_OBSIDIAN_HISTORY_SCREENSHOT_DIR ??
|
||||
join(process.env.E2E_OBSIDIAN_DIAGNOSTICS_DIR ?? "/tmp/obsidian-livesync-e2e", "document-history-nav");
|
||||
const reportPath = process.env.E2E_OBSIDIAN_HISTORY_REPORT ?? join(screenshotDir, "report.txt");
|
||||
|
||||
async function captureStep(page: import("playwright").Page, step: string): Promise<string> {
|
||||
await mkdir(screenshotDir, { recursive: true });
|
||||
const path = join(screenshotDir, `${step}.png`);
|
||||
await page.screenshot({ path, fullPage: true });
|
||||
console.log(`Screenshot: ${path}`);
|
||||
return path;
|
||||
}
|
||||
|
||||
try {
|
||||
console.log(`Using Obsidian executable: ${binary}`);
|
||||
console.log(`Temporary vault: ${vault.path}`);
|
||||
|
||||
session = await startObsidianLiveSyncSession({
|
||||
binary,
|
||||
cliBinary: cli.binary,
|
||||
vault,
|
||||
startupGraceMs: Number(process.env.E2E_OBSIDIAN_STARTUP_GRACE_MS ?? 1000),
|
||||
pluginData: {
|
||||
doctorProcessedVersion: "1.0.0",
|
||||
isConfigured: true,
|
||||
liveSync: false,
|
||||
remoteType: "",
|
||||
couchDB_URI: "",
|
||||
couchDB_DBNAME: "",
|
||||
couchDB_USER: "",
|
||||
couchDB_PASSWORD: "",
|
||||
remoteConfigurations: {},
|
||||
activeConfigurationId: "",
|
||||
notifyThresholdOfRemoteStorageSize: -1,
|
||||
periodicReplication: false,
|
||||
syncAfterMerge: false,
|
||||
syncOnEditorSave: false,
|
||||
syncOnFileOpen: false,
|
||||
syncOnSave: false,
|
||||
syncOnStart: false,
|
||||
},
|
||||
localStorageEntries: createE2eObsidianDeviceLocalState(vault.name),
|
||||
});
|
||||
await waitForLiveSyncCoreReady(cli.binary, session.cliEnv);
|
||||
|
||||
await dismissWelcomeWizard(session.remoteDebuggingPort);
|
||||
|
||||
const revisionInfo = await seedRevisions(cli.binary, session.cliEnv);
|
||||
console.log(`Seeded local history: ${revisionInfo.revCount} revisions for ${revisionInfo.id}`);
|
||||
assertEqual(revisionInfo.revCount, revisions.length, "Unexpected number of seeded revisions.");
|
||||
|
||||
const opened = await openDocumentHistory(cli.binary, session.cliEnv);
|
||||
assertEqual(opened.opened, true, "Document History modal did not open.");
|
||||
assertEqual(opened.modalTitle, "Document History", "Unexpected modal title.");
|
||||
|
||||
const report = await withObsidianPage(session.remoteDebuggingPort, async (page) => {
|
||||
const modal = page.locator(".modal-container").filter({ hasText: "Document History" });
|
||||
await modal.waitFor({ state: "visible", timeout: 10000 });
|
||||
|
||||
const revNavRow = modal.locator(".history-rev-nav-row");
|
||||
await revNavRow.waitFor({ state: "visible", timeout: 10000 });
|
||||
|
||||
const indicator = revNavRow.locator(".history-rev-indicator");
|
||||
const initialIndicator = (await indicator.innerText()).trim();
|
||||
|
||||
const prevBtn = revNavRow.locator(".history-rev-nav-btn").first();
|
||||
const nextBtn = revNavRow.locator(".history-rev-nav-btn").last();
|
||||
const range = revNavRow.locator('input[type="range"]');
|
||||
|
||||
assertTrue(/Rev \d+\/\d+/.test(initialIndicator), `Unexpected initial indicator: ${initialIndicator}`);
|
||||
|
||||
const initialRange = await range.inputValue();
|
||||
|
||||
const screenshotPaths: string[] = [];
|
||||
screenshotPaths.push(await captureStep(page, "01-initial-latest-rev"));
|
||||
assertEqual(initialIndicator, "Rev 3/3", "History did not open at the latest revision.");
|
||||
assertEqual(initialRange, "2", "History slider did not open at the latest revision.");
|
||||
assertTrue(
|
||||
!(await prevBtn.isDisabled()),
|
||||
"Older revision button should be enabled at the latest revision."
|
||||
);
|
||||
assertTrue(await nextBtn.isDisabled(), "Newer revision button should be disabled at the latest revision.");
|
||||
|
||||
await prevBtn.click();
|
||||
await page.waitForTimeout(1000);
|
||||
const afterPrevIndicator = (await indicator.innerText()).trim();
|
||||
const afterPrevRange = await range.inputValue();
|
||||
assertTrue(
|
||||
Number(afterPrevRange) < Number(initialRange),
|
||||
`◀ did not move to an older revision. before=${initialRange}, after=${afterPrevRange}`
|
||||
);
|
||||
assertTrue(afterPrevIndicator !== initialIndicator, "◀ did not update Rev indicator.");
|
||||
assertTrue(!(await prevBtn.isDisabled()), "Older revision button was disabled before the oldest revision.");
|
||||
assertTrue(!(await nextBtn.isDisabled()), "Newer revision button was not enabled after moving backwards.");
|
||||
screenshotPaths.push(await captureStep(page, "02-after-click-older-rev"));
|
||||
|
||||
await prevBtn.click();
|
||||
await page.waitForTimeout(1000);
|
||||
assertEqual(await range.inputValue(), "0", "◀ did not reach the oldest revision.");
|
||||
assertTrue(await prevBtn.isDisabled(), "Older revision button should be disabled at the oldest revision.");
|
||||
assertTrue(
|
||||
!(await nextBtn.isDisabled()),
|
||||
"Newer revision button should be enabled at the oldest revision."
|
||||
);
|
||||
screenshotPaths.push(await captureStep(page, "03-at-oldest-rev"));
|
||||
|
||||
await nextBtn.click();
|
||||
await page.waitForTimeout(1000);
|
||||
await nextBtn.click();
|
||||
await page.waitForTimeout(1000);
|
||||
const afterNextIndicator = (await indicator.innerText()).trim();
|
||||
const afterNextRange = await range.inputValue();
|
||||
assertEqual(afterNextRange, initialRange, "▶ did not return to the original revision.");
|
||||
assertEqual(afterNextIndicator, initialIndicator, "▶ did not restore the Rev indicator.");
|
||||
assertTrue(
|
||||
await nextBtn.isDisabled(),
|
||||
"Newer revision button should be disabled after returning to latest."
|
||||
);
|
||||
screenshotPaths.push(await captureStep(page, "04-after-click-newer-rev"));
|
||||
|
||||
const searchInput = modal.locator(".history-search-input");
|
||||
await searchInput.fill("keyword");
|
||||
await page.waitForTimeout(1500);
|
||||
|
||||
const searchIndicator = modal.locator(".history-search-result-indicator");
|
||||
const searchText = (await searchIndicator.innerText()).trim();
|
||||
assertTrue(/matches/.test(searchText), `Search indicator did not report matches: ${searchText}`);
|
||||
screenshotPaths.push(await captureStep(page, "05-after-search-keyword"));
|
||||
|
||||
const searchPrev = modal.locator(".history-search-row button").nth(0);
|
||||
const searchNext = modal.locator(".history-search-row button").nth(1);
|
||||
assertTrue(!(await searchPrev.isDisabled()), "Search ▲ should be enabled when matches exist.");
|
||||
assertTrue(!(await searchNext.isDisabled()), "Search ▼ should be enabled when matches exist.");
|
||||
|
||||
await searchNext.click();
|
||||
await page.waitForTimeout(1000);
|
||||
|
||||
const afterSearchIndicator = (await searchIndicator.innerText()).trim();
|
||||
assertTrue(
|
||||
/1\/\d+ matches/.test(afterSearchIndicator),
|
||||
`Search navigation failed: ${afterSearchIndicator}`
|
||||
);
|
||||
screenshotPaths.push(await captureStep(page, "06-after-search-next-match"));
|
||||
|
||||
return [
|
||||
`initialIndicator: ${initialIndicator}`,
|
||||
`afterPrevIndicator: ${afterPrevIndicator}`,
|
||||
`afterNextIndicator: ${afterNextIndicator}`,
|
||||
`searchIndicator: ${searchText}`,
|
||||
`afterSearchIndicator: ${afterSearchIndicator}`,
|
||||
"",
|
||||
"Screenshots:",
|
||||
...screenshotPaths.map((p) => `- ${p}`),
|
||||
].join("\n");
|
||||
});
|
||||
|
||||
await writeFile(reportPath, report, "utf-8");
|
||||
console.log(`Document History UI test passed.`);
|
||||
console.log(`Report: ${reportPath}`);
|
||||
console.log(`Screenshots: ${screenshotDir}`);
|
||||
} finally {
|
||||
if (session) await session.app.stop();
|
||||
await vault.dispose();
|
||||
}
|
||||
}
|
||||
|
||||
main().catch((error: unknown) => {
|
||||
console.error(error instanceof Error ? error.stack : error);
|
||||
process.exit(1);
|
||||
});
|
||||
@@ -9,6 +9,7 @@ const focusedScenarios = new Set([
|
||||
"onboarding-invitation",
|
||||
"dialog-mounts",
|
||||
"revision-repair",
|
||||
"document-history-nav",
|
||||
"settings-ui",
|
||||
"review-harness",
|
||||
"p2p-pane",
|
||||
|
||||
+31
@@ -12,6 +12,37 @@ Earlier releases remain available in the 0.25 release history and the legacy rel
|
||||
|
||||
## Unreleased
|
||||
|
||||
## 1.0.2
|
||||
|
||||
31st July, 2026
|
||||
|
||||
I am aware that some of the Community Directory review checks have become a little more sensitive again. I will watch them for a little longer, then consider the most appropriate way to adapt.
|
||||
|
||||
### Synchronisation and storage
|
||||
|
||||
#### Improved
|
||||
|
||||
- Downloaded document batches retain best-effort screen-awake and lifecycle protection until every queued file has been applied to local storage, without extending the remote-activity indicator (#1031, PR #1032). Thank you to @apple-ouyang for the improvement!
|
||||
|
||||
#### Fixed
|
||||
|
||||
- Leading UTF-8 byte order marks are preserved during Vault ingestion, keeping stored content sizes consistent with file metadata and preventing persistent three-byte integrity mismatches (#1056, PR #1058).
|
||||
|
||||
### Interface and translation
|
||||
|
||||
#### Improved
|
||||
|
||||
- Document History now provides previous and next revision controls, reports the current revision position, and disables navigation at the oldest and newest boundaries without changing search-result navigation (#990, PR #1009). Thank you to @SeleiXi for the improvement!
|
||||
- Remaining user-visible text in Setup, P2P, Customisation Sync, Global History, JSON conflict handling, and remote configuration now uses the translation catalogue (PR #1015). Thank you to @zeedif for the improvement!
|
||||
- Korean translations have broader coverage and corrections for placeholders, punctuation, and established terminology (PR #1055). Thank you to @motolies for the improvement!
|
||||
- Spanish translation coverage has been expanded across settings, Setup, P2P, maintenance, and newly catalogued interface text (PR #1059). Thank you to @zeedif for the improvement!
|
||||
|
||||
### Command-line tool
|
||||
|
||||
#### Fixed
|
||||
|
||||
- Large-buffer base64 encoding under Node.js now uses the published `octagonal-wheels` fallback when `FileReader` is unavailable, including correctly handling sliced binary views (#1036, PR #1060; [Fancy Kit PR #44](https://github.com/vrtmrz/fancy-kit/pull/44)).
|
||||
|
||||
## 1.0.1
|
||||
|
||||
29th July, 2026
|
||||
|
||||
+2
-1
@@ -13,5 +13,6 @@
|
||||
"1.0.0-rc.0": "1.7.2",
|
||||
"1.0.0-rc.1": "1.7.2",
|
||||
"1.0.0": "1.7.2",
|
||||
"1.0.1": "1.7.2"
|
||||
"1.0.1": "1.7.2",
|
||||
"1.0.2": "1.7.2"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user