@pikku/queue-bullmq 0.12.10 → 0.12.12

package/dist/bull-queue-service.d.ts

@@ -2,7 +2,7 @@ import type { ConnectionOptions, JobsOptions } from 'bullmq';
 import type Bull from 'bullmq';
 import { Queue, QueueEvents } from 'bullmq';
 import type { QueueInspection, QueueJob, QueueJobRecord, QueueJobStatus, QueueService } from '@pikku/core/queue';
-import type { JobOptions } from '@pikku/core/queue';
+import { type JobOptions } from '@pikku/core/queue';
 export declare const mapPikkuJobToBull: (options?: JobOptions) => JobsOptions;
 export declare const mapBullJobToRecord: (job: Bull.Job, status: QueueJobStatus) => QueueJobRecord;
 /**

package/dist/bull-queue-service.js

@@ -1,4 +1,5 @@
 import { Queue, QueueEvents } from 'bullmq';
+import { wrapJobTrace } from '@pikku/core/queue';
 import { mapBullJobToQueueJob } from './utils.js';
 export const mapPikkuJobToBull = (options) => {
     const bullOptions = {};
@@ -68,7 +69,7 @@ export class BullQueueService {
         if (this.queues.has(queueName)) {
             return this.queues.get(queueName);
         }
-        const queue = new Queue(queueName, config);
+        const queue = new Queue(queueName, config ?? { connection: this.redisConnectionOptions });
         queue.on('error', (error) => {
             console.error('Redis connection error:', error);
         });
@@ -88,7 +89,7 @@ export class BullQueueService {
      */
     async add(queueName, data, options) {
         const queue = await this.createQueue(queueName);
-        const bullJob = await queue.add(queueName, data, mapPikkuJobToBull(options));
+        const bullJob = await queue.add(queueName, wrapJobTrace(data, options?.traceparent, options?.pikkuUserId), mapPikkuJobToBull(options));
         if (!bullJob.id) {
             throw new Error(`Failed to add job to queue '${queueName}'.`);
         }

package/dist/bull-scheduler-service.d.ts

@@ -17,7 +17,7 @@ export declare class BullSchedulerService extends SchedulerService {
      * Schedule a one-off delayed RPC call
      * Uses BullMQ add() with delay option
      */
-    scheduleRPC(delay: number | string, rpcName: string, data?: any, session?: CoreUserSession): Promise<string>;
+    scheduleRPC(delay: number | string, rpcName: string, data?: any, session?: CoreUserSession, traceparent?: string): Promise<string>;
     /**
      * Unschedule (remove) a task by ID
      */

package/dist/bull-scheduler-service.js

@@ -1,3 +1,4 @@
+import { unwrapJobTrace, wrapJobTrace } from '@pikku/core/queue';
 import { Queue, Worker } from 'bullmq';
 import { runScheduledTask } from '@pikku/core/scheduler';
 import { SchedulerService } from '@pikku/core/services';
@@ -14,7 +15,7 @@ export class BullSchedulerService extends SchedulerService {
     constructor(redisConnectionOptions) {
         super();
         this.redisConnectionOptions = redisConnectionOptions;
-        this.queue = new Queue('pikku-remote-internal-rpc', {
+        this.queue = new Queue('pikku-mesh-rpc', {
             connection: redisConnectionOptions,
         });
         this.recurringQueue = new Queue(RECURRING_QUEUE_NAME, {
@@ -31,7 +32,7 @@ export class BullSchedulerService extends SchedulerService {
      * Schedule a one-off delayed RPC call
      * Uses BullMQ add() with delay option
      */
-    async scheduleRPC(delay, rpcName, data, session) {
+    async scheduleRPC(delay, rpcName, data, session, traceparent) {
         // Parse delay if it's a string
         const delayMs = typeof delay === 'string' ? parseDurationString(delay) : delay;
         const jobData = {
@@ -40,7 +41,7 @@ export class BullSchedulerService extends SchedulerService {
             session,
         };
         // Use add() with delay for one-off delayed execution
-        const job = await this.queue.add('pikku-remote-internal-rpc', jobData, {
+        const job = await this.queue.add('pikku-mesh-rpc', wrapJobTrace(jobData, traceparent), {
             delay: delayMs, // delay in milliseconds
             jobId: `${rpcName}-${Date.now()}`, // Ensure uniqueness
         });
@@ -68,7 +69,7 @@ export class BullSchedulerService extends SchedulerService {
         if (!job) {
             return null;
         }
-        const jobData = job.data;
+        const jobData = unwrapJobTrace(job.data).data;
         const state = await job.getState();
         // Calculate scheduled time from delay or processedOn
         const scheduledFor = job.delay
@@ -89,7 +90,7 @@ export class BullSchedulerService extends SchedulerService {
     async getAllTasks() {
         const jobs = await this.queue.getJobs(['delayed', 'waiting']);
         return jobs.map((job) => {
-            const jobData = job.data;
+            const jobData = unwrapJobTrace(job.data).data;
             const scheduledFor = job.delay
                 ? new Date(job.timestamp + job.delay)
                 : new Date(job.timestamp);

package/dist/utils.js

@@ -1,3 +1,4 @@
+import { unwrapJobTrace } from '@pikku/core/queue';
 import { QueueEvents } from 'bullmq';
 /**
  * Map Bull job state to our queue job status
@@ -22,10 +23,13 @@ const mapBullStateToStatus = (state) => {
  * Map Bull job to QueueJob interface
  */
 export const mapBullJobToQueueJob = async (bullJob, redisConnection, queueEventsMap) => {
+    const { data, traceparent, pikkuUserId } = unwrapJobTrace(bullJob.data);
     return {
         queueName: bullJob.name,
         id: bullJob.id || '',
-        data: bullJob.data,
+        data,
+        traceparent,
+        pikkuUserId,
         result: bullJob.returnvalue,
         status: async () => mapBullStateToStatus(await bullJob.getState()),
         waitForCompletion: async (ttl) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/queue-bullmq",
-  "version": "0.12.10",
+  "version": "0.12.12",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/pikkujs/pikku.git",
@@ -22,7 +22,7 @@
     "clean": "rm -rf dist tsconfig.tsbuildinfo"
   },
   "peerDependencies": {
-    "@pikku/core": "^0.12.144"
+    "@pikku/core": "^0.12.151"
   },
   "dependencies": {
     "bullmq": "^6.3.16",