diff --git a/apps/worker/src/index.ts b/apps/worker/src/index.ts index 8f3e2199..354c7d0b 100644 --- a/apps/worker/src/index.ts +++ b/apps/worker/src/index.ts @@ -5,8 +5,12 @@ import type { WorkerOptions } from 'bullmq'; import { Worker } from 'bullmq'; import express from 'express'; -import { connection, eventsQueue } from '@openpanel/queue'; -import { cronQueue, sessionsQueue } from '@openpanel/queue/src/queues'; +import { + connection, + cronQueue, + eventsQueue, + sessionsQueue, +} from '@openpanel/queue'; import { cronJob } from './jobs/cron'; import { eventsJob } from './jobs/events'; diff --git a/apps/worker/src/jobs/cron.ts b/apps/worker/src/jobs/cron.ts index 382c24bc..60cb45bc 100644 --- a/apps/worker/src/jobs/cron.ts +++ b/apps/worker/src/jobs/cron.ts @@ -1,7 +1,7 @@ import type { Job } from 'bullmq'; import { eventBuffer, profileBuffer } from '@openpanel/db'; -import type { CronQueuePayload } from '@openpanel/queue/src/queues'; +import type { CronQueuePayload } from '@openpanel/queue'; import { salt } from './cron.salt'; diff --git a/apps/worker/src/jobs/events.create-session-end.ts b/apps/worker/src/jobs/events.create-session-end.ts index 33d24a20..22a45182 100644 --- a/apps/worker/src/jobs/events.create-session-end.ts +++ b/apps/worker/src/jobs/events.create-session-end.ts @@ -2,7 +2,7 @@ import type { Job } from 'bullmq'; import { getTime } from '@openpanel/common'; import { createEvent, eventBuffer, getEvents } from '@openpanel/db'; -import type { EventsQueuePayloadCreateSessionEnd } from '@openpanel/queue/src/queues'; +import type { EventsQueuePayloadCreateSessionEnd } from '@openpanel/queue'; export async function createSessionEnd( job: Job diff --git a/apps/worker/src/jobs/events.incoming-event.ts b/apps/worker/src/jobs/events.incoming-event.ts index b77ea406..8caa06f8 100644 --- a/apps/worker/src/jobs/events.incoming-event.ts +++ b/apps/worker/src/jobs/events.incoming-event.ts @@ -9,12 +9,11 @@ import { getTime, toISOString } from '@openpanel/common'; import type { IServiceCreateEventPayload } from '@openpanel/db'; import { createEvent } from '@openpanel/db'; import { getLastScreenViewFromProfileId } from '@openpanel/db/src/services/event.service'; -import { findJobByPrefix } from '@openpanel/queue'; -import { eventsQueue, sessionsQueue } from '@openpanel/queue/src/queues'; +import { eventsQueue, findJobByPrefix, sessionsQueue } from '@openpanel/queue'; import type { EventsQueuePayloadCreateSessionEnd, EventsQueuePayloadIncomingEvent, -} from '@openpanel/queue/src/queues'; +} from '@openpanel/queue'; import { redis } from '@openpanel/redis'; function noDateInFuture(eventDate: Date): Date { diff --git a/apps/worker/src/jobs/events.ts b/apps/worker/src/jobs/events.ts index b833effd..c784f79d 100644 --- a/apps/worker/src/jobs/events.ts +++ b/apps/worker/src/jobs/events.ts @@ -6,7 +6,7 @@ import type { EventsQueuePayload, EventsQueuePayloadCreateSessionEnd, EventsQueuePayloadIncomingEvent, -} from '@openpanel/queue/src/queues'; +} from '@openpanel/queue'; import { createSessionEnd } from './events.create-session-end'; import { incomingEvent } from './events.incoming-event'; diff --git a/apps/worker/src/jobs/sessions.ts b/apps/worker/src/jobs/sessions.ts index b773b8c3..7a37941d 100644 --- a/apps/worker/src/jobs/sessions.ts +++ b/apps/worker/src/jobs/sessions.ts @@ -1,6 +1,6 @@ import type { Job } from 'bullmq'; -import type { SessionsQueuePayload } from '@openpanel/queue/src/queues'; +import type { SessionsQueuePayload } from '@openpanel/queue'; import { createSessionEnd } from './events.create-session-end'; diff --git a/packages/queue/index.ts b/packages/queue/index.ts index 8eb797c0..7dba30a6 100644 --- a/packages/queue/index.ts +++ b/packages/queue/index.ts @@ -1,4 +1,5 @@ -export { eventsQueue } from './src/queues'; +export { eventsQueue, cronQueue, sessionsQueue } from './src/queues'; +export type * from './src/queues'; export { connection } from './src/connection'; export { findJobByPrefix } from './src/utils'; export type { JobsOptions } from 'bullmq';