fix: remove old event queue, cleaned up session handling, remove hacks

apps/api/src/controllers/event.controller.ts

@@ -3,8 +3,7 @@ import type { FastifyReply, FastifyRequest } from 'fastify';
 
 import { generateDeviceId, parseUserAgent } from '@openpanel/common/server';
 import { getSalts } from '@openpanel/db';
-import { eventsGroupQueue, eventsQueue } from '@openpanel/queue';
-import { getLock, getRedisCache } from '@openpanel/redis';
+import { eventsGroupQueue } from '@openpanel/queue';
 import type { PostEventPayload } from '@openpanel/sdk';
 
 import { checkDuplicatedEvent } from '@/utils/deduplicate';
@@ -61,57 +60,28 @@ export async function postEvent(
     return;
   }
 
-  const isGroupQueue = await getRedisCache().exists('group_queue');
-  if (isGroupQueue) {
-    const uaInfo = parseUserAgent(ua, request.body?.properties);
-    const groupId = uaInfo.isServer
-      ? request.body?.profileId
-        ? `${projectId}:${request.body?.profileId}`
-        : `${projectId}:${generateId()}`
-      : currentDeviceId;
-    await eventsGroupQueue.add({
-      orderMs: new Date(timestamp).getTime(),
-      data: {
-        projectId,
-        headers,
-        event: {
-          ...request.body,
-          timestamp,
-          isTimestampFromThePast,
-        },
-        geo,
-        currentDeviceId,
-        previousDeviceId,
+  const uaInfo = parseUserAgent(ua, request.body?.properties);
+  const groupId = uaInfo.isServer
+    ? request.body?.profileId
+      ? `${projectId}:${request.body?.profileId}`
+      : `${projectId}:${generateId()}`
+    : currentDeviceId;
+  await eventsGroupQueue.add({
+    orderMs: new Date(timestamp).getTime(),
+    data: {
+      projectId,
+      headers,
+      event: {
+        ...request.body,
+        timestamp,
+        isTimestampFromThePast,
       },
-      groupId,
-    });
-  } else {
-    await eventsQueue.add(
-      'event',
-      {
-        type: 'incomingEvent',
-        payload: {
-          projectId,
-          headers,
-          event: {
-            ...request.body,
-            timestamp,
-            isTimestampFromThePast,
-          },
-          geo,
-          currentDeviceId,
-          previousDeviceId,
-        },
-      },
-      {
-        attempts: 3,
-        backoff: {
-          type: 'exponential',
-          delay: 200,
-        },
-      },
-    );
-  }
+      geo,
+      currentDeviceId,
+      previousDeviceId,
+    },
+    groupId,
+  });
 
   reply.status(202).send('ok');
 }

apps/api/src/controllers/track.controller.ts

@@ -3,13 +3,11 @@ import type { FastifyReply, FastifyRequest } from 'fastify';
 import { path, assocPath, pathOr, pick } from 'ramda';
 
 import { checkDuplicatedEvent } from '@/utils/deduplicate';
-import { logger } from '@/utils/logger';
 import { generateId } from '@openpanel/common';
 import { generateDeviceId, parseUserAgent } from '@openpanel/common/server';
 import { getProfileById, getSalts, upsertProfile } from '@openpanel/db';
 import { type GeoLocation, getGeoLocation } from '@openpanel/geo';
-import { eventsGroupQueue, eventsQueue } from '@openpanel/queue';
-import { getLock, getRedisCache } from '@openpanel/redis';
+import { eventsGroupQueue } from '@openpanel/queue';
 import type {
   DecrementPayload,
   IdentifyPayload,
@@ -282,57 +280,28 @@ async function track({
   timestamp: string;
   isTimestampFromThePast: boolean;
 }) {
-  const isGroupQueue = await getRedisCache().exists('group_queue');
-  if (isGroupQueue) {
-    const uaInfo = parseUserAgent(headers['user-agent'], payload.properties);
-    const groupId = uaInfo.isServer
-      ? payload.profileId
-        ? `${projectId}:${payload.profileId}`
-        : `${projectId}:${generateId()}`
-      : currentDeviceId;
-    await eventsGroupQueue.add({
-      orderMs: new Date(timestamp).getTime(),
-      data: {
-        projectId,
-        headers,
-        event: {
-          ...payload,
-          timestamp,
-          isTimestampFromThePast,
-        },
-        geo,
-        currentDeviceId,
-        previousDeviceId,
+  const uaInfo = parseUserAgent(headers['user-agent'], payload.properties);
+  const groupId = uaInfo.isServer
+    ? payload.profileId
+      ? `${projectId}:${payload.profileId}`
+      : `${projectId}:${generateId()}`
+    : currentDeviceId;
+  await eventsGroupQueue.add({
+    orderMs: new Date(timestamp).getTime(),
+    data: {
+      projectId,
+      headers,
+      event: {
+        ...payload,
+        timestamp,
+        isTimestampFromThePast,
       },
-      groupId,
-    });
-  } else {
-    await eventsQueue.add(
-      'event',
-      {
-        type: 'incomingEvent',
-        payload: {
-          projectId,
-          headers,
-          event: {
-            ...payload,
-            timestamp,
-            isTimestampFromThePast,
-          },
-          geo,
-          currentDeviceId,
-          previousDeviceId,
-        },
-      },
-      {
-        attempts: 3,
-        backoff: {
-          type: 'exponential',
-          delay: 200,
-        },
-      },
-    );
-  }
+      geo,
+      currentDeviceId,
+      previousDeviceId,
+    },
+    groupId,
+  });
 }
 
 async function identify({

apps/api/src/utils/graceful-shutdown.ts

@@ -1,7 +1,7 @@
 import { ch, db } from '@openpanel/db';
 import {
   cronQueue,
-  eventsQueue,
+  eventsGroupQueue,
   miscQueue,
   notificationQueue,
   sessionsQueue,
@@ -71,7 +71,7 @@ export async function shutdown(
   // Step 6: Close Bull queues (graceful shutdown of queue state)
   try {
     await Promise.all([
-      eventsQueue.close(),
+      eventsGroupQueue.close(),
       sessionsQueue.close(),
       cronQueue.close(),
       miscQueue.close(),