OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
fix redis timeout connection on serverless (avoid init redis directly)
Carl-Gerhard Lindesvärd89c5732efe19
diff --git a/packages/db/src/buffers/buffer.ts b/packages/db/src/buffers/buffer.tsindex 0b02e9234..1ec48a104 100644--- a/packages/db/src/buffers/buffer.ts+++ b/packages/db/src/buffers/buffer.ts@@ -1,4 +1,4 @@-import type { Redis } from '@openpanel/redis';+import { getRedisCache } from '@openpanel/redis';export const DELETE = '__DELETE__';@@ -40,7 +40,6 @@ export abstract class RedisBuffer<T> {public prefix = 'op:buffer';public table: string;public batchSize?: number;- public redis: Redis;// abstract methodspublic abstract onInsert?: OnInsert<T>;@@ -49,9 +48,8 @@ export abstract class RedisBuffer<T> {public abstract find: Find<T, unknown>;public abstract findMany: FindMany<T, unknown>;- constructor(options: { table: string; redis: Redis; batchSize?: number }) {+ constructor(options: { table: string; batchSize?: number }) {this.table = options.table;- this.redis = options.redis;this.batchSize = options.batchSize;}@@ -65,9 +63,9 @@ export abstract class RedisBuffer<T> {public async insert(value: T) {this.onInsert?.(value);- await this.redis.rpush(this.getKey(), JSON.stringify(value));+ await getRedisCache().rpush(this.getKey(), JSON.stringify(value));- const length = await this.redis.llen(this.getKey());+ const length = await getRedisCache().llen(this.getKey());if (this.batchSize && length >= this.batchSize) {this.flush();}@@ -109,7 +107,7 @@ export abstract class RedisBuffer<T> {e);const timestamp = new Date().getTime();- await this.redis.hset(this.getKey(`failed:${timestamp}`), {+ await getRedisCache().hset(this.getKey(`failed:${timestamp}`), {error: getError(e),data: JSON.stringify(queue.map((item) => item.event)),retries: 0,@@ -121,7 +119,7 @@ export abstract class RedisBuffer<T> {}public async deleteIndexes(indexes: number[]) {- const multi = this.redis.multi();+ const multi = getRedisCache().multi();indexes.forEach((index) => {multi.lset(this.getKey(), index, DELETE);});@@ -130,7 +128,7 @@ export abstract class RedisBuffer<T> {}public async getQueue(limit: number): Promise<QueueItem<T>[]> {- const queue = await this.redis.lrange(this.getKey(), 0, limit);+ const queue = await getRedisCache().lrange(this.getKey(), 0, limit);return queue.map((item, index) => ({event: this.transformQueueItem(item),diff --git a/packages/db/src/buffers/event-buffer.ts b/packages/db/src/buffers/event-buffer.tsindex 9241f3d59..4e2a5a1b6 100644--- a/packages/db/src/buffers/event-buffer.ts+++ b/packages/db/src/buffers/event-buffer.ts@@ -31,7 +31,6 @@ export class EventBuffer extends RedisBuffer<IClickhouseEvent> {constructor() {super({table: TABLE_NAMES.events,- redis: getRedisCache(),});}@@ -41,7 +40,7 @@ export class EventBuffer extends RedisBuffer<IClickhouseEvent> {SuperJSON.stringify(transformEvent(event)));if (event.profile_id) {- this.redis.set(+ getRedisCache().set(`live:event:${event.project_id}:${event.profile_id}`,'','EX',@@ -168,7 +167,7 @@ export class EventBuffer extends RedisBuffer<IClickhouseEvent> {});if (itemsToStalled.size > 0) {- const multi = this.redis.multi();+ const multi = getRedisCache().multi();for (const item of itemsToStalled) {multi.rpush(this.getKey('stalled'), JSON.stringify(item.event));}diff --git a/packages/db/src/buffers/profile-buffer.ts b/packages/db/src/buffers/profile-buffer.tsindex a699ca1e0..754391331 100644--- a/packages/db/src/buffers/profile-buffer.ts+++ b/packages/db/src/buffers/profile-buffer.ts@@ -22,7 +22,6 @@ import { RedisBuffer } from './buffer';export class ProfileBuffer extends RedisBuffer<IClickhouseProfile> {constructor() {super({- redis: getRedisCache(),table: 'profiles',batchSize: 100,});