diff --git a/_types/src/LiveSyncBaseCore.d.ts b/_types/src/LiveSyncBaseCore.d.ts index a3f5f93b..8363e999 100644 --- a/_types/src/LiveSyncBaseCore.d.ts +++ b/_types/src/LiveSyncBaseCore.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { SimpleStore } from "octagonal-wheels/databases/SimpleStoreBase"; import type { HasSettings, ObsidianLiveSyncSettings, EntryDoc } from "@lib/common/types"; import type { Confirm } from "@lib/interfaces/Confirm"; diff --git a/_types/src/common/KeyValueDB.d.ts b/_types/src/common/KeyValueDB.d.ts index 2a91de34..c9bd5e3f 100644 --- a/_types/src/common/KeyValueDB.d.ts +++ b/_types/src/common/KeyValueDB.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { KeyValueDatabase } from "@lib/interfaces/KeyValueDatabase.ts"; export { OpenKeyValueDatabase } from "./KeyValueDBv2.ts"; export declare const _OpenKeyValueDatabase: (dbKey: string) => Promise; diff --git a/_types/src/common/KeyValueDBv2.d.ts b/_types/src/common/KeyValueDBv2.d.ts index a1e703e5..8a8ce345 100644 --- a/_types/src/common/KeyValueDBv2.d.ts +++ b/_types/src/common/KeyValueDBv2.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { KeyValueDatabase } from "@lib/interfaces/KeyValueDatabase"; import { type IDBPDatabase } from "idb"; export declare function OpenKeyValueDatabase(dbKey: string): Promise; diff --git a/_types/src/common/PeriodicProcessor.d.ts b/_types/src/common/PeriodicProcessor.d.ts index d91584e7..f604c72f 100644 --- a/_types/src/common/PeriodicProcessor.d.ts +++ b/_types/src/common/PeriodicProcessor.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; type PeriodicProcessorHost = NecessaryServices<"API" | "control", never>; export declare class PeriodicProcessor { diff --git a/_types/src/common/SvelteItemView.d.ts b/_types/src/common/SvelteItemView.d.ts index ac65318e..6ba9b71c 100644 --- a/_types/src/common/SvelteItemView.d.ts +++ b/_types/src/common/SvelteItemView.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { ItemView } from "@/deps.ts"; import { type mount } from "svelte"; export declare abstract class SvelteItemView extends ItemView { diff --git a/_types/src/common/events.d.ts b/_types/src/common/events.d.ts index 22a9cb31..6fe6beeb 100644 --- a/_types/src/common/events.d.ts +++ b/_types/src/common/events.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { eventHub } from "@lib/hub/hub"; export declare const EVENT_PLUGIN_LOADED = "plugin-loaded"; export declare const EVENT_PLUGIN_UNLOADED = "plugin-unloaded"; diff --git a/_types/src/common/obsidianEvents.d.ts b/_types/src/common/obsidianEvents.d.ts index 929cd48e..16055e40 100644 --- a/_types/src/common/obsidianEvents.d.ts +++ b/_types/src/common/obsidianEvents.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { TFile } from "@/deps"; import type { FilePathWithPrefix, LoadedEntry } from "@lib/common/types"; export declare const EVENT_REQUEST_SHOW_HISTORY = "show-history"; diff --git a/_types/src/common/reportTool.d.ts b/_types/src/common/reportTool.d.ts index 0b19bec7..6b51b0ec 100644 --- a/_types/src/common/reportTool.d.ts +++ b/_types/src/common/reportTool.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type"; import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore"; export declare function generateReport(settings: ObsidianLiveSyncSettings, core: LiveSyncBaseCore): Promise<{ diff --git a/_types/src/common/stores.d.ts b/_types/src/common/stores.d.ts index 58dabeb5..700a4af8 100644 --- a/_types/src/common/stores.d.ts +++ b/_types/src/common/stores.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { PersistentMap } from "octagonal-wheels/dataobject/PersistentMap"; export declare let sameChangePairs: PersistentMap; export declare function initializeStores(vaultName: string): void; diff --git a/_types/src/common/types.d.ts b/_types/src/common/types.d.ts index 59086561..4253787b 100644 --- a/_types/src/common/types.d.ts +++ b/_types/src/common/types.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type PluginManifest, TFile } from "@/deps.ts"; import { type DatabaseEntry, type EntryBody, type FilePath } from "@lib/common/types.ts"; export type { CacheData, FileEventItem } from "@lib/common/types.ts"; diff --git a/_types/src/common/utils.d.ts b/_types/src/common/utils.d.ts index 35bd53c5..0a8ffbab 100644 --- a/_types/src/common/utils.d.ts +++ b/_types/src/common/utils.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { TAbstractFile } from "@/deps.ts"; import { type AnyEntry, type CouchDBCredentials, type DocumentID, type EntryHasPath, type FilePath, type FilePathWithPrefix, type UXFileInfo, type UXFileInfoStub } from "@lib/common/types.ts"; export { ICHeader, ICXHeader } from "./types.ts"; diff --git a/_types/src/deps.d.ts b/_types/src/deps.d.ts index 340afdcd..36976d14 100644 --- a/_types/src/deps.d.ts +++ b/_types/src/deps.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type FilePath } from "@lib/common/types.ts"; export { addIcon, App, debounce, Editor, FuzzySuggestModal, MarkdownRenderer, MarkdownView, Modal, Notice, Platform, Plugin, PluginSettingTab, requestUrl, sanitizeHTMLToDom, Setting, stringifyYaml, TAbstractFile, TextAreaComponent, TFile, TFolder, parseYaml, ItemView, WorkspaceLeaf, Menu, request, getLanguage, ButtonComponent, TextComponent, ToggleComponent, DropdownComponent, Component, } from "obsidian"; export type { DataWriteOptions, PluginManifest, RequestUrlParam, RequestUrlResponse, MarkdownFileInfo, ListedFiles, ValueComponent, Stat, Command, ViewCreator, } from "obsidian"; diff --git a/_types/src/features/ConfigSync/CmdConfigSync.d.ts b/_types/src/features/ConfigSync/CmdConfigSync.d.ts index bb90c1f8..ced4a28e 100644 --- a/_types/src/features/ConfigSync/CmdConfigSync.d.ts +++ b/_types/src/features/ConfigSync/CmdConfigSync.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type PluginManifest } from "@/deps.ts"; import type { EntryDoc, LoadedEntry, FilePathWithPrefix, FilePath, AnyEntry } from "@lib/common/types.ts"; import { LiveSyncCommands } from "@/features/LiveSyncCommands.ts"; diff --git a/_types/src/features/ConfigSync/PluginDialogModal.d.ts b/_types/src/features/ConfigSync/PluginDialogModal.d.ts index c885600e..ca9690be 100644 --- a/_types/src/features/ConfigSync/PluginDialogModal.d.ts +++ b/_types/src/features/ConfigSync/PluginDialogModal.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { mount } from "svelte"; import { App, Modal } from "@/deps.ts"; import ObsidianLiveSyncPlugin from "@/main.ts"; diff --git a/_types/src/features/HiddenFileCommon/JsonResolveModal.d.ts b/_types/src/features/HiddenFileCommon/JsonResolveModal.d.ts index b6bc766e..988e76da 100644 --- a/_types/src/features/HiddenFileCommon/JsonResolveModal.d.ts +++ b/_types/src/features/HiddenFileCommon/JsonResolveModal.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { App, Modal } from "@/deps.ts"; import { type FilePath, type LoadedEntry } from "@lib/common/types.ts"; import { mount } from "svelte"; diff --git a/_types/src/features/HiddenFileSync/CmdHiddenFileSync.d.ts b/_types/src/features/HiddenFileSync/CmdHiddenFileSync.d.ts index 177e7a76..ca861c1c 100644 --- a/_types/src/features/HiddenFileSync/CmdHiddenFileSync.d.ts +++ b/_types/src/features/HiddenFileSync/CmdHiddenFileSync.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type LoadedEntry, type FilePathWithPrefix, type FilePath, type DocumentID, type UXFileInfo, type UXStat, type MetaEntry, type UXDataWriteOptions } from "@lib/common/types.ts"; import { type InternalFileInfo } from "@/common/types.ts"; import { type CustomRegExp } from "@lib/common/utils.ts"; diff --git a/_types/src/features/HiddenFileSync/configureHiddenFileSyncMode.d.ts b/_types/src/features/HiddenFileSync/configureHiddenFileSyncMode.d.ts index 711c80d6..417ab8bf 100644 --- a/_types/src/features/HiddenFileSync/configureHiddenFileSyncMode.d.ts +++ b/_types/src/features/HiddenFileSync/configureHiddenFileSyncMode.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 type HiddenFileSyncDirection = "pullForce" | "pushForce" | "safe"; type ConfigureHiddenFileSyncHandlers = { disable: () => Promise; diff --git a/_types/src/features/LiveSyncCommands.d.ts b/_types/src/features/LiveSyncCommands.d.ts index 67837648..4f8266ae 100644 --- a/_types/src/features/LiveSyncCommands.d.ts +++ b/_types/src/features/LiveSyncCommands.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type AnyEntry, type DocumentID, type FilePath, type FilePathWithPrefix, type LOG_LEVEL } from "@lib/common/types.ts"; import type ObsidianLiveSyncPlugin from "@/main.ts"; import type { LiveSyncCore } from "@/main.ts"; diff --git a/_types/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.d.ts b/_types/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.d.ts index ab3c9178..99c089cc 100644 --- a/_types/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.d.ts +++ b/_types/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type DocumentID, type EntryDoc, type EntryLeaf } from "@lib/common/types"; import { LiveSyncCommands } from "@/features/LiveSyncCommands"; type ChunkID = DocumentID; diff --git a/_types/src/features/LocalDatabaseMainte/maintenancePrerequisites.d.ts b/_types/src/features/LocalDatabaseMainte/maintenancePrerequisites.d.ts index 0cddecf9..03cf5bd9 100644 --- a/_types/src/features/LocalDatabaseMainte/maintenancePrerequisites.d.ts +++ b/_types/src/features/LocalDatabaseMainte/maintenancePrerequisites.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettings } from "@lib/common/types"; type MaintenancePrerequisiteSettings = Pick; type MaintenancePrerequisiteOptions = { diff --git a/_types/src/features/P2PSync/P2PReplicator/P2POpenReplicationModal.d.ts b/_types/src/features/P2PSync/P2PReplicator/P2POpenReplicationModal.d.ts index ac0f5e59..078ee1fb 100644 --- a/_types/src/features/P2PSync/P2PReplicator/P2POpenReplicationModal.d.ts +++ b/_types/src/features/P2PSync/P2PReplicator/P2POpenReplicationModal.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { App, Modal } from "@/deps.ts"; import { mount } from "svelte"; import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator"; diff --git a/_types/src/features/P2PSync/P2PReplicator/P2PReplicationUI.d.ts b/_types/src/features/P2PSync/P2PReplicator/P2PReplicationUI.d.ts index d96dace5..eeb71c6d 100644 --- a/_types/src/features/P2PSync/P2PReplicator/P2PReplicationUI.d.ts +++ b/_types/src/features/P2PSync/P2PReplicator/P2PReplicationUI.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { App } from "@/deps.ts"; import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator"; /** diff --git a/_types/src/features/P2PSync/P2PReplicator/P2PReplicatorPaneView.d.ts b/_types/src/features/P2PSync/P2PReplicator/P2PReplicatorPaneView.d.ts index 525f562f..30ce1953 100644 --- a/_types/src/features/P2PSync/P2PReplicator/P2PReplicatorPaneView.d.ts +++ b/_types/src/features/P2PSync/P2PReplicator/P2PReplicatorPaneView.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { Menu, WorkspaceLeaf } from "@/deps.ts"; import { SvelteItemView } from "@/common/SvelteItemView.ts"; import { type PeerStatus } from "@lib/replication/trystero/P2PReplicatorPaneCommon.ts"; diff --git a/_types/src/features/P2PSync/P2PReplicator/P2PServerStatusPaneView.d.ts b/_types/src/features/P2PSync/P2PReplicator/P2PServerStatusPaneView.d.ts index eb9ce808..19dbec9c 100644 --- a/_types/src/features/P2PSync/P2PReplicator/P2PServerStatusPaneView.d.ts +++ b/_types/src/features/P2PSync/P2PReplicator/P2PServerStatusPaneView.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { WorkspaceLeaf } from "@/deps.ts"; import { SvelteItemView } from "@/common/SvelteItemView.ts"; import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore.ts"; diff --git a/_types/src/lib/src/API/DirectFileManipulator.d.ts b/_types/src/lib/src/API/DirectFileManipulator.d.ts index f0df1fcb..829a9979 100644 --- a/_types/src/lib/src/API/DirectFileManipulator.d.ts +++ b/_types/src/lib/src/API/DirectFileManipulator.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export { DirectFileManipulator } from "./DirectFileManipulatorV2.ts"; export type { DirectFileManipulatorOptions } from "./DirectFileManipulatorV2.ts"; diff --git a/_types/src/lib/src/API/processSetting.d.ts b/_types/src/lib/src/API/processSetting.d.ts index d1f85295..195f79da 100644 --- a/_types/src/lib/src/API/processSetting.d.ts +++ b/_types/src/lib/src/API/processSetting.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type ObsidianLiveSyncSettings } from "@lib/common/types"; /** * Encode settings to a tiny array to encode in QRCode, diff --git a/_types/src/lib/src/ContentSplitter/ContentSplitter.d.ts b/_types/src/lib/src/ContentSplitter/ContentSplitter.d.ts index 86296d3c..2f1534b0 100644 --- a/_types/src/lib/src/ContentSplitter/ContentSplitter.d.ts +++ b/_types/src/lib/src/ContentSplitter/ContentSplitter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 /** * Content-Splitter for Self-hosted LiveSync. * Splits content into manageable chunks for efficient storage and synchronisation. diff --git a/_types/src/lib/src/ContentSplitter/ContentSplitterBase.d.ts b/_types/src/lib/src/ContentSplitter/ContentSplitterBase.d.ts index b4ce905b..84cbf13e 100644 --- a/_types/src/lib/src/ContentSplitter/ContentSplitterBase.d.ts +++ b/_types/src/lib/src/ContentSplitter/ContentSplitterBase.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type SavingEntry } from "@lib/common/types.ts"; import { type ContentSplitterOptions, type SplitOptions } from "./ContentSplitter.ts"; export declare abstract class ContentSplitterCore { diff --git a/_types/src/lib/src/ContentSplitter/ContentSplitterRabinKarp.d.ts b/_types/src/lib/src/ContentSplitter/ContentSplitterRabinKarp.d.ts index fcc69a25..9ea7f449 100644 --- a/_types/src/lib/src/ContentSplitter/ContentSplitterRabinKarp.d.ts +++ b/_types/src/lib/src/ContentSplitter/ContentSplitterRabinKarp.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ContentSplitterOptions, SplitOptions } from "./ContentSplitter.ts"; import { ContentSplitterBase } from "./ContentSplitterBase.ts"; /** diff --git a/_types/src/lib/src/ContentSplitter/ContentSplitterV1.d.ts b/_types/src/lib/src/ContentSplitter/ContentSplitterV1.d.ts index 7e5c9083..9a1d5284 100644 --- a/_types/src/lib/src/ContentSplitter/ContentSplitterV1.d.ts +++ b/_types/src/lib/src/ContentSplitter/ContentSplitterV1.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ContentSplitterOptions, SplitOptions } from "./ContentSplitter"; import { ContentSplitterBase } from "./ContentSplitterBase"; /** diff --git a/_types/src/lib/src/ContentSplitter/ContentSplitterV2.d.ts b/_types/src/lib/src/ContentSplitter/ContentSplitterV2.d.ts index 29fc9dd3..a5f0c666 100644 --- a/_types/src/lib/src/ContentSplitter/ContentSplitterV2.d.ts +++ b/_types/src/lib/src/ContentSplitter/ContentSplitterV2.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ContentSplitterOptions, SplitOptions } from "./ContentSplitter.ts"; import { ContentSplitterBase } from "./ContentSplitterBase.ts"; /** diff --git a/_types/src/lib/src/ContentSplitter/ContentSplitters.d.ts b/_types/src/lib/src/ContentSplitter/ContentSplitters.d.ts index b7f3b544..66348783 100644 --- a/_types/src/lib/src/ContentSplitter/ContentSplitters.d.ts +++ b/_types/src/lib/src/ContentSplitter/ContentSplitters.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { SavingEntry } from "@lib/common/types"; import type { ContentSplitterOptions } from "./ContentSplitter"; import { ContentSplitterCore, type ContentSplitterBase } from "./ContentSplitterBase"; diff --git a/_types/src/lib/src/UI/svelteDialog.d.ts b/_types/src/lib/src/UI/svelteDialog.d.ts index 5a965ef8..16c2cbf6 100644 --- a/_types/src/lib/src/UI/svelteDialog.d.ts +++ b/_types/src/lib/src/UI/svelteDialog.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export type { HasSetResult, HasGetInitialData, ComponentHasResult, GuestDialogProps, DialogSvelteComponentBaseProps, DialogControlBase, } from "@lib/services/implements/base/SvelteDialog.ts"; export { CONTEXT_DIALOG_CONTROLS, setupDialogContext, getDialogContext, SvelteDialogManagerBase, } from "@lib/services/implements/base/SvelteDialog.ts"; diff --git a/_types/src/lib/src/bureau/bureau.d.ts b/_types/src/lib/src/bureau/bureau.d.ts index 801e9b66..fd6149c8 100644 --- a/_types/src/lib/src/bureau/bureau.d.ts +++ b/_types/src/lib/src/bureau/bureau.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type SlipBoard } from "octagonal-wheels/bureau/SlipBoard"; declare global { interface Slips extends LSSlips { diff --git a/_types/src/lib/src/common/ConnectionString.d.ts b/_types/src/lib/src/common/ConnectionString.d.ts index c043b2f0..d9f8760f 100644 --- a/_types/src/lib/src/common/ConnectionString.d.ts +++ b/_types/src/lib/src/common/ConnectionString.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { CouchDBConnection, BucketSyncSetting, P2PConnectionInfo } from "./models/setting.type"; export type RemoteConfigurationResult = { type: "couchdb"; diff --git a/_types/src/lib/src/common/LSError.d.ts b/_types/src/lib/src/common/LSError.d.ts index 973ec158..9fe90925 100644 --- a/_types/src/lib/src/common/LSError.d.ts +++ b/_types/src/lib/src/common/LSError.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { Constructor } from "@lib/common/utils.type"; interface ErrorWithCause extends Error { cause?: unknown; diff --git a/_types/src/lib/src/common/configForDoc.d.ts b/_types/src/lib/src/common/configForDoc.d.ts index 3b6a8e58..55cd3f83 100644 --- a/_types/src/lib/src/common/configForDoc.d.ts +++ b/_types/src/lib/src/common/configForDoc.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { Confirm } from "@lib/interfaces/Confirm"; import { type ObsidianLiveSyncSettings } from "./types"; declare enum ConditionType { diff --git a/_types/src/lib/src/common/coreEnvFunctions.d.ts b/_types/src/lib/src/common/coreEnvFunctions.d.ts index 693955e7..50f8d709 100644 --- a/_types/src/lib/src/common/coreEnvFunctions.d.ts +++ b/_types/src/lib/src/common/coreEnvFunctions.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { getLanguage as ObsidianGetLanguage } from "obsidian"; export declare function setGetLanguage(func: typeof ObsidianGetLanguage): void; export declare function getLanguage(): string; diff --git a/_types/src/lib/src/common/coreEnvVars.d.ts b/_types/src/lib/src/common/coreEnvVars.d.ts index 6788310e..ec24136d 100644 --- a/_types/src/lib/src/common/coreEnvVars.d.ts +++ b/_types/src/lib/src/common/coreEnvVars.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 declare const manifestVersion: string; declare const packageVersion: string; export { manifestVersion, packageVersion }; diff --git a/_types/src/lib/src/common/i18n.d.ts b/_types/src/lib/src/common/i18n.d.ts index d557488a..f6d2d15a 100644 --- a/_types/src/lib/src/common/i18n.d.ts +++ b/_types/src/lib/src/common/i18n.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { AllMessageKeys, I18N_LANGS } from "./rosetta"; import type { TaggedType } from "./types"; export declare let currentLang: I18N_LANGS; diff --git a/_types/src/lib/src/common/logger.d.ts b/_types/src/lib/src/common/logger.d.ts index 051b4a73..5c51454c 100644 --- a/_types/src/lib/src/common/logger.d.ts +++ b/_types/src/lib/src/common/logger.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export * from "octagonal-wheels/common/logger"; export type * from "octagonal-wheels/common/logger"; diff --git a/_types/src/lib/src/common/messages/combinedMessages.dev.d.ts b/_types/src/lib/src/common/messages/combinedMessages.dev.d.ts index 821dec6b..5ba4ab39 100644 --- a/_types/src/lib/src/common/messages/combinedMessages.dev.d.ts +++ b/_types/src/lib/src/common/messages/combinedMessages.dev.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { PartialMessages as def } from "./def.ts"; import { type MESSAGE } from "@lib/common/rosetta.ts"; type MessageKeys = keyof typeof def.def; diff --git a/_types/src/lib/src/common/messages/combinedMessages.prod.d.ts b/_types/src/lib/src/common/messages/combinedMessages.prod.d.ts index 92957cd6..3f71b7cf 100644 --- a/_types/src/lib/src/common/messages/combinedMessages.prod.d.ts +++ b/_types/src/lib/src/common/messages/combinedMessages.prod.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const allMessages: { readonly "(Active)": { readonly def: "(Active)"; diff --git a/_types/src/lib/src/common/messages/de.d.ts b/_types/src/lib/src/common/messages/de.d.ts index 4171aba3..68b4fbea 100644 --- a/_types/src/lib/src/common/messages/de.d.ts +++ b/_types/src/lib/src/common/messages/de.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const PartialMessages: { readonly de: { "(Active)": string; diff --git a/_types/src/lib/src/common/messages/def.d.ts b/_types/src/lib/src/common/messages/def.d.ts index d2a7e239..04dad69b 100644 --- a/_types/src/lib/src/common/messages/def.d.ts +++ b/_types/src/lib/src/common/messages/def.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const PartialMessages: { readonly def: { "(Active)": string; diff --git a/_types/src/lib/src/common/messages/es.d.ts b/_types/src/lib/src/common/messages/es.d.ts index 414a60e2..60878663 100644 --- a/_types/src/lib/src/common/messages/es.d.ts +++ b/_types/src/lib/src/common/messages/es.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const PartialMessages: { readonly es: { "(Active)": string; diff --git a/_types/src/lib/src/common/messages/fr.d.ts b/_types/src/lib/src/common/messages/fr.d.ts index 7444bba5..cf4cda27 100644 --- a/_types/src/lib/src/common/messages/fr.d.ts +++ b/_types/src/lib/src/common/messages/fr.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const PartialMessages: { readonly fr: { "(BETA) Always overwrite with a newer file": string; diff --git a/_types/src/lib/src/common/messages/he.d.ts b/_types/src/lib/src/common/messages/he.d.ts index cdd6cf1f..d505b4d9 100644 --- a/_types/src/lib/src/common/messages/he.d.ts +++ b/_types/src/lib/src/common/messages/he.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const PartialMessages: { readonly he: { "(BETA) Always overwrite with a newer file": string; diff --git a/_types/src/lib/src/common/messages/ja.d.ts b/_types/src/lib/src/common/messages/ja.d.ts index 0a0560a6..0fb343cd 100644 --- a/_types/src/lib/src/common/messages/ja.d.ts +++ b/_types/src/lib/src/common/messages/ja.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const PartialMessages: { readonly ja: { "(Active)": string; diff --git a/_types/src/lib/src/common/messages/ko.d.ts b/_types/src/lib/src/common/messages/ko.d.ts index cc611158..6ee068b4 100644 --- a/_types/src/lib/src/common/messages/ko.d.ts +++ b/_types/src/lib/src/common/messages/ko.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const PartialMessages: { readonly ko: { "(Active)": string; diff --git a/_types/src/lib/src/common/messages/ru.d.ts b/_types/src/lib/src/common/messages/ru.d.ts index 213a8f0f..618b7d8d 100644 --- a/_types/src/lib/src/common/messages/ru.d.ts +++ b/_types/src/lib/src/common/messages/ru.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const PartialMessages: { readonly ru: { "(Active)": string; diff --git a/_types/src/lib/src/common/messages/zh-tw.d.ts b/_types/src/lib/src/common/messages/zh-tw.d.ts index e619634d..e72e6ed1 100644 --- a/_types/src/lib/src/common/messages/zh-tw.d.ts +++ b/_types/src/lib/src/common/messages/zh-tw.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const PartialMessages: { readonly "zh-tw": { "(Active)": string; diff --git a/_types/src/lib/src/common/messages/zh.d.ts b/_types/src/lib/src/common/messages/zh.d.ts index 630c2898..c90d6ae4 100644 --- a/_types/src/lib/src/common/messages/zh.d.ts +++ b/_types/src/lib/src/common/messages/zh.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const PartialMessages: { readonly zh: { "(Active)": string; diff --git a/_types/src/lib/src/common/models/auth.type.d.ts b/_types/src/lib/src/common/models/auth.type.d.ts index 1828bb7a..e49d6aaf 100644 --- a/_types/src/lib/src/common/models/auth.type.d.ts +++ b/_types/src/lib/src/common/models/auth.type.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export type CouchDBCredentials = BasicCredentials | JWTCredentials; export type JWTAlgorithm = "HS256" | "HS512" | "ES256" | "ES512" | ""; export type Credential = { diff --git a/_types/src/lib/src/common/models/db.const.d.ts b/_types/src/lib/src/common/models/db.const.d.ts index fcf58dfc..6c905791 100644 --- a/_types/src/lib/src/common/models/db.const.d.ts +++ b/_types/src/lib/src/common/models/db.const.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { DocumentID } from "./db.type"; export declare const VERSIONING_DOCID: DocumentID; export declare const MILESTONE_DOCID: DocumentID; diff --git a/_types/src/lib/src/common/models/db.definition.d.ts b/_types/src/lib/src/common/models/db.definition.d.ts index ed47b49c..90939201 100644 --- a/_types/src/lib/src/common/models/db.definition.d.ts +++ b/_types/src/lib/src/common/models/db.definition.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { MILESTONE_DOCID, NODEINFO_DOCID } from "./db.const"; import type { AnyEntry, ChunkVersionRange, DatabaseEntry, EntryChunkPack, EntryLeaf, EntryTypes, EntryVersionInfo, InternalFileEntry, LoadedEntry, MetaEntry, NewEntry, NoteEntry, PlainEntry } from "./db.type"; import type { TweakValues } from "./tweak.definition"; diff --git a/_types/src/lib/src/common/models/db.type.d.ts b/_types/src/lib/src/common/models/db.type.d.ts index 5d92debb..08572443 100644 --- a/_types/src/lib/src/common/models/db.type.d.ts +++ b/_types/src/lib/src/common/models/db.type.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { TaggedType } from "octagonal-wheels/common/types"; import type { EntryTypes, SYNCINFO_ID } from "./db.const"; export type FilePath = TaggedType; diff --git a/_types/src/lib/src/common/models/diff.definition.d.ts b/_types/src/lib/src/common/models/diff.definition.d.ts index 1250d927..d491b6ed 100644 --- a/_types/src/lib/src/common/models/diff.definition.d.ts +++ b/_types/src/lib/src/common/models/diff.definition.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { AUTO_MERGED, CANCELLED, MISSING_OR_ERROR, NOT_CONFLICTED } from "./shared.const.symbols"; export type diff_result_leaf = { rev: string; diff --git a/_types/src/lib/src/common/models/fileaccess.const.d.ts b/_types/src/lib/src/common/models/fileaccess.const.d.ts index 2de10a8d..542dadf9 100644 --- a/_types/src/lib/src/common/models/fileaccess.const.d.ts +++ b/_types/src/lib/src/common/models/fileaccess.const.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const CHeader = "h:"; export declare const PSCHeader = "ps:"; export declare const PSCHeaderEnd = "ps;"; diff --git a/_types/src/lib/src/common/models/fileaccess.type.d.ts b/_types/src/lib/src/common/models/fileaccess.type.d.ts index 09ad7a8f..12d2a7dd 100644 --- a/_types/src/lib/src/common/models/fileaccess.type.d.ts +++ b/_types/src/lib/src/common/models/fileaccess.type.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePath, FilePathWithPrefix } from "./db.type"; export type UXStat = { size: number; @@ -50,7 +50,7 @@ export type UXDataWriteOptions = { mtime?: number; }; export type CacheData = string | ArrayBuffer; -export type FileEventType = "CREATE" | "DELETE" | "CHANGED" | "INTERNAL"; +export type FileEventType = "CREATE" | "DELETE" | "CHANGED" | "RENAME" | "INTERNAL"; export type FileEventArgs = { file: UXFileInfoStub | UXInternalFileInfoStub; cache?: CacheData; diff --git a/_types/src/lib/src/common/models/redflag.const.d.ts b/_types/src/lib/src/common/models/redflag.const.d.ts index da032874..4ce777d3 100644 --- a/_types/src/lib/src/common/models/redflag.const.d.ts +++ b/_types/src/lib/src/common/models/redflag.const.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePath } from "./db.type"; export declare const PREFIXMD_LOGFILE = "livesync_log_"; export declare const PREFIXMD_LOGFILE_UC = "LIVESYNC_LOG_"; diff --git a/_types/src/lib/src/common/models/setting.const.d.ts b/_types/src/lib/src/common/models/setting.const.d.ts index 18d867ef..a276ccf6 100644 --- a/_types/src/lib/src/common/models/setting.const.d.ts +++ b/_types/src/lib/src/common/models/setting.const.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const SETTING_VERSION_INITIAL = 0; export declare const SETTING_VERSION_SUPPORT_CASE_INSENSITIVE = 10; export declare const CURRENT_SETTING_VERSION = 10; diff --git a/_types/src/lib/src/common/models/setting.const.defaults.d.ts b/_types/src/lib/src/common/models/setting.const.defaults.d.ts index 285758d2..7ef884bc 100644 --- a/_types/src/lib/src/common/models/setting.const.defaults.d.ts +++ b/_types/src/lib/src/common/models/setting.const.defaults.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type ObsidianLiveSyncSettings, type P2PSyncSetting } from "./setting.type"; export declare const P2P_DEFAULT_SETTINGS: P2PSyncSetting; export declare const DEFAULT_SETTINGS: ObsidianLiveSyncSettings; diff --git a/_types/src/lib/src/common/models/setting.const.preferred.d.ts b/_types/src/lib/src/common/models/setting.const.preferred.d.ts index d881aa19..c922458b 100644 --- a/_types/src/lib/src/common/models/setting.const.preferred.d.ts +++ b/_types/src/lib/src/common/models/setting.const.preferred.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettings } from "./setting.type"; export declare const PREFERRED_BASE: Partial; export declare const PREFERRED_SETTING_CLOUDANT: Partial; diff --git a/_types/src/lib/src/common/models/setting.const.qr.d.ts b/_types/src/lib/src/common/models/setting.const.qr.d.ts index d5a2a522..b23f743f 100644 --- a/_types/src/lib/src/common/models/setting.const.qr.d.ts +++ b/_types/src/lib/src/common/models/setting.const.qr.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettings } from "./setting.type"; export declare const KeyIndexOfSettings: Record; diff --git a/_types/src/lib/src/common/models/setting.type.d.ts b/_types/src/lib/src/common/models/setting.type.d.ts index 82b5465e..1fff4439 100644 --- a/_types/src/lib/src/common/models/setting.type.d.ts +++ b/_types/src/lib/src/common/models/setting.type.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ChunkAlgorithms, E2EEAlgorithms, HashAlgorithms, MODE_AUTOMATIC, MODE_PAUSED, MODE_SELECTIVE, MODE_SHINY, RemoteTypes } from "./setting.const"; import type { I18N_LANGS } from "@lib/common/rosetta"; import type { CustomRegExpSourceList } from "./shared.type.util"; diff --git a/_types/src/lib/src/common/models/shared.const.behabiour.d.ts b/_types/src/lib/src/common/models/shared.const.behabiour.d.ts index 2762fc1c..f4eb9248 100644 --- a/_types/src/lib/src/common/models/shared.const.behabiour.d.ts +++ b/_types/src/lib/src/common/models/shared.const.behabiour.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const MAX_DOC_SIZE = 1000; export declare const MAX_DOC_SIZE_BIN = 102400; export declare const VER = 12; diff --git a/_types/src/lib/src/common/models/shared.const.d.ts b/_types/src/lib/src/common/models/shared.const.d.ts index fc299cc6..b85dcdb0 100644 --- a/_types/src/lib/src/common/models/shared.const.d.ts +++ b/_types/src/lib/src/common/models/shared.const.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const SETTING_KEY_P2P_DEVICE_NAME = "p2p_device_name"; export declare const configURIBase = "obsidian://setuplivesync?settings="; export declare const configURIBaseQR = "obsidian://setuplivesync?settingsQR="; diff --git a/_types/src/lib/src/common/models/shared.const.symbols.d.ts b/_types/src/lib/src/common/models/shared.const.symbols.d.ts index 06ef69df..45db23c7 100644 --- a/_types/src/lib/src/common/models/shared.const.symbols.d.ts +++ b/_types/src/lib/src/common/models/shared.const.symbols.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const CANCELLED: unique symbol; export declare const AUTO_MERGED: unique symbol; export declare const NOT_CONFLICTED: unique symbol; diff --git a/_types/src/lib/src/common/models/shared.definition.configNames.d.ts b/_types/src/lib/src/common/models/shared.definition.configNames.d.ts index 2605c71a..7fa2d0e1 100644 --- a/_types/src/lib/src/common/models/shared.definition.configNames.d.ts +++ b/_types/src/lib/src/common/models/shared.definition.configNames.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettings } from "./setting.type"; export declare const LEVEL_ADVANCED = "ADVANCED"; export declare const LEVEL_POWER_USER = "POWER_USER"; diff --git a/_types/src/lib/src/common/models/shared.definition.d.ts b/_types/src/lib/src/common/models/shared.definition.d.ts index 614e378a..e7d66389 100644 --- a/_types/src/lib/src/common/models/shared.definition.d.ts +++ b/_types/src/lib/src/common/models/shared.definition.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const DatabaseConnectingStatuses: { readonly STARTED: "STARTED"; readonly NOT_CONNECTED: "NOT_CONNECTED"; diff --git a/_types/src/lib/src/common/models/shared.type.util.d.ts b/_types/src/lib/src/common/models/shared.type.util.d.ts index 57025267..0b948be6 100644 --- a/_types/src/lib/src/common/models/shared.type.util.d.ts +++ b/_types/src/lib/src/common/models/shared.type.util.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { TaggedType } from "octagonal-wheels/common/types"; export type { TaggedType }; export type CustomRegExpSource = TaggedType; diff --git a/_types/src/lib/src/common/models/sync.definition.d.ts b/_types/src/lib/src/common/models/sync.definition.d.ts index 2880a49c..016748fb 100644 --- a/_types/src/lib/src/common/models/sync.definition.d.ts +++ b/_types/src/lib/src/common/models/sync.definition.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { EntryTypes } from "./db.const"; import type { DatabaseEntry, DocumentID } from "./db.type"; export declare const ProtocolVersions: { diff --git a/_types/src/lib/src/common/models/tweak.definition.d.ts b/_types/src/lib/src/common/models/tweak.definition.d.ts index e5120751..2d854004 100644 --- a/_types/src/lib/src/common/models/tweak.definition.d.ts +++ b/_types/src/lib/src/common/models/tweak.definition.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettings } from "./setting.type"; export declare const TweakValuesShouldMatchedTemplate: Partial; type TweakKeys = keyof TweakValues; diff --git a/_types/src/lib/src/common/rosetta.d.ts b/_types/src/lib/src/common/rosetta.d.ts index 06167315..7123bde7 100644 --- a/_types/src/lib/src/common/rosetta.d.ts +++ b/_types/src/lib/src/common/rosetta.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 /** # Rosetta stone - To localise messages to your language, please write a translation to this file and submit a PR. diff --git a/_types/src/lib/src/common/settingConstants.d.ts b/_types/src/lib/src/common/settingConstants.d.ts index 8f6111d0..fc518c7f 100644 --- a/_types/src/lib/src/common/settingConstants.d.ts +++ b/_types/src/lib/src/common/settingConstants.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type ConfigurationItem, type ObsidianLiveSyncSettings } from "./types.ts"; type ExtractPropertiesByType = { [K in keyof T as T[K] extends U ? K : never]: T[K] extends U ? K : never; diff --git a/_types/src/lib/src/common/typeUtils.d.ts b/_types/src/lib/src/common/typeUtils.d.ts index f177da96..37035eb2 100644 --- a/_types/src/lib/src/common/typeUtils.d.ts +++ b/_types/src/lib/src/common/typeUtils.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { DocumentID, FilePath, FilePathWithPrefix } from "./models/db.type"; import type { UXFileInfoStub } from "./types"; /** diff --git a/_types/src/lib/src/common/types.d.ts b/_types/src/lib/src/common/types.d.ts index 496952c1..6c4392c0 100644 --- a/_types/src/lib/src/common/types.d.ts +++ b/_types/src/lib/src/common/types.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export type { TaggedType } from "./models/shared.type.util.ts"; export { LOG_LEVEL_DEBUG, LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_URGENT, LOG_LEVEL_VERBOSE, } from "octagonal-wheels/common/logger"; export type { LOG_LEVEL } from "octagonal-wheels/common/logger"; diff --git a/_types/src/lib/src/common/utils.d.ts b/_types/src/lib/src/common/utils.d.ts index fc98c4fc..3cd8ac92 100644 --- a/_types/src/lib/src/common/utils.d.ts +++ b/_types/src/lib/src/common/utils.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type AnyEntry, type DatabaseEntry, type EntryLeaf, type SyncInfo, type LoadedEntry, type SavingEntry, type NewEntry, type PlainEntry, type CustomRegExpSource, type ParsedCustomRegExp, type CustomRegExpSourceList, type ObsidianLiveSyncSettings, type RemoteDBSettings, type P2PConnectionInfo, type BucketSyncSetting, type CouchDBConnection, type EncryptionSettings } from "./types.ts"; import { replaceAll, replaceAllPairs } from "octagonal-wheels/string"; export { replaceAll, replaceAllPairs }; diff --git a/_types/src/lib/src/common/utils.doc.d.ts b/_types/src/lib/src/common/utils.doc.d.ts index 9f9aaea9..3bf8ed94 100644 --- a/_types/src/lib/src/common/utils.doc.d.ts +++ b/_types/src/lib/src/common/utils.doc.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare function isErrorOf(ex: unknown, statusCode: number): boolean; /** * Checks if the error is effectively a 404 error from CouchDB or PouchDB. diff --git a/_types/src/lib/src/common/utils.object.d.ts b/_types/src/lib/src/common/utils.object.d.ts index 8ef1cad7..c50b31d0 100644 --- a/_types/src/lib/src/common/utils.object.d.ts +++ b/_types/src/lib/src/common/utils.object.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare function asCopy(obj: T): T; export declare function ensureError(error: unknown): Error; diff --git a/_types/src/lib/src/common/utils.patch.d.ts b/_types/src/lib/src/common/utils.patch.d.ts index 1d9ef80b..f2a3bd6a 100644 --- a/_types/src/lib/src/common/utils.patch.d.ts +++ b/_types/src/lib/src/common/utils.patch.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare function generatePatchObj(from: Record, to: Record): Record; export declare function applyPatch(from: Record, patch: Record): Record; export declare function mergeObject(objA: Record | [unknown], objB: Record | [unknown]): unknown[] | { diff --git a/_types/src/lib/src/common/utils.type.d.ts b/_types/src/lib/src/common/utils.type.d.ts index 30059819..1845a517 100644 --- a/_types/src/lib/src/common/utils.type.d.ts +++ b/_types/src/lib/src/common/utils.type.d.ts @@ -1,3 +1,3 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export type Constructor = new (...args: any[]) => T; // eslint-disable-line @typescript-eslint/no-explicit-any -- Only type declaration diff --git a/_types/src/lib/src/dataobject/StoredMap.d.ts b/_types/src/lib/src/dataobject/StoredMap.d.ts index c183ccdd..f0feef8f 100644 --- a/_types/src/lib/src/dataobject/StoredMap.d.ts +++ b/_types/src/lib/src/dataobject/StoredMap.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { SimpleStore } from "octagonal-wheels/databases/SimpleStoreBase"; export declare class StoredMapLike { _store: SimpleStore; diff --git a/_types/src/lib/src/dev/checks.d.ts b/_types/src/lib/src/dev/checks.d.ts index 45d3af5d..fcf03fce 100644 --- a/_types/src/lib/src/dev/checks.d.ts +++ b/_types/src/lib/src/dev/checks.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 interface InstanceHaveOnBindFunction { onBindFunction: (...params: T[]) => void; } diff --git a/_types/src/lib/src/encryption/encryptHKDF.d.ts b/_types/src/lib/src/encryption/encryptHKDF.d.ts index ce744358..b68a61f1 100644 --- a/_types/src/lib/src/encryption/encryptHKDF.d.ts +++ b/_types/src/lib/src/encryption/encryptHKDF.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { encryptHKDFWorker, decryptHKDFWorker } from "@lib/worker/bgWorker.ts"; export declare const encryptHKDF: typeof encryptHKDFWorker; export declare const decryptHKDF: typeof decryptHKDFWorker; diff --git a/_types/src/lib/src/encryption/stringEncryption.d.ts b/_types/src/lib/src/encryption/stringEncryption.d.ts index 1567676a..d8366d3e 100644 --- a/_types/src/lib/src/encryption/stringEncryption.d.ts +++ b/_types/src/lib/src/encryption/stringEncryption.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 /** * Encrypts a string using a passphrase, unless the string is already encrypted. * diff --git a/_types/src/lib/src/events/coreEvents.d.ts b/_types/src/lib/src/events/coreEvents.d.ts index 2c2efb65..86372dcd 100644 --- a/_types/src/lib/src/events/coreEvents.d.ts +++ b/_types/src/lib/src/events/coreEvents.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePathWithPrefix, ObsidianLiveSyncSettings } from "@lib/common/types"; export declare const EVENT_LAYOUT_READY = "layout-ready"; export declare const EVENT_PLUGIN_LOADED = "plugin-loaded"; diff --git a/_types/src/lib/src/hub/hub.d.ts b/_types/src/lib/src/hub/hub.d.ts index 06529686..42647f21 100644 --- a/_types/src/lib/src/hub/hub.d.ts +++ b/_types/src/lib/src/hub/hub.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { EventHub } from "octagonal-wheels/events"; declare global { interface LSEvents { diff --git a/_types/src/lib/src/index.d.ts b/_types/src/lib/src/index.d.ts index 90e53504..00df9e91 100644 --- a/_types/src/lib/src/index.d.ts +++ b/_types/src/lib/src/index.d.ts @@ -1,3 +1,3 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export { DirectFileManipulator, type DirectFileManipulatorOptions } from "./API/DirectFileManipulator.ts"; diff --git a/_types/src/lib/src/interfaces/AsyncActivityRunner.d.ts b/_types/src/lib/src/interfaces/AsyncActivityRunner.d.ts index 397029f4..0f3b5fa0 100644 --- a/_types/src/lib/src/interfaces/AsyncActivityRunner.d.ts +++ b/_types/src/lib/src/interfaces/AsyncActivityRunner.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 /** Options attached to one bounded asynchronous activity. */ export interface AsyncActivityOptions { /** An optional diagnostic label supplied to the activity owner. */ diff --git a/_types/src/lib/src/interfaces/Confirm.d.ts b/_types/src/lib/src/interfaces/Confirm.d.ts index 315cb661..3ee0b625 100644 --- a/_types/src/lib/src/interfaces/Confirm.d.ts +++ b/_types/src/lib/src/interfaces/Confirm.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export interface Confirm { askYesNo(message: string): Promise<"yes" | "no">; askString(title: string, key: string, placeholder: string, isPassword?: boolean): Promise; diff --git a/_types/src/lib/src/interfaces/DatabaseFileAccess.d.ts b/_types/src/lib/src/interfaces/DatabaseFileAccess.d.ts index 67bf1070..0bd1072f 100644 --- a/_types/src/lib/src/interfaces/DatabaseFileAccess.d.ts +++ b/_types/src/lib/src/interfaces/DatabaseFileAccess.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePathWithPrefix, LoadedEntry, MetaEntry, UXFileInfo, UXFileInfoStub } from "@lib/common/types"; export interface DatabaseFileAccess { delete: (file: UXFileInfoStub | FilePathWithPrefix, rev?: string) => Promise; diff --git a/_types/src/lib/src/interfaces/DatabaseRebuilder.d.ts b/_types/src/lib/src/interfaces/DatabaseRebuilder.d.ts index dfbc2a5d..09ea8c8e 100644 --- a/_types/src/lib/src/interfaces/DatabaseRebuilder.d.ts +++ b/_types/src/lib/src/interfaces/DatabaseRebuilder.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export interface Rebuilder { $performRebuildDB(method: "localOnly" | "remoteOnly" | "rebuildBothByThisDevice" | "localOnlyWithChunks"): Promise; $rebuildRemote(): Promise; diff --git a/_types/src/lib/src/interfaces/FileHandler.d.ts b/_types/src/lib/src/interfaces/FileHandler.d.ts index 74c1e516..4a0ef312 100644 --- a/_types/src/lib/src/interfaces/FileHandler.d.ts +++ b/_types/src/lib/src/interfaces/FileHandler.d.ts @@ -1,11 +1,12 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePath, FilePathWithPrefix, MetaEntry } from "@lib/common/models/db.type"; import type { UXFileInfo, UXFileInfoStub, UXInternalFileInfoStub } from "@lib/common/models/fileaccess.type"; export interface IFileHandler { readFileFromStub(file: UXFileInfoStub | UXFileInfo): Promise; storeFileToDB(info: UXFileInfoStub | UXFileInfo | UXInternalFileInfoStub | FilePathWithPrefix, force?: boolean, onlyChunks?: boolean): Promise; deleteFileFromDB(info: UXFileInfoStub | UXInternalFileInfoStub | FilePath): Promise; + renameFileInDB(info: UXFileInfoStub | UXFileInfo, oldPath: FilePath | FilePathWithPrefix): Promise; deleteRevisionFromDB(info: UXFileInfoStub | FilePath | FilePathWithPrefix, rev: string): Promise; resolveConflictedByDeletingRevision(info: UXFileInfoStub | FilePath, rev: string): Promise; dbToStorageWithSpecificRev(info: UXFileInfoStub | UXFileInfo | FilePath | null, rev: string, force?: boolean): Promise; diff --git a/_types/src/lib/src/interfaces/KeyValueDatabase.d.ts b/_types/src/lib/src/interfaces/KeyValueDatabase.d.ts index 287bf3c0..f320797a 100644 --- a/_types/src/lib/src/interfaces/KeyValueDatabase.d.ts +++ b/_types/src/lib/src/interfaces/KeyValueDatabase.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export interface KeyValueDatabase { get(key: IDBValidKey): Promise; set(key: IDBValidKey, value: T): Promise; diff --git a/_types/src/lib/src/interfaces/ServiceModule.d.ts b/_types/src/lib/src/interfaces/ServiceModule.d.ts index 7b9f4b9d..f97ef577 100644 --- a/_types/src/lib/src/interfaces/ServiceModule.d.ts +++ b/_types/src/lib/src/interfaces/ServiceModule.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { DatabaseFileAccess } from "@lib/interfaces/DatabaseFileAccess"; import type { Rebuilder } from "@lib/interfaces/DatabaseRebuilder"; import type { IFileHandler } from "@lib/interfaces/FileHandler"; diff --git a/_types/src/lib/src/interfaces/StorageAccess.d.ts b/_types/src/lib/src/interfaces/StorageAccess.d.ts index 2b127310..6740985a 100644 --- a/_types/src/lib/src/interfaces/StorageAccess.d.ts +++ b/_types/src/lib/src/interfaces/StorageAccess.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePath, FilePathWithPrefix, UXDataWriteOptions, UXFileInfo, UXFileInfoStub, UXFolderInfo, UXStat } from "@lib/common/types"; import type { CustomRegExp } from "@lib/common/utils"; import type { FileWithFileStat, FileWithStatAsProp } from "@lib/common/models/fileaccess.type"; @@ -15,6 +15,7 @@ export interface StorageAccess { normalisePath(path: string): string; restoreState(): Promise; deleteVaultItem(file: FilePathWithPrefix | UXFileInfoStub | UXFolderInfo): Promise; + renameFile(file: UXFileInfoStub | FilePathWithPrefix, newPath: FilePathWithPrefix): Promise; writeFileAuto(path: string, data: string | ArrayBuffer, opt?: UXDataWriteOptions): Promise; readFileAuto(path: string): Promise; readFileText(path: string): Promise; diff --git a/_types/src/lib/src/interfaces/StorageEventManager.d.ts b/_types/src/lib/src/interfaces/StorageEventManager.d.ts index f828dfbf..42a21913 100644 --- a/_types/src/lib/src/interfaces/StorageEventManager.d.ts +++ b/_types/src/lib/src/interfaces/StorageEventManager.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FileEventType, FilePath, UXFileInfoStub, UXInternalFileInfoStub } from "@lib/common/types"; export type FileEvent = { type: FileEventType; diff --git a/_types/src/lib/src/managers/ChangeManager.d.ts b/_types/src/lib/src/managers/ChangeManager.d.ts index 86a3859b..3ec4261b 100644 --- a/_types/src/lib/src/managers/ChangeManager.d.ts +++ b/_types/src/lib/src/managers/ChangeManager.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { FallbackWeakRef } from "octagonal-wheels/common/polyfill"; /** * Options for configuring the ChangeManager. diff --git a/_types/src/lib/src/managers/ChunkDeliveryCoordinator.d.ts b/_types/src/lib/src/managers/ChunkDeliveryCoordinator.d.ts new file mode 100644 index 00000000..bd526611 --- /dev/null +++ b/_types/src/lib/src/managers/ChunkDeliveryCoordinator.d.ts @@ -0,0 +1,53 @@ +// @ts-nocheck +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 +import type { ReactiveSource } from "octagonal-wheels/dataobject/reactive"; +import type { DocumentID } from "@lib/common/types"; +/** + * A last-resort leak fuse for an accepted delivery claim which reports no + * observable progress. It releases logical ownership so a waiter, and an + * entered bounded activity with its Wake Lock and indicator, cannot be retained + * forever by a stalled transport or never-settling Promise. + * + * Five minutes is a conservative operational ceiling, not a normal + * chunk-arrival budget, evidence of remote absence, or a transport deadline. + * The transport contract cannot yet abort the underlying request when it fires. + */ +export declare const DEFAULT_CHUNK_DELIVERY_STALL_TIMEOUT_MS: number; +export type ActivityCountSource = Pick, "value" | "onChanged" | "offChanged">; +export type ChunkDeliveryClaimOptions = { + stallTimeoutMs?: number; + onStalled?: (ids: readonly DocumentID[]) => void; +}; +export type ChunkDeliveryChangeListener = (ids?: readonly DocumentID[]) => void; +/** A finite claim that keeps chunk arrival waiters paused until every owned identifier settles. */ +export interface ChunkDeliveryClaim { + readonly done: Promise; + readonly pendingIds: readonly DocumentID[]; + release(): void; + settle(id: DocumentID): void; + touch(): void; +} +/** + * Coordinates on-demand chunk ownership with broader finite remote activity. + * + * `ChunkFetcher` owns claims. `ArrivalWaitLayer` observes only whether an + * identifier may still be delivered, so it does not depend on a replicator + * service or on fetch scheduling details. + */ +export declare class ChunkDeliveryCoordinator { + private readonly finiteReplicationActivity?; + private readonly activeClaimCounts; + private readonly claimReleases; + private readonly listeners; + private finiteActivityWasActive; + private readonly finiteActivityChanged; + private disposed; + constructor(finiteReplicationActivity?: ActivityCountSource | undefined); + claim(ids: readonly DocumentID[], options?: ChunkDeliveryClaimOptions): ChunkDeliveryClaim; + isActivityActiveFor(id: DocumentID): boolean; + isClaimActiveFor(id: DocumentID): boolean; + isFiniteReplicationActive(): boolean; + onChanged(listener: ChunkDeliveryChangeListener): () => void; + dispose(): void; + private notifyChanged; +} diff --git a/_types/src/lib/src/managers/ChunkFetcher.d.ts b/_types/src/lib/src/managers/ChunkFetcher.d.ts index 35113740..25f6bede 100644 --- a/_types/src/lib/src/managers/ChunkFetcher.d.ts +++ b/_types/src/lib/src/managers/ChunkFetcher.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type DocumentID } from "@lib/common/types.ts"; import { type ChunkManager } from "./ChunkManager.ts"; import type { IReplicatorService, ISettingService } from "@lib/services/base/IService.ts"; @@ -10,11 +10,14 @@ export type ChunkFetcherOptions = { settingService: ISettingService; chunkManager: ChunkManager; replicatorService: IReplicatorService; + deliveryStallTimeoutMs?: number; }; export declare class ChunkFetcher { options: ChunkFetcherOptions; get chunkManager(): ChunkManager; queue: DocumentID[]; + private readonly pendingClaims; + private destroyed; get interval(): number; get concurrency(): number; abort: AbortController; @@ -22,6 +25,12 @@ export declare class ChunkFetcher { destroy(): void; onEventHandler: (ids: DocumentID[]) => void; onEvent(ids: DocumentID[]): void; + private ensureClaims; + private removePendingDelivery; + private onClaimStalled; + private settleClaim; + private touchClaims; + private waitForActivityBoundary; /** * Processing requests */ diff --git a/_types/src/lib/src/managers/ChunkManager.d.ts b/_types/src/lib/src/managers/ChunkManager.d.ts index 12215261..ffe04130 100644 --- a/_types/src/lib/src/managers/ChunkManager.d.ts +++ b/_types/src/lib/src/managers/ChunkManager.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { LayeredChunkManager } from "./LayeredChunkManager"; export { LayeredChunkManager as ChunkManager }; diff --git a/_types/src/lib/src/managers/ConflictManager.d.ts b/_types/src/lib/src/managers/ConflictManager.d.ts index efe17528..ade24751 100644 --- a/_types/src/lib/src/managers/ConflictManager.d.ts +++ b/_types/src/lib/src/managers/ConflictManager.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type Diff } from "diff-match-patch"; import { type EntryDoc, type FilePathWithPrefix, type diff_result_leaf, type LoadedEntry, type DIFF_CHECK_RESULT_AUTO } from "@lib/common/types.ts"; import type { EntryManager } from "@lib/managers/EntryManager/EntryManager.ts"; diff --git a/_types/src/lib/src/managers/EntryManager/EntryManager.d.ts b/_types/src/lib/src/managers/EntryManager/EntryManager.d.ts index 53fa9c9a..b78f154d 100644 --- a/_types/src/lib/src/managers/EntryManager/EntryManager.d.ts +++ b/_types/src/lib/src/managers/EntryManager/EntryManager.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type FilePathWithPrefix, type FilePath, type LoadedEntry, type EntryDoc, type SavingEntry, type MetaEntry } from "@lib/common/types"; import type { ChunkManager } from "@lib/managers/ChunkManager"; import type { ContentSplitter } from "@lib/ContentSplitter/ContentSplitters"; diff --git a/_types/src/lib/src/managers/EntryManager/EntryManagerImpls.d.ts b/_types/src/lib/src/managers/EntryManager/EntryManagerImpls.d.ts index 68819994..77e3a9d7 100644 --- a/_types/src/lib/src/managers/EntryManager/EntryManagerImpls.d.ts +++ b/_types/src/lib/src/managers/EntryManager/EntryManagerImpls.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type SavingEntry, type DocumentID, type EntryDoc, type EntryBase, type FilePath, type FilePathWithPrefix, type LoadedEntry, type ObsidianLiveSyncSettings, type MetaEntry } from "@lib/common/types"; import type { ContentSplitter } from "@lib/ContentSplitter/ContentSplitters"; import type { HashManager } from "@lib/managers/HashManager/HashManager"; @@ -33,6 +33,14 @@ export declare function isLegacyNote(meta: LoadedEntry | MetaEntry): meta is (im children: string[]; }); export declare function canUseOnDemandChunking(settings: ObsidianLiveSyncSettings): boolean; +/** + * Decide how to retrieve chunks based on settings and waitForReady flag. + * `waitForReady` allows an already-observable finite delivery lifecycle to finish. + */ +export declare function computeChunkRetrievalMethod(waitForReady: boolean, settings: ObsidianLiveSyncSettings): { + waitForDelivery: boolean; + preventRemoteRequest: boolean; +}; export declare function getDBEntryFromMeta(host: NecessaryServicesInterfaces<"path" | "setting", never>, { localDatabase, chunkManager }: NecessaryManagers<"localDatabase" | "chunkManager">, meta: LoadedEntry | MetaEntry, dump?: boolean, waitForReady?: boolean): Promise; get database(): PouchDB.Database; get cacheStatistics(): { diff --git a/_types/src/lib/src/managers/LayeredChunkManager/ArrivalWaitLayer.d.ts b/_types/src/lib/src/managers/LayeredChunkManager/ArrivalWaitLayer.d.ts index 10c47722..e506c350 100644 --- a/_types/src/lib/src/managers/LayeredChunkManager/ArrivalWaitLayer.d.ts +++ b/_types/src/lib/src/managers/LayeredChunkManager/ArrivalWaitLayer.d.ts @@ -1,34 +1,32 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { DocumentID, EntryLeaf } from "@lib/common/types"; import type { IReadLayer } from "./ChunkLayerInterfaces"; import type { ChunkReadOptions } from "./types.ts"; +import { ChunkDeliveryCoordinator } from "@lib/managers/ChunkDeliveryCoordinator.ts"; +export type ChunkAvailabilityRecheck = (ids: readonly DocumentID[]) => Promise; /** - * Arrival wait layer - emits events for fetcher, and waits for chunks to arrive + * Waits only for a delivery lifecycle which is already observable when the + * local miss is handled. It does not guess at an arrival delay. */ export declare class ArrivalWaitLayer implements IReadLayer { - private waitingMap; - private readonly DEFAULT_TIMEOUT; + private readonly recheckAvailability?; + private readonly waitingMap; private readonly eventEmitter; - constructor(eventEmitter: (eventName: string, data: DocumentID[]) => void); + private readonly deliveryCoordinator; + private readonly ownsDeliveryCoordinator; + private readonly stopObservingActivity; + constructor(eventEmitter: (eventName: string, data: DocumentID[]) => void, deliveryCoordinator?: ChunkDeliveryCoordinator, recheckAvailability?: ChunkAvailabilityRecheck | undefined); private enqueueWaiting; - private withTimeout; - /** - * Handle chunk arrival (called when a chunk document arrives) - */ + private settle; + private settleAfterObservedActivity; + private refreshActivity; + /** Handle a chunk document becoming available. */ onChunkArrived(doc: EntryLeaf, deleted?: boolean): void; - /** - * Handle missing chunk (called when a chunk is confirmed missing) - */ + /** Handle an explicit remote-missing result. */ onMissingChunk(id: DocumentID): void; read(ids: DocumentID[], options: ChunkReadOptions, next: (remaining: DocumentID[]) => Promise<(EntryLeaf | false)[]>): Promise<(EntryLeaf | false)[]>; - /** - * Clear all waiting requests - */ clearWaiting(): void; tearDown(): void; - /** - * Get count of waiting chunks - */ getWaitingCount(): number; } diff --git a/_types/src/lib/src/managers/LayeredChunkManager/CacheLayer.d.ts b/_types/src/lib/src/managers/LayeredChunkManager/CacheLayer.d.ts index b1094e24..12794b51 100644 --- a/_types/src/lib/src/managers/LayeredChunkManager/CacheLayer.d.ts +++ b/_types/src/lib/src/managers/LayeredChunkManager/CacheLayer.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { DocumentID, EntryLeaf } from "@lib/common/types"; import type { IReadLayer, IWriteLayer } from "./ChunkLayerInterfaces"; import type { ChunkReadOptions, ChunkWriteOptions, WriteResult } from "./types.ts"; diff --git a/_types/src/lib/src/managers/LayeredChunkManager/ChunkLayerInterfaces.d.ts b/_types/src/lib/src/managers/LayeredChunkManager/ChunkLayerInterfaces.d.ts index 2c2a14b3..2b81387d 100644 --- a/_types/src/lib/src/managers/LayeredChunkManager/ChunkLayerInterfaces.d.ts +++ b/_types/src/lib/src/managers/LayeredChunkManager/ChunkLayerInterfaces.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { DocumentID, EntryLeaf } from "@lib/common/types.ts"; import type { ChunkReadOptions, ChunkWriteOptions, WriteResult } from "./types.ts"; /** diff --git a/_types/src/lib/src/managers/LayeredChunkManager/DatabaseReadLayer.d.ts b/_types/src/lib/src/managers/LayeredChunkManager/DatabaseReadLayer.d.ts index 311b46da..819db080 100644 --- a/_types/src/lib/src/managers/LayeredChunkManager/DatabaseReadLayer.d.ts +++ b/_types/src/lib/src/managers/LayeredChunkManager/DatabaseReadLayer.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { EntryLeaf, DocumentID, EntryDoc } from "@lib/common/types"; import type { IReadLayer } from "./ChunkLayerInterfaces"; import type { ChunkReadOptions } from "./types.ts"; diff --git a/_types/src/lib/src/managers/LayeredChunkManager/DatabaseWriteLayer.d.ts b/_types/src/lib/src/managers/LayeredChunkManager/DatabaseWriteLayer.d.ts index 990f4956..64321d0c 100644 --- a/_types/src/lib/src/managers/LayeredChunkManager/DatabaseWriteLayer.d.ts +++ b/_types/src/lib/src/managers/LayeredChunkManager/DatabaseWriteLayer.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { EntryLeaf, DocumentID, EntryDoc } from "@lib/common/types"; import type { IWriteLayer } from "./ChunkLayerInterfaces"; import type { ChunkWriteOptions, WriteResult } from "./types.ts"; diff --git a/_types/src/lib/src/managers/LayeredChunkManager/HotPackLayer.d.ts b/_types/src/lib/src/managers/LayeredChunkManager/HotPackLayer.d.ts index 09b3791b..3edee379 100644 --- a/_types/src/lib/src/managers/LayeredChunkManager/HotPackLayer.d.ts +++ b/_types/src/lib/src/managers/LayeredChunkManager/HotPackLayer.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { EntryLeaf, DocumentID } from "@lib/common/types"; import type { IWriteLayer } from "./ChunkLayerInterfaces"; import type { ChunkWriteOptions, WriteResult } from "./types.ts"; diff --git a/_types/src/lib/src/managers/LayeredChunkManager/types.d.ts b/_types/src/lib/src/managers/LayeredChunkManager/types.d.ts index fc2d3901..89239451 100644 --- a/_types/src/lib/src/managers/LayeredChunkManager/types.d.ts +++ b/_types/src/lib/src/managers/LayeredChunkManager/types.d.ts @@ -1,17 +1,23 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { EntryDoc } from "@lib/common/models/db.definition"; import type { DocumentID, EntryLeaf } from "@lib/common/models/db.type"; import type { ISettingService } from "@lib/services/base/IService"; import type { ChangeManager } from "@lib/managers/ChangeManager"; import type { EVENT_CHUNK_FETCHED, EVENT_MISSING_CHUNK_REMOTE, EVENT_MISSING_CHUNKS } from "@lib/managers/ChunkFetcher"; +import type { ActivityCountSource } from "@lib/managers/ChunkDeliveryCoordinator"; export type ChunkManagerOptions = { database: PouchDB.Database; changeManager: ChangeManager; settingService: ISettingService; + /** Finite replication which may still deliver a requested chunk. */ + finiteReplicationActivity?: ActivityCountSource; }; export type ChunkReadOptions = { skipCache?: boolean; + /** Wait for an already-observable finite delivery lifecycle. */ + waitForDelivery?: boolean; + /** @deprecated Use `waitForDelivery`. Positive values no longer represent an arrival duration. */ timeout?: number; preventRemoteRequest?: boolean; }; diff --git a/_types/src/lib/src/managers/LiveSyncManagers.d.ts b/_types/src/lib/src/managers/LiveSyncManagers.d.ts index d70b99d9..10fd4d26 100644 --- a/_types/src/lib/src/managers/LiveSyncManagers.d.ts +++ b/_types/src/lib/src/managers/LiveSyncManagers.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type EntryDoc } from "@lib/common/types"; import { ContentSplitter } from "@lib/ContentSplitter/ContentSplitters.ts"; import { ChangeManager } from "@lib/managers/ChangeManager.ts"; diff --git a/_types/src/lib/src/managers/StorageEventManager.d.ts b/_types/src/lib/src/managers/StorageEventManager.d.ts index 1231b574..3d26f5b1 100644 --- a/_types/src/lib/src/managers/StorageEventManager.d.ts +++ b/_types/src/lib/src/managers/StorageEventManager.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type FileEventType, type FilePath, type UXFileInfoStub, type UXFolderInfo, type UXInternalFileInfoStub } from "@lib/common/types.ts"; import { type FileEventItem } from "@lib/common/types.ts"; import type { IStorageAccessManager } from "@lib/interfaces/StorageAccess.ts"; diff --git a/_types/src/lib/src/managers/StorageProcessingManager.d.ts b/_types/src/lib/src/managers/StorageProcessingManager.d.ts index 006ee126..db12b950 100644 --- a/_types/src/lib/src/managers/StorageProcessingManager.d.ts +++ b/_types/src/lib/src/managers/StorageProcessingManager.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePathWithPrefix } from "@lib/common/models/db.type"; import type { UXFileInfoStub } from "@lib/common/models/fileaccess.type"; import type { IStorageAccessManager } from "@lib/interfaces/StorageAccess"; diff --git a/_types/src/lib/src/managers/adapters/IStorageEventConverterAdapter.d.ts b/_types/src/lib/src/managers/adapters/IStorageEventConverterAdapter.d.ts index df5a27b7..c6b4b996 100644 --- a/_types/src/lib/src/managers/adapters/IStorageEventConverterAdapter.d.ts +++ b/_types/src/lib/src/managers/adapters/IStorageEventConverterAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePath, UXFileInfoStub, UXInternalFileInfoStub } from "@lib/common/types"; /** * Adapter interface for converting platform-specific file types to UX types diff --git a/_types/src/lib/src/managers/adapters/IStorageEventManagerAdapter.d.ts b/_types/src/lib/src/managers/adapters/IStorageEventManagerAdapter.d.ts index 4f369f7c..c7d9b2f4 100644 --- a/_types/src/lib/src/managers/adapters/IStorageEventManagerAdapter.d.ts +++ b/_types/src/lib/src/managers/adapters/IStorageEventManagerAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { IStorageEventTypeGuardAdapter } from "./IStorageEventTypeGuardAdapter"; import type { IStorageEventPersistenceAdapter } from "./IStorageEventPersistenceAdapter"; import type { IStorageEventWatchAdapter } from "./IStorageEventWatchAdapter"; diff --git a/_types/src/lib/src/managers/adapters/IStorageEventPersistenceAdapter.d.ts b/_types/src/lib/src/managers/adapters/IStorageEventPersistenceAdapter.d.ts index 235c4208..44d5e9bf 100644 --- a/_types/src/lib/src/managers/adapters/IStorageEventPersistenceAdapter.d.ts +++ b/_types/src/lib/src/managers/adapters/IStorageEventPersistenceAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FileEventItem } from "@lib/common/types"; import type { FileEventItemSentinel } from "@lib/managers/StorageEventManager"; /** diff --git a/_types/src/lib/src/managers/adapters/IStorageEventStatusAdapter.d.ts b/_types/src/lib/src/managers/adapters/IStorageEventStatusAdapter.d.ts index 45c97c17..7c7e62e8 100644 --- a/_types/src/lib/src/managers/adapters/IStorageEventStatusAdapter.d.ts +++ b/_types/src/lib/src/managers/adapters/IStorageEventStatusAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 /** * Adapter interface for status update operations */ diff --git a/_types/src/lib/src/managers/adapters/IStorageEventTypeGuardAdapter.d.ts b/_types/src/lib/src/managers/adapters/IStorageEventTypeGuardAdapter.d.ts index 3baf9264..3564a3ad 100644 --- a/_types/src/lib/src/managers/adapters/IStorageEventTypeGuardAdapter.d.ts +++ b/_types/src/lib/src/managers/adapters/IStorageEventTypeGuardAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 /** * Adapter interface for type guard operations in StorageEventManager * diff --git a/_types/src/lib/src/managers/adapters/IStorageEventWatchAdapter.d.ts b/_types/src/lib/src/managers/adapters/IStorageEventWatchAdapter.d.ts index c0a368d3..4b496011 100644 --- a/_types/src/lib/src/managers/adapters/IStorageEventWatchAdapter.d.ts +++ b/_types/src/lib/src/managers/adapters/IStorageEventWatchAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePath } from "@lib/common/types"; /** * Event handlers for storage events diff --git a/_types/src/lib/src/managers/adapters/index.d.ts b/_types/src/lib/src/managers/adapters/index.d.ts index a94af70b..f8d7816a 100644 --- a/_types/src/lib/src/managers/adapters/index.d.ts +++ b/_types/src/lib/src/managers/adapters/index.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export type { IStorageEventTypeGuardAdapter } from "./IStorageEventTypeGuardAdapter"; export type { IStorageEventPersistenceAdapter } from "./IStorageEventPersistenceAdapter"; export type { IStorageEventWatchAdapter, IStorageEventWatchHandlers } from "./IStorageEventWatchAdapter"; diff --git a/_types/src/lib/src/mock_and_interop/stores.d.ts b/_types/src/lib/src/mock_and_interop/stores.d.ts index 67e87090..2f1bdbac 100644 --- a/_types/src/lib/src/mock_and_interop/stores.d.ts +++ b/_types/src/lib/src/mock_and_interop/stores.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { LOG_LEVEL } from "@lib/common/types.ts"; export type LockStats = { pending: string[]; diff --git a/_types/src/lib/src/mock_and_interop/wrapper.d.ts b/_types/src/lib/src/mock_and_interop/wrapper.d.ts index b13e9a96..bb32e41a 100644 --- a/_types/src/lib/src/mock_and_interop/wrapper.d.ts +++ b/_types/src/lib/src/mock_and_interop/wrapper.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare class WrappedNotice { constructor(message: string | DocumentFragment, timeout?: number); setMessage(message: string | DocumentFragment): this; diff --git a/_types/src/lib/src/mods.d.ts b/_types/src/lib/src/mods.d.ts index 37a47b49..c869dfa1 100644 --- a/_types/src/lib/src/mods.d.ts +++ b/_types/src/lib/src/mods.d.ts @@ -1,3 +1,3 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare function getWebCrypto(): Promise; diff --git a/_types/src/lib/src/pouchdb/LiveSyncDBFunctions.d.ts b/_types/src/lib/src/pouchdb/LiveSyncDBFunctions.d.ts index 2ad26116..db97cf37 100644 --- a/_types/src/lib/src/pouchdb/LiveSyncDBFunctions.d.ts +++ b/_types/src/lib/src/pouchdb/LiveSyncDBFunctions.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type EntryDoc, type EntryMilestoneInfo, type RemoteDBSettings, type ChunkVersionRange, type TweakValues, type DeviceInfo } from "@lib/common/types.ts"; export type ENSURE_DB_RESULT = "OK" | "INCOMPATIBLE" | "LOCKED" | "NODE_LOCKED" | "NODE_CLEANED" | ["MISMATCHED", TweakValues]; /** diff --git a/_types/src/lib/src/pouchdb/LiveSyncLocalDB.d.ts b/_types/src/lib/src/pouchdb/LiveSyncLocalDB.d.ts index 05a20a7c..383667c3 100644 --- a/_types/src/lib/src/pouchdb/LiveSyncLocalDB.d.ts +++ b/_types/src/lib/src/pouchdb/LiveSyncLocalDB.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type EntryDoc, type EntryLeaf, type Credential, type RemoteDBSettings, type DocumentID, type FilePathWithPrefix, type FilePath, type DatabaseEntry, type LoadedEntry, type MetaEntry, type SavingEntry, type diff_result_leaf } from "@lib/common/types.ts"; import { eventHub } from "@lib/hub/hub.ts"; import { LiveSyncManagers } from "@lib/managers/LiveSyncManagers.ts"; diff --git a/_types/src/lib/src/pouchdb/ReplicatorShim.d.ts b/_types/src/lib/src/pouchdb/ReplicatorShim.d.ts index a9348865..a2a1604c 100644 --- a/_types/src/lib/src/pouchdb/ReplicatorShim.d.ts +++ b/_types/src/lib/src/pouchdb/ReplicatorShim.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export type SomeDocument = PouchDB.Core.ExistingDocument & PouchDB.Core.ChangesMeta; /** * Minimal subset of the PouchDB public API required by {@link replicateShim}. diff --git a/_types/src/lib/src/pouchdb/StreamingFetch.d.ts b/_types/src/lib/src/pouchdb/StreamingFetch.d.ts index 858e0655..3b03d815 100644 --- a/_types/src/lib/src/pouchdb/StreamingFetch.d.ts +++ b/_types/src/lib/src/pouchdb/StreamingFetch.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { EntryDoc } from "@lib/common/models/db.definition"; import type { AnyEntry, EntryLeaf } from "@lib/common/models/db.type"; type DBSequence = number | string; diff --git a/_types/src/lib/src/pouchdb/StreamingFetch.integration.spec.d.ts b/_types/src/lib/src/pouchdb/StreamingFetch.integration.spec.d.ts index 08dc832e..e5839175 100644 --- a/_types/src/lib/src/pouchdb/StreamingFetch.integration.spec.d.ts +++ b/_types/src/lib/src/pouchdb/StreamingFetch.integration.spec.d.ts @@ -1,3 +1,3 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export {}; diff --git a/_types/src/lib/src/pouchdb/chunks.d.ts b/_types/src/lib/src/pouchdb/chunks.d.ts index ab4aea7c..1282685b 100644 --- a/_types/src/lib/src/pouchdb/chunks.d.ts +++ b/_types/src/lib/src/pouchdb/chunks.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { CouchDBConnection } from "@lib/common/types"; export declare function purgeUnreferencedChunks(db: PouchDB.Database, dryRun: boolean, connSetting?: CouchDBConnection, performCompact?: boolean): Promise; export declare function transferChunks(key: string, label: string, dbFrom: PouchDB.Database, dbTo: PouchDB.Database, items: { diff --git a/_types/src/lib/src/pouchdb/compress.d.ts b/_types/src/lib/src/pouchdb/compress.d.ts index efafb63b..3893640b 100644 --- a/_types/src/lib/src/pouchdb/compress.d.ts +++ b/_types/src/lib/src/pouchdb/compress.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import * as fflate from "fflate"; import type { EntryDoc } from "@lib/common/types"; export declare function _compressText(text: string): Promise; diff --git a/_types/src/lib/src/pouchdb/encryption.d.ts b/_types/src/lib/src/pouchdb/encryption.d.ts index 44ae3372..11470201 100644 --- a/_types/src/lib/src/pouchdb/encryption.d.ts +++ b/_types/src/lib/src/pouchdb/encryption.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type EntryDoc, type AnyEntry, type EntryLeaf, type DocumentID, type E2EEAlgorithm } from "@lib/common/types"; import { encryptWorker, decryptWorker, encryptHKDFWorker, decryptHKDFWorker } from "@lib/worker/bgWorker.ts"; export declare const encrypt: typeof encryptWorker; diff --git a/_types/src/lib/src/pouchdb/negotiation.d.ts b/_types/src/lib/src/pouchdb/negotiation.d.ts index 9e566047..b3a037d8 100644 --- a/_types/src/lib/src/pouchdb/negotiation.d.ts +++ b/_types/src/lib/src/pouchdb/negotiation.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const checkRemoteVersion: (db: PouchDB.Database, migrate: (from: number, to: number) => Promise, barrier?: number) => Promise; export declare const bumpRemoteVersion: (db: PouchDB.Database, barrier?: number) => Promise; export declare const checkSyncInfo: (db: PouchDB.Database) => Promise; diff --git a/_types/src/lib/src/pouchdb/pouchdb-browser.d.ts b/_types/src/lib/src/pouchdb/pouchdb-browser.d.ts index b317d182..60cdcde4 100644 --- a/_types/src/lib/src/pouchdb/pouchdb-browser.d.ts +++ b/_types/src/lib/src/pouchdb/pouchdb-browser.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import PouchDB from "pouchdb-core"; export { PouchDB }; diff --git a/_types/src/lib/src/pouchdb/pouchdb-http.d.ts b/_types/src/lib/src/pouchdb/pouchdb-http.d.ts index b317d182..60cdcde4 100644 --- a/_types/src/lib/src/pouchdb/pouchdb-http.d.ts +++ b/_types/src/lib/src/pouchdb/pouchdb-http.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import PouchDB from "pouchdb-core"; export { PouchDB }; diff --git a/_types/src/lib/src/pouchdb/pouchdb-test.d.ts b/_types/src/lib/src/pouchdb/pouchdb-test.d.ts index b317d182..60cdcde4 100644 --- a/_types/src/lib/src/pouchdb/pouchdb-test.d.ts +++ b/_types/src/lib/src/pouchdb/pouchdb-test.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import PouchDB from "pouchdb-core"; export { PouchDB }; diff --git a/_types/src/lib/src/pouchdb/utils_couchdb.d.ts b/_types/src/lib/src/pouchdb/utils_couchdb.d.ts index cfe01b68..a1487411 100644 --- a/_types/src/lib/src/pouchdb/utils_couchdb.d.ts +++ b/_types/src/lib/src/pouchdb/utils_couchdb.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const isValidRemoteCouchDBURI: (uri: string) => boolean; export declare function isCloudantURI(uri: string): boolean; export declare function isErrorOfMissingDoc(ex: unknown): boolean; diff --git a/_types/src/lib/src/replication/LiveSyncAbstractReplicator.d.ts b/_types/src/lib/src/replication/LiveSyncAbstractReplicator.d.ts index 2a951be2..b2e490b0 100644 --- a/_types/src/lib/src/replication/LiveSyncAbstractReplicator.d.ts +++ b/_types/src/lib/src/replication/LiveSyncAbstractReplicator.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type EntryDoc, type DatabaseConnectingStatus, type RemoteDBSettings, type EntryLeaf, type TweakValues, type NodeData } from "@lib/common/types.ts"; import type { RequiredServices } from "@lib/interfaces/ServiceModule"; export type ReplicationCallback = (e: PouchDB.Core.ExistingDocument[]) => Promise | boolean; diff --git a/_types/src/lib/src/replication/SyncParamsHandler.d.ts b/_types/src/lib/src/replication/SyncParamsHandler.d.ts index 7af086b5..345d2a97 100644 --- a/_types/src/lib/src/replication/SyncParamsHandler.d.ts +++ b/_types/src/lib/src/replication/SyncParamsHandler.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { SyncParameters } from "@lib/common/types.ts"; import { LiveSyncError } from "@lib/common/LSError.ts"; /** diff --git a/_types/src/lib/src/replication/couchdb/LiveSyncReplicator.d.ts b/_types/src/lib/src/replication/couchdb/LiveSyncReplicator.d.ts index 55c60e04..c800f181 100644 --- a/_types/src/lib/src/replication/couchdb/LiveSyncReplicator.d.ts +++ b/_types/src/lib/src/replication/couchdb/LiveSyncReplicator.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type EntryDoc, type RemoteDBSettings, type EntryLeaf, type TweakValues, type SyncParameters, type DatabaseEntry, type NodeData } from "@lib/common/types.ts"; import { LiveSyncAbstractReplicator, type LiveSyncReplicatorEnv, type RemoteDBStatus } from "@lib/replication/LiveSyncAbstractReplicator.ts"; import type { ServiceHub } from "@lib/services/ServiceHub.ts"; diff --git a/_types/src/lib/src/replication/httplib.d.ts b/_types/src/lib/src/replication/httplib.d.ts index 26673d92..488c0a0c 100644 --- a/_types/src/lib/src/replication/httplib.d.ts +++ b/_types/src/lib/src/replication/httplib.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { CouchDBCredentials, JWTCredentials, JWTHeader, JWTParams, JWTPayload, PreparedJWT, RemoteDBSettings } from "@lib/common/types"; import { Computed } from "octagonal-wheels/dataobject/Computed"; /** diff --git a/_types/src/lib/src/replication/journal/JournalSyncCore.d.ts b/_types/src/lib/src/replication/journal/JournalSyncCore.d.ts index 8f372b30..846e32ce 100644 --- a/_types/src/lib/src/replication/journal/JournalSyncCore.d.ts +++ b/_types/src/lib/src/replication/journal/JournalSyncCore.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type EntryDoc, type SyncParameters, type BucketSyncSetting, type RemoteDBSettings } from "@lib/common/types.ts"; import type { ReplicationCallback, ReplicationStat } from "@lib/replication/LiveSyncAbstractReplicator.ts"; import { type SimpleStore } from "@lib/common/utils.ts"; diff --git a/_types/src/lib/src/replication/journal/JournalSyncTypes.d.ts b/_types/src/lib/src/replication/journal/JournalSyncTypes.d.ts index 8996d6fe..22cac5d5 100644 --- a/_types/src/lib/src/replication/journal/JournalSyncTypes.d.ts +++ b/_types/src/lib/src/replication/journal/JournalSyncTypes.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export type CheckPointInfo = { lastLocalSeq: number | string; journalEpoch: string; diff --git a/_types/src/lib/src/replication/journal/LiveSyncJournalReplicator.d.ts b/_types/src/lib/src/replication/journal/LiveSyncJournalReplicator.d.ts index 955d7a31..911e1b96 100644 --- a/_types/src/lib/src/replication/journal/LiveSyncJournalReplicator.d.ts +++ b/_types/src/lib/src/replication/journal/LiveSyncJournalReplicator.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type RemoteDBSettings, type EntryLeaf, type ChunkVersionRange, type TweakValues, type NodeData } from "@lib/common/types.ts"; import { JournalSyncCore } from "./JournalSyncCore.ts"; import { LiveSyncAbstractReplicator, type RemoteDBStatus } from "@lib/replication/LiveSyncAbstractReplicator.ts"; diff --git a/_types/src/lib/src/replication/journal/LiveSyncJournalReplicatorEnv.d.ts b/_types/src/lib/src/replication/journal/LiveSyncJournalReplicatorEnv.d.ts index aa4fd5e5..36525dbb 100644 --- a/_types/src/lib/src/replication/journal/LiveSyncJournalReplicatorEnv.d.ts +++ b/_types/src/lib/src/replication/journal/LiveSyncJournalReplicatorEnv.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { LiveSyncReplicatorEnv } from "@lib/replication/LiveSyncAbstractReplicator"; export interface LiveSyncJournalReplicatorEnv extends LiveSyncReplicatorEnv { // eslint-disable-line @typescript-eslint/no-empty-object-type, @typescript-eslint/no-empty-interface -- Empty interface } diff --git a/_types/src/lib/src/replication/journal/objectstore/JournalStorageAdapter.d.ts b/_types/src/lib/src/replication/journal/objectstore/JournalStorageAdapter.d.ts index 836afc6d..e3f1bf78 100644 --- a/_types/src/lib/src/replication/journal/objectstore/JournalStorageAdapter.d.ts +++ b/_types/src/lib/src/replication/journal/objectstore/JournalStorageAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { RemoteDBStatus } from "@lib/replication/LiveSyncAbstractReplicator.ts"; import type { BucketSyncSetting } from "@lib/common/types.ts"; export interface IJournalStorage { diff --git a/_types/src/lib/src/replication/journal/objectstore/MinioStorageAdapter.d.ts b/_types/src/lib/src/replication/journal/objectstore/MinioStorageAdapter.d.ts index a227c09c..dd6b8220 100644 --- a/_types/src/lib/src/replication/journal/objectstore/MinioStorageAdapter.d.ts +++ b/_types/src/lib/src/replication/journal/objectstore/MinioStorageAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { S3 } from "@aws-sdk/client-s3"; import { type BucketSyncSetting } from "@lib/common/types.ts"; import type { RemoteDBStatus } from "@lib/replication/LiveSyncAbstractReplicator.ts"; @@ -10,6 +10,7 @@ export declare class MinioStorageAdapter implements IJournalStorage { _settings: BucketSyncSetting; _env: LiveSyncJournalReplicatorEnv; constructor(settings: BucketSyncSetting, env: LiveSyncJournalReplicatorEnv); + private runTrackedRequest; applyNewConfig(settings: BucketSyncSetting): void; get customHeaders(): [string, string][]; _getClient(): S3; diff --git a/_types/src/lib/src/replication/journal/objectstore/MinioStorageAdapter.integration.spec.d.ts b/_types/src/lib/src/replication/journal/objectstore/MinioStorageAdapter.integration.spec.d.ts index 08dc832e..e5839175 100644 --- a/_types/src/lib/src/replication/journal/objectstore/MinioStorageAdapter.integration.spec.d.ts +++ b/_types/src/lib/src/replication/journal/objectstore/MinioStorageAdapter.integration.spec.d.ts @@ -1,3 +1,3 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export {}; diff --git a/_types/src/lib/src/replication/trystero/LiveSyncTrysteroReplicator.d.ts b/_types/src/lib/src/replication/trystero/LiveSyncTrysteroReplicator.d.ts index 2f256055..c5479a9d 100644 --- a/_types/src/lib/src/replication/trystero/LiveSyncTrysteroReplicator.d.ts +++ b/_types/src/lib/src/replication/trystero/LiveSyncTrysteroReplicator.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type RemoteDBSettings, type EntryLeaf, type TweakValues, type LOG_LEVEL, type NodeData } from "@lib/common/types"; import { LiveSyncAbstractReplicator, type LiveSyncReplicatorEnv, type RemoteDBStatus } from "@lib/replication/LiveSyncAbstractReplicator"; import { TrysteroReplicator } from "./TrysteroReplicator"; diff --git a/_types/src/lib/src/replication/trystero/P2PLogCollector.d.ts b/_types/src/lib/src/replication/trystero/P2PLogCollector.d.ts index cc7ecee1..cd1cb9f3 100644 --- a/_types/src/lib/src/replication/trystero/P2PLogCollector.d.ts +++ b/_types/src/lib/src/replication/trystero/P2PLogCollector.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { P2PReplicationProgress } from "./TrysteroReplicator"; export declare class P2PLogCollector { constructor(); diff --git a/_types/src/lib/src/replication/trystero/P2PReplicatorBase.d.ts b/_types/src/lib/src/replication/trystero/P2PReplicatorBase.d.ts index 50f64d42..d1f9c669 100644 --- a/_types/src/lib/src/replication/trystero/P2PReplicatorBase.d.ts +++ b/_types/src/lib/src/replication/trystero/P2PReplicatorBase.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { LOG_LEVEL } from "octagonal-wheels/common/logger"; import type { SimpleStore } from "octagonal-wheels/databases/SimpleStoreBase"; import type { ReactiveSource } from "octagonal-wheels/dataobject/reactive_v2"; diff --git a/_types/src/lib/src/replication/trystero/P2PReplicatorCore.d.ts b/_types/src/lib/src/replication/trystero/P2PReplicatorCore.d.ts index 5f059929..43a94b3f 100644 --- a/_types/src/lib/src/replication/trystero/P2PReplicatorCore.d.ts +++ b/_types/src/lib/src/replication/trystero/P2PReplicatorCore.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; import type { P2PPaneParams } from "./UseP2PReplicatorResult"; export type P2PViewFactory = (leaf: unknown) => unknown; diff --git a/_types/src/lib/src/replication/trystero/P2PReplicatorPaneCommon.d.ts b/_types/src/lib/src/replication/trystero/P2PReplicatorPaneCommon.d.ts index c9fd8fae..2c87728c 100644 --- a/_types/src/lib/src/replication/trystero/P2PReplicatorPaneCommon.d.ts +++ b/_types/src/lib/src/replication/trystero/P2PReplicatorPaneCommon.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts"; export declare const EVENT_P2P_PEER_SHOW_EXTRA_MENU = "p2p-peer-show-extra-menu"; export declare enum AcceptedStatus { diff --git a/_types/src/lib/src/replication/trystero/ProxiedDB.d.ts b/_types/src/lib/src/replication/trystero/ProxiedDB.d.ts index 887bef25..b1a35382 100644 --- a/_types/src/lib/src/replication/trystero/ProxiedDB.d.ts +++ b/_types/src/lib/src/replication/trystero/ProxiedDB.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type ReplicatorHostEnv } from "./types"; import type { EntryDoc } from "@lib/common/models/db.definition"; export declare function createHostingDB(env: ReplicatorHostEnv): { diff --git a/_types/src/lib/src/replication/trystero/TrysteroReplicator.d.ts b/_types/src/lib/src/replication/trystero/TrysteroReplicator.d.ts index 6ed7a70e..6337c008 100644 --- a/_types/src/lib/src/replication/trystero/TrysteroReplicator.d.ts +++ b/_types/src/lib/src/replication/trystero/TrysteroReplicator.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type EntryDoc, type ObsidianLiveSyncSettings } from "@lib/common/types"; import { type ProgressInfo } from "@lib/pouchdb/ReplicatorShim"; import type { Confirm } from "@lib/interfaces/Confirm"; @@ -64,7 +64,7 @@ export declare class TrysteroReplicator { get deviceName(): string; get platform(): string; get confirm(): Confirm; - private runBoundedRemoteActivity; + private runFiniteReplicationActivity; constructor(env: ReplicatorHostEnv, server?: P2PHost); close(): Promise; open(): Promise; diff --git a/_types/src/lib/src/replication/trystero/TrysteroReplicatorP2PClient.d.ts b/_types/src/lib/src/replication/trystero/TrysteroReplicatorP2PClient.d.ts index 1c311822..4fa6ae5a 100644 --- a/_types/src/lib/src/replication/trystero/TrysteroReplicatorP2PClient.d.ts +++ b/_types/src/lib/src/replication/trystero/TrysteroReplicatorP2PClient.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { PouchDBShim, SomeDocument } from "@lib/pouchdb/ReplicatorShim"; import type { TrysteroReplicatorP2PServer } from "./TrysteroReplicatorP2PServer"; import { type BindableObject, type NonPrivateMethodKeys, type Response } from "./types"; diff --git a/_types/src/lib/src/replication/trystero/TrysteroReplicatorP2PConnection.d.ts b/_types/src/lib/src/replication/trystero/TrysteroReplicatorP2PConnection.d.ts index 01844319..e4ff59bc 100644 --- a/_types/src/lib/src/replication/trystero/TrysteroReplicatorP2PConnection.d.ts +++ b/_types/src/lib/src/replication/trystero/TrysteroReplicatorP2PConnection.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { TrysteroReplicatorP2PServer } from "./TrysteroReplicatorP2PServer"; export { TrysteroReplicatorP2PServer as TrysteroConnection }; diff --git a/_types/src/lib/src/replication/trystero/TrysteroReplicatorP2PServer.d.ts b/_types/src/lib/src/replication/trystero/TrysteroReplicatorP2PServer.d.ts index 4fdfb5d0..d67ba073 100644 --- a/_types/src/lib/src/replication/trystero/TrysteroReplicatorP2PServer.d.ts +++ b/_types/src/lib/src/replication/trystero/TrysteroReplicatorP2PServer.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type ActionSender, type Room } from "@trystero-p2p/nostr"; import { type P2PSyncSetting } from "@lib/common/types"; import { type ReplicatorHostEnv, type FullFilledDeviceInfo, type Request, type Response, type Payload, type Advertisement, type BindableObject, type BindableFunction } from "./types"; diff --git a/_types/src/lib/src/replication/trystero/UseP2PReplicatorResult.d.ts b/_types/src/lib/src/replication/trystero/UseP2PReplicatorResult.d.ts index e25de199..e1aa1425 100644 --- a/_types/src/lib/src/replication/trystero/UseP2PReplicatorResult.d.ts +++ b/_types/src/lib/src/replication/trystero/UseP2PReplicatorResult.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ReactiveSource } from "octagonal-wheels/dataobject/reactive_v2"; import type { LiveSyncTrysteroReplicator } from "./LiveSyncTrysteroReplicator"; import type { P2PLogCollector } from "./P2PLogCollector"; diff --git a/_types/src/lib/src/replication/trystero/addP2PEventHandlers.d.ts b/_types/src/lib/src/replication/trystero/addP2PEventHandlers.d.ts index 66813e65..324481fd 100644 --- a/_types/src/lib/src/replication/trystero/addP2PEventHandlers.d.ts +++ b/_types/src/lib/src/replication/trystero/addP2PEventHandlers.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { LiveSyncTrysteroReplicator } from "./LiveSyncTrysteroReplicator"; import type { Advertisement } from "./types"; /** diff --git a/_types/src/lib/src/replication/trystero/rpcCompat.d.ts b/_types/src/lib/src/replication/trystero/rpcCompat.d.ts index fed02e23..055b8388 100644 --- a/_types/src/lib/src/replication/trystero/rpcCompat.d.ts +++ b/_types/src/lib/src/replication/trystero/rpcCompat.d.ts @@ -1,3 +1,3 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare function toRpcMethodName(method: string): string; diff --git a/_types/src/lib/src/replication/trystero/types.d.ts b/_types/src/lib/src/replication/trystero/types.d.ts index 601c0a78..f05838cb 100644 --- a/_types/src/lib/src/replication/trystero/types.d.ts +++ b/_types/src/lib/src/replication/trystero/types.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { JsonLike } from "@lib/rpc"; import type { P2PSyncSetting, EntryDoc } from "@lib/common/types"; import type { SimpleStore } from "@lib/common/utils"; @@ -80,7 +80,7 @@ export interface ReplicatorHostEnv extends ReplicatorHost { settings: P2PSyncSetting; db: PouchDB.Database; simpleStore: SimpleStore; - runBoundedRemoteActivity?: AsyncActivityRunner["run"]; + runFiniteReplicationActivity?: AsyncActivityRunner["run"]; processReplicatedDocs(docs: Array>): void | Promise; } export type Advertisement = { diff --git a/_types/src/lib/src/replication/trystero/useP2PReplicatorCommands.d.ts b/_types/src/lib/src/replication/trystero/useP2PReplicatorCommands.d.ts index 2798cbf5..45e7cadc 100644 --- a/_types/src/lib/src/replication/trystero/useP2PReplicatorCommands.d.ts +++ b/_types/src/lib/src/replication/trystero/useP2PReplicatorCommands.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; import type { UseP2PReplicatorResult } from "./UseP2PReplicatorResult"; /** diff --git a/_types/src/lib/src/replication/trystero/useP2PReplicatorFeature.d.ts b/_types/src/lib/src/replication/trystero/useP2PReplicatorFeature.d.ts index bf086484..4d087122 100644 --- a/_types/src/lib/src/replication/trystero/useP2PReplicatorFeature.d.ts +++ b/_types/src/lib/src/replication/trystero/useP2PReplicatorFeature.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; import { LiveSyncTrysteroReplicator } from "./LiveSyncTrysteroReplicator"; import { type UseP2PReplicatorResult } from "./UseP2PReplicatorResult"; diff --git a/_types/src/lib/src/rpc/RpcRoom.d.ts b/_types/src/lib/src/rpc/RpcRoom.d.ts index 3cf7b519..e07cb680 100644 --- a/_types/src/lib/src/rpc/RpcRoom.d.ts +++ b/_types/src/lib/src/rpc/RpcRoom.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { RpcSession } from "./RpcSession"; import { type JsonLike, type RpcMethodHandler, type RpcRegisterOptions, type RpcRoomOptions } from "./types"; export declare class RpcRoom { diff --git a/_types/src/lib/src/rpc/RpcSession.d.ts b/_types/src/lib/src/rpc/RpcSession.d.ts index 85849e4e..1dd60cba 100644 --- a/_types/src/lib/src/rpc/RpcSession.d.ts +++ b/_types/src/lib/src/rpc/RpcSession.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { JsonLike } from "./types"; import type { RpcRoom } from "./RpcRoom"; export declare class RpcSession { diff --git a/_types/src/lib/src/rpc/chunking.d.ts b/_types/src/lib/src/rpc/chunking.d.ts index 70ffd726..5b624edc 100644 --- a/_types/src/lib/src/rpc/chunking.d.ts +++ b/_types/src/lib/src/rpc/chunking.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare function estimateBytes(text: string): number; export declare function splitIntoChunks(payload: string, maxBytes: number): string[]; export declare class IncomingChunkBuffer { diff --git a/_types/src/lib/src/rpc/errors.d.ts b/_types/src/lib/src/rpc/errors.d.ts index 83972c90..32207ca7 100644 --- a/_types/src/lib/src/rpc/errors.d.ts +++ b/_types/src/lib/src/rpc/errors.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { JsonLike, RpcErrorCode, RpcErrorShape } from "./types"; export declare class RpcError extends Error { code: RpcErrorCode; diff --git a/_types/src/lib/src/rpc/index.d.ts b/_types/src/lib/src/rpc/index.d.ts index ad81af57..bcf6c230 100644 --- a/_types/src/lib/src/rpc/index.d.ts +++ b/_types/src/lib/src/rpc/index.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export { RpcRoom } from "./RpcRoom"; export { RpcSession } from "./RpcSession"; export { RpcError } from "./errors"; diff --git a/_types/src/lib/src/rpc/pouchdb/RpcPouchDBProxy.d.ts b/_types/src/lib/src/rpc/pouchdb/RpcPouchDBProxy.d.ts index 75146fb8..f7559a41 100644 --- a/_types/src/lib/src/rpc/pouchdb/RpcPouchDBProxy.d.ts +++ b/_types/src/lib/src/rpc/pouchdb/RpcPouchDBProxy.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { RpcSession } from "@lib/rpc/RpcSession"; /** * A PouchDB-compatible proxy that forwards all database operations to a remote diff --git a/_types/src/lib/src/rpc/pouchdb/RpcPouchDBServer.d.ts b/_types/src/lib/src/rpc/pouchdb/RpcPouchDBServer.d.ts index 232f2c40..a4647e8a 100644 --- a/_types/src/lib/src/rpc/pouchdb/RpcPouchDBServer.d.ts +++ b/_types/src/lib/src/rpc/pouchdb/RpcPouchDBServer.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { RpcRoom } from "@lib/rpc/RpcRoom"; /** * Exposes a PouchDB database as a set of RPC methods registered on an diff --git a/_types/src/lib/src/rpc/transports/DiagRTCPeerConnections.d.ts b/_types/src/lib/src/rpc/transports/DiagRTCPeerConnections.d.ts index 7b00ab20..2e2f0ab3 100644 --- a/_types/src/lib/src/rpc/transports/DiagRTCPeerConnections.d.ts +++ b/_types/src/lib/src/rpc/transports/DiagRTCPeerConnections.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { DiagRTCStats, DiagRTCFailureDiagnosis } from "./DiagRTCPeerConnections.types"; /** * Subscribes to connection status updates. The callback will be called with the latest connection statistics whenever there is a change in the connection status of any RTCPeerConnection instance. diff --git a/_types/src/lib/src/rpc/transports/DiagRTCPeerConnections.types.d.ts b/_types/src/lib/src/rpc/transports/DiagRTCPeerConnections.types.d.ts index cfaebd51..5f211120 100644 --- a/_types/src/lib/src/rpc/transports/DiagRTCPeerConnections.types.d.ts +++ b/_types/src/lib/src/rpc/transports/DiagRTCPeerConnections.types.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export type DiagRTCConnectionStatus = { connectionState: RTCPeerConnection["connectionState"]; iceConnectionState: RTCPeerConnection["iceConnectionState"]; diff --git a/_types/src/lib/src/rpc/transports/DiagRTCPeerConnections.utils.d.ts b/_types/src/lib/src/rpc/transports/DiagRTCPeerConnections.utils.d.ts index 9cf4c3af..821028c9 100644 --- a/_types/src/lib/src/rpc/transports/DiagRTCPeerConnections.utils.d.ts +++ b/_types/src/lib/src/rpc/transports/DiagRTCPeerConnections.utils.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type DiagRTCPeerConnectionInternalStateHistory, type DiagRTCFailureDiagnosis, type DiagRTCPeerConnectionMetrics, type DiagRTCFailureStats } from "./DiagRTCPeerConnections.types"; /** * Diagnoses the failure reason of a failed RTCPeerConnection based on its internal state history and selected candidate pair information. diff --git a/_types/src/lib/src/rpc/transports/TrysteroTransport.d.ts b/_types/src/lib/src/rpc/transports/TrysteroTransport.d.ts index 13026697..b42de2f2 100644 --- a/_types/src/lib/src/rpc/transports/TrysteroTransport.d.ts +++ b/_types/src/lib/src/rpc/transports/TrysteroTransport.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type Room } from "@trystero-p2p/nostr"; import { RpcRoom } from "@lib/rpc/RpcRoom"; import { RpcPouchDBProxy } from "@lib/rpc/pouchdb/RpcPouchDBProxy"; diff --git a/_types/src/lib/src/rpc/transports/trysteroUtils.d.ts b/_types/src/lib/src/rpc/transports/trysteroUtils.d.ts index 3bdd5caa..e22d7b75 100644 --- a/_types/src/lib/src/rpc/transports/trysteroUtils.d.ts +++ b/_types/src/lib/src/rpc/transports/trysteroUtils.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { BaseRoomConfig } from "@trystero-p2p/nostr"; import type { P2PConnectionInfo } from "@lib/common/models/setting.type"; export declare function generateJoinRoomOptions(settings: P2PConnectionInfo): BaseRoomConfig; diff --git a/_types/src/lib/src/rpc/types.d.ts b/_types/src/lib/src/rpc/types.d.ts index a518eb00..fa27b395 100644 --- a/_types/src/lib/src/rpc/types.d.ts +++ b/_types/src/lib/src/rpc/types.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const RPC_VERSION_MAJOR = 1; export declare const RPC_VERSION_MINOR = 0; export type JsonLike = null | boolean | number | string | JsonLike[] | { diff --git a/_types/src/lib/src/serviceFeatures/checkRemoteSize.d.ts b/_types/src/lib/src/serviceFeatures/checkRemoteSize.d.ts index c3690fda..2278a802 100644 --- a/_types/src/lib/src/serviceFeatures/checkRemoteSize.d.ts +++ b/_types/src/lib/src/serviceFeatures/checkRemoteSize.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { createInstanceLogFunction, type LogFunction } from "@lib/services/lib/logUtils"; import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; /** diff --git a/_types/src/lib/src/serviceFeatures/offlineScanner.d.ts b/_types/src/lib/src/serviceFeatures/offlineScanner.d.ts index 97f4dd25..dea7547f 100644 --- a/_types/src/lib/src/serviceFeatures/offlineScanner.d.ts +++ b/_types/src/lib/src/serviceFeatures/offlineScanner.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type FilePathWithPrefix, type FilePathWithPrefixLC, type MetaEntry, type UXFileInfoStub, type ObsidianLiveSyncSettings, type LOG_LEVEL } from "@lib/common/types"; import { type LogFunction } from "@lib/services/lib/logUtils"; import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; diff --git a/_types/src/lib/src/serviceFeatures/prepareDatabaseForUse.d.ts b/_types/src/lib/src/serviceFeatures/prepareDatabaseForUse.d.ts index c3c57715..c5f9c00b 100644 --- a/_types/src/lib/src/serviceFeatures/prepareDatabaseForUse.d.ts +++ b/_types/src/lib/src/serviceFeatures/prepareDatabaseForUse.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; import { UnresolvedErrorManager } from "@lib/services/base/UnresolvedErrorManager"; import { type LogFunction } from "@lib/services/lib/logUtils"; diff --git a/_types/src/lib/src/serviceFeatures/remoteConfig.d.ts b/_types/src/lib/src/serviceFeatures/remoteConfig.d.ts index 67fc90c9..95435e0e 100644 --- a/_types/src/lib/src/serviceFeatures/remoteConfig.d.ts +++ b/_types/src/lib/src/serviceFeatures/remoteConfig.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type LOG_LEVEL } from "@lib/common/logger"; import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type"; import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; diff --git a/_types/src/lib/src/serviceFeatures/setupObsidian/qrCode.d.ts b/_types/src/lib/src/serviceFeatures/setupObsidian/qrCode.d.ts index 6bf65c3c..0c95e688 100644 --- a/_types/src/lib/src/serviceFeatures/setupObsidian/qrCode.d.ts +++ b/_types/src/lib/src/serviceFeatures/setupObsidian/qrCode.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; import type { SetupFeatureHost } from "./types"; export declare function encodeSetupSettingsAsQR(host: SetupFeatureHost): Promise; diff --git a/_types/src/lib/src/serviceFeatures/setupObsidian/setupUri.d.ts b/_types/src/lib/src/serviceFeatures/setupObsidian/setupUri.d.ts index 53b8892a..ada76d49 100644 --- a/_types/src/lib/src/serviceFeatures/setupObsidian/setupUri.d.ts +++ b/_types/src/lib/src/serviceFeatures/setupObsidian/setupUri.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { LogFunction } from "@lib/services/lib/logUtils"; import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; import type { SetupFeatureHost } from "./types"; diff --git a/_types/src/lib/src/serviceFeatures/setupObsidian/types.d.ts b/_types/src/lib/src/serviceFeatures/setupObsidian/types.d.ts index 015f6d33..c7254dc1 100644 --- a/_types/src/lib/src/serviceFeatures/setupObsidian/types.d.ts +++ b/_types/src/lib/src/serviceFeatures/setupObsidian/types.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; export type SetupFeatureHost = NecessaryServices<"API" | "UI" | "setting", never>; diff --git a/_types/src/lib/src/serviceFeatures/targetFilter.d.ts b/_types/src/lib/src/serviceFeatures/targetFilter.d.ts index 2b5669c5..c93ef0d9 100644 --- a/_types/src/lib/src/serviceFeatures/targetFilter.d.ts +++ b/_types/src/lib/src/serviceFeatures/targetFilter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type UXFileInfoStub } from "@lib/common/types"; import { type LogFunction } from "@lib/services/lib/logUtils"; import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; diff --git a/_types/src/lib/src/serviceModules/FileAccessBase.d.ts b/_types/src/lib/src/serviceModules/FileAccessBase.d.ts index 0893b3ad..44e8d0fb 100644 --- a/_types/src/lib/src/serviceModules/FileAccessBase.d.ts +++ b/_types/src/lib/src/serviceModules/FileAccessBase.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePath, UXDataWriteOptions, UXFileInfoStub, UXFolderInfo } from "@lib/common/types.ts"; import type { IStorageAccessManager } from "@lib/interfaces/StorageAccess.ts"; import type { IAPIService, IPathService, ISettingService, IVaultService } from "@lib/services/base/IService.ts"; @@ -71,6 +71,7 @@ export declare class FileAccessBase): Promise; vaultModify(file: ExtractFile, data: string | ArrayBuffer | Uint8Array, options?: UXDataWriteOptions): Promise; vaultCreate(path: string, data: string | ArrayBuffer | Uint8Array, options?: UXDataWriteOptions): Promise>; + vaultRename(file: ExtractFile, newPath: string): Promise>; trigger(name: string, ...data: unknown[]): void; reconcileInternalFile(path: string): Promise; /** diff --git a/_types/src/lib/src/serviceModules/Rebuilder.d.ts b/_types/src/lib/src/serviceModules/Rebuilder.d.ts index 1e2b32e6..e5322576 100644 --- a/_types/src/lib/src/serviceModules/Rebuilder.d.ts +++ b/_types/src/lib/src/serviceModules/Rebuilder.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { IFileHandler } from "@lib/interfaces/FileHandler"; import type { APIService } from "@lib/services/base/APIService"; import type { AppLifecycleService } from "@lib/services/base/AppLifecycleService"; diff --git a/_types/src/lib/src/serviceModules/ServiceDatabaseFileAccessBase.d.ts b/_types/src/lib/src/serviceModules/ServiceDatabaseFileAccessBase.d.ts index 3b0bb557..90159efb 100644 --- a/_types/src/lib/src/serviceModules/ServiceDatabaseFileAccessBase.d.ts +++ b/_types/src/lib/src/serviceModules/ServiceDatabaseFileAccessBase.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { UXFileInfoStub, FilePathWithPrefix, UXFileInfo, MetaEntry, LoadedEntry, FilePath } from "@lib/common/types"; import type { DatabaseFileAccess } from "@lib/interfaces/DatabaseFileAccess"; import type { StorageAccess } from "@lib/interfaces/StorageAccess"; diff --git a/_types/src/lib/src/serviceModules/ServiceFileAccessBase.d.ts b/_types/src/lib/src/serviceModules/ServiceFileAccessBase.d.ts index 69a49a07..aaaa1d9b 100644 --- a/_types/src/lib/src/serviceModules/ServiceFileAccessBase.d.ts +++ b/_types/src/lib/src/serviceModules/ServiceFileAccessBase.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePath, FilePathWithPrefix, UXDataWriteOptions, UXFileInfo, UXFileInfoStub, UXFolderInfo, UXStat } from "@lib/common/types"; import { ServiceModuleBase } from "@lib/serviceModules/ServiceModuleBase"; import type { APIService } from "@lib/services/base/APIService"; @@ -36,6 +36,7 @@ export declare class ServiceFileAccessBase; readFileText(path: string): Promise; isExists(path: string): Promise; + renameFile(file: UXFileInfoStub | FilePathWithPrefix, newPath: FilePathWithPrefix): Promise; writeHiddenFileAuto(path: string, data: string | ArrayBuffer, opt?: UXDataWriteOptions): Promise; appendHiddenFile(path: string, data: string, opt?: UXDataWriteOptions): Promise; stat(path: string): Promise; diff --git a/_types/src/lib/src/serviceModules/ServiceFileHandlerBase.d.ts b/_types/src/lib/src/serviceModules/ServiceFileHandlerBase.d.ts index 8b315008..3835a247 100644 --- a/_types/src/lib/src/serviceModules/ServiceFileHandlerBase.d.ts +++ b/_types/src/lib/src/serviceModules/ServiceFileHandlerBase.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { AnyEntry, FilePath, FilePathWithPrefix, MetaEntry, UXFileInfo, UXFileInfoStub, UXInternalFileInfoStub } from "@lib/common/types"; import type { IFileHandler } from "@lib/interfaces/FileHandler.ts"; import { ServiceModuleBase } from "@lib/serviceModules/ServiceModuleBase"; @@ -39,6 +39,7 @@ export declare abstract class ServiceFileHandlerBase extends ServiceModuleBase; deleteFileFromDB(info: UXFileInfoStub | UXInternalFileInfoStub | FilePath): Promise; + renameFileInDB(info: UXFileInfoStub | UXFileInfo, oldPath: FilePath | FilePathWithPrefix): Promise; deleteRevisionFromDB(info: UXFileInfoStub | FilePath | FilePathWithPrefix, rev: string): Promise; resolveConflictedByDeletingRevision(info: UXFileInfoStub | FilePath, rev: string): Promise; dbToStorageWithSpecificRev(info: UXFileInfoStub | UXFileInfo | FilePath | null, rev: string, force?: boolean): Promise; diff --git a/_types/src/lib/src/serviceModules/ServiceModuleBase.d.ts b/_types/src/lib/src/serviceModules/ServiceModuleBase.d.ts index 3668b800..1010f911 100644 --- a/_types/src/lib/src/serviceModules/ServiceModuleBase.d.ts +++ b/_types/src/lib/src/serviceModules/ServiceModuleBase.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { APIService } from "@lib/services/base/APIService"; import { createInstanceLogFunction } from "@lib/services/lib/logUtils"; export interface ServiceModuleBaseDependencies { diff --git a/_types/src/lib/src/serviceModules/adapters/IConversionAdapter.d.ts b/_types/src/lib/src/serviceModules/adapters/IConversionAdapter.d.ts index 6aebb501..0d8f607a 100644 --- a/_types/src/lib/src/serviceModules/adapters/IConversionAdapter.d.ts +++ b/_types/src/lib/src/serviceModules/adapters/IConversionAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { UXFileInfoStub, UXFolderInfo } from "@lib/common/types.ts"; /** * Conversion adapter interface diff --git a/_types/src/lib/src/serviceModules/adapters/IFileSystemAdapter.d.ts b/_types/src/lib/src/serviceModules/adapters/IFileSystemAdapter.d.ts index a760eaab..cc02740d 100644 --- a/_types/src/lib/src/serviceModules/adapters/IFileSystemAdapter.d.ts +++ b/_types/src/lib/src/serviceModules/adapters/IFileSystemAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePath, UXStat } from "@lib/common/types.ts"; import type { IPathAdapter } from "./IPathAdapter.ts"; import type { ITypeGuardAdapter } from "./ITypeGuardAdapter.ts"; @@ -33,6 +33,10 @@ export interface IFileSystemAdapter; + /** + * Rename a file and refresh any platform-specific caches + */ + renameFile(file: TNativeFile, newPath: string): Promise; /** * Get file statistics from a native file object */ diff --git a/_types/src/lib/src/serviceModules/adapters/IPathAdapter.d.ts b/_types/src/lib/src/serviceModules/adapters/IPathAdapter.d.ts index 1d428c92..0dba8585 100644 --- a/_types/src/lib/src/serviceModules/adapters/IPathAdapter.d.ts +++ b/_types/src/lib/src/serviceModules/adapters/IPathAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePath } from "@lib/common/types.ts"; /** * Path operations adapter interface diff --git a/_types/src/lib/src/serviceModules/adapters/IStorageAdapter.d.ts b/_types/src/lib/src/serviceModules/adapters/IStorageAdapter.d.ts index 12c40758..b86752ac 100644 --- a/_types/src/lib/src/serviceModules/adapters/IStorageAdapter.d.ts +++ b/_types/src/lib/src/serviceModules/adapters/IStorageAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 /** * Focused compatibility views of the existing storage adapter. * diff --git a/_types/src/lib/src/serviceModules/adapters/ITypeGuardAdapter.d.ts b/_types/src/lib/src/serviceModules/adapters/ITypeGuardAdapter.d.ts index 7cbd8b21..7d9a4b4c 100644 --- a/_types/src/lib/src/serviceModules/adapters/ITypeGuardAdapter.d.ts +++ b/_types/src/lib/src/serviceModules/adapters/ITypeGuardAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 /** * Type guard adapter interface * Provides runtime type checking for native file system objects diff --git a/_types/src/lib/src/serviceModules/adapters/IVaultAdapter.d.ts b/_types/src/lib/src/serviceModules/adapters/IVaultAdapter.d.ts index 7c689a51..3945a7a3 100644 --- a/_types/src/lib/src/serviceModules/adapters/IVaultAdapter.d.ts +++ b/_types/src/lib/src/serviceModules/adapters/IVaultAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { UXDataWriteOptions } from "@lib/common/types.ts"; /** * Vault adapter interface @@ -34,6 +34,10 @@ export interface IVaultAdapter { * Create a new file with binary content */ createBinary(path: string, data: ArrayBuffer, options?: UXDataWriteOptions): Promise; + /** + * Rename or move an existing file + */ + rename(file: TNativeFile, newPath: string): Promise; /** * Delete a file or folder */ diff --git a/_types/src/lib/src/serviceModules/adapters/index.d.ts b/_types/src/lib/src/serviceModules/adapters/index.d.ts index ef5f61f5..b15bf1e1 100644 --- a/_types/src/lib/src/serviceModules/adapters/index.d.ts +++ b/_types/src/lib/src/serviceModules/adapters/index.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export type { IPathAdapter } from "./IPathAdapter.ts"; export type { ITypeGuardAdapter } from "./ITypeGuardAdapter.ts"; export type { IConversionAdapter } from "./IConversionAdapter.ts"; diff --git a/_types/src/lib/src/services/BrowserServices.d.ts b/_types/src/lib/src/services/BrowserServices.d.ts index 836ed106..ad6c99d8 100644 --- a/_types/src/lib/src/services/BrowserServices.d.ts +++ b/_types/src/lib/src/services/BrowserServices.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { InjectableVaultServiceCompat } from "@lib/services/implements/injectable/InjectableVaultService"; import { ServiceContext } from "@lib/services/base/ServiceBase"; import { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub"; diff --git a/_types/src/lib/src/services/HeadlessServices.d.ts b/_types/src/lib/src/services/HeadlessServices.d.ts index 0c9c503e..3ae9fa1d 100644 --- a/_types/src/lib/src/services/HeadlessServices.d.ts +++ b/_types/src/lib/src/services/HeadlessServices.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { ServiceContext } from "@lib/services/base/ServiceBase"; import { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub"; import type { DatabaseService } from "@lib/services/base/DatabaseService.ts"; diff --git a/_types/src/lib/src/services/InjectableServices.d.ts b/_types/src/lib/src/services/InjectableServices.d.ts index 4e54e8e6..a1585299 100644 --- a/_types/src/lib/src/services/InjectableServices.d.ts +++ b/_types/src/lib/src/services/InjectableServices.d.ts @@ -1,3 +1,3 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub.ts"; diff --git a/_types/src/lib/src/services/ServiceHub.d.ts b/_types/src/lib/src/services/ServiceHub.d.ts index bb35246f..c4193a1e 100644 --- a/_types/src/lib/src/services/ServiceHub.d.ts +++ b/_types/src/lib/src/services/ServiceHub.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { UIService } from "./implements/base/UIService.ts"; import type { ConfigService } from "@lib/services/base/ConfigService.ts"; import type { TestService } from "@lib/services/base/TestService.ts"; diff --git a/_types/src/lib/src/services/base/APIService.d.ts b/_types/src/lib/src/services/base/APIService.d.ts index 2ec51e79..1c056809 100644 --- a/_types/src/lib/src/services/base/APIService.d.ts +++ b/_types/src/lib/src/services/base/APIService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FetchHttpHandler } from "@smithy/fetch-http-handler"; import type { LOG_LEVEL } from "@lib/common/logger"; import type { IAPIService, ICommandCompat } from "./IService"; diff --git a/_types/src/lib/src/services/base/AppLifecycleService.d.ts b/_types/src/lib/src/services/base/AppLifecycleService.d.ts index 1dbc9fb8..3dd81b7e 100644 --- a/_types/src/lib/src/services/base/AppLifecycleService.d.ts +++ b/_types/src/lib/src/services/base/AppLifecycleService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { IAppLifecycleService, ISettingService } from "./IService"; import { ServiceBase, type ServiceContext } from "./ServiceBase"; export interface AppLifecycleServiceDependencies { diff --git a/_types/src/lib/src/services/base/ConfigService.d.ts b/_types/src/lib/src/services/base/ConfigService.d.ts index 1edce2f2..f7653ba3 100644 --- a/_types/src/lib/src/services/base/ConfigService.d.ts +++ b/_types/src/lib/src/services/base/ConfigService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { IConfigService } from "@lib/services/base/IService"; import { ServiceBase, type ServiceContext } from "./ServiceBase"; export declare abstract class ConfigService extends ServiceBase implements IConfigService { diff --git a/_types/src/lib/src/services/base/ConflictService.d.ts b/_types/src/lib/src/services/base/ConflictService.d.ts index 55de6f15..a8d266f6 100644 --- a/_types/src/lib/src/services/base/ConflictService.d.ts +++ b/_types/src/lib/src/services/base/ConflictService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePathWithPrefix, MISSING_OR_ERROR, AUTO_MERGED } from "@lib/common/types"; import type { IConflictService } from "@lib/services/base/IService"; import { ServiceBase } from "@lib/services/base/ServiceBase"; diff --git a/_types/src/lib/src/services/base/ControlService.d.ts b/_types/src/lib/src/services/base/ControlService.d.ts index 5a8e6a1f..f9a360eb 100644 --- a/_types/src/lib/src/services/base/ControlService.d.ts +++ b/_types/src/lib/src/services/base/ControlService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { createInstanceLogFunction } from "@lib/services/lib/logUtils"; import type { APIService } from "./APIService"; import type { DatabaseService } from "./DatabaseService"; diff --git a/_types/src/lib/src/services/base/DatabaseEventService.d.ts b/_types/src/lib/src/services/base/DatabaseEventService.d.ts index ae010c97..f42ff37d 100644 --- a/_types/src/lib/src/services/base/DatabaseEventService.d.ts +++ b/_types/src/lib/src/services/base/DatabaseEventService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { IDatabaseEventService } from "./IService"; import { ServiceBase, type ServiceContext } from "./ServiceBase"; /** diff --git a/_types/src/lib/src/services/base/DatabaseService.d.ts b/_types/src/lib/src/services/base/DatabaseService.d.ts index f919f462..37287fdc 100644 --- a/_types/src/lib/src/services/base/DatabaseService.d.ts +++ b/_types/src/lib/src/services/base/DatabaseService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { IDatabaseService, IPathService, IVaultService, openDatabaseParameters } from "./IService"; import { ServiceBase, type ServiceContext } from "./ServiceBase"; import { LiveSyncLocalDB } from "@lib/pouchdb/LiveSyncLocalDB"; diff --git a/_types/src/lib/src/services/base/FileProcessingService.d.ts b/_types/src/lib/src/services/base/FileProcessingService.d.ts index f600c57a..32f00f4e 100644 --- a/_types/src/lib/src/services/base/FileProcessingService.d.ts +++ b/_types/src/lib/src/services/base/FileProcessingService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { IFileProcessingService } from "./IService"; import { ServiceBase, type ServiceContext } from "./ServiceBase"; /** diff --git a/_types/src/lib/src/services/base/IService.d.ts b/_types/src/lib/src/services/base/IService.d.ts index 7897d119..cfe388b8 100644 --- a/_types/src/lib/src/services/base/IService.d.ts +++ b/_types/src/lib/src/services/base/IService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FetchHttpHandler } from "@smithy/fetch-http-handler"; import { type LOG_LEVEL } from "octagonal-wheels/common/logger"; import type { AnyEntry, AUTO_MERGED, CouchDBCredentials, diff_result, DocumentID, EntryDoc, EntryHasPath, FileEventItem, FilePath, FilePathWithPrefix, LoadedEntry, MetaEntry, MISSING_OR_ERROR, ObsidianLiveSyncSettings, RemoteDBSettings, TweakValues, UXFileInfo, UXFileInfoStub } from "@lib/common/types"; @@ -106,8 +106,12 @@ export interface IReplicatorService { replicationStatics: ReactiveSource; /** Number of finite remote operations currently in progress. */ boundedRemoteActivityCount: ReactiveSource; + /** Number of finite replication operations which can still deliver database documents. */ + finiteReplicationActivityCount: ReactiveSource; /** Runs a finite remote operation within the host activity policy. */ runBoundedRemoteActivity(task: () => T | PromiseLike, options?: AsyncActivityOptions): Promise; + /** Runs finite replication which may place documents in the local database. */ + runFiniteReplicationActivity(task: () => T | PromiseLike, options?: AsyncActivityOptions): Promise; } export interface IReplicationService { processSynchroniseResult(doc: MetaEntry): Promise; diff --git a/_types/src/lib/src/services/base/KeyValueDBService.d.ts b/_types/src/lib/src/services/base/KeyValueDBService.d.ts index d7d0dea7..6092ba28 100644 --- a/_types/src/lib/src/services/base/KeyValueDBService.d.ts +++ b/_types/src/lib/src/services/base/KeyValueDBService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { SimpleStore } from "@lib/common/utils"; import type { IKeyValueDBService, IVaultService } from "./IService"; import { ServiceBase, type ServiceContext } from "./ServiceBase"; diff --git a/_types/src/lib/src/services/base/PathService.d.ts b/_types/src/lib/src/services/base/PathService.d.ts index 81582fc8..80a7e8d2 100644 --- a/_types/src/lib/src/services/base/PathService.d.ts +++ b/_types/src/lib/src/services/base/PathService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { DocumentID, EntryHasPath, FilePathWithPrefix, FilePath, AnyEntry, UXFileInfo, UXFileInfoStub } from "@lib/common/types"; import type { IPathService, ISettingService } from "./IService"; import { ServiceBase, type ServiceContext } from "./ServiceBase"; diff --git a/_types/src/lib/src/services/base/RemoteService.d.ts b/_types/src/lib/src/services/base/RemoteService.d.ts index d173dfaf..934caf19 100644 --- a/_types/src/lib/src/services/base/RemoteService.d.ts +++ b/_types/src/lib/src/services/base/RemoteService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { CouchDBCredentials, EntryDoc } from "@lib/common/types"; import type { IRemoteService } from "./IService"; import { ServiceBase, type ServiceContext } from "./ServiceBase"; diff --git a/_types/src/lib/src/services/base/ReplicationService.d.ts b/_types/src/lib/src/services/base/ReplicationService.d.ts index b0f116e0..f625d291 100644 --- a/_types/src/lib/src/services/base/ReplicationService.d.ts +++ b/_types/src/lib/src/services/base/ReplicationService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type LOG_LEVEL } from "@lib/common/types"; import type { IAPIService, IDatabaseService, IFileProcessingService, IReplicationService, IReplicatorService, ISettingService } from "./IService"; import { ServiceBase, type ServiceContext } from "./ServiceBase"; diff --git a/_types/src/lib/src/services/base/ReplicatorService.d.ts b/_types/src/lib/src/services/base/ReplicatorService.d.ts index 41c50da5..163c47b1 100644 --- a/_types/src/lib/src/services/base/ReplicatorService.d.ts +++ b/_types/src/lib/src/services/base/ReplicatorService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { LiveSyncAbstractReplicator } from "@lib/replication/LiveSyncAbstractReplicator"; import type { IReplicatorService } from "./IService"; import { ServiceBase, type ServiceContext } from "./ServiceBase"; @@ -20,6 +20,7 @@ export interface ReplicatorServiceDependencies { export declare abstract class ReplicatorService extends ServiceBase implements IReplicatorService { protected dependencies: ReplicatorServiceDependencies; readonly boundedRemoteActivityCount: import("octagonal-wheels/dataobject/reactive_v2").ReactiveSource; + readonly finiteReplicationActivityCount: import("octagonal-wheels/dataobject/reactive_v2").ReactiveSource; _log: (msg: unknown, level?: import("octagonal-wheels/common/logger").LOG_LEVEL, key?: string) => void; private settingService; private databaseEventService; @@ -33,6 +34,9 @@ export declare abstract class ReplicatorService(task: () => TValue | PromiseLike, options?: AsyncActivityOptions): Promise; + /** Runs one finite replication and exposes its document-delivery lifetime. */ + runFiniteReplicationActivity(task: () => TValue | PromiseLike, options?: AsyncActivityOptions): Promise; + private runRemoteActivity; private suspendReplication; private reinitialiseReplicator; private disposeReplicator; diff --git a/_types/src/lib/src/services/base/ServiceBase.d.ts b/_types/src/lib/src/services/base/ServiceBase.d.ts index 6bc014c9..1dc5b751 100644 --- a/_types/src/lib/src/services/base/ServiceBase.d.ts +++ b/_types/src/lib/src/services/base/ServiceBase.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare class ServiceContext { } export declare abstract class ServiceBase { diff --git a/_types/src/lib/src/services/base/SettingService.d.ts b/_types/src/lib/src/services/base/SettingService.d.ts index fe082174..4450aa13 100644 --- a/_types/src/lib/src/services/base/SettingService.d.ts +++ b/_types/src/lib/src/services/base/SettingService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type ObsidianLiveSyncSettings } from "@lib/common/types"; import type { IAPIService, ISettingService } from "./IService"; import { ServiceBase, type ServiceContext } from "./ServiceBase"; diff --git a/_types/src/lib/src/services/base/TestService.d.ts b/_types/src/lib/src/services/base/TestService.d.ts index 439d3afd..e51bcec4 100644 --- a/_types/src/lib/src/services/base/TestService.d.ts +++ b/_types/src/lib/src/services/base/TestService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ITestService } from "./IService"; import { ServiceBase, type ServiceContext } from "./ServiceBase"; /** diff --git a/_types/src/lib/src/services/base/TweakValueService.d.ts b/_types/src/lib/src/services/base/TweakValueService.d.ts index 91970238..75d98952 100644 --- a/_types/src/lib/src/services/base/TweakValueService.d.ts +++ b/_types/src/lib/src/services/base/TweakValueService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { RemoteDBSettings, TweakValues } from "@lib/common/types"; import type { ITweakValueService } from "./IService"; import { ServiceBase, type ServiceContext } from "./ServiceBase"; diff --git a/_types/src/lib/src/services/base/UnresolvedErrorManager.d.ts b/_types/src/lib/src/services/base/UnresolvedErrorManager.d.ts index 3cbe2bdb..9f465aca 100644 --- a/_types/src/lib/src/services/base/UnresolvedErrorManager.d.ts +++ b/_types/src/lib/src/services/base/UnresolvedErrorManager.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type LOG_LEVEL } from "octagonal-wheels/common/logger"; import type { AppLifecycleService } from "./AppLifecycleService"; export declare class UnresolvedErrorManager { diff --git a/_types/src/lib/src/services/base/VaultService.d.ts b/_types/src/lib/src/services/base/VaultService.d.ts index fc25dbce..95c406ca 100644 --- a/_types/src/lib/src/services/base/VaultService.d.ts +++ b/_types/src/lib/src/services/base/VaultService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePath } from "@lib/common/types"; import type { IAPIService, ISettingService, IVaultService } from "./IService"; import { ServiceBase, type ServiceContext } from "./ServiceBase"; diff --git a/_types/src/lib/src/services/implements/base/UIService.d.ts b/_types/src/lib/src/services/implements/base/UIService.d.ts index 1d7e1ab0..35ab71b4 100644 --- a/_types/src/lib/src/services/implements/base/UIService.d.ts +++ b/_types/src/lib/src/services/implements/base/UIService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { Confirm } from "@lib/interfaces/Confirm"; import type { ComponentHasResult, SvelteDialogManagerBase } from "@lib/UI/svelteDialog"; import type { IAPIService, IUIService } from "@lib/services/base/IService"; diff --git a/_types/src/lib/src/services/implements/browser/BrowserAPIService.d.ts b/_types/src/lib/src/services/implements/browser/BrowserAPIService.d.ts index 0749f5a0..db611397 100644 --- a/_types/src/lib/src/services/implements/browser/BrowserAPIService.d.ts +++ b/_types/src/lib/src/services/implements/browser/BrowserAPIService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ServiceContext } from "@lib/services/base/ServiceBase"; import { InjectableAPIService } from "@lib/services/implements/injectable/InjectableAPIService"; import type { FetchHttpHandler } from "@smithy/fetch-http-handler"; diff --git a/_types/src/lib/src/services/implements/browser/BrowserConfirm.d.ts b/_types/src/lib/src/services/implements/browser/BrowserConfirm.d.ts index eb0e390c..1c3e43bf 100644 --- a/_types/src/lib/src/services/implements/browser/BrowserConfirm.d.ts +++ b/_types/src/lib/src/services/implements/browser/BrowserConfirm.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { Confirm } from "@lib/interfaces/Confirm"; import type { ServiceContext } from "@lib/services/base/ServiceBase"; export declare class BrowserConfirm implements Confirm { diff --git a/_types/src/lib/src/services/implements/browser/BrowserDatabaseService.d.ts b/_types/src/lib/src/services/implements/browser/BrowserDatabaseService.d.ts index 522abd72..3f769b6f 100644 --- a/_types/src/lib/src/services/implements/browser/BrowserDatabaseService.d.ts +++ b/_types/src/lib/src/services/implements/browser/BrowserDatabaseService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ServiceContext } from "@lib/services/base/ServiceBase"; import { KeyValueDBService } from "@lib/services/base/KeyValueDBService"; import { DatabaseService } from "@lib/services/base/DatabaseService.ts"; diff --git a/_types/src/lib/src/services/implements/browser/BrowserUIService.d.ts b/_types/src/lib/src/services/implements/browser/BrowserUIService.d.ts index b2881d28..61656ddf 100644 --- a/_types/src/lib/src/services/implements/browser/BrowserUIService.d.ts +++ b/_types/src/lib/src/services/implements/browser/BrowserUIService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { UIService } from "@lib/services/implements/base/UIService"; import type { ConfigService } from "@lib/services/base/ConfigService"; import type { AppLifecycleService } from "@lib/services/base/AppLifecycleService"; diff --git a/_types/src/lib/src/services/implements/browser/ConfigServiceBrowserCompat.d.ts b/_types/src/lib/src/services/implements/browser/ConfigServiceBrowserCompat.d.ts index fa78c8c8..fa9e882d 100644 --- a/_types/src/lib/src/services/implements/browser/ConfigServiceBrowserCompat.d.ts +++ b/_types/src/lib/src/services/implements/browser/ConfigServiceBrowserCompat.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { ConfigService } from "@lib/services/base/ConfigService"; import type { IAPIService, ISettingService } from "@lib/services/base/IService"; import type { ServiceContext } from "@lib/services/base/ServiceBase"; diff --git a/_types/src/lib/src/services/implements/browser/Menu.d.ts b/_types/src/lib/src/services/implements/browser/Menu.d.ts index ed9827dc..db47dbf8 100644 --- a/_types/src/lib/src/services/implements/browser/Menu.d.ts +++ b/_types/src/lib/src/services/implements/browser/Menu.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type PromiseWithResolvers } from "octagonal-wheels/promises"; export declare class MenuItem { type: string; diff --git a/_types/src/lib/src/services/implements/browser/ui/renderMessageMarkdown.d.ts b/_types/src/lib/src/services/implements/browser/ui/renderMessageMarkdown.d.ts index a101da97..2aca07ca 100644 --- a/_types/src/lib/src/services/implements/browser/ui/renderMessageMarkdown.d.ts +++ b/_types/src/lib/src/services/implements/browser/ui/renderMessageMarkdown.d.ts @@ -1,3 +1,3 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare function renderMessageMarkdown(message: string): string; diff --git a/_types/src/lib/src/services/implements/headless/HeadlessAPIService.d.ts b/_types/src/lib/src/services/implements/headless/HeadlessAPIService.d.ts index 56ec91b3..248d1647 100644 --- a/_types/src/lib/src/services/implements/headless/HeadlessAPIService.d.ts +++ b/_types/src/lib/src/services/implements/headless/HeadlessAPIService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ServiceContext } from "@lib/services/base/ServiceBase"; import { InjectableAPIService } from "@lib/services/implements/injectable/InjectableAPIService"; import type { FetchHttpHandler } from "@smithy/fetch-http-handler"; diff --git a/_types/src/lib/src/services/implements/headless/HeadlessDatabaseService.d.ts b/_types/src/lib/src/services/implements/headless/HeadlessDatabaseService.d.ts index 01b73501..c077207a 100644 --- a/_types/src/lib/src/services/implements/headless/HeadlessDatabaseService.d.ts +++ b/_types/src/lib/src/services/implements/headless/HeadlessDatabaseService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { KeyValueDBService } from "@lib/services/base/KeyValueDBService"; import type { ServiceContext } from "@lib/services/base/ServiceBase"; import { DatabaseService } from "@lib/services/base/DatabaseService.ts"; diff --git a/_types/src/lib/src/services/implements/injectable/InjectableAPIService.d.ts b/_types/src/lib/src/services/implements/injectable/InjectableAPIService.d.ts index 3d64ea1f..26990d5a 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectableAPIService.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectableAPIService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { APIService } from "@lib/services/base/APIService"; import type { ServiceContext } from "@lib/services/base/ServiceBase"; export declare abstract class InjectableAPIService extends APIService { diff --git a/_types/src/lib/src/services/implements/injectable/InjectableAppLifecycleService.d.ts b/_types/src/lib/src/services/implements/injectable/InjectableAppLifecycleService.d.ts index 065b4095..a98f7610 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectableAppLifecycleService.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectableAppLifecycleService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { AppLifecycleService } from "@lib/services/base/AppLifecycleService"; import type { IAppLifecycleService } from "@lib/services/base/IService"; import type { ServiceContext } from "@lib/services/base/ServiceBase"; diff --git a/_types/src/lib/src/services/implements/injectable/InjectableConflictService.d.ts b/_types/src/lib/src/services/implements/injectable/InjectableConflictService.d.ts index 24f987eb..8f3cd6f4 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectableConflictService.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectableConflictService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { ConflictService } from "@lib/services/base/ConflictService"; import type { ServiceContext } from "@lib/services/base/ServiceBase"; export declare class InjectableConflictService extends ConflictService { diff --git a/_types/src/lib/src/services/implements/injectable/InjectableDatabaseEventService.d.ts b/_types/src/lib/src/services/implements/injectable/InjectableDatabaseEventService.d.ts index d82f9c8f..4f83c651 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectableDatabaseEventService.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectableDatabaseEventService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { DatabaseEventService } from "@lib/services/base/DatabaseEventService"; import type { ServiceContext } from "@lib/services/base/ServiceBase"; export declare class InjectableDatabaseEventService extends DatabaseEventService { diff --git a/_types/src/lib/src/services/implements/injectable/InjectableFileProcessingService.d.ts b/_types/src/lib/src/services/implements/injectable/InjectableFileProcessingService.d.ts index 23042bce..7aa184de 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectableFileProcessingService.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectableFileProcessingService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { FileProcessingService } from "@lib/services/base/FileProcessingService"; import type { ServiceContext } from "@lib/services/base/ServiceBase"; export declare class InjectableFileProcessingService extends FileProcessingService { diff --git a/_types/src/lib/src/services/implements/injectable/InjectablePathService.d.ts b/_types/src/lib/src/services/implements/injectable/InjectablePathService.d.ts index aabc3d73..662b596a 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectablePathService.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectablePathService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { UXFileInfo, AnyEntry, UXFileInfoStub, FilePathWithPrefix } from "@lib/common/types"; import { PathService } from "@lib/services/base/PathService"; import type { ServiceContext } from "@lib/services/base/ServiceBase"; diff --git a/_types/src/lib/src/services/implements/injectable/InjectableRemoteService.d.ts b/_types/src/lib/src/services/implements/injectable/InjectableRemoteService.d.ts index bd8de8c0..b8c56a2d 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectableRemoteService.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectableRemoteService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { RemoteService } from "@lib/services/base/RemoteService"; import type { ServiceContext } from "@lib/services/base/ServiceBase"; export declare class InjectableRemoteService extends RemoteService { diff --git a/_types/src/lib/src/services/implements/injectable/InjectableReplicationService.d.ts b/_types/src/lib/src/services/implements/injectable/InjectableReplicationService.d.ts index 6f85ac54..3192e303 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectableReplicationService.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectableReplicationService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { ReplicationService } from "@lib/services/base/ReplicationService"; import type { ServiceContext } from "@lib/services/base/ServiceBase"; export declare class InjectableReplicationService extends ReplicationService { diff --git a/_types/src/lib/src/services/implements/injectable/InjectableReplicatorService.d.ts b/_types/src/lib/src/services/implements/injectable/InjectableReplicatorService.d.ts index e339eeb0..b1c8c9b3 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectableReplicatorService.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectableReplicatorService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { ReplicatorService } from "@lib/services/base/ReplicatorService"; import type { ServiceContext } from "@lib/services/base/ServiceBase"; export declare class InjectableReplicatorService extends ReplicatorService { diff --git a/_types/src/lib/src/services/implements/injectable/InjectableServiceHub.d.ts b/_types/src/lib/src/services/implements/injectable/InjectableServiceHub.d.ts index 3d224e2b..6f6417c2 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectableServiceHub.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectableServiceHub.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ConfigService } from "@lib/services/base/ConfigService"; import { ControlService } from "@lib/services/base/ControlService"; import type { KeyValueDBService } from "@lib/services/base/KeyValueDBService"; diff --git a/_types/src/lib/src/services/implements/injectable/InjectableServices.d.ts b/_types/src/lib/src/services/implements/injectable/InjectableServices.d.ts index 39eb0050..0a446ba0 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectableServices.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectableServices.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type ServiceInstances } from "@lib/services/ServiceHub.ts"; import type { UIService } from "@lib/services/implements/base/UIService.ts"; import type { ConfigService } from "@lib/services/base/ConfigService.ts"; diff --git a/_types/src/lib/src/services/implements/injectable/InjectableSettingService.d.ts b/_types/src/lib/src/services/implements/injectable/InjectableSettingService.d.ts index d5ef854e..c6e4affe 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectableSettingService.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectableSettingService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ServiceContext } from "@lib/services/base/ServiceBase"; import { SettingService, type SettingServiceDependencies } from "@lib/services/base/SettingService"; import type { ObsidianLiveSyncSettings } from "@lib/common/types"; diff --git a/_types/src/lib/src/services/implements/injectable/InjectableTestService.d.ts b/_types/src/lib/src/services/implements/injectable/InjectableTestService.d.ts index 059bac13..10596f8c 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectableTestService.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectableTestService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ServiceContext } from "@lib/services/base/ServiceBase"; import { TestService } from "@lib/services/base/TestService"; export declare class InjectableTestService extends TestService { diff --git a/_types/src/lib/src/services/implements/injectable/InjectableTweakValueService.d.ts b/_types/src/lib/src/services/implements/injectable/InjectableTweakValueService.d.ts index d91cb238..80b394a3 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectableTweakValueService.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectableTweakValueService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ServiceContext } from "@lib/services/base/ServiceBase"; import { TweakValueService } from "@lib/services/base/TweakValueService"; export declare class InjectableTweakValueService extends TweakValueService { diff --git a/_types/src/lib/src/services/implements/injectable/InjectableVaultService.d.ts b/_types/src/lib/src/services/implements/injectable/InjectableVaultService.d.ts index 36019b6b..4bc4dd12 100644 --- a/_types/src/lib/src/services/implements/injectable/InjectableVaultService.d.ts +++ b/_types/src/lib/src/services/implements/injectable/InjectableVaultService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ServiceContext } from "@lib/services/base/ServiceBase"; import { VaultService } from "@lib/services/base/VaultService"; export declare abstract class InjectableVaultService extends VaultService { diff --git a/_types/src/lib/src/services/implements/obsidian/ObsidianServiceContext.d.ts b/_types/src/lib/src/services/implements/obsidian/ObsidianServiceContext.d.ts index 85d999ae..7a334a67 100644 --- a/_types/src/lib/src/services/implements/obsidian/ObsidianServiceContext.d.ts +++ b/_types/src/lib/src/services/implements/obsidian/ObsidianServiceContext.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { ServiceContext } from "@lib/services/base/ServiceBase"; import type ObsidianLiveSyncPlugin from "@/main"; import type { App, Plugin } from "@/deps"; diff --git a/_types/src/lib/src/services/lib/HandlerUtils.d.ts b/_types/src/lib/src/services/lib/HandlerUtils.d.ts index c257de16..bf6d1fee 100644 --- a/_types/src/lib/src/services/lib/HandlerUtils.d.ts +++ b/_types/src/lib/src/services/lib/HandlerUtils.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 /** * A function type that can be used as a handler. */ diff --git a/_types/src/lib/src/services/lib/logUtils.d.ts b/_types/src/lib/src/services/lib/logUtils.d.ts index f3d450a1..cd577f55 100644 --- a/_types/src/lib/src/services/lib/logUtils.d.ts +++ b/_types/src/lib/src/services/lib/logUtils.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type LOG_LEVEL } from "octagonal-wheels/common/logger"; import type { IAPIService } from "@lib/services/base/IService"; export declare const MARK_LOG_SEPARATOR = "\u200A"; diff --git a/_types/src/lib/src/services/lib/remoteActivity.d.ts b/_types/src/lib/src/services/lib/remoteActivity.d.ts new file mode 100644 index 00000000..e8345e92 --- /dev/null +++ b/_types/src/lib/src/services/lib/remoteActivity.d.ts @@ -0,0 +1,15 @@ +// @ts-nocheck +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 +import type { ReactiveSource } from "octagonal-wheels/dataobject/reactive"; +export type TrackedPhysicalRequestCounters = { + requestCount: ReactiveSource; + responseCount: ReactiveSource; +}; +/** + * Tracks one physical-request unit for status reporting. + * + * A unit may be an exact transport attempt or a higher-level SDK command. The + * resulting in-flight count is deliberately approximate and must not be used + * for protocol correctness, throttling, or completion decisions. + */ +export declare function runWithTrackedPhysicalRequest(counters: TrackedPhysicalRequestCounters, task: () => T | PromiseLike): Promise; diff --git a/_types/src/lib/src/string_and_binary/chunks.d.ts b/_types/src/lib/src/string_and_binary/chunks.d.ts index 489ef127..25ff5d49 100644 --- a/_types/src/lib/src/string_and_binary/chunks.d.ts +++ b/_types/src/lib/src/string_and_binary/chunks.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare function splitPiecesTextV2(dataSrc: string | string[], pieceSize: number, minimumChunkSize: number): () => Generator; export declare function binaryTextSplit(data: string, pieceSize: number, minimumChunkSize: number): () => Generator; export declare function splitPiecesText(dataSrc: string | string[], pieceSize: number, plainSplit: boolean, minimumChunkSize: number, useSegmenter: boolean): () => Generator; diff --git a/_types/src/lib/src/string_and_binary/convert.d.ts b/_types/src/lib/src/string_and_binary/convert.d.ts index a6cfc665..2273ffae 100644 --- a/_types/src/lib/src/string_and_binary/convert.d.ts +++ b/_types/src/lib/src/string_and_binary/convert.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { arrayBufferToBase64, base64ToArrayBuffer, base64ToArrayBufferInternalBrowser, readString, writeString, tryConvertBase64ToArrayBuffer } from "octagonal-wheels/binary"; export { arrayBufferToBase64, base64ToArrayBuffer, base64ToArrayBufferInternalBrowser, readString, writeString, tryConvertBase64ToArrayBuffer, }; export declare function arrayBufferToBase64Single(buffer: Uint8Array | ArrayBuffer): Promise; diff --git a/_types/src/lib/src/string_and_binary/hash.d.ts b/_types/src/lib/src/string_and_binary/hash.d.ts index dbdc7fec..c13a36bf 100644 --- a/_types/src/lib/src/string_and_binary/hash.d.ts +++ b/_types/src/lib/src/string_and_binary/hash.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export * from "octagonal-wheels/hash/xxhash.js"; export type * from "octagonal-wheels/hash/xxhash.js"; diff --git a/_types/src/lib/src/string_and_binary/path.d.ts b/_types/src/lib/src/string_and_binary/path.d.ts index d50ab23f..46de06cc 100644 --- a/_types/src/lib/src/string_and_binary/path.d.ts +++ b/_types/src/lib/src/string_and_binary/path.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type AnyEntry, type DocumentID, type EntryHasPath, type FilePath, type FilePathWithPrefix } from "@lib/common/types.ts"; export declare function isValidFilenameInWidows(filename: string): boolean; export declare function isValidFilenameInDarwin(filename: string): boolean; diff --git a/_types/src/lib/src/worker/bg.common.d.ts b/_types/src/lib/src/worker/bg.common.d.ts index 3ddf011b..d8e8f75e 100644 --- a/_types/src/lib/src/worker/bg.common.d.ts +++ b/_types/src/lib/src/worker/bg.common.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { END_OF_DATA } from "./universalTypes.ts"; export declare function postBack(key: number, seq: number, data: string | END_OF_DATA): void; diff --git a/_types/src/lib/src/worker/bg.worker.d.ts b/_types/src/lib/src/worker/bg.worker.d.ts index 08dc832e..e5839175 100644 --- a/_types/src/lib/src/worker/bg.worker.d.ts +++ b/_types/src/lib/src/worker/bg.worker.d.ts @@ -1,3 +1,3 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export {}; diff --git a/_types/src/lib/src/worker/bg.worker.encryption.d.ts b/_types/src/lib/src/worker/bg.worker.encryption.d.ts index e6fcc8df..59a73d2f 100644 --- a/_types/src/lib/src/worker/bg.worker.encryption.d.ts +++ b/_types/src/lib/src/worker/bg.worker.encryption.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { EncryptHKDFArguments } from "./universalTypes.ts"; import type { EncryptArguments } from "./universalTypes.ts"; /** diff --git a/_types/src/lib/src/worker/bg.worker.splitting.d.ts b/_types/src/lib/src/worker/bg.worker.splitting.d.ts index 22a3fe01..79a58c63 100644 --- a/_types/src/lib/src/worker/bg.worker.splitting.d.ts +++ b/_types/src/lib/src/worker/bg.worker.splitting.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { SplitArguments } from "./universalTypes.ts"; /** * Processes the splitting of data into chunks. diff --git a/_types/src/lib/src/worker/bgWorker.d.ts b/_types/src/lib/src/worker/bgWorker.d.ts index a3610e42..6fe97dd6 100644 --- a/_types/src/lib/src/worker/bgWorker.d.ts +++ b/_types/src/lib/src/worker/bgWorker.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { EncryptArguments, EncryptHKDFArguments, EncryptHKDFProcessItem, EncryptProcessItem, ProcessItem, SplitArguments, SplitProcessItem } from "./universalTypes.ts"; export type WorkerInstance = { worker: Worker; diff --git a/_types/src/lib/src/worker/bgWorker.encryption.d.ts b/_types/src/lib/src/worker/bgWorker.encryption.d.ts index b7444ca5..940b19a3 100644 --- a/_types/src/lib/src/worker/bgWorker.encryption.d.ts +++ b/_types/src/lib/src/worker/bgWorker.encryption.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type EncryptHKDFProcessItem, type ResultPayload } from "./universalTypes.ts"; import { type EncryptProcessItem } from "./universalTypes.ts"; import { type EncryptHKDFArguments } from "./universalTypes.ts"; diff --git a/_types/src/lib/src/worker/bgWorker.mock.d.ts b/_types/src/lib/src/worker/bgWorker.mock.d.ts index 5b953a9c..33277b34 100644 --- a/_types/src/lib/src/worker/bgWorker.mock.d.ts +++ b/_types/src/lib/src/worker/bgWorker.mock.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { EncryptHKDFProcessItem, EncryptProcessItem, SplitProcessItem, ProcessItem } from "./universalTypes.ts"; export type SplitArguments = { key: number; diff --git a/_types/src/lib/src/worker/bgWorker.splitting.d.ts b/_types/src/lib/src/worker/bgWorker.splitting.d.ts index 7205f91f..93e3d631 100644 --- a/_types/src/lib/src/worker/bgWorker.splitting.d.ts +++ b/_types/src/lib/src/worker/bgWorker.splitting.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type ResultPayloadWithSeq, type SplitProcessItem } from "./universalTypes"; /** * Splits data into pieces using a worker. diff --git a/_types/src/lib/src/worker/universalTypes.d.ts b/_types/src/lib/src/worker/universalTypes.d.ts index 46994282..c98f55e2 100644 --- a/_types/src/lib/src/worker/universalTypes.d.ts +++ b/_types/src/lib/src/worker/universalTypes.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { PromiseWithResolvers } from "octagonal-wheels/promises"; export type EncryptArguments = { key: number; diff --git a/_types/src/main.d.ts b/_types/src/main.d.ts index 86b1e2ea..ab6c62e4 100644 --- a/_types/src/main.d.ts +++ b/_types/src/main.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { Plugin, type App, type PluginManifest } from "./deps"; import { LiveSyncCommands } from "./features/LiveSyncCommands.ts"; import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext.ts"; diff --git a/_types/src/managers/ObsidianStorageEventManagerAdapter.d.ts b/_types/src/managers/ObsidianStorageEventManagerAdapter.d.ts index 946faf94..ed784cd3 100644 --- a/_types/src/managers/ObsidianStorageEventManagerAdapter.d.ts +++ b/_types/src/managers/ObsidianStorageEventManagerAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { TFile, TFolder } from "@/deps"; import type { FilePath, UXFileInfoStub, UXInternalFileInfoStub } from "@lib/common/types"; import type { FileEventItem } from "@lib/common/types"; diff --git a/_types/src/managers/StorageEventManagerObsidian.d.ts b/_types/src/managers/StorageEventManagerObsidian.d.ts index b066cfa9..05b16029 100644 --- a/_types/src/managers/StorageEventManagerObsidian.d.ts +++ b/_types/src/managers/StorageEventManagerObsidian.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePath } from "@lib/common/types"; import type ObsidianLiveSyncPlugin from "@/main"; import type { LiveSyncCore } from "@/main"; diff --git a/_types/src/modules/AbstractModule.d.ts b/_types/src/modules/AbstractModule.d.ts index 812660fc..d40832f9 100644 --- a/_types/src/modules/AbstractModule.d.ts +++ b/_types/src/modules/AbstractModule.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { AnyEntry, FilePathWithPrefix } from "@lib/common/types"; import type { IMinimumLiveSyncCommands, LiveSyncBaseCore } from "@/LiveSyncBaseCore"; import type { ServiceContext } from "@lib/services/base/ServiceBase"; diff --git a/_types/src/modules/AbstractObsidianModule.d.ts b/_types/src/modules/AbstractObsidianModule.d.ts index 5c655a15..99ce22f5 100644 --- a/_types/src/modules/AbstractObsidianModule.d.ts +++ b/_types/src/modules/AbstractObsidianModule.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { LiveSyncCore } from "@/main"; import type ObsidianLiveSyncPlugin from "@/main"; import { AbstractModule } from "./AbstractModule.ts"; diff --git a/_types/src/modules/core/ModulePeriodicProcess.d.ts b/_types/src/modules/core/ModulePeriodicProcess.d.ts index 09f6392c..85c4656f 100644 --- a/_types/src/modules/core/ModulePeriodicProcess.d.ts +++ b/_types/src/modules/core/ModulePeriodicProcess.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { PeriodicProcessor } from "@/common/PeriodicProcessor"; import type { LiveSyncCore } from "@/main"; import { AbstractModule } from "@/modules/AbstractModule"; diff --git a/_types/src/modules/core/ModuleReplicator.d.ts b/_types/src/modules/core/ModuleReplicator.d.ts index f8d160fa..7abce4a1 100644 --- a/_types/src/modules/core/ModuleReplicator.d.ts +++ b/_types/src/modules/core/ModuleReplicator.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { AbstractModule } from "@/modules/AbstractModule"; import { type EntryDoc, type RemoteType } from "@lib/common/types"; import type { LiveSyncCore } from "@/main"; diff --git a/_types/src/modules/core/ModuleReplicatorCouchDB.d.ts b/_types/src/modules/core/ModuleReplicatorCouchDB.d.ts index 70e535db..338b433b 100644 --- a/_types/src/modules/core/ModuleReplicatorCouchDB.d.ts +++ b/_types/src/modules/core/ModuleReplicatorCouchDB.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type RemoteDBSettings } from "@lib/common/types"; import type { LiveSyncAbstractReplicator } from "@lib/replication/LiveSyncAbstractReplicator"; import { AbstractModule } from "@/modules/AbstractModule"; diff --git a/_types/src/modules/core/ModuleReplicatorMinIO.d.ts b/_types/src/modules/core/ModuleReplicatorMinIO.d.ts index 094472ca..3ebb5d71 100644 --- a/_types/src/modules/core/ModuleReplicatorMinIO.d.ts +++ b/_types/src/modules/core/ModuleReplicatorMinIO.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type RemoteDBSettings } from "@lib/common/types"; import type { LiveSyncAbstractReplicator } from "@lib/replication/LiveSyncAbstractReplicator"; import type { LiveSyncCore } from "@/main"; diff --git a/_types/src/modules/core/ReplicateResultProcessor.d.ts b/_types/src/modules/core/ReplicateResultProcessor.d.ts index 96b38854..3ce23879 100644 --- a/_types/src/modules/core/ReplicateResultProcessor.d.ts +++ b/_types/src/modules/core/ReplicateResultProcessor.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type AnyEntry, type EntryDoc, type LoadedEntry, type MetaEntry } from "@lib/common/types"; import type { ModuleReplicator } from "./ModuleReplicator"; import type { ReactiveSource } from "octagonal-wheels/dataobject/reactive_v2"; diff --git a/_types/src/modules/coreFeatures/ModuleConflictChecker.d.ts b/_types/src/modules/coreFeatures/ModuleConflictChecker.d.ts index 3a331eaa..90418417 100644 --- a/_types/src/modules/coreFeatures/ModuleConflictChecker.d.ts +++ b/_types/src/modules/coreFeatures/ModuleConflictChecker.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { AbstractModule } from "@/modules/AbstractModule.ts"; import { type FilePathWithPrefix } from "@lib/common/types"; import { QueueProcessor } from "octagonal-wheels/concurrency/processor"; diff --git a/_types/src/modules/coreFeatures/ModuleConflictResolver.d.ts b/_types/src/modules/coreFeatures/ModuleConflictResolver.d.ts index b45e731e..23b2e92a 100644 --- a/_types/src/modules/coreFeatures/ModuleConflictResolver.d.ts +++ b/_types/src/modules/coreFeatures/ModuleConflictResolver.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { AbstractModule } from "@/modules/AbstractModule.ts"; import { type diff_check_result, type FilePathWithPrefix } from "@lib/common/types"; import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts"; diff --git a/_types/src/modules/coreFeatures/ModuleResolveMismatchedTweaks.d.ts b/_types/src/modules/coreFeatures/ModuleResolveMismatchedTweaks.d.ts index 25a846dd..f6abc787 100644 --- a/_types/src/modules/coreFeatures/ModuleResolveMismatchedTweaks.d.ts +++ b/_types/src/modules/coreFeatures/ModuleResolveMismatchedTweaks.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type TweakValues, type ObsidianLiveSyncSettings, type RemoteDBSettings } from "@lib/common/types.ts"; import { AbstractModule } from "@/modules/AbstractModule.ts"; import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts"; diff --git a/_types/src/modules/coreObsidian/UILib/dialogs.d.ts b/_types/src/modules/coreObsidian/UILib/dialogs.d.ts index 1c45b785..11ae4a37 100644 --- a/_types/src/modules/coreObsidian/UILib/dialogs.d.ts +++ b/_types/src/modules/coreObsidian/UILib/dialogs.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { ButtonComponent } from "@/deps.ts"; import { App, FuzzySuggestModal, Modal, Plugin, Component } from "@/deps.ts"; import { type CompatIntervalHandle } from "@lib/common/coreEnvFunctions.ts"; diff --git a/_types/src/modules/coreObsidian/storageLib/utilObsidian.d.ts b/_types/src/modules/coreObsidian/storageLib/utilObsidian.d.ts index 6c4a7d8c..325dc87e 100644 --- a/_types/src/modules/coreObsidian/storageLib/utilObsidian.d.ts +++ b/_types/src/modules/coreObsidian/storageLib/utilObsidian.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { TFile, type TAbstractFile, type TFolder } from "@/deps.ts"; import type { FilePathWithPrefix, UXFileInfo, UXFileInfoStub, UXFolderInfo, UXInternalFileInfoStub } from "@lib/common/types.ts"; import type { LiveSyncCore } from "@/main.ts"; diff --git a/_types/src/modules/essential/ModuleBasicMenu.d.ts b/_types/src/modules/essential/ModuleBasicMenu.d.ts index 4caa8d61..d1b07da1 100644 --- a/_types/src/modules/essential/ModuleBasicMenu.d.ts +++ b/_types/src/modules/essential/ModuleBasicMenu.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { LiveSyncCore } from "@/main"; import { AbstractModule } from "@/modules/AbstractModule"; export declare class ModuleBasicMenu extends AbstractModule { diff --git a/_types/src/modules/essential/ModuleMigration.d.ts b/_types/src/modules/essential/ModuleMigration.d.ts index 45ec4c02..f630ca34 100644 --- a/_types/src/modules/essential/ModuleMigration.d.ts +++ b/_types/src/modules/essential/ModuleMigration.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { AbstractModule } from "@/modules/AbstractModule.ts"; import type { LiveSyncCore } from "@/main.ts"; export declare class ModuleMigration extends AbstractModule { diff --git a/_types/src/modules/essentialObsidian/APILib/ObsHttpHandler.d.ts b/_types/src/modules/essentialObsidian/APILib/ObsHttpHandler.d.ts index db60b074..fdea53d1 100644 --- a/_types/src/modules/essentialObsidian/APILib/ObsHttpHandler.d.ts +++ b/_types/src/modules/essentialObsidian/APILib/ObsHttpHandler.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { FetchHttpHandler, type FetchHttpHandlerOptions } from "@smithy/fetch-http-handler"; import { HttpRequest, HttpResponse, type HttpHandlerOptions } from "@smithy/protocol-http"; /** diff --git a/_types/src/modules/essentialObsidian/ModuleObsidianEvents.d.ts b/_types/src/modules/essentialObsidian/ModuleObsidianEvents.d.ts index eb2bfb43..0599aa09 100644 --- a/_types/src/modules/essentialObsidian/ModuleObsidianEvents.d.ts +++ b/_types/src/modules/essentialObsidian/ModuleObsidianEvents.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts"; import type { TFile } from "@/deps.ts"; import { type ReactiveSource } from "octagonal-wheels/dataobject/reactive"; diff --git a/_types/src/modules/essentialObsidian/ModuleObsidianMenu.d.ts b/_types/src/modules/essentialObsidian/ModuleObsidianMenu.d.ts index c4d24e56..09531f7c 100644 --- a/_types/src/modules/essentialObsidian/ModuleObsidianMenu.d.ts +++ b/_types/src/modules/essentialObsidian/ModuleObsidianMenu.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { LiveSyncCore } from "@/main.ts"; import { AbstractModule } from "@/modules/AbstractModule.ts"; export declare class ModuleObsidianMenu extends AbstractModule { diff --git a/_types/src/modules/features/DocumentHistory/DocumentHistoryModal.d.ts b/_types/src/modules/features/DocumentHistory/DocumentHistoryModal.d.ts index 22f58151..2b4d867f 100644 --- a/_types/src/modules/features/DocumentHistory/DocumentHistoryModal.d.ts +++ b/_types/src/modules/features/DocumentHistory/DocumentHistoryModal.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { TFile, Modal, App } from "@/deps.ts"; import ObsidianLiveSyncPlugin from "@/main.ts"; import { type DocumentID, type FilePathWithPrefix, type LoadedEntry } from "@lib/common/types.ts"; diff --git a/_types/src/modules/features/GlobalHistory/GlobalHistoryView.d.ts b/_types/src/modules/features/GlobalHistory/GlobalHistoryView.d.ts index a41394c3..2cd6a346 100644 --- a/_types/src/modules/features/GlobalHistory/GlobalHistoryView.d.ts +++ b/_types/src/modules/features/GlobalHistory/GlobalHistoryView.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { WorkspaceLeaf } from "@/deps.ts"; import type ObsidianLiveSyncPlugin from "@/main.ts"; import { SvelteItemView } from "@/common/SvelteItemView.ts"; diff --git a/_types/src/modules/features/InteractiveConflictResolving/ConflictResolveModal.d.ts b/_types/src/modules/features/InteractiveConflictResolving/ConflictResolveModal.d.ts index ffafc8e8..2cf30abf 100644 --- a/_types/src/modules/features/InteractiveConflictResolving/ConflictResolveModal.d.ts +++ b/_types/src/modules/features/InteractiveConflictResolving/ConflictResolveModal.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { App, Modal } from "@/deps.ts"; import { CANCELLED, LEAVE_TO_SUBSEQUENT, type diff_result } from "@lib/common/types.ts"; import { eventHub } from "@/common/events.ts"; diff --git a/_types/src/modules/features/Log/LogPaneView.d.ts b/_types/src/modules/features/Log/LogPaneView.d.ts index 13e65f51..6af269eb 100644 --- a/_types/src/modules/features/Log/LogPaneView.d.ts +++ b/_types/src/modules/features/Log/LogPaneView.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { WorkspaceLeaf } from "@/deps.ts"; import type ObsidianLiveSyncPlugin from "@/main.ts"; import { SvelteItemView } from "@/common/SvelteItemView.ts"; diff --git a/_types/src/modules/features/ModuleGlobalHistory.d.ts b/_types/src/modules/features/ModuleGlobalHistory.d.ts index f178d464..c6887a01 100644 --- a/_types/src/modules/features/ModuleGlobalHistory.d.ts +++ b/_types/src/modules/features/ModuleGlobalHistory.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts"; export declare class ModuleObsidianGlobalHistory extends AbstractObsidianModule { _everyOnloadStart(): Promise; diff --git a/_types/src/modules/features/ModuleInteractiveConflictResolver.d.ts b/_types/src/modules/features/ModuleInteractiveConflictResolver.d.ts index c7df10b7..3f3522da 100644 --- a/_types/src/modules/features/ModuleInteractiveConflictResolver.d.ts +++ b/_types/src/modules/features/ModuleInteractiveConflictResolver.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type FilePathWithPrefix, type diff_result } from "@lib/common/types.ts"; import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts"; import type { LiveSyncCore } from "@/main.ts"; diff --git a/_types/src/modules/features/ModuleLog.d.ts b/_types/src/modules/features/ModuleLog.d.ts index a99f8c48..021c997d 100644 --- a/_types/src/modules/features/ModuleLog.d.ts +++ b/_types/src/modules/features/ModuleLog.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type ReactiveValue } from "octagonal-wheels/dataobject/reactive"; import { type LOG_LEVEL } from "@lib/common/types.ts"; import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts"; diff --git a/_types/src/modules/features/ModuleObsidianDocumentHistory.d.ts b/_types/src/modules/features/ModuleObsidianDocumentHistory.d.ts index b95bb288..47bca9fb 100644 --- a/_types/src/modules/features/ModuleObsidianDocumentHistory.d.ts +++ b/_types/src/modules/features/ModuleObsidianDocumentHistory.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type TFile } from "@/deps.ts"; import type { FilePathWithPrefix, DocumentID } from "@lib/common/types.ts"; import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts"; diff --git a/_types/src/modules/features/ModuleObsidianSettingAsMarkdown.d.ts b/_types/src/modules/features/ModuleObsidianSettingAsMarkdown.d.ts index 9805763f..d8e50490 100644 --- a/_types/src/modules/features/ModuleObsidianSettingAsMarkdown.d.ts +++ b/_types/src/modules/features/ModuleObsidianSettingAsMarkdown.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type ObsidianLiveSyncSettings } from "@lib/common/types"; import { AbstractModule } from "@/modules/AbstractModule.ts"; import type { ServiceContext } from "@lib/services/base/ServiceBase.ts"; diff --git a/_types/src/modules/features/ModuleObsidianSettingTab.d.ts b/_types/src/modules/features/ModuleObsidianSettingTab.d.ts index 75fe43d9..398c8c8b 100644 --- a/_types/src/modules/features/ModuleObsidianSettingTab.d.ts +++ b/_types/src/modules/features/ModuleObsidianSettingTab.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { ObsidianLiveSyncSettingTab } from "./SettingDialogue/ObsidianLiveSyncSettingTab.ts"; import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts"; import type { LiveSyncCore } from "@/main.ts"; diff --git a/_types/src/modules/features/RemoteActivityStatus.d.ts b/_types/src/modules/features/RemoteActivityStatus.d.ts index 4e85a9e8..13efc756 100644 --- a/_types/src/modules/features/RemoteActivityStatus.d.ts +++ b/_types/src/modules/features/RemoteActivityStatus.d.ts @@ -1,4 +1,16 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f -/** Returns whether the status UI should report HTTP traffic or a finite remote operation in progress. */ -export declare function hasRemoteActivity(requestCount: number, responseCount: number, boundedRemoteActivityCount: number): boolean; +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 +/** Status icon for a finite remote operation whose lifetime is known. */ +export declare const REMOTE_OPERATION_ACTIVITY_ICON = "\uD83D\uDCF2"; +/** Status icon for approximate physical remote-request activity. */ +export declare const REMOTE_REQUEST_ACTIVITY_ICON = "\uD83C\uDF10"; +/** Avoids hiding very short remote requests before the status bar can render them. */ +export declare const REMOTE_REQUEST_ACTIVITY_MINIMUM_VISIBLE_MS = 150; +export type RemoteActivityStatus = { + remoteOperationCount: number; + trackedRequestCount: number; +}; +/** Returns the non-negative difference between tracked request starts and completions. */ +export declare function getTrackedRequestCount(requestCount: number, responseCount: number): number; +/** Formats the compact prefix shown before the replication status. */ +export declare function formatRemoteActivityStatusLabel(status: RemoteActivityStatus): string; diff --git a/_types/src/modules/features/SettingDialogue/LiveSyncSetting.d.ts b/_types/src/modules/features/SettingDialogue/LiveSyncSetting.d.ts index c04a0a9c..c4610df9 100644 --- a/_types/src/modules/features/SettingDialogue/LiveSyncSetting.d.ts +++ b/_types/src/modules/features/SettingDialogue/LiveSyncSetting.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { Setting, TextComponent, type ToggleComponent, type DropdownComponent, ButtonComponent, type TextAreaComponent, type ValueComponent } from "@/deps.ts"; import { type ConfigurationItem } from "@lib/common/types.ts"; import { type ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts"; diff --git a/_types/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.d.ts b/_types/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.d.ts index 76bc3bcf..d924dad3 100644 --- a/_types/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.d.ts +++ b/_types/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { App, Component, PluginSettingTab } from "@/deps.ts"; import { type ObsidianLiveSyncSettings } from "@lib/common/types.ts"; import ObsidianLiveSyncPlugin from "@/main.ts"; diff --git a/_types/src/modules/features/SettingDialogue/PaneAdvanced.d.ts b/_types/src/modules/features/SettingDialogue/PaneAdvanced.d.ts index 3f6ee68b..8263656c 100644 --- a/_types/src/modules/features/SettingDialogue/PaneAdvanced.d.ts +++ b/_types/src/modules/features/SettingDialogue/PaneAdvanced.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts"; import type { PageFunctions } from "./SettingPane.ts"; export declare function paneAdvanced(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel }: PageFunctions): void; diff --git a/_types/src/modules/features/SettingDialogue/PaneChangeLog.d.ts b/_types/src/modules/features/SettingDialogue/PaneChangeLog.d.ts index f44bfaad..9eb5fddb 100644 --- a/_types/src/modules/features/SettingDialogue/PaneChangeLog.d.ts +++ b/_types/src/modules/features/SettingDialogue/PaneChangeLog.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts"; export declare function paneChangeLog(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement): void; diff --git a/_types/src/modules/features/SettingDialogue/PaneCustomisationSync.d.ts b/_types/src/modules/features/SettingDialogue/PaneCustomisationSync.d.ts index 0bd9dde3..93e0d0e7 100644 --- a/_types/src/modules/features/SettingDialogue/PaneCustomisationSync.d.ts +++ b/_types/src/modules/features/SettingDialogue/PaneCustomisationSync.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts"; import type { PageFunctions } from "./SettingPane.ts"; export declare function paneCustomisationSync(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel }: PageFunctions): void; diff --git a/_types/src/modules/features/SettingDialogue/PaneGeneral.d.ts b/_types/src/modules/features/SettingDialogue/PaneGeneral.d.ts index 6c5d0614..f11fc80c 100644 --- a/_types/src/modules/features/SettingDialogue/PaneGeneral.d.ts +++ b/_types/src/modules/features/SettingDialogue/PaneGeneral.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts"; import type { PageFunctions } from "./SettingPane.ts"; export declare function paneGeneral(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel, addPane }: PageFunctions): void; diff --git a/_types/src/modules/features/SettingDialogue/PaneHatch.d.ts b/_types/src/modules/features/SettingDialogue/PaneHatch.d.ts index 38d12b2d..3adc73e4 100644 --- a/_types/src/modules/features/SettingDialogue/PaneHatch.d.ts +++ b/_types/src/modules/features/SettingDialogue/PaneHatch.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts"; import type { PageFunctions } from "./SettingPane.ts"; export declare function paneHatch(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel }: PageFunctions): void; diff --git a/_types/src/modules/features/SettingDialogue/PaneMaintenance.d.ts b/_types/src/modules/features/SettingDialogue/PaneMaintenance.d.ts index 2e83024c..3e1e0f02 100644 --- a/_types/src/modules/features/SettingDialogue/PaneMaintenance.d.ts +++ b/_types/src/modules/features/SettingDialogue/PaneMaintenance.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab"; import { type PageFunctions } from "./SettingPane"; export declare function paneMaintenance(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel }: PageFunctions): void; diff --git a/_types/src/modules/features/SettingDialogue/PanePatches.d.ts b/_types/src/modules/features/SettingDialogue/PanePatches.d.ts index 0a28bb0a..3c429470 100644 --- a/_types/src/modules/features/SettingDialogue/PanePatches.d.ts +++ b/_types/src/modules/features/SettingDialogue/PanePatches.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts"; import type { PageFunctions } from "./SettingPane.ts"; export declare function panePatches(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel }: PageFunctions): void; diff --git a/_types/src/modules/features/SettingDialogue/PanePowerUsers.d.ts b/_types/src/modules/features/SettingDialogue/PanePowerUsers.d.ts index 88d52aea..ee9ef5a5 100644 --- a/_types/src/modules/features/SettingDialogue/PanePowerUsers.d.ts +++ b/_types/src/modules/features/SettingDialogue/PanePowerUsers.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts"; import type { PageFunctions } from "./SettingPane.ts"; export declare function panePowerUsers(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel }: PageFunctions): void; diff --git a/_types/src/modules/features/SettingDialogue/PaneRemoteConfig.d.ts b/_types/src/modules/features/SettingDialogue/PaneRemoteConfig.d.ts index a8549c63..bfdc1830 100644 --- a/_types/src/modules/features/SettingDialogue/PaneRemoteConfig.d.ts +++ b/_types/src/modules/features/SettingDialogue/PaneRemoteConfig.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts"; import type { PageFunctions } from "./SettingPane.ts"; export declare function paneRemoteConfig(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel, addPane }: PageFunctions): void; diff --git a/_types/src/modules/features/SettingDialogue/PaneSelector.d.ts b/_types/src/modules/features/SettingDialogue/PaneSelector.d.ts index 2ac430a3..d98c791f 100644 --- a/_types/src/modules/features/SettingDialogue/PaneSelector.d.ts +++ b/_types/src/modules/features/SettingDialogue/PaneSelector.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts"; import type { PageFunctions } from "./SettingPane.ts"; export declare function paneSelector(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel }: PageFunctions): void; diff --git a/_types/src/modules/features/SettingDialogue/PaneSetup.d.ts b/_types/src/modules/features/SettingDialogue/PaneSetup.d.ts index fe9ed905..5a3fc32d 100644 --- a/_types/src/modules/features/SettingDialogue/PaneSetup.d.ts +++ b/_types/src/modules/features/SettingDialogue/PaneSetup.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts"; import type { PageFunctions } from "./SettingPane.ts"; export declare function paneSetup(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel, addPane }: PageFunctions): void; diff --git a/_types/src/modules/features/SettingDialogue/PaneSyncSettings.d.ts b/_types/src/modules/features/SettingDialogue/PaneSyncSettings.d.ts index 568a8b6e..69ebb204 100644 --- a/_types/src/modules/features/SettingDialogue/PaneSyncSettings.d.ts +++ b/_types/src/modules/features/SettingDialogue/PaneSyncSettings.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts"; import type { PageFunctions } from "./SettingPane.ts"; export declare function paneSyncSettings(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel, addPane }: PageFunctions): void; diff --git a/_types/src/modules/features/SettingDialogue/SettingPane.d.ts b/_types/src/modules/features/SettingDialogue/SettingPane.d.ts index 534084f8..11f780b6 100644 --- a/_types/src/modules/features/SettingDialogue/SettingPane.d.ts +++ b/_types/src/modules/features/SettingDialogue/SettingPane.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type ConfigLevel } from "@lib/common/types"; import type { AllSettingItemKey, AllSettings } from "./settingConstants"; export declare const combineOnUpdate: (func1: OnUpdateFunc, func2: OnUpdateFunc) => OnUpdateFunc; diff --git a/_types/src/modules/features/SettingDialogue/SveltePanel.d.ts b/_types/src/modules/features/SettingDialogue/SveltePanel.d.ts index 5b15cc80..fb3a7f30 100644 --- a/_types/src/modules/features/SettingDialogue/SveltePanel.d.ts +++ b/_types/src/modules/features/SettingDialogue/SveltePanel.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type Component } from "svelte"; import { type Writable } from "svelte/store"; /** diff --git a/_types/src/modules/features/SettingDialogue/remoteConfigBuffer.d.ts b/_types/src/modules/features/SettingDialogue/remoteConfigBuffer.d.ts index 7bd60d83..c1d88603 100644 --- a/_types/src/modules/features/SettingDialogue/remoteConfigBuffer.d.ts +++ b/_types/src/modules/features/SettingDialogue/remoteConfigBuffer.d.ts @@ -1,4 +1,4 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianLiveSyncSettings } from "@lib/common/types.ts"; export declare function syncActivatedRemoteSettings(target: Partial, source: ObsidianLiveSyncSettings): void; diff --git a/_types/src/modules/features/SettingDialogue/settingConstants.d.ts b/_types/src/modules/features/SettingDialogue/settingConstants.d.ts index b29fd844..e13cd077 100644 --- a/_types/src/modules/features/SettingDialogue/settingConstants.d.ts +++ b/_types/src/modules/features/SettingDialogue/settingConstants.d.ts @@ -1,3 +1,3 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export * from "@lib/common/settingConstants.ts"; diff --git a/_types/src/modules/features/SettingDialogue/settingUtils.d.ts b/_types/src/modules/features/SettingDialogue/settingUtils.d.ts index 8c2d4932..fd49ed36 100644 --- a/_types/src/modules/features/SettingDialogue/settingUtils.d.ts +++ b/_types/src/modules/features/SettingDialogue/settingUtils.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type ObsidianLiveSyncSettings } from "@lib/common/types"; /** * Generates a summary of P2P configuration settings diff --git a/_types/src/modules/features/SetupManager.d.ts b/_types/src/modules/features/SetupManager.d.ts index 8307d098..a7523ea6 100644 --- a/_types/src/modules/features/SetupManager.d.ts +++ b/_types/src/modules/features/SetupManager.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type ObsidianLiveSyncSettings } from "@lib/common/types.ts"; import { AbstractModule } from "@/modules/AbstractModule.ts"; /** diff --git a/_types/src/modules/features/SetupWizard/dialogs/setupDialogTypes.d.ts b/_types/src/modules/features/SetupWizard/dialogs/setupDialogTypes.d.ts index 9fa6d6bc..28c7b2e9 100644 --- a/_types/src/modules/features/SetupWizard/dialogs/setupDialogTypes.d.ts +++ b/_types/src/modules/features/SetupWizard/dialogs/setupDialogTypes.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { BucketSyncSetting, CouchDBConnection, EncryptionSettings, ObsidianLiveSyncSettings, P2PConnectionInfo } from "@lib/common/models/setting.type"; export declare const TYPE_IDENTICAL = "identical"; export declare const TYPE_INDEPENDENT = "independent"; diff --git a/_types/src/modules/features/StatusBarDisplay.d.ts b/_types/src/modules/features/StatusBarDisplay.d.ts new file mode 100644 index 00000000..52629cfe --- /dev/null +++ b/_types/src/modules/features/StatusBarDisplay.d.ts @@ -0,0 +1,17 @@ +// @ts-nocheck +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 +import { type ReactiveValue } from "octagonal-wheels/dataobject/reactive"; +export declare const STATUS_COUNTER_INACTIVE_LINGER_MS = 3000; +export type DisposableReactiveValue = ReactiveValue & { + dispose(): void; +}; +/** + * Mirrors an activity count while keeping each visible period on screen for a + * minimum total lifetime. The delay applies only when the source becomes zero. + */ +export declare function createMinimumVisibleActivityCount(source: ReactiveValue, minimumVisibleMs: number): DisposableReactiveValue; +/** + * Formats a counter with a stable width and briefly retains its zero value so + * that the completion of queued work remains visible. + */ +export declare function createPaddedCounterLabel(source: ReactiveValue, mark: string, inactiveLingerMs?: number): DisposableReactiveValue; diff --git a/_types/src/modules/main/ModuleLiveSyncMain.d.ts b/_types/src/modules/main/ModuleLiveSyncMain.d.ts index ec303e8e..c057891d 100644 --- a/_types/src/modules/main/ModuleLiveSyncMain.d.ts +++ b/_types/src/modules/main/ModuleLiveSyncMain.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { AbstractModule } from "@/modules/AbstractModule.ts"; import type { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub.ts"; import type { LiveSyncCore } from "@/main.ts"; diff --git a/_types/src/modules/services/ObsidianAPIService.d.ts b/_types/src/modules/services/ObsidianAPIService.d.ts index bb4ccccb..a42937ec 100644 --- a/_types/src/modules/services/ObsidianAPIService.d.ts +++ b/_types/src/modules/services/ObsidianAPIService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { InjectableAPIService } from "@lib/services/implements/injectable/InjectableAPIService"; import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext"; import { type Command } from "@/deps.ts"; diff --git a/_types/src/modules/services/ObsidianAppLifecycleService.d.ts b/_types/src/modules/services/ObsidianAppLifecycleService.d.ts index fbf2ade2..48d74dec 100644 --- a/_types/src/modules/services/ObsidianAppLifecycleService.d.ts +++ b/_types/src/modules/services/ObsidianAppLifecycleService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { AppLifecycleServiceBase } from "@lib/services/implements/injectable/InjectableAppLifecycleService"; import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext"; declare module "obsidian" { diff --git a/_types/src/modules/services/ObsidianConfirm.d.ts b/_types/src/modules/services/ObsidianConfirm.d.ts index cce07512..06534c74 100644 --- a/_types/src/modules/services/ObsidianConfirm.d.ts +++ b/_types/src/modules/services/ObsidianConfirm.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type App, type Plugin } from "@/deps"; import type { Confirm } from "@lib/interfaces/Confirm"; import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext"; diff --git a/_types/src/modules/services/ObsidianDatabaseService.d.ts b/_types/src/modules/services/ObsidianDatabaseService.d.ts index 8c21fd72..e4bb117d 100644 --- a/_types/src/modules/services/ObsidianDatabaseService.d.ts +++ b/_types/src/modules/services/ObsidianDatabaseService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext"; import { DatabaseService, type DatabaseServiceDependencies } from "@lib/services/base/DatabaseService.ts"; export declare class ObsidianDatabaseService extends DatabaseService { diff --git a/_types/src/modules/services/ObsidianPathService.d.ts b/_types/src/modules/services/ObsidianPathService.d.ts index f66e10ae..2f252a8f 100644 --- a/_types/src/modules/services/ObsidianPathService.d.ts +++ b/_types/src/modules/services/ObsidianPathService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext"; import { PathService } from "@lib/services/base/PathService"; import { type BASE_IS_NEW, type TARGET_IS_NEW, type EVEN } from "@/common/utils"; diff --git a/_types/src/modules/services/ObsidianServiceHub.d.ts b/_types/src/modules/services/ObsidianServiceHub.d.ts index daca8c2e..a8084be0 100644 --- a/_types/src/modules/services/ObsidianServiceHub.d.ts +++ b/_types/src/modules/services/ObsidianServiceHub.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub"; import { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext"; import type ObsidianLiveSyncPlugin from "@/main"; diff --git a/_types/src/modules/services/ObsidianServices.d.ts b/_types/src/modules/services/ObsidianServices.d.ts index 8444b6ac..3ec92a49 100644 --- a/_types/src/modules/services/ObsidianServices.d.ts +++ b/_types/src/modules/services/ObsidianServices.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { InjectableConflictService } from "@lib/services/implements/injectable/InjectableConflictService"; import { InjectableDatabaseEventService } from "@lib/services/implements/injectable/InjectableDatabaseEventService"; import { InjectableFileProcessingService } from "@lib/services/implements/injectable/InjectableFileProcessingService"; diff --git a/_types/src/modules/services/ObsidianSettingService.d.ts b/_types/src/modules/services/ObsidianSettingService.d.ts index e4954e60..e4428399 100644 --- a/_types/src/modules/services/ObsidianSettingService.d.ts +++ b/_types/src/modules/services/ObsidianSettingService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type ObsidianLiveSyncSettings } from "@lib/common/types"; import { SettingService, type SettingServiceDependencies } from "@lib/services/base/SettingService"; import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext"; diff --git a/_types/src/modules/services/ObsidianUIService.d.ts b/_types/src/modules/services/ObsidianUIService.d.ts index 98e3e7fc..d2821cbb 100644 --- a/_types/src/modules/services/ObsidianUIService.d.ts +++ b/_types/src/modules/services/ObsidianUIService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ConfigService } from "@lib/services/base/ConfigService"; import type { AppLifecycleService } from "@lib/services/base/AppLifecycleService"; import type { ReplicatorService } from "@lib/services/base/ReplicatorService"; diff --git a/_types/src/modules/services/ObsidianVaultService.d.ts b/_types/src/modules/services/ObsidianVaultService.d.ts index 96e76669..df1f5eff 100644 --- a/_types/src/modules/services/ObsidianVaultService.d.ts +++ b/_types/src/modules/services/ObsidianVaultService.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { InjectableVaultService } from "@lib/services/implements/injectable/InjectableVaultService"; import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext"; import type { FilePath } from "@lib/common/types"; diff --git a/_types/src/serviceFeatures/onLayoutReady/enablei18n.d.ts b/_types/src/serviceFeatures/onLayoutReady/enablei18n.d.ts index b6e48b58..771b8743 100644 --- a/_types/src/serviceFeatures/onLayoutReady/enablei18n.d.ts +++ b/_types/src/serviceFeatures/onLayoutReady/enablei18n.d.ts @@ -1,3 +1,3 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 export declare const enableI18nFeature: import("@lib/interfaces/ServiceModule").ServiceFeatureFunction, keyof import("@lib/interfaces/ServiceModule").ServiceModules, Promise>; diff --git a/_types/src/serviceFeatures/redFlag.d.ts b/_types/src/serviceFeatures/redFlag.d.ts index 553afb0c..d56469fb 100644 --- a/_types/src/serviceFeatures/redFlag.d.ts +++ b/_types/src/serviceFeatures/redFlag.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; import { type LogFunction } from "@lib/services/lib/logUtils"; import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type"; diff --git a/_types/src/serviceFeatures/redFlag.simpleFetch.d.ts b/_types/src/serviceFeatures/redFlag.simpleFetch.d.ts index 8f43a4a2..4b0ef920 100644 --- a/_types/src/serviceFeatures/redFlag.simpleFetch.d.ts +++ b/_types/src/serviceFeatures/redFlag.simpleFetch.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; import { type LogFunction } from "@lib/services/lib/logUtils"; import { type FullScanOptions } from "@lib/serviceFeatures/offlineScanner"; diff --git a/_types/src/serviceFeatures/setupObsidian/setupManagerHandlers.d.ts b/_types/src/serviceFeatures/setupObsidian/setupManagerHandlers.d.ts index aa9cc4dc..2778edb5 100644 --- a/_types/src/serviceFeatures/setupObsidian/setupManagerHandlers.d.ts +++ b/_types/src/serviceFeatures/setupObsidian/setupManagerHandlers.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type SetupManager } from "@/modules/features/SetupManager"; import type { SetupFeatureHost } from "@lib/serviceFeatures/setupObsidian/types"; import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; diff --git a/_types/src/serviceFeatures/setupObsidian/setupProtocol.d.ts b/_types/src/serviceFeatures/setupObsidian/setupProtocol.d.ts index 840744eb..eaabe9b0 100644 --- a/_types/src/serviceFeatures/setupObsidian/setupProtocol.d.ts +++ b/_types/src/serviceFeatures/setupObsidian/setupProtocol.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { LogFunction } from "@lib/services/lib/logUtils"; import type { SetupFeatureHost } from "@lib/serviceFeatures/setupObsidian/types"; import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; diff --git a/_types/src/serviceFeatures/useP2PReplicatorUI.d.ts b/_types/src/serviceFeatures/useP2PReplicatorUI.d.ts index 3aceacf1..ed7b3481 100644 --- a/_types/src/serviceFeatures/useP2PReplicatorUI.d.ts +++ b/_types/src/serviceFeatures/useP2PReplicatorUI.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { NecessaryServices } from "@lib/interfaces/ServiceModule"; import { type UseP2PReplicatorResult } from "@lib/replication/trystero/UseP2PReplicatorResult"; import { P2PLogCollector } from "@lib/replication/trystero/P2PLogCollector"; diff --git a/_types/src/serviceModules/DatabaseFileAccess.d.ts b/_types/src/serviceModules/DatabaseFileAccess.d.ts index da5a3c0f..f3dc369c 100644 --- a/_types/src/serviceModules/DatabaseFileAccess.d.ts +++ b/_types/src/serviceModules/DatabaseFileAccess.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { DatabaseFileAccess } from "@lib/interfaces/DatabaseFileAccess.ts"; import { ServiceDatabaseFileAccessBase } from "@lib/serviceModules/ServiceDatabaseFileAccessBase"; export declare class ServiceDatabaseFileAccess extends ServiceDatabaseFileAccessBase implements DatabaseFileAccess { diff --git a/_types/src/serviceModules/FileAccessObsidian.d.ts b/_types/src/serviceModules/FileAccessObsidian.d.ts index 07f2eb05..bf557108 100644 --- a/_types/src/serviceModules/FileAccessObsidian.d.ts +++ b/_types/src/serviceModules/FileAccessObsidian.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type App } from "@/deps"; import { FileAccessBase, type FileAccessBaseDependencies } from "@lib/serviceModules/FileAccessBase.ts"; import { ObsidianFileSystemAdapter } from "./FileSystemAdapters/ObsidianFileSystemAdapter"; diff --git a/_types/src/serviceModules/FileHandler.d.ts b/_types/src/serviceModules/FileHandler.d.ts index 77f11153..749030a3 100644 --- a/_types/src/serviceModules/FileHandler.d.ts +++ b/_types/src/serviceModules/FileHandler.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { ServiceFileHandlerBase } from "@lib/serviceModules/ServiceFileHandlerBase"; export declare class ServiceFileHandler extends ServiceFileHandlerBase { } diff --git a/_types/src/serviceModules/FileSystemAdapters/ObsidianConversionAdapter.d.ts b/_types/src/serviceModules/FileSystemAdapters/ObsidianConversionAdapter.d.ts index 5f564a36..7ce9a85b 100644 --- a/_types/src/serviceModules/FileSystemAdapters/ObsidianConversionAdapter.d.ts +++ b/_types/src/serviceModules/FileSystemAdapters/ObsidianConversionAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { UXFileInfoStub, UXFolderInfo } from "@lib/common/types"; import type { IConversionAdapter } from "@lib/serviceModules/adapters"; import type { TFile, TFolder } from "obsidian"; diff --git a/_types/src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.d.ts b/_types/src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.d.ts index e43e10fa..085f2ee0 100644 --- a/_types/src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.d.ts +++ b/_types/src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { FilePath, UXStat } from "@lib/common/types"; import type { IFileSystemAdapter, IPathAdapter, ITypeGuardAdapter, IConversionAdapter, IStorageAdapter, IVaultAdapter } from "@lib/serviceModules/adapters"; import type { TAbstractFile, TFile, TFolder, Stat, App } from "obsidian"; @@ -25,6 +25,7 @@ export declare class ObsidianFileSystemAdapter implements IFileSystemAdapter; getAbstractFileByPathInsensitive(path: FilePath | string): Promise; getFiles(): Promise; + renameFile(file: TFile, newPath: string): Promise; statFromNative(file: TFile): Promise; reconcileInternalFile(path: string): Promise; } diff --git a/_types/src/serviceModules/FileSystemAdapters/ObsidianPathAdapter.d.ts b/_types/src/serviceModules/FileSystemAdapters/ObsidianPathAdapter.d.ts index 0f9a7830..44caccdc 100644 --- a/_types/src/serviceModules/FileSystemAdapters/ObsidianPathAdapter.d.ts +++ b/_types/src/serviceModules/FileSystemAdapters/ObsidianPathAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { type TAbstractFile } from "@/deps"; import type { FilePath } from "@lib/common/types"; import type { IPathAdapter } from "@lib/serviceModules/adapters"; diff --git a/_types/src/serviceModules/FileSystemAdapters/ObsidianStorageAdapter.d.ts b/_types/src/serviceModules/FileSystemAdapters/ObsidianStorageAdapter.d.ts index 3463e334..1ff1d25f 100644 --- a/_types/src/serviceModules/FileSystemAdapters/ObsidianStorageAdapter.d.ts +++ b/_types/src/serviceModules/FileSystemAdapters/ObsidianStorageAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { UXDataWriteOptions } from "@lib/common/types"; import type { IStorageAdapter } from "@lib/serviceModules/adapters"; import type { Stat, App } from "obsidian"; diff --git a/_types/src/serviceModules/FileSystemAdapters/ObsidianTypeGuardAdapter.d.ts b/_types/src/serviceModules/FileSystemAdapters/ObsidianTypeGuardAdapter.d.ts index 9c78b2f1..780172c3 100644 --- a/_types/src/serviceModules/FileSystemAdapters/ObsidianTypeGuardAdapter.d.ts +++ b/_types/src/serviceModules/FileSystemAdapters/ObsidianTypeGuardAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { ITypeGuardAdapter } from "@lib/serviceModules/adapters"; import { TFile, TFolder } from "obsidian"; /** diff --git a/_types/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.d.ts b/_types/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.d.ts index 90acfc81..6bb48840 100644 --- a/_types/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.d.ts +++ b/_types/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { UXDataWriteOptions } from "@lib/common/types"; import type { IVaultAdapter } from "@lib/serviceModules/adapters"; import type { TFile, App, TFolder } from "obsidian"; @@ -16,6 +16,7 @@ export declare class ObsidianVaultAdapter implements IVaultAdapter; create(path: string, data: string, options?: UXDataWriteOptions): Promise; createBinary(path: string, data: ArrayBuffer, options?: UXDataWriteOptions): Promise; + rename(file: TFile, newPath: string): Promise; delete(file: TFile | TFolder, force?: boolean): Promise; trash(file: TFile | TFolder, force?: boolean): Promise; trigger(name: string, ...data: unknown[]): void; diff --git a/_types/src/serviceModules/ServiceFileAccessImpl.d.ts b/_types/src/serviceModules/ServiceFileAccessImpl.d.ts index 648f1c73..d274a295 100644 --- a/_types/src/serviceModules/ServiceFileAccessImpl.d.ts +++ b/_types/src/serviceModules/ServiceFileAccessImpl.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import { ServiceFileAccessBase } from "@lib/serviceModules/ServiceFileAccessBase"; import type { ObsidianFileSystemAdapter } from "./FileSystemAdapters/ObsidianFileSystemAdapter"; export declare class ServiceFileAccessObsidian extends ServiceFileAccessBase { diff --git a/_types/src/types.d.ts b/_types/src/types.d.ts index 2f2e01de..598ee821 100644 --- a/_types/src/types.d.ts +++ b/_types/src/types.d.ts @@ -1,5 +1,5 @@ // @ts-nocheck -// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: a58965f +// REPO: https://github.com/vrtmrz/livesync-commonlib Commit hash: 05d4714 import type { DatabaseFileAccess } from "@lib/interfaces/DatabaseFileAccess"; import type { Rebuilder } from "@lib/interfaces/DatabaseRebuilder"; import type { IFileHandler } from "@lib/interfaces/FileHandler"; diff --git a/src/apps/cli/adapters/NodeFileSystemAdapter.ts b/src/apps/cli/adapters/NodeFileSystemAdapter.ts index 54660234..a6b61095 100644 --- a/src/apps/cli/adapters/NodeFileSystemAdapter.ts +++ b/src/apps/cli/adapters/NodeFileSystemAdapter.ts @@ -36,8 +36,27 @@ export class NodeFileSystemAdapter implements IFileSystemAdapter { + try { + const segments = pathStr.split("/").filter((segment) => segment !== ""); + let currentPath = this.basePath; + for (const segment of segments) { + const entries = await fs.readdir(currentPath); + if (!entries.includes(segment)) return false; + currentPath = path.join(currentPath, segment); + } + return segments.length > 0; + } catch { + return false; + } + } + async getAbstractFileByPath(p: FilePath | string): Promise { const pathStr = this.normalisePath(p); + if (!this.fileCache.has(pathStr) && !(await this.hasExactPathCase(pathStr))) { + this.fileCache.delete(pathStr); + return null; + } return await this.refreshFile(pathStr); } @@ -74,6 +93,15 @@ export class NodeFileSystemAdapter implements IFileSystemAdapter { + const oldPath = file.path; + await this.vault.rename(file, newPath); + this.fileCache.delete(oldPath); + const renamedFile = await this.refreshFile(newPath); + if (!renamedFile) throw new Error(`Could not find renamed file: ${newPath}`); + return renamedFile; + } + async statFromNative(file: NodeFile): Promise { return file.stat; } diff --git a/src/apps/cli/adapters/NodeVaultAdapter.ts b/src/apps/cli/adapters/NodeVaultAdapter.ts index ecc64ece..a96bc927 100644 --- a/src/apps/cli/adapters/NodeVaultAdapter.ts +++ b/src/apps/cli/adapters/NodeVaultAdapter.ts @@ -103,6 +103,13 @@ export class NodeVaultAdapter implements IVaultAdapter { }; } + async rename(file: NodeFile, newPath: string): Promise { + const targetPath = this.resolvePath(newPath); + await fs.mkdir(path.dirname(targetPath), { recursive: true }); + await fs.rename(this.resolvePath(file.path), targetPath); + file.path = newPath as FilePath; + } + async delete(file: NodeFile | NodeFolder, force = false): Promise { const fullPath = this.resolvePath(file.path); const stat = await fs.stat(fullPath); diff --git a/src/apps/cli/adapters/NodeVaultAdapter.unit.spec.ts b/src/apps/cli/adapters/NodeVaultAdapter.unit.spec.ts new file mode 100644 index 00000000..ee7e02ee --- /dev/null +++ b/src/apps/cli/adapters/NodeVaultAdapter.unit.spec.ts @@ -0,0 +1,51 @@ +import { mkdtemp, readFile, readdir, rm, writeFile } from "node:fs/promises"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; +import { describe, expect, it } from "vitest"; +import type { FilePath } from "@lib/common/types"; +import { NodeFileSystemAdapter } from "./NodeFileSystemAdapter"; +import { NodeVaultAdapter } from "./NodeVaultAdapter"; + +describe("NodeVaultAdapter.rename", () => { + it("changes the directory entry case without changing the content", async () => { + const directory = await mkdtemp(join(tmpdir(), "livesync-case-rename-")); + try { + await writeFile(join(directory, "Calculus.md"), "content", "utf8"); + const adapter = new NodeVaultAdapter(directory); + const file = { + path: "Calculus.md" as FilePath, + stat: { ctime: 1, mtime: 2, size: 7, type: "file" as const }, + }; + + await adapter.rename(file, "calculus.md"); + + expect(await readdir(directory)).toEqual(["calculus.md"]); + expect(await readFile(join(directory, "calculus.md"), "utf8")).toBe("content"); + expect(file.path).toBe("calculus.md"); + } finally { + await rm(directory, { recursive: true, force: true }); + } + }); +}); + +describe("NodeFileSystemAdapter path case", () => { + it("finds the stored case and refreshes the cache after a case-only rename", async () => { + const directory = await mkdtemp(join(tmpdir(), "livesync-case-cache-")); + try { + await writeFile(join(directory, "Calculus.md"), "content", "utf8"); + const adapter = new NodeFileSystemAdapter(directory); + + await expect(adapter.getAbstractFileByPath("calculus.md")).resolves.toBeNull(); + const existingFile = await adapter.getAbstractFileByPathInsensitive("calculus.md"); + expect(existingFile?.path).toBe("Calculus.md"); + if (!existingFile) throw new Error("Expected to find Calculus.md case-insensitively"); + const renamedFile = await adapter.renameFile(existingFile, "calculus.md"); + + expect(renamedFile.path).toBe("calculus.md"); + expect((await adapter.getFiles()).map((file) => file.path)).toEqual(["calculus.md"]); + expect(await readdir(directory)).toEqual(["calculus.md"]); + } finally { + await rm(directory, { recursive: true, force: true }); + } + }); +}); diff --git a/src/apps/webapp/adapters/FSAPIFileSystemAdapter.ts b/src/apps/webapp/adapters/FSAPIFileSystemAdapter.ts index 2c982451..1f43ae50 100644 --- a/src/apps/webapp/adapters/FSAPIFileSystemAdapter.ts +++ b/src/apps/webapp/adapters/FSAPIFileSystemAdapter.ts @@ -53,9 +53,11 @@ export class FSAPIFileSystemAdapter implements IFileSystemAdapter { + await this.vault.rename(file, newPath); + this.clearCache(); + const renamedFile = await this.refreshFile(newPath); + if (!renamedFile) throw new Error(`Could not find renamed file: ${newPath}`); + return renamedFile; + } + async statFromNative(file: FSAPIFile): Promise { // Refresh stat from the file handle try { diff --git a/src/apps/webapp/adapters/FSAPIStorageAdapter.unit.spec.ts b/src/apps/webapp/adapters/FSAPIStorageAdapter.unit.spec.ts index dde5f912..005b6ee3 100644 --- a/src/apps/webapp/adapters/FSAPIStorageAdapter.unit.spec.ts +++ b/src/apps/webapp/adapters/FSAPIStorageAdapter.unit.spec.ts @@ -1,6 +1,8 @@ -import { describe, it } from "vitest"; +import { describe, expect, it } from "vitest"; import { storageAdapterContractCases } from "@/apps/_test/storageAdapterContract"; +import { FSAPIFileSystemAdapter } from "./FSAPIFileSystemAdapter"; import { FSAPIStorageAdapter } from "./FSAPIStorageAdapter"; +import { FSAPIVaultAdapter } from "./FSAPIVaultAdapter"; class MemoryFileHandle { readonly kind = "file"; @@ -35,19 +37,32 @@ class MemoryDirectoryHandle { readonly kind = "directory"; private readonly children = new Map(); - constructor(readonly name: string) {} + constructor( + readonly name: string, + private readonly caseInsensitive = false + ) {} - async getDirectoryHandle(name: string, options?: FileSystemGetDirectoryOptions): Promise { - const existing = this.children.get(name); + private resolveName(name: string): string { + if (!this.caseInsensitive || this.children.has(name)) return name; + return [...this.children.keys()].find((childName) => childName.toLowerCase() === name.toLowerCase()) ?? name; + } + + async getDirectoryHandle( + name: string, + options?: FileSystemGetDirectoryOptions + ): Promise { + const resolvedName = this.resolveName(name); + const existing = this.children.get(resolvedName); if (existing instanceof MemoryDirectoryHandle) return existing as unknown as FileSystemDirectoryHandle; if (existing !== undefined || !options?.create) throw new DOMException("Directory not found", "NotFoundError"); - const directory = new MemoryDirectoryHandle(name); + const directory = new MemoryDirectoryHandle(name, this.caseInsensitive); this.children.set(name, directory); return directory as unknown as FileSystemDirectoryHandle; } async getFileHandle(name: string, options?: FileSystemGetFileOptions): Promise { - const existing = this.children.get(name); + const resolvedName = this.resolveName(name); + const existing = this.children.get(resolvedName); if (existing instanceof MemoryFileHandle) return existing as unknown as FileSystemFileHandle; if (existing !== undefined || !options?.create) throw new DOMException("File not found", "NotFoundError"); const file = new MemoryFileHandle(name); @@ -56,12 +71,13 @@ class MemoryDirectoryHandle { } async removeEntry(name: string, options?: FileSystemRemoveOptions): Promise { - const existing = this.children.get(name); + const resolvedName = this.resolveName(name); + const existing = this.children.get(resolvedName); if (existing === undefined) throw new DOMException("Entry not found", "NotFoundError"); if (existing instanceof MemoryDirectoryHandle && !options?.recursive && existing.children.size > 0) { throw new DOMException("Directory is not empty", "InvalidModificationError"); } - this.children.delete(name); + this.children.delete(resolvedName); } async *entries(): AsyncIterableIterator<[string, FileSystemHandle]> { @@ -69,6 +85,10 @@ class MemoryDirectoryHandle { yield [name, entry as unknown as FileSystemHandle]; } } + + names(): string[] { + return [...this.children.keys()]; + } } describe("FSAPIStorageAdapter", () => { @@ -79,3 +99,34 @@ describe("FSAPIStorageAdapter", () => { }); } }); + +describe("FSAPIVaultAdapter.rename", () => { + it("moves the file through a temporary copy while preserving content", async () => { + const memoryRoot = new MemoryDirectoryHandle("root"); + const root = memoryRoot as unknown as FileSystemDirectoryHandle; + const adapter = new FSAPIVaultAdapter(root); + const file = await adapter.create("Calculus.md", "content"); + + await adapter.rename(file, "calculus.md"); + + expect(memoryRoot.names()).toEqual(["calculus.md"]); + const renamedHandle = await root.getFileHandle("calculus.md"); + expect(await (await renamedHandle.getFile()).text()).toBe("content"); + expect(file.path).toBe("calculus.md"); + }); +}); + +describe("FSAPIFileSystemAdapter path case", () => { + it("returns the stored path case from a case-insensitive file system", async () => { + const memoryRoot = new MemoryDirectoryHandle("root", true); + const root = memoryRoot as unknown as FileSystemDirectoryHandle; + const vault = new FSAPIVaultAdapter(root); + await vault.create("Calculus.md", "content"); + const adapter = new FSAPIFileSystemAdapter(root); + + await expect(adapter.getAbstractFileByPath("calculus.md")).resolves.toBeNull(); + await expect(adapter.getAbstractFileByPathInsensitive("calculus.md")).resolves.toEqual( + expect.objectContaining({ path: "Calculus.md" }) + ); + }); +}); diff --git a/src/apps/webapp/adapters/FSAPIVaultAdapter.ts b/src/apps/webapp/adapters/FSAPIVaultAdapter.ts index 4f548ca2..fd19a5d0 100644 --- a/src/apps/webapp/adapters/FSAPIVaultAdapter.ts +++ b/src/apps/webapp/adapters/FSAPIVaultAdapter.ts @@ -97,6 +97,46 @@ export class FSAPIVaultAdapter implements IVaultAdapter { }; } + async rename(file: FSAPIFile, newPath: string): Promise { + const source = await file.handle.getFile(); + const data = await source.arrayBuffer(); + const oldPath = file.path; + const oldPathParts = oldPath.split("/"); + const oldName = oldPathParts.pop() ?? "file"; + const temporaryName = `.${oldName}.livesync-rename-${Date.now()}-${Math.floor(Math.random() * 1_000_000)}`; + const temporaryPath = [...oldPathParts, temporaryName].join("/"); + const temporaryFile = await this.createBinary(temporaryPath, data); + + try { + await this.delete(file); + } catch (error) { + await this.delete(temporaryFile, true); + throw error; + } + + try { + const renamedFile = await this.createBinary(newPath, data); + file.path = renamedFile.path; + file.stat = renamedFile.stat; + file.handle = renamedFile.handle; + } catch (error) { + try { + const restoredFile = await this.createBinary(oldPath, data); + file.path = restoredFile.path; + file.stat = restoredFile.stat; + file.handle = restoredFile.handle; + await this.delete(temporaryFile, true); + } catch (restoreError) { + throw new Error( + `Could not rename ${oldPath} to ${newPath}, or restore it. A temporary copy remains at ${temporaryPath}. Rename error: ${String(error)}. Restore error: ${String(restoreError)}` + ); + } + throw error; + } + + await this.delete(temporaryFile, true); + } + async delete(file: FSAPIFile | FSAPIFolder, force = false): Promise { const parts = file.path.split("/").filter((part) => part !== ""); const name = parts[parts.length - 1]; diff --git a/src/lib b/src/lib index 09bfafbd..05d47148 160000 --- a/src/lib +++ b/src/lib @@ -1 +1 @@ -Subproject commit 09bfafbd6cbdb10721db1cd04a2e25afa99e2738 +Subproject commit 05d47148e190cc8314689a093ace6684a42b949f diff --git a/src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.ts b/src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.ts index be527df5..58f1f694 100644 --- a/src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.ts +++ b/src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.ts @@ -54,6 +54,11 @@ export class ObsidianFileSystemAdapter implements IFileSystemAdapter { + await this.vault.rename(file, newPath); + return file; + } + statFromNative(file: TFile): Promise { return Promise.resolve({ ...file.stat, type: "file" }); } diff --git a/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.ts b/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.ts index 42ab566c..81d51e04 100644 --- a/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.ts +++ b/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.ts @@ -37,6 +37,10 @@ export class ObsidianVaultAdapter implements IVaultAdapter { return await this.app.vault.createBinary(path, toArrayBuffer(data), options); } + async rename(file: TFile, newPath: string): Promise { + return await this.app.vault.rename(file, newPath); + } + async delete(file: TFile | TFolder, force = false): Promise { if ("trashFile" in this.app.fileManager) { // eslint-disable-next-line obsidianmd/no-unsupported-api diff --git a/updates.md b/updates.md index 0cfee9d0..4d575739 100644 --- a/updates.md +++ b/updates.md @@ -9,6 +9,7 @@ The head note of 0.25 is now in [updates_old.md](https://github.com/vrtmrz/obsid - Fixed the 📲 remote-activity indicator remaining visible after CouchDB requests had completed. - Fixed missing chunks being reported unavailable while an in-progress on-demand fetch or finite replication could still deliver them. Reads now follow the actual delivery lifecycle and recheck the local database when it finishes. +- Fixed an issue where changing only the letter case of a file name within the same directory could delete it on other devices when 'Handle files as Case-Sensitive' was disabled. Directory case changes remain unsupported (#198). ### Improved