diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts index ebfa2d26..bf19d37c 100644 --- a/frontend/obsidian-plugin/src/vault-link-plugin.ts +++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts @@ -8,12 +8,33 @@ import { ObsidianFileEventHandler } from "./obisidan-event-handler"; import { StatusBar } from "./views/status-bar"; import { LogsView } from "./views/logs-view"; import { StatusDescription } from "./views/status-description"; -import { SyncClient, LogLevel, LogLine } from "sync-client"; +import type { LogLine } from "sync-client"; +import { SyncClient, LogLevel } from "sync-client"; import { ObsidianFileSystemOperations } from "./obsidian-file-system"; export default class VaultLinkPlugin extends Plugin { private settingsTab: SyncSettingsTab | undefined; private client!: SyncClient; + private static registerConsoleForLogging(client: SyncClient): void { + client.logger.addOnMessageListener((logLine: LogLine) => { + const formatted = `${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`; + + switch (logLine.level) { + case LogLevel.ERROR: + console.error(formatted); + break; + case LogLevel.WARNING: + console.warn(formatted); + break; + case LogLevel.INFO: + console.info(formatted); + break; + case LogLevel.DEBUG: + console.debug(formatted); + break; + } + }); + } public async onload(): Promise { this.client = await SyncClient.create( @@ -24,7 +45,7 @@ export default class VaultLinkPlugin extends Plugin { } ); - registerConsoleForLogging(this.client); + VaultLinkPlugin.registerConsoleForLogging(this.client); const statusDescription = new StatusDescription(this.client); @@ -124,24 +145,3 @@ export default class VaultLinkPlugin extends Plugin { } } } - -function registerConsoleForLogging(client: SyncClient) { - client.logger.addOnMessageListener((logLine: LogLine) => { - const formatted = `${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`; - - switch (logLine.level) { - case LogLevel.ERROR: - console.error(formatted); - break; - case LogLevel.WARNING: - console.warn(formatted); - break; - case LogLevel.INFO: - console.info(formatted); - break; - case LogLevel.DEBUG: - console.debug(formatted); - break; - } - }); -} diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts index 817e134b..3def68f9 100644 --- a/frontend/sync-client/src/sync-client.ts +++ b/frontend/sync-client/src/sync-client.ts @@ -1,11 +1,8 @@ import initWasm from "sync_lib"; import wasmBin from "../../../backend/sync_lib/pkg/sync_lib_bg.wasm"; import type { PersistenceProvider } from "./persistence/persistence"; -import { - HistoryEntry, - HistoryStats, - SyncHistory -} from "./tracing/sync-history"; +import type { HistoryEntry, HistoryStats } from "./tracing/sync-history"; +import { SyncHistory } from "./tracing/sync-history"; import { Logger } from "./tracing/logger"; import type { StoredDatabase } from "./persistence/database"; import { Database } from "./persistence/database"; @@ -123,7 +120,7 @@ export class SyncClient { newSettings.token !== oldSettings.token || newSettings.remoteUri !== oldSettings.remoteUri ) { - client.reset(); + void client.reset(); } });