fix types

Author: nicktrn

internal-packages/redis/src/index.ts

@@ -1,4 +1,4 @@
-import { Redis, RedisOptions } from "ioredis";
+import { Redis, type RedisOptions } from "ioredis";
 import { Logger } from "@trigger.dev/core/logger";
 
 export { Redis, type Callback, type RedisOptions, type Result, type RedisCommander } from "ioredis";

internal-packages/tracing/src/index.ts

@@ -1,5 +1,5 @@
-import { Span, SpanOptions, SpanStatusCode, Tracer } from "@opentelemetry/api";
-import { Logger, SeverityNumber } from "@opentelemetry/api-logs";
+import { type Span, type SpanOptions, SpanStatusCode, type Tracer } from "@opentelemetry/api";
+import { type Logger, SeverityNumber } from "@opentelemetry/api-logs";
 import { flattenAttributes } from "@trigger.dev/core/v3/utils/flattenAttributes";
 
 export * from "@opentelemetry/semantic-conventions";

packages/redis-worker/src/queue.test.ts

@@ -30,6 +30,11 @@ describe("SimpleQueue", () => {
       expect(await queue.size()).toBe(2);
 
       const [first] = await queue.dequeue(1);
+
+      if (!first) {
+        throw new Error("No item dequeued");
+      }
+
       expect(first).toEqual(
         expect.objectContaining({
           id: "1",
@@ -47,6 +52,11 @@ describe("SimpleQueue", () => {
       expect(await queue.size({ includeFuture: true })).toBe(1);
 
       const [second] = await queue.dequeue(1);
+
+      if (!second) {
+        throw new Error("No item dequeued");
+      }
+
       expect(second).toEqual(
         expect.objectContaining({
           id: "2",
@@ -253,6 +263,10 @@ describe("SimpleQueue", () => {
       expect(await queue.size()).toBe(1);
       expect(await queue.size({ includeFuture: true })).toBe(3);
 
+      if (!dequeued[0] || !dequeued[1]) {
+        throw new Error("No items dequeued");
+      }
+
       await queue.ack(dequeued[0].id);
       await queue.ack(dequeued[1].id);
 
@@ -270,6 +284,10 @@ describe("SimpleQueue", () => {
         })
       );
 
+      if (!last) {
+        throw new Error("No item dequeued");
+      }
+
       await queue.ack(last.id);
       expect(await queue.size({ includeFuture: true })).toBe(0);
     } finally {
@@ -315,6 +333,11 @@ describe("SimpleQueue", () => {
 
       // Dequeue the redriven item
       const [redrivenItem] = await queue.dequeue(1);
+
+      if (!redrivenItem) {
+        throw new Error("No item dequeued");
+      }
+
       expect(redrivenItem).toEqual(
         expect.objectContaining({
           id: "1",

packages/redis-worker/src/worker.ts

@@ -152,7 +152,11 @@ class Worker<TCatalog extends WorkerCatalog> {
       this.tracer,
       "enqueue",
       async (span) => {
-        const timeout = visibilityTimeoutMs ?? this.options.catalog[job].visibilityTimeoutMs;
+        const timeout = visibilityTimeoutMs ?? this.options.catalog[job]?.visibilityTimeoutMs;
+
+        if (!timeout) {
+          throw new Error(`No visibility timeout found for job ${String(job)} with id ${id}`);
+        }
 
         span.setAttribute("job_visibility_timeout_ms", timeout);
 
@@ -306,7 +310,7 @@ class Worker<TCatalog extends WorkerCatalog> {
         const newAttempt = attempt + 1;
         const retrySettings = {
           ...defaultRetrySettings,
-          ...catalogItem.retry,
+          ...catalogItem?.retry,
         };
         const retryDelay = calculateNextRetryDelay(retrySettings, newAttempt);