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
Make server event-bus work with multiple instances
Hakan Shehu0c0706834115
diff --git a/apps/server/src/host.ts b/apps/server/src/host.tsnew file mode 100644index 00000000..d54bd678--- /dev/null+++ b/apps/server/src/host.ts@@ -0,0 +1,8 @@+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/index.ts b/apps/server/src/index.tsindex ddea46a4..d3150e27 100644--- a/apps/server/src/index.ts+++ b/apps/server/src/index.ts@@ -1,5 +1,6 @@import dotenv from 'dotenv';+import { eventBus } from '@/lib/event-bus';import { initApi } from '@/api';import { migrate } from '@/data/database';import { initRedis } from '@/data/redis';@@ -14,6 +15,8 @@ const init = async () => {jobService.initQueue();await jobService.initWorker();++ await eventBus.init();};init();diff --git a/apps/server/src/lib/event-bus.ts b/apps/server/src/lib/event-bus.tsindex 8e347833..ae12dd1d 100644--- a/apps/server/src/lib/event-bus.ts+++ b/apps/server/src/lib/event-bus.ts@@ -1,4 +1,8 @@import { Event } from '@/types/events';+import { redis } from '@/data/redis';+import { host } from '@/host';++const CHANNEL_NAME = process.env.REDIS_EVENTS_CHANNEL ?? 'events';export interface Subscription {id: string;@@ -11,14 +15,42 @@ export interface EventBus {publish(event: Event): void;}+export type DistributedEventEnvelope = {+ event: Event;+ hostId: string;+};+export class EventBusService {private subscriptions: Map<string, Subscription>;private id = 0;+ private initialized = false;public constructor() {this.subscriptions = new Map<string, Subscription>();}+ public async init() {+ if (this.initialized) {+ return;+ }++ this.initialized = true;++ if (host.environment === 'development') {+ return;+ }++ const client = redis.duplicate();+ client.subscribe(CHANNEL_NAME, (message) => {+ const envelope = JSON.parse(message) as DistributedEventEnvelope;+ if (envelope.hostId === host.id) {+ return;+ }++ this.publish(envelope.event);+ });+ }+public subscribe(callback: (event: Event) => void): string {const id = (this.id++).toLocaleString();this.subscriptions.set(id, {@@ -38,6 +70,10 @@ export class EventBusService {this.subscriptions.forEach((subscription) => {subscription.callback(event);});++ if (host.environment === 'production') {+ redis.publish(CHANNEL_NAME, JSON.stringify({ event, hostId: host.id }));+ }}}diff --git a/apps/server/src/services/log-service.ts b/apps/server/src/services/log-service.tsindex 8528fb0d..54fe975a 100644--- a/apps/server/src/services/log-service.ts+++ b/apps/server/src/services/log-service.ts@@ -1,5 +1,6 @@import pino, { Level } from 'pino';-const isDev = true; //process.env.NODE_ENV === 'development';++import { host } from '@/host';const logConfig: Record<string, Level> = {api: 'trace',@@ -11,14 +12,15 @@ class LogService {return pino({name,level: logConfig[name] || 'trace',- transport: isDev- ? {- target: 'pino-pretty',- options: {- colorize: true,- },- }- : undefined,+ transport:+ host.environment === 'development'+ ? {+ target: 'pino-pretty',+ options: {+ colorize: true,+ },+ }+ : undefined,});}}diff --git a/packages/core/src/lib/id.ts b/packages/core/src/lib/id.tsindex 7e526b72..0bf69d99 100644--- a/packages/core/src/lib/id.ts+++ b/packages/core/src/lib/id.ts@@ -48,6 +48,7 @@ export enum IdType {Upload = 'up',Transaction = 'tx',Event = 'ev',+ Host = 'ht',}export const generateId = (type: IdType): string => {