reorg

Author: muniter

src/core/serializer.ts

@@ -1,10 +1,15 @@
 import { Queue } from '../core/queue.ts';
-import type { JobStatus, JobMeta, QueueMessage, DbJobRequest } from '../interfaces/job.ts';
+import type { JobStatus, JobMeta, QueueMessage, BaseJobOptions, WithPriority, WithDelay } from '../interfaces/job.ts';
 import type { DatabaseAdapter, QueueJobRecord } from '../interfaces/database.ts';
 import type { QueueOptions } from '../interfaces/plugin.ts';
 
-// Re-export job interface for this driver
-export type { DbJobRequest } from '../interfaces/job.ts';
+// Driver-specific job request interface
+export interface DbJobRequest<TPayload> extends BaseJobOptions, WithPriority, WithDelay {
+  /** Job payload */
+  payload: TPayload;
+  // DB adapters may or may not support delay/priority - we allow them for flexibility
+  // The specific DatabaseAdapter implementation determines actual support
+}
 
 export class DbQueue<TJobMap = Record<string, any>> extends Queue<TJobMap, DbJobRequest<any>> {
   constructor(

src/drivers/db.ts

@@ -2,11 +2,15 @@ import { promises as fs } from 'fs';
 import { open } from 'fs/promises';
 import path from 'path';
 import { Queue } from '../core/queue.ts';
-import type { QueueMessage, JobMeta, JobStatus, FileJobRequest } from '../interfaces/job.ts';
+import type { QueueMessage, JobMeta, JobStatus, BaseJobOptions, WithDelay } from '../interfaces/job.ts';
 import type { QueueOptions } from '../interfaces/plugin.ts';
 
-// Re-export job interface for this driver
-export type { FileJobRequest } from '../interfaces/job.ts';
+// Driver-specific job request interface
+export interface FileJobRequest<TPayload> extends BaseJobOptions, WithDelay {
+  /** Job payload */
+  payload: TPayload;
+  // File queue supports delays but not priority ordering
+}
 
 interface IndexData {
   lastId: number;

src/drivers/file.ts

@@ -1,9 +1,13 @@
 import { Queue } from '../core/queue.ts';
-import type { JobStatus, JobMeta, QueueMessage, InMemoryJobRequest } from '../interfaces/job.ts';
+import type { JobStatus, JobMeta, QueueMessage, BaseJobOptions, WithPriority, WithDelay } from '../interfaces/job.ts';
 import type { QueueOptions } from '../interfaces/plugin.ts';
 
-// Re-export job interface for this driver
-export type { InMemoryJobRequest } from '../interfaces/job.ts';
+// Driver-specific job request interface
+export interface InMemoryJobRequest<TPayload> extends BaseJobOptions, WithPriority, WithDelay {
+  /** Job payload */
+  payload: TPayload;
+  // In-memory queue supports both priority and delays
+}
 
 interface InMemoryJobRecord {
   id: string;

src/drivers/memory.ts

@@ -1,9 +1,16 @@
 import { Schema, model, Model, Document, Types } from 'mongoose';
 import type { UpdateQuery, FilterQuery, QueryOptions } from 'mongoose';
 import type { DatabaseAdapter, QueueJobRecord } from '../interfaces/database.ts';
-import type { JobMeta, JobStatus } from '../interfaces/job.ts';
+import type { JobMeta, JobStatus, BaseJobOptions, WithPriority, WithDelay } from '../interfaces/job.ts';
 import { DbQueue } from '../drivers/db.ts';
 
+// Driver-specific job request interface
+export interface MongooseJobRequest<TPayload> extends BaseJobOptions, WithPriority, WithDelay {
+  /** Job payload */
+  payload: TPayload;
+  // Mongoose/MongoDB queue supports both priority and delays
+}
+
 // MongoDB document structure for queue jobs
 export interface IQueueJobDocument {
   payload: Buffer;
@@ -245,5 +252,3 @@ export const QueueJob = createQueueModel();
 // Re-export for convenience
 export { DbQueue };
 
-// Re-export job interface for Mongoose adapter
-export type { MongooseJobRequest } from '../interfaces/job.ts';

src/drivers/mongoose.ts

@@ -1,9 +1,13 @@
 import { Queue } from '../core/queue.ts';
-import type { JobStatus, JobMeta, QueueMessage, RedisJobRequest } from '../interfaces/job.ts';
+import type { JobStatus, JobMeta, QueueMessage, BaseJobOptions, WithPriority, WithDelay } from '../interfaces/job.ts';
 import type { QueueOptions } from '../interfaces/plugin.ts';
 
-// Re-export job interface for this driver
-export type { RedisJobRequest } from '../interfaces/job.ts';
+// Driver-specific job request interface
+export interface RedisJobRequest<TPayload> extends BaseJobOptions, WithPriority, WithDelay {
+  /** Job payload */
+  payload: TPayload;
+  // Redis queue supports both priority and delays
+}
 
 
 // Type-safe interface for Redis client based on the popular 'redis' npm package

src/drivers/redis.ts

@@ -14,12 +14,17 @@ import type {
   JobStatus,
   JobMeta,
   QueueMessage,
-  SqsJobRequest,
+  BaseJobOptions,
+  WithDelay,
 } from "../interfaces/job.ts";
 import type { QueueOptions } from "../interfaces/plugin.ts";
 
-// Re-export job interface for this driver
-export type { SqsJobRequest } from "../interfaces/job.ts";
+// Driver-specific job request interface
+export interface SqsJobRequest<TPayload> extends BaseJobOptions, WithDelay {
+  /** Job payload */
+  payload: TPayload;
+  // SQS supports delays (0-900 seconds max) but not priority ordering
+}
 
 interface SqsClient {
   send: SQSClient["send"];

src/drivers/sqs.ts

@@ -106,40 +106,4 @@ export interface BaseJobRequest<TPayload> extends BaseJobOptions {
   payload: TPayload;
 }
 
-export interface DbJobRequest<TPayload> extends BaseJobOptions, WithPriority, WithDelay {
-  /** Job payload */
-  payload: TPayload;
-  // DB adapters may or may not support delay/priority - we allow them for flexibility
-  // The specific DatabaseAdapter implementation determines actual support
-}
-
-export interface SqsJobRequest<TPayload> extends BaseJobOptions, WithDelay {
-  /** Job payload */
-  payload: TPayload;
-  // SQS supports delays (0-900 seconds max) but not priority ordering
-}
-
-export interface FileJobRequest<TPayload> extends BaseJobOptions, WithDelay {
-  /** Job payload */
-  payload: TPayload;
-  // File queue supports delays but not priority ordering
-}
-
-export interface InMemoryJobRequest<TPayload> extends BaseJobOptions, WithPriority, WithDelay {
-  /** Job payload */
-  payload: TPayload;
-  // In-memory queue supports both priority and delays
-}
-
-export interface RedisJobRequest<TPayload> extends BaseJobOptions, WithPriority, WithDelay {
-  /** Job payload */
-  payload: TPayload;
-  // Redis queue supports both priority and delays
-}
-
-export interface MongooseJobRequest<TPayload> extends BaseJobOptions, WithPriority, WithDelay {
-  /** Job payload */
-  payload: TPayload;
-  // Mongoose/MongoDB queue supports both priority and delays
-}
 

src/interfaces/job.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { Queue } from '../../src/core/queue.ts';
-import type { JobMeta, QueueMessage, DbJobRequest } from '../../src/interfaces/job.ts';
+import type { JobMeta, QueueMessage, JobRequestFull } from '../../src/interfaces/job.ts';
 
 interface TestJobs {
   'test-job': { data: string };
@@ -9,7 +9,7 @@ interface TestJobs {
   'fail-job': { data: string };
 }
 
-class TestQueue extends Queue<TestJobs, DbJobRequest<any>> {
+class TestQueue extends Queue<TestJobs, JobRequestFull<any>> {
   public messages: Array<{ payload: string; meta: JobMeta; id: string }> = [];
   public completedJobs: Array<{ id: string; message: QueueMessage }> = [];
   public failedJobs: Array<{ id: string; message: QueueMessage; error: unknown }> = [];