Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Refactor logger
Hakan Shehuaf10888629cd
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.tsindex bd3b77dc..4ff5a52b 100644--- a/apps/desktop/src/main.ts+++ b/apps/desktop/src/main.ts@@ -15,10 +15,10 @@ import { CommandInput } from '@/shared/commands';import { commandService } from '@/main/services/command-service';import { bootstrapper } from '@/main/bootstrapper';import started from 'electron-squirrel-startup';-import { logService } from '@/main/services/log-service';+import { createLogger } from '@/main/logger';import { getAppIconPath } from '@/main/utils';-const logger = logService.createLogger('main');+const logger = createLogger('main');app.setName('Colanode');app.setAppUserModelId('com.colanode.desktop');diff --git a/apps/desktop/src/main/bootstrapper.ts b/apps/desktop/src/main/bootstrapper.tsindex 49037683..d2ab49c5 100644--- a/apps/desktop/src/main/bootstrapper.ts+++ b/apps/desktop/src/main/bootstrapper.ts@@ -7,13 +7,13 @@ import { accountService } from '@/main/services/account-service';import { syncService } from '@/main/services/sync-service';import { notificationService } from '@/main/services/notification-service';import { fileService } from '@/main/services/file-service';-import { logService } from '@/main/services/log-service';+import { createLogger } from '@/main/logger';// one minuteconst EVENT_LOOP_INTERVAL = 1000 * 60;class Bootstrapper {- private readonly logger = logService.createLogger('bootstrapper');+ private readonly logger = createLogger('bootstrapper');private initPromise: Promise<void> | null = null;private eventLoop: NodeJS.Timeout | null = null;diff --git a/apps/desktop/src/main/logger.ts b/apps/desktop/src/main/logger.tsnew file mode 100644index 00000000..1b764c1e--- /dev/null+++ b/apps/desktop/src/main/logger.ts@@ -0,0 +1,23 @@+import { app } from 'electron';+import pino, { Level } from 'pino';++const logConfig: Record<string, Level> = {+ main: 'trace',+ 'server-service': 'trace',+ 'file-service': 'trace',+};++export const createLogger = (name: string) => {+ return pino({+ name,+ level: logConfig[name] || 'trace',+ transport: !app.isPackaged+ ? {+ target: 'pino-pretty',+ options: {+ colorize: true,+ },+ }+ : undefined,+ });+};diff --git a/apps/desktop/src/main/services/account-service.ts b/apps/desktop/src/main/services/account-service.tsindex 89eb4e6e..05e251d4 100644--- a/apps/desktop/src/main/services/account-service.ts+++ b/apps/desktop/src/main/services/account-service.ts@@ -11,10 +11,10 @@ import {import { getAccountAvatarsDirectoryPath } from '@/main/utils';import { eventBus } from '@/shared/lib/event-bus';import { serverService } from '@/main/services/server-service';-import { logService } from '@/main/services/log-service';+import { createLogger } from '@/main/logger';class AccountService {- private readonly logger = logService.createLogger('account-service');+ private readonly logger = createLogger('account-service');async syncAccounts() {this.logger.info('Syncing accounts');diff --git a/apps/desktop/src/main/services/asset-service.ts b/apps/desktop/src/main/services/asset-service.tsindex 438df9d7..11e700b5 100644--- a/apps/desktop/src/main/services/asset-service.ts+++ b/apps/desktop/src/main/services/asset-service.ts@@ -4,7 +4,7 @@ import fs from 'fs';import unzipper from 'unzipper';import { EmojiData } from '@/shared/types/emojis';import { IconData } from '@/shared/types/icons';-import { logService } from '@/main/services/log-service';+import { createLogger } from '@/main/logger';import { getAssetsSourcePath } from '@/main/utils';type AssetsVersion = {@@ -21,7 +21,7 @@ class AssetService {app.getPath('userData'),'assets');- private readonly logger = logService.createLogger('asset-service');+ private readonly logger = createLogger('asset-service');public async handleAssetRequest(request: Request): Promise<Response> {const url = request.url.replace('asset://', '');diff --git a/apps/desktop/src/main/services/avatar-service.ts b/apps/desktop/src/main/services/avatar-service.tsindex 514f084e..fc9cfcfd 100644--- a/apps/desktop/src/main/services/avatar-service.ts+++ b/apps/desktop/src/main/services/avatar-service.ts@@ -4,10 +4,10 @@ import fs from 'fs';import { databaseService } from '@/main/data/database-service';import { httpClient } from '@/shared/lib/http-client';import { getAccountAvatarsDirectoryPath } from '@/main/utils';-import { logService } from '@/main/services/log-service';+import { createLogger } from '@/main/logger';class AvatarService {- private readonly logger = logService.createLogger('avatar-service');+ private readonly logger = createLogger('avatar-service');public async handleAvatarRequest(request: Request): Promise<Response> {const url = request.url.replace('avatar://', '');diff --git a/apps/desktop/src/main/services/command-service.ts b/apps/desktop/src/main/services/command-service.tsindex c638c5bf..acf61e29 100644--- a/apps/desktop/src/main/services/command-service.ts+++ b/apps/desktop/src/main/services/command-service.ts@@ -1,11 +1,11 @@import { CommandInput } from '@/shared/commands';-import { logService } from '@/main/services/log-service';+import { createLogger } from '@/main/logger';import { CommandMap } from '@/shared/commands';import { commandHandlerMap } from '@/main/commands';import { CommandHandler } from '@/main/types';class CommandService {- private readonly logger = logService.createLogger('command-service');+ private readonly logger = createLogger('command-service');public async executeCommand<T extends CommandInput>(input: Tdiff --git a/apps/desktop/src/main/services/file-service.ts b/apps/desktop/src/main/services/file-service.tsindex 82db2f03..23dcf758 100644--- a/apps/desktop/src/main/services/file-service.ts+++ b/apps/desktop/src/main/services/file-service.ts@@ -16,7 +16,7 @@ import {} from '@colanode/core';import { eventBus } from '@/shared/lib/event-bus';import { serverService } from '@/main/services/server-service';-import { logService } from '@/main/services/log-service';+import { createLogger } from '@/main/logger';type WorkspaceFileState = {isUploading: boolean;@@ -26,7 +26,7 @@ type WorkspaceFileState = {};class FileService {- private readonly logger = logService.createLogger('file-service');+ private readonly logger = createLogger('file-service');private readonly fileStates: Map<string, WorkspaceFileState> = new Map();constructor() {diff --git a/apps/desktop/src/main/services/log-service.ts b/apps/desktop/src/main/services/log-service.tsdeleted file mode 100644index d65d006d..00000000--- a/apps/desktop/src/main/services/log-service.ts+++ /dev/null@@ -1,27 +0,0 @@-import { app } from 'electron';-import pino, { Level } from 'pino';--const logConfig: Record<string, Level> = {- main: 'trace',- 'server-service': 'trace',- 'file-service': 'trace',-};--class LogService {- public createLogger(name: string) {- return pino({- name,- level: logConfig[name] || 'trace',- transport: !app.isPackaged- ? {- target: 'pino-pretty',- options: {- colorize: true,- },- }- : undefined,- });- }-}--export const logService = new LogService();diff --git a/apps/desktop/src/main/services/mutation-service.ts b/apps/desktop/src/main/services/mutation-service.tsindex 13138937..0ad82bdb 100644--- a/apps/desktop/src/main/services/mutation-service.ts+++ b/apps/desktop/src/main/services/mutation-service.ts@@ -3,10 +3,10 @@ import { MutationInput } from '@/shared/mutations';import { MutationMap } from '@/shared/mutations';import { mutationHandlerMap } from '@/main/mutations';import { MutationHandler } from '@/main/types';-import { logService } from '@/main/services/log-service';+import { createLogger } from '@/main/logger';class MutationService {- private readonly logger = logService.createLogger('mutation-service');+ private readonly logger = createLogger('mutation-service');public async executeMutation<T extends MutationInput>(input: Tdiff --git a/apps/desktop/src/main/services/query-service.ts b/apps/desktop/src/main/services/query-service.tsindex 015b6896..50477f60 100644--- a/apps/desktop/src/main/services/query-service.ts+++ b/apps/desktop/src/main/services/query-service.ts@@ -4,10 +4,10 @@ import { queryHandlerMap } from '@/main/queries';import { eventBus } from '@/shared/lib/event-bus';import { Event } from '@/shared/types/events';import { isEqual } from 'lodash-es';-import { logService } from '@/main/services/log-service';+import { createLogger } from '@/main/logger';class QueryService {- private readonly logger = logService.createLogger('query-service');+ private readonly logger = createLogger('query-service');private readonly subscribedQueries: Map<string, SubscribedQuery<QueryInput>> =new Map();diff --git a/apps/desktop/src/main/services/server-service.ts b/apps/desktop/src/main/services/server-service.tsindex 05546fcd..3c1fbf43 100644--- a/apps/desktop/src/main/services/server-service.ts+++ b/apps/desktop/src/main/services/server-service.ts@@ -4,7 +4,7 @@ import { ServerConfig } from '@colanode/core';import { databaseService } from '@/main/data/database-service';import { mapServer } from '@/main/utils';import { eventBus } from '@/shared/lib/event-bus';-import { logService } from '@/main/services/log-service';+import { createLogger } from '@/main/logger';type ServerState = {isAvailable: boolean;@@ -15,7 +15,7 @@ type ServerState = {class ServerService {private readonly states: Map<string, ServerState> = new Map();- private readonly logger = logService.createLogger('server-service');+ private readonly logger = createLogger('server-service');public async syncServers() {const rows = await databaseService.appDatabasediff --git a/apps/desktop/src/main/services/sync-service.ts b/apps/desktop/src/main/services/sync-service.tsindex c48572ad..3aad3ab4 100644--- a/apps/desktop/src/main/services/sync-service.ts+++ b/apps/desktop/src/main/services/sync-service.ts@@ -17,7 +17,7 @@ import {SyncInteractionsMessage,SyncNodeTransactionsOutput,} from '@colanode/core';-import { logService } from '@/main/services/log-service';+import { createLogger } from '@/main/logger';import { nodeService } from '@/main/services/node-service';import { socketService } from '@/main/services/socket-service';import { collaborationService } from '@/main/services/collaboration-service';@@ -34,7 +34,7 @@ type WorkspaceSyncState = {};class SyncService {- private readonly logger = logService.createLogger('sync-service');+ private readonly logger = createLogger('sync-service');private readonly localPendingTransactionStates: Map<string,WorkspaceSyncState