mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-09-04 01:37:05 +00:00
Compare commits
27
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f055222160 | ||
|
|
77882c677b | ||
|
|
2461d37ead | ||
|
|
d00c5ecc56 | ||
|
|
7b4f7bf514 | ||
|
|
ba8f910865 | ||
|
|
c58e462057 | ||
|
|
a09c59aaba | ||
|
|
cbbae33d67 | ||
|
|
be9c328f4a | ||
|
|
a9b146a0ab | ||
|
|
5d5e448c6b | ||
|
|
725db213c3 | ||
|
|
a2441b9870 | ||
|
|
01c38268c7 | ||
|
|
64e17ab920 | ||
|
|
d8fccd6e4b | ||
|
|
50ad4c4bdf | ||
|
|
8cb5d6d87f | ||
|
|
79eb940d80 | ||
|
|
4b47ebbd4d | ||
|
|
b28871ab67 | ||
|
|
2c35f45765 | ||
|
|
caa8c92cbe | ||
|
|
2cefff43bb | ||
|
|
6b37ea8778 | ||
|
|
01c060558a |
@@ -5,10 +5,11 @@ When working on this repository (writing code, comments, documentation, or commi
|
|||||||
## Required Reference Files
|
## Required Reference Files
|
||||||
|
|
||||||
Before making changes to documentation, user-facing text, or settings:
|
Before making changes to documentation, user-facing text, or settings:
|
||||||
1. Read [docs/terms.md](docs/terms.md) for terminology, vocabulary conventions, and technical definitions.
|
1. Read [docs/terms.md](docs/terms.md) for documentation style and vocabulary conventions.
|
||||||
2. Read [docs/settings.md](docs/settings.md) (and [docs/settings_ja.md](docs/settings_ja.md)) for UI settings and setting key mappings.
|
2. Read [docs/glossary.md](docs/glossary.md) for user-facing, operational, developer, and design terminology.
|
||||||
3. Read [docs/troubleshooting.md](docs/troubleshooting.md) for troubleshooting guidelines and common recovery steps (such as flag files and SCRAM state).
|
3. Read [docs/settings.md](docs/settings.md) (and [docs/settings_ja.md](docs/settings_ja.md)) for UI settings and setting key mappings.
|
||||||
4. Read [devs.md](devs.md) for development workflows, module architecture, and testing infrastructure.
|
4. Read [docs/troubleshooting.md](docs/troubleshooting.md) for troubleshooting guidelines and common recovery steps (such as flag files and SCRAM state).
|
||||||
|
5. Read [devs.md](devs.md) for development workflows, module architecture, and testing infrastructure.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
+4
-1
@@ -57,7 +57,10 @@ To maintain consistency across the project, we ask that you follow the establish
|
|||||||
- **Affirmative Phrasing**: Avoid asking questions using negative forms in user-facing dialogue. Use affirmative questions to prevent translation and interpretation discrepancies.
|
- **Affirmative Phrasing**: Avoid asking questions using negative forms in user-facing dialogue. Use affirmative questions to prevent translation and interpretation discrepancies.
|
||||||
- **Specific Words**: Use 'dialogue' for documentation and user-facing messages (use 'dialog' only inside source code). Use the hyphenated form 'plug-in' in user-facing text (use 'plugin' only in configuration settings or technical contexts).
|
- **Specific Words**: Use 'dialogue' for documentation and user-facing messages (use 'dialog' only inside source code). Use the hyphenated form 'plug-in' in user-facing text (use 'plugin' only in configuration settings or technical contexts).
|
||||||
|
|
||||||
For a detailed list of vocabulary conventions and terms, please refer to [docs/terms.md](docs/terms.md).
|
For writing conventions, see [Documentation style and vocabulary conventions](docs/terms.md).
|
||||||
|
Project-specific meanings are defined in the [Project glossary](docs/glossary.md),
|
||||||
|
including internal developer and design terms which might not appear in the
|
||||||
|
user interface.
|
||||||
|
|
||||||
### 3. Translations
|
### 3. Translations
|
||||||
|
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ To facilitate development and testing, the build process can automatically copy
|
|||||||
|
|
||||||
Regression tests remain in the suite owned by the implementation under test. Plug-in tests may be co-located with their source, while independent application tests remain under `test/apps/` or `test/browser-apps/` so that they stay outside the Community Review source boundary. Prefix a case or group with `compatibility:` when it protects a persisted input or state which current releases still accept, and with `retirement guard:` when it prevents a removed setting, control, or notification from returning. Remove or replace a compatibility case only when the corresponding input is no longer accepted or an equivalent maintained case preserves the contract. Remove a retirement guard only when another current contract makes the old behaviour unreachable. Do not preserve a disconnected historical test as an executable specification when no maintained runner invokes it; Git history is the reference for retired test infrastructure.
|
Regression tests remain in the suite owned by the implementation under test. Plug-in tests may be co-located with their source, while independent application tests remain under `test/apps/` or `test/browser-apps/` so that they stay outside the Community Review source boundary. Prefix a case or group with `compatibility:` when it protects a persisted input or state which current releases still accept, and with `retirement guard:` when it prevents a removed setting, control, or notification from returning. Remove or replace a compatibility case only when the corresponding input is no longer accepted or an equivalent maintained case preserves the contract. Remove a retirement guard only when another current contract makes the old behaviour unreachable. Do not preserve a disconnected historical test as an executable specification when no maintained runner invokes it; Git history is the reference for retired test infrastructure.
|
||||||
|
|
||||||
- **CLI E2E** (`src/apps/cli/testdeno/`): Host-independent consumer workflows. The canonical Compose P2P suite covers ordinary two-peer synchronisation, replacement of the current replicator followed by transfer with the same peer, and explicit relay disconnection followed by paused and resumed reconnection. Its lifecycle entry point is included only in the Docker test build and does not add a public CLI command. Run `npm run test:e2e:cli` for the ordinary suite or `npm run test:e2e:cli:p2p` for P2P validation.
|
- **CLI E2E** (`src/apps/cli/testdeno/`): Host-independent consumer workflows. The canonical Compose P2P suite covers ordinary two-peer synchronisation, replacement of the current Replicator followed by transfer with the same peer, and explicit relay disconnection followed by paused and resumed reconnection. Its lifecycle entry point is included only in the Docker test build and does not add a public CLI command. Run `npm run test:e2e:cli` for the ordinary suite or `npm run test:e2e:cli:p2p` for P2P validation.
|
||||||
- **Self-hosted setup tools** (`utils/couchdb/`, `utils/setup/`, and `utils/flyio/`): Deno contract tests consume the exact locked Commonlib registry package, verify current CouchDB, Object Storage, and random-room P2P Setup URI defaults and remote profiles, and keep CouchDB administration separate from package-owned LiveSync database-version negotiation. `unit-ci` also provisions a real temporary CouchDB database and verifies its version document against the installed Commonlib package. Run `npm run test:setup-tools` for the local contract gate.
|
- **Self-hosted setup tools** (`utils/couchdb/`, `utils/setup/`, and `utils/flyio/`): Deno contract tests consume the exact locked Commonlib registry package, verify current CouchDB, Object Storage, and random-room P2P Setup URI defaults and remote profiles, and keep CouchDB administration separate from package-owned LiveSync database-version negotiation. `unit-ci` also provisions a real temporary CouchDB database and verifies its version document against the installed Commonlib package. Run `npm run test:setup-tools` for the local contract gate.
|
||||||
- **Real Obsidian E2E** (`test/e2e-obsidian/`): Local-first scripts that launch real Obsidian with temporary vaults and the built Self-hosted LiveSync plug-in. Use these for boot-up sequence, vault reflection, RedFlag flows, Fast Setup (Simple Fetch), settings dialogues, restart-sensitive workflows, Object Storage regressions, and other behaviour that depends on Obsidian itself. Run focused scripts such as `npm run test:e2e:obsidian:two-vault-sync`, or use `npm run test:e2e:obsidian:local-suite:services` to run the broader local suite with CouchDB and MinIO fixtures managed by the wrapper.
|
- **Real Obsidian E2E** (`test/e2e-obsidian/`): Local-first scripts that launch real Obsidian with temporary vaults and the built Self-hosted LiveSync plug-in. Use these for boot-up sequence, vault reflection, RedFlag flows, Fast Setup (Simple Fetch), settings dialogues, restart-sensitive workflows, Object Storage regressions, and other behaviour that depends on Obsidian itself. Run focused scripts such as `npm run test:e2e:obsidian:two-vault-sync`, or use `npm run test:e2e:obsidian:local-suite:services` to run the broader local suite with CouchDB and MinIO fixtures managed by the wrapper.
|
||||||
|
|
||||||
@@ -129,6 +129,10 @@ Changes spanning both repositories must first produce a packed Commonlib artefac
|
|||||||
|
|
||||||
## Architecture
|
## Architecture
|
||||||
|
|
||||||
|
The [Project glossary](docs/glossary.md#developer-and-design-terms) defines the
|
||||||
|
stable developer and design vocabulary used in this section. The guidance
|
||||||
|
below describes how those boundaries are applied.
|
||||||
|
|
||||||
### Service composition and legacy Modules
|
### Service composition and legacy Modules
|
||||||
|
|
||||||
The application is composed from Services, ServiceModules, serviceFeatures, add-ons, and a legacy Module layer:
|
The application is composed from Services, ServiceModules, serviceFeatures, add-ons, and a legacy Module layer:
|
||||||
@@ -138,7 +142,7 @@ The application is composed from Services, ServiceModules, serviceFeatures, add-
|
|||||||
- **serviceFeature**: a typed composition function which accepts only its declared Services and ServiceModules. It registers lifecycle handlers, commands, user-interface bindings, or other host glue, and may return a focused view. It is not a runtime registry entry.
|
- **serviceFeature**: a typed composition function which accepts only its declared Services and ServiceModules. It registers lifecycle handlers, commands, user-interface bindings, or other host glue, and may return a focused view. It is not a runtime registry entry.
|
||||||
- **AbstractModule** and **AbstractObsidianModule**: the legacy application Module layer. Existing Modules are loaded by the application and bound after the Service graph has been composed; this broad core access is not the preferred dependency boundary for new orchestration.
|
- **AbstractModule** and **AbstractObsidianModule**: the legacy application Module layer. Existing Modules are loaded by the application and bound after the Service graph has been composed; this broad core access is not the preferred dependency boundary for new orchestration.
|
||||||
|
|
||||||
The normal composition order is the Service Hub, replicator-provider registration, ServiceModules, serviceFeatures, add-ons, and finally legacy Module binding. A serviceFeature may therefore consume an already constructed ServiceModule. Preferring a serviceFeature for new composition is a dependency-boundary rule, not an initialisation-order rule.
|
The normal composition order is the Service Hub, Replicator provider registration, ServiceModules, serviceFeatures, add-ons, and finally legacy Module binding. A serviceFeature may therefore consume an already constructed ServiceModule. Preferring a serviceFeature for new composition is a dependency-boundary rule, not an initialisation-order rule.
|
||||||
|
|
||||||
Mutable state is permitted in a serviceFeature. State alone is not a reason to create a class, a ServiceModule, or retain an AbstractModule. Prefer one private context, with module-level functions which receive that context, when identity and polymorphism are not part of the contract. Separate the state, transitions, and invariants from the surrounding function which registers lifecycle handlers and connects downstream effects. Give the stateful boundary narrow collaborators rather than `LiveSyncBaseCore`.
|
Mutable state is permitted in a serviceFeature. State alone is not a reason to create a class, a ServiceModule, or retain an AbstractModule. Prefer one private context, with module-level functions which receive that context, when identity and polymorphism are not part of the contract. Separate the state, transitions, and invariants from the surrounding function which registers lifecycle handlers and connects downstream effects. Give the stateful boundary narrow collaborators rather than `LiveSyncBaseCore`.
|
||||||
|
|
||||||
@@ -169,7 +173,12 @@ Legacy Modules remain grouped by directory:
|
|||||||
- **Service Hub** (`src/modules/services/`): Central service registry using dependency injection
|
- **Service Hub** (`src/modules/services/`): Central service registry using dependency injection
|
||||||
- **Common Library** (`@vrtmrz/livesync-commonlib`): Platform-independent synchronisation logic, shared with the CLI, WebApp, WebPeer, and external tools
|
- **Common Library** (`@vrtmrz/livesync-commonlib`): Platform-independent synchronisation logic, shared with the CLI, WebApp, WebPeer, and external tools
|
||||||
|
|
||||||
Commonlib owns one stable `LiveSyncP2PService`, its `P2PRoomSessionOwner`, and the replaceable Trystero room session. Host commands, event handlers, and views consume the focused transport, connection-probe admission, directory, peer-admission, transfer, change-relay, configuration, and diagnostic views returned by the service feature. They must not retain the deprecated compatibility Replicator as an ordinary service locator, close Trystero-owned raw peers, or install another Trystero transport generation at the application root. The exact as-built ownership and shutdown boundaries are recorded in Commonlib's `docs/p2p-transport-lifecycle.md` design document.
|
See [Replicator architecture](docs/design_docs/replicator_architecture.md) for
|
||||||
|
the implemented provider contract, active Replicator lifecycle, publication and
|
||||||
|
session fences, P2P ownership exception, compatibility boundaries, and the
|
||||||
|
steps required to add a built-in provider.
|
||||||
|
|
||||||
|
Commonlib owns one stable `LiveSyncP2PService`, its `P2PRoomSessionOwner`, and the replaceable Trystero room session. Host commands, event handlers, and views consume the focused transport, connection-probe admission, directory, peer-admission, transfer, change-relay, configuration, and diagnostic views returned by the service feature. They must not retain the deprecated compatibility Replicator as an ordinary service locator, close Trystero-owned raw peers, or install another Trystero transport generation at the application root. The exact implemented ownership and shutdown boundaries are recorded in Commonlib's [P2P transport lifecycle](https://github.com/vrtmrz/livesync-commonlib/blob/main/docs/p2p-transport-lifecycle.md) design document.
|
||||||
|
|
||||||
### Conflict Merge Policy
|
### Conflict Merge Policy
|
||||||
|
|
||||||
@@ -254,14 +263,14 @@ Existing legacy Modules continue to register their handlers in `onBindFunction()
|
|||||||
`Plugin.addSettingTab()`. Register a settings tab which reads persisted values
|
`Plugin.addSettingTab()`. Register a settings tab which reads persisted values
|
||||||
from the sequential `onSettingLoaded` lifecycle, seed its editing snapshot
|
from the sequential `onSettingLoaded` lifecycle, seed its editing snapshot
|
||||||
before registration, and keep definition construction independent of local
|
before registration, and keep definition construction independent of local
|
||||||
database and replicator readiness. See
|
database and Replicator readiness. See
|
||||||
[the declarative settings adapter ADR](docs/adr/2026_08_declarative_settings_adapter.md).
|
[the declarative settings adapter ADR](docs/adr/2026_08_declarative_settings_adapter.md).
|
||||||
- Use `this.services.setting.saveSettingData()` instead of using plugin methods directly
|
- Use `this.services.setting.saveSettingData()` instead of using plugin methods directly
|
||||||
|
|
||||||
### Database Operations
|
### Database Operations
|
||||||
|
|
||||||
- Local database operations through `LiveSyncLocalDB` (wraps PouchDB)
|
- Local database operations through `LiveSyncLocalDB` (wraps PouchDB)
|
||||||
- Document types: `EntryDoc` (files), `EntryLeaf` (chunks), `PluginDataEntry` (plugin sync)
|
- Document types are owned by Commonlib. `EntryDoc` covers file Metadata, Chunks, database version information, Milestone information, Node information, and Chunk Packs. Current Customisation Sync data uses ordinary chunked Metadata in the `ix:` namespace rather than the application-local `PluginDataEntry` interface.
|
||||||
|
|
||||||
## Important Files
|
## Important Files
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,23 @@
|
|||||||
|
---
|
||||||
|
date: 2026-09-03
|
||||||
|
commonlib-version: "0.1.21"
|
||||||
|
self-hosted-livesync-version: "1.0.24"
|
||||||
|
status: accepted
|
||||||
|
---
|
||||||
|
|
||||||
# Architectural Decision Record: P2P Room and Transport Lifecycle
|
# Architectural Decision Record: P2P Room and Transport Lifecycle
|
||||||
|
|
||||||
## Status
|
## Status
|
||||||
|
|
||||||
Accepted — implemented and verified through Commonlib owner tests, the Compose transport suite, and the real-Obsidian setup workflow.
|
Accepted — implemented and verified through Commonlib owner tests, the Compose transport suite, and the real-Obsidian setup workflow.
|
||||||
|
|
||||||
|
The stable P2P service and room-session owner accepted in
|
||||||
|
[Replicator Capabilities and Lifecycle Orchestration — Part 2](2026_08_replicator_capabilities_02_p2p_service_lifecycle.md)
|
||||||
|
supersede only this record's replaceable LiveSync P2P Replicator and ownership
|
||||||
|
of the replaceable result returned by the `serviceFeature`. This record remains
|
||||||
|
authoritative for serialised room operations, `room.leave()`, Trystero-owned
|
||||||
|
physical peers, and relay reconnection.
|
||||||
|
|
||||||
## Context
|
## Context
|
||||||
|
|
||||||
Self-hosted LiveSync uses Trystero's Nostr strategy for P2P discovery, signalling, and WebRTC transport. Three related resources have different owners and lifetimes:
|
Self-hosted LiveSync uses Trystero's Nostr strategy for P2P discovery, signalling, and WebRTC transport. Three related resources have different owners and lifetimes:
|
||||||
@@ -12,7 +26,7 @@ Self-hosted LiveSync uses Trystero's Nostr strategy for P2P discovery, signallin
|
|||||||
- Trystero owns the underlying WebRTC peers and may share one physical peer across more than one room; and
|
- Trystero owns the underlying WebRTC peers and may share one physical peer across more than one room; and
|
||||||
- Trystero's Nostr relay manager owns WebSocket clients shared by relay URL.
|
- Trystero's Nostr relay manager owns WebSocket clients shared by relay URL.
|
||||||
|
|
||||||
Closing every `RTCPeerConnection` returned by `room.getPeers()` bypasses Trystero's shared-peer manager. The manager may then retain a stale shared peer and prevent a replacement LiveSync replicator from discovering the same remote peer again.
|
Closing every `RTCPeerConnection` returned by `room.getPeers()` bypasses Trystero's shared-peer manager. The manager may then retain a stale shared peer and prevent a replacement LiveSync Replicator from discovering the same remote peer again.
|
||||||
|
|
||||||
Room departure and physical transport destruction are not equivalent. `room.leave()` sends the room-leave action, removes that room's actions and callbacks, and detaches its shared-peer binding. Trystero may retain a healthy physical WebRTC peer for later reuse after the last room binding has gone. The retained peer cannot carry actions for the room which has been left.
|
Room departure and physical transport destruction are not equivalent. `room.leave()` sends the room-leave action, removes that room's actions and callbacks, and detaches its shared-peer binding. Trystero may retain a healthy physical WebRTC peer for later reuse after the last room binding has gone. The retained peer cannot carry actions for the room which has been left.
|
||||||
|
|
||||||
@@ -40,7 +54,7 @@ The explicit disconnect operation therefore has the following contract:
|
|||||||
|
|
||||||
This operation is a logical LiveSync disconnection and a physical signalling-server disconnection. It does not promise that every browser-owned WebRTC object has been destroyed synchronously.
|
This operation is a logical LiveSync disconnection and a physical signalling-server disconnection. It does not promise that every browser-owned WebRTC object has been destroyed synchronously.
|
||||||
|
|
||||||
An explicit connect resumes relay reconnection before opening a new room. Settings application and database lifecycle replacement close the current LiveSync replicator, discard it, construct a new instance from the current settings, and open that current instance when the configured policy requires it. Commands, event handlers, and panes resolve the current service-feature result at the point of use rather than retaining an obsolete replicator.
|
An explicit connect resumes relay reconnection before opening a new room. Settings application and database lifecycle replacement close the current LiveSync Replicator, discard it, construct a new instance from the current settings, and open that current instance when the configured policy requires it. Commands, event handlers, and panes resolve the focused views returned by the current P2P `serviceFeature` at the point of use rather than retaining an obsolete Replicator.
|
||||||
|
|
||||||
Lifecycle operations on one `LiveSyncTrysteroReplicator` are serialised. A close requested while an open is in progress must leave no orphan room serving, and repeated opens must not create parallel rooms. No fixed delay is inserted between close and open: readiness is determined by the actual lifecycle operation and peer discovery.
|
Lifecycle operations on one `LiveSyncTrysteroReplicator` are serialised. A close requested while an open is in progress must leave no orphan room serving, and repeated opens must not create parallel rooms. No fixed delay is inserted between close and open: readiness is determined by the actual lifecycle operation and peer discovery.
|
||||||
|
|
||||||
@@ -50,7 +64,7 @@ P2P setup follows the transport's actual ownership model. Initialising the first
|
|||||||
|
|
||||||
## Ownership
|
## Ownership
|
||||||
|
|
||||||
Commonlib owns the LiveSync-specific P2P service, RPC, command, and lifecycle composition. Trystero owns WebRTC peer creation, sharing, reuse, stale detection, and destruction, as well as relay-client reconstruction. The Self-hosted LiveSync host owns the current Commonlib service-feature result and supplies the platform services used by its current replicator.
|
Commonlib owns the LiveSync-specific P2P service, RPC, command, and lifecycle composition. Trystero owns WebRTC peer creation, sharing, reuse, stale detection, and destruction, as well as relay-client reconstruction. The Self-hosted LiveSync host owns the focused views returned by the current Commonlib P2P `serviceFeature` and supplies the platform services used by its current Replicator.
|
||||||
|
|
||||||
Self-hosted LiveSync does not add a separate root Trystero dependency. Tests which must observe relay sockets resolve the exact Trystero generation owned by the locked Commonlib package, avoiding two independent transport singletons in one process.
|
Self-hosted LiveSync does not add a separate root Trystero dependency. Tests which must observe relay sockets resolve the exact Trystero generation owned by the locked Commonlib package, avoiding two independent transport singletons in one process.
|
||||||
|
|
||||||
@@ -58,7 +72,7 @@ Self-hosted LiveSync does not add a separate root Trystero dependency. Tests whi
|
|||||||
|
|
||||||
### Close every value returned by `room.getPeers()`
|
### Close every value returned by `room.getPeers()`
|
||||||
|
|
||||||
This bypasses Trystero's shared-peer manager and can prevent a replacement replicator from rediscovering the same peer.
|
This bypasses Trystero's shared-peer manager and can prevent a replacement Replicator from rediscovering the same peer.
|
||||||
|
|
||||||
### Add a fixed close-to-open delay
|
### Add a fixed close-to-open delay
|
||||||
|
|
||||||
@@ -76,15 +90,15 @@ This interferes with Trystero's shared relay clients. The public pause and resum
|
|||||||
|
|
||||||
Commonlib unit tests prove that normal P2P host closure calls `room.leave()` without directly closing Trystero-owned peer connections. Additional package tests cover the action API, replaceable peer-event subscriptions, multiple RPC transport disposers, serialised open and close operations, initialisation of the first device without a central remote, and Fetch running once for an additional device.
|
Commonlib unit tests prove that normal P2P host closure calls `room.leave()` without directly closing Trystero-owned peer connections. Additional package tests cover the action API, replaceable peer-event subscriptions, multiple RPC transport disposers, serialised open and close operations, initialisation of the first device without a central remote, and Fetch running once for an additional device.
|
||||||
|
|
||||||
Self-hosted LiveSync unit tests prove that settings and database replacement leave panes on the current replicator, and that an explicit P2P rebuild bypasses the policy intended for ordinary replication.
|
Self-hosted LiveSync unit tests prove that settings and database replacement leave panes on the current Replicator, and that an explicit P2P rebuild bypasses the policy intended for ordinary replication.
|
||||||
|
|
||||||
The canonical Compose P2P suite uses a real local Nostr relay and WebRTC implementation. It covers ordinary two-peer synchronisation, replacement of the active LiveSync replicator followed by discovery and transfer with the same peer, and explicit relay disconnection followed by paused and resumed reconnection. The lifecycle scenario is exposed only through a Docker test build and an injected CLI command runner; it is not part of the public CLI command surface.
|
The canonical Compose P2P suite uses a real local Nostr relay and WebRTC implementation. It covers ordinary two-peer synchronisation, replacement of the active LiveSync Replicator followed by discovery and transfer with the same peer, and explicit relay disconnection followed by paused and resumed reconnection. The lifecycle scenario is exposed only through a Docker test build and an injected CLI command runner; it is not part of the public CLI command surface.
|
||||||
|
|
||||||
The real-Obsidian P2P Setup URI workflow creates the first device, generates the second-device URI from it, accepts each peer visibly, and verifies a two-way note round-trip through a local relay. A separate focused pane test covers the principal connection control and teardown without requiring a remote peer. Transport replacement and relay-socket lifecycle remain owned by the package and Compose tests rather than being duplicated in Obsidian.
|
The real-Obsidian P2P Setup URI workflow creates the first device, generates the second-device URI from it, accepts each peer visibly, and verifies a two-way note round-trip through a local relay. A separate focused pane test covers the principal connection control and teardown without requiring a remote peer. Transport replacement and relay-socket lifecycle remain owned by the package and Compose tests rather than being duplicated in Obsidian.
|
||||||
|
|
||||||
## Consequences
|
## Consequences
|
||||||
|
|
||||||
- Replacing a P2P replicator no longer leaves host views or commands bound to an obsolete instance.
|
- Replacing a P2P Replicator no longer leaves host views or commands bound to an obsolete instance.
|
||||||
- Explicit signalling-server disconnection has a testable socket-level meaning without claiming immediate destruction of idle WebRTC objects.
|
- Explicit signalling-server disconnection has a testable socket-level meaning without claiming immediate destruction of idle WebRTC objects.
|
||||||
- Settings which change the relay, room, passphrase, or TURN configuration can replace the whole LiveSync room safely.
|
- Settings which change the relay, room, passphrase, or TURN configuration can replace the whole LiveSync room safely.
|
||||||
- Trystero may reuse healthy peers across room lifecycles, reducing unnecessary renegotiation.
|
- Trystero may reuse healthy peers across room lifecycles, reducing unnecessary renegotiation.
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
---
|
---
|
||||||
date: 2026-08-27
|
date: 2026-09-02
|
||||||
commonlib-version: "0.1.20"
|
commonlib-version: "0.1.21"
|
||||||
self-hosted-livesync-version: "1.0.21"
|
self-hosted-livesync-version: "1.0.23"
|
||||||
status: proposed
|
status: accepted
|
||||||
series: replicator-capabilities-and-lifecycle
|
series: replicator-capabilities-and-lifecycle
|
||||||
part: 1 of 3
|
part: 1 of 3
|
||||||
---
|
---
|
||||||
@@ -15,15 +15,20 @@ then [Part 3: migration plan and verification](2026_08_replicator_capabilities_0
|
|||||||
|
|
||||||
## Status
|
## Status
|
||||||
|
|
||||||
Proposed. This record defines the provider, capability, lifecycle, interaction,
|
Accepted and implemented in Commonlib 0.1.21 and Self-hosted LiveSync 1.0.23.
|
||||||
|
This record defines the provider, capability, lifecycle, interaction,
|
||||||
ownership, and probe boundaries required by current Self-hosted LiveSync
|
ownership, and probe boundaries required by current Self-hosted LiveSync
|
||||||
consumers. It is the generic part of the series; the P2P-specific ownership
|
consumers. It is the generic part of the series; the P2P-specific ownership
|
||||||
rules live in Part 2, and implementation sequencing lives in Part 3.
|
rules live in Part 2, and the completed implementation sequence lives in Part
|
||||||
|
3. The current structure is summarised in the
|
||||||
|
[Replicator architecture](../design_docs/replicator_architecture.md) design
|
||||||
|
document.
|
||||||
|
|
||||||
The accepted P2P room and transport lifecycle record remains authoritative for
|
Stage 3 in Part 3 is complete. The stable P2P service and room-session owner in
|
||||||
the current P2P implementation until Stage 3 in Part 3 is complete. The
|
Part 2 supersede the replaceable LiveSync P2P Replicator ownership described by
|
||||||
supersession boundary for that record is stated in Part 2 and is not repeated
|
the earlier P2P room and transport lifecycle record. That accepted record
|
||||||
here.
|
remains authoritative for its retained Trystero room, physical-peer, and relay
|
||||||
|
ownership decisions.
|
||||||
|
|
||||||
## Context
|
## Context
|
||||||
|
|
||||||
@@ -235,12 +240,14 @@ supplies an exhaustive definition table for that set. The current catalogue is
|
|||||||
CouchDB, Object Storage, and P2P; it is not a public third-party registration
|
CouchDB, Object Storage, and P2P; it is not a public third-party registration
|
||||||
API.
|
API.
|
||||||
|
|
||||||
CouchDB is part of every current host composition. Object Storage and P2P are
|
Every current `LiveSyncBaseCore` host composes CouchDB and Object Storage.
|
||||||
compile-time composition choices and may be included or omitted without
|
`WebPeerRuntime` is a separate P2P-only host composition, and P2P remains a
|
||||||
changing the generic scheduling feature. Adding another current provider
|
compile-time feature choice for the other hosts. A host can include or omit a
|
||||||
requires a Commonlib kind and support declaration, host composition,
|
provider without changing the generic scheduling feature. Adding another
|
||||||
Setup/profile schema handling, and provider-specific tests. It does not require
|
current provider requires a Commonlib kind and support declaration, host
|
||||||
a runtime plug-in registry or behaviour for unknown provider kinds.
|
composition, Setup/profile schema handling, and provider-specific tests. It
|
||||||
|
does not require a runtime plug-in registry or behaviour for unknown provider
|
||||||
|
kinds.
|
||||||
|
|
||||||
Each provider definition supplies:
|
Each provider definition supplies:
|
||||||
|
|
||||||
@@ -777,6 +784,7 @@ when every caller proves it to be the operation's identity.
|
|||||||
|
|
||||||
## References
|
## References
|
||||||
|
|
||||||
|
- [Project glossary](../glossary.md#developer-and-design-terms)
|
||||||
- [Part 2: P2P service and session lifecycle](2026_08_replicator_capabilities_02_p2p_service_lifecycle.md)
|
- [Part 2: P2P service and session lifecycle](2026_08_replicator_capabilities_02_p2p_service_lifecycle.md)
|
||||||
- [Part 3: migration plan and verification](2026_08_replicator_capabilities_03_migration_plan.md)
|
- [Part 3: migration plan and verification](2026_08_replicator_capabilities_03_migration_plan.md)
|
||||||
- [Bounded Remote Activity](2026_07_bounded_remote_activity.md)
|
- [Bounded Remote Activity](2026_07_bounded_remote_activity.md)
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
---
|
---
|
||||||
date: 2026-08-27
|
date: 2026-09-02
|
||||||
commonlib-version: "0.1.20"
|
commonlib-version: "0.1.21"
|
||||||
self-hosted-livesync-version: "1.0.21"
|
self-hosted-livesync-version: "1.0.23"
|
||||||
status: proposed
|
status: accepted
|
||||||
series: replicator-capabilities-and-lifecycle
|
series: replicator-capabilities-and-lifecycle
|
||||||
part: 2 of 3
|
part: 2 of 3
|
||||||
---
|
---
|
||||||
@@ -14,20 +14,24 @@ first, then continue with [Part 3: migration plan and verification](2026_08_repl
|
|||||||
|
|
||||||
## Status
|
## Status
|
||||||
|
|
||||||
Proposed. This record defines the P2P service owner, room-session boundary,
|
Accepted and implemented in Commonlib 0.1.21 and Self-hosted LiveSync 1.0.23.
|
||||||
narrow contract views, automation demands, replacement fencing, and trigger
|
This record defines the P2P service owner, room-session boundary, narrow
|
||||||
|
contract views, automation demands, replacement fencing, and trigger
|
||||||
semantics. Generic provider and capability rules are owned by Part 1; the
|
semantics. Generic provider and capability rules are owned by Part 1; the
|
||||||
implementation and verification order is owned by Part 3.
|
completed implementation and verification order is recorded in Part 3.
|
||||||
|
|
||||||
The implemented state is recorded separately in Commonlib's
|
The implemented state is recorded separately in Commonlib's
|
||||||
`docs/p2p-transport-lifecycle.md` design document. It supersedes the
|
[P2P transport lifecycle](https://github.com/vrtmrz/livesync-commonlib/blob/main/docs/p2p-transport-lifecycle.md)
|
||||||
replaceable LiveSync P2P Replicator and current-result ownership described by
|
design document and summarised with the generic provider lifecycle in the
|
||||||
|
[Replicator architecture](../design_docs/replicator_architecture.md) design
|
||||||
|
document. It supersedes the replaceable LiveSync P2P Replicator and ownership
|
||||||
|
of the replaceable result returned by the `serviceFeature`, as described by
|
||||||
the accepted [P2P Room and Transport Lifecycle](2026_07_p2p_transport_lifecycle.md)
|
the accepted [P2P Room and Transport Lifecycle](2026_07_p2p_transport_lifecycle.md)
|
||||||
record. The accepted record's decisions about serialised room operations,
|
record.
|
||||||
|
The accepted record's decisions about serialised room operations,
|
||||||
`room.leave()`, Trystero-owned physical peers, and relay reconnection remain in
|
`room.leave()`, Trystero-owned physical peers, and relay reconnection remain in
|
||||||
force. This ADR remains the decision and migration target; the Commonlib
|
force. This ADR records the product decision; the Commonlib design document
|
||||||
design document records the names and ownership boundaries which actually
|
records the implemented names and ownership boundaries.
|
||||||
landed.
|
|
||||||
|
|
||||||
## Scope and context
|
## Scope and context
|
||||||
|
|
||||||
@@ -397,6 +401,7 @@ and does not publish a second P2P lifecycle owner.
|
|||||||
|
|
||||||
## References
|
## References
|
||||||
|
|
||||||
|
- [Project glossary](../glossary.md#developer-and-design-terms)
|
||||||
- [Part 1: core contract](2026_08_replicator_capabilities_01_core_contract.md)
|
- [Part 1: core contract](2026_08_replicator_capabilities_01_core_contract.md)
|
||||||
- [Part 3: migration plan and verification](2026_08_replicator_capabilities_03_migration_plan.md)
|
- [Part 3: migration plan and verification](2026_08_replicator_capabilities_03_migration_plan.md)
|
||||||
- [P2P Room and Transport Lifecycle](2026_07_p2p_transport_lifecycle.md)
|
- [P2P Room and Transport Lifecycle](2026_07_p2p_transport_lifecycle.md)
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
---
|
---
|
||||||
date: 2026-08-27
|
date: 2026-09-02
|
||||||
commonlib-version: "0.1.20"
|
commonlib-version: "0.1.21"
|
||||||
self-hosted-livesync-version: "1.0.21"
|
self-hosted-livesync-version: "1.0.23"
|
||||||
status: proposed
|
status: accepted
|
||||||
series: replicator-capabilities-and-lifecycle
|
series: replicator-capabilities-and-lifecycle
|
||||||
part: 3 of 3
|
part: 3 of 3
|
||||||
---
|
---
|
||||||
@@ -16,11 +16,14 @@ another runtime contract.
|
|||||||
|
|
||||||
## Status
|
## Status
|
||||||
|
|
||||||
Proposed. The stages below are an implementation and verification order, not
|
Accepted and implemented in Commonlib 0.1.21 and Self-hosted LiveSync 1.0.23.
|
||||||
independently releasable states. Commonlib and Self-hosted LiveSync must not
|
The stages below record the implementation and verification order; they were
|
||||||
publish temporary support boundaries described by an incomplete stage. A
|
not independently releasable states. The target matrix, ownership boundaries,
|
||||||
release follows only after the target matrix, ownership boundaries, and the
|
and contracted production-consumer migrations in Parts 1 and 2 are complete.
|
||||||
contracted production-consumer migrations in Parts 1 and 2 are complete.
|
Items which Stage 7 explicitly defers remain separate compatibility work rather
|
||||||
|
than incomplete stages. The current result is summarised in the
|
||||||
|
[Replicator architecture](../design_docs/replicator_architecture.md) design
|
||||||
|
document.
|
||||||
|
|
||||||
## Migration rules
|
## Migration rules
|
||||||
|
|
||||||
@@ -103,11 +106,11 @@ until every remaining demand has settled. The LiveSync feature-binding test
|
|||||||
must not rely on the current registration order of equal-priority resume
|
must not rely on the current registration order of equal-priority resume
|
||||||
handlers.
|
handlers.
|
||||||
|
|
||||||
Until Stage 4 supplies target-aware unattended P2P, each host composition
|
Before Stage 4 supplied target-aware unattended P2P, each host composition
|
||||||
declares generic `P2P_SyncOnReplication` as `not-implemented`. Its automatic
|
declared generic `P2P_SyncOnReplication` as `not-implemented`. Its automatic
|
||||||
request settles without UI with an explicit blocked result. Existing AutoSync,
|
request settled without UI with an explicit blocked result. Existing AutoSync,
|
||||||
AutoWatch, and accepted incoming-request paths continue with the Stage 2 gate.
|
AutoWatch, and accepted incoming-request paths continued with the Stage 2 gate.
|
||||||
This is a temporary migration state, not the target matrix in Part 1.
|
This was a temporary migration state, not the target matrix in Part 1.
|
||||||
|
|
||||||
Apply and test the CLI scheduling precedence defined in Part 1, so the daemon
|
Apply and test the CLI scheduling precedence defined in Part 1, so the daemon
|
||||||
and scheduling context cannot schedule duplicate initial or recurring work.
|
and scheduling context cannot schedule duplicate initial or recurring work.
|
||||||
@@ -178,10 +181,11 @@ Add ownership regressions immediately before implementation:
|
|||||||
publishing the new database identity, while a failed candidate leaves one
|
publishing the new database identity, while a failed candidate leaves one
|
||||||
observable disconnected state without reviving the fenced session.
|
observable disconnected state without reviving the fenced session.
|
||||||
|
|
||||||
When this stage lands, add a supersession note to the accepted P2P lifecycle
|
Completion of this stage added a bounded supersession note to the accepted P2P
|
||||||
record and update `devs.md` from the replaceable concrete Replicator getter to
|
lifecycle record and updated `devs.md` from the replaceable concrete Replicator
|
||||||
the stable contract views. Preserve the accepted Trystero peer and relay
|
getter to the stable contract views. The accepted Trystero peer and relay
|
||||||
ownership rules rather than rewriting their historical verification.
|
ownership rules remain in force rather than being rewritten as part of this
|
||||||
|
migration.
|
||||||
|
|
||||||
## Stage 4: add target-aware unattended P2P orchestration
|
## Stage 4: add target-aware unattended P2P orchestration
|
||||||
|
|
||||||
@@ -203,14 +207,17 @@ shared-pane synchronisation.
|
|||||||
Keep the detailed wait, session-demand, de-duplication, and session-epoch state
|
Keep the detailed wait, session-demand, de-duplication, and session-epoch state
|
||||||
machine in Part 2 rather than expanding the generic provider contract. If
|
machine in Part 2 rather than expanding the generic provider contract. If
|
||||||
implementation evidence requires a refinement, amend Part 2 before completing
|
implementation evidence requires a refinement, amend Part 2 before completing
|
||||||
this stage. After Stage 3 is complete, Part 2 supersedes the
|
this stage. With Stage 3 complete, Part 2 supersedes the portions of the
|
||||||
replaceable-Replicator and current-result ownership portions of the accepted
|
accepted July 2026 record concerning the replaceable Replicator and ownership
|
||||||
July 2026 record; its Trystero peer and relay decisions remain unchanged.
|
of the replaceable result returned by the `serviceFeature`. Its Trystero peer
|
||||||
|
and relay decisions remain unchanged.
|
||||||
|
|
||||||
Commonlib's `docs/p2p-transport-lifecycle.md` design document records the
|
Commonlib's
|
||||||
implemented Stage 3 and Stage 4 ownership, demand, automation, replacement,
|
[P2P transport lifecycle](https://github.com/vrtmrz/livesync-commonlib/blob/main/docs/p2p-transport-lifecycle.md)
|
||||||
and shutdown behaviour. This document remains the migration and verification
|
design document records the implemented Stage 3 and Stage 4 ownership, demand,
|
||||||
sequence rather than a second description of the implemented state.
|
automation, replacement, and shutdown behaviour. This document remains the
|
||||||
|
migration and verification sequence rather than a second description of the
|
||||||
|
implemented state.
|
||||||
|
|
||||||
## Stage 5: separate active construction and flow-specific probes
|
## Stage 5: separate active construction and flow-specific probes
|
||||||
|
|
||||||
@@ -231,8 +238,8 @@ making active construction private.
|
|||||||
The provider-defined active-construction path is now private to
|
The provider-defined active-construction path is now private to
|
||||||
`ReplicatorService`. The public `getNewReplicator` handler remains as a
|
`ReplicatorService`. The public `getNewReplicator` handler remains as a
|
||||||
compatibility surface, but current Self-hosted LiveSync production code no
|
compatibility surface, but current Self-hosted LiveSync production code no
|
||||||
longer calls it. Its removal belongs to Stage 7 after any external compatibility
|
longer calls it. Stage 7 reviewed its possible removal and deferred it pending
|
||||||
decision has been made.
|
an external compatibility decision.
|
||||||
|
|
||||||
The current host composition has migrated CouchDB and Object Storage connection
|
The current host composition has migrated CouchDB and Object Storage connection
|
||||||
checks, passphrase inspection, preferred-tweak reads, CLI remote status and
|
checks, passphrase inspection, preferred-tweak reads, CLI remote status and
|
||||||
@@ -246,10 +253,11 @@ against the active relay binding held by the stable P2P service. The Stage 7
|
|||||||
review identified and completed that remaining owner boundary; it did not
|
review identified and completed that remaining owner boundary; it did not
|
||||||
reopen the active-construction contract.
|
reopen the active-construction contract.
|
||||||
|
|
||||||
This position completes the Stage 5 construction and probe boundary. It is not
|
This position completed the Stage 5 construction and probe boundary. At that
|
||||||
itself a release decision: the active-publication and truthful-attempt work in
|
intermediate point it was not itself a release decision: Stage 6 still had to
|
||||||
Stage 6 remains required. Complete retirement of the compatibility facade is
|
complete the active-publication lifecycle and return an exact outcome for each
|
||||||
not a prerequisite for issue 1140.
|
attempt. Complete retirement of the compatibility facade was not a prerequisite
|
||||||
|
for issue 1140.
|
||||||
|
|
||||||
## Stage 6: harden the active lifecycle and exact attempt outcome
|
## Stage 6: harden the active lifecycle and exact attempt outcome
|
||||||
|
|
||||||
@@ -342,8 +350,8 @@ publication.
|
|||||||
|
|
||||||
The first implementation regressions cover:
|
The first implementation regressions cover:
|
||||||
|
|
||||||
- replacement waiting for an admitted exact-context task while ignoring an
|
- replacement waiting for a task admitted against the exact publication while
|
||||||
unrelated bounded activity;
|
ignoring an unrelated bounded activity;
|
||||||
- context acquisition waiting for a queued replacement rather than returning a
|
- context acquisition waiting for a queued replacement rather than returning a
|
||||||
stale or intermediate publication;
|
stale or intermediate publication;
|
||||||
- rejecting central-remote administration releasing its reservation before
|
- rejecting central-remote administration releasing its reservation before
|
||||||
@@ -711,6 +719,7 @@ retirement remains a separately reviewed compatibility change.
|
|||||||
|
|
||||||
## References
|
## References
|
||||||
|
|
||||||
|
- [Project glossary](../glossary.md#developer-and-design-terms)
|
||||||
- [Part 1: core contract](2026_08_replicator_capabilities_01_core_contract.md)
|
- [Part 1: core contract](2026_08_replicator_capabilities_01_core_contract.md)
|
||||||
- [Part 2: P2P service and session lifecycle](2026_08_replicator_capabilities_02_p2p_service_lifecycle.md)
|
- [Part 2: P2P service and session lifecycle](2026_08_replicator_capabilities_02_p2p_service_lifecycle.md)
|
||||||
- [P2P Room and Transport Lifecycle](2026_07_p2p_transport_lifecycle.md)
|
- [P2P Room and Transport Lifecycle](2026_07_p2p_transport_lifecycle.md)
|
||||||
|
|||||||
+193
-144
@@ -1,173 +1,222 @@
|
|||||||
# Data Structures of Self-Hosted LiveSync
|
---
|
||||||
|
date: 2026-09-03
|
||||||
|
commonlib-version: "0.1.21"
|
||||||
|
self-hosted-livesync-version: "1.0.24"
|
||||||
|
status: accepted
|
||||||
|
---
|
||||||
|
|
||||||
## Overview
|
# Database Data Structures
|
||||||
|
|
||||||
Self-hosted LiveSync uses the following types of documents:
|
## Scope and Authority
|
||||||
|
|
||||||
- Metadata
|
This document is a developer overview of the database structures used by the
|
||||||
- Legacy Metadata
|
current Self-hosted LiveSync 1.0 series. It is not a stable, forward-compatible
|
||||||
- Binary Metadata
|
API for constructing CouchDB documents by hand.
|
||||||
- Plain Metadata
|
|
||||||
- Chunk
|
|
||||||
- Versioning
|
|
||||||
- Synchronise Information
|
|
||||||
- Synchronise Parameters
|
|
||||||
- Milestone Information
|
|
||||||
|
|
||||||
## Description of Each Data Structure
|
The executable authority for document types, path and identifier encoding,
|
||||||
|
chunk splitting and hashing, encryption, compression, and content
|
||||||
|
reconstruction is the exact `@vrtmrz/livesync-commonlib` version recorded in
|
||||||
|
the repository lockfile. Commonlib owns this domain under the
|
||||||
|
[package-boundary decision](adr/2026_07_common_library_package_boundary.md).
|
||||||
|
When this overview and that installed package differ, correct this document
|
||||||
|
and treat the package behaviour as authoritative for the affected release.
|
||||||
|
|
||||||
All documents inherit from the `DatabaseEntry` interface. This is necessary for conflict resolution and deletion flags.
|
Three representations must be distinguished:
|
||||||
|
|
||||||
|
1. the decoded application representation used by Commonlib services;
|
||||||
|
2. the local PouchDB representation, including CouchDB revision metadata; and
|
||||||
|
3. the raw remote representation after any configured compression, E2EE, or
|
||||||
|
path-obfuscation transform.
|
||||||
|
|
||||||
|
The examples below describe the first two representations unless a section
|
||||||
|
explicitly discusses the raw remote representation. The exact raw remote shape
|
||||||
|
depends on the configured transforms and protocol version and cannot be
|
||||||
|
inferred from the decoded or local examples alone.
|
||||||
|
|
||||||
|
## Principal Document Families
|
||||||
|
|
||||||
|
- file Metadata, including compatibility-only legacy Metadata;
|
||||||
|
- Chunks and compatibility transport structures such as Chunk Packs;
|
||||||
|
- database version, synchronisation, Milestone, and Node information; and
|
||||||
|
- CouchDB revision and deletion records.
|
||||||
|
|
||||||
|
Commonlib's `EntryDoc` is a union across several of these families. It is not
|
||||||
|
synonymous with file Metadata.
|
||||||
|
|
||||||
|
## Common CouchDB Fields
|
||||||
|
|
||||||
|
Database documents share this base shape:
|
||||||
|
|
||||||
```ts
|
```ts
|
||||||
export interface DatabaseEntry {
|
export interface DatabaseEntry {
|
||||||
_id: DocumentID;
|
_id: DocumentID;
|
||||||
_rev?: string;
|
_rev?: string;
|
||||||
_deleted?: boolean;
|
_deleted?: boolean;
|
||||||
|
_conflicts?: string[];
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
### Versioning Document
|
- `_id` identifies one CouchDB document.
|
||||||
|
- `_rev` identifies one revision of that document.
|
||||||
|
- `_conflicts` is returned when conflict information is requested. It is
|
||||||
|
CouchDB revision metadata, not part of the persisted application document.
|
||||||
|
- `_deleted: true` creates a CouchDB tombstone. It is distinct from the
|
||||||
|
logical file-deletion field `deleted: true` described below.
|
||||||
|
|
||||||
This document stores version information for Self-hosted LiveSync.
|
## File Metadata
|
||||||
The ID is fixed as `obsydian_livesync_version` [VERSIONING_DOCID]. Yes, the typo has become a curse.
|
|
||||||
When Self-hosted LiveSync detects changes to this document via Replication, it reads the version information and checks compatibility.
|
|
||||||
This internal database version is independent of the plug-in's SemVer version. The last version explicitly acknowledged on a device is stored through Commonlib's device-local configuration contract. When that version differs, or when a settings migration requires review, Self-hosted LiveSync presents a dedicated compatibility dialogue and blocks replication without changing the user's automatic synchronisation choices. A supported upgrade can resume only after explicit review. A downgrade from a newer acknowledged database version, or settings written by a future schema, remains blocked until a compatible plug-in is installed.
|
|
||||||
Please refer to negotiation.ts.
|
|
||||||
|
|
||||||
### Synchronise Information Document
|
Current files are stored as chunked Metadata. The following is a simplified
|
||||||
|
shape; the exported Commonlib declarations remain authoritative:
|
||||||
This document stores information that should be verified in synchronisation settings.
|
|
||||||
The ID is fixed as `syncinfo` [SYNCINFO_ID].
|
|
||||||
The information stored in this document is only the conditions necessary for synchronisation to succeed, and as of v0.25.43, only a random string is stored.
|
|
||||||
This document is only used during rebuilds from the settings screen for CouchDB-based synchronisation, making it like an appendix. It may be removed in the future.
|
|
||||||
|
|
||||||
### Synchronise Parameters Document
|
|
||||||
|
|
||||||
This document stores synchronisation parameters.
|
|
||||||
Synchronisation parameters include the protocol version and salt used for encryption, but do not include chunking settings.
|
|
||||||
|
|
||||||
The ID is fixed as `_local/obsidian_livesync_sync_parameters` [DOCID_SYNC_PARAMETERS] or `_obsidian_livesync_journal_sync_parameters.json` [DOCID_JOURNAL_SYNC_PARAMETERS].
|
|
||||||
|
|
||||||
This document exists only on the remote and not locally.
|
|
||||||
This document stores the following information.
|
|
||||||
It is read each time before connecting and is used to verify that E2EE settings match.
|
|
||||||
This mismatch cannot be ignored and synchronisation will be stopped.
|
|
||||||
|
|
||||||
```ts
|
```ts
|
||||||
export interface SyncParameters extends DatabaseEntry {
|
type ChunkedMetadata = DatabaseEntry & {
|
||||||
_id: typeof DOCID_SYNC_PARAMETERS;
|
|
||||||
type: (typeof EntryTypes)["SYNC_PARAMETERS"];
|
|
||||||
protocolVersion: ProtocolVersion;
|
|
||||||
pbkdf2salt: string;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### protocolVersion
|
|
||||||
|
|
||||||
This field indicates the protocol version used by the remote. Mostly, this value should be `2` (ProtocolVersions.ADVANCED_E2EE), which indicates safer E2EE support.
|
|
||||||
|
|
||||||
#### pbkdf2salt
|
|
||||||
|
|
||||||
This field stores the salt used for PBKDF2 key derivation on the remote. This salt and the passphrase provides E2EE encryption keys.
|
|
||||||
|
|
||||||
### Milestone Information Document
|
|
||||||
|
|
||||||
This document stores information about how the remote accepts and recognises clients.
|
|
||||||
The ID is fixed as `_local/obsidian_livesync_milestone` [MILESTONE_DOCID].
|
|
||||||
This document exists only on the remote and not locally.
|
|
||||||
This document is used to indicate synchronisation progress and includes the version range of accepted chunks for each node and adjustment values for each node.
|
|
||||||
Tweak Mismatched is determined based on the information in this document.
|
|
||||||
|
|
||||||
For details, please refer to LiveSyncReplicator.ts, LiveSyncJournalReplicator.ts, and LiveSyncDBFunctions.ts.
|
|
||||||
|
|
||||||
```ts
|
|
||||||
export interface EntryMilestoneInfo extends DatabaseEntry {
|
|
||||||
_id: typeof MILESTONE_DOCID;
|
|
||||||
type: EntryTypes["MILESTONE_INFO"];
|
|
||||||
created: number;
|
|
||||||
accepted_nodes: string[];
|
|
||||||
node_info: { [key: NodeKey]: NodeData };
|
|
||||||
locked: boolean;
|
|
||||||
cleaned?: boolean;
|
|
||||||
node_chunk_info: { [key: NodeKey]: ChunkVersionRange };
|
|
||||||
tweak_values: { [key: NodeKey]: TweakValues };
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### locked
|
|
||||||
|
|
||||||
If the remote has been requested to lock out from any client, this is set to true.
|
|
||||||
When set to true, clients will stop synchronisation unless they are included in accepted_nodes.
|
|
||||||
|
|
||||||
### cleaned
|
|
||||||
|
|
||||||
If the remote has been cleaned up from any client, this is set to true.
|
|
||||||
In this case, clients will stop synchronisation as they need to rebuild again.
|
|
||||||
|
|
||||||
### Metadata Document
|
|
||||||
|
|
||||||
Metadata documents store metadata for Obsidian notes.
|
|
||||||
|
|
||||||
```ts
|
|
||||||
export interface MetadataDocument extends DatabaseEntry {
|
|
||||||
_id: DocumentID;
|
|
||||||
ctime: number;
|
ctime: number;
|
||||||
mtime: number;
|
mtime: number;
|
||||||
size: number;
|
size: number;
|
||||||
deleted?: boolean;
|
deleted?: boolean;
|
||||||
eden: Record<string, EdenChunk>; // Obsolete
|
eden: Record<string, { data: string; epoch: number }>;
|
||||||
path: FilePathWithPrefix;
|
path: FilePathWithPrefix;
|
||||||
children: string[];
|
children: string[];
|
||||||
type: EntryTypes["NOTE_LEGACY" | "NOTE_BINARY" | "NOTE_PLAIN"];
|
type: "plain" | "newnote";
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### type
|
|
||||||
|
|
||||||
This field indicates the type of Metadata document.
|
|
||||||
By convention, Self-hosted LiveSync does not save the mime type of the file, but distinguishes them with this field. Please note this.
|
|
||||||
Possible values are as follows:
|
|
||||||
|
|
||||||
- NOTE_LEGACY: Legacy metadata document
|
|
||||||
- Please do not use
|
|
||||||
- NOTE_BINARY: Binary metadata document (newnote)
|
|
||||||
- NOTE_PLAIN: Plain metadata document (plain)
|
|
||||||
|
|
||||||
#### children
|
|
||||||
|
|
||||||
This field stores an array of Chunk Document IDs.
|
|
||||||
|
|
||||||
#### \_id, path
|
|
||||||
|
|
||||||
\_id is generated based on the path of the Obsidian note.
|
|
||||||
|
|
||||||
The validation and explicit repair contract for normal-file Metadata whose
|
|
||||||
actual ID does not match the ID derived from its stored path is defined in
|
|
||||||
[Normal-file Metadata Document ID Validation and Repair](design_docs/metadata_document_id_validation_and_repair.md).
|
|
||||||
|
|
||||||
- If the path starts with `_`, it is converted to `/_` for convenience.
|
|
||||||
- If Case Sensitive is disabled, it is converted to lowercase.
|
|
||||||
|
|
||||||
When Obfuscation is enabled, the path field contains `f:{obfuscated path}`.
|
|
||||||
The path field stores the path as is. However, when Obfuscation is enabled, the obfuscated path is stored.
|
|
||||||
|
|
||||||
When Property Encryption is enabled, the path field stores all properties including children, mtime, ctime, and size in an encrypted state. Please refer to encryption.ts.
|
|
||||||
|
|
||||||
### Chunk Document
|
|
||||||
|
|
||||||
```ts
|
|
||||||
export type EntryLeaf = DatabaseEntry & {
|
|
||||||
_id: DocumentID;
|
|
||||||
type: EntryTypes["CHUNK"];
|
|
||||||
data: string;
|
|
||||||
};
|
};
|
||||||
```
|
```
|
||||||
|
|
||||||
Chunk documents store parts of note content.
|
`children` contains Chunk document IDs in reconstruction order. A normal save
|
||||||
|
persists every referenced Chunk before it persists the Metadata which names
|
||||||
|
those Chunks. The writes are separate database operations rather than one
|
||||||
|
atomic transaction, so another client may still observe the Metadata first.
|
||||||
|
The resulting retrieval contract is documented in
|
||||||
|
[Chunk Retrieval and Waiting](design_docs/chunk_retrieval_and_waiting.md).
|
||||||
|
|
||||||
- The type field is always `[CHUNK]`, `leaf`.
|
The current persisted file types are:
|
||||||
- The data field stores the chunk content.
|
|
||||||
- The \_id field is generated based on a hash of the content and the passphrase.
|
|
||||||
|
|
||||||
Hash functions used include xxHash and SHA-1, depending on settings.
|
- `plain`, for text content represented by literal text Chunks; and
|
||||||
Chunking methods used include Contextual Chunking and Rabin-Karp Chunking, depending on settings.
|
- `newnote`, for binary content represented by Base64 Chunks.
|
||||||
|
|
||||||
|
The compatibility-only `notes` type stores content directly in its `data`
|
||||||
|
field rather than in `children`. Existing data may be read through selected
|
||||||
|
legacy paths, but current writers do not create `notes` documents, and not
|
||||||
|
every current replication path accepts newly created legacy documents.
|
||||||
|
|
||||||
|
`datatype` appears on Commonlib's loaded and saving representations. The
|
||||||
|
current Metadata writer does not persist it, so it is absent from ordinary
|
||||||
|
current CouchDB Metadata.
|
||||||
|
|
||||||
|
`eden` remains in the shared type for existing data compatibility. New
|
||||||
|
configuration does not enable Eden, and current writers do not create
|
||||||
|
incubated Eden Chunks for a new configuration.
|
||||||
|
|
||||||
|
### Times and Size
|
||||||
|
|
||||||
|
`ctime` and `mtime` are Unix epoch times in milliseconds. `size` is the byte
|
||||||
|
size of the decoded file content supplied by the storage boundary. Current
|
||||||
|
storage adapters and generated Blob paths obtain it from filesystem metadata
|
||||||
|
or `Blob.size`; JavaScript `String.length` is a UTF-16 code-unit count and is
|
||||||
|
not a valid substitute for non-ASCII content.
|
||||||
|
|
||||||
|
### Paths, Identifiers, and Namespaces
|
||||||
|
|
||||||
|
At the decoded boundary, `path` records the logical path, including any
|
||||||
|
feature namespace prefix. `_id` is derived from that path by Commonlib's path
|
||||||
|
service:
|
||||||
|
|
||||||
|
- a path beginning with `_` receives a leading `/` in its document ID so that
|
||||||
|
CouchDB does not interpret it as a reserved identifier;
|
||||||
|
- the path is folded to lower case only when
|
||||||
|
`handleFilenameCaseSensitive` is disabled; and
|
||||||
|
- when path obfuscation is enabled, the body of the document ID is replaced
|
||||||
|
by an `f:` SHA-256-derived value. A feature prefix is retained, so an
|
||||||
|
obfuscated Hidden File Sync ID can begin with `i:f:`.
|
||||||
|
|
||||||
|
The main namespaces are:
|
||||||
|
|
||||||
|
| Prefix | Meaning |
|
||||||
|
| ------ | ------------------------------------------------------- |
|
||||||
|
| none | An ordinary Vault file |
|
||||||
|
| `i:` | Hidden File Sync Metadata |
|
||||||
|
| `ix:` | Customisation Sync Metadata |
|
||||||
|
| `ps:` | Compatibility namespace for plug-in storage data |
|
||||||
|
| `f:` | Obfuscated document-ID body |
|
||||||
|
| `h:` | Chunk document |
|
||||||
|
| `h:+` | Chunk whose identifier incorporates encryption material |
|
||||||
|
|
||||||
|
Namespaces identify storage and path handling; they do not by themselves
|
||||||
|
select an Entry `type`. Current Hidden File Sync and Customisation Sync writers
|
||||||
|
store chunked `plain` or `newnote` documents under `i:` and `ix:`. The
|
||||||
|
application-local `type: "plugin"` interface is not a Commonlib Entry type and
|
||||||
|
is not the current Customisation Sync storage format. Although Commonlib
|
||||||
|
retains an `internalfile` constant for compatibility, current Hidden File Sync
|
||||||
|
producers do not use it as their persisted type.
|
||||||
|
|
||||||
|
The decoded `path` does not become `f:{obfuscated path}`. Compression, E2EE,
|
||||||
|
and path obfuscation can change raw remote identifiers and properties.
|
||||||
|
Commonlib owns those transforms, and their exact representation depends on the
|
||||||
|
selected settings.
|
||||||
|
|
||||||
|
The validation and explicit repair contract for ordinary-file Metadata whose
|
||||||
|
stored `_id` does not agree with its decoded `path` is defined in
|
||||||
|
[Normal-file Metadata Document ID Validation and Repair](design_docs/metadata_document_id_validation_and_repair.md).
|
||||||
|
|
||||||
|
## Chunk Documents
|
||||||
|
|
||||||
|
```ts
|
||||||
|
export type EntryLeaf = DatabaseEntry & {
|
||||||
|
type: "leaf";
|
||||||
|
data: string;
|
||||||
|
isCorrupted?: boolean;
|
||||||
|
};
|
||||||
|
```
|
||||||
|
|
||||||
|
A `leaf` stores one content-addressed piece. For `plain` Metadata, `data` is
|
||||||
|
literal text. For `newnote` Metadata, `data` is Base64 text representing binary
|
||||||
|
bytes. Concatenating and decoding the children in order reconstructs the
|
||||||
|
decoded file content.
|
||||||
|
|
||||||
|
Commonlib's configured `HashManager` produces content-derived Chunk
|
||||||
|
identifiers. Their representation can vary with compatibility and encryption
|
||||||
|
settings. Historical hash algorithms remain readable only as compatibility
|
||||||
|
settings.
|
||||||
|
|
||||||
|
Chunk revisions are content-derived irrespective of the obsolete stored
|
||||||
|
`doNotUseFixedRevisionForChunks` setting. Compression and E2EE may transform a
|
||||||
|
Chunk's raw remote `data` and add representation markers, so the remote value
|
||||||
|
can differ from the decoded Chunk data.
|
||||||
|
|
||||||
|
## File Deletion
|
||||||
|
|
||||||
|
LiveSync distinguishes two operations:
|
||||||
|
|
||||||
|
- `deleted: true` is a logical deletion of a file. With Metadata retention
|
||||||
|
enabled, an ordinary current-file deletion preserves the existing Metadata
|
||||||
|
fields and Chunk references, updates `mtime`, and creates a new Metadata
|
||||||
|
revision. This permits the deletion to participate in synchronisation and
|
||||||
|
conflict history.
|
||||||
|
- `_deleted: true` is a CouchDB tombstone for one document revision. That
|
||||||
|
revision does not retain the application body. Tombstones are used by
|
||||||
|
explicit compatibility and clean-up paths.
|
||||||
|
|
||||||
|
A logical deletion does not clear `children` or set `size` to zero. The
|
||||||
|
`deleteMetadataOfDeletedFiles` setting can request an immediate tombstone
|
||||||
|
instead. Whether retained, logically deleted Metadata is later tombstoned
|
||||||
|
depends on the configured deletion-retention settings.
|
||||||
|
|
||||||
|
Branch-specific conflict operations and their ancestry requirements are defined
|
||||||
|
in the [Conflict Resolution specification](specs_conflict_resolution.md).
|
||||||
|
|
||||||
|
## Control Documents
|
||||||
|
|
||||||
|
The principal control documents are:
|
||||||
|
|
||||||
|
| Document | Identifier | Purpose |
|
||||||
|
| ---------------------------------- | ------------------------------------------------- | -------------------------------------------------------------------------------------------------------- |
|
||||||
|
| Version information | `obsydian_livesync_version` | Records the internal database version. The historical spelling is retained for compatibility. |
|
||||||
|
| Synchronisation information | `syncinfo` | Stores rebuild-related synchronisation information for CouchDB-based operation. |
|
||||||
|
| CouchDB synchronisation parameters | `_local/obsidian_livesync_sync_parameters` | Stores the protocol version and PBKDF2 salt on the remote. |
|
||||||
|
| Journal synchronisation parameters | `_obsidian_livesync_journal_sync_parameters.json` | Journal counterpart of the synchronisation-parameter record. |
|
||||||
|
| Milestone information | `_local/obsidian_livesync_milestone` | Records accepted Nodes, locking, clean-up state, Chunk version ranges, and synchronisation tweak values. |
|
||||||
|
| Node information | `_local/obsidian_livesync_nodeinfo` | Records the local Node identifier and compatibility markers. |
|
||||||
|
|
||||||
|
The `_local/` records are CouchDB-local documents and do not replicate like
|
||||||
|
ordinary Metadata and Chunks. Synchronisation parameters are checked before
|
||||||
|
connecting; an incompatible protocol or encryption configuration stops
|
||||||
|
synchronisation rather than being ignored.
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ Accepted for a limited implementation.
|
|||||||
## Problem and scope
|
## Problem and scope
|
||||||
|
|
||||||
This document uses the independent revision properties defined under
|
This document uses the independent revision properties defined under
|
||||||
[Revision](../terms.md#revision) and the general state model in
|
[Revision](../glossary.md#revision) and the general state model in
|
||||||
[Conflict resolution and revision provenance](../specs_conflict_resolution.md).
|
[Conflict resolution and revision provenance](../specs_conflict_resolution.md).
|
||||||
|
|
||||||
Document History can reconstruct an available historical revision from its
|
Document History can reconstruct an available historical revision from its
|
||||||
|
|||||||
@@ -0,0 +1,333 @@
|
|||||||
|
---
|
||||||
|
date: 2026-09-03
|
||||||
|
commonlib-version: "0.1.21"
|
||||||
|
self-hosted-livesync-version: "1.0.24"
|
||||||
|
commonlib-source-commit: e770f617ff0fc88f4823226b0ab3aefdff50cc1e
|
||||||
|
status: accepted
|
||||||
|
---
|
||||||
|
|
||||||
|
# Replicator architecture
|
||||||
|
|
||||||
|
This is the implemented architecture for Self-hosted LiveSync 1.0.24 with `@vrtmrz/livesync-commonlib` 0.1.21. It is an implementation overview for developers maintaining the composition or adding a built-in provider. The corresponding Commonlib source was inspected at commit `e770f617ff0fc88f4823226b0ab3aefdff50cc1e`.
|
||||||
|
|
||||||
|
## Status, scope, and source-of-truth boundary
|
||||||
|
|
||||||
|
The plug-in repository is the source of truth for host composition, host scheduling, Obsidian/CLI/WebApp/WebPeer integration, provider declarations, and host-owned resource adapters. Commonlib is the source of truth for the provider contract, the active-publication state machine, typed replication runners, P2P service ownership, and Journal transport primitives. This repository consumes Commonlib as the published `0.1.21` package; it does not maintain a source mirror or a generated fallback.
|
||||||
|
|
||||||
|
The implementation has three built-in providers:
|
||||||
|
|
||||||
|
- CouchDB, composed by this repository;
|
||||||
|
- Object Storage, composed by this repository; and
|
||||||
|
- P2P, composed by Commonlib's `useP2PReplicatorFeature` in each application runtime which supports it.
|
||||||
|
|
||||||
|
The catalogue is closed at host composition. `src/common/replicatorProviders.ts` exhaustively composes the central providers, while the Commonlib P2P feature composes its P2P provider. This is not a runtime third-party registry: a provider cannot be added by registering a name, loading a plug-in, or supplying a setting at runtime. Adding a provider means changing the relevant Commonlib and host composition, then shipping and testing that composition.
|
||||||
|
|
||||||
|
The three capability ADRs record the decisions which led to this shape. They are useful decision history, but this document describes the current implementation and its ownership boundaries rather than repeating the ADR sequence.
|
||||||
|
|
||||||
|
## Terminology
|
||||||
|
|
||||||
|
The [Project glossary](../glossary.md#developer-and-design-terms) is canonical
|
||||||
|
for project-specific vocabulary in this document. In particular, see
|
||||||
|
[Replicator](../glossary.md#replicator),
|
||||||
|
[Replicator provider definition](../glossary.md#replicator-provider-definition),
|
||||||
|
[Active publication](../glossary.md#active-publication),
|
||||||
|
[Admission and reservation](../glossary.md#admission-and-reservation),
|
||||||
|
[Configuration identity](../glossary.md#configuration-identity),
|
||||||
|
[Capability](../glossary.md#capability),
|
||||||
|
[Central remote](../glossary.md#central-remote),
|
||||||
|
[Publication retirement](../glossary.md#publication-retirement), and
|
||||||
|
[Fence, generation, and epoch](../glossary.md#fence-generation-and-epoch).
|
||||||
|
The glossary also fixes the ownership meanings of
|
||||||
|
[Adjunct P2P transport](../glossary.md#adjunct-p2p-transport),
|
||||||
|
[Remote resource and probe](../glossary.md#remote-resource-and-probe),
|
||||||
|
[Non-owning adapter](../glossary.md#non-owning-adapter),
|
||||||
|
[P2P service, room session, and demand](../glossary.md#p2p-service-room-session-and-demand),
|
||||||
|
[Interaction authority](../glossary.md#interaction-authority),
|
||||||
|
[Journal remote epoch](../glossary.md#journal-remote-epoch),
|
||||||
|
[Replication outcome](../glossary.md#replication-outcome), and
|
||||||
|
[Suspension](../glossary.md#suspension).
|
||||||
|
The user-facing glossary also distinguishes
|
||||||
|
[OneShot Sync from Continuous replication](../glossary.md#user-facing-and-operational-terms).
|
||||||
|
Names shown in code font are source identifiers, not additional prose terms.
|
||||||
|
|
||||||
|
## Ownership and topology
|
||||||
|
|
||||||
|
The portable topology below names ownership rather than merely call order. An arrow means that the object or layer composes, invokes, or owns the next item.
|
||||||
|
|
||||||
|
```text
|
||||||
|
Application composition
|
||||||
|
Obsidian main / CLI / WebApp --> LiveSyncBaseCore --+
|
||||||
|
WebPeerRuntime ------------------------------------+--> Service Hub
|
||||||
|
|
|
||||||
|
+----------------------------------------+---------------------+
|
||||||
|
| |
|
||||||
|
v v
|
||||||
|
ReplicatorService (Commonlib) ReplicationService (Commonlib)
|
||||||
|
| |
|
||||||
|
+--> closed provider catalogue +--> typed replication runners
|
||||||
|
| CouchDB / Object Storage / P2P | readiness + outcomes
|
||||||
|
| |
|
||||||
|
+--> active publication <------ exact-publication admission ---+
|
||||||
|
provider + instance + identity
|
||||||
|
|
||||||
|
useP2PReplicatorFeature (Commonlib)
|
||||||
|
|
|
||||||
|
+--> registers the P2P provider, whose factory creates non-owning active adapters
|
||||||
|
|
|
||||||
|
+--> stable P2P service views and lifecycle
|
||||||
|
|
|
||||||
|
+--> P2PRoomSessionOwner
|
||||||
|
|
|
||||||
|
+--> P2PAutomationCoordinator
|
||||||
|
+--> current P2PRoomSession
|
||||||
|
|
|
||||||
|
+--> P2PHost / TrysteroReplicator
|
||||||
|
|
|
||||||
|
+--> Trystero room, relays, and physical peers
|
||||||
|
```
|
||||||
|
|
||||||
|
`LiveSyncBaseCore` receives a Service Hub, registers the central provider definitions, composes `serviceFeature` functions, and retains only focused views. `WebPeerRuntime` composes directly over its browser Service Hub because it is a P2P-only host. The P2P feature is composed by each supporting application runtime, so the CLI and web applications can use the same transport ownership without making the active adapter a second owner.
|
||||||
|
|
||||||
|
| Owner | Responsibility | Explicitly does not own |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| Host composition | Selects the closed provider catalogue, supplies host adapters, and registers features before lifecycle work begins. | Active-instance retirement or operation admission. |
|
||||||
|
| Commonlib `ReplicatorService` | Provider registration, active publication, exact-publication reservations, serial lifecycle transitions, transfer stop during suspension or retirement, and physical close. | Replication readiness, trigger policy, or P2P room ownership. |
|
||||||
|
| Commonlib `ReplicationService` and its typed coordinator | User and unattended OneShot dispatch, Continuous startup, readiness, interaction authority, finite-activity accounting, outcomes, and failure hand-off. | Active publication replacement or scheduling policy. |
|
||||||
|
| Host replication scheduling `serviceFeature` | Decides when resume, Periodic, and Continuous requests may run, and fences stale scheduled work. | Provider construction, transfer mechanics, or active Replicator close. |
|
||||||
|
| Provider definition and runner | Declares what one remote kind supports and adapts its transfer results to typed outcomes. | Selecting when a request should run. |
|
||||||
|
| Stable P2P service and room-session owner | P2P demand, binding reconciliation, session retirement, finite room operations, automation state, and focused views. | The active P2P adapter's publication lifetime or Trystero's physical peers. |
|
||||||
|
|
||||||
|
## Request flow
|
||||||
|
|
||||||
|
1. Composition registers the central provider definitions before lifecycle-driven provider initialisation. P2P composition registers its own Commonlib provider and returns stable P2P views and lifecycle controls.
|
||||||
|
2. `ReplicatorService` serialises setting realisation, active-provider initialisation, database lifecycle transitions, suspension, and unload. `ReplicationService` owns per-request readiness. Resume work is separately owned by the host scheduling feature and the P2P service lifecycle.
|
||||||
|
3. `ReplicatorService` resolves the current `remoteType`, checks `isConfigured`, and computes the provider's opaque configuration identity. If the provider and identity are unchanged, the active publication is retained. If either changes, the replacement fence runs before a new publication is created.
|
||||||
|
4. A typed operation such as `runUserInitiated`, `runUnattended`, or `startContinuous` acquires the current publication after earlier queued lifecycle transitions have settled. It checks interaction authority, capability support, and readiness in the order required by the request type, then takes an immutable settings snapshot.
|
||||||
|
5. The operation admits a reservation against the exact publication and identity. The provider-specific runner owns the transfer; finite operations are counted as bounded remote activity, while continuous replication is not.
|
||||||
|
6. Provider resources are created through the declared resource factories when a feature needs a connection, preferred-tweak, Security Seed, or synchronisation-information probe. Resource ownership is explicit, and owned resources are disposed in the caller's `finally` path.
|
||||||
|
7. The runner returns a `ReplicationOutcome` rather than using `undefined` as a success signal. Documents delivered through `parseSynchroniseResult` are queued by the host result processor for local application; central compatibility recovery and Security Seed preflight remain host features around the typed operation.
|
||||||
|
8. Automatic `database-event`, `editor-save`, `file-open`, `merge`, `resume`, `periodic`, and `daemon` requests select unattended authority explicitly. Unattended work cannot prompt, select a peer interactively, or silently fall back to a legacy capability.
|
||||||
|
|
||||||
|
The active publication may change while a request is being prepared. The reservation keeps the admitted old instance alive until the operation settles; a new request admitted after the queued transition observes the new publication. A callback which holds a reservation must not await a lifecycle transition which itself waits for that reservation.
|
||||||
|
|
||||||
|
## Provider contract and current capability matrix
|
||||||
|
|
||||||
|
The Commonlib contract is deliberately small. A provider definition supplies the following shape (with the exact generic types omitted here for readability):
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
{
|
||||||
|
kind,
|
||||||
|
diagnosticName,
|
||||||
|
readiness,
|
||||||
|
isConfigured(setting),
|
||||||
|
configurationIdentity(setting),
|
||||||
|
create(setting),
|
||||||
|
remoteResources,
|
||||||
|
centralRemoteAdministration?,
|
||||||
|
userInitiatedOneShot,
|
||||||
|
unattendedOneShot,
|
||||||
|
continuous,
|
||||||
|
stopActiveTransfer
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
`defineReplicatorProviderDefinitions` makes the definition map exhaustive for the selected `RemoteType` tuple and rejects duplicate, missing, extra, or mismatched runtime definitions. Capability declarations are explicit. `supported` adapts a provider runner to `ReplicationOutcome`; `not-implemented` and `not-applicable` produce typed blocked outcomes. The contract distinguishes user authority from `NO_INTERACTION`, so a provider cannot accidentally prompt from an unattended trigger.
|
||||||
|
|
||||||
|
The factory receives the fully merged effective settings. It returns a `ReplicatorInstance` with only four required lifecycle methods:
|
||||||
|
|
||||||
|
| Method | Contract |
|
||||||
|
| --- | --- |
|
||||||
|
| `initializeDatabaseForReplication()` | Prepare local state before publication. `false` rejects and disposes the candidate. |
|
||||||
|
| `openReplication(setting, keepAlive, showResult, ignoreCleanLock)` | Retained compatibility entry point for finite or Continuous work. A typed provider runner must convert its `void` or Boolean settlement to an explicit outcome; `void` is not finite success. |
|
||||||
|
| `terminateSync()` | Request cancellation of active transfer work and settle synchronously or asynchronously. It does not transfer ownership or replace physical close. |
|
||||||
|
| `closeReplication()` | Release resources owned by this instance. It runs only after admitted work drains; a non-owning adapter, such as P2P, must leave service-owned resources alone. |
|
||||||
|
|
||||||
|
Provider-specific methods remain on provider-specific interfaces or host-owned adapters. They are not added to the generic contract merely because an old compatibility class exposed them.
|
||||||
|
|
||||||
|
### Current capability matrix
|
||||||
|
|
||||||
|
| Capability | CouchDB | Object Storage | P2P |
|
||||||
|
| --- | --- | --- | --- |
|
||||||
|
| Readiness | Central remote preparation required | Central remote preparation required | Central preparation not applicable; peer readiness is provider-owned |
|
||||||
|
| Active Replicator factory | `LiveSyncCouchDBReplicator` | `LiveSyncJournalReplicator` | `P2PActiveReplicatorAdapter` over the stable P2P service |
|
||||||
|
| User-initiated OneShot | Supported | Supported | Supported, with explicit peer selection |
|
||||||
|
| Unattended OneShot | Supported | Supported | Supported for configured targets; no peer-selection prompt |
|
||||||
|
| Continuous replication | Supported | Not applicable | Not applicable |
|
||||||
|
| Stop active transfer | Supported | Supported | Supported; cancels finite operations while retaining the room when appropriate |
|
||||||
|
| Connection resource | Supported | Supported | Not applicable |
|
||||||
|
| Preferred-tweak resource | Supported | Supported | Not applicable |
|
||||||
|
| Security Seed resource | Supported | Supported | Not applicable |
|
||||||
|
| Synchronisation-information resource | Supported | Not applicable | Not applicable |
|
||||||
|
| Central remote administration | CouchDB administration supported | Object Storage administration supported | Not applicable |
|
||||||
|
|
||||||
|
The matrix is the current host composition, not a promise that every provider must support every row. A new provider must declare every resource kind and every operation capability, using `not-applicable` where the concept does not exist. Central remote administration is a cohesive capability: it covers the applicable verification milestone and mark-resolved, lock, and unlock mutations rather than exposing individual legacy helpers as generic operations.
|
||||||
|
|
||||||
|
## Active Replicator lifecycle and exact replacement fence
|
||||||
|
|
||||||
|
Commonlib's `ReplicatorService` serialises lifecycle transitions on one queue. It owns the active publication, reservations against that publication, transfer stop, and final close. The effective configuration identity is deliberately opaque; comparing it is valid, but inspecting or persisting it is not.
|
||||||
|
|
||||||
|
```text
|
||||||
|
absent
|
||||||
|
|
|
||||||
|
| configured lifecycle initialisation
|
||||||
|
v
|
||||||
|
candidate (private and not admitted)
|
||||||
|
| \
|
||||||
|
| initialised and current \ failed or stale --> closed; no active publication
|
||||||
|
v
|
||||||
|
active publication
|
||||||
|
| \ same provider and identity --> retained
|
||||||
|
| \ suspension ----------------> transfer stopped; publication retained
|
||||||
|
|
|
||||||
|
| provider, identity, database, or terminal lifecycle change
|
||||||
|
v
|
||||||
|
quiescing (removed from current; new admission fenced)
|
||||||
|
|
|
||||||
|
| stop --> drain exact reservations --> close --> complete retirement
|
||||||
|
v
|
||||||
|
absent --> optional replacement candidate
|
||||||
|
```
|
||||||
|
|
||||||
|
For a provider or effective-configuration change, the exact fence is:
|
||||||
|
|
||||||
|
1. Enqueue the transition on the serial lifecycle queue.
|
||||||
|
2. Read the current setting, resolve the closed provider definition, check `isConfigured`, and compute the effective identity.
|
||||||
|
3. If the current publication has a different provider or identity, call `beginRetirement`. This stops new reservations and removes the publication from the current slot.
|
||||||
|
4. Request the provider's `stopActiveTransfer` capability. The legacy `terminateSync` path is retained only for an untyped compatibility publication.
|
||||||
|
5. Await settlement of reservations admitted from the retiring publication. New operations cannot enter it.
|
||||||
|
6. Call the old instance's `closeReplication`.
|
||||||
|
7. Mark the retirement complete. No publication is installed between removal of the old publication and this completion.
|
||||||
|
8. Create a candidate through the provider definition, reset provider statistics, and yield the required microtask boundary.
|
||||||
|
9. Initialise the candidate for the current database and run `onBeforeReplicatorPublication` handlers.
|
||||||
|
10. Re-read the current setting, provider, and opaque identity. If any is stale, dispose the candidate and publish nothing; the queued lifecycle work will resolve the newer state.
|
||||||
|
11. Publish the provider, candidate instance, and identity atomically as the new active publication.
|
||||||
|
|
||||||
|
The same provider and identity retain the current publication. Database initialisation is a lifecycle boundary even when the setting identity is unchanged: the old publication is retired before the physical local database is replaced, then a candidate is created for the new database. A failed or stale candidate leaves the service without an active publication; it is not silently substituted with a previous instance.
|
||||||
|
|
||||||
|
If transfer stop fails, retirement still proceeds to draining and physical close. If physical close rejects, retirement remains fenced and no replacement can be published; a later serial transition may retry the same retirement. The service never restores admission to a publication once retirement has begun.
|
||||||
|
|
||||||
|
## Generation and epoch fences
|
||||||
|
|
||||||
|
These values protect different state machines. They must not be collapsed into one general-purpose generation.
|
||||||
|
|
||||||
|
| Fence | Owner and representation | Changes when | Protects | Does not protect |
|
||||||
|
| --- | --- | --- | --- | --- |
|
||||||
|
| Active publication identity | Commonlib `ActiveReplicatorPublication` object, containing provider, instance, and opaque configuration identity; not a numeric counter | Provider/configuration replacement, or a database lifecycle replacement | Admission and completion against the exact active instance | Delayed scheduling, P2P automation baselines, or Journal remote-wipe decisions |
|
||||||
|
| Host scheduling lifecycle generation | `ReplicationSchedulingContext.lifecycleGeneration` | Scheduling resumes after the lifecycle was disabled | Resume operations and timer callbacks from a previous host scheduling lifecycle | Provider replacement, P2P room callbacks, or Journal transfers |
|
||||||
|
| P2P service lifecycle generation | Private `P2PServiceState.lifecycleGeneration` | Explicit disconnect or host lifecycle closure | Delayed P2P AutoStart and service-level automatic demand | A room's operation set, automation baseline, or remote Journal epoch |
|
||||||
|
| P2P session object / epoch fence | The current `P2PRoomSession` object, its `acceptingOperations` flag, session abort signal, and the owner's lifecycle queue; there is no exported numeric P2P session epoch | Room binding replacement, retirement, or owner close | Room callbacks, finite operations, peer handlers, and stale candidate sessions | Cross-session automation deduplication and host scheduling |
|
||||||
|
| P2P automation generation | `P2PAutomationCoordinator.generation` | `beginLifecycle` or effective identity reconciliation (namespace or database object) | Completed peer baseline publication and stale automation completions | Room ownership, explicit disconnect veto, and physical peer connection ownership |
|
||||||
|
| Journal stop generation | `LiveSyncJournalReplicator.journalTransferStopGeneration` | `terminateSync` requests a stop | Admitted Journal transfers after setup and before `client.sync`; repeated stops share settlement | Provider publication identity and remote checkpoint/cache identity |
|
||||||
|
| Journal remote epoch | `CheckPointInfo.journalEpoch`, derived as `protocolVersion:pbkdf2salt` | Successfully read sync parameters yield a different value; a subsequent history probe decides whether checkpoint caches must be reset | Journal checkpoint and deduplication-cache reconciliation across remote histories | Local cancellation, provider retirement, or transfer admission |
|
||||||
|
|
||||||
|
In particular, a numeric value in one row cannot be used as evidence that an operation in another row is current. Failure to read Journal sync parameters does not produce a new remote epoch, and a P2P transport replacement does not by itself clear the automation coordinator's completed-peer baseline.
|
||||||
|
|
||||||
|
## Suspension, terminal retirement, and database replacement
|
||||||
|
|
||||||
|
| Event | `ReplicatorService` publication | P2P service and adapter | Result |
|
||||||
|
| --- | --- | --- | --- |
|
||||||
|
| Application suspension | Requests `stopActiveTransfer` and retains the active publication | `closeForLifecycle` closes the current room/session and invalidates delayed automation; the active adapter is non-owning and does not close the service through `closeReplication` | Suspension is reversible. Resumption schedules the appropriate P2P AutoStart and host replication work. |
|
||||||
|
| Provider setting or effective identity change | Runs the complete replacement fence | Reconciles or replaces the P2P room when its effective binding changes | The old publication/session cannot receive new work. |
|
||||||
|
| Database replacement or rebuild | Retires and closes the active publication before physical database teardown; database-ready events permit reinitialisation | Closes the P2P room before database destruction and creates a binding for the new database object | No provider or room may retain the old database. |
|
||||||
|
| Unload or terminal lifecycle close | Stops, drains, closes, and completes retirement; no active publication remains | `closeForLifecycle` clears owner demand, closes the current room, and invalidates automation | Terminal retirement is not resumed. |
|
||||||
|
|
||||||
|
Suspension and retirement therefore have different guarantees. `ReplicatorService` suspension stops transfer but intentionally retains the provider instance and publication. Terminal retirement removes admission, drains it, closes it, and does not publish a replacement unless a later lifecycle event explicitly initialises one. P2P transport is additionally closed on suspension because its service lifecycle owns a room session, but the active P2P adapter is only a compatibility handle and does not own that session.
|
||||||
|
|
||||||
|
## Owned resources and probes
|
||||||
|
|
||||||
|
| Resource or probe | Owner | Lifetime and disposal rule |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| Active Replicator publication | Commonlib `ReplicatorService` | Publication retirement fences admission, drains reservations, calls `closeReplication`, and completes the retirement. |
|
||||||
|
| Central connection probe | Host resource factory in `src/common/replicatorResources/connection.ts` | A caller-owned CouchDB or Object Storage snapshot backed by a concrete Replicator/connection; dispose it in `finally`. It does not replace the active publication. |
|
||||||
|
| Preferred-tweak probe | Host `preferredTweak` resource factory | Read through the declared resource, then dispose the owned resource. |
|
||||||
|
| Security Seed probe | Host `securitySeed` resource factory and the replication preflight | Use `createRemoteResource` and `withOwnedRemoteResource`; reject an empty seed and always dispose the resource. It does not assume that an active Replicator exists. |
|
||||||
|
| Synchronisation-information probe | Host `synchronisationInformation` resource factory | Check or read through the resource and dispose it; an unavailable remote is not treated as a confirmed absence. |
|
||||||
|
| Central administration operation | Provider administration runner | Uses its declared verification and mutation ownership. A fresh connection may be owned by the operation; an active Journal client borrowed from the active provider is not disposed by the borrower. |
|
||||||
|
| Journal client and transfer set | `LiveSyncJournalReplicator` | The Journal Replicator owns the client and active transfer promises. `terminateSync` requests stop and awaits the shared settlement; `closeReplication` disposes the client without lazily creating one. |
|
||||||
|
| P2P room/session, finite operation set, and relay actions | `P2PRoomSessionOwner` and current `P2PRoomSession` | The owner serialises binding and demand changes. Session retirement rejects admission, aborts and awaits operations, disables broadcast, and disposes the session Replicator. |
|
||||||
|
| Physical Trystero peer connections | Trystero runtime | Commonlib must not close raw `room.getPeers()` connections merely because a logical room session retires; shared Trystero ownership may outlive an idle room callback. |
|
||||||
|
| Physical local database | Commonlib DatabaseService | Database lifecycle owns teardown and readiness. Replicator and P2P owners close before the database is destroyed. |
|
||||||
|
|
||||||
|
Probe callers must use the resource capability rather than reaching through `LiveSyncBaseCore.replicator`. This keeps a short-lived observation from acquiring ownership of the active transfer or publication.
|
||||||
|
|
||||||
|
## P2P special ownership and the non-owning adapter
|
||||||
|
|
||||||
|
P2P is composed as a `serviceFeature` and has more state than a central provider. It can remain enabled as an adjunct while CouchDB or Object Storage is the selected main remote; `ReplicatorService` publishes the P2P active adapter only when `remoteType` is P2P. The active-publication owner and the room-session owner are therefore deliberately independent.
|
||||||
|
|
||||||
|
The stable service owns persistent demand (`explicit`, `automatic`, or `rebuild-continuation`), finite-operation demand, the lifecycle queue, the effective binding, and the current room session. The room owner compares the local database object separately and includes the effective device name in its binding signature, so the binding is not interchangeable with the P2P provider's active-publication configuration identity. The automation coordinator owns automation-baseline deduplication. The current `P2PRoomSession` owns one room, peer handlers, advertisements, RPC, session cancellation, and finite operations. Trystero owns shared relay clients and physical peer connections.
|
||||||
|
|
||||||
|
`P2PActiveReplicatorAdapter` implements the minimal `ReplicatorInstance` view required by the provider contract. Its `initializeDatabaseForReplication`, `openReplication`, and `terminateSync` methods delegate to the P2P service. Its `closeReplication` is intentionally a no-op: closing the active adapter must not close the room, relay actions, finite-operation registry, or stable P2P service. The service lifecycle (`closeForLifecycle`, owner close, or binding reconciliation) is the only owner which retires the room.
|
||||||
|
|
||||||
|
The P2P connection probe follows the same boundary. An active compatible room may be observed; an incompatible active binding blocks the probe. An idle probe can run a caller-owned trial through the owner queue and must await clean-up. It must not publish itself as the active room or close resources owned by another session.
|
||||||
|
|
||||||
|
Automatic configured-target replication acquires finite room demand, waits for peer advertisements within a bounded window, evaluates admission without prompting, shares the baseline through `P2PAutomationCoordinator`, and returns an explicit completed, partial, blocked, cancelled, or failed outcome. Explicit disconnect veto remains distinct from host lifecycle closure. AutoStart cannot clear an explicit disconnect veto; rebuild continuation is a separately authorised path.
|
||||||
|
|
||||||
|
## Adding a built-in provider
|
||||||
|
|
||||||
|
Provider work crosses the Commonlib package boundary and this repository's host composition. The following sequence is the smallest complete path; omit a step only when the provider genuinely has no corresponding concept.
|
||||||
|
|
||||||
|
### First decide whether this is a provider
|
||||||
|
|
||||||
|
A new provider is appropriate when a remote kind needs a distinct active Replicator lifecycle, effective configuration identity, readiness policy, or replication roles. A new S3-compatible service or another backend which retains the Object Storage Journal protocol is usually an `IJournalStorage` adapter instead; see [Journal Replicator 2nd Edition](../design_docs_of_journalsync_2nd.md). A new read-only observation over an existing provider is usually a remote resource or a focused view. Neither case needs another active provider.
|
||||||
|
|
||||||
|
1. **Define the canonical remote kind in Commonlib.** Add the `RemoteType` value and its setting type in `src/common/models/setting.const.ts` and `src/common/models/setting.type.ts`, update exports such as `src/common/types.ts`, and add defaults or persistence fields only where the provider needs them. Add focused setting and migration tests.
|
||||||
|
2. **Implement the Replicator in Commonlib.** Place the provider-specific Replicator and transport code under `src/replication/<provider>/`. Implement the minimal `ReplicatorInstance` contract, cancellation, and close semantics. Keep provider-specific operations on focused facets. Add unit tests for success, cancellation, failure, stop, and replacement-sensitive clean-up.
|
||||||
|
3. **Define effective configuration identity.** Include every setting which changes the live binding, and exclude profile labels or policy-only settings. Normalise two spellings only when the runtime genuinely treats them as equivalent. Put shared identity logic in Commonlib when the provider is shared there; put the host projection in `src/common/replicatorConfigurationIdentity.ts` when this repository owns it. Test that equivalent effective settings retain an instance and binding changes replace it. Never expose identity values in logs, UI, or persistence.
|
||||||
|
4. **Add configuration and setup seams in Commonlib.** If the provider has a connection string, profile, migration, or document representation, update the applicable files, including `src/common/ConnectionString.ts`, `src/remoteConfigurations.ts`, `src/common/configForDoc.ts`, `src/API/processSetting.ts`, and their focused tests. These files are conditional: do not add a setting representation which the provider does not need.
|
||||||
|
5. **Declare the provider contract surface at its composition owner.** Add a central provider to the tuple and definition map in this repository's `src/common/replicatorProviders.ts`; add a P2P-like provider to the closed tuple owned by its Commonlib `serviceFeature`. In the definition, declare readiness, all four remote-resource capability entries, user and unattended OneShot runners, Continuous where applicable, `stopActiveTransfer`, and central administration where applicable. Extend `RemoteResource` kinds only for a genuinely cross-provider resource; do not encode provider-specific helpers as generic capabilities.
|
||||||
|
6. **Implement stateful transport ownership, if required.** For a P2P-like provider, add a stable service owner, focused views, lifecycle ownership, binding identity, session retirement, and automation fences in Commonlib, then compose it through a `serviceFeature`. Keep any active adapter non-owning if the service owns a replaceable transport. Add lifecycle, stale-callback, probe, and database-replacement tests before host integration.
|
||||||
|
7. **Compose the provider in each supporting application.** Central definitions are registered by `LiveSyncBaseCore`. A dedicated stateful feature must be composed from the applicable hosts: `src/main.ts`, `src/apps/cli/main.ts`, `src/apps/webapp/WebAppRuntime.ts`, and `src/apps/webpeer/src/WebPeerRuntime.ts`. Each selected catalogue must remain exhaustive and closed; add no runtime provider registry.
|
||||||
|
8. **Add host-owned resources and administration.** Add or extend `src/common/replicatorResources/` for connection, preferred-tweak, Security Seed, and synchronisation-information probes. Add provider-specific central verification and mutations in `src/common/centralRemoteAdministration.ts` when applicable. Test ownership, snapshots, the distinction between unavailable and absent states, postconditions, and disposal.
|
||||||
|
9. **Integrate setup and user-facing configuration.** Update the relevant setup dialogue files under `src/modules/features/SetupWizard/dialogs/`, including `dialogs/setupDialogTypes.ts`, SetupManager or setup features, remote configuration handling, and message resources under `src/common/messagesYAML` plus generated baked messages where required. Follow the terminology and settings mappings in the repository documentation, and add setup, serialisation, and migration tests.
|
||||||
|
10. **Integrate host operations and triggers.** Adapt only the capability call sites which the provider supports. Check `src/serviceFeatures/replicationScheduling.ts`, `src/serviceFeatures/replication/`, CLI commands under `src/apps/cli/commands`, and application-specific lifecycle composition. Ensure unattended paths use `NO_INTERACTION`, periodic and resume fallback obey capability outcomes, and no caller reaches for `getNewReplicator` or the `LiveSyncBaseCore.replicator` compatibility getter.
|
||||||
|
11. **Validate the package boundary.** In Commonlib, run its focused unit tests, build or pack the exact candidate artefact, and test the downstream LiveSync consumer against that artefact. In this repository, run provider map, configuration-identity, resource, central-administration, scheduling, and replication-feature unit tests. Add a real remote integration test, CLI E2E coverage, or real Obsidian E2E coverage for every boundary the provider claims to support.
|
||||||
|
|
||||||
|
A provider is complete only when its source ownership, replacement fence, capability matrix, setup path, and tests agree. Updating a setting type or adding a class without adding the closed composition definition does not make it a built-in provider.
|
||||||
|
|
||||||
|
## Compatibility seams and non-goals
|
||||||
|
|
||||||
|
- `ReplicatorService.getNewReplicator`, `getActiveReplicator`, and the `LiveSyncBaseCore.replicator` getter remain compatibility seams for existing callers. Beyond `ReplicatorInstance`, `LiveSyncBaseCore.replicator` exposes provider-specific members only as an optional compatibility view. None is a new provider extension point.
|
||||||
|
- `ReplicationService.performReplication` remains a direct legacy path through the active instance. New call sites use `replicateUserInitiated`, `replicateUnattended`, `replicateUnattendedByEvent`, `startContinuous`, or `stopActiveTransfer`, as appropriate.
|
||||||
|
- `LiveSyncAbstractReplicator` and other legacy classes may retain methods needed by existing modules. New features use typed provider capabilities, resource factories, and focused service views; they do not infer capabilities from a large legacy class.
|
||||||
|
- The generic contract does not unify directional Journal operations, Streaming replication, Chunk retrieval, remote-size inspection, garbage collection, repair workflows, or provider-specific administration. Those remain explicit provider or host features.
|
||||||
|
- The provider catalogue is not a public runtime registry, dynamic plug-in API, or settings-driven discovery mechanism. Unknown `RemoteType` values are composition/configuration failures, not third-party providers which the runtime should load.
|
||||||
|
- Commonlib remains an external authoritative package. This repository must not recreate `src/lib`, `_types`, or another source mirror to bypass the package boundary.
|
||||||
|
- P2P logical room retirement does not authorise closing shared raw `RTCPeerConnection` objects. Physical transport ownership remains with Trystero.
|
||||||
|
- No numeric P2P session epoch is exported. Session object identity, admission flags, abort signals, and the owner queue provide the fence; the P2P automation generation and the host scheduling generation protect different concerns.
|
||||||
|
- Suspension is not a database replacement or a successful replication result. It stops or closes the appropriate active work and relies on the next lifecycle event to resume, reconcile, or retire it.
|
||||||
|
|
||||||
|
## Source map
|
||||||
|
|
||||||
|
### This repository
|
||||||
|
|
||||||
|
| Concern | Source and tests |
|
||||||
|
| --- | --- |
|
||||||
|
| Host composition and compatibility boundary | [`LiveSyncBaseCore.ts`](../../src/LiveSyncBaseCore.ts), [`main.ts`](../../src/main.ts), [`src/apps/cli/main.ts`](../../src/apps/cli/main.ts), [`WebAppRuntime.ts`](../../src/apps/webapp/WebAppRuntime.ts), [`WebPeerRuntime.ts`](../../src/apps/webpeer/src/WebPeerRuntime.ts) |
|
||||||
|
| Closed central provider map | [`replicatorProviders.ts`](../../src/common/replicatorProviders.ts), [`replicatorProviders.unit.spec.ts`](../../src/common/replicatorProviders.unit.spec.ts) |
|
||||||
|
| Provider identities and resources | [`replicatorConfigurationIdentity.ts`](../../src/common/replicatorConfigurationIdentity.ts), [`replicatorResources/`](../../src/common/replicatorResources/index.ts), [`replicatorResources.unit.spec.ts`](../../src/common/replicatorResources.unit.spec.ts) |
|
||||||
|
| Central administration and preflight | [`centralRemoteAdministration.ts`](../../src/common/centralRemoteAdministration.ts), [`centralRemoteAdministration.unit.spec.ts`](../../src/common/centralRemoteAdministration.unit.spec.ts), [`replication/preflight.ts`](../../src/serviceFeatures/replication/preflight.ts) |
|
||||||
|
| Host scheduling and replication feature | [`replicationScheduling.ts`](../../src/serviceFeatures/replicationScheduling.ts), [`replicationScheduling.unit.spec.ts`](../../src/serviceFeatures/replicationScheduling.unit.spec.ts), [`replication/index.ts`](../../src/serviceFeatures/replication/index.ts) |
|
||||||
|
| Service graph and bounded local activity | [`ObsidianServices.ts`](../../src/modules/services/ObsidianServices.ts), [`ObsidianServiceHub.ts`](../../src/modules/services/ObsidianServiceHub.ts) |
|
||||||
|
| Architecture guidance | [`devs.md`](../../devs.md), [Service feature and legacy Module boundaries](service_feature_and_legacy_module_boundaries.md), [Project glossary](../glossary.md), [Documentation style and vocabulary conventions](../terms.md), [`docs/settings.md`](../settings.md), [`docs/troubleshooting.md`](../troubleshooting.md) |
|
||||||
|
|
||||||
|
### Commonlib 0.1.21
|
||||||
|
|
||||||
|
The exact package tree described here is [pinned at commit `e770f617ff0fc88f4823226b0ab3aefdff50cc1e`](https://github.com/vrtmrz/livesync-commonlib/tree/e770f617ff0fc88f4823226b0ab3aefdff50cc1e). The source and design-document links below target that commit.
|
||||||
|
|
||||||
|
| Concern | Commonlib source or design document at the pinned commit |
|
||||||
|
| --- | --- |
|
||||||
|
| Provider contract, outcomes, identities, and resource capabilities | [`src/replication/ReplicatorInstance.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/replication/ReplicatorInstance.ts), [`src/replication/ReplicatorProvider.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/replication/ReplicatorProvider.ts), [`src/replication/RemoteResource.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/replication/RemoteResource.ts), [`src/replication/CentralRemoteAdministration.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/replication/CentralRemoteAdministration.ts), [`src/replication/CentralCompatibility.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/replication/CentralCompatibility.ts) |
|
||||||
|
| Active publication and typed operations | [`src/services/base/ReplicatorService.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/services/base/ReplicatorService.ts), [`activeReplicatorState.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/services/base/ReplicatorService.activeReplicatorState.ts), [`typedReplication.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/services/base/ReplicationService.typedReplication.ts), [`readiness.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/services/base/ReplicationService.readiness.ts) |
|
||||||
|
| P2P service, room ownership, and automation | [`P2PService.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/p2p/P2PService.ts), [`P2PRoomSessionOwner.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/replication/trystero/P2PRoomSessionOwner.ts), [`P2PRoomSession.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/replication/trystero/P2PRoomSession.ts), [`useP2PReplicatorFeature.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/replication/trystero/useP2PReplicatorFeature.ts), [`P2PAutomationCoordinator.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/replication/trystero/P2PAutomationCoordinator.ts) |
|
||||||
|
| P2P lifecycle design | [`docs/p2p-transport-lifecycle.md`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/docs/p2p-transport-lifecycle.md) |
|
||||||
|
| Database and service-feature lifecycle | [`docs/database-lifecycle.md`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/docs/database-lifecycle.md), [`docs/service-feature-composition.md`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/docs/service-feature-composition.md), [`docs/settings-lifecycle.md`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/docs/settings-lifecycle.md) |
|
||||||
|
| Journal transfer and remote epoch | [`LiveSyncJournalReplicator.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/replication/journal/LiveSyncJournalReplicator.ts), [`JournalSyncCore.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/replication/journal/JournalSyncCore.ts), [`JournalSyncTypes.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/replication/journal/JournalSyncTypes.ts) |
|
||||||
|
| Journal storage adapter boundary | [`JournalStorageAdapter.ts`](https://github.com/vrtmrz/livesync-commonlib/blob/e770f617ff0fc88f4823226b0ab3aefdff50cc1e/src/replication/journal/objectstore/JournalStorageAdapter.ts) |
|
||||||
|
|
||||||
|
### Decision records
|
||||||
|
|
||||||
|
- [Core provider contract and capabilities ADR](../adr/2026_08_replicator_capabilities_01_core_contract.md)
|
||||||
|
- [P2P service lifecycle ADR](../adr/2026_08_replicator_capabilities_02_p2p_service_lifecycle.md)
|
||||||
|
- [Replicator migration plan ADR](../adr/2026_08_replicator_capabilities_03_migration_plan.md)
|
||||||
|
- [P2P Room and Transport Lifecycle ADR](../adr/2026_07_p2p_transport_lifecycle.md)
|
||||||
|
- [Bounded Remote Activity ADR](../adr/2026_07_bounded_remote_activity.md)
|
||||||
@@ -0,0 +1,384 @@
|
|||||||
|
---
|
||||||
|
date: 2026-09-03
|
||||||
|
commonlib-version: "0.1.21"
|
||||||
|
self-hosted-livesync-version: "1.0.24"
|
||||||
|
status: accepted
|
||||||
|
---
|
||||||
|
|
||||||
|
# Project glossary
|
||||||
|
|
||||||
|
This glossary records stable, project-specific meanings used by Self-hosted
|
||||||
|
LiveSync. Ordinary English and established technology terms retain their usual
|
||||||
|
meanings unless they are defined here. Exact code identifiers, API names, and
|
||||||
|
user-interface labels retain their source spelling.
|
||||||
|
|
||||||
|
The sections describe the intended audience, not a visibility guarantee. A
|
||||||
|
term in the developer and design section can appear in code, tests, logs, or
|
||||||
|
diagnostics. That does not make it user-interface vocabulary or a public
|
||||||
|
extension contract.
|
||||||
|
|
||||||
|
## User-facing and operational terms
|
||||||
|
|
||||||
|
These terms can appear in the user interface, user documentation, setup and
|
||||||
|
recovery guidance, or diagnostics intended for users.
|
||||||
|
|
||||||
|
### A–R
|
||||||
|
|
||||||
|
- **Boot-up sequence (boot sequence):** The initialisation process of the
|
||||||
|
plug-in when Obsidian starts. It begins with loading the plug-in, setting up
|
||||||
|
core services, loading saved settings, and opening the local database. After
|
||||||
|
the layout is ready, the plug-in checks for flag files, runs configuration
|
||||||
|
diagnostics, connects to the remote database, and begins file watching. The
|
||||||
|
sequence finishes when the plug-in is ready and operational.
|
||||||
|
- **Broken files (size mismatch):** A state where a file's Metadata and the
|
||||||
|
content stored in its Chunks do not match, causing file retrieval or
|
||||||
|
synchronisation failures. Inspect these mismatches with **Inspect conflicts
|
||||||
|
and file/database differences** in the Hatch pane, then handle one exact
|
||||||
|
revision at a time.
|
||||||
|
- **Chunk / Chunks:** Divided units of data stored in the database or Object
|
||||||
|
Storage to support efficient synchronisation.
|
||||||
|
- **Compaction:** A database maintenance procedure which discards old
|
||||||
|
historical document revisions to reduce remote database size.
|
||||||
|
- **Continuous replication:** A provider's long-running replication mode. It
|
||||||
|
remains active to exchange changes until stopped and is distinct from a
|
||||||
|
finite OneShot Sync operation.
|
||||||
|
- **Custom HTTP Handler / Use Internal API (CORS bypass settings):** Settings
|
||||||
|
which bypass CORS restrictions by routing requests through Obsidian's native
|
||||||
|
request APIs. There are separate settings for each central remote type:
|
||||||
|
- **S3-compatible Object Storage (`useCustomRequestHandler`):** Labelled
|
||||||
|
**Use Custom HTTP Handler** in the standard settings tab and **Use internal
|
||||||
|
API** in the Svelte Setup Wizard dialogue. It is represented as `useProxy`
|
||||||
|
in Setup URI query parameters for compatibility.
|
||||||
|
- **CouchDB (`useRequestAPI`):** Labelled **Use Request API to avoid
|
||||||
|
inevitable CORS problem** in the standard settings tab and **Use Internal
|
||||||
|
API** in the Svelte Setup Wizard dialogue. It is represented as
|
||||||
|
`useRequestAPI` in Setup URI query parameters.
|
||||||
|
- **Customisation Sync:** The feature which synchronises settings, snippets,
|
||||||
|
themes, and plug-ins. Write 'Customisation' with an 's' in documentation;
|
||||||
|
technical configuration and links can use `customization` where required.
|
||||||
|
- **Database Adapter (IDB and IndexedDB):** The local database storage
|
||||||
|
interface used by PouchDB. The `IDB` adapter is recommended because the older
|
||||||
|
`IndexedDB` adapter is obsolete and can cause memory leaks in LiveSync mode.
|
||||||
|
Switching adapters requires local data migration and an Obsidian restart,
|
||||||
|
but not a full database rebuild.
|
||||||
|
- **Database Suffix (`additionalSuffixOfDatabaseName`):** A suffix appended to
|
||||||
|
the database name so that multiple Vaults with the same name can synchronise
|
||||||
|
to the same remote server.
|
||||||
|
- **E2EE Algorithm:** The cryptographic algorithm version used for end-to-end
|
||||||
|
encryption. All synchronising devices must use a compatible version, such as
|
||||||
|
`V2` or `V1`.
|
||||||
|
- **Eden (Eden Chunks):** A sunset-compatibility optimisation in which newly
|
||||||
|
created Chunks are held inside the document until they stabilise, before
|
||||||
|
becoming independent Chunks.
|
||||||
|
- **Fast Setup (Simple Fetch):** The preferred automated initial
|
||||||
|
synchronisation flow for a secondary device. It uses Streaming replication
|
||||||
|
for the initial download and delays local file reflection to avoid temporary
|
||||||
|
synchronisation warnings.
|
||||||
|
- **Fast Fetch:** The CouchDB-specific Streaming replication path used by Fast
|
||||||
|
Setup. It reads the changes feed in bounded pages and persists a checkpoint
|
||||||
|
so an interrupted transfer can resume. An ineligible transport uses the
|
||||||
|
ordinary fetch path instead.
|
||||||
|
- **Flag files (`redflag.md`, `redflag2.md`, and `redflag3.md`):** Special
|
||||||
|
Markdown files or directories at the Vault root which stop the boot-up
|
||||||
|
sequence or trigger recovery work. `redflag.md` suspends all processes,
|
||||||
|
`redflag2.md` (`flag_rebuild.md`) triggers a full database rebuild, and
|
||||||
|
`redflag3.md` (`flag_fetch.md`) discards and fetches the local database again.
|
||||||
|
- **Garbage Collection (GC):** The maintenance process which identifies Chunk
|
||||||
|
documents not reachable from a current file or conflict branch, records
|
||||||
|
logical deletions for them, propagates those deletions, and requests remote
|
||||||
|
compaction to reclaim storage.
|
||||||
|
- **Hatch (Hatch pane):** The troubleshooting and maintenance section in the
|
||||||
|
plug-in settings. It contains diagnostics, database reset controls, status
|
||||||
|
reports, and advanced edge-case settings.
|
||||||
|
- **Hidden File Sync:** The feature which synchronises files in hidden
|
||||||
|
directories, such as `.obsidian`.
|
||||||
|
- **JWT Authentication:** An experimental CouchDB authentication option which
|
||||||
|
uses a JSON Web Token instead of standard credentials. It requires a private
|
||||||
|
key or secret, algorithm, expiry duration, subject, and key ID.
|
||||||
|
- **LiveSync:** This name has two established meanings: the shortened plug-in
|
||||||
|
name for Self-hosted LiveSync, and the Sync Mode for continuous, real-time
|
||||||
|
synchronisation. Prefer 'Continuous replication' in design documentation
|
||||||
|
when the mode, rather than the product, is meant.
|
||||||
|
- **livesync-serverpeer / WebPeer:** Specialised clients which assist WebRTC
|
||||||
|
peer-to-peer communication.
|
||||||
|
- **Metadata (file metadata):** A database document which stores file
|
||||||
|
properties, including its name, path, size, modification time, and references
|
||||||
|
to the Chunks containing its content. PouchDB or CouchDB revision metadata
|
||||||
|
carries conflict state; the file Metadata document has no separate history
|
||||||
|
field. Metadata and file content are stored separately.
|
||||||
|
- **OneShot Sync (OneShot replication):** One finite bidirectional
|
||||||
|
synchronisation operation, normally pull then push, which is requested
|
||||||
|
directly or by an event. It is distinct from Continuous replication.
|
||||||
|
- **Overwrite Server Data with This Device's Files:** A maintenance operation,
|
||||||
|
formerly named `Rebuild everything`, which discards the remote database and
|
||||||
|
rebuilds the local and remote databases from the current files on one
|
||||||
|
authoritative device.
|
||||||
|
- **Path Obfuscation:** A privacy option which encrypts file paths and folder
|
||||||
|
names on the remote server.
|
||||||
|
- **plug-in:** The spelling used in user-facing messages and general prose.
|
||||||
|
Retain `plugin` in code, configuration, and established technical names.
|
||||||
|
- **Remediation (`maxMTimeForReflectEvents`):** A recovery setting which limits
|
||||||
|
reflection of changes from the database to the Vault by ignoring file events
|
||||||
|
after a specified date and time.
|
||||||
|
- **Reset Synchronisation on This Device:** A maintenance operation, formerly
|
||||||
|
named `Fetch everything`, which discards the local database and rebuilds it
|
||||||
|
from the remote database.
|
||||||
|
|
||||||
|
### Revision
|
||||||
|
|
||||||
|
A revision is a version of one PouchDB or CouchDB document. Concurrent changes
|
||||||
|
can form a revision tree with more than one current branch.
|
||||||
|
|
||||||
|
Revision modifiers describe independent properties. More than one can apply to
|
||||||
|
the same revision:
|
||||||
|
|
||||||
|
- **leaf:** Has no known child revision.
|
||||||
|
- **winner:** Is the leaf selected by PouchDB or CouchDB as the current
|
||||||
|
document.
|
||||||
|
- **conflict:** Is another current leaf which was not selected as the winner.
|
||||||
|
- **Vault-matching:** Represents the same file content, or the same absent-file
|
||||||
|
state, as the current Vault. More than one revision can match.
|
||||||
|
- **displayed:** Is recorded by valid device-local file provenance as the
|
||||||
|
branch represented in the Vault. A pending local edit might no longer match
|
||||||
|
its bytes, but still extends this recorded branch.
|
||||||
|
- **logically deleted:** Represents absence of the file through a deletion
|
||||||
|
marker. A logically deleted revision can also be a leaf, winner, conflict,
|
||||||
|
or Vault-matching revision. An absent file retains no displayed provenance.
|
||||||
|
|
||||||
|
Avoid 'live revision' because it can mean either a current leaf or a
|
||||||
|
non-deleted revision. See
|
||||||
|
[Independent revision properties](specs_conflict_resolution.md#independent-revision-properties)
|
||||||
|
for the relationship between revision-tree roles, Vault state, and
|
||||||
|
device-local provenance.
|
||||||
|
|
||||||
|
### S–Z
|
||||||
|
|
||||||
|
- **Scram (Scram Switches):** Emergency controls which suspend file watching or
|
||||||
|
database reflection to reduce the risk of corruption or unintended changes.
|
||||||
|
- **Security Seed:** The remote PBKDF2 salt used to derive the encryption key
|
||||||
|
for replication. It must be read from, or established on, the remote before
|
||||||
|
encrypted synchronisation.
|
||||||
|
- **Segmenter (Segmented-splitter):** A chunking method which divides files at
|
||||||
|
semantic boundaries, such as paragraphs or sections, rather than arbitrary
|
||||||
|
byte boundaries.
|
||||||
|
- **Self-hosted LiveSync:** The name of this plug-in. 'Self-hosted' is one
|
||||||
|
hyphenated word.
|
||||||
|
- **Setting Doctor (Config Doctor):** A diagnostic utility which identifies
|
||||||
|
configuration mismatches or suboptimal settings and presents recommended
|
||||||
|
values and reasons.
|
||||||
|
- **Setup URI:** An encrypted representation of plug-in settings and remote
|
||||||
|
configuration which can be transferred to another device and opened with a
|
||||||
|
passphrase.
|
||||||
|
- **Signalling relay (P2P):** A Nostr-compatible WebSocket relay used for peer
|
||||||
|
discovery and WebRTC connection negotiation. It does not store or transfer
|
||||||
|
Vault content. The project author operates a public relay as a best-effort
|
||||||
|
convenience, and users can supply another compatible relay.
|
||||||
|
- **Streaming replication (stream-based replication):** A transfer method
|
||||||
|
which downloads database documents as a continuous stream of events. Fast
|
||||||
|
Setup uses it to retrieve remote Metadata efficiently.
|
||||||
|
- **Sync Mode:** The trigger mechanism for synchronisation. Current modes are
|
||||||
|
**LiveSync**, for continuous replication, **Periodic Sync**, for work at a
|
||||||
|
configured interval, and **On Events**, for configured application events.
|
||||||
|
- **Synchronising devices:** Devices which participate in the same
|
||||||
|
synchronisation for a Vault. The term describes membership rather than
|
||||||
|
current activity, so it includes offline and idle devices.
|
||||||
|
- **TURN Server (WebRTC P2P):** A Traversal Using Relays around NAT server used
|
||||||
|
as an optional fallback when NAT or firewall rules prevent a direct WebRTC
|
||||||
|
connection. It relays encrypted WebRTC traffic and is distinct from the
|
||||||
|
signalling relay.
|
||||||
|
- **Update Thinning (Batch database update):** An optimisation which groups
|
||||||
|
local file edits over a short delay before committing them to the local
|
||||||
|
database, reducing database writes.
|
||||||
|
- **WebRTC P2P (peer-to-peer):** A synchronisation method which allows devices
|
||||||
|
to communicate directly without a central remote database.
|
||||||
|
|
||||||
|
## Developer and design terms
|
||||||
|
|
||||||
|
These definitions are stable vocabulary for architecture documents, ADRs,
|
||||||
|
implementation, tests, and code review. They might never appear in the user
|
||||||
|
interface. Inclusion here fixes their project meaning; it does not make the
|
||||||
|
named surface a public API or extension point.
|
||||||
|
|
||||||
|
### Active publication
|
||||||
|
|
||||||
|
The atomic publication of one Replicator provider, its `ReplicatorInstance`,
|
||||||
|
and its configuration identity, owned by Commonlib's `ReplicatorService`. Its
|
||||||
|
object identity is the admission fence for operations. An active publication
|
||||||
|
is also called the active Replicator publication, and its instance is the
|
||||||
|
**active Replicator**. 'Active publication' is more precise than 'current
|
||||||
|
Replicator' when admission or retirement matters.
|
||||||
|
|
||||||
|
### Adjunct P2P transport
|
||||||
|
|
||||||
|
P2P operating as an additional transport while CouchDB or Object Storage is
|
||||||
|
the selected main remote. It retains its own service and room-session
|
||||||
|
ownership; it is not the active Replicator for the main remote. Architecture
|
||||||
|
documents can shorten this to 'adjunct P2P' where the distinction is already
|
||||||
|
clear.
|
||||||
|
|
||||||
|
### Admission and reservation
|
||||||
|
|
||||||
|
**Admission** is permission for an operation to use one exact active
|
||||||
|
publication or P2P room session. A **reservation** records admitted work and
|
||||||
|
keeps its owner alive until that work settles. Retirement closes admission
|
||||||
|
before it waits for existing reservations, so later work cannot enter the
|
||||||
|
retiring generation.
|
||||||
|
|
||||||
|
### Bounded remote activity
|
||||||
|
|
||||||
|
A finite logical operation which can involve remote work, waiting, queueing, or
|
||||||
|
local result handling. Its lifetime is broader than an individual network
|
||||||
|
request. Continuous replication is not bounded remote activity. See the
|
||||||
|
[Bounded Remote Activity ADR](adr/2026_07_bounded_remote_activity.md).
|
||||||
|
|
||||||
|
### Capability
|
||||||
|
|
||||||
|
A typed declaration that a Replicator provider supports an operation or remote
|
||||||
|
resource, does not implement it, or considers it inapplicable. Capability
|
||||||
|
support is explicit; callers do not infer it from a legacy method, a Boolean
|
||||||
|
default, or a neutral return value.
|
||||||
|
|
||||||
|
### Central remote
|
||||||
|
|
||||||
|
A CouchDB or Object Storage remote which can require central preparation and
|
||||||
|
administration before replication. P2P is not a central remote. The **main
|
||||||
|
remote** is the `RemoteType` selected for the active Replicator; P2P can also
|
||||||
|
operate as an additional transport when a central remote is selected.
|
||||||
|
|
||||||
|
### Configuration identity
|
||||||
|
|
||||||
|
An opaque projection of the effective settings which determine whether an
|
||||||
|
existing provider instance or P2P binding can be retained. It can contain
|
||||||
|
credentials. Code can compare an identity for equality, but must not inspect,
|
||||||
|
log, persist, or display it.
|
||||||
|
|
||||||
|
### Fence, generation, and epoch
|
||||||
|
|
||||||
|
A **fence** prevents stale work or work admitted by one owner from affecting a
|
||||||
|
replacement owner or state. A **generation** normally changes when one local
|
||||||
|
lifecycle is invalidated. An **epoch** identifies one session or data history
|
||||||
|
where the owning contract uses that term. These values belong to distinct state
|
||||||
|
machines and are not interchangeable or evidence that another owner is
|
||||||
|
current.
|
||||||
|
|
||||||
|
### Focused view
|
||||||
|
|
||||||
|
A narrow interface exposing only the operations required by a consumer. It
|
||||||
|
delegates to a stable owner and does not independently own the underlying
|
||||||
|
mutable state or resource.
|
||||||
|
|
||||||
|
### Interaction authority
|
||||||
|
|
||||||
|
The explicit upper bound on user interaction permitted during an operation.
|
||||||
|
User-initiated work can receive selected permissions; unattended work carries
|
||||||
|
`NO_INTERACTION` and cannot open a dialogue, request peer selection, or obtain
|
||||||
|
authority through a fallback path.
|
||||||
|
|
||||||
|
### Journal remote epoch
|
||||||
|
|
||||||
|
The `protocolVersion:pbkdf2salt` value stored as
|
||||||
|
`CheckPointInfo.journalEpoch`. It identifies Journal checkpoint and
|
||||||
|
deduplication-cache history. It is data-history state, not a cancellation,
|
||||||
|
Replicator retirement, or operation-admission fence.
|
||||||
|
|
||||||
|
### Non-owning adapter
|
||||||
|
|
||||||
|
An adapter which implements a contract by delegating to another component
|
||||||
|
without owning the delegated resource. Closing it releases only resources
|
||||||
|
which the adapter itself owns. In particular, closing the active P2P adapter
|
||||||
|
does not close the stable P2P service or its room session.
|
||||||
|
|
||||||
|
### Owner and ownership
|
||||||
|
|
||||||
|
The **owner** is the single component responsible for creating, replacing,
|
||||||
|
stopping, and disposing a resource or stateful lifecycle. A borrower, adapter,
|
||||||
|
or focused view can use that resource only within its declared boundary and
|
||||||
|
must not perform the owner's lifecycle operations.
|
||||||
|
|
||||||
|
### P2P service, room session, and demand
|
||||||
|
|
||||||
|
The **P2P service** is the stable Commonlib owner which supplies focused views
|
||||||
|
and owns replaceable room sessions. A **P2P room session** is one active room
|
||||||
|
membership and the resources whose validity depends on it. **Demand** is one
|
||||||
|
persistent or finite reason for the owner to retain a room. Releasing one
|
||||||
|
demand does not close a room retained by another. A room's effective binding
|
||||||
|
includes the settings, local database object, and device identity which make
|
||||||
|
that session valid. A **session epoch** is the internal identity and fence of
|
||||||
|
one room-session object, not a persisted room name or a public numeric counter.
|
||||||
|
An **automation baseline** records peers for which the initial transfer
|
||||||
|
completed in the current logical automation lifecycle; it is owned
|
||||||
|
independently of a replaceable room session. A **configured target** is a
|
||||||
|
persisted peer name selected for unattended `P2P_SyncOnReplication`; the
|
||||||
|
request can wait for its advertisement, but cannot prompt for peer selection.
|
||||||
|
|
||||||
|
### Publication retirement
|
||||||
|
|
||||||
|
The lifecycle transition which removes an active publication from current
|
||||||
|
admission, asks its provider to stop transfer work, drains reservations for
|
||||||
|
that exact publication, closes the old instance, and marks retirement
|
||||||
|
complete. **Quiescing** is the state after admission has closed and before
|
||||||
|
retirement completes. A replacement cannot be published across an incomplete
|
||||||
|
retirement fence. A **candidate** is a newly constructed instance which remains
|
||||||
|
private until initialisation and freshness checks permit atomic publication.
|
||||||
|
|
||||||
|
### Remote resource and probe
|
||||||
|
|
||||||
|
A **remote resource** is a provider-declared, caller-owned object created from
|
||||||
|
one effective-settings snapshot for a bounded task. A **probe** is a bounded,
|
||||||
|
flow-specific validation or observation for connection, compatibility, setup,
|
||||||
|
or diagnostics. It can use an owned remote resource or an owner-arbitrated P2P
|
||||||
|
trial. It does not publish or replace the active Replicator, and the caller
|
||||||
|
disposes every resource which it owns.
|
||||||
|
|
||||||
|
### Replicator
|
||||||
|
|
||||||
|
The project abstraction which performs replication for one configured remote
|
||||||
|
kind and implements the `ReplicatorInstance` lifecycle contract. Use
|
||||||
|
'replication' for the process and 'Replicator' for this runtime abstraction. A
|
||||||
|
Replicator can be an owning transport implementation or a non-owning adapter;
|
||||||
|
the provider contract determines the boundary.
|
||||||
|
|
||||||
|
### Replicator provider definition
|
||||||
|
|
||||||
|
The exhaustive, host-composed declaration for one `RemoteType`: its
|
||||||
|
configuration identity, Replicator factory, readiness requirement,
|
||||||
|
capabilities, remote-resource factories, operation runners, and optional
|
||||||
|
central administration. The readiness requirement declares which layer must
|
||||||
|
establish operation preconditions. The provider catalogue is **closed
|
||||||
|
composition**, not a runtime registry: adding a provider requires changing,
|
||||||
|
shipping, and testing the owning composition. A **built-in provider** is one
|
||||||
|
included in that shipped catalogue. Architecture prose can shorten 'Replicator
|
||||||
|
provider definition' to 'provider'; it does not mean only the transport
|
||||||
|
instance.
|
||||||
|
|
||||||
|
### Replication outcome
|
||||||
|
|
||||||
|
The typed settlement of an attempted replication operation, represented by
|
||||||
|
`ReplicationOutcome`. Completed, partial, blocked, cancelled, and failed states
|
||||||
|
remain explicit; `undefined`, an empty value, or a compatibility default is not
|
||||||
|
treated as successful work.
|
||||||
|
|
||||||
|
### Service composition terms
|
||||||
|
|
||||||
|
- A **Service Hub** is the long-lived registry of service contracts for one
|
||||||
|
application composition.
|
||||||
|
- A **Service** owns a stable shared capability and its lifecycle.
|
||||||
|
- A **ServiceModule** is a host-created, long-lived stateful or resource-owning
|
||||||
|
capability shared through the typed `ServiceModules` record.
|
||||||
|
- A **serviceFeature** is a typed composition function which accepts declared
|
||||||
|
Services and ServiceModules, registers host integration, and can return a
|
||||||
|
focused view. It is not a runtime registry entry.
|
||||||
|
- A **legacy Module** is an existing application structure retained for
|
||||||
|
compatibility. New behaviour does not acquire the complete core merely to
|
||||||
|
imitate that locator pattern.
|
||||||
|
|
||||||
|
See [Service feature and legacy Module boundaries](design_docs/service_feature_and_legacy_module_boundaries.md)
|
||||||
|
for the selection and composition rules.
|
||||||
|
|
||||||
|
### Suspension
|
||||||
|
|
||||||
|
A reversible lifecycle action which stops active transfer work without
|
||||||
|
retiring the active Replicator publication. The P2P service also closes its
|
||||||
|
current room session during application suspension because that session has a
|
||||||
|
separate owner and lifecycle. Resumption can retain the Replicator instance and
|
||||||
|
open a new P2P room as required.
|
||||||
@@ -20,7 +20,7 @@ Resolving a conflict writes the selected or merged result on one observed branch
|
|||||||
|
|
||||||
### Independent revision properties
|
### Independent revision properties
|
||||||
|
|
||||||
The modifiers defined under [Revision](terms.md#revision) describe independent properties, rather than exclusive revision types. The winner is a database-tree role, Vault-matching describes current file-state equality, and displayed identifies the device-local branch recorded for the Vault. The same revision commonly has all three properties, but synchronisation, conflicts, local edits, and missing provenance can separate them.
|
The modifiers defined under [Revision](glossary.md#revision) describe independent properties, rather than exclusive revision types. The winner is a database-tree role, Vault-matching describes current file-state equality, and displayed identifies the device-local branch recorded for the Vault. The same revision commonly has all three properties, but synchronisation, conflicts, local edits, and missing provenance can separate them.
|
||||||
|
|
||||||
| Situation | Winner | Vault-matching | Displayed |
|
| Situation | Winner | Vault-matching | Displayed |
|
||||||
| ---------------------------------------------------- | ------------------ | --------------------------------------------------- | ---------------------------------------------------- |
|
| ---------------------------------------------------- | ------------------ | --------------------------------------------------- | ---------------------------------------------------- |
|
||||||
|
|||||||
+16
-1
@@ -11,6 +11,21 @@
|
|||||||
|
|
||||||
Note: The figure is drawn as single-directional, between two devices for demonstration purposes. Everything actually occurs bi-directionally between many devices at the same time.
|
Note: The figure is drawn as single-directional, between two devices for demonstration purposes. Everything actually occurs bi-directionally between many devices at the same time.
|
||||||
|
|
||||||
|
## Current technical references
|
||||||
|
|
||||||
|
- [Database Data Structures](datastructure.md) describes current Metadata and
|
||||||
|
Chunk shapes, identifier handling, deletion, and raw remote representations.
|
||||||
|
- [Replicator architecture](design_docs/replicator_architecture.md) describes
|
||||||
|
provider composition, active Replicator publication, retirement, and P2P
|
||||||
|
ownership.
|
||||||
|
- [Conflict resolution and revision provenance](specs_conflict_resolution.md)
|
||||||
|
defines the current revision-tree and file-provenance rules.
|
||||||
|
- [Chunk Retrieval and Waiting](design_docs/chunk_retrieval_and_waiting.md)
|
||||||
|
defines missing-Chunk arrival and quiescence handling.
|
||||||
|
- [Data Compression](specs_data_compression.md) and [Garbage Collection
|
||||||
|
V3](specs_garbage_collection.md) describe their respective storage and
|
||||||
|
maintenance contracts.
|
||||||
|
|
||||||
## Techniques to keep bandwidth consumption low.
|
## Techniques to keep bandwidth consumption low.
|
||||||
|
|
||||||

|

|
||||||
|
|||||||
+9
-94
@@ -1,3 +1,10 @@
|
|||||||
|
---
|
||||||
|
date: 2026-09-03
|
||||||
|
commonlib-version: "0.1.21"
|
||||||
|
self-hosted-livesync-version: "1.0.24"
|
||||||
|
status: accepted
|
||||||
|
---
|
||||||
|
|
||||||
# Notes on Terminology, Spelling, Vocabulary Conventions
|
# Notes on Terminology, Spelling, Vocabulary Conventions
|
||||||
|
|
||||||
## Spelling and Vocabulary conventions
|
## Spelling and Vocabulary conventions
|
||||||
@@ -24,97 +31,5 @@ All guidelines and conventions listed below are disclosed and maintained solely
|
|||||||
|
|
||||||
### Terminology
|
### Terminology
|
||||||
|
|
||||||
- Boot-up sequence (boot-sequence)
|
Project-specific meanings are defined separately in the
|
||||||
- The initialisation process of the plug-in when Obsidian starts. It starts with the loading of the plug-in, setting up core services, loading saved settings, and opening the local database. Once the layout is ready, the plug-in checks for the presence of flag files, runs configuration diagnostics, connects to the remote database, and begins file watching. The sequence finishes once the plug-in is fully ready and operational.
|
[Project glossary](glossary.md).
|
||||||
- Broken files (Size mismatch)
|
|
||||||
- A state where a file's metadata and the actual content stored in its chunks do not match, causing file retrieval or synchronisation failures. These mismatches can be inspected with `Inspect conflicts and file/database differences` on the Hatch pane, then handled one exact revision at a time.
|
|
||||||
- Chunk / Chunks
|
|
||||||
- Divided units of data stored in the database or object storage to facilitate efficient synchronisation.
|
|
||||||
- Compaction
|
|
||||||
- A database maintenance procedure that discards old historical document revisions to shrink the remote database size.
|
|
||||||
- Custom HTTP Handler / Use Internal API (CORS Bypass Settings)
|
|
||||||
- Settings used to bypass CORS restrictions by routing requests through Obsidian's native request APIs. There are two distinct settings under the hood depending on the remote server type:
|
|
||||||
- **For S3-compatible Object Storage (useCustomRequestHandler)**: Labeled as **"Use Custom HTTP Handler"** in the standard settings tab, **"Use internal API"** in the Svelte-based Setup Wizard dialogue, and represented as `useProxy` in the Setup URI's query parameters due to an unfortunate misunderstanding during development.
|
|
||||||
- **For CouchDB (useRequestAPI)**: Labeled as **"Use Request API to avoid `inevitable` CORS problem"** in the standard settings tab, **"Use Internal API"** in the Svelte-based Setup Wizard dialogue, and represented as `useRequestAPI` in the Setup URI's query parameters.
|
|
||||||
- Customisation Sync
|
|
||||||
- The feature that synchronises settings, snippets, themes, and plug-ins. Write with an "s" in documentation (`Customisation`), though technical configurations and links may use `customization`.
|
|
||||||
- Database Adapter (IDB vs. IndexedDB)
|
|
||||||
- The local database storage interface used by PouchDB. The `IDB` adapter is recommended since the older `IndexedDB` adapter is obsolete and known to cause memory leaks in `LiveSync` mode. Users can switch between these adapters without a full database rebuild, although a local data migration and an Obsidian restart are required.
|
|
||||||
- Database Suffix (additionalSuffixOfDatabaseName)
|
|
||||||
- A unique suffix appended to the database name to allow synchronising multiple vaults with the same name on the same remote server.
|
|
||||||
- E2EE Algorithm
|
|
||||||
- The cryptographic algorithm version used for end-to-end encryption. All synchronising devices must be configured with a compatible version (such as `V2` or `V1`).
|
|
||||||
- Eden (Eden Chunks)
|
|
||||||
- A performance optimisation where newly created chunks are held within the document until they stabilise, before graduating to independent chunks.
|
|
||||||
- Fast Setup (Simple Fetch)
|
|
||||||
- A simplified, automated initial synchronisation flow triggered when setting up subsequent devices or recovering a database. It bypasses the detailed step-by-step setup wizard dialogues, prompting the user with high-level data processing decisions and completing the initial download and local file scan in one continuous process.
|
|
||||||
- Flag files (redflag.md, redflag2.md, redflag3.md)
|
|
||||||
- Special Markdown files (or directories) placed at the root of the vault to stop the boot-up sequence or trigger recovery tasks. For instance, `redflag.md` suspends all processes, while `redflag2.md` (`flag_rebuild.md`) triggers a full database rebuild and `redflag3.md` (`flag_fetch.md`) discards the local database to fetch it again from the remote.
|
|
||||||
- Garbage Collection (GC)
|
|
||||||
- The process of identifying and purging unreferenced chunks (unused data) from local and remote databases to reclaim storage space.
|
|
||||||
- Hatch (Hatch pane)
|
|
||||||
- A dedicated troubleshooting and maintenance section in the plug-in settings, typically hidden behind a warning-labeled collapsible panel to prevent accidental misconfiguration. It contains diagnostic utilities, database reset controls, status reports, and advanced edge-case patches.
|
|
||||||
- Hidden File Sync
|
|
||||||
- The feature that synchronises files located in hidden directories (like `.obsidian`).
|
|
||||||
- JWT Authentication
|
|
||||||
- An experimental authentication option for CouchDB allowing secure token-based authentication instead of standard credentials. It requires a configured private key/secret, algorithm, expiration duration, subject, and key ID.
|
|
||||||
- LiveSync
|
|
||||||
- A very confusing term.
|
|
||||||
- As a shortened form of `Self-hosted LiveSync`.
|
|
||||||
- As the name of a synchronisation mode. This should be changed to `Continuous`, in contrast to `Periodic`.
|
|
||||||
- livesync-serverpeer / webpeer
|
|
||||||
- Pseudo-clients that assist in WebRTC peer-to-peer communication.
|
|
||||||
- Metadata (File metadata)
|
|
||||||
- A database document that stores properties of a file, including its filename, path, size, modification time, and references (hashes) of the chunks that comprise the file's content. Conflict state is carried by the surrounding PouchDB/CouchDB revision metadata rather than by a separate history field inside the file metadata document. In Self-hosted LiveSync, file metadata is stored separately from the actual file content to enable efficient synchronisation and versioning.
|
|
||||||
- OneShot Sync
|
|
||||||
- A single, immediate bidirectional synchronisation (pull then push) triggered on demand or on specific events, as opposed to continuous (live) replication.
|
|
||||||
- Overwrite Server Data with This Device's Files
|
|
||||||
- A maintenance operation (formerly known as `Rebuild everything`) that discards the remote database and reconstructs it by uploading all current local files as a fresh database, overwriting any remote changes.
|
|
||||||
- Path Obfuscation
|
|
||||||
- A privacy option that encrypts file paths and folder names on the remote server.
|
|
||||||
- plug-in
|
|
||||||
- We use the hyphenated form `plug-in` in user-facing messages and general documentation, while `plugin` may appear in codebase files, configuration settings, or technical contexts.
|
|
||||||
- Signalling relay (P2P)
|
|
||||||
- A Nostr-compatible WebSocket relay used for peer discovery and WebRTC connection negotiation. It does not store or transfer Vault contents. The project author operates a public relay as a best-effort convenience, and users can provide another compatible relay.
|
|
||||||
- Remediation (maxMTimeForReflectEvents)
|
|
||||||
- A recovery setting that restricts the propagation of changes from the database to local storage, ignoring any file events (such as accidental mass deletions) that occurred after a specified date and time.
|
|
||||||
- Reset Synchronisation on This Device
|
|
||||||
- A maintenance operation (formerly known as `Fetch everything`) that discards the local database and reconstructs it by downloading all data from the remote server.
|
|
||||||
|
|
||||||
#### Revision
|
|
||||||
|
|
||||||
A revision is a version of one PouchDB/CouchDB document. Concurrent changes can form a revision tree with more than one current branch.
|
|
||||||
|
|
||||||
Revision modifiers describe independent properties. More than one may apply to the same revision:
|
|
||||||
|
|
||||||
- **leaf**: Has no known child revision.
|
|
||||||
- **winner**: Is the leaf selected by PouchDB/CouchDB as the current document.
|
|
||||||
- **conflict**: Is another current leaf which was not selected as the winner.
|
|
||||||
- **Vault-matching**: Represents the same file contents, or the same absent-file state, as the current Vault. More than one revision may match.
|
|
||||||
- **displayed**: Is recorded by valid device-local file provenance as the branch represented in the Vault. A pending local edit may no longer match its bytes, but still extends this recorded branch.
|
|
||||||
- **logically deleted**: Represents the absence of the file through a deletion marker. A logically deleted revision may also be a leaf, winner, conflict, or Vault-matching revision. An absent file retains no displayed provenance.
|
|
||||||
|
|
||||||
Avoid **live revision** in prose because it can ambiguously mean either a current leaf or a non-deleted revision. See [Independent revision properties](specs_conflict_resolution.md#independent-revision-properties) for the relationship between revision-tree roles, Vault state, and device-local provenance.
|
|
||||||
|
|
||||||
- Scram (Scram Switches)
|
|
||||||
- Emergency controls in the settings that allow users to suspend file watching or database writes to prevent corruption.
|
|
||||||
- Segmenter (Segmented-splitter)
|
|
||||||
- A chunking method that divides files on semantic boundaries (such as paragraphs or sections) rather than arbitrary byte boundaries.
|
|
||||||
- Self-hosted LiveSync
|
|
||||||
- The name of this plug-in. `Self-hosted` is one word.
|
|
||||||
- Setting Doctor (Config Doctor)
|
|
||||||
- A diagnostic utility that checks for mismatches or suboptimal configurations, presenting users with ideal values and recommendation reasons to easily resolve issues during migration, configuration import, or general troubleshooting.
|
|
||||||
- Setup URI
|
|
||||||
- An encrypted representation of the plug-in's settings containing server configuration, which allows users to clone their configuration across devices securely using a passphrase.
|
|
||||||
- Streaming replication (Stream-based replication)
|
|
||||||
- A data transfer method that downloads database documents as a continuous stream of events. It is significantly faster than traditional chunk-by-chunk HTTP requests and is used during Fast Setup to retrieve remote metadata quickly.
|
|
||||||
- Sync Mode
|
|
||||||
- The replication trigger mechanism. Users can select from `On Events` (synchronising on local file changes), `Periodic and Events` (synchronising at fixed intervals as well as on events), or `LiveSync` (continuous, real-time synchronisation).
|
|
||||||
- Synchronising devices
|
|
||||||
- Devices which participate in the same synchronisation for a Vault. The term describes membership rather than current activity, so it includes offline and idle devices.
|
|
||||||
- TURN Server (WebRTC P2P)
|
|
||||||
- A Traversal Using Relays around NAT server used as an optional fallback to relay encrypted WebRTC traffic when strict NAT or firewall rules block a direct peer connection. It is distinct from the signalling relay.
|
|
||||||
- Update Thinning (Batch database update)
|
|
||||||
- An optimisation that groups multiple local file edits together over a short delay before committing them to the local database, reducing the number of database write operations.
|
|
||||||
- WebRTC P2P (Peer-to-Peer)
|
|
||||||
- A synchronisation method enabling direct communication between devices without a central server database.
|
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"id": "obsidian-livesync",
|
"id": "obsidian-livesync",
|
||||||
"name": "Self-hosted LiveSync",
|
"name": "Self-hosted LiveSync",
|
||||||
"version": "1.0.23",
|
"version": "1.0.24",
|
||||||
"minAppVersion": "1.7.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.",
|
"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",
|
"author": "vorotamoroz",
|
||||||
|
|||||||
Generated
+5
-5
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "obsidian-livesync",
|
"name": "obsidian-livesync",
|
||||||
"version": "1.0.23",
|
"version": "1.0.24",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "obsidian-livesync",
|
"name": "obsidian-livesync",
|
||||||
"version": "1.0.23",
|
"version": "1.0.24",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"workspaces": [
|
"workspaces": [
|
||||||
"src/apps/cli",
|
"src/apps/cli",
|
||||||
@@ -12937,7 +12937,7 @@
|
|||||||
},
|
},
|
||||||
"src/apps/cli": {
|
"src/apps/cli": {
|
||||||
"name": "self-hosted-livesync-cli",
|
"name": "self-hosted-livesync-cli",
|
||||||
"version": "1.0.23-cli",
|
"version": "1.0.24-cli",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"chokidar": "^4.0.0",
|
"chokidar": "^4.0.0",
|
||||||
"minimatch": "^10.2.5",
|
"minimatch": "^10.2.5",
|
||||||
@@ -12962,7 +12962,7 @@
|
|||||||
},
|
},
|
||||||
"src/apps/webapp": {
|
"src/apps/webapp": {
|
||||||
"name": "livesync-webapp",
|
"name": "livesync-webapp",
|
||||||
"version": "1.0.23-webapp",
|
"version": "1.0.24-webapp",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"octagonal-wheels": "^0.1.53"
|
"octagonal-wheels": "^0.1.53"
|
||||||
},
|
},
|
||||||
@@ -12974,7 +12974,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"src/apps/webpeer": {
|
"src/apps/webpeer": {
|
||||||
"version": "1.0.23-webpeer",
|
"version": "1.0.24-webpeer",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"octagonal-wheels": "^0.1.53"
|
"octagonal-wheels": "^0.1.53"
|
||||||
},
|
},
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "obsidian-livesync",
|
"name": "obsidian-livesync",
|
||||||
"version": "1.0.23",
|
"version": "1.0.24",
|
||||||
"description": "Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
|
"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",
|
"main": "main.js",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
|
|||||||
+44
-32
@@ -48,7 +48,7 @@ CLI Main
|
|||||||
- Settings management (JSON file)
|
- Settings management (JSON file)
|
||||||
- Graceful shutdown handling
|
- Graceful shutdown handling
|
||||||
|
|
||||||
## Usage
|
## Command overview
|
||||||
|
|
||||||
The CLI operates on a **database directory** which contains PouchDB data and settings.
|
The CLI operates on a **database directory** which contains PouchDB data and settings.
|
||||||
|
|
||||||
@@ -151,6 +151,46 @@ npm run cli -- [database-path] [command] [args...]
|
|||||||
node src/apps/cli/dist/index.cjs [database-path] [command] [args...]
|
node src/apps/cli/dist/index.cjs [database-path] [command] [args...]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### systemd installation
|
||||||
|
|
||||||
|
The `deploy/` directory contains a systemd unit template and an install script.
|
||||||
|
|
||||||
|
**Automated installation (user service, recommended):**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bash src/apps/cli/deploy/install.sh --vault /path/to/vault
|
||||||
|
```
|
||||||
|
|
||||||
|
**With a polling interval:**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bash src/apps/cli/deploy/install.sh --vault /path/to/vault --interval 60
|
||||||
|
```
|
||||||
|
|
||||||
|
**System-wide installation** (requires root or `sudo` for `/etc/systemd/system/`):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bash src/apps/cli/deploy/install.sh --system --vault /path/to/vault
|
||||||
|
```
|
||||||
|
|
||||||
|
The script:
|
||||||
|
|
||||||
|
1. Installs the repository dependencies and builds the CLI.
|
||||||
|
2. Installs the complete CLI bundle and its production dependencies under `~/.local/lib/livesync-cli` (user) or `/usr/local/lib/livesync-cli` (system), then checks that the installed CLI can start.
|
||||||
|
3. Installs the command wrapper as `~/.local/bin/livesync-cli` (user) or `/usr/local/bin/livesync-cli` (system).
|
||||||
|
4. Writes the unit file to `~/.config/systemd/user/livesync-cli.service` (user) or `/etc/systemd/system/livesync-cli.service` (system).
|
||||||
|
5. Reloads systemd, enables and starts the service, and reports success only after confirming that the service remains active.
|
||||||
|
|
||||||
|
Ensure that `~/.local/bin` for a user installation, or `/usr/local/bin` for a system-wide installation, is on the shell's `PATH` before invoking `livesync-cli` interactively. For example, add the following to the appropriate shell start-up file for a user installation when needed:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
export PATH="$HOME/.local/bin:$PATH"
|
||||||
|
```
|
||||||
|
|
||||||
|
The generated systemd unit uses the wrapper's absolute path and does not depend on the shell's `PATH`.
|
||||||
|
|
||||||
|
**Manual setup** — if you prefer to manage the unit yourself, copy `deploy/livesync-cli.service`, replace `LIVESYNC_BIN` and `LIVESYNC_VAULT_PATH` with the actual binary path and Vault path, then install it in the appropriate systemd directory.
|
||||||
|
|
||||||
### Docker
|
### Docker
|
||||||
|
|
||||||
A Docker image is provided for headless / server deployments. Build from the repository root:
|
A Docker image is provided for headless / server deployments. Build from the repository root:
|
||||||
@@ -210,7 +250,9 @@ candidate carries the host's public IP and peers can connect normally.
|
|||||||
|
|
||||||
### Adding `livesync-cli` alias
|
### Adding `livesync-cli` alias
|
||||||
|
|
||||||
To use the `livesync-cli` command globally, you can add an alias to your shell configuration file (e.g., `.zshrc` or `.bashrc`).
|
If you used the [systemd installer](#systemd-installation), no alias is required: it installs the `livesync-cli` wrapper in `~/.local/bin` or `/usr/local/bin`. If the installed command is not found, follow the `PATH` guidance in the systemd installation section.
|
||||||
|
|
||||||
|
The aliases below are only for running the CLI from a source checkout, or from Docker without using the installer. Add the appropriate alias to your shell configuration file, such as `.zshrc` or `.bashrc`.
|
||||||
|
|
||||||
If you are using `npm run`, add the following line:
|
If you are using `npm run`, add the following line:
|
||||||
|
|
||||||
@@ -506,36 +548,6 @@ Patterns apply in both directions: the chokidar watcher will not emit events for
|
|||||||
|
|
||||||
Changes to this file require a daemon restart to take effect.
|
Changes to this file require a daemon restart to take effect.
|
||||||
|
|
||||||
### Systemd Installation
|
|
||||||
|
|
||||||
The `deploy/` directory contains a systemd unit template and an install script.
|
|
||||||
|
|
||||||
**Automated install (user service, recommended):**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
bash src/apps/cli/deploy/install.sh --vault /path/to/vault
|
|
||||||
```
|
|
||||||
|
|
||||||
**With polling interval:**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
bash src/apps/cli/deploy/install.sh --vault /path/to/vault --interval 60
|
|
||||||
```
|
|
||||||
|
|
||||||
**System-wide install** (requires root / sudo for `/etc/systemd/system/`):
|
|
||||||
|
|
||||||
```bash
|
|
||||||
bash src/apps/cli/deploy/install.sh --system --vault /path/to/vault
|
|
||||||
```
|
|
||||||
|
|
||||||
The script:
|
|
||||||
1. Builds the CLI (`npm install` + `npm run build`).
|
|
||||||
2. Installs the binary to `~/.local/bin/livesync-cli` (user) or `/usr/local/bin/livesync-cli` (system).
|
|
||||||
3. Writes the unit file to `~/.config/systemd/user/livesync-cli.service` (user) or `/etc/systemd/system/livesync-cli.service` (system).
|
|
||||||
4. Runs `systemctl [--user] daemon-reload && systemctl [--user] enable --now livesync-cli`.
|
|
||||||
|
|
||||||
**Manual setup** — if you prefer to manage the unit yourself, copy `deploy/livesync-cli.service`, replace `LIVESYNC_BIN` and `LIVESYNC_VAULT_PATH` with the actual binary path and vault path, then install to the appropriate systemd directory.
|
|
||||||
|
|
||||||
### Planned options:
|
### Planned options:
|
||||||
|
|
||||||
- `--immediate`: Perform sync after the command (e.g. `push`, `pull`, `put`, `rm`).
|
- `--immediate`: Perform sync after the command (e.g. `push`, `pull`, `put`, `rm`).
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
REPO_ROOT="$(cd -- "$SCRIPT_DIR/../../.." && pwd)"
|
REPO_ROOT="$(cd -- "$SCRIPT_DIR/../../../.." && pwd)"
|
||||||
CLI_DIR="$REPO_ROOT/src/apps/cli"
|
CLI_DIR="$REPO_ROOT/src/apps/cli"
|
||||||
SERVICE_TEMPLATE="$SCRIPT_DIR/livesync-cli.service"
|
SERVICE_TEMPLATE="$SCRIPT_DIR/livesync-cli.service"
|
||||||
|
|
||||||
@@ -104,30 +104,70 @@ fi
|
|||||||
# ── Install binary ───────────────────────────────────────────────────────────
|
# ── Install binary ───────────────────────────────────────────────────────────
|
||||||
if [[ "$INSTALL_MODE" == "user" ]]; then
|
if [[ "$INSTALL_MODE" == "user" ]]; then
|
||||||
BIN_DIR="$HOME/.local/bin"
|
BIN_DIR="$HOME/.local/bin"
|
||||||
|
LIB_DIR="$HOME/.local/lib/livesync-cli"
|
||||||
UNIT_DIR="$HOME/.config/systemd/user"
|
UNIT_DIR="$HOME/.config/systemd/user"
|
||||||
SYSTEMCTL_FLAGS="--user"
|
SYSTEMCTL_FLAGS="--user"
|
||||||
else
|
else
|
||||||
BIN_DIR="/usr/local/bin"
|
BIN_DIR="/usr/local/bin"
|
||||||
|
LIB_DIR="/usr/local/lib/livesync-cli"
|
||||||
UNIT_DIR="/etc/systemd/system"
|
UNIT_DIR="/etc/systemd/system"
|
||||||
SYSTEMCTL_FLAGS=""
|
SYSTEMCTL_FLAGS=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "$BIN_DIR"
|
LIB_PARENT="$(dirname -- "$LIB_DIR")"
|
||||||
|
mkdir -p "$BIN_DIR" "$LIB_PARENT"
|
||||||
|
|
||||||
LIVESYNC_BIN="$BIN_DIR/livesync-cli"
|
LIVESYNC_BIN="$BIN_DIR/livesync-cli"
|
||||||
LIVESYNC_JS="$BIN_DIR/livesync-cli.js"
|
LIVESYNC_JS="$LIB_DIR/dist/index.cjs"
|
||||||
|
|
||||||
# Copy the CJS bundle so the wrapper is self-contained and independent of the
|
# Build a complete runtime payload before replacing any previous installation.
|
||||||
# build directory location.
|
# The Vite output contains hashed sibling chunks, while some Node dependencies
|
||||||
cp "$BUILT_CJS" "$LIVESYNC_JS"
|
# deliberately remain external and must be installed next to the bundle.
|
||||||
|
PAYLOAD_STAGING="$(mktemp -d "$LIB_PARENT/.livesync-cli.install.XXXXXX")"
|
||||||
|
cleanup_payload() {
|
||||||
|
if [[ -n "$PAYLOAD_STAGING" ]] && [[ -e "$PAYLOAD_STAGING" ]]; then
|
||||||
|
rm -rf -- "$PAYLOAD_STAGING"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
trap cleanup_payload EXIT
|
||||||
|
|
||||||
# Write a bash wrapper that invokes node on the installed bundle.
|
cp "$CLI_DIR/package.json" "$PAYLOAD_STAGING/package.json"
|
||||||
|
npm install --omit=dev --no-audit --no-fund --prefix "$PAYLOAD_STAGING"
|
||||||
|
cp -R "$CLI_DIR/dist" "$PAYLOAD_STAGING/dist"
|
||||||
|
|
||||||
|
if ! node "$PAYLOAD_STAGING/dist/index.cjs" --help >/dev/null; then
|
||||||
|
echo "Error: installed CLI failed its start-up check" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
PAYLOAD_BACKUP=""
|
||||||
|
if [[ -e "$LIB_DIR" ]] || [[ -L "$LIB_DIR" ]]; then
|
||||||
|
PAYLOAD_BACKUP="$(mktemp -d "$LIB_PARENT/.livesync-cli.backup.XXXXXX")"
|
||||||
|
rmdir "$PAYLOAD_BACKUP"
|
||||||
|
mv -- "$LIB_DIR" "$PAYLOAD_BACKUP"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! mv -- "$PAYLOAD_STAGING" "$LIB_DIR"; then
|
||||||
|
if [[ -n "$PAYLOAD_BACKUP" ]]; then
|
||||||
|
mv -- "$PAYLOAD_BACKUP" "$LIB_DIR"
|
||||||
|
fi
|
||||||
|
echo "Error: failed to install the CLI files at $LIB_DIR" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
PAYLOAD_STAGING=""
|
||||||
|
|
||||||
|
if [[ -n "$PAYLOAD_BACKUP" ]]; then
|
||||||
|
rm -rf -- "$PAYLOAD_BACKUP"
|
||||||
|
fi
|
||||||
|
trap - EXIT
|
||||||
|
|
||||||
|
# Write a bash wrapper that invokes Node.js on the installed payload.
|
||||||
cat > "$LIVESYNC_BIN" <<WRAPPER
|
cat > "$LIVESYNC_BIN" <<WRAPPER
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
exec node "$LIVESYNC_JS" "\$@"
|
exec node "$LIVESYNC_JS" "\$@"
|
||||||
WRAPPER
|
WRAPPER
|
||||||
chmod +x "$LIVESYNC_BIN"
|
chmod +x "$LIVESYNC_BIN"
|
||||||
echo "[INFO] Installed bundle: $LIVESYNC_JS"
|
echo "[INFO] Installed CLI files: $LIB_DIR"
|
||||||
echo "[INFO] Installed binary: $LIVESYNC_BIN"
|
echo "[INFO] Installed binary: $LIVESYNC_BIN"
|
||||||
|
|
||||||
# ── Write systemd unit ───────────────────────────────────────────────────────
|
# ── Write systemd unit ───────────────────────────────────────────────────────
|
||||||
@@ -180,6 +220,15 @@ systemctl $SYSTEMCTL_FLAGS daemon-reload
|
|||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
systemctl $SYSTEMCTL_FLAGS enable --now livesync-cli
|
systemctl $SYSTEMCTL_FLAGS enable --now livesync-cli
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
if ! systemctl $SYSTEMCTL_FLAGS is-active --quiet livesync-cli; then
|
||||||
|
echo "Error: livesync-cli service did not remain active after startup." >&2
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
systemctl $SYSTEMCTL_FLAGS status livesync-cli --no-pager || true
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "[Done] livesync-cli service installed and started."
|
echo "[Done] livesync-cli service installed and started."
|
||||||
echo ""
|
echo ""
|
||||||
|
|||||||
@@ -0,0 +1,192 @@
|
|||||||
|
import { spawnSync } from "node:child_process";
|
||||||
|
import { chmod, copyFile, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
|
||||||
|
import { tmpdir } from "node:os";
|
||||||
|
import { delimiter, dirname, join } from "node:path";
|
||||||
|
import { fileURLToPath } from "node:url";
|
||||||
|
import { afterEach, describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
const deploySourceDirectory = dirname(fileURLToPath(import.meta.url));
|
||||||
|
const temporaryDirectories: string[] = [];
|
||||||
|
|
||||||
|
type InstallerFixture = {
|
||||||
|
cliDirectory: string;
|
||||||
|
environment: NodeJS.ProcessEnv;
|
||||||
|
homeDirectory: string;
|
||||||
|
installerPath: string;
|
||||||
|
npmCallLog: string;
|
||||||
|
repositoryRoot: string;
|
||||||
|
systemctlCallLog: string;
|
||||||
|
vaultDirectory: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
async function writeExecutable(path: string, content: string): Promise<void> {
|
||||||
|
await writeFile(path, `${content}\n`, "utf8");
|
||||||
|
await chmod(path, 0o755);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createInstallerFixture(serviceActive: boolean): Promise<InstallerFixture> {
|
||||||
|
const temporaryDirectory = await mkdtemp(join(tmpdir(), "livesync-cli-installer-"));
|
||||||
|
temporaryDirectories.push(temporaryDirectory);
|
||||||
|
|
||||||
|
const repositoryRoot = join(temporaryDirectory, "repository");
|
||||||
|
const cliDirectory = join(repositoryRoot, "src", "apps", "cli");
|
||||||
|
const deployDirectory = join(cliDirectory, "deploy");
|
||||||
|
const distDirectory = join(cliDirectory, "dist");
|
||||||
|
const fakeBinDirectory = join(temporaryDirectory, "fake-bin");
|
||||||
|
const homeDirectory = join(temporaryDirectory, "home");
|
||||||
|
const vaultDirectory = join(temporaryDirectory, "vault");
|
||||||
|
const npmCallLog = join(temporaryDirectory, "npm-calls.log");
|
||||||
|
const systemctlCallLog = join(temporaryDirectory, "systemctl-calls.log");
|
||||||
|
|
||||||
|
await Promise.all([
|
||||||
|
mkdir(deployDirectory, { recursive: true }),
|
||||||
|
mkdir(distDirectory, { recursive: true }),
|
||||||
|
mkdir(fakeBinDirectory, { recursive: true }),
|
||||||
|
mkdir(homeDirectory, { recursive: true }),
|
||||||
|
mkdir(vaultDirectory, { recursive: true }),
|
||||||
|
]);
|
||||||
|
|
||||||
|
await Promise.all([
|
||||||
|
copyFile(join(deploySourceDirectory, "install.sh"), join(deployDirectory, "install.sh")),
|
||||||
|
copyFile(join(deploySourceDirectory, "livesync-cli.service"), join(deployDirectory, "livesync-cli.service")),
|
||||||
|
writeFile(
|
||||||
|
join(repositoryRoot, "package.json"),
|
||||||
|
JSON.stringify({ private: true, workspaces: ["src/apps/*"] }),
|
||||||
|
"utf8"
|
||||||
|
),
|
||||||
|
writeFile(
|
||||||
|
join(cliDirectory, "package.json"),
|
||||||
|
JSON.stringify({
|
||||||
|
name: "self-hosted-livesync-cli",
|
||||||
|
private: true,
|
||||||
|
version: "0.0.0",
|
||||||
|
dependencies: { "fixture-runtime-dependency": "1.0.0" },
|
||||||
|
}),
|
||||||
|
"utf8"
|
||||||
|
),
|
||||||
|
writeFile(
|
||||||
|
join(distDirectory, "index.cjs"),
|
||||||
|
'const chunk = require("./chunk.cjs");\n' +
|
||||||
|
'const dependency = require("fixture-runtime-dependency");\n' +
|
||||||
|
"process.stdout.write(`${chunk}:${dependency}\\n`);\n",
|
||||||
|
"utf8"
|
||||||
|
),
|
||||||
|
writeFile(join(distDirectory, "chunk.cjs"), 'module.exports = "chunk-ready";\n', "utf8"),
|
||||||
|
]);
|
||||||
|
|
||||||
|
await writeExecutable(
|
||||||
|
join(fakeBinDirectory, "npm"),
|
||||||
|
[
|
||||||
|
"#!/usr/bin/env bash",
|
||||||
|
"set -euo pipefail",
|
||||||
|
'printf \'%s|%s\\n\' "$PWD" "$*" >> "$NPM_CALL_LOG"',
|
||||||
|
'prefix=""',
|
||||||
|
"expect_prefix=0",
|
||||||
|
'for argument in "$@"; do',
|
||||||
|
' if [[ "$expect_prefix" -eq 1 ]]; then',
|
||||||
|
' prefix="$argument"',
|
||||||
|
" expect_prefix=0",
|
||||||
|
' elif [[ "$argument" == "--prefix" ]]; then',
|
||||||
|
" expect_prefix=1",
|
||||||
|
" fi",
|
||||||
|
"done",
|
||||||
|
'if [[ -n "$prefix" ]]; then',
|
||||||
|
' mkdir -p "$prefix/node_modules/fixture-runtime-dependency"',
|
||||||
|
" printf '%s\\n' 'module.exports = \"dependency-ready\";' > \"$prefix/node_modules/fixture-runtime-dependency/index.js\"",
|
||||||
|
"fi",
|
||||||
|
].join("\n")
|
||||||
|
);
|
||||||
|
await writeExecutable(
|
||||||
|
join(fakeBinDirectory, "systemctl"),
|
||||||
|
[
|
||||||
|
"#!/usr/bin/env bash",
|
||||||
|
"set -euo pipefail",
|
||||||
|
'printf \'%s\\n\' "$*" >> "$SYSTEMCTL_CALL_LOG"',
|
||||||
|
'if [[ " $* " == *" is-active "* ]]; then',
|
||||||
|
' [[ "${FAKE_SYSTEMCTL_ACTIVE:-1}" == "1" ]]',
|
||||||
|
" exit",
|
||||||
|
"fi",
|
||||||
|
'if [[ " $* " == *" status "* ]]; then',
|
||||||
|
" printf '%s\\n' \"fixture service status\"",
|
||||||
|
"fi",
|
||||||
|
].join("\n")
|
||||||
|
);
|
||||||
|
await writeExecutable(join(fakeBinDirectory, "sleep"), ["#!/usr/bin/env bash", "exit 0"].join("\n"));
|
||||||
|
|
||||||
|
return {
|
||||||
|
cliDirectory,
|
||||||
|
environment: {
|
||||||
|
...process.env,
|
||||||
|
FAKE_SYSTEMCTL_ACTIVE: serviceActive ? "1" : "0",
|
||||||
|
HOME: homeDirectory,
|
||||||
|
NPM_CALL_LOG: npmCallLog,
|
||||||
|
PATH: `${fakeBinDirectory}${delimiter}${process.env.PATH ?? ""}`,
|
||||||
|
SYSTEMCTL_CALL_LOG: systemctlCallLog,
|
||||||
|
},
|
||||||
|
homeDirectory,
|
||||||
|
installerPath: join(deployDirectory, "install.sh"),
|
||||||
|
npmCallLog,
|
||||||
|
repositoryRoot,
|
||||||
|
systemctlCallLog,
|
||||||
|
vaultDirectory,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function runInstaller(fixture: InstallerFixture) {
|
||||||
|
return spawnSync("bash", [fixture.installerPath, "--vault", fixture.vaultDirectory], {
|
||||||
|
encoding: "utf8",
|
||||||
|
env: fixture.environment,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
afterEach(async () => {
|
||||||
|
await Promise.all(
|
||||||
|
temporaryDirectories.splice(0).map((directory) => rm(directory, { recursive: true, force: true }))
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
describe.skipIf(process.platform === "win32")("CLI systemd installer", () => {
|
||||||
|
it("installs a runnable CLI independently of the source repository", async () => {
|
||||||
|
const fixture = await createInstallerFixture(true);
|
||||||
|
|
||||||
|
const installation = runInstaller(fixture);
|
||||||
|
|
||||||
|
expect(installation.error).toBeUndefined();
|
||||||
|
expect(installation.status, installation.stderr).toBe(0);
|
||||||
|
expect(installation.stdout).toContain("[Done] livesync-cli service installed and started.");
|
||||||
|
|
||||||
|
const installedCommand = join(fixture.homeDirectory, ".local", "bin", "livesync-cli");
|
||||||
|
const installedPayload = join(fixture.homeDirectory, ".local", "lib", "livesync-cli", "dist", "index.cjs");
|
||||||
|
const installedUnit = join(fixture.homeDirectory, ".config", "systemd", "user", "livesync-cli.service");
|
||||||
|
expect(await readFile(installedPayload, "utf8")).toContain('require("./chunk.cjs")');
|
||||||
|
expect(await readFile(installedUnit, "utf8")).toContain("Type=exec");
|
||||||
|
|
||||||
|
await rm(fixture.repositoryRoot, { recursive: true });
|
||||||
|
|
||||||
|
const command = spawnSync(installedCommand, [], { encoding: "utf8", env: fixture.environment });
|
||||||
|
expect(command.error).toBeUndefined();
|
||||||
|
expect(command.status, command.stderr).toBe(0);
|
||||||
|
expect(command.stdout).toBe("chunk-ready:dependency-ready\n");
|
||||||
|
|
||||||
|
const npmCalls = await readFile(fixture.npmCallLog, "utf8");
|
||||||
|
expect(npmCalls).toContain(`${fixture.repositoryRoot}|install --silent`);
|
||||||
|
expect(npmCalls).toContain(`${fixture.cliDirectory}|run build`);
|
||||||
|
expect(npmCalls).toMatch(/install .*--omit=dev|install --omit=dev/);
|
||||||
|
|
||||||
|
const systemctlCalls = await readFile(fixture.systemctlCallLog, "utf8");
|
||||||
|
expect(systemctlCalls).toContain("--user enable --now livesync-cli");
|
||||||
|
expect(systemctlCalls).toContain("--user is-active --quiet livesync-cli");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not report success when the service fails to remain active", async () => {
|
||||||
|
const fixture = await createInstallerFixture(false);
|
||||||
|
|
||||||
|
const installation = runInstaller(fixture);
|
||||||
|
const combinedOutput = `${installation.stdout}\n${installation.stderr}`;
|
||||||
|
|
||||||
|
expect(installation.error).toBeUndefined();
|
||||||
|
expect(installation.status).not.toBe(0);
|
||||||
|
expect(combinedOutput).toContain("service did not remain active after startup");
|
||||||
|
expect(combinedOutput).not.toContain("[Done]");
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -4,7 +4,7 @@ After=network-online.target
|
|||||||
Wants=network-online.target
|
Wants=network-online.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=exec
|
||||||
ExecStart=LIVESYNC_BIN LIVESYNC_VAULT_PATH
|
ExecStart=LIVESYNC_BIN LIVESYNC_VAULT_PATH
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
RestartSec=10
|
RestartSec=10
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "self-hosted-livesync-cli",
|
"name": "self-hosted-livesync-cli",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.0.23-cli",
|
"version": "1.0.24-cli",
|
||||||
"main": "dist/index.cjs",
|
"main": "dist/index.cjs",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
"buildRun": "npm run build && npm run cli --",
|
"buildRun": "npm run build && npm run cli --",
|
||||||
"build:docker": "docker build -f Dockerfile -t livesync-cli ../../..",
|
"build:docker": "docker build -f Dockerfile -t livesync-cli ../../..",
|
||||||
"check": "tsc -p tsconfig.json",
|
"check": "tsc -p tsconfig.json",
|
||||||
"test:unit": "cd ../../.. && npx vitest run --config vitest.config.unit.ts src/apps/cli/main.unit.spec.ts src/apps/cli/settingsPersistence.unit.spec.ts src/apps/cli/commands/utils.unit.spec.ts src/apps/cli/commands/runCommand.unit.spec.ts src/apps/cli/commands/p2p.unit.spec.ts",
|
"test:unit": "cd ../../.. && npx vitest run --config vitest.config.unit.ts src/apps/cli/main.unit.spec.ts src/apps/cli/settingsPersistence.unit.spec.ts src/apps/cli/commands/utils.unit.spec.ts src/apps/cli/commands/runCommand.unit.spec.ts src/apps/cli/commands/p2p.unit.spec.ts src/apps/cli/deploy/install.unit.spec.ts",
|
||||||
"test:e2e:two-vaults": "bash test/test-e2e-two-vaults-with-docker-linux.sh",
|
"test:e2e:two-vaults": "bash test/test-e2e-two-vaults-with-docker-linux.sh",
|
||||||
"test:e2e:two-vaults:common": "bash test/test-e2e-two-vaults-common.sh",
|
"test:e2e:two-vaults:common": "bash test/test-e2e-two-vaults-common.sh",
|
||||||
"test:e2e:two-vaults:matrix": "bash test/test-e2e-two-vaults-matrix.sh",
|
"test:e2e:two-vaults:matrix": "bash test/test-e2e-two-vaults-matrix.sh",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "livesync-webapp",
|
"name": "livesync-webapp",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.0.23-webapp",
|
"version": "1.0.24-webapp",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"description": "Browser-based Self-hosted LiveSync using FileSystem API",
|
"description": "Browser-based Self-hosted LiveSync using FileSystem API",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "webpeer",
|
"name": "webpeer",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.0.23-webpeer",
|
"version": "1.0.24-webpeer",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -7,8 +7,6 @@
|
|||||||
* remove it from this map in the same change.
|
* remove it from this map in the same change.
|
||||||
*/
|
*/
|
||||||
export const liveSyncProvisionalEnglishMessages = {
|
export const liveSyncProvisionalEnglishMessages = {
|
||||||
"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.":
|
|
||||||
"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.",
|
|
||||||
"Setup Complete: Preparing to Fetch from Another Device": "Setup Complete: Preparing to Fetch from Another Device",
|
"Setup Complete: Preparing to Fetch from Another Device": "Setup Complete: Preparing to Fetch from Another Device",
|
||||||
"The P2P connection has been configured successfully. The initial synchronisation data must now be fetched from an online source device.":
|
"The P2P connection has been configured successfully. The initial synchronisation data must now be fetched from an online source device.":
|
||||||
"The P2P connection has been configured successfully. The initial synchronisation data must now be fetched from an online source device.",
|
"The P2P connection has been configured successfully. The initial synchronisation data must now be fetched from an online source device.",
|
||||||
@@ -59,10 +57,6 @@ export const liveSyncProvisionalEnglishMessages = {
|
|||||||
"Follow whenever this device connects": "Follow whenever this device connects",
|
"Follow whenever this device connects": "Follow whenever this device connects",
|
||||||
"Include in the P2P synchronisation command": "Include in the P2P synchronisation command",
|
"Include in the P2P synchronisation command": "Include in the P2P synchronisation command",
|
||||||
"More actions for ${DEVICE}": "More actions for ${DEVICE}",
|
"More actions for ${DEVICE}": "More actions for ${DEVICE}",
|
||||||
"Create or connect to database and continue": "Create or connect to database and continue",
|
|
||||||
"Connect to existing database and continue": "Connect to existing database and continue",
|
|
||||||
"Test connection and save": "Test connection and save",
|
|
||||||
"Save without connecting": "Save without connecting",
|
|
||||||
"Use this device's settings": "Use this device's settings",
|
"Use this device's settings": "Use this device's settings",
|
||||||
Retry: "Retry",
|
Retry: "Retry",
|
||||||
"No Synchronisation Settings Found": "No Synchronisation Settings Found",
|
"No Synchronisation Settings Found": "No Synchronisation Settings Found",
|
||||||
@@ -75,14 +69,6 @@ export const liveSyncProvisionalEnglishMessages = {
|
|||||||
"Could not read the remote's synchronisation settings. Retry, or continue the overwrite with this device's settings. A working connection is still required.",
|
"Could not read the remote's synchronisation settings. Retry, or continue the overwrite with this device's settings. A working connection is still required.",
|
||||||
"Skips checking and applying synchronisation settings from the remote.":
|
"Skips checking and applying synchronisation settings from the remote.":
|
||||||
"Skips checking and applying synchronisation settings from the remote.",
|
"Skips checking and applying synchronisation settings from the remote.",
|
||||||
"Enter a complete HTTP or HTTPS URL.": "Enter a complete HTTP or HTTPS URL.",
|
|
||||||
"CouchDB validates the database name when you connect. The name must not be empty.":
|
|
||||||
"CouchDB validates the database name when you connect. The name must not be empty.",
|
|
||||||
"Saving without a successful connection test keeps this profile, but automatic synchronisation may fail until the connection is corrected.":
|
|
||||||
"Saving without a successful connection test keeps this profile, but automatic synchronisation may fail until the connection is corrected.",
|
|
||||||
"This optional check uses Obsidian's internal request API and sends the credentials above to the CouchDB server. Use it only with a server you trust; administrator access may be required.":
|
|
||||||
"This optional check uses Obsidian's internal request API and sends the credentials above to the CouchDB server. Use it only with a server you trust; administrator access may be required.",
|
|
||||||
"Check server requirements": "Check server requirements",
|
|
||||||
"Change CouchDB server setting": "Change CouchDB server setting",
|
"Change CouchDB server setting": "Change CouchDB server setting",
|
||||||
"Change CouchDB server setting '${SETTING}' to '${VALUE}'?":
|
"Change CouchDB server setting '${SETTING}' to '${VALUE}'?":
|
||||||
"Change CouchDB server setting '${SETTING}' to '${VALUE}'?",
|
"Change CouchDB server setting '${SETTING}' to '${VALUE}'?",
|
||||||
|
|||||||
@@ -148,16 +148,9 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
zh: "(正则表达式)如果已设置,则所有匹配此模式的本地和远端文件变更都会被跳过。",
|
zh: "(正则表达式)如果已设置,则所有匹配此模式的本地和远端文件变更都会被跳过。",
|
||||||
"zh-tw": "(正則表示式)若已設定,所有符合此模式的本機與遠端檔案變更都會被略過。",
|
"zh-tw": "(正則表示式)若已設定,所有符合此模式的本機與遠端檔案變更都會被略過。",
|
||||||
},
|
},
|
||||||
"(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 already have another synchronising device.) This option adds this device to the same synchronisation.":
|
||||||
{
|
{
|
||||||
def: "(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.",
|
def: "(Select this if you already have another synchronising device.) This option adds this device to the same synchronisation.",
|
||||||
es: "(Seleccione esto si ya utiliza la sincronización en otro ordenador o teléfono). Esta opción es adecuada si desea añadir este dispositivo a una configuración de LiveSync existente。",
|
|
||||||
ja: "(別の PC やスマートフォンですでに同期を利用している場合に選択してください。)この端末を既存の LiveSync 構成に追加する場合に適しています。",
|
|
||||||
ko: "(다른 컴퓨터나 스마트폰에서 이미 동기화를 사용 중이라면 선택하세요.) 이 기기를 기존 LiveSync 구성에 추가하려는 경우에 적합합니다.",
|
|
||||||
ru: "(Выберите этот вариант, если вы уже используете синхронизацию на другом компьютере или смартфоне.) Он подходит, если вы хотите добавить это устройство к уже существующей конфигурации LiveSync。",
|
|
||||||
zh: "(如果你已经在另一台电脑或手机上使用同步,请选择此项。)此选项适合将当前设备加入现有 LiveSync 配置的用户。",
|
|
||||||
"zh-tw":
|
|
||||||
"(如果你已經在另一台電腦或手機上使用同步,請選擇此項。)此選項適合將目前裝置加入既有 LiveSync 設定的使用者。",
|
|
||||||
},
|
},
|
||||||
"(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.":
|
||||||
{
|
{
|
||||||
@@ -740,6 +733,10 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
zh: "检查尚未转换为路径混淆 ID 的文档,并在需要时将其转换。",
|
zh: "检查尚未转换为路径混淆 ID 的文档,并在需要时将其转换。",
|
||||||
"zh-tw": "檢查尚未轉換為路徑混淆 ID 的文件,並在需要時進行轉換。",
|
"zh-tw": "檢查尚未轉換為路徑混淆 ID 的文件,並在需要時進行轉換。",
|
||||||
},
|
},
|
||||||
|
"Check server requirements": {
|
||||||
|
def: "Check server requirements",
|
||||||
|
es: "Comprobar los requisitos del servidor",
|
||||||
|
},
|
||||||
"Checking connection... Please wait.": {
|
"Checking connection... Please wait.": {
|
||||||
def: "Checking connection... Please wait.",
|
def: "Checking connection... Please wait.",
|
||||||
es: "Comprobando la conexión... Espera un momento.",
|
es: "Comprobando la conexión... Espera un momento.",
|
||||||
@@ -993,6 +990,10 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
ko: "연결",
|
ko: "연결",
|
||||||
"zh-tw": "連線",
|
"zh-tw": "連線",
|
||||||
},
|
},
|
||||||
|
"Connect to existing database and continue": {
|
||||||
|
def: "Connect to existing database and continue",
|
||||||
|
es: "Conectar a la base de datos existente y continuar",
|
||||||
|
},
|
||||||
"Connected to Signaling Server (as Peer ID: ${peerId})": {
|
"Connected to Signaling Server (as Peer ID: ${peerId})": {
|
||||||
def: "Connected to Signaling Server (as Peer ID: ${peerId})",
|
def: "Connected to Signaling Server (as Peer ID: ${peerId})",
|
||||||
es: "Conectado al servidor de señalización (como ID de par: ${peerId})",
|
es: "Conectado al servidor de señalización (como ID de par: ${peerId})",
|
||||||
@@ -1094,6 +1095,14 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
zh: "CouchDB 连接调优",
|
zh: "CouchDB 连接调优",
|
||||||
"zh-tw": "CouchDB 連線調校",
|
"zh-tw": "CouchDB 連線調校",
|
||||||
},
|
},
|
||||||
|
"CouchDB validates the database name when you connect. The name must not be empty.": {
|
||||||
|
def: "CouchDB validates the database name when you connect. The name must not be empty.",
|
||||||
|
es: "CouchDB valida el nombre de la base de datos al conectar. El nombre no puede estar vacío.",
|
||||||
|
},
|
||||||
|
"Create or connect to database and continue": {
|
||||||
|
def: "Create or connect to database and continue",
|
||||||
|
es: "Crear o conectar a la base de datos y continuar",
|
||||||
|
},
|
||||||
"Create P2P remote": {
|
"Create P2P remote": {
|
||||||
def: "Create P2P remote",
|
def: "Create P2P remote",
|
||||||
es: "Crear remoto P2P",
|
es: "Crear remoto P2P",
|
||||||
@@ -1433,7 +1442,7 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
},
|
},
|
||||||
"dialog.yourLanguageAvailable": {
|
"dialog.yourLanguageAvailable": {
|
||||||
def: "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 Default** and then take screenshots, messages and logs. This can be done in the setting dialogue.\nMay you find it easy to use!",
|
def: "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 Default** and then take screenshots, messages and logs. This can be done in the setting dialogue.\nMay you find it easy to use!",
|
||||||
es: "Self-hosted LiveSync tenía traducciones para tu idioma, así que se ha activado el ajuste %{Display language}.\n\nNota: no todos los mensajes están traducidos. ¡Esperamos tus contribuciones!\nNota 2: si abres una incidencia, **vuelve antes a Predeterminado** y luego haz las capturas de pantalla y recoge los mensajes y registros. Puedes hacerlo desde el diálogo de ajustes.\n¡Que lo disfrutes!",
|
es: "Self-hosted LiveSync tenía traducciones para tu idioma, así que se ha activado el ajuste Idioma de visualización.\n\nNota: no todos los mensajes están traducidos. ¡Esperamos tus contribuciones!\nNota 2: si abres una incidencia, **vuelve antes a Predeterminado** y luego haz las capturas de pantalla y recoge los mensajes y registros. Puedes hacerlo desde el diálogo de ajustes.\n¡Que lo disfrutes!",
|
||||||
fr: "Self-hosted LiveSync dispose d'une traduction pour votre langue, le paramètre %{Display language} a donc été activé.\n\nNote : Tous les messages ne sont pas traduits. Nous attendons vos contributions !\nNote 2 : Si vous créez un ticket, **veuillez revenir à Par défaut** puis prendre des captures d'écran, messages et journaux. Cela peut être fait dans la boîte de dialogue des paramètres.\nBonne utilisation !",
|
fr: "Self-hosted LiveSync dispose d'une traduction pour votre langue, le paramètre %{Display language} a donc été activé.\n\nNote : Tous les messages ne sont pas traduits. Nous attendons vos contributions !\nNote 2 : Si vous créez un ticket, **veuillez revenir à Par défaut** puis prendre des captures d'écran, messages et journaux. Cela peut être fait dans la boîte de dialogue des paramètres.\nBonne utilisation !",
|
||||||
he: "ל-Self-hosted LiveSync יש תרגום לשפתך, ולכן הגדרת %{Display language} הופעלה.\n\nהערה: לא כל ההודעות מתורגמות. אנחנו ממתינים לתרומותיך!\nהערה 2: אם אתה פותח Issue, **אנא חזור ל-%{lang-def}** ואז צלם צילומי מסך, הודעות ויומנים. ניתן לעשות זאת בדיאלוג ההגדרות.\nנקווה שתמצא/י את הפלאגין נוח לשימוש!",
|
he: "ל-Self-hosted LiveSync יש תרגום לשפתך, ולכן הגדרת %{Display language} הופעלה.\n\nהערה: לא כל ההודעות מתורגמות. אנחנו ממתינים לתרומותיך!\nהערה 2: אם אתה פותח Issue, **אנא חזור ל-%{lang-def}** ואז צלם צילומי מסך, הודעות ויומנים. ניתן לעשות זאת בדיאלוג ההגדרות.\nנקווה שתמצא/י את הפלאגין נוח לשימוש!",
|
||||||
ja: "Self-hosted LiveSync に設定されている言語の翻訳がありましたので、インターフェースの表示言語が適用されました。\n\n注意: 全てのメッセージは翻訳されていません。あなたの貢献をお待ちしています!\nGithubにIssueを作成する際には、 インターフェースの表示言語 を一旦 Default に戻してから、スクショやメッセージ、ログを収集してください。これは設定から変更できます。\n\n便利に使用できれば幸いです。",
|
ja: "Self-hosted LiveSync に設定されている言語の翻訳がありましたので、インターフェースの表示言語が適用されました。\n\n注意: 全てのメッセージは翻訳されていません。あなたの貢献をお待ちしています!\nGithubにIssueを作成する際には、 インターフェースの表示言語 を一旦 Default に戻してから、スクショやメッセージ、ログを収集してください。これは設定から変更できます。\n\n便利に使用できれば幸いです。",
|
||||||
@@ -2035,6 +2044,10 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
zh: "增大块大小",
|
zh: "增大块大小",
|
||||||
"zh-tw": "擴大 chunk 大小",
|
"zh-tw": "擴大 chunk 大小",
|
||||||
},
|
},
|
||||||
|
"Enter a complete HTTP or HTTPS URL.": {
|
||||||
|
def: "Enter a complete HTTP or HTTPS URL.",
|
||||||
|
es: "Introduce una URL HTTP o HTTPS completa.",
|
||||||
|
},
|
||||||
"Enter a folder prefix (optional)": {
|
"Enter a folder prefix (optional)": {
|
||||||
def: "Enter a folder prefix (optional)",
|
def: "Enter a folder prefix (optional)",
|
||||||
es: "Introduce un prefijo de carpeta (opcional)",
|
es: "Introduce un prefijo de carpeta (opcional)",
|
||||||
@@ -2530,6 +2543,10 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
ko: "해당 없는 항목 숨기기",
|
ko: "해당 없는 항목 숨기기",
|
||||||
"zh-tw": "隱藏不適用的項目",
|
"zh-tw": "隱藏不適用的項目",
|
||||||
},
|
},
|
||||||
|
"Hide password": {
|
||||||
|
def: "Hide password",
|
||||||
|
es: "Ocultar contraseña",
|
||||||
|
},
|
||||||
"Higher (${local} > ${remote})": {
|
"Higher (${local} > ${remote})": {
|
||||||
def: "Higher (${local} > ${remote})",
|
def: "Higher (${local} > ${remote})",
|
||||||
es: "Superior (${local} > ${remote})",
|
es: "Superior (${local} > ${remote})",
|
||||||
@@ -5369,7 +5386,7 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
},
|
},
|
||||||
"obsidianLiveSyncSettingTab.logConfiguredLiveSync": {
|
"obsidianLiveSyncSettingTab.logConfiguredLiveSync": {
|
||||||
def: "Configured synchronization mode: LiveSync",
|
def: "Configured synchronization mode: LiveSync",
|
||||||
es: "Modo de sincronización configurado: Sincronización en Vivo",
|
es: "Modo de sincronización configurado: Sincronización en vivo",
|
||||||
fr: "Mode de synchronisation configuré : LiveSync",
|
fr: "Mode de synchronisation configuré : LiveSync",
|
||||||
he: "מצב סנכרון שהוגדר: LiveSync",
|
he: "מצב סנכרון שהוגדר: LiveSync",
|
||||||
ja: "設定された同期モード: LiveSync",
|
ja: "設定された同期モード: LiveSync",
|
||||||
@@ -5981,7 +5998,7 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
},
|
},
|
||||||
"obsidianLiveSyncSettingTab.nameTestDatabaseConnection": {
|
"obsidianLiveSyncSettingTab.nameTestDatabaseConnection": {
|
||||||
def: "Test Database Connection",
|
def: "Test Database Connection",
|
||||||
es: "Probar Conexión de Base de Datos",
|
es: "Probar conexión de base de datos",
|
||||||
fr: "Tester la connexion à la base de données",
|
fr: "Tester la connexion à la base de données",
|
||||||
he: "בדוק חיבור למסד נתונים",
|
he: "בדוק חיבור למסד נתונים",
|
||||||
ja: "データベース接続テスト",
|
ja: "データベース接続テスト",
|
||||||
@@ -5992,7 +6009,7 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
},
|
},
|
||||||
"obsidianLiveSyncSettingTab.nameValidateDatabaseConfig": {
|
"obsidianLiveSyncSettingTab.nameValidateDatabaseConfig": {
|
||||||
def: "Validate Database Configuration",
|
def: "Validate Database Configuration",
|
||||||
es: "Validar Configuración de la Base de Datos",
|
es: "Validar configuración de la base de datos",
|
||||||
fr: "Valider la configuration de la base de données",
|
fr: "Valider la configuration de la base de données",
|
||||||
he: "אמת תצורת מסד נתונים",
|
he: "אמת תצורת מסד נתונים",
|
||||||
ja: "データベース設定を検証",
|
ja: "データベース設定を検証",
|
||||||
@@ -6300,7 +6317,7 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
},
|
},
|
||||||
"obsidianLiveSyncSettingTab.panelGeneralSettings": {
|
"obsidianLiveSyncSettingTab.panelGeneralSettings": {
|
||||||
def: "General Settings",
|
def: "General Settings",
|
||||||
es: "Configuraciones Generales",
|
es: "Configuraciones generales",
|
||||||
fr: "Paramètres généraux",
|
fr: "Paramètres généraux",
|
||||||
he: "הגדרות כלליות",
|
he: "הגדרות כלליות",
|
||||||
ja: "一般設定",
|
ja: "一般設定",
|
||||||
@@ -6311,7 +6328,7 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
},
|
},
|
||||||
"obsidianLiveSyncSettingTab.panelPrivacyEncryption": {
|
"obsidianLiveSyncSettingTab.panelPrivacyEncryption": {
|
||||||
def: "Privacy & Encryption",
|
def: "Privacy & Encryption",
|
||||||
es: "Privacidad y Cifrado",
|
es: "Privacidad y cifrado",
|
||||||
fr: "Confidentialité et chiffrement",
|
fr: "Confidentialité et chiffrement",
|
||||||
he: "פרטיות והצפנה",
|
he: "פרטיות והצפנה",
|
||||||
ja: "プライバシーと暗号化",
|
ja: "プライバシーと暗号化",
|
||||||
@@ -6640,7 +6657,7 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
},
|
},
|
||||||
"obsidianLiveSyncSettingTab.titleSyncSettings": {
|
"obsidianLiveSyncSettingTab.titleSyncSettings": {
|
||||||
def: "Sync Settings",
|
def: "Sync Settings",
|
||||||
es: "Configuraciones de Sincronización",
|
es: "Configuraciones de sincronización",
|
||||||
fr: "Paramètres de synchronisation",
|
fr: "Paramètres de synchronisation",
|
||||||
he: "הגדרות סנכרון",
|
he: "הגדרות סנכרון",
|
||||||
ja: "同期設定",
|
ja: "同期設定",
|
||||||
@@ -8384,6 +8401,10 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
zh: "将设置保存到一个 Markdown 文件中。当新设置到达时,您将收到通知。您可以根据平台设置不同的文件 ",
|
zh: "将设置保存到一个 Markdown 文件中。当新设置到达时,您将收到通知。您可以根据平台设置不同的文件 ",
|
||||||
"zh-tw": "將設定儲存到 Markdown 檔案中。有新設定送達時會通知你,可依平台設定不同的檔案。",
|
"zh-tw": "將設定儲存到 Markdown 檔案中。有新設定送達時會通知你,可依平台設定不同的檔案。",
|
||||||
},
|
},
|
||||||
|
"Save without connecting": {
|
||||||
|
def: "Save without connecting",
|
||||||
|
es: "Guardar sin conectar",
|
||||||
|
},
|
||||||
"Saving will be performed forcefully after this number of seconds.": {
|
"Saving will be performed forcefully after this number of seconds.": {
|
||||||
def: "Saving will be performed forcefully after this number of seconds.",
|
def: "Saving will be performed forcefully after this number of seconds.",
|
||||||
es: "Guardado forzado tras esta cantidad de segundos",
|
es: "Guardado forzado tras esta cantidad de segundos",
|
||||||
@@ -8395,6 +8416,11 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
zh: "在此秒数后将强制执行保存 ",
|
zh: "在此秒数后将强制执行保存 ",
|
||||||
"zh-tw": "經過這個秒數後,會強制執行儲存。",
|
"zh-tw": "經過這個秒數後,會強制執行儲存。",
|
||||||
},
|
},
|
||||||
|
"Saving without a successful connection test keeps this profile, but automatic synchronisation may fail until the connection is corrected.":
|
||||||
|
{
|
||||||
|
def: "Saving without a successful connection test keeps this profile, but automatic synchronisation may fail until the connection is corrected.",
|
||||||
|
es: "Guardar sin una prueba de conexión correcta conserva este perfil, pero la sincronización automática puede fallar hasta que se corrija la conexión.",
|
||||||
|
},
|
||||||
"Scan a QR Code (Recommended for mobile)": {
|
"Scan a QR Code (Recommended for mobile)": {
|
||||||
def: "Scan a QR Code (Recommended for mobile)",
|
def: "Scan a QR Code (Recommended for mobile)",
|
||||||
es: "Escanear un código QR (recomendado para móviles)",
|
es: "Escanear un código QR (recomendado para móviles)",
|
||||||
@@ -9414,6 +9440,10 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
zh: "仅显示通知",
|
zh: "仅显示通知",
|
||||||
"zh-tw": "僅顯示通知",
|
"zh-tw": "僅顯示通知",
|
||||||
},
|
},
|
||||||
|
"Show password": {
|
||||||
|
def: "Show password",
|
||||||
|
es: "Mostrar contraseña",
|
||||||
|
},
|
||||||
"Show status as icons only": {
|
"Show status as icons only": {
|
||||||
def: "Show status as icons only",
|
def: "Show status as icons only",
|
||||||
es: "Mostrar estado solo con íconos",
|
es: "Mostrar estado solo con íconos",
|
||||||
@@ -9773,6 +9803,10 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
zh: "目标模式",
|
zh: "目标模式",
|
||||||
"zh-tw": "目標模式",
|
"zh-tw": "目標模式",
|
||||||
},
|
},
|
||||||
|
"Test connection and save": {
|
||||||
|
def: "Test connection and save",
|
||||||
|
es: "Probar la conexión y guardar",
|
||||||
|
},
|
||||||
"Test Settings and Continue": {
|
"Test Settings and Continue": {
|
||||||
def: "Test Settings and Continue",
|
def: "Test Settings and Continue",
|
||||||
es: "Probar los ajustes y continuar",
|
es: "Probar los ajustes y continuar",
|
||||||
@@ -9998,6 +10032,11 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
"zh-tw":
|
"zh-tw":
|
||||||
"此功能可在裝置之間直接同步,無需伺服器;但同步時兩台裝置必須同時在線,且部分功能可能受限。網際網路連線僅用於訊號交換(偵測對端),不用於資料傳輸。",
|
"此功能可在裝置之間直接同步,無需伺服器;但同步時兩台裝置必須同時在線,且部分功能可能受限。網際網路連線僅用於訊號交換(偵測對端),不用於資料傳輸。",
|
||||||
},
|
},
|
||||||
|
"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.":
|
||||||
|
{
|
||||||
|
def: "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.",
|
||||||
|
es: "Esta primera configuración consta de varios pasos breves, ya que confirma el cifrado, el método de conexión y qué dispositivo aporta los datos iniciales. Una vez completada, los demás dispositivos podrán reutilizar un Setup URI.",
|
||||||
|
},
|
||||||
"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.": {
|
||||||
def: "This is an advanced option for users who do not have a URI or who wish to configure detailed settings.",
|
def: "This is an advanced option for users who do not have a URI or who wish to configure detailed settings.",
|
||||||
es: "Esta es una opción avanzada para usuarios que no disponen de un URI o que desean configurar parámetros detallados。",
|
es: "Esta es una opción avanzada para usuarios que no disponen de un URI o que desean configurar parámetros detallados。",
|
||||||
@@ -10024,6 +10063,11 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
zh: "这是最符合当前设计的同步方式,所有功能均可用。你需要事先部署好 CouchDB 实例。",
|
zh: "这是最符合当前设计的同步方式,所有功能均可用。你需要事先部署好 CouchDB 实例。",
|
||||||
"zh-tw": "這是最符合目前設計的同步方式,所有功能皆可使用。你需要事先部署好 CouchDB 實例。",
|
"zh-tw": "這是最符合目前設計的同步方式,所有功能皆可使用。你需要事先部署好 CouchDB 實例。",
|
||||||
},
|
},
|
||||||
|
"This optional check uses Obsidian's internal request API and sends the credentials above to the CouchDB server. Use it only with a server you trust; administrator access may be required.":
|
||||||
|
{
|
||||||
|
def: "This optional check uses Obsidian's internal request API and sends the credentials above to the CouchDB server. Use it only with a server you trust; administrator access may be required.",
|
||||||
|
es: "Esta comprobación opcional usa la API interna de solicitudes de Obsidian y envía las credenciales anteriores al servidor CouchDB. Utilízala solo con un servidor de confianza; puede requerir acceso de administrador.",
|
||||||
|
},
|
||||||
"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.": {
|
||||||
def: "This passphrase will not be copied to another device. It will be set to `Default` until you configure it again.",
|
def: "This passphrase will not be copied to another device. It will be set to `Default` until you configure it again.",
|
||||||
es: "Esta frase no se copia a otros dispositivos. Usará `Default` hasta reconfigurar",
|
es: "Esta frase no se copia a otros dispositivos. Usará `Default` hasta reconfigurar",
|
||||||
@@ -12684,6 +12728,20 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
|||||||
"zh-tw":
|
"zh-tw":
|
||||||
"只有在特殊情況下才應執行此操作,例如伺服器資料已完全損毀、其他所有裝置上的變更都已不再需要,或資料庫大小相對於 Vault 大小已變得異常龐大時。",
|
"只有在特殊情況下才應執行此操作,例如伺服器資料已完全損毀、其他所有裝置上的變更都已不再需要,或資料庫大小相對於 Vault 大小已變得異常龐大時。",
|
||||||
},
|
},
|
||||||
|
"you wanted(Thank you)!": {
|
||||||
|
def: "you wanted(Thank you)!",
|
||||||
|
es: "tu solicitud (¡gracias!)",
|
||||||
|
},
|
||||||
|
"(Select this if another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.":
|
||||||
|
{
|
||||||
|
es: "(Seleccione esto si ya utiliza la sincronización en otro ordenador o teléfono). Esta opción es adecuada si desea añadir este dispositivo a una configuración de LiveSync existente。",
|
||||||
|
ja: "(別の PC やスマートフォンですでに同期を利用している場合に選択してください。)この端末を既存の LiveSync 構成に追加する場合に適しています。",
|
||||||
|
ko: "(다른 컴퓨터나 스마트폰에서 이미 동기화를 사용 중이라면 선택하세요.) 이 기기를 기존 LiveSync 구성에 추가하려는 경우에 적합합니다.",
|
||||||
|
ru: "(Выберите этот вариант, если вы уже используете синхронизацию на другом компьютере или смартфоне.) Он подходит, если вы хотите добавить это устройство к уже существующей конфигурации LiveSync。",
|
||||||
|
zh: "(如果你已经在另一台电脑或手机上使用同步,请选择此项。)此选项适合将当前设备加入现有 LiveSync 配置的用户。",
|
||||||
|
"zh-tw":
|
||||||
|
"(如果你已經在另一台電腦或手機上使用同步,請選擇此項。)此選項適合將目前裝置加入既有 LiveSync 設定的使用者。",
|
||||||
|
},
|
||||||
"Compute revisions for chunks (Previous behaviour)": {
|
"Compute revisions for chunks (Previous behaviour)": {
|
||||||
es: "Calcular revisiones para chunks (comportamiento anterior)",
|
es: "Calcular revisiones para chunks (comportamiento anterior)",
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"(Active)": "(Aktiv)",
|
"(Active)": "(Aktiv)",
|
||||||
"(RegExp) Empty to sync all files. Set filter as a regular expression to limit synchronising files.": "(RegExp) Leer lassen, um alle Dateien zu synchronisieren. Legen Sie einen Filter als regulären Ausdruck fest, um die zu synchronisierenden Dateien einzuschränken.",
|
"(RegExp) Empty to sync all files. Set filter as a regular expression to limit synchronising files.": "(RegExp) Leer lassen, um alle Dateien zu synchronisieren. Legen Sie einen Filter als regulären Ausdruck fest, um die zu synchronisierenden Dateien einzuschränken.",
|
||||||
"(RegExp) If this is set, any changes to local and remote files that match this will be skipped.": "(RegExp) Wenn dies gesetzt ist, werden alle Änderungen an lokalen und Remote-Dateien übersprungen, die diesem Muster entsprechen.",
|
"(RegExp) If this is set, any changes to local and remote files that match this will be skipped.": "(RegExp) Wenn dies gesetzt ist, werden alle Änderungen an lokalen und Remote-Dateien übersprungen, die diesem Muster entsprechen.",
|
||||||
"(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.": "(Wählen Sie dies, wenn Sie die Synchronisation bereits auf einem anderen Computer oder Smartphone verwenden.) Diese Option ist geeignet, wenn Sie dieses Gerät zu einer bestehenden LiveSync-Einrichtung hinzufügen möchten.",
|
"(Select this if another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.": "(Wählen Sie dies, wenn Sie die Synchronisation bereits auf einem anderen Computer oder Smartphone verwenden.) Diese Option ist geeignet, wenn Sie dieses Gerät zu einer bestehenden LiveSync-Einrichtung hinzufügen möchten.",
|
||||||
"(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.": "(Wählen Sie dies, wenn Sie dieses Gerät als erstes Synchronisationsgerät einrichten.) Diese Option ist geeignet, wenn Sie LiveSync neu verwenden und von Grund auf einrichten möchten.",
|
"(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.": "(Wählen Sie dies, wenn Sie dieses Gerät als erstes Synchronisationsgerät einrichten.) Diese Option ist geeignet, wenn Sie LiveSync neu verwenden und von Grund auf einrichten möchten.",
|
||||||
"> [!INFO]- The connected devices have been detected as follows:\n${devices}": "> [!INFO]- Die folgenden verbundenen Geräte wurden erkannt:\n${devices}",
|
"> [!INFO]- The connected devices have been detected as follows:\n${devices}": "> [!INFO]- Die folgenden verbundenen Geräte wurden erkannt:\n${devices}",
|
||||||
"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.": "Eine Setup-URI ist eine einzelne Zeichenfolge, die Ihre Serveradresse und Authentifizierungsdaten enthält. Wenn Ihre Serverinstallation eine URI erzeugt hat, bietet deren Verwendung eine einfache und sichere Konfiguration。",
|
"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.": "Eine Setup-URI ist eine einzelne Zeichenfolge, die Ihre Serveradresse und Authentifizierungsdaten enthält. Wenn Ihre Serverinstallation eine URI erzeugt hat, bietet deren Verwendung eine einfache und sichere Konfiguration。",
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
"(Obsolete) Use an old adapter for compatibility": "(Obsolete) Use an old adapter for compatibility",
|
"(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) 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.",
|
"(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 already have another synchronising device.) This option adds this device to the same synchronisation.": "(Select this if you already have another synchronising device.) This option adds this device to the same synchronisation.",
|
||||||
"(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.",
|
"(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 Remote": "↑: Overwrite Remote",
|
||||||
"↓: Overwrite Local": "↓: Overwrite Local",
|
"↓: Overwrite Local": "↓: Overwrite Local",
|
||||||
@@ -90,6 +90,7 @@
|
|||||||
"Check": "Check",
|
"Check": "Check",
|
||||||
"Check and convert non-path-obfuscated files": "Check and convert non-path-obfuscated files",
|
"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.",
|
"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.",
|
||||||
|
"Check server requirements": "Check server requirements",
|
||||||
"Checking connection... Please wait.": "Checking connection... Please wait.",
|
"Checking connection... Please wait.": "Checking connection... Please wait.",
|
||||||
"Chunks": "Chunks",
|
"Chunks": "Chunks",
|
||||||
"Close": "Close",
|
"Close": "Close",
|
||||||
@@ -121,6 +122,7 @@
|
|||||||
"Configure Remote": "Configure Remote",
|
"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.",
|
"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",
|
"Connect": "Connect",
|
||||||
|
"Connect to existing database and continue": "Connect to existing database and continue",
|
||||||
"Connected to Signaling Server (as Peer ID: ${peerId})": "Connected to Signaling Server (as Peer ID: ${peerId})",
|
"Connected to Signaling Server (as Peer ID: ${peerId})": "Connected to Signaling Server (as Peer ID: ${peerId})",
|
||||||
"Connected:": "Connected:",
|
"Connected:": "Connected:",
|
||||||
"Connection Method": "Connection Method",
|
"Connection Method": "Connection Method",
|
||||||
@@ -134,6 +136,8 @@
|
|||||||
"Copy Report to clipboard": "Copy Report to clipboard",
|
"Copy Report to clipboard": "Copy Report to clipboard",
|
||||||
"CouchDB Configuration": "CouchDB Configuration",
|
"CouchDB Configuration": "CouchDB Configuration",
|
||||||
"CouchDB Connection Tweak": "CouchDB Connection Tweak",
|
"CouchDB Connection Tweak": "CouchDB Connection Tweak",
|
||||||
|
"CouchDB validates the database name when you connect. The name must not be empty.": "CouchDB validates the database name when you connect. The name must not be empty.",
|
||||||
|
"Create or connect to database and continue": "Create or connect to database and continue",
|
||||||
"Create P2P remote": "Create P2P remote",
|
"Create P2P remote": "Create P2P remote",
|
||||||
"Cross-platform": "Cross-platform",
|
"Cross-platform": "Cross-platform",
|
||||||
"Current adapter: {adapter}": "Current adapter: {adapter}",
|
"Current adapter: {adapter}": "Current adapter: {adapter}",
|
||||||
@@ -236,6 +240,7 @@
|
|||||||
"End-to-End Encryption": "End-to-End Encryption",
|
"End-to-End Encryption": "End-to-End Encryption",
|
||||||
"Endpoint URL": "Endpoint URL",
|
"Endpoint URL": "Endpoint URL",
|
||||||
"Enhance chunk size": "Enhance chunk size",
|
"Enhance chunk size": "Enhance chunk size",
|
||||||
|
"Enter a complete HTTP or HTTPS URL.": "Enter a complete HTTP or HTTPS URL.",
|
||||||
"Enter a folder prefix (optional)": "Enter a folder prefix (optional)",
|
"Enter a folder prefix (optional)": "Enter a folder prefix (optional)",
|
||||||
"Enter Server Information": "Enter Server Information",
|
"Enter Server Information": "Enter Server Information",
|
||||||
"Enter Setup URI": "Enter Setup URI",
|
"Enter Setup URI": "Enter Setup URI",
|
||||||
@@ -303,6 +308,7 @@
|
|||||||
"Hidden Files": "Hidden Files",
|
"Hidden Files": "Hidden Files",
|
||||||
"Hide completely": "Hide completely",
|
"Hide completely": "Hide completely",
|
||||||
"Hide not applicable items": "Hide not applicable items",
|
"Hide not applicable items": "Hide not applicable items",
|
||||||
|
"Hide password": "Hide password",
|
||||||
"Higher (${local} > ${remote})": "Higher (${local} > ${remote})",
|
"Higher (${local} > ${remote})": "Higher (${local} > ${remote})",
|
||||||
"Highlight diff": "Highlight diff",
|
"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 to display network errors when the sync server is unreachable.": "How to display network errors when the sync server is unreachable.",
|
||||||
@@ -910,7 +916,9 @@
|
|||||||
"Same or local only": "Same or local only",
|
"Same or local only": "Same or local only",
|
||||||
"Save and Apply": "Save and Apply",
|
"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.",
|
"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.",
|
||||||
|
"Save without connecting": "Save without connecting",
|
||||||
"Saving will be performed forcefully after this number of seconds.": "Saving will be performed forcefully after this number of seconds.",
|
"Saving will be performed forcefully after this number of seconds.": "Saving will be performed forcefully after this number of seconds.",
|
||||||
|
"Saving without a successful connection test keeps this profile, but automatic synchronisation may fail until the connection is corrected.": "Saving without a successful connection test keeps this profile, but automatic synchronisation may fail until the connection is corrected.",
|
||||||
"Scan a QR Code (Recommended for mobile)": "Scan a QR Code (Recommended for mobile)",
|
"Scan a QR Code (Recommended for mobile)": "Scan a QR Code (Recommended for mobile)",
|
||||||
"Scan changes": "Scan changes",
|
"Scan changes": "Scan changes",
|
||||||
"Scan changes on customization sync": "Scan changes on customization sync",
|
"Scan changes on customization sync": "Scan changes on customization sync",
|
||||||
@@ -1019,6 +1027,7 @@
|
|||||||
"Show history": "Show history",
|
"Show history": "Show history",
|
||||||
"Show icon only": "Show icon only",
|
"Show icon only": "Show icon only",
|
||||||
"Show only notifications": "Show only notifications",
|
"Show only notifications": "Show only notifications",
|
||||||
|
"Show password": "Show password",
|
||||||
"Show status as icons only": "Show status as icons only",
|
"Show status as icons only": "Show status as icons only",
|
||||||
"Show status icon instead of file warnings banner": "Show status icon instead of file warnings banner",
|
"Show status icon instead of file warnings banner": "Show status icon instead of file warnings banner",
|
||||||
"Show status inside the editor": "Show status inside the editor",
|
"Show status inside the editor": "Show status inside the editor",
|
||||||
@@ -1060,6 +1069,7 @@
|
|||||||
"Syncing": "Syncing",
|
"Syncing": "Syncing",
|
||||||
"Syncing...": "Syncing...",
|
"Syncing...": "Syncing...",
|
||||||
"Target patterns": "Target patterns",
|
"Target patterns": "Target patterns",
|
||||||
|
"Test connection and save": "Test connection and save",
|
||||||
"Test Settings and Continue": "Test Settings and Continue",
|
"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.",
|
"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 test cannot add a signalling relay while P2P is active. Use the active relay settings, or disconnect P2P before testing.": "The connection test cannot add a signalling relay while P2P is active. Use the active relay settings, or disconnect P2P before testing.",
|
"The connection test cannot add a signalling relay while P2P is active. Use the active relay settings, or disconnect P2P before testing.": "The connection test cannot add a signalling relay while P2P is active. Use the active relay settings, or disconnect P2P before testing.",
|
||||||
@@ -1089,9 +1099,11 @@
|
|||||||
"This device": "This device",
|
"This device": "This device",
|
||||||
"This device name": "This device name",
|
"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 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 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.": "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.",
|
||||||
"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 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 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 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 optional check uses Obsidian's internal request API and sends the credentials above to the CouchDB server. Use it only with a server you trust; administrator access may be required.": "This optional check uses Obsidian's internal request API and sends the credentials above to the CouchDB server. Use it only with a server you trust; administrator access may be required.",
|
||||||
"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 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 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 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",
|
||||||
@@ -1462,5 +1474,6 @@
|
|||||||
"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 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 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."
|
"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.",
|
||||||
|
"you wanted(Thank you)!": "you wanted(Thank you)!"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
"(Obsolete) Use an old adapter for compatibility": "(Obsoleto) Usar adaptador antiguo",
|
"(Obsolete) Use an old adapter for compatibility": "(Obsoleto) Usar adaptador antiguo",
|
||||||
"(RegExp) Empty to sync all files. Set filter as a regular expression to limit synchronising files.": "(RegExp) Déjelo vacío para sincronizar todos los archivos. Defina un filtro como expresión regular para limitar los archivos que se sincronizan.",
|
"(RegExp) Empty to sync all files. Set filter as a regular expression to limit synchronising files.": "(RegExp) Déjelo vacío para sincronizar todos los archivos. Defina un filtro como expresión regular para limitar los archivos que se sincronizan.",
|
||||||
"(RegExp) If this is set, any changes to local and remote files that match this will be skipped.": "(RegExp) Si se establece, se omitirá cualquier cambio en archivos locales y remotos que coincida con este patrón.",
|
"(RegExp) If this is set, any changes to local and remote files that match this will be skipped.": "(RegExp) Si se establece, se omitirá cualquier cambio en archivos locales y remotos que coincida con este patrón.",
|
||||||
"(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.": "(Seleccione esto si ya utiliza la sincronización en otro ordenador o teléfono). Esta opción es adecuada si desea añadir este dispositivo a una configuración de LiveSync existente。",
|
"(Select this if another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.": "(Seleccione esto si ya utiliza la sincronización en otro ordenador o teléfono). Esta opción es adecuada si desea añadir este dispositivo a una configuración de LiveSync existente。",
|
||||||
"(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.": "(Seleccione esto si está configurando este dispositivo como el primer dispositivo de sincronización). Esta opción es adecuada si es nuevo en LiveSync y desea configurarlo desde cero。",
|
"(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.": "(Seleccione esto si está configurando este dispositivo como el primer dispositivo de sincronización). Esta opción es adecuada si es nuevo en LiveSync y desea configurarlo desde cero。",
|
||||||
"↑: Overwrite Remote": "↑: Sobrescribir remoto",
|
"↑: Overwrite Remote": "↑: Sobrescribir remoto",
|
||||||
"↓: Overwrite Local": "↓: Sobrescribir local",
|
"↓: Overwrite Local": "↓: Sobrescribir local",
|
||||||
@@ -90,6 +90,7 @@
|
|||||||
"Check": "Comprobar",
|
"Check": "Comprobar",
|
||||||
"Check and convert non-path-obfuscated files": "Comprobar y convertir archivos sin ofuscación de ruta",
|
"Check and convert non-path-obfuscated files": "Comprobar y convertir archivos sin ofuscación de ruta",
|
||||||
"Check for documents that have not been converted to path-obfuscated IDs and convert them if necessary.": "Comprueba los documentos que aún no se hayan convertido a identificadores con ruta ofuscada y conviértelos si es necesario.",
|
"Check for documents that have not been converted to path-obfuscated IDs and convert them if necessary.": "Comprueba los documentos que aún no se hayan convertido a identificadores con ruta ofuscada y conviértelos si es necesario.",
|
||||||
|
"Check server requirements": "Comprobar los requisitos del servidor",
|
||||||
"Checking connection... Please wait.": "Comprobando la conexión... Espera un momento.",
|
"Checking connection... Please wait.": "Comprobando la conexión... Espera un momento.",
|
||||||
"Chunks": "Fragmentos (chunks)",
|
"Chunks": "Fragmentos (chunks)",
|
||||||
"Close": "Cerrar",
|
"Close": "Cerrar",
|
||||||
@@ -122,6 +123,7 @@
|
|||||||
"Configure Remote": "Configurar remoto",
|
"Configure Remote": "Configurar remoto",
|
||||||
"Configure the same server information as your other devices again, manually, very advanced users only.": "Configure manualmente la misma información del servidor que en sus otros dispositivos. Solo para usuarios muy avanzados。",
|
"Configure the same server information as your other devices again, manually, very advanced users only.": "Configure manualmente la misma información del servidor que en sus otros dispositivos. Solo para usuarios muy avanzados。",
|
||||||
"Connect": "Conectar",
|
"Connect": "Conectar",
|
||||||
|
"Connect to existing database and continue": "Conectar a la base de datos existente y continuar",
|
||||||
"Connected to Signaling Server (as Peer ID: ${peerId})": "Conectado al servidor de señalización (como ID de par: ${peerId})",
|
"Connected to Signaling Server (as Peer ID: ${peerId})": "Conectado al servidor de señalización (como ID de par: ${peerId})",
|
||||||
"Connected:": "Conectadas:",
|
"Connected:": "Conectadas:",
|
||||||
"Connection Method": "Método de conexión",
|
"Connection Method": "Método de conexión",
|
||||||
@@ -135,6 +137,8 @@
|
|||||||
"Copy Report to clipboard": "Copiar el informe al portapapeles",
|
"Copy Report to clipboard": "Copiar el informe al portapapeles",
|
||||||
"CouchDB Configuration": "Configuración de CouchDB",
|
"CouchDB Configuration": "Configuración de CouchDB",
|
||||||
"CouchDB Connection Tweak": "Ajustes de conexión de CouchDB",
|
"CouchDB Connection Tweak": "Ajustes de conexión de CouchDB",
|
||||||
|
"CouchDB validates the database name when you connect. The name must not be empty.": "CouchDB valida el nombre de la base de datos al conectar. El nombre no puede estar vacío.",
|
||||||
|
"Create or connect to database and continue": "Crear o conectar a la base de datos y continuar",
|
||||||
"Create P2P remote": "Crear remoto P2P",
|
"Create P2P remote": "Crear remoto P2P",
|
||||||
"Cross-platform": "Multiplataforma",
|
"Cross-platform": "Multiplataforma",
|
||||||
"Current adapter: {adapter}": "Adaptador actual: {adapter}",
|
"Current adapter: {adapter}": "Adaptador actual: {adapter}",
|
||||||
@@ -177,7 +181,7 @@
|
|||||||
"Device Setup Method": "Método de configuración del dispositivo",
|
"Device Setup Method": "Método de configuración del dispositivo",
|
||||||
"Devices:": "Dispositivos:",
|
"Devices:": "Dispositivos:",
|
||||||
"Diagnostic RTCPeerConnection is enabled": "El RTCPeerConnection de diagnóstico está habilitado",
|
"Diagnostic RTCPeerConnection is enabled": "El RTCPeerConnection de diagnóstico está habilitado",
|
||||||
"dialog.yourLanguageAvailable": "Self-hosted LiveSync tenía traducciones para tu idioma, así que se ha activado el ajuste %{Display language}.\n\nNota: no todos los mensajes están traducidos. ¡Esperamos tus contribuciones!\nNota 2: si abres una incidencia, **vuelve antes a %{lang-def}** y luego haz las capturas de pantalla y recoge los mensajes y registros. Puedes hacerlo desde el diálogo de ajustes.\n¡Que lo disfrutes!",
|
"dialog.yourLanguageAvailable": "Self-hosted LiveSync tenía traducciones para tu idioma, así que se ha activado el ajuste %{Display Language}.\n\nNota: no todos los mensajes están traducidos. ¡Esperamos tus contribuciones!\nNota 2: si abres una incidencia, **vuelve antes a %{lang-def}** y luego haz las capturas de pantalla y recoge los mensajes y registros. Puedes hacerlo desde el diálogo de ajustes.\n¡Que lo disfrutes!",
|
||||||
"dialog.yourLanguageAvailable.btnRevertToDefault": "Mantener %{lang-def}",
|
"dialog.yourLanguageAvailable.btnRevertToDefault": "Mantener %{lang-def}",
|
||||||
"dialog.yourLanguageAvailable.Title": " ¡Hay traducción disponible!",
|
"dialog.yourLanguageAvailable.Title": " ¡Hay traducción disponible!",
|
||||||
"Diff": "Diferencias",
|
"Diff": "Diferencias",
|
||||||
@@ -237,6 +241,7 @@
|
|||||||
"End-to-End Encryption": "Cifrado de extremo a extremo",
|
"End-to-End Encryption": "Cifrado de extremo a extremo",
|
||||||
"Endpoint URL": "URL del endpoint",
|
"Endpoint URL": "URL del endpoint",
|
||||||
"Enhance chunk size": "Mejorar tamaño de chunks",
|
"Enhance chunk size": "Mejorar tamaño de chunks",
|
||||||
|
"Enter a complete HTTP or HTTPS URL.": "Introduce una URL HTTP o HTTPS completa.",
|
||||||
"Enter a folder prefix (optional)": "Introduce un prefijo de carpeta (opcional)",
|
"Enter a folder prefix (optional)": "Introduce un prefijo de carpeta (opcional)",
|
||||||
"Enter Server Information": "Introducir información del servidor",
|
"Enter Server Information": "Introducir información del servidor",
|
||||||
"Enter Setup URI": "Introducir el Setup URI",
|
"Enter Setup URI": "Introducir el Setup URI",
|
||||||
@@ -304,6 +309,7 @@
|
|||||||
"Hidden Files": "Archivos ocultos",
|
"Hidden Files": "Archivos ocultos",
|
||||||
"Hide completely": "Ocultar por completo",
|
"Hide completely": "Ocultar por completo",
|
||||||
"Hide not applicable items": "Ocultar elementos no aplicables",
|
"Hide not applicable items": "Ocultar elementos no aplicables",
|
||||||
|
"Hide password": "Ocultar contraseña",
|
||||||
"Higher (${local} > ${remote})": "Superior (${local} > ${remote})",
|
"Higher (${local} > ${remote})": "Superior (${local} > ${remote})",
|
||||||
"Highlight diff": "Resaltar las diferencias",
|
"Highlight diff": "Resaltar las diferencias",
|
||||||
"How to display network errors when the sync server is unreachable.": "Cómo mostrar los errores de red cuando el servidor de sincronización no está disponible.",
|
"How to display network errors when the sync server is unreachable.": "Cómo mostrar los errores de red cuando el servidor de sincronización no está disponible.",
|
||||||
@@ -593,7 +599,7 @@
|
|||||||
"obsidianLiveSyncSettingTab.logCheckingDbConfig": "Verificando la configuración de la base de datos",
|
"obsidianLiveSyncSettingTab.logCheckingDbConfig": "Verificando la configuración de la base de datos",
|
||||||
"obsidianLiveSyncSettingTab.logCheckPassphraseFailed": "ERROR: Error al comprobar la frase de contraseña con el servidor remoto:\n${db}.",
|
"obsidianLiveSyncSettingTab.logCheckPassphraseFailed": "ERROR: Error al comprobar la frase de contraseña con el servidor remoto:\n${db}.",
|
||||||
"obsidianLiveSyncSettingTab.logConfiguredDisabled": "Modo de sincronización configurado: DESACTIVADO",
|
"obsidianLiveSyncSettingTab.logConfiguredDisabled": "Modo de sincronización configurado: DESACTIVADO",
|
||||||
"obsidianLiveSyncSettingTab.logConfiguredLiveSync": "Modo de sincronización configurado: Sincronización en Vivo",
|
"obsidianLiveSyncSettingTab.logConfiguredLiveSync": "Modo de sincronización configurado: Sincronización en vivo",
|
||||||
"obsidianLiveSyncSettingTab.logConfiguredPeriodic": "Modo de sincronización configurado: Periódico",
|
"obsidianLiveSyncSettingTab.logConfiguredPeriodic": "Modo de sincronización configurado: Periódico",
|
||||||
"obsidianLiveSyncSettingTab.logCouchDbConfigFail": "Configuración de CouchDB: ${title} falló",
|
"obsidianLiveSyncSettingTab.logCouchDbConfigFail": "Configuración de CouchDB: ${title} falló",
|
||||||
"obsidianLiveSyncSettingTab.logCouchDbConfigSet": "Configuración de CouchDB: ${title} -> Establecer ${key} en ${value}",
|
"obsidianLiveSyncSettingTab.logCouchDbConfigSet": "Configuración de CouchDB: ${title} -> Establecer ${key} en ${value}",
|
||||||
@@ -648,8 +654,8 @@
|
|||||||
"obsidianLiveSyncSettingTab.nameHiddenFileSynchronization": "Sincronización de archivos ocultos",
|
"obsidianLiveSyncSettingTab.nameHiddenFileSynchronization": "Sincronización de archivos ocultos",
|
||||||
"obsidianLiveSyncSettingTab.nameManualSetup": "Configuración manual",
|
"obsidianLiveSyncSettingTab.nameManualSetup": "Configuración manual",
|
||||||
"obsidianLiveSyncSettingTab.nameTestConnection": "Probar conexión",
|
"obsidianLiveSyncSettingTab.nameTestConnection": "Probar conexión",
|
||||||
"obsidianLiveSyncSettingTab.nameTestDatabaseConnection": "Probar Conexión de Base de Datos",
|
"obsidianLiveSyncSettingTab.nameTestDatabaseConnection": "Probar conexión de base de datos",
|
||||||
"obsidianLiveSyncSettingTab.nameValidateDatabaseConfig": "Validar Configuración de la Base de Datos",
|
"obsidianLiveSyncSettingTab.nameValidateDatabaseConfig": "Validar configuración de la base de datos",
|
||||||
"obsidianLiveSyncSettingTab.okAdminPrivileges": "✔ Tienes privilegios de administrador.",
|
"obsidianLiveSyncSettingTab.okAdminPrivileges": "✔ Tienes privilegios de administrador.",
|
||||||
"obsidianLiveSyncSettingTab.okCorsCredentials": "✔ cors.credentials está correcto.",
|
"obsidianLiveSyncSettingTab.okCorsCredentials": "✔ cors.credentials está correcto.",
|
||||||
"obsidianLiveSyncSettingTab.okCorsCredentialsForOrigin": "CORS credenciales OK",
|
"obsidianLiveSyncSettingTab.okCorsCredentialsForOrigin": "CORS credenciales OK",
|
||||||
@@ -677,8 +683,8 @@
|
|||||||
"obsidianLiveSyncSettingTab.optionRebuildBoth": "Reconstructuir ambos desde este dispositivo",
|
"obsidianLiveSyncSettingTab.optionRebuildBoth": "Reconstructuir ambos desde este dispositivo",
|
||||||
"obsidianLiveSyncSettingTab.optionSaveOnlySettings": "(Peligro) Guardar solo configuración",
|
"obsidianLiveSyncSettingTab.optionSaveOnlySettings": "(Peligro) Guardar solo configuración",
|
||||||
"obsidianLiveSyncSettingTab.panelChangeLog": "Registro de cambios",
|
"obsidianLiveSyncSettingTab.panelChangeLog": "Registro de cambios",
|
||||||
"obsidianLiveSyncSettingTab.panelGeneralSettings": "Configuraciones Generales",
|
"obsidianLiveSyncSettingTab.panelGeneralSettings": "Configuraciones generales",
|
||||||
"obsidianLiveSyncSettingTab.panelPrivacyEncryption": "Privacidad y Cifrado",
|
"obsidianLiveSyncSettingTab.panelPrivacyEncryption": "Privacidad y cifrado",
|
||||||
"obsidianLiveSyncSettingTab.panelRemoteConfiguration": "Configuración remota",
|
"obsidianLiveSyncSettingTab.panelRemoteConfiguration": "Configuración remota",
|
||||||
"obsidianLiveSyncSettingTab.panelSetup": "Configuración",
|
"obsidianLiveSyncSettingTab.panelSetup": "Configuración",
|
||||||
"obsidianLiveSyncSettingTab.serverVersion": "Información del servidor: ${info}",
|
"obsidianLiveSyncSettingTab.serverVersion": "Información del servidor: ${info}",
|
||||||
@@ -706,7 +712,7 @@
|
|||||||
"obsidianLiveSyncSettingTab.titleSetupOtherDevices": "Para configurar otros dispositivos",
|
"obsidianLiveSyncSettingTab.titleSetupOtherDevices": "Para configurar otros dispositivos",
|
||||||
"obsidianLiveSyncSettingTab.titleSynchronizationMethod": "Método de sincronización",
|
"obsidianLiveSyncSettingTab.titleSynchronizationMethod": "Método de sincronización",
|
||||||
"obsidianLiveSyncSettingTab.titleSynchronizationPreset": "Preestablecimiento de sincronización",
|
"obsidianLiveSyncSettingTab.titleSynchronizationPreset": "Preestablecimiento de sincronización",
|
||||||
"obsidianLiveSyncSettingTab.titleSyncSettings": "Configuraciones de Sincronización",
|
"obsidianLiveSyncSettingTab.titleSyncSettings": "Configuraciones de sincronización",
|
||||||
"obsidianLiveSyncSettingTab.titleSyncSettingsViaMarkdown": "Configuración de sincronización a través de Markdown",
|
"obsidianLiveSyncSettingTab.titleSyncSettingsViaMarkdown": "Configuración de sincronización a través de Markdown",
|
||||||
"obsidianLiveSyncSettingTab.titleUpdateThinning": "Actualización de adelgazamiento",
|
"obsidianLiveSyncSettingTab.titleUpdateThinning": "Actualización de adelgazamiento",
|
||||||
"obsidianLiveSyncSettingTab.warnCorsOriginUnmatched": "⚠ El origen de CORS no coincide: {from}->{to}",
|
"obsidianLiveSyncSettingTab.warnCorsOriginUnmatched": "⚠ El origen de CORS no coincide: {from}->{to}",
|
||||||
@@ -903,7 +909,9 @@
|
|||||||
"Same or local only": "Igual o solo local",
|
"Same or local only": "Igual o solo local",
|
||||||
"Save and Apply": "Guardar y aplicar",
|
"Save and Apply": "Guardar y aplicar",
|
||||||
"Save settings to a markdown file. You will be notified when new settings arrive. You can set different files by the platform.": "Guardar configuración en archivo markdown. Se notificarán nuevos ajustes. Puede definir diferentes archivos por plataforma",
|
"Save settings to a markdown file. You will be notified when new settings arrive. You can set different files by the platform.": "Guardar configuración en archivo markdown. Se notificarán nuevos ajustes. Puede definir diferentes archivos por plataforma",
|
||||||
|
"Save without connecting": "Guardar sin conectar",
|
||||||
"Saving will be performed forcefully after this number of seconds.": "Guardado forzado tras esta cantidad de segundos",
|
"Saving will be performed forcefully after this number of seconds.": "Guardado forzado tras esta cantidad de segundos",
|
||||||
|
"Saving without a successful connection test keeps this profile, but automatic synchronisation may fail until the connection is corrected.": "Guardar sin una prueba de conexión correcta conserva este perfil, pero la sincronización automática puede fallar hasta que se corrija la conexión.",
|
||||||
"Scan a QR Code (Recommended for mobile)": "Escanear un código QR (recomendado para móviles)",
|
"Scan a QR Code (Recommended for mobile)": "Escanear un código QR (recomendado para móviles)",
|
||||||
"Scan changes": "Buscar cambios",
|
"Scan changes": "Buscar cambios",
|
||||||
"Scan changes on customization sync": "Escanear cambios en sincronización de personalización",
|
"Scan changes on customization sync": "Escanear cambios en sincronización de personalización",
|
||||||
@@ -1053,6 +1061,7 @@
|
|||||||
"Show history": "Mostrar el historial",
|
"Show history": "Mostrar el historial",
|
||||||
"Show icon only": "Mostrar solo el icono",
|
"Show icon only": "Mostrar solo el icono",
|
||||||
"Show only notifications": "Mostrar solo notificaciones",
|
"Show only notifications": "Mostrar solo notificaciones",
|
||||||
|
"Show password": "Mostrar contraseña",
|
||||||
"Show status as icons only": "Mostrar estado solo con íconos",
|
"Show status as icons only": "Mostrar estado solo con íconos",
|
||||||
"Show status icon instead of file warnings banner": "Mostrar icono de estado en lugar del banner de advertencia de archivos",
|
"Show status icon instead of file warnings banner": "Mostrar icono de estado en lugar del banner de advertencia de archivos",
|
||||||
"Show status inside the editor": "Mostrar estado dentro del editor",
|
"Show status inside the editor": "Mostrar estado dentro del editor",
|
||||||
@@ -1094,6 +1103,7 @@
|
|||||||
"Syncing": "Sincronización",
|
"Syncing": "Sincronización",
|
||||||
"Syncing...": "Sincronizando...",
|
"Syncing...": "Sincronizando...",
|
||||||
"Target patterns": "Patrones objetivo",
|
"Target patterns": "Patrones objetivo",
|
||||||
|
"Test connection and save": "Probar la conexión y guardar",
|
||||||
"Test Settings and Continue": "Probar los ajustes y continuar",
|
"Test Settings and Continue": "Probar los ajustes y continuar",
|
||||||
"Testing only - Resolve file conflicts by syncing newer copies of the file, this can overwrite modified files. Be Warned.": "Solo pruebas - Resolver conflictos sincronizando copias nuevas (puede sobrescribir modificaciones)",
|
"Testing only - Resolve file conflicts by syncing newer copies of the file, this can overwrite modified files. Be Warned.": "Solo pruebas - Resolver conflictos sincronizando copias nuevas (puede sobrescribir modificaciones)",
|
||||||
"The connection to the server has been configured successfully. As the next step,": "La conexión con el servidor se ha configurado correctamente. Como paso siguiente,",
|
"The connection to the server has been configured successfully. As the next step,": "La conexión con el servidor se ha configurado correctamente. Como paso siguiente,",
|
||||||
@@ -1122,9 +1132,11 @@
|
|||||||
"This device": "Este dispositivo",
|
"This device": "Este dispositivo",
|
||||||
"This device name": "Nombre de este dispositivo",
|
"This device name": "Nombre de este dispositivo",
|
||||||
"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.": "Esta función permite la sincronización directa entre dispositivos. No requiere servidor, pero ambos dispositivos deben estar en línea al mismo tiempo para que la sincronización se produzca, y algunas funciones pueden ser limitadas. La conexión a Internet solo se necesita para la señalización (detección de pares), no para la transferencia de datos。",
|
"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.": "Esta función permite la sincronización directa entre dispositivos. No requiere servidor, pero ambos dispositivos deben estar en línea al mismo tiempo para que la sincronización se produzca, y algunas funciones pueden ser limitadas. La conexión a Internet solo se necesita para la señalización (detección de pares), no para la transferencia de datos。",
|
||||||
|
"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.": "Esta primera configuración consta de varios pasos breves, ya que confirma el cifrado, el método de conexión y qué dispositivo aporta los datos iniciales. Una vez completada, los demás dispositivos podrán reutilizar un Setup URI.",
|
||||||
"This is an advanced option for users who do not have a URI or who wish to configure detailed settings.": "Esta es una opción avanzada para usuarios que no disponen de un URI o que desean configurar parámetros detallados。",
|
"This is an advanced option for users who do not have a URI or who wish to configure detailed settings.": "Esta es una opción avanzada para usuarios que no disponen de un URI o que desean configurar parámetros detallados。",
|
||||||
"This is an extremely powerful operation. We strongly recommend that you copy your Vault folder to a safe location.": "Esta es una operación extremadamente potente. Te recomendamos encarecidamente copiar la carpeta de tu Vault a un lugar seguro.",
|
"This is an extremely powerful operation. We strongly recommend that you copy your Vault folder to a safe location.": "Esta es una operación extremadamente potente. Te recomendamos encarecidamente copiar la carpeta de tu Vault a un lugar seguro.",
|
||||||
"This is the most suitable synchronisation method for the design. All functions are available. You must have set up a CouchDB instance.": "Este es el método de sincronización más adecuado para el diseño. Todas las funciones están disponibles. Debe tener configurada una instancia de CouchDB。",
|
"This is the most suitable synchronisation method for the design. All functions are available. You must have set up a CouchDB instance.": "Este es el método de sincronización más adecuado para el diseño. Todas las funciones están disponibles. Debe tener configurada una instancia de CouchDB。",
|
||||||
|
"This optional check uses Obsidian's internal request API and sends the credentials above to the CouchDB server. Use it only with a server you trust; administrator access may be required.": "Esta comprobación opcional usa la API interna de solicitudes de Obsidian y envía las credenciales anteriores al servidor CouchDB. Utilízala solo con un servidor de confianza; puede requerir acceso de administrador.",
|
||||||
"This passphrase will not be copied to another device. It will be set to `Default` until you configure it again.": "Esta frase no se copia a otros dispositivos. Usará `Default` hasta reconfigurar",
|
"This passphrase will not be copied to another device. It will be set to `Default` until you configure it again.": "Esta frase no se copia a otros dispositivos. Usará `Default` hasta reconfigurar",
|
||||||
"This password is used to encrypt the connection. Use something long enough.": "Esta contraseña se usa para cifrar la conexión. Usa algo suficientemente largo.",
|
"This password is used to encrypt the connection. Use something long enough.": "Esta contraseña se usa para cifrar la conexión. Usa algo suficientemente largo.",
|
||||||
"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": "Este procedimiento eliminará primero todos los datos de sincronización existentes en el servidor. A continuación, los datos del servidor se reconstruirán por completo usando el estado actual del Vault de este dispositivo (incluida su base de datos local) como",
|
"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": "Este procedimiento eliminará primero todos los datos de sincronización existentes en el servidor. A continuación, los datos del servidor se reconstruirán por completo usando el estado actual del Vault de este dispositivo (incluida su base de datos local) como",
|
||||||
@@ -1473,5 +1485,6 @@
|
|||||||
"You are adding this device to an existing synchronisation setup.": "Está añadiendo este dispositivo a una configuración de sincronización existente。",
|
"You are adding this device to an existing synchronisation setup.": "Está añadiendo este dispositivo a una configuración de sincronización existente。",
|
||||||
"You can configure in the Obsidian Plugin Settings.": "Puedes configurarlo en los ajustes del complemento de Obsidian.",
|
"You can configure in the Obsidian Plugin Settings.": "Puedes configurarlo en los ajustes del complemento de Obsidian.",
|
||||||
"You should create a new synchronisation destination and rebuild your data there.": "Deberías crear un nuevo destino de sincronización y reconstruir allí tus datos.",
|
"You should create a new synchronisation destination and rebuild your data there.": "Deberías crear un nuevo destino de sincronización y reconstruir allí tus datos.",
|
||||||
"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.": "Solo deberías realizar esta operación en circunstancias excepcionales: cuando los datos del servidor estén completamente corruptos, cuando ya no necesites los cambios de los demás dispositivos o cuando el tamaño de la base de datos sea inusualmente grande respecto al del Vault."
|
"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.": "Solo deberías realizar esta operación en circunstancias excepcionales: cuando los datos del servidor estén completamente corruptos, cuando ya no necesites los cambios de los demás dispositivos o cuando el tamaño de la base de datos sea inusualmente grande respecto al del Vault.",
|
||||||
|
"you wanted(Thank you)!": "tu solicitud (¡gracias!)"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
"(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.": "(別の PC やスマートフォンですでに同期を利用している場合に選択してください。)この端末を既存の LiveSync 構成に追加する場合に適しています。",
|
"(Select this if another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.": "(別の PC やスマートフォンですでに同期を利用している場合に選択してください。)この端末を既存の LiveSync 構成に追加する場合に適しています。",
|
||||||
"(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.": "(この端末を最初の同期端末として設定する場合に選択してください。)LiveSync を初めて利用し、最初から設定したい場合に適しています。",
|
"(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.": "(この端末を最初の同期端末として設定する場合に選択してください。)LiveSync を初めて利用し、最初から設定したい場合に適しています。",
|
||||||
"> [!INFO]- The connected devices have been detected as follows:\n${devices}": "> [!INFO]- 次の接続済みデバイスが検出されました:\n${devices}",
|
"> [!INFO]- The connected devices have been detected as follows:\n${devices}": "> [!INFO]- 次の接続済みデバイスが検出されました:\n${devices}",
|
||||||
"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.": "Setup URI は、サーバーアドレスと認証情報を含む 1 本の文字列です。サーバーのインストールスクリプトで生成された URI がある場合は、それを使うと簡単かつ安全に設定できます。",
|
"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.": "Setup URI は、サーバーアドレスと認証情報を含む 1 本の文字列です。サーバーのインストールスクリプトで生成された URI がある場合は、それを使うと簡単かつ安全に設定できます。",
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
"(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.": "(다른 컴퓨터나 스마트폰에서 이미 동기화를 사용 중이라면 선택하세요.) 이 기기를 기존 LiveSync 구성에 추가하려는 경우에 적합합니다.",
|
"(Select this if another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.": "(다른 컴퓨터나 스마트폰에서 이미 동기화를 사용 중이라면 선택하세요.) 이 기기를 기존 LiveSync 구성에 추가하려는 경우에 적합합니다.",
|
||||||
"(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.": "(이 기기를 첫 번째 동기화 기기로 설정한다면 선택하세요.) LiveSync를 처음 사용하며 처음부터 설정하려는 경우에 적합합니다.",
|
"(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.": "(이 기기를 첫 번째 동기화 기기로 설정한다면 선택하세요.) LiveSync를 처음 사용하며 처음부터 설정하려는 경우에 적합합니다.",
|
||||||
"↑: Overwrite Remote": "↑: 원격 덮어쓰기",
|
"↑: Overwrite Remote": "↑: 원격 덮어쓰기",
|
||||||
"↓: Overwrite Local": "↓: 로컬 덮어쓰기",
|
"↓: Overwrite Local": "↓: 로컬 덮어쓰기",
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
"(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) Оставьте пустым, чтобы синхронизировать все файлы. Укажите регулярное выражение, чтобы ограничить синхронизируемые файлы.",
|
"(RegExp) Empty to sync all files. Set filter as a regular expression to limit synchronising files.": "(RegExp) Оставьте пустым, чтобы синхронизировать все файлы. Укажите регулярное выражение, чтобы ограничить синхронизируемые файлы.",
|
||||||
"(RegExp) If this is set, any changes to local and remote files that match this will be skipped.": "(RegExp) Если задано, любые изменения локальных и удалённых файлов, соответствующих этому шаблону, будут пропускаться.",
|
"(RegExp) If this is set, any changes to local and remote files that match this will be skipped.": "(RegExp) Если задано, любые изменения локальных и удалённых файлов, соответствующих этому шаблону, будут пропускаться.",
|
||||||
"(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.": "(Выберите этот вариант, если вы уже используете синхронизацию на другом компьютере или смартфоне.) Он подходит, если вы хотите добавить это устройство к уже существующей конфигурации LiveSync。",
|
"(Select this if another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.": "(Выберите этот вариант, если вы уже используете синхронизацию на другом компьютере или смартфоне.) Он подходит, если вы хотите добавить это устройство к уже существующей конфигурации LiveSync。",
|
||||||
"(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.": "(Выберите этот вариант, если настраиваете это устройство как первое устройство синхронизации.) Он подходит, если вы впервые используете LiveSync и хотите настроить всё с нуля。",
|
"(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.": "(Выберите этот вариант, если настраиваете это устройство как первое устройство синхронизации.) Он подходит, если вы впервые используете LiveSync и хотите настроить всё с нуля。",
|
||||||
"> [!INFO]- The connected devices have been detected as follows:\n${devices}": "> [!INFO]- Обнаружены следующие подключённые устройства:\n${devices}",
|
"> [!INFO]- The connected devices have been detected as follows:\n${devices}": "> [!INFO]- Обнаружены следующие подключённые устройства:\n${devices}",
|
||||||
"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.": "Setup URI — это одна строка текста, содержащая адрес сервера и данные аутентификации. Если URI был создан скриптом установки сервера, его использование обеспечивает простую и безопасную настройку。",
|
"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.": "Setup URI — это одна строка текста, содержащая адрес сервера и данные аутентификации. Если URI был создан скриптом установки сервера, его использование обеспечивает простую и безопасную настройку。",
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
"(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.": "(如果你已經在另一台電腦或手機上使用同步,請選擇此項。)此選項適合將目前裝置加入既有 LiveSync 設定的使用者。",
|
"(Select this if another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.": "(如果你已經在另一台電腦或手機上使用同步,請選擇此項。)此選項適合將目前裝置加入既有 LiveSync 設定的使用者。",
|
||||||
"(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.": "(如果你正在將此裝置設定為第一台同步裝置,請選擇此項。)此選項適合初次使用 LiveSync,並希望從頭開始設定的使用者。",
|
"(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.": "(如果你正在將此裝置設定為第一台同步裝置,請選擇此項。)此選項適合初次使用 LiveSync,並希望從頭開始設定的使用者。",
|
||||||
"↑: Overwrite Remote": "↑:覆寫遠端",
|
"↑: Overwrite Remote": "↑:覆寫遠端",
|
||||||
"↓: Overwrite Local": "↓:覆寫本機",
|
"↓: Overwrite Local": "↓:覆寫本機",
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
"(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.": "(如果你已经在另一台电脑或手机上使用同步,请选择此项。)此选项适合将当前设备加入现有 LiveSync 配置的用户。",
|
"(Select this if another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.": "(如果你已经在另一台电脑或手机上使用同步,请选择此项。)此选项适合将当前设备加入现有 LiveSync 配置的用户。",
|
||||||
"(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.": "(如果你正在将此设备配置为第一台同步设备,请选择此项。)此选项适合初次使用 LiveSync,并希望从头开始配置的用户。",
|
"(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.": "(如果你正在将此设备配置为第一台同步设备,请选择此项。)此选项适合初次使用 LiveSync,并希望从头开始配置的用户。",
|
||||||
"> [!INFO]- The connected devices have been detected as follows:\n${devices}": "> [!INFO]- 已检测到以下已连接设备:\n${devices}",
|
"> [!INFO]- The connected devices have been detected as follows:\n${devices}": "> [!INFO]- 已检测到以下已连接设备:\n${devices}",
|
||||||
"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.": "Setup URI 是一段包含服务器地址与认证信息的文本。如果服务器安装脚本已经生成了 URI,使用它可以更简单且更安全地完成配置。",
|
"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.": "Setup URI 是一段包含服务器地址与认证信息的文本。如果服务器安装脚本已经生成了 URI,使用它可以更简单且更安全地完成配置。",
|
||||||
|
|||||||
@@ -283,7 +283,7 @@ xxhash64 (Fastest): xxhash64 (am schnellsten)
|
|||||||
"I am setting this up for the first time": "Ich richte dies zum ersten Mal ein"
|
"I am setting this up for the first time": "Ich richte dies zum ersten Mal ein"
|
||||||
"(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.": "(Wählen Sie dies, wenn Sie dieses Gerät als erstes Synchronisationsgerät einrichten.) Diese Option ist geeignet, wenn Sie LiveSync neu verwenden und von Grund auf einrichten möchten."
|
"(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.": "(Wählen Sie dies, wenn Sie dieses Gerät als erstes Synchronisationsgerät einrichten.) Diese Option ist geeignet, wenn Sie LiveSync neu verwenden und von Grund auf einrichten möchten."
|
||||||
"I am adding a device to an existing synchronisation setup": "Ich füge ein Gerät zu einer bestehenden Synchronisationseinrichtung hinzu"
|
"I am adding a device to an existing synchronisation setup": "Ich füge ein Gerät zu einer bestehenden Synchronisationseinrichtung hinzu"
|
||||||
"(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.": "(Wählen Sie dies, wenn Sie die Synchronisation bereits auf einem anderen Computer oder Smartphone verwenden.) Diese Option ist geeignet, wenn Sie dieses Gerät zu einer bestehenden LiveSync-Einrichtung hinzufügen möchten."
|
"(Select this if another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.": "(Wählen Sie dies, wenn Sie die Synchronisation bereits auf einem anderen Computer oder Smartphone verwenden.) Diese Option ist geeignet, wenn Sie dieses Gerät zu einer bestehenden LiveSync-Einrichtung hinzufügen möchten."
|
||||||
"Yes, I want to set up a new synchronisation": "Ja, ich möchte eine neue Synchronisation einrichten"
|
"Yes, I want to set up a new synchronisation": "Ja, ich möchte eine neue Synchronisation einrichten"
|
||||||
"Yes, I want to add this device to my existing synchronisation": "Ja, ich möchte dieses Gerät zu meiner bestehenden Synchronisation hinzufügen"
|
"Yes, I want to add this device to my existing synchronisation": "Ja, ich möchte dieses Gerät zu meiner bestehenden Synchronisation hinzufügen"
|
||||||
"No, please take me back": "Nein, bitte zurück"
|
"No, please take me back": "Nein, bitte zurück"
|
||||||
|
|||||||
@@ -129,6 +129,7 @@ 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.:
|
||||||
Check for documents that have not been converted to path-obfuscated IDs and
|
Check for documents that have not been converted to path-obfuscated IDs and
|
||||||
convert them if necessary.
|
convert them if necessary.
|
||||||
|
Check server requirements: Check server requirements
|
||||||
Checking connection... Please wait.: Checking connection... Please wait.
|
Checking connection... Please wait.: Checking connection... Please wait.
|
||||||
Chunks: Chunks
|
Chunks: Chunks
|
||||||
Close: Close
|
Close: Close
|
||||||
@@ -158,6 +159,7 @@ Configure And Change Remote: Configure And Change Remote
|
|||||||
Configure E2EE: Configure E2EE
|
Configure E2EE: Configure E2EE
|
||||||
Configure Remote: Configure Remote
|
Configure Remote: Configure Remote
|
||||||
Connect: Connect
|
Connect: Connect
|
||||||
|
Connect to existing database and continue: Connect to existing database and continue
|
||||||
"Connected to Signaling Server (as Peer ID: ${peerId})": "Connected to Signaling Server (as Peer ID: ${peerId})"
|
"Connected to Signaling Server (as Peer ID: ${peerId})": "Connected to Signaling Server (as Peer ID: ${peerId})"
|
||||||
"Connected:": "Connected:"
|
"Connected:": "Connected:"
|
||||||
Connection Settings: Connection Settings
|
Connection Settings: Connection Settings
|
||||||
@@ -167,7 +169,11 @@ Copy: Copy
|
|||||||
Copy Report to clipboard: Copy Report to clipboard
|
Copy Report to clipboard: Copy Report to clipboard
|
||||||
CouchDB Configuration: CouchDB Configuration
|
CouchDB Configuration: CouchDB Configuration
|
||||||
CouchDB Connection Tweak: CouchDB Connection Tweak
|
CouchDB Connection Tweak: CouchDB Connection Tweak
|
||||||
|
CouchDB validates the database name when you connect. The name must not be empty.:
|
||||||
|
CouchDB validates the database name when you connect. The name must not be
|
||||||
|
empty.
|
||||||
Create P2P remote: Create P2P remote
|
Create P2P remote: Create P2P remote
|
||||||
|
Create or connect to database and continue: Create or connect to database and continue
|
||||||
Cross-platform: Cross-platform
|
Cross-platform: Cross-platform
|
||||||
"Current adapter: {adapter}": "Current adapter: {adapter}"
|
"Current adapter: {adapter}": "Current adapter: {adapter}"
|
||||||
Custom Headers: Custom Headers
|
Custom Headers: Custom Headers
|
||||||
@@ -340,6 +346,7 @@ Encryption phassphrase. If changed, you should overwrite the server's database w
|
|||||||
End-to-End Encryption: End-to-End Encryption
|
End-to-End Encryption: End-to-End Encryption
|
||||||
Endpoint URL: Endpoint URL
|
Endpoint URL: Endpoint URL
|
||||||
Enhance chunk size: Enhance chunk size
|
Enhance chunk size: Enhance chunk size
|
||||||
|
Enter a complete HTTP or HTTPS URL.: Enter a complete HTTP or HTTPS URL.
|
||||||
Enter a folder prefix (optional): Enter a folder prefix (optional)
|
Enter a folder prefix (optional): Enter a folder prefix (optional)
|
||||||
Enter Setup URI: Enter Setup URI
|
Enter Setup URI: Enter Setup URI
|
||||||
Enter TURN credential: Enter TURN credential
|
Enter TURN credential: Enter TURN credential
|
||||||
@@ -402,6 +409,7 @@ Hidden file synchronization have been temporarily disabled. Please enable them a
|
|||||||
Hidden Files: Hidden Files
|
Hidden Files: Hidden Files
|
||||||
Hide completely: Hide completely
|
Hide completely: Hide completely
|
||||||
Hide not applicable items: Hide not applicable items
|
Hide not applicable items: Hide not applicable items
|
||||||
|
Hide password: Hide password
|
||||||
Higher (${local} > ${remote}): Higher (${local} > ${remote})
|
Higher (${local} > ${remote}): Higher (${local} > ${remote})
|
||||||
Highlight diff: Highlight diff
|
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 to display network errors when the sync server is unreachable.: How to display network errors when the sync server is unreachable.
|
||||||
@@ -1488,7 +1496,11 @@ 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.:
|
||||||
Save settings to a markdown file. You will be notified when new settings
|
Save settings to a markdown file. You will be notified when new settings
|
||||||
arrive. You can set different files by the platform.
|
arrive. You can set different files by the platform.
|
||||||
|
Save without connecting: Save without connecting
|
||||||
Saving will be performed forcefully after this number of seconds.: Saving will be performed forcefully after this number of seconds.
|
Saving will be performed forcefully after this number of seconds.: Saving will be performed forcefully after this number of seconds.
|
||||||
|
Saving without a successful connection test keeps this profile, but automatic synchronisation may fail until the connection is corrected.:
|
||||||
|
Saving without a successful connection test keeps this profile, but
|
||||||
|
automatic synchronisation may fail until the connection is corrected.
|
||||||
Scan changes: Scan changes
|
Scan changes: Scan changes
|
||||||
Scan changes on customization sync: Scan changes on customization sync
|
Scan changes on customization sync: Scan changes on customization sync
|
||||||
Scan customization automatically: Scan customization automatically
|
Scan customization automatically: Scan customization automatically
|
||||||
@@ -1750,6 +1762,7 @@ Sync: Sync
|
|||||||
Sync once: Sync once
|
Sync once: Sync once
|
||||||
Syncing...: Syncing...
|
Syncing...: Syncing...
|
||||||
Test Settings and Continue: Test Settings and Continue
|
Test Settings and Continue: Test Settings and Continue
|
||||||
|
Test connection and save: Test connection and save
|
||||||
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 connection to the server has been configured successfully. As the next
|
The connection to the server has been configured successfully. As the next
|
||||||
step,
|
step,
|
||||||
@@ -1800,6 +1813,7 @@ Show full banner: Show full banner
|
|||||||
Show history: Show history
|
Show history: Show history
|
||||||
Show icon only: Show icon only
|
Show icon only: Show icon only
|
||||||
Show only notifications: Show only notifications
|
Show only notifications: Show only notifications
|
||||||
|
Show password: Show password
|
||||||
Show status as icons only: Show status as icons only
|
Show status as icons only: Show status as icons only
|
||||||
Show status icon instead of file warnings banner: Show status icon instead of file warnings banner
|
Show status icon instead of file warnings banner: Show status icon instead of file warnings banner
|
||||||
Show status inside the editor: Show status inside the editor
|
Show status inside the editor: Show status inside the editor
|
||||||
@@ -1876,9 +1890,17 @@ This can isolate your connections between devices. Use the same Room ID for the
|
|||||||
the same devices.
|
the same devices.
|
||||||
This device: This device
|
This device: This device
|
||||||
This device name: This device name
|
This device name: This device name
|
||||||
|
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.:
|
||||||
|
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.
|
||||||
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 an extremely powerful operation. We strongly recommend that you copy
|
This is an extremely powerful operation. We strongly recommend that you copy
|
||||||
your Vault folder to a safe location.
|
your Vault folder to a safe location.
|
||||||
|
This optional check uses Obsidian's internal request API and sends the credentials above to the CouchDB server. Use it only with a server you trust; administrator access may be required.:
|
||||||
|
This optional check uses Obsidian's internal request API and sends the
|
||||||
|
credentials above to the CouchDB server. Use it only with a server you
|
||||||
|
trust; administrator access may be required.
|
||||||
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 passphrase will not be copied to another device. It will be set to
|
This passphrase will not be copied to another device. It will be set to
|
||||||
`Default` until you configure it again.
|
`Default` until you configure it again.
|
||||||
@@ -2071,7 +2093,7 @@ xxhash64 (Fastest): xxhash64 (Fastest)
|
|||||||
"I am setting this up for the first time": "I am setting this up for the first time"
|
"I am setting this up for the first time": "I am setting this up for the first time"
|
||||||
"(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."
|
"(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."
|
||||||
"I am adding a device to an existing synchronisation setup": "I am adding a device to an existing synchronisation setup"
|
"I am adding a device to an existing synchronisation setup": "I am adding a device to an existing synchronisation setup"
|
||||||
"(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 already have another synchronising device.) This option adds this device to the same synchronisation.": "(Select this if you already have another synchronising device.) This option adds this device to the same synchronisation."
|
||||||
"Yes, I want to set up a new synchronisation": "Yes, I want to set up a new synchronisation"
|
"Yes, I want to set up a new synchronisation": "Yes, I want to set up a new synchronisation"
|
||||||
"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 add this device to my existing synchronisation": "Yes, I want to add this device to my existing synchronisation"
|
||||||
"No, please take me back": "No, please take me back"
|
"No, please take me back": "No, please take me back"
|
||||||
@@ -2419,6 +2441,7 @@ Ui:
|
|||||||
Title: Choose a synchronisation remote
|
Title: Choose a synchronisation remote
|
||||||
|
|
||||||
You can configure in the Obsidian Plugin Settings.: You can configure in the Obsidian Plugin Settings.
|
You can configure in the Obsidian Plugin Settings.: You can configure in the Obsidian Plugin Settings.
|
||||||
|
"you wanted(Thank you)!": "you wanted(Thank you)!"
|
||||||
|
|
||||||
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 create a new synchronisation destination and rebuild your data
|
You should create a new synchronisation destination and rebuild your data
|
||||||
|
|||||||
@@ -132,6 +132,7 @@ Check and convert non-path-obfuscated files: Comprobar y convertir archivos sin
|
|||||||
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.:
|
||||||
Comprueba los documentos que aún no se hayan convertido a identificadores con
|
Comprueba los documentos que aún no se hayan convertido a identificadores con
|
||||||
ruta ofuscada y conviértelos si es necesario.
|
ruta ofuscada y conviértelos si es necesario.
|
||||||
|
Check server requirements: Comprobar los requisitos del servidor
|
||||||
Checking connection... Please wait.: Comprobando la conexión... Espera un momento.
|
Checking connection... Please wait.: Comprobando la conexión... Espera un momento.
|
||||||
Chunks: Fragmentos (chunks)
|
Chunks: Fragmentos (chunks)
|
||||||
Close: Cerrar
|
Close: Cerrar
|
||||||
@@ -166,6 +167,7 @@ Configure And Change Remote: Configurar y cambiar remoto
|
|||||||
Configure E2EE: Configurar E2EE
|
Configure E2EE: Configurar E2EE
|
||||||
Configure Remote: Configurar remoto
|
Configure Remote: Configurar remoto
|
||||||
Connect: Conectar
|
Connect: Conectar
|
||||||
|
Connect to existing database and continue: Conectar a la base de datos existente y continuar
|
||||||
"Connected to Signaling Server (as Peer ID: ${peerId})": "Conectado al servidor de señalización (como ID de par: ${peerId})"
|
"Connected to Signaling Server (as Peer ID: ${peerId})": "Conectado al servidor de señalización (como ID de par: ${peerId})"
|
||||||
"Connected:": "Conectadas:"
|
"Connected:": "Conectadas:"
|
||||||
Connection Settings: Ajustes de conexión
|
Connection Settings: Ajustes de conexión
|
||||||
@@ -176,6 +178,10 @@ Copy Report to clipboard: Copiar el informe al portapapeles
|
|||||||
CouchDB Configuration: Configuración de CouchDB
|
CouchDB Configuration: Configuración de CouchDB
|
||||||
CouchDB Connection Tweak: Ajustes de conexión de CouchDB
|
CouchDB Connection Tweak: Ajustes de conexión de CouchDB
|
||||||
Create P2P remote: Crear remoto P2P
|
Create P2P remote: Crear remoto P2P
|
||||||
|
CouchDB validates the database name when you connect. The name must not be empty.:
|
||||||
|
CouchDB valida el nombre de la base de datos al conectar. El nombre no puede
|
||||||
|
estar vacío.
|
||||||
|
Create or connect to database and continue: Crear o conectar a la base de datos y continuar
|
||||||
Cross-platform: Multiplataforma
|
Cross-platform: Multiplataforma
|
||||||
"Current adapter: {adapter}": "Adaptador actual: {adapter}"
|
"Current adapter: {adapter}": "Adaptador actual: {adapter}"
|
||||||
Custom Headers: Encabezados personalizados
|
Custom Headers: Encabezados personalizados
|
||||||
@@ -224,7 +230,7 @@ dialog:
|
|||||||
yourLanguageAvailable:
|
yourLanguageAvailable:
|
||||||
_value: >-
|
_value: >-
|
||||||
Self-hosted LiveSync tenía traducciones para tu idioma, así que se ha
|
Self-hosted LiveSync tenía traducciones para tu idioma, así que se ha
|
||||||
activado el ajuste %{Display language}.
|
activado el ajuste %{Display Language}.
|
||||||
|
|
||||||
|
|
||||||
Nota: no todos los mensajes están traducidos. ¡Esperamos tus
|
Nota: no todos los mensajes están traducidos. ¡Esperamos tus
|
||||||
@@ -345,6 +351,7 @@ Encryption phassphrase. If changed, you should overwrite the server's database w
|
|||||||
End-to-End Encryption: Cifrado de extremo a extremo
|
End-to-End Encryption: Cifrado de extremo a extremo
|
||||||
Endpoint URL: URL del endpoint
|
Endpoint URL: URL del endpoint
|
||||||
Enhance chunk size: Mejorar tamaño de chunks
|
Enhance chunk size: Mejorar tamaño de chunks
|
||||||
|
Enter a complete HTTP or HTTPS URL.: Introduce una URL HTTP o HTTPS completa.
|
||||||
Enter a folder prefix (optional): Introduce un prefijo de carpeta (opcional)
|
Enter a folder prefix (optional): Introduce un prefijo de carpeta (opcional)
|
||||||
Enter Setup URI: Introducir el Setup URI
|
Enter Setup URI: Introducir el Setup URI
|
||||||
Enter TURN credential: Introduce la credencial de TURN
|
Enter TURN credential: Introduce la credencial de TURN
|
||||||
@@ -425,6 +432,7 @@ Hidden file synchronization have been temporarily disabled. Please enable them a
|
|||||||
Hidden Files: Archivos ocultos
|
Hidden Files: Archivos ocultos
|
||||||
Hide completely: Ocultar por completo
|
Hide completely: Ocultar por completo
|
||||||
Hide not applicable items: Ocultar elementos no aplicables
|
Hide not applicable items: Ocultar elementos no aplicables
|
||||||
|
Hide password: Ocultar contraseña
|
||||||
Higher (${local} > ${remote}): Superior (${local} > ${remote})
|
Higher (${local} > ${remote}): Superior (${local} > ${remote})
|
||||||
Highlight diff: Resaltar las diferencias
|
Highlight diff: Resaltar las diferencias
|
||||||
How to display network errors when the sync server is unreachable.:
|
How to display network errors when the sync server is unreachable.:
|
||||||
@@ -1518,7 +1526,7 @@ obsidianLiveSyncSettingTab:
|
|||||||
ERROR: Error al comprobar la frase de contraseña con el servidor remoto:
|
ERROR: Error al comprobar la frase de contraseña con el servidor remoto:
|
||||||
${db}.
|
${db}.
|
||||||
logConfiguredDisabled: "Modo de sincronización configurado: DESACTIVADO"
|
logConfiguredDisabled: "Modo de sincronización configurado: DESACTIVADO"
|
||||||
logConfiguredLiveSync: "Modo de sincronización configurado: Sincronización en Vivo"
|
logConfiguredLiveSync: "Modo de sincronización configurado: Sincronización en vivo"
|
||||||
logConfiguredPeriodic: "Modo de sincronización configurado: Periódico"
|
logConfiguredPeriodic: "Modo de sincronización configurado: Periódico"
|
||||||
logCouchDbConfigFail: "Configuración de CouchDB: ${title} falló"
|
logCouchDbConfigFail: "Configuración de CouchDB: ${title} falló"
|
||||||
logCouchDbConfigSet: "Configuración de CouchDB: ${title} -> Establecer ${key} en ${value}"
|
logCouchDbConfigSet: "Configuración de CouchDB: ${title} -> Establecer ${key} en ${value}"
|
||||||
@@ -1656,8 +1664,8 @@ obsidianLiveSyncSettingTab:
|
|||||||
nameHiddenFileSynchronization: Sincronización de archivos ocultos
|
nameHiddenFileSynchronization: Sincronización de archivos ocultos
|
||||||
nameManualSetup: Configuración manual
|
nameManualSetup: Configuración manual
|
||||||
nameTestConnection: Probar conexión
|
nameTestConnection: Probar conexión
|
||||||
nameTestDatabaseConnection: Probar Conexión de Base de Datos
|
nameTestDatabaseConnection: Probar conexión de base de datos
|
||||||
nameValidateDatabaseConfig: Validar Configuración de la Base de Datos
|
nameValidateDatabaseConfig: Validar configuración de la base de datos
|
||||||
okAdminPrivileges: ✔ Tienes privilegios de administrador.
|
okAdminPrivileges: ✔ Tienes privilegios de administrador.
|
||||||
okCorsCredentials: ✔ cors.credentials está correcto.
|
okCorsCredentials: ✔ cors.credentials está correcto.
|
||||||
okCorsCredentialsForOrigin: CORS credenciales OK
|
okCorsCredentialsForOrigin: CORS credenciales OK
|
||||||
@@ -1684,8 +1692,8 @@ obsidianLiveSyncSettingTab:
|
|||||||
optionRebuildBoth: Reconstructuir ambos desde este dispositivo
|
optionRebuildBoth: Reconstructuir ambos desde este dispositivo
|
||||||
optionSaveOnlySettings: (Peligro) Guardar solo configuración
|
optionSaveOnlySettings: (Peligro) Guardar solo configuración
|
||||||
panelChangeLog: Registro de cambios
|
panelChangeLog: Registro de cambios
|
||||||
panelGeneralSettings: Configuraciones Generales
|
panelGeneralSettings: Configuraciones generales
|
||||||
panelPrivacyEncryption: Privacidad y Cifrado
|
panelPrivacyEncryption: Privacidad y cifrado
|
||||||
panelRemoteConfiguration: Configuración remota
|
panelRemoteConfiguration: Configuración remota
|
||||||
panelSetup: Configuración
|
panelSetup: Configuración
|
||||||
titleAppearance: Apariencia
|
titleAppearance: Apariencia
|
||||||
@@ -1711,7 +1719,7 @@ obsidianLiveSyncSettingTab:
|
|||||||
titleSetupOtherDevices: Para configurar otros dispositivos
|
titleSetupOtherDevices: Para configurar otros dispositivos
|
||||||
titleSynchronizationMethod: Método de sincronización
|
titleSynchronizationMethod: Método de sincronización
|
||||||
titleSynchronizationPreset: Preestablecimiento de sincronización
|
titleSynchronizationPreset: Preestablecimiento de sincronización
|
||||||
titleSyncSettings: Configuraciones de Sincronización
|
titleSyncSettings: Configuraciones de sincronización
|
||||||
titleSyncSettingsViaMarkdown: Configuración de sincronización a través de Markdown
|
titleSyncSettingsViaMarkdown: Configuración de sincronización a través de Markdown
|
||||||
titleUpdateThinning: Actualización de adelgazamiento
|
titleUpdateThinning: Actualización de adelgazamiento
|
||||||
warnCorsOriginUnmatched: "⚠ El origen de CORS no coincide: {from}->{to}"
|
warnCorsOriginUnmatched: "⚠ El origen de CORS no coincide: {from}->{to}"
|
||||||
@@ -1804,7 +1812,11 @@ Restore or reconstruct local database from remote.: Restaura o reconstruye la ba
|
|||||||
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.:
|
||||||
Guardar configuración en archivo markdown. Se notificarán nuevos ajustes.
|
Guardar configuración en archivo markdown. Se notificarán nuevos ajustes.
|
||||||
Puede definir diferentes archivos por plataforma
|
Puede definir diferentes archivos por plataforma
|
||||||
|
Save without connecting: Guardar sin conectar
|
||||||
Saving will be performed forcefully after this number of seconds.: Guardado forzado tras esta cantidad de segundos
|
Saving will be performed forcefully after this number of seconds.: Guardado forzado tras esta cantidad de segundos
|
||||||
|
Saving without a successful connection test keeps this profile, but automatic synchronisation may fail until the connection is corrected.:
|
||||||
|
Guardar sin una prueba de conexión correcta conserva este perfil, pero la
|
||||||
|
sincronización automática puede fallar hasta que se corrija la conexión.
|
||||||
Scan changes on customization sync: Escanear cambios en sincronización de personalización
|
Scan changes on customization sync: Escanear cambios en sincronización de personalización
|
||||||
Scan customization automatically: Escanear personalización automáticamente
|
Scan customization automatically: Escanear personalización automáticamente
|
||||||
Scan customization before replicating.: Escanear personalización antes de replicar
|
Scan customization before replicating.: Escanear personalización antes de replicar
|
||||||
@@ -1910,6 +1922,7 @@ Show full banner: Mostrar banner completo
|
|||||||
Show history: Mostrar el historial
|
Show history: Mostrar el historial
|
||||||
Show icon only: Mostrar solo el icono
|
Show icon only: Mostrar solo el icono
|
||||||
Show only notifications: Mostrar solo notificaciones
|
Show only notifications: Mostrar solo notificaciones
|
||||||
|
Show password: Mostrar contraseña
|
||||||
Show status as icons only: Mostrar estado solo con íconos
|
Show status as icons only: Mostrar estado solo con íconos
|
||||||
Show status icon instead of file warnings banner: Mostrar icono de estado en lugar del banner de advertencia de archivos
|
Show status icon instead of file warnings banner: Mostrar icono de estado en lugar del banner de advertencia de archivos
|
||||||
Show status inside the editor: Mostrar estado dentro del editor
|
Show status inside the editor: Mostrar estado dentro del editor
|
||||||
@@ -1960,6 +1973,7 @@ Syncing:
|
|||||||
"": Sincronizando...
|
"": Sincronizando...
|
||||||
Target patterns: Patrones objetivo
|
Target patterns: Patrones objetivo
|
||||||
Test Settings and Continue: Probar los ajustes y continuar
|
Test Settings and Continue: Probar los ajustes y continuar
|
||||||
|
Test connection and save: Probar la conexión y guardar
|
||||||
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.:
|
||||||
Solo pruebas - Resolver conflictos sincronizando copias nuevas (puede
|
Solo pruebas - Resolver conflictos sincronizando copias nuevas (puede
|
||||||
sobrescribir modificaciones)
|
sobrescribir modificaciones)
|
||||||
@@ -2022,9 +2036,17 @@ This can isolate your connections between devices. Use the same Room ID for the
|
|||||||
para los mismos dispositivos.
|
para los mismos dispositivos.
|
||||||
This device: Este dispositivo
|
This device: Este dispositivo
|
||||||
This device name: Nombre de este dispositivo
|
This device name: Nombre de este dispositivo
|
||||||
|
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.:
|
||||||
|
Esta primera configuración consta de varios pasos breves, ya que confirma el
|
||||||
|
cifrado, el método de conexión y qué dispositivo aporta los datos iniciales.
|
||||||
|
Una vez completada, los demás dispositivos podrán reutilizar un Setup URI.
|
||||||
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.:
|
||||||
Esta es una operación extremadamente potente. Te recomendamos encarecidamente
|
Esta es una operación extremadamente potente. Te recomendamos encarecidamente
|
||||||
copiar la carpeta de tu Vault a un lugar seguro.
|
copiar la carpeta de tu Vault a un lugar seguro.
|
||||||
|
This optional check uses Obsidian's internal request API and sends the credentials above to the CouchDB server. Use it only with a server you trust; administrator access may be required.:
|
||||||
|
Esta comprobación opcional usa la API interna de solicitudes de Obsidian y
|
||||||
|
envía las credenciales anteriores al servidor CouchDB. Utilízala solo con un
|
||||||
|
servidor de confianza; puede requerir acceso de administrador.
|
||||||
This passphrase will not be copied to another device. It will be set to `Default` until you configure it again.: Esta frase no se copia a otros dispositivos. Usará `Default` hasta reconfigurar
|
This passphrase will not be copied to another device. It will be set to `Default` until you configure it again.: Esta frase no se copia a otros dispositivos. Usará `Default` hasta reconfigurar
|
||||||
This password is used to encrypt the connection. Use something long enough.: Esta contraseña se usa para cifrar la conexión. Usa algo suficientemente largo.
|
This password is used to encrypt the connection. Use something long enough.: Esta contraseña se usa para cifrar la conexión. Usa algo suficientemente largo.
|
||||||
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:
|
||||||
@@ -2610,7 +2632,7 @@ xxhash64 (Fastest): xxhash64 (el más rápido)
|
|||||||
"I am adding a device to an existing synchronisation setup":
|
"I am adding a device to an existing synchronisation setup":
|
||||||
"Estoy agregando un dispositivo a una configuración de sincronización
|
"Estoy agregando un dispositivo a una configuración de sincronización
|
||||||
existente"
|
existente"
|
||||||
"(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 another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.":
|
||||||
"(Seleccione esto si ya utiliza la sincronización en otro ordenador o
|
"(Seleccione esto si ya utiliza la sincronización en otro ordenador o
|
||||||
teléfono). Esta opción es adecuada si desea añadir este dispositivo a una
|
teléfono). Esta opción es adecuada si desea añadir este dispositivo a una
|
||||||
configuración de LiveSync existente。"
|
configuración de LiveSync existente。"
|
||||||
@@ -2666,6 +2688,7 @@ xxhash64 (Fastest): xxhash64 (el más rápido)
|
|||||||
limitadas. La conexión a Internet solo se necesita para la señalización
|
limitadas. La conexión a Internet solo se necesita para la señalización
|
||||||
(detección de pares), no para la transferencia de datos。"
|
(detección de pares), no para la transferencia de datos。"
|
||||||
You can configure in the Obsidian Plugin Settings.: Puedes configurarlo en los ajustes del complemento de Obsidian.
|
You can configure in the Obsidian Plugin Settings.: Puedes configurarlo en los ajustes del complemento de Obsidian.
|
||||||
|
"you wanted(Thank you)!": "tu solicitud (¡gracias!)"
|
||||||
You should create a new synchronisation destination and rebuild your data there.: Deberías crear un nuevo destino de sincronización y reconstruir allí tus datos.
|
You should create a new synchronisation destination and rebuild your data there.: Deberías crear un nuevo destino de sincronización y reconstruir allí tus datos.
|
||||||
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.:
|
||||||
"Solo deberías realizar esta operación en circunstancias excepcionales: cuando
|
"Solo deberías realizar esta operación en circunstancias excepcionales: cuando
|
||||||
|
|||||||
@@ -1186,7 +1186,7 @@ The minimum interval for automatic synchronisation on event.: イベント発生
|
|||||||
"I am setting this up for the first time": "はじめて設定します"
|
"I am setting this up for the first time": "はじめて設定します"
|
||||||
"(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.": "(この端末を最初の同期端末として設定する場合に選択してください。)LiveSync を初めて利用し、最初から設定したい場合に適しています。"
|
"(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.": "(この端末を最初の同期端末として設定する場合に選択してください。)LiveSync を初めて利用し、最初から設定したい場合に適しています。"
|
||||||
"I am adding a device to an existing synchronisation setup": "既存の同期構成に端末を追加します"
|
"I am adding a device to an existing synchronisation setup": "既存の同期構成に端末を追加します"
|
||||||
"(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.": "(別の PC やスマートフォンですでに同期を利用している場合に選択してください。)この端末を既存の LiveSync 構成に追加する場合に適しています。"
|
"(Select this if another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.": "(別の PC やスマートフォンですでに同期を利用している場合に選択してください。)この端末を既存の LiveSync 構成に追加する場合に適しています。"
|
||||||
"Yes, I want to set up a new synchronisation": "はい、新しい同期を設定します"
|
"Yes, I want to set up a new synchronisation": "はい、新しい同期を設定します"
|
||||||
"Yes, I want to add this device to my existing synchronisation": "はい、この端末を既存の同期に追加します"
|
"Yes, I want to add this device to my existing synchronisation": "はい、この端末を既存の同期に追加します"
|
||||||
"No, please take me back": "いいえ、前に戻ります"
|
"No, please take me back": "いいえ、前に戻ります"
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
(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.: (다른 컴퓨터나 스마트폰에서 이미 동기화를 사용 중이라면 선택하세요.) 이 기기를 기존 LiveSync 구성에 추가하려는 경우에 적합합니다.
|
(Select this if another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.: (다른 컴퓨터나 스마트폰에서 이미 동기화를 사용 중이라면 선택하세요.) 이 기기를 기존 LiveSync 구성에 추가하려는 경우에 적합합니다.
|
||||||
(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.: (이 기기를 첫 번째 동기화 기기로 설정한다면 선택하세요.) LiveSync를 처음 사용하며 처음부터 설정하려는 경우에 적합합니다.
|
(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.: (이 기기를 첫 번째 동기화 기기로 설정한다면 선택하세요.) LiveSync를 처음 사용하며 처음부터 설정하려는 경우에 적합합니다.
|
||||||
"↑: Overwrite Remote": "↑: 원격 덮어쓰기"
|
"↑: Overwrite Remote": "↑: 원격 덮어쓰기"
|
||||||
"↓: Overwrite Local": "↓: 로컬 덮어쓰기"
|
"↓: Overwrite Local": "↓: 로컬 덮어쓰기"
|
||||||
|
|||||||
@@ -1058,7 +1058,7 @@ xxhash64 (Fastest): xxhash64 (самый быстрый)
|
|||||||
"I am setting this up for the first time": "Я настраиваю это впервые"
|
"I am setting this up for the first time": "Я настраиваю это впервые"
|
||||||
"(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.": "(Выберите этот вариант, если настраиваете это устройство как первое устройство синхронизации.) Он подходит, если вы впервые используете LiveSync и хотите настроить всё с нуля。"
|
"(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.": "(Выберите этот вариант, если настраиваете это устройство как первое устройство синхронизации.) Он подходит, если вы впервые используете LiveSync и хотите настроить всё с нуля。"
|
||||||
"I am adding a device to an existing synchronisation setup": "Я добавляю устройство к существующей настройке синхронизации"
|
"I am adding a device to an existing synchronisation setup": "Я добавляю устройство к существующей настройке синхронизации"
|
||||||
"(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.": "(Выберите этот вариант, если вы уже используете синхронизацию на другом компьютере или смартфоне.) Он подходит, если вы хотите добавить это устройство к уже существующей конфигурации LiveSync。"
|
"(Select this if another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.": "(Выберите этот вариант, если вы уже используете синхронизацию на другом компьютере или смартфоне.) Он подходит, если вы хотите добавить это устройство к уже существующей конфигурации LiveSync。"
|
||||||
"Yes, I want to set up a new synchronisation": "Да, я хочу настроить новую синхронизацию"
|
"Yes, I want to set up a new synchronisation": "Да, я хочу настроить новую синхронизацию"
|
||||||
"Yes, I want to add this device to my existing synchronisation": "Да, я хочу добавить это устройство к существующей синхронизации"
|
"Yes, I want to add this device to my existing synchronisation": "Да, я хочу добавить это устройство к существующей синхронизации"
|
||||||
"No, please take me back": "Нет, верните меня назад"
|
"No, please take me back": "Нет, верните меня назад"
|
||||||
|
|||||||
@@ -1667,7 +1667,7 @@ xxhash64 (Fastest): xxhash64(最快)
|
|||||||
"I am setting this up for the first time": "我是第一次進行設定"
|
"I am setting this up for the first time": "我是第一次進行設定"
|
||||||
"(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.": "(如果你正在將此裝置設定為第一台同步裝置,請選擇此項。)此選項適合初次使用 LiveSync,並希望從頭開始設定的使用者。"
|
"(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.": "(如果你正在將此裝置設定為第一台同步裝置,請選擇此項。)此選項適合初次使用 LiveSync,並希望從頭開始設定的使用者。"
|
||||||
"I am adding a device to an existing synchronisation setup": "我要將裝置加入既有同步設定"
|
"I am adding a device to an existing synchronisation setup": "我要將裝置加入既有同步設定"
|
||||||
"(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.": "(如果你已經在另一台電腦或手機上使用同步,請選擇此項。)此選項適合將目前裝置加入既有 LiveSync 設定的使用者。"
|
"(Select this if another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.": "(如果你已經在另一台電腦或手機上使用同步,請選擇此項。)此選項適合將目前裝置加入既有 LiveSync 設定的使用者。"
|
||||||
"Yes, I want to set up a new synchronisation": "是的,我要設定新的同步"
|
"Yes, I want to set up a new synchronisation": "是的,我要設定新的同步"
|
||||||
"Yes, I want to add this device to my existing synchronisation": "是的,我要把這台裝置加入既有同步"
|
"Yes, I want to add this device to my existing synchronisation": "是的,我要把這台裝置加入既有同步"
|
||||||
"No, please take me back": "不,返回上一步"
|
"No, please take me back": "不,返回上一步"
|
||||||
|
|||||||
@@ -1568,7 +1568,7 @@ xxhash64 (Fastest): xxhash64(最快)
|
|||||||
"I am setting this up for the first time": "我是第一次进行设置"
|
"I am setting this up for the first time": "我是第一次进行设置"
|
||||||
"(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.": "(如果你正在将此设备配置为第一台同步设备,请选择此项。)此选项适合初次使用 LiveSync,并希望从头开始配置的用户。"
|
"(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.": "(如果你正在将此设备配置为第一台同步设备,请选择此项。)此选项适合初次使用 LiveSync,并希望从头开始配置的用户。"
|
||||||
"I am adding a device to an existing synchronisation setup": "我要将设备加入现有同步配置"
|
"I am adding a device to an existing synchronisation setup": "我要将设备加入现有同步配置"
|
||||||
"(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.": "(如果你已经在另一台电脑或手机上使用同步,请选择此项。)此选项适合将当前设备加入现有 LiveSync 配置的用户。"
|
"(Select this if another device is already using LiveSync.) This option adds this device to that existing synchronisation setup.": "(如果你已经在另一台电脑或手机上使用同步,请选择此项。)此选项适合将当前设备加入现有 LiveSync 配置的用户。"
|
||||||
"Yes, I want to set up a new synchronisation": "是的,我要配置新的同步"
|
"Yes, I want to set up a new synchronisation": "是的,我要配置新的同步"
|
||||||
"Yes, I want to add this device to my existing synchronisation": "是的,我要把这台设备加入现有同步"
|
"Yes, I want to add this device to my existing synchronisation": "是的,我要把这台设备加入现有同步"
|
||||||
"No, please take me back": "不,返回上一步"
|
"No, please take me back": "不,返回上一步"
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ export function paneHatch(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement,
|
|||||||
.setDisabled(false)
|
.setDisabled(false)
|
||||||
.onClick(() => {
|
.onClick(() => {
|
||||||
this.closeSetting();
|
this.closeSetting();
|
||||||
eventHub.emitEvent(EVENT_REQUEST_RUN_DOCTOR, "you wanted(Thank you)!");
|
eventHub.emitEvent(EVENT_REQUEST_RUN_DOCTOR, $msg("you wanted(Thank you)!"));
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
new Setting(paneEl)
|
new Setting(paneEl)
|
||||||
|
|||||||
@@ -59,7 +59,7 @@
|
|||||||
bind:value={userType}
|
bind:value={userType}
|
||||||
>
|
>
|
||||||
{translateMessage(
|
{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."
|
"(Select this if you already have another synchronising device.) This option adds this device to the same synchronisation."
|
||||||
)}
|
)}
|
||||||
</Option>
|
</Option>
|
||||||
</Options>
|
</Options>
|
||||||
|
|||||||
@@ -48,80 +48,94 @@
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<DialogHeader title={translateMessage("End-to-End Encryption")} />
|
<div class="sls-e2ee-dialog">
|
||||||
<Guidance>{translateMessage("Please configure your end-to-end encryption settings.")}</Guidance>
|
<DialogHeader title={translateMessage("End-to-End Encryption")} />
|
||||||
<InputRow label={translateMessage("End-to-End Encryption")}>
|
<Guidance>{translateMessage("Please configure your end-to-end encryption settings.")}</Guidance>
|
||||||
<input type="checkbox" bind:checked={encryptionSettings.encrypt} />
|
<InputRow label={translateMessage("End-to-End Encryption")}>
|
||||||
<Password
|
<input type="checkbox" bind:checked={encryptionSettings.encrypt} />
|
||||||
name="e2ee-passphrase"
|
|
||||||
placeholder={translateMessage("Enter your passphrase")}
|
|
||||||
bind:value={encryptionSettings.passphrase}
|
|
||||||
disabled={!encryptionSettings.encrypt}
|
|
||||||
required={encryptionSettings.encrypt}
|
|
||||||
/>
|
|
||||||
</InputRow>
|
|
||||||
<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 />
|
|
||||||
{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>
|
|
||||||
{translateMessage("This setting must be the same even when connecting to multiple synchronisation destinations.")}
|
|
||||||
</InfoNote>
|
|
||||||
<InputRow label={translateMessage("Obfuscate Properties")}>
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
bind:checked={encryptionSettings.usePathObfuscation}
|
|
||||||
disabled={!encryptionSettings.encrypt}
|
|
||||||
/>
|
|
||||||
</InputRow>
|
|
||||||
|
|
||||||
<InfoNote>
|
|
||||||
{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={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>
|
|
||||||
{/each}
|
|
||||||
</select>
|
|
||||||
</InputRow>
|
</InputRow>
|
||||||
<InfoNote>
|
<InfoNote title={translateMessage("Strongly Recommended")}>
|
||||||
{translateMessage(
|
{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.",
|
"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."
|
||||||
{ algorithm: E2EEAlgorithmNames[DEFAULT_SETTINGS.E2EEAlgorithm] }
|
)}
|
||||||
|
<br />
|
||||||
|
{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>
|
||||||
|
{#if encryptionSettings.encrypt}
|
||||||
|
<InputRow label={translateMessage("Passphrase")}>
|
||||||
|
<Password
|
||||||
|
name="e2ee-passphrase"
|
||||||
|
placeholder={translateMessage("Enter your passphrase")}
|
||||||
|
bind:value={encryptionSettings.passphrase}
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</InputRow>
|
||||||
|
<InfoNote warning>
|
||||||
|
{translateMessage(
|
||||||
|
"This setting must be the same even when connecting to multiple synchronisation destinations."
|
||||||
|
)}
|
||||||
|
</InfoNote>
|
||||||
|
<InputRow label={translateMessage("Obfuscate Properties")}>
|
||||||
|
<input type="checkbox" bind:checked={encryptionSettings.usePathObfuscation} />
|
||||||
|
</InputRow>
|
||||||
|
<InfoNote>
|
||||||
|
{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>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<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>
|
||||||
|
{/each}
|
||||||
|
</select>
|
||||||
|
</InputRow>
|
||||||
|
<InfoNote>
|
||||||
|
{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>
|
||||||
|
{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>
|
<InfoNote warning>
|
||||||
{translateMessage(
|
<p>
|
||||||
"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(
|
||||||
)}
|
"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>
|
||||||
|
{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>
|
</InfoNote>
|
||||||
</ExtraItems>
|
|
||||||
|
|
||||||
<InfoNote warning>
|
<UserDecisions>
|
||||||
<p>
|
<Decision title={translateMessage("Proceed")} important disabled={!e2eeValid} commit={() => commit()} />
|
||||||
{translateMessage(
|
<Decision title={translateMessage("Cancel")} commit={() => setResult(TYPE_CANCELLED)} />
|
||||||
"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."
|
</UserDecisions>
|
||||||
)}
|
</div>
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
{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>
|
<style>
|
||||||
<Decision title={translateMessage("Proceed")} important disabled={!e2eeValid} commit={() => commit()} />
|
.sls-e2ee-dialog {
|
||||||
<Decision title={translateMessage("Cancel")} commit={() => setResult(TYPE_CANCELLED)} />
|
display: flex;
|
||||||
</UserDecisions>
|
flex-direction: column;
|
||||||
|
gap: 0.5em;
|
||||||
|
}
|
||||||
|
:global(.dialog-host .sls-e2ee-dialog label > span) {
|
||||||
|
width: auto;
|
||||||
|
min-width: 8em;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
let showPassword = $state(false);
|
let showPassword = $state(false);
|
||||||
const type = $derived.by(() => (showPassword ? "text" : "password"));
|
const type = $derived.by(() => (showPassword ? "text" : "password"));
|
||||||
const translatedPlaceholder = $derived.by(() => translate(placeholder));
|
const translatedPlaceholder = $derived.by(() => translate(placeholder));
|
||||||
|
const toggleLabel = $derived.by(() => translate(showPassword ? "Hide password" : "Show password"));
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<input
|
<input
|
||||||
@@ -31,4 +32,36 @@
|
|||||||
autocorrect="off"
|
autocorrect="off"
|
||||||
autocapitalize="off"
|
autocapitalize="off"
|
||||||
/>
|
/>
|
||||||
<input type="checkbox" bind:checked={showPassword} />
|
<button
|
||||||
|
type="button"
|
||||||
|
class="sls-password-toggle"
|
||||||
|
aria-label={toggleLabel}
|
||||||
|
title={toggleLabel}
|
||||||
|
aria-pressed={showPassword}
|
||||||
|
{disabled}
|
||||||
|
onclick={() => (showPassword = !showPassword)}
|
||||||
|
>
|
||||||
|
👁️
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.sls-password-toggle {
|
||||||
|
display: inline-flex;
|
||||||
|
flex: 0 0 auto;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 4px;
|
||||||
|
margin-left: 4px;
|
||||||
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
box-shadow: none;
|
||||||
|
line-height: 1;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
.sls-password-toggle:hover {
|
||||||
|
background: var(--background-modifier-hover);
|
||||||
|
}
|
||||||
|
:global(body.is-mobile) .sls-password-toggle {
|
||||||
|
min-width: 44px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
Your {title || "data"} has been copied to the clipboard.
|
Your {title || "data"} has been copied to the clipboard.
|
||||||
</InfoNote>
|
</InfoNote>
|
||||||
<UserDecisions>
|
<UserDecisions>
|
||||||
<Decision title="OK" important={true} {commit} />
|
<Decision title={translateMessage("Ok")} important={true} {commit} />
|
||||||
</UserDecisions>
|
</UserDecisions>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
|||||||
@@ -291,6 +291,15 @@ export async function adjustSettingToRemote(
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (operation === "rebuild") {
|
||||||
|
// An overwrite makes this device authoritative for both the Vault contents and the
|
||||||
|
// shared synchronisation settings. The remote lookup above remains a connection
|
||||||
|
// preflight, but settings from the database which is about to be replaced must not
|
||||||
|
// overwrite intentional local changes such as enabling E2EE.
|
||||||
|
log("Rebuild will use this device's synchronisation settings.", LOG_LEVEL_NOTICE);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
const remoteTweaks = remoteResult.values;
|
const remoteTweaks = remoteResult.values;
|
||||||
const necessary = extractObject(TweakValuesShouldMatchedTemplate, remoteTweaks);
|
const necessary = extractObject(TweakValuesShouldMatchedTemplate, remoteTweaks);
|
||||||
// Check if any necessary tweak value is different from current config.
|
// Check if any necessary tweak value is different from current config.
|
||||||
|
|||||||
@@ -1149,6 +1149,33 @@ describe("Red Flag Feature", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
describe("Remote configuration adjustment", () => {
|
describe("Remote configuration adjustment", () => {
|
||||||
|
it("keeps this device's E2EE settings when preparing to overwrite the remote", async () => {
|
||||||
|
const host = createHostMock();
|
||||||
|
Object.assign(host.mocks.setting.settings, TweakValuesShouldMatchedTemplate, {
|
||||||
|
encrypt: true,
|
||||||
|
passphrase: "local-encryption-passphrase",
|
||||||
|
});
|
||||||
|
host.mocks.tweakValue.fetchRemotePreferred.mockResolvedValueOnce(
|
||||||
|
availableRemoteTweaks({
|
||||||
|
...TweakValuesShouldMatchedTemplate,
|
||||||
|
encrypt: false,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
const result = await adjustSettingToRemote(
|
||||||
|
host as any,
|
||||||
|
createLoggerMock(),
|
||||||
|
host.mocks.setting.currentSettings(),
|
||||||
|
"rebuild"
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(result).toBe(true);
|
||||||
|
expect(host.mocks.tweakValue.fetchRemotePreferred).toHaveBeenCalledOnce();
|
||||||
|
expect(host.mocks.setting.currentSettings().encrypt).toBe(true);
|
||||||
|
expect(host.mocks.setting.currentSettings().passphrase).toBe("local-encryption-passphrase");
|
||||||
|
expect(host.mocks.setting.applyExternalSettings).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
it("should skip remote configuration fetch when preventFetchingConfig is true", async () => {
|
it("should skip remote configuration fetch when preventFetchingConfig is true", async () => {
|
||||||
const host = createHostMock();
|
const host = createHostMock();
|
||||||
const config = { preventFetchingConfig: true } as any;
|
const config = { preventFetchingConfig: true } as any;
|
||||||
@@ -1855,8 +1882,15 @@ describe("Red Flag Feature", () => {
|
|||||||
it("should handle rebuildAll flag with flagHandlerToEventHandler", async () => {
|
it("should handle rebuildAll flag with flagHandlerToEventHandler", async () => {
|
||||||
const host = createHostMock();
|
const host = createHostMock();
|
||||||
const log = createLoggerMock();
|
const log = createLoggerMock();
|
||||||
|
Object.assign(host.mocks.setting.settings, TweakValuesShouldMatchedTemplate, {
|
||||||
|
encrypt: true,
|
||||||
|
passphrase: "local-encryption-passphrase",
|
||||||
|
});
|
||||||
host.mocks.tweakValue.fetchRemotePreferred.mockResolvedValueOnce(
|
host.mocks.tweakValue.fetchRemotePreferred.mockResolvedValueOnce(
|
||||||
availableRemoteTweaks({ customChunkSize: 1 })
|
availableRemoteTweaks({
|
||||||
|
...TweakValuesShouldMatchedTemplate,
|
||||||
|
encrypt: false,
|
||||||
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
host.mocks.storageAccess.files.add(FlagFilesOriginal.REBUILD_ALL);
|
host.mocks.storageAccess.files.add(FlagFilesOriginal.REBUILD_ALL);
|
||||||
@@ -1868,6 +1902,8 @@ describe("Red Flag Feature", () => {
|
|||||||
await Promise.resolve(eventHandler());
|
await Promise.resolve(eventHandler());
|
||||||
await new Promise((resolve) => setTimeout(resolve, 10));
|
await new Promise((resolve) => setTimeout(resolve, 10));
|
||||||
expect(host.mocks.rebuilder.$rebuildEverything).toHaveBeenCalled();
|
expect(host.mocks.rebuilder.$rebuildEverything).toHaveBeenCalled();
|
||||||
|
expect(host.mocks.setting.currentSettings().encrypt).toBe(true);
|
||||||
|
expect(host.mocks.setting.applyExternalSettings).not.toHaveBeenCalled();
|
||||||
|
|
||||||
expect(host.mocks.ui.dialogManager.openWithExplicitCancel).toHaveBeenCalled();
|
expect(host.mocks.ui.dialogManager.openWithExplicitCancel).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -345,6 +345,12 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.sls-onboarding-invitation-action {
|
.sls-onboarding-invitation-action {
|
||||||
|
display: inline;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Touch devices need a larger tap target; on desktop this would just pad the
|
||||||
|
link with blank space and make it look like a misplaced button. */
|
||||||
|
body.is-mobile .sls-onboarding-invitation-action {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
min-width: 44px;
|
min-width: 44px;
|
||||||
min-height: 44px;
|
min-height: 44px;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import type { Locator, Page } from "playwright";
|
import type { Locator, Page } from "playwright";
|
||||||
|
import { $msg } from "../../../src/common/translation.ts";
|
||||||
import { evalObsidianJson } from "./cli.ts";
|
import { evalObsidianJson } from "./cli.ts";
|
||||||
import { captureObsidianDialogue, captureObsidianElement, withObsidianPage } from "./ui.ts";
|
import { captureObsidianDialogue, captureObsidianElement, withObsidianPage } from "./ui.ts";
|
||||||
|
|
||||||
@@ -166,7 +167,7 @@ export async function generateSetupURIFromDevice(
|
|||||||
);
|
);
|
||||||
await withObsidianPage(port, async (page) => {
|
await withObsidianPage(port, async (page) => {
|
||||||
const result = modalByTitle(page, resultTitle);
|
const result = modalByTitle(page, resultTitle);
|
||||||
await result.getByRole("button", { name: "OK", exact: true }).click({ timeout: uiTimeoutMs });
|
await result.getByRole("button", { name: $msg("Ok"), exact: true }).click({ timeout: uiTimeoutMs });
|
||||||
await result.waitFor({ state: "hidden", timeout: uiTimeoutMs });
|
await result.waitFor({ state: "hidden", timeout: uiTimeoutMs });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,15 @@
|
|||||||
import { randomBytes } from "node:crypto";
|
import { randomBytes } from "node:crypto";
|
||||||
import { readFile } from "node:fs/promises";
|
import { readFile } from "node:fs/promises";
|
||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
|
import { DEVICE_ID_PREFERRED, MILESTONE_DOCID } from "@vrtmrz/livesync-commonlib/compat/common/types";
|
||||||
import { evalObsidianJson } from "../runner/cli.ts";
|
import { evalObsidianJson } from "../runner/cli.ts";
|
||||||
import {
|
import {
|
||||||
assertCouchDbReachable,
|
assertCouchDbReachable,
|
||||||
deleteCouchDbDatabase,
|
deleteCouchDbDatabase,
|
||||||
|
fetchCouchDbDocument,
|
||||||
loadCouchDbConfig,
|
loadCouchDbConfig,
|
||||||
makeUniqueDatabaseName,
|
makeUniqueDatabaseName,
|
||||||
|
putCouchDbDocument,
|
||||||
waitForCouchDbDocs,
|
waitForCouchDbDocs,
|
||||||
type CouchDbConfig,
|
type CouchDbConfig,
|
||||||
} from "../runner/couchdb.ts";
|
} from "../runner/couchdb.ts";
|
||||||
@@ -28,7 +31,8 @@ import {
|
|||||||
continueWithoutRemoteSettings,
|
continueWithoutRemoteSettings,
|
||||||
type SetupArtifact,
|
type SetupArtifact,
|
||||||
} from "../runner/setupUri.ts";
|
} from "../runner/setupUri.ts";
|
||||||
import { captureObsidianPage, withObsidianPage } from "../runner/ui.ts";
|
import { captureObsidianPage, openLiveSyncSettings, withObsidianPage } from "../runner/ui.ts";
|
||||||
|
import { dismissConfigDoctorIfShown } from "../runner/upgradeWorkflow.ts";
|
||||||
import { createTemporaryVault, type TemporaryVault } from "../runner/vault.ts";
|
import { createTemporaryVault, type TemporaryVault } from "../runner/vault.ts";
|
||||||
|
|
||||||
process.env.E2E_OBSIDIAN_CLI_TIMEOUT_MS ??= "90000";
|
process.env.E2E_OBSIDIAN_CLI_TIMEOUT_MS ??= "90000";
|
||||||
@@ -44,6 +48,10 @@ const captures = {
|
|||||||
scenario: "couchdb-manual-setup-workflow",
|
scenario: "couchdb-manual-setup-workflow",
|
||||||
guide: "couchdb-manual",
|
guide: "couchdb-manual",
|
||||||
} as const;
|
} as const;
|
||||||
|
const e2eeRebuildCaptures = {
|
||||||
|
scenario: "couchdb-manual-setup-workflow",
|
||||||
|
guide: "couchdb-manual-e2ee-rebuild",
|
||||||
|
} as const;
|
||||||
|
|
||||||
type RunnerContext = {
|
type RunnerContext = {
|
||||||
binary: string;
|
binary: string;
|
||||||
@@ -111,25 +119,59 @@ async function enterManualCouchDBSettings(port: number, couchDb: CouchDbConfig,
|
|||||||
await withObsidianPage(port, async (page) => {
|
await withObsidianPage(port, async (page) => {
|
||||||
const method = modalByTitle(page, "Connection Method");
|
const method = modalByTitle(page, "Connection Method");
|
||||||
await selectRadioOption(method, "Configure a remote manually");
|
await selectRadioOption(method, "Configure a remote manually");
|
||||||
await method
|
await method.getByRole("button", { name: "Proceed with manual configuration" }).click({ timeout: uiTimeoutMs });
|
||||||
.getByRole("button", { name: "Proceed with manual configuration" })
|
|
||||||
.click({ timeout: uiTimeoutMs });
|
|
||||||
|
|
||||||
const encryption = modalByTitle(page, "End-to-End Encryption");
|
const encryption = modalByTitle(page, "End-to-End Encryption");
|
||||||
await encryption.waitFor({ state: "visible", timeout: uiTimeoutMs });
|
await encryption.waitFor({ state: "visible", timeout: uiTimeoutMs });
|
||||||
|
assertEqual(
|
||||||
|
await encryption.locator('input[name="e2ee-passphrase"]').count(),
|
||||||
|
0,
|
||||||
|
"The passphrase field was present before end-to-end encryption was enabled."
|
||||||
|
);
|
||||||
|
assertEqual(
|
||||||
|
await encryption.locator("label.row").filter({ hasText: "Obfuscate Properties" }).count(),
|
||||||
|
0,
|
||||||
|
"The Obfuscate Properties row was present before end-to-end encryption was enabled."
|
||||||
|
);
|
||||||
await encryption
|
await encryption
|
||||||
.locator("label.row")
|
.locator("label.row")
|
||||||
.filter({ hasText: "End-to-End Encryption" })
|
.filter({ hasText: "End-to-End Encryption" })
|
||||||
.locator('input[type="checkbox"]')
|
.locator('input[type="checkbox"]')
|
||||||
.first()
|
.first()
|
||||||
.check({ timeout: uiTimeoutMs });
|
.check({ timeout: uiTimeoutMs });
|
||||||
|
const passphraseInput = encryption.locator('input[name="e2ee-passphrase"]');
|
||||||
|
await passphraseInput.waitFor({ state: "visible", timeout: uiTimeoutMs });
|
||||||
await encryption
|
await encryption
|
||||||
.locator("label.row")
|
.locator("label.row")
|
||||||
.filter({ hasText: "Obfuscate Properties" })
|
.filter({ hasText: "Obfuscate Properties" })
|
||||||
.locator('input[type="checkbox"]')
|
.locator('input[type="checkbox"]')
|
||||||
.first()
|
.first()
|
||||||
.check({ timeout: uiTimeoutMs });
|
.check({ timeout: uiTimeoutMs });
|
||||||
await encryption.locator('input[name="e2ee-passphrase"]').fill(randomBytes(24).toString("base64url"));
|
const passphraseValue = randomBytes(24).toString("base64url");
|
||||||
|
await passphraseInput.fill(passphraseValue);
|
||||||
|
const passwordToggle = encryption.locator("button.sls-password-toggle");
|
||||||
|
await passwordToggle.click({ timeout: uiTimeoutMs });
|
||||||
|
assertEqual(
|
||||||
|
await passphraseInput.getAttribute("type"),
|
||||||
|
"text",
|
||||||
|
"Toggling visibility did not reveal the passphrase."
|
||||||
|
);
|
||||||
|
assertEqual(
|
||||||
|
await passphraseInput.inputValue(),
|
||||||
|
passphraseValue,
|
||||||
|
"Toggling visibility changed the passphrase value."
|
||||||
|
);
|
||||||
|
await passwordToggle.click({ timeout: uiTimeoutMs });
|
||||||
|
assertEqual(
|
||||||
|
await passphraseInput.getAttribute("type"),
|
||||||
|
"password",
|
||||||
|
"Toggling visibility again did not re-mask the passphrase."
|
||||||
|
);
|
||||||
|
assertEqual(
|
||||||
|
await passphraseInput.inputValue(),
|
||||||
|
passphraseValue,
|
||||||
|
"Re-masking the passphrase changed its value."
|
||||||
|
);
|
||||||
});
|
});
|
||||||
screenshots.push(await captureGuideDialogue(port, "guide-couchdb-manual-encryption.png", "End-to-End Encryption"));
|
screenshots.push(await captureGuideDialogue(port, "guide-couchdb-manual-encryption.png", "End-to-End Encryption"));
|
||||||
await withObsidianPage(port, async (page) => {
|
await withObsidianPage(port, async (page) => {
|
||||||
@@ -246,6 +288,112 @@ async function waitForRemoteEntry(context: RunnerContext, entry: { id: string; c
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function assertPersistedE2EE(vault: TemporaryVault): Promise<void> {
|
||||||
|
const persisted = JSON.parse(
|
||||||
|
await readFile(join(vault.path, ".obsidian", "plugins", "obsidian-livesync", "data.json"), "utf8")
|
||||||
|
) as {
|
||||||
|
encrypt?: unknown;
|
||||||
|
encryptedPassphrase?: unknown;
|
||||||
|
passphrase?: unknown;
|
||||||
|
};
|
||||||
|
assertEqual(persisted.encrypt, true, "Manual CouchDB setup did not persist E2EE as enabled.");
|
||||||
|
assertEqual(persisted.passphrase, "", "Manual CouchDB setup persisted the E2EE passphrase in plain text.");
|
||||||
|
if (typeof persisted.encryptedPassphrase !== "string" || persisted.encryptedPassphrase.length === 0) {
|
||||||
|
throw new Error("Manual CouchDB setup did not persist an encrypted E2EE passphrase.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function setRemotePreferredE2EEDisabled(context: RunnerContext): Promise<void> {
|
||||||
|
const milestone = await fetchCouchDbDocument(context.couchDb, context.dbName, MILESTONE_DOCID);
|
||||||
|
const tweakValues = milestone.tweak_values;
|
||||||
|
if (typeof tweakValues !== "object" || tweakValues === null || Array.isArray(tweakValues)) {
|
||||||
|
throw new Error("The existing CouchDB milestone did not contain synchronisation settings.");
|
||||||
|
}
|
||||||
|
const preferred = (tweakValues as Record<string, unknown>)[DEVICE_ID_PREFERRED];
|
||||||
|
if (typeof preferred !== "object" || preferred === null || Array.isArray(preferred)) {
|
||||||
|
throw new Error("The existing CouchDB milestone did not contain preferred synchronisation settings.");
|
||||||
|
}
|
||||||
|
await putCouchDbDocument(context.couchDb, context.dbName, {
|
||||||
|
...milestone,
|
||||||
|
tweak_values: {
|
||||||
|
...tweakValues,
|
||||||
|
[DEVICE_ID_PREFERRED]: {
|
||||||
|
...(preferred as Record<string, unknown>),
|
||||||
|
encrypt: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function assertRemotePreferredE2EE(context: RunnerContext, expected: boolean): Promise<void> {
|
||||||
|
const milestone = await fetchCouchDbDocument(context.couchDb, context.dbName, MILESTONE_DOCID);
|
||||||
|
const tweakValues = milestone.tweak_values;
|
||||||
|
const preferred =
|
||||||
|
typeof tweakValues === "object" && tweakValues !== null && !Array.isArray(tweakValues)
|
||||||
|
? (tweakValues as Record<string, unknown>)[DEVICE_ID_PREFERRED]
|
||||||
|
: undefined;
|
||||||
|
const encrypt =
|
||||||
|
typeof preferred === "object" && preferred !== null && !Array.isArray(preferred)
|
||||||
|
? (preferred as Record<string, unknown>).encrypt
|
||||||
|
: undefined;
|
||||||
|
assertEqual(encrypt, expected, `The remote preferred E2EE setting was not ${expected ? "enabled" : "disabled"}.`);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function scheduleRemoteOverwrite(port: number): Promise<void> {
|
||||||
|
await dismissConfigDoctorIfShown(port);
|
||||||
|
await withObsidianPage(port, async (page) => {
|
||||||
|
const settingsNavigator = await openLiveSyncSettings(page, uiTimeoutMs);
|
||||||
|
const maintenance = await settingsNavigator.openPage("Maintenance");
|
||||||
|
const overwrite = maintenance
|
||||||
|
.locator(".setting-item")
|
||||||
|
.filter({ hasText: "Overwrite Server Data with This Device's Files" });
|
||||||
|
await overwrite
|
||||||
|
.getByRole("button", { name: "Schedule and Restart", exact: true })
|
||||||
|
.click({ timeout: uiTimeoutMs });
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function assertRemoteEntryEncrypted(
|
||||||
|
context: RunnerContext,
|
||||||
|
entry: { id: string; path: string; children: string[] },
|
||||||
|
plaintextPath: string,
|
||||||
|
plaintext: string
|
||||||
|
): Promise<void> {
|
||||||
|
const remoteMetadata = await fetchCouchDbDocument(context.couchDb, context.dbName, entry.id);
|
||||||
|
const serialisedMetadata = JSON.stringify(remoteMetadata);
|
||||||
|
if (
|
||||||
|
!remoteMetadata._id.startsWith("f:") ||
|
||||||
|
typeof remoteMetadata.path !== "string" ||
|
||||||
|
!remoteMetadata.path.startsWith("/\\:") ||
|
||||||
|
remoteMetadata.path === entry.path ||
|
||||||
|
serialisedMetadata.includes(plaintextPath) ||
|
||||||
|
!Array.isArray(remoteMetadata.children) ||
|
||||||
|
remoteMetadata.children.length !== 0 ||
|
||||||
|
remoteMetadata.mtime !== 0 ||
|
||||||
|
remoteMetadata.ctime !== 0 ||
|
||||||
|
remoteMetadata.size !== 0
|
||||||
|
) {
|
||||||
|
throw new Error("The directly fetched CouchDB Metadata document did not protect its properties.");
|
||||||
|
}
|
||||||
|
|
||||||
|
const childId = entry.children[0];
|
||||||
|
if (!childId) {
|
||||||
|
throw new Error("The local E2EE test entry did not reference a Chunk document.");
|
||||||
|
}
|
||||||
|
if (!childId.startsWith("h:+")) {
|
||||||
|
throw new Error(`The E2EE test entry used an unencrypted Chunk identifier: ${childId}`);
|
||||||
|
}
|
||||||
|
const remoteChunk = await fetchCouchDbDocument(context.couchDb, context.dbName, childId);
|
||||||
|
assertEqual(remoteChunk.e_, true, "The directly fetched CouchDB Chunk was not marked as encrypted.");
|
||||||
|
if (
|
||||||
|
typeof remoteChunk.data !== "string" ||
|
||||||
|
remoteChunk.data === plaintext ||
|
||||||
|
remoteChunk.data.includes(plaintext)
|
||||||
|
) {
|
||||||
|
throw new Error("The directly fetched CouchDB Chunk contained readable Vault content.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function main(): Promise<void> {
|
async function main(): Promise<void> {
|
||||||
const binary = requireObsidianBinary();
|
const binary = requireObsidianBinary();
|
||||||
const cli = discoverObsidianCli();
|
const cli = discoverObsidianCli();
|
||||||
@@ -288,11 +436,37 @@ async function main(): Promise<void> {
|
|||||||
1,
|
1,
|
||||||
"Manual CouchDB setup did not persist exactly one remote profile."
|
"Manual CouchDB setup did not persist exactly one remote profile."
|
||||||
);
|
);
|
||||||
|
await assertPersistedE2EE(vaultA);
|
||||||
|
|
||||||
await writeNoteViaObsidian(context.cliBinary, session.cliEnv, notePath, noteContent);
|
await writeNoteViaObsidian(context.cliBinary, session.cliEnv, notePath, noteContent);
|
||||||
const entry = await waitForLocalDatabaseEntry(context.cliBinary, session.cliEnv, notePath);
|
const entry = await waitForLocalDatabaseEntry(context.cliBinary, session.cliEnv, notePath);
|
||||||
await pushLocalChanges(context.cliBinary, session.cliEnv);
|
await pushLocalChanges(context.cliBinary, session.cliEnv);
|
||||||
await waitForRemoteEntry(context, entry);
|
await waitForRemoteEntry(context, entry);
|
||||||
|
} catch (error) {
|
||||||
|
await captureFailure(session, "first-device");
|
||||||
|
throw error;
|
||||||
|
} finally {
|
||||||
|
await stopTrackedSession(context, session);
|
||||||
|
}
|
||||||
|
|
||||||
|
await setRemotePreferredE2EEDisabled(context);
|
||||||
|
await assertRemotePreferredE2EE(context, false);
|
||||||
|
|
||||||
|
session = await startUnconfiguredSession(context, vaultA);
|
||||||
|
try {
|
||||||
|
await scheduleRemoteOverwrite(session.remoteDebuggingPort);
|
||||||
|
screenshots.push(await confirmRebuild(session.remoteDebuggingPort, e2eeRebuildCaptures));
|
||||||
|
screenshots.push(
|
||||||
|
await acknowledgeDisabledOptionalFeatures(session.remoteDebuggingPort, e2eeRebuildCaptures)
|
||||||
|
);
|
||||||
|
await finishInitialisation(session.remoteDebuggingPort, context.cliBinary, session.cliEnv);
|
||||||
|
await resumeCompatibilityReviewIfShown(session.remoteDebuggingPort);
|
||||||
|
await assertPersistedE2EE(vaultA);
|
||||||
|
|
||||||
|
const rebuiltEntry = await waitForLocalDatabaseEntry(context.cliBinary, session.cliEnv, notePath);
|
||||||
|
await waitForRemoteEntry(context, rebuiltEntry);
|
||||||
|
await assertRemoteEntryEncrypted(context, rebuiltEntry, notePath, noteContent);
|
||||||
|
await assertRemotePreferredE2EE(context, true);
|
||||||
|
|
||||||
const generated = await generateSetupURIFromDevice(
|
const generated = await generateSetupURIFromDevice(
|
||||||
session.remoteDebuggingPort,
|
session.remoteDebuggingPort,
|
||||||
@@ -302,7 +476,7 @@ async function main(): Promise<void> {
|
|||||||
secondDeviceArtifact = generated.artifact;
|
secondDeviceArtifact = generated.artifact;
|
||||||
screenshots.push(...generated.screenshots);
|
screenshots.push(...generated.screenshots);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
await captureFailure(session, "first-device");
|
await captureFailure(session, "e2ee-rebuild");
|
||||||
throw error;
|
throw error;
|
||||||
} finally {
|
} finally {
|
||||||
await stopTrackedSession(context, session);
|
await stopTrackedSession(context, session);
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { readFile } from "node:fs/promises";
|
import { readFile } from "node:fs/promises";
|
||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
|
import { $msg } from "../../../src/common/translation.ts";
|
||||||
import { discoverObsidianCli, requireObsidianBinary } from "../runner/environment.ts";
|
import { discoverObsidianCli, requireObsidianBinary } from "../runner/environment.ts";
|
||||||
import { createE2eCouchDbPluginData, waitForLiveSyncCoreReady } from "../runner/liveSyncWorkflow.ts";
|
import { createE2eCouchDbPluginData, waitForLiveSyncCoreReady } from "../runner/liveSyncWorkflow.ts";
|
||||||
import { assertMobileDialogueLayout, assertMobileNoticeLayout, setObsidianMobileTestMode } from "../runner/mobileUi.ts";
|
import { assertMobileDialogueLayout, assertMobileNoticeLayout, setObsidianMobileTestMode } from "../runner/mobileUi.ts";
|
||||||
@@ -909,7 +910,7 @@ async function verifyLogAndReportSurfaces(): Promise<{ log: string; report: stri
|
|||||||
if (!report.includes("# ---- Debug Info Dump ----")) {
|
if (!report.includes("# ---- Debug Info Dump ----")) {
|
||||||
throw new Error("The full-report dialogue did not contain the generated debug report.");
|
throw new Error("The full-report dialogue did not contain the generated debug report.");
|
||||||
}
|
}
|
||||||
await modal.getByRole("button", { name: "OK", exact: true }).waitFor({
|
await modal.getByRole("button", { name: $msg("Ok"), exact: true }).waitFor({
|
||||||
state: "visible",
|
state: "visible",
|
||||||
timeout: uiTimeoutMs,
|
timeout: uiTimeoutMs,
|
||||||
});
|
});
|
||||||
@@ -920,7 +921,7 @@ async function verifyLogAndReportSurfaces(): Promise<{ log: string; report: stri
|
|||||||
const modal = page.locator(".modal-container").filter({
|
const modal = page.locator(".modal-container").filter({
|
||||||
hasText: "Your Debug info is ready to be copied",
|
hasText: "Your Debug info is ready to be copied",
|
||||||
});
|
});
|
||||||
await modal.getByRole("button", { name: "OK", exact: true }).click({ timeout: uiTimeoutMs });
|
await modal.getByRole("button", { name: $msg("Ok"), exact: true }).click({ timeout: uiTimeoutMs });
|
||||||
await modal.waitFor({ state: "hidden", timeout: uiTimeoutMs });
|
await modal.waitFor({ state: "hidden", timeout: uiTimeoutMs });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -131,7 +131,57 @@ async function captureAndSelectMobileInvitation(): Promise<string> {
|
|||||||
return screenshot;
|
return screenshot;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function captureAndCloseIntro(filename: string, mobile: boolean): Promise<string> {
|
async function captureMobilePasswordToggle(): Promise<string> {
|
||||||
|
const port = obsidianRemoteDebuggingPort();
|
||||||
|
await withObsidianPage(port, async (page) => {
|
||||||
|
const intro = onboardingDialogue(page);
|
||||||
|
await intro
|
||||||
|
.locator("label")
|
||||||
|
.filter({ hasText: "I am setting this up for the first time" })
|
||||||
|
.locator('input[type="radio"]')
|
||||||
|
.first()
|
||||||
|
.check({ timeout: uiTimeoutMs });
|
||||||
|
await intro
|
||||||
|
.getByRole("button", { name: "Yes, I want to set up a new synchronisation" })
|
||||||
|
.click({ timeout: uiTimeoutMs });
|
||||||
|
|
||||||
|
const method = page.locator(".modal-container").filter({ hasText: "Connection Method" });
|
||||||
|
await method.waitFor({ state: "visible", timeout: uiTimeoutMs });
|
||||||
|
await method
|
||||||
|
.locator("label")
|
||||||
|
.filter({ hasText: "Configure a remote manually" })
|
||||||
|
.locator('input[type="radio"]')
|
||||||
|
.first()
|
||||||
|
.check({ timeout: uiTimeoutMs });
|
||||||
|
await method.getByRole("button", { name: "Proceed with manual configuration" }).click({ timeout: uiTimeoutMs });
|
||||||
|
|
||||||
|
const encryption = page.locator(".modal-container").filter({ hasText: "End-to-End Encryption" });
|
||||||
|
await encryption.waitFor({ state: "visible", timeout: uiTimeoutMs });
|
||||||
|
await encryption
|
||||||
|
.locator("label.row")
|
||||||
|
.filter({ hasText: "End-to-End Encryption" })
|
||||||
|
.locator('input[type="checkbox"]')
|
||||||
|
.first()
|
||||||
|
.check({ timeout: uiTimeoutMs });
|
||||||
|
});
|
||||||
|
const screenshot = await captureObsidianDialogue(port, "onboarding-e2ee-mobile.png", async (page) => {
|
||||||
|
const encryption = page.locator(".modal-container").filter({ hasText: "End-to-End Encryption" });
|
||||||
|
const passwordToggle = encryption.locator("button.sls-password-toggle");
|
||||||
|
await passwordToggle.waitFor({ state: "visible", timeout: uiTimeoutMs });
|
||||||
|
await passwordToggle.evaluate((element) => element.scrollIntoView({ block: "center" }));
|
||||||
|
await assertLocatorHasMinimumTouchTarget(page, passwordToggle, {
|
||||||
|
label: "mobile password visibility button",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
await withObsidianPage(port, async (page) => {
|
||||||
|
const encryption = page.locator(".modal-container").filter({ hasText: "End-to-End Encryption" });
|
||||||
|
await encryption.getByRole("button", { name: "Cancel", exact: true }).click({ timeout: uiTimeoutMs });
|
||||||
|
await encryption.waitFor({ state: "hidden", timeout: uiTimeoutMs });
|
||||||
|
});
|
||||||
|
return screenshot;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function captureIntro(filename: string, mobile: boolean, closeAfterCapture = true): Promise<string> {
|
||||||
const port = obsidianRemoteDebuggingPort();
|
const port = obsidianRemoteDebuggingPort();
|
||||||
const screenshot = await captureObsidianDialogue(port, filename, async (page) => {
|
const screenshot = await captureObsidianDialogue(port, filename, async (page) => {
|
||||||
const container = onboardingDialogue(page);
|
const container = onboardingDialogue(page);
|
||||||
@@ -145,11 +195,13 @@ async function captureAndCloseIntro(filename: string, mobile: boolean): Promise<
|
|||||||
.waitFor({ state: "visible", timeout: uiTimeoutMs });
|
.waitFor({ state: "visible", timeout: uiTimeoutMs });
|
||||||
if (mobile) await assertMobileDialogueLayout(page, container, "mobile onboarding introduction");
|
if (mobile) await assertMobileDialogueLayout(page, container, "mobile onboarding introduction");
|
||||||
});
|
});
|
||||||
await withObsidianPage(port, async (page) => {
|
if (closeAfterCapture) {
|
||||||
const container = onboardingDialogue(page);
|
await withObsidianPage(port, async (page) => {
|
||||||
await container.getByRole("button", { name: "No, please take me back" }).click({ timeout: uiTimeoutMs });
|
const container = onboardingDialogue(page);
|
||||||
await container.waitFor({ state: "hidden", timeout: uiTimeoutMs });
|
await container.getByRole("button", { name: "No, please take me back" }).click({ timeout: uiTimeoutMs });
|
||||||
});
|
await container.waitFor({ state: "hidden", timeout: uiTimeoutMs });
|
||||||
|
});
|
||||||
|
}
|
||||||
return screenshot;
|
return screenshot;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -231,10 +283,11 @@ async function main(): Promise<void> {
|
|||||||
|
|
||||||
const desktopInvitation = await captureDesktopInvitation();
|
const desktopInvitation = await captureDesktopInvitation();
|
||||||
const mobileInvitation = await captureAndSelectMobileInvitation();
|
const mobileInvitation = await captureAndSelectMobileInvitation();
|
||||||
const mobileIntro = await captureAndCloseIntro("onboarding-intro-mobile.png", true);
|
const mobileIntro = await captureIntro("onboarding-intro-mobile.png", true, false);
|
||||||
|
const mobileEncryption = await captureMobilePasswordToggle();
|
||||||
await setObsidianMobileTestMode(obsidianRemoteDebuggingPort(), false, uiTimeoutMs);
|
await setObsidianMobileTestMode(obsidianRemoteDebuggingPort(), false, uiTimeoutMs);
|
||||||
await openOnboardingFromSettings();
|
await openOnboardingFromSettings();
|
||||||
const settingsIntro = await captureAndCloseIntro("onboarding-intro-settings-desktop.png", false);
|
const settingsIntro = await captureIntro("onboarding-intro-settings-desktop.png", false);
|
||||||
await dismissVisibleNotices();
|
await dismissVisibleNotices();
|
||||||
await closeSettings();
|
await closeSettings();
|
||||||
|
|
||||||
@@ -243,6 +296,7 @@ async function main(): Promise<void> {
|
|||||||
desktopInvitation,
|
desktopInvitation,
|
||||||
mobileInvitation,
|
mobileInvitation,
|
||||||
mobileIntro,
|
mobileIntro,
|
||||||
|
mobileEncryption,
|
||||||
settingsIntro,
|
settingsIntro,
|
||||||
].join(", ")}`
|
].join(", ")}`
|
||||||
);
|
);
|
||||||
|
|||||||
+27
@@ -12,6 +12,33 @@ Earlier releases remain available in the 1.0 release history, the 1.0 preview hi
|
|||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
|
||||||
|
## 1.0.24
|
||||||
|
|
||||||
|
3rd September, 2026
|
||||||
|
|
||||||
|
### Interface and translation
|
||||||
|
|
||||||
|
#### Fixed
|
||||||
|
|
||||||
|
- The Setup Wizard now correctly explains that the existing-device path adds this device to an existing synchronisation (PR #1118). Thank you to @nikhilmaddirala for the contribution!
|
||||||
|
- Spanish translations now resolve the **Display language** placeholder, cover previously untranslated Setup Wizard and CouchDB text, translate user-facing Config Doctor values and confirmation controls, and use Spanish sentence case (PR #1129). Thank you to @zeedif for the contribution!
|
||||||
|
|
||||||
|
#### Improved
|
||||||
|
|
||||||
|
- The Setup Wizard now shows the passphrase and **Obfuscate Properties** controls only after E2EE is enabled, provides a password-visibility button, allows longer translated labels to wrap, and keeps the invitation link compact on desktop while preserving its mobile touch target (PR #1130). Thank you to @zeedif for the contribution!
|
||||||
|
|
||||||
|
### Synchronisation and storage
|
||||||
|
|
||||||
|
#### Fixed
|
||||||
|
|
||||||
|
- **Overwrite Server Data with This Device's Files** now keeps this device's synchronisation settings instead of reapplying settings from the remote database which is about to be replaced. Enabling E2EE before a rebuild therefore remains enabled and uploads encrypted data. (#1146)
|
||||||
|
|
||||||
|
### Command-line tool
|
||||||
|
|
||||||
|
#### Fixed
|
||||||
|
|
||||||
|
- The systemd installer now finds the repository root correctly, installs every generated bundle chunk and required production dependency, checks the installed command before activation, and reports success only when the service remains active.
|
||||||
|
|
||||||
## 1.0.23
|
## 1.0.23
|
||||||
|
|
||||||
2nd September, 2026
|
2nd September, 2026
|
||||||
|
|||||||
+2
-1
@@ -35,5 +35,6 @@
|
|||||||
"1.0.20": "1.7.2",
|
"1.0.20": "1.7.2",
|
||||||
"1.0.21": "1.7.2",
|
"1.0.21": "1.7.2",
|
||||||
"1.0.22": "1.7.2",
|
"1.0.22": "1.7.2",
|
||||||
"1.0.23": "1.7.2"
|
"1.0.23": "1.7.2",
|
||||||
|
"1.0.24": "1.7.2"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user