init redis lazy

apps/worker/scripts/debug.ts

@@ -3,11 +3,11 @@ import { escape } from 'sqlstring';
 import type { IClickhouseEvent } from '@openpanel/db';
 import { chQuery, eventBuffer, TABLE_NAMES } from '@openpanel/db';
 import { sessionsQueue } from '@openpanel/queue/src/queues';
-import { redis } from '@openpanel/redis';
+import { getRedisCache, getRedisQueue } from '@openpanel/redis';
 
 async function debugStalledEvents() {
-  const keys = await redis.keys('bull:sessions:sessionEnd*');
-  const delayedZRange = await redis.zrange(
+  const keys = await getRedisQueue().keys('bull:sessions:sessionEnd*');
+  const delayedZRange = await getRedisQueue().zrange(
     'bull:sessions:delayed',
     0,
     -1,
@@ -20,10 +20,14 @@ async function debugStalledEvents() {
       }
       return acc;
     },
-    [] as Record<string, number>
+    {} as Record<string, number>
+  );
+  const opKeys = await getRedisCache().keys('op:*');
+  const stalledEvents = await getRedisCache().lrange(
+    'op:buffer:events:stalled',
+    0,
+    -1
   );
-  const opKeys = await redis.keys('op:*');
-  const stalledEvents = await redis.lrange('op:buffer:events:stalled', 0, -1);
   // keys.forEach((key) => {
   //   console.log(key);
   // });
@@ -112,7 +116,14 @@ async function debugStalledEvents() {
   delayedJobs.sort((a, b) => a.timestamp + a.delay - (b.timestamp + b.delay));
   let delayedJobsCount = 0;
   delayedJobs.forEach((job) => {
-    const date = new Date(delayedValues[job.id]);
+    if (!job.id) {
+      return;
+    }
+    const timestamp = delayedValues[job.id];
+    if (!timestamp) {
+      return;
+    }
+    const date = new Date(timestamp);
     // if date is in the past
     // if (date.getTime() - 1000 * 60 * 5 < Date.now()) {
     if (date.getTime() < Date.now()) {

apps/worker/src/index.ts

@@ -5,12 +5,8 @@ import type { WorkerOptions } from 'bullmq';
 import { Worker } from 'bullmq';
 import express from 'express';
 
-import {
-  connection,
-  cronQueue,
-  eventsQueue,
-  sessionsQueue,
-} from '@openpanel/queue';
+import { cronQueue, eventsQueue, sessionsQueue } from '@openpanel/queue';
+import { getRedisQueue } from '@openpanel/redis';
 
 import { cronJob } from './jobs/cron';
 import { eventsJob } from './jobs/events';
@@ -23,12 +19,7 @@ serverAdapter.setBasePath(process.env.SELF_HOSTED ? '/worker' : '/');
 const app = express();
 
 const workerOptions: WorkerOptions = {
-  connection: {
-    ...connection,
-    enableReadyCheck: false,
-    maxRetriesPerRequest: null,
-    enableOfflineQueue: true,
-  },
+  connection: getRedisQueue(),
   concurrency: parseInt(process.env.CONCURRENCY || '1', 10),
 };
 

apps/worker/src/jobs/events.incoming-event.ts

@@ -14,7 +14,7 @@ import type {
   EventsQueuePayloadCreateSessionEnd,
   EventsQueuePayloadIncomingEvent,
 } from '@openpanel/queue';
-import { redis } from '@openpanel/redis';
+import { getRedisQueue } from '@openpanel/redis';
 
 function noDateInFuture(eventDate: Date): Date {
   if (eventDate > new Date()) {
@@ -217,7 +217,9 @@ async function getSessionEnd({
   currentDeviceId: string;
   previousDeviceId: string;
 }) {
-  const sessionEndKeys = await redis.keys(`*:sessionEnd:${projectId}:*`);
+  const sessionEndKeys = await getRedisQueue().keys(
+    `*:sessionEnd:${projectId}:*`
+  );
 
   const sessionEndJobCurrentDeviceId = await findJobByPrefix(
     sessionsQueue,

apps/worker/src/jobs/events.ts

@@ -7,7 +7,6 @@ import type {
   EventsQueuePayloadCreateSessionEnd,
   EventsQueuePayloadIncomingEvent,
 } from '@openpanel/queue';
-import { redis } from '@openpanel/redis';
 
 import { createSessionEnd } from './events.create-session-end';
 import { incomingEvent } from './events.incoming-event';

apps/worker/src/metrics.ts

@@ -1,7 +1,7 @@
 import client from 'prom-client';
 
 import { cronQueue, eventsQueue, sessionsQueue } from '@openpanel/queue';
-import { redis } from '@openpanel/redis';
+import { getRedisCache } from '@openpanel/redis';
 
 const Registry = client.Registry;
 
@@ -75,7 +75,7 @@ buffers.forEach((buffer) => {
       name: `buffer_${buffer}_count`,
       help: 'Number of users in the users array',
       async collect() {
-        const metric = await redis.llen(`op:buffer:${buffer}`);
+        const metric = await getRedisCache().llen(`op:buffer:${buffer}`);
         this.set(metric);
       },
     })
@@ -86,7 +86,9 @@ buffers.forEach((buffer) => {
       name: `buffer_${buffer}_stalled_count`,
       help: 'Number of users in the users array',
       async collect() {
-        const metric = await redis.llen(`op:buffer:${buffer}:stalled`);
+        const metric = await getRedisCache().llen(
+          `op:buffer:${buffer}:stalled`
+        );
         this.set(metric);
       },
     })