Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Refactor debuggers

Hakan Shehu194b0fce440e
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index f9db612c..a399e989 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -1,5 +1,6 @@
import started from 'electron-squirrel-startup';
import { updateElectronApp, UpdateSourceType } from 'update-electron-app';
+import { createDebugger } from '@colanode/core';
import { app, BrowserWindow, ipcMain, protocol, shell } from 'electron';
import path from 'path';
@@ -7,7 +8,6 @@ import path from 'path';
import { metadataService } from '@/main/services/metadata-service';
import { notificationService } from '@/main/services/notification-service';
import { WindowSize } from '@/shared/types/metadata';
-import { createDebugger } from '@/main/debugger';
import { scheduler } from '@/main/scheduler';
import { assetService } from '@/main/services/asset-service';
import { avatarService } from '@/main/services/avatar-service';
@@ -21,7 +21,7 @@ import { eventBus } from '@/shared/lib/event-bus';
import { MutationInput, MutationMap } from '@/shared/mutations';
import { QueryInput, QueryMap } from '@/shared/queries';
-const debug = createDebugger('main');
+const debug = createDebugger('desktop:main');
app.setName('Colanode');
app.setAppUserModelId('com.colanode.desktop');
diff --git a/apps/desktop/src/main/data/database-service.ts b/apps/desktop/src/main/data/database-service.ts
index a12c20fc..d034349d 100644
--- a/apps/desktop/src/main/data/database-service.ts
+++ b/apps/desktop/src/main/data/database-service.ts
@@ -1,9 +1,9 @@
import SQLite from 'better-sqlite3';
import { Kysely, Migration, Migrator, SqliteDialect } from 'kysely';
+import { createDebugger } from '@colanode/core';
import fs from 'fs';
-import { createDebugger } from '@/main/debugger';
import { appDatabaseMigrations } from '@/main/data/app/migrations';
import { AppDatabaseSchema } from '@/main/data/app/schema';
import { workspaceDatabaseMigrations } from '@/main/data/workspace/migrations';
@@ -19,7 +19,7 @@ class DatabaseService {
> = new Map();
public readonly appDatabase: Kysely<AppDatabaseSchema>;
- private readonly debug = createDebugger('database-service');
+ private readonly debug = createDebugger('desktop:service:database');
constructor() {
this.debug('Constructing database service');
diff --git a/apps/desktop/src/main/jobs/connect-socket.ts b/apps/desktop/src/main/jobs/connect-socket.ts
index 04676919..7ca5a3e6 100644
--- a/apps/desktop/src/main/jobs/connect-socket.ts
+++ b/apps/desktop/src/main/jobs/connect-socket.ts
@@ -1,5 +1,6 @@
+import { createDebugger } from '@colanode/core';
+
import { databaseService } from '@/main/data/database-service';
-import { createDebugger } from '@/main/debugger';
import { socketService } from '@/main/services/socket-service';
import { JobHandler } from '@/main/jobs';
@@ -20,7 +21,7 @@ export class ConnectSocketJobHandler implements JobHandler<ConnectSocketInput> {
public triggerDebounce = 0;
public interval = 1000 * 30;
- private readonly debug = createDebugger('job:connect-socket');
+ private readonly debug = createDebugger('desktop:job:connect-socket');
public async handleJob(input: ConnectSocketInput) {
const account = await databaseService.appDatabase
diff --git a/apps/desktop/src/main/jobs/revert-invalid-mutations.ts b/apps/desktop/src/main/jobs/revert-invalid-mutations.ts
index ccfe9f92..1bbb036d 100644
--- a/apps/desktop/src/main/jobs/revert-invalid-mutations.ts
+++ b/apps/desktop/src/main/jobs/revert-invalid-mutations.ts
@@ -1,7 +1,8 @@
+import { createDebugger } from '@colanode/core';
+
import { entryService } from '@/main/services/entry-service';
import { fileService } from '@/main/services/file-service';
import { messageService } from '@/main/services/message-service';
-import { createDebugger } from '@/main/debugger';
import { databaseService } from '@/main/data/database-service';
import { JobHandler } from '@/main/jobs';
import { mapMutation } from '@/main/utils';
@@ -25,7 +26,9 @@ export class RevertInvalidMutationsJobHandler
public triggerDebounce = 100;
public interval = 1000 * 60 * 5;
- private readonly debug = createDebugger('job:revert-invalid-mutations');
+ private readonly debug = createDebugger(
+ 'desktop:job:revert-invalid-mutations'
+ );
public async handleJob(input: RevertInvalidMutationsInput) {
this.debug(`Reverting invalid mutations for user ${input.userId}`);
diff --git a/apps/desktop/src/main/jobs/sync-deleted-tokens.ts b/apps/desktop/src/main/jobs/sync-deleted-tokens.ts
index 368a1307..40c17e02 100644
--- a/apps/desktop/src/main/jobs/sync-deleted-tokens.ts
+++ b/apps/desktop/src/main/jobs/sync-deleted-tokens.ts
@@ -1,7 +1,6 @@
-import { ApiErrorCode } from '@colanode/core';
+import { ApiErrorCode, createDebugger } from '@colanode/core';
import { serverService } from '@/main/services/server-service';
-import { createDebugger } from '@/main/debugger';
import { databaseService } from '@/main/data/database-service';
import { JobHandler } from '@/main/jobs';
import { httpClient } from '@/shared/lib/http-client';
@@ -25,7 +24,7 @@ export class SyncDeletedTokensJobHandler
public triggerDebounce = 100;
public interval = 1000 * 60 * 5;
- private readonly debug = createDebugger('job:sync-deleted-tokens');
+ private readonly debug = createDebugger('desktop:job:sync-deleted-tokens');
public async handleJob(_: SyncDeletedTokensInput) {
this.debug('Syncing deleted tokens');
diff --git a/apps/desktop/src/main/jobs/sync-pending-mutations.ts b/apps/desktop/src/main/jobs/sync-pending-mutations.ts
index 59d26056..89e8bc22 100644
--- a/apps/desktop/src/main/jobs/sync-pending-mutations.ts
+++ b/apps/desktop/src/main/jobs/sync-pending-mutations.ts
@@ -1,7 +1,6 @@
-import { Mutation, SyncMutationsOutput } from '@colanode/core';
+import { Mutation, SyncMutationsOutput, createDebugger } from '@colanode/core';
import { fetchWorkspaceCredentials, mapMutation } from '@/main/utils';
-import { createDebugger } from '@/main/debugger';
import { databaseService } from '@/main/data/database-service';
import { serverService } from '@/main/services/server-service';
import { JobHandler } from '@/main/jobs';
@@ -29,7 +28,7 @@ export class SyncPendingMutationsJobHandler
public triggerDebounce = 0;
public interval = 1000 * 60;
- private readonly debug = createDebugger('job:sync-pending-mutations');
+ private readonly debug = createDebugger('desktop:job:sync-pending-mutations');
public async handleJob(input: SyncPendingMutationsInput) {
let hasMore = true;
diff --git a/apps/desktop/src/main/scheduler.ts b/apps/desktop/src/main/scheduler.ts
index 7b5a6bde..fa8f4389 100644
--- a/apps/desktop/src/main/scheduler.ts
+++ b/apps/desktop/src/main/scheduler.ts
@@ -1,9 +1,9 @@
import { sha256 } from 'js-sha256';
+import { createDebugger } from '@colanode/core';
import { socketService } from '@/main/services/socket-service';
import { radarService } from '@/main/services/radar-service';
import { databaseService } from '@/main/data/database-service';
-import { createDebugger } from '@/main/debugger';
import { JobHandler, JobInput, JobMap } from '@/main/jobs';
import { SyncServersJobHandler } from '@/main/jobs/sync-servers';
import { SyncAccountJobHandler } from '@/main/jobs/sync-account';
@@ -47,7 +47,7 @@ type JobState = {
};
class Scheduler {
- private readonly debug = createDebugger('scheduler');
+ private readonly debug = createDebugger('desktop:scheduler');
private initPromise: Promise<void> | null = null;
private initialized = false;
diff --git a/apps/desktop/src/main/services/account-service.ts b/apps/desktop/src/main/services/account-service.ts
index fc390c0f..8ddbb6ca 100644
--- a/apps/desktop/src/main/services/account-service.ts
+++ b/apps/desktop/src/main/services/account-service.ts
@@ -3,12 +3,12 @@ import {
ApiErrorCode,
ApiErrorOutput,
LoginSuccessOutput,
+ createDebugger,
} from '@colanode/core';
import { app } from 'electron';
import fs from 'fs';
-import { createDebugger } from '@/main/debugger';
import { SelectAccount } from '@/main/data/app/schema';
import { databaseService } from '@/main/data/database-service';
import { serverService } from '@/main/services/server-service';
@@ -25,7 +25,7 @@ import { MutationError, MutationErrorCode } from '@/shared/mutations';
import { parseApiError } from '@/shared/lib/axios';
class AccountService {
- private readonly debug = createDebugger('service:account');
+ private readonly debug = createDebugger('desktop:service:account');
public async initAccount(output: LoginSuccessOutput, server: string) {
const { createdAccount, createdWorkspaces } =
diff --git a/apps/desktop/src/main/services/avatar-service.ts b/apps/desktop/src/main/services/avatar-service.ts
index 6d7f41a9..c4826146 100644
--- a/apps/desktop/src/main/services/avatar-service.ts
+++ b/apps/desktop/src/main/services/avatar-service.ts
@@ -1,3 +1,5 @@
+import { createDebugger } from '@colanode/core';
+
import { net } from 'electron';
import fs from 'fs';
import path from 'path';
@@ -5,10 +7,9 @@ import path from 'path';
import { databaseService } from '@/main/data/database-service';
import { getAccountAvatarsDirectoryPath } from '@/main/utils';
import { httpClient } from '@/shared/lib/http-client';
-import { createDebugger } from '@/main/debugger';
class AvatarService {
- private readonly debug = createDebugger('service:avatar');
+ private readonly debug = createDebugger('desktop:service:avatar');
public async handleAvatarRequest(request: Request): Promise<Response> {
const url = request.url.replace('avatar://', '');
diff --git a/apps/desktop/src/main/services/collaboration-service.ts b/apps/desktop/src/main/services/collaboration-service.ts
index ce9b3719..c667c09f 100644
--- a/apps/desktop/src/main/services/collaboration-service.ts
+++ b/apps/desktop/src/main/services/collaboration-service.ts
@@ -1,11 +1,10 @@
-import { SyncCollaborationData } from '@colanode/core';
+import { SyncCollaborationData, createDebugger } from '@colanode/core';
-import { createDebugger } from '@/main/debugger';
import { databaseService } from '@/main/data/database-service';
import { eventBus } from '@/shared/lib/event-bus';
class CollaborationService {
- private readonly debug = createDebugger('service:collaboration');
+ private readonly debug = createDebugger('desktop:service:collaboration');
public async syncServerCollaboration(
userId: string,
diff --git a/apps/desktop/src/main/services/command-service.ts b/apps/desktop/src/main/services/command-service.ts
index d440fcc8..79e0fa4e 100644
--- a/apps/desktop/src/main/services/command-service.ts
+++ b/apps/desktop/src/main/services/command-service.ts
@@ -1,10 +1,11 @@
-import { createDebugger } from '@/main/debugger';
+import { createDebugger } from '@colanode/core';
+
import { commandHandlerMap } from '@/main/commands';
import { CommandHandler } from '@/main/types';
import { CommandInput, CommandMap } from '@/shared/commands';
class CommandService {
- private readonly debug = createDebugger('service:command');
+ private readonly debug = createDebugger('desktop:service:command');
public async executeCommand<T extends CommandInput>(
input: T
diff --git a/apps/desktop/src/main/services/entry-service.ts b/apps/desktop/src/main/services/entry-service.ts
index a93edfa3..6744b517 100644
--- a/apps/desktop/src/main/services/entry-service.ts
+++ b/apps/desktop/src/main/services/entry-service.ts
@@ -17,10 +17,10 @@ import {
Entry,
canCreateEntry,
TransactionOperation,
+ createDebugger,
} from '@colanode/core';
import { decodeState, YDoc } from '@colanode/crdt';
-import { createDebugger } from '@/main/debugger';
import { databaseService } from '@/main/data/database-service';
import { SelectEntryTransaction } from '@/main/data/workspace/schema';
import {
@@ -48,7 +48,7 @@ export type UpdateEntryResult =
| 'invalid_attributes';
class EntryService {
- private readonly debug = createDebugger('service:entry');
+ private readonly debug = createDebugger('desktop:service:entry');
public async createEntry(userId: string, input: CreateEntryInput) {
this.debug(`Creating ${Array.isArray(input) ? 'entries' : 'entry'}`);
diff --git a/apps/desktop/src/main/services/file-service.ts b/apps/desktop/src/main/services/file-service.ts
index 7778d861..9f87052f 100644
--- a/apps/desktop/src/main/services/file-service.ts
+++ b/apps/desktop/src/main/services/file-service.ts
@@ -7,6 +7,7 @@ import {
SyncFileData,
SyncFileInteractionData,
SyncFileTombstoneData,
+ createDebugger,
} from '@colanode/core';
import axios from 'axios';
import mime from 'mime-types';
@@ -15,7 +16,6 @@ import { net, shell } from 'electron';
import fs from 'fs';
import path from 'path';
-import { createDebugger } from '@/main/debugger';
import { databaseService } from '@/main/data/database-service';
import { serverService } from '@/main/services/server-service';
import {
@@ -35,7 +35,7 @@ import {
} from '@/shared/types/files';
class FileService {
- private readonly debug = createDebugger('service:file');
+ private readonly debug = createDebugger('desktop:service:file');
public async handleFileRequest(request: Request): Promise<Response> {
const url = request.url.replace('local-file://', '');
diff --git a/apps/desktop/src/main/services/message-service.ts b/apps/desktop/src/main/services/message-service.ts
index 2741717e..6c972e91 100644
--- a/apps/desktop/src/main/services/message-service.ts
+++ b/apps/desktop/src/main/services/message-service.ts
@@ -6,6 +6,7 @@ import {
SyncMessageInteractionData,
SyncMessageReactionData,
SyncMessageTombstoneData,
+ createDebugger,
} from '@colanode/core';
import { fileService } from '@/main/services/file-service';
@@ -15,11 +16,10 @@ import {
mapMessageReaction,
} from '@/main/utils';
import { databaseService } from '@/main/data/database-service';
-import { createDebugger } from '@/main/debugger';
import { eventBus } from '@/shared/lib/event-bus';
class MessageService {
- private readonly debug = createDebugger('service:message');
+ private readonly debug = createDebugger('desktop:service:message');
public async syncServerMessage(userId: string, message: SyncMessageData) {
const workspaceDatabase =
diff --git a/apps/desktop/src/main/services/mutation-service.ts b/apps/desktop/src/main/services/mutation-service.ts
index 86bac2b7..2c92910a 100644
--- a/apps/desktop/src/main/services/mutation-service.ts
+++ b/apps/desktop/src/main/services/mutation-service.ts
@@ -1,4 +1,5 @@
-import { createDebugger } from '@/main/debugger';
+import { createDebugger } from '@colanode/core';
+
import { mutationHandlerMap } from '@/main/mutations';
import { MutationHandler } from '@/main/types';
import {
@@ -9,7 +10,7 @@ import {
} from '@/shared/mutations';
class MutationService {
- private readonly debug = createDebugger('service:mutation');
+ private readonly debug = createDebugger('desktop:service:mutation');
public async executeMutation<T extends MutationInput>(
input: T
diff --git a/apps/desktop/src/main/services/query-service.ts b/apps/desktop/src/main/services/query-service.ts
index 46579406..65d1748d 100644
--- a/apps/desktop/src/main/services/query-service.ts
+++ b/apps/desktop/src/main/services/query-service.ts
@@ -1,6 +1,6 @@
import { isEqual } from 'lodash-es';
+import { createDebugger } from '@colanode/core';
-import { createDebugger } from '@/main/debugger';
import { queryHandlerMap } from '@/main/queries';
import { QueryHandler, SubscribedQuery } from '@/main/types';
import { eventBus } from '@/shared/lib/event-bus';
@@ -8,7 +8,7 @@ import { QueryInput, QueryMap } from '@/shared/queries';
import { Event } from '@/shared/types/events';
class QueryService {
- private readonly debug = createDebugger('service:query');
+ private readonly debug = createDebugger('desktop:service:query');
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.ts
index 997dc9b8..0978dbd7 100644
--- a/apps/desktop/src/main/services/server-service.ts
+++ b/apps/desktop/src/main/services/server-service.ts
@@ -1,11 +1,10 @@
-import { ServerConfig } from '@colanode/core';
+import { createDebugger, ServerConfig } from '@colanode/core';
import axios from 'axios';
import { databaseService } from '@/main/data/database-service';
import { mapServer } from '@/main/utils';
import { eventBus } from '@/shared/lib/event-bus';
import { Server } from '@/shared/types/servers';
-import { createDebugger } from '@/main/debugger';
type ServerState = {
isAvailable: boolean;
@@ -16,7 +15,7 @@ type ServerState = {
class ServerService {
private readonly states: Map<string, ServerState> = new Map();
- private readonly debug = createDebugger('service:server');
+ private readonly debug = createDebugger('desktop:service:server');
public async syncServers() {
this.debug('Syncing servers');
diff --git a/apps/desktop/src/main/services/socket-connection.ts b/apps/desktop/src/main/services/socket-connection.ts
index 5dfde8ba..98d4e1be 100644
--- a/apps/desktop/src/main/services/socket-connection.ts
+++ b/apps/desktop/src/main/services/socket-connection.ts
@@ -1,8 +1,7 @@
-import { Message } from '@colanode/core';
+import { Message, createDebugger } from '@colanode/core';
import { WebSocket } from 'ws';
import { scheduler } from '@/main/scheduler';
-import { createDebugger } from '@/main/debugger';
import { SelectAccount } from '@/main/data/app/schema';
import { syncService } from '@/main/services/sync-service';
import { BackoffCalculator } from '@/shared/lib/backoff-calculator';
diff --git a/apps/desktop/src/main/services/socket-service.ts b/apps/desktop/src/main/services/socket-service.ts
index 0016d9d9..a5679655 100644
--- a/apps/desktop/src/main/services/socket-service.ts
+++ b/apps/desktop/src/main/services/socket-service.ts
@@ -1,12 +1,11 @@
-import { Message } from '@colanode/core';
+import { createDebugger, Message } from '@colanode/core';
import { SelectAccount } from '@/main/data/app/schema';
-import { createDebugger } from '@/main/debugger';
import { serverService } from '@/main/services/server-service';
import { SocketConnection } from '@/main/services/socket-connection';
class SocketService {
- private readonly debug = createDebugger('service:socket');
+ private readonly debug = createDebugger('desktop:service:socket');
private readonly sockets: Map<string, SocketConnection> = new Map();
constructor() {}
diff --git a/apps/desktop/src/main/services/sync-service.ts b/apps/desktop/src/main/services/sync-service.ts
index 09b1b47a..0850cea1 100644
--- a/apps/desktop/src/main/services/sync-service.ts
+++ b/apps/desktop/src/main/services/sync-service.ts
@@ -1,9 +1,12 @@
-import { SynchronizerInput, SynchronizerOutputMessage } from '@colanode/core';
+import {
+ createDebugger,
+ SynchronizerInput,
+ SynchronizerOutputMessage,
+} from '@colanode/core';
import { Kysely } from 'kysely';
import { databaseService } from '@/main/data/database-service';
import { BaseSynchronizer } from '@/main/synchronizers/base';
-import { createDebugger } from '@/main/debugger';
import { UserSynchronizer } from '@/main/synchronizers/users';
import { WorkspaceDatabaseSchema } from '@/main/data/workspace/schema';
import { CollaborationSynchronizer } from '@/main/synchronizers/collaborations';
@@ -19,7 +22,7 @@ import { MessageTombstoneSynchronizer } from '@/main/synchronizers/message-tombs
import { eventBus } from '@/shared/lib/event-bus';
class SyncService {
- private readonly debug = createDebugger('service:sync');
+ private readonly debug = createDebugger('desktop:service:sync');
private readonly synchronizers: Map<
string,
BaseSynchronizer<SynchronizerInput>
diff --git a/apps/desktop/src/main/synchronizers/base.ts b/apps/desktop/src/main/synchronizers/base.ts
index ed9fa79a..c50a058a 100644
--- a/apps/desktop/src/main/synchronizers/base.ts
+++ b/apps/desktop/src/main/synchronizers/base.ts
@@ -4,11 +4,11 @@ import {
SynchronizerInputMessage,
SynchronizerInput,
SynchronizerMap,
+ createDebugger,
} from '@colanode/core';
import { sha256 } from 'js-sha256';
import { socketService } from '@/main/services/socket-service';
-import { createDebugger } from '@/main/debugger';
import { WorkspaceDatabaseSchema } from '@/main/data/workspace/schema';
export type SynchronizerStatus = 'idle' | 'waiting' | 'processing';
@@ -20,7 +20,7 @@ export abstract class BaseSynchronizer<TInput extends SynchronizerInput> {
public readonly input: TInput;
protected readonly database: Kysely<WorkspaceDatabaseSchema>;
- protected readonly debug = createDebugger('consumer');
+ protected readonly debug = createDebugger('desktop:synchronizer');
private status: SynchronizerStatus = 'idle';
private cursor: bigint = 0n;
@@ -143,7 +143,7 @@ export abstract class BaseSynchronizer<TInput extends SynchronizerInput> {
private generateId(userId: string, input: TInput) {
const idObj = {
userId,
- inputId: input,
+ input,
};
return sha256(JSON.stringify(idObj));
diff --git a/apps/server/package.json b/apps/server/package.json
index 1f51578e..1a0cf31d 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -52,8 +52,6 @@
"multer": "^1.4.5-lts.1",
"nodemailer": "^6.9.16",
"pg": "^8.13.0",
- "pino": "^9.5.0",
- "pino-pretty": "^13.0.0",
"postgres": "^3.4.4",
"redis": "^4.7.0",
"sharp": "^0.33.5",
diff --git a/apps/server/src/api.ts b/apps/server/src/api.ts
index 94beed77..ff93ea7a 100644
--- a/apps/server/src/api.ts
+++ b/apps/server/src/api.ts
@@ -1,14 +1,14 @@
import cors from 'cors';
import express, { Request, Response } from 'express';
+import { createDebugger } from '@colanode/core';
import http from 'http';
import { clientRouter } from '@/routes/client';
import { ipMiddleware } from '@/middlewares/ip';
import { socketService } from '@/services/socket-service';
-import { createLogger } from '@/lib/logger';
-const logger = createLogger('api');
+const debug = createDebugger('server:api');
export const initApi = async () => {
const app = express();
@@ -34,6 +34,6 @@ export const initApi = async () => {
await socketService.init(server);
server.listen(port, () => {
- logger.info(`Server is running at http://localhost:${port}`);
+ debug(`Server is running at http://localhost:${port}`);
});
};
diff --git a/apps/server/src/data/database.ts b/apps/server/src/data/database.ts
index bf7018ca..c167617d 100644
--- a/apps/server/src/data/database.ts
+++ b/apps/server/src/data/database.ts
@@ -8,13 +8,13 @@ import {
UpdateResult,
} from 'kysely';
import pg from 'pg';
+import { createDebugger } from '@colanode/core';
import { databaseMigrations } from '@/data/migrations';
import { DatabaseSchema } from '@/data/schema';
import { configuration } from '@/lib/configuration';
-import { createLogger } from '@/lib/logger';
-const logger = createLogger('database');
+const debug = createDebugger('server:database');
const dialect = new PostgresDialect({
pool: new pg.Pool({
@@ -43,12 +43,12 @@ export const migrate = async () => {
const result = await migrator.migrateToLatest();
if (result.error) {
- logger.error(`Migration failed, ${result.error}`);
+ debug(`Migration failed, ${result.error}`);
}
if (result.results && result.results.length > 0) {
for (const r of result.results) {
- logger.info(
+ debug(
`Migration result: ${r.direction} - ${r.migrationName} - ${r.status} `
);
}
diff --git a/apps/server/src/host.ts b/apps/server/src/host.ts
deleted file mode 100644
index d54bd678..00000000
--- a/apps/server/src/host.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { generateId, IdType } from '@colanode/core';
-
-type HostEnvironment = 'development' | 'production';
-
-export const host = {
- id: generateId(IdType.Host),
- environment: (process.env.NODE_ENV as HostEnvironment) || 'development',
-};
diff --git a/apps/server/src/jobs/clean-entry-data.ts b/apps/server/src/jobs/clean-entry-data.ts
index c6b3da3c..37018bc1 100644
--- a/apps/server/src/jobs/clean-entry-data.ts
+++ b/apps/server/src/jobs/clean-entry-data.ts
@@ -1,5 +1,10 @@
import { DeleteObjectCommand } from '@aws-sdk/client-s3';
-import { generateId, IdType, TransactionOperation } from '@colanode/core';
+import {
+ createDebugger,
+ generateId,
+ IdType,
+ TransactionOperation,
+} from '@colanode/core';
import { database } from '@/data/database';
import {
@@ -9,13 +14,12 @@ import {
} from '@/data/schema';
import { JobHandler } from '@/types/jobs';
import { eventBus } from '@/lib/event-bus';
-import { createLogger } from '@/lib/logger';
import { fileS3 } from '@/data/storage';
import { configuration } from '@/lib/configuration';
const BATCH_SIZE = 100;
-const logger = createLogger('clean-entry-data');
+const debug = createDebugger('server:job:clean-entry-data');
export type CleanEntryDataInput = {
type: 'clean_entry_data';
@@ -34,7 +38,7 @@ declare module '@/types/jobs' {
export const cleanEntryDataHandler: JobHandler<CleanEntryDataInput> = async (
input
) => {
- logger.trace(`Cleaning entry data for ${input.entryId}`);
+ debug(`Cleaning entry data for ${input.entryId}`);
const deleteTransactions = await database
.selectFrom('entry_transactions')
@@ -43,7 +47,7 @@ export const cleanEntryDataHandler: JobHandler<CleanEntryDataInput> = async (
.execute();
if (deleteTransactions.length !== 1) {
- logger.error(`Expected 1 delete transaction for ${input.entryId}`);
+ debug(`Expected 1 delete transaction for ${input.entryId}`);
return;
}
@@ -52,7 +56,7 @@ export const cleanEntryDataHandler: JobHandler<CleanEntryDataInput> = async (
!deleteTransaction?.operation ||
deleteTransaction.operation !== TransactionOperation.Delete
) {
- logger.error(`Expected delete transaction for ${input.entryId}`);
+ debug(`Expected delete transaction for ${input.entryId}`);
return;
}
@@ -84,7 +88,7 @@ const deleteChildren = async (parentIds: string[], userId: string) => {
.execute();
if (descendants.length === 0) {
- logger.trace(`No descendants found for ${parentIds}`);
+ debug(`No descendants found for ${parentIds}`);
hasMore = false;
break;
}
@@ -155,7 +159,7 @@ const deleteChildren = async (parentIds: string[], userId: string) => {
hasMore = descendants.length === BATCH_SIZE;
} catch (error) {
- logger.error(`Error cleaning entry data for ${parentIds}: ${error}`);
+ debug(`Error cleaning entry data for ${parentIds}: ${error}`);
hasMore = false;
}
}
@@ -229,7 +233,7 @@ const deleteMessages = async (entryIds: string[], userId: string) => {
hasMore = messages.length === BATCH_SIZE;
} catch (error) {
- logger.error(`Error deleting messages for ${entryIds}: ${error}`);
+ debug(`Error deleting messages for ${entryIds}: ${error}`);
hasMore = false;
}
}
@@ -296,7 +300,7 @@ const deleteFiles = async (entryIds: string[], userId: string) => {
hasMore = files.length === BATCH_SIZE;
} catch (error) {
- logger.error(`Error deleting files for ${entryIds}: ${error}`);
+ debug(`Error deleting files for ${entryIds}: ${error}`);
hasMore = false;
}
}
diff --git a/apps/server/src/lib/logger.ts b/apps/server/src/lib/logger.ts
deleted file mode 100644
index 70c213c4..00000000
--- a/apps/server/src/lib/logger.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import pino, { Level } from 'pino';
-
-import { host } from '@/host';
-
-const logConfig: Record<string, Level> = {
- api: 'trace',
- 'synapse-service': 'trace',
-};
-
-export const createLogger = (name: string) => {
- return pino({
- name,
- level: logConfig[name] || 'trace',
- transport:
- host.environment === 'development'
- ? {
- target: 'pino-pretty',
- options: {
- colorize: true,
- },
- }
- : undefined,
- });
-};
diff --git a/apps/server/src/services/entry-service.ts b/apps/server/src/services/entry-service.ts
index c7795f9f..69c975a0 100644
--- a/apps/server/src/services/entry-service.ts
+++ b/apps/server/src/services/entry-service.ts
@@ -13,6 +13,7 @@ import {
canUpdateEntry,
canDeleteEntry,
TransactionOperation,
+ createDebugger,
} from '@colanode/core';
import { decodeState, YDoc } from '@colanode/crdt';
import { Transaction } from 'kysely';
@@ -30,7 +31,6 @@ import {
} from '@/data/schema';
import { eventBus } from '@/lib/event-bus';
import { fetchEntry, mapEntry } from '@/lib/entries';
-import { createLogger } from '@/lib/logger';
import {
ApplyCreateTransactionInput,
ApplyCreateTransactionOutput,
@@ -59,7 +59,7 @@ type CollaboratorChangeResult = {
};
class EntryService {
- private readonly logger = createLogger('node-service');
+ private readonly debug = createDebugger('server:service:entry');
public async createEntry(
input: CreateEntryInput
@@ -129,7 +129,7 @@ class EntryService {
transaction: createdTransaction,
};
} catch (error) {
- this.logger.error(error, 'Failed to create node transaction');
+ this.debug(`Failed to create node transaction: ${error}`);
return null;
}
}
@@ -379,7 +379,7 @@ class EntryService {
transaction: createdTransaction,
};
} catch (error) {
- this.logger.error(error, 'Failed to apply node create transaction');
+ this.debug(`Failed to apply node create transaction: ${error}`);
return null;
}
}
diff --git a/apps/server/src/services/job-service.ts b/apps/server/src/services/job-service.ts
index 0e3a410f..0b5324d9 100644
--- a/apps/server/src/services/job-service.ts
+++ b/apps/server/src/services/job-service.ts
@@ -1,11 +1,11 @@
import { Job, JobsOptions, Queue, Worker } from 'bullmq';
+import { createDebugger } from '@colanode/core';
import { configuration } from '@/lib/configuration';
import { jobHandlerMap } from '@/jobs';
import { JobHandler, JobInput } from '@/types/jobs';
-import { createLogger } from '@/lib/logger';
-const logger = createLogger('job-service');
+const debug = createDebugger('server:service:job');
class JobService {
private jobQueue: Queue | undefined;
@@ -37,7 +37,7 @@ class JobService {
});
this.jobQueue.on('error', (error) => {
- logger.error(error, 'Job queue error');
+ debug(`Job queue error: ${error}`);
});
}
diff --git a/apps/server/src/services/socket-connection.ts b/apps/server/src/services/socket-connection.ts
index 6dc14597..04fe447f 100644
--- a/apps/server/src/services/socket-connection.ts
+++ b/apps/server/src/services/socket-connection.ts
@@ -4,9 +4,9 @@ import {
SynchronizerInput,
SynchronizerInputMessage,
WorkspaceStatus,
+ createDebugger,
} from '@colanode/core';
-import { createLogger } from '@/lib/logger';
import { RequestAccount } from '@/types/api';
import { database } from '@/data/database';
import {
@@ -38,7 +38,7 @@ type SocketUser = {
};
export class SocketConnection {
- private readonly logger = createLogger('socket-connection');
+ private readonly debug = createDebugger('server:service:socket-connection');
private readonly account: RequestAccount;
private readonly socket: WebSocket;
@@ -47,6 +47,10 @@ export class SocketConnection {
new Map();
constructor(account: RequestAccount, socket: WebSocket) {
+ this.debug(
+ `New connection, account:${account.id}, device:${account.deviceId}`
+ );
+
this.account = account;
this.socket = socket;
@@ -73,7 +77,9 @@ export class SocketConnection {
}
private async handleMessage(message: Message) {
- this.logger.trace(message, `Socket message from ${this.account.id}`);
+ this.debug(
+ `Socket message, account:${this.account.id}, device:${this.account.deviceId}, type:${message.type}`
+ );
if (message.type === 'synchronizer_input') {
this.handleSynchronizerInput(message);
@@ -105,10 +111,6 @@ export class SocketConnection {
}
private async handleSynchronizerInput(message: SynchronizerInputMessage) {
- this.logger.info(
- `Synchronizer input from ${this.account.id} and user ${message.userId} and input ${message.input}`
- );
-
const user = await this.getOrCreateUser(message.userId);
if (user === null) {
return;
diff --git a/apps/server/src/services/socket-service.ts b/apps/server/src/services/socket-service.ts
index 6bc31de3..e326015c 100644
--- a/apps/server/src/services/socket-service.ts
+++ b/apps/server/src/services/socket-service.ts
@@ -1,17 +1,16 @@
import { WebSocketServer, WebSocket } from 'ws';
+import { createDebugger } from '@colanode/core';
import { IncomingMessage, Server } from 'http';
-import { rateLimitService } from './rate-limit-service';
-
+import { rateLimitService } from '@/services/rate-limit-service';
import { SocketConnection } from '@/services/socket-connection';
import { eventBus } from '@/lib/event-bus';
import { parseToken, verifyToken } from '@/lib/tokens';
-import { createLogger } from '@/lib/logger';
import { RequestAccount } from '@/types/api';
class SocketService {
- private readonly logger = createLogger('socket-service');
+ private readonly debug = createDebugger('server:service:socket');
private readonly connections: Map<string, SocketConnection> = new Map();
constructor() {
@@ -32,26 +31,33 @@ class SocketService {
}
public async init(server: Server) {
- this.logger.info('Initializing socket service');
+ this.debug('Initializing socket service');
const wss = new WebSocketServer({
noServer: true,
});
server.on('upgrade', async (request, socket, head) => {
+ this.debug(
+ `Upgrade request, url: ${request.url}, device: ${request.headers['device-id']}`
+ );
+
if (request.url !== '/client/v1/synapse') {
+ this.debug(`Invalid upgrade request ${request.url}`);
socket.destroy();
return;
}
const token = request.headers['authorization'];
if (!token) {
+ this.debug(`Invalid upgrade request, no token`);
socket.destroy();
return;
}
const tokenData = parseToken(token);
if (!tokenData) {
+ this.debug(`Invalid upgrade request, invalid token`);
socket.destroy();
return;
}
@@ -61,18 +67,21 @@ class SocketService {
);
if (isRateLimited) {
+ this.debug(`Rate limited device ${tokenData.deviceId}`);
socket.destroy();
return;
}
const result = await verifyToken(tokenData);
if (!result.authenticated) {
+ this.debug(`Invalid upgrade request, invalid token`);
socket.destroy();
return;
}
const account = result.account;
wss.handleUpgrade(request, socket, head, (ws) => {
+ this.debug(`Upgrading connection for device ${tokenData.deviceId}`);
wss.emit('connection', ws, request, account);
});
});
@@ -85,6 +94,7 @@ class SocketService {
account: RequestAccount
) => {
socket.on('close', () => {
+ this.debug(`Closing connection for device ${account.deviceId}`);
const connection = this.connections.get(account.deviceId);
if (connection) {
this.connections.delete(account.deviceId);
diff --git a/package-lock.json b/package-lock.json
index 48959212..9031296a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -245,8 +245,6 @@
"multer": "^1.4.5-lts.1",
"nodemailer": "^6.9.16",
"pg": "^8.13.0",
- "pino": "^9.5.0",
- "pino-pretty": "^13.0.0",
"postgres": "^3.4.4",
"redis": "^4.7.0",
"sharp": "^0.33.5",
@@ -8498,15 +8496,6 @@
"node": ">= 4.0.0"
}
},
- "node_modules/atomic-sleep": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz",
- "integrity": "sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==",
- "license": "MIT",
- "engines": {
- "node": ">=8.0.0"
- }
- },
"node_modules/author-regex": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz",
@@ -9471,6 +9460,7 @@
"version": "2.0.20",
"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+ "dev": true,
"license": "MIT"
},
"node_modules/combined-stream": {
@@ -9784,15 +9774,6 @@
"url": "https://github.com/sponsors/kossnocorp"
}
},
- "node_modules/dateformat": {
- "version": "4.6.3",
- "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
- "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==",
- "license": "MIT",
- "engines": {
- "node": "*"
- }
- },
"node_modules/debug": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
@@ -11844,12 +11825,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/fast-copy": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-3.0.2.tgz",
- "integrity": "sha512-dl0O9Vhju8IrcLndv2eU4ldt1ftXMqqfgN4H1cpmGV7P6jeB9FwpN9a2c8DPGE1Ys88rNUJVYDHq73CGAGOPfQ==",
- "license": "MIT"
- },
"node_modules/fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -11898,21 +11873,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/fast-redact": {
- "version": "3.5.0",
- "resolved": "https://registry.npmjs.org/fast-redact/-/fast-redact-3.5.0.tgz",
- "integrity": "sha512-dwsoQlS7h9hMeYUq1W++23NDcBLV4KqONnITDV9DjfS3q1SgDGVrBdvvTLUotWtPSD7asWDV9/CmsZPy8Hf70A==",
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/fast-safe-stringify": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
- "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
- "license": "MIT"
- },
"node_modules/fast-xml-parser": {
"version": "4.4.1",
"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz",
@@ -12899,12 +12859,6 @@
"node": ">= 0.4"
}
},
- "node_modules/help-me": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz",
- "integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==",
- "license": "MIT"
- },
"node_modules/highlight.js": {
"version": "11.11.1",
"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.11.1.tgz",
@@ -13833,6 +13787,7 @@
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",
"integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==",
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=10"
@@ -15322,15 +15277,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/on-exit-leak-free": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz",
- "integrity": "sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==",
- "license": "MIT",
- "engines": {
- "node": ">=14.0.0"
- }
- },
"node_modules/on-finished": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
@@ -16035,67 +15981,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/pino": {
- "version": "9.6.0",
- "resolved": "https://registry.npmjs.org/pino/-/pino-9.6.0.tgz",
- "integrity": "sha512-i85pKRCt4qMjZ1+L7sy2Ag4t1atFcdbEt76+7iRJn1g2BvsnRMGu9p8pivl9fs63M2kF/A0OacFZhTub+m/qMg==",
- "license": "MIT",
- "dependencies": {
- "atomic-sleep": "^1.0.0",
- "fast-redact": "^3.1.1",
- "on-exit-leak-free": "^2.1.0",
- "pino-abstract-transport": "^2.0.0",
- "pino-std-serializers": "^7.0.0",
- "process-warning": "^4.0.0",
- "quick-format-unescaped": "^4.0.3",
- "real-require": "^0.2.0",
- "safe-stable-stringify": "^2.3.1",
- "sonic-boom": "^4.0.1",
- "thread-stream": "^3.0.0"
- },
- "bin": {
- "pino": "bin.js"
- }
- },
- "node_modules/pino-abstract-transport": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-2.0.0.tgz",
- "integrity": "sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==",
- "license": "MIT",
- "dependencies": {
- "split2": "^4.0.0"
- }
- },
- "node_modules/pino-pretty": {
- "version": "13.0.0",
- "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-13.0.0.tgz",
- "integrity": "sha512-cQBBIVG3YajgoUjo1FdKVRX6t9XPxwB9lcNJVD5GCnNM4Y6T12YYx8c6zEejxQsU0wrg9TwmDulcE9LR7qcJqA==",
- "license": "MIT",
- "dependencies": {
- "colorette": "^2.0.7",
- "dateformat": "^4.6.3",
- "fast-copy": "^3.0.2",
- "fast-safe-stringify": "^2.1.1",
- "help-me": "^5.0.0",
- "joycon": "^3.1.1",
- "minimist": "^1.2.6",
- "on-exit-leak-free": "^2.1.0",
- "pino-abstract-transport": "^2.0.0",
- "pump": "^3.0.0",
- "secure-json-parse": "^2.4.0",
- "sonic-boom": "^4.0.1",
- "strip-json-comments": "^3.1.1"
- },
- "bin": {
- "pino-pretty": "bin.js"
- }
- },
- "node_modules/pino-std-serializers": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz",
- "integrity": "sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==",
- "license": "MIT"
- },
"node_modules/pirates": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
@@ -16499,12 +16384,6 @@
"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
"license": "MIT"
},
- "node_modules/process-warning": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-4.0.0.tgz",
- "integrity": "sha512-/MyYDxttz7DfGMMHiysAsFE4qF+pQYAA8ziO/3NcRVrQ5fSk+Mns4QZA/oRPFzvcqNoVJXQNWNAsdwBXLUkQKw==",
- "license": "MIT"
- },
"node_modules/progress": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -16852,12 +16731,6 @@
],
"license": "MIT"
},
- "node_modules/quick-format-unescaped": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz",
- "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==",
- "license": "MIT"
- },
"node_modules/quick-lru": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
@@ -17352,15 +17225,6 @@
"node": ">=8.10.0"
}
},
- "node_modules/real-require": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/real-require/-/real-require-0.2.0.tgz",
- "integrity": "sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==",
- "license": "MIT",
- "engines": {
- "node": ">= 12.13.0"
- }
- },
"node_modules/rechoir": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
@@ -17836,15 +17700,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/safe-stable-stringify": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz",
- "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==",
- "license": "MIT",
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/safer-buffer": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -17860,12 +17715,6 @@
"loose-envify": "^1.1.0"
}
},
- "node_modules/secure-json-parse": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz",
- "integrity": "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==",
- "license": "BSD-3-Clause"
- },
"node_modules/semver": {
"version": "7.6.3",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
@@ -18321,15 +18170,6 @@
"node": ">= 10"
}
},
- "node_modules/sonic-boom": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.0.tgz",
- "integrity": "sha512-INb7TM37/mAcsGmc9hyyI6+QR3rR1zVRu36B0NeGXKnOOLiZOfER5SA+N7X7k3yUYRzLWafduTDvJAfDswwEww==",
- "license": "MIT",
- "dependencies": {
- "atomic-sleep": "^1.0.0"
- }
- },
"node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -18702,6 +18542,7 @@
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=8"
@@ -19032,15 +18873,6 @@
"node": ">=0.8"
}
},
- "node_modules/thread-stream": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-3.1.0.tgz",
- "integrity": "sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==",
- "license": "MIT",
- "dependencies": {
- "real-require": "^0.2.0"
- }
- },
"node_modules/tiny-each-async": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/tiny-each-async/-/tiny-each-async-2.0.3.tgz",
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index e9d5b708..42e53f74 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -30,3 +30,4 @@ export * from './lib/entries';
export * from './lib/texts';
export * from './lib/permissions';
export * from './types/api';
+export * from './lib/debugger';
diff --git a/apps/desktop/src/main/debugger.ts b/packages/core/src/lib/debugger.ts
similarity index 100%
rename from apps/desktop/src/main/debugger.ts
rename to packages/core/src/lib/debugger.ts